From owner-svn-src-projects@freebsd.org Sun Nov 5 22:19:15 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6F054E53914 for ; Sun, 5 Nov 2017 22:19:15 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4B4566EB66; Sun, 5 Nov 2017 22:19:15 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA5MJEqX002934; Sun, 5 Nov 2017 22:19:14 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA5MJDQ1002922; Sun, 5 Nov 2017 22:19:13 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201711052219.vA5MJDQ1002922@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sun, 5 Nov 2017 22:19:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r325454 - in projects/runtime-coverage: . bin/rm lib/libclang_rt rescue/rescue sbin sbin/badsect share/mk sys/amd64/amd64 sys/kern sys/mips/rmi sys/powerpc/mpc85xx usr.sbin/crunch/examples X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/runtime-coverage: . bin/rm lib/libclang_rt rescue/rescue sbin sbin/badsect share/mk sys/amd64/amd64 sys/kern sys/mips/rmi sys/powerpc/mpc85xx usr.sbin/crunch/examples X-SVN-Commit-Revision: 325454 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2017 22:19:15 -0000 Author: ngie Date: Sun Nov 5 22:19:13 2017 New Revision: 325454 URL: https://svnweb.freebsd.org/changeset/base/325454 Log: MFhead@r325453 Deleted: projects/runtime-coverage/sbin/badsect/ Modified: projects/runtime-coverage/ObsoleteFiles.inc projects/runtime-coverage/bin/rm/rm.c projects/runtime-coverage/lib/libclang_rt/Makefile.inc projects/runtime-coverage/rescue/rescue/Makefile projects/runtime-coverage/sbin/Makefile projects/runtime-coverage/share/mk/sys.mk projects/runtime-coverage/sys/amd64/amd64/pmap.c projects/runtime-coverage/sys/kern/vfs_cache.c projects/runtime-coverage/sys/mips/rmi/rootfs_list.txt projects/runtime-coverage/sys/powerpc/mpc85xx/fsl_sata.c projects/runtime-coverage/usr.sbin/crunch/examples/fixit.conf projects/runtime-coverage/usr.sbin/crunch/examples/really-big.conf Directory Properties: projects/runtime-coverage/ (props changed) Modified: projects/runtime-coverage/ObsoleteFiles.inc ============================================================================== --- projects/runtime-coverage/ObsoleteFiles.inc Sun Nov 5 22:09:59 2017 (r325453) +++ projects/runtime-coverage/ObsoleteFiles.inc Sun Nov 5 22:19:13 2017 (r325454) @@ -38,6 +38,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20171108: badsect(8) removal +OLD_FILES+=sbin/badsect +OLD_FILES+=rescue/badsect +OLD_FILES+=usr/share/man/man8/badsect.8.gz # 20171105: fixing lib/libclang_rt CRTARCH for arm:armv[67]. .if ${MACHINE} == "arm" .if ${MACHINE_ARCH:Marmv[67]*} != "" && ${CPUTYPE:M*soft*} == "" Modified: projects/runtime-coverage/bin/rm/rm.c ============================================================================== --- projects/runtime-coverage/bin/rm/rm.c Sun Nov 5 22:09:59 2017 (r325453) +++ projects/runtime-coverage/bin/rm/rm.c Sun Nov 5 22:19:13 2017 (r325454) @@ -515,7 +515,7 @@ check(const char *path, const char *name, struct stat "%s: -P was specified, but file is not writable", path); (void)fprintf(stderr, "override %s%s%s/%s %s%sfor %s? ", - modep + 1, modep[9] == ' ' ? "" : " ", + modep + 1, modep[10] == ' ' ? "" : " ", user_from_uid(sp->st_uid, 0), group_from_gid(sp->st_gid, 0), *flagsp ? flagsp : "", *flagsp ? " " : "", Modified: projects/runtime-coverage/lib/libclang_rt/Makefile.inc ============================================================================== --- projects/runtime-coverage/lib/libclang_rt/Makefile.inc Sun Nov 5 22:09:59 2017 (r325453) +++ projects/runtime-coverage/lib/libclang_rt/Makefile.inc Sun Nov 5 22:19:13 2017 (r325454) @@ -2,14 +2,12 @@ .include -# NOTE: based on TARGET_ABI/TARGET_CPUTYPE, set in Makefile.inc1 . .if ${MACHINE} == "arm" .if ${MACHINE_ARCH:Marmv[67]*} != "" && ${CPUTYPE:M*soft*} == "" CRTARCH= armhf .endif .endif - -CRTARCH?= ${TARGET_CPUARCH:C/amd64/x86_64/} +CRTARCH?= ${MACHINE_CPUARCH:C/amd64/x86_64/} CRTSRC= ${SRCTOP}/contrib/compiler-rt .PATH: ${CRTSRC}/lib Modified: projects/runtime-coverage/rescue/rescue/Makefile ============================================================================== --- projects/runtime-coverage/rescue/rescue/Makefile Sun Nov 5 22:09:59 2017 (r325453) +++ projects/runtime-coverage/rescue/rescue/Makefile Sun Nov 5 22:19:13 2017 (r325454) @@ -85,7 +85,7 @@ CRUNCH_SUPPRESS_LINK_-tcsh= 1 # headers in addition to the standard 'paths.h' header. # CRUNCH_SRCDIRS+= sbin -CRUNCH_PROGS_sbin= badsect \ +CRUNCH_PROGS_sbin= \ camcontrol clri devfs dmesg dump \ dumpfs dumpon fsck fsck_ffs fsck_msdosfs fsdb \ fsirand gbde geom ifconfig init \ Modified: projects/runtime-coverage/sbin/Makefile ============================================================================== --- projects/runtime-coverage/sbin/Makefile Sun Nov 5 22:09:59 2017 (r325453) +++ projects/runtime-coverage/sbin/Makefile Sun Nov 5 22:19:13 2017 (r325454) @@ -6,7 +6,6 @@ # XXX MISSING: icheck ncheck SUBDIR=adjkerntz \ - badsect \ camcontrol \ clri \ comcontrol \ Modified: projects/runtime-coverage/share/mk/sys.mk ============================================================================== --- projects/runtime-coverage/share/mk/sys.mk Sun Nov 5 22:09:59 2017 (r325453) +++ projects/runtime-coverage/share/mk/sys.mk Sun Nov 5 22:19:13 2017 (r325454) @@ -15,11 +15,6 @@ unix ?= We run FreeBSD, not UNIX. # __TO_CPUARCH=C/mips(n32|64)?(el)?(hf)?/mips/:C/arm(v[67])?(eb)?/arm/:C/powerpc(64|spe)/powerpc/:C/riscv64(sf)?/riscv/ MACHINE_CPUARCH=${MACHINE_ARCH:${__TO_CPUARCH}} -.ifdef TARGET_ARCH -TARGET_CPUARCH=${TARGET_ARCH:${__TO_CPUARCH}} -.else -TARGET_CPUARCH=${MACHINE_CPUARCH} -.endif .endif __DEFAULT_YES_OPTIONS+= \ Modified: projects/runtime-coverage/sys/amd64/amd64/pmap.c ============================================================================== --- projects/runtime-coverage/sys/amd64/amd64/pmap.c Sun Nov 5 22:09:59 2017 (r325453) +++ projects/runtime-coverage/sys/amd64/amd64/pmap.c Sun Nov 5 22:19:13 2017 (r325454) @@ -2915,7 +2915,7 @@ reclaim_pv_chunk(pmap_t locked_pmap, struct rwlock **l PG_G = PG_A = PG_M = PG_RW = 0; SLIST_INIT(&free); bzero(&pc_marker_b, sizeof(pc_marker_b)); - bzero(&pc_marker_end, sizeof(pc_marker_end)); + bzero(&pc_marker_end_b, sizeof(pc_marker_end_b)); pc_marker = (struct pv_chunk *)&pc_marker_b; pc_marker_end = (struct pv_chunk *)&pc_marker_end_b; Modified: projects/runtime-coverage/sys/kern/vfs_cache.c ============================================================================== --- projects/runtime-coverage/sys/kern/vfs_cache.c Sun Nov 5 22:09:59 2017 (r325453) +++ projects/runtime-coverage/sys/kern/vfs_cache.c Sun Nov 5 22:19:13 2017 (r325454) @@ -1163,6 +1163,9 @@ retry_dotdot: hash = cache_get_hash(cnp->cn_nameptr, cnp->cn_namelen, dvp); blp = HASH2BUCKETLOCK(hash); retry: + if (LIST_EMPTY(NCHHASH(hash))) + goto out_no_entry; + rw_rlock(blp); LIST_FOREACH(ncp, (NCHHASH(hash)), nc_hash) { @@ -1175,10 +1178,7 @@ retry: /* We failed to find an entry */ if (ncp == NULL) { rw_runlock(blp); - SDT_PROBE3(vfs, namecache, lookup, miss, dvp, cnp->cn_nameptr, - NULL); - counter_u64_add(nummisszap, 1); - return (0); + goto out_no_entry; } counter_u64_add(numposzaps, 1); @@ -1190,6 +1190,10 @@ retry: goto retry; } cache_free(ncp); + return (0); +out_no_entry: + SDT_PROBE3(vfs, namecache, lookup, miss, dvp, cnp->cn_nameptr, NULL); + counter_u64_add(nummisszap, 1); return (0); } Modified: projects/runtime-coverage/sys/mips/rmi/rootfs_list.txt ============================================================================== --- projects/runtime-coverage/sys/mips/rmi/rootfs_list.txt Sun Nov 5 22:09:59 2017 (r325453) +++ projects/runtime-coverage/sys/mips/rmi/rootfs_list.txt Sun Nov 5 22:19:13 2017 (r325454) @@ -448,7 +448,6 @@ ./sbin ./sbin/adjkerntz ./sbin/atacontrol -./sbin/badsect ./sbin/bsdlabel ./sbin/camcontrol ./sbin/ccdconfig Modified: projects/runtime-coverage/sys/powerpc/mpc85xx/fsl_sata.c ============================================================================== --- projects/runtime-coverage/sys/powerpc/mpc85xx/fsl_sata.c Sun Nov 5 22:09:59 2017 (r325453) +++ projects/runtime-coverage/sys/powerpc/mpc85xx/fsl_sata.c Sun Nov 5 22:19:13 2017 (r325454) @@ -988,11 +988,12 @@ fsl_sata_dmasetprd(void *arg, bus_dma_segment_t *segs, prd[j].dba = FSL_SATA_CTP_BUS(ch, slot) + FSL_SATA_PRD_OFFSET(j+1); j++; + extlen = 0; } len = segs[i].ds_len; len = roundup2(len, sizeof(uint32_t)); - prd[i].dba = htole32((uint32_t)segs[i].ds_addr); - prd[i].dwc_flg = htole32(FSL_SATA_PRD_SNOOP | len); + prd[j].dba = htole32((uint32_t)segs[i].ds_addr); + prd[j].dwc_flg = htole32(FSL_SATA_PRD_SNOOP | len); slot->ttl += len; if (j > FSL_SATA_PRD_MAX_DIRECT) extlen += len; Modified: projects/runtime-coverage/usr.sbin/crunch/examples/fixit.conf ============================================================================== --- projects/runtime-coverage/usr.sbin/crunch/examples/fixit.conf Sun Nov 5 22:09:59 2017 (r325453) +++ projects/runtime-coverage/usr.sbin/crunch/examples/fixit.conf Sun Nov 5 22:19:13 2017 (r325454) @@ -1,4 +1,5 @@ # fixit.conf - put in anything we think we might want on a fixit floppy +# $FreeBSD$ # first, we list the source dirs that our programs reside in. These are # searched in order listed to find the dir containing each program. @@ -21,7 +22,7 @@ ln sh -sh # init invokes the shell this way # /sbin stuff -progs badsect chown clri disklabel dump dmesg fdisk fsck ifconfig init +progs chown clri disklabel dump dmesg fdisk fsck ifconfig init progs mknod mount newfs ping reboot restore swapon umount ln dump rdump ln restore rrestore Modified: projects/runtime-coverage/usr.sbin/crunch/examples/really-big.conf ============================================================================== --- projects/runtime-coverage/usr.sbin/crunch/examples/really-big.conf Sun Nov 5 22:09:59 2017 (r325453) +++ projects/runtime-coverage/usr.sbin/crunch/examples/really-big.conf Sun Nov 5 22:19:13 2017 (r325454) @@ -23,7 +23,7 @@ ln sh -sh srcdirs /usr/src/sbin -progs badsect bim clri disklabel dmesg dump dumpfs fdisk fsck halt +progs bim clri disklabel dmesg dump dumpfs fdisk fsck halt progs ifconfig init mknod modload modunload mount mount_isofs progs mount_lofs mount_msdosfs mountd progs newfs nfsd nfsiod ping quotacheck reboot restore route routed savecore