Date: Sat, 4 May 2019 02:10:48 +0000 (UTC) From: Enji Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r347076 - in projects/runtime-coverage-v2: lib/atf/libatf-c lib/libbe lib/libc/gen lib/libfetch lib/libvgl libexec/rtld-elf release release/tools sbin/fsck_ffs sbin/ifconfig sbin/reboot... Message-ID: <201905040210.x442Am6j041431@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sat May 4 02:10:47 2019 New Revision: 347076 URL: https://svnweb.freebsd.org/changeset/base/347076 Log: MFhead@r347075 Added: projects/runtime-coverage-v2/sys/compat/linux/linux_common.h - copied unchanged from r347075, head/sys/compat/linux/linux_common.h projects/runtime-coverage-v2/sys/dts/arm64/overlays/sun50i-h5-nanopi-neo2-opp.dtso - copied unchanged from r347075, head/sys/dts/arm64/overlays/sun50i-h5-nanopi-neo2-opp.dtso projects/runtime-coverage-v2/sys/dts/arm64/overlays/sun50i-h5-opp.dtso - copied unchanged from r347075, head/sys/dts/arm64/overlays/sun50i-h5-opp.dtso projects/runtime-coverage-v2/sys/dts/arm64/overlays/sun50i-h5-sid.dtso - copied unchanged from r347075, head/sys/dts/arm64/overlays/sun50i-h5-sid.dtso projects/runtime-coverage-v2/sys/dts/arm64/overlays/sun50i-h5-ths.dtso - copied unchanged from r347075, head/sys/dts/arm64/overlays/sun50i-h5-ths.dtso projects/runtime-coverage-v2/tests/sys/vm/mlock_test.c - copied unchanged from r347075, head/tests/sys/vm/mlock_test.c Modified: projects/runtime-coverage-v2/lib/atf/libatf-c/Makefile projects/runtime-coverage-v2/lib/libbe/be.c projects/runtime-coverage-v2/lib/libbe/be_access.c projects/runtime-coverage-v2/lib/libc/gen/directory.3 projects/runtime-coverage-v2/lib/libfetch/common.c projects/runtime-coverage-v2/lib/libvgl/bitmap.c projects/runtime-coverage-v2/libexec/rtld-elf/rtld_malloc.c projects/runtime-coverage-v2/release/Makefile.vm projects/runtime-coverage-v2/release/tools/gce.conf projects/runtime-coverage-v2/release/tools/vmimage.subr projects/runtime-coverage-v2/sbin/fsck_ffs/dir.c projects/runtime-coverage-v2/sbin/fsck_ffs/fsck.h projects/runtime-coverage-v2/sbin/fsck_ffs/fsck_ffs.8 projects/runtime-coverage-v2/sbin/fsck_ffs/globs.c projects/runtime-coverage-v2/sbin/fsck_ffs/main.c projects/runtime-coverage-v2/sbin/ifconfig/ifconfig.8 projects/runtime-coverage-v2/sbin/ifconfig/iflagg.c projects/runtime-coverage-v2/sbin/reboot/boot_i386.8 projects/runtime-coverage-v2/share/man/man4/ccr.4 projects/runtime-coverage-v2/share/man/man7/development.7 projects/runtime-coverage-v2/share/misc/committers-src.dot projects/runtime-coverage-v2/stand/common/disk.c projects/runtime-coverage-v2/stand/efi/boot1/Makefile projects/runtime-coverage-v2/stand/efi/boot1/boot1.c projects/runtime-coverage-v2/stand/efi/boot1/boot_module.h projects/runtime-coverage-v2/stand/efi/loader/main.c projects/runtime-coverage-v2/stand/i386/gptboot/gptboot.8 projects/runtime-coverage-v2/stand/i386/zfsboot/zfsboot.c projects/runtime-coverage-v2/sys/amd64/conf/GENERIC projects/runtime-coverage-v2/sys/amd64/conf/MINIMAL projects/runtime-coverage-v2/sys/amd64/linux/linux.h projects/runtime-coverage-v2/sys/amd64/linux32/linux.h projects/runtime-coverage-v2/sys/amd64/vmm/vmm_instruction_emul.c projects/runtime-coverage-v2/sys/arm/conf/std.arm projects/runtime-coverage-v2/sys/arm/conf/std.armv6 projects/runtime-coverage-v2/sys/arm/conf/std.armv7 projects/runtime-coverage-v2/sys/arm64/arm64/efirt_machdep.c projects/runtime-coverage-v2/sys/arm64/arm64/identcpu.c projects/runtime-coverage-v2/sys/arm64/conf/GENERIC projects/runtime-coverage-v2/sys/arm64/linux/linux.h projects/runtime-coverage-v2/sys/compat/linprocfs/linprocfs.c projects/runtime-coverage-v2/sys/compat/linsysfs/linsysfs.c projects/runtime-coverage-v2/sys/compat/linux/linux.c projects/runtime-coverage-v2/sys/compat/linux/linux.h projects/runtime-coverage-v2/sys/compat/linux/linux_emul.c projects/runtime-coverage-v2/sys/compat/linux/linux_emul.h projects/runtime-coverage-v2/sys/compat/linux/linux_ioctl.c projects/runtime-coverage-v2/sys/compat/linux/linux_misc.c projects/runtime-coverage-v2/sys/compat/linuxkpi/common/include/linux/dmapool.h projects/runtime-coverage-v2/sys/compat/linuxkpi/common/src/linux_pci.c projects/runtime-coverage-v2/sys/conf/NOTES projects/runtime-coverage-v2/sys/conf/dtb.build.mk projects/runtime-coverage-v2/sys/conf/files.arm64 projects/runtime-coverage-v2/sys/conf/options projects/runtime-coverage-v2/sys/i386/conf/GENERIC projects/runtime-coverage-v2/sys/i386/conf/MINIMAL projects/runtime-coverage-v2/sys/i386/linux/linux.h projects/runtime-coverage-v2/sys/kern/kern_time.c projects/runtime-coverage-v2/sys/mips/conf/ERL projects/runtime-coverage-v2/sys/mips/conf/JZ4780 projects/runtime-coverage-v2/sys/mips/conf/X1000 projects/runtime-coverage-v2/sys/mips/conf/std.BERI projects/runtime-coverage-v2/sys/modules/dtb/allwinner/Makefile projects/runtime-coverage-v2/sys/modules/dtb/rockchip/Makefile projects/runtime-coverage-v2/sys/net/ieee8023ad_lacp.c projects/runtime-coverage-v2/sys/net/ieee8023ad_lacp.h projects/runtime-coverage-v2/sys/net/if_lagg.c projects/runtime-coverage-v2/sys/net/if_lagg.h projects/runtime-coverage-v2/sys/net/iflib.c projects/runtime-coverage-v2/sys/net/iflib.h projects/runtime-coverage-v2/sys/powerpc/booke/locore.S projects/runtime-coverage-v2/sys/powerpc/booke/trap_subr.S projects/runtime-coverage-v2/sys/powerpc/conf/GENERIC projects/runtime-coverage-v2/sys/powerpc/conf/GENERIC64 projects/runtime-coverage-v2/sys/powerpc/conf/MPC85XX projects/runtime-coverage-v2/sys/powerpc/conf/MPC85XXSPE projects/runtime-coverage-v2/sys/powerpc/powernv/opal_hmi.c projects/runtime-coverage-v2/sys/powerpc/powerpc/swtch64.S projects/runtime-coverage-v2/sys/riscv/riscv/nexus.c projects/runtime-coverage-v2/sys/security/mac/mac_inet.c projects/runtime-coverage-v2/sys/security/mac/mac_internal.h projects/runtime-coverage-v2/sys/security/mac/mac_net.c projects/runtime-coverage-v2/sys/sparc64/conf/GENERIC projects/runtime-coverage-v2/sys/ufs/ufs/dir.h projects/runtime-coverage-v2/sys/ufs/ufs/ufs_bmap.c projects/runtime-coverage-v2/sys/ufs/ufs/ufs_extern.h projects/runtime-coverage-v2/sys/ufs/ufs/ufs_lookup.c projects/runtime-coverage-v2/sys/ufs/ufs/ufs_vnops.c projects/runtime-coverage-v2/sys/vm/vm_map.c projects/runtime-coverage-v2/sys/vm/vm_pageout.c projects/runtime-coverage-v2/tests/sys/vm/Makefile projects/runtime-coverage-v2/tools/boot/ci-qemu-test.sh projects/runtime-coverage-v2/usr.bin/stat/stat.c projects/runtime-coverage-v2/usr.bin/stat/tests/stat_test.sh projects/runtime-coverage-v2/usr.sbin/bhyve/block_if.c projects/runtime-coverage-v2/usr.sbin/bhyve/block_if.h projects/runtime-coverage-v2/usr.sbin/bhyve/pci_virtio_block.c projects/runtime-coverage-v2/usr.sbin/lpr/common_source/printcap.c projects/runtime-coverage-v2/usr.sbin/mountd/mountd.c projects/runtime-coverage-v2/usr.sbin/rtadvd/if.c Directory Properties: projects/runtime-coverage-v2/ (props changed) Modified: projects/runtime-coverage-v2/lib/atf/libatf-c/Makefile ============================================================================== --- projects/runtime-coverage-v2/lib/atf/libatf-c/Makefile Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/lib/atf/libatf-c/Makefile Sat May 4 02:10:47 2019 (r347076) @@ -95,6 +95,65 @@ INCS+= atf-c.h INCSDIR_atf-c.h= ${INCLUDEDIR} MAN= atf-c.3 +MLINKS+= atf-c.3 ATF_CHECK.3 \ + atf-c.3 ATF_CHECK_MSG.3 \ + atf-c.3 ATF_CHECK_EQ.3 \ + atf-c.3 ATF_CHECK_EQ_MSG.3 \ + atf-c.3 ATF_CHECK_MATCH.3 \ + atf-c.3 ATF_CHECK_MATCH_MSG.3 \ + atf-c.3 ATF_CHECK_STREQ.3 \ + atf-c.3 ATF_CHECK_STREQ_MSG.3 \ + atf-c.3 ATF_CHECK_ERRNO.3 \ + atf-c.3 ATF_REQUIRE.3 \ + atf-c.3 ATF_REQUIRE_MSG.3 \ + atf-c.3 ATF_REQUIRE_EQ.3 \ + atf-c.3 ATF_REQUIRE_EQ_MSG.3 \ + atf-c.3 ATF_REQUIRE_MATCH.3 \ + atf-c.3 ATF_REQUIRE_MATCH_MSG.3 \ + atf-c.3 ATF_REQUIRE_STREQ.3 \ + atf-c.3 ATF_REQUIRE_STREQ_MSG.3 \ + atf-c.3 ATF_REQUIRE_ERRNO.3 \ + atf-c.3 ATF_TC.3 \ + atf-c.3 ATF_TC_BODY.3 \ + atf-c.3 ATF_TC_BODY_NAME.3 \ + atf-c.3 ATF_TC_CLEANUP.3 \ + atf-c.3 ATF_TC_CLEANUP_NAME.3 \ + atf-c.3 ATF_TC_HEAD.3 \ + atf-c.3 ATF_TC_HEAD_NAME.3 \ + atf-c.3 ATF_TC_NAME.3 \ + atf-c.3 ATF_TC_WITH_CLEANUP.3 \ + atf-c.3 ATF_TC_WITHOUT_HEAD.3 \ + atf-c.3 ATF_TP_ADD_TC.3 \ + atf-c.3 ATF_TP_ADD_TCS.3 \ + atf-c.3 atf_tc_get_config_var.3 \ + atf-c.3 atf_tc_get_config_var_wd.3 \ + atf-c.3 atf_tc_get_config_var_as_bool.3 \ + atf-c.3 atf_tc_get_config_var_as_bool_wd.3 \ + atf-c.3 atf_tc_get_config_var_as_long.3 \ + atf-c.3 atf_tc_get_config_var_as_long_wd.3 \ + atf-c.3 atf_no_error.3 \ + atf-c.3 atf_tc_expect_death.3 \ + atf-c.3 atf_tc_expect_exit.3 \ + atf-c.3 atf_tc_expect_fail.3 \ + atf-c.3 atf_tc_expect_pass.3 \ + atf-c.3 atf_tc_expect_signal.3 \ + atf-c.3 atf_tc_expect_timeout.3 \ + atf-c.3 atf_tc_fail.3 \ + atf-c.3 atf_tc_fail_nonfatal.3 \ + atf-c.3 atf_tc_pass.3 \ + atf-c.3 atf_tc_skip.3 \ + atf-c.3 atf_utils_cat_file.3 \ + atf-c.3 atf_utils_compare_file.3 \ + atf-c.3 atf_utils_copy_file.3 \ + atf-c.3 atf_utils_create_file.3 \ + atf-c.3 atf_utils_file_exists.3 \ + atf-c.3 atf_utils_fork.3 \ + atf-c.3 atf_utils_free_charpp.3 \ + atf-c.3 atf_utils_grep_file.3 \ + atf-c.3 atf_utils_grep_string.3 \ + atf-c.3 atf_utils_readline.3 \ + atf-c.3 atf_utils_redirect.3 \ + atf-c.3 atf_utils_wait.3 MLINKS+= atf-c.3 atf-c-api.3 # Backwards compatibility. HAS_TESTS= Modified: projects/runtime-coverage-v2/lib/libbe/be.c ============================================================================== --- projects/runtime-coverage-v2/lib/libbe/be.c Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/lib/libbe/be.c Sat May 4 02:10:47 2019 (r347076) @@ -822,7 +822,7 @@ be_import(libbe_handle_t *lbh, const char *bootenv, in nvlist_alloc(&props, NV_UNIQUE_NAME, KM_SLEEP); nvlist_add_string(props, "canmount", "noauto"); - nvlist_add_string(props, "mountpoint", "/"); + nvlist_add_string(props, "mountpoint", "none"); err = zfs_prop_set_list(zfs, props); nvlist_free(props); Modified: projects/runtime-coverage-v2/lib/libbe/be_access.c ============================================================================== --- projects/runtime-coverage-v2/lib/libbe/be_access.c Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/lib/libbe/be_access.c Sat May 4 02:10:47 2019 (r347076) @@ -45,6 +45,7 @@ struct be_mount_info { const char *mountpoint; int mntflags; int deepmount; + int depth; }; static int @@ -79,6 +80,7 @@ be_mount_iter(zfs_handle_t *zfs_hdl, void *data) char *mountpoint; char tmp[BE_MAXPATHLEN], zfs_mnt[BE_MAXPATHLEN]; struct be_mount_info *info; + char opt; info = (struct be_mount_info *)data; @@ -94,37 +96,50 @@ be_mount_iter(zfs_handle_t *zfs_hdl, void *data) NULL, NULL, 0, 1)) return (1); - if (strcmp("none", zfs_mnt) != 0) { - char opt = '\0'; + if (strcmp("none", zfs_mnt) == 0) { + /* + * mountpoint=none; we'll mount it at info->mountpoint assuming + * we're at the root. If we're not at the root... that's less + * than stellar and not entirely sure what to do with that. + * For now, we won't treat it as an error condition -- we just + * won't mount it, and we'll continue on. + */ + if (info->depth > 0) + return (0); + snprintf(tmp, BE_MAXPATHLEN, "%s", info->mountpoint); + } else { mountpoint = be_mountpoint_augmented(info->lbh, zfs_mnt); - snprintf(tmp, BE_MAXPATHLEN, "%s%s", info->mountpoint, mountpoint); + } - if ((err = zmount(zfs_get_name(zfs_hdl), tmp, info->mntflags, - __DECONST(char *, MNTTYPE_ZFS), NULL, 0, &opt, 1)) != 0) { - switch (errno) { - case ENAMETOOLONG: - return (set_error(info->lbh, BE_ERR_PATHLEN)); - case ELOOP: - case ENOENT: - case ENOTDIR: - return (set_error(info->lbh, BE_ERR_BADPATH)); - case EPERM: - return (set_error(info->lbh, BE_ERR_PERMS)); - case EBUSY: - return (set_error(info->lbh, BE_ERR_PATHBUSY)); - default: - return (set_error(info->lbh, BE_ERR_UNKNOWN)); - } + opt = '\0'; + if ((err = zmount(zfs_get_name(zfs_hdl), tmp, info->mntflags, + __DECONST(char *, MNTTYPE_ZFS), NULL, 0, &opt, 1)) != 0) { + switch (errno) { + case ENAMETOOLONG: + return (set_error(info->lbh, BE_ERR_PATHLEN)); + case ELOOP: + case ENOENT: + case ENOTDIR: + return (set_error(info->lbh, BE_ERR_BADPATH)); + case EPERM: + return (set_error(info->lbh, BE_ERR_PERMS)); + case EBUSY: + return (set_error(info->lbh, BE_ERR_PATHBUSY)); + default: + return (set_error(info->lbh, BE_ERR_UNKNOWN)); } } if (!info->deepmount) return (0); - return (zfs_iter_filesystems(zfs_hdl, be_mount_iter, info)); + ++info->depth; + err = zfs_iter_filesystems(zfs_hdl, be_mount_iter, info); + --info->depth; + return (err); } @@ -138,9 +153,11 @@ be_umount_iter(zfs_handle_t *zfs_hdl, void *data) info = (struct be_mount_info *)data; + ++info->depth; if((err = zfs_iter_filesystems(zfs_hdl, be_umount_iter, info)) != 0) { return (err); } + --info->depth; if (!zfs_is_mounted(zfs_hdl, &mountpoint)) { return (0); @@ -248,6 +265,7 @@ be_mount(libbe_handle_t *lbh, char *bootenv, char *mou info.mountpoint = (mountpoint == NULL) ? mnt_temp : mountpoint; info.mntflags = mntflags; info.deepmount = mntdeep; + info.depth = 0; if((err = be_mount_iter(zhdl, &info) != 0)) { zfs_close(zhdl); @@ -283,6 +301,7 @@ be_unmount(libbe_handle_t *lbh, char *bootenv, int fla info.be = be; info.mountpoint = NULL; info.mntflags = (flags & BE_MNT_FORCE) ? MS_FORCE : 0; + info.depth = 0; if ((err = be_umount_iter(root_hdl, &info)) != 0) { zfs_close(root_hdl); Modified: projects/runtime-coverage-v2/lib/libc/gen/directory.3 ============================================================================== --- projects/runtime-coverage-v2/lib/libc/gen/directory.3 Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/lib/libc/gen/directory.3 Sat May 4 02:10:47 2019 (r347076) @@ -28,7 +28,7 @@ .\" @(#)directory.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd May 22, 2017 +.Dd April 30, 2019 .Dt DIRECTORY 3 .Os .Sh NAME @@ -264,6 +264,30 @@ return (NOT_FOUND); .Xr open 2 , .Xr read 2 , .Xr dir 5 +.Sh STANDARDS +The +.Fn closedir , +.Fn dirfd , +.Fn fdopendir , +.Fn opendir , +.Fn readdir , +.Fn readdir_r , +.Fn rewinddir , +.Fn seekdir +and +.Fn telldir +functions are expected to conform to +.St -p1003.1-2008 . +The +.Fn fdclosedir +function and the +.Fa d_off , +.Fa d_reclen +and +.Fa d_type +fields of +.Vt struct dirent +are non-standard, and should not be used in portable programs. .Sh HISTORY The .Fn opendir , Modified: projects/runtime-coverage-v2/lib/libfetch/common.c ============================================================================== --- projects/runtime-coverage-v2/lib/libfetch/common.c Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/lib/libfetch/common.c Sat May 4 02:10:47 2019 (r347076) @@ -994,6 +994,7 @@ fetch_ssl(conn_t *conn, const struct url *URL, int ver #else (void)conn; (void)verbose; + (void)URL; fprintf(stderr, "SSL support disabled\n"); return (-1); #endif Modified: projects/runtime-coverage-v2/lib/libvgl/bitmap.c ============================================================================== --- projects/runtime-coverage-v2/lib/libvgl/bitmap.c Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/lib/libvgl/bitmap.c Sat May 4 02:10:47 2019 (r347076) @@ -47,7 +47,7 @@ static int color2bit[16] = {0x00000000, 0x00000001, 0x static void WriteVerticalLine(VGLBitmap *dst, int x, int y, int width, byte *line) { - int i, pos, last, planepos, start_offset, end_offset, offset; + int bwidth, i, pos, last, planepos, start_offset, end_offset, offset; int len; unsigned int word = 0; byte *address; @@ -58,13 +58,13 @@ WriteVerticalLine(VGLBitmap *dst, int x, int y, int wi case VIDBUF4S: start_offset = (x & 0x07); end_offset = (x + width) & 0x07; - i = (width + start_offset) / 8; + bwidth = (width + start_offset) / 8; if (end_offset) - i++; + bwidth++; VGLPlane[0] = VGLBuf; - VGLPlane[1] = VGLPlane[0] + i; - VGLPlane[2] = VGLPlane[1] + i; - VGLPlane[3] = VGLPlane[2] + i; + VGLPlane[1] = VGLPlane[0] + bwidth; + VGLPlane[2] = VGLPlane[1] + bwidth; + VGLPlane[3] = VGLPlane[2] + bwidth; pos = 0; planepos = 0; last = 8 - start_offset; @@ -87,9 +87,6 @@ WriteVerticalLine(VGLBitmap *dst, int x, int y, int wi VGLPlane[2][planepos] = word>>16; VGLPlane[3][planepos] = word>>24; } - if (start_offset || end_offset) - width+=8; - width /= 8; outb(0x3ce, 0x01); outb(0x3cf, 0x00); /* set/reset enable */ outb(0x3ce, 0x08); outb(0x3cf, 0xff); /* bit mask */ for (i=0; i<4; i++) { @@ -103,7 +100,7 @@ WriteVerticalLine(VGLBitmap *dst, int x, int y, int wi VGLPlane[i][planepos] |= dst->Bitmap[pos+planepos] & mask[end_offset]; if (start_offset) VGLPlane[i][0] |= dst->Bitmap[pos] & ~mask[start_offset]; - bcopy(&VGLPlane[i][0], dst->Bitmap + pos, width); + bcopy(&VGLPlane[i][0], dst->Bitmap + pos, bwidth); } else { /* VIDBUF4S */ if (end_offset) { offset = VGLSetSegment(pos + planepos); @@ -112,9 +109,9 @@ WriteVerticalLine(VGLBitmap *dst, int x, int y, int wi offset = VGLSetSegment(pos); if (start_offset) VGLPlane[i][0] |= dst->Bitmap[offset] & ~mask[start_offset]; - for (last = width; ; ) { + for (last = bwidth; ; ) { len = min(VGLAdpInfo.va_window_size - offset, last); - bcopy(&VGLPlane[i][width - last], dst->Bitmap + offset, len); + bcopy(&VGLPlane[i][bwidth - last], dst->Bitmap + offset, len); pos += len; last -= len; if (last <= 0) Modified: projects/runtime-coverage-v2/libexec/rtld-elf/rtld_malloc.c ============================================================================== --- projects/runtime-coverage-v2/libexec/rtld-elf/rtld_malloc.c Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/libexec/rtld-elf/rtld_malloc.c Sat May 4 02:10:47 2019 (r347076) @@ -45,17 +45,14 @@ static char *rcsid = "$FreeBSD$"; * This is designed for use in a virtual memory environment. */ -#include <sys/types.h> +#include <sys/param.h> #include <sys/sysctl.h> +#include <sys/mman.h> #include <errno.h> #include <stdarg.h> #include <stddef.h> -#include <stdio.h> -#include <stdlib.h> #include <string.h> #include <unistd.h> -#include <sys/param.h> -#include <sys/mman.h> #include "rtld.h" #include "rtld_printf.h" #include "paths.h" @@ -81,10 +78,6 @@ union overhead { struct { u_char ovu_magic; /* magic number */ u_char ovu_index; /* bucket # */ -#ifdef RCHECK - u_short ovu_rmagic; /* range magic number */ - u_int ovu_size; /* actual block size */ -#endif } ovu; #define ov_magic ovu.ovu_magic #define ov_index ovu.ovu_index @@ -100,12 +93,6 @@ static int findbucket(union overhead *freep, int srchl #define MAGIC 0xef /* magic # on accounting info */ #define RMAGIC 0x5555 /* magic # on range info */ -#ifdef RCHECK -#define RSLOP sizeof (u_short) -#else -#define RSLOP 0 -#endif - /* * nextf[i] is the pointer to the next free block of size 2^(i+3). The * smallest allocatable block is 8 bytes. The overhead information @@ -117,34 +104,7 @@ static union overhead *nextf[NBUCKETS]; static int pagesz; /* page size */ static int pagebucket; /* page size bucket */ -#ifdef MSTATS /* - * nmalloc[i] is the difference between the number of mallocs and frees - * for a given block size. - */ -static u_int nmalloc[NBUCKETS]; -#include <stdio.h> -#endif - -#if defined(MALLOC_DEBUG) || defined(RCHECK) -#define ASSERT(p) if (!(p)) botch("p") -#include <stdio.h> -static void -botch(s) - char *s; -{ - fprintf(stderr, "\r\nassertion botched: %s\r\n", s); - (void) fflush(stderr); /* just in case user buffered it */ - abort(); -} -#else -#define ASSERT(p) -#endif - -/* Debugging stuff */ -#define TRACE() rtld_printf("TRACE %s:%d\n", __FILE__, __LINE__) - -/* * The array of supported page sizes is provided by the user, i.e., the * program that calls this storage allocator. That program must initialize * the array before making its first call to allocate storage. The array @@ -188,15 +148,10 @@ __crt_malloc(size_t nbytes) * stored in hash buckets which satisfies request. * Account for space used per block for accounting. */ - if (nbytes <= (unsigned long)(n = pagesz - sizeof (*op) - RSLOP)) { -#ifndef RCHECK + if (nbytes <= (unsigned long)(n = pagesz - sizeof(*op))) { amt = 8; /* size of first bucket */ bucket = 0; -#else - amt = 16; /* size of first bucket */ - bucket = 1; -#endif - n = -(sizeof (*op) + RSLOP); + n = -sizeof(*op); } else { amt = pagesz; bucket = pagebucket; @@ -220,18 +175,6 @@ __crt_malloc(size_t nbytes) nextf[bucket] = op->ov_next; op->ov_magic = MAGIC; op->ov_index = bucket; -#ifdef MSTATS - nmalloc[bucket]++; -#endif -#ifdef RCHECK - /* - * Record allocated size of block and - * bound space with magic numbers. - */ - op->ov_size = roundup2(nbytes, RSLOP); - op->ov_rmagic = RMAGIC; - *(u_short *)((caddr_t)(op + 1) + op->ov_size) = RMAGIC; -#endif return ((char *)(op + 1)); } @@ -266,13 +209,9 @@ morecore(int bucket) * sbrk_size <= 0 only for big, FLUFFY, requests (about * 2^30 bytes on a VAX, I think) or for a negative arg. */ - sz = 1 << (bucket + 3); -#ifdef MALLOC_DEBUG - ASSERT(sz > 0); -#else - if (sz <= 0) + if ((unsigned)bucket >= NBBY * sizeof(int) - 4) return; -#endif + sz = 1 << (bucket + 3); if (sz < pagesz) { amt = pagesz; nblks = amt / sz; @@ -306,23 +245,11 @@ __crt_free(void *cp) if (cp == NULL) return; op = (union overhead *)((caddr_t)cp - sizeof (union overhead)); -#ifdef MALLOC_DEBUG - ASSERT(op->ov_magic == MAGIC); /* make sure it was in use */ -#else if (op->ov_magic != MAGIC) return; /* sanity */ -#endif -#ifdef RCHECK - ASSERT(op->ov_rmagic == RMAGIC); - ASSERT(*(u_short *)((caddr_t)(op + 1) + op->ov_size) == RMAGIC); -#endif size = op->ov_index; - ASSERT(size < NBUCKETS); op->ov_next = nextf[size]; /* also clobbers ov_magic */ nextf[size] = op; -#ifdef MSTATS - nmalloc[size]--; -#endif } /* @@ -374,26 +301,21 @@ __crt_realloc(void *cp, size_t nbytes) } onb = 1 << (i + 3); if (onb < (u_int)pagesz) - onb -= sizeof (*op) + RSLOP; + onb -= sizeof(*op); else - onb += pagesz - sizeof (*op) - RSLOP; + onb += pagesz - sizeof(*op); /* avoid the copy if same size block */ if (was_alloced) { if (i) { i = 1 << (i + 2); if (i < pagesz) - i -= sizeof (*op) + RSLOP; + i -= sizeof(*op); else - i += pagesz - sizeof (*op) - RSLOP; + i += pagesz - sizeof(*op); } - if (nbytes <= onb && nbytes > (size_t)i) { -#ifdef RCHECK - op->ov_size = roundup2(nbytes, RSLOP); - *(u_short *)((caddr_t)(op + 1) + op->ov_size) = RMAGIC; -#endif - return(cp); - } else - __crt_free(cp); + if (nbytes <= onb && nbytes > (size_t)i) + return (cp); + __crt_free(cp); } if ((res = __crt_malloc(nbytes)) == NULL) return (NULL); @@ -423,39 +345,6 @@ findbucket(union overhead *freep, int srchlen) } return (-1); } - -#ifdef MSTATS -/* - * mstats - print out statistics about malloc - * - * Prints two lines of numbers, one showing the length of the free list - * for each size category, the second showing the number of mallocs - - * frees for each size category. - */ -mstats(char * s) -{ - int i, j; - union overhead *p; - int totfree = 0, - totused = 0; - - fprintf(stderr, "Memory allocation statistics %s\nfree:\t", s); - for (i = 0; i < NBUCKETS; i++) { - for (j = 0, p = nextf[i]; p; p = p->ov_next, j++) - ; - fprintf(stderr, " %d", j); - totfree += j * (1 << (i + 3)); - } - fprintf(stderr, "\nused:\t"); - for (i = 0; i < NBUCKETS; i++) { - fprintf(stderr, " %d", nmalloc[i]); - totused += nmalloc[i] * (1 << (i + 3)); - } - fprintf(stderr, "\n\tTotal in use: %d, total free: %d\n", - totused, totfree); -} -#endif - static int morepages(int n) Modified: projects/runtime-coverage-v2/release/Makefile.vm ============================================================================== --- projects/runtime-coverage-v2/release/Makefile.vm Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/release/Makefile.vm Sat May 4 02:10:47 2019 (r347076) @@ -7,7 +7,7 @@ VMTARGETS= vm-image VMFORMATS?= vhd vmdk qcow2 raw -VMSIZE?= 30G +VMSIZE?= 3072M SWAPSIZE?= 1G VMBASE?= vm Modified: projects/runtime-coverage-v2/release/tools/gce.conf ============================================================================== --- projects/runtime-coverage-v2/release/tools/gce.conf Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/release/tools/gce.conf Sat May 4 02:10:47 2019 (r347076) @@ -3,8 +3,8 @@ # $FreeBSD$ # -# Reduce VMSIZE to be below the free quota limit. -export VMSIZE=27G +# The default of 3GB is too small for GCE, so override the size here. +export VMSIZE=20G # Set to a list of packages to install. export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \ Modified: projects/runtime-coverage-v2/release/tools/vmimage.subr ============================================================================== --- projects/runtime-coverage-v2/release/tools/vmimage.subr Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/release/tools/vmimage.subr Sat May 4 02:10:47 2019 (r347076) @@ -182,6 +182,9 @@ vm_extra_enable_services() { if [ -z "${VMCONFIG}" -o -c "${VMCONFIG}" ]; then echo 'ifconfig_DEFAULT="DHCP inet6 accept_rtadv"' >> \ ${DESTDIR}/etc/rc.conf + # Expand the filesystem to fill the disk. + echo 'growfs_enable="YES"' >> ${DESTDIR}/etc/rc.conf + touch ${DESTDIR}/firstboot fi return 0 Modified: projects/runtime-coverage-v2/sbin/fsck_ffs/dir.c ============================================================================== --- projects/runtime-coverage-v2/sbin/fsck_ffs/dir.c Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/sbin/fsck_ffs/dir.c Sat May 4 02:10:47 2019 (r347076) @@ -147,14 +147,23 @@ fsck_readdir(struct inodesc *idesc) struct direct *dp, *ndp; struct bufarea *bp; long size, blksiz, fix, dploc; + int dc; blksiz = idesc->id_numfrags * sblock.fs_fsize; bp = getdirblk(idesc->id_blkno, blksiz); if (idesc->id_loc % DIRBLKSIZ == 0 && idesc->id_filesize > 0 && idesc->id_loc < blksiz) { dp = (struct direct *)(bp->b_un.b_buf + idesc->id_loc); - if (dircheck(idesc, dp)) + if ((dc = dircheck(idesc, dp)) > 0) { + if (dc == 2) { + /* + * dircheck() cleared unused directory space. + * Mark the buffer as dirty to write it out. + */ + dirty(bp); + } goto dpok; + } if (idesc->id_fix == IGNORE) return (0); fix = dofix(idesc, "DIRECTORY CORRUPTED"); @@ -181,19 +190,26 @@ dpok: if ((idesc->id_loc % DIRBLKSIZ) == 0) return (dp); ndp = (struct direct *)(bp->b_un.b_buf + idesc->id_loc); - if (idesc->id_loc < blksiz && idesc->id_filesize > 0 && - dircheck(idesc, ndp) == 0) { - size = DIRBLKSIZ - (idesc->id_loc % DIRBLKSIZ); - idesc->id_loc += size; - idesc->id_filesize -= size; - if (idesc->id_fix == IGNORE) - return (0); - fix = dofix(idesc, "DIRECTORY CORRUPTED"); - bp = getdirblk(idesc->id_blkno, blksiz); - dp = (struct direct *)(bp->b_un.b_buf + dploc); - dp->d_reclen += size; - if (fix) + if (idesc->id_loc < blksiz && idesc->id_filesize > 0) { + if ((dc = dircheck(idesc, ndp)) == 0) { + size = DIRBLKSIZ - (idesc->id_loc % DIRBLKSIZ); + idesc->id_loc += size; + idesc->id_filesize -= size; + if (idesc->id_fix == IGNORE) + return (0); + fix = dofix(idesc, "DIRECTORY CORRUPTED"); + bp = getdirblk(idesc->id_blkno, blksiz); + dp = (struct direct *)(bp->b_un.b_buf + dploc); + dp->d_reclen += size; + if (fix) + dirty(bp); + } else if (dc == 2) { + /* + * dircheck() cleared unused directory space. + * Mark the buffer as dirty to write it out. + */ dirty(bp); + } } return (dp); } @@ -201,6 +217,11 @@ dpok: /* * Verify that a directory entry is valid. * This is a superset of the checks made in the kernel. + * Also optionally clears padding and unused directory space. + * + * Returns 0 if the entry is bad, 1 if the entry is good and no changes + * were made, and 2 if the entry is good but modified to clear out padding + * and unused space and needs to be written back to disk. */ static int dircheck(struct inodesc *idesc, struct direct *dp) @@ -209,15 +230,39 @@ dircheck(struct inodesc *idesc, struct direct *dp) char *cp; u_char type; u_int8_t namlen; - int spaceleft; + int spaceleft, modified, unused; + modified = 0; spaceleft = DIRBLKSIZ - (idesc->id_loc % DIRBLKSIZ); if (dp->d_reclen == 0 || dp->d_reclen > spaceleft || - (dp->d_reclen & 0x3) != 0) + (dp->d_reclen & (DIR_ROUNDUP - 1)) != 0) goto bad; - if (dp->d_ino == 0) - return (1); + if (dp->d_ino == 0) { + /* + * Special case of an unused directory entry. Normally + * the kernel would coalesce unused space with the previous + * entry by extending its d_reclen, but there are situations + * (e.g. fsck) where that doesn't occur. + * If we're clearing out directory cruft (-z flag), then make + * sure this entry gets fully cleared as well. + */ + if (zflag && fswritefd >= 0) { + if (dp->d_type != 0) { + dp->d_type = 0; + modified = 1; + } + if (dp->d_namlen != 0) { + dp->d_namlen = 0; + modified = 1; + } + if (dp->d_name[0] != '\0') { + dp->d_name[0] = '\0'; + modified = 1; + } + } + goto good; + } size = DIRSIZ(0, dp); namlen = dp->d_namlen; type = dp->d_type; @@ -231,7 +276,37 @@ dircheck(struct inodesc *idesc, struct direct *dp) goto bad; if (*cp != '\0') goto bad; + +good: + if (zflag && fswritefd >= 0) { + /* + * Clear unused directory entry space, including the d_name + * padding. + */ + /* First figure the number of pad bytes. */ + unused = roundup2(namlen + 1, DIR_ROUNDUP) - (namlen + 1); + + /* Add in the free space to the end of the record. */ + unused += dp->d_reclen - DIRSIZ(0, dp); + + /* + * Now clear out the unused space, keeping track if we actually + * changed anything. + */ + for (cp = &dp->d_name[namlen + 1]; unused > 0; unused--, cp++) { + if (*cp != '\0') { + *cp = '\0'; + modified = 1; + } + } + + if (modified) { + return 2; + } + } + return (1); + bad: if (debug) printf("Bad dir: ino %d reclen %d namlen %d type %d name %s\n", Modified: projects/runtime-coverage-v2/sbin/fsck_ffs/fsck.h ============================================================================== --- projects/runtime-coverage-v2/sbin/fsck_ffs/fsck.h Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/sbin/fsck_ffs/fsck.h Sat May 4 02:10:47 2019 (r347076) @@ -315,6 +315,7 @@ extern off_t bflag; /* location of alternate super b extern int debug; /* output debugging info */ extern int Eflag; /* delete empty data blocks */ extern int Zflag; /* zero empty data blocks */ +extern int zflag; /* zero unused directory space */ extern int inoopt; /* trim out unused inodes */ extern char ckclean; /* only do work if not cleanly unmounted */ extern int cvtlevel; /* convert to newer file system format */ Modified: projects/runtime-coverage-v2/sbin/fsck_ffs/fsck_ffs.8 ============================================================================== --- projects/runtime-coverage-v2/sbin/fsck_ffs/fsck_ffs.8 Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/sbin/fsck_ffs/fsck_ffs.8 Sat May 4 02:10:47 2019 (r347076) @@ -29,7 +29,7 @@ .\" @(#)fsck.8 8.4 (Berkeley) 5/9/95 .\" $FreeBSD$ .\" -.Dd January 13, 2018 +.Dd May 3, 2019 .Dt FSCK_FFS 8 .Os .Sh NAME @@ -38,7 +38,7 @@ .Nd file system consistency check and interactive repair .Sh SYNOPSIS .Nm -.Op Fl BCdEFfnpRrSyZ +.Op Fl BCdEFfnpRrSyZz .Op Fl b Ar block .Op Fl c Ar level .Op Fl m Ar mode @@ -301,6 +301,9 @@ If both and .Fl Z are specified, blocks are first zeroed and then erased. +.It Fl z +Clear unused directory space. +The cleared space includes deleted file names and name padding. .El .Pp Inconsistencies checked are as follows: Modified: projects/runtime-coverage-v2/sbin/fsck_ffs/globs.c ============================================================================== --- projects/runtime-coverage-v2/sbin/fsck_ffs/globs.c Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/sbin/fsck_ffs/globs.c Sat May 4 02:10:47 2019 (r347076) @@ -85,6 +85,7 @@ off_t bflag; /* location of alternate super block */ int debug; /* output debugging info */ int Eflag; /* delete empty data blocks */ int Zflag; /* zero empty data blocks */ +int zflag; /* zero unused directory space */ int inoopt; /* trim out unused inodes */ char ckclean; /* only do work if not cleanly unmounted */ int cvtlevel; /* convert to newer file system format */ Modified: projects/runtime-coverage-v2/sbin/fsck_ffs/main.c ============================================================================== --- projects/runtime-coverage-v2/sbin/fsck_ffs/main.c Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/sbin/fsck_ffs/main.c Sat May 4 02:10:47 2019 (r347076) @@ -89,7 +89,7 @@ main(int argc, char *argv[]) sync(); skipclean = 1; inoopt = 0; - while ((ch = getopt(argc, argv, "b:Bc:CdEfFm:npRrSyZ")) != -1) { + while ((ch = getopt(argc, argv, "b:Bc:CdEfFm:npRrSyZz")) != -1) { switch (ch) { case 'b': skipclean = 0; @@ -164,6 +164,10 @@ main(int argc, char *argv[]) case 'Z': Zflag++; + break; + + case 'z': + zflag++; break; default: Modified: projects/runtime-coverage-v2/sbin/ifconfig/ifconfig.8 ============================================================================== --- projects/runtime-coverage-v2/sbin/ifconfig/ifconfig.8 Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/sbin/ifconfig/ifconfig.8 Sat May 4 02:10:47 2019 (r347076) @@ -28,7 +28,7 @@ .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" $FreeBSD$ .\" -.Dd June 27, 2018 +.Dd May 3, 2019 .Dt IFCONFIG 8 .Os .Sh NAME @@ -2497,6 +2497,22 @@ Use the RSS hash from the network card if available. Set a shift parameter for RSS local hash computation. Hash is calculated by using flowid bits in a packet header mbuf which are shifted by the number of this parameter. +.It Cm use_numa +Enable selection of egress ports based on the native +.Xr NUMA 4 +domain for the packets being transmitted. +This is currently only implemented for lacp mode. +This works only on +.Xr NUMA 4 +hardware, running a kernel compiled with the +.Xr NUMA 4 +option, and when interfaces from multiple +.Xr NUMA 4 +domains are ports of the aggregation interface. +.It Cm -use_numa +Disable selection of egress ports based on the native +.Xr NUMA 4 +domain for the packets being transmitted. .It Cm lacp_fast_timeout Enable lacp fast-timeout on the interface. .It Cm -lacp_fast_timeout Modified: projects/runtime-coverage-v2/sbin/ifconfig/iflagg.c ============================================================================== --- projects/runtime-coverage-v2/sbin/ifconfig/iflagg.c Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/sbin/ifconfig/iflagg.c Sat May 4 02:10:47 2019 (r347076) @@ -130,6 +130,8 @@ setlaggsetopt(const char *val, int d, int s, const str switch (ro.ro_opts) { case LAGG_OPT_USE_FLOWID: case -LAGG_OPT_USE_FLOWID: + case LAGG_OPT_USE_NUMA: + case -LAGG_OPT_USE_NUMA: case LAGG_OPT_LACP_STRICT: case -LAGG_OPT_LACP_STRICT: case LAGG_OPT_LACP_TXTEST: @@ -303,6 +305,8 @@ static struct cmd lagg_cmds[] = { DEF_CMD_ARG("lagghash", setlagghash), DEF_CMD("use_flowid", LAGG_OPT_USE_FLOWID, setlaggsetopt), DEF_CMD("-use_flowid", -LAGG_OPT_USE_FLOWID, setlaggsetopt), + DEF_CMD("use_numa", LAGG_OPT_USE_NUMA, setlaggsetopt), + DEF_CMD("-use_numa", -LAGG_OPT_USE_NUMA, setlaggsetopt), DEF_CMD("lacp_strict", LAGG_OPT_LACP_STRICT, setlaggsetopt), DEF_CMD("-lacp_strict", -LAGG_OPT_LACP_STRICT, setlaggsetopt), DEF_CMD("lacp_txtest", LAGG_OPT_LACP_TXTEST, setlaggsetopt), Modified: projects/runtime-coverage-v2/sbin/reboot/boot_i386.8 ============================================================================== --- projects/runtime-coverage-v2/sbin/reboot/boot_i386.8 Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/sbin/reboot/boot_i386.8 Sat May 4 02:10:47 2019 (r347076) @@ -36,7 +36,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 15, 2018 +.Dd April 30, 2019 .Dt BOOT 8 i386 .Os .Sh NAME @@ -95,7 +95,7 @@ program is documented separately. After the boot blocks have been loaded, you should see a prompt similar to the following: .Bd -literal ->> FreeBSD/i386 BOOT +>> FreeBSD/x86 BOOT Default: 0:ad(0,a)/boot/loader boot: .Ed Modified: projects/runtime-coverage-v2/share/man/man4/ccr.4 ============================================================================== --- projects/runtime-coverage-v2/share/man/man4/ccr.4 Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/share/man/man4/ccr.4 Sat May 4 02:10:47 2019 (r347076) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 11, 2019 +.Dd April 29, 2019 .Dt CCR 4 .Os .Sh NAME @@ -34,7 +34,7 @@ To compile this driver into the kernel, place the following lines in your kernel configuration file: -.Bd -ragged -offset indeunt +.Bd -ragged -offset indent .Cd "device ccr" .Ed .Pp @@ -49,9 +49,10 @@ The .Nm driver provides support for the crypto accelerator engine included on PCI Express Ethernet adapters based on the Chelsio Terminator 6 ASIC (T6). -The driver accelerates AES-CBC, AES-CTR, AES-GCM, AES-XTS, SHA1, SHA2-224, -SHA2-256, SHA2-384, SHA2-512, SHA1-HMAC, SHA2-224-HMAC, -SHA2-256-HMAC, SHA2-384-HMAC, and SHA2-512-HMAC operations for +The driver accelerates AES-CBC, AES-CCM, AES-CTR, AES-GCM, AES-XTS, +SHA1, SHA2-224, SHA2-256, SHA2-384, SHA2-512, +SHA1-HMAC, SHA2-224-HMAC, SHA2-256-HMAC, SHA2-384-HMAC, and SHA2-512-HMAC +operations for .Xr crypto 4 and .Xr ipsec 4 . Modified: projects/runtime-coverage-v2/share/man/man7/development.7 ============================================================================== --- projects/runtime-coverage-v2/share/man/man7/development.7 Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/share/man/man7/development.7 Sat May 4 02:10:47 2019 (r347076) @@ -93,7 +93,7 @@ For coding conventions, see To ask questions regarding development, use the mailing lists, such as freebsd-arch@ and freebsd-hackers@: .Pp -.Lk https://lists.FreeBSD.org/ +.Lk https://lists.FreeBSD.org .Pp To get your patches integrated into the main .Fx @@ -102,7 +102,7 @@ it is a code review tool that allows other developers suggest improvements, and, eventually, allows them to pick up the change and commit it: .Pp -.Lk https://reviews.FreeBSD.org/ +.Lk https://reviews.FreeBSD.org .Sh EXAMPLES Check out the CURRENT branch, build it, and install, overwriting the current system: Modified: projects/runtime-coverage-v2/share/misc/committers-src.dot ============================================================================== --- projects/runtime-coverage-v2/share/misc/committers-src.dot Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/share/misc/committers-src.dot Sat May 4 02:10:47 2019 (r347076) @@ -155,6 +155,7 @@ dexuan [label="Dexuan Cui\ndexuan@FreeBSD.org\n2016/10 dfr [label="Doug Rabson\ndfr@FreeBSD.org\n????/??/??"] dg [label="David Greenman\ndg@FreeBSD.org\n1993/06/14"] dim [label="Dimitry Andric\ndim@FreeBSD.org\n2010/08/30"] +dougm [label="Doug Moore\ndougm@FreeBSD.org\n2019/04/30"] dteske [label="Devin Teske\ndteske@FreeBSD.org\n2012/04/10"] dumbbell [label="Jean-Sebastien Pedron\ndumbbell@FreeBSD.org\n2004/11/29"] dwmalone [label="David Malone\ndwmalone@FreeBSD.org\n2000/07/11"] @@ -663,6 +664,7 @@ ken -> will kib -> ae kib -> badger kib -> dchagin +kib -> dougm kib -> gjb kib -> jah kib -> jlh @@ -694,6 +696,7 @@ marcel -> nwhitehorn marcel -> sjg markj -> cem +markj -> dougm markj -> lwhsu markj -> mhorne markj -> rlibby Modified: projects/runtime-coverage-v2/stand/common/disk.c ============================================================================== --- projects/runtime-coverage-v2/stand/common/disk.c Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/stand/common/disk.c Sat May 4 02:10:47 2019 (r347076) @@ -286,9 +286,9 @@ disk_open(struct disk_devdesc *dev, uint64_t mediasize od->entrysize = part.end - part.start + 1; slice = part.index; if (ptable_gettype(od->table) == PTABLE_GPT) { - partition = 255; + partition = D_PARTISGPT; goto out; /* Nothing more to do */ - } else if (partition == 255) { + } else if (partition == D_PARTISGPT) { /* * When we try to open GPT partition, but partition * table isn't GPT, reset d_partition value to -1 @@ -419,7 +419,7 @@ disk_parsedev(struct disk_devdesc *dev, const char *de /* we don't support nested partitions on GPT */ if (*cp != '\0' && *cp != ':') return (EINVAL); - partition = 255; + partition = D_PARTISGPT; } else #endif #ifdef LOADER_MBR_SUPPORT Modified: projects/runtime-coverage-v2/stand/efi/boot1/Makefile ============================================================================== --- projects/runtime-coverage-v2/stand/efi/boot1/Makefile Sat May 4 02:09:30 2019 (r347075) +++ projects/runtime-coverage-v2/stand/efi/boot1/Makefile Sat May 4 02:10:47 2019 (r347076) @@ -2,7 +2,8 @@ .include <bsd.init.mk> -PROG= boot1.sym +BOOT1?= boot1 +PROG= ${BOOT1}.sym INTERNALPROG= WARNS?= 6 @@ -24,7 +25,7 @@ CWARNFLAGS.zfs_module.c += -Wno-unused-parameter CWARNFLAGS.zfs_module.c += -Wno-unused-function *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905040210.x442Am6j041431>