svn commit: r336863 - in vendor/file/5.34: . doc magic magic/Magdir python src tests
Author: eadler Date: Sun Jul 29 05:54:54 2018 New Revision: 336863 URL: https://svnweb.freebsd.org/changeset/base/336863 Log: vendor/file: tag 5.34 Added: vendor/file/5.34/ - copied from r336859, vendor/file/dist/ vendor/file/5.34/magic/Magdir/dataone - copied unchanged from r336862, vendor/file/dist/magic/Magdir/dataone vendor/file/5.34/python/CHANGELOG.md - copied unchanged from r336862, vendor/file/dist/python/CHANGELOG.md vendor/file/5.34/python/LICENSE - copied unchanged from r336862, vendor/file/dist/python/LICENSE vendor/file/5.34/python/README.md - copied unchanged from r336862, vendor/file/dist/python/README.md vendor/file/5.34/python/tests.py - copied unchanged from r336862, vendor/file/dist/python/tests.py vendor/file/5.34/tests/JW07022A.mp3.result - copied unchanged from r336862, vendor/file/dist/tests/JW07022A.mp3.result vendor/file/5.34/tests/JW07022A.mp3.testfile - copied unchanged from r336862, vendor/file/dist/tests/JW07022A.mp3.testfile Replaced: vendor/file/5.34/ChangeLog - copied unchanged from r336862, vendor/file/dist/ChangeLog vendor/file/5.34/Makefile.in - copied unchanged from r336862, vendor/file/dist/Makefile.in vendor/file/5.34/README - copied unchanged from r336862, vendor/file/dist/README vendor/file/5.34/aclocal.m4 - copied unchanged from r336862, vendor/file/dist/aclocal.m4 vendor/file/5.34/compile - copied unchanged from r336862, vendor/file/dist/compile vendor/file/5.34/config.guess - copied unchanged from r336862, vendor/file/dist/config.guess vendor/file/5.34/config.h.in - copied unchanged from r336862, vendor/file/dist/config.h.in vendor/file/5.34/config.sub - copied unchanged from r336862, vendor/file/dist/config.sub vendor/file/5.34/configure - copied unchanged from r336862, vendor/file/dist/configure vendor/file/5.34/configure.ac - copied unchanged from r336862, vendor/file/dist/configure.ac vendor/file/5.34/depcomp - copied unchanged from r336862, vendor/file/dist/depcomp vendor/file/5.34/doc/Makefile.in - copied unchanged from r336862, vendor/file/dist/doc/Makefile.in vendor/file/5.34/doc/file.man - copied unchanged from r336862, vendor/file/dist/doc/file.man vendor/file/5.34/doc/magic.man - copied unchanged from r336862, vendor/file/dist/doc/magic.man vendor/file/5.34/install-sh - copied unchanged from r336862, vendor/file/dist/install-sh vendor/file/5.34/ltmain.sh - copied unchanged from r336862, vendor/file/dist/ltmain.sh vendor/file/5.34/magic/Magdir/animation - copied unchanged from r336862, vendor/file/dist/magic/Magdir/animation vendor/file/5.34/magic/Magdir/archive - copied unchanged from r336862, vendor/file/dist/magic/Magdir/archive vendor/file/5.34/magic/Magdir/audio - copied unchanged from r336862, vendor/file/dist/magic/Magdir/audio vendor/file/5.34/magic/Magdir/cad - copied unchanged from r336862, vendor/file/dist/magic/Magdir/cad vendor/file/5.34/magic/Magdir/console - copied unchanged from r336862, vendor/file/dist/magic/Magdir/console vendor/file/5.34/magic/Magdir/database - copied unchanged from r336862, vendor/file/dist/magic/Magdir/database vendor/file/5.34/magic/Magdir/dbpf - copied unchanged from r336862, vendor/file/dist/magic/Magdir/dbpf vendor/file/5.34/magic/Magdir/dump - copied unchanged from r336862, vendor/file/dist/magic/Magdir/dump vendor/file/5.34/magic/Magdir/elf - copied unchanged from r336862, vendor/file/dist/magic/Magdir/elf vendor/file/5.34/magic/Magdir/fsav - copied unchanged from r336862, vendor/file/dist/magic/Magdir/fsav vendor/file/5.34/magic/Magdir/images - copied unchanged from r336862, vendor/file/dist/magic/Magdir/images vendor/file/5.34/magic/Magdir/linux - copied unchanged from r336862, vendor/file/dist/magic/Magdir/linux vendor/file/5.34/magic/Magdir/make - copied unchanged from r336862, vendor/file/dist/magic/Magdir/make vendor/file/5.34/magic/Magdir/measure - copied unchanged from r336862, vendor/file/dist/magic/Magdir/measure vendor/file/5.34/magic/Magdir/msdos - copied unchanged from r336862, vendor/file/dist/magic/Magdir/msdos vendor/file/5.34/magic/Magdir/msooxml - copied unchanged from r336862, vendor/file/dist/magic/Magdir/msooxml vendor/file/5.34/magic/Magdir/pdf - copied unchanged from r336862, vendor/file/dist/magic/Magdir/pdf vendor/file/5.34/magic/Magdir/sgi - copied unchanged from r336862, vendor/file/dist/magic/Magdir/sgi vendor/file/5.34/magic/Makefile.am - copied unchanged from r336862, vendor/file/dist/magic/Makefile.am vendor/file/5.34/magic/Makefile.in - copied unchanged from r336862, vendor/file/dist/magic/Makefile.in vendor/file/5.34/missing - copied unchanged from r336862, vendor/file/dist/missing vendor/file/5.34/python/Makefile.am - copied unchanged from r336862,
svn commit: r336862 - in vendor/file/dist: . doc magic magic/Magdir python src tests
Author: eadler
Date: Sun Jul 29 05:53:49 2018
New Revision: 336862
URL: https://svnweb.freebsd.org/changeset/base/336862
Log:
vendor/file: add 5.34
gpg: Good signature from "Christos Zoulas (personal key)
" [unknown]
gpg: aka "Christos Zoulas (NetBSD key)
" [unknown]
Obtained from:ftp://ftp.astron.com/pub/file/
Added:
vendor/file/dist/magic/Magdir/dataone
vendor/file/dist/python/CHANGELOG.md
vendor/file/dist/python/LICENSE
vendor/file/dist/python/README.md
vendor/file/dist/python/tests.py (contents, props changed)
vendor/file/dist/tests/JW07022A.mp3.result
vendor/file/dist/tests/JW07022A.mp3.testfile (contents, props changed)
Deleted:
vendor/file/dist/python/README
Modified:
vendor/file/dist/ChangeLog
vendor/file/dist/Makefile.in
vendor/file/dist/README
vendor/file/dist/aclocal.m4
vendor/file/dist/compile
vendor/file/dist/config.guess
vendor/file/dist/config.h.in
vendor/file/dist/config.sub
vendor/file/dist/configure
vendor/file/dist/configure.ac
vendor/file/dist/depcomp
vendor/file/dist/doc/Makefile.in
vendor/file/dist/doc/file.man
vendor/file/dist/doc/magic.man
vendor/file/dist/install-sh
vendor/file/dist/ltmain.sh
vendor/file/dist/magic/Magdir/animation
vendor/file/dist/magic/Magdir/archive
vendor/file/dist/magic/Magdir/audio
vendor/file/dist/magic/Magdir/cad
vendor/file/dist/magic/Magdir/console
vendor/file/dist/magic/Magdir/database
vendor/file/dist/magic/Magdir/dbpf
vendor/file/dist/magic/Magdir/dump
vendor/file/dist/magic/Magdir/elf
vendor/file/dist/magic/Magdir/fsav
vendor/file/dist/magic/Magdir/images
vendor/file/dist/magic/Magdir/linux
vendor/file/dist/magic/Magdir/make
vendor/file/dist/magic/Magdir/measure
vendor/file/dist/magic/Magdir/msdos
vendor/file/dist/magic/Magdir/msooxml
vendor/file/dist/magic/Magdir/pdf
vendor/file/dist/magic/Magdir/sgi
vendor/file/dist/magic/Makefile.am
vendor/file/dist/magic/Makefile.in
vendor/file/dist/missing
vendor/file/dist/python/Makefile.am
vendor/file/dist/python/Makefile.in
vendor/file/dist/python/magic.py
vendor/file/dist/python/setup.py
vendor/file/dist/src/Makefile.in
vendor/file/dist/src/apprentice.c
vendor/file/dist/src/compress.c
vendor/file/dist/src/der.c
vendor/file/dist/src/file.h
vendor/file/dist/src/funcs.c
vendor/file/dist/src/readcdf.c
vendor/file/dist/src/readelf.c
vendor/file/dist/src/readelf.h
vendor/file/dist/src/seccomp.c
vendor/file/dist/src/softmagic.c
vendor/file/dist/tests/Makefile.am
vendor/file/dist/tests/Makefile.in
Modified: vendor/file/dist/ChangeLog
==
--- vendor/file/dist/ChangeLog Sun Jul 29 05:51:14 2018(r336861)
+++ vendor/file/dist/ChangeLog Sun Jul 29 05:53:49 2018(r336862)
@@ -1,3 +1,15 @@
+2018-07-25 8:50 Christos Zoulas
+
+ * release 5.34
+
+2018-06-22 16:38 Christos Zoulas
+
+ * Add Quad indirect offsets
+
+2018-05-24 14:10 Christos Zoulas
+
+ * Enable parsing of ELF dynamic sections to handle PIE better
+
2018-04-15 14:52 Christos Zoulas
* release 5.33
Modified: vendor/file/dist/Makefile.in
==
--- vendor/file/dist/Makefile.inSun Jul 29 05:51:14 2018
(r336861)
+++ vendor/file/dist/Makefile.inSun Jul 29 05:53:49 2018
(r336862)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,61 @@
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
-am__dry=no; \
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+false; \
+ elif test -n '$(MAKE_HOST)'; then \
+true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+true; \
+ else \
+false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
-echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
-for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
-*=*|--*) ;; \
-*n*) am__dry=yes; break;; \
- esac; \
-done;; \
+bs=\\; \
+
svn commit: r336861 - vendor/file/5.34
Author: eadler Date: Sun Jul 29 05:51:14 2018 New Revision: 336861 URL: https://svnweb.freebsd.org/changeset/base/336861 Log: Remove 5.34 I inverted the order of the import. Deleted: vendor/file/5.34/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336860 - in vendor/file/5.34: . doc m4 magic magic/Magdir python src tests
Author: eadler Date: Sun Jul 29 05:49:48 2018 New Revision: 336860 URL: https://svnweb.freebsd.org/changeset/base/336860 Log: vendor/file: add 5.34 gpg: Good signature from "Christos Zoulas (personal key) " [unknown] gpg: aka "Christos Zoulas (NetBSD key) " [unknown] Obtained from:ftp://ftp.astron.com/pub/file/ Added: vendor/file/5.34/ vendor/file/5.34/AUTHORS vendor/file/5.34/COPYING vendor/file/5.34/ChangeLog vendor/file/5.34/INSTALL vendor/file/5.34/MAINT vendor/file/5.34/Makefile.am (contents, props changed) vendor/file/5.34/Makefile.in (contents, props changed) vendor/file/5.34/NEWS vendor/file/5.34/README vendor/file/5.34/TODO vendor/file/5.34/acinclude.m4 vendor/file/5.34/aclocal.m4 vendor/file/5.34/compile (contents, props changed) vendor/file/5.34/config.guess (contents, props changed) vendor/file/5.34/config.h.in (contents, props changed) vendor/file/5.34/config.sub (contents, props changed) vendor/file/5.34/configure (contents, props changed) vendor/file/5.34/configure.ac vendor/file/5.34/depcomp (contents, props changed) vendor/file/5.34/doc/ vendor/file/5.34/doc/Makefile.am (contents, props changed) vendor/file/5.34/doc/Makefile.in (contents, props changed) vendor/file/5.34/doc/file.man vendor/file/5.34/doc/libmagic.man vendor/file/5.34/doc/magic.man vendor/file/5.34/install-sh (contents, props changed) vendor/file/5.34/ltmain.sh (contents, props changed) vendor/file/5.34/m4/ vendor/file/5.34/m4/libtool.m4 vendor/file/5.34/m4/ltoptions.m4 vendor/file/5.34/m4/ltsugar.m4 vendor/file/5.34/m4/ltversion.m4 vendor/file/5.34/m4/lt~obsolete.m4 vendor/file/5.34/magic/ vendor/file/5.34/magic/Header vendor/file/5.34/magic/Localstuff vendor/file/5.34/magic/Magdir/ vendor/file/5.34/magic/Magdir/acorn vendor/file/5.34/magic/Magdir/adi vendor/file/5.34/magic/Magdir/adventure vendor/file/5.34/magic/Magdir/algol68 vendor/file/5.34/magic/Magdir/allegro vendor/file/5.34/magic/Magdir/alliant vendor/file/5.34/magic/Magdir/amanda vendor/file/5.34/magic/Magdir/amigaos vendor/file/5.34/magic/Magdir/android vendor/file/5.34/magic/Magdir/animation vendor/file/5.34/magic/Magdir/aout vendor/file/5.34/magic/Magdir/apache (contents, props changed) vendor/file/5.34/magic/Magdir/apl vendor/file/5.34/magic/Magdir/apple (contents, props changed) vendor/file/5.34/magic/Magdir/application vendor/file/5.34/magic/Magdir/applix vendor/file/5.34/magic/Magdir/apt vendor/file/5.34/magic/Magdir/archive vendor/file/5.34/magic/Magdir/assembler vendor/file/5.34/magic/Magdir/asterix vendor/file/5.34/magic/Magdir/att3b vendor/file/5.34/magic/Magdir/audio vendor/file/5.34/magic/Magdir/basis vendor/file/5.34/magic/Magdir/beetle vendor/file/5.34/magic/Magdir/ber vendor/file/5.34/magic/Magdir/bflt vendor/file/5.34/magic/Magdir/bhl vendor/file/5.34/magic/Magdir/bioinformatics vendor/file/5.34/magic/Magdir/blackberry vendor/file/5.34/magic/Magdir/blcr vendor/file/5.34/magic/Magdir/blender vendor/file/5.34/magic/Magdir/blit vendor/file/5.34/magic/Magdir/bout vendor/file/5.34/magic/Magdir/bsdi vendor/file/5.34/magic/Magdir/bsi vendor/file/5.34/magic/Magdir/btsnoop vendor/file/5.34/magic/Magdir/c-lang vendor/file/5.34/magic/Magdir/c64 vendor/file/5.34/magic/Magdir/cad vendor/file/5.34/magic/Magdir/cafebabe vendor/file/5.34/magic/Magdir/cbor vendor/file/5.34/magic/Magdir/cddb vendor/file/5.34/magic/Magdir/chord vendor/file/5.34/magic/Magdir/cisco vendor/file/5.34/magic/Magdir/citrus vendor/file/5.34/magic/Magdir/clarion vendor/file/5.34/magic/Magdir/claris vendor/file/5.34/magic/Magdir/clipper vendor/file/5.34/magic/Magdir/coff vendor/file/5.34/magic/Magdir/commands vendor/file/5.34/magic/Magdir/communications vendor/file/5.34/magic/Magdir/compress vendor/file/5.34/magic/Magdir/console vendor/file/5.34/magic/Magdir/convex vendor/file/5.34/magic/Magdir/coverage vendor/file/5.34/magic/Magdir/cracklib vendor/file/5.34/magic/Magdir/ctags vendor/file/5.34/magic/Magdir/ctf vendor/file/5.34/magic/Magdir/cubemap vendor/file/5.34/magic/Magdir/cups vendor/file/5.34/magic/Magdir/dact vendor/file/5.34/magic/Magdir/database vendor/file/5.34/magic/Magdir/dataone vendor/file/5.34/magic/Magdir/dbpf vendor/file/5.34/magic/Magdir/der vendor/file/5.34/magic/Magdir/diamond vendor/file/5.34/magic/Magdir/diff vendor/file/5.34/magic/Magdir/digital vendor/file/5.34/magic/Magdir/dolby vendor/file/5.34/magic/Magdir/dump vendor/file/5.34/magic/Magdir/dyadic vendor/file/5.34/magic/Magdir/ebml vendor/file/5.34/magic/Magdir/editors vendor/file/5.34/magic/Magdir/efi vendor/file/5.34/magic/Magdir/elf vendor/file/5.34/magic/Magdir/encore vendor/file/5.34/magic/Magdir/epoc vendor/file/5.34/magic/Magdir/erlang vendor/file/5.34/magic/Magdir/esri vendor/file/5.34/magic/Magdir/fcs
svn commit: r336859 - head/sbin/init/rc.d
Author: truckman
Date: Sun Jul 29 05:42:07 2018
New Revision: 336859
URL: https://svnweb.freebsd.org/changeset/base/336859
Log:
Fix a variable name typo in r336845 that prevented the rc.d scripts
from being installed in the correct directory.
Resurrect a few rc.d scripts that were prematurely deleted from the
Makefile by r336845.
Reviewed by: brd
Modified:
head/sbin/init/rc.d/Makefile
Modified: head/sbin/init/rc.d/Makefile
==
--- head/sbin/init/rc.d/MakefileSun Jul 29 05:14:26 2018
(r336858)
+++ head/sbin/init/rc.d/MakefileSun Jul 29 05:42:07 2018
(r336859)
@@ -2,7 +2,7 @@
.include
-CONFSDIR= /etc/rc.d
+CONFDIR= /etc/rc.d
CONFGROUPS=CONFS
CONFS= DAEMON \
@@ -75,6 +75,7 @@ CONFS=DAEMON \
netif \
netoptions \
netwait \
+ newsyslog \
nfsclient \
nfscbd \
nfsd \
@@ -112,6 +113,8 @@ CONFS= DAEMON \
stf \
swap \
swaplate \
+ sysctl \
+ syslogd \
tmp \
${_ubthidhci} \
ugidfw \
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336858 - stable/11/sys/dev/vt/hw/vga
Author: eadler
Date: Sun Jul 29 05:14:26 2018
New Revision: 336858
URL: https://svnweb.freebsd.org/changeset/base/336858
Log:
MFC r335631:
Always initialize the ignore local variable.
PR: 229235
Modified:
stable/11/sys/dev/vt/hw/vga/vt_vga.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/vt/hw/vga/vt_vga.c
==
--- stable/11/sys/dev/vt/hw/vga/vt_vga.cSun Jul 29 03:20:05 2018
(r336857)
+++ stable/11/sys/dev/vt/hw/vga/vt_vga.cSun Jul 29 05:14:26 2018
(r336858)
@@ -1213,6 +1213,7 @@ vga_acpi_disabled(void)
uint16_t flags;
int ignore;
+ ignore = 0;
TUNABLE_INT_FETCH("hw.vga.acpi_ignore_no_vga", );
if (ignore)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336805 - in stable/11: share/man/man4 sys/dev/vt/hw/vga
On Sat, 28 Jul 2018 at 16:34, Konstantin Belousov wrote:
>
> On Sat, Jul 28, 2018 at 07:37:01AM +, Eitan Adler wrote:
> > Author: eadler
> > Date: Sat Jul 28 07:37:01 2018
> > New Revision: 336805
> > URL: https://svnweb.freebsd.org/changeset/base/336805
> >
> > Log:
> > MFC r335629:
> >
> > vt: add option to ignore NO_VGA flag in ACPI
> >
> > To workaround buggy firmware that sets this flag when there's actually
> > a VGA present.
> >
> > Ref D16003
> > PR: 229235
> >
> > Modified:
> > stable/11/share/man/man4/vt.4
> > stable/11/sys/dev/vt/hw/vga/vt_vga.c
> > Directory Properties:
> > stable/11/ (props changed)
> >
> > Modified: stable/11/share/man/man4/vt.4
> > ==
> > --- stable/11/share/man/man4/vt.4 Sat Jul 28 06:46:10 2018
> > (r336804)
> > +++ stable/11/share/man/man4/vt.4 Sat Jul 28 07:37:01 2018
> > (r336805)
> > @@ -44,6 +44,7 @@
> > In
> > .Xr loader.conf 5 :
> > .Cd hw.vga.textmode=1
> > +.Cd hw.vga.acpi_ignore_no_vga=1
> > .Cd kern.vty=vt
> > .Cd kern.vt.color..rgb=""
> > .Cd kern.vt.fb.default_mode="x"
> > @@ -196,6 +197,10 @@ prompt or in
> > Set to 1 to use virtual terminals in text mode instead of graphics mode.
> > Features that require graphics mode, like loadable fonts, will be
> > disabled.
> > +.It Va hw.vga.acpi_ignore_no_vga
> > +Set to 1 to force the usage of the VGA driver regardless of whether
> > +ACPI IAPC_BOOT_ARCH signals no VGA support.
> > +Can be used to workaround firmware bugs in the ACPI tables.
> > .It Va kern.vty
> > Set this value to
> > .Ql vt
> >
> > Modified: stable/11/sys/dev/vt/hw/vga/vt_vga.c
> > ==
> > --- stable/11/sys/dev/vt/hw/vga/vt_vga.c Sat Jul 28 06:46:10 2018
> > (r336804)
> > +++ stable/11/sys/dev/vt/hw/vga/vt_vga.c Sat Jul 28 07:37:01 2018
> > (r336805)
> > @@ -1211,6 +1211,12 @@ vga_acpi_disabled(void)
> > ACPI_TABLE_FADT *fadt;
> > vm_paddr_t physaddr;
> > uint16_t flags;
> > + int ignore;
> > +
> > + TUNABLE_INT_FETCH("hw.vga.acpi_ignore_no_vga", );
> > +
> > + if (ignore)
> > + return (false);
> If the tunable is not set, this code evaluates the stack garbage.
> Why did you merged this without asking the author and not looking
> at the followups ?
Please assume some level of good faith.
I MFCed this because I was asked to here
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=229235 over a month
ago. During that time no one mentioned or linked any followups. I did
look in my email for mentions of r335629 as well - of which there are
none.
Now that you mention it, I looked at the svn log and found r335631
which I will MFC as well.
--
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336857 - head/sbin/init/rc.d
Author: brd
Date: Sun Jul 29 03:20:05 2018
New Revision: 336857
URL: https://svnweb.freebsd.org/changeset/base/336857
Log:
Fix a typo that prevented some rc scripts from being installed.
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16495
Modified:
head/sbin/init/rc.d/Makefile
Modified: head/sbin/init/rc.d/Makefile
==
--- head/sbin/init/rc.d/MakefileSun Jul 29 01:44:26 2018
(r336856)
+++ head/sbin/init/rc.d/MakefileSun Jul 29 03:20:05 2018
(r336857)
@@ -3,7 +3,7 @@
.include
CONFSDIR= /etc/rc.d
-CONFSGROUPS= CONFS
+CONFGROUPS=CONFS
CONFS= DAEMON \
FILESYSTEMS \
@@ -130,13 +130,13 @@ CONFS+= ypbind \
.endif
.if ${MK_ACCT} != "no"
-CONFSGROUPS+= ACCT
+CONFGROUPS+= ACCT
ACCT+= accounting
ACCTPACKAGE= acct
.endif
.if ${MK_ACPI} != "no"
-CONFSGROUPS+= ACPI
+CONFGROUPS+= ACPI
ACPI= power_profile
ACPIPACKAGE= acpi
.endif
@@ -146,13 +146,13 @@ CONFS+= powerd
.endif
.if ${MK_AMD} != "no"
-CONFSGROUPS+= AMD
+CONFGROUPS+= AMD
AMD+= amd
AMDPACKAGE=amd
.endif
.if ${MK_APM} != "no"
-CONFSGROUPS+= APM
+CONFGROUPS+= APM
APM+= apm
.if ${MACHINE} == "i386"
APM+= apmd
@@ -184,7 +184,7 @@ CONFS+= bootparams
.endif
.if ${MK_BSNMP} != "no"
-CONFSGROUPS+= BSNMP
+CONFGROUPS+= BSNMP
BSNMP+=bsnmpd
BSNMPPACKAGE= bsnmp
.endif
@@ -198,7 +198,7 @@ CONFS+= ftpd
.endif
.if ${MK_HAST} != "no"
-CONFSGROUPS+= HAST
+CONFGROUPS+= HAST
HAST= hastd
HASTPACKAGE= hast
.endif
@@ -220,7 +220,7 @@ CONFS+= iscsid
.endif
.if ${MK_JAIL} != "no"
-CONFSGROUPS+= JAIL
+CONFGROUPS+= JAIL
JAIL+= jail
JAILPACKAGE= jail
.endif
@@ -268,7 +268,7 @@ CONFS+= keyserv
.endif
.if ${MK_OPENSSH} != "no"
-CONFSGROUPS+= SSH
+CONFGROUPS+= SSH
SSH= sshd
SSHPACKAGE=ssh
.endif
@@ -282,7 +282,7 @@ CONFS+= routed
.endif
.if ${MK_SENDMAIL} != "no"
-CONFSGROUPS+= SMRCD
+CONFGROUPS+= SMRCD
SMRCD= sendmail
SMRCDPACKAGE= sendmail
.endif
@@ -292,7 +292,7 @@ CONFS+= timed
.endif
.if ${MK_UNBOUND} != "no"
-CONFSGROUPS+= UNBOUND
+CONFGROUPS+= UNBOUND
UNBOUND+= local_unbound
UNBOUNDPACKAGE=unbound
.endif
@@ -302,7 +302,7 @@ _utx= utx
.endif
.if ${MK_VI} != "no"
-CONFSGROUPS+= VI
+CONFGROUPS+= VI
VI+= virecover
VIPACKAGE= vi
.endif
@@ -313,7 +313,7 @@ CONFS+= wpa_supplicant
.endif
.if ${MK_ZFS} != "no"
-CONFSGROUPS+= ZFS
+CONFGROUPS+= ZFS
ZFS+= zfs
ZFS+= zfsbe
ZFS+= zfsd
@@ -324,7 +324,7 @@ ETC_ZFS=/etc/zfs
ETC_ZFSPACKAGE=zfs
.endif
-.for fg in ${CONFSGROUPS}
+.for fg in ${CONFGROUPS}
${fg}MODE?=${BINMODE}
.endfor
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336856 - head/tools/build
Author: will
Date: Sun Jul 29 01:44:26 2018
New Revision: 336856
URL: https://svnweb.freebsd.org/changeset/base/336856
Log:
beinstall: perform pre-installworld steps.
Since all post-installkernel steps are assumed to operate in the updated
installation, it's necessary to chroot all of the followup steps in the new
boot environment. Set up and mount the source and object directories at the
same paths inside the BE root, and clean up to the extent changes were made.
This commit fixes upgrading using beinstall past the new ntpd user change.
Improve testability of changes to this script while I'm here.
Reported by: rpokala (earlier patch)
Modified:
head/tools/build/beinstall.sh
Modified: head/tools/build/beinstall.sh
==
--- head/tools/build/beinstall.sh Sun Jul 29 00:30:06 2018
(r336855)
+++ head/tools/build/beinstall.sh Sun Jul 29 01:44:26 2018
(r336856)
@@ -78,26 +78,92 @@ rmdir_be() {
rm -rf ${BE_MNTPT}
}
+unmount_be() {
+ mount | grep " on ${BE_MNTPT}" | awk '{print $3}' | sort -r | xargs -t
umount -f
+}
+
cleanup_be() {
+ # Before destroying, unmount any child filesystems that may have
+ # been mounted under the boot environment. Sort them in reverse
+ # order so children are unmounted first.
+ unmount_be
+ # Finally, clean up any directories that were created by the
+ # operation, via cleanup_be_dirs().
+ if [ -n "${created_be_dirs}" ]; then
+ chroot ${BE_MNTPT} /bin/rm -rf ${created_be_dirs}
+ fi
beadm destroy -F ${BENAME}
}
+create_be_dirs() {
+ echo "${BE_MNTPT}: Inspecting dirs $*"
+ for dir in $*; do
+ curdir="$dir"
+ topdir="$dir"
+ while :; do
+ [ -e "${BE_MNTPT}${curdir}" ] && break
+ topdir=$curdir
+ curdir=$(dirname ${curdir})
+ done
+ [ "$curdir" = "$dir" ] && continue
+
+ # Add the top-most nonexistent directory to the list, then
+ # mkdir -p the innermost directory specified by the argument.
+ # This way the least number of directories are rm'd directly.
+ created_be_dirs="${topdir} ${created_be_dirs}"
+ echo "${BE_MNTPT}: Created ${dir}"
+ mkdir -p ${BE_MNTPT}${dir} || return $?
+ done
+ return 0
+}
+
+update_mergemaster_pre() {
+ mergemaster -p -m ${srcdir} -D ${BE_MNTPT} -t ${BE_MM_ROOT}
${MERGEMASTER_FLAGS}
+}
+
update_mergemaster() {
- mergemaster -m $(pwd) -D ${BE_MNTPT} -t ${BE_MM_ROOT}
${MERGEMASTER_FLAGS}
+ chroot ${BE_MNTPT} \
+ mergemaster -m ${srcdir} -t ${BE_MM_ROOT} ${MERGEMASTER_FLAGS}
}
+update_etcupdate_pre() {
+ etcupdate -p -s ${srcdir} -D ${BE_MNTPT} ${ETCUPDATE_FLAGS} || return $?
+ etcupdate resolve -D ${BE_MNTPT} || return $?
+}
+
update_etcupdate() {
- etcupdate -s $(pwd) -D ${BE_MNTPT} ${ETCUPDATE_FLAGS} || return $?
- etcupdate resolve -D ${BE_MNTPT}
+ chroot ${BE_MNTPT} \
+ etcupdate -s ${srcdir} ${ETCUPDATE_FLAGS} || return $?
+ chroot ${BE_MNTPT} etcupdate resolve
}
+# Special command-line subcommand that can be used to do a full cleanup
+# after a manual post-mortem has been completed.
+postmortem() {
+ [ -n "${BENAME}" ] || errx "Must specify BENAME"
+ [ -n "${BE_MNTPT}" ] || errx "Must specify BE_MNTPT"
+ echo "Performing post-mortem on BE ${BENAME} at ${BE_MNTPT} ..."
+ unmount_be
+ rmdir_be
+ echo "Post-mortem cleanup complete."
+ echo "To destroy the BE (recommended), run: beadm destroy ${BENAME}"
+ echo "To instead continue with the BE, run: beadm activate ${BENAME}"
+}
+
+if [ -n "$BEINSTALL_CMD" ]; then
+ ${BEINSTALL_CMD} $*
+ exit $?
+fi
+
+
cleanup_commands=""
trap 'errx "Interrupt caught"' HUP INT TERM
[ "$(whoami)" != "root" ] && errx "Must be run as root"
[ ! -f "Makefile.inc1" ] && errx "Must be in FreeBSD source tree"
+srcdir=$(pwd)
objdir=$(make -V .OBJDIR 2>/dev/null)
[ ! -d "${objdir}" ] && errx "Must have built FreeBSD from source tree"
@@ -139,11 +205,24 @@ beadm mount ${BENAME} ${BE_TMP}/mnt || errx "Unable to
echo "Mounted ${BENAME} to ${BE_MNTPT}, performing install/update ..."
make "$@" DESTDIR=${BE_MNTPT} installkernel || errx "Installkernel failed!"
-make "$@" DESTDIR=${BE_MNTPT} installworld || errx "Installworld failed!"
+if [ -n "${CONFIG_UPDATER}" ]; then
+ "update_${CONFIG_UPDATER}_pre"
+ [ $? -ne 0 ] && errx "${CONFIG_UPDATER} (pre-world) failed!"
+fi
+# Mount the source and object tree within the BE in order to account for any
+# changes applied by the pre-installworld updater. Cleanup any directories
+# created if they didn't exist previously.
+create_be_dirs "${srcdir}" "${objdir}"
Re: svn commit: r336757 - in head: share/man/man4 share/man/man7 share/misc sys/dev/firewire sys/dev/hwpmc sys/dev/sk sys/dev/sound/pci sys/dev/sound/pcm sys/fs/nfsclient
> > This may intersect badly with our current policy of not shipping any CAs in > > base. > > I objected to the conversion of http -> https in base when it started. I saw > no good reason for it, and for the very reason you site, https is totally > useless in base until you have installed CA's. The inclusion of public CAs is a source of active debate by core@. In advance of a final decision on that subject, we want to get ahead of some of this discussion. The FreeBSD Project's place on the interwebs is secured via HTTPS (with limited exception). Referring to material hosted by the Project using HTTPS is sound best practice that help us collectively improve our security posture. The links where the scheme was changed from http to https are all in documentation or comments, and are NOT used at runtime by developers, operators, or any meaningful automation (i.e. this isn't something pkg(1) or fetch(1) uses). While this process of updating http links to https does cause a bit of necessary churn, updating http links in documentation and comments is a reasonable activity that help us keep the project current with modern standards. Maintenance activities that enhance our trust with the community is not glamorous and comes in the form of many similar incremental improvements. Like many things in technology, the definition of what's relevant, competitive, and modern changes over time (including hardware, protocols, performance primitives, developer productivity, and security best practices). Moving to HTTPS for non-runtime links is a sensible example of an incremental improvement that should not be considered avant-garde in this day and age. Regardless of the outcome of core@'s decision to include and maintain public CAs in base (or change a default in the installer to install a port), modernizing docs or other maintenance activities that improve our security posture is a +1 activity from core@'s perspective. -sc (on behalf of core@) -- Sean Chittenden signature.asc Description: PGP signature
Re: svn commit: r336526 - head
Hi Ravi,
Thanks for taking an initial stab, I applied your patch and quickly
realized the problem is deeper than it looks. This is because installworld
and the second stage of mergemaster/etcupdate require the "pre" phase to
take effect in their view of the system (specifically, the "ntpd" user must
exist from their /etc/passwd, etc). For traditional upgrades, this occurs
by simply rebooting.
I've committed a revised version of your original patch, and have upgraded
across this barrier using beinstall. Please give it a try and let me know
how it goes.
Thanks!
--Will.
On Wed, Jul 25, 2018 at 11:28 PM, Ravi Pokala wrote:
> -Original Message-
> From: Ravi Pokala
> Date: 2018-07-20, Friday at 10:53
> To: Ian Lepore , , <
> svn-src-all@freebsd.org>, , Will Andrews
>
> Subject: Re: svn commit: r336526 - head
>
> > -Original Message-
> > From: on behalf of Ian Lepore <
> i...@freebsd.org>
> > Date: 2018-07-20, Friday at 10:38
> > To: Ravi Pokala , , <
> svn-src-all@freebsd.org>,
> > Subject: Re: svn commit: r336526 - head
> >
> >> On Fri, 2018-07-20 at 09:56 -0700, Ravi Pokala wrote:
> >>> Hi Ian,
> >>>
> >>> -Original Message-
> >>> From: on behalf of Ian Lepore
> >>> Date: 2018-07-19, Thursday at 17:44
> >>> To: , ,
> >>> Subject: svn commit: r336526 - head
> >>>
>
> Author: ian
> Date: Fri Jul 20 00:44:04 2018
> New Revision: 336526
> URL: https://svnweb.freebsd.org/changeset/base/336526
>
> Log:
> Add ntpd to the list of users/groups to check before installing.
>
> Modified:
> head/Makefile.inc1
> >>> When trying to installworld:
> >>>
> >>> ERROR: Required ntpd user is missing, see /usr/src/UPDATING.
> >>>
> >>> But there is no UPDATING entry about this. (Also, shouldn't it be
> ${SRCTOP}/UPDATING?)
> >>>
> >>> Thanks,
> >>>
> >>> Ravi (rpokala@)
> >>
> >> I wondered about that too, when I accidentally stumbled across the
> >> CHECK_UIDS thing and realized I should add ntpd to it. I searched in
> >> UPDATING for some of the other things in the CHECK_UIDS list to see
> >> what had been said about such changes in the past, even searching
> >> through old-old svn history, and found nothing.
> >>
> >> I finally settled on the thought that the reference to UPDATING was to
> >> the stuff at the bottom that never changes. In particular to the
> >> section around line 1595 that documents the instalkernel, reboot,
> >> mergemaster, installworld sequence. The mergemaster part should take
> >> care of the new userid, I guess.
> >>
> >> -- Ian
> >
> > Interesting. I was attempting the install via the `beinstall.sh' script.
> CCing will@, since he wrote it.
> >
> > Thanks,
> >
> > Ravi (rpokala@)
>
> After some discussion on IRC, I created this patch to fix `beinstall.sh'.
>
> https://people.freebsd.org/~rpokala/beinstall.patch
>
> However, I'm a bit afraid of testing it, until someone who actually knows
> `etcupdate' and `mergemaster' can confirm that it won't blow up my box. :-)
>
> Can anyone take a look and assuage my fears?
>
> Thanks,
>
> Ravi (rpokala@)
>
>
>
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336855 - head/sys/kern
Author: truckman
Date: Sun Jul 29 00:30:06 2018
New Revision: 336855
URL: https://svnweb.freebsd.org/changeset/base/336855
Log:
Fix the long term ULE load balancer so that it actually works. The
initial call to sched_balance() during startup is meant to initialize
balance_ticks, but does not actually do that since smp_started is
still zero at that time. Since balance_ticks does not get set,
there are no further calls to sched_balance(). Fix this by setting
balance_ticks in sched_initticks() since we know the value of
balance_interval at that time, and eliminate the useless startup
call to sched_balance(). We don't need to randomize the intial
value of balance_ticks.
Since there is now only one call to sched_balance(), we can hoist
the tests at the top of this function out to the caller and avoid
the overhead of the function call when running a SMP kernel on UP
hardware.
PR: 223914
Reviewed by: kib
MFC after:2 weeks
Modified:
head/sys/kern/sched_ule.c
Modified: head/sys/kern/sched_ule.c
==
--- head/sys/kern/sched_ule.c Sun Jul 29 00:12:16 2018(r336854)
+++ head/sys/kern/sched_ule.c Sun Jul 29 00:30:06 2018(r336855)
@@ -884,9 +884,6 @@ sched_balance(void)
{
struct tdq *tdq;
- if (smp_started == 0 || rebalance == 0)
- return;
-
balance_ticks = max(balance_interval / 2, 1) +
(sched_random() % balance_interval);
tdq = TDQ_SELF();
@@ -1413,7 +1410,6 @@ sched_setup_smp(void)
panic("Can't find cpu group for %d\n", i);
}
balance_tdq = TDQ_SELF();
- sched_balance();
}
#endif
@@ -1474,6 +1470,7 @@ sched_initticks(void *dummy)
* what realstathz is.
*/
balance_interval = realstathz;
+ balance_ticks = balance_interval;
affinity = SCHED_AFFINITY_DEFAULT;
#endif
if (sched_idlespinthresh < 0)
@@ -2382,7 +2379,7 @@ sched_clock(struct thread *td)
/*
* We run the long term load balancer infrequently on the first cpu.
*/
- if (balance_tdq == tdq) {
+ if (balance_tdq == tdq && smp_started != 0 && rebalance != 0) {
if (balance_ticks && --balance_ticks == 0)
sched_balance();
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336854 - in head: contrib/libarchive/cat contrib/libarchive/cpio contrib/libarchive/libarchive contrib/libarchive/libarchive/test contrib/libarchive/tar contrib/libarchive/tar/test con...
Author: mm
Date: Sun Jul 29 00:12:16 2018
New Revision: 336854
URL: https://svnweb.freebsd.org/changeset/base/336854
Log:
MFV r336851:
Update vendor/libarchive/dist to git 2c8c83b9731ff822fad6cc8c670ea5519c366a14
Important vendor changes:
PR #993: Chdir to -C directory for metalog processing
OSS-Fuzz #4969: Check size of the extended time field in zip archives
PR #973: Record informational compression level in gzip header
MFC after:1 week
Added:
head/contrib/libarchive/tar/test/test_option_C_mtree.c
- copied unchanged from r336851,
vendor/libarchive/dist/tar/test/test_option_C_mtree.c
Modified:
head/contrib/libarchive/cat/bsdcat.c
head/contrib/libarchive/cpio/cpio.c
head/contrib/libarchive/libarchive/archive_entry.c
head/contrib/libarchive/libarchive/archive_entry.h
head/contrib/libarchive/libarchive/archive_openssl_hmac_private.h
head/contrib/libarchive/libarchive/archive_read.c
head/contrib/libarchive/libarchive/archive_read_support_format_mtree.c
head/contrib/libarchive/libarchive/archive_read_support_format_zip.c
head/contrib/libarchive/libarchive/archive_virtual.c
head/contrib/libarchive/libarchive/archive_write_add_filter_gzip.c
head/contrib/libarchive/libarchive/archive_write_set_format_ar.c
head/contrib/libarchive/libarchive/test/test_sparse_basic.c
head/contrib/libarchive/libarchive/test/test_write_filter_gzip.c
head/contrib/libarchive/libarchive/test/test_write_filter_zstd.c
head/contrib/libarchive/tar/bsdtar.c
head/contrib/libarchive/tar/test/test_option_fflags.c
head/contrib/libarchive/tar/write.c
head/contrib/libarchive/test_utils/test_main.c
head/usr.bin/tar/tests/Makefile
Directory Properties:
head/contrib/libarchive/ (props changed)
Modified: head/contrib/libarchive/cat/bsdcat.c
==
--- head/contrib/libarchive/cat/bsdcat.cSat Jul 28 23:59:36 2018
(r336853)
+++ head/contrib/libarchive/cat/bsdcat.cSun Jul 29 00:12:16 2018
(r336854)
@@ -61,7 +61,7 @@ usage(FILE *stream, int eval)
static void
version(void)
{
- printf("bsdcat %s - %s\n",
+ printf("bsdcat %s - %s \n",
BSDCAT_VERSION_STRING,
archive_version_details());
exit(0);
Modified: head/contrib/libarchive/cpio/cpio.c
==
--- head/contrib/libarchive/cpio/cpio.c Sat Jul 28 23:59:36 2018
(r336853)
+++ head/contrib/libarchive/cpio/cpio.c Sun Jul 29 00:12:16 2018
(r336854)
@@ -499,7 +499,7 @@ long_help(void)
static void
version(void)
{
- fprintf(stdout,"bsdcpio %s - %s\n",
+ fprintf(stdout,"bsdcpio %s - %s \n",
BSDCPIO_VERSION_STRING,
archive_version_details());
exit(0);
Modified: head/contrib/libarchive/libarchive/archive_entry.c
==
--- head/contrib/libarchive/libarchive/archive_entry.c Sat Jul 28 23:59:36
2018(r336853)
+++ head/contrib/libarchive/libarchive/archive_entry.c Sun Jul 29 00:12:16
2018(r336854)
@@ -1491,7 +1491,7 @@ archive_entry_acl_next(struct archive_entry *entry, in
* the style of the generated ACL.
*/
wchar_t *
-archive_entry_acl_to_text_w(struct archive_entry *entry, ssize_t *len,
+archive_entry_acl_to_text_w(struct archive_entry *entry, la_ssize_t *len,
int flags)
{
return (archive_acl_to_text_w(>acl, len, flags,
@@ -1499,7 +1499,7 @@ archive_entry_acl_to_text_w(struct archive_entry *entr
}
char *
-archive_entry_acl_to_text(struct archive_entry *entry, ssize_t *len,
+archive_entry_acl_to_text(struct archive_entry *entry, la_ssize_t *len,
int flags)
{
return (archive_acl_to_text_l(>acl, len, flags, NULL));
Modified: head/contrib/libarchive/libarchive/archive_entry.h
==
--- head/contrib/libarchive/libarchive/archive_entry.h Sat Jul 28 23:59:36
2018(r336853)
+++ head/contrib/libarchive/libarchive/archive_entry.h Sun Jul 29 00:12:16
2018(r336854)
@@ -42,6 +42,7 @@
#include
#include /* for wchar_t */
+#include
#include
#if defined(_WIN32) && !defined(__CYGWIN__)
Modified: head/contrib/libarchive/libarchive/archive_openssl_hmac_private.h
==
--- head/contrib/libarchive/libarchive/archive_openssl_hmac_private.h Sat Jul
28 23:59:36 2018(r336853)
+++ head/contrib/libarchive/libarchive/archive_openssl_hmac_private.h Sun Jul
29 00:12:16 2018(r336854)
@@ -28,7 +28,8 @@
#include
#include
-#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x1010L || \
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER <
0x2070L)
#include /* malloc, free */
svn commit: r336853 - head/usr.sbin/wpa/wpa_supplicant
Author: cem Date: Sat Jul 28 23:59:36 2018 New Revision: 336853 URL: https://svnweb.freebsd.org/changeset/base/336853 Log: wpa_supplicant.8: Remove removed option Our base version of wpa_supplicant does not support the -u option, so remove it. PR: 230102 Submitted by: D Green Modified: head/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 Modified: head/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 == --- head/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 Sat Jul 28 23:55:18 2018(r336852) +++ head/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 Sat Jul 28 23:59:36 2018(r336853) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 7, 2012 +.Dd July 28, 2018 .Dt WPA_SUPPLICANT 8 .Os .Sh NAME @@ -144,8 +144,6 @@ Send log messages through instead of to the terminal. .It Fl t Include timestamp in debug messages. -.It Fl u -Enable DBus control interface. .It Fl v Display version information on the terminal and exit. .It Fl W ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336852 - head/lib/libc/gen
Author: cem Date: Sat Jul 28 23:55:18 2018 New Revision: 336852 URL: https://svnweb.freebsd.org/changeset/base/336852 Log: exec.3: Add BUGS section and document non-FreeBSD portability Requested by: kib (in part) Modified: head/lib/libc/gen/exec.3 Modified: head/lib/libc/gen/exec.3 == --- head/lib/libc/gen/exec.3Sat Jul 28 23:47:22 2018(r336851) +++ head/lib/libc/gen/exec.3Sat Jul 28 23:55:18 2018(r336852) @@ -314,3 +314,55 @@ The .Fn execvP function first appeared in .Fx 5.2 . +.Sh BUGS +The type of the +.Fa argv +and +.Fa envp +parameters to +.Fn execle , +.Fn exect , +.Fn execv , +.Fn execvp , +and +.Fn execvP +is a historical accident and no sane implementation should modify the provided +strings. +The bogus parameter types trigger false positives from +.Li const +correctness analyzers. +On +.Fx , +the +.Fn __DECONST +macro may be used to work around this limitation. +.Pp +Due to a fluke of the C standard, on platforms other than +.Fx +the definition of +.Dv NULL +may be the untyped number zero, rather than a +.Ad (void *)0 +expression. +To distinguish the concepts, they are referred to as a +.Dq null pointer constant +and a +.Dq null pointer , +respectively. +On exotic computer architectures that +.Fx +does not support, the null pointer constant and null pointer may have a +different representation. +In general, where this document and others reference a +.Dv NULL +value, they actually imply a null pointer. +E.g., for portability to non-FreeBSD operating systems on exotic computer +architectures, one may use +.Li (char *)NULL +in place of +.Dv NULL +when invoking +.Fn execl , +.Fn execle , +and +.Fn execlp . ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336851 - in vendor/libarchive/dist: . cat cpio libarchive libarchive/test tar tar/test test_utils
Author: mm
Date: Sat Jul 28 23:47:22 2018
New Revision: 336851
URL: https://svnweb.freebsd.org/changeset/base/336851
Log:
Update vendor/libarchive/dist to git 2c8c83b9731ff822fad6cc8c670ea5519c366a14
Important vendor changes:
PR #993: Chdir to -C directory for metalog processing
OSS-Fuzz #4969: Check size of the extended time field in zip archives
PR #973: Record informational compression level in gzip header
Added:
vendor/libarchive/dist/tar/test/test_option_C_mtree.c (contents, props
changed)
Modified:
vendor/libarchive/dist/.travis.yml
vendor/libarchive/dist/CMakeLists.txt
vendor/libarchive/dist/Makefile.am
vendor/libarchive/dist/cat/bsdcat.c
vendor/libarchive/dist/cpio/cpio.c
vendor/libarchive/dist/libarchive/archive_entry.c
vendor/libarchive/dist/libarchive/archive_entry.h
vendor/libarchive/dist/libarchive/archive_openssl_hmac_private.h
vendor/libarchive/dist/libarchive/archive_read.c
vendor/libarchive/dist/libarchive/archive_read_disk_windows.c
vendor/libarchive/dist/libarchive/archive_read_support_format_mtree.c
vendor/libarchive/dist/libarchive/archive_read_support_format_zip.c
vendor/libarchive/dist/libarchive/archive_virtual.c
vendor/libarchive/dist/libarchive/archive_write_add_filter_gzip.c
vendor/libarchive/dist/libarchive/archive_write_disk_windows.c
vendor/libarchive/dist/libarchive/archive_write_set_format_ar.c
vendor/libarchive/dist/libarchive/test/test_sparse_basic.c
vendor/libarchive/dist/libarchive/test/test_write_filter_gzip.c
vendor/libarchive/dist/libarchive/test/test_write_filter_zstd.c
vendor/libarchive/dist/tar/bsdtar.c
vendor/libarchive/dist/tar/test/CMakeLists.txt
vendor/libarchive/dist/tar/test/test_option_fflags.c
vendor/libarchive/dist/tar/write.c
vendor/libarchive/dist/test_utils/test_main.c
Modified: vendor/libarchive/dist/.travis.yml
==
--- vendor/libarchive/dist/.travis.yml Sat Jul 28 23:29:36 2018
(r336850)
+++ vendor/libarchive/dist/.travis.yml Sat Jul 28 23:47:22 2018
(r336851)
@@ -25,6 +25,6 @@ matrix:
before_install:
- if [ `uname` = "Darwin" ]; then brew update; fi
install:
- - if [ `uname` = "Darwin" ]; then brew install xz lzop lz4 zstd; fi
+ - if [ `uname` = "Darwin" ]; then brew install xz lz4 zstd; fi
script:
- build/ci_build.sh
Modified: vendor/libarchive/dist/CMakeLists.txt
==
--- vendor/libarchive/dist/CMakeLists.txt Sat Jul 28 23:29:36 2018
(r336850)
+++ vendor/libarchive/dist/CMakeLists.txt Sat Jul 28 23:47:22 2018
(r336851)
@@ -493,7 +493,7 @@ IF(ENABLE_LZO)
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZO2 DEFAULT_MSG LZO2_LIBRARY
LZO2_INCLUDE_DIR)
ELSE(ENABLE_LZO)
- SET(LIBZMA_FOUND FALSE) # Override cached value
+ SET(LZO2_FOUND FALSE) # Override cached value
ENDIF(ENABLE_LZO)
IF(LZO2_FOUND)
SET(HAVE_LIBLZO2 1)
Modified: vendor/libarchive/dist/Makefile.am
==
--- vendor/libarchive/dist/Makefile.am Sat Jul 28 23:29:36 2018
(r336850)
+++ vendor/libarchive/dist/Makefile.am Sat Jul 28 23:47:22 2018
(r336851)
@@ -972,6 +972,7 @@ bsdtar_test_SOURCES= \
tar/test/test_help.c \
tar/test/test_leading_slash.c \
tar/test/test_missing_file.c \
+ tar/test/test_option_C_mtree.c \
tar/test/test_option_C_upper.c \
tar/test/test_option_H_upper.c \
tar/test/test_option_L_upper.c \
Modified: vendor/libarchive/dist/cat/bsdcat.c
==
--- vendor/libarchive/dist/cat/bsdcat.c Sat Jul 28 23:29:36 2018
(r336850)
+++ vendor/libarchive/dist/cat/bsdcat.c Sat Jul 28 23:47:22 2018
(r336851)
@@ -61,7 +61,7 @@ usage(FILE *stream, int eval)
static void
version(void)
{
- printf("bsdcat %s - %s\n",
+ printf("bsdcat %s - %s \n",
BSDCAT_VERSION_STRING,
archive_version_details());
exit(0);
Modified: vendor/libarchive/dist/cpio/cpio.c
==
--- vendor/libarchive/dist/cpio/cpio.c Sat Jul 28 23:29:36 2018
(r336850)
+++ vendor/libarchive/dist/cpio/cpio.c Sat Jul 28 23:47:22 2018
(r336851)
@@ -499,7 +499,7 @@ long_help(void)
static void
version(void)
{
- fprintf(stdout,"bsdcpio %s - %s\n",
+ fprintf(stdout,"bsdcpio %s - %s \n",
BSDCPIO_VERSION_STRING,
archive_version_details());
exit(0);
Modified: vendor/libarchive/dist/libarchive/archive_entry.c
==
--- vendor/libarchive/dist/libarchive/archive_entry.c Sat Jul 28 23:29:36
2018(r336850)
+++
Re: svn commit: r336805 - in stable/11: share/man/man4 sys/dev/vt/hw/vga
On Sat, Jul 28, 2018 at 07:37:01AM +, Eitan Adler wrote:
> Author: eadler
> Date: Sat Jul 28 07:37:01 2018
> New Revision: 336805
> URL: https://svnweb.freebsd.org/changeset/base/336805
>
> Log:
> MFC r335629:
>
> vt: add option to ignore NO_VGA flag in ACPI
>
> To workaround buggy firmware that sets this flag when there's actually
> a VGA present.
>
> Ref D16003
> PR: 229235
>
> Modified:
> stable/11/share/man/man4/vt.4
> stable/11/sys/dev/vt/hw/vga/vt_vga.c
> Directory Properties:
> stable/11/ (props changed)
>
> Modified: stable/11/share/man/man4/vt.4
> ==
> --- stable/11/share/man/man4/vt.4 Sat Jul 28 06:46:10 2018
> (r336804)
> +++ stable/11/share/man/man4/vt.4 Sat Jul 28 07:37:01 2018
> (r336805)
> @@ -44,6 +44,7 @@
> In
> .Xr loader.conf 5 :
> .Cd hw.vga.textmode=1
> +.Cd hw.vga.acpi_ignore_no_vga=1
> .Cd kern.vty=vt
> .Cd kern.vt.color..rgb=""
> .Cd kern.vt.fb.default_mode="x"
> @@ -196,6 +197,10 @@ prompt or in
> Set to 1 to use virtual terminals in text mode instead of graphics mode.
> Features that require graphics mode, like loadable fonts, will be
> disabled.
> +.It Va hw.vga.acpi_ignore_no_vga
> +Set to 1 to force the usage of the VGA driver regardless of whether
> +ACPI IAPC_BOOT_ARCH signals no VGA support.
> +Can be used to workaround firmware bugs in the ACPI tables.
> .It Va kern.vty
> Set this value to
> .Ql vt
>
> Modified: stable/11/sys/dev/vt/hw/vga/vt_vga.c
> ==
> --- stable/11/sys/dev/vt/hw/vga/vt_vga.c Sat Jul 28 06:46:10 2018
> (r336804)
> +++ stable/11/sys/dev/vt/hw/vga/vt_vga.c Sat Jul 28 07:37:01 2018
> (r336805)
> @@ -1211,6 +1211,12 @@ vga_acpi_disabled(void)
> ACPI_TABLE_FADT *fadt;
> vm_paddr_t physaddr;
> uint16_t flags;
> + int ignore;
> +
> + TUNABLE_INT_FETCH("hw.vga.acpi_ignore_no_vga", );
> +
> + if (ignore)
> + return (false);
If the tunable is not set, this code evaluates the stack garbage.
Why did you merged this without asking the author and not looking
at the followups ?
>
> physaddr = acpi_find_table(ACPI_SIG_FADT);
> if (physaddr == 0)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336850 - in head: etc usr.sbin/nscd
Author: brd
Date: Sat Jul 28 23:29:36 2018
New Revision: 336850
URL: https://svnweb.freebsd.org/changeset/base/336850
Log:
Move nscd.conf from etc/ to usr.sbin/nscd/
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16490
Added:
head/usr.sbin/nscd/nscd.conf
- copied unchanged from r336849, head/etc/nscd.conf
Deleted:
head/etc/nscd.conf
Modified:
head/etc/Makefile
head/usr.sbin/nscd/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sat Jul 28 23:02:10 2018(r336849)
+++ head/etc/Makefile Sat Jul 28 23:29:36 2018(r336850)
@@ -115,10 +115,6 @@ SSH= ${SRCTOP}/crypto/openssh/ssh_config \
SSL= ${SRCTOP}/crypto/openssl/apps/openssl.cnf
.endif
-.if ${MK_NS_CACHING} != "no"
-BIN1+= nscd.conf
-.endif
-
.if ${MK_PORTSNAP} != "no"
BIN1+= portsnap.conf
.endif
Modified: head/usr.sbin/nscd/Makefile
==
--- head/usr.sbin/nscd/Makefile Sat Jul 28 23:02:10 2018(r336849)
+++ head/usr.sbin/nscd/Makefile Sat Jul 28 23:29:36 2018(r336850)
@@ -1,5 +1,6 @@
# $FreeBSD$
+CONFS= nscd.conf
PROG= nscd
MAN= nscd.conf.5 nscd.8
Copied: head/usr.sbin/nscd/nscd.conf (from r336849, head/etc/nscd.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/nscd/nscd.confSat Jul 28 23:29:36 2018
(r336850, copy of r336849, head/etc/nscd.conf)
@@ -0,0 +1,12 @@
+#
+# Default caching daemon configuration file
+# $FreeBSD$
+#
+
+enable-cache passwd yes
+enable-cache group yes
+enable-cache hosts yes
+enable-cache services yes
+enable-cache protocols yes
+enable-cache rpc yes
+enable-cache networks yes
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336849 - head/sbin/init
Author: brd Date: Sat Jul 28 23:02:10 2018 New Revision: 336849 URL: https://svnweb.freebsd.org/changeset/base/336849 Log: Switch these to CONFS as well so they work with etcupdate/mergemaster. Approved by: will (mentor) Modified: head/sbin/init/Makefile Modified: head/sbin/init/Makefile == --- head/sbin/init/Makefile Sat Jul 28 20:45:36 2018(r336848) +++ head/sbin/init/Makefile Sat Jul 28 23:02:10 2018(r336849) @@ -1,15 +1,15 @@ # @(#)Makefile8.1 (Berkeley) 7/19/93 # $FreeBSD$ -FILESGROUPS= FILESETC FILESETCEXEC FILESETCDEFAULTS -FILESETCDIR= /etc -FILESETC= network.subr rc rc.initdiskless rc.subr rc.shutdown -FILESETCMODE= 644 -FILESETCEXEC= netstart pccard_ether rc.resume rc.suspend -FILESETCEXECDIR= /etc -FILESETCEXECMODE= 755 -FILESETCDEFAULTSDIR= /etc/defaults -FILESETCDEFAULTS= rc.conf +CONFGROUPS=CONFETC CONFETCEXEC CONFETCDEFAULTS +CONFETCDIR=/etc +CONFETC= network.subr rc rc.initdiskless rc.subr rc.shutdown +CONFETCMODE= 644 +CONFETCEXEC= netstart pccard_ether rc.resume rc.suspend +CONFETCEXECDIR=/etc +CONFETCEXECMODE= 755 +CONFETCDEFAULTSDIR=/etc/defaults +CONFETCDEFAULTS= rc.conf PACKAGE=runtime PROG= init SRCS= init.c getmntopts.c ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336835 - head/lib/libc/gen
On Sat, Jul 28, 2018 at 01:59:16PM -0700, Conrad Meyer wrote: > On Sat, Jul 28, 2018 at 1:32 PM, Konstantin Belousov > wrote: > > Our existing practice is to not provide an advise in the man pages > > for the userspace code which would harm the portability or the standard > > conformance. > > Perhaps, but you do not have to look beyond this manual page to find > that such a practice, if it is even nominally applied, is not followed > consistently. The remainder of the document spells the terminating > value as plain "NULL." FreeBSD manual pages consistently refer to > NULL as a pointer value. > > The Linux manual page spells the terminating value (char *)NULL and > explicitly documents why. That is perhaps both pedantically correct > and clear. I am amenable to such a change. I do not see much difference between (char *)0 and (char *)NULL. Both are better there, because both are correct. If you prefer (char *)NULL, please use it. > > > I am not so sure about CheriBSD, for instance. > > I observe simply that CheriBSD is not FreeBSD and that CHERI is an > exotic architecture. We should not give an advise which breaks other architectures, even if not included into the mainline repo. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336835 - head/lib/libc/gen
On Sat, Jul 28, 2018 at 1:32 PM, Konstantin Belousov wrote: > Our existing practice is to not provide an advise in the man pages > for the userspace code which would harm the portability or the standard > conformance. Perhaps, but you do not have to look beyond this manual page to find that such a practice, if it is even nominally applied, is not followed consistently. The remainder of the document spells the terminating value as plain "NULL." FreeBSD manual pages consistently refer to NULL as a pointer value. The Linux manual page spells the terminating value (char *)NULL and explicitly documents why. That is perhaps both pedantically correct and clear. I am amenable to such a change. > I am not so sure about CheriBSD, for instance. I observe simply that CheriBSD is not FreeBSD and that CHERI is an exotic architecture. Best, Conrad ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336848 - head/release/arm
Author: manu Date: Sat Jul 28 20:45:36 2018 New Revision: 336848 URL: https://svnweb.freebsd.org/changeset/base/336848 Log: release: arm: Add a GENERIC sdcard image This produce a generic sdcard image using armv7 GENERIC kernel that just need some u-boot (or none if the board have u-boot or a SPI flash for example). Reviewed by: imp, gjb Differential Revision:https://reviews.freebsd.org/D16410 Added: head/release/arm/GENERICSD.conf (contents, props changed) Added: head/release/arm/GENERICSD.conf == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/release/arm/GENERICSD.conf Sat Jul 28 20:45:36 2018 (r336848) @@ -0,0 +1,16 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +EMBEDDED_TARGET_ARCH="armv7" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 +FAT_SIZE="50m -b 1m" +FAT_TYPE="16" +IMAGE_SIZE="3072M" +KERNEL="GENERIC" +MD_ARGS="-x 63 -y 255" +NODOC=1 +PART_SCHEME="MBR" +export BOARDNAME="GENERICSD" ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336847 - in head: etc etc/defaults sbin/init
Author: brd
Date: Sat Jul 28 20:41:33 2018
New Revision: 336847
URL: https://svnweb.freebsd.org/changeset/base/336847
Log:
Opps, I missed moving a couple of files in r336845.
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16466
Added:
head/sbin/init/netstart
- copied unchanged from r336846, head/etc/netstart
head/sbin/init/network.subr
- copied unchanged from r336846, head/etc/network.subr
head/sbin/init/pccard_ether
- copied unchanged from r336846, head/etc/pccard_ether
head/sbin/init/rc
- copied unchanged from r336846, head/etc/rc
head/sbin/init/rc.conf
- copied unchanged from r336846, head/etc/defaults/rc.conf
head/sbin/init/rc.initdiskless
- copied unchanged from r336846, head/etc/rc.initdiskless
head/sbin/init/rc.resume
- copied unchanged from r336846, head/etc/rc.resume
head/sbin/init/rc.shutdown
- copied unchanged from r336846, head/etc/rc.shutdown
head/sbin/init/rc.subr
- copied unchanged from r336846, head/etc/rc.subr
head/sbin/init/rc.suspend
- copied unchanged from r336846, head/etc/rc.suspend
Deleted:
head/etc/defaults/rc.conf
head/etc/netstart
head/etc/network.subr
head/etc/pccard_ether
head/etc/rc
head/etc/rc.initdiskless
head/etc/rc.resume
head/etc/rc.shutdown
head/etc/rc.subr
head/etc/rc.suspend
Copied: head/sbin/init/netstart (from r336846, head/etc/netstart)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sbin/init/netstart Sat Jul 28 20:41:33 2018(r336847, copy
of r336846, head/etc/netstart)
@@ -0,0 +1,57 @@
+#!/bin/sh -
+#
+# Copyright (c) 1993 The FreeBSD Project
+# 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$
+# From: @(#)netstart 5.9 (Berkeley) 3/30/91
+#
+
+# This file is NOT called by any of the other scripts - it has been
+# obsoleted by /etc/rc.d/* and is provided here only for user
+# convenience (if you're sitting in single user mode and wish to start
+# the network by hand, this script will do it for you).
+#
+
+_start=quietstart
+
+/etc/rc.d/devd ${_start}
+/etc/rc.d/hostid ${_start}
+/etc/rc.d/hostname ${_start}
+/etc/rc.d/ipmon ${_start}
+/etc/rc.d/ipfilter ${_start}
+/etc/rc.d/ipnat ${_start}
+/etc/rc.d/ipfs ${_start}
+/etc/rc.d/sppp ${_start}
+/etc/rc.d/netif ${_start}
+/etc/rc.d/ipsec ${_start}
+/etc/rc.d/ppp ${_start}
+/etc/rc.d/ipfw ${_start}
+/etc/rc.d/routing ${_start}
+/etc/rc.d/route6d ${_start}
+/etc/rc.d/routed ${_start}
+/etc/rc.d/rtsold ${_start}
+/etc/rc.d/nisdomain ${_start}
+
+exit 0
Copied: head/sbin/init/network.subr (from r336846, head/etc/network.subr)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sbin/init/network.subr Sat Jul 28 20:41:33 2018(r336847, copy
of r336846, head/etc/network.subr)
@@ -0,0 +1,1793 @@
+#
+# Copyright (c) 2003 The FreeBSD Project. 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 PROJECT AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
svn commit: r336846 - in stable/10/sys/fs: nfs nfsserver
Author: rmacklem
Date: Sat Jul 28 20:38:08 2018
New Revision: 336846
URL: https://svnweb.freebsd.org/changeset/base/336846
Log:
MFC: r334492
Add the BindConnectiontoSession operation to the NFSv4.1 server.
Under some fairly unusual circumstances, the Linux NFSv4.1 client is
doing a BindConnectiontoSession operation for TCP connections.
It is also used by the ESXi6.5 NFSv4.1 client.
This patch adds this operation to the NFSv4.1 server.
PR: 226493
Modified:
stable/10/sys/fs/nfs/nfs.h
stable/10/sys/fs/nfs/nfs_commonsubs.c
stable/10/sys/fs/nfs/nfs_var.h
stable/10/sys/fs/nfs/nfsproto.h
stable/10/sys/fs/nfsserver/nfs_nfsdserv.c
stable/10/sys/fs/nfsserver/nfs_nfsdsocket.c
stable/10/sys/fs/nfsserver/nfs_nfsdstate.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/fs/nfs/nfs.h
==
--- stable/10/sys/fs/nfs/nfs.h Sat Jul 28 20:36:23 2018(r336845)
+++ stable/10/sys/fs/nfs/nfs.h Sat Jul 28 20:38:08 2018(r336846)
@@ -288,6 +288,7 @@ struct nfsreferral {
#defineLCL_ADMINREVOKED0x8000
#defineLCL_RECLAIMCOMPLETE 0x0001
#defineLCL_NFSV41 0x0002
+#defineLCL_DONEBINDCONN0x0004
#defineLCL_GSS LCL_KERBV /* Or of all mechs */
Modified: stable/10/sys/fs/nfs/nfs_commonsubs.c
==
--- stable/10/sys/fs/nfs/nfs_commonsubs.c Sat Jul 28 20:36:23 2018
(r336845)
+++ stable/10/sys/fs/nfs/nfs_commonsubs.c Sat Jul 28 20:38:08 2018
(r336846)
@@ -136,7 +136,7 @@ struct nfsv4_opflag nfsv4_opflag[NFSV41_NOPS] = {
{ 0, 2, 1, 1, LK_EXCLUSIVE, 1, 0 }, /* Write */
{ 0, 0, 0, 0, LK_EXCLUSIVE, 1, 0 }, /* ReleaseLockOwner */
{ 0, 0, 0, 0, LK_EXCLUSIVE, 1, 1 }, /* Backchannel Ctrl */
- { 0, 0, 0, 0, LK_EXCLUSIVE, 1, 1 }, /* Bind Conn to Sess */
+ { 0, 0, 0, 0, LK_EXCLUSIVE, 0, 0 }, /* Bind Conn to Sess */
{ 0, 0, 0, 0, LK_EXCLUSIVE, 0, 0 }, /* Exchange ID */
{ 0, 0, 0, 0, LK_EXCLUSIVE, 0, 0 }, /* Create Session */
{ 0, 0, 0, 0, LK_EXCLUSIVE, 0, 0 }, /* Destroy Session */
Modified: stable/10/sys/fs/nfs/nfs_var.h
==
--- stable/10/sys/fs/nfs/nfs_var.h Sat Jul 28 20:36:23 2018
(r336845)
+++ stable/10/sys/fs/nfs/nfs_var.h Sat Jul 28 20:38:08 2018
(r336846)
@@ -95,6 +95,7 @@ int nfsrv_getclient(nfsquad_t, int, struct nfsclient *
nfsquad_t, uint32_t, struct nfsrv_descript *, NFSPROC_T *);
int nfsrv_destroyclient(nfsquad_t, NFSPROC_T *);
int nfsrv_destroysession(struct nfsrv_descript *, uint8_t *);
+int nfsrv_bindconnsess(struct nfsrv_descript *, uint8_t *, int *);
int nfsrv_freestateid(struct nfsrv_descript *, nfsv4stateid_t *, NFSPROC_T *);
int nfsrv_teststateid(struct nfsrv_descript *, nfsv4stateid_t *, NFSPROC_T *);
int nfsrv_adminrevoke(struct nfsd_clid *, NFSPROC_T *);
@@ -230,6 +231,8 @@ int nfsrvd_sequence(struct nfsrv_descript *, int,
int nfsrvd_reclaimcomplete(struct nfsrv_descript *, int,
vnode_t, NFSPROC_T *, struct nfsexstuff *);
int nfsrvd_destroyclientid(struct nfsrv_descript *, int,
+vnode_t, NFSPROC_T *, struct nfsexstuff *);
+int nfsrvd_bindconnsess(struct nfsrv_descript *, int,
vnode_t, NFSPROC_T *, struct nfsexstuff *);
int nfsrvd_destroysession(struct nfsrv_descript *, int,
vnode_t, NFSPROC_T *, struct nfsexstuff *);
Modified: stable/10/sys/fs/nfs/nfsproto.h
==
--- stable/10/sys/fs/nfs/nfsproto.h Sat Jul 28 20:36:23 2018
(r336845)
+++ stable/10/sys/fs/nfs/nfsproto.h Sat Jul 28 20:38:08 2018
(r336846)
@@ -648,6 +648,15 @@
#defineNFSFLAYUTIL_DENSE 0x1
#defineNFSFLAYUTIL_COMMIT_THRU_MDS 0x2
+/* Enum values for Bind Connection to Session. */
+#defineNFSCDFC4_FORE 0x1
+#defineNFSCDFC4_BACK 0x2
+#defineNFSCDFC4_FORE_OR_BOTH 0x3
+#defineNFSCDFC4_BACK_OR_BOTH 0x7
+#defineNFSCDFS4_FORE 0x1
+#defineNFSCDFS4_BACK 0x2
+#defineNFSCDFS4_BOTH 0x3
+
/* Conversion macros */
#definevtonfsv2_mode(t,m)
\
txdr_unsigned(((t) == VFIFO) ? MAKEIMODE(VCHR, (m)) : \
Modified: stable/10/sys/fs/nfsserver/nfs_nfsdserv.c
==
--- stable/10/sys/fs/nfsserver/nfs_nfsdserv.c Sat Jul 28 20:36:23 2018
(r336845)
+++ stable/10/sys/fs/nfsserver/nfs_nfsdserv.c Sat Jul 28 20:38:08 2018
(r336846)
@@ -4020,6
svn commit: r336845 - in head: etc etc/defaults etc/rc.d sbin/init sbin/init/rc.d
Author: brd
Date: Sat Jul 28 20:36:23 2018
New Revision: 336845
URL: https://svnweb.freebsd.org/changeset/base/336845
Log:
Move rc startup scripts from etc/ to sbin/init/
This keeps most startup scripts as CONFS per discussion on src-committers from
back during BSDCan.
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16466
Added:
head/sbin/init/rc.d/
- copied from r336844, head/etc/rc.d/
Deleted:
head/etc/rc.d/
Modified:
head/etc/Makefile
head/etc/defaults/Makefile
head/sbin/init/Makefile
head/sbin/init/rc.d/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sat Jul 28 20:33:08 2018(r336844)
+++ head/etc/Makefile Sat Jul 28 20:36:23 2018(r336845)
@@ -31,19 +31,14 @@ BIN1= crontab \
mac.conf \
motd \
netconfig \
- network.subr \
networks \
newsyslog.conf \
nsswitch.conf \
phones \
profile \
protocols \
- rc \
rc.bsdextended \
rc.firewall \
- rc.initdiskless \
- rc.shutdown \
- rc.subr \
remote \
rpc \
services \
@@ -144,9 +139,6 @@ BIN1+= csh.cshrc csh.login csh.logout
BIN1+= regdomain.xml
.endif
-# -rwxr-xr-x root:wheel, for the new cron root:wheel
-BIN2= netstart pccard_ether rc.suspend rc.resume
-
.if ${MK_SENDMAIL} == "no"
ETCMAIL=mailer.conf aliases
.else
@@ -187,8 +179,6 @@ distribution:
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${BIN1} ${DESTDIR}/etc; \
cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf; \
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \
- ${BIN2} ${DESTDIR}/etc; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
@@ -235,7 +225,6 @@ distribution:
.if ${MK_PKGBOOTSTRAP} != "no"
${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
.endif
- ${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
Modified: head/etc/defaults/Makefile
==
--- head/etc/defaults/Makefile Sat Jul 28 20:33:08 2018(r336844)
+++ head/etc/defaults/Makefile Sat Jul 28 20:36:23 2018(r336845)
@@ -2,7 +2,7 @@
.include
-FILES= devfs.rules periodic.conf rc.conf
+FILES= devfs.rules periodic.conf
FILESDIR= /etc/defaults
.if ${MK_BLUETOOTH} != "no"
Modified: head/sbin/init/Makefile
==
--- head/sbin/init/Makefile Sat Jul 28 20:33:08 2018(r336844)
+++ head/sbin/init/Makefile Sat Jul 28 20:36:23 2018(r336845)
@@ -1,6 +1,15 @@
# @(#)Makefile8.1 (Berkeley) 7/19/93
# $FreeBSD$
+FILESGROUPS= FILESETC FILESETCEXEC FILESETCDEFAULTS
+FILESETCDIR= /etc
+FILESETC= network.subr rc rc.initdiskless rc.subr rc.shutdown
+FILESETCMODE= 644
+FILESETCEXEC= netstart pccard_ether rc.resume rc.suspend
+FILESETCEXECDIR= /etc
+FILESETCEXECMODE= 755
+FILESETCDEFAULTSDIR= /etc/defaults
+FILESETCDEFAULTS= rc.conf
PACKAGE=runtime
PROG= init
SRCS= init.c getmntopts.c
@@ -16,5 +25,7 @@ CFLAGS+=-I${MOUNT}
.PATH: ${MOUNT}
NO_SHARED?=YES
+
+SUBDIR+= rc.d
.include
Modified: head/sbin/init/rc.d/Makefile
==
--- head/etc/rc.d/Makefile Sat Jul 28 20:33:08 2018(r336844)
+++ head/sbin/init/rc.d/MakefileSat Jul 28 20:36:23 2018
(r336845)
@@ -2,10 +2,10 @@
.include
-BINDIR=/etc/rc.d
-FILESGROUPS= FILES
+CONFSDIR= /etc/rc.d
+CONFSGROUPS= CONFS
-FILES= DAEMON \
+CONFS= DAEMON \
FILESYSTEMS \
LOGIN \
NETWORKING \
@@ -75,7 +75,6 @@ FILES=DAEMON \
netif \
netoptions \
netwait \
- newsyslog \
nfsclient \
nfscbd \
nfsd \
@@ -113,8 +112,6 @@ FILES= DAEMON \
stf \
swap \
swaplate \
- sysctl \
- syslogd \
tmp \
${_ubthidhci} \
ugidfw \
@@ -123,7 +120,7 @@ FILES= DAEMON \
watchdogd
.if ${MK_NIS} != "no"
-FILES+=ypbind \
+CONFS+=ypbind \
ypldap \
yppasswdd \
ypserv \
@@ -133,29 +130,29 @@ FILES+= ypbind \
.endif
.if ${MK_ACCT} != "no"
-FILESGROUPS+= ACCT
+CONFSGROUPS+= ACCT
ACCT+= accounting
ACCTPACKAGE= acct
.endif
.if ${MK_ACPI} != "no"
-FILESGROUPS+= ACPI
+CONFSGROUPS+= ACPI
ACPI= power_profile
ACPIPACKAGE= acpi
.endif
.if ${MK_ACPI} != "no" || ${MK_APM} != "no"
-FILES+=
Re: svn commit: r336835 - head/lib/libc/gen
On Sat, Jul 28, 2018 at 01:16:45PM -0700, Conrad Meyer wrote: > On Sat, Jul 28, 2018 at 1:06 PM, Konstantin Belousov > wrote: > > On Sat, Jul 28, 2018 at 07:08:00PM +, Conrad Meyer wrote: > >> For unclear reasons, POSIX' definition of these routines spells NULL as > >> "(char *)0." This is needlessly unclear. One guess might be that POSIX > >> targets more exotic computer architectures than FreeBSD does. > >> Fortunately, > >> there is no such problem on any reasonable platform for FreeBSD to > >> support. > >> Spell NULL as NULL. > > > > The reasons are quite clear. > > Unclear here refers to the lack of documentation, not the absense of a > possible explanation. > > > Practically NULL has to be defined as '0' > > or '0L' at best, for C and esp. C++ rules of the pointers automatic > > casts to work. This means that NULL cannot be used in vararg lists where > > the pointer is expected. > > This is not true on FreeBSD. NULL is (void*)0 in all C code, and the > special nullptr value in C++. Yes, this is a stronger definition than > the C standard guarantees. This is because the C standard permits > much more exotic architectures than FreeBSD actually runs on. Our existing practice is to not provide an advise in the man pages for the userspace code which would harm the portability or the standard conformance. > > > In other words, the (char *)0 part of the pre-commit text was correct, > > while after-commit use of NULL only works on machines where pointers > > have the same representation as ints or longs. > > I believe this encompasses all architectures FreeBSD supports ??? even > ignoring our sys/_null.h definition of NULL as (void *)0 or nullptr. I am not so sure about CheriBSD, for instance. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336842 - in stable/11/sys/fs: nfs nfsserver
Author: rmacklem
Date: Sat Jul 28 20:29:05 2018
New Revision: 336842
URL: https://svnweb.freebsd.org/changeset/base/336842
Log:
MFC: r334492
Add the BindConnectiontoSession operation to the NFSv4.1 server.
Under some fairly unusual circumstances, the Linux NFSv4.1 client is
doing a BindConnectiontoSession operation for TCP connections.
It is also used by the ESXi6.5 NFSv4.1 client.
This patch adds this operation to the NFSv4.1 server.
PR: 226493
Modified:
stable/11/sys/fs/nfs/nfs.h
stable/11/sys/fs/nfs/nfs_commonsubs.c
stable/11/sys/fs/nfs/nfs_var.h
stable/11/sys/fs/nfs/nfsproto.h
stable/11/sys/fs/nfsserver/nfs_nfsdserv.c
stable/11/sys/fs/nfsserver/nfs_nfsdsocket.c
stable/11/sys/fs/nfsserver/nfs_nfsdstate.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/fs/nfs/nfs.h
==
--- stable/11/sys/fs/nfs/nfs.h Sat Jul 28 20:26:25 2018(r336841)
+++ stable/11/sys/fs/nfs/nfs.h Sat Jul 28 20:29:05 2018(r336842)
@@ -288,6 +288,7 @@ struct nfsreferral {
#defineLCL_ADMINREVOKED0x8000
#defineLCL_RECLAIMCOMPLETE 0x0001
#defineLCL_NFSV41 0x0002
+#defineLCL_DONEBINDCONN0x0004
#defineLCL_GSS LCL_KERBV /* Or of all mechs */
Modified: stable/11/sys/fs/nfs/nfs_commonsubs.c
==
--- stable/11/sys/fs/nfs/nfs_commonsubs.c Sat Jul 28 20:26:25 2018
(r336841)
+++ stable/11/sys/fs/nfs/nfs_commonsubs.c Sat Jul 28 20:29:05 2018
(r336842)
@@ -139,7 +139,7 @@ struct nfsv4_opflag nfsv4_opflag[NFSV41_NOPS] = {
{ 0, 2, 1, 1, LK_EXCLUSIVE, 1, 0 }, /* Write */
{ 0, 0, 0, 0, LK_EXCLUSIVE, 1, 0 }, /* ReleaseLockOwner */
{ 0, 0, 0, 0, LK_EXCLUSIVE, 1, 1 }, /* Backchannel Ctrl */
- { 0, 0, 0, 0, LK_EXCLUSIVE, 1, 1 }, /* Bind Conn to Sess */
+ { 0, 0, 0, 0, LK_EXCLUSIVE, 0, 0 }, /* Bind Conn to Sess */
{ 0, 0, 0, 0, LK_EXCLUSIVE, 0, 0 }, /* Exchange ID */
{ 0, 0, 0, 0, LK_EXCLUSIVE, 0, 0 }, /* Create Session */
{ 0, 0, 0, 0, LK_EXCLUSIVE, 0, 0 }, /* Destroy Session */
Modified: stable/11/sys/fs/nfs/nfs_var.h
==
--- stable/11/sys/fs/nfs/nfs_var.h Sat Jul 28 20:26:25 2018
(r336841)
+++ stable/11/sys/fs/nfs/nfs_var.h Sat Jul 28 20:29:05 2018
(r336842)
@@ -95,6 +95,7 @@ int nfsrv_getclient(nfsquad_t, int, struct nfsclient *
nfsquad_t, uint32_t, struct nfsrv_descript *, NFSPROC_T *);
int nfsrv_destroyclient(nfsquad_t, NFSPROC_T *);
int nfsrv_destroysession(struct nfsrv_descript *, uint8_t *);
+int nfsrv_bindconnsess(struct nfsrv_descript *, uint8_t *, int *);
int nfsrv_freestateid(struct nfsrv_descript *, nfsv4stateid_t *, NFSPROC_T *);
int nfsrv_teststateid(struct nfsrv_descript *, nfsv4stateid_t *, NFSPROC_T *);
int nfsrv_adminrevoke(struct nfsd_clid *, NFSPROC_T *);
@@ -230,6 +231,8 @@ int nfsrvd_sequence(struct nfsrv_descript *, int,
int nfsrvd_reclaimcomplete(struct nfsrv_descript *, int,
vnode_t, NFSPROC_T *, struct nfsexstuff *);
int nfsrvd_destroyclientid(struct nfsrv_descript *, int,
+vnode_t, NFSPROC_T *, struct nfsexstuff *);
+int nfsrvd_bindconnsess(struct nfsrv_descript *, int,
vnode_t, NFSPROC_T *, struct nfsexstuff *);
int nfsrvd_destroysession(struct nfsrv_descript *, int,
vnode_t, NFSPROC_T *, struct nfsexstuff *);
Modified: stable/11/sys/fs/nfs/nfsproto.h
==
--- stable/11/sys/fs/nfs/nfsproto.h Sat Jul 28 20:26:25 2018
(r336841)
+++ stable/11/sys/fs/nfs/nfsproto.h Sat Jul 28 20:29:05 2018
(r336842)
@@ -650,6 +650,15 @@
#defineNFSFLAYUTIL_DENSE 0x1
#defineNFSFLAYUTIL_COMMIT_THRU_MDS 0x2
+/* Enum values for Bind Connection to Session. */
+#defineNFSCDFC4_FORE 0x1
+#defineNFSCDFC4_BACK 0x2
+#defineNFSCDFC4_FORE_OR_BOTH 0x3
+#defineNFSCDFC4_BACK_OR_BOTH 0x7
+#defineNFSCDFS4_FORE 0x1
+#defineNFSCDFS4_BACK 0x2
+#defineNFSCDFS4_BOTH 0x3
+
/* Conversion macros */
#definevtonfsv2_mode(t,m)
\
txdr_unsigned(((t) == VFIFO) ? MAKEIMODE(VCHR, (m)) : \
Modified: stable/11/sys/fs/nfsserver/nfs_nfsdserv.c
==
--- stable/11/sys/fs/nfsserver/nfs_nfsdserv.c Sat Jul 28 20:26:25 2018
(r336841)
+++ stable/11/sys/fs/nfsserver/nfs_nfsdserv.c Sat Jul 28 20:29:05 2018
(r336842)
@@ -4051,6
svn commit: r336844 - head
Author: manu Date: Sat Jul 28 20:33:08 2018 New Revision: 336844 URL: https://svnweb.freebsd.org/changeset/base/336844 Log: UPDATING: Add note about efifb support and serial output Modified: head/UPDATING Modified: head/UPDATING == --- head/UPDATING Sat Jul 28 20:31:03 2018(r336843) +++ head/UPDATING Sat Jul 28 20:33:08 2018(r336844) @@ -52,6 +52,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: zfs boot blocks don't understand symlinks). 20180719: + ARM64 now have efifb support, if you want to have serial console + on your arm64 board when an screen is connected and the bootloader + setup a frambuffer for us to use, just add : + boot_serial=YES + boot_multicons=YES + in /boot/loader.conf + For Raspberry Pi 3 (RPI) users, this is needed even if you don't have + an screen connected as the firmware will setup a framebuffer are that + u-boot will expose as an EFI framebuffer. + +20180719: New uid:gid added, ntpd:ntpd (123:123). Be sure to run mergemaster or take steps to update /etc/passwd before doing installworld on existing systems. Also, rc.d/ntpd now starts ntpd(8) as user ntpd ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336843 - head/share/mk
Author: brd
Date: Sat Jul 28 20:31:03 2018
New Revision: 336843
URL: https://svnweb.freebsd.org/changeset/base/336843
Log:
Whitespace only change, no functional change intended.
The padding makes it much easier to read, but occasionally means that commits
like this one have to be done to follow up. I intentionally kept this
separate from r336841 to try and make things easier to follow later on.
Approved by: bapt (mentor)
Modified:
head/share/mk/bsd.confs.mk
Modified: head/share/mk/bsd.confs.mk
==
--- head/share/mk/bsd.confs.mk Sat Jul 28 20:29:05 2018(r336842)
+++ head/share/mk/bsd.confs.mk Sat Jul 28 20:31:03 2018(r336843)
@@ -23,12 +23,12 @@ buildconfig: ${${group}}
all: buildconfig
. endif
-.for group in ${CONFGROUPS}
-. if defined(${group}) && !empty(${group})
+. for group in ${CONFGROUPS}
+.if defined(${group}) && !empty(${group})
-.if !target(afterinstallconfig)
+. if !target(afterinstallconfig)
afterinstallconfig:
-.endif
+. endif
installconfig: realinstallconfig afterinstallconfig
.ORDER:realinstallconfig afterinstallconfig
@@ -39,79 +39,79 @@ ${group}DIR?= ${CONFDIR}
STAGE_SETS+= ${group:C,[/*],_,g}
STAGE_DIR.${group:C,[/*],_,g}= ${STAGE_OBJTOP}${${group}DIR}
-.if defined(NO_ROOT)
-. if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*}
-.if defined(${${group}PACKAGE})
+. if defined(NO_ROOT)
+.if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*}
+. if defined(${${group}PACKAGE})
${group}TAGS+= package=${${group}PACKAGE:Uruntime}
-.else
+. else
${group}TAGS+= package=${PACKAGE:Uruntime}
-.endif
. endif
+.endif
${group}TAGS+= config
${group}TAG_ARGS= -T ${${group}TAGS:[*]:S/ /,/g}
-.endif
+. endif
-.if ${${group}DIR:S/^\///} == ${${group}DIR}
+. if ${${group}DIR:S/^\///} == ${${group}DIR}
# ${group}DIR specifies a variable that specifies a path
DIRS+= ${${group}DIR}
_${group}DIR= ${${group}DIR}
-.else
+. else
# ${group}DIR specifies a path
DIRS+= ${group}DIR
_${group}DIR= ${group}DIR
-.endif
+. endif
-.for cnf in ${${group}}
+. for cnf in ${${group}}
${group}OWN_${cnf}?= ${${group}OWN}
${group}GRP_${cnf}?= ${${group}GRP}
${group}MODE_${cnf}?= ${${group}MODE}
${group}DIR_${cnf}?= ${${group}DIR}
-. if defined(${group}NAME)
+.if defined(${group}NAME)
${group}NAME_${cnf}?= ${${group}NAME}
-. else
+.else
${group}NAME_${cnf}?= ${cnf:T}
-. endif
+.endif
# Determine the directory for the current file. Default to the parent group
# DIR, then check to see how to pass that variable on below.
${group}DIR_${cnf}?= ${${group}DIR}
-. if ${${group}DIR_${cnf}:S/^\///} == ${${group}DIR_${cnf}}
+.if ${${group}DIR_${cnf}:S/^\///} == ${${group}DIR_${cnf}}
# DIR specifies a variable that specifies a path
_${group}DIR_${cnf}= ${${group}DIR_${cnf}}
-. else
+.else
# DIR directly specifies a path
_${group}DIR_${cnf}= ${group}DIR_${cnf}
-. endif
+.endif
${group}PREFIX_${cnf}= ${DESTDIR}${${_${group}DIR_${cnf}}}
# Append DIR to DIRS if not already in place -- DIRS is already filtered, so
# this is primarily to ease inspection.
-. for d in ${DIRS}
+.for d in ${DIRS}
_DIRS+=${${d}}
-. endfor
-. if ${DIRS:M${_${group}DIR_${cnf}}} == ""
-.if ${_DIRS:M${${_${group}DIR_${cnf == ""
+.endfor
+.if ${DIRS:M${_${group}DIR_${cnf}}} == ""
+. if ${_DIRS:M${${_${group}DIR_${cnf == ""
DIRS+= ${_${group}DIR_${cnf}}
-.else
+. else
_${group}DIR_${cnf}= ${group}DIR
-.endif
. endif
+.endif
-. if defined(${group}NAME)
+.if defined(${group}NAME)
${group}NAME_${cnf}?= ${${group}NAME}
-. else
+.else
${group}NAME_${cnf}?= ${cnf:T}
-. endif # defined(${group}NAME)
+.endif # defined(${group}NAME)
# Work around a bug with install(1) -C and /dev/null
-. if ${cnf} == "/dev/null"
+.if ${cnf} == "/dev/null"
INSTALL_COPY=
-. else
+.else
INSTALL_COPY= -C
-. endif
+.endif
STAGE_AS_SETS+= ${cnf:T}
STAGE_AS_${cnf:T}= ${${group}NAME_${cnf:T}}
@@ -124,8 +124,7 @@ _${group}INS_${cnf:T}: ${cnf}
${INSTALL} ${${group}TAG_ARGS} ${INSTALL_COPY} -o ${${group}OWN_${cnf}}
\
-g ${${group}GRP_${cnf}} -m ${${group}MODE_${cnf}} \
${.ALLSRC} ${${group}PREFIX_${cnf}}/${${group}NAME_${cnf}}
-.endfor # for cnf in ${${group}}
-
+. endfor # for cnf in ${${group}}
.endif # defined(${group}) && !empty(${group})
. endfor
svn commit: r336841 - head/share/mk
Author: brd
Date: Sat Jul 28 20:26:25 2018
New Revision: 336841
URL: https://svnweb.freebsd.org/changeset/base/336841
Log:
Fix `make distribute' installing some configs which means CONFS was broken
with etcupdate and mergemaster.
Approved by: bapt (mentor)
Differential Revision:https://reviews.freebsd.org/D16478
Modified:
head/share/mk/bsd.confs.mk
Modified: head/share/mk/bsd.confs.mk
==
--- head/share/mk/bsd.confs.mk Sat Jul 28 20:21:23 2018(r336840)
+++ head/share/mk/bsd.confs.mk Sat Jul 28 20:26:25 2018(r336841)
@@ -23,7 +23,6 @@ buildconfig: ${${group}}
all: buildconfig
. endif
-. if !target(installconfig)
.for group in ${CONFGROUPS}
. if defined(${group}) && !empty(${group})
@@ -130,8 +129,6 @@ _${group}INS_${cnf:T}: ${cnf}
.endif # defined(${group}) && !empty(${group})
. endfor
-
-.endif # !target(installconfig)
.if ${MK_STAGING} != "no"
. if !empty(STAGE_SETS)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336835 - head/lib/libc/gen
On Sat, Jul 28, 2018 at 1:06 PM, Konstantin Belousov wrote: > On Sat, Jul 28, 2018 at 07:08:00PM +, Conrad Meyer wrote: >> For unclear reasons, POSIX' definition of these routines spells NULL as >> "(char *)0." This is needlessly unclear. One guess might be that POSIX >> targets more exotic computer architectures than FreeBSD does. Fortunately, >> there is no such problem on any reasonable platform for FreeBSD to support. >> Spell NULL as NULL. > > The reasons are quite clear. Unclear here refers to the lack of documentation, not the absense of a possible explanation. > Practically NULL has to be defined as '0' > or '0L' at best, for C and esp. C++ rules of the pointers automatic > casts to work. This means that NULL cannot be used in vararg lists where > the pointer is expected. This is not true on FreeBSD. NULL is (void*)0 in all C code, and the special nullptr value in C++. Yes, this is a stronger definition than the C standard guarantees. This is because the C standard permits much more exotic architectures than FreeBSD actually runs on. > In other words, the (char *)0 part of the pre-commit text was correct, > while after-commit use of NULL only works on machines where pointers > have the same representation as ints or longs. I believe this encompasses all architectures FreeBSD supports — even ignoring our sys/_null.h definition of NULL as (void *)0 or nullptr. Best, Conrad ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336840 - in head: etc lib/libc/gen
Author: brd
Date: Sat Jul 28 20:21:23 2018
New Revision: 336840
URL: https://svnweb.freebsd.org/changeset/base/336840
Log:
Move etc/shells to lib/libc/gen with getusershell(3).
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16467
Added:
head/lib/libc/gen/shells
- copied unchanged from r336839, head/etc/shells
Deleted:
head/etc/shells
Modified:
head/etc/Makefile
head/lib/libc/gen/Makefile.inc
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sat Jul 28 20:21:04 2018(r336839)
+++ head/etc/Makefile Sat Jul 28 20:21:23 2018(r336840)
@@ -47,7 +47,6 @@ BIN1= crontab \
remote \
rpc \
services \
- shells \
sysctl.conf \
syslog.conf \
termcap.small
Modified: head/lib/libc/gen/Makefile.inc
==
--- head/lib/libc/gen/Makefile.inc Sat Jul 28 20:21:04 2018
(r336839)
+++ head/lib/libc/gen/Makefile.inc Sat Jul 28 20:21:23 2018
(r336840)
@@ -4,6 +4,8 @@
# machine-independent gen sources
.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/gen ${LIBC_SRCTOP}/gen
+CONFS= shells
+
SRCS+= __getosreldate.c \
__pthread_mutex_init_calloc_cb_stub.c \
__xuname.c \
Copied: head/lib/libc/gen/shells (from r336839, head/etc/shells)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libc/gen/shellsSat Jul 28 20:21:23 2018(r336840, copy
of r336839, head/etc/shells)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+#
+# List of acceptable shells for chpass(1).
+# Ftpd will not allow users to connect who are not using
+# one of these shells.
+
+/bin/sh
+/bin/csh
+/bin/tcsh
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336839 - in head/sys/fs: nfs nfsserver
Author: rmacklem
Date: Sat Jul 28 20:21:04 2018
New Revision: 336839
URL: https://svnweb.freebsd.org/changeset/base/336839
Log:
Modify the NFSv4.1 server so that it allows ReclaimComplete as done by ESXi
6.7.
I believe that a ReclaimComplete with rca_one_fs == TRUE is only
to be used after a file system has been transferred to a different
file server. However, RFC5661 is somewhat vague w.r.t. this and
the ESXi 6.7 client does both a ReclaimComplete with rca_one_fs == TRUE
and one with ReclaimComplete with rca_one_fs == FALSE.
Therefore, just ignore the rca_one_fs == TRUE operation and return
NFS_OK without doing anything instead of replying NFS4ERR_NOTSUPP.
This allows the ESXi 6.7 NFSv4.1 client to do a mount.
After discussion on the NFSv4 IETF working group mailing list, doing this
along with setting a flag to note that a ReclaimComplete with rca_one_fs TRUE
was an appropriate way to handle this.
The flag that indicates that a ReclaimComplete with rca_one_fs == TRUE was
done may be used to disable replies of NFS4ERR_GRACE for non-reclaim
state operations in a future commit.
This patch along with r332790, r334492 and r336357 allow ESXi 6.7 NFSv4.1
mounts
work ok. ESX 6.5 NFSv4.1 mounts do not work well, due to what I believe are
violations of RFC-5661 and should not be used.
Reported by: andreas.n...@frequentis.com
Tested by:andreas.n...@frequentis.com, dan...@ftml.net (earlier version)
MFC after:2 weeks
Relnotes: yes
Modified:
head/sys/fs/nfs/nfs.h
head/sys/fs/nfs/nfs_var.h
head/sys/fs/nfsserver/nfs_nfsdserv.c
head/sys/fs/nfsserver/nfs_nfsdstate.c
Modified: head/sys/fs/nfs/nfs.h
==
--- head/sys/fs/nfs/nfs.h Sat Jul 28 20:04:39 2018(r336838)
+++ head/sys/fs/nfs/nfs.h Sat Jul 28 20:21:04 2018(r336839)
@@ -329,6 +329,7 @@ struct nfsreferral {
#defineLCL_RECLAIMCOMPLETE 0x0001
#defineLCL_NFSV41 0x0002
#defineLCL_DONEBINDCONN0x0004
+#defineLCL_RECLAIMONEFS0x0008
#defineLCL_GSS LCL_KERBV /* Or of all mechs */
Modified: head/sys/fs/nfs/nfs_var.h
==
--- head/sys/fs/nfs/nfs_var.h Sat Jul 28 20:04:39 2018(r336838)
+++ head/sys/fs/nfs/nfs_var.h Sat Jul 28 20:21:04 2018(r336839)
@@ -141,7 +141,7 @@ void nfsrv_nfsuserddelport(void);
void nfsrv_throwawayallstate(NFSPROC_T *);
int nfsrv_checksequence(struct nfsrv_descript *, uint32_t, uint32_t *,
uint32_t *, int, uint32_t *, NFSPROC_T *);
-int nfsrv_checkreclaimcomplete(struct nfsrv_descript *);
+int nfsrv_checkreclaimcomplete(struct nfsrv_descript *, int);
void nfsrv_cache_session(uint8_t *, uint32_t, int, struct mbuf **);
void nfsrv_freeallbackchannel_xprts(void);
int nfsrv_layoutcommit(struct nfsrv_descript *, vnode_t, int, int, uint64_t,
Modified: head/sys/fs/nfsserver/nfs_nfsdserv.c
==
--- head/sys/fs/nfsserver/nfs_nfsdserv.cSat Jul 28 20:04:39 2018
(r336838)
+++ head/sys/fs/nfsserver/nfs_nfsdserv.cSat Jul 28 20:21:04 2018
(r336839)
@@ -4229,17 +4229,26 @@ nfsrvd_reclaimcomplete(struct nfsrv_descript *nd, __un
__unused vnode_t vp, __unused NFSPROC_T *p, __unused struct nfsexstuff
*exp)
{
uint32_t *tl;
- int error = 0;
+ int error = 0, onefs;
if (nfs_rootfhset == 0 || nfsd_checkrootexp(nd) != 0) {
nd->nd_repstat = NFSERR_WRONGSEC;
goto nfsmout;
}
NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED);
+ /*
+* I believe that a ReclaimComplete with rca_one_fs == TRUE is only
+* to be used after a file system has been transferred to a different
+* file server. However, RFC5661 is somewhat vague w.r.t. this and
+* the ESXi 6.7 client does both a ReclaimComplete with rca_one_fs
+* == TRUE and one with ReclaimComplete with rca_one_fs == FALSE.
+* Therefore, just ignore the rca_one_fs == TRUE operation and return
+* NFS_OK without doing anything.
+*/
+ onefs = 0;
if (*tl == newnfs_true)
- nd->nd_repstat = NFSERR_NOTSUPP;
- else
- nd->nd_repstat = nfsrv_checkreclaimcomplete(nd);
+ onefs = 1;
+ nd->nd_repstat = nfsrv_checkreclaimcomplete(nd, onefs);
nfsmout:
NFSEXITCODE2(error, nd);
return (error);
Modified: head/sys/fs/nfsserver/nfs_nfsdstate.c
==
--- head/sys/fs/nfsserver/nfs_nfsdstate.c Sat Jul 28 20:04:39 2018
(r336838)
+++ head/sys/fs/nfsserver/nfs_nfsdstate.c Sat Jul 28 20:21:04 2018
(r336839)
@@ -6064,7 +6064,7 @@
Re: svn commit: r336835 - head/lib/libc/gen
On Sat, Jul 28, 2018 at 07:08:00PM +, Conrad Meyer wrote: > For unclear reasons, POSIX' definition of these routines spells NULL as > "(char *)0." This is needlessly unclear. One guess might be that POSIX > targets more exotic computer architectures than FreeBSD does. Fortunately, > there is no such problem on any reasonable platform for FreeBSD to support. > Spell NULL as NULL. The reasons are quite clear. Practically NULL has to be defined as '0' or '0L' at best, for C and esp. C++ rules of the pointers automatic casts to work. This means that NULL cannot be used in vararg lists where the pointer is expected. In other words, the (char *)0 part of the pre-commit text was correct, while after-commit use of NULL only works on machines where pointers have the same representation as ints or longs. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336838 - in head/lib: libauditd libbsm
Author: asomers Date: Sat Jul 28 20:04:39 2018 New Revision: 336838 URL: https://svnweb.freebsd.org/changeset/base/336838 Log: Disable -Wcast-align in libbsm and libauditd Along with some pending upstream changes, this will allow raising the WARNS level. Reviewed by: cem, aniketp MFC after:2 weeks Differential Revision:https://reviews.freebsd.org/D16486 Modified: head/lib/libauditd/Makefile head/lib/libbsm/Makefile Modified: head/lib/libauditd/Makefile == --- head/lib/libauditd/Makefile Sat Jul 28 19:44:20 2018(r336837) +++ head/lib/libauditd/Makefile Sat Jul 28 20:04:39 2018(r336838) @@ -23,3 +23,10 @@ WARNS?= 3 MAN= .include + +# Disable -Wcast-align. Casting res->ai_addr in auditd_set_host triggers this +# warning, but it's ok because res->ai_addr must've originally pointed to a +# sockaddr_in or sockaddr_in6 anyway. +# Better would be to disable this warning in just that one function, but GCC +# 4.2 can't do that :( . +CWARNFLAGS.auditd_lib.c+= -Wno-cast-align Modified: head/lib/libbsm/Makefile == --- head/lib/libbsm/MakefileSat Jul 28 19:44:20 2018(r336837) +++ head/lib/libbsm/MakefileSat Jul 28 20:04:39 2018(r336838) @@ -181,3 +181,10 @@ MLINKS=libbsm.3 bsm.3 \ setaudit.2 setaudit_addr.2 .include + +# Disable -Wcast-align. Casting sa_local in au_to_socket_ex triggers this +# warning, but it's ok because sa_local must've originally pointed to a +# sockaddr_in or sockaddr_in6 anyway. +# Better would be to disable this warning in just that one function, but GCC +# 4.2 can't do that :( . +CWARNFLAGS.bsm_token.c+= -Wno-cast-align ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336837 - head/stand/efi/loader
Author: imp
Date: Sat Jul 28 19:44:20 2018
New Revision: 336837
URL: https://svnweb.freebsd.org/changeset/base/336837
Log:
Be more conservative about setting hw.uart.console
Note when we've found a 8250 PNP node. Only try to set hw.uart.console
if we see one (otherwise ignore serial hints). The 8250 is the only
one known to have I/O ports, so limit the guessing to when we've
positively seen one. And limit this to x86 since that's the only
platform where we have I/O ports. Otherwise, we'd set the serial port
to something crazy for the platform and fall off the cliff early in
boot.
Differential Revision: https://reviews.freebsd.org/D16463
Modified:
head/stand/efi/loader/bootinfo.c
head/stand/efi/loader/main.c
Modified: head/stand/efi/loader/bootinfo.c
==
--- head/stand/efi/loader/bootinfo.cSat Jul 28 19:35:49 2018
(r336836)
+++ head/stand/efi/loader/bootinfo.cSat Jul 28 19:44:20 2018
(r336837)
@@ -82,10 +82,13 @@ bi_getboothowto(char *kargs)
howto |= RB_SERIAL;
if (strcmp(console, "nullconsole") == 0)
howto |= RB_MUTE;
- if (strcmp(console, "efi") == 0) {
+#if defined(__i386__) || defined(__amd64__)
+ if (strcmp(console, "efi") == 0 &&
+ getenv("efi_8250_uid") != NULL &&
+ getenv("hw.uart.console") == NULL) {
/*
-* If we found a com port and com speed, we need to tell
-* the kernel where the serial port is, and how
+* If we found a 8250 com port and com speed, we need to
+* tell the kernel where the serial port is, and how
* fast. Ideally, we'd get the port from ACPI, but that
* isn't running in the loader. Do the next best thing
* by allowing it to be set by a loader.conf variable,
@@ -93,24 +96,31 @@ bi_getboothowto(char *kargs)
* comconsole_port if not. PCI support is needed, but
* for that we'd ideally refactor the
* libi386/comconsole.c code to have identical behavior.
+* We only try to set the port for cases where we saw
+* the Serial(x) node when parsing, otherwise
+* specialized hardware that has Uart nodes will have a
+* bogus address set.
+* But if someone specifically setup hw.uart.console,
+* don't override that.
*/
+ speed = -1;
+ port = -1;
tmp = getenv("efi_com_speed");
- if (tmp != NULL) {
+ if (tmp != NULL)
speed = strtol(tmp, NULL, 0);
- tmp = getenv("efi_com_port");
- if (tmp == NULL)
- tmp = getenv("comconsole_port");
- /* XXX fallback to EFI variable set in rc.d? */
- if (tmp != NULL)
- port = strtol(tmp, NULL, 0);
- else
- port = 0x3f8;
+ tmp = getenv("efi_com_port");
+ if (tmp == NULL)
+ tmp = getenv("comconsole_port");
+ if (tmp != NULL)
+ port = strtol(tmp, NULL, 0);
+ if (speed != -1 && port != -1) {
snprintf(buf, sizeof(buf), "io:%d,br:%d", port,
speed);
env_setenv("hw.uart.console", EV_VOLATILE, buf,
NULL, NULL);
}
}
+#endif
}
return (howto);
Modified: head/stand/efi/loader/main.c
==
--- head/stand/efi/loader/main.cSat Jul 28 19:35:49 2018
(r336836)
+++ head/stand/efi/loader/main.cSat Jul 28 19:44:20 2018
(r336837)
@@ -644,6 +644,15 @@ parse_args(int argc, CHAR16 *argv[])
return (howto);
}
+static void
+setenv_int(const char *key, int val)
+{
+ char buf[20];
+
+ snprintf(buf, sizeof(buf), "%d", val);
+ setenv(key, buf, 1);
+}
+
/*
* Parse ConOut (the list of consoles active) and see if we can find a
* serial port and/or a video port. It would be nice to also walk the
@@ -675,15 +684,15 @@ parse_uefi_con_out(void)
DevicePathSubType(node) == ACPI_DP) {
/* Check for Serial node
svn commit: r336836 - head/release/tools
Author: cem Date: Sat Jul 28 19:35:49 2018 New Revision: 336836 URL: https://svnweb.freebsd.org/changeset/base/336836 Log: Remove insecure ciphers from GCE sshd configuration They were added for unclear reasons in r277263. The current OpenSSH defaults (7.5+) are reasonable, and do not include the insecure rc4 cipher: chacha20-poly1...@openssh.com, aes128-ctr,aes192-ctr,aes256-ctr, aes128-...@openssh.com,aes256-...@openssh.com, aes128-cbc,aes192-cbc,aes256-cbc I think I recall there being a reason for a specific list of ciphers on GCE at the time, but I do not recall what it was, and cannot find any current GCE documentation of such a list. So, just revert the explicit configuration and use sane openssh defaults. PR: 230092 Submitted by: Gustavo Scalet MFC after:3 days Security: yes Modified: head/release/tools/gce.conf Modified: head/release/tools/gce.conf == --- head/release/tools/gce.conf Sat Jul 28 19:08:00 2018(r336835) +++ head/release/tools/gce.conf Sat Jul 28 19:35:49 2018(r336836) @@ -66,7 +66,6 @@ EOF ChallengeResponseAuthentication no X11Forwarding no AcceptEnv LANG -Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc AllowAgentForwarding no ClientAliveInterval 420 EOF ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336835 - head/lib/libc/gen
Author: cem Date: Sat Jul 28 19:08:00 2018 New Revision: 336835 URL: https://svnweb.freebsd.org/changeset/base/336835 Log: Clean up execl*(3) manual page prototype formatting Rendering of execle was missing a comma between the NULL argument and envp. For unclear reasons, POSIX' definition of these routines comments out the mandatory trailing NULL argument. That seems unnecessary and probably (reasonably) confuses mdoc. For unclear reasons, POSIX' definition of these routines spells NULL as "(char *)0." This is needlessly unclear. One guess might be that POSIX targets more exotic computer architectures than FreeBSD does. Fortunately, there is no such problem on any reasonable platform for FreeBSD to support. Spell NULL as NULL. The comma was probably removed in r117204 while the comment and creative spelling of NULL were added in r116537 (both 15 years ago). Modified: head/lib/libc/gen/exec.3 Modified: head/lib/libc/gen/exec.3 == --- head/lib/libc/gen/exec.3Sat Jul 28 17:21:34 2018(r336834) +++ head/lib/libc/gen/exec.3Sat Jul 28 19:08:00 2018(r336835) @@ -28,7 +28,7 @@ .\" @(#)exec.3 8.3 (Berkeley) 1/24/94 .\" $FreeBSD$ .\" -.Dd January 5, 2016 +.Dd July 28, 2018 .Dt EXEC 3 .Os .Sh NAME @@ -46,16 +46,11 @@ .In unistd.h .Vt extern char **environ ; .Ft int -.Fn execl "const char *path" "const char *arg" ... /* "(char *)0" */ +.Fn execl "const char *path" "const char *arg" ... NULL .Ft int -.Fn execlp "const char *file" "const char *arg" ... /* "(char *)0" */ +.Fn execlp "const char *file" "const char *arg" ... NULL .Ft int -.Fo execle -.Fa "const char *path" "const char *arg" ... -.Fa /* -.Bk -words -.Fa "(char *)0" "char *const envp[]" */ -.Ek +.Fn execle "const char *path" "const char *arg" ... NULL "char *const envp[]" .Fc .Ft int .Fn exect "const char *path" "char *const argv[]" "char *const envp[]" ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336834 - in head/sys/arm: arm include mv/armadaxp ti
Author: andrew
Date: Sat Jul 28 17:21:34 2018
New Revision: 336834
URL: https://svnweb.freebsd.org/changeset/base/336834
Log:
Use the cp15 functions to read cp15 registers rather than using assembly
functions. The former are static inline functions so will compile to a
single instruction.
Modified:
head/sys/arm/arm/cpufunc.c
head/sys/arm/arm/cpufunc_asm.S
head/sys/arm/arm/identcpu-v4.c
head/sys/arm/arm/trap-v4.c
head/sys/arm/include/cpufunc.h
head/sys/arm/mv/armadaxp/armadaxp.c
head/sys/arm/mv/armadaxp/armadaxp_mp.c
head/sys/arm/ti/ti_cpuid.c
Modified: head/sys/arm/arm/cpufunc.c
==
--- head/sys/arm/arm/cpufunc.c Sat Jul 28 16:56:46 2018(r336833)
+++ head/sys/arm/arm/cpufunc.c Sat Jul 28 17:21:34 2018(r336834)
@@ -284,10 +284,8 @@ get_cachetype_cp15(void)
u_int multiplier;
u_char type;
- __asm __volatile("mrc p15, 0, %0, c0, c0, 1"
- : "=r" (ctype));
-
- cpuid = cpu_ident();
+ ctype = cp15_ctr_get();
+ cpuid = cp15_midr_get();
/*
* ...and thus spake the ARM ARM:
*
@@ -388,7 +386,7 @@ get_cachetype_cp15(void)
int
set_cpufuncs(void)
{
- cputype = cpu_ident();
+ cputype = cp15_midr_get();
cputype &= CPU_ID_CPU_MASK;
#if defined(CPU_ARM9E)
@@ -553,7 +551,7 @@ arm11x6_setup(void)
uint32_t tmp, tmp2;
uint32_t cpuid;
- cpuid = cpu_ident();
+ cpuid = cp15_midr_get();
auxctrl = 0;
auxctrl_wax = ~0;
Modified: head/sys/arm/arm/cpufunc_asm.S
==
--- head/sys/arm/arm/cpufunc_asm.S Sat Jul 28 16:56:46 2018
(r336833)
+++ head/sys/arm/arm/cpufunc_asm.S Sat Jul 28 17:21:34 2018
(r336834)
@@ -62,35 +62,10 @@ END(cpufunc_nullop)
*
*/
-ENTRY(cpu_ident)
- mrc p15, 0, r0, c0, c0, 0
- RET
-END(cpu_ident)
-
-ENTRY(cpu_get_control)
- mrc CP15_SCTLR(r0)
- RET
-END(cpu_get_control)
-
-ENTRY(cpu_read_cache_config)
- mrc p15, 0, r0, c0, c0, 1
- RET
-END(cpu_read_cache_config)
-
-ENTRY(cpu_faultstatus)
- mrc p15, 0, r0, c5, c0, 0
- RET
-END(cpu_faultstatus)
-
-ENTRY(cpu_faultaddress)
- mrc p15, 0, r0, c6, c0, 0
- RET
-END(cpu_faultaddress)
-
/*
* Generic functions to write the internal coprocessor registers
*
- *
+
* Currently these registers are
* c1 - CPU Control
* c3 - Domain Access Control
Modified: head/sys/arm/arm/identcpu-v4.c
==
--- head/sys/arm/arm/identcpu-v4.c Sat Jul 28 16:56:46 2018
(r336833)
+++ head/sys/arm/arm/identcpu-v4.c Sat Jul 28 17:21:34 2018
(r336834)
@@ -279,8 +279,8 @@ identify_arm_cpu(void)
u_int cpuid, ctrl;
int i;
- ctrl = cpu_get_control();
- cpuid = cpu_ident();
+ ctrl = cp15_sctlr_get();
+ cpuid = cp15_midr_get();
if (cpuid == 0) {
printf("Processor failed probe - no CPU ID\n");
Modified: head/sys/arm/arm/trap-v4.c
==
--- head/sys/arm/arm/trap-v4.c Sat Jul 28 16:56:46 2018(r336833)
+++ head/sys/arm/arm/trap-v4.c Sat Jul 28 17:21:34 2018(r336834)
@@ -189,8 +189,8 @@ abort_handler(struct trapframe *tf, int type)
return (prefetch_abort_handler(tf));
/* Grab FAR/FSR before enabling interrupts */
- far = cpu_faultaddress();
- fsr = cpu_faultstatus();
+ far = cp15_dfar_get();
+ fsr = cp15_dfsr_get();
#if 0
printf("data abort: fault address=%p (from pc=%p lr=%p)\n",
(void*)far, (void*)tf->tf_pc, (void*)tf->tf_svc_lr);
Modified: head/sys/arm/include/cpufunc.h
==
--- head/sys/arm/include/cpufunc.h Sat Jul 28 16:56:46 2018
(r336833)
+++ head/sys/arm/include/cpufunc.h Sat Jul 28 17:21:34 2018
(r336834)
@@ -208,12 +208,8 @@ intset_cpufuncs(void);
#define ARCHITECTURE_NOT_SUPPORTED 2 /* not known */
void cpufunc_nullop (void);
-u_int cpu_ident (void);
u_int cpufunc_control (u_int clear, u_int bic);
void cpu_domains (u_int domains);
-u_int cpu_faultstatus (void);
-u_int cpu_faultaddress(void);
-u_int cpu_get_control (void);
u_int cpu_pfr (int);
#if defined(CPU_ARM9E)
Modified: head/sys/arm/mv/armadaxp/armadaxp.c
==
--- head/sys/arm/mv/armadaxp/armadaxp.c Sat Jul 28 16:56:46 2018
(r336833)
+++ head/sys/arm/mv/armadaxp/armadaxp.c Sat Jul 28 17:21:34 2018
(r336834)
@@ -35,8 +35,9 @@
svn commit: r336833 - head/sys/arm/arm
Author: andrew Date: Sat Jul 28 16:56:46 2018 New Revision: 336833 URL: https://svnweb.freebsd.org/changeset/base/336833 Log: Remove an unneeded cpu_ident() prototype. Modified: head/sys/arm/arm/elf_trampoline.c Modified: head/sys/arm/arm/elf_trampoline.c == --- head/sys/arm/arm/elf_trampoline.c Sat Jul 28 15:42:57 2018 (r336832) +++ head/sys/arm/arm/elf_trampoline.c Sat Jul 28 16:56:46 2018 (r336833) @@ -56,7 +56,6 @@ void _start(void); void __start(void); void __startC(unsigned r0, unsigned r1, unsigned r2, unsigned r3); -extern unsigned int cpu_ident(void); extern void do_call(void *, void *, void *, int); #define GZ_HEAD0xa ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336832 - head/sys/sparc64/include
Author: marius
Date: Sat Jul 28 15:42:57 2018
New Revision: 336832
URL: https://svnweb.freebsd.org/changeset/base/336832
Log:
Implement atomic_swap_{32,64,int,long,ptr}(9).
Modified:
head/sys/sparc64/include/atomic.h
Modified: head/sys/sparc64/include/atomic.h
==
--- head/sys/sparc64/include/atomic.h Sat Jul 28 12:53:10 2018
(r336831)
+++ head/sys/sparc64/include/atomic.h Sat Jul 28 15:42:57 2018
(r336832)
@@ -154,14 +154,15 @@
e; \
})
-#defineatomic_st(p, v, sz) do {
\
+#defineatomic_st(p, v, sz) ({
\
itype(sz) e, r; \
for (e = *(volatile itype(sz) *)(p);; e = r) { \
r = atomic_cas((p), e, (v), sz);\
if (r == e) \
break; \
} \
-} while (0)
+ e; \
+})
#defineatomic_st_acq(p, v, sz) do {
\
atomic_st((p), (v), sz);\
@@ -310,6 +311,12 @@ static __inline void
\
atomic_store_rel_ ## name(volatile ptype p, vtype v) \
{ \
atomic_st_rel((p), (v), sz);\
+} \
+ \
+static __inline vtype \
+atomic_swap_ ## name(volatile ptype p, vtype v)
\
+{ \
+ return ((vtype)atomic_st((p), (v), sz));\
}
static __inline void
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336831 - head/sys/arm/arm
Author: andrew
Date: Sat Jul 28 12:53:10 2018
New Revision: 336831
URL: https://svnweb.freebsd.org/changeset/base/336831
Log:
Remove some write only global values from the arm cpufunc code.
Modified:
head/sys/arm/arm/cpufunc.c
Modified: head/sys/arm/arm/cpufunc.c
==
--- head/sys/arm/arm/cpufunc.c Sat Jul 28 12:52:03 2018(r336830)
+++ head/sys/arm/arm/cpufunc.c Sat Jul 28 12:53:10 2018(r336831)
@@ -268,11 +268,6 @@ u_int cpu_reset_needs_v4_MMU_disable; /* flag used in
defined(CPU_MV_PJ4B) || \
defined(CPU_CORTEXA) || defined(CPU_KRAIT)
-/* Global cache line sizes, use 32 as default */
-intarm_dcache_min_line_size = 32;
-intarm_icache_min_line_size = 32;
-intarm_idcache_min_line_size = 32;
-
static void get_cachetype_cp15(void);
/* Additional cache information local to this file. Log2 of some of the
@@ -304,12 +299,6 @@ get_cachetype_cp15(void)
goto out;
if (CPU_CT_FORMAT(ctype) == CPU_CT_ARMV7) {
- /* Resolve minimal cache line sizes */
- arm_dcache_min_line_size = 1 << (CPU_CT_DMINLINE(ctype) + 2);
- arm_icache_min_line_size = 1 << (CPU_CT_IMINLINE(ctype) + 2);
- arm_idcache_min_line_size =
- min(arm_icache_min_line_size, arm_dcache_min_line_size);
-
__asm __volatile("mrc p15, 1, %0, c0, c0, 1"
: "=r" (clevel));
arm_cache_level = clevel;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336830 - head/sys/arm/arm
Author: andrew
Date: Sat Jul 28 12:52:03 2018
New Revision: 336830
URL: https://svnweb.freebsd.org/changeset/base/336830
Log:
Remove an unused function from the arm ELF trampoline. It tries to find
properties about the CPU caches, however we never use these values.
Modified:
head/sys/arm/arm/elf_trampoline.c
Modified: head/sys/arm/arm/elf_trampoline.c
==
--- head/sys/arm/arm/elf_trampoline.c Sat Jul 28 12:50:09 2018
(r336829)
+++ head/sys/arm/arm/elf_trampoline.c Sat Jul 28 12:52:03 2018
(r336830)
@@ -72,35 +72,6 @@ extern void sheeva_l2cache_wbinv_all(void);
#define cpu_l2cache_wbinv_all()
#endif
-
-int arm_picache_size;
-int arm_picache_line_size;
-int arm_picache_ways;
-
-int arm_pdcache_size; /* and unified */
-int arm_pdcache_line_size = 32;
-int arm_pdcache_ways;
-
-int arm_pcache_type;
-int arm_pcache_unified;
-
-int arm_dcache_align;
-int arm_dcache_align_mask;
-
-int arm_dcache_min_line_size = 32;
-int arm_icache_min_line_size = 32;
-int arm_idcache_min_line_size = 32;
-
-u_int arm_cache_level;
-u_int arm_cache_type[14];
-u_int arm_cache_loc;
-
-/* Additional cache information local to this file. Log2 of some of the
- above numbers. */
-static int arm_dcache_l2_nsets;
-static int arm_dcache_l2_assoc;
-static int arm_dcache_l2_linesize;
-
/*
* Boot parameters
*/
@@ -229,114 +200,6 @@ _startC(unsigned r0, unsigned r1, unsigned r2, unsigne
"mov sp, %2\n"
: "=r" (tmp1), "+r" (kernphysaddr), "+r" (sp));
__start();
-}
-
-static void
-get_cachetype_cp15()
-{
- u_int ctype, isize, dsize, cpuid;
- u_int clevel, csize, i, sel;
- u_int multiplier;
- u_char type;
-
- __asm __volatile("mrc p15, 0, %0, c0, c0, 1"
- : "=r" (ctype));
-
- cpuid = cpu_ident();
- /*
-* ...and thus spake the ARM ARM:
-*
-* If an value corresponding to an unimplemented or
-* reserved ID register is encountered, the System Control
-* processor returns the value of the main ID register.
-*/
- if (ctype == cpuid)
- goto out;
-
- if (CPU_CT_FORMAT(ctype) == CPU_CT_ARMV7) {
- /* Resolve minimal cache line sizes */
- arm_dcache_min_line_size = 1 << (CPU_CT_DMINLINE(ctype) + 2);
- arm_icache_min_line_size = 1 << (CPU_CT_IMINLINE(ctype) + 2);
- arm_idcache_min_line_size =
- (arm_dcache_min_line_size > arm_icache_min_line_size ?
- arm_icache_min_line_size : arm_dcache_min_line_size);
-
- __asm __volatile("mrc p15, 1, %0, c0, c0, 1"
- : "=r" (clevel));
- arm_cache_level = clevel;
- arm_cache_loc = CPU_CLIDR_LOC(arm_cache_level) + 1;
- i = 0;
- while ((type = (clevel & 0x7)) && i < 7) {
- if (type == CACHE_DCACHE || type == CACHE_UNI_CACHE ||
- type == CACHE_SEP_CACHE) {
- sel = i << 1;
- __asm __volatile("mcr p15, 2, %0, c0, c0, 0"
- : : "r" (sel));
- __asm __volatile("mrc p15, 1, %0, c0, c0, 0"
- : "=r" (csize));
- arm_cache_type[sel] = csize;
- }
- if (type == CACHE_ICACHE || type == CACHE_SEP_CACHE) {
- sel = (i << 1) | 1;
- __asm __volatile("mcr p15, 2, %0, c0, c0, 0"
- : : "r" (sel));
- __asm __volatile("mrc p15, 1, %0, c0, c0, 0"
- : "=r" (csize));
- arm_cache_type[sel] = csize;
- }
- i++;
- clevel >>= 3;
- }
- } else {
- if ((ctype & CPU_CT_S) == 0)
- arm_pcache_unified = 1;
-
- /*
-* If you want to know how this code works, go read the ARM ARM.
-*/
-
- arm_pcache_type = CPU_CT_CTYPE(ctype);
-
- if (arm_pcache_unified == 0) {
- isize = CPU_CT_ISIZE(ctype);
- multiplier = (isize & CPU_CT_xSIZE_M) ? 3 : 2;
- arm_picache_line_size = 1U << (CPU_CT_xSIZE_LEN(isize)
+ 3);
- if (CPU_CT_xSIZE_ASSOC(isize) == 0) {
- if (isize & CPU_CT_xSIZE_M)
- arm_picache_line_size = 0; /* not
present */
- else
- arm_picache_ways =
svn commit: r336829 - in head/sys: arm/arm conf
Author: andrew
Date: Sat Jul 28 12:50:09 2018
New Revision: 336829
URL: https://svnweb.freebsd.org/changeset/base/336829
Log:
Only build the cache handling code we need when building the arm ELF
trampoline.
Modified:
head/sys/arm/arm/cpufunc_asm_armv5_ec.S
head/sys/arm/arm/cpufunc_asm_sheeva.S
head/sys/conf/Makefile.arm
Modified: head/sys/arm/arm/cpufunc_asm_armv5_ec.S
==
--- head/sys/arm/arm/cpufunc_asm_armv5_ec.S Sat Jul 28 12:20:42 2018
(r336828)
+++ head/sys/arm/arm/cpufunc_asm_armv5_ec.S Sat Jul 28 12:50:09 2018
(r336829)
@@ -39,6 +39,7 @@
#include
__FBSDID("$FreeBSD$");
+#ifndef ELF_TRAMPOLINE
/*
* Functions to set the MMU Translation Table Base register
*
@@ -192,6 +193,7 @@ ENTRY(armv5_ec_idcache_wbinv_range)
mcr p15, 0, r0, c7, c10, 4 /* drain the write buffer */
RET
END(armv5_ec_idcache_wbinv_range)
+#endif /* !ELF_TRAMPOLINE */
ENTRY_NP(armv5_ec_idcache_wbinv_all)
.Larmv5_ec_idcache_wbinv_all:
@@ -204,6 +206,7 @@ ENTRY_NP(armv5_ec_idcache_wbinv_all)
/* Fall through to purge Dcache. */
END(armv5_ec_idcache_wbinv_all)
+#ifndef ELF_TRAMPOLINE
ENTRY(armv5_ec_dcache_wbinv_all)
.Larmv5_ec_dcache_wbinv_all:
1: mrc p15, 0, APSR_nzcv, c7, c14, 3 /* Test, clean and invalidate
DCache */
@@ -211,4 +214,4 @@ ENTRY(armv5_ec_dcache_wbinv_all)
mcr p15, 0, r0, c7, c10, 4 /* drain the write buffer */
RET
END(armv5_ec_dcache_wbinv_all)
-
+#endif
Modified: head/sys/arm/arm/cpufunc_asm_sheeva.S
==
--- head/sys/arm/arm/cpufunc_asm_sheeva.S Sat Jul 28 12:20:42 2018
(r336828)
+++ head/sys/arm/arm/cpufunc_asm_sheeva.S Sat Jul 28 12:50:09 2018
(r336829)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+#ifndef ELF_TRAMPOLINE
.Lsheeva_cache_line_size:
.word _C_LABEL(arm_pdcache_line_size)
.Lsheeva_asm_page_mask:
@@ -376,6 +377,7 @@ ENTRY(sheeva_l2cache_wb_range)
ldr lr, [sp], #4
RET
END(sheeva_l2cache_wb_range)
+#endif /* !ELF_TRAMPOLINE */
ENTRY(sheeva_l2cache_wbinv_all)
/* Disable irqs */
@@ -393,6 +395,7 @@ ENTRY(sheeva_l2cache_wbinv_all)
RET
END(sheeva_l2cache_wbinv_all)
+#ifndef ELF_TRAMPOLINE
/* This function modifies register value as follows:
*
* arg1 arg EFFECT (bit value saved into register)
@@ -418,4 +421,4 @@ ENTRY(sheeva_cpu_sleep)
mcr p15, 0, r0, c7, c0, 4 /* Wait for interrupt */
mov pc, lr
END(sheeva_cpu_sleep)
-
+#endif /* !ELF_TRAMPOLINE */
Modified: head/sys/conf/Makefile.arm
==
--- head/sys/conf/Makefile.arm Sat Jul 28 12:20:42 2018(r336828)
+++ head/sys/conf/Makefile.arm Sat Jul 28 12:50:09 2018(r336829)
@@ -73,8 +73,6 @@ SYSTEM_LD_TAIL +=;sed s/" + SIZEOF_HEADERS"// ldscript
rm ${FULLKERNEL}.noheader
FILES_CPU_FUNC = \
- $S/$M/$M/cpufunc_asm_arm9.S \
- $S/$M/$M/cpufunc_asm.S \
$S/$M/$M/cpufunc_asm_armv5_ec.S \
$S/$M/$M/cpufunc_asm_sheeva.S
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336828 - in head/sys/arm: arm include
Author: andrew
Date: Sat Jul 28 12:20:42 2018
New Revision: 336828
URL: https://svnweb.freebsd.org/changeset/base/336828
Log:
Make the arm cpu setup functions static. Any other place that needs these
functions will use the function pointer we create for them.
Modified:
head/sys/arm/arm/cpufunc.c
head/sys/arm/include/cpufunc.h
Modified: head/sys/arm/arm/cpufunc.c
==
--- head/sys/arm/arm/cpufunc.c Sat Jul 28 12:16:57 2018(r336827)
+++ head/sys/arm/arm/cpufunc.c Sat Jul 28 12:20:42 2018(r336828)
@@ -81,6 +81,19 @@ u_intarm_cache_type[14];
u_int arm_cache_loc;
#if defined(CPU_ARM9E)
+static void arm10_setup(void);
+#endif
+#ifdef CPU_MV_PJ4B
+static void pj4bv7_setup(void);
+#endif
+#if defined(CPU_ARM1176)
+static void arm11x6_setup(void);
+#endif
+#if defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+static void cortexa_setup(void);
+#endif
+
+#if defined(CPU_ARM9E)
struct cpu_functions armv5_ec_cpufuncs = {
/* CPU functions */
@@ -473,7 +486,7 @@ out:
*/
#if defined(CPU_ARM9E)
-void
+static void
arm10_setup(void)
{
int cpuctrl, cpuctrlmask;
@@ -544,7 +557,7 @@ cpu_scc_setup_ccnt(void)
#endif
#if defined(CPU_ARM1176)
-void
+static void
arm11x6_setup(void)
{
uint32_t auxctrl, auxctrl_wax;
@@ -576,7 +589,7 @@ arm11x6_setup(void)
#endif /* CPU_ARM1176 */
#ifdef CPU_MV_PJ4B
-void
+static void
pj4bv7_setup(void)
{
@@ -586,8 +599,7 @@ pj4bv7_setup(void)
#endif /* CPU_MV_PJ4B */
#if defined(CPU_CORTEXA) || defined(CPU_KRAIT)
-
-void
+static void
cortexa_setup(void)
{
Modified: head/sys/arm/include/cpufunc.h
==
--- head/sys/arm/include/cpufunc.h Sat Jul 28 12:16:57 2018
(r336827)
+++ head/sys/arm/include/cpufunc.h Sat Jul 28 12:20:42 2018
(r336828)
@@ -220,8 +220,6 @@ u_int cpu_pfr (int);
void arm9_tlb_flushID_SE (u_int va);
void arm9_context_switch (void);
-void arm10_setup (void);
-
u_int sheeva_control_ext (u_int, u_int);
void sheeva_cpu_sleep(int);
void sheeva_setttb (u_int);
@@ -238,17 +236,12 @@ void sheeva_l2cache_wbinv_all(void);
#if defined(CPU_CORTEXA) || defined(CPU_MV_PJ4B) || defined(CPU_KRAIT)
void armv7_cpu_sleep (int);
-void armv7_setup (void);
-
-void cortexa_setup (void);
#endif
#if defined(CPU_MV_PJ4B)
void pj4b_config (void);
-void pj4bv7_setup(void);
#endif
#if defined(CPU_ARM1176)
-voidarm11x6_setup (void);
voidarm11x6_sleep (int); /* no ref. for errata */
#endif
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336827 - head/sys/arm/arm
Author: andrew Date: Sat Jul 28 12:16:57 2018 New Revision: 336827 URL: https://svnweb.freebsd.org/changeset/base/336827 Log: Remove an unneeded check for CPU_XSCALE_81342 Modified: head/sys/arm/arm/identcpu-v4.c Modified: head/sys/arm/arm/identcpu-v4.c == --- head/sys/arm/arm/identcpu-v4.c Sat Jul 28 12:00:32 2018 (r336826) +++ head/sys/arm/arm/identcpu-v4.c Sat Jul 28 12:16:57 2018 (r336827) @@ -317,9 +317,6 @@ identify_arm_cpu(void) case CPU_CLASS_MARVELL: print_enadis(ctrl & CPU_CONTROL_DC_ENABLE, "DC"); print_enadis(ctrl & CPU_CONTROL_IC_ENABLE, "IC"); -#ifdef CPU_XSCALE_81342 - print_enadis(ctrl & CPU_CONTROL_L2_ENABLE, "L2"); -#endif #if defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY) i = sheeva_control_ext(0, 0); print_enadis(i & MV_WA_ENABLE, "WA"); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336826 - in head/sys/arm: arm include
Author: andrew
Date: Sat Jul 28 12:00:32 2018
New Revision: 336826
URL: https://svnweb.freebsd.org/changeset/base/336826
Log:
Remove old CPU_ values from the arm cpufunc code. These have been removed.
Modified:
head/sys/arm/arm/cpufunc.c
head/sys/arm/arm/cpufunc_asm_arm9.S
head/sys/arm/include/cpufunc.h
Modified: head/sys/arm/arm/cpufunc.c
==
--- head/sys/arm/arm/cpufunc.c Sat Jul 28 11:58:43 2018(r336825)
+++ head/sys/arm/arm/cpufunc.c Sat Jul 28 12:00:32 2018(r336826)
@@ -61,10 +61,6 @@ __FBSDID("$FreeBSD$");
#include
-#if defined(CPU_XSCALE_81342)
-#include
-#endif
-
/* PRIMARY CACHE VARIABLES */
intarm_picache_size;
intarm_picache_line_size;
@@ -84,57 +80,6 @@ u_intarm_cache_level;
u_int arm_cache_type[14];
u_int arm_cache_loc;
-#ifdef CPU_ARM9
-struct cpu_functions arm9_cpufuncs = {
- /* CPU functions */
-
- cpufunc_nullop, /* cpwait */
-
- /* MMU functions */
-
- cpufunc_control,/* control */
- arm9_setttb,/* Setttb */
-
- /* TLB functions */
-
- armv4_tlb_flushID, /* tlb_flushID */
- arm9_tlb_flushID_SE,/* tlb_flushID_SE */
- armv4_tlb_flushD, /* tlb_flushD */
- armv4_tlb_flushD_SE,/* tlb_flushD_SE*/
-
- /* Cache operations */
-
- arm9_icache_sync_range, /* icache_sync_range*/
-
- arm9_dcache_wbinv_all, /* dcache_wbinv_all */
- arm9_dcache_wbinv_range,/* dcache_wbinv_range */
- arm9_dcache_inv_range, /* dcache_inv_range */
- arm9_dcache_wb_range, /* dcache_wb_range */
-
- armv4_idcache_inv_all, /* idcache_inv_all */
- arm9_idcache_wbinv_all, /* idcache_wbinv_all*/
- arm9_idcache_wbinv_range, /* idcache_wbinv_range */
- cpufunc_nullop, /* l2cache_wbinv_all*/
- (void *)cpufunc_nullop, /* l2cache_wbinv_range */
- (void *)cpufunc_nullop, /* l2cache_inv_range*/
- (void *)cpufunc_nullop, /* l2cache_wb_range */
- (void *)cpufunc_nullop, /* l2cache_drain_writebuf */
-
- /* Other functions */
-
- armv4_drain_writebuf, /* drain_writebuf */
-
- (void *)cpufunc_nullop, /* sleep*/
-
- /* Soft functions */
-
- arm9_context_switch,/* context_switch */
-
- arm9_setup /* cpu setup*/
-
-};
-#endif /* CPU_ARM9 */
-
#if defined(CPU_ARM9E)
struct cpu_functions armv5_ec_cpufuncs = {
/* CPU functions */
@@ -254,160 +199,6 @@ struct cpu_functions pj4bv7_cpufuncs = {
};
#endif /* CPU_MV_PJ4B */
-#if defined(CPU_XSCALE_PXA2X0)
-
-struct cpu_functions xscale_cpufuncs = {
- /* CPU functions */
-
- xscale_cpwait, /* cpwait */
-
- /* MMU functions */
-
- xscale_control, /* control */
- xscale_setttb, /* setttb */
-
- /* TLB functions */
-
- armv4_tlb_flushID, /* tlb_flushID */
- xscale_tlb_flushID_SE, /* tlb_flushID_SE */
- armv4_tlb_flushD, /* tlb_flushD */
- armv4_tlb_flushD_SE,/* tlb_flushD_SE*/
-
- /* Cache operations */
-
- xscale_cache_syncI_rng, /* icache_sync_range*/
-
- xscale_cache_purgeD,/* dcache_wbinv_all */
- xscale_cache_purgeD_rng,/* dcache_wbinv_range */
- xscale_cache_flushD_rng,/* dcache_inv_range */
- xscale_cache_cleanD_rng,/* dcache_wb_range */
-
- xscale_cache_flushID, /* idcache_inv_all */
- xscale_cache_purgeID, /* idcache_wbinv_all*/
- xscale_cache_purgeID_rng, /* idcache_wbinv_range */
- cpufunc_nullop, /* l2cache_wbinv_all*/
- (void *)cpufunc_nullop, /* l2cache_wbinv_range */
- (void *)cpufunc_nullop, /* l2cache_inv_range*/
- (void *)cpufunc_nullop, /* l2cache_wb_range */
- (void *)cpufunc_nullop, /* l2cache_drain_writebuf */
-
- /* Other functions */
-
- armv4_drain_writebuf, /* drain_writebuf */
-
- xscale_cpu_sleep, /* sleep*/
-
- /* Soft functions */
-
- xscale_context_switch, /* context_switch */
-
- xscale_setup/* cpu setup*/
-};
-#endif
-/* CPU_XSCALE_PXA2X0 */
-
-#ifdef CPU_XSCALE_81342
-struct cpu_functions xscalec3_cpufuncs = {
- /* CPU functions */
svn commit: r336825 - head/sys/arm/arm
Author: andrew
Date: Sat Jul 28 11:58:43 2018
New Revision: 336825
URL: https://svnweb.freebsd.org/changeset/base/336825
Log:
Remove the old CPU_ values from the arm kernel trampoline. These options
are gone so we can remove them from the code.
Modified:
head/sys/arm/arm/elf_trampoline.c
Modified: head/sys/arm/arm/elf_trampoline.c
==
--- head/sys/arm/arm/elf_trampoline.c Sat Jul 28 11:09:34 2018
(r336824)
+++ head/sys/arm/arm/elf_trampoline.c Sat Jul 28 11:58:43 2018
(r336825)
@@ -61,26 +61,11 @@ extern void do_call(void *, void *, void *, int);
#define GZ_HEAD0xa
-#if defined(CPU_ARM9)
-#define cpu_idcache_wbinv_all arm9_idcache_wbinv_all
-extern void arm9_idcache_wbinv_all(void);
-#elif defined(CPU_FA526)
-#define cpu_idcache_wbinv_all fa526_idcache_wbinv_all
-extern void fa526_idcache_wbinv_all(void);
-#elif defined(CPU_ARM9E)
+#if defined(CPU_ARM9E)
#define cpu_idcache_wbinv_all armv5_ec_idcache_wbinv_all
extern void armv5_ec_idcache_wbinv_all(void);
-#elif defined(CPU_XSCALE_PXA2X0)
-#define cpu_idcache_wbinv_all xscale_cache_purgeID
-extern void xscale_cache_purgeID(void);
-#elif defined(CPU_XSCALE_81342)
-#define cpu_idcache_wbinv_all xscalec3_cache_purgeID
-extern void xscalec3_cache_purgeID(void);
#endif
-#ifdef CPU_XSCALE_81342
-#define cpu_l2cache_wbinv_all xscalec3_l2cache_purge
-extern void xscalec3_l2cache_purge(void);
-#elif defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY)
+#if defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY)
#define cpu_l2cache_wbinv_all sheeva_l2cache_wbinv_all
extern void sheeva_l2cache_wbinv_all(void);
#else
@@ -121,11 +106,6 @@ static int arm_dcache_l2_linesize;
*/
static struct arm_boot_params s_boot_params;
-extern int arm9_dcache_sets_inc;
-extern int arm9_dcache_sets_max;
-extern int arm9_dcache_index_max;
-extern int arm9_dcache_index_inc;
-
static __inline void *
memcpy(void *dst, const void *src, int len)
{
@@ -165,8 +145,6 @@ bzero(void *addr, int count)
}
}
-static void arm9_setup(void);
-
void
_startC(unsigned r0, unsigned r1, unsigned r2, unsigned r3)
{
@@ -250,13 +228,6 @@ _startC(unsigned r0, unsigned r1, unsigned r2, unsigne
"2: nop\n"
"mov sp, %2\n"
: "=r" (tmp1), "+r" (kernphysaddr), "+r" (sp));
-#ifndef KZIP
-#ifdef CPU_ARM9
- /* So that idcache_wbinv works; */
- if ((cpu_ident() & 0xf000) == 0x9000)
- arm9_setup();
-#endif
-#endif
__start();
}
@@ -368,18 +339,6 @@ get_cachetype_cp15()
}
}
-static void
-arm9_setup(void)
-{
-
- get_cachetype_cp15();
- arm9_dcache_sets_inc = 1U << arm_dcache_l2_linesize;
- arm9_dcache_sets_max = (1U << (arm_dcache_l2_linesize +
- arm_dcache_l2_nsets)) - arm9_dcache_sets_inc;
- arm9_dcache_index_inc = 1U << (32 - arm_dcache_l2_assoc);
- arm9_dcache_index_max = 0U - arm9_dcache_index_inc;
-}
-
#ifdef KZIP
static unsigned char *orig_input, *i_input, *i_output;
@@ -684,11 +643,6 @@ __start(void)
pt_addr = L1_TABLE_SIZE +
rounddown2((int)&_end + KERNSIZE + 0x100, L1_TABLE_SIZE);
-#ifdef CPU_ARM9
- /* So that idcache_wbinv works; */
- if ((cpu_ident() & 0xf000) == 0x9000)
- arm9_setup();
-#endif
setup_pagetables(pt_addr, (vm_paddr_t)curaddr,
(vm_paddr_t)curaddr + 0x1000, 1);
/* Gzipped kernel */
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336824 - vendor/lldb/lldb-trunk-r338150
Author: dim Date: Sat Jul 28 11:09:34 2018 New Revision: 336824 URL: https://svnweb.freebsd.org/changeset/base/336824 Log: Tag lldb trunk r338150. Added: vendor/lldb/lldb-trunk-r338150/ - copied from r336823, vendor/lldb/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336820 - vendor/libc++/libc++-trunk-r338150
Author: dim Date: Sat Jul 28 11:08:13 2018 New Revision: 336820 URL: https://svnweb.freebsd.org/changeset/base/336820 Log: Tag libc++ trunk r338150. Added: vendor/libc++/libc++-trunk-r338150/ - copied from r336819, vendor/libc++/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336816 - vendor/clang/clang-trunk-r338150
Author: dim Date: Sat Jul 28 11:06:16 2018 New Revision: 336816 URL: https://svnweb.freebsd.org/changeset/base/336816 Log: Tag clang trunk r338150. Added: vendor/clang/clang-trunk-r338150/ - copied from r336815, vendor/clang/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336822 - vendor/lld/lld-trunk-r338150
Author: dim Date: Sat Jul 28 11:08:40 2018 New Revision: 336822 URL: https://svnweb.freebsd.org/changeset/base/336822 Log: Tag lld trunk r338150. Added: vendor/lld/lld-trunk-r338150/ - copied from r336821, vendor/lld/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336818 - vendor/compiler-rt/compiler-rt-trunk-r338150
Author: dim Date: Sat Jul 28 11:06:56 2018 New Revision: 336818 URL: https://svnweb.freebsd.org/changeset/base/336818 Log: Tag compiler-rt trunk r338150. Added: vendor/compiler-rt/compiler-rt-trunk-r338150/ - copied from r336817, vendor/compiler-rt/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336814 - vendor/llvm/llvm-trunk-r338150
Author: dim Date: Sat Jul 28 11:01:08 2018 New Revision: 336814 URL: https://svnweb.freebsd.org/changeset/base/336814 Log: Tag llvm trunk r338150. Added: vendor/llvm/llvm-trunk-r338150/ - copied from r336813, vendor/llvm/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336813 - in head/sys: arm/arm arm/conf conf
> On 28 Jul 2018, at 12:00, Andrew Turner wrote: > > Author: andrew > Date: Sat Jul 28 11:00:45 2018 > New Revision: 336813 > URL: https://svnweb.freebsd.org/changeset/base/336813 > > Log: > Remove now the cow unused CPU_ARM9 and CPU_FA526 options. These are for > ARMv4 CPUs that are no longer supported. While here also remove unused xscale files. Andrew ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336813 - in head/sys: arm/arm arm/conf conf
Author: andrew
Date: Sat Jul 28 11:00:45 2018
New Revision: 336813
URL: https://svnweb.freebsd.org/changeset/base/336813
Log:
Remove now the cow unused CPU_ARM9 and CPU_FA526 options. These are for
ARMv4 CPUs that are no longer supported.
Deleted:
head/sys/arm/arm/cpufunc_asm_fa526.S
head/sys/arm/arm/cpufunc_asm_xscale.S
head/sys/arm/arm/cpufunc_asm_xscale_c3.S
Modified:
head/sys/arm/conf/NOTES
head/sys/conf/Makefile.arm
head/sys/conf/files.arm
head/sys/conf/options.arm
Modified: head/sys/arm/conf/NOTES
==
--- head/sys/arm/conf/NOTES Sat Jul 28 11:00:21 2018(r336812)
+++ head/sys/arm/conf/NOTES Sat Jul 28 11:00:45 2018(r336813)
@@ -2,9 +2,7 @@
machinearm
-cpuCPU_ARM9
cpuCPU_ARM9E
-cpuCPU_FA526
files "../mv/files.mv"
files "../mv/discovery/files.db78xxx"
Modified: head/sys/conf/Makefile.arm
==
--- head/sys/conf/Makefile.arm Sat Jul 28 11:00:21 2018(r336812)
+++ head/sys/conf/Makefile.arm Sat Jul 28 11:00:45 2018(r336813)
@@ -74,9 +74,9 @@ SYSTEM_LD_TAIL +=;sed s/" + SIZEOF_HEADERS"// ldscript
FILES_CPU_FUNC = \
$S/$M/$M/cpufunc_asm_arm9.S \
- $S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S \
- $S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S \
- $S/$M/$M/cpufunc_asm_fa526.S $S/$M/$M/cpufunc_asm_sheeva.S
+ $S/$M/$M/cpufunc_asm.S \
+ $S/$M/$M/cpufunc_asm_armv5_ec.S \
+ $S/$M/$M/cpufunc_asm_sheeva.S
.if ${MACHINE_ARCH:Marmv[67]*} == "" && defined(KERNPHYSADDR)
KERNEL_EXTRA=trampoline
Modified: head/sys/conf/files.arm
==
--- head/sys/conf/files.arm Sat Jul 28 11:00:21 2018(r336812)
+++ head/sys/conf/files.arm Sat Jul 28 11:00:45 2018(r336813)
@@ -30,16 +30,13 @@ arm/arm/busdma_machdep-v6.c optionalarmv7 |
armv6 |
arm/arm/copystr.S standard
arm/arm/cpufunc.c standard
arm/arm/cpufunc_asm.S standard
-arm/arm/cpufunc_asm_arm9.S optionalcpu_arm9 | cpu_arm9e
+arm/arm/cpufunc_asm_arm9.S optionalcpu_arm9e
arm/arm/cpufunc_asm_arm11x6.S optionalcpu_arm1176
-arm/arm/cpufunc_asm_armv4.Soptionalcpu_arm9 | cpu_arm9e |
cpu_fa526 | cpu_xscale_pxa2x0 | cpu_xscale_81342
+arm/arm/cpufunc_asm_armv4.Soptionalcpu_arm9e
arm/arm/cpufunc_asm_armv5_ec.S optionalcpu_arm9e
arm/arm/cpufunc_asm_armv7.Soptionalcpu_cortexa | cpu_krait |
cpu_mv_pj4b
-arm/arm/cpufunc_asm_fa526.Soptionalcpu_fa526
arm/arm/cpufunc_asm_pj4b.S optionalcpu_mv_pj4b
arm/arm/cpufunc_asm_sheeva.S optionalcpu_arm9e
-arm/arm/cpufunc_asm_xscale.S optionalcpu_xscale_pxa2x0 |
cpu_xscale_81342
-arm/arm/cpufunc_asm_xscale_c3.Soptionalcpu_xscale_81342
arm/arm/cpuinfo.c standard
arm/arm/cpu_asm-v6.S optionalarmv7 | armv6
arm/arm/db_disasm.coptionalddb
Modified: head/sys/conf/options.arm
==
--- head/sys/conf/options.arm Sat Jul 28 11:00:21 2018(r336812)
+++ head/sys/conf/options.arm Sat Jul 28 11:00:45 2018(r336813)
@@ -9,12 +9,10 @@ ARM_USE_V6_BUSDMA opt_global.h
ARM_WANT_TP_ADDRESSopt_global.h
COUNTS_PER_SEC opt_timer.h
CPSW_ETHERSWITCH opt_cpsw.h
-CPU_ARM9 opt_global.h
CPU_ARM9E opt_global.h
CPU_ARM1176opt_global.h
CPU_CORTEXAopt_global.h
CPU_KRAIT opt_global.h
-CPU_FA526 opt_global.h
CPU_MV_PJ4Bopt_global.h
SMP_ON_UP opt_global.h # Runtime detection of MP extensions
DEV_GICopt_global.h
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336812 - vendor/llvm/llvm-trunk-r338150
Author: dim Date: Sat Jul 28 11:00:21 2018 New Revision: 336812 URL: https://svnweb.freebsd.org/changeset/base/336812 Log: Delete tag, for retagging. Deleted: vendor/llvm/llvm-trunk-r338150/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336810 - vendor/llvm/llvm-trunk-r338150
Author: dim Date: Sat Jul 28 10:51:41 2018 New Revision: 336810 URL: https://svnweb.freebsd.org/changeset/base/336810 Log: Tag llvm trunk r338150. Added: vendor/llvm/llvm-trunk-r338150/ - copied from r336809, vendor/llvm/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336808 - svnadmin/conf
Author: dim Date: Sat Jul 28 10:49:03 2018 New Revision: 336808 URL: https://svnweb.freebsd.org/changeset/base/336808 Log: Bump my limit for a rather largish llvm import. Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf == --- svnadmin/conf/sizelimit.confSat Jul 28 10:48:41 2018 (r336807) +++ svnadmin/conf/sizelimit.confSat Jul 28 10:49:03 2018 (r336808) @@ -17,7 +17,7 @@ achim bapt davidcs -dim +dim2048 imp jb jeff ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336807 - head/sys/arm/ralink
Author: andrew Date: Sat Jul 28 10:48:41 2018 New Revision: 336807 URL: https://svnweb.freebsd.org/changeset/base/336807 Log: The RT1310 is an ARM926EJ-S, fix the config to mark it as such. Modified: head/sys/arm/ralink/std.ralink Modified: head/sys/arm/ralink/std.ralink == --- head/sys/arm/ralink/std.ralink Sat Jul 28 07:54:21 2018 (r336806) +++ head/sys/arm/ralink/std.ralink Sat Jul 28 10:48:41 2018 (r336807) @@ -1,5 +1,6 @@ # $FreeBSD$ files "../ralink/files.ralink" -cpuCPU_ARM9 +cpuCPU_ARM9E machinearm +makeoptionsCONF_CFLAGS="-march=armv5te" optionsINTRNG ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336806 - in head/sys: arm/arm arm/include conf
Author: andrew
Date: Sat Jul 28 07:54:21 2018
New Revision: 336806
URL: https://svnweb.freebsd.org/changeset/base/336806
Log:
Only support INTRNG in the SMP code on arm. We already require INTRNG on
anything that could be multicore on arm.
Modified:
head/sys/arm/arm/mp_machdep.c
head/sys/arm/include/smp.h
head/sys/conf/options.arm
Modified: head/sys/arm/arm/mp_machdep.c
==
--- head/sys/arm/arm/mp_machdep.c Sat Jul 28 07:37:01 2018
(r336805)
+++ head/sys/arm/arm/mp_machdep.c Sat Jul 28 07:54:21 2018
(r336806)
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
#include "opt_ddb.h"
-#include "opt_smp.h"
#include
__FBSDID("$FreeBSD$");
@@ -75,9 +74,6 @@ volatile int mp_naps;
/* Set to 1 once we're ready to let the APs out of the pen. */
volatile int aps_ready = 0;
-#ifndef INTRNG
-static int ipi_handler(void *arg);
-#endif
void set_stackptrs(int cpu);
/* Temporary variables for init_secondary() */
@@ -153,9 +149,6 @@ init_secondary(int cpu)
{
struct pcpu *pc;
uint32_t loop_counter;
-#ifndef INTRNG
- int start = 0, end = 0;
-#endif
pmap_set_tex();
cpuinfo_reinit_mmu(pmap_kern_ttb);
@@ -215,20 +208,6 @@ init_secondary(int cpu)
mtx_unlock_spin(_boot_mtx);
-#ifndef INTRNG
- /* Enable ipi */
-#ifdef IPI_IRQ_START
- start = IPI_IRQ_START;
-#ifdef IPI_IRQ_END
- end = IPI_IRQ_END;
-#else
- end = IPI_IRQ_START;
-#endif
-#endif
-
- for (int i = start; i <= end; i++)
- arm_unmask_irq(i);
-#endif /* INTRNG */
enable_interrupts(PSR_I);
loop_counter = 0;
@@ -250,7 +229,6 @@ init_secondary(int cpu)
/* NOTREACHED */
}
-#ifdef INTRNG
static void
ipi_rendezvous(void *dummy __unused)
{
@@ -347,126 +325,20 @@ ipi_hardclock(void *arg)
critical_exit();
}
-#else
-static int
-ipi_handler(void *arg)
-{
- u_int cpu, ipi;
-
- cpu = PCPU_GET(cpuid);
-
- ipi = pic_ipi_read((int)arg);
-
- while ((ipi != 0x3ff)) {
- switch (ipi) {
- case IPI_RENDEZVOUS:
- CTR0(KTR_SMP, "IPI_RENDEZVOUS");
- smp_rendezvous_action();
- break;
-
- case IPI_AST:
- CTR0(KTR_SMP, "IPI_AST");
- break;
-
- case IPI_STOP:
- /*
-* IPI_STOP_HARD is mapped to IPI_STOP so it is not
-* necessary to add it in the switch.
-*/
- CTR0(KTR_SMP, "IPI_STOP or IPI_STOP_HARD");
-
- savectx([cpu]);
-
- /*
-* CPUs are stopped when entering the debugger and at
-* system shutdown, both events which can precede a
-* panic dump. For the dump to be correct, all caches
-* must be flushed and invalidated, but on ARM there's
-* no way to broadcast a wbinv_all to other cores.
-* Instead, we have each core do the local wbinv_all as
-* part of stopping the core. The core requesting the
-* stop will do the l2 cache flush after all other cores
-* have done their l1 flushes and stopped.
-*/
- dcache_wbinv_poc_all();
-
- /* Indicate we are stopped */
- CPU_SET_ATOMIC(cpu, _cpus);
-
- /* Wait for restart */
- while (!CPU_ISSET(cpu, _cpus))
- cpu_spinwait();
-
- CPU_CLR_ATOMIC(cpu, _cpus);
- CPU_CLR_ATOMIC(cpu, _cpus);
-#ifdef DDB
- dbg_resume_dbreg();
-#endif
- CTR0(KTR_SMP, "IPI_STOP (restart)");
- break;
- case IPI_PREEMPT:
- CTR1(KTR_SMP, "%s: IPI_PREEMPT", __func__);
- sched_preempt(curthread);
- break;
- case IPI_HARDCLOCK:
- CTR1(KTR_SMP, "%s: IPI_HARDCLOCK", __func__);
- hardclockintr();
- break;
- default:
- panic("Unknown IPI 0x%0x on cpu %d", ipi, curcpu);
- }
-
- pic_ipi_clear(ipi);
- ipi = pic_ipi_read(-1);
- }
-
- return (FILTER_HANDLED);
-}
-#endif
-
static void
release_aps(void *dummy __unused)
{
uint32_t loop_counter;
-#ifndef INTRNG
- int start = 0, end = 0;
-#endif
if (mp_ncpus == 1)
return;
-#ifdef INTRNG
intr_pic_ipi_setup(IPI_RENDEZVOUS, "rendezvous", ipi_rendezvous, NULL);
svn commit: r336805 - in stable/11: share/man/man4 sys/dev/vt/hw/vga
Author: eadler
Date: Sat Jul 28 07:37:01 2018
New Revision: 336805
URL: https://svnweb.freebsd.org/changeset/base/336805
Log:
MFC r335629:
vt: add option to ignore NO_VGA flag in ACPI
To workaround buggy firmware that sets this flag when there's actually
a VGA present.
Ref D16003
PR: 229235
Modified:
stable/11/share/man/man4/vt.4
stable/11/sys/dev/vt/hw/vga/vt_vga.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/share/man/man4/vt.4
==
--- stable/11/share/man/man4/vt.4 Sat Jul 28 06:46:10 2018
(r336804)
+++ stable/11/share/man/man4/vt.4 Sat Jul 28 07:37:01 2018
(r336805)
@@ -44,6 +44,7 @@
In
.Xr loader.conf 5 :
.Cd hw.vga.textmode=1
+.Cd hw.vga.acpi_ignore_no_vga=1
.Cd kern.vty=vt
.Cd kern.vt.color..rgb=""
.Cd kern.vt.fb.default_mode="x"
@@ -196,6 +197,10 @@ prompt or in
Set to 1 to use virtual terminals in text mode instead of graphics mode.
Features that require graphics mode, like loadable fonts, will be
disabled.
+.It Va hw.vga.acpi_ignore_no_vga
+Set to 1 to force the usage of the VGA driver regardless of whether
+ACPI IAPC_BOOT_ARCH signals no VGA support.
+Can be used to workaround firmware bugs in the ACPI tables.
.It Va kern.vty
Set this value to
.Ql vt
Modified: stable/11/sys/dev/vt/hw/vga/vt_vga.c
==
--- stable/11/sys/dev/vt/hw/vga/vt_vga.cSat Jul 28 06:46:10 2018
(r336804)
+++ stable/11/sys/dev/vt/hw/vga/vt_vga.cSat Jul 28 07:37:01 2018
(r336805)
@@ -1211,6 +1211,12 @@ vga_acpi_disabled(void)
ACPI_TABLE_FADT *fadt;
vm_paddr_t physaddr;
uint16_t flags;
+ int ignore;
+
+ TUNABLE_INT_FETCH("hw.vga.acpi_ignore_no_vga", );
+
+ if (ignore)
+ return (false);
physaddr = acpi_find_table(ACPI_SIG_FADT);
if (physaddr == 0)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336804 - in head/sys/arm: allwinner altera/socfpga amlogic/aml8726 annapurna/alpine broadcom/bcm2835 freescale/imx mv/armada38x nvidia/tegra124 qemu rockchip samsung/exynos xilinx
Author: andrew Date: Sat Jul 28 06:46:10 2018 New Revision: 336804 URL: https://svnweb.freebsd.org/changeset/base/336804 Log: Remove IPI_IRQ_START and IPI_IRQ_END from the arm kernel config files. These are unneeded with INTRNG. Modified: head/sys/arm/allwinner/std.allwinner head/sys/arm/altera/socfpga/std.socfpga head/sys/arm/amlogic/aml8726/std.aml8726 head/sys/arm/annapurna/alpine/std.alpine head/sys/arm/broadcom/bcm2835/std.bcm2836 head/sys/arm/freescale/imx/std.imx6 head/sys/arm/mv/armada38x/std.armada38x head/sys/arm/nvidia/tegra124/std.tegra124 head/sys/arm/qemu/std.virt head/sys/arm/rockchip/std.rk30xx head/sys/arm/samsung/exynos/std.exynos5250 head/sys/arm/samsung/exynos/std.exynos5420 head/sys/arm/xilinx/std.zynq7 Modified: head/sys/arm/allwinner/std.allwinner == --- head/sys/arm/allwinner/std.allwinnerSat Jul 28 04:06:33 2018 (r336803) +++ head/sys/arm/allwinner/std.allwinnerSat Jul 28 06:46:10 2018 (r336804) @@ -5,9 +5,6 @@ cpu CPU_CORTEXA machinearm armv7 makeoptionsCONF_CFLAGS="-march=armv7a" -optionsIPI_IRQ_START=0 -optionsIPI_IRQ_END=15 - files "../allwinner/files.allwinner" files "../allwinner/a20/files.a20" files "../allwinner/a31/files.a31" Modified: head/sys/arm/altera/socfpga/std.socfpga == --- head/sys/arm/altera/socfpga/std.socfpga Sat Jul 28 04:06:33 2018 (r336803) +++ head/sys/arm/altera/socfpga/std.socfpga Sat Jul 28 06:46:10 2018 (r336804) @@ -4,7 +4,4 @@ cpu CPU_CORTEXA machinearm armv7 makeoptionsCONF_CFLAGS="-march=armv7a" -optionsIPI_IRQ_START=0 -optionsIPI_IRQ_END=15 - files "../altera/socfpga/files.socfpga" Modified: head/sys/arm/amlogic/aml8726/std.aml8726 == --- head/sys/arm/amlogic/aml8726/std.aml8726Sat Jul 28 04:06:33 2018 (r336803) +++ head/sys/arm/amlogic/aml8726/std.aml8726Sat Jul 28 06:46:10 2018 (r336804) @@ -20,9 +20,6 @@ files "../amlogic/aml8726/files.aml8726" # Set all global interrupts to be edge triggered, active high. optionsGIC_DEFAULT_ICFGR_INIT=0x -optionsIPI_IRQ_START=0 -optionsIPI_IRQ_END=15 - #options EARLY_PRINTF #options SOCDEV_PA=0xc810 #options SOCDEV_VA=0xd810 Modified: head/sys/arm/annapurna/alpine/std.alpine == --- head/sys/arm/annapurna/alpine/std.alpineSat Jul 28 04:06:33 2018 (r336803) +++ head/sys/arm/annapurna/alpine/std.alpineSat Jul 28 06:46:10 2018 (r336804) @@ -10,7 +10,4 @@ options KERNVIRTADDR=0xa020 makeoptionsKERNBASE=0xa000 optionsKERNBASE=0xa000 -optionsIPI_IRQ_START=0 -optionsIPI_IRQ_END=15 - files "../annapurna/alpine/files.alpine" Modified: head/sys/arm/broadcom/bcm2835/std.bcm2836 == --- head/sys/arm/broadcom/bcm2835/std.bcm2836 Sat Jul 28 04:06:33 2018 (r336803) +++ head/sys/arm/broadcom/bcm2835/std.bcm2836 Sat Jul 28 06:46:10 2018 (r336804) @@ -5,8 +5,6 @@ cpu CPU_CORTEXA makeoptionsCONF_CFLAGS="-march=armv7a" optionsSOC_BCM2836 -optionsIPI_IRQ_START=76 - files "../broadcom/bcm2835/files.bcm2836" files "../broadcom/bcm2835/files.bcm283x" Modified: head/sys/arm/freescale/imx/std.imx6 == --- head/sys/arm/freescale/imx/std.imx6 Sat Jul 28 04:06:33 2018 (r336803) +++ head/sys/arm/freescale/imx/std.imx6 Sat Jul 28 06:46:10 2018 (r336804) @@ -3,8 +3,5 @@ machine arm armv7 cpuCPU_CORTEXA makeoptionsCONF_CFLAGS="-march=armv7a" -optionsIPI_IRQ_START=0 -optionsIPI_IRQ_END=15 - files "../freescale/imx/files.imx6" Modified: head/sys/arm/mv/armada38x/std.armada38x == --- head/sys/arm/mv/armada38x/std.armada38x Sat Jul 28 04:06:33 2018 (r336803) +++ head/sys/arm/mv/armada38x/std.armada38x Sat Jul 28 06:46:10 2018 (r336804) @@ -4,6 +4,3 @@ cpu CPU_CORTEXA machinearm armv7 makeoptionsCONF_CFLAGS="-march=armv7a" - -optionsIPI_IRQ_START=0 -optionsIPI_IRQ_END=15 Modified: head/sys/arm/nvidia/tegra124/std.tegra124 == --- head/sys/arm/nvidia/tegra124/std.tegra124
