svn commit: r336803 - head/sys/vm
Author: alc
Date: Sat Jul 28 04:06:33 2018
New Revision: 336803
URL: https://svnweb.freebsd.org/changeset/base/336803
Log:
To date, mlockall(MCL_FUTURE) has had the unfortunate side effect of
blocking vm map entry and object coalescing for the calling process.
However, there is no reason that mlockall(MCL_FUTURE) should block
such coalescing. This change enables it.
Reviewed by: kib, markj
Tested by:pho
MFC after:6 weeks
Differential Revision:https://reviews.freebsd.org/D16413
Modified:
head/sys/vm/vm_map.c
Modified: head/sys/vm/vm_map.c
==
--- head/sys/vm/vm_map.cSat Jul 28 02:53:36 2018(r336802)
+++ head/sys/vm/vm_map.cSat Jul 28 04:06:33 2018(r336803)
@@ -1277,10 +1277,9 @@ charged:
vm_object_clear_flag(object, OBJ_ONEMAPPING);
VM_OBJECT_WUNLOCK(object);
} else if (prev_entry != >header &&
- prev_entry->eflags == protoeflags &&
+ (prev_entry->eflags & ~MAP_ENTRY_USER_WIRED) == protoeflags &&
(cow & (MAP_STACK_GROWS_DOWN | MAP_STACK_GROWS_UP)) == 0 &&
- prev_entry->end == start && prev_entry->wired_count == 0 &&
- (prev_entry->cred == cred ||
+ prev_entry->end == start && (prev_entry->cred == cred ||
(prev_entry->object.vm_object != NULL &&
prev_entry->object.vm_object->cred == cred)) &&
vm_object_coalesce(prev_entry->object.vm_object,
@@ -1295,7 +1294,11 @@ charged:
*/
if (prev_entry->inheritance == inheritance &&
prev_entry->protection == prot &&
- prev_entry->max_protection == max) {
+ prev_entry->max_protection == max &&
+ prev_entry->wired_count == 0) {
+ KASSERT((prev_entry->eflags & MAP_ENTRY_USER_WIRED) ==
+ 0, ("prev_entry %p has incoherent wiring",
+ prev_entry));
if ((prev_entry->eflags & MAP_ENTRY_GUARD) == 0)
map->size += end - prev_entry->end;
prev_entry->end = end;
___
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: r336802 - head/tests/sys/kqueue/libkqueue
Author: dab Date: Sat Jul 28 02:53:36 2018 New Revision: 336802 URL: https://svnweb.freebsd.org/changeset/base/336802 Log: Fix compilation error on some arches after r336761 & r336781. Another cast for printing an intmax_t was needed in a kqueue test for some arches. Pointy-hat: me (twice) MFC after:1 week X-MFC-with: r336761, r336781 Sponsored by: Dell EMC Modified: head/tests/sys/kqueue/libkqueue/timer.c Modified: head/tests/sys/kqueue/libkqueue/timer.c == --- head/tests/sys/kqueue/libkqueue/timer.c Sat Jul 28 00:59:59 2018 (r336801) +++ head/tests/sys/kqueue/libkqueue/timer.c Sat Jul 28 02:53:36 2018 (r336802) @@ -239,7 +239,7 @@ test_abstime(void) kev.fflags = 0; kevent_cmp(, kevent_get(kqfd)); if (time(NULL) < when + timeout) - err(1, "too early %jd %jd", time(NULL), (intmax_t)(when + timeout)); + err(1, "too early %jd %jd", (intmax_t)time(NULL), (intmax_t)(when + timeout)); /* Check if the event occurs again */ sleep(3); ___ 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: r336801 - head/contrib/libarchive/libarchive
Author: cem
Date: Sat Jul 28 00:59:59 2018
New Revision: 336801
URL: https://svnweb.freebsd.org/changeset/base/336801
Log:
MFV r336800: libarchive: Cherry-pick upstream 2c8c83b9
Relevant vendor changes:
Fix issue #948: out-of-bounds read in lha_read_data_none()
admbugs: 877
MFC after:3 days
Security: CVE-2017-14503
Modified:
head/contrib/libarchive/libarchive/archive_read_support_format_lha.c
Directory Properties:
head/contrib/libarchive/ (props changed)
Modified: head/contrib/libarchive/libarchive/archive_read_support_format_lha.c
==
--- head/contrib/libarchive/libarchive/archive_read_support_format_lha.c
Sat Jul 28 00:55:57 2018(r336800)
+++ head/contrib/libarchive/libarchive/archive_read_support_format_lha.c
Sat Jul 28 00:59:59 2018(r336801)
@@ -701,6 +701,12 @@ archive_read_format_lha_read_header(struct archive_rea
* Prepare variables used to read a file content.
*/
lha->entry_bytes_remaining = lha->compsize;
+ if (lha->entry_bytes_remaining < 0) {
+ archive_set_error(>archive,
+ ARCHIVE_ERRNO_FILE_FORMAT,
+ "Invalid LHa entry size");
+ return (ARCHIVE_FATAL);
+ }
lha->entry_offset = 0;
lha->entry_crc_calculated = 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: r336800 - vendor/libarchive/dist/libarchive
Author: cem
Date: Sat Jul 28 00:55:57 2018
New Revision: 336800
URL: https://svnweb.freebsd.org/changeset/base/336800
Log:
libarchive: Cherry-pick upstream 2c8c83b9
Relevant vendor changes:
Fix issue #948: out-of-bounds read in lha_read_data_none()
admbugs: 877
Security: CVE-2017-14503
Modified:
vendor/libarchive/dist/libarchive/archive_read_support_format_lha.c
Modified: vendor/libarchive/dist/libarchive/archive_read_support_format_lha.c
==
--- vendor/libarchive/dist/libarchive/archive_read_support_format_lha.c Sat Jul
28 00:33:40 2018(r336799)
+++ vendor/libarchive/dist/libarchive/archive_read_support_format_lha.c Sat Jul
28 00:55:57 2018(r336800)
@@ -701,6 +701,12 @@ archive_read_format_lha_read_header(struct archive_rea
* Prepare variables used to read a file content.
*/
lha->entry_bytes_remaining = lha->compsize;
+ if (lha->entry_bytes_remaining < 0) {
+ archive_set_error(>archive,
+ ARCHIVE_ERRNO_FILE_FORMAT,
+ "Invalid LHa entry size");
+ return (ARCHIVE_FATAL);
+ }
lha->entry_offset = 0;
lha->entry_crc_calculated = 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: r336799 - head/tools/build
Author: eadler
Date: Sat Jul 28 00:33:40 2018
New Revision: 336799
URL: https://svnweb.freebsd.org/changeset/base/336799
Log:
tools/build/beinstall.sh: Use some slightly better shell syntax; reduce
duplication
This is is a first pass at improving the be installer.
Reviewed By: will
Differential Revision: https://reviews.freebsd.org/D16081
Modified:
head/tools/build/beinstall.sh
Modified: head/tools/build/beinstall.sh
==
--- head/tools/build/beinstall.sh Fri Jul 27 23:38:31 2018
(r336798)
+++ head/tools/build/beinstall.sh Sat Jul 28 00:33:40 2018
(r336799)
@@ -69,7 +69,7 @@ cleanup() {
errx() {
cleanup
- echo "error: $*"
+ echo "error: $@"
exit 1
}
@@ -107,16 +107,17 @@ if [ -e .git ] ; then
[ $? -ne 0 ] && errx "Can't lookup git commit timestamp"
commit_ts=$(date -r ${commit_time} '+%Y%m%d.%H%M%S')
elif [ -d .svn ] ; then
-if [ -f /usr/bin/svnlite ]; then
-commit_ts=$( svnlite info --show-item last-changed-date | sed -e
's/\..*//' -e 's/T/./' -e 's/-//g' -e s'/://g' )
-elif [ -f /usr/local/bin/svn ]; then
-commit_ts=$( svn info --show-item last-changed-date | sed -e
's/\..*//' -e 's/T/./' -e 's/-//g' -e s'/://g' )
-else
-errx "Can't lookup Subversion commit timestamp"
-fi
+ if [ -e /usr/bin/svnlite ]; then
+svn=/usr/bin/svnlite
+ elif [ -e /usr/local/bin/svn ]; then
+svn=/usr/local/bin/svn
+ else
+errx "Unable to find subversion"
+ fi
+ commit_ts="$( "$svn" info --show-item last-changed-date | sed -e
's/\..*//' -e 's/T/./' -e 's/-//g' -e s'/://g' )"
[ $? -ne 0 ] && errx "Can't lookup Subversion commit timestamp"
else
-errx "Unable to determine sandbox type"
+errx "Unable to determine source control type"
fi
commit_ver=$(${objdir}/bin/freebsd-version/freebsd-version -u 2>/dev/null)
@@ -137,8 +138,8 @@ beadm create ${BENAME} >/dev/null || errx "Unable to c
beadm mount ${BENAME} ${BE_TMP}/mnt || errx "Unable to mount BE ${BENAME}."
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!"
+make "$@" DESTDIR=${BE_MNTPT} installkernel || errx "Installkernel failed!"
+make "$@" DESTDIR=${BE_MNTPT} installworld || errx "Installworld failed!"
if [ -n "${CONFIG_UPDATER}" ]; then
"update_${CONFIG_UPDATER}"
___
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: r336789 - head/stand/efi/loader
Yea, that was a misfire It's been a long week and I didn't check before
I tried to commit and hit ^C too late when I realized my mistake.
Warner
On Fri, Jul 27, 2018 at 5:54 PM, Rodney W. Grimes <
free...@pdx.rh.cn85.dnsmgr.net> wrote:
> [ Charset UTF-8 unsupported, converting... ]
> > Author: imp
> > Date: Fri Jul 27 22:00:00 2018
> > New Revision: 336789
> > URL: https://svnweb.freebsd.org/changeset/base/336789
> >
> > Log:
> > stand debug
>
> Thats a bit brief for a commit message...
>
> > Modified:
> > head/stand/efi/loader/main.c
> >
> > Modified: head/stand/efi/loader/main.c
> >
> ==
> > --- head/stand/efi/loader/main.c Fri Jul 27 21:50:10 2018
> (r336788)
> > +++ head/stand/efi/loader/main.c Fri Jul 27 22:00:00 2018
> (r336789)
> > @@ -312,6 +312,7 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused,
> char *
> > char *kernel = NULL;
> > FILEPATH_DEVICE_PATH *fp;
> > struct stat st;
> > + CHAR16 *text;
> >
> > /*
> >* FreeBSD encodes it's boot loading path into the boot loader
> > @@ -349,6 +350,11 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused,
> char *
> > if ((char *)edp > ep)
> > return NOT_SPECIFIC;
> > while (dp < edp) {
> > + text = efi_devpath_name(dp);
> > + if (text != NULL) {
> > + printf(" BootInfo Path: %S\n", text);
> > + efi_free_devpath_name(text);
> > + }
> > last_dp = dp;
> > dp = (EFI_DEVICE_PATH *)((char *)dp +
> efi_devpath_length(dp));
> > }
> > @@ -359,22 +365,31 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused,
> char *
> >* path in it. Those show up as various VenHw() nodes
> >* which are basically opaque to us. Don't count those
> >* as something specifc.
> > + * path in it...
> >*/
> > - if (last_dp == first_dp)
> > + if (last_dp == first_dp) {
> > + printf("Ignoring BootXXX: Only one DP found\n");
> > return NOT_SPECIFIC;
> > - if (efi_devpath_to_media_path(last_dp) == NULL)
> > + }
> > + if (efi_devpath_to_media_path(path) == NULL) {
> > + printf("Ignoring Boot: No Media Path\n");
> > return NOT_SPECIFIC;
> > + }
> >
> > /*
> >* OK. At this point we either have a good path or a bad one.
> >* Let's check.
> >*/
> > pp = efiblk_get_pdinfo_by_device_path(last_dp);
> > - if (pp == NULL)
> > + if (pp == NULL) {
> > + printf("Ignoring Boot: Device Path not found\n");
> > return BAD_CHOICE;
> > + }
> > set_currdev_pdinfo(pp);
> > - if (!sanity_check_currdev())
> > + if (!sanity_check_currdev()){
> > + printf("Ignoring BootXXX: sanity check failed\n");
> > return BAD_CHOICE;
> > + }
> >
> > /*
> >* OK. We've found a device that matches, next we need to check
> the last
> > @@ -386,20 +401,30 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused,
> char *
> >*/
> > dp = efi_devpath_last_node(last_dp);
> > if (DevicePathType(dp) != MEDIA_DEVICE_PATH ||
> > - DevicePathSubType(dp) != MEDIA_FILEPATH_DP)
> > + DevicePathSubType(dp) != MEDIA_FILEPATH_DP) {
> > + printf("Using Boot for root partition\n");
> > return (BOOT_INFO_OK); /* use currdir, default
> kernel */
> > + }
> > fp = (FILEPATH_DEVICE_PATH *)dp;
> > ucs2_to_utf8(fp->PathName, );
> > - if (kernel == NULL)
> > + if (kernel == NULL) {
> > + printf("Not using BootXXX: can't decode kernel\n");
> > return (BAD_CHOICE);
> > + }
> > if (*kernel == '\\' || isupper(*kernel))
> > fix_dosisms(kernel);
> > if (stat(kernel, ) != 0) {
> > free(kernel);
> > + printf("Not using BootXXX: can't find %s\n", kernel);
> > return (BAD_CHOICE);
> > }
> > setenv("kernel", kernel, 1);
> > free(kernel);
> > + text = efi_devpath_name(last_dp);
> > + if (text) {
> > + printf("Using BootXXX %S + %s\n", text, kernel);
> > + efi_free_devpath_name(text);
> > + }
> >
> > return (BOOT_INFO_OK);
> > }
> > @@ -499,13 +524,22 @@ find_currdev(EFI_LOADED_IMAGE *img, bool
> do_bootmgr, b
> > if (sanity_check_currdev())
> > return (0);
> > if (dp->pd_parent != NULL) {
> > + pdinfo_t *espdp = dp;
> > dp = dp->pd_parent;
> > STAILQ_FOREACH(pp, >pd_part, pd_link) {
> > + /* Already tried the ESP */
> > + if (espdp == pp)
> > + continue;
> > /*
> >
Re: svn commit: r336789 - head/stand/efi/loader
[ Charset UTF-8 unsupported, converting... ]
> Author: imp
> Date: Fri Jul 27 22:00:00 2018
> New Revision: 336789
> URL: https://svnweb.freebsd.org/changeset/base/336789
>
> Log:
> stand debug
Thats a bit brief for a commit message...
> Modified:
> head/stand/efi/loader/main.c
>
> Modified: head/stand/efi/loader/main.c
> ==
> --- head/stand/efi/loader/main.c Fri Jul 27 21:50:10 2018
> (r336788)
> +++ head/stand/efi/loader/main.c Fri Jul 27 22:00:00 2018
> (r336789)
> @@ -312,6 +312,7 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
> char *kernel = NULL;
> FILEPATH_DEVICE_PATH *fp;
> struct stat st;
> + CHAR16 *text;
>
> /*
>* FreeBSD encodes it's boot loading path into the boot loader
> @@ -349,6 +350,11 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
> if ((char *)edp > ep)
> return NOT_SPECIFIC;
> while (dp < edp) {
> + text = efi_devpath_name(dp);
> + if (text != NULL) {
> + printf(" BootInfo Path: %S\n", text);
> + efi_free_devpath_name(text);
> + }
> last_dp = dp;
> dp = (EFI_DEVICE_PATH *)((char *)dp + efi_devpath_length(dp));
> }
> @@ -359,22 +365,31 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
>* path in it. Those show up as various VenHw() nodes
>* which are basically opaque to us. Don't count those
>* as something specifc.
> + * path in it...
>*/
> - if (last_dp == first_dp)
> + if (last_dp == first_dp) {
> + printf("Ignoring BootXXX: Only one DP found\n");
> return NOT_SPECIFIC;
> - if (efi_devpath_to_media_path(last_dp) == NULL)
> + }
> + if (efi_devpath_to_media_path(path) == NULL) {
> + printf("Ignoring Boot: No Media Path\n");
> return NOT_SPECIFIC;
> + }
>
> /*
>* OK. At this point we either have a good path or a bad one.
>* Let's check.
>*/
> pp = efiblk_get_pdinfo_by_device_path(last_dp);
> - if (pp == NULL)
> + if (pp == NULL) {
> + printf("Ignoring Boot: Device Path not found\n");
> return BAD_CHOICE;
> + }
> set_currdev_pdinfo(pp);
> - if (!sanity_check_currdev())
> + if (!sanity_check_currdev()){
> + printf("Ignoring BootXXX: sanity check failed\n");
> return BAD_CHOICE;
> + }
>
> /*
>* OK. We've found a device that matches, next we need to check the last
> @@ -386,20 +401,30 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
>*/
> dp = efi_devpath_last_node(last_dp);
> if (DevicePathType(dp) != MEDIA_DEVICE_PATH ||
> - DevicePathSubType(dp) != MEDIA_FILEPATH_DP)
> + DevicePathSubType(dp) != MEDIA_FILEPATH_DP) {
> + printf("Using Boot for root partition\n");
> return (BOOT_INFO_OK); /* use currdir, default kernel
> */
> + }
> fp = (FILEPATH_DEVICE_PATH *)dp;
> ucs2_to_utf8(fp->PathName, );
> - if (kernel == NULL)
> + if (kernel == NULL) {
> + printf("Not using BootXXX: can't decode kernel\n");
> return (BAD_CHOICE);
> + }
> if (*kernel == '\\' || isupper(*kernel))
> fix_dosisms(kernel);
> if (stat(kernel, ) != 0) {
> free(kernel);
> + printf("Not using BootXXX: can't find %s\n", kernel);
> return (BAD_CHOICE);
> }
> setenv("kernel", kernel, 1);
> free(kernel);
> + text = efi_devpath_name(last_dp);
> + if (text) {
> + printf("Using BootXXX %S + %s\n", text, kernel);
> + efi_free_devpath_name(text);
> + }
>
> return (BOOT_INFO_OK);
> }
> @@ -499,13 +524,22 @@ find_currdev(EFI_LOADED_IMAGE *img, bool do_bootmgr, b
> if (sanity_check_currdev())
> return (0);
> if (dp->pd_parent != NULL) {
> + pdinfo_t *espdp = dp;
> dp = dp->pd_parent;
> STAILQ_FOREACH(pp, >pd_part, pd_link) {
> + /* Already tried the ESP */
> + if (espdp == pp)
> + continue;
> /*
>* Roll up the ZFS special case
>* for those partitions that have
>* zpools on them.
>*/
> + text = efi_devpath_name(pp->pd_devpath);
> + if (text != NULL) {
> + printf("Trying: %S\n", text);
> + efi_free_devpath_name(text);
> +
svn commit: r336798 - head/usr.sbin/nfsd
Author: rmacklem Date: Fri Jul 27 23:38:31 2018 New Revision: 336798 URL: https://svnweb.freebsd.org/changeset/base/336798 Log: Update nfsd.8 for support of IPv6 addresses for hosts in the "-p" option. r336795 adds support for handling of IPv6 addresses returned by getaddrinfo(3) for DS hostnames. This updates the man page for this change. This is a content change. Modified: head/usr.sbin/nfsd/nfsd.8 Modified: head/usr.sbin/nfsd/nfsd.8 == --- head/usr.sbin/nfsd/nfsd.8 Fri Jul 27 23:34:10 2018(r336797) +++ head/usr.sbin/nfsd/nfsd.8 Fri Jul 27 23:38:31 2018(r336798) @@ -28,7 +28,7 @@ .\"@(#)nfsd.8 8.4 (Berkeley) 3/29/95 .\" $FreeBSD$ .\" -.Dd June 30, 2018 +.Dd July 27, 2018 .Dt NFSD 8 .Os .Sh NAME @@ -117,15 +117,10 @@ The .Ar pnfs_setup string is a set of fields separated by ',' characters: .Bl -tag -width Ds -Each of these fields specifies one Data Server. +Each of these fields specifies one DS. It consists of a server hostname, followed by a ':' and the directory path where the DS's data storage file system is mounted on this MDS server. -At this time, only IPv4 addresses are supported by the interface to the kernel, -so the -.Dq server hostname -must resolve to an IPv4 address and support mounts on that address. -This needs to be extended to support IPv6 addresses in the near future. This can optionally be followed by a '#' and the mds_path, which is the directory path for an exported file system on this MDS. If this is specified, it means that this DS is to be used to store data @@ -161,6 +156,18 @@ data files for and nfsv4-data1 will be used to store data files for .Dq /export2 . .El +.sp +When using IPv6 addresses for DSs +be wary of using link local addresses. +The IPv6 address for the DS is sent to the client and there is no scope +zone in it. +As such, a link local address may not work for a pNFS client to DS +TCP connection. +When parsed, +.Nm +will only use a link local address if it is the only address returned by +.Xr getaddrinfo 3 +for the DS hostname. .It Fl m Ar mirror_level This option is only meaningful when used with the .Fl p ___ 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: r336796 - head/share/man/man4/man4.arm
Author: imp Date: Fri Jul 27 23:28:35 2018 New Revision: 336796 URL: https://svnweb.freebsd.org/changeset/base/336796 Log: Remove npe.4. It was removed as part of the xscale removal. Modified: head/share/man/man4/man4.arm/Makefile Modified: head/share/man/man4/man4.arm/Makefile == --- head/share/man/man4/man4.arm/Makefile Fri Jul 27 23:10:28 2018 (r336795) +++ head/share/man/man4/man4.arm/Makefile Fri Jul 27 23:28:35 2018 (r336796) @@ -16,7 +16,6 @@ MAN= \ imx6_snvs.4 \ imx_wdog.4 \ mge.4 \ - npe.4 \ ti_adc.4 MLINKS= cgem.4 if_cgem.4 ___ 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: r336795 - head/usr.sbin/nfsd
Author: rmacklem
Date: Fri Jul 27 23:10:28 2018
New Revision: 336795
URL: https://svnweb.freebsd.org/changeset/base/336795
Log:
Add support for IPv6 addresses to the pNFS "-p" option.
This patch adds code to handle IPv6 addresses returned by getaddrinfo()
for the host entries in the "-p" command line argument.
If the IPv6 address is a link local address, only use it if it is the
only address for the host. This is done since there is no way to know
if the NFSv4.1 pNFS client is in the same scope zone as the MDS.
inet_ntop() is used for the IPv6 address translation, since the client
will have no use for the scope zone suffix and inet_ntop() does not
put this in the address string.
Discussed with: bu7c...@yandex.ru
Modified:
head/usr.sbin/nfsd/nfsd.c
Modified: head/usr.sbin/nfsd/nfsd.c
==
--- head/usr.sbin/nfsd/nfsd.c Fri Jul 27 22:46:42 2018(r336794)
+++ head/usr.sbin/nfsd/nfsd.c Fri Jul 27 23:10:28 2018(r336795)
@@ -1179,14 +1179,16 @@ backup_stable(__unused int signo)
static void
parse_dsserver(const char *optionarg, struct nfsd_nfsd_args *nfsdargp)
{
- char *ad, *cp, *cp2, *dsaddr, *dshost, *dspath, *dsvol, nfsprt[9];
- char *mdspath, *mdsp;
+ char *cp, *cp2, *dsaddr, *dshost, *dspath, *dsvol, nfsprt[9];
+ char *mdspath, *mdsp, ip6[INET6_ADDRSTRLEN];
+ const char *ad;
int ecode;
u_int adsiz, dsaddrcnt, dshostcnt, dspathcnt, hostsiz, pathsiz;
u_int mdspathcnt;
size_t dsaddrsiz, dshostsiz, dspathsiz, nfsprtsiz, mdspathsiz;
- struct addrinfo hints, *ai_tcp;
+ struct addrinfo hints, *ai_tcp, *res;
struct sockaddr_in sin;
+ struct sockaddr_in6 sin6;
cp = strdup(optionarg);
if (cp == NULL)
@@ -1275,22 +1277,55 @@ parse_dsserver(const char *optionarg, struct nfsd_nfsd
/* Get the fully qualified domain name and IP address. */
memset(, 0, sizeof(hints));
- hints.ai_flags = AI_CANONNAME;
- hints.ai_family = AF_INET;
+ hints.ai_flags = AI_CANONNAME | AI_ADDRCONFIG;
+ hints.ai_family = PF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
ecode = getaddrinfo(cp, NULL, , _tcp);
if (ecode != 0)
err(1, "getaddrinfo pnfs: %s %s", cp,
gai_strerror(ecode));
- if (ai_tcp->ai_addr->sa_family != AF_INET ||
- ai_tcp->ai_addrlen < sizeof(sin))
- err(1, "getaddrinfo() returned non-INET address");
- /* Mips cares about sockaddr_in alignment, so copy the addr. */
- memcpy(, ai_tcp->ai_addr, sizeof(sin));
+ ad = NULL;
+ for (res = ai_tcp; res != NULL; res = res->ai_next) {
+ if (res->ai_addr->sa_family == AF_INET) {
+ if (res->ai_addrlen < sizeof(sin))
+ err(1, "getaddrinfo() returned "
+ "undersized IPv4 address");
+ /*
+* Mips cares about sockaddr_in alignment,
+* so copy the address.
+*/
+ memcpy(, res->ai_addr, sizeof(sin));
+ ad = inet_ntoa(sin.sin_addr);
+ break;
+ } else if (res->ai_family == AF_INET6) {
+ if (res->ai_addrlen < sizeof(sin6))
+ err(1, "getaddrinfo() returned "
+ "undersized IPv6 address");
+ /*
+* Mips cares about sockaddr_in6 alignment,
+* so copy the address.
+*/
+ memcpy(, res->ai_addr, sizeof(sin6));
+ ad = inet_ntop(AF_INET6, _addr, ip6,
+ sizeof(ip6));
+ /*
+* XXX
+* Since a link local address will only
+* work if the client and DS are in the
+* same scope zone, only use it if it is
+* the only address.
+*/
+ if (ad != NULL &&
+ !IN6_IS_ADDR_LINKLOCAL(_addr))
+ break;
+ }
+ }
+ if (ad == NULL)
+ err(1, "No IP address for %s", cp);
+
/*
Re: svn commit: r336742 - in head: etc sbin/dump
On Fri, Jul 27, 2018, at 4:07 PM, Brad Davis wrote: > On Fri, Jul 27, 2018, at 3:30 PM, Brad Davis wrote: > > On Fri, Jul 27, 2018, at 3:26 PM, Antoine Brodin wrote: > > > On Thu, Jul 26, 2018 at 6:45 PM, Brad Davis wrote: > > > > Author: brd > > > > Date: Thu Jul 26 16:45:25 2018 > > > > New Revision: 336742 > > > > URL: https://svnweb.freebsd.org/changeset/base/336742 > > > > > > > > Log: > > > > Move dumpdates creation to CONFS= > > > > > > > > Approved by: bapt (mentor) > > > > Differential Revision:https://reviews.freebsd.org/D16435 > > > > > > Hi, > > > > > > This commit seems to prevent successful installation of FreeBSD. > > > > It only seems to prevent upgrades, so my build a release VM test is not > > enough.. I am working on it right now. > > I found the issue and I opened up the following review for one of my > mentors to approve and have prodded them: > > https://reviews.freebsd.org/D16476 > > install(1) should be fixed, but this gets around the issue quickly so > people can move on. Committed in r336794. Regards, Brad Davis ___ 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: r336794 - head/share/mk
Author: brd
Date: Fri Jul 27 22:46:42 2018
New Revision: 336794
URL: https://svnweb.freebsd.org/changeset/base/336794
Log:
Avoid a install(1) crash by not using -C when the source is /dev/null
Approved by: allanjude (mentor)
Differential Revision:https://reviews.freebsd.org/D16476
Modified:
head/share/mk/bsd.confs.mk
Modified: head/share/mk/bsd.confs.mk
==
--- head/share/mk/bsd.confs.mk Fri Jul 27 22:35:07 2018(r336793)
+++ head/share/mk/bsd.confs.mk Fri Jul 27 22:46:42 2018(r336794)
@@ -107,6 +107,12 @@ ${group}NAME_${cnf}?= ${${group}NAME}
${group}NAME_${cnf}?= ${cnf:T}
. endif # defined(${group}NAME)
+# Work around a bug with install(1) -C and /dev/null
+. if ${cnf} == "/dev/null"
+INSTALL_COPY=
+. else
+INSTALL_COPY= -C
+. endif
STAGE_AS_SETS+= ${cnf:T}
STAGE_AS_${cnf:T}= ${${group}NAME_${cnf:T}}
@@ -116,7 +122,7 @@ stage_as.${cnf:T}: ${cnf}
realinstallconfig: installdirs-${_${group}DIR_${cnf}} _${group}INS_${cnf:T}
_${group}INS_${cnf:T}: ${cnf}
- ${INSTALL} ${${group}TAG_ARGS} -C -o ${${group}OWN_${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}}
___
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: r336793 - head/stand/efi/loader
Author: imp
Date: Fri Jul 27 22:35:07 2018
New Revision: 336793
URL: https://svnweb.freebsd.org/changeset/base/336793
Log:
Use % for printf, not a dollar sign
Modified:
head/stand/efi/loader/main.c
Modified: head/stand/efi/loader/main.c
==
--- head/stand/efi/loader/main.cFri Jul 27 22:31:38 2018
(r336792)
+++ head/stand/efi/loader/main.cFri Jul 27 22:35:07 2018
(r336793)
@@ -422,7 +422,7 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
free(kernel);
text = efi_devpath_name(last_dp);
if (text) {
- printf("Using Boot$04x %S + %s\n", boot_current, text,
+ printf("Using Boot%04x %S + %s\n", boot_current, text,
kernel);
efi_free_devpath_name(text);
}
___
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: r336792 - head/stand/efi/loader
Author: imp
Date: Fri Jul 27 22:31:38 2018
New Revision: 336792
URL: https://svnweb.freebsd.org/changeset/base/336792
Log:
Style nits noted by rpokala
Modified:
head/stand/efi/loader/main.c
Modified: head/stand/efi/loader/main.c
==
--- head/stand/efi/loader/main.cFri Jul 27 22:29:20 2018
(r336791)
+++ head/stand/efi/loader/main.cFri Jul 27 22:31:38 2018
(r336792)
@@ -365,7 +365,6 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
* path in it. Those show up as various VenHw() nodes
* which are basically opaque to us. Don't count those
* as something specifc.
-* path in it...
*/
if (last_dp == first_dp) {
printf("Ignoring Boot%04x: Only one DP found\n", boot_current);
@@ -386,7 +385,7 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
return BAD_CHOICE;
}
set_currdev_pdinfo(pp);
- if (!sanity_check_currdev()){
+ if (!sanity_check_currdev()) {
printf("Ignoring Boot%04x: sanity check failed\n",
boot_current);
return BAD_CHOICE;
}
___
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: r336789 - head/stand/efi/loader
On Fri, Jul 27, 2018 at 4:22 PM, O. Hartmann wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA512
>
> Am Fri, 27 Jul 2018 22:00:00 + (UTC)
> Warner Losh schrieb:
>
> > Author: imp
> > Date: Fri Jul 27 22:00:00 2018
> > New Revision: 336789
> > URL: https://svnweb.freebsd.org/changeset/base/336789
> >
> > Log:
> > stand debug
> >
> > Modified:
> > head/stand/efi/loader/main.c
> >
> > Modified: head/stand/efi/loader/main.c
> >
> ==
> > --- head/stand/efi/loader/main.c Fri Jul 27 21:50:10 2018
> (r336788)
> > +++ head/stand/efi/loader/main.c Fri Jul 27 22:00:00 2018
> (r336789)
> > @@ -312,6 +312,7 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused,
> char *
> > char *kernel = NULL;
> > FILEPATH_DEVICE_PATH *fp;
> > struct stat st;
> > + CHAR16 *text;
> >
> > /*
> >* FreeBSD encodes it's boot loading path into the boot loader
> > @@ -349,6 +350,11 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused,
> char *
> > if ((char *)edp > ep)
> > return NOT_SPECIFIC;
> > while (dp < edp) {
> > + text = efi_devpath_name(dp);
> > + if (text != NULL) {
> > + printf(" BootInfo Path: %S\n", text);
> > + efi_free_devpath_name(text);
> > + }
> > last_dp = dp;
> > dp = (EFI_DEVICE_PATH *)((char *)dp +
> efi_devpath_length(dp));
> > }
> > @@ -359,22 +365,31 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused,
> char *
> >* path in it. Those show up as various VenHw() nodes
> >* which are basically opaque to us. Don't count those
> >* as something specifc.
> > + * path in it...
> >*/
> > - if (last_dp == first_dp)
> > + if (last_dp == first_dp) {
> > + printf("Ignoring BootXXX: Only one DP found\n");
> > return NOT_SPECIFIC;
> > - if (efi_devpath_to_media_path(last_dp) == NULL)
> > + }
> > + if (efi_devpath_to_media_path(path) == NULL) {
> > + printf("Ignoring Boot: No Media Path\n");
> > return NOT_SPECIFIC;
> > + }
> >
> > /*
> >* OK. At this point we either have a good path or a bad one.
> >* Let's check.
> >*/
> > pp = efiblk_get_pdinfo_by_device_path(last_dp);
> > - if (pp == NULL)
> > + if (pp == NULL) {
> > + printf("Ignoring Boot: Device Path not found\n");
> > return BAD_CHOICE;
> > + }
> > set_currdev_pdinfo(pp);
> > - if (!sanity_check_currdev())
> > + if (!sanity_check_currdev()){
> > + printf("Ignoring BootXXX: sanity check failed\n");
> > return BAD_CHOICE;
> > + }
> >
> > /*
> >* OK. We've found a device that matches, next we need to check
> the last
> > @@ -386,20 +401,30 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused,
> char *
> >*/
> > dp = efi_devpath_last_node(last_dp);
> > if (DevicePathType(dp) != MEDIA_DEVICE_PATH ||
> > - DevicePathSubType(dp) != MEDIA_FILEPATH_DP)
> > + DevicePathSubType(dp) != MEDIA_FILEPATH_DP) {
> > + printf("Using Boot for root partition\n");
> > return (BOOT_INFO_OK); /* use currdir, default
> kernel */
> > + }
> > fp = (FILEPATH_DEVICE_PATH *)dp;
> > ucs2_to_utf8(fp->PathName, );
> > - if (kernel == NULL)
> > + if (kernel == NULL) {
> > + printf("Not using BootXXX: can't decode kernel\n");
> > return (BAD_CHOICE);
> > + }
> > if (*kernel == '\\' || isupper(*kernel))
> > fix_dosisms(kernel);
> > if (stat(kernel, ) != 0) {
> > free(kernel);
> > + printf("Not using BootXXX: can't find %s\n", kernel);
> > return (BAD_CHOICE);
> > }
> > setenv("kernel", kernel, 1);
> > free(kernel);
> > + text = efi_devpath_name(last_dp);
> > + if (text) {
> > + printf("Using BootXXX %S + %s\n", text, kernel);
> > + efi_free_devpath_name(text);
> > + }
> >
> > return (BOOT_INFO_OK);
> > }
> > @@ -499,13 +524,22 @@ find_currdev(EFI_LOADED_IMAGE *img, bool
> do_bootmgr, b
> > if (sanity_check_currdev())
> > return (0);
> > if (dp->pd_parent != NULL) {
> > + pdinfo_t *espdp = dp;
> > dp = dp->pd_parent;
> > STAILQ_FOREACH(pp, >pd_part, pd_link) {
> > + /* Already tried the ESP */
> > + if (espdp == pp)
> > + continue;
> > /*
> >* Roll up the ZFS special case
> >* for those partitions that have
> >* zpools
svn commit: r336791 - head/stand/efi/loader
Author: imp
Date: Fri Jul 27 22:29:20 2018
New Revision: 336791
URL: https://svnweb.freebsd.org/changeset/base/336791
Log:
In the Boot message, use the actual boot variable.
Fix stupid compile issue that crept in when I moved patches between trees.
Modified:
head/stand/efi/loader/main.c
Modified: head/stand/efi/loader/main.c
==
--- head/stand/efi/loader/main.cFri Jul 27 22:29:15 2018
(r336790)
+++ head/stand/efi/loader/main.cFri Jul 27 22:29:20 2018
(r336791)
@@ -368,11 +368,11 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
* path in it...
*/
if (last_dp == first_dp) {
- printf("Ignoring BootXXX: Only one DP found\n");
+ printf("Ignoring Boot%04x: Only one DP found\n", boot_current);
return NOT_SPECIFIC;
}
- if (efi_devpath_to_media_path(path) == NULL) {
- printf("Ignoring Boot: No Media Path\n");
+ if (efi_devpath_to_media_path(last_dp) == NULL) {
+ printf("Ignoring Boot%04x: No Media Path\n", boot_current);
return NOT_SPECIFIC;
}
@@ -382,12 +382,12 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
*/
pp = efiblk_get_pdinfo_by_device_path(last_dp);
if (pp == NULL) {
- printf("Ignoring Boot: Device Path not found\n");
+ printf("Ignoring Boot%04x: Device Path not found\n",
boot_current);
return BAD_CHOICE;
}
set_currdev_pdinfo(pp);
if (!sanity_check_currdev()){
- printf("Ignoring BootXXX: sanity check failed\n");
+ printf("Ignoring Boot%04x: sanity check failed\n",
boot_current);
return BAD_CHOICE;
}
@@ -402,27 +402,29 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
dp = efi_devpath_last_node(last_dp);
if (DevicePathType(dp) != MEDIA_DEVICE_PATH ||
DevicePathSubType(dp) != MEDIA_FILEPATH_DP) {
- printf("Using Boot for root partition\n");
+ printf("Using Boot%04x for root partition\n", boot_current);
return (BOOT_INFO_OK); /* use currdir, default kernel
*/
}
fp = (FILEPATH_DEVICE_PATH *)dp;
ucs2_to_utf8(fp->PathName, );
if (kernel == NULL) {
- printf("Not using BootXXX: can't decode kernel\n");
+ printf("Not using Boot%04x: can't decode kernel\n",
boot_current);
return (BAD_CHOICE);
}
if (*kernel == '\\' || isupper(*kernel))
fix_dosisms(kernel);
if (stat(kernel, ) != 0) {
free(kernel);
- printf("Not using BootXXX: can't find %s\n", kernel);
+ printf("Not using Boot%04x: can't find %s\n", boot_current,
+ kernel);
return (BAD_CHOICE);
}
setenv("kernel", kernel, 1);
free(kernel);
text = efi_devpath_name(last_dp);
if (text) {
- printf("Using BootXXX %S + %s\n", text, kernel);
+ printf("Using Boot$04x %S + %s\n", boot_current, text,
+ kernel);
efi_free_devpath_name(text);
}
___
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: r336790 - head/stand/efi/loader
Author: imp
Date: Fri Jul 27 22:29:15 2018
New Revision: 336790
URL: https://svnweb.freebsd.org/changeset/base/336790
Log:
Add some additional debug to loader.efi
Add some verbose debugging information to the loader's new
choices. I'll remove these / put them behind a DEBUG define at a later
time. This is to give additional information if there's any dangling
edge cases not contemplated by the code. r336789 had most of this
change, but had the wrong commit message. This refines it slightly.
Modified:
head/stand/efi/loader/main.c
Modified: head/stand/efi/loader/main.c
==
--- head/stand/efi/loader/main.cFri Jul 27 22:00:00 2018
(r336789)
+++ head/stand/efi/loader/main.cFri Jul 27 22:29:15 2018
(r336790)
@@ -832,7 +832,6 @@ main(int argc, CHAR16 *argv[])
}
}
}
- printf("howto %#x console set to %s\n", howto, getenv("console"));
/*
* howto is set now how we want to export the flags to the kernel, so
@@ -869,6 +868,8 @@ main(int argc, CHAR16 *argv[])
ST->Hdr.Revision & 0x);
printf(" EFI Firmware: %S (rev %d.%02d)\n", ST->FirmwareVendor,
ST->FirmwareRevision >> 16, ST->FirmwareRevision & 0x);
+ printf(" Console: %s (%#x)\n", getenv("console"), howto);
+
/* Determine the devpath of our image so we can prefer it. */
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336789 - head/stand/efi/loader
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512
Am Fri, 27 Jul 2018 22:00:00 + (UTC)
Warner Losh schrieb:
> Author: imp
> Date: Fri Jul 27 22:00:00 2018
> New Revision: 336789
> URL: https://svnweb.freebsd.org/changeset/base/336789
>
> Log:
> stand debug
>
> Modified:
> head/stand/efi/loader/main.c
>
> Modified: head/stand/efi/loader/main.c
> ==
> --- head/stand/efi/loader/main.c Fri Jul 27 21:50:10 2018
> (r336788)
> +++ head/stand/efi/loader/main.c Fri Jul 27 22:00:00 2018
> (r336789)
> @@ -312,6 +312,7 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
> char *kernel = NULL;
> FILEPATH_DEVICE_PATH *fp;
> struct stat st;
> + CHAR16 *text;
>
> /*
>* FreeBSD encodes it's boot loading path into the boot loader
> @@ -349,6 +350,11 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
> if ((char *)edp > ep)
> return NOT_SPECIFIC;
> while (dp < edp) {
> + text = efi_devpath_name(dp);
> + if (text != NULL) {
> + printf(" BootInfo Path: %S\n", text);
> + efi_free_devpath_name(text);
> + }
> last_dp = dp;
> dp = (EFI_DEVICE_PATH *)((char *)dp + efi_devpath_length(dp));
> }
> @@ -359,22 +365,31 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
>* path in it. Those show up as various VenHw() nodes
>* which are basically opaque to us. Don't count those
>* as something specifc.
> + * path in it...
>*/
> - if (last_dp == first_dp)
> + if (last_dp == first_dp) {
> + printf("Ignoring BootXXX: Only one DP found\n");
> return NOT_SPECIFIC;
> - if (efi_devpath_to_media_path(last_dp) == NULL)
> + }
> + if (efi_devpath_to_media_path(path) == NULL) {
> + printf("Ignoring Boot: No Media Path\n");
> return NOT_SPECIFIC;
> + }
>
> /*
>* OK. At this point we either have a good path or a bad one.
>* Let's check.
>*/
> pp = efiblk_get_pdinfo_by_device_path(last_dp);
> - if (pp == NULL)
> + if (pp == NULL) {
> + printf("Ignoring Boot: Device Path not found\n");
> return BAD_CHOICE;
> + }
> set_currdev_pdinfo(pp);
> - if (!sanity_check_currdev())
> + if (!sanity_check_currdev()){
> + printf("Ignoring BootXXX: sanity check failed\n");
> return BAD_CHOICE;
> + }
>
> /*
>* OK. We've found a device that matches, next we need to check the last
> @@ -386,20 +401,30 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
>*/
> dp = efi_devpath_last_node(last_dp);
> if (DevicePathType(dp) != MEDIA_DEVICE_PATH ||
> - DevicePathSubType(dp) != MEDIA_FILEPATH_DP)
> + DevicePathSubType(dp) != MEDIA_FILEPATH_DP) {
> + printf("Using Boot for root partition\n");
> return (BOOT_INFO_OK); /* use currdir, default kernel
> */
> + }
> fp = (FILEPATH_DEVICE_PATH *)dp;
> ucs2_to_utf8(fp->PathName, );
> - if (kernel == NULL)
> + if (kernel == NULL) {
> + printf("Not using BootXXX: can't decode kernel\n");
> return (BAD_CHOICE);
> + }
> if (*kernel == '\\' || isupper(*kernel))
> fix_dosisms(kernel);
> if (stat(kernel, ) != 0) {
> free(kernel);
> + printf("Not using BootXXX: can't find %s\n", kernel);
> return (BAD_CHOICE);
> }
> setenv("kernel", kernel, 1);
> free(kernel);
> + text = efi_devpath_name(last_dp);
> + if (text) {
> + printf("Using BootXXX %S + %s\n", text, kernel);
> + efi_free_devpath_name(text);
> + }
>
> return (BOOT_INFO_OK);
> }
> @@ -499,13 +524,22 @@ find_currdev(EFI_LOADED_IMAGE *img, bool do_bootmgr, b
> if (sanity_check_currdev())
> return (0);
> if (dp->pd_parent != NULL) {
> + pdinfo_t *espdp = dp;
> dp = dp->pd_parent;
> STAILQ_FOREACH(pp, >pd_part, pd_link) {
> + /* Already tried the ESP */
> + if (espdp == pp)
> + continue;
> /*
>* Roll up the ZFS special case
>* for those partitions that have
>* zpools on them.
>*/
> + text = efi_devpath_name(pp->pd_devpath);
> + if (text != NULL) {
> + printf("Trying: %S\n", text);
> +
Re: svn commit: r336789 - head/stand/efi/loader
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512
Am Fri, 27 Jul 2018 22:00:00 + (UTC)
Warner Losh schrieb:
> Author: imp
> Date: Fri Jul 27 22:00:00 2018
> New Revision: 336789
> URL: https://svnweb.freebsd.org/changeset/base/336789
>
> Log:
> stand debug
>
> Modified:
> head/stand/efi/loader/main.c
>
> Modified: head/stand/efi/loader/main.c
> ==
> --- head/stand/efi/loader/main.c Fri Jul 27 21:50:10 2018
> (r336788)
> +++ head/stand/efi/loader/main.c Fri Jul 27 22:00:00 2018
> (r336789)
> @@ -312,6 +312,7 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
> char *kernel = NULL;
> FILEPATH_DEVICE_PATH *fp;
> struct stat st;
> + CHAR16 *text;
>
> /*
>* FreeBSD encodes it's boot loading path into the boot loader
> @@ -349,6 +350,11 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
> if ((char *)edp > ep)
> return NOT_SPECIFIC;
> while (dp < edp) {
> + text = efi_devpath_name(dp);
> + if (text != NULL) {
> + printf(" BootInfo Path: %S\n", text);
> + efi_free_devpath_name(text);
> + }
> last_dp = dp;
> dp = (EFI_DEVICE_PATH *)((char *)dp + efi_devpath_length(dp));
> }
> @@ -359,22 +365,31 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
>* path in it. Those show up as various VenHw() nodes
>* which are basically opaque to us. Don't count those
>* as something specifc.
> + * path in it...
>*/
> - if (last_dp == first_dp)
> + if (last_dp == first_dp) {
> + printf("Ignoring BootXXX: Only one DP found\n");
> return NOT_SPECIFIC;
> - if (efi_devpath_to_media_path(last_dp) == NULL)
> + }
> + if (efi_devpath_to_media_path(path) == NULL) {
> + printf("Ignoring Boot: No Media Path\n");
> return NOT_SPECIFIC;
> + }
>
> /*
>* OK. At this point we either have a good path or a bad one.
>* Let's check.
>*/
> pp = efiblk_get_pdinfo_by_device_path(last_dp);
> - if (pp == NULL)
> + if (pp == NULL) {
> + printf("Ignoring Boot: Device Path not found\n");
> return BAD_CHOICE;
> + }
> set_currdev_pdinfo(pp);
> - if (!sanity_check_currdev())
> + if (!sanity_check_currdev()){
> + printf("Ignoring BootXXX: sanity check failed\n");
> return BAD_CHOICE;
> + }
>
> /*
>* OK. We've found a device that matches, next we need to check the last
> @@ -386,20 +401,30 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
>*/
> dp = efi_devpath_last_node(last_dp);
> if (DevicePathType(dp) != MEDIA_DEVICE_PATH ||
> - DevicePathSubType(dp) != MEDIA_FILEPATH_DP)
> + DevicePathSubType(dp) != MEDIA_FILEPATH_DP) {
> + printf("Using Boot for root partition\n");
> return (BOOT_INFO_OK); /* use currdir, default kernel
> */
> + }
> fp = (FILEPATH_DEVICE_PATH *)dp;
> ucs2_to_utf8(fp->PathName, );
> - if (kernel == NULL)
> + if (kernel == NULL) {
> + printf("Not using BootXXX: can't decode kernel\n");
> return (BAD_CHOICE);
> + }
> if (*kernel == '\\' || isupper(*kernel))
> fix_dosisms(kernel);
> if (stat(kernel, ) != 0) {
> free(kernel);
> + printf("Not using BootXXX: can't find %s\n", kernel);
> return (BAD_CHOICE);
> }
> setenv("kernel", kernel, 1);
> free(kernel);
> + text = efi_devpath_name(last_dp);
> + if (text) {
> + printf("Using BootXXX %S + %s\n", text, kernel);
> + efi_free_devpath_name(text);
> + }
>
> return (BOOT_INFO_OK);
> }
> @@ -499,13 +524,22 @@ find_currdev(EFI_LOADED_IMAGE *img, bool do_bootmgr, b
> if (sanity_check_currdev())
> return (0);
> if (dp->pd_parent != NULL) {
> + pdinfo_t *espdp = dp;
> dp = dp->pd_parent;
> STAILQ_FOREACH(pp, >pd_part, pd_link) {
> + /* Already tried the ESP */
> + if (espdp == pp)
> + continue;
> /*
>* Roll up the ZFS special case
>* for those partitions that have
>* zpools on them.
>*/
> + text = efi_devpath_name(pp->pd_devpath);
> + if (text != NULL) {
> + printf("Trying: %S\n", text);
> +
Re: svn commit: r336742 - in head: etc sbin/dump
On Fri, Jul 27, 2018, at 3:30 PM, Brad Davis wrote: > On Fri, Jul 27, 2018, at 3:26 PM, Antoine Brodin wrote: > > On Thu, Jul 26, 2018 at 6:45 PM, Brad Davis wrote: > > > Author: brd > > > Date: Thu Jul 26 16:45:25 2018 > > > New Revision: 336742 > > > URL: https://svnweb.freebsd.org/changeset/base/336742 > > > > > > Log: > > > Move dumpdates creation to CONFS= > > > > > > Approved by: bapt (mentor) > > > Differential Revision:https://reviews.freebsd.org/D16435 > > > > Hi, > > > > This commit seems to prevent successful installation of FreeBSD. > > It only seems to prevent upgrades, so my build a release VM test is not > enough.. I am working on it right now. I found the issue and I opened up the following review for one of my mentors to approve and have prodded them: https://reviews.freebsd.org/D16476 install(1) should be fixed, but this gets around the issue quickly so people can move on. Regards, Brad Davis ___ 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: r336789 - head/stand/efi/loader
Author: imp
Date: Fri Jul 27 22:00:00 2018
New Revision: 336789
URL: https://svnweb.freebsd.org/changeset/base/336789
Log:
stand debug
Modified:
head/stand/efi/loader/main.c
Modified: head/stand/efi/loader/main.c
==
--- head/stand/efi/loader/main.cFri Jul 27 21:50:10 2018
(r336788)
+++ head/stand/efi/loader/main.cFri Jul 27 22:00:00 2018
(r336789)
@@ -312,6 +312,7 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
char *kernel = NULL;
FILEPATH_DEVICE_PATH *fp;
struct stat st;
+ CHAR16 *text;
/*
* FreeBSD encodes it's boot loading path into the boot loader
@@ -349,6 +350,11 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
if ((char *)edp > ep)
return NOT_SPECIFIC;
while (dp < edp) {
+ text = efi_devpath_name(dp);
+ if (text != NULL) {
+ printf(" BootInfo Path: %S\n", text);
+ efi_free_devpath_name(text);
+ }
last_dp = dp;
dp = (EFI_DEVICE_PATH *)((char *)dp + efi_devpath_length(dp));
}
@@ -359,22 +365,31 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
* path in it. Those show up as various VenHw() nodes
* which are basically opaque to us. Don't count those
* as something specifc.
+* path in it...
*/
- if (last_dp == first_dp)
+ if (last_dp == first_dp) {
+ printf("Ignoring BootXXX: Only one DP found\n");
return NOT_SPECIFIC;
- if (efi_devpath_to_media_path(last_dp) == NULL)
+ }
+ if (efi_devpath_to_media_path(path) == NULL) {
+ printf("Ignoring Boot: No Media Path\n");
return NOT_SPECIFIC;
+ }
/*
* OK. At this point we either have a good path or a bad one.
* Let's check.
*/
pp = efiblk_get_pdinfo_by_device_path(last_dp);
- if (pp == NULL)
+ if (pp == NULL) {
+ printf("Ignoring Boot: Device Path not found\n");
return BAD_CHOICE;
+ }
set_currdev_pdinfo(pp);
- if (!sanity_check_currdev())
+ if (!sanity_check_currdev()){
+ printf("Ignoring BootXXX: sanity check failed\n");
return BAD_CHOICE;
+ }
/*
* OK. We've found a device that matches, next we need to check the last
@@ -386,20 +401,30 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char *
*/
dp = efi_devpath_last_node(last_dp);
if (DevicePathType(dp) != MEDIA_DEVICE_PATH ||
- DevicePathSubType(dp) != MEDIA_FILEPATH_DP)
+ DevicePathSubType(dp) != MEDIA_FILEPATH_DP) {
+ printf("Using Boot for root partition\n");
return (BOOT_INFO_OK); /* use currdir, default kernel
*/
+ }
fp = (FILEPATH_DEVICE_PATH *)dp;
ucs2_to_utf8(fp->PathName, );
- if (kernel == NULL)
+ if (kernel == NULL) {
+ printf("Not using BootXXX: can't decode kernel\n");
return (BAD_CHOICE);
+ }
if (*kernel == '\\' || isupper(*kernel))
fix_dosisms(kernel);
if (stat(kernel, ) != 0) {
free(kernel);
+ printf("Not using BootXXX: can't find %s\n", kernel);
return (BAD_CHOICE);
}
setenv("kernel", kernel, 1);
free(kernel);
+ text = efi_devpath_name(last_dp);
+ if (text) {
+ printf("Using BootXXX %S + %s\n", text, kernel);
+ efi_free_devpath_name(text);
+ }
return (BOOT_INFO_OK);
}
@@ -499,13 +524,22 @@ find_currdev(EFI_LOADED_IMAGE *img, bool do_bootmgr, b
if (sanity_check_currdev())
return (0);
if (dp->pd_parent != NULL) {
+ pdinfo_t *espdp = dp;
dp = dp->pd_parent;
STAILQ_FOREACH(pp, >pd_part, pd_link) {
+ /* Already tried the ESP */
+ if (espdp == pp)
+ continue;
/*
* Roll up the ZFS special case
* for those partitions that have
* zpools on them.
*/
+ text = efi_devpath_name(pp->pd_devpath);
+ if (text != NULL) {
+ printf("Trying: %S\n", text);
+ efi_free_devpath_name(text);
+ }
if (try_as_currdev(dp, pp))
return (0);
svn commit: r336788 - head/tools/boot
Author: imp
Date: Fri Jul 27 21:50:10 2018
New Revision: 336788
URL: https://svnweb.freebsd.org/changeset/base/336788
Log:
also set multicons for tests
Modified:
head/tools/boot/rootgen.sh
Modified: head/tools/boot/rootgen.sh
==
--- head/tools/boot/rootgen.sh Fri Jul 27 21:40:05 2018(r336787)
+++ head/tools/boot/rootgen.sh Fri Jul 27 21:50:10 2018(r336788)
@@ -799,7 +799,8 @@ echo -h -D -S115200 > ${DESTDIR}/boot.config
cat > ${DESTDIR}/boot/loader.conf
svn commit: r336787 - head
Author: imp Date: Fri Jul 27 21:40:05 2018 New Revision: 336787 URL: https://svnweb.freebsd.org/changeset/base/336787 Log: Note ARM Atmel, Cavlium and XScale removal. Modified: head/UPDATING Modified: head/UPDATING == --- head/UPDATING Fri Jul 27 21:36:29 2018(r336786) +++ head/UPDATING Fri Jul 27 21:40:05 2018(r336787) @@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20180727: + Atmel AT91RM9200 and AT91SAM9, Cavium CNS 11xx and XScale + support has been removed from the tree. These ports were + obsolete and/or known to be broken for many years. + 20180723: loader.efi has been augmented to participate more fully in the UEFI boot manager protocol. loader.efi will now look at the ___ 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: r336786 - in head: . sys/arm/xscale
Author: imp Date: Fri Jul 27 21:36:29 2018 New Revision: 336786 URL: https://svnweb.freebsd.org/changeset/base/336786 Log: Re-remove these empty directories Deleted: head/sys/arm/xscale/ Modified: head/UPDATING Modified: head/UPDATING == --- head/UPDATING Fri Jul 27 21:26:32 2018(r336785) +++ head/UPDATING Fri Jul 27 21:36:29 2018(r336786) @@ -1,4 +1,4 @@ -Updating Information for FreeBSD current users. + Updating Information for FreeBSD current users. This file is maintained and copyrighted by M. Warner Losh . See end of file for further details. For commonly done items, please see the ___ 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: r336742 - in head: etc sbin/dump
On Fri, Jul 27, 2018, at 3:26 PM, Antoine Brodin wrote: > On Thu, Jul 26, 2018 at 6:45 PM, Brad Davis wrote: > > Author: brd > > Date: Thu Jul 26 16:45:25 2018 > > New Revision: 336742 > > URL: https://svnweb.freebsd.org/changeset/base/336742 > > > > Log: > > Move dumpdates creation to CONFS= > > > > Approved by: bapt (mentor) > > Differential Revision:https://reviews.freebsd.org/D16435 > > Hi, > > This commit seems to prevent successful installation of FreeBSD. It only seems to prevent upgrades, so my build a release VM test is not enough.. I am working on it right now. Regards, Brad Davis ___ 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: r336742 - in head: etc sbin/dump
On Thu, Jul 26, 2018 at 6:45 PM, Brad Davis wrote:
> Author: brd
> Date: Thu Jul 26 16:45:25 2018
> New Revision: 336742
> URL: https://svnweb.freebsd.org/changeset/base/336742
>
> Log:
> Move dumpdates creation to CONFS=
>
> Approved by: bapt (mentor)
> Differential Revision:https://reviews.freebsd.org/D16435
Hi,
This commit seems to prevent successful installation of FreeBSD.
Cheers,
Antoine
>
> Modified:
> head/etc/Makefile
> head/sbin/dump/Makefile
>
> Modified: head/etc/Makefile
> ==
> --- head/etc/Makefile Thu Jul 26 16:08:34 2018(r336741)
> +++ head/etc/Makefile Thu Jul 26 16:45:25 2018(r336742)
> @@ -296,8 +296,6 @@ distribution:
> ${INSTALL_SYMLINK} mail/aliases ${DESTDIR}/etc/aliases; \
> fi
> .endif
> - ${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \
> - ${DESTDIR}/etc/dumpdates
> .if ${MK_LOCATE} != "no"
> ${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \
> ${DESTDIR}/var/db/locate.database
>
> Modified: head/sbin/dump/Makefile
> ==
> --- head/sbin/dump/Makefile Thu Jul 26 16:08:34 2018(r336741)
> +++ head/sbin/dump/Makefile Thu Jul 26 16:45:25 2018(r336742)
> @@ -15,6 +15,10 @@
>
> PACKAGE=runtime
> PROG= dump
> +CONFS= /dev/null
> +CONFSGRP= operator
> +CONFSMODE= 664
> +CONFSNAME_/dev/null= dumpdates
> LINKS= ${BINDIR}/dump ${BINDIR}/rdump
> CFLAGS+=-DRDUMP
> SRCS= itime.c main.c optr.c dumprmt.c tape.c traverse.c unctime.c cache.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"
svn commit: r336785 - head/sys/arm/conf
Author: imp Date: Fri Jul 27 21:26:32 2018 New Revision: 336785 URL: https://svnweb.freebsd.org/changeset/base/336785 Log: This builds now, so aadd it back to Universe. Modified: head/sys/arm/conf/RT1310 Modified: head/sys/arm/conf/RT1310 == --- head/sys/arm/conf/RT1310Fri Jul 27 21:25:07 2018(r336784) +++ head/sys/arm/conf/RT1310Fri Jul 27 21:26:32 2018(r336785) @@ -3,8 +3,6 @@ # # $FreeBSD$ # -# TODO: This fails to build under universe, irnore it until it's fixed -#NO_UNIVERSE ident RT1310 include"std.arm" ___ 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: r336784 - in head: share/man/man4/man4.arm sys/arm/conf sys/arm/xscale sys/arm/xscale/i8134x sys/arm/xscale/pxa sys/conf
Author: imp Date: Fri Jul 27 21:25:07 2018 New Revision: 336784 URL: https://svnweb.freebsd.org/changeset/base/336784 Log: Remove xscale support. As discussed in arm@. This is a scaled back version of the prior commit because xscale is overlaoded in places to mean armv5 or similar. The OLD XSCALE stuff hasn't been useful in a while. The original committer (cognet@) was the only one that had boards for it. He's blessed this removal. Newer XSCALE (GUMSTIX) is for hardware that's quite old. After discussion on arm@, it was clear there was no support for keeping it. Noticed by: andrew@ Deleted: head/share/man/man4/man4.arm/npe.4 head/sys/arm/conf/CRB head/sys/arm/conf/GUMSTIX head/sys/arm/conf/GUMSTIX-QEMU head/sys/arm/conf/GUMSTIX.hints head/sys/arm/xscale/i8134x/crb_machdep.c head/sys/arm/xscale/i8134x/files.crb head/sys/arm/xscale/i8134x/files.i81342 head/sys/arm/xscale/i8134x/i80321_timer.c head/sys/arm/xscale/i8134x/i80321_wdog.c head/sys/arm/xscale/i8134x/i80321reg.h head/sys/arm/xscale/i8134x/i80321var.h head/sys/arm/xscale/i8134x/i81342.c head/sys/arm/xscale/i8134x/i81342_mcu.c head/sys/arm/xscale/i8134x/i81342_pci.c head/sys/arm/xscale/i8134x/i81342_space.c head/sys/arm/xscale/i8134x/i81342reg.h head/sys/arm/xscale/i8134x/i81342var.h head/sys/arm/xscale/i8134x/iq81342_7seg.c head/sys/arm/xscale/i8134x/iq81342reg.h head/sys/arm/xscale/i8134x/iq81342var.h head/sys/arm/xscale/i8134x/obio.c head/sys/arm/xscale/i8134x/obiovar.h head/sys/arm/xscale/i8134x/std.crb head/sys/arm/xscale/i8134x/std.i81342 head/sys/arm/xscale/i8134x/uart_bus_i81342.c head/sys/arm/xscale/i8134x/uart_cpu_i81342.c head/sys/arm/xscale/pxa/files.pxa head/sys/arm/xscale/pxa/if_smc_smi.c head/sys/arm/xscale/pxa/pxa_gpio.c head/sys/arm/xscale/pxa/pxa_icu.c head/sys/arm/xscale/pxa/pxa_machdep.c head/sys/arm/xscale/pxa/pxa_obio.c head/sys/arm/xscale/pxa/pxa_smi.c head/sys/arm/xscale/pxa/pxa_space.c head/sys/arm/xscale/pxa/pxa_timer.c head/sys/arm/xscale/pxa/pxareg.h head/sys/arm/xscale/pxa/pxavar.h head/sys/arm/xscale/pxa/std.pxa head/sys/arm/xscale/pxa/uart_bus_pxa.c head/sys/arm/xscale/pxa/uart_cpu_pxa.c head/sys/arm/xscale/std.xscale Modified: head/sys/arm/conf/NOTES head/sys/conf/options.arm Modified: head/sys/arm/conf/NOTES == --- head/sys/arm/conf/NOTES Fri Jul 27 21:25:01 2018(r336783) +++ head/sys/arm/conf/NOTES Fri Jul 27 21:25:07 2018(r336784) @@ -5,17 +5,12 @@ machine arm cpuCPU_ARM9 cpuCPU_ARM9E cpuCPU_FA526 -cpuCPU_XSCALE_81342 -cpuCPU_XSCALE_PXA2X0 files "../mv/files.mv" files "../mv/discovery/files.db78xxx" files "../mv/kirkwood/files.kirkwood" files "../mv/orion/files.db88f5xxx" files "../mv/orion/files.ts7800" -files "../xscale/i8134x/files.crb" -files "../xscale/i8134x/files.i81342" -files "../xscale/pxa/files.pxa" optionsPHYSADDR=0x Modified: head/sys/conf/options.arm == --- head/sys/conf/options.arm Fri Jul 27 21:25:01 2018(r336783) +++ head/sys/conf/options.arm Fri Jul 27 21:25:07 2018(r336784) @@ -16,8 +16,6 @@ CPU_CORTEXA opt_global.h CPU_KRAIT opt_global.h CPU_FA526 opt_global.h CPU_MV_PJ4Bopt_global.h -CPU_XSCALE_81342 opt_global.h -CPU_XSCALE_PXA2X0 opt_global.h SMP_ON_UP opt_global.h # Runtime detection of MP extensions DEV_GICopt_global.h DEV_PMUopt_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: r336783 - in head: lib/libc/arm/string lib/libpmc share/man/man4/man4.arm share/mk sys/arm/arm sys/arm/conf sys/arm/include sys/arm/xscale sys/arm/xscale/i8134x sys/arm/xscale/pxa sys/c...
Author: imp
Date: Fri Jul 27 21:25:01 2018
New Revision: 336783
URL: https://svnweb.freebsd.org/changeset/base/336783
Log:
Revert r336773: it removed too much.
r336773 removed all things xscale. However, some things xscale are
really armv5. Revert that entirely. A more modest removal will follow.
Noticed by: andrew@
Added:
head/lib/libc/arm/string/memcpy_xscale.S (contents, props changed)
head/lib/libpmc/pmc.xscale.3 (contents, props changed)
head/share/man/man4/man4.arm/npe.4 (contents, props changed)
head/sys/arm/arm/bcopyinout_xscale.S (contents, props changed)
head/sys/arm/arm/cpufunc_asm_xscale.S (contents, props changed)
head/sys/arm/arm/cpufunc_asm_xscale_c3.S (contents, props changed)
head/sys/arm/conf/CRB (contents, props changed)
head/sys/arm/conf/GUMSTIX (contents, props changed)
head/sys/arm/conf/GUMSTIX-QEMU (contents, props changed)
head/sys/arm/conf/GUMSTIX.hints (contents, props changed)
head/sys/arm/xscale/
head/sys/arm/xscale/i8134x/
head/sys/arm/xscale/i8134x/crb_machdep.c (contents, props changed)
head/sys/arm/xscale/i8134x/files.crb (contents, props changed)
head/sys/arm/xscale/i8134x/files.i81342 (contents, props changed)
head/sys/arm/xscale/i8134x/i80321_timer.c (contents, props changed)
head/sys/arm/xscale/i8134x/i80321_wdog.c (contents, props changed)
head/sys/arm/xscale/i8134x/i80321reg.h (contents, props changed)
head/sys/arm/xscale/i8134x/i80321var.h (contents, props changed)
head/sys/arm/xscale/i8134x/i81342.c (contents, props changed)
head/sys/arm/xscale/i8134x/i81342_mcu.c (contents, props changed)
head/sys/arm/xscale/i8134x/i81342_pci.c (contents, props changed)
head/sys/arm/xscale/i8134x/i81342_space.c (contents, props changed)
head/sys/arm/xscale/i8134x/i81342reg.h (contents, props changed)
head/sys/arm/xscale/i8134x/i81342var.h (contents, props changed)
head/sys/arm/xscale/i8134x/iq81342_7seg.c (contents, props changed)
head/sys/arm/xscale/i8134x/iq81342reg.h (contents, props changed)
head/sys/arm/xscale/i8134x/iq81342var.h (contents, props changed)
head/sys/arm/xscale/i8134x/obio.c (contents, props changed)
head/sys/arm/xscale/i8134x/obiovar.h (contents, props changed)
head/sys/arm/xscale/i8134x/std.crb (contents, props changed)
head/sys/arm/xscale/i8134x/std.i81342 (contents, props changed)
head/sys/arm/xscale/i8134x/uart_bus_i81342.c (contents, props changed)
head/sys/arm/xscale/i8134x/uart_cpu_i81342.c (contents, props changed)
head/sys/arm/xscale/pxa/
head/sys/arm/xscale/pxa/files.pxa (contents, props changed)
head/sys/arm/xscale/pxa/if_smc_smi.c (contents, props changed)
head/sys/arm/xscale/pxa/pxa_gpio.c (contents, props changed)
head/sys/arm/xscale/pxa/pxa_icu.c (contents, props changed)
head/sys/arm/xscale/pxa/pxa_machdep.c (contents, props changed)
head/sys/arm/xscale/pxa/pxa_obio.c (contents, props changed)
head/sys/arm/xscale/pxa/pxa_smi.c (contents, props changed)
head/sys/arm/xscale/pxa/pxa_space.c (contents, props changed)
head/sys/arm/xscale/pxa/pxa_timer.c (contents, props changed)
head/sys/arm/xscale/pxa/pxareg.h (contents, props changed)
head/sys/arm/xscale/pxa/pxavar.h (contents, props changed)
head/sys/arm/xscale/pxa/std.pxa (contents, props changed)
head/sys/arm/xscale/pxa/uart_bus_pxa.c (contents, props changed)
head/sys/arm/xscale/pxa/uart_cpu_pxa.c (contents, props changed)
head/sys/arm/xscale/std.xscale (contents, props changed)
head/sys/dev/hwpmc/hwpmc_xscale.h (contents, props changed)
Modified:
head/lib/libc/arm/string/memcpy.S
head/lib/libpmc/Makefile
head/lib/libpmc/libpmc.c
head/lib/libpmc/pmc.3
head/share/man/man4/man4.arm/Makefile
head/share/mk/bsd.cpu.mk
head/sys/arm/arm/bcopyinout.S
head/sys/arm/arm/cpufunc.c
head/sys/arm/arm/dump_machdep.c
head/sys/arm/arm/elf_trampoline.c
head/sys/arm/arm/exception.S
head/sys/arm/arm/identcpu-v4.c
head/sys/arm/arm/pmap-v4.c
head/sys/arm/arm/trap-v4.c
head/sys/arm/arm/vm_machdep.c
head/sys/arm/conf/NOTES
head/sys/arm/include/armreg.h
head/sys/arm/include/cpu-v4.h
head/sys/arm/include/cpufunc.h
head/sys/arm/include/intr.h
head/sys/arm/include/md_var.h
head/sys/arm/include/pmap-v4.h
head/sys/arm/include/pmc_mdep.h
head/sys/arm/include/pte-v4.h
head/sys/conf/Makefile.arm
head/sys/conf/files.arm
head/sys/conf/options.arm
head/sys/dev/hwpmc/pmc_events.h
head/sys/sys/pmc.h
Modified: head/lib/libc/arm/string/memcpy.S
==
--- head/lib/libc/arm/string/memcpy.S Fri Jul 27 20:34:15 2018
(r336782)
+++ head/lib/libc/arm/string/memcpy.S Fri Jul 27 21:25:01 2018
(r336783)
@@ -2,4 +2,8 @@
#include
__FBSDID("$FreeBSD$");
+#if !defined(_ARM_ARCH_5E) || defined(_STANDALONE)
#include "memcpy_arm.S"
+#else
+#include "memcpy_xscale.S"
+#endif
Added:
Re: svn commit: r336781 - head/tests/sys/kqueue/libkqueue
On Fri, 2018-07-27 at 20:14 +, David Bright wrote: > Author: dab > Date: Fri Jul 27 20:14:58 2018 > New Revision: 336781 > URL: https://svnweb.freebsd.org/changeset/base/336781 > > Log: > Fix compilation error on some arches after r336761. > > A cast for printing an intmax_t was needed in a kqueue test for > some > arches. > > MFC after: 1 week > X-MFC-with: r336761 > Sponsored by: Dell EMC > > Modified: > head/tests/sys/kqueue/libkqueue/timer.c > > Modified: head/tests/sys/kqueue/libkqueue/timer.c > = > = > --- head/tests/sys/kqueue/libkqueue/timer.c Fri Jul 27 > 20:07:40 2018 (r336780) > +++ head/tests/sys/kqueue/libkqueue/timer.c Fri Jul 27 > 20:14:58 2018 (r336781) > @@ -239,7 +239,7 @@ test_abstime(void) > kev.fflags = 0; > kevent_cmp(, kevent_get(kqfd)); > if (time(NULL) < when + timeout) > - err(1, "too early %jd %jd", time(NULL), when + timeout); > + err(1, "too early %jd %jd", time(NULL), (intmax_t)(when > + timeout)); > You also need to cast the return value from time(NULL), it's a time_t as well. Unrelated: time(NULL) is used twice; if control takes the true branch of the if, then the process gets preempted before doing the second time(NULL) call, enough time could elapse that the printed results will be pretty confusing because it will be after when+timeout by then. -- Ian > /* Check if the event occurs again */ > sleep(3); > ___ 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: r336782 - head/lib/libproc/tests
Author: markj Date: Fri Jul 27 20:34:15 2018 New Revision: 336782 URL: https://svnweb.freebsd.org/changeset/base/336782 Log: Detach from the child process before completing the test. Otherwise the child will receive SIGTRAP if the parent exits first. Modified: head/lib/libproc/tests/proc_test.c Modified: head/lib/libproc/tests/proc_test.c == --- head/lib/libproc/tests/proc_test.c Fri Jul 27 20:14:58 2018 (r336781) +++ head/lib/libproc/tests/proc_test.c Fri Jul 27 20:34:15 2018 (r336782) @@ -183,7 +183,7 @@ ATF_TC_BODY(map_alias_name2map, tc) ATF_CHECK_EQ_MSG(proc_continue(phdl), 0, "failed to resume execution"); - proc_free(phdl); + proc_detach(phdl, 0); } ATF_TC(map_prefix_name2map); @@ -212,7 +212,7 @@ ATF_TC_BODY(map_prefix_name2map, tc) ATF_CHECK_EQ_MSG(proc_continue(phdl), 0, "failed to resume execution"); - proc_free(phdl); + proc_detach(phdl, 0); } ATF_TC(map_alias_name2sym); @@ -251,7 +251,7 @@ ATF_TC_BODY(map_alias_name2sym, tc) ATF_CHECK_EQ_MSG(proc_continue(phdl), 0, "failed to resume execution"); - proc_free(phdl); + proc_detach(phdl, 0); } ATF_TC(symbol_lookup); @@ -291,7 +291,7 @@ ATF_TC_BODY(symbol_lookup, tc) ATF_CHECK_EQ_MSG(proc_continue(phdl), 0, "failed to resume execution"); - proc_free(phdl); + proc_detach(phdl, 0); } ATF_TC(symbol_lookup_fail); @@ -328,7 +328,7 @@ ATF_TC_BODY(symbol_lookup_fail, tc) ATF_CHECK_EQ_MSG(proc_continue(phdl), 0, "failed to resume execution"); - proc_free(phdl); + proc_detach(phdl, 0); } ATF_TC(signal_forward); @@ -369,7 +369,7 @@ ATF_TC_BODY(signal_forward, tc) ATF_REQUIRE(WIFEXITED(status)); ATF_REQUIRE_EQ(WEXITSTATUS(status), 0); - proc_free(phdl); + proc_detach(phdl, 0); } ATF_TC(symbol_sort_local); @@ -400,6 +400,8 @@ ATF_TC_BODY(symbol_sort_local, tc) ATF_REQUIRE_MSG(strcmp(symname, "baz") == 0, "unexpected symbol name '%s'", symname); ATF_REQUIRE(GELF_ST_BIND(bar_sym.st_info) == STB_GLOBAL); + + proc_detach(phdl, 0); } ATF_TC(symbol_sort_prefix); @@ -428,6 +430,8 @@ ATF_TC_BODY(symbol_sort_prefix, tc) ATF_REQUIRE_MSG(strcmp(symname, "qux") == 0, "unexpected symbol name '%s'", symname); + + proc_detach(phdl, 0); } ATF_TC(symbol_sort_underscore); @@ -457,6 +461,8 @@ ATF_TC_BODY(symbol_sort_underscore, tc) ATF_REQUIRE_MSG(strcmp(symname, "foo") == 0, "unexpected symbol name '%s'", symname); + + proc_detach(phdl, 0); } ATF_TP_ADD_TCS(tp) ___ 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: r336781 - head/tests/sys/kqueue/libkqueue
Author: dab Date: Fri Jul 27 20:14:58 2018 New Revision: 336781 URL: https://svnweb.freebsd.org/changeset/base/336781 Log: Fix compilation error on some arches after r336761. A cast for printing an intmax_t was needed in a kqueue test for some arches. MFC after:1 week X-MFC-with: r336761 Sponsored by: Dell EMC Modified: head/tests/sys/kqueue/libkqueue/timer.c Modified: head/tests/sys/kqueue/libkqueue/timer.c == --- head/tests/sys/kqueue/libkqueue/timer.c Fri Jul 27 20:07:40 2018 (r336780) +++ head/tests/sys/kqueue/libkqueue/timer.c Fri Jul 27 20:14:58 2018 (r336781) @@ -239,7 +239,7 @@ test_abstime(void) kev.fflags = 0; kevent_cmp(, kevent_get(kqfd)); if (time(NULL) < when + timeout) - err(1, "too early %jd %jd", time(NULL), when + timeout); + err(1, "too early %jd %jd", time(NULL), (intmax_t)(when + timeout)); /* Check if the event occurs again */ sleep(3); ___ 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: r336780 - head/share/man/man4/man4.arm
Author: imp Date: Fri Jul 27 20:07:40 2018 New Revision: 336780 URL: https://svnweb.freebsd.org/changeset/base/336780 Log: Forgot to delete the link as well for npe. Modified: head/share/man/man4/man4.arm/Makefile Modified: head/share/man/man4/man4.arm/Makefile == --- head/share/man/man4/man4.arm/Makefile Fri Jul 27 19:47:42 2018 (r336779) +++ head/share/man/man4/man4.arm/Makefile Fri Jul 27 20:07:40 2018 (r336780) @@ -21,7 +21,6 @@ MAN= \ MLINKS= cgem.4 if_cgem.4 MLINKS+= imx_wdog.4 imxwdt.4 MLINKS+= mge.4 if_mge.4 -MLINKS+=npe.4 if_npe.4 MANSUBDIR=/arm ___ 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: r336779 - in head/lib: libc/gen libutil
Author: ian
Date: Fri Jul 27 19:47:42 2018
New Revision: 336779
URL: https://svnweb.freebsd.org/changeset/base/336779
Log:
Stop exporting __pw_scan and __pw_initpwd as freebsd-private libc functions
for use in libutil, and instead compile the small amount of common code
directly into libutil with a .PATH reachover.
Discussed with: kib@
Modified:
head/lib/libc/gen/Symbol.map
head/lib/libutil/Makefile
Modified: head/lib/libc/gen/Symbol.map
==
--- head/lib/libc/gen/Symbol.mapFri Jul 27 19:31:58 2018
(r336778)
+++ head/lib/libc/gen/Symbol.mapFri Jul 27 19:47:42 2018
(r336779)
@@ -510,8 +510,6 @@ FBSDprivate_1.0 {
__opendir2;
__pause;
_pause;
- __pw_initpwd; /* Used by (at least) libutil */
- __pw_scan; /* Used by (at least) libutil */
__raise;
_raise;
__sleep;
Modified: head/lib/libutil/Makefile
==
--- head/lib/libutil/Makefile Fri Jul 27 19:31:58 2018(r336778)
+++ head/lib/libutil/Makefile Fri Jul 27 19:47:42 2018(r336779)
@@ -6,6 +6,8 @@ SHLIBDIR?= /lib
.include
+.PATH: ${SRCTOP}/lib/libc/gen # for pw_scan.c
+
LIB= util
SHLIB_MAJOR= 9
@@ -15,8 +17,8 @@ SRCS= _secure_path.c auth.c expand_number.c flopen.c f
kinfo_getvmobject.c kld.c \
login_auth.c login_cap.c \
login_class.c login_crypt.c login_ok.c login_times.c login_tty.c \
- pidfile.c property.c pty.c pw_util.c quotafile.c realhostname.c \
- stub.c trimdomain.c uucplock.c
+ pidfile.c property.c pty.c pw_scan.c pw_util.c quotafile.c \
+ realhostname.c stub.c trimdomain.c uucplock.c
INCS= libutil.h login_cap.h
CFLAGS+= -DNO__SCCSID
___
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: r336746 - in head/lib: libc/gen libutil
On Fri, Jul 27, 2018 at 12:57:54PM -0600, Ian Lepore wrote: > Yes, this is exactly what I think we should do after your description > of how FBSDprivate_1.0 exists specifically to solve some interactions > between rtld, libc, and libthr. Great. > > This is what I meant when I said in one of the earlier emails: > > > I also noticed that chpass(1) and pwd_mkdb(8)_both directly compile in > > their own copy of the pw_scan.c source using .PATH in their makefiles. > > I wonder if doing that as the way of sharing the code between libc and > > libutil would be a better thing to do? (And presumably that would > > remove the need to have entries in the FBSDprivate_1.0 list?) > > So if we do that, are there any special considerations about removing > the __pw_scan entry (and now __pw_initpwd as well) from the private > list? Or can they just be deleted without needing to do anything else? > Does anything need to be done to make the __pw_scan symbol not directly > visible for linking to resolve external references? Remove them. FBSDprivate_1.0 is private and is guaranteed to be ABI-unstable. There is nothing to do to prevent linking against these symbols. If somebody decides to check if she inadvertently did that, it is enough to see if the FBSDprivate_1.0 namespace is referenced by the linked object, e.g. by 'readelf -V object' and see versions needed. ___ 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: r336778 - vendor/bsnmp/1.13
Author: harti Date: Fri Jul 27 19:31:58 2018 New Revision: 336778 URL: https://svnweb.freebsd.org/changeset/base/336778 Log: Tag bsnmp vendor release 1.13. Added: vendor/bsnmp/1.13/ - copied from r336777, vendor/bsnmp/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: r336777 - in vendor/bsnmp/dist: . config gensnmpdef gensnmptree lib snmp_mibII snmp_ntp snmp_target snmp_usm snmp_vacm snmpd
Author: harti Date: Fri Jul 27 19:30:18 2018 New Revision: 336777 URL: https://svnweb.freebsd.org/changeset/base/336777 Log: Vendor import of bsnmp-1.13. Added: vendor/bsnmp/dist/README.1st (contents, props changed) vendor/bsnmp/dist/config/install-sh (contents, props changed) vendor/bsnmp/dist/lib/snmpcrypto.c (contents, props changed) vendor/bsnmp/dist/lib/snmptc.h.in (contents, props changed) vendor/bsnmp/dist/lib/tc.def (contents, props changed) vendor/bsnmp/dist/libbsnmp.pc.in (contents, props changed) vendor/bsnmp/dist/snmp_mibII/Makefile.in (contents, props changed) vendor/bsnmp/dist/snmp_target/ vendor/bsnmp/dist/snmp_target/Makefile.in (contents, props changed) vendor/bsnmp/dist/snmp_target/snmp_target.3 (contents, props changed) vendor/bsnmp/dist/snmp_target/target_snmp.c (contents, props changed) vendor/bsnmp/dist/snmp_target/target_tree.def (contents, props changed) vendor/bsnmp/dist/snmp_usm/ vendor/bsnmp/dist/snmp_usm/Makefile.in (contents, props changed) vendor/bsnmp/dist/snmp_usm/snmp_usm.3 (contents, props changed) vendor/bsnmp/dist/snmp_usm/usm_snmp.c (contents, props changed) vendor/bsnmp/dist/snmp_usm/usm_tree.def (contents, props changed) vendor/bsnmp/dist/snmp_vacm/ vendor/bsnmp/dist/snmp_vacm/Makefile.in (contents, props changed) vendor/bsnmp/dist/snmp_vacm/snmp_vacm.3 (contents, props changed) vendor/bsnmp/dist/snmp_vacm/vacm_snmp.c (contents, props changed) vendor/bsnmp/dist/snmp_vacm/vacm_tree.def (contents, props changed) Deleted: vendor/bsnmp/dist/acinclude.m4 vendor/bsnmp/dist/aclocal.m4 vendor/bsnmp/dist/config/install.sh vendor/bsnmp/dist/configure vendor/bsnmp/dist/snmpd/.gdbinit Modified: vendor/bsnmp/dist/Makefile.in (contents, props changed) vendor/bsnmp/dist/VERSION (contents, props changed) vendor/bsnmp/dist/config/Makefile.build (contents, props changed) vendor/bsnmp/dist/config/Makefile.post (contents, props changed) vendor/bsnmp/dist/config/Makefile.pre (contents, props changed) vendor/bsnmp/dist/config/config.guess (contents, props changed) vendor/bsnmp/dist/config/config.sub (contents, props changed) vendor/bsnmp/dist/config/ltmain.sh (contents, props changed) vendor/bsnmp/dist/config/mkinstalldirs (contents, props changed) vendor/bsnmp/dist/configure.ac (contents, props changed) vendor/bsnmp/dist/gensnmpdef/Makefile.in (contents, props changed) vendor/bsnmp/dist/gensnmpdef/gensnmpdef.1 (contents, props changed) vendor/bsnmp/dist/gensnmpdef/gensnmpdef.c (contents, props changed) vendor/bsnmp/dist/gensnmptree/Makefile.in (contents, props changed) vendor/bsnmp/dist/gensnmptree/gensnmptree.1 (contents, props changed) vendor/bsnmp/dist/gensnmptree/gensnmptree.c (contents, props changed) vendor/bsnmp/dist/lib/Makefile.in (contents, props changed) vendor/bsnmp/dist/lib/asn1.3 (contents, props changed) vendor/bsnmp/dist/lib/asn1.c (contents, props changed) vendor/bsnmp/dist/lib/asn1.h (contents, props changed) vendor/bsnmp/dist/lib/bsnmpagent.3 (contents, props changed) vendor/bsnmp/dist/lib/bsnmpclient.3 (contents, props changed) vendor/bsnmp/dist/lib/bsnmplib.3 (contents, props changed) vendor/bsnmp/dist/lib/snmp.c (contents, props changed) vendor/bsnmp/dist/lib/snmp.h (contents, props changed) vendor/bsnmp/dist/lib/snmpagent.c (contents, props changed) vendor/bsnmp/dist/lib/snmpagent.h (contents, props changed) vendor/bsnmp/dist/lib/snmpclient.c (contents, props changed) vendor/bsnmp/dist/lib/snmpclient.h (contents, props changed) vendor/bsnmp/dist/lib/snmppriv.h (contents, props changed) vendor/bsnmp/dist/lib/support.c (contents, props changed) vendor/bsnmp/dist/lib/support.h (contents, props changed) vendor/bsnmp/dist/oid-list (contents, props changed) vendor/bsnmp/dist/snmp_mibII/BEGEMOT-IP-MIB.txt (contents, props changed) vendor/bsnmp/dist/snmp_mibII/BEGEMOT-MIB2-MIB.txt (contents, props changed) vendor/bsnmp/dist/snmp_mibII/mibII.c (contents, props changed) vendor/bsnmp/dist/snmp_mibII/mibII.h (contents, props changed) vendor/bsnmp/dist/snmp_mibII/mibII_begemot.c (contents, props changed) vendor/bsnmp/dist/snmp_mibII/mibII_ifmib.c (contents, props changed) vendor/bsnmp/dist/snmp_mibII/mibII_ifstack.c (contents, props changed) vendor/bsnmp/dist/snmp_mibII/mibII_interfaces.c (contents, props changed) vendor/bsnmp/dist/snmp_mibII/mibII_ip.c (contents, props changed) vendor/bsnmp/dist/snmp_mibII/mibII_ipaddr.c (contents, props changed) vendor/bsnmp/dist/snmp_mibII/mibII_nettomedia.c (contents, props changed) vendor/bsnmp/dist/snmp_mibII/mibII_rcvaddr.c (contents, props changed) vendor/bsnmp/dist/snmp_mibII/mibII_route.c (contents, props changed) vendor/bsnmp/dist/snmp_mibII/mibII_tcp.c (contents, props changed) vendor/bsnmp/dist/snmp_mibII/mibII_tree.def (contents, props changed)
svn commit: r336776 - head/release/arm
Author: imp Date: Fri Jul 27 19:25:09 2018 New Revision: 336776 URL: https://svnweb.freebsd.org/changeset/base/336776 Log: Remove the hopelessly confused GUMSTIX.conf config This config never worked. At no time did u-boot match the kenrel match the userland. As all the GUMSTIX gear we support is quite old and/or not working, remove it. The duovero stuff might work, but nobody has the hardware for it and GUMSTIX hasn't sold it in years. Deleted: head/release/arm/GUMSTIX.conf ___ 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: 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.
Fetch is in base and works fine with http:, now falls over
if you cut and paste any of these until you manually convert
them back to http:
>
> Best,
> Conrad
>
> On Fri, Jul 27, 2018 at 3:40 AM, Eitan Adler wrote:
> > Author: eadler
> > Date: Fri Jul 27 10:40:48 2018
> > New Revision: 336757
> > URL: https://svnweb.freebsd.org/changeset/base/336757
> >
> > Log:
> > Use https over http for FreeBSD pages
> >
> > Modified:
> > head/share/man/man4/firewire.4
> > head/share/man/man7/tests.7
> > head/share/misc/bsd-family-tree
> > head/sys/dev/firewire/00README
> > head/sys/dev/hwpmc/pmc_events.h
> > head/sys/dev/sk/if_sk.c
> > head/sys/dev/sound/pci/maestro3.c
> > head/sys/dev/sound/pcm/dsp.c
> > head/sys/fs/nfsclient/nfs_clstate.c
> >
> > Modified: head/share/man/man4/firewire.4
> > ==
> > --- head/share/man/man4/firewire.4 Fri Jul 27 07:05:50 2018
> > (r336756)
> > +++ head/share/man/man4/firewire.4 Fri Jul 27 10:40:48 2018
> > (r336757)
> > @@ -87,7 +87,7 @@ Debugging over the firewire interace is possible with
> > .Xr dcons 4
> > driver.
> > Please see
> > -.Pa http://wiki.freebsd.org/DebugWithDcons
> > +.Pa https://wiki.freebsd.org/DebugWithDcons
> > for details on how to setup debugging with firewire.
> > .Sh FILES
> > .Bl -tag -width "Pa /dev/fwmem0.0" -compact
> >
> > Modified: head/share/man/man7/tests.7
> > ==
> > --- head/share/man/man7/tests.7 Fri Jul 27 07:05:50 2018(r336756)
> > +++ head/share/man/man7/tests.7 Fri Jul 27 10:40:48 2018(r336757)
> > @@ -198,7 +198,7 @@ problem report.
> > For more details please refer to:
> > .Bl -bullet -offset indent -compact
> > .It
> > -.Lk http://lists.freebsd.org/ "FreeBSD Mailing Lists"
> > +.Lk https://lists.freebsd.org/ "FreeBSD Mailing Lists"
> > .It
> > .Lk https://www.freebsd.org/support.html "Problem Reporting"
> > .El
> >
> > Modified: head/share/misc/bsd-family-tree
> > ==
> > --- head/share/misc/bsd-family-tree Fri Jul 27 07:05:50 2018
> > (r336756)
> > +++ head/share/misc/bsd-family-tree Fri Jul 27 10:40:48 2018
> > (r336757)
> > @@ -814,6 +814,6 @@ Steven M. Schultz for providing 2.8BSD, 2.10BSD, 2.11B
> >
> > --
> > Copyright (c) 1997-2012 Wolfram Schneider
> > -URL: http://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree
> > +URL: https://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree
> >
> > $FreeBSD$
> >
> > Modified: head/sys/dev/firewire/00README
> > ==
> > --- head/sys/dev/firewire/00README Fri Jul 27 07:05:50 2018
> > (r336756)
> > +++ head/sys/dev/firewire/00README Fri Jul 27 10:40:48 2018
> > (r336757)
> > @@ -9,7 +9,7 @@ IEEE 1394 support for FreeBSD-5.X and 4.X.
> > modified by Hidetoshi Shimokawa .
> > Please note this driver is still under development.
> > You can find latest snapshots under:
> > - http://people.freebsd.org/~simokawa/
> > + https://people.freebsd.org/~simokawa/
> > named firewire-2002.tar.gz
> >
> > The driver consists of 6 parts:
> >
> > Modified: head/sys/dev/hwpmc/pmc_events.h
> > ==
> > --- head/sys/dev/hwpmc/pmc_events.h Fri Jul 27 07:05:50 2018
> > (r336756)
> > +++ head/sys/dev/hwpmc/pmc_events.h Fri Jul 27 10:40:48 2018
> > (r336757)
> > @@ -36,7 +36,7 @@
> > * the source tree at src/share/doc/papers/hwpmc/hwpmc.ms
> > * as well as on-line at:
> > *
> > - * http://wiki.freebsd.org/PmcTools/PmcHardwareHowTo
> > + * https://wiki.freebsd.org/PmcTools/PmcHardwareHowTo
> > *
> > * Please refer to those resources before you attempt to modify
> > * this file or the hwpmc driver/subsystem.
> >
> > Modified: head/sys/dev/sk/if_sk.c
> > ==
> > --- head/sys/dev/sk/if_sk.c Fri Jul 27 07:05:50 2018(r336756)
> > +++ head/sys/dev/sk/if_sk.c Fri Jul 27 10:40:48 2018(r336757)
> > @@ -64,7 +64,7 @@ __FBSDID("$FreeBSD$");
> > * XMAC II datasheet online. I have put my copy at people.freebsd.org as a
> > * convenience to others until Vitesse corrects this problem:
> > *
> > - *
> > http://people.freebsd.org/~wpaul/SysKonnect/xmacii_datasheet_rev_c_9-29.pdf
> > + *
> >
svn commit: r336775 - in head/sys/arm: at91 cavium lpc xscale
Author: imp Date: Fri Jul 27 19:12:02 2018 New Revision: 336775 URL: https://svnweb.freebsd.org/changeset/base/336775 Log: Remove now-empty directories. git-svn doesn't remove them unless you give it special flags, which I forgot. Pointy Hat to: imp Deleted: head/sys/arm/at91/ head/sys/arm/cavium/ head/sys/arm/lpc/ head/sys/arm/xscale/ ___ 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: r336746 - in head/lib: libc/gen libutil
On Fri, 2018-07-27 at 19:44 +0300, Konstantin Belousov wrote: > On Fri, Jul 27, 2018 at 10:07:11AM -0600, Ian Lepore wrote: > > > > I believe pw_scan() was originally a static function in libc used by > > getpwent() and related functions. When libutil grew some pw utilties, > > it looks like the static pw_scan was renamed to __pw_scan and added to > > the private list, so that it could be shared with libutil (and so I > > copied that process with pw_init(), but I had to rename it to > > pw_initpwd because libutil already has a pw_init()). > > > > I'm not sure how to make the functions more generic, pw_scan() parses a > > line of text in passwd(5) format, optionally warns about errors, and > > fills in a struct passwd with what it finds. pw_initpwd() inits a > > struct passwd to (well-)known default values. But libutil pw_scan() > > allocates the struct and requires the caller to free it, and the > > internal __pw_scan() fills in a struct passed in to it and returns an > > int, so there's no way to re-unify the functions under a single name. > I did not asked to make it more generic. I mean, if the function is > exported, its interface should be useful enough for generic consumers. > If the current interface is fine, so be it, but see below. > > > > > > > It would be strange to me to have one or two of the pw_() family of > > functions in libc and the rest of them in libutil. Libutil seems like a > > fine place for password/group file utilities that go beyond the posix > > functions. It's just an implementation detail that we'd prefer to share > > the source code for a small bit of common functionality around parsing > > lines of passwd file data. > Would it be a solution to stop exporting these functions at all, and > just sompile them twice, once in libc, and second time in libutil ? > libutil would add a source file from libc into it SRCS. Yes, this is exactly what I think we should do after your description of how FBSDprivate_1.0 exists specifically to solve some interactions between rtld, libc, and libthr. This is what I meant when I said in one of the earlier emails: > I also noticed that chpass(1) and pwd_mkdb(8)_both directly compile in > their own copy of the pw_scan.c source using .PATH in their makefiles. > I wonder if doing that as the way of sharing the code between libc and > libutil would be a better thing to do? (And presumably that would > remove the need to have entries in the FBSDprivate_1.0 list?) So if we do that, are there any special considerations about removing the __pw_scan entry (and now __pw_initpwd as well) from the private list? Or can they just be deleted without needing to do anything else? Does anything need to be done to make the __pw_scan symbol not directly visible for linking to resolve external references? -- Ian ___ 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: 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.
Best,
Conrad
On Fri, Jul 27, 2018 at 3:40 AM, Eitan Adler wrote:
> Author: eadler
> Date: Fri Jul 27 10:40:48 2018
> New Revision: 336757
> URL: https://svnweb.freebsd.org/changeset/base/336757
>
> Log:
> Use https over http for FreeBSD pages
>
> Modified:
> head/share/man/man4/firewire.4
> head/share/man/man7/tests.7
> head/share/misc/bsd-family-tree
> head/sys/dev/firewire/00README
> head/sys/dev/hwpmc/pmc_events.h
> head/sys/dev/sk/if_sk.c
> head/sys/dev/sound/pci/maestro3.c
> head/sys/dev/sound/pcm/dsp.c
> head/sys/fs/nfsclient/nfs_clstate.c
>
> Modified: head/share/man/man4/firewire.4
> ==
> --- head/share/man/man4/firewire.4 Fri Jul 27 07:05:50 2018
> (r336756)
> +++ head/share/man/man4/firewire.4 Fri Jul 27 10:40:48 2018
> (r336757)
> @@ -87,7 +87,7 @@ Debugging over the firewire interace is possible with
> .Xr dcons 4
> driver.
> Please see
> -.Pa http://wiki.freebsd.org/DebugWithDcons
> +.Pa https://wiki.freebsd.org/DebugWithDcons
> for details on how to setup debugging with firewire.
> .Sh FILES
> .Bl -tag -width "Pa /dev/fwmem0.0" -compact
>
> Modified: head/share/man/man7/tests.7
> ==
> --- head/share/man/man7/tests.7 Fri Jul 27 07:05:50 2018(r336756)
> +++ head/share/man/man7/tests.7 Fri Jul 27 10:40:48 2018(r336757)
> @@ -198,7 +198,7 @@ problem report.
> For more details please refer to:
> .Bl -bullet -offset indent -compact
> .It
> -.Lk http://lists.freebsd.org/ "FreeBSD Mailing Lists"
> +.Lk https://lists.freebsd.org/ "FreeBSD Mailing Lists"
> .It
> .Lk https://www.freebsd.org/support.html "Problem Reporting"
> .El
>
> Modified: head/share/misc/bsd-family-tree
> ==
> --- head/share/misc/bsd-family-tree Fri Jul 27 07:05:50 2018
> (r336756)
> +++ head/share/misc/bsd-family-tree Fri Jul 27 10:40:48 2018
> (r336757)
> @@ -814,6 +814,6 @@ Steven M. Schultz for providing 2.8BSD, 2.10BSD, 2.11B
>
> --
> Copyright (c) 1997-2012 Wolfram Schneider
> -URL: http://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree
> +URL: https://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree
>
> $FreeBSD$
>
> Modified: head/sys/dev/firewire/00README
> ==
> --- head/sys/dev/firewire/00README Fri Jul 27 07:05:50 2018
> (r336756)
> +++ head/sys/dev/firewire/00README Fri Jul 27 10:40:48 2018
> (r336757)
> @@ -9,7 +9,7 @@ IEEE 1394 support for FreeBSD-5.X and 4.X.
> modified by Hidetoshi Shimokawa .
> Please note this driver is still under development.
> You can find latest snapshots under:
> - http://people.freebsd.org/~simokawa/
> + https://people.freebsd.org/~simokawa/
> named firewire-2002.tar.gz
>
> The driver consists of 6 parts:
>
> Modified: head/sys/dev/hwpmc/pmc_events.h
> ==
> --- head/sys/dev/hwpmc/pmc_events.h Fri Jul 27 07:05:50 2018
> (r336756)
> +++ head/sys/dev/hwpmc/pmc_events.h Fri Jul 27 10:40:48 2018
> (r336757)
> @@ -36,7 +36,7 @@
> * the source tree at src/share/doc/papers/hwpmc/hwpmc.ms
> * as well as on-line at:
> *
> - * http://wiki.freebsd.org/PmcTools/PmcHardwareHowTo
> + * https://wiki.freebsd.org/PmcTools/PmcHardwareHowTo
> *
> * Please refer to those resources before you attempt to modify
> * this file or the hwpmc driver/subsystem.
>
> Modified: head/sys/dev/sk/if_sk.c
> ==
> --- head/sys/dev/sk/if_sk.c Fri Jul 27 07:05:50 2018(r336756)
> +++ head/sys/dev/sk/if_sk.c Fri Jul 27 10:40:48 2018(r336757)
> @@ -64,7 +64,7 @@ __FBSDID("$FreeBSD$");
> * XMAC II datasheet online. I have put my copy at people.freebsd.org as a
> * convenience to others until Vitesse corrects this problem:
> *
> - *
> http://people.freebsd.org/~wpaul/SysKonnect/xmacii_datasheet_rev_c_9-29.pdf
> + *
> https://people.freebsd.org/~wpaul/SysKonnect/xmacii_datasheet_rev_c_9-29.pdf
> *
> * Written by Bill Paul
> * Department of Electrical Engineering
>
> Modified: head/sys/dev/sound/pci/maestro3.c
> ==
> --- head/sys/dev/sound/pci/maestro3.c Fri Jul 27 07:05:50 2018
> (r336756)
> +++ head/sys/dev/sound/pci/maestro3.c Fri Jul 27 10:40:48 2018
> (r336757)
> @@ -45,7 +45,7 @@
> * , http://www.zabbo.net/maestro3
> *
> * Cameron Grant created the pcm framework used here nearly verbatim.
> - * ,
svn commit: r336774 - in head/sys: amd64/include i386/include vm
Author: imp
Date: Fri Jul 27 18:34:20 2018
New Revision: 336774
URL: https://svnweb.freebsd.org/changeset/base/336774
Log:
Rename VM_FREELIST_ISADMA to VM_FREELIST_LOWMEM.
There's no differene between VM_FREELIST_ISADMA and VM_FREELIST_LOWMEM
except for the default boundary (16MB on x86 and 256MB on MIPS, but
they are otherwise the same). We don't need both for any system we
support (there were some really old ARC systems that did have ISA/EISA
bus, but we never ran on them and they are too old to ever grow
support for).
Differential Review: https://reviews.freebsd.org/D16290
Modified:
head/sys/amd64/include/vmparam.h
head/sys/i386/include/vmparam.h
head/sys/vm/vm_phys.c
Modified: head/sys/amd64/include/vmparam.h
==
--- head/sys/amd64/include/vmparam.hFri Jul 27 18:33:09 2018
(r336773)
+++ head/sys/amd64/include/vmparam.hFri Jul 27 18:34:20 2018
(r336774)
@@ -110,7 +110,9 @@
#defineVM_NFREELIST3
#defineVM_FREELIST_DEFAULT 0
#defineVM_FREELIST_DMA32 1
-#defineVM_FREELIST_ISADMA 2
+#defineVM_FREELIST_LOWMEM 2
+
+#define VM_LOWMEM_BOUNDARY (16 << 20) /* 16MB ISA DMA limit */
/*
* Create the DMA32 free list only if the number of physical pages above
Modified: head/sys/i386/include/vmparam.h
==
--- head/sys/i386/include/vmparam.h Fri Jul 27 18:33:09 2018
(r336773)
+++ head/sys/i386/include/vmparam.h Fri Jul 27 18:34:20 2018
(r336774)
@@ -97,12 +97,14 @@
/*
* Create two free page lists: VM_FREELIST_DEFAULT is for physical
* pages that are above the largest physical address that is
- * accessible by ISA DMA and VM_FREELIST_ISADMA is for physical pages
+ * accessible by ISA DMA and VM_FREELIST_LOWMEM is for physical pages
* that are below that address.
*/
#defineVM_NFREELIST2
#defineVM_FREELIST_DEFAULT 0
-#defineVM_FREELIST_ISADMA 1
+#defineVM_FREELIST_LOWMEM 1
+
+#define VM_LOWMEM_BOUNDARY (16 << 20) /* 16MB ISA DMA limit */
/*
* The largest allocation size is 2MB under PAE and 4MB otherwise.
Modified: head/sys/vm/vm_phys.c
==
--- head/sys/vm/vm_phys.c Fri Jul 27 18:33:09 2018(r336773)
+++ head/sys/vm/vm_phys.c Fri Jul 27 18:34:20 2018(r336774)
@@ -115,9 +115,6 @@ static int __read_mostly vm_freelist_to_flind[VM_NFREE
CTASSERT(VM_FREELIST_DEFAULT == 0);
-#ifdef VM_FREELIST_ISADMA
-#defineVM_ISADMA_BOUNDARY 16777216
-#endif
#ifdef VM_FREELIST_DMA32
#defineVM_DMA32_BOUNDARY ((vm_paddr_t)1 << 32)
#endif
@@ -126,9 +123,6 @@ CTASSERT(VM_FREELIST_DEFAULT == 0);
* Enforce the assumptions made by vm_phys_add_seg() and vm_phys_init() about
* the ordering of the free list boundaries.
*/
-#if defined(VM_ISADMA_BOUNDARY) && defined(VM_LOWMEM_BOUNDARY)
-CTASSERT(VM_ISADMA_BOUNDARY < VM_LOWMEM_BOUNDARY);
-#endif
#if defined(VM_LOWMEM_BOUNDARY) && defined(VM_DMA32_BOUNDARY)
CTASSERT(VM_LOWMEM_BOUNDARY < VM_DMA32_BOUNDARY);
#endif
@@ -442,12 +436,6 @@ vm_phys_add_seg(vm_paddr_t start, vm_paddr_t end)
* list boundaries.
*/
paddr = start;
-#ifdef VM_FREELIST_ISADMA
- if (paddr < VM_ISADMA_BOUNDARY && end > VM_ISADMA_BOUNDARY) {
- vm_phys_create_seg(paddr, VM_ISADMA_BOUNDARY);
- paddr = VM_ISADMA_BOUNDARY;
- }
-#endif
#ifdef VM_FREELIST_LOWMEM
if (paddr < VM_LOWMEM_BOUNDARY && end > VM_LOWMEM_BOUNDARY) {
vm_phys_create_seg(paddr, VM_LOWMEM_BOUNDARY);
@@ -486,11 +474,6 @@ vm_phys_init(void)
npages = 0;
for (segind = vm_phys_nsegs - 1; segind >= 0; segind--) {
seg = _phys_segs[segind];
-#ifdef VM_FREELIST_ISADMA
- if (seg->end <= VM_ISADMA_BOUNDARY)
- vm_freelist_to_flind[VM_FREELIST_ISADMA] = 1;
- else
-#endif
#ifdef VM_FREELIST_LOWMEM
if (seg->end <= VM_LOWMEM_BOUNDARY)
vm_freelist_to_flind[VM_FREELIST_LOWMEM] = 1;
@@ -540,13 +523,6 @@ vm_phys_init(void)
npages += atop(seg->end - seg->start);
#else
seg->first_page = PHYS_TO_VM_PAGE(seg->start);
-#endif
-#ifdef VM_FREELIST_ISADMA
- if (seg->end <= VM_ISADMA_BOUNDARY) {
- flind = vm_freelist_to_flind[VM_FREELIST_ISADMA];
- KASSERT(flind >= 0,
- ("vm_phys_init: ISADMA flind < 0"));
- } else
#endif
#ifdef VM_FREELIST_LOWMEM
if (seg->end <= VM_LOWMEM_BOUNDARY) {
___
svn-src-all@freebsd.org mailing list
svn commit: r336773 - in head: lib/libc/arm/string lib/libpmc share/man/man4/man4.arm share/mk sys/arm/arm sys/arm/conf sys/arm/include sys/arm/xscale sys/arm/xscale/i8134x sys/arm/xscale/pxa sys/c...
Author: imp
Date: Fri Jul 27 18:33:09 2018
New Revision: 336773
URL: https://svnweb.freebsd.org/changeset/base/336773
Log:
Remove xscale support
The OLD XSCALE stuff hasn't been useful in a while. The original
committer (cognet@) was the only one that had boards for it. He's
blessed this removal. Newer XSCALE (GUMSTIX) is for hardware that's
quite old. After discussion on arm@, it was clear there was no support
for keeping it.
Differential Review: https://reviews.freebsd.org/D16313
Deleted:
head/lib/libc/arm/string/memcpy_xscale.S
head/lib/libpmc/pmc.xscale.3
head/share/man/man4/man4.arm/npe.4
head/sys/arm/arm/bcopyinout_xscale.S
head/sys/arm/arm/cpufunc_asm_xscale.S
head/sys/arm/arm/cpufunc_asm_xscale_c3.S
head/sys/arm/conf/CRB
head/sys/arm/conf/GUMSTIX
head/sys/arm/conf/GUMSTIX-QEMU
head/sys/arm/conf/GUMSTIX.hints
head/sys/arm/xscale/i8134x/crb_machdep.c
head/sys/arm/xscale/i8134x/files.crb
head/sys/arm/xscale/i8134x/files.i81342
head/sys/arm/xscale/i8134x/i80321_timer.c
head/sys/arm/xscale/i8134x/i80321_wdog.c
head/sys/arm/xscale/i8134x/i80321reg.h
head/sys/arm/xscale/i8134x/i80321var.h
head/sys/arm/xscale/i8134x/i81342.c
head/sys/arm/xscale/i8134x/i81342_mcu.c
head/sys/arm/xscale/i8134x/i81342_pci.c
head/sys/arm/xscale/i8134x/i81342_space.c
head/sys/arm/xscale/i8134x/i81342reg.h
head/sys/arm/xscale/i8134x/i81342var.h
head/sys/arm/xscale/i8134x/iq81342_7seg.c
head/sys/arm/xscale/i8134x/iq81342reg.h
head/sys/arm/xscale/i8134x/iq81342var.h
head/sys/arm/xscale/i8134x/obio.c
head/sys/arm/xscale/i8134x/obiovar.h
head/sys/arm/xscale/i8134x/std.crb
head/sys/arm/xscale/i8134x/std.i81342
head/sys/arm/xscale/i8134x/uart_bus_i81342.c
head/sys/arm/xscale/i8134x/uart_cpu_i81342.c
head/sys/arm/xscale/pxa/files.pxa
head/sys/arm/xscale/pxa/if_smc_smi.c
head/sys/arm/xscale/pxa/pxa_gpio.c
head/sys/arm/xscale/pxa/pxa_icu.c
head/sys/arm/xscale/pxa/pxa_machdep.c
head/sys/arm/xscale/pxa/pxa_obio.c
head/sys/arm/xscale/pxa/pxa_smi.c
head/sys/arm/xscale/pxa/pxa_space.c
head/sys/arm/xscale/pxa/pxa_timer.c
head/sys/arm/xscale/pxa/pxareg.h
head/sys/arm/xscale/pxa/pxavar.h
head/sys/arm/xscale/pxa/std.pxa
head/sys/arm/xscale/pxa/uart_bus_pxa.c
head/sys/arm/xscale/pxa/uart_cpu_pxa.c
head/sys/arm/xscale/std.xscale
head/sys/dev/hwpmc/hwpmc_xscale.h
Modified:
head/lib/libc/arm/string/memcpy.S
head/lib/libpmc/Makefile
head/lib/libpmc/libpmc.c
head/lib/libpmc/pmc.3
head/share/man/man4/man4.arm/Makefile
head/share/mk/bsd.cpu.mk
head/sys/arm/arm/bcopyinout.S
head/sys/arm/arm/cpufunc.c
head/sys/arm/arm/dump_machdep.c
head/sys/arm/arm/elf_trampoline.c
head/sys/arm/arm/exception.S
head/sys/arm/arm/identcpu-v4.c
head/sys/arm/arm/pmap-v4.c
head/sys/arm/arm/trap-v4.c
head/sys/arm/arm/vm_machdep.c
head/sys/arm/conf/NOTES
head/sys/arm/include/armreg.h
head/sys/arm/include/cpu-v4.h
head/sys/arm/include/cpufunc.h
head/sys/arm/include/intr.h
head/sys/arm/include/md_var.h
head/sys/arm/include/pmap-v4.h
head/sys/arm/include/pmc_mdep.h
head/sys/arm/include/pte-v4.h
head/sys/conf/Makefile.arm
head/sys/conf/files.arm
head/sys/conf/options.arm
head/sys/dev/hwpmc/pmc_events.h
head/sys/sys/pmc.h
Modified: head/lib/libc/arm/string/memcpy.S
==
--- head/lib/libc/arm/string/memcpy.S Fri Jul 27 18:31:30 2018
(r336772)
+++ head/lib/libc/arm/string/memcpy.S Fri Jul 27 18:33:09 2018
(r336773)
@@ -2,8 +2,4 @@
#include
__FBSDID("$FreeBSD$");
-#if !defined(_ARM_ARCH_5E) || defined(_STANDALONE)
#include "memcpy_arm.S"
-#else
-#include "memcpy_xscale.S"
-#endif
Modified: head/lib/libpmc/Makefile
==
--- head/lib/libpmc/MakefileFri Jul 27 18:31:30 2018(r336772)
+++ head/lib/libpmc/MakefileFri Jul 27 18:33:09 2018(r336773)
@@ -75,7 +75,6 @@ MAN+= pmc.tsc.3
MAN+= pmc.ucf.3
MAN+= pmc.westmere.3
MAN+= pmc.westmereuc.3
-MAN+= pmc.xscale.3
MLINKS+= \
pmc_allocate.3 pmc_release.3 \
Modified: head/lib/libpmc/libpmc.c
==
--- head/lib/libpmc/libpmc.cFri Jul 27 18:31:30 2018(r336772)
+++ head/lib/libpmc/libpmc.cFri Jul 27 18:33:09 2018(r336773)
@@ -59,10 +59,6 @@ static int tsc_allocate_pmc(enum pmc_event _pe, char *
struct pmc_op_pmcallocate *_pmc_config);
#endif
#if defined(__arm__)
-#if defined(__XSCALE__)
-static int xscale_allocate_pmc(enum pmc_event _pe, char *_ctrspec,
-struct pmc_op_pmcallocate *_pmc_config);
-#endif
static int armv7_allocate_pmc(enum pmc_event _pe, char *_ctrspec,
struct pmc_op_pmcallocate *_pmc_config);
#endif
@@ -140,7 +136,6 @@ struct pmc_class_descr {
PMC_CLASSDEP_TABLE(iaf, IAF);
PMC_CLASSDEP_TABLE(k8, K8);
-PMC_CLASSDEP_TABLE(xscale,
svn commit: r336772 - in head/sys/arm: conf ralink
Author: imp Date: Fri Jul 27 18:31:30 2018 New Revision: 336772 URL: https://svnweb.freebsd.org/changeset/base/336772 Log: Make ralink compile again. Add std.ralink to define common things across all ralink configs. Add cpu, machine and options INTRNG to this file. Remove RT1310.hints file reference: that file isn't in our tree. Added: head/sys/arm/ralink/std.ralink (contents, props changed) Modified: head/sys/arm/conf/RT1310 head/sys/arm/ralink/rt1310_intc.c Modified: head/sys/arm/conf/RT1310 == --- head/sys/arm/conf/RT1310Fri Jul 27 18:30:01 2018(r336771) +++ head/sys/arm/conf/RT1310Fri Jul 27 18:31:30 2018(r336772) @@ -8,7 +8,7 @@ ident RT1310 include"std.arm" -hints "RT1310.hints" +include"../ralink/std.ralink" # Flattened Device Tree optionsFDT Modified: head/sys/arm/ralink/rt1310_intc.c == --- head/sys/arm/ralink/rt1310_intc.c Fri Jul 27 18:30:01 2018 (r336771) +++ head/sys/arm/ralink/rt1310_intc.c Fri Jul 27 18:31:30 2018 (r336772) @@ -140,7 +140,7 @@ rt1310_intc_probe(device_t dev) if (!ofw_bus_status_okay(dev)) return (ENXIO); - if (!ofw_bus_is_compatible(dev, "rt,pic")) + if (!ofw_bus_is_compatible_strict(dev, "rt,pic")) return (ENXIO); #ifdef INTRNG Added: head/sys/arm/ralink/std.ralink == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/ralink/std.ralink Fri Jul 27 18:31:30 2018 (r336772) @@ -0,0 +1,5 @@ +# $FreeBSD$ +files "../ralink/files.ralink" +cpuCPU_ARM9 +machinearm +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: r336770 - in head/sys: arm/at91 arm/conf arm/include conf dev/nand dev/usb/controller dts/arm modules/dtb/atmel modules/usb modules/usb/at91dci
Author: imp Date: Fri Jul 27 18:28:22 2018 New Revision: 336770 URL: https://svnweb.freebsd.org/changeset/base/336770 Log: Remove Atmel AT91RM9200 and AT91SAM9 support. The last known robust version of this code base was FreeBSD 8.2. There are no users of this on current, and all users of it have abandoned this platform or are in legacy mode with a prior version of FreeBSD. All known users on arm@ approved this removal, and there were no objections. Differential Revision: https://reviews.freebsd.org/D16312 Deleted: head/sys/arm/at91/at91.c head/sys/arm/at91/at91_aic.c head/sys/arm/at91/at91_aicreg.h head/sys/arm/at91/at91_cfata.c head/sys/arm/at91/at91_common.c head/sys/arm/at91/at91_gpio.h head/sys/arm/at91/at91_machdep.c head/sys/arm/at91/at91_mci.c head/sys/arm/at91/at91_mcireg.h head/sys/arm/at91/at91_ohci.c head/sys/arm/at91/at91_ohci_fdt.c head/sys/arm/at91/at91_pdcreg.h head/sys/arm/at91/at91_pinctrl.c head/sys/arm/at91/at91_pio.c head/sys/arm/at91/at91_pio_sam9g20.h head/sys/arm/at91/at91_pio_sam9g45.h head/sys/arm/at91/at91_pioreg.h head/sys/arm/at91/at91_piovar.h head/sys/arm/at91/at91_pit.c head/sys/arm/at91/at91_pitreg.h head/sys/arm/at91/at91_pmc.c head/sys/arm/at91/at91_pmcreg.h head/sys/arm/at91/at91_pmcvar.h head/sys/arm/at91/at91_reset.S head/sys/arm/at91/at91_rst.c head/sys/arm/at91/at91_rstreg.h head/sys/arm/at91/at91_rtc.c head/sys/arm/at91/at91_rtcreg.h head/sys/arm/at91/at91_sdramc.c head/sys/arm/at91/at91_shdwc.c head/sys/arm/at91/at91_smc.c head/sys/arm/at91/at91_smc.h head/sys/arm/at91/at91_spi.c head/sys/arm/at91/at91_spireg.h head/sys/arm/at91/at91_ssc.c head/sys/arm/at91/at91_sscreg.h head/sys/arm/at91/at91_st.c head/sys/arm/at91/at91_streg.h head/sys/arm/at91/at91_tcb.c head/sys/arm/at91/at91_twi.c head/sys/arm/at91/at91_twiio.h head/sys/arm/at91/at91_twireg.h head/sys/arm/at91/at91_usartreg.h head/sys/arm/at91/at91_wdt.c head/sys/arm/at91/at91_wdtreg.h head/sys/arm/at91/at91board.h head/sys/arm/at91/at91reg.h head/sys/arm/at91/at91rm9200.c head/sys/arm/at91/at91rm9200_devices.c head/sys/arm/at91/at91rm9200var.h head/sys/arm/at91/at91rm92reg.h head/sys/arm/at91/at91sam9260.c head/sys/arm/at91/at91sam9260reg.h head/sys/arm/at91/at91sam9g20.c head/sys/arm/at91/at91sam9g20reg.h head/sys/arm/at91/at91sam9g45.c head/sys/arm/at91/at91sam9g45reg.h head/sys/arm/at91/at91sam9x5.c head/sys/arm/at91/at91sam9x5reg.h head/sys/arm/at91/at91soc.c head/sys/arm/at91/at91soc.h head/sys/arm/at91/at91var.h head/sys/arm/at91/board_bwct.c head/sys/arm/at91/board_eb9200.c head/sys/arm/at91/board_ethernut5.c head/sys/arm/at91/board_hl200.c head/sys/arm/at91/board_hl201.c head/sys/arm/at91/board_kb920x.c head/sys/arm/at91/board_qila9g20.c head/sys/arm/at91/board_sam9260ek.c head/sys/arm/at91/board_sam9g20ek.c head/sys/arm/at91/board_sam9x25ek.c head/sys/arm/at91/board_sn9g45.c head/sys/arm/at91/board_tsc4370.c head/sys/arm/at91/files.at91 head/sys/arm/at91/if_ate.c head/sys/arm/at91/if_atereg.h head/sys/arm/at91/if_macb.c head/sys/arm/at91/if_macbreg.h head/sys/arm/at91/if_macbvar.h head/sys/arm/at91/std.at91 head/sys/arm/at91/std.at91sam9 head/sys/arm/at91/std.at91sam9g45 head/sys/arm/at91/std.atmel head/sys/arm/at91/std.bwct head/sys/arm/at91/std.eb9200 head/sys/arm/at91/std.ethernut5 head/sys/arm/at91/std.hl200 head/sys/arm/at91/std.hl201 head/sys/arm/at91/std.kb920x head/sys/arm/at91/std.qila9g20 head/sys/arm/at91/std.sam9260ek head/sys/arm/at91/std.sam9g20ek head/sys/arm/at91/std.sam9x25ek head/sys/arm/at91/std.sn9g45 head/sys/arm/at91/std.tsc4370 head/sys/arm/at91/uart_bus_at91usart.c head/sys/arm/at91/uart_cpu_at91usart.c head/sys/arm/at91/uart_dev_at91usart.c head/sys/arm/conf/ATMEL head/sys/arm/conf/SAM9G20EK head/sys/arm/include/at91_gpio.h head/sys/dev/nand/nfc_at91.c head/sys/dev/nand/nfc_at91.h head/sys/dev/usb/controller/at91dci.c head/sys/dev/usb/controller/at91dci.h head/sys/dev/usb/controller/at91dci_atmelarm.c head/sys/dev/usb/controller/at91dci_fdt.c head/sys/dev/usb/controller/atmegadci_atmelarm.c head/sys/dev/usb/controller/musb_otg_atmelarm.c head/sys/dev/usb/controller/uss820dci_atmelarm.c head/sys/dts/arm/hl201.dts head/sys/dts/arm/sam9260ek.dts head/sys/modules/dtb/atmel/Makefile head/sys/modules/usb/at91dci/Makefile Modified: head/sys/arm/conf/NOTES head/sys/conf/files head/sys/conf/options.arm head/sys/dev/usb/controller/usb_controller.c head/sys/modules/usb/Makefile Modified: head/sys/arm/conf/NOTES == --- head/sys/arm/conf/NOTES Fri Jul 27 18:26:38 2018(r336769) +++ head/sys/arm/conf/NOTES Fri Jul 27 18:28:22 2018(r336770) @@ -8,7 +8,6 @@ cpu CPU_FA526 cpuCPU_XSCALE_81342 cpuCPU_XSCALE_PXA2X0
svn commit: r336769 - stable/11/sys/cam/scsi
Author: mav
Date: Fri Jul 27 18:26:38 2018
New Revision: 336769
URL: https://svnweb.freebsd.org/changeset/base/336769
Log:
MFC r308296 (by scottl):
asc/ascq 44/0 is typically a non-transient, permanent error (at least until
the components are reset). Therefore retries are pointless. This is very
visible in SATL systems, for example an LSI SAS controller and a SATA HDD/SSD.
Modified:
stable/11/sys/cam/scsi/scsi_all.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/cam/scsi/scsi_all.c
==
--- stable/11/sys/cam/scsi/scsi_all.c Fri Jul 27 18:18:20 2018
(r336768)
+++ stable/11/sys/cam/scsi/scsi_all.c Fri Jul 27 18:26:38 2018
(r336769)
@@ -2327,7 +2327,7 @@ static struct asc_table_entry asc_table[] = {
{ SST(0x43, 0x00, SS_RDEF,
"Message error") },
/* DTLPWROMAEBKVF */
- { SST(0x44, 0x00, SS_RDEF,
+ { SST(0x44, 0x00, SS_FATAL | EIO,
"Internal target failure") },
/* DT P MAEBKVF */
{ SST(0x44, 0x01, SS_RDEF, /* XXX TBD */
___
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: r336768 - head/usr.sbin/efibootmgr
Author: imp
Date: Fri Jul 27 18:18:20 2018
New Revision: 336768
URL: https://svnweb.freebsd.org/changeset/base/336768
Log:
Add -b bootnum to allow creation of a specific boot number (rather
than the auotmatic selection). This is important in some scripting
environments.
Also, remove bogus checks for bootnum != 0. 0 is a valid bootnum.
Sponsored by: Netflix
Modified:
head/usr.sbin/efibootmgr/efibootmgr.8
head/usr.sbin/efibootmgr/efibootmgr.c
Modified: head/usr.sbin/efibootmgr/efibootmgr.8
==
--- head/usr.sbin/efibootmgr/efibootmgr.8 Fri Jul 27 17:39:36 2018
(r336767)
+++ head/usr.sbin/efibootmgr/efibootmgr.8 Fri Jul 27 18:18:20 2018
(r336768)
@@ -36,7 +36,7 @@
.Op Fl T
.Op Fl o Ar bootorder
.Op Fl verbose
-.Op Fl c -k Ar kernel -l Ar loader [-L Ar label] [--dry-run]
+.Op Fl c -k Ar kernel -l Ar loader [-L Ar label] [--dry-run] [-b Bootvar]
.Sh "DESCRIPTION"
.Nm
manipulates how UEFI Boot Managers boot the system.
@@ -70,6 +70,9 @@ Create a new Boot Variable
The path to and name of the loader.
.It Fl k -kernel Ar kernel
The path to and name of the kernel.
+.It Fl b Bootvar
+When creating an entry, use Bootvar as the index.
+Fail if it already exists.
.It Fl L -label Ar label
An optional description for the entry.
.It Fl D -dry-run
Modified: head/usr.sbin/efibootmgr/efibootmgr.c
==
--- head/usr.sbin/efibootmgr/efibootmgr.c Fri Jul 27 17:39:36 2018
(r336767)
+++ head/usr.sbin/efibootmgr/efibootmgr.c Fri Jul 27 18:18:20 2018
(r336768)
@@ -82,6 +82,7 @@ typedef struct _bmgr_opts {
booldelete_bootnext;
booldel_timeout;
booldry_run;
+ boolhas_bootnum;
boolonce;
int cp_src;
boolset_active;
@@ -170,7 +171,7 @@ set_bootvar(const char *name, uint8_t *data, size_t si
#define USAGE \
" [-aAnNB Bootvar] [-t timeout] [-T] [-o bootorder] [-O] [--verbose]
[--help] \n\
- [-c -l loader [-k kernel ] [-L label] [--dry-run]]"
+ [-c -l loader [-k kernel ] [-L label] [--dry-run] [-b Bootvar]]"
#define CREATE_USAGE \
" efibootmgr -c -l loader [-k kernel] [-L label] [--dry-run]"
@@ -201,6 +202,10 @@ parse_args(int argc, char *argv[])
opts.set_active = true;
opts.bootnum = strtoul(optarg, NULL, 16);
break;
+ case 'b':
+ opts.has_bootnum = true;
+ opts.bootnum = strtoul(optarg, NULL, 16);
+ break;
case 'B':
opts.delete = true;
opts.bootnum = strtoul(optarg, NULL, 16);
@@ -266,12 +271,7 @@ parse_args(int argc, char *argv[])
errx(1, "%s",CREATE_USAGE);
return;
}
- if (opts.set_bootnext && !(opts.bootnum))
- errx(1, "%s", BOOTNEXT_USAGE);
- if ((opts.set_active || opts.set_inactive) && !(opts.bootnum))
- errx(1, "%s", ACTIVE_USAGE);
-
if (opts.order && !(opts.order))
errx(1, "%s", ORDER_USAGE);
}
@@ -557,7 +557,23 @@ make_next_boot_var_name(void)
return name;
}
+static char *
+make_boot_var_name(uint16_t bootnum)
+{
+ struct entry *v;
+ char *name;
+ LIST_FOREACH(v, , entries) {
+ if (v->idx == bootnum)
+ return NULL;
+ }
+
+ asprintf(, "%s%04X", "Boot", bootnum);
+ if (name == NULL)
+ err(1, "asprintf");
+ return name;
+}
+
static size_t
create_loadopt(uint8_t *buf, size_t bufmax, uint32_t attributes, efidp dp,
size_t dp_size,
const char *description, const uint8_t *optional_data, size_t
optional_data_size)
@@ -605,7 +621,8 @@ create_loadopt(uint8_t *buf, size_t bufmax, uint32_t a
static int
-make_boot_var(const char *label, const char *loader, const char *kernel, const
char *env, bool dry_run)
+make_boot_var(const char *label, const char *loader, const char *kernel, const
char *env, bool dry_run,
+ int bootnum)
{
struct entry *new_ent;
uint32_t load_attrs = 0;
@@ -617,7 +634,10 @@ make_boot_var(const char *label, const char *loader, c
assert(label != NULL);
- bootvar = make_next_boot_var_name();
+ if (bootnum == -1)
+ bootvar = make_next_boot_var_name();
+ else
+ bootvar = make_boot_var_name((uint16_t)bootnum);
if (bootvar == NULL)
err(1, "bootvar creation");
if (loader == NULL)
@@ -894,7 +914,8 @@ main(int argc, char *argv[])
* side effect, adds to boot order, but not yet active.
*/
make_boot_var(opts.label ? opts.label : "",
- opts.loader, opts.kernel,
svn commit: r336767 - in stable/11: include lib/msun lib/msun/ld128 lib/msun/ld80 lib/msun/man lib/msun/src
Author: dim Date: Fri Jul 27 17:39:36 2018 New Revision: 336767 URL: https://svnweb.freebsd.org/changeset/base/336767 Log: MFC r327400 (by eadler): cacos(3): correct spelling of 'I' In some cases we had 'i' instead of 'I'. PR: 195517 Submitted by: stephen MFC r329259 (by eadler): msun: signed overflow in atan2 As a component of atan2(y, x), the case of x == 1.0 is farmed out to atan(y). The current implementation of this comparison is vulnerable to signed integer underflow (that is, undefined behavior), and it's performed in a somewhat more complicated way than it need be. Change it to not be quite so cute, rather directly comparing the high/low bits of x to the specific IEEE-754 bit pattern that encodes 1.0. Note that while there are three different e_atan* files in the relevant directory, only this one needs fixing. e_atan2f.c already compares against the full bit pattern encoding 1.0f, while e_atan2l.cuses bitwise-ands/ors/nots and so doesn't require a change. Closes #130 Submitted by: Jeff Walden (@jswalden github PR #130) Reviewed by: bde MFC r334721 (by cem): clog.3, complex.3: Fix typos and igor style issues PR: 228783 Reported by: Karsten MFC r336299 (by mmacy): msun: add ld80/ld128 powl, cpow, cpowf, cpowl from openbsd This corresponds to the latest status (hasn't changed in 9+ years) from openbsd of ld80/ld128 powl, and source cpowf, cpow, cpowl (the complex power functions for float complex, double complex, and long double complex) which are required for C99 compliance and were missing from FreeBSD. Also required for some numerical codes using complex numbered Hamiltonians. Thanks to jhb for tracking down the issue with making weak_reference compile on powerpc. When asked to review, bde said "I don't like it" - but provided no actionable feedback or superior implementations. Discussed with: jhb Submitted by: jmd Differential Revision: https://reviews.freebsd.org/D15919 MFC r336563: Recommit r336497: Fix powl, cpow, cpowf, and cpowl imports from OpenBSD This is a follow-up to r336299. * lib/msun/Makefile: . Remove polevll.c * lib/msun/ld80/e_powl.c: . Copy contents of polevll.c to here. This is the only consumer of these functions. Make functions 'static inline'. . Make reducl a 'static inline' function. * lib/msun/man/exp.3: . Remove BUGS section that no longer applies. * lib/msun/src/math_private.h: . Remove prototypes of __p1evll() and __polevll() * lib/msun/src/s_cpow.c: * lib/msun/src/s_cpowf.c: * lib/msun/src/s_cpowl.c . Include math_private.h. . Use the CMPLX macro from either C99 or math_private.h (depends on compiler support) instead of the problematic use of complex I. Submitted by: Steve Kargl PR: 229876 Added: stable/11/lib/msun/ld128/e_powl.c - copied unchanged from r336299, head/lib/msun/ld128/e_powl.c stable/11/lib/msun/ld80/e_powl.c - copied, changed from r336299, head/lib/msun/ld80/e_powl.c stable/11/lib/msun/man/cpow.3 - copied unchanged from r336299, head/lib/msun/man/cpow.3 stable/11/lib/msun/src/s_cpow.c - copied, changed from r336299, head/lib/msun/src/s_cpow.c stable/11/lib/msun/src/s_cpowf.c - copied, changed from r336299, head/lib/msun/src/s_cpowf.c stable/11/lib/msun/src/s_cpowl.c - copied, changed from r336299, head/lib/msun/src/s_cpowl.c Modified: stable/11/include/complex.h stable/11/lib/msun/Makefile stable/11/lib/msun/Symbol.map stable/11/lib/msun/man/cacos.3 stable/11/lib/msun/man/clog.3 stable/11/lib/msun/man/complex.3 stable/11/lib/msun/man/exp.3 stable/11/lib/msun/src/e_atan2.c stable/11/lib/msun/src/e_pow.c stable/11/lib/msun/src/imprecise.c stable/11/lib/msun/src/math_private.h Directory Properties: stable/11/ (props changed) Modified: stable/11/include/complex.h == --- stable/11/include/complex.h Fri Jul 27 16:13:06 2018(r336766) +++ stable/11/include/complex.h Fri Jul 27 17:39:36 2018(r336767) @@ -95,6 +95,10 @@ double complex conj(double complex) __pure2; float complex conjf(float complex) __pure2; long double complex conjl(long double complex) __pure2; +float complex cpowf(float complex, float complex); +double complex cpow(double complex, double complex); +long double complex + cpowl(long double complex, long double complex); float complex cprojf(float complex) __pure2; double complex cproj(double complex) __pure2; long double complex Modified: stable/11/lib/msun/Makefile == --- stable/11/lib/msun/Makefile Fri Jul 27 16:13:06 2018(r336766) +++ stable/11/lib/msun/Makefile Fri Jul 27 17:39:36 2018(r336767)
Re: svn commit: r336746 - in head/lib: libc/gen libutil
On Fri, Jul 27, 2018 at 10:07:11AM -0600, Ian Lepore wrote: > I believe pw_scan() was originally a static function in libc used by > getpwent() and related functions. When libutil grew some pw utilties, > it looks like the static pw_scan was renamed to __pw_scan and added to > the private list, so that it could be shared with libutil (and so I > copied that process with pw_init(), but I had to rename it to > pw_initpwd because libutil already has a pw_init()). > > I'm not sure how to make the functions more generic, pw_scan() parses a > line of text in passwd(5) format, optionally warns about errors, and > fills in a struct passwd with what it finds. pw_initpwd() inits a > struct passwd to (well-)known default values. But libutil pw_scan() > allocates the struct and requires the caller to free it, and the > internal __pw_scan() fills in a struct passed in to it and returns an > int, so there's no way to re-unify the functions under a single name. I did not asked to make it more generic. I mean, if the function is exported, its interface should be useful enough for generic consumers. If the current interface is fine, so be it, but see below. > > It would be strange to me to have one or two of the pw_() family of > functions in libc and the rest of them in libutil. Libutil seems like a > fine place for password/group file utilities that go beyond the posix > functions. It's just an implementation detail that we'd prefer to share > the source code for a small bit of common functionality around parsing > lines of passwd file data. Would it be a solution to stop exporting these functions at all, and just sompile them twice, once in libc, and second time in libutil ? libutil would add a source file from libc into it SRCS. ___ 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: r336766 - head/sys/riscv/include
Author: br Date: Fri Jul 27 16:13:06 2018 New Revision: 336766 URL: https://svnweb.freebsd.org/changeset/base/336766 Log: Use SPP (Supervisor Previous Privilege) bit in the sstatus register to determine if trap is from userspace. Otherwise if we jump to kernel address from userspace, then TRAPF_USERMODE failed to detect usermode and then do_ast triggers a panic "ast in kernel mode". Reviewed by: markj@ Sponsored by: DARPA, AFRL Differential Revision:https://reviews.freebsd.org/D16469 Modified: head/sys/riscv/include/cpu.h Modified: head/sys/riscv/include/cpu.h == --- head/sys/riscv/include/cpu.hFri Jul 27 15:49:12 2018 (r336765) +++ head/sys/riscv/include/cpu.hFri Jul 27 16:13:06 2018 (r336766) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2015-2016 Ruslan Bukin + * Copyright (c) 2015-2018 Ruslan Bukin * All rights reserved. * * Portions of this software were developed by SRI International and the @@ -41,7 +41,7 @@ #include #defineTRAPF_PC(tfp) ((tfp)->tf_ra) -#defineTRAPF_USERMODE(tfp) (((tfp)->tf_sepc & (1ul << 63)) == 0) +#defineTRAPF_USERMODE(tfp) (((tfp)->tf_sstatus & SSTATUS_SPP) == 0) #definecpu_getstack(td)((td)->td_frame->tf_sp) #definecpu_setstack(td, sp)((td)->td_frame->tf_sp = (sp)) ___ 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: r336746 - in head/lib: libc/gen libutil
On Fri, 2018-07-27 at 18:43 +0300, Konstantin Belousov wrote: > On Fri, Jul 27, 2018 at 09:35:41AM -0600, Ian Lepore wrote: > > > > On Fri, 2018-07-27 at 18:03 +0300, Konstantin Belousov wrote: > > > > > > On Thu, Jul 26, 2018 at 06:34:38PM +, Ian Lepore wrote: > > > > > > > > > > > > Author: ian > > > > Date: Thu Jul 26 18:34:38 2018 > > > > New Revision: 336746 > > > > URL: https://svnweb.freebsd.org/changeset/base/336746 > > > > > > > > Log: > > > > Make pw_scan(3) more compatible with getpwent(3) et. al. when > > > > processing > > > > data from /etc/passwd rather than /etc/master.passwd. > > > > > > > > The libc getpwent(3) and related functions automatically read > > > > master.passwd > > > > when run by root, or passwd when run by a non-root > > > > user. When run by non- > > > > root, getpwent() copes with the missing data by setting the > > > > corresponding > > > > fields in the passwd struct to known values (zeroes for > > > > numbers, or a > > > > pointer to an empty string for literals). When libutil's > > > > pw_scan(3) was > > > > used to parse a line without the root-accessible data, it was > > > > leaving > > > > garbage in the corresponding fields. > > > > > > > > These changes rename the static pw_init() function used by > > > > getpwent() and > > > > friends to __pw_initpwd(), and move it into pw_scan.c so that > > > > common init > > > > code can be shared between libc and libutil. pw_scan(3) now > > > > calls > > > > __pw_initpwd() before __pw_scan(), just like the getpwent() > > > > family does, so > > > > that reading an arbitrary passwd file in either format and > > > > parsing it with > > > > pw_scan(3) returns the same results as getpwent(3) would. > > > > > > > > This also adds a new pw_initpwd(3) function to libutil, so > > > > that code which > > > > creates passwd structs from scratch in some manner that > > > > doesn't involve > > > > pw_scan() can initialize the struct to the values expected by > > > > lots of > > > > existing code, which doesn't expect to encounter NULL > > > > pointers or garbage > > > > values in some fields. > > > > > > > If my reading is right, you just made libutil depend on the > > > internal > > > libc interfaces. Formal consequence is that libutil.so version > > > must > > > be bumped each time the used interface is changed (and it is > > > allowed > > > to change). I think that your change actually requires the bump > > > of > > > libutil.so.N version already. > > > > > > Also, libutil.so.N should be moved from the libutil pkgbase > > > package to > > > the clibs package, I am not sure about this. > > > > > > At the higher level, I very much dislike this change. > > > FBSDprivate_1.0 > > > namespace is for symbols providing the internal interfaces for > > > the > > > C runtime implementation in the FreeBSD. This is mostly a knot of > > > inter-dependencies between rtld, libc and libthr. libutil > > > arguably > > > should not participate. > > > > > > If you want for libc to provide a functionality outside the C > > > runtime, > > > please make the sustainable interface, which ABI can be > > > maintained, and > > > export the symbols in the normal namespace, with the usual > > > stability > > > guarantees. > > There was already a function, __pw_scan(), in file pw_scan.c, which > > was > > called from both libutil and libc implementations. I added a new > > function __pw_initpwd() into the pw_scan.c file. That function is > > called from all the same places that __pw_scan() is called from. So > > as > > near as I can tell, I haven't changed the structure of anything or > > created any new linkages between the libraries that didn't exist > > already. > > > > I will admit I don't understand the FBSDprivate_1.0 stuff at all, > > and > > there appears to be no documentation or guidance on how to work > > with > > it. Since __pw_scan was in the private list, and I was adding a new > > function that is like it in every way, I reasoned that the new > > function > > should be in the list too. It's actually not clear to me that > > either of > > the functions should be in that list, but like I said... no > > published > > info about it that I could find. > > > > I also noticed that chpass(1) and pwd_mkdb(8)_both directly compile > > in > > their own copy of the pw_scan.c source using .PATH in their > > makefiles. > > I wonder if doing that as the way of sharing the code between libc > > and > > libutil would be a better thing to do? (And presumably that would > > remove the need to have entries in the FBSDprivate_1.0 list?) > I suspect that the better way is to export the used functions > in the FBSD_1.5 namespace. Might be use the opportunity to rename > them, in particular, remove the leading double underscore. Might > be, reconsider the interfaces to make them more generic. > > Do the consumers depend on the specific layout of some structure ? I believe pw_scan() was originally a
svn commit: r336765 - stable/11/sys/arm64/arm64
Author: markj
Date: Fri Jul 27 15:49:12 2018
New Revision: 336765
URL: https://svnweb.freebsd.org/changeset/base/336765
Log:
MFC r336556:
Initialize the L3 page's wire count correctly after a L2 entry demotion.
Modified:
stable/11/sys/arm64/arm64/pmap.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/arm64/arm64/pmap.c
==
--- stable/11/sys/arm64/arm64/pmap.cFri Jul 27 15:46:34 2018
(r336764)
+++ stable/11/sys/arm64/arm64/pmap.cFri Jul 27 15:49:12 2018
(r336765)
@@ -4611,6 +4611,7 @@ pmap_demote_l2_locked(pmap_t pmap, pt_entry_t *l2, vm_
* If the page table page is new, initialize it.
*/
if (ml3->wire_count == 1) {
+ ml3->wire_count = NL3PG;
for (i = 0; i < Ln_ENTRIES; i++) {
l3[i] = newl3 | phys;
phys += L3_SIZE;
___
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: r336764 - in head/sys: amd64/amd64 i386/i386 vm
Author: markj
Date: Fri Jul 27 15:46:34 2018
New Revision: 336764
URL: https://svnweb.freebsd.org/changeset/base/336764
Log:
Fix handling of KVA in kmem_bootstrap_free().
Do not use vm_map_remove() to release KVA back to the system. Because
kernel map entries do not have an associated VM object, with r336030
the vm_map_remove() call will not update the kernel page tables. Avoid
relying on the vm_map layer and instead update the pmap and release KVA
to the kernel arena directly in kmem_bootstrap_free().
Because the pmap updates will generally result in superpage demotions,
modify pmap_init() to insert PTPs shadowed by superpage mappings into
the kernel pmap's radix tree.
While here, port r329171 to i386.
Reported by: alc
Reviewed by: alc, kib
X-MFC with: r336505
Sponsored by: The FreeBSD Foundation
Differential Revision:https://reviews.freebsd.org/D16426
Modified:
head/sys/amd64/amd64/pmap.c
head/sys/i386/i386/pmap.c
head/sys/vm/vm_kern.c
Modified: head/sys/amd64/amd64/pmap.c
==
--- head/sys/amd64/amd64/pmap.c Fri Jul 27 15:31:20 2018(r336763)
+++ head/sys/amd64/amd64/pmap.c Fri Jul 27 15:46:34 2018(r336764)
@@ -372,6 +372,8 @@ static u_int64_tDMPDphys; /* phys addr of direct
mapp
static u_int64_t DMPDPphys; /* phys addr of direct mapped level 3 */
static int ndmpdpphys; /* number of DMPDPphys pages */
+static vm_paddr_t KERNend;/* phys addr of end of bootstrap data */
+
/*
* pmap_mapdev support pre initialization (i.e. console)
*/
@@ -998,8 +1000,9 @@ create_pagetables(vm_paddr_t *firstaddr)
/* Map from zero to end of allocations under 2M pages */
/* This replaces some of the KPTphys entries above */
for (i = 0; (i << PDRSHIFT) < *firstaddr; i++)
+ /* Preset PG_M and PG_A because demotion expects it. */
pd_p[i] = (i << PDRSHIFT) | X86_PG_V | PG_PS | pg_g |
- bootaddr_rwx(i << PDRSHIFT);
+ X86_PG_M | X86_PG_A | bootaddr_rwx(i << PDRSHIFT);
/*
* Because we map the physical blocks in 2M pages, adjust firstaddr
@@ -1091,6 +1094,8 @@ pmap_bootstrap(vm_paddr_t *firstaddr)
pt_entry_t *pte;
int i;
+ KERNend = *firstaddr;
+
if (!pti)
pg_g = X86_PG_G;
@@ -1323,6 +1328,7 @@ pmap_init(void)
* Initialize the vm page array entries for the kernel pmap's
* page table pages.
*/
+ PMAP_LOCK(kernel_pmap);
for (i = 0; i < nkpt; i++) {
mpte = PHYS_TO_VM_PAGE(KPTphys + (i << PAGE_SHIFT));
KASSERT(mpte >= vm_page_array &&
@@ -1331,7 +1337,11 @@ pmap_init(void)
mpte->pindex = pmap_pde_pindex(KERNBASE) + i;
mpte->phys_addr = KPTphys + (i << PAGE_SHIFT);
mpte->wire_count = 1;
+ if (i << PDRSHIFT < KERNend &&
+ pmap_insert_pt_page(kernel_pmap, mpte))
+ panic("pmap_init: pmap_insert_pt_page failed");
}
+ PMAP_UNLOCK(kernel_pmap);
vm_wire_add(nkpt);
/*
Modified: head/sys/i386/i386/pmap.c
==
--- head/sys/i386/i386/pmap.c Fri Jul 27 15:31:20 2018(r336763)
+++ head/sys/i386/i386/pmap.c Fri Jul 27 15:46:34 2018(r336764)
@@ -931,6 +931,7 @@ pmap_init(void)
* Initialize the vm page array entries for the kernel pmap's
* page table pages.
*/
+ PMAP_LOCK(kernel_pmap);
for (i = 0; i < NKPT; i++) {
mpte = PHYS_TO_VM_PAGE(KPTphys + ptoa(i));
KASSERT(mpte >= vm_page_array &&
@@ -938,7 +939,14 @@ pmap_init(void)
("pmap_init: page table page is out of range"));
mpte->pindex = i + KPTDI;
mpte->phys_addr = KPTphys + ptoa(i);
+ mpte->wire_count = 1;
+ if (pseflag != 0 &&
+ KERNBASE <= i << PDRSHIFT && i << PDRSHIFT < KERNend &&
+ pmap_insert_pt_page(kernel_pmap, mpte))
+ panic("pmap_init: pmap_insert_pt_page failed");
}
+ PMAP_UNLOCK(kernel_pmap);
+ vm_wire_add(NKPT);
/*
* Initialize the address space (zone) for the pv entries. Set a
Modified: head/sys/vm/vm_kern.c
==
--- head/sys/vm/vm_kern.c Fri Jul 27 15:31:20 2018(r336763)
+++ head/sys/vm/vm_kern.c Fri Jul 27 15:46:34 2018(r336764)
@@ -700,16 +700,15 @@ kmem_bootstrap_free(vm_offset_t start, vm_size_t size)
{
#if defined(__i386__) || defined(__amd64__)
struct vm_domain *vmd;
- vm_offset_t end;
+ vm_offset_t end, va;
vm_paddr_t pa;
vm_page_t
Re: svn commit: r336746 - in head/lib: libc/gen libutil
On Fri, Jul 27, 2018 at 09:35:41AM -0600, Ian Lepore wrote: > On Fri, 2018-07-27 at 18:03 +0300, Konstantin Belousov wrote: > > On Thu, Jul 26, 2018 at 06:34:38PM +, Ian Lepore wrote: > > > > > > Author: ian > > > Date: Thu Jul 26 18:34:38 2018 > > > New Revision: 336746 > > > URL: https://svnweb.freebsd.org/changeset/base/336746 > > > > > > Log: > > > Make pw_scan(3) more compatible with getpwent(3) et. al. when processing > > > data from /etc/passwd rather than /etc/master.passwd. > > > > > > The libc getpwent(3) and related functions automatically read > > > master.passwd > > > when run by root, or passwd when run by a non-root user. When run by > > > non- > > > root, getpwent() copes with the missing data by setting the > > > corresponding > > > fields in the passwd struct to known values (zeroes for numbers, or a > > > pointer to an empty string for literals). When libutil's pw_scan(3) was > > > used to parse a line without the root-accessible data, it was leaving > > > garbage in the corresponding fields. > > > > > > These changes rename the static pw_init() function used by getpwent() > > > and > > > friends to __pw_initpwd(), and move it into pw_scan.c so that common > > > init > > > code can be shared between libc and libutil. pw_scan(3) now calls > > > __pw_initpwd() before __pw_scan(), just like the getpwent() family > > > does, so > > > that reading an arbitrary passwd file in either format and parsing it > > > with > > > pw_scan(3) returns the same results as getpwent(3) would. > > > > > > This also adds a new pw_initpwd(3) function to libutil, so that code > > > which > > > creates passwd structs from scratch in some manner that doesn't involve > > > pw_scan() can initialize the struct to the values expected by lots of > > > existing code, which doesn't expect to encounter NULL pointers or > > > garbage > > > values in some fields. > > > > > If my reading is right, you just made libutil depend on the internal > > libc interfaces. Formal consequence is that libutil.so version must > > be bumped each time the used interface is changed (and it is allowed > > to change). I think that your change actually requires the bump of > > libutil.so.N version already. > > > > Also, libutil.so.N should be moved from the libutil pkgbase package to > > the clibs package, I am not sure about this. > > > > At the higher level, I very much dislike this change. FBSDprivate_1.0 > > namespace is for symbols providing the internal interfaces for the > > C runtime implementation in the FreeBSD. This is mostly a knot of > > inter-dependencies between rtld, libc and libthr. libutil arguably > > should not participate. > > > > If you want for libc to provide a functionality outside the C runtime, > > please make the sustainable interface, which ABI can be maintained, and > > export the symbols in the normal namespace, with the usual stability > > guarantees. > > There was already a function, __pw_scan(), in file pw_scan.c, which was > called from both libutil and libc implementations. I added a new > function __pw_initpwd() into the pw_scan.c file. That function is > called from all the same places that __pw_scan() is called from. So as > near as I can tell, I haven't changed the structure of anything or > created any new linkages between the libraries that didn't exist > already. > > I will admit I don't understand the FBSDprivate_1.0 stuff at all, and > there appears to be no documentation or guidance on how to work with > it. Since __pw_scan was in the private list, and I was adding a new > function that is like it in every way, I reasoned that the new function > should be in the list too. It's actually not clear to me that either of > the functions should be in that list, but like I said... no published > info about it that I could find. > > I also noticed that chpass(1) and pwd_mkdb(8)_both directly compile in > their own copy of the pw_scan.c source using .PATH in their makefiles. > I wonder if doing that as the way of sharing the code between libc and > libutil would be a better thing to do? (And presumably that would > remove the need to have entries in the FBSDprivate_1.0 list?) I suspect that the better way is to export the used functions in the FBSD_1.5 namespace. Might be use the opportunity to rename them, in particular, remove the leading double underscore. Might be, reconsider the interfaces to make them more generic. Do the consumers depend on the specific layout of some structure ? ___ 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: r336746 - in head/lib: libc/gen libutil
On Fri, 2018-07-27 at 18:03 +0300, Konstantin Belousov wrote: > On Thu, Jul 26, 2018 at 06:34:38PM +, Ian Lepore wrote: > > > > Author: ian > > Date: Thu Jul 26 18:34:38 2018 > > New Revision: 336746 > > URL: https://svnweb.freebsd.org/changeset/base/336746 > > > > Log: > > Make pw_scan(3) more compatible with getpwent(3) et. al. when processing > > data from /etc/passwd rather than /etc/master.passwd. > > > > The libc getpwent(3) and related functions automatically read > > master.passwd > > when run by root, or passwd when run by a non-root user. When run by non- > > root, getpwent() copes with the missing data by setting the corresponding > > fields in the passwd struct to known values (zeroes for numbers, or a > > pointer to an empty string for literals). When libutil's pw_scan(3) was > > used to parse a line without the root-accessible data, it was leaving > > garbage in the corresponding fields. > > > > These changes rename the static pw_init() function used by getpwent() and > > friends to __pw_initpwd(), and move it into pw_scan.c so that common init > > code can be shared between libc and libutil. pw_scan(3) now calls > > __pw_initpwd() before __pw_scan(), just like the getpwent() family does, > > so > > that reading an arbitrary passwd file in either format and parsing it with > > pw_scan(3) returns the same results as getpwent(3) would. > > > > This also adds a new pw_initpwd(3) function to libutil, so that code which > > creates passwd structs from scratch in some manner that doesn't involve > > pw_scan() can initialize the struct to the values expected by lots of > > existing code, which doesn't expect to encounter NULL pointers or garbage > > values in some fields. > > > If my reading is right, you just made libutil depend on the internal > libc interfaces. Formal consequence is that libutil.so version must > be bumped each time the used interface is changed (and it is allowed > to change). I think that your change actually requires the bump of > libutil.so.N version already. > > Also, libutil.so.N should be moved from the libutil pkgbase package to > the clibs package, I am not sure about this. > > At the higher level, I very much dislike this change. FBSDprivate_1.0 > namespace is for symbols providing the internal interfaces for the > C runtime implementation in the FreeBSD. This is mostly a knot of > inter-dependencies between rtld, libc and libthr. libutil arguably > should not participate. > > If you want for libc to provide a functionality outside the C runtime, > please make the sustainable interface, which ABI can be maintained, and > export the symbols in the normal namespace, with the usual stability > guarantees. There was already a function, __pw_scan(), in file pw_scan.c, which was called from both libutil and libc implementations. I added a new function __pw_initpwd() into the pw_scan.c file. That function is called from all the same places that __pw_scan() is called from. So as near as I can tell, I haven't changed the structure of anything or created any new linkages between the libraries that didn't exist already. I will admit I don't understand the FBSDprivate_1.0 stuff at all, and there appears to be no documentation or guidance on how to work with it. Since __pw_scan was in the private list, and I was adding a new function that is like it in every way, I reasoned that the new function should be in the list too. It's actually not clear to me that either of the functions should be in that list, but like I said... no published info about it that I could find. I also noticed that chpass(1) and pwd_mkdb(8)_both directly compile in their own copy of the pw_scan.c source using .PATH in their makefiles. I wonder if doing that as the way of sharing the code between libc and libutil would be a better thing to do? (And presumably that would remove the need to have entries in the FBSDprivate_1.0 list?) -- Ian ___ 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: r336763 - in head/sys: amd64/amd64 x86/x86
Author: kib
Date: Fri Jul 27 15:31:20 2018
New Revision: 336763
URL: https://svnweb.freebsd.org/changeset/base/336763
Log:
On amd64, enable workarounds for several Ryzen erratas as described in
the AMD document 55449 'Revision Guide for AMD Family 17h Models
00h-0Fh Processors' rev 1.12.
The errata numbers are mentioned near each action.
It seems that newer BIOSes already include required chicken bits
settings, so the magic MSR updates are only needed when BIOS cannot be
updated. On the other hand, MWAIT avoidance seems to be important.
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/sys/amd64/amd64/initcpu.c
head/sys/x86/x86/cpu_machdep.c
Modified: head/sys/amd64/amd64/initcpu.c
==
--- head/sys/amd64/amd64/initcpu.c Fri Jul 27 15:17:24 2018
(r336762)
+++ head/sys/amd64/amd64/initcpu.c Fri Jul 27 15:31:20 2018
(r336763)
@@ -130,6 +130,30 @@ init_amd(void)
}
}
+ /* Ryzen erratas. */
+ if (CPUID_TO_FAMILY(cpu_id) == 0x17 && CPUID_TO_MODEL(cpu_id) == 0x1 &&
+ (cpu_feature2 & CPUID2_HV) == 0) {
+ /* 1021 */
+ msr = rdmsr(0xc0011029);
+ msr |= 0x2000;
+ wrmsr(0xc0011029, msr);
+
+ /* 1033 */
+ msr = rdmsr(0xc0011020);
+ msr |= 0x10;
+ wrmsr(0xc0011020, msr);
+
+ /* 1049 */
+ msr = rdmsr(0xc0011028);
+ msr |= 0x10;
+ wrmsr(0xc0011028, msr);
+
+ /* 1095 */
+ msr = rdmsr(0xc0011020);
+ msr |= 0x200;
+ wrmsr(0xc0011020, msr);
+ }
+
/*
* Work around a problem on Ryzen that is triggered by executing
* code near the top of user memory, in our case the signal
Modified: head/sys/x86/x86/cpu_machdep.c
==
--- head/sys/x86/x86/cpu_machdep.c Fri Jul 27 15:17:24 2018
(r336762)
+++ head/sys/x86/x86/cpu_machdep.c Fri Jul 27 15:31:20 2018
(r336763)
@@ -709,6 +709,13 @@ cpu_idle_tun(void *unused __unused)
if (TUNABLE_STR_FETCH("machdep.idle", tunvar, sizeof(tunvar)))
cpu_idle_selector(tunvar);
+ else if (cpu_vendor_id == CPU_VENDOR_AMD &&
+ CPUID_TO_FAMILY(cpu_id) == 0x17 && CPUID_TO_MODEL(cpu_id) == 0x1) {
+ /* Ryzen erratas 1057, 1109. */
+ cpu_idle_selector("hlt");
+ idle_mwait = 0;
+ }
+
if (cpu_vendor_id == CPU_VENDOR_INTEL && cpu_id == 0x506c9) {
/*
* Apollo Lake errata APL31 (public errata APL30).
___
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: r336762 - head/usr.sbin/pw
Author: ian Date: Fri Jul 27 15:17:24 2018 New Revision: 336762 URL: https://svnweb.freebsd.org/changeset/base/336762 Log: Remove some code that's no longer needed because it's now part of pw_scan(3). It was also leading to segfaults; pw can be NULL when control reaches these lines now, because of the way my previous change restructured the loops. Reported by: lwhsu@ Modified: head/usr.sbin/pw/pw_vpw.c Modified: head/usr.sbin/pw/pw_vpw.c == --- head/usr.sbin/pw/pw_vpw.c Fri Jul 27 13:49:17 2018(r336761) +++ head/usr.sbin/pw/pw_vpw.c Fri Jul 27 15:17:24 2018(r336762) @@ -113,18 +113,6 @@ vnextpwent(char const *nam, uid_t uid, int doclose) } free(line); - /* -* If we read the non-master passwd, some fields may not have been -* populated. Clean them up so that the output looks the same as that -* generated using getpwnam() which also inits them to these values. -*/ - if (!(pw->pw_fields & _PWF_CLASS)) - pw->pw_class = ""; - if (!(pw->pw_fields & _PWF_CHANGE)) - pw->pw_change = 0; - if (!(pw->pw_fields & _PWF_EXPIRE)) - pw->pw_expire = 0; - return (pw); } ___ 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: r336746 - in head/lib: libc/gen libutil
On Thu, Jul 26, 2018 at 06:34:38PM +, Ian Lepore wrote: > Author: ian > Date: Thu Jul 26 18:34:38 2018 > New Revision: 336746 > URL: https://svnweb.freebsd.org/changeset/base/336746 > > Log: > Make pw_scan(3) more compatible with getpwent(3) et. al. when processing > data from /etc/passwd rather than /etc/master.passwd. > > The libc getpwent(3) and related functions automatically read master.passwd > when run by root, or passwd when run by a non-root user. When run by non- > root, getpwent() copes with the missing data by setting the corresponding > fields in the passwd struct to known values (zeroes for numbers, or a > pointer to an empty string for literals). When libutil's pw_scan(3) was > used to parse a line without the root-accessible data, it was leaving > garbage in the corresponding fields. > > These changes rename the static pw_init() function used by getpwent() and > friends to __pw_initpwd(), and move it into pw_scan.c so that common init > code can be shared between libc and libutil. pw_scan(3) now calls > __pw_initpwd() before __pw_scan(), just like the getpwent() family does, so > that reading an arbitrary passwd file in either format and parsing it with > pw_scan(3) returns the same results as getpwent(3) would. > > This also adds a new pw_initpwd(3) function to libutil, so that code which > creates passwd structs from scratch in some manner that doesn't involve > pw_scan() can initialize the struct to the values expected by lots of > existing code, which doesn't expect to encounter NULL pointers or garbage > values in some fields. > If my reading is right, you just made libutil depend on the internal libc interfaces. Formal consequence is that libutil.so version must be bumped each time the used interface is changed (and it is allowed to change). I think that your change actually requires the bump of libutil.so.N version already. Also, libutil.so.N should be moved from the libutil pkgbase package to the clibs package, I am not sure about this. At the higher level, I very much dislike this change. FBSDprivate_1.0 namespace is for symbols providing the internal interfaces for the C runtime implementation in the FreeBSD. This is mostly a knot of inter-dependencies between rtld, libc and libthr. libutil arguably should not participate. If you want for libc to provide a functionality outside the C runtime, please make the sustainable interface, which ABI can be maintained, and export the symbols in the normal namespace, with the usual stability guarantees. ___ 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: r336761 - in head: lib/libc/sys sys/kern tests/sys/kqueue/libkqueue
Author: dab
Date: Fri Jul 27 13:49:17 2018
New Revision: 336761
URL: https://svnweb.freebsd.org/changeset/base/336761
Log:
Allow a EVFILT_TIMER kevent to be updated.
If a timer is updated (re-added) with a different time period
(specified in the .data field of the kevent), the new time period has
no effect; the timer will not expire until the original time has
elapsed. This violates the documented behavior as the kqueue(2) man
page says (in part) "Re-adding an existing event will modify the
parameters of the original event, and not result in a duplicate
entry."
This modification, adapted from a patch submitted by cem@ to PR214987,
fixes the kqueue system to allow updating a timer entry. The
kevent timer behavior is changed to:
* When a timer is re-added, update the timer parameters to and
re-start the timer using the new parameters.
* Allow updating both active and already expired timers.
* When the timer has already expired, dequeue any undelivered events
and clear the count of expirations.
All of these changes address the original PR and also bring the
FreeBSD and macOS kevent timer behaviors into agreement.
A few other changes were made along the way:
* Update the kqueue(2) man page to reflect the new timer behavior.
* Fix man page style issues in kqueue(2) diagnosed by igor.
* Update the timer libkqueue system test to test for the updated
timer behavior.
* Fix the (test) libkqueue common.h file so that it includes
config.h which defines various HAVE_* feature defines, before the
#if tests for such variables in common.h. This enables the use of
the actual err(3) family of functions.
* Fix the usages of the err(3) functions in the tests for incorrect
type of variables. Those were formerly undiagnosed due to the
disablement of the err(3) functions (see previous bullet point).
PR: 214987
Reported by: Brian Wellington
Reviewed by: kib
MFC after:1 week
Relnotes: yes
Sponsored by: Dell EMC
Differential Revision:https://reviews.freebsd.org/D15778
Modified:
head/lib/libc/sys/kqueue.2
head/sys/kern/kern_event.c
head/tests/sys/kqueue/libkqueue/common.h
head/tests/sys/kqueue/libkqueue/main.c
head/tests/sys/kqueue/libkqueue/timer.c
Modified: head/lib/libc/sys/kqueue.2
==
--- head/lib/libc/sys/kqueue.2 Fri Jul 27 13:11:05 2018(r336760)
+++ head/lib/libc/sys/kqueue.2 Fri Jul 27 13:49:17 2018(r336761)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 22, 2017
+.Dd July 27, 2018
.Dt KQUEUE 2
.Os
.Sh NAME
@@ -154,7 +154,7 @@ struct kevent {
u_int fflags; /* filter flag value */
int64_t data; /* filter data value */
void *udata; /* opaque user data identifier */
- uint64_t ext[4]; /* extentions */
+ uint64_t ext[4]; /* extensions */
};
.Ed
.Pp
@@ -355,8 +355,8 @@ Events for this filter are not registered with
.Fn kevent
directly but are registered via the
.Va aio_sigevent
-member of an asychronous I/O request when it is scheduled via an asychronous
I/O
-system call such as
+member of an asynchronous I/O request when it is scheduled via an
+asynchronous I/O system call such as
.Fn aio_read .
The filter returns under the same conditions as
.Fn aio_error .
@@ -501,7 +501,7 @@ been marked as
.Dv SIG_IGN ,
except for the
.Dv SIGCHLD
-signal, which, if ignored, won't be recorded by the filter.
+signal, which, if ignored, will not be recorded by the filter.
Event notification happens after normal
signal delivery processing.
.Va data
@@ -558,6 +558,13 @@ On return,
.Va fflags
contains the events which triggered the filter.
.Pp
+If an existing timer is re-added, the existing timer will be
+effectively canceled (throwing away any undelivered record of previous
+timer expiration) and re-started using the new parameters contained in
+.Va data
+and
+.Va fflags .
+.Pp
There is a system wide limit on the number of timers
which is controlled by the
.Va kern.kq_calloutmax
@@ -604,9 +611,9 @@ contains the users defined flags in the lower 24 bits.
.Sh CANCELLATION BEHAVIOUR
If
.Fa nevents
-is non-zero, i.e. the function is potentially blocking, the call
+is non-zero, i.e., the function is potentially blocking, the call
is a cancellation point.
-Otherwise, i.e. if
+Otherwise, i.e., if
.Fa nevents
is zero, the call is not cancellable.
Cancellation can only occur before any changes are made to the kqueue,
@@ -782,7 +789,7 @@ The
value is limited to 24 hours; longer timeouts will be silently
reinterpreted as 24 hours.
.Pp
-In versions older than
+In versions older than
.Fx 12.0 ,
.In sys/event.h
failed to parse without including
Modified: head/sys/kern/kern_event.c
==
---
svn commit: r336760 - head/sys/dev/ahci
Author: luporl
Date: Fri Jul 27 13:11:05 2018
New Revision: 336760
URL: https://svnweb.freebsd.org/changeset/base/336760
Log:
Fixed endianess issue in AHCI driver
There were some bits that were being set in cmd_flags (a field of AHCI's
command list structure) after cmd_flags was converted to little endian.
On a big endian host, such as PowerPC, this would set the wrong bits.
This was preventing AHCI driver from working on these hosts.
Reviewed by: jhibbits
Approved by: jhibbits (mentor)
Modified:
head/sys/dev/ahci/ahci.c
Modified: head/sys/dev/ahci/ahci.c
==
--- head/sys/dev/ahci/ahci.cFri Jul 27 11:35:58 2018(r336759)
+++ head/sys/dev/ahci/ahci.cFri Jul 27 13:11:05 2018(r336760)
@@ -1523,6 +1523,7 @@ ahci_execute_transaction(struct ahci_slot *slot)
int fis_size, i, softreset;
uint8_t *fis = ch->dma.rfis + 0x40;
uint8_t val;
+ uint16_t cmd_flags;
/* Get a piece of the workspace for this request */
ctp = (struct ahci_cmd_tab *)
@@ -1536,12 +1537,12 @@ ahci_execute_transaction(struct ahci_slot *slot)
/* Setup the command list entry */
clp = (struct ahci_cmd_list *)
(ch->dma.work + AHCI_CL_OFFSET + (AHCI_CL_SIZE * slot->slot));
- clp->cmd_flags = htole16(
+ cmd_flags =
(ccb->ccb_h.flags & CAM_DIR_OUT ? AHCI_CMD_WRITE : 0) |
(ccb->ccb_h.func_code == XPT_SCSI_IO ?
(AHCI_CMD_ATAPI | AHCI_CMD_PREFETCH) : 0) |
(fis_size / sizeof(u_int32_t)) |
- (port << 12));
+ (port << 12);
clp->prd_length = htole16(slot->dma.nsegs);
/* Special handling for Soft Reset command. */
if ((ccb->ccb_h.func_code == XPT_ATA_IO) &&
@@ -1552,7 +1553,7 @@ ahci_execute_transaction(struct ahci_slot *slot)
ahci_stop(ch);
ahci_clo(ch);
ahci_start(ch, 0);
- clp->cmd_flags |= AHCI_CMD_RESET | AHCI_CMD_CLR_BUSY;
+ cmd_flags |= AHCI_CMD_RESET | AHCI_CMD_CLR_BUSY;
} else {
softreset = 2;
/* Prepare FIS receive area for check. */
@@ -1562,6 +1563,7 @@ ahci_execute_transaction(struct ahci_slot *slot)
} else
softreset = 0;
clp->bytecount = 0;
+ clp->cmd_flags = htole16(cmd_flags);
clp->cmd_table_phys = htole64(ch->dma.work_bus + AHCI_CT_OFFSET +
(AHCI_CT_SIZE * slot->slot));
bus_dmamap_sync(ch->dma.work_tag, ch->dma.work_map,
___
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: r336759 - head/stand/lua
Author: kevans
Date: Fri Jul 27 11:35:58 2018
New Revision: 336759
URL: https://svnweb.freebsd.org/changeset/base/336759
Log:
lualoader: "nextboot_file" should be spelled "nextboot_conf"
See: /boot/defaults/loader.conf
Reported by: gtetlow (inadvertently)
Modified:
head/stand/lua/config.lua
Modified: head/stand/lua/config.lua
==
--- head/stand/lua/config.lua Fri Jul 27 10:44:38 2018(r336758)
+++ head/stand/lua/config.lua Fri Jul 27 11:35:58 2018(r336759)
@@ -317,7 +317,7 @@ local function readFile(name, silent)
end
local function checkNextboot()
- local nextboot_file = loader.getenv("nextboot_file")
+ local nextboot_file = loader.getenv("nextboot_conf")
if nextboot_file == nil then
return
end
___
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: r336758 - head/share/mk
Author: eadler
Date: Fri Jul 27 10:44:38 2018
New Revision: 336758
URL: https://svnweb.freebsd.org/changeset/base/336758
Log:
Feex a cuple of small typos
Modified:
head/share/mk/atf.test.mk
head/share/mk/bsd.own.mk
head/share/mk/bsd.sys.mk
head/share/mk/bsd.test.mk
head/share/mk/meta.sys.mk
head/share/mk/plain.test.mk
head/share/mk/tap.test.mk
Modified: head/share/mk/atf.test.mk
==
--- head/share/mk/atf.test.mk Fri Jul 27 10:40:48 2018(r336757)
+++ head/share/mk/atf.test.mk Fri Jul 27 10:44:38 2018(r336758)
@@ -16,7 +16,7 @@
# require the ATF libraries.
#
# Test programs registered in this manner are set to be installed into TESTSDIR
-# (which should be overriden by the Makefile) and are not required to provide a
+# (which should be overridden by the Makefile) and are not required to provide
a
# manpage.
ATF_TESTS_C?=
ATF_TESTS_CXX?=
Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkFri Jul 27 10:40:48 2018(r336757)
+++ head/share/mk/bsd.own.mkFri Jul 27 10:44:38 2018(r336758)
@@ -267,7 +267,7 @@ XZ_CMD?=xz
PKG_CMD?= pkg
# Pointer to the top directory into which tests are installed. Should not be
-# overriden by Makefiles, but the user may choose to set this in src.conf(5).
+# overridden by Makefiles, but the user may choose to set this in src.conf(5).
TESTSBASE?= /usr/tests
DEPENDFILE?= .depend
Modified: head/share/mk/bsd.sys.mk
==
--- head/share/mk/bsd.sys.mkFri Jul 27 10:40:48 2018(r336757)
+++ head/share/mk/bsd.sys.mkFri Jul 27 10:44:38 2018(r336758)
@@ -221,7 +221,7 @@ CFLAGS+=${SSP_CFLAGS}
DEBUG_FILES_CFLAGS?= -g
# Allow user-specified additional warning flags, plus compiler and file
-# specific flag overrides, unless we've overriden this...
+# specific flag overrides, unless we've overridden this...
.if ${MK_WARNS} != "no"
CFLAGS+= ${CWARNFLAGS:M*} ${CWARNFLAGS.${COMPILER_TYPE}}
CFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/share/mk/bsd.test.mk
==
--- head/share/mk/bsd.test.mk Fri Jul 27 10:40:48 2018(r336757)
+++ head/share/mk/bsd.test.mk Fri Jul 27 10:44:38 2018(r336758)
@@ -42,7 +42,7 @@ TESTS_ENV?=
# Force all tests in a separate distribution file.
#
# We want this to be the case even when the distribution name is already
-# overriden. For example: we want the tests for programs in the 'games'
+# overridden. For example: we want the tests for programs in the 'games'
# distribution to end up in the 'tests' distribution; the test programs
# themselves have all the necessary logic to detect that the games are not
# installed and thus won't cause false negatives.
Modified: head/share/mk/meta.sys.mk
==
--- head/share/mk/meta.sys.mk Fri Jul 27 10:40:48 2018(r336757)
+++ head/share/mk/meta.sys.mk Fri Jul 27 10:44:38 2018(r336758)
@@ -23,7 +23,7 @@
.-include "local.meta.sys.mk"
-# absoulte path to what we are reading.
+# absolute path to what we are reading.
_PARSEDIR = ${.PARSEDIR:tA}
.if !defined(SYS_MK_DIR)
Modified: head/share/mk/plain.test.mk
==
--- head/share/mk/plain.test.mk Fri Jul 27 10:40:48 2018(r336757)
+++ head/share/mk/plain.test.mk Fri Jul 27 10:44:38 2018(r336758)
@@ -16,7 +16,7 @@
# PROGS, PROGS_CXX and SCRIPTS, respectively.
#
# Test programs registered in this manner are set to be installed into TESTSDIR
-# (which should be overriden by the Makefile) and are not required to provide a
+# (which should be overridden by the Makefile) and are not required to provide
a
# manpage.
PLAIN_TESTS_C?=
PLAIN_TESTS_CXX?=
Modified: head/share/mk/tap.test.mk
==
--- head/share/mk/tap.test.mk Fri Jul 27 10:40:48 2018(r336757)
+++ head/share/mk/tap.test.mk Fri Jul 27 10:44:38 2018(r336758)
@@ -18,7 +18,7 @@
# PROGS, PROGS_CXX and SCRIPTS, respectively.
#
# Test programs registered in this manner are set to be installed into TESTSDIR
-# (which should be overriden by the Makefile) and are not required to provide a
+# (which should be overridden by the Makefile) and are not required to provide
a
# manpage.
TAP_TESTS_C?=
TAP_TESTS_CXX?=
___
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: 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
Author: eadler
Date: Fri Jul 27 10:40:48 2018
New Revision: 336757
URL: https://svnweb.freebsd.org/changeset/base/336757
Log:
Use https over http for FreeBSD pages
Modified:
head/share/man/man4/firewire.4
head/share/man/man7/tests.7
head/share/misc/bsd-family-tree
head/sys/dev/firewire/00README
head/sys/dev/hwpmc/pmc_events.h
head/sys/dev/sk/if_sk.c
head/sys/dev/sound/pci/maestro3.c
head/sys/dev/sound/pcm/dsp.c
head/sys/fs/nfsclient/nfs_clstate.c
Modified: head/share/man/man4/firewire.4
==
--- head/share/man/man4/firewire.4 Fri Jul 27 07:05:50 2018
(r336756)
+++ head/share/man/man4/firewire.4 Fri Jul 27 10:40:48 2018
(r336757)
@@ -87,7 +87,7 @@ Debugging over the firewire interace is possible with
.Xr dcons 4
driver.
Please see
-.Pa http://wiki.freebsd.org/DebugWithDcons
+.Pa https://wiki.freebsd.org/DebugWithDcons
for details on how to setup debugging with firewire.
.Sh FILES
.Bl -tag -width "Pa /dev/fwmem0.0" -compact
Modified: head/share/man/man7/tests.7
==
--- head/share/man/man7/tests.7 Fri Jul 27 07:05:50 2018(r336756)
+++ head/share/man/man7/tests.7 Fri Jul 27 10:40:48 2018(r336757)
@@ -198,7 +198,7 @@ problem report.
For more details please refer to:
.Bl -bullet -offset indent -compact
.It
-.Lk http://lists.freebsd.org/ "FreeBSD Mailing Lists"
+.Lk https://lists.freebsd.org/ "FreeBSD Mailing Lists"
.It
.Lk https://www.freebsd.org/support.html "Problem Reporting"
.El
Modified: head/share/misc/bsd-family-tree
==
--- head/share/misc/bsd-family-tree Fri Jul 27 07:05:50 2018
(r336756)
+++ head/share/misc/bsd-family-tree Fri Jul 27 10:40:48 2018
(r336757)
@@ -814,6 +814,6 @@ Steven M. Schultz for providing 2.8BSD, 2.10BSD, 2.11B
--
Copyright (c) 1997-2012 Wolfram Schneider
-URL: http://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree
+URL: https://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree
$FreeBSD$
Modified: head/sys/dev/firewire/00README
==
--- head/sys/dev/firewire/00README Fri Jul 27 07:05:50 2018
(r336756)
+++ head/sys/dev/firewire/00README Fri Jul 27 10:40:48 2018
(r336757)
@@ -9,7 +9,7 @@ IEEE 1394 support for FreeBSD-5.X and 4.X.
modified by Hidetoshi Shimokawa .
Please note this driver is still under development.
You can find latest snapshots under:
- http://people.freebsd.org/~simokawa/
+ https://people.freebsd.org/~simokawa/
named firewire-2002.tar.gz
The driver consists of 6 parts:
Modified: head/sys/dev/hwpmc/pmc_events.h
==
--- head/sys/dev/hwpmc/pmc_events.h Fri Jul 27 07:05:50 2018
(r336756)
+++ head/sys/dev/hwpmc/pmc_events.h Fri Jul 27 10:40:48 2018
(r336757)
@@ -36,7 +36,7 @@
* the source tree at src/share/doc/papers/hwpmc/hwpmc.ms
* as well as on-line at:
*
- * http://wiki.freebsd.org/PmcTools/PmcHardwareHowTo
+ * https://wiki.freebsd.org/PmcTools/PmcHardwareHowTo
*
* Please refer to those resources before you attempt to modify
* this file or the hwpmc driver/subsystem.
Modified: head/sys/dev/sk/if_sk.c
==
--- head/sys/dev/sk/if_sk.c Fri Jul 27 07:05:50 2018(r336756)
+++ head/sys/dev/sk/if_sk.c Fri Jul 27 10:40:48 2018(r336757)
@@ -64,7 +64,7 @@ __FBSDID("$FreeBSD$");
* XMAC II datasheet online. I have put my copy at people.freebsd.org as a
* convenience to others until Vitesse corrects this problem:
*
- * http://people.freebsd.org/~wpaul/SysKonnect/xmacii_datasheet_rev_c_9-29.pdf
+ * https://people.freebsd.org/~wpaul/SysKonnect/xmacii_datasheet_rev_c_9-29.pdf
*
* Written by Bill Paul
* Department of Electrical Engineering
Modified: head/sys/dev/sound/pci/maestro3.c
==
--- head/sys/dev/sound/pci/maestro3.c Fri Jul 27 07:05:50 2018
(r336756)
+++ head/sys/dev/sound/pci/maestro3.c Fri Jul 27 10:40:48 2018
(r336757)
@@ -45,7 +45,7 @@
* , http://www.zabbo.net/maestro3
*
* Cameron Grant created the pcm framework used here nearly verbatim.
- * , http://people.freebsd.org/~cg/template.c
+ * , https://people.freebsd.org/~cg/template.c
*
* Taku YAMAMOTO for his Maestro-1/2 FreeBSD driver and sanity reference.
*
Modified: head/sys/dev/sound/pcm/dsp.c
==
--- head/sys/dev/sound/pcm/dsp.cFri Jul 27 07:05:50 2018
(r336756)
+++
svn commit: r336756 - head/usr.bin/top
Author: daichi
Date: Fri Jul 27 07:05:50 2018
New Revision: 336756
URL: https://svnweb.freebsd.org/changeset/base/336756
Log:
top(1): fix a buffer overflow copying states to display while they were
incremented
- fix an AddressSanitizer error
Submitted by: devne...@gmail.com
Reviewed by: eadler
Approved by: gnn (mentor)
Differential Revision:https://reviews.freebsd.org/D16183
Modified:
head/usr.bin/top/display.c
Modified: head/usr.bin/top/display.c
==
--- head/usr.bin/top/display.c Fri Jul 27 05:40:03 2018(r336755)
+++ head/usr.bin/top/display.c Fri Jul 27 07:05:50 2018(r336756)
@@ -420,6 +420,7 @@ i_cpustates(int *states)
int value;
const char * const *names;
const char *thisname;
+int *hstates = states;
int cpu;
for (cpu = 0; cpu < num_cpus; cpu++) {
@@ -453,6 +454,7 @@ for (cpu = 0; cpu < num_cpus; cpu++) {
}
/* copy over values into "last" array */
+states = hstates;
memcpy(lcpustates, states, num_cpustates * sizeof(int) * num_cpus);
}
@@ -462,6 +464,7 @@ u_cpustates(int *states)
int value;
const char * const *names;
const char *thisname;
+int *hstates = states;
int *lp;
int *colp;
int cpu;
@@ -504,6 +507,8 @@ for (cpu = 0; cpu < num_cpus; cpu++) {
colp++;
}
}
+
+states = hstates;
}
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"
