From owner-svn-src-all@freebsd.org Sun Feb 26 00:19:03 2017 Return-Path: Delivered-To: svn-src-all@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 DF76ACEDB8D; Sun, 26 Feb 2017 00:19:03 +0000 (UTC) (envelope-from jtl@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 A0601356; Sun, 26 Feb 2017 00:19:03 +0000 (UTC) (envelope-from jtl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1Q0J2O4012567; Sun, 26 Feb 2017 00:19:02 GMT (envelope-from jtl@FreeBSD.org) Received: (from jtl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1Q0J2Pm012566; Sun, 26 Feb 2017 00:19:02 GMT (envelope-from jtl@FreeBSD.org) Message-Id: <201702260019.v1Q0J2Pm012566@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jtl set sender to jtl@FreeBSD.org using -f From: "Jonathan T. Looney" Date: Sun, 26 Feb 2017 00:19:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314286 - head/sys/net X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 00:19:04 -0000 Author: jtl Date: Sun Feb 26 00:19:02 2017 New Revision: 314286 URL: https://svnweb.freebsd.org/changeset/base/314286 Log: Do some minimal work to better conform to the 802.3ad (LACP) standard. In particular, don't set the synchronized bit for the peer unless it truly appears to be synchronized to us. Also, don't set our own synchronized bit unless we have actually seen a remote system. Prior to this change, we were seeing some strange behavior, such as: 1. We send an advertisement with the Activity, Aggregation, and Default flags, followed by an advertisement with the Activity, Aggregation, Synchronization, and Default flags. However, we hadn't seen an advertisement from another peer and were still advertising the default (NULL) peer. A closer examination of the in-kernel data structures (using kgdb) showed that the system had added the default (NULL) peer as a valid aggregator for the segment. 2. We were receiving an advertisement from a peer that included the default (NULL) peer instead of including our system information. However, we responded with an advertisement that included the Synchronization flag for both our system and the peer. (Since the peer's advertisement did not include our system information, we shouldn't add the synchronization bit for the peer.) This patch corrects those two items. Reviewed by: smh MFC after: 2 weeks Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D9485 Modified: head/sys/net/ieee8023ad_lacp.c Modified: head/sys/net/ieee8023ad_lacp.c ============================================================================== --- head/sys/net/ieee8023ad_lacp.c Sat Feb 25 23:06:10 2017 (r314285) +++ head/sys/net/ieee8023ad_lacp.c Sun Feb 26 00:19:02 2017 (r314286) @@ -1331,6 +1331,10 @@ lacp_select(struct lacp_port *lp) return; } + /* If we haven't heard from our peer, skip this step. */ + if (lp->lp_state & LACP_STATE_DEFAULTED) + return; + KASSERT(!LACP_TIMER_ISARMED(lp, LACP_TIMER_WAIT_WHILE), ("timer_wait_while still active")); @@ -1686,7 +1690,15 @@ lacp_sm_rx_record_pdu(struct lacp_port * LACP_STATE_AGGREGATION) && !lacp_compare_peerinfo(&lp->lp_actor, &du->ldu_partner)) || (du->ldu_partner.lip_state & LACP_STATE_AGGREGATION) == 0)) { - /* XXX nothing? */ + /* + * XXX Maintain legacy behavior of leaving the + * LACP_STATE_SYNC bit unchanged from the partner's + * advertisement if lsc_strict_mode is false. + * TODO: We should re-examine the concept of the "strict mode" + * to ensure it makes sense to maintain a non-strict mode. + */ + if (lp->lp_lsc->lsc_strict_mode) + lp->lp_partner.lip_state |= LACP_STATE_SYNC; } else { lp->lp_partner.lip_state &= ~LACP_STATE_SYNC; } @@ -1701,10 +1713,6 @@ lacp_sm_rx_record_pdu(struct lacp_port * sizeof(buf)))); } - /* XXX Hack, still need to implement 5.4.9 para 2,3,4 */ - if (lp->lp_lsc->lsc_strict_mode) - lp->lp_partner.lip_state |= LACP_STATE_SYNC; - lacp_sm_ptx_update_timeout(lp, oldpstate); } From owner-svn-src-all@freebsd.org Sun Feb 26 01:05:28 2017 Return-Path: Delivered-To: svn-src-all@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 E0657CE491E; Sun, 26 Feb 2017 01:05:28 +0000 (UTC) (envelope-from avos@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 AD6D4EA2; Sun, 26 Feb 2017 01:05:28 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1Q15RFP031640; Sun, 26 Feb 2017 01:05:27 GMT (envelope-from avos@FreeBSD.org) Received: (from avos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1Q15RJ9031639; Sun, 26 Feb 2017 01:05:27 GMT (envelope-from avos@FreeBSD.org) Message-Id: <201702260105.v1Q15RJ9031639@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avos set sender to avos@FreeBSD.org using -f From: Andriy Voskoboinyk Date: Sun, 26 Feb 2017 01:05:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314287 - head/sys/dev/iwn X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 01:05:29 -0000 Author: avos Date: Sun Feb 26 01:05:27 2017 New Revision: 314287 URL: https://svnweb.freebsd.org/changeset/base/314287 Log: iwn: stop all watchdogs on device shutdown. Tested with Intel 6205, STA mode. MFC after: 5 days Modified: head/sys/dev/iwn/if_iwn.c Modified: head/sys/dev/iwn/if_iwn.c ============================================================================== --- head/sys/dev/iwn/if_iwn.c Sun Feb 26 00:19:02 2017 (r314286) +++ head/sys/dev/iwn/if_iwn.c Sun Feb 26 01:05:27 2017 (r314287) @@ -8834,6 +8834,7 @@ iwn_stop_locked(struct iwn_softc *sc) sc->sc_is_scanning = 0; sc->sc_tx_timer = 0; callout_stop(&sc->watchdog_to); + callout_stop(&sc->scan_timeout); callout_stop(&sc->calib_to); sc->sc_flags &= ~IWN_FLAG_RUNNING; From owner-svn-src-all@freebsd.org Sun Feb 26 04:41:38 2017 Return-Path: Delivered-To: svn-src-all@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 44E57CEB6E7; Sun, 26 Feb 2017 04:41:38 +0000 (UTC) (envelope-from alfred@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 1F4B8B7F; Sun, 26 Feb 2017 04:41:38 +0000 (UTC) (envelope-from alfred@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1Q4fbKU015898; Sun, 26 Feb 2017 04:41:37 GMT (envelope-from alfred@FreeBSD.org) Received: (from alfred@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1Q4fbJq015897; Sun, 26 Feb 2017 04:41:37 GMT (envelope-from alfred@FreeBSD.org) Message-Id: <201702260441.v1Q4fbJq015897@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: alfred set sender to alfred@FreeBSD.org using -f From: Alfred Perlstein Date: Sun, 26 Feb 2017 04:41:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314288 - head/usr.bin/fortune/datfiles X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 04:41:38 -0000 Author: alfred Date: Sun Feb 26 04:41:37 2017 New Revision: 314288 URL: https://svnweb.freebsd.org/changeset/base/314288 Log: More FreeBSD tips for fortune(6) Submitted by: lme PR: 192373 Modified: head/usr.bin/fortune/datfiles/freebsd-tips Modified: head/usr.bin/fortune/datfiles/freebsd-tips ============================================================================== --- head/usr.bin/fortune/datfiles/freebsd-tips Sun Feb 26 01:05:27 2017 (r314287) +++ head/usr.bin/fortune/datfiles/freebsd-tips Sun Feb 26 04:41:37 2017 (r314288) @@ -7,6 +7,7 @@ a root login. You can add a user to the % By pressing "Scroll Lock" you can use the arrow keys to scroll backward through the console output. Press "Scroll Lock" again to turn it off. +Don't have a "Scroll Lock" key? The "Pause / Break" key acts alike. % Can't remember if you've installed a certain port or not? Try "pkg info -x port_name". @@ -40,8 +41,8 @@ Having trouble using fetch through a fir variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details. % If other operating systems have damaged your Master Boot Record, you can -reinstall it with boot0cfg(8). See -"man boot0cfg" for details. +reinstall it with gpart(8). See +"man gpart" for details. % If you accidentally end up inside vi, you can quit it by pressing Escape, colon (:), q (q), bang (!) and pressing return. @@ -116,7 +117,7 @@ In order to support national characters less without creating other nationalisation aspects, set the environment variable LC_ALL to 'en_US.ISO8859-1'. % -"man firewall" will give advice for building a FreeBSD firewall +"man firewall" will give advice for building a FreeBSD firewall using ipfw(8). -- David Scheidt % "man hier" will explain the way FreeBSD filesystems are normally laid out. @@ -141,7 +142,8 @@ FreeBSD system. -- David Scheidt % Need to do a search in a manpage or in a file you've sent to a pager? Use -"/search_word". To repeat the same search, type "n" for next. +"/search_word". To repeat the same search, type "n" for next or "p" for +previous. -- Dru % Need to find the location of a program? Use "locate program_name". @@ -183,7 +185,7 @@ flag is your gateway. Nice bash prompt: PS1='(\[$(tput md)\]\t <\w>\[$(tput me)\]) $(echo $?) \$ ' -- Mathieu % -Over quota? "du -s * | sort -n " will give you a sorted list of your +Over quota? "du -sh * | sort -h " will give you a sorted list of your directory sizes. -- David Scheidt % @@ -191,7 +193,8 @@ nc(1) (or netcat) is useful not only for TCP or UDP connections, but also for proxying them with inetd(8). % sh (the default Bourne shell in FreeBSD) supports command-line editing. Just -``set -o emacs'' or ``set -o vi'' to enable it. +``set -o emacs'' or ``set -o vi'' to enable it. Use "" key to complete +paths. % Simple tcsh prompt: set prompt = '%# ' % @@ -215,6 +218,8 @@ the scroll lock key and use your page up press the scroll lock key again to get your prompt back. -- Dru % +You can press Ctrl-L while in the shell to clear the screen. +% To determine whether a file is a text file, executable, or some other type of file, use @@ -231,10 +236,10 @@ is running FreeBSD at the time) to quick To erase a line you've written at the command prompt, use "Ctrl-U". -- Dru % -To find the hostname associated with an IP address, use +To find out the hostname associated with an IP address, use drill -x IP_address - -- Allan Jude + -- Dru % To obtain a neat PostScript rendering of a manual page, use ``-t'' switch of the man(1) utility: ``man -t ''. For example: @@ -247,7 +252,8 @@ To quickly create an empty file, use "to -- Dru % To read a compressed file without having to first uncompress it, use -"zcat" or "zless" to view it. +"zcat" or "zless" to view it. There is also "bzcat", "bzless", "xzcat" +and "xzless". -- Dru % To repeat the last command in the C shell, type "!!". @@ -283,7 +289,7 @@ To see how much disk space is left on yo % To see the 10 largest files on a directory or partition, use - du /partition_or_directory_name | sort -rn | head + du -h /partition_or_directory_name | sort -rh | head -- Dru % To see the IP addresses currently set on your active interfaces, type @@ -291,7 +297,8 @@ To see the IP addresses currently set on -- Dru % To see the last 10 lines of a long file, use "tail filename". To see the -first 10 lines, use "head filename". +first 10 lines, use "head filename". To see new lines as they're appended +to a file, use "tail -f filename". -- Dru % To see the last time that you logged in, use lastlogin(8). @@ -343,6 +350,9 @@ write This won't work if you don't have write permissions to the directory and probably won't be suitable if you're editing through a symbolic link. + +If you have sudo(8) installed and permissions to use it, type +``w ! sudo tee %'' to force a write. % You can adjust the volume of various parts of the sound system in your computer by typing 'mixer '. To get a list of what you can @@ -393,7 +403,7 @@ You can make a log of your terminal sess You can often get answers to your questions about FreeBSD by searching in the FreeBSD mailing list archives at - http://www.FreeBSD.org/search/search.html + http://freebsd.markmail.org % You can open up a new split-screen window in (n)vi with :N or :E and then use ^w to switch between the two. @@ -408,8 +418,6 @@ You can press Ctrl-D to quickly exit fro login shell. -- Konstantinos Konstantinidis % -You can press Ctrl-L while in the shell to clear the screen. -% You can press up-arrow or down-arrow to walk through a list of previous commands in tcsh. % @@ -439,7 +447,9 @@ aliases, you can usually type just 'alia % You can use /etc/make.conf to control the options used to compile software on this system. Example entries are in -/usr/share/examples/etc/make.conf. +/usr/share/examples/etc/make.conf and in make.conf(5). +For options that are set for building FreeBSD's kernel and its world, see +src.conf(5). % You can use "pkg info" to see a list of packages you have installed. % @@ -457,8 +467,102 @@ Try "whereis firefox" and "whereis where -- Konstantinos Konstantinidis % Want to run the same command again? -In tcsh you can type "!!" +In tcsh you can type "!!". % Want to go the directory you were just in? Type "cd -" % +Can't delete /usr/obj? Enter "chflags -R noschg /usr/obj" to remove the +system immutable flag for all files in /usr/obj. + + -- Lars Engels +% +Want to list all files of an installed package? Enter +"pkg info -l packagename". + + -- Lars Engels +% +Are you looking for a package? Search for it with +"pkg search part_of_package_name" + + -- Lars Engels +% +If you want to recursively copy a directory preserving file and directory +attributes use +"cp -a source target" + + -- Lars Engels +% +Do you wonder what a terminal program is doing at the moment? dd(1) does not +show any troughput? Hit "^T" (Control + t) to send SIGINFO to the process +and see what it is doing. + + -- Lars Engels +% +Do you want to know which version of FreeBSD you are running? Enter +"freebsd-version -ku" to display kernel and userland version. + + -- Lars Engels +% +If you want to end one or more processes at a time using a regular expression +enter "pkill regex". + + -- Lars Engels +% +Do you want to run a program directly after some other process has ended? Use +"pwait pid && new_program" + + -- Lars Engels +% +When you want your users to be able to reboot or shutdown FreeBSD, add them +to the group "operator" and they are allowed to use shutdown(8) and poweroff(8). + + -- Lars Engels +% +If you need to create a FAT32 formatted USB thumb drive, find out its devicename +running dmesg(8) after inserting it. Then create an MBR schema, a single slice and +format it: + +# gpart create -s MBR ${devicename} +# gpart add -t fat32 ${devicename} +# newfs_msdos -F 32 -L thumbdrive ${devicename}s1 + + -- Lars Engels +% +If you want to get a sorted list of all services that are started when FreeBSD boots, +enter "service -e". + + -- Lars Engels +% +To easily configure your installed FreeBSD use bsdconfig(8). + + -- Lars Engels +% +After you compiled and installed a new version of FreeBSD, use etcupdate(8) to merge +configuration updates. +Run "etcupdate extract" once when your sources match your running system, then run +"etcupdate" after every upgrade and "etcupdate resolve" to resolve any conflicts. + + -- Lars Engels +% +Do you want to do a binary upgrade of your running FreeBSD installation? Use freebsd-update(8). + +To install updates and patches for the running branch use +# freebsd-update fetch install + +To upgrade to a newer release use +# freebsd-update upgrade -r ${name_of_release} + + -- Lars Engels +% +To run rc scripts in /etc/rc.d and /usr/local/etc/rc.d use service(8). +Run "service ${name_of_rc_script} start" to start a daemon and +"service ${name_of_rc_script} stop" to stop it. + + -- Lars Engels +% +If you don't want to edit /etc/rc.conf directly, use sysrc(8) to add and remove entries. +Use "sysrc name=value" to add an entry and "sysrc -x name" to delete an entry. + + -- Lars Engels +% From owner-svn-src-all@freebsd.org Sun Feb 26 06:05:30 2017 Return-Path: Delivered-To: svn-src-all@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 9E591CEDBE3; Sun, 26 Feb 2017 06:05:30 +0000 (UTC) (envelope-from alfred@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 6AEF3616; Sun, 26 Feb 2017 06:05:30 +0000 (UTC) (envelope-from alfred@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1Q65TeM047489; Sun, 26 Feb 2017 06:05:29 GMT (envelope-from alfred@FreeBSD.org) Received: (from alfred@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1Q65T5s047488; Sun, 26 Feb 2017 06:05:29 GMT (envelope-from alfred@FreeBSD.org) Message-Id: <201702260605.v1Q65T5s047488@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: alfred set sender to alfred@FreeBSD.org using -f From: Alfred Perlstein Date: Sun, 26 Feb 2017 06:05:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314289 - head/usr.bin/fortune/datfiles X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 06:05:30 -0000 Author: alfred Date: Sun Feb 26 06:05:29 2017 New Revision: 314289 URL: https://svnweb.freebsd.org/changeset/base/314289 Log: spelling fix Submitted by: adamw Modified: head/usr.bin/fortune/datfiles/freebsd-tips Modified: head/usr.bin/fortune/datfiles/freebsd-tips ============================================================================== --- head/usr.bin/fortune/datfiles/freebsd-tips Sun Feb 26 04:41:37 2017 (r314288) +++ head/usr.bin/fortune/datfiles/freebsd-tips Sun Feb 26 06:05:29 2017 (r314289) @@ -494,7 +494,7 @@ attributes use -- Lars Engels % Do you wonder what a terminal program is doing at the moment? dd(1) does not -show any troughput? Hit "^T" (Control + t) to send SIGINFO to the process +show any throughput? Hit "^T" (Control + t) to send SIGINFO to the process and see what it is doing. -- Lars Engels From owner-svn-src-all@freebsd.org Sun Feb 26 06:25:57 2017 Return-Path: Delivered-To: svn-src-all@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 12149CEE149; Sun, 26 Feb 2017 06:25:57 +0000 (UTC) (envelope-from mav@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 E0AACE9C; Sun, 26 Feb 2017 06:25:56 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1Q6PuEn055402; Sun, 26 Feb 2017 06:25:56 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1Q6Puf2055401; Sun, 26 Feb 2017 06:25:56 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201702260625.v1Q6Puf2055401@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sun, 26 Feb 2017 06:25:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314290 - head/sys/dev/usb/storage X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 06:25:57 -0000 Author: mav Date: Sun Feb 26 06:25:55 2017 New Revision: 314290 URL: https://svnweb.freebsd.org/changeset/base/314290 Log: Implement use of multiple transfers per I/O. This change removes limitation of single S/G list entry and limitation on maximal I/O size, using multiple data transfers per I/O if needed. Also it removes code duplication between send and receive paths, which are now completely equal. Modified: head/sys/dev/usb/storage/cfumass.c Modified: head/sys/dev/usb/storage/cfumass.c ============================================================================== --- head/sys/dev/usb/storage/cfumass.c Sun Feb 26 06:05:29 2017 (r314289) +++ head/sys/dev/usb/storage/cfumass.c Sun Feb 26 06:25:55 2017 (r314290) @@ -200,8 +200,7 @@ static device_resume_t cfumass_resume; static usb_handle_request_t cfumass_handle_request; static usb_callback_t cfumass_t_command_callback; -static usb_callback_t cfumass_t_data_out_callback; -static usb_callback_t cfumass_t_data_in_callback; +static usb_callback_t cfumass_t_data_callback; static usb_callback_t cfumass_t_status_callback; static device_method_t cfumass_methods[] = { @@ -250,7 +249,7 @@ static struct usb_config cfumass_config[ .bufsize = CFUMASS_BULK_SIZE, .flags = {.proxy_buffer = 1, .short_xfer_ok = 1, .ext_buffer = 1}, - .callback = &cfumass_t_data_out_callback, + .callback = &cfumass_t_data_callback, .usb_mode = USB_MODE_DEVICE, }, @@ -261,7 +260,7 @@ static struct usb_config cfumass_config[ .bufsize = CFUMASS_BULK_SIZE, .flags = {.proxy_buffer = 1, .short_xfer_ok = 1, .ext_buffer = 1}, - .callback = &cfumass_t_data_in_callback, + .callback = &cfumass_t_data_callback, .usb_mode = USB_MODE_DEVICE, }, @@ -712,124 +711,66 @@ tr_setup: } static void -cfumass_t_data_out_callback(struct usb_xfer *xfer, usb_error_t usb_error) +cfumass_t_data_callback(struct usb_xfer *xfer, usb_error_t usb_error) { - struct cfumass_softc *sc; - union ctl_io *io; - struct ctl_sg_entry ctl_sg_entry, *ctl_sglist; - int actlen, ctl_sg_count; - - sc = usbd_xfer_softc(xfer); - io = sc->sc_ctl_io; - - if (io->scsiio.kern_sg_entries > 0) { - ctl_sglist = (struct ctl_sg_entry *)io->scsiio.kern_data_ptr; - ctl_sg_count = io->scsiio.kern_sg_entries; - } else { - ctl_sglist = &ctl_sg_entry; - ctl_sglist->addr = io->scsiio.kern_data_ptr; - ctl_sglist->len = io->scsiio.kern_data_len; - ctl_sg_count = 1; - } + struct cfumass_softc *sc = usbd_xfer_softc(xfer); + union ctl_io *io = sc->sc_ctl_io; + uint32_t max_bulk; + struct ctl_sg_entry sg_entry, *sglist; + int actlen, sumlen, sg_count; switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: CFUMASS_DEBUG(sc, "USB_ST_TRANSFERRED"); - usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); - if (actlen != ctl_sglist[0].len) { - KASSERT(actlen <= ctl_sglist[0].len, - ("actlen %d > ctl_sglist.len %zd", - actlen, ctl_sglist[0].len)); - CFUMASS_DEBUG(sc, "host transferred %d bytes" - "instead of expected %zd bytes", - actlen, ctl_sglist[0].len); - } + usbd_xfer_status(xfer, &actlen, &sumlen, NULL, NULL); sc->sc_current_residue -= actlen; + io->scsiio.ext_data_filled += actlen; io->scsiio.kern_data_resid -= actlen; - io->scsiio.be_move_done(io); - sc->sc_ctl_io = NULL; - break; - - case USB_ST_SETUP: -tr_setup: - CFUMASS_DEBUG(sc, "USB_ST_SETUP"); - - CFUMASS_DEBUG(sc, "requested size %d, CTL segment size %zd", - sc->sc_current_transfer_length, ctl_sglist[0].len); - - usbd_xfer_set_frame_data(xfer, 0, ctl_sglist[0].addr, ctl_sglist[0].len); - usbd_transfer_submit(xfer); - break; - - default: - if (usb_error == USB_ERR_CANCELLED) { - CFUMASS_DEBUG(sc, "USB_ERR_CANCELLED"); + if (actlen < sumlen || + sc->sc_current_residue == 0 || + io->scsiio.kern_data_resid == 0) { + sc->sc_ctl_io = NULL; + io->scsiio.be_move_done(io); break; } - - CFUMASS_DEBUG(sc, "USB_ST_ERROR: %s", - usbd_errstr(usb_error)); - - goto tr_setup; - } -} - -static void -cfumass_t_data_in_callback(struct usb_xfer *xfer, usb_error_t usb_error) -{ - struct cfumass_softc *sc; - union ctl_io *io; - uint32_t max_bulk; - struct ctl_sg_entry ctl_sg_entry, *ctl_sglist; - int actlen, ctl_sg_count; - - sc = usbd_xfer_softc(xfer); - io = sc->sc_ctl_io; - - switch (USB_GET_STATE(xfer)) { - case USB_ST_TRANSFERRED: - CFUMASS_DEBUG(sc, "USB_ST_TRANSFERRED"); - - usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); - sc->sc_current_residue -= actlen; - io->scsiio.kern_data_resid -= actlen; - io->scsiio.be_move_done(io); - sc->sc_ctl_io = NULL; - break; + /* FALLTHROUGH */ case USB_ST_SETUP: tr_setup: CFUMASS_DEBUG(sc, "USB_ST_SETUP"); if (io->scsiio.kern_sg_entries > 0) { - ctl_sglist = (struct ctl_sg_entry *)io->scsiio.kern_data_ptr; - ctl_sg_count = io->scsiio.kern_sg_entries; + sglist = (struct ctl_sg_entry *)io->scsiio.kern_data_ptr; + sg_count = io->scsiio.kern_sg_entries; } else { - ctl_sglist = &ctl_sg_entry; - ctl_sglist->addr = io->scsiio.kern_data_ptr; - ctl_sglist->len = io->scsiio.kern_data_len; - ctl_sg_count = 1; + sglist = &sg_entry; + sglist->addr = io->scsiio.kern_data_ptr; + sglist->len = io->scsiio.kern_data_len; + sg_count = 1; } - if (sc->sc_current_transfer_length > io->scsiio.kern_total_len) { - CFUMASS_DEBUG(sc, "initiator requested %d bytes, " - "we will send %ju and stall", - sc->sc_current_transfer_length, - (uintmax_t)io->scsiio.kern_total_len); + sumlen = io->scsiio.ext_data_filled - + io->scsiio.kern_rel_offset; + while (sumlen >= sglist->len && sg_count > 0) { + sumlen -= sglist->len; + sglist++; + sg_count--; } + KASSERT(sg_count > 0, ("Run out of S/G list entries")); max_bulk = usbd_xfer_max_len(xfer); - CFUMASS_DEBUG(sc, "max_bulk %d, requested size %d, " - "CTL segment size %zd", max_bulk, - sc->sc_current_transfer_length, ctl_sglist[0].len); - - if (max_bulk >= ctl_sglist[0].len) - max_bulk = ctl_sglist[0].len; + actlen = min(sglist->len - sumlen, max_bulk); + actlen = min(actlen, sc->sc_current_transfer_length - + io->scsiio.ext_data_filled); + CFUMASS_DEBUG(sc, "requested %d, done %d, max_bulk %d, " + "segment %zd => transfer %d", + sc->sc_current_transfer_length, io->scsiio.ext_data_filled, + max_bulk, sglist->len - sumlen, actlen); - usbd_xfer_set_frame_data(xfer, 0, ctl_sglist[0].addr, max_bulk); + usbd_xfer_set_frame_data(xfer, 0, + (uint8_t *)sglist->addr + sumlen, actlen); usbd_transfer_submit(xfer); - break; default: @@ -837,9 +778,7 @@ tr_setup: CFUMASS_DEBUG(sc, "USB_ERR_CANCELLED"); break; } - CFUMASS_DEBUG(sc, "USB_ST_ERROR: %s", usbd_errstr(usb_error)); - goto tr_setup; } } From owner-svn-src-all@freebsd.org Sun Feb 26 06:39:02 2017 Return-Path: Delivered-To: svn-src-all@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 EC9E3CEE51A; Sun, 26 Feb 2017 06:39:02 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [96.47.65.170]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C8FB4634; Sun, 26 Feb 2017 06:39:02 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net [73.231.226.104]) by mail.baldwin.cx (Postfix) with ESMTPSA id AA6B710A791; Sun, 26 Feb 2017 01:38:54 -0500 (EST) From: John Baldwin To: Warner Losh Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314250 - in head/sys: arm/mv arm/nvidia arm/versatile arm/xscale/i8134x arm/xscale/ixp425 dev/acpica dev/hyperv/pcib dev/ofw dev/pci dev/xen/pcifront mips/adm5120 mips/atheros mips/cav... Date: Sat, 25 Feb 2017 22:28:33 -0800 Message-ID: <3310124.BntCrrpGtA@ralph.baldwin.cx> User-Agent: KMail/4.14.10 (FreeBSD/11.0-STABLE; KDE/4.14.10; amd64; ; ) In-Reply-To: <201702250611.v1P6BxIY083971@repo.freebsd.org> References: <201702250611.v1P6BxIY083971@repo.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Sun, 26 Feb 2017 01:38:54 -0500 (EST) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 06:39:03 -0000 On Saturday, February 25, 2017 06:11:59 AM Warner Losh wrote: > Author: imp > Date: Sat Feb 25 06:11:59 2017 > New Revision: 314250 > URL: https://svnweb.freebsd.org/changeset/base/314250 > > Log: > Convert PCIe Hot Plug to using pci_request_feature > > Convert PCIe hot plug support over to asking the firmware, if any, for > permission to use the HotPlug hardware. Implement pci_request_feature > for ACPI. All other host pci connections to allowing all valid feature > requests. > > Sponsored by: Netflix This lost one good feature from the first version: > @@ -722,3 +720,25 @@ acpi_pcib_acpi_release_resource(device_t > } > #endif > #endif > + > +static int > +acpi_pcib_request_feature(device_t pcib, device_t dev, enum pci_feature feature) > +{ > + uint32_t osc_ctl; > + struct acpi_hpcib_softc *sc; > + > + sc = device_get_softc(dev); > + > + switch (feature) { > + case PCI_FEATURE_HP: > + osc_ctl = PCIM_OSC_CTL_PCIE_HP; > + break; > + case PCI_FEATURE_AER: > + osc_ctl = PCIM_OSC_CTL_PCIE_AER; > + break; > + default: > + return (EINVAL); > + } > + > + return (acpi_pcib_osc(sc, osc_ctl)); > +} We should check for the desired 'osc_ctl' in the already-enabled sc->ap_osc_ctl and not bother invoking _OSC if the specific feature has already been granted. -- John Baldwin From owner-svn-src-all@freebsd.org Sun Feb 26 07:09:45 2017 Return-Path: Delivered-To: svn-src-all@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 439AFCEEACB for ; Sun, 26 Feb 2017 07:09:45 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x22a.google.com (mail-it0-x22a.google.com [IPv6:2607:f8b0:4001:c0b::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 07B0C142 for ; Sun, 26 Feb 2017 07:09:45 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x22a.google.com with SMTP id 203so49558044ith.0 for ; Sat, 25 Feb 2017 23:09:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=PhQn8PexhU580Tpwk3xJMgJPCcI8TBoWr67dWgtf5+A=; b=etTGQ1XckzESB7Pu0RyZp3G5719ffIvUjctGgv1v89cbYgo9HrQlTtPn/YMkYV3vhd NMjQSDdBmogfwDABEgFwfgHXHB32sncmR+15CCGplhqnZGtTyuq5bCOlMtWwE+WYRUl7 2sCqgz+5PWTy9K2hasmOzIQCIZ/L6LjDLh6bsSG2XoWuIBIx43PZzH/tpxhpoc66DOyT izxBTwFgp26r82JcXCHfLAdcAfRL8jky+e71jUzE2HH6Rd9h69JKg1T2udCreOGr4Ymp C9B3e7CB7u0NnnJlTmbND4qiqJUhjTTUUS8x00Zq4poQ/fx83HNJ4dCxO38sRBtOEHkY 7V6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=PhQn8PexhU580Tpwk3xJMgJPCcI8TBoWr67dWgtf5+A=; b=PjZjA0jlv6cikf9EzbIsMRBJs/MHLt0dh1uy2FXGmnUexAaWDeqeDfU7IBdNL1nR7f GQUMo2rIeDMfUcWufng2i24NgVfQXTzbnt8Jb82D2OO4YBz6ALXAwFo5woZf9Onvw0Xr yK0kBxCKKZyokD6lO0JSo/BT8PF8pLoKaZJP3U3ThV8Sv3YdR4CULY4UgrennDLnfpgm vgw1mmkfhVrBCuyjmAQQWWWqtzEvmERGeLhtIjPOI3MMLQSQr3hY5ssyY7IctsarMowA f2wpxkUDxXXaNP+ZF3vjPlDa+rM/+vJm2nxt3zaqx7BehBiDXs3ceBOBV9zJw7YQGrGR 3i9Q== X-Gm-Message-State: AMke39nsI6j82hnfw5eDXb+EmCO+vbV9fHK8RN+xDmfP4eUKwLNm5avOPlUcb8vmRiIdEQTJXqXFi4864lBbIQ== X-Received: by 10.36.116.71 with SMTP id o68mr10583536itc.60.1488092984134; Sat, 25 Feb 2017 23:09:44 -0800 (PST) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.145.132 with HTTP; Sat, 25 Feb 2017 23:09:43 -0800 (PST) X-Originating-IP: [69.53.245.200] In-Reply-To: <3310124.BntCrrpGtA@ralph.baldwin.cx> References: <201702250611.v1P6BxIY083971@repo.freebsd.org> <3310124.BntCrrpGtA@ralph.baldwin.cx> From: Warner Losh Date: Sun, 26 Feb 2017 00:09:43 -0700 X-Google-Sender-Auth: As_dtD7-ZCK-AFe3MDj0W_2u6eE Message-ID: Subject: Re: svn commit: r314250 - in head/sys: arm/mv arm/nvidia arm/versatile arm/xscale/i8134x arm/xscale/ixp425 dev/acpica dev/hyperv/pcib dev/ofw dev/pci dev/xen/pcifront mips/adm5120 mips/atheros mips/cav... To: John Baldwin Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 07:09:45 -0000 On Sat, Feb 25, 2017 at 11:28 PM, John Baldwin wrote: > On Saturday, February 25, 2017 06:11:59 AM Warner Losh wrote: >> Author: imp >> Date: Sat Feb 25 06:11:59 2017 >> New Revision: 314250 >> URL: https://svnweb.freebsd.org/changeset/base/314250 >> >> Log: >> Convert PCIe Hot Plug to using pci_request_feature >> >> Convert PCIe hot plug support over to asking the firmware, if any, for >> permission to use the HotPlug hardware. Implement pci_request_feature >> for ACPI. All other host pci connections to allowing all valid feature >> requests. >> >> Sponsored by: Netflix > > This lost one good feature from the first version: > >> @@ -722,3 +720,25 @@ acpi_pcib_acpi_release_resource(device_t >> } >> #endif >> #endif >> + >> +static int >> +acpi_pcib_request_feature(device_t pcib, device_t dev, enum pci_feature feature) >> +{ >> + uint32_t osc_ctl; >> + struct acpi_hpcib_softc *sc; >> + >> + sc = device_get_softc(dev); >> + >> + switch (feature) { >> + case PCI_FEATURE_HP: >> + osc_ctl = PCIM_OSC_CTL_PCIE_HP; >> + break; >> + case PCI_FEATURE_AER: >> + osc_ctl = PCIM_OSC_CTL_PCIE_AER; >> + break; >> + default: >> + return (EINVAL); >> + } >> + >> + return (acpi_pcib_osc(sc, osc_ctl)); >> +} > > We should check for the desired 'osc_ctl' in the already-enabled > sc->ap_osc_ctl and not bother invoking _OSC if the specific feature > has already been granted. OK. I think I must have misunderstood your comments. I'd gotten the impression thought you wanted me to remove it, so I did. It's easy enough to add back. For current uses, it won't matter, but it might in the future. Warner From owner-svn-src-all@freebsd.org Sun Feb 26 09:14:12 2017 Return-Path: Delivered-To: svn-src-all@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 056E6CEB302; Sun, 26 Feb 2017 09:14:12 +0000 (UTC) (envelope-from joel@vnode.se) Received: from smtp.opsify.se (smtp.opsify.se [185.137.191.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.opsify.se", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BC59A282; Sun, 26 Feb 2017 09:14:11 +0000 (UTC) (envelope-from joel@vnode.se) Received: from ymer.vnode.se (62-20-154-136-no280.tbcn.telia.com [62.20.154.136]) by smtp.opsify.se (Postfix) with ESMTPSA id AA8A13870E1; Sun, 26 Feb 2017 10:14:03 +0100 (CET) Date: Sun, 26 Feb 2017 10:14:02 +0100 From: Joel Dahl To: Allan Jude Cc: Bryan Drewery , Bartek Rutkowski , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314036 - head/usr.sbin/bsdinstall/scripts Message-ID: <20170226091402.GA6135@ymer.vnode.se> Mail-Followup-To: Allan Jude , Bryan Drewery , Bartek Rutkowski , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201702210937.v1L9bY6V093836@repo.freebsd.org> <28a4cf5e-2edd-3e30-9ecd-817f886e9ea3@FreeBSD.org> <20170221144002.GA87822@FreeBSD.org> <20170222070733.GA29010@ymer.vnode.se> <6550638c-a629-bf5e-65e0-672cfd125f73@FreeBSD.org> <5a98141c-5614-372c-5786-1437cc40011a@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5a98141c-5614-372c-5786-1437cc40011a@freebsd.org> User-Agent: Mutt/1.7.2 (2016-11-26) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 09:14:12 -0000 On Wed, Feb 22, 2017 at 06:10:04PM -0500, Allan Jude wrote: > Core is soon to announce a more formalized way to discuss and reach > consensus on these types of changes. robak@ can I ask that you back this > out for now, and we use that process to determine what the right set of > knobs to turn on by default is, and which should be up to the user. This hasn't been backed out yet. -- Joel From owner-svn-src-all@freebsd.org Sun Feb 26 09:29:39 2017 Return-Path: Delivered-To: svn-src-all@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 E2C33CEB815; Sun, 26 Feb 2017 09:29:39 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mail.blih.net (mail.blih.net [212.83.177.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.blih.net", Issuer "mail.blih.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id D77C2982; Sun, 26 Feb 2017 09:29:37 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mail.blih.net (mail.blih.net [212.83.177.182]) by mail.blih.net (OpenSMTPD) with ESMTP id 0110225f; Sun, 26 Feb 2017 10:22:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=bidouilliste.com; h=date :from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=mail; bh=yuuZp3K0avPFn/YKsKwvIxXslGs=; b=n8S8jcW058h5RERNqKmEwAEWONOv dcdJ8kg4tcQuR5TcpVBSCTlZYcQ+RfFNZDePJXi/N4LUeTteUwOOcPYUo+6HoUA2 pnAq2qwUaR+BVaQRIdr2NpDjnX36CojH6qzRs3yqM7XhRr/mzLPoEJhJSHpWQI0K 7Wg595gF7l1Pu3E= DomainKey-Signature: a=rsa-sha1; c=nofws; d=bidouilliste.com; h=date :from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; q=dns; s= mail; b=Vz9x9j165RvZngCvXGUDsFYb3pML5QMLuAFq50zomM6h1D+L0XP/aYgM DNPWiiY7IIGf9mozNg4uhPTezp1ZD1XdkjaiiGno61BqanviPfMz4/kFkrw5tpra Hbo9WVDibLzHn9YEVOjTJHwC2O9xhu5rwRELT/HZlCGbM0NvMjo= Received: from knuckles.blih.net (ip-54.net-82-216-203.roubaix.rev.numericable.fr [82.216.203.54]) by mail.blih.net (OpenSMTPD) with ESMTPSA id 2fd6bb2c TLS version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Sun, 26 Feb 2017 10:22:55 +0100 (CET) Date: Sun, 26 Feb 2017 10:22:52 +0100 From: Emmanuel Vadot To: Ruslan Bukin Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314212 - head/sys/dev/uart Message-Id: <20170226102252.a71cba36fd86822065e61b1d@bidouilliste.com> In-Reply-To: <201702241637.v1OGbZ1e047175@repo.freebsd.org> References: <201702241637.v1OGbZ1e047175@repo.freebsd.org> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.29; amd64-portbld-freebsd12.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 09:29:40 -0000 Hello, This break uart in ARM. Based on the comment of the macros since we're using our own device the ealier code was correct. Cheers, On Fri, 24 Feb 2017 16:37:35 +0000 (UTC) Ruslan Bukin wrote: > Author: br > Date: Fri Feb 24 16:37:35 2017 > New Revision: 314212 > URL: https://svnweb.freebsd.org/changeset/base/314212 > > Log: > Use correct macro for Synopsys UART driver declaration. > > Modified: > head/sys/dev/uart/uart_dev_snps.c > > Modified: head/sys/dev/uart/uart_dev_snps.c > ============================================================================== > --- head/sys/dev/uart/uart_dev_snps.c Fri Feb 24 16:11:55 2017 (r314211) > +++ head/sys/dev/uart/uart_dev_snps.c Fri Feb 24 16:37:35 2017 (r314212) > @@ -104,7 +104,7 @@ static struct ofw_compat_data compat_dat > { "snps,dw-apb-uart", (uintptr_t)&uart_snps_class }, > { NULL, (uintptr_t)NULL } > }; > -UART_FDT_CLASS(compat_data); > +UART_FDT_CLASS_AND_DEVICE(compat_data); > > #ifdef EXT_RESOURCES > static int -- Emmanuel Vadot From owner-svn-src-all@freebsd.org Sun Feb 26 09:35:46 2017 Return-Path: Delivered-To: svn-src-all@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 54728CEBA08; Sun, 26 Feb 2017 09:35:46 +0000 (UTC) (envelope-from dchagin@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 2ED31D8F; Sun, 26 Feb 2017 09:35:46 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1Q9Zj0T029016; Sun, 26 Feb 2017 09:35:45 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1Q9Zjcg029013; Sun, 26 Feb 2017 09:35:45 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201702260935.v1Q9Zjcg029013@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sun, 26 Feb 2017 09:35:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314291 - in head/sys: amd64/linux amd64/linux32 i386/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 09:35:46 -0000 Author: dchagin Date: Sun Feb 26 09:35:44 2017 New Revision: 314291 URL: https://svnweb.freebsd.org/changeset/base/314291 Log: Change Linuxulator timerfd syscalls definition to match actual Linux one. MFC after: 1 month Modified: head/sys/amd64/linux/syscalls.master head/sys/amd64/linux32/syscalls.master head/sys/i386/linux/syscalls.master Modified: head/sys/amd64/linux/syscalls.master ============================================================================== --- head/sys/amd64/linux/syscalls.master Sun Feb 26 06:25:55 2017 (r314290) +++ head/sys/amd64/linux/syscalls.master Sun Feb 26 09:35:44 2017 (r314291) @@ -475,12 +475,15 @@ 281 AUE_NULL STD { int linux_epoll_pwait(l_int epfd, struct epoll_event *events, \ l_int maxevents, l_int timeout, l_sigset_t *mask); } 282 AUE_NULL STD { int linux_signalfd(void); } -283 AUE_NULL STD { int linux_timerfd_create(void); } +283 AUE_NULL STD { int linux_timerfd_create(l_int clockid, l_int flags); } 284 AUE_NULL STD { int linux_eventfd(l_uint initval); } 285 AUE_NULL STD { int linux_fallocate(l_int fd, l_int mode, \ l_loff_t offset, l_loff_t len); } -286 AUE_NULL STD { int linux_timerfd_settime(void); } -287 AUE_NULL STD { int linux_timerfd_gettime(void); } +286 AUE_NULL STD { int linux_timerfd_settime(l_int fd, l_int flags, \ + const struct l_itimerspec *new_value, \ + struct l_itimerspec *old_value); } +287 AUE_NULL STD { int linux_timerfd_gettime(l_int fd, \ + struct l_itimerspec *old_value); } 288 AUE_ACCEPT STD { int linux_accept4(l_int s, l_uintptr_t addr, \ l_uintptr_t namelen, int flags); } ; linux 2.6.27: Modified: head/sys/amd64/linux32/syscalls.master ============================================================================== --- head/sys/amd64/linux32/syscalls.master Sun Feb 26 06:25:55 2017 (r314290) +++ head/sys/amd64/linux32/syscalls.master Sun Feb 26 09:35:44 2017 (r314291) @@ -538,14 +538,17 @@ 320 AUE_FUTIMESAT STD { int linux_utimensat(l_int dfd, const char *pathname, \ const struct l_timespec *times, l_int flags); } 321 AUE_NULL STD { int linux_signalfd(void); } -322 AUE_NULL STD { int linux_timerfd_create(void); } +322 AUE_NULL STD { int linux_timerfd_create(l_int clockid, l_int flags); } 323 AUE_NULL STD { int linux_eventfd(l_uint initval); } ; linux 2.6.23: 324 AUE_NULL STD { int linux_fallocate(l_int fd, l_int mode, \ l_loff_t offset, l_loff_t len); } ; linux 2.6.25: -325 AUE_NULL STD { int linux_timerfd_settime(void); } -326 AUE_NULL STD { int linux_timerfd_gettime(void); } +325 AUE_NULL STD { int linux_timerfd_settime(l_int fd, l_int flags, \ + const struct l_itimerspec *new_value, \ + struct l_itimerspec *old_value); } +326 AUE_NULL STD { int linux_timerfd_gettime(l_int fd, \ + struct l_itimerspec *old_value); } ; linux 2.6.27: 327 AUE_NULL STD { int linux_signalfd4(void); } 328 AUE_NULL STD { int linux_eventfd2(l_uint initval, l_int flags); } Modified: head/sys/i386/linux/syscalls.master ============================================================================== --- head/sys/i386/linux/syscalls.master Sun Feb 26 06:25:55 2017 (r314290) +++ head/sys/i386/linux/syscalls.master Sun Feb 26 09:35:44 2017 (r314291) @@ -546,14 +546,17 @@ 320 AUE_FUTIMESAT STD { int linux_utimensat(l_int dfd, const char *pathname, \ const struct l_timespec *times, l_int flags); } 321 AUE_NULL STD { int linux_signalfd(void); } -322 AUE_NULL STD { int linux_timerfd_create(void); } +322 AUE_NULL STD { int linux_timerfd_create(l_int clockid, l_int flags); } 323 AUE_NULL STD { int linux_eventfd(l_uint initval); } ; linux 2.6.23: 324 AUE_NULL STD { int linux_fallocate(l_int fd, l_int mode, \ l_loff_t offset, l_loff_t len); } ; linux 2.6.25: -325 AUE_NULL STD { int linux_timerfd_settime(void); } -326 AUE_NULL STD { int linux_timerfd_gettime(void); } +325 AUE_NULL STD { int linux_timerfd_settime(l_int fd, l_int flags, \ + const struct l_itimerspec *new_value, \ + struct l_itimerspec *old_value); } +326 AUE_NULL STD { int linux_timerfd_gettime(l_int fd, \ + struct l_itimerspec *old_value); } ; linux 2.6.27: 327 AUE_NULL STD { int linux_signalfd4(void); } 328 AUE_NULL STD { int linux_eventfd2(l_uint initval, l_int flags); } From owner-svn-src-all@freebsd.org Sun Feb 26 09:37:27 2017 Return-Path: Delivered-To: svn-src-all@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 7DCDCCEBAD2; Sun, 26 Feb 2017 09:37:27 +0000 (UTC) (envelope-from dchagin@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 4CDB1EF8; Sun, 26 Feb 2017 09:37:27 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1Q9bQOk029129; Sun, 26 Feb 2017 09:37:26 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1Q9bPu5029120; Sun, 26 Feb 2017 09:37:25 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201702260937.v1Q9bPu5029120@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sun, 26 Feb 2017 09:37:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314292 - in head/sys: amd64/linux amd64/linux32 i386/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 09:37:27 -0000 Author: dchagin Date: Sun Feb 26 09:37:25 2017 New Revision: 314292 URL: https://svnweb.freebsd.org/changeset/base/314292 Log: Regen after r314291 (timerfd definition). MFC after: 1 month Modified: head/sys/amd64/linux/linux_proto.h head/sys/amd64/linux/linux_sysent.c head/sys/amd64/linux/linux_systrace_args.c head/sys/amd64/linux32/linux32_proto.h head/sys/amd64/linux32/linux32_sysent.c head/sys/amd64/linux32/linux32_systrace_args.c head/sys/i386/linux/linux_proto.h head/sys/i386/linux/linux_sysent.c head/sys/i386/linux/linux_systrace_args.c Modified: head/sys/amd64/linux/linux_proto.h ============================================================================== --- head/sys/amd64/linux/linux_proto.h Sun Feb 26 09:35:44 2017 (r314291) +++ head/sys/amd64/linux/linux_proto.h Sun Feb 26 09:37:25 2017 (r314292) @@ -1000,7 +1000,8 @@ struct linux_signalfd_args { register_t dummy; }; struct linux_timerfd_create_args { - register_t dummy; + char clockid_l_[PADL_(l_int)]; l_int clockid; char clockid_r_[PADR_(l_int)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; }; struct linux_eventfd_args { char initval_l_[PADL_(l_uint)]; l_uint initval; char initval_r_[PADR_(l_uint)]; @@ -1012,10 +1013,14 @@ struct linux_fallocate_args { char len_l_[PADL_(l_loff_t)]; l_loff_t len; char len_r_[PADR_(l_loff_t)]; }; struct linux_timerfd_settime_args { - register_t dummy; + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char new_value_l_[PADL_(const struct l_itimerspec *)]; const struct l_itimerspec * new_value; char new_value_r_[PADR_(const struct l_itimerspec *)]; + char old_value_l_[PADL_(struct l_itimerspec *)]; struct l_itimerspec * old_value; char old_value_r_[PADR_(struct l_itimerspec *)]; }; struct linux_timerfd_gettime_args { - register_t dummy; + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; + char old_value_l_[PADL_(struct l_itimerspec *)]; struct l_itimerspec * old_value; char old_value_r_[PADR_(struct l_itimerspec *)]; }; struct linux_accept4_args { char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; Modified: head/sys/amd64/linux/linux_sysent.c ============================================================================== --- head/sys/amd64/linux/linux_sysent.c Sun Feb 26 09:35:44 2017 (r314291) +++ head/sys/amd64/linux/linux_sysent.c Sun Feb 26 09:37:25 2017 (r314292) @@ -300,11 +300,11 @@ struct sysent linux_sysent[] = { { AS(linux_utimensat_args), (sy_call_t *)linux_utimensat, AUE_FUTIMESAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 280 = linux_utimensat */ { AS(linux_epoll_pwait_args), (sy_call_t *)linux_epoll_pwait, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 281 = linux_epoll_pwait */ { 0, (sy_call_t *)linux_signalfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 282 = linux_signalfd */ - { 0, (sy_call_t *)linux_timerfd_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 283 = linux_timerfd_create */ + { AS(linux_timerfd_create_args), (sy_call_t *)linux_timerfd_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 283 = linux_timerfd_create */ { AS(linux_eventfd_args), (sy_call_t *)linux_eventfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 284 = linux_eventfd */ { AS(linux_fallocate_args), (sy_call_t *)linux_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 285 = linux_fallocate */ - { 0, (sy_call_t *)linux_timerfd_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 286 = linux_timerfd_settime */ - { 0, (sy_call_t *)linux_timerfd_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 287 = linux_timerfd_gettime */ + { AS(linux_timerfd_settime_args), (sy_call_t *)linux_timerfd_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 286 = linux_timerfd_settime */ + { AS(linux_timerfd_gettime_args), (sy_call_t *)linux_timerfd_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 287 = linux_timerfd_gettime */ { AS(linux_accept4_args), (sy_call_t *)linux_accept4, AUE_ACCEPT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 288 = linux_accept4 */ { 0, (sy_call_t *)linux_signalfd4, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 289 = linux_signalfd4 */ { AS(linux_eventfd2_args), (sy_call_t *)linux_eventfd2, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 290 = linux_eventfd2 */ Modified: head/sys/amd64/linux/linux_systrace_args.c ============================================================================== --- head/sys/amd64/linux/linux_systrace_args.c Sun Feb 26 09:35:44 2017 (r314291) +++ head/sys/amd64/linux/linux_systrace_args.c Sun Feb 26 09:37:25 2017 (r314292) @@ -2078,7 +2078,10 @@ systrace_args(int sysnum, void *params, } /* linux_timerfd_create */ case 283: { - *n_args = 0; + struct linux_timerfd_create_args *p = params; + iarg[0] = p->clockid; /* l_int */ + iarg[1] = p->flags; /* l_int */ + *n_args = 2; break; } /* linux_eventfd */ @@ -2100,12 +2103,20 @@ systrace_args(int sysnum, void *params, } /* linux_timerfd_settime */ case 286: { - *n_args = 0; + struct linux_timerfd_settime_args *p = params; + iarg[0] = p->fd; /* l_int */ + iarg[1] = p->flags; /* l_int */ + uarg[2] = (intptr_t) p->new_value; /* const struct l_itimerspec * */ + uarg[3] = (intptr_t) p->old_value; /* struct l_itimerspec * */ + *n_args = 4; break; } /* linux_timerfd_gettime */ case 287: { - *n_args = 0; + struct linux_timerfd_gettime_args *p = params; + iarg[0] = p->fd; /* l_int */ + uarg[1] = (intptr_t) p->old_value; /* struct l_itimerspec * */ + *n_args = 2; break; } /* linux_accept4 */ @@ -5644,6 +5655,16 @@ systrace_entry_setargdesc(int sysnum, in break; /* linux_timerfd_create */ case 283: + switch(ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + default: + break; + }; break; /* linux_eventfd */ case 284: @@ -5676,9 +5697,35 @@ systrace_entry_setargdesc(int sysnum, in break; /* linux_timerfd_settime */ case 286: + switch(ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + case 2: + p = "userland const struct l_itimerspec *"; + break; + case 3: + p = "userland struct l_itimerspec *"; + break; + default: + break; + }; break; /* linux_timerfd_gettime */ case 287: + switch(ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "userland struct l_itimerspec *"; + break; + default: + break; + }; break; /* linux_accept4 */ case 288: @@ -7494,6 +7541,9 @@ systrace_return_setargdesc(int sysnum, i case 282: /* linux_timerfd_create */ case 283: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_eventfd */ case 284: if (ndx == 0 || ndx == 1) @@ -7506,8 +7556,14 @@ systrace_return_setargdesc(int sysnum, i break; /* linux_timerfd_settime */ case 286: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_timerfd_gettime */ case 287: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_accept4 */ case 288: if (ndx == 0 || ndx == 1) Modified: head/sys/amd64/linux32/linux32_proto.h ============================================================================== --- head/sys/amd64/linux32/linux32_proto.h Sun Feb 26 09:35:44 2017 (r314291) +++ head/sys/amd64/linux32/linux32_proto.h Sun Feb 26 09:37:25 2017 (r314292) @@ -1062,7 +1062,8 @@ struct linux_signalfd_args { register_t dummy; }; struct linux_timerfd_create_args { - register_t dummy; + char clockid_l_[PADL_(l_int)]; l_int clockid; char clockid_r_[PADR_(l_int)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; }; struct linux_eventfd_args { char initval_l_[PADL_(l_uint)]; l_uint initval; char initval_r_[PADR_(l_uint)]; @@ -1074,10 +1075,14 @@ struct linux_fallocate_args { char len_l_[PADL_(l_loff_t)]; l_loff_t len; char len_r_[PADR_(l_loff_t)]; }; struct linux_timerfd_settime_args { - register_t dummy; + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char new_value_l_[PADL_(const struct l_itimerspec *)]; const struct l_itimerspec * new_value; char new_value_r_[PADR_(const struct l_itimerspec *)]; + char old_value_l_[PADL_(struct l_itimerspec *)]; struct l_itimerspec * old_value; char old_value_r_[PADR_(struct l_itimerspec *)]; }; struct linux_timerfd_gettime_args { - register_t dummy; + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; + char old_value_l_[PADL_(struct l_itimerspec *)]; struct l_itimerspec * old_value; char old_value_r_[PADR_(struct l_itimerspec *)]; }; struct linux_signalfd4_args { register_t dummy; Modified: head/sys/amd64/linux32/linux32_sysent.c ============================================================================== --- head/sys/amd64/linux32/linux32_sysent.c Sun Feb 26 09:35:44 2017 (r314291) +++ head/sys/amd64/linux32/linux32_sysent.c Sun Feb 26 09:37:25 2017 (r314292) @@ -340,11 +340,11 @@ struct sysent linux32_sysent[] = { { AS(linux_epoll_pwait_args), (sy_call_t *)linux_epoll_pwait, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 319 = linux_epoll_pwait */ { AS(linux_utimensat_args), (sy_call_t *)linux_utimensat, AUE_FUTIMESAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 320 = linux_utimensat */ { 0, (sy_call_t *)linux_signalfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 321 = linux_signalfd */ - { 0, (sy_call_t *)linux_timerfd_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 322 = linux_timerfd_create */ + { AS(linux_timerfd_create_args), (sy_call_t *)linux_timerfd_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 322 = linux_timerfd_create */ { AS(linux_eventfd_args), (sy_call_t *)linux_eventfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 323 = linux_eventfd */ { AS(linux_fallocate_args), (sy_call_t *)linux_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 324 = linux_fallocate */ - { 0, (sy_call_t *)linux_timerfd_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 325 = linux_timerfd_settime */ - { 0, (sy_call_t *)linux_timerfd_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 326 = linux_timerfd_gettime */ + { AS(linux_timerfd_settime_args), (sy_call_t *)linux_timerfd_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 325 = linux_timerfd_settime */ + { AS(linux_timerfd_gettime_args), (sy_call_t *)linux_timerfd_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 326 = linux_timerfd_gettime */ { 0, (sy_call_t *)linux_signalfd4, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 327 = linux_signalfd4 */ { AS(linux_eventfd2_args), (sy_call_t *)linux_eventfd2, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 328 = linux_eventfd2 */ { AS(linux_epoll_create1_args), (sy_call_t *)linux_epoll_create1, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 329 = linux_epoll_create1 */ Modified: head/sys/amd64/linux32/linux32_systrace_args.c ============================================================================== --- head/sys/amd64/linux32/linux32_systrace_args.c Sun Feb 26 09:35:44 2017 (r314291) +++ head/sys/amd64/linux32/linux32_systrace_args.c Sun Feb 26 09:37:25 2017 (r314292) @@ -2189,7 +2189,10 @@ systrace_args(int sysnum, void *params, } /* linux_timerfd_create */ case 322: { - *n_args = 0; + struct linux_timerfd_create_args *p = params; + iarg[0] = p->clockid; /* l_int */ + iarg[1] = p->flags; /* l_int */ + *n_args = 2; break; } /* linux_eventfd */ @@ -2211,12 +2214,20 @@ systrace_args(int sysnum, void *params, } /* linux_timerfd_settime */ case 325: { - *n_args = 0; + struct linux_timerfd_settime_args *p = params; + iarg[0] = p->fd; /* l_int */ + iarg[1] = p->flags; /* l_int */ + uarg[2] = (intptr_t) p->new_value; /* const struct l_itimerspec * */ + uarg[3] = (intptr_t) p->old_value; /* struct l_itimerspec * */ + *n_args = 4; break; } /* linux_timerfd_gettime */ case 326: { - *n_args = 0; + struct linux_timerfd_gettime_args *p = params; + iarg[0] = p->fd; /* l_int */ + uarg[1] = (intptr_t) p->old_value; /* struct l_itimerspec * */ + *n_args = 2; break; } /* linux_signalfd4 */ @@ -5998,6 +6009,16 @@ systrace_entry_setargdesc(int sysnum, in break; /* linux_timerfd_create */ case 322: + switch(ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + default: + break; + }; break; /* linux_eventfd */ case 323: @@ -6030,9 +6051,35 @@ systrace_entry_setargdesc(int sysnum, in break; /* linux_timerfd_settime */ case 325: + switch(ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + case 2: + p = "userland const struct l_itimerspec *"; + break; + case 3: + p = "userland struct l_itimerspec *"; + break; + default: + break; + }; break; /* linux_timerfd_gettime */ case 326: + switch(ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "userland struct l_itimerspec *"; + break; + default: + break; + }; break; /* linux_signalfd4 */ case 327: @@ -8128,6 +8175,9 @@ systrace_return_setargdesc(int sysnum, i case 321: /* linux_timerfd_create */ case 322: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_eventfd */ case 323: if (ndx == 0 || ndx == 1) @@ -8140,8 +8190,14 @@ systrace_return_setargdesc(int sysnum, i break; /* linux_timerfd_settime */ case 325: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_timerfd_gettime */ case 326: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_signalfd4 */ case 327: /* linux_eventfd2 */ Modified: head/sys/i386/linux/linux_proto.h ============================================================================== --- head/sys/i386/linux/linux_proto.h Sun Feb 26 09:35:44 2017 (r314291) +++ head/sys/i386/linux/linux_proto.h Sun Feb 26 09:37:25 2017 (r314292) @@ -1080,7 +1080,8 @@ struct linux_signalfd_args { register_t dummy; }; struct linux_timerfd_create_args { - register_t dummy; + char clockid_l_[PADL_(l_int)]; l_int clockid; char clockid_r_[PADR_(l_int)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; }; struct linux_eventfd_args { char initval_l_[PADL_(l_uint)]; l_uint initval; char initval_r_[PADR_(l_uint)]; @@ -1092,10 +1093,14 @@ struct linux_fallocate_args { char len_l_[PADL_(l_loff_t)]; l_loff_t len; char len_r_[PADR_(l_loff_t)]; }; struct linux_timerfd_settime_args { - register_t dummy; + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char new_value_l_[PADL_(const struct l_itimerspec *)]; const struct l_itimerspec * new_value; char new_value_r_[PADR_(const struct l_itimerspec *)]; + char old_value_l_[PADL_(struct l_itimerspec *)]; struct l_itimerspec * old_value; char old_value_r_[PADR_(struct l_itimerspec *)]; }; struct linux_timerfd_gettime_args { - register_t dummy; + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; + char old_value_l_[PADL_(struct l_itimerspec *)]; struct l_itimerspec * old_value; char old_value_r_[PADR_(struct l_itimerspec *)]; }; struct linux_signalfd4_args { register_t dummy; Modified: head/sys/i386/linux/linux_sysent.c ============================================================================== --- head/sys/i386/linux/linux_sysent.c Sun Feb 26 09:35:44 2017 (r314291) +++ head/sys/i386/linux/linux_sysent.c Sun Feb 26 09:37:25 2017 (r314292) @@ -339,11 +339,11 @@ struct sysent linux_sysent[] = { { AS(linux_epoll_pwait_args), (sy_call_t *)linux_epoll_pwait, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 319 = linux_epoll_pwait */ { AS(linux_utimensat_args), (sy_call_t *)linux_utimensat, AUE_FUTIMESAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 320 = linux_utimensat */ { 0, (sy_call_t *)linux_signalfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 321 = linux_signalfd */ - { 0, (sy_call_t *)linux_timerfd_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 322 = linux_timerfd_create */ + { AS(linux_timerfd_create_args), (sy_call_t *)linux_timerfd_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 322 = linux_timerfd_create */ { AS(linux_eventfd_args), (sy_call_t *)linux_eventfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 323 = linux_eventfd */ { AS(linux_fallocate_args), (sy_call_t *)linux_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 324 = linux_fallocate */ - { 0, (sy_call_t *)linux_timerfd_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 325 = linux_timerfd_settime */ - { 0, (sy_call_t *)linux_timerfd_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 326 = linux_timerfd_gettime */ + { AS(linux_timerfd_settime_args), (sy_call_t *)linux_timerfd_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 325 = linux_timerfd_settime */ + { AS(linux_timerfd_gettime_args), (sy_call_t *)linux_timerfd_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 326 = linux_timerfd_gettime */ { 0, (sy_call_t *)linux_signalfd4, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 327 = linux_signalfd4 */ { AS(linux_eventfd2_args), (sy_call_t *)linux_eventfd2, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 328 = linux_eventfd2 */ { AS(linux_epoll_create1_args), (sy_call_t *)linux_epoll_create1, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 329 = linux_epoll_create1 */ Modified: head/sys/i386/linux/linux_systrace_args.c ============================================================================== --- head/sys/i386/linux/linux_systrace_args.c Sun Feb 26 09:35:44 2017 (r314291) +++ head/sys/i386/linux/linux_systrace_args.c Sun Feb 26 09:37:25 2017 (r314292) @@ -2265,7 +2265,10 @@ systrace_args(int sysnum, void *params, } /* linux_timerfd_create */ case 322: { - *n_args = 0; + struct linux_timerfd_create_args *p = params; + iarg[0] = p->clockid; /* l_int */ + iarg[1] = p->flags; /* l_int */ + *n_args = 2; break; } /* linux_eventfd */ @@ -2287,12 +2290,20 @@ systrace_args(int sysnum, void *params, } /* linux_timerfd_settime */ case 325: { - *n_args = 0; + struct linux_timerfd_settime_args *p = params; + iarg[0] = p->fd; /* l_int */ + iarg[1] = p->flags; /* l_int */ + uarg[2] = (intptr_t) p->new_value; /* const struct l_itimerspec * */ + uarg[3] = (intptr_t) p->old_value; /* struct l_itimerspec * */ + *n_args = 4; break; } /* linux_timerfd_gettime */ case 326: { - *n_args = 0; + struct linux_timerfd_gettime_args *p = params; + iarg[0] = p->fd; /* l_int */ + uarg[1] = (intptr_t) p->old_value; /* struct l_itimerspec * */ + *n_args = 2; break; } /* linux_signalfd4 */ @@ -6229,6 +6240,16 @@ systrace_entry_setargdesc(int sysnum, in break; /* linux_timerfd_create */ case 322: + switch(ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + default: + break; + }; break; /* linux_eventfd */ case 323: @@ -6261,9 +6282,35 @@ systrace_entry_setargdesc(int sysnum, in break; /* linux_timerfd_settime */ case 325: + switch(ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + case 2: + p = "userland const struct l_itimerspec *"; + break; + case 3: + p = "userland struct l_itimerspec *"; + break; + default: + break; + }; break; /* linux_timerfd_gettime */ case 326: + switch(ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "userland struct l_itimerspec *"; + break; + default: + break; + }; break; /* linux_signalfd4 */ case 327: @@ -8406,6 +8453,9 @@ systrace_return_setargdesc(int sysnum, i case 321: /* linux_timerfd_create */ case 322: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_eventfd */ case 323: if (ndx == 0 || ndx == 1) @@ -8418,8 +8468,14 @@ systrace_return_setargdesc(int sysnum, i break; /* linux_timerfd_settime */ case 325: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_timerfd_gettime */ case 326: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_signalfd4 */ case 327: /* linux_eventfd2 */ From owner-svn-src-all@freebsd.org Sun Feb 26 09:40:43 2017 Return-Path: Delivered-To: svn-src-all@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 A395ECEBBB2; Sun, 26 Feb 2017 09:40:43 +0000 (UTC) (envelope-from dchagin@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 61E52E6; Sun, 26 Feb 2017 09:40:43 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1Q9egQ7029311; Sun, 26 Feb 2017 09:40:42 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1Q9egOq029307; Sun, 26 Feb 2017 09:40:42 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201702260940.v1Q9egOq029307@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sun, 26 Feb 2017 09:40:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314293 - head/sys/compat/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 09:40:43 -0000 Author: dchagin Date: Sun Feb 26 09:40:42 2017 New Revision: 314293 URL: https://svnweb.freebsd.org/changeset/base/314293 Log: Return EOVERFLOW error in case then the size of tv_sec field of struct timespec in COMPAT_LINUX32 Linuxulator's not equal to the size of native tv_sec. MFC after: 1 month Modified: head/sys/compat/linux/linux_misc.c head/sys/compat/linux/linux_time.c head/sys/compat/linux/linux_timer.h Modified: head/sys/compat/linux/linux_misc.c ============================================================================== --- head/sys/compat/linux/linux_misc.c Sun Feb 26 09:37:25 2017 (r314292) +++ head/sys/compat/linux/linux_misc.c Sun Feb 26 09:40:42 2017 (r314293) @@ -2290,8 +2290,9 @@ linux_pselect6(struct thread *td, struct TIMEVAL_TO_TIMESPEC(&utv, &uts); - native_to_linux_timespec(<s, &uts); - error = copyout(<s, args->tsp, sizeof(lts)); + error = native_to_linux_timespec(<s, &uts); + if (error == 0) + error = copyout(<s, args->tsp, sizeof(lts)); } return (error); @@ -2343,8 +2344,9 @@ linux_ppoll(struct thread *td, struct li } else timespecclear(&uts); - native_to_linux_timespec(<s, &uts); - error = copyout(<s, args->tsp, sizeof(lts)); + error = native_to_linux_timespec(<s, &uts); + if (error == 0) + error = copyout(<s, args->tsp, sizeof(lts)); } return (error); @@ -2438,7 +2440,9 @@ linux_sched_rr_get_interval(struct threa PROC_UNLOCK(tdt->td_proc); if (error != 0) return (error); - native_to_linux_timespec(<s, &ts); + error = native_to_linux_timespec(<s, &ts); + if (error != 0) + return (error); return (copyout(<s, uap->interval, sizeof(lts))); } Modified: head/sys/compat/linux/linux_time.c ============================================================================== --- head/sys/compat/linux/linux_time.c Sun Feb 26 09:37:25 2017 (r314292) +++ head/sys/compat/linux/linux_time.c Sun Feb 26 09:40:42 2017 (r314293) @@ -41,6 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_time.c #include #include #include +#include #include #include #include @@ -118,16 +119,21 @@ LIN_SDT_PROBE_DEFINE1(time, linux_clock_ LIN_SDT_PROBE_DEFINE1(time, linux_clock_nanosleep, return, "int"); -void +int native_to_linux_timespec(struct l_timespec *ltp, struct timespec *ntp) { LIN_SDT_PROBE2(time, native_to_linux_timespec, entry, ltp, ntp); - +#ifdef COMPAT_LINUX32 + if (ntp->tv_sec > INT_MAX && + sizeof(ltp->tv_sec) != sizeof(ntp->tv_sec)) + return (EOVERFLOW); +#endif ltp->tv_sec = ntp->tv_sec; ltp->tv_nsec = ntp->tv_nsec; LIN_SDT_PROBE0(time, native_to_linux_timespec, return); + return (0); } int @@ -322,8 +328,9 @@ linux_clock_gettime(struct thread *td, s LIN_SDT_PROBE1(time, linux_clock_gettime, return, error); return (error); } - native_to_linux_timespec(<s, &tp); - + error = native_to_linux_timespec(<s, &tp); + if (error != 0) + return (error); error = copyout(<s, args->tp, sizeof lts); if (error != 0) LIN_SDT_PROBE1(time, linux_clock_gettime, copyout_error, error); @@ -450,8 +457,9 @@ linux_clock_getres(struct thread *td, st LIN_SDT_PROBE1(time, linux_clock_getres, return, error); return (error); } - native_to_linux_timespec(<s, &ts); - + error = native_to_linux_timespec(<s, &ts); + if (error != 0) + return (error); error = copyout(<s, args->tp, sizeof lts); if (error != 0) LIN_SDT_PROBE1(time, linux_clock_getres, copyout_error, error); @@ -490,7 +498,9 @@ linux_nanosleep(struct thread *td, struc } error = kern_nanosleep(td, &rqts, rmtp); if (args->rmtp != NULL) { - native_to_linux_timespec(&lrmts, rmtp); + error2 = native_to_linux_timespec(&lrmts, rmtp); + if (error2 != 0) + return (error2); error2 = copyout(&lrmts, args->rmtp, sizeof(lrmts)); if (error2 != 0) { LIN_SDT_PROBE1(time, linux_nanosleep, copyout_error, @@ -553,7 +563,9 @@ linux_clock_nanosleep(struct thread *td, error = kern_nanosleep(td, &rqts, rmtp); if (args->rmtp != NULL) { /* XXX. Not for TIMER_ABSTIME */ - native_to_linux_timespec(&lrmts, rmtp); + error2 = native_to_linux_timespec(&lrmts, rmtp); + if (error2 != 0) + return (error2); error2 = copyout(&lrmts, args->rmtp, sizeof(lrmts)); if (error2 != 0) { LIN_SDT_PROBE1(time, linux_clock_nanosleep, Modified: head/sys/compat/linux/linux_timer.h ============================================================================== --- head/sys/compat/linux/linux_timer.h Sun Feb 26 09:37:25 2017 (r314292) +++ head/sys/compat/linux/linux_timer.h Sun Feb 26 09:40:42 2017 (r314293) @@ -111,7 +111,7 @@ struct l_itimerspec { struct l_timespec it_value; }; -void native_to_linux_timespec(struct l_timespec *, +int native_to_linux_timespec(struct l_timespec *, struct timespec *); int linux_to_native_timespec(struct timespec *, struct l_timespec *); From owner-svn-src-all@freebsd.org Sun Feb 26 09:42:35 2017 Return-Path: Delivered-To: svn-src-all@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 B7FA4CEBDC1; Sun, 26 Feb 2017 09:42:35 +0000 (UTC) (envelope-from dchagin@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 92BE66E5; Sun, 26 Feb 2017 09:42:35 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1Q9gYPR032859; Sun, 26 Feb 2017 09:42:34 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1Q9gYnq032858; Sun, 26 Feb 2017 09:42:34 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201702260942.v1Q9gYnq032858@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sun, 26 Feb 2017 09:42:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314294 - head/sys/compat/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 09:42:35 -0000 Author: dchagin Date: Sun Feb 26 09:42:34 2017 New Revision: 314294 URL: https://svnweb.freebsd.org/changeset/base/314294 Log: Nostly style(9) changes, replace unused eventfd_truncate() by default invfo_truncate() method. MFC after: 1 month Modified: head/sys/compat/linux/linux_event.c Modified: head/sys/compat/linux/linux_event.c ============================================================================== --- head/sys/compat/linux/linux_event.c Sun Feb 26 09:40:42 2017 (r314293) +++ head/sys/compat/linux/linux_event.c Sun Feb 26 09:42:34 2017 (r314294) @@ -123,7 +123,6 @@ typedef uint64_t eventfd_t; static fo_rdwr_t eventfd_read; static fo_rdwr_t eventfd_write; -static fo_truncate_t eventfd_truncate; static fo_ioctl_t eventfd_ioctl; static fo_poll_t eventfd_poll; static fo_kqfilter_t eventfd_kqfilter; @@ -134,7 +133,7 @@ static fo_fill_kinfo_t eventfd_fill_kinf static struct fileops eventfdops = { .fo_read = eventfd_read, .fo_write = eventfd_write, - .fo_truncate = eventfd_truncate, + .fo_truncate = invfo_truncate, .fo_ioctl = eventfd_ioctl, .fo_poll = eventfd_poll, .fo_kqfilter = eventfd_kqfilter, @@ -207,7 +206,7 @@ epoll_create_common(struct thread *td, i int error; error = kern_kqueue(td, flags, NULL); - if (error) + if (error != 0) return (error); epoll_fd_install(td, EPOLL_DEF_SZ, 0); @@ -378,7 +377,7 @@ epoll_kev_copyin(void *arg, struct keven struct epoll_copyin_args *args; args = (struct epoll_copyin_args*) arg; - + memcpy(kevp, args->changelist, count * sizeof(*kevp)); args->changelist += count; @@ -438,7 +437,7 @@ linux_epoll_ctl(struct thread *td, struc * EVFILT_READ and EVFILT_WRITE, ignoring any errors */ error = epoll_delete_all_events(td, epfp, args->fd); - if (error) + if (error != 0) goto leave0; /* FALLTHROUGH */ @@ -458,7 +457,7 @@ linux_epoll_ctl(struct thread *td, struc error = epoll_to_kevent(td, epfp, args->fd, &le, &kev_flags, kev, &nchanges); - if (error) + if (error != 0) goto leave0; epoll_fd_install(td, args->fd, le.data); @@ -622,7 +621,7 @@ eventfd_create(struct thread *td, uint32 fdp = td->td_proc->p_fd; error = falloc(td, &fp, &fd, fflags); - if (error) + if (error != 0) return (error); efd = malloc(sizeof(*efd), M_EPOLL, M_WAITOK | M_ZERO); @@ -681,7 +680,7 @@ eventfd_close(struct file *fp, struct th static int eventfd_read(struct file *fp, struct uio *uio, struct ucred *active_cred, - int flags, struct thread *td) + int flags, struct thread *td) { struct eventfd *efd; eventfd_t count; @@ -727,7 +726,7 @@ retry: static int eventfd_write(struct file *fp, struct uio *uio, struct ucred *active_cred, - int flags, struct thread *td) + int flags, struct thread *td) { struct eventfd *efd; eventfd_t count; @@ -741,7 +740,7 @@ eventfd_write(struct file *fp, struct ui return (EINVAL); error = uiomove(&count, sizeof(eventfd_t), uio); - if (error) + if (error != 0) return (error); if (count == UINT64_MAX) return (EINVAL); @@ -773,7 +772,7 @@ retry: static int eventfd_poll(struct file *fp, int events, struct ucred *active_cred, - struct thread *td) + struct thread *td) { struct eventfd *efd; int revents = 0; @@ -862,17 +861,8 @@ filt_eventfdwrite(struct knote *kn, long /*ARGSUSED*/ static int -eventfd_truncate(struct file *fp, off_t length, struct ucred *active_cred, - struct thread *td) -{ - - return (ENXIO); -} - -/*ARGSUSED*/ -static int eventfd_ioctl(struct file *fp, u_long cmd, void *data, - struct ucred *active_cred, struct thread *td) + struct ucred *active_cred, struct thread *td) { struct eventfd *efd; @@ -897,7 +887,7 @@ eventfd_ioctl(struct file *fp, u_long cm /*ARGSUSED*/ static int eventfd_stat(struct file *fp, struct stat *st, struct ucred *active_cred, - struct thread *td) + struct thread *td) { return (ENXIO); From owner-svn-src-all@freebsd.org Sun Feb 26 09:48:20 2017 Return-Path: Delivered-To: svn-src-all@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 1EDE1CEBE5B; Sun, 26 Feb 2017 09:48:20 +0000 (UTC) (envelope-from dchagin@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 D0C948E2; Sun, 26 Feb 2017 09:48:19 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1Q9mJnv033156; Sun, 26 Feb 2017 09:48:19 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1Q9mIuG033147; Sun, 26 Feb 2017 09:48:18 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201702260948.v1Q9mIuG033147@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sun, 26 Feb 2017 09:48:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314295 - in head/sys: amd64/linux amd64/linux32 compat/linux i386/linux sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 09:48:20 -0000 Author: dchagin Date: Sun Feb 26 09:48:18 2017 New Revision: 314295 URL: https://svnweb.freebsd.org/changeset/base/314295 Log: Implement timerfd family syscalls. MFC after: 1 month Modified: head/sys/amd64/linux/linux_dummy.c head/sys/amd64/linux32/linux32_dummy.c head/sys/compat/linux/linux_event.c head/sys/compat/linux/linux_event.h head/sys/compat/linux/linux_time.c head/sys/compat/linux/linux_timer.h head/sys/i386/linux/linux_dummy.c head/sys/sys/file.h Modified: head/sys/amd64/linux/linux_dummy.c ============================================================================== --- head/sys/amd64/linux/linux_dummy.c Sun Feb 26 09:42:34 2017 (r314294) +++ head/sys/amd64/linux/linux_dummy.c Sun Feb 26 09:48:18 2017 (r314295) @@ -103,10 +103,6 @@ DUMMY(vmsplice); DUMMY(move_pages); /* linux 2.6.22: */ DUMMY(signalfd); -DUMMY(timerfd_create); -/* linux 2.6.25: */ -DUMMY(timerfd_settime); -DUMMY(timerfd_gettime); /* linux 2.6.27: */ DUMMY(signalfd4); DUMMY(inotify_init1); Modified: head/sys/amd64/linux32/linux32_dummy.c ============================================================================== --- head/sys/amd64/linux32/linux32_dummy.c Sun Feb 26 09:42:34 2017 (r314294) +++ head/sys/amd64/linux32/linux32_dummy.c Sun Feb 26 09:48:18 2017 (r314295) @@ -103,10 +103,6 @@ DUMMY(move_pages); DUMMY(getcpu); /* linux 2.6.22: */ DUMMY(signalfd); -DUMMY(timerfd_create); -/* linux 2.6.25: */ -DUMMY(timerfd_settime); -DUMMY(timerfd_gettime); /* linux 2.6.27: */ DUMMY(signalfd4); DUMMY(inotify_init1); Modified: head/sys/compat/linux/linux_event.c ============================================================================== --- head/sys/compat/linux/linux_event.c Sun Feb 26 09:42:34 2017 (r314294) +++ head/sys/compat/linux/linux_event.c Sun Feb 26 09:48:18 2017 (r314295) @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -63,6 +64,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include /* @@ -161,6 +163,41 @@ static struct filterops eventfd_wfiltops .f_event = filt_eventfdwrite }; +/* timerfd */ +typedef uint64_t timerfd_t; + +static fo_rdwr_t timerfd_read; +static fo_poll_t timerfd_poll; +static fo_kqfilter_t timerfd_kqfilter; +static fo_stat_t timerfd_stat; +static fo_close_t timerfd_close; +static fo_fill_kinfo_t timerfd_fill_kinfo; + +static struct fileops timerfdops = { + .fo_read = timerfd_read, + .fo_write = invfo_rdwr, + .fo_truncate = invfo_truncate, + .fo_ioctl = invfo_ioctl, + .fo_poll = timerfd_poll, + .fo_kqfilter = timerfd_kqfilter, + .fo_stat = timerfd_stat, + .fo_close = timerfd_close, + .fo_chmod = invfo_chmod, + .fo_chown = invfo_chown, + .fo_sendfile = invfo_sendfile, + .fo_fill_kinfo = timerfd_fill_kinfo, + .fo_flags = DFLAG_PASSABLE +}; + +static void filt_timerfddetach(struct knote *kn); +static int filt_timerfdread(struct knote *kn, long hint); + +static struct filterops timerfd_rfiltops = { + .f_isfd = 1, + .f_detach = filt_timerfddetach, + .f_event = filt_timerfdread +}; + struct eventfd { eventfd_t efd_count; uint32_t efd_flags; @@ -168,7 +205,19 @@ struct eventfd { struct mtx efd_lock; }; +struct timerfd { + clockid_t tfd_clockid; + struct itimerspec tfd_time; + struct callout tfd_callout; + timerfd_t tfd_count; + bool tfd_canceled; + struct selinfo tfd_sel; + struct mtx tfd_lock; +}; + static int eventfd_create(struct thread *td, uint32_t initval, int flags); +static void linux_timerfd_expire(void *); +static void linux_timerfd_curval(struct timerfd *, struct itimerspec *); static void @@ -901,3 +950,360 @@ eventfd_fill_kinfo(struct file *fp, stru kif->kf_type = KF_TYPE_UNKNOWN; return (0); } + +int +linux_timerfd_create(struct thread *td, struct linux_timerfd_create_args *args) +{ + struct filedesc *fdp; + struct timerfd *tfd; + struct file *fp; + clockid_t clockid; + int fflags, fd, error; + + if ((args->flags & ~LINUX_TFD_CREATE_FLAGS) != 0) + return (EINVAL); + + error = linux_to_native_clockid(&clockid, args->clockid); + if (error != 0) + return (error); + if (clockid != CLOCK_REALTIME && clockid != CLOCK_MONOTONIC) + return (EINVAL); + + fflags = 0; + if ((args->flags & LINUX_TFD_CLOEXEC) != 0) + fflags |= O_CLOEXEC; + + fdp = td->td_proc->p_fd; + error = falloc(td, &fp, &fd, fflags); + if (error != 0) + return (error); + + tfd = malloc(sizeof(*tfd), M_EPOLL, M_WAITOK | M_ZERO); + tfd->tfd_clockid = clockid; + mtx_init(&tfd->tfd_lock, "timerfd", NULL, MTX_DEF); + + callout_init_mtx(&tfd->tfd_callout, &tfd->tfd_lock, 0); + knlist_init_mtx(&tfd->tfd_sel.si_note, &tfd->tfd_lock); + + fflags = FREAD; + if ((args->flags & LINUX_O_NONBLOCK) != 0) + fflags |= FNONBLOCK; + + finit(fp, fflags, DTYPE_LINUXTFD, tfd, &timerfdops); + fdrop(fp, td); + + td->td_retval[0] = fd; + return (error); +} + +static int +timerfd_close(struct file *fp, struct thread *td) +{ + struct timerfd *tfd; + + tfd = fp->f_data; + if (fp->f_type != DTYPE_LINUXTFD || tfd == NULL) + return (EINVAL); + + timespecclear(&tfd->tfd_time.it_value); + timespecclear(&tfd->tfd_time.it_interval); + + mtx_lock(&tfd->tfd_lock); + callout_drain(&tfd->tfd_callout); + mtx_unlock(&tfd->tfd_lock); + + seldrain(&tfd->tfd_sel); + knlist_destroy(&tfd->tfd_sel.si_note); + + fp->f_ops = &badfileops; + mtx_destroy(&tfd->tfd_lock); + free(tfd, M_EPOLL); + + return (0); +} + +static int +timerfd_read(struct file *fp, struct uio *uio, struct ucred *active_cred, + int flags, struct thread *td) +{ + struct timerfd *tfd; + timerfd_t count; + int error; + + tfd = fp->f_data; + if (fp->f_type != DTYPE_LINUXTFD || tfd == NULL) + return (EINVAL); + + if (uio->uio_resid < sizeof(timerfd_t)) + return (EINVAL); + + error = 0; + mtx_lock(&tfd->tfd_lock); +retry: + if (tfd->tfd_canceled) { + tfd->tfd_count = 0; + mtx_unlock(&tfd->tfd_lock); + return (ECANCELED); + } + if (tfd->tfd_count == 0) { + if ((fp->f_flag & FNONBLOCK) != 0) { + mtx_unlock(&tfd->tfd_lock); + return (EAGAIN); + } + error = mtx_sleep(&tfd->tfd_count, &tfd->tfd_lock, PCATCH, "ltfdrd", 0); + if (error == 0) + goto retry; + } + if (error == 0) { + count = tfd->tfd_count; + tfd->tfd_count = 0; + mtx_unlock(&tfd->tfd_lock); + error = uiomove(&count, sizeof(timerfd_t), uio); + } else + mtx_unlock(&tfd->tfd_lock); + + return (error); +} + +static int +timerfd_poll(struct file *fp, int events, struct ucred *active_cred, + struct thread *td) +{ + struct timerfd *tfd; + int revents = 0; + + tfd = fp->f_data; + if (fp->f_type != DTYPE_LINUXTFD || tfd == NULL) + return (POLLERR); + + mtx_lock(&tfd->tfd_lock); + if ((events & (POLLIN|POLLRDNORM)) && tfd->tfd_count > 0) + revents |= events & (POLLIN|POLLRDNORM); + if (revents == 0) + selrecord(td, &tfd->tfd_sel); + mtx_unlock(&tfd->tfd_lock); + + return (revents); +} + +/*ARGSUSED*/ +static int +timerfd_kqfilter(struct file *fp, struct knote *kn) +{ + struct timerfd *tfd; + + tfd = fp->f_data; + if (fp->f_type != DTYPE_LINUXTFD || tfd == NULL) + return (EINVAL); + + if (kn->kn_filter == EVFILT_READ) + kn->kn_fop = &timerfd_rfiltops; + else + return (EINVAL); + + kn->kn_hook = tfd; + knlist_add(&tfd->tfd_sel.si_note, kn, 0); + + return (0); +} + +static void +filt_timerfddetach(struct knote *kn) +{ + struct timerfd *tfd = kn->kn_hook; + + mtx_lock(&tfd->tfd_lock); + knlist_remove(&tfd->tfd_sel.si_note, kn, 1); + mtx_unlock(&tfd->tfd_lock); +} + +/*ARGSUSED*/ +static int +filt_timerfdread(struct knote *kn, long hint) +{ + struct timerfd *tfd = kn->kn_hook; + + return (tfd->tfd_count > 0); +} + +/*ARGSUSED*/ +static int +timerfd_stat(struct file *fp, struct stat *st, struct ucred *active_cred, + struct thread *td) +{ + + return (ENXIO); +} + +/*ARGSUSED*/ +static int +timerfd_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp) +{ + + kif->kf_type = KF_TYPE_UNKNOWN; + return (0); +} + +static void +linux_timerfd_clocktime(struct timerfd *tfd, struct timespec *ts) +{ + + if (tfd->tfd_clockid == CLOCK_REALTIME) + getnanotime(ts); + else /* CLOCK_MONOTONIC */ + getnanouptime(ts); +} + +static void +linux_timerfd_curval(struct timerfd *tfd, struct itimerspec *ots) +{ + struct timespec cts; + + linux_timerfd_clocktime(tfd, &cts); + *ots = tfd->tfd_time; + if (ots->it_value.tv_sec != 0 || ots->it_value.tv_nsec != 0) { + timespecsub(&ots->it_value, &cts); + if (ots->it_value.tv_sec < 0 || + (ots->it_value.tv_sec == 0 && + ots->it_value.tv_nsec == 0)) { + ots->it_value.tv_sec = 0; + ots->it_value.tv_nsec = 1; + } + } +} + +int +linux_timerfd_gettime(struct thread *td, struct linux_timerfd_gettime_args *args) +{ + cap_rights_t rights; + struct l_itimerspec lots; + struct itimerspec ots; + struct timerfd *tfd; + struct file *fp; + int error; + + error = fget(td, args->fd, cap_rights_init(&rights, CAP_READ), &fp); + if (error != 0) + return (error); + tfd = fp->f_data; + if (fp->f_type != DTYPE_LINUXTFD || tfd == NULL) { + error = EINVAL; + goto out; + } + + mtx_lock(&tfd->tfd_lock); + linux_timerfd_curval(tfd, &ots); + mtx_unlock(&tfd->tfd_lock); + + error = native_to_linux_itimerspec(&lots, &ots); + if (error == 0) + error = copyout(&lots, args->old_value, sizeof(lots)); + +out: + fdrop(fp, td); + return (error); +} + +int +linux_timerfd_settime(struct thread *td, struct linux_timerfd_settime_args *args) +{ + struct l_itimerspec lots; + struct itimerspec nts, ots; + struct timespec cts, ts; + cap_rights_t rights; + struct timerfd *tfd; + struct timeval tv; + struct file *fp; + int error; + + if ((args->flags & ~LINUX_TFD_SETTIME_FLAGS) != 0) + return (EINVAL); + + error = copyin(args->new_value, &lots, sizeof(lots)); + if (error != 0) + return (error); + error = linux_to_native_itimerspec(&nts, &lots); + if (error != 0) + return (error); + + error = fget(td, args->fd, cap_rights_init(&rights, CAP_WRITE), &fp); + if (error != 0) + return (error); + tfd = fp->f_data; + if (fp->f_type != DTYPE_LINUXTFD || tfd == NULL) { + error = EINVAL; + goto out; + } + + mtx_lock(&tfd->tfd_lock); + if (!timespecisset(&nts.it_value)) + timespecclear(&nts.it_interval); + if (args->old_value != NULL) + linux_timerfd_curval(tfd, &ots); + + tfd->tfd_time = nts; + if (timespecisset(&nts.it_value)) { + linux_timerfd_clocktime(tfd, &cts); + ts = nts.it_value; + if ((args->flags & LINUX_TFD_TIMER_ABSTIME) == 0) { + timespecadd(&tfd->tfd_time.it_value, &cts); + } else { + timespecsub(&ts, &cts); + } + TIMESPEC_TO_TIMEVAL(&tv, &ts); + callout_reset(&tfd->tfd_callout, tvtohz(&tv), + linux_timerfd_expire, tfd); + tfd->tfd_canceled = false; + } else { + tfd->tfd_canceled = true; + callout_stop(&tfd->tfd_callout); + } + mtx_unlock(&tfd->tfd_lock); + + if (args->old_value != NULL) { + error = native_to_linux_itimerspec(&lots, &ots); + if (error == 0) + error = copyout(&lots, args->old_value, sizeof(lots)); + } + +out: + fdrop(fp, td); + return (error); +} + +static void +linux_timerfd_expire(void *arg) +{ + struct timespec cts, ts; + struct timeval tv; + struct timerfd *tfd; + + tfd = (struct timerfd *)arg; + + linux_timerfd_clocktime(tfd, &cts); + if (timespeccmp(&cts, &tfd->tfd_time.it_value, >=)) { + if (timespecisset(&tfd->tfd_time.it_interval)) + timespecadd(&tfd->tfd_time.it_value, + &tfd->tfd_time.it_interval); + else + /* single shot timer */ + timespecclear(&tfd->tfd_time.it_value); + if (timespecisset(&tfd->tfd_time.it_value)) { + ts = tfd->tfd_time.it_value; + timespecsub(&ts, &cts); + TIMESPEC_TO_TIMEVAL(&tv, &ts); + callout_reset(&tfd->tfd_callout, tvtohz(&tv), + linux_timerfd_expire, tfd); + } + tfd->tfd_count++; + KNOTE_LOCKED(&tfd->tfd_sel.si_note, 0); + selwakeup(&tfd->tfd_sel); + wakeup(&tfd->tfd_count); + } else if (timespecisset(&tfd->tfd_time.it_value)) { + ts = tfd->tfd_time.it_value; + timespecsub(&ts, &cts); + TIMESPEC_TO_TIMEVAL(&tv, &ts); + callout_reset(&tfd->tfd_callout, tvtohz(&tv), + linux_timerfd_expire, tfd); + } +} Modified: head/sys/compat/linux/linux_event.h ============================================================================== --- head/sys/compat/linux/linux_event.h Sun Feb 26 09:42:34 2017 (r314294) +++ head/sys/compat/linux/linux_event.h Sun Feb 26 09:48:18 2017 (r314295) @@ -57,4 +57,15 @@ #define LINUX_EFD_SEMAPHORE (1 << 0) +#define LINUX_TFD_TIMER_ABSTIME (1 << 0) +#define LINUX_TFD_TIMER_CANCEL_ON_SET (1 << 1) +#define LINUX_TFD_CLOEXEC LINUX_O_CLOEXEC +#define LINUX_TFD_NONBLOCK LINUX_O_NONBLOCK + +#define LINUX_TFD_SHARED_FCNTL_FLAGS (LINUX_TFD_CLOEXEC \ + |LINUX_TFD_NONBLOCK) +#define LINUX_TFD_CREATE_FLAGS LINUX_TFD_SHARED_FCNTL_FLAGS +#define LINUX_TFD_SETTIME_FLAGS (LINUX_TFD_TIMER_ABSTIME \ + |LINUX_TFD_TIMER_CANCEL_ON_SET) + #endif /* !_LINUX_EVENT_H_ */ Modified: head/sys/compat/linux/linux_time.c ============================================================================== --- head/sys/compat/linux/linux_time.c Sun Feb 26 09:42:34 2017 (r314294) +++ head/sys/compat/linux/linux_time.c Sun Feb 26 09:48:18 2017 (r314295) @@ -154,6 +154,28 @@ linux_to_native_timespec(struct timespec } int +native_to_linux_itimerspec(struct l_itimerspec *ltp, struct itimerspec *ntp) +{ + int error; + + error = native_to_linux_timespec(<p->it_interval, &ntp->it_interval); + if (error == 0) + error = native_to_linux_timespec(<p->it_value, &ntp->it_interval); + return (error); +} + +int +linux_to_native_itimerspec(struct itimerspec *ntp, struct l_itimerspec *ltp) +{ + int error; + + error = linux_to_native_timespec(&ntp->it_interval, <p->it_interval); + if (error == 0) + error = linux_to_native_timespec(&ntp->it_value, <p->it_value); + return (error); +} + +int linux_to_native_clockid(clockid_t *n, clockid_t l) { Modified: head/sys/compat/linux/linux_timer.h ============================================================================== --- head/sys/compat/linux/linux_timer.h Sun Feb 26 09:42:34 2017 (r314294) +++ head/sys/compat/linux/linux_timer.h Sun Feb 26 09:48:18 2017 (r314295) @@ -116,5 +116,9 @@ int native_to_linux_timespec(struct l_ti int linux_to_native_timespec(struct timespec *, struct l_timespec *); int linux_to_native_clockid(clockid_t *, clockid_t); +int native_to_linux_itimerspec(struct l_itimerspec *, + struct itimerspec *); +int linux_to_native_itimerspec(struct itimerspec *, + struct l_itimerspec *); #endif /* _LINUX_TIMER_H */ Modified: head/sys/i386/linux/linux_dummy.c ============================================================================== --- head/sys/i386/linux/linux_dummy.c Sun Feb 26 09:42:34 2017 (r314294) +++ head/sys/i386/linux/linux_dummy.c Sun Feb 26 09:48:18 2017 (r314295) @@ -99,10 +99,6 @@ DUMMY(move_pages); DUMMY(getcpu); /* linux 2.6.22: */ DUMMY(signalfd); -DUMMY(timerfd_create); -/* linux 2.6.25: */ -DUMMY(timerfd_settime); -DUMMY(timerfd_gettime); /* linux 2.6.27: */ DUMMY(signalfd4); DUMMY(inotify_init1); Modified: head/sys/sys/file.h ============================================================================== --- head/sys/sys/file.h Sun Feb 26 09:42:34 2017 (r314294) +++ head/sys/sys/file.h Sun Feb 26 09:48:18 2017 (r314295) @@ -67,6 +67,7 @@ struct vnode; #define DTYPE_DEV 11 /* Device specific fd type */ #define DTYPE_PROCDESC 12 /* process descriptor */ #define DTYPE_LINUXEFD 13 /* emulation eventfd type */ +#define DTYPE_LINUXTFD 14 /* emulation timerfd type */ #ifdef _KERNEL From owner-svn-src-all@freebsd.org Sun Feb 26 10:53:04 2017 Return-Path: Delivered-To: svn-src-all@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 310B3CED4D8; Sun, 26 Feb 2017 10:53:04 +0000 (UTC) (envelope-from kib@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 D2C7CB14; Sun, 26 Feb 2017 10:53:03 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QAr2oo060478; Sun, 26 Feb 2017 10:53:02 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QAr2OH060474; Sun, 26 Feb 2017 10:53:02 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201702261053.v1QAr2OH060474@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 26 Feb 2017 10:53:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314296 - in stable/11/sys: amd64/amd64 arm/arm i386/i386 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 10:53:04 -0000 Author: kib Date: Sun Feb 26 10:53:02 2017 New Revision: 314296 URL: https://svnweb.freebsd.org/changeset/base/314296 Log: MFC r313933, r313939, r313966: Microoptimize pmap_protect_pde() on amd64, i386 and pmap_protect_pte1() on armv6. Modified: stable/11/sys/amd64/amd64/pmap.c stable/11/sys/arm/arm/pmap-v6.c stable/11/sys/i386/i386/pmap.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/amd64/amd64/pmap.c ============================================================================== --- stable/11/sys/amd64/amd64/pmap.c Sun Feb 26 09:48:18 2017 (r314295) +++ stable/11/sys/amd64/amd64/pmap.c Sun Feb 26 10:53:02 2017 (r314296) @@ -4015,12 +4015,12 @@ pmap_protect_pde(pmap_t pmap, pd_entry_t anychanged = FALSE; retry: oldpde = newpde = *pde; - if (oldpde & PG_MANAGED) { + if ((oldpde & (PG_MANAGED | PG_M | PG_RW)) == + (PG_MANAGED | PG_M | PG_RW)) { eva = sva + NBPDR; for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME); va < eva; va += PAGE_SIZE, m++) - if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW)) - vm_page_dirty(m); + vm_page_dirty(m); } if ((prot & VM_PROT_WRITE) == 0) newpde &= ~(PG_RW | PG_M); Modified: stable/11/sys/arm/arm/pmap-v6.c ============================================================================== --- stable/11/sys/arm/arm/pmap-v6.c Sun Feb 26 09:48:18 2017 (r314295) +++ stable/11/sys/arm/arm/pmap-v6.c Sun Feb 26 10:53:02 2017 (r314296) @@ -4806,12 +4806,11 @@ pmap_protect_pte1(pmap_t pmap, pt1_entry ("%s: sva is not 1mpage aligned", __func__)); opte1 = npte1 = pte1_load(pte1p); - if (pte1_is_managed(opte1)) { + if (pte1_is_managed(opte1) && pte1_is_dirty(opte1)) { eva = sva + PTE1_SIZE; for (va = sva, m = PHYS_TO_VM_PAGE(pte1_pa(opte1)); va < eva; va += PAGE_SIZE, m++) - if (pte1_is_dirty(opte1)) - vm_page_dirty(m); + vm_page_dirty(m); } if ((prot & VM_PROT_WRITE) == 0) npte1 |= PTE1_RO | PTE1_NM; Modified: stable/11/sys/i386/i386/pmap.c ============================================================================== --- stable/11/sys/i386/i386/pmap.c Sun Feb 26 09:48:18 2017 (r314295) +++ stable/11/sys/i386/i386/pmap.c Sun Feb 26 10:53:02 2017 (r314296) @@ -3146,12 +3146,12 @@ pmap_protect_pde(pmap_t pmap, pd_entry_t anychanged = FALSE; retry: oldpde = newpde = *pde; - if (oldpde & PG_MANAGED) { + if ((oldpde & (PG_MANAGED | PG_M | PG_RW)) == + (PG_MANAGED | PG_M | PG_RW)) { eva = sva + NBPDR; for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME); va < eva; va += PAGE_SIZE, m++) - if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW)) - vm_page_dirty(m); + vm_page_dirty(m); } if ((prot & VM_PROT_WRITE) == 0) newpde &= ~(PG_RW | PG_M); From owner-svn-src-all@freebsd.org Sun Feb 26 10:58:02 2017 Return-Path: Delivered-To: svn-src-all@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 77C37CED5C9; Sun, 26 Feb 2017 10:58:02 +0000 (UTC) (envelope-from kib@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 447C1C9A; Sun, 26 Feb 2017 10:58:02 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QAw1eR060732; Sun, 26 Feb 2017 10:58:01 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QAw1fV060731; Sun, 26 Feb 2017 10:58:01 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201702261058.v1QAw1fV060731@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 26 Feb 2017 10:58:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314297 - stable/11/sys/kern X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 10:58:02 -0000 Author: kib Date: Sun Feb 26 10:58:01 2017 New Revision: 314297 URL: https://svnweb.freebsd.org/changeset/base/314297 Log: MFC r313688: Switch copyout_map() to use vm_mmap_object() instead of vm_mmap(). Modified: stable/11/sys/kern/subr_uio.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/kern/subr_uio.c ============================================================================== --- stable/11/sys/kern/subr_uio.c Sun Feb 26 10:53:02 2017 (r314296) +++ stable/11/sys/kern/subr_uio.c Sun Feb 26 10:58:01 2017 (r314297) @@ -468,10 +468,11 @@ copyout_map(struct thread *td, vm_offset /* round size up to page boundary */ size = (vm_size_t)round_page(sz); - - error = vm_mmap(&vms->vm_map, addr, size, VM_PROT_READ | VM_PROT_WRITE, - VM_PROT_ALL, MAP_PRIVATE | MAP_ANON, OBJT_DEFAULT, NULL, 0); - + if (size == 0) + return (EINVAL); + error = vm_mmap_object(&vms->vm_map, addr, size, VM_PROT_READ | + VM_PROT_WRITE, VM_PROT_ALL, MAP_PRIVATE | MAP_ANON, NULL, 0, + FALSE, td); return (error); } From owner-svn-src-all@freebsd.org Sun Feb 26 11:02:15 2017 Return-Path: Delivered-To: svn-src-all@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 B3223CED810; Sun, 26 Feb 2017 11:02:15 +0000 (UTC) (envelope-from kib@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 7F221165; Sun, 26 Feb 2017 11:02:15 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QB2EsL064576; Sun, 26 Feb 2017 11:02:14 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QB2Eqd064574; Sun, 26 Feb 2017 11:02:14 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201702261102.v1QB2Eqd064574@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 26 Feb 2017 11:02:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314298 - in stable/11/sys: fs/devfs kern X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 11:02:15 -0000 Author: kib Date: Sun Feb 26 11:02:14 2017 New Revision: 314298 URL: https://svnweb.freebsd.org/changeset/base/314298 Log: MFC r313967: Apply noexec mount option for mmap(PROT_EXEC). PR: 217062 Modified: stable/11/sys/fs/devfs/devfs_vnops.c stable/11/sys/kern/vfs_vnops.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/fs/devfs/devfs_vnops.c ============================================================================== --- stable/11/sys/fs/devfs/devfs_vnops.c Sun Feb 26 10:58:01 2017 (r314297) +++ stable/11/sys/fs/devfs/devfs_vnops.c Sun Feb 26 11:02:14 2017 (r314298) @@ -1789,9 +1789,11 @@ devfs_mmap_f(struct file *fp, vm_map_t m * compatible. */ mp = vp->v_mount; - if (mp != NULL && (mp->mnt_flag & MNT_NOEXEC) != 0) + if (mp != NULL && (mp->mnt_flag & MNT_NOEXEC) != 0) { maxprot = VM_PROT_NONE; - else + if ((prot & VM_PROT_EXECUTE) != 0) + return (EACCES); + } else maxprot = VM_PROT_EXECUTE; if ((fp->f_flag & FREAD) != 0) maxprot |= VM_PROT_READ; Modified: stable/11/sys/kern/vfs_vnops.c ============================================================================== --- stable/11/sys/kern/vfs_vnops.c Sun Feb 26 10:58:01 2017 (r314297) +++ stable/11/sys/kern/vfs_vnops.c Sun Feb 26 11:02:14 2017 (r314298) @@ -2434,9 +2434,11 @@ vn_mmap(struct file *fp, vm_map_t map, v * proc does a setuid? */ mp = vp->v_mount; - if (mp != NULL && (mp->mnt_flag & MNT_NOEXEC) != 0) + if (mp != NULL && (mp->mnt_flag & MNT_NOEXEC) != 0) { maxprot = VM_PROT_NONE; - else + if ((prot & VM_PROT_EXECUTE) != 0) + return (EACCES); + } else maxprot = VM_PROT_EXECUTE; if ((fp->f_flag & FREAD) != 0) maxprot |= VM_PROT_READ; From owner-svn-src-all@freebsd.org Sun Feb 26 12:44:55 2017 Return-Path: Delivered-To: svn-src-all@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 D1DB3CECDE7; Sun, 26 Feb 2017 12:44:55 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 23F47934; Sun, 26 Feb 2017 12:44:54 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id v1QCikX0061651 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sun, 26 Feb 2017 14:44:46 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua v1QCikX0061651 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id v1QCijRt061650; Sun, 26 Feb 2017 14:44:45 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 26 Feb 2017 14:44:45 +0200 From: Konstantin Belousov To: Bruce Evans Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314087 - head/sys/x86/x86 Message-ID: <20170226124445.GE2092@kib.kiev.ua> References: <201702220707.v1M7764i020598@repo.freebsd.org> <20170223053954.J1044@besplex.bde.org> <20170224125335.GV2092@kib.kiev.ua> <20170225130549.C1026@besplex.bde.org> <20170225101543.GC2092@kib.kiev.ua> <20170226013936.S856@besplex.bde.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170226013936.S856@besplex.bde.org> User-Agent: Mutt/1.7.2 (2016-11-26) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 12:44:55 -0000 On Sun, Feb 26, 2017 at 04:43:12AM +1100, Bruce Evans wrote: > On Sat, 25 Feb 2017, Konstantin Belousov wrote: > > > On Sat, Feb 25, 2017 at 02:17:23PM +1100, Bruce Evans wrote: > >> On Fri, 24 Feb 2017, Konstantin Belousov wrote: > >> > >>> On Thu, Feb 23, 2017 at 06:33:43AM +1100, Bruce Evans wrote: > >>>> On Wed, 22 Feb 2017, Konstantin Belousov wrote: > >>>> > >>>>> Log: > >>>>> More fixes for regression in r313898 on i386. > >>>>> Use long long constants where needed. > >>>> > >>>> The long long abomination is never needed, and is always a style bug. > >>> I never saw any explanation behind this claim. Esp. the first part > >>> of it, WRT 'never needed'. > >> > >> I hope I wrote enough about this in log messages when I cleaned up the > >> long longs 20 years ago :-). > >> > >> long long was a hack to work around intmax_t not existing and long being > >> unexpandable in practice because it was used in ABIs. It should have gone > >> away when intmax_t was standardized. Unfortunately, long long was > >> standardised too. > > It does not make a sense even more. long long is native compiler type, > > It is only native since C99 broke C under pressure from misimplementatations > with long long. In unbroken C, long is the longest type, and lots of code > depended on this (the main correct main was casting integers to long for > printing, and the main incorrect use was using long for almost everything > while assuming that int is 16 or 32 bits and not using typedefs much). > Correct implementations used an extended integer type (extended integer > types were also nonstandard before C99, and making them longer than long > also breaks C). > > 4.4BSD used quad_t and required it to be not actually a quad int, but > precisely 64 bits, and used long excessively (for example, pid_t was > long on all arches). This is essentially the long long mistake, with > long long spelled better as quad_t, combined with similar mistakes > from a previous generation where int was 16 bits. Long was used > excessively as a simple way to get integers with at least 32 bits, > although BSD never supported systems with int smaller than 32 bits > AFAIK, and 4.4BSD certainly didn't support such systems. 2.9 BSD was a port to PDP-11, AFAIK, with 16bit ints. > But BSD > broke the type of at least pid_t by sprinkling longs. In FreeBSD-1 > from Net/2, pid_t was short. BSD wanted to expand PID_MAX from 30000, > and did this wrong by expanding pid_t from short to long, just in time > for this to be wrong in practice since 64-bit systems were becoming > available so that long could easily be longer than int. > > (Net)BSD for alpha wasn't burdened with ABIs requiring long to be 32 > bits, so it made long 64 bits and didn't need long long (except even > plain long should be actually long, so it should be twice as wide as > a register and thus 128 bits on alpha). NetBSD cleaned up the > sprinkling of longs at much the same time that 4.4BSD-Lite1 sprinkled > them, to avoid getting silly sizes like 64 bits for pid_t and related > compatibilityroblems. I think NetBSD actually never imported 4.4BSD- > Lite1, but later merged Lite1 or Lite2 and kept its typedefs instead > of clobbering them with the long sprinkling. FreeBSD was handicapped > by the USL lawsuit. It had to import Lite1. It only fixed the long > sprinkling much later by merging Lite2. I think Lite2 got got the > better types from NetBSD. This is summarised in the FreeBSD commit > log using essentially "Splat!" :-(. > > > while anything_t is a typename to provide MI fixed type. long long was > > obviosvly choosen to extend types without requiring new keyword. > > Abusing a standard keyword doesn't do much except ensure a syntax error > if code with the extended type is compiler with a compiler that doesn't > support the extension. BSD's quad_t is in the application namespace. > __quad_t would be better. > > The errors are now being repeated with extensions to 128-bit integers. > At least they are being spelled better as __int128_t instead of long > long long or full doubling (long long long long = 128 bits). C doesn't > alllow __int128_t even as an extended type unless intmax_t is at least > 128 bits. Compatibility, ABI and bloat problems prevent enlarging > intmax_t from 64 bits to 128 bits on LP64 systems just like they prevented > the misimplementations enlarging long from 32 bits on LP32 and L32P64 > systems. > > >> It is "never needed" since anything that can be done with it can be done > >> better using intmax_t or intN_t or int_fastN_T or int_leastN_t. Except, > >> there is no suffix for explicit intmax_t constants, so you would have to > >> write such constants using INTMAX_C() or better a cast to intmax_t if > >> the constant is not needed in a cpp expression. > > If you replace long long with int there, the same logical structure of > > sentences will hold. Does it mean that 'int' is abomination since we > > have int32_t which allows everything to be done better ? > > No, since correct uses of int are possible. int32_t allows almost > everything to be done worse. It should only be used in software and > hardware ABIs (like pid_t and network software packet layouts in > software, and memory-mapped device registers and network hardware > packet layouts in hardware). Using it asks precisely 32 bits 2's > complement with no padding bits at any cost. Using it is unportable, > but in practice the implementation has to emulate it if it is not a > natural type for the CPU. There aren't many CPUs like that any more. > Ones with native 1's complement and no native support for 2's complement > used to be more common. The original alpha didn't have 8-bit loads and > stores; I don't know if it had 32-bit ones. Emulation just takes time > for software, but for memory-mapped device registers it takes hardware > support to avoid side effects from wider loads and stores. Hardware > tends to have this automatically -- even on i386, it is common to map > 8-bit registers to 32-bit words in PCI space, and if 8-bit accesses are > impossible then the hardware needs to be more careful with address > selection to avoid using the 24 top bits in each word. As is, original alpha cannot implement C11, which, I believe, is the common knowledge. Sure, unusable implementation might take a global lock for each memory access (might be, only for each byte and half-word access) to emulate atomicity, but this is only a theoretical play. > > Typedefs are hard to use, but unavoidable when an API specifies them. > Then a constant ABI may also make the typedefs inefficient in space > and time. > > To avoid the space/time efficiencies, int_least32_t and int_fast32_t > should be used instead of int32_t. These are also hard to use, and > almost never used in practice. It is easier to hard-code int32_t > and assume that this is efficient in space and time. > > But it is more correct to use plain int (except for ABIs). In plain > C and in POSIX before ~2007, plain int is essentially a convenient > spelling of int_fast16_t. POSIX changed this in ~2007 to require > 32-bit ints, so int is now a convenient spelling of int_fast32_t, > just like it has always been in BSD. > > I just noticed some complications the non 2's complement cases. C > and POSIX still support 1's complement and this weakens the fast > and least types. E.g., INT32_MIN is -2**32, but this is not > representable using 32 bits except in the 2's complement case, and > C doesn't require int_fast32_t or int_least32_t to be able to > represent it. This makes the signed fast and least types difficult to > use correctly. Code like the following is invalid: > > struct sc { > int_least32_t least_reg_image; > ... > }; > int_fast32_t fast_reg_image; > int32_t reg_image; > ... > reg_image = bus_space_read_4(bst, bsh, off); /* not quite correct */ > fast_reg_image = reg_image; /* copy it for time efficiency */ > fast_reg_image = adjust(fast_reg_image); > sc.least_reg_image = fast_reg_image; /* pack it for space effic. */ > > because the space and time conversions, and the adjustment using the fast > type might clobber the INT32_MIN bit except in the 2's complement case. > > Of course, code accessing device registers would use unsigned types and > automatically avoid the problem. It was already an error to convert the > uint32_t returned by bus_space_read_4() to int32_t, although this > conversion would not clobber the INT32_MIN since int32_t is 2's complement. > > POSIX code can now simply use int or u_int if it just needs 32 bits. > Similarly for portable code that just needs 16 bits. int is the only > type which is easy to use, so it should be used if possible. It is > supposed to be as space/time efficient as possible, subject to the > constraint that it is 16 or 32 bits. The fast and least types only > give one of these at a time and are harder to use since their rank is > opaque so you have to know too much about them to know if other types > promote to them of if they promote to int or long, etc. Even unsigned > and long are not so easy to use. Unsigned must sometimes be used to > get 2's complement behaviour or extra range, but using it gives sign > extension problems. long is too long for general use, and the promotion > rules to it doesn't occur automatically like it does for int. long long > is even less usable than long. > > >>>> I don't like using explicit long constants either. Here the number of bits > >>>> in the register is fixed by the hardware at 64. The number of bits in a > >>>> long on amd64 and a long on i386 is only fixed by ABI because the ABI is > >>>> broken for historical reasons. > >>> I really cannot make any sense of this statement. > >> > >> To know that the ULL suffix is correct for 64-bit types, you have to now > >> that long longs are 64 bits on all arches supported by the code. Then > >> to use this suffix, you have to hard-code this knowledge. Then to read > >> the code, the reader has to translate back to 64 bits. The translations > >> were easier 1 arch at a time. > > And why it is bad ? Same is true for int and long, which are often used > > in MD code to provide specific word size. In fact, there is not much for > > a programmer to know: we and any other UNIX supports either ILP32 or LP64 > > for the given architecture. > > I used basic types intentionally in i386 headers -- always use [u_]char, > [u_short and [u_]int or perhaps a vm type like vm_offset_t and never > [u_]intN_t. This doesn't work so well for longs or long longs. I supported > i386 with correctly sized longs -- twice as long as a register. This > gave I32L64P32. > > Merging the x86 headers churned many of the shorter type declarations > for [u_]intN_t, but had to be more careful with longs because these differ > between amd64 and i386, and more careful with long longs because although > these don't differ in size, long long is unnatural on amd64 so tends to > cause warnings. In general, it is unclear if a fixed-width type is used > because it is related to the word size, an API or an ABI. u_int might > mean precisely 32 bits. u_long might mean the word size; it is easier to > write, but is broken for i386 with correctly-sized longs, so I removed > most uses of it for the word size. unsigned long might mean precisely > 64 bits, but is harder to write than uint64_t except in literal suffixes, > and has a logical type mismatch on amd64, so is rarely use. > > >> Casting to uint64_t is clearer, but doesn't > >> work in cpp expressions. In cpp expressions, use UINT64_C(). Almost no > >> one knows about it uses this. There are 5 examples of using it in /sys > >> (3 in arm64 pte.h, 1 in powerpc pte.h, and 1 in mips xlr_machdep.c, > >> where the use is unnecessary but interesting: it is ~UINT64_C(0). We > >> used to have squillions of magic ~0's for the rman max limit. This was > >> spelled ~0U, ~0UL and perhaps even plain ~0. Plain ~0 worked best except > >> on unsupported 1's complement machines, since it normally gets sign extended > >> to as many bits as necessary. Now this is spelled RM_MAX_END, which is > >> implemented non-magically using a cast: (~(rman_res_t)0). Grepping for > >> ~0[uU] in dev/* shows only 1 obvious unconverted place. > > This clearly demonstrates why ULL/UL notation is superior to UINT64_C() or > > any other obfuscation. > > RM_MAX_END is an unobfuscation. > > Unconditional use of ULL just asks for future unportabilities and > compiler warnings now. On amd64, long long is never needed since it is > no longer than long, and compilers could reasonably complain about uses > when they can't see that its use has no effect or when they are generating > portability warnings. > > >> The MTRR_* macros are in x86/specialreg.h, and are spelled without ULL > >> suffixes. I prefer the latter, but seem to rememeber bugs elsewhere > >> caused by using expressions like ~FOO where FOO happens to be small. > >> Actually the problems are mostly when FOO happens to be between > >> INT_MAX+1U and UINT_MAX. When FOO is small and has no suffix, e.g., > >> if it is 0, then its type is int and ~FOO has type int and sign-extends > >> to 64 bits if necessary. But if FOO is say 0x80000000, it has type u_int > >> so ~FOO doesn't sign-extend. (Decimal constants without a suffix never > >> have an unsigned type and the hex constant here lets me write this number > >> and automatically give it an unsigned type. Normally this type is best.) > >> > >> Explicit type suffixes mainly hide these problems. If FOO is 0x80000000ULL, > >> then it has the correct type for ~FOO to work in expressions where everything > >> has type unsigned long long, but in other expressions a cast might still > >> be needed. > > Yes, yet another (and most useful) reason to use ULL and ignore a FUD about it. > > amd64 doesn't even have such expressions. The other terms will be mostly > uint64_t = plain u_long. Mixing with ULL promotes everything to unsigned > long long. Everything works because the arch is LP64 and also bogusly LL64, > but this is harder to understand than code using the 64-bit types throughout, > that is, using ~(uint64_t)FOO. Everything works because amd64 is LPLL64, but also because i386 is ILP32LL64, so using ULL gives desirable outcome for both architectures. Again, after re-reading all the text above, I do not see anything wrong with long long. Except that you do not like it. From owner-svn-src-all@freebsd.org Sun Feb 26 12:52:44 2017 Return-Path: Delivered-To: svn-src-all@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 259B1CED333; Sun, 26 Feb 2017 12:52:44 +0000 (UTC) (envelope-from sanpei.ml@gmail.com) Received: from mail-yb0-x236.google.com (mail-yb0-x236.google.com [IPv6:2607:f8b0:4002:c09::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DD130EAC; Sun, 26 Feb 2017 12:52:43 +0000 (UTC) (envelope-from sanpei.ml@gmail.com) Received: by mail-yb0-x236.google.com with SMTP id d88so13932488ybi.0; Sun, 26 Feb 2017 04:52:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=djmgq6y/gH7oW0tVcbMKWCgotdorb1Y84jm5ksZmZjk=; b=fK1hC+zUH2kW4FaU7FgfMo5OxeApoEijejMIInXsjzzePQOHcdc43DTVIG7Ol1tfCH eFL5yR9Hrx2hHipNPmX7j6Acf0O90XFUvLbHimdd8D2xw6roSm9q2Tk/a5PJ2QqJs5Dg 9ddBMGVUk8f26VRqVb+CKfZXeZLvS4WEQROqkNAPBsUfgQPo89L8UxyqjzhXornVx68J gdTghSVb1tzPxVS5KpJ7cp2hvEqX1jn1Uae7oK9kl6RWSb/AdEGar6/4ehYg+otpr/K1 OpmE06r7ah0Lf7/GoKCA7jVQLOwzBoWcGIkeZMrE9KqbdDrmjq+c1slGkYHNWuNks+iY 0Uuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=djmgq6y/gH7oW0tVcbMKWCgotdorb1Y84jm5ksZmZjk=; b=ZRHh2L0OwUREzuUdOAWpGWKe/vijeCPSJdN1HqOY6Bd5ZSztskTZcS4R6Po4bm3tjo suaKxFi/sIpoQHhUrhO8QfG9S1535V3LiKjUoDhu72B65Hy+2JNO03NmXdHky+Nqgvk0 ZtyyhAabzXfDdViwa6JkJl4h6SfFmqaSzRlUZIu32IhsALzFbGQKfzT9LOJHrGiSgec/ 0wFtSmF+Rm1ltV13hggBWbOZurFH/SiTUG4GTqbbiReE1Di8+gYCnxtPjyUHIx4b+UmG tmEehmI46cnM2aM9Q97DPNjS31LqRG3dvrpsmqHrIJRZJn+tlIa1tcFX+9rZJdQHQtsA nAkA== X-Gm-Message-State: AMke39mV7tMC67MTAJxWQ2EnqX4p0tolf4mtM046IDsEuyLHJjoEYiuwq2cEvwxD1RBOsdGe9rwABENENlGCTg== X-Received: by 10.37.3.151 with SMTP id 145mr7108808ybd.164.1488113562717; Sun, 26 Feb 2017 04:52:42 -0800 (PST) MIME-Version: 1.0 References: <201701240209.v0O29UDD047838@repo.freebsd.org> <1487201535.73144.15.camel@freebsd.org> In-Reply-To: <1487201535.73144.15.camel@freebsd.org> From: Yoshiro MIHIRA Date: Sun, 26 Feb 2017 12:52:32 +0000 Message-ID: Subject: Re: svn commit: r312679 - head/sys/arm/freescale/imx To: Ian Lepore , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, "freebsd-arm@FreeBSD.org" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 12:52:44 -0000 I tried Ian-san's patch, unfortunately it was not solved... If you have any idea, please let me know... 2017=E5=B9=B42=E6=9C=8816=E6=97=A5(=E6=9C=A8) 8:32 Ian Lepore : > > > Author: ian > > > Date: Tue Jan 24 02:09:30 2017 > > > New Revision: 312679 > > > URL: https://svnweb.freebsd.org/changeset/base/312679 > [...] > On Wed, 2017-02-15 at 10:31 +0000, Yoshiro MIHIRA wrote: > > Hi. > > Ian > > > > Thank you for your strong effort to support imx6 board. > > > > I have SolidRun HummingBoard-i2(imx6dl-hummingboard). > > > > I have reboot issue(never reset after reboot) and if I use Linux, I > > reproduce this issue So I reported this issue to SolidRun Forum. > > http://forum.solid-run.com/linux-on-cubox-i-and-hummingboard-f8/need- > > to-push-reset-button-to-reboot-linux-system-t3122.html > > But I could not get any information. > > > > I tested latest kernel(r313280) unfortunately it was not solved. > > > > Do you know other information about reset issue, please let me know. > > > > Currently I need to push reset button when I restart system... > > > > Yours > > Yoshiro MIHIRA > > > > [adding arm@ list] > > Are you set up to build and test a custom kernel? If so, try applying > the patch I'm attaching to this mail and let me know if it helps. This > turns on a bit in the control register that is described in the manual > as "use a new more robust method to generate a software reset" (if it's > better, I wonder why they didn't make it the hardware default?). > > -- Ian > From owner-svn-src-all@freebsd.org Sun Feb 26 12:52:46 2017 Return-Path: Delivered-To: svn-src-all@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 F3E4DCED340; Sun, 26 Feb 2017 12:52:45 +0000 (UTC) (envelope-from mav@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 B061CEAE; Sun, 26 Feb 2017 12:52:45 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QCqisr008272; Sun, 26 Feb 2017 12:52:44 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QCqiW7008269; Sun, 26 Feb 2017 12:52:44 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201702261252.v1QCqiW7008269@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sun, 26 Feb 2017 12:52:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314299 - head/sys/dev/isp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 12:52:46 -0000 Author: mav Date: Sun Feb 26 12:52:44 2017 New Revision: 314299 URL: https://svnweb.freebsd.org/changeset/base/314299 Log: Fix residual length reporting in target mode. This allows to properly handle cases when target wants to receive or send more data then initiator wants to send or receive. Previously in such cases isp(4) returned CAM_DATA_RUN_ERR, while now it returns resid > 0. MFC after: 2 weeks Modified: head/sys/dev/isp/isp_freebsd.c head/sys/dev/isp/isp_target.c Modified: head/sys/dev/isp/isp_freebsd.c ============================================================================== --- head/sys/dev/isp/isp_freebsd.c Sun Feb 26 11:02:14 2017 (r314298) +++ head/sys/dev/isp/isp_freebsd.c Sun Feb 26 12:52:44 2017 (r314299) @@ -1316,13 +1316,24 @@ isp_target_start_ctio(ispsoftc_t *isp, u /* * Check for overflow */ - tmp = atp->bytes_xfered + atp->bytes_in_transit + xfrlen; - if (tmp > atp->orig_datalen) { - isp_prt(isp, ISP_LOGERR, "%s: [0x%x] data overflow by %u bytes", __func__, cso->tag_id, tmp - atp->orig_datalen); + tmp = atp->bytes_xfered + atp->bytes_in_transit; + if (xfrlen > 0 && tmp > atp->orig_datalen) { + isp_prt(isp, ISP_LOGERR, + "%s: [0x%x] data overflow by %u bytes", __func__, + cso->tag_id, tmp + xfrlen - atp->orig_datalen); ccb->ccb_h.status = CAM_DATA_RUN_ERR; xpt_done(ccb); continue; } + if (xfrlen > atp->orig_datalen - tmp) { + xfrlen = atp->orig_datalen - tmp; + if (xfrlen == 0 && !sendstatus) { + cso->resid = cso->dxfer_len; + ccb->ccb_h.status = CAM_REQ_CMP; + xpt_done(ccb); + continue; + } + } if (IS_24XX(isp)) { ct7_entry_t *cto = (ct7_entry_t *) local; @@ -1352,16 +1363,13 @@ isp_target_start_ctio(ispsoftc_t *isp, u cto->ct_flags |= CT7_SENDSTATUS | CT7_NO_DATA; resid = atp->orig_datalen - atp->bytes_xfered - atp->bytes_in_transit; if (sense_length <= MAXRESPLEN_24XX) { - if (resid < 0) { - cto->ct_resid = -resid; - } else if (resid > 0) { - cto->ct_resid = resid; - } cto->ct_flags |= CT7_FLAG_MODE1; cto->ct_scsi_status = cso->scsi_status; if (resid < 0) { + cto->ct_resid = -resid; cto->ct_scsi_status |= (FCP_RESID_OVERFLOW << 8); } else if (resid > 0) { + cto->ct_resid = resid; cto->ct_scsi_status |= (FCP_RESID_UNDERFLOW << 8); } if (fctape) { @@ -2238,10 +2246,10 @@ static void isp_handle_platform_ctio(ispsoftc_t *isp, void *arg) { union ccb *ccb; - int sentstatus = 0, ok = 0, notify_cam = 0, resid = 0, failure = 0; + int sentstatus = 0, ok = 0, notify_cam = 0, failure = 0; atio_private_data_t *atp = NULL; int bus; - uint32_t handle, moved_data = 0, data_requested; + uint32_t handle, data_requested, resid; handle = ((ct2_entry_t *)arg)->ct_syshandle; ccb = isp_find_xs(isp, handle); @@ -2250,7 +2258,7 @@ isp_handle_platform_ctio(ispsoftc_t *isp return; } isp_destroy_handle(isp, handle); - data_requested = PISP_PCMD(ccb)->datalen; + resid = data_requested = PISP_PCMD(ccb)->datalen; isp_free_pcmd(isp, ccb); if (isp->isp_nactive) { isp->isp_nactive--; @@ -2296,10 +2304,8 @@ isp_handle_platform_ctio(ispsoftc_t *isp sentstatus = ct->ct_flags & CT7_SENDSTATUS; ok = (ct->ct_nphdl == CT7_OK); notify_cam = (ct->ct_header.rqs_seqno & ATPD_SEQ_NOTIFY_CAM) != 0; - if ((ct->ct_flags & CT7_DATAMASK) != CT7_NO_DATA) { + if ((ct->ct_flags & CT7_DATAMASK) != CT7_NO_DATA) resid = ct->ct_resid; - moved_data = data_requested - resid; - } } isp_prt(isp, ok? ISP_LOGTDEBUG0 : ISP_LOGWARN, "%s: CTIO7[%x] seq %u nc %d sts 0x%x flg 0x%x sns %d resid %d %s", __func__, ct->ct_rxid, ATPD_GET_SEQNO(ct), notify_cam, ct->ct_nphdl, ct->ct_flags, (ccb->ccb_h.status & CAM_SENT_SENSE) != 0, resid, sentstatus? "FIN" : "MID"); @@ -2320,22 +2326,20 @@ isp_handle_platform_ctio(ispsoftc_t *isp sentstatus = ct->ct_flags & CT2_SENDSTATUS; ok = (ct->ct_status & ~QLTM_SVALID) == CT_OK; notify_cam = (ct->ct_header.rqs_seqno & ATPD_SEQ_NOTIFY_CAM) != 0; - if ((ct->ct_flags & CT2_DATAMASK) != CT2_NO_DATA) { + if ((ct->ct_flags & CT2_DATAMASK) != CT2_NO_DATA) resid = ct->ct_resid; - moved_data = data_requested - resid; - } } isp_prt(isp, ok? ISP_LOGTDEBUG0 : ISP_LOGWARN, "%s: CTIO2[%x] seq %u nc %d sts 0x%x flg 0x%x sns %d resid %d %s", __func__, ct->ct_rxid, ATPD_GET_SEQNO(ct), notify_cam, ct->ct_status, ct->ct_flags, (ccb->ccb_h.status & CAM_SENT_SENSE) != 0, resid, sentstatus? "FIN" : "MID"); } if (ok) { - if (moved_data) { - atp->bytes_xfered += moved_data; - ccb->csio.resid = atp->orig_datalen - atp->bytes_xfered - atp->bytes_in_transit; + if (data_requested > 0) { + atp->bytes_xfered += data_requested - resid; + ccb->csio.resid = ccb->csio.dxfer_len - + (data_requested - resid); } - if (sentstatus && (ccb->ccb_h.flags & CAM_SEND_SENSE)) { + if (sentstatus && (ccb->ccb_h.flags & CAM_SEND_SENSE)) ccb->ccb_h.status |= CAM_SENT_SENSE; - } ccb->ccb_h.status |= CAM_REQ_CMP; } else { notify_cam = 1; Modified: head/sys/dev/isp/isp_target.c ============================================================================== --- head/sys/dev/isp/isp_target.c Sun Feb 26 11:02:14 2017 (r314298) +++ head/sys/dev/isp/isp_target.c Sun Feb 26 12:52:44 2017 (r314299) @@ -558,13 +558,9 @@ isp_endcmd(ispsoftc_t *isp, ...) } else { cto->ct_flags |= CT7_FLAG_MODE1 | CT7_SENDSTATUS; } - if (aep->at_cmnd.cdb_dl.sf.fcp_cmnd_dl) { + if (aep->at_cmnd.cdb_dl.sf.fcp_cmnd_dl != 0) { cto->ct_resid = aep->at_cmnd.cdb_dl.sf.fcp_cmnd_dl; - if (cto->ct_resid < 0) { - cto->ct_scsi_status |= (FCP_RESID_OVERFLOW << 8); - } else if (cto->ct_resid > 0) { - cto->ct_scsi_status |= (FCP_RESID_UNDERFLOW << 8); - } + cto->ct_scsi_status |= (FCP_RESID_UNDERFLOW << 8); } cto->ct_syshandle = hdl; } else { From owner-svn-src-all@freebsd.org Sun Feb 26 12:54:28 2017 Return-Path: Delivered-To: svn-src-all@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 8D35CCED4A7; Sun, 26 Feb 2017 12:54:28 +0000 (UTC) (envelope-from mav@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 5A0CF3F4; Sun, 26 Feb 2017 12:54:28 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QCsRuN008398; Sun, 26 Feb 2017 12:54:27 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QCsRHP008397; Sun, 26 Feb 2017 12:54:27 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201702261254.v1QCsRHP008397@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sun, 26 Feb 2017 12:54:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314300 - head/sys/cam/ctl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 12:54:28 -0000 Author: mav Date: Sun Feb 26 12:54:27 2017 New Revision: 314300 URL: https://svnweb.freebsd.org/changeset/base/314300 Log: Use resid field of CTIO to detect under/overruns. MFC after: 2 weeks Modified: head/sys/cam/ctl/scsi_ctl.c Modified: head/sys/cam/ctl/scsi_ctl.c ============================================================================== --- head/sys/cam/ctl/scsi_ctl.c Sun Feb 26 12:52:44 2017 (r314299) +++ head/sys/cam/ctl/scsi_ctl.c Sun Feb 26 12:54:27 2017 (r314300) @@ -1253,7 +1253,8 @@ ctlfedone(struct cam_periph *periph, uni */ switch (done_ccb->ccb_h.status & CAM_STATUS_MASK) { case CAM_REQ_CMP: - io->scsiio.kern_data_resid -= csio->dxfer_len; + io->scsiio.kern_data_resid -= + csio->dxfer_len - csio->resid; io->io_hdr.port_status = 0; break; default: @@ -1280,8 +1281,8 @@ ctlfedone(struct cam_periph *periph, uni * pieces, figure out where we are in the list, and * continue sending pieces if necessary. */ - if ((cmd_info->flags & CTLFE_CMD_PIECEWISE) - && (io->io_hdr.port_status == 0)) { + if ((cmd_info->flags & CTLFE_CMD_PIECEWISE) && + io->io_hdr.port_status == 0 && csio->resid == 0) { ccb_flags flags; uint8_t *data_ptr; uint32_t dxfer_len; From owner-svn-src-all@freebsd.org Sun Feb 26 13:25:58 2017 Return-Path: Delivered-To: svn-src-all@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 13912CEDD2B; Sun, 26 Feb 2017 13:25:58 +0000 (UTC) (envelope-from nyan@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 D4B076CB; Sun, 26 Feb 2017 13:25:57 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QDPumq020147; Sun, 26 Feb 2017 13:25:56 GMT (envelope-from nyan@FreeBSD.org) Received: (from nyan@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QDPuOX020146; Sun, 26 Feb 2017 13:25:56 GMT (envelope-from nyan@FreeBSD.org) Message-Id: <201702261325.v1QDPuOX020146@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nyan set sender to nyan@FreeBSD.org using -f From: Takahashi Yoshihiro Date: Sun, 26 Feb 2017 13:25:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314301 - head/sys/x86/x86 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 13:25:58 -0000 Author: nyan Date: Sun Feb 26 13:25:56 2017 New Revision: 314301 URL: https://svnweb.freebsd.org/changeset/base/314301 Log: Fix the acpi idle support on i386 which was broken by r312910. The ifdefs were '#if !defined(__i386__) || !defined(PC98)' previously, so cpu_idle_acpi was enabled both i386 and amd64 except PC98. I was obfuscated by '#if !defined(__i386__)' condition. Submitted by: bde Reported by: bde Modified: head/sys/x86/x86/cpu_machdep.c Modified: head/sys/x86/x86/cpu_machdep.c ============================================================================== --- head/sys/x86/x86/cpu_machdep.c Sun Feb 26 12:54:27 2017 (r314300) +++ head/sys/x86/x86/cpu_machdep.c Sun Feb 26 13:25:56 2017 (r314301) @@ -451,9 +451,7 @@ struct { { cpu_idle_spin, "spin" }, { cpu_idle_mwait, "mwait" }, { cpu_idle_hlt, "hlt" }, -#if !defined(__i386__) { cpu_idle_acpi, "acpi" }, -#endif { NULL, NULL } }; @@ -470,11 +468,9 @@ idle_sysctl_available(SYSCTL_HANDLER_ARG if (strstr(idle_tbl[i].id_name, "mwait") && (cpu_feature2 & CPUID2_MON) == 0) continue; -#if !defined(__i386__) if (strcmp(idle_tbl[i].id_name, "acpi") == 0 && cpu_idle_hook == NULL) continue; -#endif p += sprintf(p, "%s%s", p != avail ? ", " : "", idle_tbl[i].id_name); } @@ -509,11 +505,9 @@ idle_sysctl(SYSCTL_HANDLER_ARGS) if (strstr(idle_tbl[i].id_name, "mwait") && (cpu_feature2 & CPUID2_MON) == 0) continue; -#if !defined(__i386__) if (strcmp(idle_tbl[i].id_name, "acpi") == 0 && cpu_idle_hook == NULL) continue; -#endif if (strcmp(idle_tbl[i].id_name, buf)) continue; cpu_idle_fn = idle_tbl[i].id_fn; From owner-svn-src-all@freebsd.org Sun Feb 26 14:29:11 2017 Return-Path: Delivered-To: svn-src-all@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 80C46CEE01E; Sun, 26 Feb 2017 14:29:11 +0000 (UTC) (envelope-from mav@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 364C89E1; Sun, 26 Feb 2017 14:29:11 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QETAGH045498; Sun, 26 Feb 2017 14:29:10 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QETAae045496; Sun, 26 Feb 2017 14:29:10 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201702261429.v1QETAae045496@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sun, 26 Feb 2017 14:29:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314302 - head/sys/dev/isp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 14:29:11 -0000 Author: mav Date: Sun Feb 26 14:29:09 2017 New Revision: 314302 URL: https://svnweb.freebsd.org/changeset/base/314302 Log: Return better error code in case of too long CDB. Its more important for SPI HBAs, as they don't support CDBs above 12 bytes. The new error code makes CAM to fall back to alternative commands. MFC after: 2 weeks Modified: head/sys/dev/isp/isp.c head/sys/dev/isp/isp_freebsd.h Modified: head/sys/dev/isp/isp.c ============================================================================== --- head/sys/dev/isp/isp.c Sun Feb 26 13:25:56 2017 (r314301) +++ head/sys/dev/isp/isp.c Sun Feb 26 14:29:09 2017 (r314302) @@ -4317,7 +4317,7 @@ isp_start(XS_T *xs) if (XS_CDBLEN(xs) > (IS_FC(isp)? 16 : 44) || XS_CDBLEN(xs) == 0) { isp_prt(isp, ISP_LOGERR, "unsupported cdb length (%d, CDB[0]=0x%x)", XS_CDBLEN(xs), XS_CDBP(xs)[0] & 0xff); - XS_SETERR(xs, HBA_BOTCH); + XS_SETERR(xs, HBA_REQINVAL); return (CMD_COMPLETE); } @@ -4494,7 +4494,7 @@ isp_start(XS_T *xs) if (IS_SCSI(isp)) { if (cdblen > sizeof (reqp->req_cdb)) { isp_prt(isp, ISP_LOGERR, "Command Length %u too long for this chip", cdblen); - XS_SETERR(xs, HBA_BOTCH); + XS_SETERR(xs, HBA_REQINVAL); return (CMD_COMPLETE); } reqp->req_target = target | (XS_CHANNEL(xs) << 7); @@ -4506,7 +4506,7 @@ isp_start(XS_T *xs) if (cdblen > sizeof (t7->req_cdb)) { isp_prt(isp, ISP_LOGERR, "Command Length %u too long for this chip", cdblen); - XS_SETERR(xs, HBA_BOTCH); + XS_SETERR(xs, HBA_REQINVAL); return (CMD_COMPLETE); } @@ -4539,7 +4539,7 @@ isp_start(XS_T *xs) if (cdblen > sizeof t2->req_cdb) { isp_prt(isp, ISP_LOGERR, "Command Length %u too long for this chip", cdblen); - XS_SETERR(xs, HBA_BOTCH); + XS_SETERR(xs, HBA_REQINVAL); return (CMD_COMPLETE); } if (FCPARAM(isp, XS_CHANNEL(xs))->fctape_enabled && (lp->prli_word3 & PRLI_WD3_RETRY)) { @@ -6567,6 +6567,7 @@ isp_parse_status(ispsoftc_t *isp, ispsta case RQCS_PORT_BUSY: isp_prt(isp, ISP_LOGWARN, "port busy for target %d", XS_TGT(xs)); if (XS_NOERR(xs)) { + *XS_STSP(xs) = SCSI_BUSY; XS_SETERR(xs, HBA_TGTBSY); } return; Modified: head/sys/dev/isp/isp_freebsd.h ============================================================================== --- head/sys/dev/isp/isp_freebsd.h Sun Feb 26 13:25:56 2017 (r314301) +++ head/sys/dev/isp/isp_freebsd.h Sun Feb 26 14:29:09 2017 (r314302) @@ -574,6 +574,7 @@ default: \ # define HBA_CMDTIMEOUT CAM_CMD_TIMEOUT # define HBA_SELTIMEOUT CAM_SEL_TIMEOUT # define HBA_TGTBSY CAM_SCSI_STATUS_ERROR +# define HBA_REQINVAL CAM_REQ_INVALID # define HBA_BUSRESET CAM_SCSI_BUS_RESET # define HBA_ABORTED CAM_REQ_ABORTED # define HBA_DATAOVR CAM_DATA_RUN_ERR From owner-svn-src-all@freebsd.org Sun Feb 26 16:00:22 2017 Return-Path: Delivered-To: svn-src-all@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 4B71DCEEB77; Sun, 26 Feb 2017 16:00:22 +0000 (UTC) (envelope-from manu@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 EEDD2787; Sun, 26 Feb 2017 16:00:21 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QG0L6W080641; Sun, 26 Feb 2017 16:00:21 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QG0Krv080636; Sun, 26 Feb 2017 16:00:20 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201702261600.v1QG0Krv080636@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Sun, 26 Feb 2017 16:00:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314303 - in head/sys/arm/allwinner: . clkng h3 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 16:00:22 -0000 Author: manu Date: Sun Feb 26 16:00:20 2017 New Revision: 314303 URL: https://svnweb.freebsd.org/changeset/base/314303 Log: Add clkng driver for Allwinner SoC Since Linux 4.9-4.10 DTS doesn't have clocks under /clocks but only a ccu node. Currently only H3 is supported with almost the same state as HEAD. (video pll aren't supported for now but we don't support video). This driver and clocks will also be used for other SoC (A64, A31, H5, H2 etc ...) Reviewed by: jmcneill Differential Revision: https://reviews.freebsd.org/D9517 Added: head/sys/arm/allwinner/clkng/ head/sys/arm/allwinner/clkng/aw_ccung.c (contents, props changed) head/sys/arm/allwinner/clkng/aw_ccung.h (contents, props changed) head/sys/arm/allwinner/clkng/aw_clk.h (contents, props changed) head/sys/arm/allwinner/clkng/aw_clk_nkmp.c (contents, props changed) head/sys/arm/allwinner/clkng/aw_clk_nkmp.h (contents, props changed) head/sys/arm/allwinner/clkng/aw_clk_nm.c (contents, props changed) head/sys/arm/allwinner/clkng/aw_clk_nm.h (contents, props changed) head/sys/arm/allwinner/clkng/aw_clk_prediv_mux.c (contents, props changed) head/sys/arm/allwinner/clkng/aw_clk_prediv_mux.h (contents, props changed) head/sys/arm/allwinner/clkng/ccu_h3.c (contents, props changed) head/sys/arm/allwinner/clkng/ccu_h3.h (contents, props changed) Modified: head/sys/arm/allwinner/files.allwinner head/sys/arm/allwinner/h3/files.h3 Added: head/sys/arm/allwinner/clkng/aw_ccung.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/allwinner/clkng/aw_ccung.c Sun Feb 26 16:00:20 2017 (r314303) @@ -0,0 +1,348 @@ +/*- + * Copyright (c) 2017 Emmanuel Vadot + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +/* + * Allwinner Clock Control Unit + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include + +#include +#include + +#include + +#include +#include + +#if defined(SOC_ALLWINNER_H3) +#include +#endif + +#include "clkdev_if.h" +#include "hwreset_if.h" + +static struct resource_spec aw_ccung_spec[] = { + { SYS_RES_MEMORY, 0, RF_ACTIVE }, + { -1, 0 } +}; + +#if defined(SOC_ALLWINNER_H3) +#define H3_CCU 1 +#endif + +static struct ofw_compat_data compat_data[] = { +#if defined(SOC_ALLWINNER_H3) + { "allwinner,sun8i-h3-ccu", H3_CCU }, +#endif + {NULL, 0 } +}; + +#define CCU_READ4(sc, reg) bus_read_4((sc)->res, (reg)) +#define CCU_WRITE4(sc, reg, val) bus_write_4((sc)->res, (reg), (val)) + +static int +aw_ccung_write_4(device_t dev, bus_addr_t addr, uint32_t val) +{ + struct aw_ccung_softc *sc; + + sc = device_get_softc(dev); + CCU_WRITE4(sc, addr, val); + return (0); +} + +static int +aw_ccung_read_4(device_t dev, bus_addr_t addr, uint32_t *val) +{ + struct aw_ccung_softc *sc; + + sc = device_get_softc(dev); + + *val = CCU_READ4(sc, addr); + return (0); +} + +static int +aw_ccung_modify_4(device_t dev, bus_addr_t addr, uint32_t clr, uint32_t set) +{ + struct aw_ccung_softc *sc; + uint32_t reg; + + sc = device_get_softc(dev); + + reg = CCU_READ4(sc, addr); + reg &= ~clr; + reg |= set; + CCU_WRITE4(sc, addr, reg); + + return (0); +} + +static int +aw_ccung_reset_assert(device_t dev, intptr_t id, bool reset) +{ + struct aw_ccung_softc *sc; + uint32_t val; + + sc = device_get_softc(dev); + + if (id >= sc->nresets || sc->resets[id].offset == 0) + return (0); + + mtx_lock(&sc->mtx); + val = CCU_READ4(sc, sc->resets[id].offset); + if (reset) + val &= ~(1 << sc->resets[id].shift); + else + val |= 1 << sc->resets[id].shift; + CCU_WRITE4(sc, sc->resets[id].offset, val); + mtx_unlock(&sc->mtx); + + return (0); +} + +static int +aw_ccung_reset_is_asserted(device_t dev, intptr_t id, bool *reset) +{ + struct aw_ccung_softc *sc; + uint32_t val; + + sc = device_get_softc(dev); + + if (id >= sc->nresets || sc->resets[id].offset == 0) + return (0); + + mtx_lock(&sc->mtx); + val = CCU_READ4(sc, sc->resets[id].offset); + *reset = (val & (1 << sc->resets[id].shift)) != 0 ? false : true; + mtx_unlock(&sc->mtx); + + return (0); +} + +static void +aw_ccung_device_lock(device_t dev) +{ + struct aw_ccung_softc *sc; + + sc = device_get_softc(dev); + mtx_lock(&sc->mtx); +} + +static void +aw_ccung_device_unlock(device_t dev) +{ + struct aw_ccung_softc *sc; + + sc = device_get_softc(dev); + mtx_unlock(&sc->mtx); +} + +static int +aw_ccung_probe(device_t dev) +{ + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) + return (ENXIO); + + device_set_desc(dev, "Allwinner Clock Control Unit NG"); + return (BUS_PROBE_DEFAULT); +} + +static int +aw_ccung_register_gates(struct aw_ccung_softc *sc) +{ + struct clk_gate_def def; + int i; + + for (i = 0; i < sc->ngates; i++) { + if (sc->gates[i].name == NULL) + continue; + memset(&def, 0, sizeof(def)); + def.clkdef.id = i; + def.clkdef.name = sc->gates[i].name; + def.clkdef.parent_names = &sc->gates[i].parent_name; + def.clkdef.parent_cnt = 1; + def.offset = sc->gates[i].offset; + def.shift = sc->gates[i].shift; + def.mask = 1; + def.on_value = 1; + def.off_value = 0; + clknode_gate_register(sc->clkdom, &def); + } + + return (0); +} + +static void +aw_ccung_init_clocks(struct aw_ccung_softc *sc) +{ + struct clknode *clknode; + int i, error; + + for (i = 0; i < sc->n_clk_init; i++) { + clknode = clknode_find_by_name(sc->clk_init[i].name); + if (clknode == NULL) { + device_printf(sc->dev, "Cannot find clock %s\n", + sc->clk_init[i].name); + continue; + } + + if (sc->clk_init[i].parent_name != NULL) { + if (bootverbose) + device_printf(sc->dev, "Setting %s as parent for %s\n", + sc->clk_init[i].parent_name, + sc->clk_init[i].name); + error = clknode_set_parent_by_name(clknode, + sc->clk_init[i].parent_name); + if (error != 0) { + device_printf(sc->dev, + "Cannot set parent to %s for %s\n", + sc->clk_init[i].parent_name, + sc->clk_init[i].name); + continue; + } + } + if (sc->clk_init[i].default_freq != 0) { + error = clknode_set_freq(clknode, + sc->clk_init[i].default_freq, 0 , 0); + if (error != 0) { + device_printf(sc->dev, + "Cannot set frequency for %s to %llu\n", + sc->clk_init[i].name, + sc->clk_init[i].default_freq); + continue; + } + } + if (sc->clk_init[i].enable) { + error = clknode_enable(clknode); + if (error != 0) { + device_printf(sc->dev, + "Cannot enable %s\n", + sc->clk_init[i].name); + continue; + } + } + } +} + +static int +aw_ccung_attach(device_t dev) +{ + struct aw_ccung_softc *sc; + + sc = device_get_softc(dev); + sc->dev = dev; + + if (bus_alloc_resources(dev, aw_ccung_spec, &sc->res) != 0) { + device_printf(dev, "cannot allocate resources for device\n"); + return (ENXIO); + } + + mtx_init(&sc->mtx, device_get_nameunit(dev), NULL, MTX_DEF); + + sc->type = ofw_bus_search_compatible(dev, compat_data)->ocd_data; + + sc->clkdom = clkdom_create(dev); + if (sc->clkdom == NULL) + panic("Cannot create clkdom\n"); + + switch (sc->type) { +#if defined(SOC_ALLWINNER_H3) + case H3_CCU: + ccu_h3_register_clocks(sc); + break; +#endif + } + + if (sc->gates) + aw_ccung_register_gates(sc); + if (clkdom_finit(sc->clkdom) != 0) + panic("cannot finalize clkdom initialization\n"); + + clkdom_xlock(sc->clkdom); + aw_ccung_init_clocks(sc); + clkdom_unlock(sc->clkdom); + + if (bootverbose) + clkdom_dump(sc->clkdom); + + /* If we have resets, register our self as a reset provider */ + if (sc->resets) + hwreset_register_ofw_provider(dev); + + return (0); +} + +static device_method_t aw_ccung_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, aw_ccung_probe), + DEVMETHOD(device_attach, aw_ccung_attach), + + /* clkdev interface */ + DEVMETHOD(clkdev_write_4, aw_ccung_write_4), + DEVMETHOD(clkdev_read_4, aw_ccung_read_4), + DEVMETHOD(clkdev_modify_4, aw_ccung_modify_4), + DEVMETHOD(clkdev_device_lock, aw_ccung_device_lock), + DEVMETHOD(clkdev_device_unlock, aw_ccung_device_unlock), + + /* Reset interface */ + DEVMETHOD(hwreset_assert, aw_ccung_reset_assert), + DEVMETHOD(hwreset_is_asserted, aw_ccung_reset_is_asserted), + + DEVMETHOD_END +}; + +static driver_t aw_ccung_driver = { + "aw_ccung", + aw_ccung_methods, + sizeof(struct aw_ccung_softc), +}; + +static devclass_t aw_ccung_devclass; + +EARLY_DRIVER_MODULE(aw_ccung, simplebus, aw_ccung_driver, aw_ccung_devclass, + 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); +MODULE_VERSION(aw_ccung, 1); Added: head/sys/arm/allwinner/clkng/aw_ccung.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/allwinner/clkng/aw_ccung.h Sun Feb 26 16:00:20 2017 (r314303) @@ -0,0 +1,59 @@ +/*- + * Copyright (c) 2017 Emmanuel Vadot + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef __CCU_NG_H__ +#define __CCU_NG_H__ + +struct aw_ccung_softc { + device_t dev; + struct resource *res; + struct clkdom *clkdom; + struct mtx mtx; + int type; + struct aw_ccung_reset *resets; + int nresets; + struct aw_ccung_gate *gates; + int ngates; + struct aw_clk_init *clk_init; + int n_clk_init; +}; + +struct aw_ccung_reset { + uint32_t offset; + uint32_t shift; +}; + +struct aw_ccung_gate { + const char *name; + const char *parent_name; + uint32_t id; + uint32_t offset; + uint32_t shift; +}; + +#endif /* __CCU_NG_H__ */ Added: head/sys/arm/allwinner/clkng/aw_clk.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/allwinner/clkng/aw_clk.h Sun Feb 26 16:00:20 2017 (r314303) @@ -0,0 +1,317 @@ +/*- + * Copyright (c) 2017 Emmanuel Vadot + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef __AW_CLK_H__ +#define __AW_CLK_H__ + +/* + Allwinner clocks formula : + +PLLs: + +(24MHz*N*K)/(M*P) +(24MHz*N)/(M*P) +(24MHz*N*2)/M +(24MHz*N)/M +(24MHz*N*K)/M +(24MHz*N*K/2) +(24MHz*N)/M +(24MHz*N*K/2) +(24MHz*N)/M + +Periph clocks: + +Clock Source/Divider N/Divider M +Clock Source/Divider N/Divider M/2 + + */ + +struct aw_clk_init { + const char *name; + const char *parent_name; + uint64_t default_freq; + bool enable; +}; + +#define AW_CLK_HAS_GATE 0x0001 +#define AW_CLK_HAS_LOCK 0x0002 +#define AW_CLK_HAS_MUX 0x0004 +#define AW_CLK_REPARENT 0x0008 +#define AW_CLK_SCALE_CHANGE 0x0010 + +#define AW_CLK_FACTOR_POWER_OF_TWO 0x0001 +#define AW_CLK_FACTOR_ZERO_BASED 0x0002 +#define AW_CLK_FACTOR_HAS_COND 0x0004 +#define AW_CLK_FACTOR_FIXED 0x0008 + +struct aw_clk_factor { + uint32_t shift; /* Shift bits for the factor */ + uint32_t mask; /* Mask to get the factor, will be override by the clk methods */ + uint32_t width; /* Number of bits for the factor */ + uint32_t value; /* Fixed value, depends on AW_CLK_FACTOR_FIXED */ + + uint32_t cond_shift; + uint32_t cond_mask; + uint32_t cond_width; + uint32_t cond_value; + + uint32_t flags; /* Flags */ +}; + +static inline uint32_t +aw_clk_get_factor(uint32_t val, struct aw_clk_factor *factor) +{ + uint32_t factor_val; + uint32_t cond; + + if (factor->flags & AW_CLK_FACTOR_HAS_COND) { + cond = (val & factor->cond_mask) >> factor->cond_shift; + if (cond != factor->cond_value) + return (1); + } + + if (factor->flags & AW_CLK_FACTOR_FIXED) + return (factor->value); + + factor_val = (val & factor->mask) >> factor->shift; + if (!(factor->flags & AW_CLK_FACTOR_ZERO_BASED)) + factor_val += 1; + else if (factor->flags & AW_CLK_FACTOR_POWER_OF_TWO) + factor_val = 1 << factor_val; + + return (factor_val); +} + +static inline uint32_t +aw_clk_factor_get_max(struct aw_clk_factor *factor) +{ + uint32_t max; + + if (factor->flags & AW_CLK_FACTOR_FIXED) + max = factor->value; + else if (factor->flags & AW_CLK_FACTOR_POWER_OF_TWO) + max = 1 << ((1 << factor->width) - 1); + else { + max = (1 << factor->width); + } + + return (max); +} + +static inline uint32_t +aw_clk_factor_get_min(struct aw_clk_factor *factor) +{ + uint32_t min; + + if (factor->flags & AW_CLK_FACTOR_FIXED) + min = factor->value; + else if (factor->flags & AW_CLK_FACTOR_ZERO_BASED) + min = 0; + else + min = 1; + + return (min); +} + +static inline uint32_t +aw_clk_factor_get_value(struct aw_clk_factor *factor, uint32_t raw) +{ + uint32_t val; + + if (factor->flags & AW_CLK_FACTOR_FIXED) + return (factor->value); + + if (factor->flags & AW_CLK_FACTOR_ZERO_BASED) + val = raw; + else if (factor->flags & AW_CLK_FACTOR_POWER_OF_TWO) { + for (val = 0; raw != 1; val++) + raw >>= 1; + } else + val = raw - 1; + + return (val); +} + +#define CCU_RESET(idx, o, s) \ + [idx] = { \ + .offset = o, \ + .shift = s, \ + }, + +#define CCU_GATE(idx, clkname, pname, o, s) \ + [idx] = { \ + .name = clkname, \ + .parent_name = pname, \ + .offset = o, \ + .shift = s, \ + }, + +#define NKMP_CLK(_id, _name, _pnames, \ + _offset, \ + _n_shift, _n_width, _n_value, _n_flags, \ + _k_shift, _k_width, _k_value, _k_flags, \ + _m_shift, _m_width, _m_value, _m_flags, \ + _p_shift, _p_width, _p_value, _p_flags, \ + _gate, \ + _lock, _lock_retries, \ + _flags) \ + { \ + .clkdef = { \ + .id = _id, \ + .name = _name, \ + .parent_names = _pnames, \ + .parent_cnt = nitems(_pnames), \ + }, \ + .offset = _offset, \ + .n.shift = _n_shift, \ + .n.width = _n_width, \ + .n.value = _n_value, \ + .n.flags = _n_flags, \ + .k.shift = _k_shift, \ + .k.width = _k_width, \ + .k.value = _k_value, \ + .k.flags = _k_flags, \ + .m.shift = _m_shift, \ + .m.width = _m_width, \ + .m.value = _m_value, \ + .m.flags = _m_flags, \ + .p.shift = _p_shift, \ + .p.width = _p_width, \ + .p.value = _p_value, \ + .p.flags = _p_flags, \ + .gate_shift = _gate, \ + .lock_shift = _lock, \ + .lock_retries = _lock_retries, \ + .flags = _flags, \ + }, + +#define NM_CLK(_id, _name, _pnames, \ + _offset, \ + _nshift, _nwidth, _nvalue, _nflags, \ + _mshift, _mwidth, _mvalue, _mflags, \ + _mux_shift, _mux_width, \ + _gate_shift, \ + _flags) \ + { \ + .clkdef = { \ + .id = _id, \ + .name = _name, \ + .parent_names = _pnames, \ + .parent_cnt = nitems(_pnames), \ + }, \ + .offset = _offset, \ + .n.shift = _nshift, \ + .n.width = _nwidth, \ + .n.value = _nvalue, \ + .n.flags = _nflags, \ + .mux_shift = _mux_shift, \ + .m.shift = _mshift, \ + .m.width = _mwidth, \ + .m.value = _mvalue, \ + .m.flags = _mflags, \ + .mux_width = _mux_width, \ + .flags = _flags, \ + }, + +#define PREDIV_CLK(_id, _name, _pnames, \ + _offset, \ + _mux_shift, _mux_width, \ + _div_shift, _div_width, _div_value, _div_flags, \ + _prediv_shift, _prediv_width, _prediv_value, _prediv_flags, \ + _prediv_cond_shift, _prediv_cond_width, _prediv_cond_value) \ + { \ + .clkdef = { \ + .id = _id, \ + .name = _name, \ + .parent_names = _pnames, \ + .parent_cnt = nitems(_pnames), \ + }, \ + .offset = _offset, \ + .mux_shift = _mux_shift, \ + .mux_width = _mux_width, \ + .div.shift = _div_shift, \ + .div.width = _div_width, \ + .div.value = _div_value, \ + .div.flags = _div_flags, \ + .prediv.shift = _prediv_shift, \ + .prediv.width = _prediv_width, \ + .prediv.value = _prediv_value, \ + .prediv.flags = _prediv_flags, \ + .prediv.cond_shift = _prediv_cond_shift, \ + .prediv.cond_width = _prediv_cond_width, \ + .prediv.cond_value = _prediv_cond_value, \ + }, + +#define MUX_CLK(_id, _name, _pnames, \ + _offset, _shift, _width) \ + { \ + .clkdef = { \ + .id = _id, \ + .name = _name, \ + .parent_names = _pnames, \ + .parent_cnt = nitems(_pnames) \ + }, \ + .offset = _offset, \ + .shift = _shift, \ + .width = _width, \ + }, + +#define DIV_CLK(_id, _name, _pnames, \ + _offset, \ + _i_shift, _i_width, \ + _div_flags, _div_table) \ + { \ + .clkdef = { \ + .id = _id, \ + .name = _name, \ + .parent_names = _pnames, \ + .parent_cnt = nitems(_pnames) \ + }, \ + .offset = _offset, \ + .i_shift = _i_shift, \ + .i_width = _i_width, \ + .div_flags = _div_flags, \ + .div_table = _div_table, \ + }, + +#define FIXED_CLK(_id, _name, _pnames, \ + _freq, _mult, _div, _flags) \ + { \ + .clkdef = { \ + .id = _id, \ + .name = _name, \ + .parent_names = _pnames, \ + .parent_cnt = 1, \ + }, \ + .freq = _freq, \ + .mult = _mult, \ + .div = _div, \ + .fixed_flags = _flags, \ + }, + +#endif /* __AW_CLK_H__ */ Added: head/sys/arm/allwinner/clkng/aw_clk_nkmp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/allwinner/clkng/aw_clk_nkmp.c Sun Feb 26 16:00:20 2017 (r314303) @@ -0,0 +1,362 @@ +/*- + * Copyright (c) 2017 Emmanuel Vadot + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include + +#include + +#include +#include + +#include "clkdev_if.h" + +/* + * clknode for clocks matching the formula : + * + * clk = (clkin * n * k) / (m * p) + * + */ + +struct aw_clk_nkmp_sc { + uint32_t offset; + + struct aw_clk_factor n; + struct aw_clk_factor k; + struct aw_clk_factor m; + struct aw_clk_factor p; + + uint32_t gate_shift; + uint32_t lock_shift; + uint32_t lock_retries; + + uint32_t flags; +}; + +#define WRITE4(_clk, off, val) \ + CLKDEV_WRITE_4(clknode_get_device(_clk), off, val) +#define READ4(_clk, off, val) \ + CLKDEV_READ_4(clknode_get_device(_clk), off, val) +#define MODIFY4(_clk, off, clr, set ) \ + CLKDEV_MODIFY_4(clknode_get_device(_clk), off, clr, set) +#define DEVICE_LOCK(_clk) \ + CLKDEV_DEVICE_LOCK(clknode_get_device(_clk)) +#define DEVICE_UNLOCK(_clk) \ + CLKDEV_DEVICE_UNLOCK(clknode_get_device(_clk)) + +static int +aw_clk_nkmp_init(struct clknode *clk, device_t dev) +{ + clknode_init_parent_idx(clk, 0); + return (0); +} + +static int +aw_clk_nkmp_set_gate(struct clknode *clk, bool enable) +{ + struct aw_clk_nkmp_sc *sc; + uint32_t val; + + sc = clknode_get_softc(clk); + + if ((sc->flags & AW_CLK_HAS_GATE) == 0) + return (0); + + DEVICE_LOCK(clk); + READ4(clk, sc->offset, &val); + if (enable) + val |= (1 << sc->gate_shift); + else + val &= ~(1 << sc->gate_shift); + WRITE4(clk, sc->offset, val); + DEVICE_UNLOCK(clk); + + return (0); +} + +static uint64_t +aw_clk_nkmp_find_best(struct aw_clk_nkmp_sc *sc, uint64_t fparent, uint64_t *fout, + uint32_t *factor_n, uint32_t *factor_k, uint32_t *factor_m, uint32_t *factor_p) +{ + uint64_t cur, best; + uint32_t n, k, m, p; + + best = 0; + *factor_n = 0; + *factor_k = 0; + *factor_m = 0; + *factor_p = 0; + + for (n = aw_clk_factor_get_min(&sc->n); n <= aw_clk_factor_get_max(&sc->n); ) { + for (k = aw_clk_factor_get_min(&sc->k); k <= aw_clk_factor_get_max(&sc->k); ) { + for (m = aw_clk_factor_get_min(&sc->m); m <= aw_clk_factor_get_max(&sc->m); ) { + for (p = aw_clk_factor_get_min(&sc->p); p <= aw_clk_factor_get_max(&sc->p); ) { + cur = (fparent * n * k) / (m * p); + if ((*fout - cur) < (*fout - best)) { + best = cur; + *factor_n = n; + *factor_k = k; + *factor_m = m; + *factor_p = p; + } + if (best == *fout) + return (best); + if ((sc->p.flags & AW_CLK_FACTOR_POWER_OF_TWO) != 0) + p <<= 1; + else + p++; + } + if ((sc->m.flags & AW_CLK_FACTOR_POWER_OF_TWO) != 0) + m <<= 1; + else + m++; + } + if ((sc->k.flags & AW_CLK_FACTOR_POWER_OF_TWO) != 0) + k <<= 1; + else + k++; + } + if ((sc->n.flags & AW_CLK_FACTOR_POWER_OF_TWO) != 0) + n <<= 1; + else + n++; + } + + return best; +} + +static void +aw_clk_nkmp_set_freq_scale(struct clknode *clk, struct aw_clk_nkmp_sc *sc, + uint32_t factor_n, uint32_t factor_k, uint32_t factor_m, uint32_t factor_p) +{ + uint32_t val, n, k, m, p; + int retry; + + DEVICE_LOCK(clk); + READ4(clk, sc->offset, &val); + + n = aw_clk_get_factor(val, &sc->n); + k = aw_clk_get_factor(val, &sc->k); + m = aw_clk_get_factor(val, &sc->m); + p = aw_clk_get_factor(val, &sc->p); + + if (p < factor_p) { + val &= ~sc->p.mask; + val |= aw_clk_factor_get_value(&sc->p, factor_p) << sc->p.shift; + WRITE4(clk, sc->offset, val); + DELAY(2000); + } + + if (m < factor_m) { + val &= ~sc->m.mask; + val |= aw_clk_factor_get_value(&sc->m, factor_m) << sc->m.shift; + WRITE4(clk, sc->offset, val); + DELAY(2000); + } + + val &= ~sc->n.mask; + val &= ~sc->k.mask; + val |= aw_clk_factor_get_value(&sc->n, factor_n) << sc->n.shift; + val |= aw_clk_factor_get_value(&sc->k, factor_k) << sc->k.shift; + WRITE4(clk, sc->offset, val); + DELAY(2000); + + if (m > factor_m) { + val &= ~sc->m.mask; + val |= aw_clk_factor_get_value(&sc->m, factor_m) << sc->m.shift; + WRITE4(clk, sc->offset, val); + DELAY(2000); + } + + if (p > factor_p) { + val &= ~sc->p.mask; + val |= aw_clk_factor_get_value(&sc->p, factor_p) << sc->p.shift; + WRITE4(clk, sc->offset, val); + DELAY(2000); + } + + if ((sc->flags & AW_CLK_HAS_LOCK) != 0) { + for (retry = 0; retry < sc->lock_retries; retry++) { + READ4(clk, sc->offset, &val); + if ((val & (1 << sc->lock_shift)) != 0) + break; + DELAY(1000); + } + } + + DEVICE_UNLOCK(clk); +} + +static int +aw_clk_nkmp_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, + int flags, int *stop) +{ + struct aw_clk_nkmp_sc *sc; + uint64_t best; + uint32_t val, best_n, best_k, best_m, best_p; + int retry; + + sc = clknode_get_softc(clk); + + best = aw_clk_nkmp_find_best(sc, fparent, fout, + &best_n, &best_k, &best_m, &best_p); + if ((flags & CLK_SET_DRYRUN) != 0) { + *fout = best; + *stop = 1; + return (0); + } + + if ((best < *fout) && + ((flags & CLK_SET_ROUND_DOWN) != 0)) { + *stop = 1; + return (ERANGE); + } + if ((best > *fout) && + ((flags & CLK_SET_ROUND_UP) != 0)) { + *stop = 1; + return (ERANGE); + } + + if ((sc->flags & AW_CLK_SCALE_CHANGE) != 0) + aw_clk_nkmp_set_freq_scale(clk, sc, + best_n, best_k, best_m, best_p); + else { + DEVICE_LOCK(clk); + READ4(clk, sc->offset, &val); + val &= ~sc->n.mask; + val &= ~sc->k.mask; + val &= ~sc->m.mask; + val &= ~sc->p.mask; + val |= aw_clk_factor_get_value(&sc->n, best_n) << sc->n.shift; + val |= aw_clk_factor_get_value(&sc->k, best_k) << sc->k.shift; + val |= aw_clk_factor_get_value(&sc->m, best_m) << sc->m.shift; + val |= aw_clk_factor_get_value(&sc->p, best_p) << sc->p.shift; + WRITE4(clk, sc->offset, val); + DELAY(2000); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Sun Feb 26 16:35:00 2017 Return-Path: Delivered-To: svn-src-all@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 2F427CEE405; Sun, 26 Feb 2017 16:35:00 +0000 (UTC) (envelope-from des@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 F0624AD5; Sun, 26 Feb 2017 16:34:59 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QGYxeW096719; Sun, 26 Feb 2017 16:34:59 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QGYxmB096718; Sun, 26 Feb 2017 16:34:59 GMT (envelope-from des@FreeBSD.org) Message-Id: <201702261634.v1QGYxmB096718@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Sun, 26 Feb 2017 16:34:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314304 - head/crypto/openssh X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 16:35:00 -0000 Author: des Date: Sun Feb 26 16:34:58 2017 New Revision: 314304 URL: https://svnweb.freebsd.org/changeset/base/314304 Log: Fix amusingly harmless mis-merge. Modified: head/crypto/openssh/readconf.c Modified: head/crypto/openssh/readconf.c ============================================================================== --- head/crypto/openssh/readconf.c Sun Feb 26 16:00:20 2017 (r314303) +++ head/crypto/openssh/readconf.c Sun Feb 26 16:34:58 2017 (r314304) @@ -319,7 +319,6 @@ add_local_forward(Options *options, cons #else ipport_reserved = IPPORT_RESERVED; #endif - if (newfwd->listen_port < ipport_reserved && original_real_uid != 0) if (newfwd->listen_port < ipport_reserved && original_real_uid != 0 && newfwd->listen_path == NULL) fatal("Privileged ports can only be forwarded by root."); From owner-svn-src-all@freebsd.org Sun Feb 26 17:37:47 2017 Return-Path: Delivered-To: svn-src-all@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 85F40CEE444 for ; Sun, 26 Feb 2017 17:37:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x22e.google.com (mail-io0-x22e.google.com [IPv6:2607:f8b0:4001:c06::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D2A0F51 for ; Sun, 26 Feb 2017 17:37:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x22e.google.com with SMTP id g18so19404731ioe.0 for ; Sun, 26 Feb 2017 09:37:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=Oy6OGawpdlV7LYNjELxEzN9rT4Nzpa2hoi4q2wcIz4A=; b=DDo9IgOLTy3eT6CJ4nYBvxtL1nqpJfiqbxwNokXEWcthb4DlPUdusm/sKTKJnDDHym Ns4+94kEjTCeHy6nb6yRxqxnq3UoI76clSwaE9usn7B3YyjPTIJktWwx2R/pvUnfn5Xl IP+k1PQQ2yM5Rm2SLtchfbFV9dRTbKZwWtJqP5z66j6B3Tqk1NcKjS7D/m1mw9a/nNcy 0egolUQw7yb4RXXLzxkISC55SKTHox3BF8YB0pYxt6VwdZ8tb9MXxY0bX5iNfTpy6PP3 kLYaW9rryiyYBu3CNO1ydAqXgEOCQryH5aa1xassaM+MuJ0KojCLTVqZAh3g54rgb4dv NB3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=Oy6OGawpdlV7LYNjELxEzN9rT4Nzpa2hoi4q2wcIz4A=; b=gsq+zMOF8n4GERuswXWPqDBoCcaBNtNq9z6cAGuGE6c91jbfRp9isBqtGcJiyZTtzz Hia1ab/B/hHPcLds7Al7dZF0hvLLTtBx3jeF0GLA64zy+OtGwtNm/aIvRnTZ689UGDVF //kxHxbSVhIzTIFkRoCZqCLhbyfVLk4aH/kaEgp1RLLrDmUhwR90Puv8G4LGYE0ylLaX sWndOhNROF68JuaL+DKeq/qDKixBTeV0u3CS9zBNHmWg2KG3mIdVlkP4hpbIcbn6BF85 omgR5unnwseQOTOR1Uad437AH/RE0OVWbKk0InR6Lr0ZjV8ds8UBKgBcqeEtQd3JPfHt 9WYA== X-Gm-Message-State: AMke39mGBluOfVbL+CJQsNbzY4PKU8jARY0cqRZt+Gvyc+eh/9Oh/vxsWbhKkYFcfELzzZ9k5H7LvZ4d/l812A== X-Received: by 10.107.11.216 with SMTP id 85mr11271146iol.0.1488130665612; Sun, 26 Feb 2017 09:37:45 -0800 (PST) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.145.132 with HTTP; Sun, 26 Feb 2017 09:37:45 -0800 (PST) X-Originating-IP: [50.253.99.174] In-Reply-To: <20170226124445.GE2092@kib.kiev.ua> References: <201702220707.v1M7764i020598@repo.freebsd.org> <20170223053954.J1044@besplex.bde.org> <20170224125335.GV2092@kib.kiev.ua> <20170225130549.C1026@besplex.bde.org> <20170225101543.GC2092@kib.kiev.ua> <20170226013936.S856@besplex.bde.org> <20170226124445.GE2092@kib.kiev.ua> From: Warner Losh Date: Sun, 26 Feb 2017 10:37:45 -0700 X-Google-Sender-Auth: ZqYlrp3Yw8xm7bvfBJj80IcbqX0 Message-ID: Subject: Re: svn commit: r314087 - head/sys/x86/x86 To: Konstantin Belousov Cc: Bruce Evans , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 17:37:47 -0000 On Sun, Feb 26, 2017 at 5:44 AM, Konstantin Belousov wrote: > On Sun, Feb 26, 2017 at 04:43:12AM +1100, Bruce Evans wrote: > 2.9 BSD was a port to PDP-11, AFAIK, with 16bit ints. A bit off topic, but 2BSD was basically[**] a continuation of Research Unix which started out life on the PDP-11 (well, OK, it started life in assembler on the PDP-7, but then was rewritten in C on the PDP-11). PDP-11 had 16-bit ints, 32-bit longs, 16-bit shorts, 16-bit pointers, 8-bit chars and 20-bit physical addresses. After 2.9, it also required weird things like separate I&D space where you could have a function pointer and a data pointer that had the same bit pattern, but referred to different objects because instruction space and address space were different (effectively giving 17-bits of address space, kinda). But you also had things like an overlay manager from hell that would page in different parts of the code if the program couldn't fit int 64k, and many of the limitations of the BSD 2.11 TCP stack were based on limitations of how deep you could do the overlays. It didn't have long longs. Or a compiler more modern than K&R[*]. Other than that, ULL vs explicit casts Warner [*] OK, gcc can produce pdp-11 output, even to this day. But it's far far to large to run on a pdp-11 natively. [**] Lots of cross pollination between BSD and Bell Labs is noted and documented extensively elsewhere. From owner-svn-src-all@freebsd.org Sun Feb 26 18:05:43 2017 Return-Path: Delivered-To: svn-src-all@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 7FB78CEEED1; Sun, 26 Feb 2017 18:05:43 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail.karels.net (mail.karels.net [63.231.190.5]) by mx1.freebsd.org (Postfix) with ESMTP id 0B38CAF8; Sun, 26 Feb 2017 18:05:42 +0000 (UTC) (envelope-from mike@karels.net) Received: from [10.0.2.11] (mjk-mac2.karels.net [10.0.2.11]) by mail.karels.net (8.15.2/8.15.2) with ESMTP id v1QI5e8k075070; Sun, 26 Feb 2017 12:05:40 -0600 (CST) (envelope-from mike@karels.net) From: "Mike Karels" To: "Konstantin Belousov" Cc: "Bruce Evans" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314087 - head/sys/x86/x86 Date: Sun, 26 Feb 2017 12:05:35 -0600 Message-ID: <84316203-3A73-44EC-93B0-400F0D3F335C@karels.net> In-Reply-To: <20170226124445.GE2092@kib.kiev.ua> References: <201702220707.v1M7764i020598@repo.freebsd.org> <20170223053954.J1044@besplex.bde.org> <20170224125335.GV2092@kib.kiev.ua> <20170225130549.C1026@besplex.bde.org> <20170225101543.GC2092@kib.kiev.ua> <20170226013936.S856@besplex.bde.org> <20170226124445.GE2092@kib.kiev.ua> MIME-Version: 1.0 X-Mailer: MailMate (1.9.6r5347) Content-Type: text/plain; format=flowed X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 18:05:43 -0000 Tangential, but: On 26 Feb 2017, at 6:44, Konstantin Belousov wrote: > On Sun, Feb 26, 2017 at 04:43:12AM +1100, Bruce Evans wrote: > 2.9 BSD was a port to PDP-11, AFAIK, with 16bit ints. All of the 2BSD systems ran on PDP-11 with 16-bit ints, as did Research versions 1 through 7th Edition. 2.9BSD just happens to be the version for which I was principal developer. I spent a lot of time back-porting from 4BSD (for the VAX), and int vs long was the main issue. Mike From owner-svn-src-all@freebsd.org Sun Feb 26 18:17:13 2017 Return-Path: Delivered-To: svn-src-all@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 9CA75CEE34D; Sun, 26 Feb 2017 18:17:13 +0000 (UTC) (envelope-from alc@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 694D21AC; Sun, 26 Feb 2017 18:17:13 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QIHCLl037745; Sun, 26 Feb 2017 18:17:12 GMT (envelope-from alc@FreeBSD.org) Received: (from alc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QIHCkG037744; Sun, 26 Feb 2017 18:17:12 GMT (envelope-from alc@FreeBSD.org) Message-Id: <201702261817.v1QIHCkG037744@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org using -f From: Alan Cox Date: Sun, 26 Feb 2017 18:17:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314305 - stable/11/sys/amd64/amd64 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 18:17:13 -0000 Author: alc Date: Sun Feb 26 18:17:12 2017 New Revision: 314305 URL: https://svnweb.freebsd.org/changeset/base/314305 Log: MFC r313960 In pmap_enter(), set the PG_MANAGED flag on the new PTE in one place, rather two places, and do so before the pmap lock is acquired. Modified: stable/11/sys/amd64/amd64/pmap.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/amd64/amd64/pmap.c ============================================================================== --- stable/11/sys/amd64/amd64/pmap.c Sun Feb 26 16:34:58 2017 (r314304) +++ stable/11/sys/amd64/amd64/pmap.c Sun Feb 26 18:17:12 2017 (r314305) @@ -4367,7 +4367,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, if ((m->oflags & VPO_UNMANAGED) != 0) { if ((newpte & PG_RW) != 0) newpte |= PG_M; - } + } else + newpte |= PG_MANAGED; mpte = NULL; @@ -4440,11 +4441,9 @@ retry: /* * No, might be a protection or wiring change. */ - if ((origpte & PG_MANAGED) != 0) { - newpte |= PG_MANAGED; - if ((newpte & PG_RW) != 0) - vm_page_aflag_set(m, PGA_WRITEABLE); - } + if ((origpte & PG_MANAGED) != 0 && + (newpte & PG_RW) != 0) + vm_page_aflag_set(m, PGA_WRITEABLE); if (((origpte ^ newpte) & ~(PG_M | PG_A)) == 0) goto unchanged; goto validate; @@ -4461,8 +4460,7 @@ retry: /* * Enter on the PV list if part of our managed memory. */ - if ((m->oflags & VPO_UNMANAGED) == 0) { - newpte |= PG_MANAGED; + if ((newpte & PG_MANAGED) != 0) { pv = get_pv_entry(pmap, &lock); pv->pv_va = va; CHANGE_PV_LIST_LOCK_TO_PHYS(&lock, pa); From owner-svn-src-all@freebsd.org Sun Feb 26 19:00:56 2017 Return-Path: Delivered-To: svn-src-all@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 59A0BCEEF18; Sun, 26 Feb 2017 19:00:56 +0000 (UTC) (envelope-from des@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 26A169B8; Sun, 26 Feb 2017 19:00:56 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QJ0tJH054508; Sun, 26 Feb 2017 19:00:55 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QJ0tRI054507; Sun, 26 Feb 2017 19:00:55 GMT (envelope-from des@FreeBSD.org) Message-Id: <201702261900.v1QJ0tRI054507@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Sun, 26 Feb 2017 19:00:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314306 - head/crypto/openssh X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 19:00:56 -0000 Author: des Date: Sun Feb 26 19:00:55 2017 New Revision: 314306 URL: https://svnweb.freebsd.org/changeset/base/314306 Log: Avoid picking up MIT Kerberos from ports (if installed). Modified: head/crypto/openssh/freebsd-configure.sh Modified: head/crypto/openssh/freebsd-configure.sh ============================================================================== --- head/crypto/openssh/freebsd-configure.sh Sun Feb 26 18:17:12 2017 (r314305) +++ head/crypto/openssh/freebsd-configure.sh Sun Feb 26 19:00:55 2017 (r314306) @@ -30,7 +30,7 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbi unset LD_LIBRARY_PATH # generate config.h with krb5 and stash it -sh configure $configure_args --with-kerberos5 +sh configure $configure_args --with-kerberos5=/usr mv config.log config.log.orig mv config.h config.h.orig From owner-svn-src-all@freebsd.org Sun Feb 26 19:23:05 2017 Return-Path: Delivered-To: svn-src-all@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 168A1CEE641; Sun, 26 Feb 2017 19:23:05 +0000 (UTC) (envelope-from mav@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 DA5AC96F; Sun, 26 Feb 2017 19:23:04 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QJN3Iw065229; Sun, 26 Feb 2017 19:23:03 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QJN3MJ065228; Sun, 26 Feb 2017 19:23:03 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201702261923.v1QJN3MJ065228@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sun, 26 Feb 2017 19:23:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314307 - head/sys/cam/ctl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 19:23:05 -0000 Author: mav Date: Sun Feb 26 19:23:03 2017 New Revision: 314307 URL: https://svnweb.freebsd.org/changeset/base/314307 Log: Add support for SIMs without autosense. If we asked to send sense data by setting CAM_SEND_SENSE, but SIM didn't confirm transmission by setting CAM_SENT_SENSE, assume it was not sent. Queue the I/O back to CTL for later REQUEST SENSE with ctl_queue_sense(). This is needed for error reporting on SPI HBAs like ahc(4)/ahd(4). MFC after: 2 weeks Modified: head/sys/cam/ctl/scsi_ctl.c Modified: head/sys/cam/ctl/scsi_ctl.c ============================================================================== --- head/sys/cam/ctl/scsi_ctl.c Sun Feb 26 19:00:55 2017 (r314306) +++ head/sys/cam/ctl/scsi_ctl.c Sun Feb 26 19:23:03 2017 (r314307) @@ -1223,6 +1223,20 @@ ctlfedone(struct cam_periph *periph, uni * datamove done routine. */ if ((io->io_hdr.flags & CTL_FLAG_DMA_INPROG) == 0) { + /* + * If we asked to send sense data but it wasn't sent, + * queue the I/O back to CTL for later REQUEST SENSE. + */ + if ((done_ccb->ccb_h.flags & CAM_SEND_SENSE) != 0 && + (done_ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP && + (done_ccb->ccb_h.status & CAM_SENT_SENSE) == 0 && + (io = ctl_alloc_io_nowait(bus_softc->port.ctl_pool_ref)) != NULL) { + PRIV_INFO(io) = PRIV_INFO( + (union ctl_io *)atio->ccb_h.io_ptr); + ctl_queue_sense(atio->ccb_h.io_ptr); + atio->ccb_h.io_ptr = io; + } + /* Abort ATIO if CTIO sending status has failed. */ if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { From owner-svn-src-all@freebsd.org Sun Feb 26 19:25:34 2017 Return-Path: Delivered-To: svn-src-all@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 AC0B4CEE6D5; Sun, 26 Feb 2017 19:25:34 +0000 (UTC) (envelope-from mav@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 7BB8FAB8; Sun, 26 Feb 2017 19:25:34 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QJPX7l065437; Sun, 26 Feb 2017 19:25:33 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QJPX2b065435; Sun, 26 Feb 2017 19:25:33 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201702261925.v1QJPX2b065435@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sun, 26 Feb 2017 19:25:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314308 - head/sys/dev/aic7xxx X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 19:25:34 -0000 Author: mav Date: Sun Feb 26 19:25:33 2017 New Revision: 314308 URL: https://svnweb.freebsd.org/changeset/base/314308 Log: Fix LUN enabling on wildcard target, as done by CTL. MFC after: 2 weeks Modified: head/sys/dev/aic7xxx/aic79xx.c head/sys/dev/aic7xxx/aic7xxx.c Modified: head/sys/dev/aic7xxx/aic79xx.c ============================================================================== --- head/sys/dev/aic7xxx/aic79xx.c Sun Feb 26 19:23:03 2017 (r314307) +++ head/sys/dev/aic7xxx/aic79xx.c Sun Feb 26 19:25:33 2017 (r314308) @@ -9918,7 +9918,8 @@ ahd_handle_en_lun(struct ahd_softc *ahd, u_int our_id; our_id = ahd->our_id; - if (ccb->ccb_h.target_id != our_id) { + if (ccb->ccb_h.target_id != our_id + && ccb->ccb_h.target_id != CAM_TARGET_WILDCARD) { if ((ahd->features & AHD_MULTI_TID) != 0 && (ahd->flags & AHD_INITIATORROLE) != 0) { /* Modified: head/sys/dev/aic7xxx/aic7xxx.c ============================================================================== --- head/sys/dev/aic7xxx/aic7xxx.c Sun Feb 26 19:23:03 2017 (r314307) +++ head/sys/dev/aic7xxx/aic7xxx.c Sun Feb 26 19:25:33 2017 (r314308) @@ -7347,7 +7347,8 @@ ahc_handle_en_lun(struct ahc_softc *ahc, else our_id = ahc->our_id_b; - if (ccb->ccb_h.target_id != our_id) { + if (ccb->ccb_h.target_id != our_id + && ccb->ccb_h.target_id != CAM_TARGET_WILDCARD) { /* * our_id represents our initiator ID, or * the ID of the first target to have an From owner-svn-src-all@freebsd.org Sun Feb 26 19:51:46 2017 Return-Path: Delivered-To: svn-src-all@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 48AB8CEEEC9; Sun, 26 Feb 2017 19:51:46 +0000 (UTC) (envelope-from dchagin@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 184A263B; Sun, 26 Feb 2017 19:51:46 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QJpjxV076539; Sun, 26 Feb 2017 19:51:45 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QJpjL8076517; Sun, 26 Feb 2017 19:51:45 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201702261951.v1QJpjL8076517@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sun, 26 Feb 2017 19:51:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314309 - head/sys/compat/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 19:51:46 -0000 Author: dchagin Date: Sun Feb 26 19:51:44 2017 New Revision: 314309 URL: https://svnweb.freebsd.org/changeset/base/314309 Log: Return EINVAL when an invalid file descriptor is specified. MFC after: 1 month Modified: head/sys/compat/linux/linux_event.c Modified: head/sys/compat/linux/linux_event.c ============================================================================== --- head/sys/compat/linux/linux_event.c Sun Feb 26 19:25:33 2017 (r314308) +++ head/sys/compat/linux/linux_event.c Sun Feb 26 19:51:44 2017 (r314309) @@ -462,8 +462,10 @@ linux_epoll_ctl(struct thread *td, struc cap_rights_init(&rights, CAP_KQUEUE_CHANGE), &epfp); if (error != 0) return (error); - if (epfp->f_type != DTYPE_KQUEUE) + if (epfp->f_type != DTYPE_KQUEUE) { + error = EINVAL; goto leave1; + } /* Protect user data vector from incorrectly supplied fd. */ error = fget(td, args->fd, cap_rights_init(&rights, CAP_POLL_EVENT), &fp); @@ -560,6 +562,10 @@ linux_epoll_wait_common(struct thread *t cap_rights_init(&rights, CAP_KQUEUE_EVENT), &epfp); if (error != 0) return (error); + if (epfp->f_type != DTYPE_KQUEUE) { + error = EINVAL; + goto leave; + } coargs.leventlist = events; coargs.p = td->td_proc; From owner-svn-src-all@freebsd.org Sun Feb 26 19:54:04 2017 Return-Path: Delivered-To: svn-src-all@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 41693CEEF71; Sun, 26 Feb 2017 19:54:04 +0000 (UTC) (envelope-from alc@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 03A68995; Sun, 26 Feb 2017 19:54:03 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QJs39b077065; Sun, 26 Feb 2017 19:54:03 GMT (envelope-from alc@FreeBSD.org) Received: (from alc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QJs2J4077061; Sun, 26 Feb 2017 19:54:02 GMT (envelope-from alc@FreeBSD.org) Message-Id: <201702261954.v1QJs2J4077061@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org using -f From: Alan Cox Date: Sun, 26 Feb 2017 19:54:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314310 - in head/sys: amd64/amd64 amd64/include i386/i386 i386/include X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 19:54:04 -0000 Author: alc Date: Sun Feb 26 19:54:02 2017 New Revision: 314310 URL: https://svnweb.freebsd.org/changeset/base/314310 Log: Refine the fix from r312954. Specifically, add a new PDE-only flag, PG_PROMOTED, that indicates whether lingering 4KB page mappings might need to be flushed on a PDE change that restricts or destroys a 2MB page mapping. This flag allows the pmap to avoid range invalidations that are both unnecessary and costly. Reviewed by: kib, markj MFC after: 6 weeks Differential Revision: https://reviews.freebsd.org/D9665 Modified: head/sys/amd64/amd64/pmap.c head/sys/amd64/include/pmap.h head/sys/i386/i386/pmap.c head/sys/i386/include/pmap.h Modified: head/sys/amd64/amd64/pmap.c ============================================================================== --- head/sys/amd64/amd64/pmap.c Sun Feb 26 19:51:44 2017 (r314309) +++ head/sys/amd64/amd64/pmap.c Sun Feb 26 19:54:02 2017 (r314310) @@ -613,6 +613,8 @@ static vm_page_t pmap_enter_quick_locked vm_page_t m, vm_prot_t prot, vm_page_t mpte, struct rwlock **lockp); static void pmap_fill_ptp(pt_entry_t *firstpte, pt_entry_t newpte); static int pmap_insert_pt_page(pmap_t pmap, vm_page_t mpte); +static void pmap_invalidate_pde_page(pmap_t pmap, vm_offset_t va, + pd_entry_t pde); static void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode); static void pmap_pde_attr(pd_entry_t *pde, int cache_bits, int mask); static void pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, @@ -1838,6 +1840,27 @@ pmap_update_pde(pmap_t pmap, vm_offset_t } #endif /* !SMP */ +static void +pmap_invalidate_pde_page(pmap_t pmap, vm_offset_t va, pd_entry_t pde) +{ + + /* + * When the PDE has PG_PROMOTED set, the 2MB page mapping was created + * by a promotion that did not invalidate the 512 4KB page mappings + * that might exist in the TLB. Consequently, at this point, the TLB + * may hold both 4KB and 2MB page mappings for the address range [va, + * va + NBPDR). Therefore, the entire range must be invalidated here. + * In contrast, when PG_PROMOTED is clear, the TLB will not hold any + * 4KB page mappings for the address range [va, va + NBPDR), and so a + * single INVLPG suffices to invalidate the 2MB page mapping from the + * TLB. + */ + if ((pde & PG_PROMOTED) != 0) + pmap_invalidate_range(pmap, va, va + NBPDR - 1); + else + pmap_invalidate_page(pmap, va); +} + #define PMAP_CLFLUSH_THRESHOLD (2 * 1024 * 1024) void @@ -3472,7 +3495,8 @@ pmap_demote_pde_locked(pmap_t pmap, pd_e SLIST_INIT(&free); sva = trunc_2mpage(va); pmap_remove_pde(pmap, pde, sva, &free, lockp); - pmap_invalidate_range(pmap, sva, sva + NBPDR - 1); + if ((oldpde & PG_G) == 0) + pmap_invalidate_pde_page(pmap, sva, oldpde); pmap_free_zero_pages(&free); CTR2(KTR_PMAP, "pmap_demote_pde: failure for va %#lx" " in pmap %p", va, pmap); @@ -3612,25 +3636,8 @@ pmap_remove_pde(pmap_t pmap, pd_entry_t oldpde = pte_load_clear(pdq); if (oldpde & PG_W) pmap->pm_stats.wired_count -= NBPDR / PAGE_SIZE; - - /* - * When workaround_erratum383 is false, a promotion to a 2M - * page mapping does not invalidate the 512 4K page mappings - * from the TLB. Consequently, at this point, the TLB may - * hold both 4K and 2M page mappings. Therefore, the entire - * range of addresses must be invalidated here. In contrast, - * when workaround_erratum383 is true, a promotion does - * invalidate the 512 4K page mappings, and so a single INVLPG - * suffices to invalidate the 2M page mapping. - */ - if ((oldpde & PG_G) != 0) { - if (workaround_erratum383) - pmap_invalidate_page(kernel_pmap, sva); - else - pmap_invalidate_range(kernel_pmap, sva, - sva + NBPDR - 1); - } - + if ((oldpde & PG_G) != 0) + pmap_invalidate_pde_page(kernel_pmap, sva, oldpde); pmap_resident_count_dec(pmap, NBPDR / PAGE_SIZE); if (oldpde & PG_MANAGED) { CHANGE_PV_LIST_LOCK_TO_PHYS(lockp, oldpde & PG_PS_FRAME); @@ -4010,16 +4017,16 @@ retry: if ((prot & VM_PROT_EXECUTE) == 0) newpde |= pg_nx; if (newpde != oldpde) { - if (!atomic_cmpset_long(pde, oldpde, newpde)) + /* + * As an optimization to future operations on this PDE, clear + * PG_PROMOTED. The impending invalidation will remove any + * lingering 4KB page mappings from the TLB. + */ + if (!atomic_cmpset_long(pde, oldpde, newpde & ~PG_PROMOTED)) goto retry; - if (oldpde & PG_G) { - /* See pmap_remove_pde() for explanation. */ - if (workaround_erratum383) - pmap_invalidate_page(kernel_pmap, sva); - else - pmap_invalidate_range(kernel_pmap, sva, - sva + NBPDR - 1); - } else + if ((oldpde & PG_G) != 0) + pmap_invalidate_pde_page(kernel_pmap, sva, oldpde); + else anychanged = TRUE; } return (anychanged); @@ -4272,7 +4279,7 @@ setpte: if (workaround_erratum383) pmap_update_pde(pmap, va, pde, PG_PS | newpde); else - pde_store(pde, PG_PS | newpde); + pde_store(pde, PG_PROMOTED | PG_PS | newpde); atomic_add_long(&pmap_pde_promotions, 1); CTR2(KTR_PMAP, "pmap_promote_pde: success for va %#lx" @@ -4585,7 +4592,8 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t pmap_resident_count_inc(pmap, NBPDR / PAGE_SIZE); /* - * Map the superpage. + * Map the superpage. (This is not a promoted mapping; there will not + * be any lingering 4KB page mappings in the TLB.) */ pde_store(pde, newpde); Modified: head/sys/amd64/include/pmap.h ============================================================================== --- head/sys/amd64/include/pmap.h Sun Feb 26 19:51:44 2017 (r314309) +++ head/sys/amd64/include/pmap.h Sun Feb 26 19:54:02 2017 (r314310) @@ -109,6 +109,7 @@ #define PG_MANAGED X86_PG_AVAIL2 #define EPT_PG_EMUL_V X86_PG_AVAIL(52) #define EPT_PG_EMUL_RW X86_PG_AVAIL(53) +#define PG_PROMOTED X86_PG_AVAIL(54) /* PDE only */ #define PG_FRAME (0x000ffffffffff000ul) #define PG_PS_FRAME (0x000fffffffe00000ul) Modified: head/sys/i386/i386/pmap.c ============================================================================== --- head/sys/i386/i386/pmap.c Sun Feb 26 19:51:44 2017 (r314309) +++ head/sys/i386/i386/pmap.c Sun Feb 26 19:54:02 2017 (r314310) @@ -301,6 +301,8 @@ static vm_page_t pmap_enter_quick_locked vm_page_t m, vm_prot_t prot, vm_page_t mpte); static void pmap_flush_page(vm_page_t m); static int pmap_insert_pt_page(pmap_t pmap, vm_page_t mpte); +static void pmap_invalidate_pde_page(pmap_t pmap, vm_offset_t va, + pd_entry_t pde); static void pmap_fill_ptp(pt_entry_t *firstpte, pt_entry_t newpte); static boolean_t pmap_is_modified_pvh(struct md_page *pvh); static boolean_t pmap_is_referenced_pvh(struct md_page *pvh); @@ -1259,6 +1261,27 @@ pmap_update_pde(pmap_t pmap, vm_offset_t } #endif /* !SMP */ +static void +pmap_invalidate_pde_page(pmap_t pmap, vm_offset_t va, pd_entry_t pde) +{ + + /* + * When the PDE has PG_PROMOTED set, the 2- or 4MB page mapping was + * created by a promotion that did not invalidate the 512 or 1024 4KB + * page mappings that might exist in the TLB. Consequently, at this + * point, the TLB may hold both 4KB and 2- or 4MB page mappings for + * the address range [va, va + NBPDR). Therefore, the entire range + * must be invalidated here. In contrast, when PG_PROMOTED is clear, + * the TLB will not hold any 4KB page mappings for the address range + * [va, va + NBPDR), and so a single INVLPG suffices to invalidate the + * 2- or 4MB page mapping from the TLB. + */ + if ((pde & PG_PROMOTED) != 0) + pmap_invalidate_range(pmap, va, va + NBPDR - 1); + else + pmap_invalidate_page(pmap, va); +} + #define PMAP_CLFLUSH_THRESHOLD (2 * 1024 * 1024) void @@ -2649,7 +2672,8 @@ pmap_demote_pde(pmap_t pmap, pd_entry_t SLIST_INIT(&free); sva = trunc_4mpage(va); pmap_remove_pde(pmap, pde, sva, &free); - pmap_invalidate_range(pmap, sva, sva + NBPDR - 1); + if ((oldpde & PG_G) == 0) + pmap_invalidate_pde_page(pmap, sva, oldpde); pmap_free_zero_pages(&free); CTR2(KTR_PMAP, "pmap_demote_pde: failure for va %#x" " in pmap %p", va, pmap); @@ -2819,23 +2843,9 @@ pmap_remove_pde(pmap_t pmap, pd_entry_t /* * Machines that don't support invlpg, also don't support * PG_G. - * - * When workaround_erratum383 is false, a promotion to a 2M/4M - * page mapping does not invalidate the 512/1024 4K page mappings - * from the TLB. Consequently, at this point, the TLB may - * hold both 4K and 2M/4M page mappings. Therefore, the entire - * range of addresses must be invalidated here. In contrast, - * when workaround_erratum383 is true, a promotion does - * invalidate the 512/1024 4K page mappings, and so a single INVLPG - * suffices to invalidate the 2M/4M page mapping. - */ - if ((oldpde & PG_G) != 0) { - if (workaround_erratum383) - pmap_invalidate_page(kernel_pmap, sva); - else - pmap_invalidate_range(kernel_pmap, sva, - sva + NBPDR - 1); - } + */ + if ((oldpde & PG_G) != 0) + pmap_invalidate_pde_page(kernel_pmap, sva, oldpde); pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE; if (oldpde & PG_MANAGED) { @@ -3143,16 +3153,16 @@ retry: newpde |= pg_nx; #endif if (newpde != oldpde) { - if (!pde_cmpset(pde, oldpde, newpde)) + /* + * As an optimization to future operations on this PDE, clear + * PG_PROMOTED. The impending invalidation will remove any + * lingering 4KB page mappings from the TLB. + */ + if (!pde_cmpset(pde, oldpde, newpde & ~PG_PROMOTED)) goto retry; - if (oldpde & PG_G) { - /* See pmap_remove_pde() for explanation. */ - if (workaround_erratum383) - pmap_invalidate_page(kernel_pmap, sva); - else - pmap_invalidate_range(kernel_pmap, sva, - sva + NBPDR - 1); - } else + if ((oldpde & PG_G) != 0) + pmap_invalidate_pde_page(kernel_pmap, sva, oldpde); + else anychanged = TRUE; } return (anychanged); @@ -3437,9 +3447,9 @@ setpte: if (workaround_erratum383) pmap_update_pde(pmap, va, pde, PG_PS | newpde); else if (pmap == kernel_pmap) - pmap_kenter_pde(va, PG_PS | newpde); + pmap_kenter_pde(va, PG_PROMOTED | PG_PS | newpde); else - pde_store(pde, PG_PS | newpde); + pde_store(pde, PG_PROMOTED | PG_PS | newpde); pmap_pde_promotions++; CTR2(KTR_PMAP, "pmap_promote_pde: success for va %#x" @@ -3722,7 +3732,8 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t pmap->pm_stats.resident_count += NBPDR / PAGE_SIZE; /* - * Map the superpage. + * Map the superpage. (This is not a promoted mapping; there will not + * be any lingering 4KB page mappings in the TLB.) */ pde_store(pde, newpde); Modified: head/sys/i386/include/pmap.h ============================================================================== --- head/sys/i386/include/pmap.h Sun Feb 26 19:51:44 2017 (r314309) +++ head/sys/i386/include/pmap.h Sun Feb 26 19:54:02 2017 (r314310) @@ -71,6 +71,7 @@ /* Our various interpretations of the above */ #define PG_W PG_AVAIL1 /* "Wired" pseudoflag */ #define PG_MANAGED PG_AVAIL2 +#define PG_PROMOTED PG_AVAIL3 /* PDE only */ #if defined(PAE) || defined(PAE_TABLES) #define PG_FRAME (0x000ffffffffff000ull) #define PG_PS_FRAME (0x000fffffffe00000ull) From owner-svn-src-all@freebsd.org Sun Feb 26 19:54:18 2017 Return-Path: Delivered-To: svn-src-all@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 A0BEECEEFA7; Sun, 26 Feb 2017 19:54:18 +0000 (UTC) (envelope-from dchagin@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 5534FA79; Sun, 26 Feb 2017 19:54:18 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QJsHt0077118; Sun, 26 Feb 2017 19:54:17 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QJsHl8077117; Sun, 26 Feb 2017 19:54:17 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201702261954.v1QJsHl8077117@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sun, 26 Feb 2017 19:54:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314311 - head/sys/compat/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 19:54:18 -0000 Author: dchagin Date: Sun Feb 26 19:54:17 2017 New Revision: 314311 URL: https://svnweb.freebsd.org/changeset/base/314311 Log: Restore signal mask in epoll_pwait. MFC after: 1 month Modified: head/sys/compat/linux/linux_event.c Modified: head/sys/compat/linux/linux_event.c ============================================================================== --- head/sys/compat/linux/linux_event.c Sun Feb 26 19:54:02 2017 (r314310) +++ head/sys/compat/linux/linux_event.c Sun Feb 26 19:54:17 2017 (r314311) @@ -530,23 +530,32 @@ static int linux_epoll_wait_common(struct thread *td, int epfd, struct epoll_event *events, int maxevents, int timeout, sigset_t *uset) { - struct file *epfp; - struct timespec ts, *tsp; - cap_rights_t rights; struct epoll_copyout_args coargs; struct kevent_copyops k_ops = { &coargs, epoll_kev_copyout, NULL}; + struct timespec ts, *tsp; + cap_rights_t rights; + struct file *epfp; + sigset_t omask; int error; if (maxevents <= 0 || maxevents > LINUX_MAX_EVENTS) return (EINVAL); + error = fget(td, epfd, + cap_rights_init(&rights, CAP_KQUEUE_EVENT), &epfp); + if (error != 0) + return (error); + if (epfp->f_type != DTYPE_KQUEUE) { + error = EINVAL; + goto leave1; + } if (uset != NULL) { error = kern_sigprocmask(td, SIG_SETMASK, uset, - &td->td_oldsigmask, 0); + &omask, 0); if (error != 0) - return (error); + goto leave1; td->td_pflags |= TDP_OLDMASK; /* * Make sure that ast() is called on return to @@ -558,14 +567,6 @@ linux_epoll_wait_common(struct thread *t thread_unlock(td); } - error = fget(td, epfd, - cap_rights_init(&rights, CAP_KQUEUE_EVENT), &epfp); - if (error != 0) - return (error); - if (epfp->f_type != DTYPE_KQUEUE) { - error = EINVAL; - goto leave; - } coargs.leventlist = events; coargs.p = td->td_proc; @@ -575,7 +576,7 @@ linux_epoll_wait_common(struct thread *t if (timeout != -1) { if (timeout < 0) { error = EINVAL; - goto leave; + goto leave0; } /* Convert from milliseconds to timespec. */ ts.tv_sec = timeout / 1000; @@ -595,7 +596,12 @@ linux_epoll_wait_common(struct thread *t */ if (error == 0) td->td_retval[0] = coargs.count; -leave: + +leave0: + if (uset != NULL) + error = kern_sigprocmask(td, SIG_SETMASK, &omask, + NULL, 0); +leave1: fdrop(epfp, td); return (error); } From owner-svn-src-all@freebsd.org Sun Feb 26 19:57:19 2017 Return-Path: Delivered-To: svn-src-all@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 B875DCEE09E; Sun, 26 Feb 2017 19:57:19 +0000 (UTC) (envelope-from dchagin@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 76E74C90; Sun, 26 Feb 2017 19:57:19 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QJvIKi077301; Sun, 26 Feb 2017 19:57:18 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QJvIBS077298; Sun, 26 Feb 2017 19:57:18 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201702261957.v1QJvIBS077298@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sun, 26 Feb 2017 19:57:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314312 - in head/sys: amd64/linux amd64/linux32 i386/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 19:57:19 -0000 Author: dchagin Date: Sun Feb 26 19:57:18 2017 New Revision: 314312 URL: https://svnweb.freebsd.org/changeset/base/314312 Log: Change Linux epoll_pwait syscall definition to match Linux actual one. MFC after: 1 month Modified: head/sys/amd64/linux/syscalls.master head/sys/amd64/linux32/syscalls.master head/sys/i386/linux/syscalls.master Modified: head/sys/amd64/linux/syscalls.master ============================================================================== --- head/sys/amd64/linux/syscalls.master Sun Feb 26 19:54:17 2017 (r314311) +++ head/sys/amd64/linux/syscalls.master Sun Feb 26 19:57:18 2017 (r314312) @@ -473,7 +473,8 @@ 280 AUE_FUTIMESAT STD { int linux_utimensat(l_int dfd, const char *pathname, \ const struct l_timespec *times, l_int flags); } 281 AUE_NULL STD { int linux_epoll_pwait(l_int epfd, struct epoll_event *events, \ - l_int maxevents, l_int timeout, l_sigset_t *mask); } + l_int maxevents, l_int timeout, l_sigset_t *mask, \ + l_size_t sigsetsize); } 282 AUE_NULL STD { int linux_signalfd(void); } 283 AUE_NULL STD { int linux_timerfd_create(l_int clockid, l_int flags); } 284 AUE_NULL STD { int linux_eventfd(l_uint initval); } Modified: head/sys/amd64/linux32/syscalls.master ============================================================================== --- head/sys/amd64/linux32/syscalls.master Sun Feb 26 19:54:17 2017 (r314311) +++ head/sys/amd64/linux32/syscalls.master Sun Feb 26 19:57:18 2017 (r314312) @@ -533,7 +533,8 @@ ; linux 2.6.19: 318 AUE_NULL STD { int linux_getcpu(void); } 319 AUE_NULL STD { int linux_epoll_pwait(l_int epfd, struct epoll_event *events, \ - l_int maxevents, l_int timeout, l_sigset_t *mask); } + l_int maxevents, l_int timeout, l_sigset_t *mask, \ + l_size_t sigsetsize); } ; linux 2.6.22: 320 AUE_FUTIMESAT STD { int linux_utimensat(l_int dfd, const char *pathname, \ const struct l_timespec *times, l_int flags); } Modified: head/sys/i386/linux/syscalls.master ============================================================================== --- head/sys/i386/linux/syscalls.master Sun Feb 26 19:54:17 2017 (r314311) +++ head/sys/i386/linux/syscalls.master Sun Feb 26 19:57:18 2017 (r314312) @@ -541,7 +541,8 @@ ; linux 2.6.19: 318 AUE_NULL STD { int linux_getcpu(void); } 319 AUE_NULL STD { int linux_epoll_pwait(l_int epfd, struct epoll_event *events, \ - l_int maxevents, l_int timeout, l_sigset_t *mask); } + l_int maxevents, l_int timeout, l_sigset_t *mask, \ + l_size_t sigsetsize); } ; linux 2.6.22: 320 AUE_FUTIMESAT STD { int linux_utimensat(l_int dfd, const char *pathname, \ const struct l_timespec *times, l_int flags); } From owner-svn-src-all@freebsd.org Sun Feb 26 19:59:30 2017 Return-Path: Delivered-To: svn-src-all@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 640B7CEE173; Sun, 26 Feb 2017 19:59:30 +0000 (UTC) (envelope-from dchagin@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 25E6EF89; Sun, 26 Feb 2017 19:59:30 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QJxTT3077434; Sun, 26 Feb 2017 19:59:29 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QJxSYD077427; Sun, 26 Feb 2017 19:59:28 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201702261959.v1QJxSYD077427@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sun, 26 Feb 2017 19:59:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314313 - in head/sys: amd64/linux amd64/linux32 i386/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 19:59:30 -0000 Author: dchagin Date: Sun Feb 26 19:59:28 2017 New Revision: 314313 URL: https://svnweb.freebsd.org/changeset/base/314313 Log: Regen for r314312 (Linux epoll_pwait). MFC after: 1 month Modified: head/sys/amd64/linux/linux_proto.h head/sys/amd64/linux/linux_systrace_args.c head/sys/amd64/linux32/linux32_proto.h head/sys/amd64/linux32/linux32_systrace_args.c head/sys/i386/linux/linux_proto.h head/sys/i386/linux/linux_systrace_args.c Modified: head/sys/amd64/linux/linux_proto.h ============================================================================== --- head/sys/amd64/linux/linux_proto.h Sun Feb 26 19:57:18 2017 (r314312) +++ head/sys/amd64/linux/linux_proto.h Sun Feb 26 19:59:28 2017 (r314313) @@ -995,6 +995,7 @@ struct linux_epoll_pwait_args { char maxevents_l_[PADL_(l_int)]; l_int maxevents; char maxevents_r_[PADR_(l_int)]; char timeout_l_[PADL_(l_int)]; l_int timeout; char timeout_r_[PADR_(l_int)]; char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; + char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_signalfd_args { register_t dummy; Modified: head/sys/amd64/linux/linux_systrace_args.c ============================================================================== --- head/sys/amd64/linux/linux_systrace_args.c Sun Feb 26 19:57:18 2017 (r314312) +++ head/sys/amd64/linux/linux_systrace_args.c Sun Feb 26 19:59:28 2017 (r314313) @@ -2068,7 +2068,8 @@ systrace_args(int sysnum, void *params, iarg[2] = p->maxevents; /* l_int */ iarg[3] = p->timeout; /* l_int */ uarg[4] = (intptr_t) p->mask; /* l_sigset_t * */ - *n_args = 5; + iarg[5] = p->sigsetsize; /* l_size_t */ + *n_args = 6; break; } /* linux_signalfd */ @@ -5646,6 +5647,9 @@ systrace_entry_setargdesc(int sysnum, in case 4: p = "userland l_sigset_t *"; break; + case 5: + p = "l_size_t"; + break; default: break; }; Modified: head/sys/amd64/linux32/linux32_proto.h ============================================================================== --- head/sys/amd64/linux32/linux32_proto.h Sun Feb 26 19:57:18 2017 (r314312) +++ head/sys/amd64/linux32/linux32_proto.h Sun Feb 26 19:59:28 2017 (r314313) @@ -1051,6 +1051,7 @@ struct linux_epoll_pwait_args { char maxevents_l_[PADL_(l_int)]; l_int maxevents; char maxevents_r_[PADR_(l_int)]; char timeout_l_[PADL_(l_int)]; l_int timeout; char timeout_r_[PADR_(l_int)]; char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; + char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_utimensat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; Modified: head/sys/amd64/linux32/linux32_systrace_args.c ============================================================================== --- head/sys/amd64/linux32/linux32_systrace_args.c Sun Feb 26 19:57:18 2017 (r314312) +++ head/sys/amd64/linux32/linux32_systrace_args.c Sun Feb 26 19:59:28 2017 (r314313) @@ -2169,7 +2169,8 @@ systrace_args(int sysnum, void *params, iarg[2] = p->maxevents; /* l_int */ iarg[3] = p->timeout; /* l_int */ uarg[4] = (intptr_t) p->mask; /* l_sigset_t * */ - *n_args = 5; + iarg[5] = p->sigsetsize; /* l_size_t */ + *n_args = 6; break; } /* linux_utimensat */ @@ -5981,6 +5982,9 @@ systrace_entry_setargdesc(int sysnum, in case 4: p = "userland l_sigset_t *"; break; + case 5: + p = "l_size_t"; + break; default: break; }; Modified: head/sys/i386/linux/linux_proto.h ============================================================================== --- head/sys/i386/linux/linux_proto.h Sun Feb 26 19:57:18 2017 (r314312) +++ head/sys/i386/linux/linux_proto.h Sun Feb 26 19:59:28 2017 (r314313) @@ -1069,6 +1069,7 @@ struct linux_epoll_pwait_args { char maxevents_l_[PADL_(l_int)]; l_int maxevents; char maxevents_r_[PADR_(l_int)]; char timeout_l_[PADL_(l_int)]; l_int timeout; char timeout_r_[PADR_(l_int)]; char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; + char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_utimensat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; Modified: head/sys/i386/linux/linux_systrace_args.c ============================================================================== --- head/sys/i386/linux/linux_systrace_args.c Sun Feb 26 19:57:18 2017 (r314312) +++ head/sys/i386/linux/linux_systrace_args.c Sun Feb 26 19:59:28 2017 (r314313) @@ -2245,7 +2245,8 @@ systrace_args(int sysnum, void *params, iarg[2] = p->maxevents; /* l_int */ iarg[3] = p->timeout; /* l_int */ uarg[4] = (intptr_t) p->mask; /* l_sigset_t * */ - *n_args = 5; + iarg[5] = p->sigsetsize; /* l_size_t */ + *n_args = 6; break; } /* linux_utimensat */ @@ -6212,6 +6213,9 @@ systrace_entry_setargdesc(int sysnum, in case 4: p = "userland l_sigset_t *"; break; + case 5: + p = "l_size_t"; + break; default: break; }; From owner-svn-src-all@freebsd.org Sun Feb 26 20:02:00 2017 Return-Path: Delivered-To: svn-src-all@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 503B3CEE34B; Sun, 26 Feb 2017 20:02:00 +0000 (UTC) (envelope-from dchagin@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 18FAA387; Sun, 26 Feb 2017 20:02:00 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QK1xGr079684; Sun, 26 Feb 2017 20:01:59 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QK1xOB079683; Sun, 26 Feb 2017 20:01:59 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201702262001.v1QK1xOB079683@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sun, 26 Feb 2017 20:01:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314314 - head/sys/compat/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 20:02:00 -0000 Author: dchagin Date: Sun Feb 26 20:01:58 2017 New Revision: 314314 URL: https://svnweb.freebsd.org/changeset/base/314314 Log: Return EINVAL in case when an invalid size of signal mask specified. MFC after: 1 month Modified: head/sys/compat/linux/linux_event.c Modified: head/sys/compat/linux/linux_event.c ============================================================================== --- head/sys/compat/linux/linux_event.c Sun Feb 26 19:59:28 2017 (r314313) +++ head/sys/compat/linux/linux_event.c Sun Feb 26 20:01:58 2017 (r314314) @@ -622,6 +622,8 @@ linux_epoll_pwait(struct thread *td, str int error; if (args->mask != NULL) { + if (args->sigsetsize != sizeof(l_sigset_t)) + return (EINVAL); error = copyin(args->mask, &lmask, sizeof(l_sigset_t)); if (error != 0) return (error); From owner-svn-src-all@freebsd.org Sun Feb 26 20:49:37 2017 Return-Path: Delivered-To: svn-src-all@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 F34FCCEC13C; Sun, 26 Feb 2017 20:49:37 +0000 (UTC) (envelope-from avos@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 B7C1EBB3; Sun, 26 Feb 2017 20:49:37 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QKnaxU096828; Sun, 26 Feb 2017 20:49:36 GMT (envelope-from avos@FreeBSD.org) Received: (from avos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QKnZAc096812; Sun, 26 Feb 2017 20:49:35 GMT (envelope-from avos@FreeBSD.org) Message-Id: <201702262049.v1QKnZAc096812@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avos set sender to avos@FreeBSD.org using -f From: Andriy Voskoboinyk Date: Sun, 26 Feb 2017 20:49:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314315 - in head/sys/dev: bwi bwn iwm iwn otus ral rtwn usb/wlan wpi X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 20:49:38 -0000 Author: avos Date: Sun Feb 26 20:49:35 2017 New Revision: 314315 URL: https://svnweb.freebsd.org/changeset/base/314315 Log: net80211 drivers: fix rate setup for EAPOL frames, obtain Tx parameters directly from the node. - Use ni_txparms directly instead of calculating them manually every time - Move M_EAPOL flag check upper; otherwise it may be skipped due to 'ucastrate' / 'mcastrate' check - Use 'mgtrate' for control frames too (see ifconfig(8), mgtrate parameter) - Add few more M_EAPOL checks where it was missing (zyd(4), ural(4), urtw(4)) - Few unrelated cleanups Tested with: - Intel 6205 (iwn(4)), STA mode; - WUSB54GC (rum(4)), HOSTAP mode + RTL8188EU (rtwn(4)), STA mode. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D9811 Modified: head/sys/dev/bwi/if_bwi.c head/sys/dev/bwn/if_bwn.c head/sys/dev/iwm/if_iwm.c head/sys/dev/iwn/if_iwn.c head/sys/dev/otus/if_otus.c head/sys/dev/ral/rt2560.c head/sys/dev/ral/rt2661.c head/sys/dev/ral/rt2860.c head/sys/dev/rtwn/if_rtwn_tx.c head/sys/dev/usb/wlan/if_rum.c head/sys/dev/usb/wlan/if_run.c head/sys/dev/usb/wlan/if_ural.c head/sys/dev/usb/wlan/if_urtw.c head/sys/dev/usb/wlan/if_zyd.c head/sys/dev/wpi/if_wpi.c Modified: head/sys/dev/bwi/if_bwi.c ============================================================================== --- head/sys/dev/bwi/if_bwi.c Sun Feb 26 20:01:58 2017 (r314314) +++ head/sys/dev/bwi/if_bwi.c Sun Feb 26 20:49:35 2017 (r314315) @@ -2930,7 +2930,7 @@ bwi_encap(struct bwi_softc *sc, int idx, struct bwi_mac *mac; struct bwi_txbuf_hdr *hdr; struct ieee80211_frame *wh; - const struct ieee80211_txparam *tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; uint8_t rate, rate_fb; uint32_t mac_ctrl; uint16_t phy_ctrl; @@ -2955,7 +2955,6 @@ bwi_encap(struct bwi_softc *sc, int idx, /* * Find TX rate */ - tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)]; if (type != IEEE80211_FC0_TYPE_DATA || (m->m_flags & M_EAPOL)) { rate = rate_fb = tp->mgmtrate; } else if (ismcast) { Modified: head/sys/dev/bwn/if_bwn.c ============================================================================== --- head/sys/dev/bwn/if_bwn.c Sun Feb 26 20:01:58 2017 (r314314) +++ head/sys/dev/bwn/if_bwn.c Sun Feb 26 20:49:35 2017 (r314315) @@ -6189,7 +6189,7 @@ bwn_set_txhdr(struct bwn_mac *mac, struc struct ieee80211_frame *protwh; struct ieee80211_frame_cts *cts; struct ieee80211_frame_rts *rts; - const struct ieee80211_txparam *tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = &sc->sc_ic; struct mbuf *mprot; @@ -6214,7 +6214,6 @@ bwn_set_txhdr(struct bwn_mac *mac, struc /* * Find TX rate */ - tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)]; if (type != IEEE80211_FC0_TYPE_DATA || (m->m_flags & M_EAPOL)) rate = rate_fb = tp->mgmtrate; else if (ismcast) Modified: head/sys/dev/iwm/if_iwm.c ============================================================================== --- head/sys/dev/iwm/if_iwm.c Sun Feb 26 20:01:58 2017 (r314314) +++ head/sys/dev/iwm/if_iwm.c Sun Feb 26 20:49:35 2017 (r314315) @@ -3549,7 +3549,9 @@ iwm_tx_fill_cmd(struct iwm_softc *sc, st tx->rts_retry_limit = IWM_RTS_DFAULT_RETRY_LIMIT; tx->data_retry_limit = IWM_DEFAULT_TX_RETRY; - if (type == IEEE80211_FC0_TYPE_MGT) { + if (type == IEEE80211_FC0_TYPE_MGT || + type == IEEE80211_FC0_TYPE_CTL || + (m->m_flags & M_EAPOL) != 0) { ridx = iwm_tx_rateidx_global_lookup(sc, tp->mgmtrate); IWM_DPRINTF(sc, IWM_DEBUG_TXRATE, "%s: MGT (%d)\n", __func__, tp->mgmtrate); @@ -3561,11 +3563,7 @@ iwm_tx_fill_cmd(struct iwm_softc *sc, st ridx = iwm_tx_rateidx_global_lookup(sc, tp->ucastrate); IWM_DPRINTF(sc, IWM_DEBUG_TXRATE, "%s: FIXED_RATE (%d)\n", __func__, tp->ucastrate); - } else if (m->m_flags & M_EAPOL) { - ridx = iwm_tx_rateidx_global_lookup(sc, tp->mgmtrate); - IWM_DPRINTF(sc, IWM_DEBUG_TXRATE, - "%s: EAPOL\n", __func__); - } else if (type == IEEE80211_FC0_TYPE_DATA) { + } else { int i; /* for data frames, use RS table */ @@ -3582,10 +3580,6 @@ iwm_tx_fill_cmd(struct iwm_softc *sc, st IWM_DPRINTF(sc, IWM_DEBUG_XMIT | IWM_DEBUG_TXRATE, "%s: start with i=%d, txrate %d\n", __func__, i, iwm_rates[ridx].rate); - } else { - ridx = iwm_tx_rateidx_global_lookup(sc, tp->mgmtrate); - IWM_DPRINTF(sc, IWM_DEBUG_TXRATE, "%s: DEFAULT (%d)\n", - __func__, tp->mgmtrate); } IWM_DPRINTF(sc, IWM_DEBUG_XMIT | IWM_DEBUG_TXRATE, Modified: head/sys/dev/iwn/if_iwn.c ============================================================================== --- head/sys/dev/iwn/if_iwn.c Sun Feb 26 20:01:58 2017 (r314314) +++ head/sys/dev/iwn/if_iwn.c Sun Feb 26 20:49:35 2017 (r314315) @@ -4370,7 +4370,7 @@ static int iwn_tx_data(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni) { struct iwn_ops *ops = &sc->ops; - const struct ieee80211_txparam *tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; struct iwn_node *wn = (void *)ni; @@ -4449,15 +4449,14 @@ iwn_tx_data(struct iwn_softc *sc, struct data = &ring->data[ring->cur]; /* Choose a TX rate index. */ - tp = &vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)]; - if (type == IEEE80211_FC0_TYPE_MGT) + if (type == IEEE80211_FC0_TYPE_MGT || + type == IEEE80211_FC0_TYPE_CTL || + (m->m_flags & M_EAPOL) != 0) rate = tp->mgmtrate; else if (IEEE80211_IS_MULTICAST(wh->i_addr1)) rate = tp->mcastrate; else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) rate = tp->ucastrate; - else if (m->m_flags & M_EAPOL) - rate = tp->mgmtrate; else { /* XXX pass pktlen */ (void) ieee80211_ratectl_rate(ni, NULL, 0); Modified: head/sys/dev/otus/if_otus.c ============================================================================== --- head/sys/dev/otus/if_otus.c Sun Feb 26 20:01:58 2017 (r314314) +++ head/sys/dev/otus/if_otus.c Sun Feb 26 20:49:35 2017 (r314315) @@ -2231,11 +2231,11 @@ otus_tx(struct otus_softc *sc, struct ie /* Pickup a rate index. */ if (params != NULL) { rate = otus_rate_to_hw_rate(sc, params->ibp_rate0); - } else if (IEEE80211_IS_MULTICAST(wh->i_addr1) || - (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) != IEEE80211_FC0_TYPE_DATA) { + } else if (m->m_flags & M_EAPOL) { /* Get lowest rate */ rate = otus_rate_to_hw_rate(sc, 0); - } else if (m->m_flags & M_EAPOL) { + } else if (IEEE80211_IS_MULTICAST(wh->i_addr1) || + (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) != IEEE80211_FC0_TYPE_DATA) { /* Get lowest rate */ rate = otus_rate_to_hw_rate(sc, 0); } else { Modified: head/sys/dev/ral/rt2560.c ============================================================================== --- head/sys/dev/ral/rt2560.c Sun Feb 26 20:01:58 2017 (r314314) +++ head/sys/dev/ral/rt2560.c Sun Feb 26 20:49:35 2017 (r314315) @@ -1518,7 +1518,7 @@ rt2560_tx_mgt(struct rt2560_softc *sc, s desc = &sc->prioq.desc[sc->prioq.cur]; data = &sc->prioq.data[sc->prioq.cur]; - rate = vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)].mgmtrate; + rate = ni->ni_txparms->mgmtrate; wh = mtod(m0, struct ieee80211_frame *); @@ -1746,7 +1746,7 @@ rt2560_tx_data(struct rt2560_softc *sc, struct rt2560_tx_desc *desc; struct rt2560_tx_data *data; struct ieee80211_frame *wh; - const struct ieee80211_txparam *tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; struct ieee80211_key *k; struct mbuf *mnew; bus_dma_segment_t segs[RT2560_MAX_SCATTER]; @@ -1756,11 +1756,10 @@ rt2560_tx_data(struct rt2560_softc *sc, wh = mtod(m0, struct ieee80211_frame *); - tp = &vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)]; - if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { - rate = tp->mcastrate; - } else if (m0->m_flags & M_EAPOL) { + if (m0->m_flags & M_EAPOL) { rate = tp->mgmtrate; + } else if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { + rate = tp->mcastrate; } else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) { rate = tp->ucastrate; } else { Modified: head/sys/dev/ral/rt2661.c ============================================================================== --- head/sys/dev/ral/rt2661.c Sun Feb 26 20:01:58 2017 (r314314) +++ head/sys/dev/ral/rt2661.c Sun Feb 26 20:49:35 2017 (r314315) @@ -1286,7 +1286,7 @@ rt2661_tx_mgt(struct rt2661_softc *sc, s desc = &sc->mgtq.desc[sc->mgtq.cur]; data = &sc->mgtq.data[sc->mgtq.cur]; - rate = vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)].mgmtrate; + rate = ni->ni_txparms->mgmtrate; wh = mtod(m0, struct ieee80211_frame *); @@ -1435,7 +1435,7 @@ rt2661_tx_data(struct rt2661_softc *sc, struct rt2661_tx_desc *desc; struct rt2661_tx_data *data; struct ieee80211_frame *wh; - const struct ieee80211_txparam *tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; struct ieee80211_key *k; const struct chanAccParams *cap; struct mbuf *mnew; @@ -1446,11 +1446,10 @@ rt2661_tx_data(struct rt2661_softc *sc, wh = mtod(m0, struct ieee80211_frame *); - tp = &vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)]; - if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { - rate = tp->mcastrate; - } else if (m0->m_flags & M_EAPOL) { + if (m0->m_flags & M_EAPOL) { rate = tp->mgmtrate; + } else if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { + rate = tp->mcastrate; } else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) { rate = tp->ucastrate; } else { Modified: head/sys/dev/ral/rt2860.c ============================================================================== --- head/sys/dev/ral/rt2860.c Sun Feb 26 20:01:58 2017 (r314314) +++ head/sys/dev/ral/rt2860.c Sun Feb 26 20:49:35 2017 (r314315) @@ -1459,7 +1459,7 @@ rt2860_tx(struct rt2860_softc *sc, struc struct rt2860_txd *txd; struct rt2860_txwi *txwi; struct ieee80211_frame *wh; - const struct ieee80211_txparam *tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; struct ieee80211_key *k; struct mbuf *m1; bus_dma_segment_t segs[RT2860_MAX_SCATTER]; @@ -1488,11 +1488,10 @@ rt2860_tx(struct rt2860_softc *sc, struc hdrlen = ieee80211_anyhdrsize(wh); type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK; - tp = &vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)]; - if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { - rate = tp->mcastrate; - } else if (m->m_flags & M_EAPOL) { + if (m->m_flags & M_EAPOL) { rate = tp->mgmtrate; + } else if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { + rate = tp->mcastrate; } else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) { rate = tp->ucastrate; } else { Modified: head/sys/dev/rtwn/if_rtwn_tx.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn_tx.c Sun Feb 26 20:01:58 2017 (r314314) +++ head/sys/dev/rtwn/if_rtwn_tx.c Sun Feb 26 20:49:35 2017 (r314315) @@ -112,17 +112,16 @@ static int rtwn_tx_data(struct rtwn_softc *sc, struct ieee80211_node *ni, struct mbuf *m) { - const struct ieee80211_txparam *tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; struct ieee80211com *ic = &sc->sc_ic; struct ieee80211vap *vap = ni->ni_vap; struct ieee80211_key *k = NULL; - struct ieee80211_channel *chan; struct ieee80211_frame *wh; struct rtwn_tx_desc_common *txd; struct rtwn_tx_buf buf; uint8_t rate, ridx, type; u_int cipher; - int ismcast, maxretry; + int ismcast; RTWN_ASSERT_LOCKED(sc); @@ -130,20 +129,15 @@ rtwn_tx_data(struct rtwn_softc *sc, stru type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK; ismcast = IEEE80211_IS_MULTICAST(wh->i_addr1); - chan = (ni->ni_chan != IEEE80211_CHAN_ANYC) ? - ni->ni_chan : ic->ic_curchan; - tp = &vap->iv_txparms[ieee80211_chan2mode(chan)]; - maxretry = tp->maxretry; - /* Choose a TX rate index. */ - if (type == IEEE80211_FC0_TYPE_MGT) + if (type == IEEE80211_FC0_TYPE_MGT || + type == IEEE80211_FC0_TYPE_CTL || + (m->m_flags & M_EAPOL) != 0) rate = tp->mgmtrate; else if (ismcast) rate = tp->mcastrate; else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) rate = tp->ucastrate; - else if (m->m_flags & M_EAPOL) - rate = tp->mgmtrate; else { if (sc->sc_ratectl == RTWN_RATECTL_NET80211) { /* XXX pass pktlen */ @@ -181,7 +175,7 @@ rtwn_tx_data(struct rtwn_softc *sc, stru memset(txd, 0, sc->txdesc_len); txd->txdw1 = htole32(SM(RTWN_TXDW1_CIPHER, rtwn_get_cipher(cipher))); - rtwn_fill_tx_desc(sc, ni, m, txd, ridx, maxretry); + rtwn_fill_tx_desc(sc, ni, m, txd, ridx, tp->maxretry); if (ieee80211_radiotap_active_vap(vap)) { struct rtwn_tx_radiotap_header *tap = &sc->sc_txtap; Modified: head/sys/dev/usb/wlan/if_rum.c ============================================================================== --- head/sys/dev/usb/wlan/if_rum.c Sun Feb 26 20:01:58 2017 (r314314) +++ head/sys/dev/usb/wlan/if_rum.c Sun Feb 26 20:49:35 2017 (r314315) @@ -1503,11 +1503,10 @@ rum_tx_crypto_flags(struct rum_softc *sc static int rum_tx_mgt(struct rum_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) { - struct ieee80211vap *vap = ni->ni_vap; + const struct ieee80211_txparam *tp = ni->ni_txparms; struct ieee80211com *ic = &sc->sc_ic; struct rum_tx_data *data; struct ieee80211_frame *wh; - const struct ieee80211_txparam *tp; struct ieee80211_key *k = NULL; uint32_t flags = 0; uint16_t dur; @@ -1537,8 +1536,6 @@ rum_tx_mgt(struct rum_softc *sc, struct wh = mtod(m0, struct ieee80211_frame *); } - tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)]; - if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) { flags |= RT2573_TX_NEED_ACK; @@ -1642,7 +1639,7 @@ rum_tx_data(struct rum_softc *sc, struct struct ieee80211com *ic = &sc->sc_ic; struct rum_tx_data *data; struct ieee80211_frame *wh; - const struct ieee80211_txparam *tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; struct ieee80211_key *k = NULL; uint32_t flags = 0; uint16_t dur; @@ -1661,13 +1658,12 @@ rum_tx_data(struct rum_softc *sc, struct qos = 0; ac = M_WME_GETAC(m0); - tp = &vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)]; - if (IEEE80211_IS_MULTICAST(wh->i_addr1)) + if (m0->m_flags & M_EAPOL) + rate = tp->mgmtrate; + else if (IEEE80211_IS_MULTICAST(wh->i_addr1)) rate = tp->mcastrate; else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) rate = tp->ucastrate; - else if (m0->m_flags & M_EAPOL) - rate = tp->mgmtrate; else { (void) ieee80211_ratectl_rate(ni, NULL, 0); rate = ni->ni_txrate; @@ -2190,12 +2186,11 @@ rum_set_chan(struct rum_softc *sc, struc static void rum_set_maxretry(struct rum_softc *sc, struct ieee80211vap *vap) { - const struct ieee80211_txparam *tp; struct ieee80211_node *ni = vap->iv_bss; + const struct ieee80211_txparam *tp = ni->ni_txparms; struct rum_vap *rvp = RUM_VAP(vap); - tp = &vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)]; - rvp->maxretry = tp->maxretry < 0xf ? tp->maxretry : 0xf; + rvp->maxretry = MIN(tp->maxretry, 0xf); rum_modbits(sc, RT2573_TXRX_CSR4, RT2573_SHORT_RETRY(rvp->maxretry) | RT2573_LONG_RETRY(rvp->maxretry), Modified: head/sys/dev/usb/wlan/if_run.c ============================================================================== --- head/sys/dev/usb/wlan/if_run.c Sun Feb 26 20:01:58 2017 (r314314) +++ head/sys/dev/usb/wlan/if_run.c Sun Feb 26 20:49:35 2017 (r314315) @@ -3310,8 +3310,7 @@ run_tx(struct run_softc *sc, struct mbuf struct ieee80211com *ic = &sc->sc_ic; struct ieee80211vap *vap = ni->ni_vap; struct ieee80211_frame *wh; - struct ieee80211_channel *chan; - const struct ieee80211_txparam *tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; struct run_node *rn = RUN_NODE(ni); struct run_tx_data *data; struct rt2870_txd *txd; @@ -3360,9 +3359,6 @@ run_tx(struct run_softc *sc, struct mbuf RUN_DPRINTF(sc, RUN_DEBUG_XMIT, "qos %d\tqid %d\ttid %d\tqflags %x\n", qos, qid, tid, qflags); - chan = (ni->ni_chan != IEEE80211_CHAN_ANYC)?ni->ni_chan:ic->ic_curchan; - tp = &vap->iv_txparms[ieee80211_chan2mode(chan)]; - /* pickup a rate index */ if (IEEE80211_IS_MULTICAST(wh->i_addr1) || type != IEEE80211_FC0_TYPE_DATA || m->m_flags & M_EAPOL) { Modified: head/sys/dev/usb/wlan/if_ural.c ============================================================================== --- head/sys/dev/usb/wlan/if_ural.c Sun Feb 26 20:01:58 2017 (r314314) +++ head/sys/dev/usb/wlan/if_ural.c Sun Feb 26 20:49:35 2017 (r314315) @@ -1070,9 +1070,8 @@ ural_tx_bcn(struct ural_softc *sc, struc static int ural_tx_mgt(struct ural_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) { - struct ieee80211vap *vap = ni->ni_vap; + const struct ieee80211_txparam *tp = ni->ni_txparms; struct ieee80211com *ic = ni->ni_ic; - const struct ieee80211_txparam *tp; struct ural_tx_data *data; struct ieee80211_frame *wh; struct ieee80211_key *k; @@ -1085,8 +1084,6 @@ ural_tx_mgt(struct ural_softc *sc, struc STAILQ_REMOVE_HEAD(&sc->tx_free, next); sc->tx_nfree--; - tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)]; - wh = mtod(m0, struct ieee80211_frame *); if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) { k = ieee80211_crypto_encap(ni, m0); @@ -1239,7 +1236,7 @@ ural_tx_data(struct ural_softc *sc, stru struct ieee80211com *ic = ni->ni_ic; struct ural_tx_data *data; struct ieee80211_frame *wh; - const struct ieee80211_txparam *tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; struct ieee80211_key *k; uint32_t flags = 0; uint16_t dur; @@ -1249,8 +1246,9 @@ ural_tx_data(struct ural_softc *sc, stru wh = mtod(m0, struct ieee80211_frame *); - tp = &vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)]; - if (IEEE80211_IS_MULTICAST(wh->i_addr1)) + if (m0->m_flags & M_EAPOL) + rate = tp->mgmtrate; + else if (IEEE80211_IS_MULTICAST(wh->i_addr1)) rate = tp->mcastrate; else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) rate = tp->ucastrate; Modified: head/sys/dev/usb/wlan/if_urtw.c ============================================================================== --- head/sys/dev/usb/wlan/if_urtw.c Sun Feb 26 20:01:58 2017 (r314314) +++ head/sys/dev/usb/wlan/if_urtw.c Sun Feb 26 20:49:35 2017 (r314315) @@ -1643,7 +1643,7 @@ urtw_tx_start(struct urtw_softc *sc, str { struct ieee80211_frame *wh = mtod(m0, struct ieee80211_frame *); struct ieee80211_key *k; - const struct ieee80211_txparam *tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; struct ieee80211com *ic = &sc->sc_ic; struct ieee80211vap *vap = ni->ni_vap; struct usb_xfer *rtl8187b_pipes[URTW_8187B_TXPIPE_MAX] = { @@ -1690,11 +1690,10 @@ urtw_tx_start(struct urtw_softc *sc, str } if ((wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_MGT || - (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_CTL) { - tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)]; + (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_CTL || + (m0->m_flags & M_EAPOL) != 0) { rate = tp->mgmtrate; } else { - tp = &vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)]; /* for data frames */ if (IEEE80211_IS_MULTICAST(wh->i_addr1)) rate = tp->mcastrate; Modified: head/sys/dev/usb/wlan/if_zyd.c ============================================================================== --- head/sys/dev/usb/wlan/if_zyd.c Sun Feb 26 20:01:58 2017 (r314314) +++ head/sys/dev/usb/wlan/if_zyd.c Sun Feb 26 20:49:35 2017 (r314315) @@ -2439,7 +2439,7 @@ zyd_tx_start(struct zyd_softc *sc, struc struct zyd_tx_desc *desc; struct zyd_tx_data *data; struct ieee80211_frame *wh; - const struct ieee80211_txparam *tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; struct ieee80211_key *k; int rate, totlen; static const uint8_t ratediv[] = ZYD_TX_RATEDIV; @@ -2453,11 +2453,10 @@ zyd_tx_start(struct zyd_softc *sc, struc sc->tx_nfree--; if ((wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_MGT || - (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_CTL) { - tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)]; + (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_CTL || + (m0->m_flags & M_EAPOL) != 0) { rate = tp->mgmtrate; } else { - tp = &vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)]; /* for data frames */ if (IEEE80211_IS_MULTICAST(wh->i_addr1)) rate = tp->mcastrate; Modified: head/sys/dev/wpi/if_wpi.c ============================================================================== --- head/sys/dev/wpi/if_wpi.c Sun Feb 26 20:01:58 2017 (r314314) +++ head/sys/dev/wpi/if_wpi.c Sun Feb 26 20:49:35 2017 (r314315) @@ -2784,11 +2784,10 @@ end: DPRINTF(sc, WPI_DEBUG_TRACE, error static int wpi_tx_data(struct wpi_softc *sc, struct mbuf *m, struct ieee80211_node *ni) { - const struct ieee80211_txparam *tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; struct wpi_node *wn = WPI_NODE(ni); - struct ieee80211_channel *chan; struct ieee80211_frame *wh; struct ieee80211_key *k = NULL; struct wpi_buf tx_data; @@ -2813,19 +2812,15 @@ wpi_tx_data(struct wpi_softc *sc, struct } ac = M_WME_GETAC(m); - chan = (ni->ni_chan != IEEE80211_CHAN_ANYC) ? - ni->ni_chan : ic->ic_curchan; - tp = &vap->iv_txparms[ieee80211_chan2mode(chan)]; - /* Choose a TX rate index. */ - if (type == IEEE80211_FC0_TYPE_MGT) + if (type == IEEE80211_FC0_TYPE_MGT || + type == IEEE80211_FC0_TYPE_CTL || + (m->m_flags & M_EAPOL) != 0) rate = tp->mgmtrate; else if (ismcast) rate = tp->mcastrate; else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) rate = tp->ucastrate; - else if (m->m_flags & M_EAPOL) - rate = tp->mgmtrate; else { /* XXX pass pktlen */ (void) ieee80211_ratectl_rate(ni, NULL, 0); From owner-svn-src-all@freebsd.org Sun Feb 26 20:56:52 2017 Return-Path: Delivered-To: svn-src-all@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 49B43CEC4AA; Sun, 26 Feb 2017 20:56:52 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail107.syd.optusnet.com.au (mail107.syd.optusnet.com.au [211.29.132.53]) by mx1.freebsd.org (Postfix) with ESMTP id D469D11E; Sun, 26 Feb 2017 20:56:51 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from besplex.bde.org (c122-106-153-191.carlnfd1.nsw.optusnet.com.au [122.106.153.191]) by mail107.syd.optusnet.com.au (Postfix) with ESMTPS id E1C6AD41C5F; Mon, 27 Feb 2017 07:56:42 +1100 (AEDT) Date: Mon, 27 Feb 2017 07:56:42 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Dmitry Chagin cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314293 - head/sys/compat/linux In-Reply-To: <201702260940.v1Q9egOq029307@repo.freebsd.org> Message-ID: <20170227070338.X992@besplex.bde.org> References: <201702260940.v1Q9egOq029307@repo.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.2 cv=VbSHBBh9 c=1 sm=1 tr=0 a=Tj3pCpwHnMupdyZSltBt7Q==:117 a=Tj3pCpwHnMupdyZSltBt7Q==:17 a=kj9zAlcOel0A:10 a=xh91hpXy2ZdKNyyoVj0A:9 a=CjuIK1q_8ugA:10 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 20:56:52 -0000 On Sun, 26 Feb 2017, Dmitry Chagin wrote: > Log: > Return EOVERFLOW error in case then the size of tv_sec field of struct timespec > in COMPAT_LINUX32 Linuxulator's not equal to the size of native tv_sec. This has several bugs, and it is silly to check the range of times (where overflow can't happen occurs for normal times) while blindly truncating security-related things like uids (where overflow happens for normal uids). > Modified: head/sys/compat/linux/linux_time.c > ============================================================================== > --- head/sys/compat/linux/linux_time.c Sun Feb 26 09:37:25 2017 (r314292) > +++ head/sys/compat/linux/linux_time.c Sun Feb 26 09:40:42 2017 (r314293) > ... > -void > +int > native_to_linux_timespec(struct l_timespec *ltp, struct timespec *ntp) > { > > LIN_SDT_PROBE2(time, native_to_linux_timespec, entry, ltp, ntp); > - > +#ifdef COMPAT_LINUX32 > + if (ntp->tv_sec > INT_MAX && This doesn't use the parametrization that l_time_t is l_long = int32_t when COMPAT_LINUX32, but uses an ugly ifdef, then assumes than int == int32_t. > + sizeof(ltp->tv_sec) != sizeof(ntp->tv_sec)) > + return (EOVERFLOW); > +#endif Negative values are not checked for, so overflow can still occur. Sometimes negative values overlow to a positive value(e.g., bit pattern 0x8000000000000001 -> 1 in 2's complement. Other times they overflow to a negative value (e.g., 0x8000000080000001 -> 0x80000001 in 2's complement). Overflowing values are very unlikely, and the check doesn't prevent them. E.g., even COMPAT_32 APIs might set a time to 0x7fffffff. The time overflows to INT32_MIN 1 second later on 32-bit kernels. The kernel shouldn't allow setting such times, but does. It is left to the user to avoid this foot- shooting. Since setting critical times is privileged, the user usually doesn't do this. On 64-bit kernels, setting such times works and no overflow occurs for native times, but unsuspecting 32-bit applications are broken, so again it is left to privileged users to avoid this foot- shooting (now for 32-bit feet). Similarly for negative times. They are even less useful than times after 32-bit time_t overflows, but in some cases they are not errors so must not be rejected or blindly truncated by conversion functions. Overflow of tv_nsec is not checked for. It really can't happen, since although native time_t is required to be long by historical mistakes, and long might tbe 64 bits or larger, on values between 0 and 10**9-1 are valid for it, and these are representable by 32-bit long. This depends on the conversion function only being from native times which are presumably already active so have been checked for validity. uids overflow routinely. E.g., the error uid is (uid_t)-1 = 0xffffffff and blind truncation of this in linux_uid16.c overflows to 0xffff which is the 16-bit error uid (uid16_t)-1. But 0xffff = 65535 is a valid native uid. The valid native uid 0x10000 overflows to 0 (root). The valid native uid 0xfffffffe (nobody for nfs) overflows to 0xfffe (nobody). Bruce From owner-svn-src-all@freebsd.org Sun Feb 26 21:24:37 2017 Return-Path: Delivered-To: svn-src-all@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 4395FCED804; Sun, 26 Feb 2017 21:24:37 +0000 (UTC) (envelope-from pfg@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 107991D58; Sun, 26 Feb 2017 21:24:36 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QLOanR012422; Sun, 26 Feb 2017 21:24:36 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QLOawO012421; Sun, 26 Feb 2017 21:24:36 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201702262124.v1QLOawO012421@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sun, 26 Feb 2017 21:24:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314316 - head/usr.bin/dc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 21:24:37 -0000 Author: pfg Date: Sun Feb 26 21:24:35 2017 New Revision: 314316 URL: https://svnweb.freebsd.org/changeset/base/314316 Log: dc(1): Catch up with OpenBSD tag. OpenBSD rev 1.12 corresponds to our SVN r275162. Update the tag to make easier future updates. No functional change. MFC after: 3 days Modified: head/usr.bin/dc/stack.c Modified: head/usr.bin/dc/stack.c ============================================================================== --- head/usr.bin/dc/stack.c Sun Feb 26 20:49:35 2017 (r314315) +++ head/usr.bin/dc/stack.c Sun Feb 26 21:24:35 2017 (r314316) @@ -1,4 +1,4 @@ -/* $OpenBSD: stack.c,v 1.11 2009/10/27 23:59:37 deraadt Exp $ */ +/* $OpenBSD: stack.c,v 1.12 2014/11/26 15:05:51 otto Exp $ */ /* * Copyright (c) 2003, Otto Moerbeek From owner-svn-src-all@freebsd.org Sun Feb 26 21:33:20 2017 Return-Path: Delivered-To: svn-src-all@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 8A4CECEDAE9; Sun, 26 Feb 2017 21:33:20 +0000 (UTC) (envelope-from imp@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 4870B23F; Sun, 26 Feb 2017 21:33:20 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QLXJww016296; Sun, 26 Feb 2017 21:33:19 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QLXIPD016289; Sun, 26 Feb 2017 21:33:18 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201702262133.v1QLXIPD016289@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sun, 26 Feb 2017 21:33:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314317 - in head/sys: mips/nlm mips/rmi powerpc/powermac sparc64/pci X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 21:33:20 -0000 Author: imp Date: Sun Feb 26 21:33:18 2017 New Revision: 314317 URL: https://svnweb.freebsd.org/changeset/base/314317 Log: Include pcib_private.h for prototypes. Noticed by: rpokala@ Sponsored by: Netflix Modified: head/sys/mips/nlm/xlp_pci.c head/sys/mips/rmi/xlr_pci.c head/sys/powerpc/powermac/cpcht.c head/sys/sparc64/pci/fire.c head/sys/sparc64/pci/psycho.c head/sys/sparc64/pci/schizo.c Modified: head/sys/mips/nlm/xlp_pci.c ============================================================================== --- head/sys/mips/nlm/xlp_pci.c Sun Feb 26 21:24:35 2017 (r314316) +++ head/sys/mips/nlm/xlp_pci.c Sun Feb 26 21:33:18 2017 (r314317) @@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$"); #include #include "pcib_if.h" +#include #include "pci_if.h" static int Modified: head/sys/mips/rmi/xlr_pci.c ============================================================================== --- head/sys/mips/rmi/xlr_pci.c Sun Feb 26 21:24:35 2017 (r314316) +++ head/sys/mips/rmi/xlr_pci.c Sun Feb 26 21:33:18 2017 (r314317) @@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$"); #include #include "pcib_if.h" +#include #define pci_cfg_offset(bus,slot,devfn,where) (((bus)<<16) + ((slot) << 11)+((devfn)<<8)+(where)) #define PCIE_LINK_STATE 0x4000 Modified: head/sys/powerpc/powermac/cpcht.c ============================================================================== --- head/sys/powerpc/powermac/cpcht.c Sun Feb 26 21:24:35 2017 (r314316) +++ head/sys/powerpc/powermac/cpcht.c Sun Feb 26 21:33:18 2017 (r314317) @@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$"); #include #include "pcib_if.h" +#include #include "pic_if.h" /* Modified: head/sys/sparc64/pci/fire.c ============================================================================== --- head/sys/sparc64/pci/fire.c Sun Feb 26 21:24:35 2017 (r314316) +++ head/sys/sparc64/pci/fire.c Sun Feb 26 21:33:18 2017 (r314317) @@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include Modified: head/sys/sparc64/pci/psycho.c ============================================================================== --- head/sys/sparc64/pci/psycho.c Sun Feb 26 21:24:35 2017 (r314316) +++ head/sys/sparc64/pci/psycho.c Sun Feb 26 21:33:18 2017 (r314317) @@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include Modified: head/sys/sparc64/pci/schizo.c ============================================================================== --- head/sys/sparc64/pci/schizo.c Sun Feb 26 21:24:35 2017 (r314316) +++ head/sys/sparc64/pci/schizo.c Sun Feb 26 21:33:18 2017 (r314317) @@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include From owner-svn-src-all@freebsd.org Sun Feb 26 21:49:44 2017 Return-Path: Delivered-To: svn-src-all@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 9F82BCEDF42; Sun, 26 Feb 2017 21:49:44 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from CAN01-TO1-obe.outbound.protection.outlook.com (mail-eopbgr670052.outbound.protection.outlook.com [40.107.67.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "Microsoft IT SSL SHA2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 55EB8CBF; Sun, 26 Feb 2017 21:49:43 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from YTXPR01MB0189.CANPRD01.PROD.OUTLOOK.COM (10.165.218.133) by YTXPR01MB0192.CANPRD01.PROD.OUTLOOK.COM (10.165.218.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Sun, 26 Feb 2017 21:49:41 +0000 Received: from YTXPR01MB0189.CANPRD01.PROD.OUTLOOK.COM ([10.165.218.133]) by YTXPR01MB0189.CANPRD01.PROD.OUTLOOK.COM ([10.165.218.133]) with mapi id 15.01.0933.019; Sun, 26 Feb 2017 21:49:40 +0000 From: Rick Macklem To: Warner Losh , Konstantin Belousov CC: Bruce Evans , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r314087 - head/sys/x86/x86 Thread-Topic: svn commit: r314087 - head/sys/x86/x86 Thread-Index: AQHSjxW+6zE+Xzm5AUyCge+66sryE6F5ghKAgAB9BwCAAT7ygIAAUd2AgABDYJ0= Date: Sun, 26 Feb 2017 21:49:40 +0000 Message-ID: References: <201702220707.v1M7764i020598@repo.freebsd.org> <20170223053954.J1044@besplex.bde.org> <20170224125335.GV2092@kib.kiev.ua> <20170225130549.C1026@besplex.bde.org> <20170225101543.GC2092@kib.kiev.ua> <20170226013936.S856@besplex.bde.org> <20170226124445.GE2092@kib.kiev.ua>, In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=rmacklem@uoguelph.ca; x-ms-office365-filtering-correlation-id: 2a337576-83c4-4ea9-e5f8-08d45e915e23 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:YTXPR01MB0192; x-microsoft-exchange-diagnostics: 1; YTXPR01MB0192; 7:graWERc5RcYLiRzBavdBIsqW/GO/D7yBvufESydDJs7yx7kPgH2VqM4NREeUFiWLNcO5xBNsAvYMhNP77J9tyxUnKXvuf+oRvJOBazOoazydw8pD4tyVzftZbDTnA44mPARBetLqkxuIoVDUawfif+/CUf+mXP95rFny7f8AxBtja8CgAlCf/rqohSYk9V8+wIJY0oo1C2NQrLIfqvdioH93DP6gyXQiogVG1biKHiD7A/UqImydMcAxmI7yqhFkanakKsQmWquUZB9GntLiu1HwkcZMwaI/rGXKUOH5tSdumKIkmJLUhXL8Ycw/7Y9OvVXmY5B7Yhoe1K9eErUstg== x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040375)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6041248)(20161123558025)(20161123555025)(20161123560025)(20161123564025)(20161123562025)(6072148); SRVR:YTXPR01MB0192; BCL:0; PCL:0; RULEID:; SRVR:YTXPR01MB0192; x-forefront-prvs: 0230B09AC4 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6009001)(7916002)(39450400003)(377454003)(24454002)(199003)(189002)(7696004)(53936002)(2950100002)(33656002)(97736004)(53546006)(305945005)(8936002)(39060400002)(38730400002)(6246003)(81166006)(81156014)(8676002)(55016002)(68736007)(189998001)(9686003)(92566002)(122556002)(54906002)(93886004)(2900100001)(106116001)(6506006)(106356001)(76176999)(50986999)(54356999)(74482002)(101416001)(74316002)(6436002)(5660300001)(86362001)(3660700001)(102836003)(3280700002)(4326007)(2906002)(77096006)(105586002)(229853002); DIR:OUT; SFP:1101; SCL:1; SRVR:YTXPR01MB0192; H:YTXPR01MB0189.CANPRD01.PROD.OUTLOOK.COM; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: uoguelph.ca does not designate permitted sender hosts) spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: uoguelph.ca X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Feb 2017 21:49:40.7981 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: be62a12b-2cad-49a1-a5fa-85f4f3156a7d X-MS-Exchange-Transport-CrossTenantHeadersStamped: YTXPR01MB0192 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 21:49:44 -0000 Warner Losh wrote: > On Sun, Feb 26, 2017 at 5:44 AM, Konstantin Belousov wrote: > > On Sun, Feb 26, 2017 at 04:43:12AM +1100, Bruce Evans wrote: > > 2.9 BSD was a port to PDP-11, AFAIK, with 16bit ints. > > A bit off topic, but 2BSD was basically[**] a continuation of Research > Unix which started out life on the PDP-11 (well, OK, it started life > in assembler on the PDP-7, but then was rewritten in C on the PDP-11). More off topic...this C was defined by Dennis Richie (sp?) and I heard him once say "ANSI C isn't a bad language, but it isn't C". It didn't have "uns= igned int" because he noted that a "char *" behaved the same, so why is it needed? > Or a compiler more modern than K&R[*]. I could be wrong (lost my K&R C book long ago), but I think K&R had: char - 1byte short - 2bytes long - 4 bytes long long - 8bytes int - whatever the arch preferred, with a minimum of 2bytes (And, yes, Brian did disagree with Dennis and added "unsigned".) Personally, I think "long" should have remained 4bytes on all arches and that would have made code less painful to port... (I could live with "int" assumed to be at least 4bytes.) rick ps: And, yes, I still prefer "old C", but suffer through the ANSIisms.;-) From owner-svn-src-all@freebsd.org Sun Feb 26 22:05:24 2017 Return-Path: Delivered-To: svn-src-all@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 4570FCEE3EC; Sun, 26 Feb 2017 22:05:24 +0000 (UTC) (envelope-from jchandra@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 F078B833; Sun, 26 Feb 2017 22:05:23 +0000 (UTC) (envelope-from jchandra@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QM5N1g028098; Sun, 26 Feb 2017 22:05:23 GMT (envelope-from jchandra@FreeBSD.org) Received: (from jchandra@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QM5N4V028097; Sun, 26 Feb 2017 22:05:23 GMT (envelope-from jchandra@FreeBSD.org) Message-Id: <201702262205.v1QM5N4V028097@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jchandra set sender to jchandra@FreeBSD.org using -f From: "Jayachandran C." Date: Sun, 26 Feb 2017 22:05:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314318 - head/sys/dev/uart X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 22:05:24 -0000 Author: jchandra Date: Sun Feb 26 22:05:22 2017 New Revision: 314318 URL: https://svnweb.freebsd.org/changeset/base/314318 Log: Enable pl011 UART FIFOs The pl011 UART has a 16 entry Tx FIFO and a 16 entry Rx FIFO that have not been used so far. Update the driver to enable the FIFOs and use them in transmit and receive. Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D8819 Modified: head/sys/dev/uart/uart_dev_pl011.c Modified: head/sys/dev/uart/uart_dev_pl011.c ============================================================================== --- head/sys/dev/uart/uart_dev_pl011.c Sun Feb 26 21:33:18 2017 (r314317) +++ head/sys/dev/uart/uart_dev_pl011.c Sun Feb 26 22:05:22 2017 (r314318) @@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$"); #define DR_OE (1 << 11) /* Overrun error */ #define UART_FR 0x06 /* Flag register */ +#define FR_RXFE (1 << 4) /* Receive FIFO/reg empty */ #define FR_TXFF (1 << 5) /* Transmit FIFO/reg full */ #define FR_RXFF (1 << 6) /* Receive FIFO/reg full */ #define FR_TXFE (1 << 7) /* Transmit FIFO/reg empty */ @@ -171,9 +172,9 @@ uart_pl011_param(struct uart_bas *bas, i line |= LCR_H_PEN; else line &= ~LCR_H_PEN; + line |= LCR_H_FEN; /* Configure the rest */ - line &= ~LCR_H_FEN; ctrl |= (CR_RXE | CR_TXE | CR_UARTEN); if (bas->rclk != 0 && baudrate != 0) { @@ -219,7 +220,7 @@ static int uart_pl011_rxready(struct uart_bas *bas) { - return (__uart_getreg(bas, UART_FR) & FR_RXFF); + return !(__uart_getreg(bas, UART_FR) & FR_RXFE); } static int @@ -417,8 +418,8 @@ uart_pl011_bus_probe(struct uart_softc * device_set_desc(sc->sc_dev, "PrimeCell UART (PL011)"); - sc->sc_rxfifosz = 1; - sc->sc_txfifosz = 1; + sc->sc_rxfifosz = 16; + sc->sc_txfifosz = 16; return (0); } @@ -440,7 +441,6 @@ uart_pl011_bus_receive(struct uart_softc break; } - __uart_setreg(bas, UART_ICR, (UART_RXREADY | RIS_RTIM)); xc = __uart_getreg(bas, UART_DR); rx = xc & 0xff; @@ -481,20 +481,12 @@ uart_pl011_bus_transmit(struct uart_soft uart_barrier(bas); } - /* If not empty wait until it is */ - if ((__uart_getreg(bas, UART_FR) & FR_TXFE) != FR_TXFE) { - sc->sc_txbusy = 1; - - /* Enable TX interrupt */ - __uart_setreg(bas, UART_IMSC, psc->imsc); - } + /* Mark busy and enable TX interrupt */ + sc->sc_txbusy = 1; + __uart_setreg(bas, UART_IMSC, psc->imsc); uart_unlock(sc->sc_hwmtx); - /* No interrupt expected, schedule the next fifo write */ - if (!sc->sc_txbusy) - uart_sched_softih(sc, SER_INT_TXIDLE); - return (0); } From owner-svn-src-all@freebsd.org Sun Feb 26 22:07:27 2017 Return-Path: Delivered-To: svn-src-all@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 D49E2CEE495; Sun, 26 Feb 2017 22:07:27 +0000 (UTC) (envelope-from oshogbo@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 8A4299EE; Sun, 26 Feb 2017 22:07:27 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QM7QmD028205; Sun, 26 Feb 2017 22:07:26 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QM7QBk028204; Sun, 26 Feb 2017 22:07:26 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201702262207.v1QM7QBk028204@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski Date: Sun, 26 Feb 2017 22:07:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314319 - head/lib/libc/x86/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 22:07:27 -0000 Author: oshogbo Date: Sun Feb 26 22:07:26 2017 New Revision: 314319 URL: https://svnweb.freebsd.org/changeset/base/314319 Log: Don't try to open devices in the gettc() function which will always fail in the Capability mode. Instead silently fallback to the syscall method, which is done for example in the gettimeofday(2) function. Reviewed by: kib Modified: head/lib/libc/x86/sys/__vdso_gettc.c Modified: head/lib/libc/x86/sys/__vdso_gettc.c ============================================================================== --- head/lib/libc/x86/sys/__vdso_gettc.c Sun Feb 26 22:05:22 2017 (r314318) +++ head/lib/libc/x86/sys/__vdso_gettc.c Sun Feb 26 22:07:26 2017 (r314319) @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include #include "namespace.h" +#include #include #include #include @@ -124,6 +125,7 @@ __vdso_init_hpet(uint32_t u) static const char devprefix[] = "/dev/hpet"; char devname[64], *c, *c1, t; volatile char *new_map, *old_map; + unsigned int mode; uint32_t u1; int fd; @@ -144,18 +146,26 @@ __vdso_init_hpet(uint32_t u) if (old_map != NULL) return; + mode = 0; + if (cap_getmode(&mode) == 0 && mode != 0) + goto fail; + fd = _open(devname, O_RDONLY); - if (fd == -1) { - atomic_cmpset_rel_ptr((volatile uintptr_t *)&hpet_dev_map[u], - (uintptr_t)old_map, (uintptr_t)MAP_FAILED); - return; - } + if (fd == -1) + goto fail; + new_map = mmap(NULL, PAGE_SIZE, PROT_READ, MAP_SHARED, fd, 0); _close(fd); if (atomic_cmpset_rel_ptr((volatile uintptr_t *)&hpet_dev_map[u], (uintptr_t)old_map, (uintptr_t)new_map) == 0 && new_map != MAP_FAILED) - munmap((void *)new_map, PAGE_SIZE); + munmap((void *)new_map, PAGE_SIZE); + + return; +fail: + /* Prevent the caller from re-entering. */ + atomic_cmpset_rel_ptr((volatile uintptr_t *)&hpet_dev_map[u], + (uintptr_t)old_map, (uintptr_t)MAP_FAILED); } #ifdef WANT_HYPERV @@ -174,16 +184,23 @@ static void __vdso_init_hyperv_tsc(void) { int fd; + unsigned int mode; + + mode = 0; + if (cap_getmode(&mode) == 0 && mode != 0) + goto fail; fd = _open(HYPERV_REFTSC_DEVPATH, O_RDONLY); - if (fd < 0) { - /* Prevent the caller from re-entering. */ - hyperv_ref_tsc = MAP_FAILED; - return; - } + if (fd < 0) + goto fail; hyperv_ref_tsc = mmap(NULL, sizeof(*hyperv_ref_tsc), PROT_READ, MAP_SHARED, fd, 0); _close(fd); + + return; +fail: + /* Prevent the caller from re-entering. */ + hyperv_ref_tsc = MAP_FAILED; } static int From owner-svn-src-all@freebsd.org Sun Feb 26 22:15:40 2017 Return-Path: Delivered-To: svn-src-all@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 CC952CEE725; Sun, 26 Feb 2017 22:15:40 +0000 (UTC) (envelope-from oshogbo@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 9C193F15; Sun, 26 Feb 2017 22:15:40 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QMFdfF031994; Sun, 26 Feb 2017 22:15:39 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QMFdAY031993; Sun, 26 Feb 2017 22:15:39 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201702262215.v1QMFdAY031993@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski Date: Sun, 26 Feb 2017 22:15:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314320 - head/lib/libc/x86/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 22:15:40 -0000 Author: oshogbo Date: Sun Feb 26 22:15:39 2017 New Revision: 314320 URL: https://svnweb.freebsd.org/changeset/base/314320 Log: Remove unneeded variable initialization from r314319. Pointed out by: kib Modified: head/lib/libc/x86/sys/__vdso_gettc.c Modified: head/lib/libc/x86/sys/__vdso_gettc.c ============================================================================== --- head/lib/libc/x86/sys/__vdso_gettc.c Sun Feb 26 22:07:26 2017 (r314319) +++ head/lib/libc/x86/sys/__vdso_gettc.c Sun Feb 26 22:15:39 2017 (r314320) @@ -146,7 +146,6 @@ __vdso_init_hpet(uint32_t u) if (old_map != NULL) return; - mode = 0; if (cap_getmode(&mode) == 0 && mode != 0) goto fail; @@ -186,7 +185,6 @@ __vdso_init_hyperv_tsc(void) int fd; unsigned int mode; - mode = 0; if (cap_getmode(&mode) == 0 && mode != 0) goto fail; From owner-svn-src-all@freebsd.org Sun Feb 26 22:17:08 2017 Return-Path: Delivered-To: svn-src-all@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 79EFFCEE7E7; Sun, 26 Feb 2017 22:17:08 +0000 (UTC) (envelope-from pfg@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 38549B8; Sun, 26 Feb 2017 22:17:08 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1QMH7hm032090; Sun, 26 Feb 2017 22:17:07 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1QMH7ZK032087; Sun, 26 Feb 2017 22:17:07 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201702262217.v1QMH7ZK032087@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sun, 26 Feb 2017 22:17:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314321 - head/usr.bin/dc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2017 22:17:08 -0000 Author: pfg Date: Sun Feb 26 22:17:06 2017 New Revision: 314321 URL: https://svnweb.freebsd.org/changeset/base/314321 Log: dc(1): Merge minor changes from OpenBSD. Prefer setvbuf() to setlinebuf() for portability. Some style(9) and redundant tests for NULL. These are only meant to ease up merging newer changes but we are skipping changes done in order to accomodate OpenBSD's pledge support. Obtained from: OpenBSD MFC after: 2 weeks Modified: head/usr.bin/dc/bcode.c head/usr.bin/dc/dc.c head/usr.bin/dc/stack.c Modified: head/usr.bin/dc/bcode.c ============================================================================== --- head/usr.bin/dc/bcode.c Sun Feb 26 22:15:39 2017 (r314320) +++ head/usr.bin/dc/bcode.c Sun Feb 26 22:17:06 2017 (r314321) @@ -960,9 +960,8 @@ badd(void) struct number *a, *b, *r; a = pop_number(); - if (a == NULL) { + if (a == NULL) return; - } b = pop_number(); if (b == NULL) { push_number(a); @@ -987,9 +986,8 @@ bsub(void) struct number *a, *b, *r; a = pop_number(); - if (a == NULL) { + if (a == NULL) return; - } b = pop_number(); if (b == NULL) { push_number(a); @@ -1035,9 +1033,8 @@ bmul(void) struct number *a, *b, *r; a = pop_number(); - if (a == NULL) { + if (a == NULL) return; - } b = pop_number(); if (b == NULL) { push_number(a); @@ -1060,9 +1057,8 @@ bdiv(void) u_int scale; a = pop_number(); - if (a == NULL) { + if (a == NULL) return; - } b = pop_number(); if (b == NULL) { push_number(a); @@ -1097,9 +1093,8 @@ bmod(void) u_int scale; a = pop_number(); - if (a == NULL) { + if (a == NULL) return; - } b = pop_number(); if (b == NULL) { push_number(a); @@ -1134,9 +1129,8 @@ bdivmod(void) u_int scale; a = pop_number(); - if (a == NULL) { + if (a == NULL) return; - } b = pop_number(); if (b == NULL) { push_number(a); @@ -1176,9 +1170,8 @@ bexp(void) u_int rscale; p = pop_number(); - if (p == NULL) { + if (p == NULL) return; - } a = pop_number(); if (a == NULL) { push_number(p); @@ -1299,9 +1292,8 @@ bsqrt(void) onecount = 0; n = pop_number(); - if (n == NULL) { + if (n == NULL) return; - } if (BN_is_zero(n->number)) { r = new_number(); push_number(r); @@ -1342,9 +1334,8 @@ not(void) struct number *a; a = pop_number(); - if (a == NULL) { + if (a == NULL) return; - } a->scale = 0; bn_check(BN_set_word(a->number, BN_get_word(a->number) ? 0 : 1)); push_number(a); @@ -1363,9 +1354,8 @@ equal_numbers(void) struct number *a, *b, *r; a = pop_number(); - if (a == NULL) { + if (a == NULL) return; - } b = pop_number(); if (b == NULL) { push_number(a); @@ -1383,9 +1373,8 @@ less_numbers(void) struct number *a, *b, *r; a = pop_number(); - if (a == NULL) { + if (a == NULL) return; - } b = pop_number(); if (b == NULL) { push_number(a); @@ -1403,9 +1392,8 @@ lesseq_numbers(void) struct number *a, *b, *r; a = pop_number(); - if (a == NULL) { + if (a == NULL) return; - } b = pop_number(); if (b == NULL) { push_number(a); @@ -1736,9 +1724,8 @@ eval_tos(void) char *p; p = pop_string(); - if (p == NULL) - return; - eval_string(p); + if (p != NULL) + eval_string(p); } void Modified: head/usr.bin/dc/dc.c ============================================================================== --- head/usr.bin/dc/dc.c Sun Feb 26 22:15:39 2017 (r314320) +++ head/usr.bin/dc/dc.c Sun Feb 26 22:17:06 2017 (r314321) @@ -125,8 +125,8 @@ main(int argc, char *argv[]) if (!preproc_done) init_bmachine(extended_regs); - setlinebuf(stdout); - setlinebuf(stderr); + (void)setvbuf(stdout, NULL, _IOLBF, 0); + (void)setvbuf(stderr, NULL, _IOLBF, 0); if (argc > 1) usage(); Modified: head/usr.bin/dc/stack.c ============================================================================== --- head/usr.bin/dc/stack.c Sun Feb 26 22:15:39 2017 (r314320) +++ head/usr.bin/dc/stack.c Sun Feb 26 22:17:06 2017 (r314321) @@ -68,10 +68,8 @@ stack_free_value(struct value *v) free(v->u.string); break; } - if (v->array != NULL) { - array_free(v->array); - v->array = NULL; - } + array_free(v->array); + v->array = NULL; } /* Copy number or string content into already allocated target */ @@ -225,10 +223,8 @@ stack_popnumber(struct stack *stack) if (stack_empty(stack)) return (NULL); - if (stack->stack[stack->sp].array != NULL) { - array_free(stack->stack[stack->sp].array); - stack->stack[stack->sp].array = NULL; - } + array_free(stack->stack[stack->sp].array); + stack->stack[stack->sp].array = NULL; if (stack->stack[stack->sp].type != BCODE_NUMBER) { warnx("not a number"); /* XXX remove */ return (NULL); @@ -242,10 +238,8 @@ stack_popstring(struct stack *stack) if (stack_empty(stack)) return (NULL); - if (stack->stack[stack->sp].array != NULL) { - array_free(stack->stack[stack->sp].array); - stack->stack[stack->sp].array = NULL; - } + array_free(stack->stack[stack->sp].array); + stack->stack[stack->sp].array = NULL; if (stack->stack[stack->sp].type != BCODE_STRING) { warnx("not a string"); /* XXX remove */ return (NULL); @@ -257,9 +251,8 @@ void stack_clear(struct stack *stack) { - while (stack->sp >= 0) { + while (stack->sp >= 0) stack_free_value(&stack->stack[stack->sp--]); - } free(stack->stack); stack_init(stack); } From owner-svn-src-all@freebsd.org Mon Feb 27 00:10:02 2017 Return-Path: Delivered-To: svn-src-all@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 415CECEEC1E; Mon, 27 Feb 2017 00:10:02 +0000 (UTC) (envelope-from pfg@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 1115F8BB; Mon, 27 Feb 2017 00:10:01 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1R0A1wO074124; Mon, 27 Feb 2017 00:10:01 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1R0A1wm074123; Mon, 27 Feb 2017 00:10:01 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201702270010.v1R0A1wm074123@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Mon, 27 Feb 2017 00:10:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314322 - head/lib/librss X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 00:10:02 -0000 Author: pfg Date: Mon Feb 27 00:10:00 2017 New Revision: 314322 URL: https://svnweb.freebsd.org/changeset/base/314322 Log: librss: simplify some NULL checks. MFC after: 1 week Modified: head/lib/librss/librss.c Modified: head/lib/librss/librss.c ============================================================================== --- head/lib/librss/librss.c Sun Feb 26 22:17:06 2017 (r314321) +++ head/lib/librss/librss.c Mon Feb 27 00:10:00 2017 (r314322) @@ -244,10 +244,10 @@ rss_config_get(void) return (rc); error: - if ((rc != NULL) && rc->rss_bucket_map) + if (rc != NULL) { free(rc->rss_bucket_map); - if (rc != NULL) free(rc); + } return (NULL); } From owner-svn-src-all@freebsd.org Mon Feb 27 01:51:50 2017 Return-Path: Delivered-To: svn-src-all@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 44142CEF63E; Mon, 27 Feb 2017 01:51:50 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id EF10B8A7; Mon, 27 Feb 2017 01:51:49 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id iATVcPaJgC3JIiATWcuvoU; Sun, 26 Feb 2017 18:51:43 -0700 X-Authority-Analysis: v=2.2 cv=XbT59Mx5 c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=n2v9WMKugxEA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=km5jbiIkLU5slP2OBFIA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 495161AB; Sun, 26 Feb 2017 17:51:41 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id v1R1pe1F003587; Sun, 26 Feb 2017 17:51:40 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201702270151.v1R1pe1F003587@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: "Pedro F. Giffuni" cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314322 - head/lib/librss In-Reply-To: Message from "Pedro F. Giffuni" of "Mon, 27 Feb 2017 00:10:01 +0000." <201702270010.v1R0A1wm074123@repo.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sun, 26 Feb 2017 17:51:40 -0800 X-CMAE-Envelope: MS4wfGyCCHM2hDRDRaTyfbR5cPLfUsVbUudgX1nN9KSnFLOlEjvC7GjtSbN5I0uNWwIv4nEt8J+lzpO46RZ/kEj6XXYiRXD+gUdFl7UMBElLI/02jvbpVjm/ DYUMTr8cBjvzfQVs2uSXR/8DsVkwutIfIzSBJaYkv+bnlrVMWFhXcZBc1sT74dzB0xBGHAU587R3+DYjzvt6SNFBeHHAAy7GHDw3gWu99rNNlRU4fsxtOX5e as9fn9p7zQZGbPniounvc5ia7JmwPzgjeZnTOkJPUDd4lizpHfl1fuhIRs61nvh2 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 01:51:50 -0000 In message <201702270010.v1R0A1wm074123@repo.freebsd.org>, "Pedro F. Giffuni" w rites: > Author: pfg > Date: Mon Feb 27 00:10:00 2017 > New Revision: 314322 > URL: https://svnweb.freebsd.org/changeset/base/314322 > > Log: > librss: simplify some NULL checks. > > MFC after: 1 week > > Modified: > head/lib/librss/librss.c > > Modified: head/lib/librss/librss.c > ============================================================================= > = > --- head/lib/librss/librss.c Sun Feb 26 22:17:06 2017 (r314321) > +++ head/lib/librss/librss.c Mon Feb 27 00:10:00 2017 (r314322) > @@ -244,10 +244,10 @@ rss_config_get(void) > return (rc); > > error: > - if ((rc != NULL) && rc->rss_bucket_map) > + if (rc != NULL) { > free(rc->rss_bucket_map); What happens if rc is not NULL and rc->rss_bucket_map is NULL? > - if (rc != NULL) > free(rc); > + } > return (NULL); > } > > > -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. From owner-svn-src-all@freebsd.org Mon Feb 27 02:25:07 2017 Return-Path: Delivered-To: svn-src-all@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 1A10BCEFBC7 for ; Mon, 27 Feb 2017 02:25:07 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm24-vm5.bullet.mail.ne1.yahoo.com (nm24-vm5.bullet.mail.ne1.yahoo.com [98.138.91.246]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BB9706EA for ; Mon, 27 Feb 2017 02:25:06 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1488162300; bh=QkSAuYh9EezaIEA6B+okQ3V7KQDY8qGRln1rSIyA4o4=; h=Subject:To:References:Cc:From:Date:In-Reply-To:From:Subject; b=sit4VGIvjqU77MeOmi35OhDUfNlvRE3vHqoKbKHaiMtHfLrZTCfA6dxhonGeml6buM0jPBsMUVEctXEbz7/+vVCgv+ioBAPUrJE0q6fH2ZpQhBo0W/2+aX2OxIqdRXnj+EFvO8dtOY8ZdUUPZR1dIS/3czf/DF0SUIWl58phoAFclKBJXLcQp6cz3hy/WsAKElWdQ1N57OVrNHQwwbG/U35QSrK+kSQG4uN93XbKTYXtXRqC0RhLdyrIKZwzfVLgo50bsZTuLZiSkhYg5GvirIncPMExm2AuFkCyQDfxSIA4p7Ap4oYy5g0AiHfOfA9lk1tiXVJt5qqGmWnrtmbsZw== Received: from [98.138.100.118] by nm24.bullet.mail.ne1.yahoo.com with NNFMP; 27 Feb 2017 02:25:00 -0000 Received: from [98.138.84.39] by tm109.bullet.mail.ne1.yahoo.com with NNFMP; 27 Feb 2017 02:25:00 -0000 Received: from [127.0.0.1] by smtp107.mail.ne1.yahoo.com with NNFMP; 27 Feb 2017 02:25:00 -0000 X-Yahoo-Newman-Id: 743187.11294.bm@smtp107.mail.ne1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: Pveaq5IVM1lNQO49Uhedk6qmKv0D2jDrW0s0o0Fuke_hCFW _UqKS6FvFliSWrr.ezJtk.OALGywvAxjx46K_0vX5ldnhZDWkJSruhejVIvq H7WQAaRDtayyI.7VbksevhA3DoJurPpbMhhQ3E6D.gNJaBwrqwN1uwtUnuuY _mlq3..CnuXwPj3pHgKHlRfAu3k4.Sk3XZuYYYrQwGvHeSVo1iCoLgNgccVN bwCqSnpl2NBN1f8SvBGjNmmpc2me_CKrtPYpUep0kTZXrAOqDwftK8NrYh07 yB7uIDARdfeU85IETxvgQTjMX8Bs7GxtA8oWzG6sP073IEtq6Z0VwgHuqU4b IwvXRsUKQzPmV5ALmReh2YmpGlWx8YUbWWPyq_uRf748qsiGevyI1BX88XUm mw5gaoU9AP_D9kiQBHCTH8Lkfp5fBcmowzD90ljTMu2MH8Kr3tMHvx3D9wm6 vLGW6idnCbihLFtioMQQX9O0YUfqTqB7fSm2qfQhNebuB9m7jm2NnyDkweup m5wDX7EfsH_0kXF_5URMGN9sviEc31bKepYQzhR6zxpYBGWo- X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Subject: Re: svn commit: r314322 - head/lib/librss To: Cy Schubert References: <201702270151.v1R1pe1F003587@slippy.cwsent.com> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Pedro Giffuni Message-ID: <404d743b-735b-0605-5ab5-ccb95ce24ad8@FreeBSD.org> Date: Sun, 26 Feb 2017 21:27:48 -0500 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <201702270151.v1R1pe1F003587@slippy.cwsent.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 02:25:07 -0000 Hello; On 2/26/2017 8:51 PM, Cy Schubert wrote: > In message <201702270010.v1R0A1wm074123@repo.freebsd.org>, "Pedro F. > Giffuni" w > rites: >> Author: pfg >> Date: Mon Feb 27 00:10:00 2017 >> New Revision: 314322 >> URL: https://svnweb.freebsd.org/changeset/base/314322 >> >> Log: >> librss: simplify some NULL checks. >> >> MFC after: 1 week >> >> Modified: >> head/lib/librss/librss.c >> >> Modified: head/lib/librss/librss.c >> ============================================================================= >> = >> --- head/lib/librss/librss.c Sun Feb 26 22:17:06 2017 (r314321) >> +++ head/lib/librss/librss.c Mon Feb 27 00:10:00 2017 (r314322) >> @@ -244,10 +244,10 @@ rss_config_get(void) >> return (rc); >> >> error: >> - if ((rc != NULL) && rc->rss_bucket_map) >> + if (rc != NULL) { >> free(rc->rss_bucket_map); > What happens if rc is not NULL and rc->rss_bucket_map is NULL? According the free(3): " If /ptr/ is *NULL*, no action occurs." Pedro. From owner-svn-src-all@freebsd.org Mon Feb 27 02:37:33 2017 Return-Path: Delivered-To: svn-src-all@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 E92FECEFEF4; Mon, 27 Feb 2017 02:37:33 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id A00EAC4D; Mon, 27 Feb 2017 02:37:33 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id iBBrcPosGC3JIiBBscv2Ww; Sun, 26 Feb 2017 19:37:32 -0700 X-Authority-Analysis: v=2.2 cv=XbT59Mx5 c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=n2v9WMKugxEA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=wR5-japwTx45AJySfSsA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id E5739216; Sun, 26 Feb 2017 18:37:30 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id v1R2bSsC004156; Sun, 26 Feb 2017 18:37:28 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201702270237.v1R2bSsC004156@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Pedro Giffuni cc: Cy Schubert , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314322 - head/lib/librss In-Reply-To: Message from Pedro Giffuni of "Sun, 26 Feb 2017 21:27:48 -0500." <404d743b-735b-0605-5ab5-ccb95ce24ad8@FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sun, 26 Feb 2017 18:37:28 -0800 X-CMAE-Envelope: MS4wfFluleE7ctIQEzzK+dh6vrSP+tBoUT72OAPtQBKuGPJO54E5/gCqGAOeHUQpvlasg+P3vfAVxFNkGNPB7Xf+bVbgYGKwZlp6323V/geltCy1DgwQuJQo C7XiSqg0VmG3X75MtdERaTUocoS8u+Nx/np8eXWc6z3AoXjK+UDqUzoWMBk8uSLTWHt5higIY2Rk0CcpeFNG3MAcBt8o4s8qy22O6u2ctf0AQvmHhtr821wO ULvT1RRQCuLUW/Qc7q58RBOexbBAWTpO9piFavFgROjqE/EkrrShOm6IDimPZZLU X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 02:37:34 -0000 In message <404d743b-735b-0605-5ab5-ccb95ce24ad8@FreeBSD.org>, Pedro Giffuni wr ites: > This is a multi-part message in MIME format. > --------------C3FC59CAC7D072A09BF70AAF > Content-Type: text/plain; charset=windows-1252; format=flowed > Content-Transfer-Encoding: 7bit > > Hello; > > On 2/26/2017 8:51 PM, Cy Schubert wrote: > > In message <201702270010.v1R0A1wm074123@repo.freebsd.org>, "Pedro F. > > Giffuni" w > > rites: > >> Author: pfg > >> Date: Mon Feb 27 00:10:00 2017 > >> New Revision: 314322 > >> URL: https://svnweb.freebsd.org/changeset/base/314322 > >> > >> Log: > >> librss: simplify some NULL checks. > >> > >> MFC after: 1 week > >> > >> Modified: > >> head/lib/librss/librss.c > >> > >> Modified: head/lib/librss/librss.c > >> ========================================================================== > === > >> = > >> --- head/lib/librss/librss.c Sun Feb 26 22:17:06 2017 (r31432 > 1) > >> +++ head/lib/librss/librss.c Mon Feb 27 00:10:00 2017 (r31432 > 2) > >> @@ -244,10 +244,10 @@ rss_config_get(void) > >> return (rc); > >> > >> error: > >> - if ((rc != NULL) && rc->rss_bucket_map) > >> + if (rc != NULL) { > >> free(rc->rss_bucket_map); > > What happens if rc is not NULL and rc->rss_bucket_map is NULL? > > According the free(3): " If /ptr/ is *NULL*, no action occurs." > Good point. Then why even test for RC being NULL? The only reason I can think of doing any test for NULL before free(3) is that if the likelihood of *ptr being NULL is greater than the likelihood of *ptr not being NULL then you save running the extra instructions to make that determination in free(), e.g. pushes, call, return, pops. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. From owner-svn-src-all@freebsd.org Mon Feb 27 02:49:06 2017 Return-Path: Delivered-To: svn-src-all@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 744FCCEF21D for ; Mon, 27 Feb 2017 02:49:06 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm17-vm0.bullet.mail.ne1.yahoo.com (nm17-vm0.bullet.mail.ne1.yahoo.com [98.138.91.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 40ACA29B for ; Mon, 27 Feb 2017 02:49:06 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1488163739; bh=T94pAVqPzJGPGi2ZGXEF4OYxlnZ9iwVpxcgegpzNsUo=; h=Subject:To:References:Cc:From:Date:In-Reply-To:From:Subject; b=elFETUNbcup1ZMZ3Izo7hdvLBC4peJfoHncTzgKPypfph7S42xiSvKqJK99Ttfnt3o9mTEz86NGSI7++km+3MFS2GgLLfMGMj9Hz2IFIzOBUNEjb72C6l94VtjmmoIbTRBcZ7j83P0qIUHTdCi8Vq7eUdg2DX3PSJjUfCwlZuEovkVl/Sv+mOXAEFOyJrh27XT0OkTh9dSzzMGKtIVUKfTRhZrTW+m24e+gcfL5KYPQOsk8zFzXrj9PmjcsbPXK18wHpqVztinnU0GebZIvwW0VgaDUwC+og3EWkM1W8WAWzu3zZJ/eA9W3couUxoIF6EIXarnUW75y3Yn3fWVgCkQ== Received: from [98.138.100.111] by nm17.bullet.mail.ne1.yahoo.com with NNFMP; 27 Feb 2017 02:48:59 -0000 Received: from [98.138.84.47] by tm100.bullet.mail.ne1.yahoo.com with NNFMP; 27 Feb 2017 02:48:59 -0000 Received: from [127.0.0.1] by smtp115.mail.ne1.yahoo.com with NNFMP; 27 Feb 2017 02:48:59 -0000 X-Yahoo-Newman-Id: 494556.31278.bm@smtp115.mail.ne1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: J6LHWS8VM1kEeMvf6eEhGCb6ACudEUqaaq_hCnOHFg7RMak oHT0mN8TuyIwqu0Z2cFYxcDo.0kgF2vk.7ooKQYOcLL2Xi.fCwe_uyMIO5R8 q_56hsOBkVuO6dQnyneMpyQfC9wkdm5ap1OdkHjLrpI5mLf1X5fa.yhfqOAd 4tLHj2TG1W1Vi5IMehKZufbu25Hv_ipjvzjuC1jLqPoYlfNqxjsIFtfX2G.J 6V3YApJp5BZZdRswHoE0aphjPmgueRjRQogHOtwIRs43v6C0U7QfX.twjJhZ Jx.hNt7zfhn0aodz.IQy8UKwxtU8g.Mi2DpOawGLbK9lYzrmImXL1DoAerd6 5j9k4QJA8IHOYd0.nBl1HGWzXqeYwfqL3tWy3CIe5XTP9hyER2xtLhK.ngfY Ha9Q5fFxliQ1Hpln2tGQdbSUr7Pk7fEwBrUS1X3t3gGUojBb3NXXx8aQZcvW eqsmZZlkDpTr7WAJkYRAgaKmZjg_8ABUREJGl0WF3bbYTLi.txEVk69gpHtp DNcdjQ4ix5OphdrjBmUddY1cCXBgCZf5XliKjXi9646n9F5I- X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Subject: Re: svn commit: r314322 - head/lib/librss To: Cy Schubert References: <201702270237.v1R2bSsC004156@slippy.cwsent.com> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Pedro Giffuni Message-ID: <6a8a34b7-e6ff-b8e2-44a6-7e3cc08e6e3d@FreeBSD.org> Date: Sun, 26 Feb 2017 21:51:47 -0500 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <201702270237.v1R2bSsC004156@slippy.cwsent.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 02:49:06 -0000 On 2/26/2017 9:37 PM, Cy Schubert wrote: > In message <404d743b-735b-0605-5ab5-ccb95ce24ad8@FreeBSD.org>, Pedro > Giffuni wr > ites: >> This is a multi-part message in MIME format. >> --------------C3FC59CAC7D072A09BF70AAF >> Content-Type: text/plain; charset=windows-1252; format=flowed >> Content-Transfer-Encoding: 7bit >> >> Hello; >> >> On 2/26/2017 8:51 PM, Cy Schubert wrote: >>> In message <201702270010.v1R0A1wm074123@repo.freebsd.org>, "Pedro F. >>> Giffuni" w >>> rites: >>>> Author: pfg >>>> Date: Mon Feb 27 00:10:00 2017 >>>> New Revision: 314322 >>>> URL: https://svnweb.freebsd.org/changeset/base/314322 >>>> >>>> Log: >>>> librss: simplify some NULL checks. >>>> >>>> MFC after: 1 week >>>> >>>> Modified: >>>> head/lib/librss/librss.c >>>> >>>> Modified: head/lib/librss/librss.c >>>> ========================================================================== >> === >>>> = >>>> --- head/lib/librss/librss.c Sun Feb 26 22:17:06 2017 (r31432 >> 1) >>>> +++ head/lib/librss/librss.c Mon Feb 27 00:10:00 2017 (r31432 >> 2) >>>> @@ -244,10 +244,10 @@ rss_config_get(void) >>>> return (rc); >>>> >>>> error: >>>> - if ((rc != NULL) && rc->rss_bucket_map) >>>> + if (rc != NULL) { >>>> free(rc->rss_bucket_map); >>> What happens if rc is not NULL and rc->rss_bucket_map is NULL? >> According the free(3): " If /ptr/ is *NULL*, no action occurs." >> > Good point. > > Then why even test for RC being NULL? If rc is NULL, there is a chance that rc->rss_bucket_map is random garbage and you might be "double freeing" something. > The only reason I can think of doing any test for NULL before free(3) is > that if the likelihood of *ptr being NULL is greater than the likelihood of > *ptr not being NULL then you save running the extra instructions to make > that determination in free(), e.g. pushes, call, return, pops. > The check for rc NULL is necessary, the only optimization is that having done the check we already know if we need to free(rc), so while we could leave the second free() outside the branch it is better to leave it within the "if" . Pedro. From owner-svn-src-all@freebsd.org Mon Feb 27 03:17:29 2017 Return-Path: Delivered-To: svn-src-all@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 BD855CEF95C for ; Mon, 27 Feb 2017 03:17:29 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x235.google.com (mail-io0-x235.google.com [IPv6:2607:f8b0:4001:c06::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8F6766AC for ; Mon, 27 Feb 2017 03:17:29 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x235.google.com with SMTP id g18so23824182ioe.0 for ; Sun, 26 Feb 2017 19:17:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=OSQXsYM2pIBfcwdT+OEgnKYPH+X0oO5kyA49I61uNMI=; b=Nkd4Pc3XnnA63jCpHlJARCbw/PVQ1yqrEwgzk6YkTesBzLtl6xAeCi3WQLcFx1+xO0 qm9WiUwT3pfxQ26Czd5tOhdH/1PosxrQG7g5xneUmYffyS9aTW9C+Wd6ZZzwv6wxPK9z GAkbvsyPmhzmaw2uLQrdiZbtu3r5YrvvUT32esDuZL0gMLD/zzxGSM8pLOmPLSVqXILZ xesuXYEAtPyVoI5jyqi2kIL5GZtA/2r/nkgQqClYoK8x0ARF21N8GxryBuaW5+mtNN6m yQn16pqD0NzjpXkHKZzfsNErozbU0qX2Djy3N8KD4j/mIroTlOln3mISjUIxq8XIDKNN gBXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=OSQXsYM2pIBfcwdT+OEgnKYPH+X0oO5kyA49I61uNMI=; b=J18lYX73bu81AO5TG3vvyC03F44fho2H1sM9Y9QcKqa2k9af1gS4VhZJRNWXGtEYF4 qgcxR8gHxPqlu6OvFZ3qe80VI7uTNrVrJejhS/XW3XQ4aBQJbpMMtBgNYzK98UmXE5yf RbSI8Iu/3qGcdRVh7eHzO8fbD8TDlT+B1CJF8IHPMmZaemf0IS/T2nB2upH48DI7djyo E0USSKlFog/FLa4rCUr674ewUD2Pn8QK3ZEVwe8iItNqP3Jm6ALMJK0nVtHQJSI7vuYM eBDjWthT2jVYY1C50P4gxZgTV/2OQAPo0BesJS5knW2W6O/E+YgpLLVoT+K5/VEJLsjL Ystw== X-Gm-Message-State: AMke39npskxEQ3zY6RydcKZsZswwb1IVfMw8nWikGrMZWhM+OfZB8Su0Z93njyDFaydO/72HArf7vYsnStIt2A== X-Received: by 10.107.11.216 with SMTP id 85mr12733214iol.0.1488165448860; Sun, 26 Feb 2017 19:17:28 -0800 (PST) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.134.129 with HTTP; Sun, 26 Feb 2017 19:17:28 -0800 (PST) X-Originating-IP: [75.104.68.92] In-Reply-To: <201702270237.v1R2bSsC004156@slippy.cwsent.com> References: <404d743b-735b-0605-5ab5-ccb95ce24ad8@FreeBSD.org> <201702270237.v1R2bSsC004156@slippy.cwsent.com> From: Warner Losh Date: Sun, 26 Feb 2017 20:17:28 -0700 X-Google-Sender-Auth: R3OI_ostcF5769l9KOnGcbIbCyM Message-ID: Subject: Re: svn commit: r314322 - head/lib/librss To: Cy Schubert Cc: Pedro Giffuni , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 03:17:29 -0000 > Then why even test for RC being NULL? So rc->rss_bucket_map doesn't dereference a null pointer and core dump maybe? Warner From owner-svn-src-all@freebsd.org Mon Feb 27 03:52:33 2017 Return-Path: Delivered-To: svn-src-all@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 CDFD8CEF2A7; Mon, 27 Feb 2017 03:52:33 +0000 (UTC) (envelope-from mav@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 950A5B6F; Mon, 27 Feb 2017 03:52:33 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1R3qWuZ062511; Mon, 27 Feb 2017 03:52:32 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1R3qWxd062510; Mon, 27 Feb 2017 03:52:32 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201702270352.v1R3qWxd062510@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 27 Feb 2017 03:52:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314323 - stable/11/sys/dev/iscsi X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 03:52:33 -0000 Author: mav Date: Mon Feb 27 03:52:32 2017 New Revision: 314323 URL: https://svnweb.freebsd.org/changeset/base/314323 Log: MFC r313707: Remove M_PKTHDR from m_getm2() in icl_pdu_append_data(). ip_data_mbuf is always appended to ip_bhs_mbuf, so it does not need own packet header. This change first avoids allocation/initialization of the header, and then avoids dropping one when it later gets to socket buffer. Modified: stable/11/sys/dev/iscsi/icl_soft.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/iscsi/icl_soft.c ============================================================================== --- stable/11/sys/dev/iscsi/icl_soft.c Mon Feb 27 00:10:00 2017 (r314322) +++ stable/11/sys/dev/iscsi/icl_soft.c Mon Feb 27 03:52:32 2017 (r314323) @@ -1087,7 +1087,7 @@ icl_pdu_append_data(struct icl_pdu *requ KASSERT(len > 0, ("len == 0")); - newmb = m_getm2(NULL, len, flags, MT_DATA, M_PKTHDR); + newmb = m_getm2(NULL, len, flags, MT_DATA, 0); if (newmb == NULL) { ICL_WARN("failed to allocate mbuf for %zd bytes", len); return (ENOMEM); From owner-svn-src-all@freebsd.org Mon Feb 27 04:05:36 2017 Return-Path: Delivered-To: svn-src-all@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 42782CEF4EE; Mon, 27 Feb 2017 04:05:36 +0000 (UTC) (envelope-from lidl@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 ED6B7FED; Mon, 27 Feb 2017 04:05:35 +0000 (UTC) (envelope-from lidl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1R45Zv5066480; Mon, 27 Feb 2017 04:05:35 GMT (envelope-from lidl@FreeBSD.org) Received: (from lidl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1R45ZsB066479; Mon, 27 Feb 2017 04:05:35 GMT (envelope-from lidl@FreeBSD.org) Message-Id: <201702270405.v1R45ZsB066479@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lidl set sender to lidl@FreeBSD.org using -f From: Kurt Lidl Date: Mon, 27 Feb 2017 04:05:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314324 - stable/11/contrib/blacklist/libexec X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 04:05:36 -0000 Author: lidl Date: Mon Feb 27 04:05:34 2017 New Revision: 314324 URL: https://svnweb.freebsd.org/changeset/base/314324 Log: MFC r314111: Improve ipfw rule creation for blacklist-helper script When blocking an address, the blacklist-helper script needs to do the following things for the ipfw packet filter: - create a table to hold the addresses to be blocked, so lookups can be done quickly, and place the address to be blocked in that table - create rule that does the lookup in the table and blocks the packet The ipfw system allows multiple rules to be inserted for a given rule number. There only needs to be one rule to do the lookup per port. Modify the script to probe for the existence of the rule before attempting to create it, so only one rule is inserted, rather than one rule per blocked address. PR: 214980 Reported by: azhegalov (at) gmail.com Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D9681 Modified: stable/11/contrib/blacklist/libexec/blacklistd-helper Modified: stable/11/contrib/blacklist/libexec/blacklistd-helper ============================================================================== --- stable/11/contrib/blacklist/libexec/blacklistd-helper Mon Feb 27 03:52:32 2017 (r314323) +++ stable/11/contrib/blacklist/libexec/blacklistd-helper Mon Feb 27 04:05:34 2017 (r314324) @@ -63,8 +63,11 @@ add) tname="port$6" /sbin/ipfw table $tname create type addr 2>/dev/null /sbin/ipfw -q table $tname add "$addr/$mask" - /sbin/ipfw -q add $rule drop $3 from "table("$tname")" to \ - any dst-port $6 && echo OK + # if rule number $rule does not already exist, create it + /sbin/ipfw show $rule >/dev/null 2>&1 || \ + /sbin/ipfw add $rule drop $3 from \ + table"("$tname")" to any dst-port $6 >/dev/null && \ + echo OK ;; npf) /sbin/npfctl rule "$2" add block in final $proto from \ From owner-svn-src-all@freebsd.org Mon Feb 27 04:07:30 2017 Return-Path: Delivered-To: svn-src-all@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 7FBA8CEF56A; Mon, 27 Feb 2017 04:07:30 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 34778197; Mon, 27 Feb 2017 04:07:29 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id iCamcSZdbsa1kiCancFspY; Sun, 26 Feb 2017 21:07:22 -0700 X-Authority-Analysis: v=2.2 cv=W+NIbVek c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=n2v9WMKugxEA:10 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=bo0pdqHELOON81cyJx8A:9 a=CjuIK1q_8ugA:10 a=9WeMLp5Z2dYA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 3BF9F328; Sun, 26 Feb 2017 20:07:20 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id v1R47JXY004778; Sun, 26 Feb 2017 20:07:19 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201702270407.v1R47JXY004778@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Warner Losh cc: Cy Schubert , Pedro Giffuni , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r314322 - head/lib/librss In-Reply-To: Message from Warner Losh of "Sun, 26 Feb 2017 20:17:28 -0700." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sun, 26 Feb 2017 20:07:19 -0800 X-CMAE-Envelope: MS4wfByNn89Xt3HB0x7RgOzUPKQpncO5xKxSs0DRPpZ6KEx24DFNKqM9Efa6poYmYkFc79TJt9g5omZWrp6GzQMZQ9IpVrPMYNQ4QBSDsbX6GGGCGIh8GqOk D5wPBcVBS3hzdZszHoeUgbNb/k95Frxf8xqgpou3I2M6/pTR9ZQxblOhkSwYy/RsnQwcpV7zL+qOPryv0J+KLO/F+XyocXpryRs1p1S/pCJMe+b9ejBqb8Yg D0pFC95t7GQtSHA0C/Ks5cWcMB0UC0E6E9Jbf0axgmXELswMNdIxpqqusbzhjb6ov/2VddecaXpLlzCKA+JY5w== X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 04:07:30 -0000 In message , Warner Losh writes: > > Then why even test for RC being NULL? > > So rc->rss_bucket_map doesn't dereference a null pointer and core dump maybe? Yes. I overlooked that. :( -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. From owner-svn-src-all@freebsd.org Mon Feb 27 04:08:10 2017 Return-Path: Delivered-To: svn-src-all@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 09255CEF5C8; Mon, 27 Feb 2017 04:08:10 +0000 (UTC) (envelope-from lidl@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 BC4B330A; Mon, 27 Feb 2017 04:08:09 +0000 (UTC) (envelope-from lidl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1R488gT066629; Mon, 27 Feb 2017 04:08:08 GMT (envelope-from lidl@FreeBSD.org) Received: (from lidl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1R488So066628; Mon, 27 Feb 2017 04:08:08 GMT (envelope-from lidl@FreeBSD.org) Message-Id: <201702270408.v1R488So066628@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lidl set sender to lidl@FreeBSD.org using -f From: Kurt Lidl Date: Mon, 27 Feb 2017 04:08:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314325 - stable/11/contrib/blacklist/bin X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 04:08:10 -0000 Author: lidl Date: Mon Feb 27 04:08:08 2017 New Revision: 314325 URL: https://svnweb.freebsd.org/changeset/base/314325 Log: MFC r314120: Reset failed login count to zero when removing a blocked address The blacklistd daemon keeps records of failed login attempts for each address:port that is flagged as a failed login. When a successful login occurs for that address:port combination, the record's last update time is set to zero, to indicate no current failed login attempts. Reset the failed login count to zero, so that at the next failed login attempt, the counting will restart properly at zero. Without this reset to zero, the first failed login after a successful login will cause the address to be blocked immediately. When debugging is turned on, output more information about database state before and after the database updates have occured. A similar patch has already been upstreamed to NetBSD. Sponsored by: The FreeBSD Foundation Modified: stable/11/contrib/blacklist/bin/blacklistd.c Modified: stable/11/contrib/blacklist/bin/blacklistd.c ============================================================================== --- stable/11/contrib/blacklist/bin/blacklistd.c Mon Feb 27 04:05:34 2017 (r314324) +++ stable/11/contrib/blacklist/bin/blacklistd.c Mon Feb 27 04:08:08 2017 (r314325) @@ -207,7 +207,7 @@ process(bl_t bl) if (debug) { char b1[128], b2[128]; - (*lfun)(LOG_DEBUG, "%s: db state info for %s: count=%d/%d " + (*lfun)(LOG_DEBUG, "%s: initial db state for %s: count=%d/%d " "last=%s now=%s", __func__, rbuf, dbi.count, c.c_nfail, fmttime(b1, sizeof(b1), dbi.last), fmttime(b2, sizeof(b2), ts.tv_sec)); @@ -246,15 +246,24 @@ process(bl_t bl) case BL_DELETE: if (dbi.last == 0) goto out; + dbi.count = 0; dbi.last = 0; break; default: (*lfun)(LOG_ERR, "unknown message %d", bi->bi_type); } - if (state_put(state, &c, &dbi) == -1) - goto out; + state_put(state, &c, &dbi); + out: close(bi->bi_fd); + + if (debug) { + char b1[128], b2[128]; + (*lfun)(LOG_DEBUG, "%s: final db state for %s: count=%d/%d " + "last=%s now=%s", __func__, rbuf, dbi.count, c.c_nfail, + fmttime(b1, sizeof(b1), dbi.last), + fmttime(b2, sizeof(b2), ts.tv_sec)); + } } static void @@ -393,7 +402,7 @@ rules_restore(void) int main(int argc, char *argv[]) { - int c, tout, flags, flush, restore; + int c, tout, flags, flush, restore, ret; const char *spath, *blsock; setprogname(argv[0]); @@ -512,7 +521,10 @@ main(int argc, char *argv[]) readconf = 0; conf_parse(configfile); } - switch (poll(pfd, (nfds_t)nfd, tout)) { + ret = poll(pfd, (nfds_t)nfd, tout); + if (debug) + (*lfun)(LOG_DEBUG, "received %d from poll()", ret); + switch (ret) { case -1: if (errno == EINTR) continue; From owner-svn-src-all@freebsd.org Mon Feb 27 08:20:30 2017 Return-Path: Delivered-To: svn-src-all@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 0ABADCEF4D3; Mon, 27 Feb 2017 08:20:30 +0000 (UTC) (envelope-from mav@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 CFA7E145; Mon, 27 Feb 2017 08:20:29 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1R8KSqt062616; Mon, 27 Feb 2017 08:20:28 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1R8KSgN062612; Mon, 27 Feb 2017 08:20:28 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201702270820.v1R8KSgN062612@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 27 Feb 2017 08:20:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314326 - head/sys/dev/isp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 08:20:30 -0000 Author: mav Date: Mon Feb 27 08:20:28 2017 New Revision: 314326 URL: https://svnweb.freebsd.org/changeset/base/314326 Log: Send TERMINATE to firmware when aborting active ATIO. MFC after: 2 weeks Modified: head/sys/dev/isp/isp.c head/sys/dev/isp/isp_freebsd.c head/sys/dev/isp/isp_freebsd.h Modified: head/sys/dev/isp/isp.c ============================================================================== --- head/sys/dev/isp/isp.c Mon Feb 27 04:08:08 2017 (r314325) +++ head/sys/dev/isp/isp.c Mon Feb 27 08:20:28 2017 (r314326) @@ -7133,7 +7133,7 @@ static const uint32_t mbpfc[] = { ISP_FC_OPMAP(0x00, 0x00), /* 0x3f: */ ISP_FC_OPMAP(0x03, 0x01), /* 0x40: MBOX_LOOP_PORT_BYPASS */ ISP_FC_OPMAP(0x03, 0x01), /* 0x41: MBOX_LOOP_PORT_ENABLE */ - ISP_FC_OPMAP_HALF(0x0, 0x01, 0x3, 0xcf), /* 0x42: MBOX_GET_RESOURCE_COUNT */ + ISP_FC_OPMAP_HALF(0x0, 0x01, 0x1f, 0xcf), /* 0x42: MBOX_GET_RESOURCE_COUNT */ ISP_FC_OPMAP(0x01, 0x01), /* 0x43: MBOX_REQUEST_OFFLINE_MODE */ ISP_FC_OPMAP(0x00, 0x00), /* 0x44: */ ISP_FC_OPMAP(0x00, 0x00), /* 0x45: */ Modified: head/sys/dev/isp/isp_freebsd.c ============================================================================== --- head/sys/dev/isp/isp_freebsd.c Mon Feb 27 04:08:08 2017 (r314325) +++ head/sys/dev/isp/isp_freebsd.c Mon Feb 27 08:20:28 2017 (r314326) @@ -1011,7 +1011,7 @@ isp_dump_atpd(ispsoftc_t *isp, int chan) if (atp->state == ATPD_STATE_FREE) continue; isp_prt(isp, ISP_LOGALL, "Chan %d ATP [0x%x] origdlen %u bytes_xfrd %u lun %jx nphdl 0x%04x s_id 0x%06x d_id 0x%06x oxid 0x%04x state %s", - chan, atp->tag, atp->orig_datalen, atp->bytes_xfered, (uintmax_t)atp->lun, atp->nphdl, atp->sid, atp->portid, atp->oxid, states[atp->state & 0x7]); + chan, atp->tag, atp->orig_datalen, atp->bytes_xfered, (uintmax_t)atp->lun, atp->nphdl, atp->sid, atp->did, atp->oxid, states[atp->state & 0x7]); } } @@ -1344,8 +1344,8 @@ isp_target_start_ctio(ispsoftc_t *isp, u ATPD_SET_SEQNO(cto, atp); cto->ct_nphdl = atp->nphdl; cto->ct_rxid = atp->tag; - cto->ct_iid_lo = atp->portid; - cto->ct_iid_hi = atp->portid >> 16; + cto->ct_iid_lo = atp->sid; + cto->ct_iid_hi = atp->sid >> 16; cto->ct_oxid = atp->oxid; cto->ct_vpidx = ISP_GET_VPIDX(isp, XS_CHANNEL(ccb)); cto->ct_timeout = (XS_TIME(ccb) + 999) / 1000; @@ -2088,7 +2088,8 @@ isp_handle_platform_atio7(ispsoftc_t *is atp->bytes_xfered = 0; atp->lun = lun; atp->nphdl = nphdl; - atp->portid = sid; + atp->sid = sid; + atp->did = did; atp->oxid = aep->at_hdr.ox_id; atp->rxid = aep->at_hdr.rx_id; atp->cdb0 = atiop->cdb_io.cdb_bytes[0]; @@ -3269,7 +3270,23 @@ isp_abort_atio(ispsoftc_t *isp, union cc /* Search for the ATIO among running. */ atp = isp_find_atpd(isp, XS_CHANNEL(accb), accb->atio.tag_id); if (atp != NULL) { - /* XXX Send TERMINATE to firmware here. */ + /* Send TERMINATE to firmware. */ + if (!atp->dead && IS_24XX(isp)) { + uint8_t storage[QENTRY_LEN]; + ct7_entry_t *cto = (ct7_entry_t *) storage; + + ISP_MEMZERO(cto, sizeof (ct7_entry_t)); + cto->ct_header.rqs_entry_type = RQSTYPE_CTIO7; + cto->ct_header.rqs_entry_count = 1; + cto->ct_nphdl = atp->nphdl; + cto->ct_rxid = atp->tag; + cto->ct_iid_lo = atp->sid; + cto->ct_iid_hi = atp->sid >> 16; + cto->ct_oxid = atp->oxid; + cto->ct_vpidx = XS_CHANNEL(accb); + cto->ct_flags = CT7_NOACK|CT7_TERMINATE; + isp_target_put_entry(isp, cto); + } isp_put_atpd(isp, XS_CHANNEL(accb), atp); ccb->ccb_h.status = CAM_REQ_CMP; } else { Modified: head/sys/dev/isp/isp_freebsd.h ============================================================================== --- head/sys/dev/isp/isp_freebsd.h Mon Feb 27 04:08:08 2017 (r314325) +++ head/sys/dev/isp/isp_freebsd.h Mon Feb 27 08:20:28 2017 (r314326) @@ -103,7 +103,7 @@ typedef struct atio_private_data { lun_id_t lun; uint32_t nphdl; uint32_t sid; - uint32_t portid; + uint32_t did; uint16_t rxid; /* wire rxid */ uint16_t oxid; /* wire oxid */ uint16_t word3; /* PRLI word3 params */ From owner-svn-src-all@freebsd.org Mon Feb 27 08:27:41 2017 Return-Path: Delivered-To: svn-src-all@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 5CDFACEF883; Mon, 27 Feb 2017 08:27:41 +0000 (UTC) (envelope-from avg@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 213488CF; Mon, 27 Feb 2017 08:27:41 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1R8ReZd066415; Mon, 27 Feb 2017 08:27:40 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1R8Rcx0066394; Mon, 27 Feb 2017 08:27:38 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201702270827.v1R8Rcx0066394@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 27 Feb 2017 08:27:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314327 - in stable/10: lib/libcrypt lib/libmd sbin/gbde sbin/geom/class/eli sbin/md5 sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/conf sys/crypto/sha2 sys/dev/random sys/geom/bde... X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 08:27:41 -0000 Author: avg Date: Mon Feb 27 08:27:38 2017 New Revision: 314327 URL: https://svnweb.freebsd.org/changeset/base/314327 Log: MFC r292782: Replace sys/crypto/sha2/sha2.c with lib/libmd/sha512c.c cperciva's libmd implementation is 5-30% faster The same was done for SHA256 previously in r263218 Approved by: secteam Added: stable/10/sys/crypto/sha2/sha384.h - copied unchanged from r292782, head/sys/crypto/sha2/sha384.h stable/10/sys/crypto/sha2/sha512.h - copied unchanged from r292782, head/sys/crypto/sha2/sha512.h stable/10/sys/crypto/sha2/sha512c.c - copied unchanged from r292782, head/sys/crypto/sha2/sha512c.c Deleted: stable/10/lib/libmd/sha512.h stable/10/lib/libmd/sha512c.c stable/10/sys/crypto/sha2/sha2.c stable/10/sys/crypto/sha2/sha2.h Modified: stable/10/lib/libcrypt/Makefile stable/10/lib/libmd/Makefile stable/10/lib/libmd/sha512.3 stable/10/lib/libmd/shadriver.c stable/10/sbin/gbde/Makefile stable/10/sbin/gbde/gbde.c stable/10/sbin/geom/class/eli/Makefile stable/10/sbin/md5/Makefile stable/10/sbin/md5/md5.1 stable/10/sbin/md5/md5.c stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c stable/10/sys/conf/files stable/10/sys/crypto/sha2/sha256.h stable/10/sys/dev/random/hash.c stable/10/sys/dev/random/yarrow.c stable/10/sys/geom/bde/g_bde.c stable/10/sys/geom/bde/g_bde_crypt.c stable/10/sys/geom/bde/g_bde_lock.c stable/10/sys/geom/bde/g_bde_work.c stable/10/sys/geom/eli/g_eli.h stable/10/sys/modules/crypto/Makefile stable/10/sys/modules/geom/geom_bde/Makefile stable/10/sys/modules/zfs/Makefile stable/10/sys/netinet/sctp_os_bsd.h stable/10/sys/opencrypto/xform.h Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libcrypt/Makefile ============================================================================== --- stable/10/lib/libcrypt/Makefile Mon Feb 27 08:20:28 2017 (r314326) +++ stable/10/lib/libcrypt/Makefile Mon Feb 27 08:27:38 2017 (r314327) @@ -29,6 +29,7 @@ CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BL .for sym in MD4Init MD4Final MD4Update MD4Pad \ MD5Init MD5Final MD5Update MD5Pad \ SHA256_Init SHA256_Final SHA256_Update \ + SHA384_Init SHA384_Final SHA384_Update \ SHA512_Init SHA512_Final SHA512_Update CFLAGS+= -D${sym}=__${sym} .endfor Modified: stable/10/lib/libmd/Makefile ============================================================================== --- stable/10/lib/libmd/Makefile Mon Feb 27 08:20:28 2017 (r314326) +++ stable/10/lib/libmd/Makefile Mon Feb 27 08:27:38 2017 (r314327) @@ -7,8 +7,9 @@ SRCS= md4c.c md5c.c md4hl.c md5hl.c \ rmd160c.c rmd160hl.c \ sha0c.c sha0hl.c sha1c.c sha1hl.c \ sha256c.c sha256hl.c \ + sha384hl.c \ sha512c.c sha512hl.c -INCS= md4.h md5.h ripemd.h sha.h sha256.h sha512.h +INCS= md4.h md5.h ripemd.h sha.h sha256.h sha384.h sha512.h WARNS?= 0 @@ -33,6 +34,10 @@ MLINKS+=sha256.3 SHA256_Init.3 sha256.3 MLINKS+=sha256.3 SHA256_Final.3 sha256.3 SHA256_End.3 MLINKS+=sha256.3 SHA256_File.3 sha256.3 SHA256_FileChunk.3 MLINKS+=sha256.3 SHA256_Data.3 +MLINKS+=sha512.3 SHA384_Init.3 sha512.3 SHA384_Update.3 +MLINKS+=sha512.3 SHA384_Final.3 sha512.3 SHA384_End.3 +MLINKS+=sha512.3 SHA384_File.3 sha512.3 SHA384_FileChunk.3 +MLINKS+=sha512.3 SHA384_Data.3 sha512.3 sha384.3 MLINKS+=sha512.3 SHA512_Init.3 sha512.3 SHA512_Update.3 MLINKS+=sha512.3 SHA512_Final.3 sha512.3 SHA512_End.3 MLINKS+=sha512.3 SHA512_File.3 sha512.3 SHA512_FileChunk.3 @@ -40,7 +45,8 @@ MLINKS+=sha512.3 SHA512_Data.3 CLEANFILES+= md[245]hl.c md[245].ref md[245].3 mddriver \ rmd160.ref rmd160hl.c rmddriver \ sha0.ref sha0hl.c sha1.ref sha1hl.c shadriver \ - sha256.ref sha256hl.c sha512.ref sha512hl.c + sha256.ref sha256hl.c sha384hl.c sha384.ref \ + sha512.ref sha512hl.c # Define WEAK_REFS to provide weak aliases for libmd symbols # @@ -87,6 +93,12 @@ sha256hl.c: mdXhl.c -e 's/SHA256__/SHA256_/g' \ ${.ALLSRC}) > ${.TARGET} +sha384hl.c: mdXhl.c + (echo '#define LENGTH 48'; \ + sed -e 's/mdX/sha384/g' -e 's/MDX/SHA384_/g' \ + -e 's/SHA384__/SHA384_/g' \ + ${.ALLSRC}) > ${.TARGET} + sha512hl.c: mdXhl.c (echo '#define LENGTH 64'; \ sed -e 's/mdX/sha512/g' -e 's/MDX/SHA512_/g' \ @@ -167,6 +179,21 @@ sha256.ref: @echo 'SHA-256 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ 'f371bc4a311f2b009eef952dd83ca80e2b60026c8e935592d0f9c308453c813e' >> ${.TARGET} +sha384.ref: + echo 'SHA-384 test suite:' > ${.TARGET} + @echo 'SHA-384 ("") =' \ + '38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b' >> ${.TARGET} + @echo 'SHA-384 ("abc") =' \ + 'cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7' >> ${.TARGET} + @echo 'SHA-384 ("message digest") =' \ + '473ed35167ec1f5d8e550368a3db39be54639f828868e9454c239fc8b52e3c61dbd0d8b4de1390c256dcbb5d5fd99cd5' >> ${.TARGET} + @echo 'SHA-384 ("abcdefghijklmnopqrstuvwxyz") =' \ + 'feb67349df3db6f5924815d6c3dc133f091809213731fe5c7b5f4999e463479ff2877f5f2936fa63bb43784b12f3ebb4' >> ${.TARGET} + @echo 'SHA-384 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ + '1761336e3f7cbfe51deb137f026f89e01a448e3b1fafa64039c1464ee8732f11a5341a6f41e0c202294736ed64db1a84' >> ${.TARGET} + @echo 'SHA-384 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ + 'b12932b0627d1c060942f5447764155655bd4da0c9afa6dd9b9ef53129af1b8fb0195996d2de9ca0df9d821ffee67026' >> ${.TARGET} + sha512.ref: echo 'SHA-512 test suite:' > ${.TARGET} @echo 'SHA-512 ("") =' \ @@ -195,7 +222,8 @@ rmd160.ref: @echo 'RIPEMD160 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ '9b752e45573d4b39f4dbd3323cab82bf63326bfb' >> ${.TARGET} -test: md4.ref md5.ref sha0.ref rmd160.ref sha1.ref sha256.ref sha512.ref +test: md4.ref md5.ref sha0.ref rmd160.ref sha1.ref sha256.ref sha384.ref \ + sha512.ref @${ECHO} if any of these test fail, the code produces wrong results @${ECHO} and should NOT be used. ${CC} ${CFLAGS} ${LDFLAGS} -DMD=4 -o mddriver ${.CURDIR}/mddriver.c libmd.a @@ -218,6 +246,9 @@ test: md4.ref md5.ref sha0.ref rmd160.re ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=256 -o shadriver ${.CURDIR}/shadriver.c libmd.a ./shadriver | cmp sha256.ref - @${ECHO} SHA-256 passed test + ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=384 -o shadriver ${.CURDIR}/shadriver.c libmd.a + ./shadriver | cmp sha384.ref - + @${ECHO} SHA-384 passed test ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=512 -o shadriver ${.CURDIR}/shadriver.c libmd.a ./shadriver | cmp sha512.ref - @${ECHO} SHA-512 passed test Modified: stable/10/lib/libmd/sha512.3 ============================================================================== --- stable/10/lib/libmd/sha512.3 Mon Feb 27 08:20:28 2017 (r314326) +++ stable/10/lib/libmd/sha512.3 Mon Feb 27 08:27:38 2017 (r314327) @@ -9,7 +9,7 @@ .\" From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp .\" $FreeBSD$ .\" -.Dd March 28, 2014 +.Dd October 17, 2015 .Dt SHA512 3 .Os .Sh NAME @@ -19,8 +19,15 @@ .Nm SHA512_End , .Nm SHA512_File , .Nm SHA512_FileChunk , -.Nm SHA512_Data -.Nd calculate the FIPS 180-2 ``SHA-512'' message digest +.Nm SHA512_Data , +.Nm SHA384_Init , +.Nm SHA384_Update , +.Nm SHA384_Final , +.Nm SHA384_End , +.Nm SHA384_File , +.Nm SHA384_FileChunk , +.Nm SHA384_Data +.Nd calculate the FIPS 180-4 ``SHA-512'' family of message digests .Sh LIBRARY .Lb libmd .Sh SYNOPSIS @@ -40,6 +47,20 @@ .Fn SHA512_FileChunk "const char *filename" "char *buf" "off_t offset" "off_t length" .Ft "char *" .Fn SHA512_Data "const unsigned char *data" "unsigned int len" "char *buf" +.Ft void +.Fn SHA384_Init "SHA384_CTX *context" +.Ft void +.Fn SHA384_Update "SHA384_CTX *context" "const unsigned char *data" "size_t len" +.Ft void +.Fn SHA384_Final "unsigned char digest[48]" "SHA384_CTX *context" +.Ft "char *" +.Fn SHA384_End "SHA384_CTX *context" "char *buf" +.Ft "char *" +.Fn SHA384_File "const char *filename" "char *buf" +.Ft "char *" +.Fn SHA384_FileChunk "const char *filename" "char *buf" "off_t offset" "off_t length" +.Ft "char *" +.Fn SHA384_Data "const unsigned char *data" "unsigned int len" "char *buf" .Sh DESCRIPTION The .Li SHA512_ @@ -119,6 +140,21 @@ after use. If the .Fa buf argument is non-null it must point to at least 65 characters of buffer space. +.Pp +The +.Li SHA384_ +functions are identical to the +.Li SHA512_ +functions except they use a different initial hash value and the output is +truncated to 384 bits. +.Pp +.Fn SHA384_End +is a wrapper for +.Fn SHA384_Final +which converts the return value to a 49-character +(including the terminating '\e0') +.Tn ASCII +string which represents the 384 bits in hexadecimal. .Sh SEE ALSO .Xr md4 3 , .Xr md5 3 , Modified: stable/10/lib/libmd/shadriver.c ============================================================================== --- stable/10/lib/libmd/shadriver.c Mon Feb 27 08:20:28 2017 (r314326) +++ stable/10/lib/libmd/shadriver.c Mon Feb 27 08:27:38 2017 (r314327) @@ -22,6 +22,7 @@ __FBSDID("$FreeBSD$"); #include "sha.h" #include "sha256.h" +#include "sha384.h" #include "sha512.h" /* The following makes SHA default to SHA-1 if it has not already been @@ -36,6 +37,9 @@ __FBSDID("$FreeBSD$"); #elif SHA == 256 #undef SHA_Data #define SHA_Data SHA256_Data +#elif SHA == 384 +#undef SHA_Data +#define SHA_Data SHA384_Data #elif SHA == 512 #undef SHA_Data #define SHA_Data SHA512_Data Modified: stable/10/sbin/gbde/Makefile ============================================================================== --- stable/10/sbin/gbde/Makefile Mon Feb 27 08:20:28 2017 (r314326) +++ stable/10/sbin/gbde/Makefile Mon Feb 27 08:27:38 2017 (r314327) @@ -4,7 +4,7 @@ PROG= gbde SRCS= gbde.c template.c SRCS+= rijndael-alg-fst.c SRCS+= rijndael-api-fst.c -SRCS+= sha2.c +SRCS+= sha512c.c SRCS+= g_bde_lock.c # rijndael-fst.c does evil casting things which can results in warnings, Modified: stable/10/sbin/gbde/gbde.c ============================================================================== --- stable/10/sbin/gbde/gbde.c Mon Feb 27 08:20:28 2017 (r314326) +++ stable/10/sbin/gbde/gbde.c Mon Feb 27 08:27:38 2017 (r314327) @@ -84,7 +84,7 @@ #include #include #include -#include +#include #include #include Modified: stable/10/sbin/geom/class/eli/Makefile ============================================================================== --- stable/10/sbin/geom/class/eli/Makefile Mon Feb 27 08:20:28 2017 (r314326) +++ stable/10/sbin/geom/class/eli/Makefile Mon Feb 27 08:27:38 2017 (r314327) @@ -6,7 +6,8 @@ GEOM_CLASS= eli SRCS= g_eli_crypto.c SRCS+= g_eli_key.c SRCS+= pkcs5v2.c -SRCS+= sha2.c +SRCS+= sha256c.c +SRCS+= sha512c.c DPADD= ${LIBMD} ${LIBCRYPTO} LDADD= -lmd -lcrypto Modified: stable/10/sbin/md5/Makefile ============================================================================== --- stable/10/sbin/md5/Makefile Mon Feb 27 08:20:28 2017 (r314326) +++ stable/10/sbin/md5/Makefile Mon Feb 27 08:27:38 2017 (r314327) @@ -6,11 +6,13 @@ PROG= md5 LINKS= ${BINDIR}/md5 ${BINDIR}/rmd160 \ ${BINDIR}/md5 ${BINDIR}/sha1 \ ${BINDIR}/md5 ${BINDIR}/sha256 \ + ${BINDIR}/md5 ${BINDIR}/sha384 \ ${BINDIR}/md5 ${BINDIR}/sha512 MLINKS= md5.1 rmd160.1 \ md5.1 sha1.1 \ md5.1 sha256.1 \ + md5.1 sha384.1 \ md5.1 sha512.1 DPADD= ${LIBMD} Modified: stable/10/sbin/md5/md5.1 ============================================================================== --- stable/10/sbin/md5/md5.1 Mon Feb 27 08:20:28 2017 (r314326) +++ stable/10/sbin/md5/md5.1 Mon Feb 27 08:27:38 2017 (r314327) @@ -1,9 +1,9 @@ .\" $FreeBSD$ -.Dd May 17, 2014 +.Dd October 17, 2015 .Dt MD5 1 .Os .Sh NAME -.Nm md5 , sha1 , sha256 , sha512, rmd160 +.Nm md5 , sha1 , sha256 , sha384 , sha512, rmd160 .Nd calculate a message-digest fingerprint (checksum) for a file .Sh SYNOPSIS .Nm md5 @@ -21,6 +21,11 @@ .Op Fl c Ar string .Op Fl s Ar string .Op Ar +.Nm sha384 +.Op Fl pqrtx +.Op Fl c Ar string +.Op Fl s Ar string +.Op Ar .Nm sha512 .Op Fl pqrtx .Op Fl c Ar string @@ -33,7 +38,7 @@ .Op Ar .Sh DESCRIPTION The -.Nm md5 , sha1 , sha256 , sha512 +.Nm md5 , sha1 , sha256 , sha384 , sha512 and .Nm rmd160 utilities take as input a message of arbitrary length and produce as @@ -46,7 +51,7 @@ It is conjectured that it is computation produce two messages having the same message digest, or to produce any message having a given prespecified target message digest. The -.Tn MD5 , SHA-1 , SHA-256 , SHA-512 +.Tn MD5 , SHA-1 , SHA-256 , SHA-384 , SHA-512 and .Tn RIPEMD-160 algorithms are intended for digital signature applications, where a @@ -123,6 +128,7 @@ option. .Xr ripemd 3 , .Xr sha 3 , .Xr sha256 3 , +.Xr sha384 3 , .Xr sha512 3 .Rs .%A R. Rivest Modified: stable/10/sbin/md5/md5.c ============================================================================== --- stable/10/sbin/md5/md5.c Mon Feb 27 08:20:28 2017 (r314326) +++ stable/10/sbin/md5/md5.c Mon Feb 27 08:27:38 2017 (r314327) @@ -28,6 +28,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -55,6 +56,7 @@ typedef char *(DIGEST_End)(void *, char extern const char *MD5TestOutput[MDTESTCOUNT]; extern const char *SHA1_TestOutput[MDTESTCOUNT]; extern const char *SHA256_TestOutput[MDTESTCOUNT]; +extern const char *SHA384_TestOutput[MDTESTCOUNT]; extern const char *SHA512_TestOutput[MDTESTCOUNT]; extern const char *RIPEMD160_TestOutput[MDTESTCOUNT]; @@ -80,6 +82,7 @@ typedef union { MD5_CTX md5; SHA1_CTX sha1; SHA256_CTX sha256; + SHA384_CTX sha384; SHA512_CTX sha512; RIPEMD160_CTX ripemd160; } DIGEST_CTX; @@ -101,6 +104,9 @@ static const struct Algorithm_t Algorith { "sha256", "SHA256", &SHA256_TestOutput, (DIGEST_Init*)&SHA256_Init, (DIGEST_Update*)&SHA256_Update, (DIGEST_End*)&SHA256_End, &SHA256_Data, &SHA256_File }, + { "sha384", "SHA384", &SHA384_TestOutput, (DIGEST_Init*)&SHA384_Init, + (DIGEST_Update*)&SHA384_Update, (DIGEST_End*)&SHA384_End, + &SHA384_Data, &SHA384_File }, { "sha512", "SHA512", &SHA512_TestOutput, (DIGEST_Init*)&SHA512_Init, (DIGEST_Update*)&SHA512_Update, (DIGEST_End*)&SHA512_End, &SHA512_Data, &SHA512_File }, @@ -327,6 +333,17 @@ const char *SHA256_TestOutput[MDTESTCOUN "e6eae09f10ad4122a0e2a4075761d185a272ebd9f5aa489e998ff2f09cbfdd9f" }; +const char *SHA384_TestOutput[MDTESTCOUNT] = { + "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b", + "54a59b9f22b0b80880d8427e548b7c23abd873486e1f035dce9cd697e85175033caa88e6d57bc35efae0b5afd3145f31", + "cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7", + "473ed35167ec1f5d8e550368a3db39be54639f828868e9454c239fc8b52e3c61dbd0d8b4de1390c256dcbb5d5fd99cd5", + "feb67349df3db6f5924815d6c3dc133f091809213731fe5c7b5f4999e463479ff2877f5f2936fa63bb43784b12f3ebb4", + "1761336e3f7cbfe51deb137f026f89e01a448e3b1fafa64039c1464ee8732f11a5341a6f41e0c202294736ed64db1a84", + "b12932b0627d1c060942f5447764155655bd4da0c9afa6dd9b9ef53129af1b8fb0195996d2de9ca0df9d821ffee67026", + "99428d401bf4abcd4ee0695248c9858b7503853acfae21a9cffa7855f46d1395ef38596fcd06d5a8c32d41a839cc5dfb" +}; + const char *SHA512_TestOutput[MDTESTCOUNT] = { "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e", "1f40fc92da241694750979ee6cf582f2d5d7d28e18335de05abc54d0560e0f5302860c652bf08d560252aa5e74210546f369fbbbce8c12cfc7957b2652fe9a75", Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c Mon Feb 27 08:20:28 2017 (r314326) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c Mon Feb 27 08:27:38 2017 (r314327) @@ -28,7 +28,7 @@ #include #include #ifdef _KERNEL -#include +#include #else #include #endif Modified: stable/10/sys/conf/files ============================================================================== --- stable/10/sys/conf/files Mon Feb 27 08:20:28 2017 (r314326) +++ stable/10/sys/conf/files Mon Feb 27 08:27:38 2017 (r314327) @@ -543,10 +543,9 @@ crypto/rijndael/rijndael-api-fst.c optio crypto/rijndael/rijndael-api.c optional crypto | ipsec | wlan_ccmp crypto/sha1.c optional carp | crypto | ipsec | \ netgraph_mppc_encryption | sctp -crypto/sha2/sha2.c optional crypto | geom_bde | ipsec | random | \ - sctp | zfs crypto/sha2/sha256c.c optional crypto | geom_bde | ipsec | random | \ sctp | zfs +crypto/sha2/sha512c.c optional crypto | geom_bde | ipsec | zfs crypto/siphash/siphash.c optional inet | inet6 crypto/siphash/siphash_test.c optional inet | inet6 ddb/db_access.c optional ddb Modified: stable/10/sys/crypto/sha2/sha256.h ============================================================================== --- stable/10/sys/crypto/sha2/sha256.h Mon Feb 27 08:20:28 2017 (r314326) +++ stable/10/sys/crypto/sha2/sha256.h Mon Feb 27 08:27:38 2017 (r314327) @@ -33,10 +33,14 @@ #include #endif +#define SHA256_BLOCK_LENGTH 64 +#define SHA256_DIGEST_LENGTH 32 +#define SHA256_DIGEST_STRING_LENGTH (SHA256_DIGEST_LENGTH * 2 + 1) + typedef struct SHA256Context { uint32_t state[8]; uint64_t count; - uint8_t buf[64]; + uint8_t buf[SHA256_BLOCK_LENGTH]; } SHA256_CTX; __BEGIN_DECLS @@ -74,10 +78,10 @@ __BEGIN_DECLS void SHA256_Init(SHA256_CTX *); void SHA256_Update(SHA256_CTX *, const void *, size_t); -void SHA256_Final(unsigned char [32], SHA256_CTX *); +void SHA256_Final(unsigned char [SHA256_DIGEST_LENGTH], SHA256_CTX *); +#ifndef _KERNEL char *SHA256_End(SHA256_CTX *, char *); char *SHA256_Data(const void *, unsigned int, char *); -#ifndef _KERNEL char *SHA256_File(const char *, char *); char *SHA256_FileChunk(const char *, char *, off_t, off_t); #endif Copied: stable/10/sys/crypto/sha2/sha384.h (from r292782, head/sys/crypto/sha2/sha384.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/sys/crypto/sha2/sha384.h Mon Feb 27 08:27:38 2017 (r314327, copy of r292782, head/sys/crypto/sha2/sha384.h) @@ -0,0 +1,87 @@ +/*- + * Copyright 2005 Colin Percival + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _SHA384_H_ +#define _SHA384_H_ + +#ifndef _KERNEL +#include +#endif + +#define SHA384_BLOCK_LENGTH 128 +#define SHA384_DIGEST_LENGTH 48 +#define SHA384_DIGEST_STRING_LENGTH (SHA384_DIGEST_LENGTH * 2 + 1) + +typedef struct SHA384Context { + uint64_t state[8]; + uint64_t count[2]; + uint8_t buf[SHA384_BLOCK_LENGTH]; +} SHA384_CTX; + +__BEGIN_DECLS + +/* Ensure libmd symbols do not clash with libcrypto */ +#ifndef SHA384_Init +#define SHA384_Init _libmd_SHA384_Init +#endif +#ifndef SHA384_Update +#define SHA384_Update _libmd_SHA384_Update +#endif +#ifndef SHA384_Final +#define SHA384_Final _libmd_SHA384_Final +#endif +#ifndef SHA384_End +#define SHA384_End _libmd_SHA384_End +#endif +#ifndef SHA384_File +#define SHA384_File _libmd_SHA384_File +#endif +#ifndef SHA384_FileChunk +#define SHA384_FileChunk _libmd_SHA384_FileChunk +#endif +#ifndef SHA384_Data +#define SHA384_Data _libmd_SHA384_Data +#endif + +#ifndef SHA384_version +#define SHA384_version _libmd_SHA384_version +#endif + +void SHA384_Init(SHA384_CTX *); +void SHA384_Update(SHA384_CTX *, const void *, size_t); +void SHA384_Final(unsigned char [SHA384_DIGEST_LENGTH], SHA384_CTX *); +#ifndef _KERNEL +char *SHA384_End(SHA384_CTX *, char *); +char *SHA384_Data(const void *, unsigned int, char *); +char *SHA384_File(const char *, char *); +char *SHA384_FileChunk(const char *, char *, off_t, off_t); +#endif + +__END_DECLS + +#endif /* !_SHA384_H_ */ Copied: stable/10/sys/crypto/sha2/sha512.h (from r292782, head/sys/crypto/sha2/sha512.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/sys/crypto/sha2/sha512.h Mon Feb 27 08:27:38 2017 (r314327, copy of r292782, head/sys/crypto/sha2/sha512.h) @@ -0,0 +1,90 @@ +/*- + * Copyright 2005 Colin Percival + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _SHA512_H_ +#define _SHA512_H_ + +#ifndef _KERNEL +#include +#endif + +#define SHA512_BLOCK_LENGTH 128 +#define SHA512_DIGEST_LENGTH 64 +#define SHA512_DIGEST_STRING_LENGTH (SHA512_DIGEST_LENGTH * 2 + 1) + +typedef struct SHA512Context { + uint64_t state[8]; + uint64_t count[2]; + uint8_t buf[SHA512_BLOCK_LENGTH]; +} SHA512_CTX; + +__BEGIN_DECLS + +/* Ensure libmd symbols do not clash with libcrypto */ +#ifndef SHA512_Init +#define SHA512_Init _libmd_SHA512_Init +#endif +#ifndef SHA512_Update +#define SHA512_Update _libmd_SHA512_Update +#endif +#ifndef SHA512_Final +#define SHA512_Final _libmd_SHA512_Final +#endif +#ifndef SHA512_End +#define SHA512_End _libmd_SHA512_End +#endif +#ifndef SHA512_File +#define SHA512_File _libmd_SHA512_File +#endif +#ifndef SHA512_FileChunk +#define SHA512_FileChunk _libmd_SHA512_FileChunk +#endif +#ifndef SHA512_Data +#define SHA512_Data _libmd_SHA512_Data +#endif + +#ifndef SHA512_Transform +#define SHA512_Transform _libmd_SHA512_Transform +#endif +#ifndef SHA512_version +#define SHA512_version _libmd_SHA512_version +#endif + +void SHA512_Init(SHA512_CTX *); +void SHA512_Update(SHA512_CTX *, const void *, size_t); +void SHA512_Final(unsigned char [SHA512_DIGEST_LENGTH], SHA512_CTX *); +#ifndef _KERNEL +char *SHA512_End(SHA512_CTX *, char *); +char *SHA512_Data(const void *, unsigned int, char *); +char *SHA512_File(const char *, char *); +char *SHA512_FileChunk(const char *, char *, off_t, off_t); +#endif + +__END_DECLS + +#endif /* !_SHA512_H_ */ Copied: stable/10/sys/crypto/sha2/sha512c.c (from r292782, head/sys/crypto/sha2/sha512c.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/sys/crypto/sha2/sha512c.c Mon Feb 27 08:27:38 2017 (r314327, copy of r292782, head/sys/crypto/sha2/sha512c.c) @@ -0,0 +1,397 @@ +/*- + * Copyright 2005 Colin Percival + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include + +#ifdef _KERNEL +#include +#else +#include +#endif + +#include "sha512.h" +#include "sha384.h" + +#if BYTE_ORDER == BIG_ENDIAN + +/* Copy a vector of big-endian uint64_t into a vector of bytes */ +#define be64enc_vect(dst, src, len) \ + memcpy((void *)dst, (const void *)src, (size_t)len) + +/* Copy a vector of bytes into a vector of big-endian uint64_t */ +#define be64dec_vect(dst, src, len) \ + memcpy((void *)dst, (const void *)src, (size_t)len) + +#else /* BYTE_ORDER != BIG_ENDIAN */ + +/* + * Encode a length len/4 vector of (uint64_t) into a length len vector of + * (unsigned char) in big-endian form. Assumes len is a multiple of 8. + */ +static void +be64enc_vect(unsigned char *dst, const uint64_t *src, size_t len) +{ + size_t i; + + for (i = 0; i < len / 8; i++) + be64enc(dst + i * 8, src[i]); +} + +/* + * Decode a big-endian length len vector of (unsigned char) into a length + * len/4 vector of (uint64_t). Assumes len is a multiple of 8. + */ +static void +be64dec_vect(uint64_t *dst, const unsigned char *src, size_t len) +{ + size_t i; + + for (i = 0; i < len / 8; i++) + dst[i] = be64dec(src + i * 8); +} + +#endif /* BYTE_ORDER != BIG_ENDIAN */ + +/* Elementary functions used by SHA512 */ +#define Ch(x, y, z) ((x & (y ^ z)) ^ z) +#define Maj(x, y, z) ((x & (y | z)) | (y & z)) +#define SHR(x, n) (x >> n) +#define ROTR(x, n) ((x >> n) | (x << (64 - n))) +#define S0(x) (ROTR(x, 28) ^ ROTR(x, 34) ^ ROTR(x, 39)) +#define S1(x) (ROTR(x, 14) ^ ROTR(x, 18) ^ ROTR(x, 41)) +#define s0(x) (ROTR(x, 1) ^ ROTR(x, 8) ^ SHR(x, 7)) +#define s1(x) (ROTR(x, 19) ^ ROTR(x, 61) ^ SHR(x, 6)) + +/* SHA512 round function */ +#define RND(a, b, c, d, e, f, g, h, k) \ + t0 = h + S1(e) + Ch(e, f, g) + k; \ + t1 = S0(a) + Maj(a, b, c); \ + d += t0; \ + h = t0 + t1; + +/* Adjusted round function for rotating state */ +#define RNDr(S, W, i, k) \ + RND(S[(80 - i) % 8], S[(81 - i) % 8], \ + S[(82 - i) % 8], S[(83 - i) % 8], \ + S[(84 - i) % 8], S[(85 - i) % 8], \ + S[(86 - i) % 8], S[(87 - i) % 8], \ + W[i] + k) + +/* + * SHA512 block compression function. The 512-bit state is transformed via + * the 512-bit input block to produce a new state. + */ +static void +SHA512_Transform(uint64_t * state, const unsigned char block[SHA512_BLOCK_LENGTH]) +{ + uint64_t W[80]; + uint64_t S[8]; + uint64_t t0, t1; + int i; + + /* 1. Prepare message schedule W. */ + be64dec_vect(W, block, SHA512_BLOCK_LENGTH); + for (i = 16; i < 80; i++) + W[i] = s1(W[i - 2]) + W[i - 7] + s0(W[i - 15]) + W[i - 16]; + + /* 2. Initialize working variables. */ + memcpy(S, state, SHA512_DIGEST_LENGTH); + + /* 3. Mix. */ + RNDr(S, W, 0, 0x428a2f98d728ae22ULL); + RNDr(S, W, 1, 0x7137449123ef65cdULL); + RNDr(S, W, 2, 0xb5c0fbcfec4d3b2fULL); + RNDr(S, W, 3, 0xe9b5dba58189dbbcULL); + RNDr(S, W, 4, 0x3956c25bf348b538ULL); + RNDr(S, W, 5, 0x59f111f1b605d019ULL); + RNDr(S, W, 6, 0x923f82a4af194f9bULL); + RNDr(S, W, 7, 0xab1c5ed5da6d8118ULL); + RNDr(S, W, 8, 0xd807aa98a3030242ULL); + RNDr(S, W, 9, 0x12835b0145706fbeULL); + RNDr(S, W, 10, 0x243185be4ee4b28cULL); + RNDr(S, W, 11, 0x550c7dc3d5ffb4e2ULL); + RNDr(S, W, 12, 0x72be5d74f27b896fULL); + RNDr(S, W, 13, 0x80deb1fe3b1696b1ULL); + RNDr(S, W, 14, 0x9bdc06a725c71235ULL); + RNDr(S, W, 15, 0xc19bf174cf692694ULL); + RNDr(S, W, 16, 0xe49b69c19ef14ad2ULL); + RNDr(S, W, 17, 0xefbe4786384f25e3ULL); + RNDr(S, W, 18, 0x0fc19dc68b8cd5b5ULL); + RNDr(S, W, 19, 0x240ca1cc77ac9c65ULL); + RNDr(S, W, 20, 0x2de92c6f592b0275ULL); + RNDr(S, W, 21, 0x4a7484aa6ea6e483ULL); + RNDr(S, W, 22, 0x5cb0a9dcbd41fbd4ULL); + RNDr(S, W, 23, 0x76f988da831153b5ULL); + RNDr(S, W, 24, 0x983e5152ee66dfabULL); + RNDr(S, W, 25, 0xa831c66d2db43210ULL); + RNDr(S, W, 26, 0xb00327c898fb213fULL); + RNDr(S, W, 27, 0xbf597fc7beef0ee4ULL); + RNDr(S, W, 28, 0xc6e00bf33da88fc2ULL); + RNDr(S, W, 29, 0xd5a79147930aa725ULL); + RNDr(S, W, 30, 0x06ca6351e003826fULL); + RNDr(S, W, 31, 0x142929670a0e6e70ULL); + RNDr(S, W, 32, 0x27b70a8546d22ffcULL); + RNDr(S, W, 33, 0x2e1b21385c26c926ULL); + RNDr(S, W, 34, 0x4d2c6dfc5ac42aedULL); + RNDr(S, W, 35, 0x53380d139d95b3dfULL); + RNDr(S, W, 36, 0x650a73548baf63deULL); + RNDr(S, W, 37, 0x766a0abb3c77b2a8ULL); + RNDr(S, W, 38, 0x81c2c92e47edaee6ULL); + RNDr(S, W, 39, 0x92722c851482353bULL); + RNDr(S, W, 40, 0xa2bfe8a14cf10364ULL); + RNDr(S, W, 41, 0xa81a664bbc423001ULL); + RNDr(S, W, 42, 0xc24b8b70d0f89791ULL); + RNDr(S, W, 43, 0xc76c51a30654be30ULL); + RNDr(S, W, 44, 0xd192e819d6ef5218ULL); + RNDr(S, W, 45, 0xd69906245565a910ULL); + RNDr(S, W, 46, 0xf40e35855771202aULL); + RNDr(S, W, 47, 0x106aa07032bbd1b8ULL); + RNDr(S, W, 48, 0x19a4c116b8d2d0c8ULL); + RNDr(S, W, 49, 0x1e376c085141ab53ULL); + RNDr(S, W, 50, 0x2748774cdf8eeb99ULL); + RNDr(S, W, 51, 0x34b0bcb5e19b48a8ULL); + RNDr(S, W, 52, 0x391c0cb3c5c95a63ULL); + RNDr(S, W, 53, 0x4ed8aa4ae3418acbULL); + RNDr(S, W, 54, 0x5b9cca4f7763e373ULL); + RNDr(S, W, 55, 0x682e6ff3d6b2b8a3ULL); + RNDr(S, W, 56, 0x748f82ee5defb2fcULL); + RNDr(S, W, 57, 0x78a5636f43172f60ULL); + RNDr(S, W, 58, 0x84c87814a1f0ab72ULL); + RNDr(S, W, 59, 0x8cc702081a6439ecULL); + RNDr(S, W, 60, 0x90befffa23631e28ULL); + RNDr(S, W, 61, 0xa4506cebde82bde9ULL); + RNDr(S, W, 62, 0xbef9a3f7b2c67915ULL); + RNDr(S, W, 63, 0xc67178f2e372532bULL); + RNDr(S, W, 64, 0xca273eceea26619cULL); + RNDr(S, W, 65, 0xd186b8c721c0c207ULL); + RNDr(S, W, 66, 0xeada7dd6cde0eb1eULL); + RNDr(S, W, 67, 0xf57d4f7fee6ed178ULL); + RNDr(S, W, 68, 0x06f067aa72176fbaULL); + RNDr(S, W, 69, 0x0a637dc5a2c898a6ULL); + RNDr(S, W, 70, 0x113f9804bef90daeULL); + RNDr(S, W, 71, 0x1b710b35131c471bULL); + RNDr(S, W, 72, 0x28db77f523047d84ULL); + RNDr(S, W, 73, 0x32caab7b40c72493ULL); + RNDr(S, W, 74, 0x3c9ebe0a15c9bebcULL); + RNDr(S, W, 75, 0x431d67c49c100d4cULL); + RNDr(S, W, 76, 0x4cc5d4becb3e42b6ULL); + RNDr(S, W, 77, 0x597f299cfc657e2aULL); + RNDr(S, W, 78, 0x5fcb6fab3ad6faecULL); + RNDr(S, W, 79, 0x6c44198c4a475817ULL); + + /* 4. Mix local working variables into global state */ + for (i = 0; i < 8; i++) + state[i] += S[i]; +} + +static unsigned char PAD[SHA512_BLOCK_LENGTH] = { + 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +}; + +/* Add padding and terminating bit-count. */ +static void +SHA512_Pad(SHA512_CTX * ctx) +{ + unsigned char len[16]; + uint64_t r, plen; + + /* + * Convert length to a vector of bytes -- we do this now rather + * than later because the length will change after we pad. + */ + be64enc_vect(len, ctx->count, 16); + + /* Add 1--128 bytes so that the resulting length is 112 mod 128 */ + r = (ctx->count[1] >> 3) & 0x7f; + plen = (r < 112) ? (112 - r) : (240 - r); + SHA512_Update(ctx, PAD, (size_t)plen); + + /* Add the terminating bit-count */ + SHA512_Update(ctx, len, 16); +} + +/* SHA-512 initialization. Begins a SHA-512 operation. */ +void +SHA512_Init(SHA512_CTX * ctx) +{ + + /* Zero bits processed so far */ + ctx->count[0] = ctx->count[1] = 0; + + /* Magic initialization constants */ + ctx->state[0] = 0x6a09e667f3bcc908ULL; + ctx->state[1] = 0xbb67ae8584caa73bULL; + ctx->state[2] = 0x3c6ef372fe94f82bULL; + ctx->state[3] = 0xa54ff53a5f1d36f1ULL; + ctx->state[4] = 0x510e527fade682d1ULL; + ctx->state[5] = 0x9b05688c2b3e6c1fULL; + ctx->state[6] = 0x1f83d9abfb41bd6bULL; + ctx->state[7] = 0x5be0cd19137e2179ULL; +} + +/* Add bytes into the hash */ +void +SHA512_Update(SHA512_CTX * ctx, const void *in, size_t len) +{ + uint64_t bitlen[2]; + uint64_t r; + const unsigned char *src = in; + + /* Number of bytes left in the buffer from previous updates */ + r = (ctx->count[1] >> 3) & 0x7f; + + /* Convert the length into a number of bits */ + bitlen[1] = ((uint64_t)len) << 3; + bitlen[0] = ((uint64_t)len) >> 61; + + /* Update number of bits */ + if ((ctx->count[1] += bitlen[1]) < bitlen[1]) + ctx->count[0]++; + ctx->count[0] += bitlen[0]; + + /* Handle the case where we don't need to perform any transforms */ + if (len < SHA512_BLOCK_LENGTH - r) { + memcpy(&ctx->buf[r], src, len); + return; + } + + /* Finish the current block */ + memcpy(&ctx->buf[r], src, SHA512_BLOCK_LENGTH - r); + SHA512_Transform(ctx->state, ctx->buf); + src += SHA512_BLOCK_LENGTH - r; + len -= SHA512_BLOCK_LENGTH - r; + + /* Perform complete blocks */ + while (len >= SHA512_BLOCK_LENGTH) { + SHA512_Transform(ctx->state, src); + src += SHA512_BLOCK_LENGTH; + len -= SHA512_BLOCK_LENGTH; + } + + /* Copy left over data into buffer */ + memcpy(ctx->buf, src, len); +} + +/* + * SHA-512 finalization. Pads the input data, exports the hash value, + * and clears the context state. + */ +void +SHA512_Final(unsigned char digest[SHA512_DIGEST_LENGTH], SHA512_CTX * ctx) +{ + + /* Add padding */ + SHA512_Pad(ctx); + + /* Write the hash */ + be64enc_vect(digest, ctx->state, SHA512_DIGEST_LENGTH); + + /* Clear the context state */ + memset((void *)ctx, 0, sizeof(*ctx)); +} + +/*** SHA-384: *********************************************************/ +/* + * the SHA384 and SHA512 transforms are identical, so SHA384 is skipped + */ + +/* SHA-384 initialization. Begins a SHA-384 operation. */ +void +SHA384_Init(SHA384_CTX * ctx) +{ + + /* Zero bits processed so far */ + ctx->count[0] = ctx->count[1] = 0; + + /* Magic initialization constants */ + ctx->state[0] = 0xcbbb9d5dc1059ed8ULL; + ctx->state[1] = 0x629a292a367cd507ULL; + ctx->state[2] = 0x9159015a3070dd17ULL; + ctx->state[3] = 0x152fecd8f70e5939ULL; + ctx->state[4] = 0x67332667ffc00b31ULL; + ctx->state[5] = 0x8eb44a8768581511ULL; + ctx->state[6] = 0xdb0c2e0d64f98fa7ULL; + ctx->state[7] = 0x47b5481dbefa4fa4ULL; +} + +/* Add bytes into the SHA-384 hash */ +void +SHA384_Update(SHA384_CTX * ctx, const void *in, size_t len) +{ + + SHA512_Update((SHA512_CTX *)ctx, in, len); +} + +/* + * SHA-384 finalization. Pads the input data, exports the hash value, + * and clears the context state. + */ +void +SHA384_Final(unsigned char digest[SHA384_DIGEST_LENGTH], SHA384_CTX * ctx) +{ + + /* Add padding */ + SHA512_Pad((SHA512_CTX *)ctx); + + /* Write the hash */ + be64enc_vect(digest, ctx->state, SHA384_DIGEST_LENGTH); + + /* Clear the context state */ + memset((void *)ctx, 0, sizeof(*ctx)); +} + +#ifdef WEAK_REFS +/* When building libmd, provide weak references. Note: this is not + activated in the context of compiling these sources for internal + use in libcrypt. + */ +#undef SHA512_Init +__weak_reference(_libmd_SHA512_Init, SHA512_Init); +#undef SHA512_Update +__weak_reference(_libmd_SHA512_Update, SHA512_Update); +#undef SHA512_Final +__weak_reference(_libmd_SHA512_Final, SHA512_Final); +#undef SHA512_Transform +__weak_reference(_libmd_SHA512_Transform, SHA512_Transform); + +#undef SHA384_Init +__weak_reference(_libmd_SHA384_Init, SHA384_Init); +#undef SHA384_Update +__weak_reference(_libmd_SHA384_Update, SHA384_Update); +#undef SHA384_Final +__weak_reference(_libmd_SHA384_Final, SHA384_Final); +#endif Modified: stable/10/sys/dev/random/hash.c ============================================================================== --- stable/10/sys/dev/random/hash.c Mon Feb 27 08:20:28 2017 (r314326) +++ stable/10/sys/dev/random/hash.c Mon Feb 27 08:27:38 2017 (r314327) @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include Modified: stable/10/sys/dev/random/yarrow.c ============================================================================== --- stable/10/sys/dev/random/yarrow.c Mon Feb 27 08:20:28 2017 (r314326) +++ stable/10/sys/dev/random/yarrow.c Mon Feb 27 08:27:38 2017 (r314327) @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Mon Feb 27 08:36:53 2017 Return-Path: Delivered-To: svn-src-all@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 2B7E2CEFE5E; Mon, 27 Feb 2017 08:36:53 +0000 (UTC) (envelope-from hselasky@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 DDF97FED; Mon, 27 Feb 2017 08:36:52 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1R8ap9o070265; Mon, 27 Feb 2017 08:36:51 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1R8apcb070264; Mon, 27 Feb 2017 08:36:51 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201702270836.v1R8apcb070264@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 27 Feb 2017 08:36:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314328 - head/sys/dev/acpica X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 08:36:53 -0000 Author: hselasky Date: Mon Feb 27 08:36:51 2017 New Revision: 314328 URL: https://svnweb.freebsd.org/changeset/base/314328 Log: Fix startup race initialising ACPI CM battery structures on MacBookPro. During acpi_cmbat_attach() the acpi_cmbat_init_battery() notification handler is registered. It has been observed this notification handler can be called instantly, before the attach routine has returned. In the notification handler there is a call to device_is_attached() which returns false. Because the softc is set we know an attach is in progress and the fix is simply to wait and try again in this case. Reviewed by: avg @ MFC after: 1 week Modified: head/sys/dev/acpica/acpi_cmbat.c Modified: head/sys/dev/acpica/acpi_cmbat.c ============================================================================== --- head/sys/dev/acpica/acpi_cmbat.c Mon Feb 27 08:27:38 2017 (r314327) +++ head/sys/dev/acpica/acpi_cmbat.c Mon Feb 27 08:36:51 2017 (r314328) @@ -164,6 +164,16 @@ acpi_cmbat_detach(device_t dev) handle = acpi_get_handle(dev); AcpiRemoveNotifyHandler(handle, ACPI_ALL_NOTIFY, acpi_cmbat_notify_handler); acpi_battery_remove(dev); + + /* + * Force any pending notification handler calls to complete by + * requesting cmbat serialisation while freeing and clearing the + * softc pointer: + */ + ACPI_SERIAL_BEGIN(cmbat); + device_set_softc(dev, NULL); + ACPI_SERIAL_END(cmbat); + return (0); } @@ -436,7 +446,6 @@ acpi_cmbat_init_battery(void *arg) device_t dev; dev = (device_t)arg; - sc = device_get_softc(dev); ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), "battery initialization start\n"); @@ -446,18 +455,33 @@ acpi_cmbat_init_battery(void *arg) * to wait a while. */ for (retry = 0; retry < ACPI_CMBAT_RETRY_MAX; retry++, AcpiOsSleep(10000)) { - /* batteries on DOCK can be ejected w/ DOCK during retrying */ - if (!device_is_attached(dev)) + /* + * Batteries on DOCK can be ejected w/ DOCK during retrying. + * + * If there is a valid softc pointer the device may be in + * attaching, attached or detaching state. If the state is + * different from attached retry getting the device state + * until it becomes stable. This solves a race if the ACPI + * notification handler is called during attach, because + * device_is_attached() doesn't return non-zero until after + * the attach code has been executed. + */ + ACPI_SERIAL_BEGIN(cmbat); + sc = device_get_softc(dev); + if (sc == NULL) { + ACPI_SERIAL_END(cmbat); return; + } - if (!acpi_BatteryIsPresent(dev)) + if (!acpi_BatteryIsPresent(dev) || !device_is_attached(dev)) { + ACPI_SERIAL_END(cmbat); continue; + } /* * Only query the battery if this is the first try or the specific * type of info is still invalid. */ - ACPI_SERIAL_BEGIN(cmbat); if (retry == 0 || !acpi_battery_bst_valid(&sc->bst)) { timespecclear(&sc->bst_lastupdated); acpi_cmbat_get_bst(dev); From owner-svn-src-all@freebsd.org Mon Feb 27 08:58:28 2017 Return-Path: Delivered-To: svn-src-all@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 B1152CEF900; Mon, 27 Feb 2017 08:58:28 +0000 (UTC) (envelope-from manu@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 7376FD81; Mon, 27 Feb 2017 08:58:28 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1R8wRbg078246; Mon, 27 Feb 2017 08:58:27 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1R8wRED078241; Mon, 27 Feb 2017 08:58:27 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201702270858.v1R8wRED078241@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Mon, 27 Feb 2017 08:58:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314329 - head/sys/arm/allwinner/clkng X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 08:58:28 -0000 Author: manu Date: Mon Feb 27 08:58:27 2017 New Revision: 314329 URL: https://svnweb.freebsd.org/changeset/base/314329 Log: allwinner: Add support for lock and fractional mode on NM clock Some PLL have a fractional mode and a lock bit. Add support for it on the NM clock and export the clocks in the clkdom. Modified: head/sys/arm/allwinner/clkng/aw_clk.h head/sys/arm/allwinner/clkng/aw_clk_nm.c head/sys/arm/allwinner/clkng/aw_clk_nm.h head/sys/arm/allwinner/clkng/ccu_h3.c Modified: head/sys/arm/allwinner/clkng/aw_clk.h ============================================================================== --- head/sys/arm/allwinner/clkng/aw_clk.h Mon Feb 27 08:36:51 2017 (r314328) +++ head/sys/arm/allwinner/clkng/aw_clk.h Mon Feb 27 08:58:27 2017 (r314329) @@ -63,6 +63,7 @@ struct aw_clk_init { #define AW_CLK_HAS_MUX 0x0004 #define AW_CLK_REPARENT 0x0008 #define AW_CLK_SCALE_CHANGE 0x0010 +#define AW_CLK_HAS_FRAC 0x0020 #define AW_CLK_FACTOR_POWER_OF_TWO 0x0001 #define AW_CLK_FACTOR_ZERO_BASED 0x0002 @@ -83,6 +84,13 @@ struct aw_clk_factor { uint32_t flags; /* Flags */ }; +struct aw_clk_frac { + uint64_t freq0; + uint64_t freq1; + uint32_t mode_sel; + uint32_t freq_sel; +}; + static inline uint32_t aw_clk_get_factor(uint32_t val, struct aw_clk_factor *factor) { @@ -238,6 +246,38 @@ aw_clk_factor_get_value(struct aw_clk_fa .flags = _flags, \ }, +#define NM_CLK_WITH_FRAC(_id, _name, _pnames, \ + _offset, \ + _nshift, _nwidth, _nvalue, _nflags, \ + _mshift, _mwidth, _mvalue, _mflags, \ + _gate_shift, _lock_shift,_lock_retries, \ + _flags, _freq0, _freq1, _mode_sel, _freq_sel) \ + { \ + .clkdef = { \ + .id = _id, \ + .name = _name, \ + .parent_names = _pnames, \ + .parent_cnt = nitems(_pnames), \ + }, \ + .offset = _offset, \ + .n.shift = _nshift, \ + .n.width = _nwidth, \ + .n.value = _nvalue, \ + .n.flags = _nflags, \ + .m.shift = _mshift, \ + .m.width = _mwidth, \ + .m.value = _mvalue, \ + .m.flags = _mflags, \ + .gate_shift = _gate_shift, \ + .lock_shift = _lock_shift, \ + .lock_retries = _lock_retries, \ + .flags = _flags | AW_CLK_HAS_FRAC, \ + .frac.freq0 = _freq0, \ + .frac.freq1 = _freq1, \ + .frac.mode_sel = _mode_sel, \ + .frac.freq_sel = _freq_sel, \ + }, + #define PREDIV_CLK(_id, _name, _pnames, \ _offset, \ _mux_shift, _mux_width, \ Modified: head/sys/arm/allwinner/clkng/aw_clk_nm.c ============================================================================== --- head/sys/arm/allwinner/clkng/aw_clk_nm.c Mon Feb 27 08:36:51 2017 (r314328) +++ head/sys/arm/allwinner/clkng/aw_clk_nm.c Mon Feb 27 08:58:27 2017 (r314329) @@ -52,10 +52,13 @@ struct aw_clk_nm_sc { struct aw_clk_factor m; struct aw_clk_factor n; + struct aw_clk_frac frac; uint32_t mux_shift; uint32_t mux_mask; uint32_t gate_shift; + uint32_t lock_shift; + uint32_t lock_retries; uint32_t flags; }; @@ -178,13 +181,13 @@ aw_clk_nm_set_freq(struct clknode *clk, struct aw_clk_nm_sc *sc; struct clknode *p_clk; const char **p_names; - uint64_t cur, best; + uint64_t cur, best, best_frac; uint32_t val, m, n, best_m, best_n; - int p_idx, best_parent; + int p_idx, best_parent, retry; sc = clknode_get_softc(clk); - best = cur = 0; + best = best_frac = cur = 0; best_parent = 0; if ((sc->flags & AW_CLK_REPARENT) != 0) { @@ -205,8 +208,15 @@ aw_clk_nm_set_freq(struct clknode *clk, p_idx = clknode_get_parent_idx(clk); p_clk = clknode_get_parent(clk); clknode_get_freq(p_clk, &fparent); - } else - best = aw_clk_nm_find_best(sc, fparent, fout, &best_n, &best_m); + } else { + if (sc->flags & AW_CLK_HAS_FRAC && + (*fout == sc->frac.freq0 || *fout == sc->frac.freq1)) + best = best_frac = *fout; + + if (best == 0) + best = aw_clk_nm_find_best(sc, fparent, fout, + &best_n, &best_m); + } if ((flags & CLK_SET_DRYRUN) != 0) { *fout = best; @@ -228,17 +238,36 @@ aw_clk_nm_set_freq(struct clknode *clk, if (p_idx != best_parent) clknode_set_parent_by_idx(clk, best_parent); - n = aw_clk_factor_get_value(&sc->n, best_n); - m = aw_clk_factor_get_value(&sc->m, best_m); DEVICE_LOCK(clk); READ4(clk, sc->offset, &val); - val &= ~sc->n.mask; - val &= ~sc->m.mask; - val |= n << sc->n.shift; - val |= m << sc->m.shift; + + if (best_frac != 0) { + val &= ~sc->frac.mode_sel; + if (best_frac == sc->frac.freq0) + val &= ~sc->frac.freq_sel; + else + val |= sc->frac.freq_sel; + } else { + n = aw_clk_factor_get_value(&sc->n, best_n); + m = aw_clk_factor_get_value(&sc->m, best_m); + val &= ~sc->n.mask; + val &= ~sc->m.mask; + val |= n << sc->n.shift; + val |= m << sc->m.shift; + } + WRITE4(clk, sc->offset, val); DEVICE_UNLOCK(clk); + if ((sc->flags & AW_CLK_HAS_LOCK) != 0) { + for (retry = 0; retry < sc->lock_retries; retry++) { + READ4(clk, sc->offset, &val); + if ((val & (1 << sc->lock_shift)) != 0) + break; + DELAY(1000); + } + } + *fout = best; *stop = 1; @@ -257,10 +286,17 @@ aw_clk_nm_recalc(struct clknode *clk, ui READ4(clk, sc->offset, &val); DEVICE_UNLOCK(clk); - m = aw_clk_get_factor(val, &sc->m); - n = aw_clk_get_factor(val, &sc->n); + if (sc->flags & AW_CLK_HAS_FRAC && ((val & sc->frac.mode_sel) == 0)) { + if (val & sc->frac.freq_sel) + *freq = sc->frac.freq1; + else + *freq = sc->frac.freq0; + } else { + m = aw_clk_get_factor(val, &sc->m); + n = aw_clk_get_factor(val, &sc->n); - *freq = *freq / n / m; + *freq = *freq / n / m; + } return (0); } @@ -302,11 +338,19 @@ aw_clk_nm_register(struct clkdom *clkdom sc->n.mask = ((1 << sc->n.width) - 1) << sc->n.shift; sc->n.flags = clkdef->n.flags; + sc->frac.freq0 = clkdef->frac.freq0; + sc->frac.freq1 = clkdef->frac.freq1; + sc->frac.mode_sel = 1 << clkdef->frac.mode_sel; + sc->frac.freq_sel = 1 << clkdef->frac.freq_sel; + sc->mux_shift = clkdef->mux_shift; sc->mux_mask = ((1 << clkdef->mux_width) - 1) << sc->mux_shift; sc->gate_shift = clkdef->gate_shift; + sc->lock_shift = clkdef->lock_shift; + sc->lock_retries = clkdef->lock_retries; + sc->flags = clkdef->flags; clknode_register(clkdom, clk); Modified: head/sys/arm/allwinner/clkng/aw_clk_nm.h ============================================================================== --- head/sys/arm/allwinner/clkng/aw_clk_nm.h Mon Feb 27 08:36:51 2017 (r314328) +++ head/sys/arm/allwinner/clkng/aw_clk_nm.h Mon Feb 27 08:58:27 2017 (r314329) @@ -37,10 +37,13 @@ struct aw_clk_nm_def { struct aw_clk_factor m; struct aw_clk_factor n; + struct aw_clk_frac frac; uint32_t mux_shift; uint32_t mux_width; uint32_t gate_shift; + uint32_t lock_shift; + uint32_t lock_retries; uint32_t flags; }; Modified: head/sys/arm/allwinner/clkng/ccu_h3.c ============================================================================== --- head/sys/arm/allwinner/clkng/ccu_h3.c Mon Feb 27 08:36:51 2017 (r314328) +++ head/sys/arm/allwinner/clkng/ccu_h3.c Mon Feb 27 08:58:27 2017 (r314329) @@ -182,28 +182,12 @@ static const char *pll_cpux_parents[] = static const char *pll_audio_parents[] = {"osc24M"}; static const char *pll_audio_mult_parents[] = {"pll_audio"}; /* - * Need fractional mode on nkmp or a NM fract -static const char *pll_video_parents[] = {"osc24M"}; - */ -/* - * Need fractional mode on nkmp or a NM fract -static const char *pll_ve_parents[] = {"osc24M"}; - */ -/* * Needs a update bit on nkmp or special clk static const char *pll_ddr_parents[] = {"osc24M"}; */ static const char *pll_periph0_parents[] = {"osc24M"}; static const char *pll_periph0_2x_parents[] = {"pll_periph0"}; -/* - * Need fractional mode on nkmp or a NM fract -static const char *pll_gpu_parents[] = {"osc24M"}; - */ static const char *pll_periph1_parents[] = {"osc24M"}; -/* - * Need fractional mode on nkmp or a NM fract -static const char *pll_de_parents[] = {"osc24M"}; - */ static struct aw_clk_nkmp_def nkmp_clks[] = { NKMP_CLK(H3_CLK_PLL_CPUX, /* id */ @@ -268,6 +252,10 @@ static struct aw_clk_prediv_mux_def pred 0, 2, 1) /* prediv condition */ }; +static const char *pll_video_parents[] = {"osc24M"}; +static const char *pll_ve_parents[] = {"osc24M"}; +static const char *pll_gpu_parents[] = {"osc24M"}; +static const char *pll_de_parents[] = {"osc24M"}; static const char *apb2_parents[] = {"osc32k", "osc24M", "pll_periph0", "pll_periph0"}; static const char *mod_parents[] = {"osc24M", "pll_periph0", "pll_periph1"}; static const char *ts_parents[] = {"osc24M", "pll_periph0"}; @@ -275,6 +263,42 @@ static const char *spdif_parents[] = {"p static const char *i2s_parents[] = {"pll_audio-8x", "pll_audio-4x", "pll_audio-2x", "pll_audio"}; static struct aw_clk_nm_def nm_clks[] = { + NM_CLK_WITH_FRAC(H3_CLK_PLL_VIDEO, /* id */ + "pll_video", pll_video_parents, /* name, parents */ + 0x10, /* offset */ + 8, 7, 0, 0, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 31, 28, 1000, /* gate, lock, lock retries */ + AW_CLK_HAS_LOCK, /* flags */ + 270000000, 297000000, /* freq0, freq1 */ + 24, 25) /* mode sel, freq sel */ + NM_CLK_WITH_FRAC(H3_CLK_PLL_VE, /* id */ + "pll_ve", pll_ve_parents, /* name, parents */ + 0x18, /* offset */ + 8, 7, 0, 0, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 31, 28, 1000, /* gate, lock, lock retries */ + AW_CLK_HAS_LOCK, /* flags */ + 270000000, 297000000, /* freq0, freq1 */ + 24, 25) /* mode sel, freq sel */ + NM_CLK_WITH_FRAC(H3_CLK_PLL_GPU, /* id */ + "pll_gpu", pll_gpu_parents, /* name, parents */ + 0x38, /* offset */ + 8, 7, 0, 0, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 31, 28, 1000, /* gate, lock, lock retries */ + AW_CLK_HAS_LOCK, /* flags */ + 270000000, 297000000, /* freq0, freq1 */ + 24, 25) /* mode sel, freq sel */ + NM_CLK_WITH_FRAC(H3_CLK_PLL_DE, /* id */ + "pll_de", pll_de_parents, /* name, parents */ + 0x48, /* offset */ + 8, 7, 0, 0, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 31, 28, 1000, /* gate, lock, lock retries */ + AW_CLK_HAS_LOCK, /* flags */ + 270000000, 297000000, /* freq0, freq1 */ + 24, 25) /* mode sel, freq sel */ NM_CLK(H3_CLK_APB2, /* id */ "apb2", apb2_parents, /* name, parents */ 0x58, /* offset */ From owner-svn-src-all@freebsd.org Mon Feb 27 10:10:46 2017 Return-Path: Delivered-To: svn-src-all@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 62D77CE9BFB; Mon, 27 Feb 2017 10:10:46 +0000 (UTC) (envelope-from avg@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 324E2C57; Mon, 27 Feb 2017 10:10:46 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RAAjpq006318; Mon, 27 Feb 2017 10:10:45 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RAAjCV006317; Mon, 27 Feb 2017 10:10:45 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201702271010.v1RAAjCV006317@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 27 Feb 2017 10:10:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314330 - stable/10/lib/libmd X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 10:10:46 -0000 Author: avg Date: Mon Feb 27 10:10:45 2017 New Revision: 314330 URL: https://svnweb.freebsd.org/changeset/base/314330 Log: MFC r285417: Add new include path for sha256.h Modified: stable/10/lib/libmd/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libmd/Makefile ============================================================================== --- stable/10/lib/libmd/Makefile Mon Feb 27 08:58:27 2017 (r314329) +++ stable/10/lib/libmd/Makefile Mon Feb 27 10:10:45 2017 (r314330) @@ -54,7 +54,8 @@ CLEANFILES+= md[245]hl.c md[245].ref md[ # in which case: # * macros are used to rename symbols to libcrypt internal names # * no weak aliases are generated -CFLAGS+= -I${.CURDIR} -DWEAK_REFS +CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sys/crypto/sha2 +CFLAGS+= -DWEAK_REFS .PATH: ${.CURDIR}/${MACHINE_ARCH} ${.CURDIR}/../../sys/crypto/sha2 .if exists(${MACHINE_ARCH}/sha.S) From owner-svn-src-all@freebsd.org Mon Feb 27 10:22:17 2017 Return-Path: Delivered-To: svn-src-all@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 89394CEF1CA; Mon, 27 Feb 2017 10:22:17 +0000 (UTC) (envelope-from avg@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 55E0881F; Mon, 27 Feb 2017 10:22:17 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RAMGC6013743; Mon, 27 Feb 2017 10:22:16 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RAMGaW013742; Mon, 27 Feb 2017 10:22:16 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201702271022.v1RAMGaW013742@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 27 Feb 2017 10:22:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314331 - stable/10/sys/modules/random X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 10:22:17 -0000 Author: avg Date: Mon Feb 27 10:22:16 2017 New Revision: 314331 URL: https://svnweb.freebsd.org/changeset/base/314331 Log: fix up r314327 (MFC of r292782): sha2 -> sha512 in sys/modules/random Modified: stable/10/sys/modules/random/Makefile Modified: stable/10/sys/modules/random/Makefile ============================================================================== --- stable/10/sys/modules/random/Makefile Mon Feb 27 10:10:45 2017 (r314330) +++ stable/10/sys/modules/random/Makefile Mon Feb 27 10:22:16 2017 (r314331) @@ -12,7 +12,7 @@ SRCS+= ivy.c .endif SRCS+= randomdev_soft.c yarrow.c hash.c SRCS+= random_harvestq.c live_entropy_sources.c rwfile.c -SRCS+= rijndael-alg-fst.c rijndael-api-fst.c sha2.c sha256c.c +SRCS+= rijndael-alg-fst.c rijndael-api-fst.c sha256c.c sha512c.c SRCS+= bus_if.h device_if.h vnode_if.h opt_cpu.h opt_random.h CFLAGS+= -I${.CURDIR}/../.. From owner-svn-src-all@freebsd.org Mon Feb 27 10:40:42 2017 Return-Path: Delivered-To: svn-src-all@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 150EACEF91F; Mon, 27 Feb 2017 10:40:42 +0000 (UTC) (envelope-from avg@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 D18699E; Mon, 27 Feb 2017 10:40:41 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RAefLM018655; Mon, 27 Feb 2017 10:40:41 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RAeesS018645; Mon, 27 Feb 2017 10:40:40 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201702271040.v1RAeesS018645@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 27 Feb 2017 10:40:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314332 - in stable/10: lib/libcrypt lib/libmd sbin/md5 sys/crypto/sha2 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 10:40:42 -0000 Author: avg Date: Mon Feb 27 10:40:39 2017 New Revision: 314332 URL: https://svnweb.freebsd.org/changeset/base/314332 Log: MFC r300903: Implement SHA-512 truncated (224 and 256 bits) Added: stable/10/sys/crypto/sha2/sha512t.h - copied unchanged from r300903, head/sys/crypto/sha2/sha512t.h Modified: stable/10/lib/libcrypt/Makefile stable/10/lib/libmd/Makefile stable/10/lib/libmd/sha512.3 stable/10/lib/libmd/shadriver.c stable/10/sbin/md5/Makefile stable/10/sbin/md5/md5.1 stable/10/sbin/md5/md5.c stable/10/sys/crypto/sha2/sha512c.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libcrypt/Makefile ============================================================================== --- stable/10/lib/libcrypt/Makefile Mon Feb 27 10:22:16 2017 (r314331) +++ stable/10/lib/libcrypt/Makefile Mon Feb 27 10:40:39 2017 (r314332) @@ -29,6 +29,8 @@ CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BL .for sym in MD4Init MD4Final MD4Update MD4Pad \ MD5Init MD5Final MD5Update MD5Pad \ SHA256_Init SHA256_Final SHA256_Update \ + SHA512_224_Init SHA512_224_Final SHA512_224_Update \ + SHA512_256_Init SHA512_256_Final SHA512_256_Update \ SHA384_Init SHA384_Final SHA384_Update \ SHA512_Init SHA512_Final SHA512_Update CFLAGS+= -D${sym}=__${sym} Modified: stable/10/lib/libmd/Makefile ============================================================================== --- stable/10/lib/libmd/Makefile Mon Feb 27 10:22:16 2017 (r314331) +++ stable/10/lib/libmd/Makefile Mon Feb 27 10:40:39 2017 (r314332) @@ -8,8 +8,8 @@ SRCS= md4c.c md5c.c md4hl.c md5hl.c \ sha0c.c sha0hl.c sha1c.c sha1hl.c \ sha256c.c sha256hl.c \ sha384hl.c \ - sha512c.c sha512hl.c -INCS= md4.h md5.h ripemd.h sha.h sha256.h sha384.h sha512.h + sha512c.c sha512hl.c sha512thl.c +INCS= md4.h md5.h ripemd.h sha.h sha256.h sha384.h sha512.h sha512t.h WARNS?= 0 @@ -42,11 +42,15 @@ MLINKS+=sha512.3 SHA512_Init.3 sha512.3 MLINKS+=sha512.3 SHA512_Final.3 sha512.3 SHA512_End.3 MLINKS+=sha512.3 SHA512_File.3 sha512.3 SHA512_FileChunk.3 MLINKS+=sha512.3 SHA512_Data.3 +MLINKS+=sha512.3 SHA512_256_Init.3 sha512.3 SHA512_256_Update.3 +MLINKS+=sha512.3 SHA512_256_Final.3 sha512.3 SHA512_256_End.3 +MLINKS+=sha512.3 SHA512_256_File.3 sha512.3 SHA512_256_FileChunk.3 +MLINKS+=sha512.3 SHA512_256_Data.3 CLEANFILES+= md[245]hl.c md[245].ref md[245].3 mddriver \ rmd160.ref rmd160hl.c rmddriver \ sha0.ref sha0hl.c sha1.ref sha1hl.c shadriver \ sha256.ref sha256hl.c sha384hl.c sha384.ref \ - sha512.ref sha512hl.c + sha512.ref sha512hl.c sha512t256.ref sha512thl.c # Define WEAK_REFS to provide weak aliases for libmd symbols # @@ -106,6 +110,13 @@ sha512hl.c: mdXhl.c -e 's/SHA512__/SHA512_/g' \ ${.ALLSRC}) > ${.TARGET} +sha512thl.c: mdXhl.c + (echo '#define LENGTH 32'; \ + sed -e 's/mdX/sha512t/g' -e 's/MDX/SHA512_256_/g' \ + -e 's/SHA512_256__/SHA512_256_/g' \ + -e 's/SHA512_256_CTX/SHA512_CTX/g' \ + ${.ALLSRC}) > ${.TARGET} + rmd160hl.c: mdXhl.c (echo '#define LENGTH 20'; \ sed -e 's/mdX/ripemd/g' -e 's/MDX/RIPEMD160_/g' \ @@ -210,6 +221,21 @@ sha512.ref: @echo 'SHA-512 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ '72ec1ef1124a45b047e8b7c75a932195135bb61de24ec0d1914042246e0aec3a2354e093d76f3048b456764346900cb130d2a4fd5dd16abb5e30bcb850dee843' >> ${.TARGET} +sha512t256.ref: + echo 'SHA-512256 test suite:' > ${.TARGET} + @echo 'SHA-512256 ("") =' \ + 'c672b8d1ef56ed28ab87c3622c5114069bdd3ad7b8f9737498d0c01ecef0967a' >> ${.TARGET} + @echo 'SHA-512256 ("abc") =' \ + '53048e2681941ef99b2e29b76b4c7dabe4c2d0c634fc6d46e0e2f13107e7af23' >> ${.TARGET} + @echo 'SHA-512256 ("message digest") =' \ + '0cf471fd17ed69d990daf3433c89b16d63dec1bb9cb42a6094604ee5d7b4e9fb' >> ${.TARGET} + @echo 'SHA-512256 ("abcdefghijklmnopqrstuvwxyz") =' \ + 'fc3189443f9c268f626aea08a756abe7b726b05f701cb08222312ccfd6710a26' >> ${.TARGET} + @echo 'SHA-512256 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ + 'cdf1cc0effe26ecc0c13758f7b4a48e000615df241284185c39eb05d355bb9c8' >> ${.TARGET} + @echo 'SHA-512256 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ + '2c9fdbc0c90bdd87612ee8455474f9044850241dc105b1e8b94b8ddf5fac9148' >> ${.TARGET} + rmd160.ref: echo 'RIPEMD160 test suite:' > ${.TARGET} @echo 'RIPEMD160 ("") = 9c1185a5c5e9fc54612808977ee8f548b2258d31' >> ${.TARGET} @@ -224,7 +250,7 @@ rmd160.ref: '9b752e45573d4b39f4dbd3323cab82bf63326bfb' >> ${.TARGET} test: md4.ref md5.ref sha0.ref rmd160.ref sha1.ref sha256.ref sha384.ref \ - sha512.ref + sha512.ref sha512t256.ref @${ECHO} if any of these test fail, the code produces wrong results @${ECHO} and should NOT be used. ${CC} ${CFLAGS} ${LDFLAGS} -DMD=4 -o mddriver ${.CURDIR}/mddriver.c libmd.a @@ -253,6 +279,9 @@ test: md4.ref md5.ref sha0.ref rmd160.re ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=512 -o shadriver ${.CURDIR}/shadriver.c libmd.a ./shadriver | cmp sha512.ref - @${ECHO} SHA-512 passed test + ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=512256 -o shadriver ${.CURDIR}/shadriver.c libmd.a + ./shadriver | cmp sha512t256.ref - + @${ECHO} SHA-512t256 passed test -rm -f shadriver .include Modified: stable/10/lib/libmd/sha512.3 ============================================================================== --- stable/10/lib/libmd/sha512.3 Mon Feb 27 10:22:16 2017 (r314331) +++ stable/10/lib/libmd/sha512.3 Mon Feb 27 10:40:39 2017 (r314332) @@ -9,7 +9,7 @@ .\" From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp .\" $FreeBSD$ .\" -.Dd October 17, 2015 +.Dd April 22, 2016 .Dt SHA512 3 .Os .Sh NAME @@ -26,7 +26,14 @@ .Nm SHA384_End , .Nm SHA384_File , .Nm SHA384_FileChunk , -.Nm SHA384_Data +.Nm SHA384_Data, +.Nm SHA512_256_Init , +.Nm SHA512_256_Update , +.Nm SHA512_256_Final , +.Nm SHA512_256_End , +.Nm SHA512_256_File , +.Nm SHA512_256_FileChunk , +.Nm SHA512_256_Data .Nd calculate the FIPS 180-4 ``SHA-512'' family of message digests .Sh LIBRARY .Lb libmd @@ -47,6 +54,7 @@ .Fn SHA512_FileChunk "const char *filename" "char *buf" "off_t offset" "off_t length" .Ft "char *" .Fn SHA512_Data "const unsigned char *data" "unsigned int len" "char *buf" +.In sha384.h .Ft void .Fn SHA384_Init "SHA384_CTX *context" .Ft void @@ -61,6 +69,21 @@ .Fn SHA384_FileChunk "const char *filename" "char *buf" "off_t offset" "off_t length" .Ft "char *" .Fn SHA384_Data "const unsigned char *data" "unsigned int len" "char *buf" +.In sha512t.h +.Ft void +.Fn SHA512_256_Init "SHA512_CTX *context" +.Ft void +.Fn SHA512_256_Update "SHA512_CTX *context" "const unsigned char *data" "size_t len" +.Ft void +.Fn SHA512_256_Final "unsigned char digest[32]" "SHA512_CTX *context" +.Ft "char *" +.Fn SHA512_256_End "SHA512_CTX *context" "char *buf" +.Ft "char *" +.Fn SHA512_256_File "const char *filename" "char *buf" +.Ft "char *" +.Fn SHA512_256_FileChunk "const char *filename" "char *buf" "off_t offset" "off_t length" +.Ft "char *" +.Fn SHA512_256_Data "const unsigned char *data" "unsigned int len" "char *buf" .Sh DESCRIPTION The .Li SHA512_ @@ -92,7 +115,7 @@ and finally extract the result using .Fn SHA512_End is a wrapper for .Fn SHA512_Final -which converts the return value to a 65-character +which converts the return value to a 129-character (including the terminating '\e0') .Tn ASCII string which represents the 512 bits in hexadecimal. @@ -139,22 +162,32 @@ and subsequently must be explicitly deal after use. If the .Fa buf -argument is non-null it must point to at least 65 characters of buffer space. +argument is non-null it must point to at least 129 characters of buffer space. .Pp The .Li SHA384_ +and +.Li SHA512_256_ functions are identical to the .Li SHA512_ functions except they use a different initial hash value and the output is -truncated to 384 bits. +truncated to 384 bits and 256 bits respectively. .Pp .Fn SHA384_End is a wrapper for .Fn SHA384_Final -which converts the return value to a 49-character +which converts the return value to a 97-character (including the terminating '\e0') .Tn ASCII string which represents the 384 bits in hexadecimal. +.Pp +.Fn SHA512_256_End +is a wrapper for +.Fn SHA512_Final +which converts the return value to a 65-character +(including the terminating '\e0') +.Tn ASCII +string which represents the 256 bits in hexadecimal. .Sh SEE ALSO .Xr md4 3 , .Xr md5 3 , Modified: stable/10/lib/libmd/shadriver.c ============================================================================== --- stable/10/lib/libmd/shadriver.c Mon Feb 27 10:22:16 2017 (r314331) +++ stable/10/lib/libmd/shadriver.c Mon Feb 27 10:40:39 2017 (r314332) @@ -24,6 +24,7 @@ __FBSDID("$FreeBSD$"); #include "sha256.h" #include "sha384.h" #include "sha512.h" +#include "sha512t.h" /* The following makes SHA default to SHA-1 if it has not already been * defined with C compiler flags. */ @@ -43,6 +44,9 @@ __FBSDID("$FreeBSD$"); #elif SHA == 512 #undef SHA_Data #define SHA_Data SHA512_Data +#elif SHA == 512256 +#undef SHA_Data +#define SHA_Data SHA512_256_Data #endif /* Digests a string and prints the result. */ Modified: stable/10/sbin/md5/Makefile ============================================================================== --- stable/10/sbin/md5/Makefile Mon Feb 27 10:22:16 2017 (r314331) +++ stable/10/sbin/md5/Makefile Mon Feb 27 10:40:39 2017 (r314332) @@ -7,13 +7,15 @@ LINKS= ${BINDIR}/md5 ${BINDIR}/rmd160 \ ${BINDIR}/md5 ${BINDIR}/sha1 \ ${BINDIR}/md5 ${BINDIR}/sha256 \ ${BINDIR}/md5 ${BINDIR}/sha384 \ - ${BINDIR}/md5 ${BINDIR}/sha512 + ${BINDIR}/md5 ${BINDIR}/sha512 \ + ${BINDIR}/md5 ${BINDIR}/sha512t256 MLINKS= md5.1 rmd160.1 \ md5.1 sha1.1 \ md5.1 sha256.1 \ md5.1 sha384.1 \ - md5.1 sha512.1 + md5.1 sha512.1 \ + md5.1 sha512t256.1 DPADD= ${LIBMD} LDADD= -lmd Modified: stable/10/sbin/md5/md5.1 ============================================================================== --- stable/10/sbin/md5/md5.1 Mon Feb 27 10:22:16 2017 (r314331) +++ stable/10/sbin/md5/md5.1 Mon Feb 27 10:40:39 2017 (r314332) @@ -1,9 +1,9 @@ .\" $FreeBSD$ -.Dd October 17, 2015 +.Dd April 22, 2016 .Dt MD5 1 .Os .Sh NAME -.Nm md5 , sha1 , sha256 , sha384 , sha512, rmd160 +.Nm md5 , sha1 , sha256 , sha384 , sha512, sha512t256, rmd160 .Nd calculate a message-digest fingerprint (checksum) for a file .Sh SYNOPSIS .Nm md5 @@ -31,6 +31,11 @@ .Op Fl c Ar string .Op Fl s Ar string .Op Ar +.Nm sha512t256 +.Op Fl pqrtx +.Op Fl c Ar string +.Op Fl s Ar string +.Op Ar .Nm rmd160 .Op Fl pqrtx .Op Fl c Ar string @@ -38,7 +43,7 @@ .Op Ar .Sh DESCRIPTION The -.Nm md5 , sha1 , sha256 , sha384 , sha512 +.Nm md5 , sha1 , sha256 , sha384 , sha512, sha512t256 and .Nm rmd160 utilities take as input a message of arbitrary length and produce as @@ -78,8 +83,17 @@ found which is faster than a brute-force .Tn SHA-1 in doubt. .Pp -It is recommended that all new applications use +.Tn SHA-512t256 +is a version of +.Tn SHA-512 +truncated to only 256 bits. +On 64-bit hardware, this algorithm is approximately 50% faster than .Tn SHA-256 +but with the same level of security. +The hashes are not interchangeable. +.Pp +It is recommended that all new applications use +.Tn SHA-512 instead of one of the other hash functions. .Pp The following options may be used in any combination and must @@ -114,7 +128,7 @@ Run a built-in test script. .El .Sh EXIT STATUS The -.Nm md5 , sha1 , sha256 , sha512 +.Nm md5 , sha1 , sha256 , sha512, sha512t256 and .Nm rmd160 utilities exit 0 on success, Modified: stable/10/sbin/md5/md5.c ============================================================================== --- stable/10/sbin/md5/md5.c Mon Feb 27 10:22:16 2017 (r314331) +++ stable/10/sbin/md5/md5.c Mon Feb 27 10:40:39 2017 (r314332) @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -58,6 +59,7 @@ extern const char *SHA1_TestOutput[MDTES extern const char *SHA256_TestOutput[MDTESTCOUNT]; extern const char *SHA384_TestOutput[MDTESTCOUNT]; extern const char *SHA512_TestOutput[MDTESTCOUNT]; +extern const char *SHA512t256_TestOutput[MDTESTCOUNT]; extern const char *RIPEMD160_TestOutput[MDTESTCOUNT]; typedef struct Algorithm_t { @@ -110,6 +112,9 @@ static const struct Algorithm_t Algorith { "sha512", "SHA512", &SHA512_TestOutput, (DIGEST_Init*)&SHA512_Init, (DIGEST_Update*)&SHA512_Update, (DIGEST_End*)&SHA512_End, &SHA512_Data, &SHA512_File }, + { "sha512t256", "SHA512t256", &SHA512t256_TestOutput, (DIGEST_Init*)&SHA512_256_Init, + (DIGEST_Update*)&SHA512_256_Update, (DIGEST_End*)&SHA512_256_End, + &SHA512_256_Data, &SHA512_256_File }, { "rmd160", "RMD160", &RIPEMD160_TestOutput, (DIGEST_Init*)&RIPEMD160_Init, (DIGEST_Update*)&RIPEMD160_Update, (DIGEST_End*)&RIPEMD160_End, &RIPEMD160_Data, &RIPEMD160_File } @@ -355,6 +360,17 @@ const char *SHA512_TestOutput[MDTESTCOUN "e8a835195e039708b13d9131e025f4441dbdc521ce625f245a436dcd762f54bf5cb298d96235e6c6a304e087ec8189b9512cbdf6427737ea82793460c367b9c3" }; +const char *SHA512t256_TestOutput[MDTESTCOUNT] = { + "c672b8d1ef56ed28ab87c3622c5114069bdd3ad7b8f9737498d0c01ecef0967a", + "455e518824bc0601f9fb858ff5c37d417d67c2f8e0df2babe4808858aea830f8", + "53048e2681941ef99b2e29b76b4c7dabe4c2d0c634fc6d46e0e2f13107e7af23", + "0cf471fd17ed69d990daf3433c89b16d63dec1bb9cb42a6094604ee5d7b4e9fb", + "fc3189443f9c268f626aea08a756abe7b726b05f701cb08222312ccfd6710a26", + "cdf1cc0effe26ecc0c13758f7b4a48e000615df241284185c39eb05d355bb9c8", + "2c9fdbc0c90bdd87612ee8455474f9044850241dc105b1e8b94b8ddf5fac9148", + "dd095fc859b336c30a52548b3dc59fcc0d1be8616ebcf3368fad23107db2d736" +}; + const char *RIPEMD160_TestOutput[MDTESTCOUNT] = { "9c1185a5c5e9fc54612808977ee8f548b2258d31", "0bdc9d2d256b3ee9daae347be6f4dc835a467ffe", Modified: stable/10/sys/crypto/sha2/sha512c.c ============================================================================== --- stable/10/sys/crypto/sha2/sha512c.c Mon Feb 27 10:22:16 2017 (r314331) +++ stable/10/sys/crypto/sha2/sha512c.c Mon Feb 27 10:40:39 2017 (r314332) @@ -1,5 +1,6 @@ /*- * Copyright 2005 Colin Percival + * Copyright (c) 2015 Allan Jude * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,6 +38,7 @@ __FBSDID("$FreeBSD$"); #endif #include "sha512.h" +#include "sha512t.h" #include "sha384.h" #if BYTE_ORDER == BIG_ENDIAN @@ -324,6 +326,88 @@ SHA512_Final(unsigned char digest[SHA512 memset((void *)ctx, 0, sizeof(*ctx)); } +/*** SHA-512t: *********************************************************/ +/* + * the SHA512t transforms are identical to SHA512 so reuse the existing function + */ +void +SHA512_224_Init(SHA512_CTX * ctx) +{ + + /* Zero bits processed so far */ + ctx->count[0] = ctx->count[1] = 0; + + /* Magic initialization constants */ + ctx->state[0] = 0x8c3d37c819544da2ULL; + ctx->state[1] = 0x73e1996689dcd4d6ULL; + ctx->state[2] = 0x1dfab7ae32ff9c82ULL; + ctx->state[3] = 0x679dd514582f9fcfULL; + ctx->state[4] = 0x0f6d2b697bd44da8ULL; + ctx->state[5] = 0x77e36f7304c48942ULL; + ctx->state[6] = 0x3f9d85a86a1d36c8ULL; + ctx->state[7] = 0x1112e6ad91d692a1ULL; +} + +void +SHA512_224_Update(SHA512_CTX * ctx, const void *in, size_t len) +{ + + SHA512_Update(ctx, in, len); +} + +void +SHA512_224_Final(unsigned char digest[static SHA512_224_DIGEST_LENGTH], SHA512_CTX * ctx) +{ + + /* Add padding */ + SHA512_Pad(ctx); + + /* Write the hash */ + be64enc_vect(digest, ctx->state, SHA512_224_DIGEST_LENGTH); + + /* Clear the context state */ + memset(ctx, 0, sizeof(*ctx)); +} + +void +SHA512_256_Init(SHA512_CTX * ctx) +{ + + /* Zero bits processed so far */ + ctx->count[0] = ctx->count[1] = 0; + + /* Magic initialization constants */ + ctx->state[0] = 0x22312194fc2bf72cULL; + ctx->state[1] = 0x9f555fa3c84c64c2ULL; + ctx->state[2] = 0x2393b86b6f53b151ULL; + ctx->state[3] = 0x963877195940eabdULL; + ctx->state[4] = 0x96283ee2a88effe3ULL; + ctx->state[5] = 0xbe5e1e2553863992ULL; + ctx->state[6] = 0x2b0199fc2c85b8aaULL; + ctx->state[7] = 0x0eb72ddc81c52ca2ULL; +} + +void +SHA512_256_Update(SHA512_CTX * ctx, const void *in, size_t len) +{ + + SHA512_Update(ctx, in, len); +} + +void +SHA512_256_Final(unsigned char digest[static SHA512_256_DIGEST_LENGTH], SHA512_CTX * ctx) +{ + + /* Add padding */ + SHA512_Pad(ctx); + + /* Write the hash */ + be64enc_vect(digest, ctx->state, SHA512_256_DIGEST_LENGTH); + + /* Clear the context state */ + memset(ctx, 0, sizeof(*ctx)); +} + /*** SHA-384: *********************************************************/ /* * the SHA384 and SHA512 transforms are identical, so SHA384 is skipped @@ -388,6 +472,20 @@ __weak_reference(_libmd_SHA512_Final, SH #undef SHA512_Transform __weak_reference(_libmd_SHA512_Transform, SHA512_Transform); +#undef SHA512_224_Init +__weak_reference(_libmd_SHA512_224_Init, SHA512_224_Init); +#undef SHA512_224_Update +__weak_reference(_libmd_SHA512_224_Update, SHA512_224_Update); +#undef SHA512_224_Final +__weak_reference(_libmd_SHA512_224_Final, SHA512_224_Final); + +#undef SHA512_256_Init +__weak_reference(_libmd_SHA512_256_Init, SHA512_256_Init); +#undef SHA512_256_Update +__weak_reference(_libmd_SHA512_256_Update, SHA512_256_Update); +#undef SHA512_256_Final +__weak_reference(_libmd_SHA512_256_Final, SHA512_256_Final); + #undef SHA384_Init __weak_reference(_libmd_SHA384_Init, SHA384_Init); #undef SHA384_Update Copied: stable/10/sys/crypto/sha2/sha512t.h (from r300903, head/sys/crypto/sha2/sha512t.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/sys/crypto/sha2/sha512t.h Mon Feb 27 10:40:39 2017 (r314332, copy of r300903, head/sys/crypto/sha2/sha512t.h) @@ -0,0 +1,125 @@ +/*- + * Copyright (c) 2015 Allan Jude + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _SHA512T_H_ +#define _SHA512T_H_ + +#include "sha512.h" + +#ifndef _KERNEL +#include +#endif + +#define SHA512_224_DIGEST_LENGTH 28 +#define SHA512_224_DIGEST_STRING_LENGTH (SHA512_224_DIGEST_LENGTH * 2 + 1) +#define SHA512_256_DIGEST_LENGTH 32 +#define SHA512_256_DIGEST_STRING_LENGTH (SHA512_256_DIGEST_LENGTH * 2 + 1) + +__BEGIN_DECLS + +/* Ensure libmd symbols do not clash with libcrypto */ +#ifndef SHA512_224_Init +#define SHA512_224_Init _libmd_SHA512_224_Init +#endif +#ifndef SHA512_224_Update +#define SHA512_224_Update _libmd_SHA512_224_Update +#endif +#ifndef SHA512_224_Final +#define SHA512_224_Final _libmd_SHA512_224_Final +#endif +#ifndef SHA512_224_End +#define SHA512_224_End _libmd_SHA512_224_End +#endif +#ifndef SHA512_224_File +#define SHA512_224_File _libmd_SHA512_224_File +#endif +#ifndef SHA512_224_FileChunk +#define SHA512_224_FileChunk _libmd_SHA512_224_FileChunk +#endif +#ifndef SHA512_224_Data +#define SHA512_224_Data _libmd_SHA512_224_Data +#endif + +#ifndef SHA512_224_Transform +#define SHA512_224_Transform _libmd_SHA512_224_Transform +#endif +#ifndef SHA512_224_version +#define SHA512_224_version _libmd_SHA512_224_version +#endif + +#ifndef SHA512_256_Init +#define SHA512_256_Init _libmd_SHA512_256_Init +#endif +#ifndef SHA512_256_Update +#define SHA512_256_Update _libmd_SHA512_256_Update +#endif +#ifndef SHA512_256_Final +#define SHA512_256_Final _libmd_SHA512_256_Final +#endif +#ifndef SHA512_256_End +#define SHA512_256_End _libmd_SHA512_256_End +#endif +#ifndef SHA512_256_File +#define SHA512_256_File _libmd_SHA512_256_File +#endif +#ifndef SHA512_256_FileChunk +#define SHA512_256_FileChunk _libmd_SHA512_256_FileChunk +#endif +#ifndef SHA512_256_Data +#define SHA512_256_Data _libmd_SHA512_256_Data +#endif + +#ifndef SHA512_256_Transform +#define SHA512_256_Transform _libmd_SHA512_256_Transform +#endif +#ifndef SHA512_256_version +#define SHA512_256_version _libmd_SHA512_256_version +#endif + +void SHA512_224_Init(SHA512_CTX *); +void SHA512_224_Update(SHA512_CTX *, const void *, size_t); +void SHA512_224_Final(unsigned char [static SHA512_224_DIGEST_LENGTH], SHA512_CTX *); +#ifndef _KERNEL +char *SHA512_224_End(SHA512_CTX *, char *); +char *SHA512_224_Data(const void *, unsigned int, char *); +char *SHA512_224_File(const char *, char *); +char *SHA512_224_FileChunk(const char *, char *, off_t, off_t); +#endif +void SHA512_256_Init(SHA512_CTX *); +void SHA512_256_Update(SHA512_CTX *, const void *, size_t); +void SHA512_256_Final(unsigned char [static SHA512_256_DIGEST_LENGTH], SHA512_CTX *); +#ifndef _KERNEL +char *SHA512_256_End(SHA512_CTX *, char *); +char *SHA512_256_Data(const void *, unsigned int, char *); +char *SHA512_256_File(const char *, char *); +char *SHA512_256_FileChunk(const char *, char *, off_t, off_t); +#endif + +__END_DECLS + +#endif /* !_SHA512T_H_ */ From owner-svn-src-all@freebsd.org Mon Feb 27 11:10:37 2017 Return-Path: Delivered-To: svn-src-all@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 B2510CEF0D8; Mon, 27 Feb 2017 11:10:37 +0000 (UTC) (envelope-from manu@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 60B9F51; Mon, 27 Feb 2017 11:10:37 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RBAas5029835; Mon, 27 Feb 2017 11:10:36 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RBAajb029830; Mon, 27 Feb 2017 11:10:36 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201702271110.v1RBAajb029830@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Mon, 27 Feb 2017 11:10:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314333 - head/sys/arm/allwinner/clkng X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 11:10:37 -0000 Author: manu Date: Mon Feb 27 11:10:36 2017 New Revision: 314333 URL: https://svnweb.freebsd.org/changeset/base/314333 Log: allwinner: Order clocks by offset rather than by type for H3 ccu. Also add a few more supported gates and add comments for which clocks are missing. Modified: head/sys/arm/allwinner/clkng/aw_clk.h head/sys/arm/allwinner/clkng/ccu_h3.c head/sys/arm/allwinner/clkng/ccu_h3.h Modified: head/sys/arm/allwinner/clkng/aw_clk.h ============================================================================== --- head/sys/arm/allwinner/clkng/aw_clk.h Mon Feb 27 10:40:39 2017 (r314332) +++ head/sys/arm/allwinner/clkng/aw_clk.h Mon Feb 27 11:10:36 2017 (r314333) @@ -179,7 +179,7 @@ aw_clk_factor_get_value(struct aw_clk_fa .shift = s, \ }, -#define NKMP_CLK(_id, _name, _pnames, \ +#define NKMP_CLK(_clkname, _id, _name, _pnames, \ _offset, \ _n_shift, _n_width, _n_value, _n_flags, \ _k_shift, _k_width, _k_value, _k_flags, \ @@ -188,7 +188,7 @@ aw_clk_factor_get_value(struct aw_clk_fa _gate, \ _lock, _lock_retries, \ _flags) \ - { \ + static struct aw_clk_nkmp_def _clkname = { \ .clkdef = { \ .id = _id, \ .name = _name, \ @@ -216,16 +216,16 @@ aw_clk_factor_get_value(struct aw_clk_fa .lock_shift = _lock, \ .lock_retries = _lock_retries, \ .flags = _flags, \ - }, + } -#define NM_CLK(_id, _name, _pnames, \ +#define NM_CLK(_clkname, _id, _name, _pnames, \ _offset, \ _nshift, _nwidth, _nvalue, _nflags, \ _mshift, _mwidth, _mvalue, _mflags, \ _mux_shift, _mux_width, \ _gate_shift, \ _flags) \ - { \ + static struct aw_clk_nm_def _clkname = { \ .clkdef = { \ .id = _id, \ .name = _name, \ @@ -244,15 +244,15 @@ aw_clk_factor_get_value(struct aw_clk_fa .m.flags = _mflags, \ .mux_width = _mux_width, \ .flags = _flags, \ - }, + } -#define NM_CLK_WITH_FRAC(_id, _name, _pnames, \ +#define NM_CLK_WITH_FRAC(_clkname, _id, _name, _pnames, \ _offset, \ _nshift, _nwidth, _nvalue, _nflags, \ _mshift, _mwidth, _mvalue, _mflags, \ _gate_shift, _lock_shift,_lock_retries, \ _flags, _freq0, _freq1, _mode_sel, _freq_sel) \ - { \ + static struct aw_clk_nm_def _clkname = { \ .clkdef = { \ .id = _id, \ .name = _name, \ @@ -276,15 +276,15 @@ aw_clk_factor_get_value(struct aw_clk_fa .frac.freq1 = _freq1, \ .frac.mode_sel = _mode_sel, \ .frac.freq_sel = _freq_sel, \ - }, + } -#define PREDIV_CLK(_id, _name, _pnames, \ +#define PREDIV_CLK(_clkname, _id, _name, _pnames, \ _offset, \ _mux_shift, _mux_width, \ _div_shift, _div_width, _div_value, _div_flags, \ _prediv_shift, _prediv_width, _prediv_value, _prediv_flags, \ _prediv_cond_shift, _prediv_cond_width, _prediv_cond_value) \ - { \ + static struct aw_clk_prediv_mux_def _clkname = { \ .clkdef = { \ .id = _id, \ .name = _name, \ @@ -305,11 +305,11 @@ aw_clk_factor_get_value(struct aw_clk_fa .prediv.cond_shift = _prediv_cond_shift, \ .prediv.cond_width = _prediv_cond_width, \ .prediv.cond_value = _prediv_cond_value, \ - }, + } -#define MUX_CLK(_id, _name, _pnames, \ +#define MUX_CLK(_clkname, _id, _name, _pnames, \ _offset, _shift, _width) \ - { \ + static struct clk_mux_def _clkname = { \ .clkdef = { \ .id = _id, \ .name = _name, \ @@ -319,13 +319,13 @@ aw_clk_factor_get_value(struct aw_clk_fa .offset = _offset, \ .shift = _shift, \ .width = _width, \ - }, + } -#define DIV_CLK(_id, _name, _pnames, \ +#define DIV_CLK(_clkname, _id, _name, _pnames, \ _offset, \ _i_shift, _i_width, \ _div_flags, _div_table) \ - { \ + static struct clk_div_def _clkname = { \ .clkdef = { \ .id = _id, \ .name = _name, \ @@ -337,11 +337,11 @@ aw_clk_factor_get_value(struct aw_clk_fa .i_width = _i_width, \ .div_flags = _div_flags, \ .div_table = _div_table, \ - }, + } -#define FIXED_CLK(_id, _name, _pnames, \ +#define FIXED_CLK(_clkname, _id, _name, _pnames, \ _freq, _mult, _div, _flags) \ - { \ + static struct clk_fixed_def _clkname = { \ .clkdef = { \ .id = _id, \ .name = _name, \ @@ -352,6 +352,6 @@ aw_clk_factor_get_value(struct aw_clk_fa .mult = _mult, \ .div = _div, \ .fixed_flags = _flags, \ - }, + } #endif /* __AW_CLK_H__ */ Modified: head/sys/arm/allwinner/clkng/ccu_h3.c ============================================================================== --- head/sys/arm/allwinner/clkng/ccu_h3.c Mon Feb 27 10:40:39 2017 (r314332) +++ head/sys/arm/allwinner/clkng/ccu_h3.c Mon Feb 27 11:10:36 2017 (r314333) @@ -176,225 +176,175 @@ static struct aw_ccung_gate h3_ccu_gates CCU_GATE(H3_CLK_I2S0, "i2s0", "i2s0mux", 0xB0, 31) CCU_GATE(H3_CLK_I2S1, "i2s1", "i2s1mux", 0xB4, 31) CCU_GATE(H3_CLK_I2S2, "i2s2", "i2s2mux", 0xB8, 31) + + /* CCU_GATE(H3_CLK_DRAM_VE, "dram-ve", "dram", 0x100, 0) */ + /* CCU_GATE(H3_CLK_DRAM_VE, "dram-csi", "dram", 0x100, 1) */ + /* CCU_GATE(H3_CLK_DRAM_VE, "dram-deinterlace", "dram", 0x100, 2) */ + /* CCU_GATE(H3_CLK_DRAM_VE, "dram-ts", "dram", 0x100, 3) */ + + CCU_GATE(H3_CLK_AC_DIG, "ac-dig", "pll_audio", 0x140, 31) + + CCU_GATE(H3_CLK_AVS, "avs", "osc24M", 0x144, 31) + + CCU_GATE(H3_CLK_HDMI_DDC, "hdmi-ddc", "osc24M", 0x154, 31) }; static const char *pll_cpux_parents[] = {"osc24M"}; +NKMP_CLK(pll_cpux_clk, + H3_CLK_PLL_CPUX, /* id */ + "pll_cpux", pll_cpux_parents, /* name, parents */ + 0x00, /* offset */ + 8, 5, 0, 0, /* n factor */ + 4, 2, 0, 0, /* k factor */ + 0, 2, 0, 0, /* m factor */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* p factor */ + 31, /* gate */ + 28, 1000, /* lock */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK | AW_CLK_SCALE_CHANGE); /* flags */ + static const char *pll_audio_parents[] = {"osc24M"}; +NKMP_CLK(pll_audio_clk, + H3_CLK_PLL_AUDIO, /* id */ + "pll_audio", pll_audio_parents, /* name, parents */ + 0x08, /* offset */ + 8, 7, 0, 0, /* n factor */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* k factor (fake) */ + 0, 5, 0, 0, /* m factor */ + 16, 4, 0, 0, /* p factor */ + 31, /* gate */ + 28, 1000, /* lock */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ + static const char *pll_audio_mult_parents[] = {"pll_audio"}; +FIXED_CLK(pll_audio_2x_clk, + H3_CLK_PLL_AUDIO_2X, /* id */ + "pll_audio-2x", /* name */ + pll_audio_mult_parents, /* parent */ + 0, /* freq */ + 2, /* mult */ + 1, /* div */ + 0); /* flags */ +FIXED_CLK(pll_audio_4x_clk, + H3_CLK_PLL_AUDIO_4X, /* id */ + "pll_audio-4x", /* name */ + pll_audio_mult_parents, /* parent */ + 0, /* freq */ + 4, /* mult */ + 1, /* div */ + 0); /* flags */ +FIXED_CLK(pll_audio_8x_clk, + H3_CLK_PLL_AUDIO_8X, /* id */ + "pll_audio-8x", /* name */ + pll_audio_mult_parents, /* parent */ + 0, /* freq */ + 8, /* mult */ + 1, /* div */ + 0); /* flags */ + +static const char *pll_video_parents[] = {"osc24M"}; +NM_CLK_WITH_FRAC(pll_video_clk, + H3_CLK_PLL_VIDEO, /* id */ + "pll_video", pll_video_parents, /* name, parents */ + 0x10, /* offset */ + 8, 7, 0, 0, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 31, 28, 1000, /* gate, lock, lock retries */ + AW_CLK_HAS_LOCK, /* flags */ + 270000000, 297000000, /* freq0, freq1 */ + 24, 25); /* mode sel, freq sel */ + +static const char *pll_ve_parents[] = {"osc24M"}; +NM_CLK_WITH_FRAC(pll_ve_clk, + H3_CLK_PLL_VE, /* id */ + "pll_ve", pll_ve_parents, /* name, parents */ + 0x18, /* offset */ + 8, 7, 0, 0, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 31, 28, 1000, /* gate, lock, lock retries */ + AW_CLK_HAS_LOCK, /* flags */ + 270000000, 297000000, /* freq0, freq1 */ + 24, 25); /* mode sel, freq sel */ + /* * Needs a update bit on nkmp or special clk static const char *pll_ddr_parents[] = {"osc24M"}; */ + static const char *pll_periph0_parents[] = {"osc24M"}; static const char *pll_periph0_2x_parents[] = {"pll_periph0"}; -static const char *pll_periph1_parents[] = {"osc24M"}; - -static struct aw_clk_nkmp_def nkmp_clks[] = { - NKMP_CLK(H3_CLK_PLL_CPUX, /* id */ - "pll_cpux", pll_cpux_parents, /* name, parents */ - 0x00, /* offset */ - 8, 5, 0, 0, /* n factor */ - 4, 2, 0, 0, /* k factor */ - 0, 2, 0, 0, /* m factor */ - 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* p factor */ - 31, /* gate */ - 28, 1000, /* lock */ - AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK | AW_CLK_SCALE_CHANGE) /* flags */ - NKMP_CLK(H3_CLK_PLL_AUDIO, /* id */ - "pll_audio", pll_audio_parents, /* name, parents */ - 0x08, /* offset */ - 8, 7, 0, 0, /* n factor */ - 0, 0, 1, AW_CLK_FACTOR_FIXED, /* k factor (fake) */ - 0, 5, 0, 0, /* m factor */ - 16, 4, 0, 0, /* p factor */ - 31, /* gate */ - 28, 1000, /* lock */ - AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK) /* flags */ - NKMP_CLK(H3_CLK_PLL_PERIPH0, /* id */ - "pll_periph0", pll_periph0_parents, /* name, parents */ - 0x28, /* offset */ - 8, 5, 0, 0, /* n factor */ - 4, 2, 0, 0, /* k factor */ - 0, 0, 2, AW_CLK_FACTOR_FIXED, /* m factor (fake) */ - 0, 0, 1, AW_CLK_FACTOR_FIXED, /* p factor (fake) */ - 31, /* gate */ - 28, 1000, /* lock */ - AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK) /* flags */ - NKMP_CLK(H3_CLK_PLL_PERIPH1, /* id */ - "pll_periph1", pll_periph1_parents, /* name, parents */ - 0x44, /* offset */ - 8, 5, 0, 0, /* n factor */ - 4, 2, 0, 0, /* k factor */ - 0, 0, 2, AW_CLK_FACTOR_FIXED, /* m factor (fake) */ - 0, 0, 1, AW_CLK_FACTOR_FIXED, /* p factor (fake) */ - 31, /* gate */ - 28, 1000, /* lock */ - AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK) /* flags */ -}; +NKMP_CLK(pll_periph0_clk, + H3_CLK_PLL_PERIPH0, /* id */ + "pll_periph0", pll_periph0_parents, /* name, parents */ + 0x28, /* offset */ + 8, 5, 0, 0, /* n factor */ + 4, 2, 0, 0, /* k factor */ + 0, 0, 2, AW_CLK_FACTOR_FIXED, /* m factor (fake) */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* p factor (fake) */ + 31, /* gate */ + 28, 1000, /* lock */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ -static const char *ahb1_parents[] = {"osc32k", "osc24M", "axi", "pll_periph0"}; -static const char *ahb2_parents[] = {"ahb1", "pll_periph0"}; - -static struct aw_clk_prediv_mux_def prediv_mux_clks[] = { - PREDIV_CLK(H3_CLK_AHB1, /* id */ - "ahb1", ahb1_parents, /* name, parents */ - 0x54, /* offset */ - 12, 2, /* mux */ - 4, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* div */ - 6, 2, 0, AW_CLK_FACTOR_HAS_COND, /* prediv */ - 12, 2, 3) /* prediv condition */ - PREDIV_CLK(H3_CLK_AHB2, /* id */ - "ahb2", ahb2_parents, /* name, parents */ - 0x5c, /* offset */ - 0, 2, /* mux */ - 0, 0, 1, AW_CLK_FACTOR_FIXED, /* div */ - 0, 0, 2, AW_CLK_FACTOR_HAS_COND | AW_CLK_FACTOR_FIXED, /* prediv */ - 0, 2, 1) /* prediv condition */ -}; - -static const char *pll_video_parents[] = {"osc24M"}; -static const char *pll_ve_parents[] = {"osc24M"}; static const char *pll_gpu_parents[] = {"osc24M"}; -static const char *pll_de_parents[] = {"osc24M"}; -static const char *apb2_parents[] = {"osc32k", "osc24M", "pll_periph0", "pll_periph0"}; -static const char *mod_parents[] = {"osc24M", "pll_periph0", "pll_periph1"}; -static const char *ts_parents[] = {"osc24M", "pll_periph0"}; -static const char *spdif_parents[] = {"pll_audio"}; -static const char *i2s_parents[] = {"pll_audio-8x", "pll_audio-4x", "pll_audio-2x", "pll_audio"}; +NM_CLK_WITH_FRAC(pll_gpu_clk, + H3_CLK_PLL_GPU, /* id */ + "pll_gpu", pll_gpu_parents, /* name, parents */ + 0x38, /* offset */ + 8, 7, 0, 0, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 31, 28, 1000, /* gate, lock, lock retries */ + AW_CLK_HAS_LOCK, /* flags */ + 270000000, 297000000, /* freq0, freq1 */ + 24, 25); /* mode sel, freq sel */ -static struct aw_clk_nm_def nm_clks[] = { - NM_CLK_WITH_FRAC(H3_CLK_PLL_VIDEO, /* id */ - "pll_video", pll_video_parents, /* name, parents */ - 0x10, /* offset */ - 8, 7, 0, 0, /* n factor */ - 0, 4, 0, 0, /* m factor */ - 31, 28, 1000, /* gate, lock, lock retries */ - AW_CLK_HAS_LOCK, /* flags */ - 270000000, 297000000, /* freq0, freq1 */ - 24, 25) /* mode sel, freq sel */ - NM_CLK_WITH_FRAC(H3_CLK_PLL_VE, /* id */ - "pll_ve", pll_ve_parents, /* name, parents */ - 0x18, /* offset */ - 8, 7, 0, 0, /* n factor */ - 0, 4, 0, 0, /* m factor */ - 31, 28, 1000, /* gate, lock, lock retries */ - AW_CLK_HAS_LOCK, /* flags */ - 270000000, 297000000, /* freq0, freq1 */ - 24, 25) /* mode sel, freq sel */ - NM_CLK_WITH_FRAC(H3_CLK_PLL_GPU, /* id */ - "pll_gpu", pll_gpu_parents, /* name, parents */ - 0x38, /* offset */ - 8, 7, 0, 0, /* n factor */ - 0, 4, 0, 0, /* m factor */ - 31, 28, 1000, /* gate, lock, lock retries */ - AW_CLK_HAS_LOCK, /* flags */ - 270000000, 297000000, /* freq0, freq1 */ - 24, 25) /* mode sel, freq sel */ - NM_CLK_WITH_FRAC(H3_CLK_PLL_DE, /* id */ - "pll_de", pll_de_parents, /* name, parents */ - 0x48, /* offset */ - 8, 7, 0, 0, /* n factor */ - 0, 4, 0, 0, /* m factor */ - 31, 28, 1000, /* gate, lock, lock retries */ - AW_CLK_HAS_LOCK, /* flags */ - 270000000, 297000000, /* freq0, freq1 */ - 24, 25) /* mode sel, freq sel */ - NM_CLK(H3_CLK_APB2, /* id */ - "apb2", apb2_parents, /* name, parents */ - 0x58, /* offset */ - 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ - 0, 5, 0, 0, /* m factor */ - 24, 2, /* mux */ - 0, /* gate */ - AW_CLK_HAS_MUX) - NM_CLK(H3_CLK_NAND, "nand", mod_parents, /* id, name, parents */ - 0x80, /* offset */ - 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ - 0, 4, 0, 0, /* m factor */ - 24, 2, /* mux */ - 31, /* gate */ - AW_CLK_HAS_GATE | AW_CLK_HAS_MUX) /* flags */ - NM_CLK(H3_CLK_MMC0, "mmc0", mod_parents, /* id, name, parents */ - 0x88, /* offset */ - 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ - 0, 4, 0, 0, /* m factor */ - 24, 2, /* mux */ - 31, /* gate */ - AW_CLK_HAS_GATE | AW_CLK_HAS_MUX | - AW_CLK_REPARENT) /* flags */ - NM_CLK(H3_CLK_MMC1, "mmc1", mod_parents, /* id, name, parents */ - 0x8c, /* offset */ - 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ - 0, 4, 0, 0, /* m factor */ - 24, 2, /* mux */ - 31, /* gate */ - AW_CLK_HAS_GATE | AW_CLK_HAS_MUX | - AW_CLK_REPARENT) /* flags */ - NM_CLK(H3_CLK_MMC2, "mmc2", mod_parents, /* id, name, parents */ - 0x90, /* offset */ - 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ - 0, 4, 0, 0, /* m factor */ - 24, 2, /* mux */ - 31, /* gate */ - AW_CLK_HAS_GATE | AW_CLK_HAS_MUX | - AW_CLK_REPARENT) /* flags */ - NM_CLK(H3_CLK_TS, "ts", ts_parents, /* id, name, parents */ - 0x98, /* offset */ - 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ - 0, 4, 0, 0, /* m factor */ - 24, 2, /* mux */ - 31, /* gate */ - AW_CLK_HAS_GATE | AW_CLK_HAS_MUX) /* flags */ - NM_CLK(H3_CLK_CE, "ce", mod_parents, /* id, name, parents */ - 0x9C, /* offset */ - 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ - 0, 4, 0, 0, /* m factor */ - 24, 2, /* mux */ - 31, /* gate */ - AW_CLK_HAS_GATE | AW_CLK_HAS_MUX) /* flags */ - NM_CLK(H3_CLK_SPI0, "spi0", mod_parents, /* id, name, parents */ - 0xA0, /* offset */ - 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ - 0, 4, 0, 0, /* m factor */ - 24, 2, /* mux */ - 31, /* gate */ - AW_CLK_HAS_GATE | AW_CLK_HAS_MUX | - AW_CLK_REPARENT) /* flags */ - NM_CLK(H3_CLK_SPI1, "spi1", mod_parents, /* id, name, parents */ - 0xA4, /* offset */ - 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ - 0, 4, 0, 0, /* m factor */ - 24, 2, /* mux */ - 31, /* gate */ - AW_CLK_HAS_GATE | AW_CLK_HAS_MUX | - AW_CLK_REPARENT) /* flags */ - NM_CLK(H3_CLK_SPDIF, "spdif", spdif_parents, /* id, name, parents */ - 0xC0, /* offset */ - 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ - 0, 4, 0, 0, /* m factor */ - 0, 0, /* mux */ - 31, /* gate */ - AW_CLK_HAS_GATE) /* flags */ +static const char *pll_periph1_parents[] = {"osc24M"}; +NKMP_CLK(pll_periph1_clk, + H3_CLK_PLL_PERIPH1, /* id */ + "pll_periph1", pll_periph1_parents, /* name, parents */ + 0x44, /* offset */ + 8, 5, 0, 0, /* n factor */ + 4, 2, 0, 0, /* k factor */ + 0, 0, 2, AW_CLK_FACTOR_FIXED, /* m factor (fake) */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* p factor (fake) */ + 31, /* gate */ + 28, 1000, /* lock */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ -}; +static const char *pll_de_parents[] = {"osc24M"}; +NM_CLK_WITH_FRAC(pll_de_clk, + H3_CLK_PLL_DE, /* id */ + "pll_de", pll_de_parents, /* name, parents */ + 0x48, /* offset */ + 8, 7, 0, 0, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 31, 28, 1000, /* gate, lock, lock retries */ + AW_CLK_HAS_LOCK, /* flags */ + 270000000, 297000000, /* freq0, freq1 */ + 24, 25); /* mode sel, freq sel */ static const char *cpux_parents[] = {"osc32k", "osc24M", "pll_cpux", "pll_cpux"}; +MUX_CLK(cpux_clk, + H3_CLK_CPUX, /* id */ + "cpux", cpux_parents, /* name, parents */ + 0x50, 16, 2); /* offset, shift, width */ -static struct clk_mux_def mux_clks[] = { - MUX_CLK(H3_CLK_CPUX, /* id */ - "cpux", cpux_parents, /* name, parents */ - 0x50, 16, 2) /* offset, shift, width */ - MUX_CLK(0, - "i2s0mux", i2s_parents, - 0xb0, 16, 2) - MUX_CLK(0, - "i2s1mux", i2s_parents, - 0xb4, 16, 2) - MUX_CLK(0, - "i2s2mux", i2s_parents, - 0xb8, 16, 2) -}; +static const char *axi_parents[] = {"cpux"}; +DIV_CLK(axi_clk, + H3_CLK_AXI, /* id */ + "axi", axi_parents, /* name, parents */ + 0x50, /* offset */ + 0, 2, /* shift, width */ + 0, NULL); /* flags, div table */ +static const char *ahb1_parents[] = {"osc32k", "osc24M", "axi", "pll_periph0"}; +PREDIV_CLK(ahb1_clk, H3_CLK_AHB1, /* id */ + "ahb1", ahb1_parents, /* name, parents */ + 0x54, /* offset */ + 12, 2, /* mux */ + 4, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* div */ + 6, 2, 0, AW_CLK_FACTOR_HAS_COND, /* prediv */ + 12, 2, 3); /* prediv condition */ + +static const char *apb1_parents[] = {"ahb1"}; static struct clk_div_table apb1_div_table[] = { { .value = 0, .divider = 2, }, { .value = 1, .divider = 2, }, @@ -402,7 +352,35 @@ static struct clk_div_table apb1_div_tab { .value = 3, .divider = 8, }, { }, }; +DIV_CLK(apb1_clk, + H3_CLK_APB1, /* id */ + "apb1", apb1_parents, /* name, parents */ + 0x54, /* offset */ + 8, 2, /* shift, width */ + CLK_DIV_WITH_TABLE, /* flags */ + apb1_div_table); /* div table */ +static const char *apb2_parents[] = {"osc32k", "osc24M", "pll_periph0", "pll_periph0"}; +NM_CLK(apb2_clk, + H3_CLK_APB2, /* id */ + "apb2", apb2_parents, /* name, parents */ + 0x58, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 5, 0, 0, /* m factor */ + 24, 2, /* mux */ + 0, /* gate */ + AW_CLK_HAS_MUX); + +static const char *ahb2_parents[] = {"ahb1", "pll_periph0"}; +PREDIV_CLK(ahb2_clk, H3_CLK_AHB2, /* id */ + "ahb2", ahb2_parents, /* name, parents */ + 0x5c, /* offset */ + 0, 2, /* mux */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* div */ + 0, 0, 2, AW_CLK_FACTOR_HAS_COND | AW_CLK_FACTOR_FIXED, /* prediv */ + 0, 2, 1); /* prediv condition */ + +static const char *ths_parents[] = {"osc24M"}; static struct clk_div_table ths_div_table[] = { { .value = 0, .divider = 1, }, { .value = 1, .divider = 2, }, @@ -410,60 +388,182 @@ static struct clk_div_table ths_div_tabl { .value = 3, .divider = 6, }, { }, }; +DIV_CLK(thsdiv_clk, + 0, /* id */ + "thsdiv", ths_parents, /* name, parents */ + 0x74, /* offset */ + 0, 2, /* shift, width */ + CLK_DIV_WITH_TABLE, /* flags */ + ths_div_table); /* div table */ -static const char *ths_parents[] = {"osc24M"}; -static const char *axi_parents[] = {"cpux"}; -static const char *apb1_parents[] = {"ahb1"}; +static const char *mod_parents[] = {"osc24M", "pll_periph0", "pll_periph1"}; +NM_CLK(nand_clk, + H3_CLK_NAND, "nand", mod_parents, /* id, name, parents */ + 0x80, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ + +NM_CLK(mmc0_clk, + H3_CLK_MMC0, "mmc0", mod_parents, /* id, name, parents */ + 0x88, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX | + AW_CLK_REPARENT); /* flags */ + +NM_CLK(mmc1_clk, + H3_CLK_MMC1, "mmc1", mod_parents, /* id, name, parents */ + 0x8c, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX | + AW_CLK_REPARENT); /* flags */ + +NM_CLK(mmc2_clk, + H3_CLK_MMC2, "mmc2", mod_parents, /* id, name, parents */ + 0x90, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX | + AW_CLK_REPARENT); /* flags */ + +static const char *ts_parents[] = {"osc24M", "pll_periph0"}; +NM_CLK(ts_clk, + H3_CLK_TS, "ts", ts_parents, /* id, name, parents */ + 0x98, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ + +NM_CLK(ce_clk, + H3_CLK_CE, "ce", mod_parents, /* id, name, parents */ + 0x9C, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ + +NM_CLK(spi0_clk, + H3_CLK_SPI0, "spi0", mod_parents, /* id, name, parents */ + 0xA0, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX | + AW_CLK_REPARENT); /* flags */ + +NM_CLK(spi1_clk, + H3_CLK_SPI1, "spi1", mod_parents, /* id, name, parents */ + 0xA4, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX | + AW_CLK_REPARENT); /* flags */ + +static const char *i2s_parents[] = {"pll_audio-8x", "pll_audio-4x", "pll_audio-2x", "pll_audio"}; +MUX_CLK(i2s0mux_clk, + 0, "i2s0mux", i2s_parents, /* id, name, parents */ + 0xb0, 16, 2); /* offset, mux shift, mux width */ +MUX_CLK(i2s1mux_clk, + 0, "i2s1mux", i2s_parents, /* id, name, parents */ + 0xb4, 16, 2); /* offset, mux shift, mux width */ +MUX_CLK(i2s2mux_clk, + 0, "i2s2mux", i2s_parents, /* id, name, parents */ + 0xb8, 16, 2); /* offset, mux shift, mux width */ + +static const char *spdif_parents[] = {"pll_audio"}; +NM_CLK(spdif_clk, + H3_CLK_SPDIF, "spdif", spdif_parents, /* id, name, parents */ + 0xC0, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake); */ + 0, 4, 0, 0, /* m factor */ + 0, 0, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE); /* flags */ + +FIXED_CLK(pll_periph0_2x_clk, + H3_CLK_PLL_PERIPH0_2X, /* id */ + "pll_periph0-2x", /* name */ + pll_periph0_2x_parents, /* parent */ + 0, /* freq */ + 2, /* mult */ + 1, /* div */ + 0); /* flags */ + +/* DRAM clock 0xF4 */ +/* DE gating 0x104 */ +/* TCON0 0x118 */ +/* TVE 0x120 */ +/* Deinterlace 0x124 */ +/* CSI_MISC 0x130 */ +/* CSI 0x134 */ +/* VE 0x13C */ +/* HDMI 0x150 */ +/* MBUS 0x15C */ +/* GPU 0x1A0 */ + +static struct aw_clk_nkmp_def *nkmp_clks[] = { + &pll_cpux_clk, + &pll_audio_clk, + &pll_periph0_clk, + &pll_periph1_clk, +}; + +static struct aw_clk_nm_def *nm_clks[] = { + &pll_video_clk, + &pll_ve_clk, + &pll_gpu_clk, + &pll_de_clk, + &apb2_clk, + &nand_clk, + &mmc0_clk, + &mmc1_clk, + &mmc2_clk, + &ts_clk, + &ce_clk, + &spi0_clk, + &spi1_clk, + &spdif_clk, +}; + +static struct aw_clk_prediv_mux_def *prediv_mux_clks[] = { + &ahb1_clk, + &ahb2_clk, +}; + +static struct clk_mux_def *mux_clks[] = { + &cpux_clk, + &i2s0mux_clk, + &i2s1mux_clk, + &i2s2mux_clk, +}; -static struct clk_div_def div_clks[] = { - DIV_CLK(H3_CLK_AXI, /* id */ - "axi", axi_parents, /* name, parents */ - 0x50, /* offset */ - 0, 2, /* shift, width */ - 0, NULL) /* flags, div table */ - DIV_CLK(H3_CLK_APB1, /* id */ - "apb1", apb1_parents, /* name, parents */ - 0x54, /* offset */ - 8, 2, /* shift, width */ - CLK_DIV_WITH_TABLE, /* flags */ - apb1_div_table) /* div table */ - DIV_CLK(0, /* id */ - "thsdiv", ths_parents, /* name, parents */ - 0x74, /* offset */ - 0, 2, /* shift, width */ - CLK_DIV_WITH_TABLE, /* flags */ - ths_div_table) /* div table */ +static struct clk_div_def *div_clks[] = { + &axi_clk, + &apb1_clk, + &thsdiv_clk, }; -static struct clk_fixed_def fixed_factor_clks[] = { - FIXED_CLK(H3_CLK_PLL_PERIPH0_2X, /* id */ - "pll_periph0-2x", /* name */ - pll_periph0_2x_parents, /* parent */ - 0, /* freq */ - 2, /* mult */ - 1, /* div */ - 0) /* flags */ - FIXED_CLK(H3_CLK_PLL_AUDIO_2X, /* id */ - "pll_audio-2x", /* name */ - pll_audio_mult_parents, /* parent */ - 0, /* freq */ - 2, /* mult */ - 1, /* div */ - 0) /* flags */ - FIXED_CLK(H3_CLK_PLL_AUDIO_4X, /* id */ - "pll_audio-4x", /* name */ - pll_audio_mult_parents, /* parent */ - 0, /* freq */ - 4, /* mult */ - 1, /* div */ - 0) /* flags */ - FIXED_CLK(H3_CLK_PLL_AUDIO_8X, /* id */ - "pll_audio-8x", /* name */ - pll_audio_mult_parents, /* parent */ - 0, /* freq */ - 8, /* mult */ - 1, /* div */ - 0) /* flags */ +static struct clk_fixed_def *fixed_factor_clks[] = { + &pll_periph0_2x_clk, + &pll_audio_2x_clk, + &pll_audio_4x_clk, + &pll_audio_8x_clk, }; static struct aw_clk_init init_clks[] = { @@ -484,16 +584,16 @@ ccu_h3_register_clocks(struct aw_ccung_s sc->n_clk_init = nitems(init_clks); for (i = 0; i < nitems(nkmp_clks); i++) - aw_clk_nkmp_register(sc->clkdom, &nkmp_clks[i]); + aw_clk_nkmp_register(sc->clkdom, nkmp_clks[i]); for (i = 0; i < nitems(nm_clks); i++) - aw_clk_nm_register(sc->clkdom, &nm_clks[i]); + aw_clk_nm_register(sc->clkdom, nm_clks[i]); for (i = 0; i < nitems(prediv_mux_clks); i++) - aw_clk_prediv_mux_register(sc->clkdom, &prediv_mux_clks[i]); + aw_clk_prediv_mux_register(sc->clkdom, prediv_mux_clks[i]); for (i = 0; i < nitems(mux_clks); i++) - clknode_mux_register(sc->clkdom, &mux_clks[i]); + clknode_mux_register(sc->clkdom, mux_clks[i]); for (i = 0; i < nitems(div_clks); i++) - clknode_div_register(sc->clkdom, &div_clks[i]); + clknode_div_register(sc->clkdom, div_clks[i]); for (i = 0; i < nitems(fixed_factor_clks); i++) - clknode_fixed_register(sc->clkdom, &fixed_factor_clks[i]); + clknode_fixed_register(sc->clkdom, fixed_factor_clks[i]); } Modified: head/sys/arm/allwinner/clkng/ccu_h3.h ============================================================================== --- head/sys/arm/allwinner/clkng/ccu_h3.h Mon Feb 27 10:40:39 2017 (r314332) +++ head/sys/arm/allwinner/clkng/ccu_h3.h Mon Feb 27 11:10:36 2017 (r314333) @@ -184,6 +184,25 @@ #define H3_CLK_USBOHCI2 94 #define H3_CLK_USBOHCI3 95 +#define H3_CLK_DRAM_VE 97 +#define H3_CLK_DRAM_CSI 98 +#define H3_CLK_DRAM_DEINTERLACE 99 +#define H3_CLK_DRAM_TS 100 +#define H3_CLK_DE 101 +#define H3_CLK_TCON0 102 +#define H3_CLK_TVE 103 +#define H3_CLK_DEINTERLACE 104 +#define H3_CLK_CSI_MISC 105 +#define H3_CLK_CSI_SCLK 106 +#define H3_CLK_CSI_MCLK 107 +#define H3_CLK_VE 108 +#define H3_CLK_AC_DIG 109 +#define H3_CLK_AVS 110 +#define H3_CLK_HDMI 111 +#define H3_CLK_HDMI_DDC 112 + +#define H3_CLK_GPU 114 + void ccu_h3_register_clocks(struct aw_ccung_softc *sc); #endif /* __CCU_H3_H__ */ From owner-svn-src-all@freebsd.org Mon Feb 27 11:27:48 2017 Return-Path: Delivered-To: svn-src-all@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 C542ECEF44D; Mon, 27 Feb 2017 11:27:48 +0000 (UTC) (envelope-from kib@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 933A6A65; Mon, 27 Feb 2017 11:27:48 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RBRllX037488; Mon, 27 Feb 2017 11:27:47 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RBRkYG037478; Mon, 27 Feb 2017 11:27:46 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201702271127.v1RBRkYG037478@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 27 Feb 2017 11:27:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314334 - in stable/11/sys: compat/cloudabi compat/freebsd32 compat/linux kern sys vm X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 11:27:48 -0000 Author: kib Date: Mon Feb 27 11:27:46 2017 New Revision: 314334 URL: https://svnweb.freebsd.org/changeset/base/314334 Log: MFC kern_mmap(9) and related helpers. MFC r302514 (by rwatson): Audit file-descriptor arguments to I/O system calls such as read(2), write(2), dup(2), and mmap(2). MFC r302524 (by rwatson): When mmap(2) is used with a vnode, capture vnode attributes in the audit trail. MFC r313352 (by trasz): Add kern_vm_mmap2(), kern_vm_mprotect(), kern_vm_msync(), kern_vm_munlock(), kern_vm_munmap(), and kern_vm_madvise(). MFC r313655: Change type of the prot parameter for kern_vm_mmap() from vm_prot_t to int. MFC r313696: Rework r313352. Modified: stable/11/sys/compat/cloudabi/cloudabi_mem.c stable/11/sys/compat/freebsd32/freebsd32_misc.c stable/11/sys/compat/linux/linux_misc.c stable/11/sys/compat/linux/linux_mmap.c stable/11/sys/kern/kern_descrip.c stable/11/sys/kern/sys_generic.c stable/11/sys/kern/vfs_aio.c stable/11/sys/sys/syscallsubr.h stable/11/sys/vm/vm_extern.h stable/11/sys/vm/vm_mmap.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/cloudabi/cloudabi_mem.c ============================================================================== --- stable/11/sys/compat/cloudabi/cloudabi_mem.c Mon Feb 27 11:10:36 2017 (r314333) +++ stable/11/sys/compat/cloudabi/cloudabi_mem.c Mon Feb 27 11:27:46 2017 (r314334) @@ -28,7 +28,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include +#include #include @@ -62,137 +63,116 @@ int cloudabi_sys_mem_advise(struct thread *td, struct cloudabi_sys_mem_advise_args *uap) { - struct madvise_args madvise_args = { - .addr = uap->addr, - .len = uap->len - }; + int behav; switch (uap->advice) { case CLOUDABI_ADVICE_DONTNEED: - madvise_args.behav = MADV_DONTNEED; + behav = MADV_DONTNEED; break; case CLOUDABI_ADVICE_NORMAL: - madvise_args.behav = MADV_NORMAL; + behav = MADV_NORMAL; break; case CLOUDABI_ADVICE_RANDOM: - madvise_args.behav = MADV_RANDOM; + behav = MADV_RANDOM; break; case CLOUDABI_ADVICE_SEQUENTIAL: - madvise_args.behav = MADV_SEQUENTIAL; + behav = MADV_SEQUENTIAL; break; case CLOUDABI_ADVICE_WILLNEED: - madvise_args.behav = MADV_WILLNEED; + behav = MADV_WILLNEED; break; default: return (EINVAL); } - return (sys_madvise(td, &madvise_args)); + return (kern_madvise(td, (uintptr_t)uap->addr, uap->len, + behav)); } int cloudabi_sys_mem_lock(struct thread *td, struct cloudabi_sys_mem_lock_args *uap) { - struct mlock_args mlock_args = { - .addr = uap->addr, - .len = uap->len - }; - return (sys_mlock(td, &mlock_args)); + return (kern_mlock(td->td_proc, td->td_ucred, + __DECONST(uintptr_t, uap->addr), uap->len)); } int cloudabi_sys_mem_map(struct thread *td, struct cloudabi_sys_mem_map_args *uap) { - struct mmap_args mmap_args = { - .addr = uap->addr, - .len = uap->len, - .fd = uap->fd, - .pos = uap->off - }; - int error; + int error, flags, prot; /* Translate flags. */ + flags = 0; if (uap->flags & CLOUDABI_MAP_ANON) - mmap_args.flags |= MAP_ANON; + flags |= MAP_ANON; if (uap->flags & CLOUDABI_MAP_FIXED) - mmap_args.flags |= MAP_FIXED; + flags |= MAP_FIXED; if (uap->flags & CLOUDABI_MAP_PRIVATE) - mmap_args.flags |= MAP_PRIVATE; + flags |= MAP_PRIVATE; if (uap->flags & CLOUDABI_MAP_SHARED) - mmap_args.flags |= MAP_SHARED; + flags |= MAP_SHARED; /* Translate protection. */ - error = convert_mprot(uap->prot, &mmap_args.prot); + error = convert_mprot(uap->prot, &prot); if (error != 0) return (error); - return (sys_mmap(td, &mmap_args)); + return (kern_mmap(td, (uintptr_t)uap->addr, uap->len, prot, flags, + uap->fd, uap->off)); } int cloudabi_sys_mem_protect(struct thread *td, struct cloudabi_sys_mem_protect_args *uap) { - struct mprotect_args mprotect_args = { - .addr = uap->addr, - .len = uap->len, - }; - int error; + int error, prot; /* Translate protection. */ - error = convert_mprot(uap->prot, &mprotect_args.prot); + error = convert_mprot(uap->prot, &prot); if (error != 0) return (error); - return (sys_mprotect(td, &mprotect_args)); + return (kern_mprotect(td, (uintptr_t)uap->addr, uap->len, + prot)); } int cloudabi_sys_mem_sync(struct thread *td, struct cloudabi_sys_mem_sync_args *uap) { - struct msync_args msync_args = { - .addr = uap->addr, - .len = uap->len, - }; + int flags; /* Convert flags. */ switch (uap->flags & (CLOUDABI_MS_ASYNC | CLOUDABI_MS_SYNC)) { case CLOUDABI_MS_ASYNC: - msync_args.flags |= MS_ASYNC; + flags = MS_ASYNC; break; case CLOUDABI_MS_SYNC: - msync_args.flags |= MS_SYNC; + flags = MS_SYNC; break; default: return (EINVAL); } if ((uap->flags & CLOUDABI_MS_INVALIDATE) != 0) - msync_args.flags |= MS_INVALIDATE; + flags |= MS_INVALIDATE; - return (sys_msync(td, &msync_args)); + return (kern_msync(td, (uintptr_t)uap->addr, uap->len, + flags)); } int cloudabi_sys_mem_unlock(struct thread *td, struct cloudabi_sys_mem_unlock_args *uap) { - struct munlock_args munlock_args = { - .addr = uap->addr, - .len = uap->len - }; - return (sys_munlock(td, &munlock_args)); + return (kern_munlock(td, __DECONST(uintptr_t, uap->addr), + uap->len)); } int cloudabi_sys_mem_unmap(struct thread *td, struct cloudabi_sys_mem_unmap_args *uap) { - struct munmap_args munmap_args = { - .addr = uap->addr, - .len = uap->len - }; - return (sys_munmap(td, &munmap_args)); + return (kern_munmap(td, (uintptr_t)uap->addr, uap->len)); } Modified: stable/11/sys/compat/freebsd32/freebsd32_misc.c ============================================================================== --- stable/11/sys/compat/freebsd32/freebsd32_misc.c Mon Feb 27 11:10:36 2017 (r314333) +++ stable/11/sys/compat/freebsd32/freebsd32_misc.c Mon Feb 27 11:27:46 2017 (r314334) @@ -449,42 +449,30 @@ freebsd32_fexecve(struct thread *td, str int freebsd32_mprotect(struct thread *td, struct freebsd32_mprotect_args *uap) { - struct mprotect_args ap; + int prot; - ap.addr = PTRIN(uap->addr); - ap.len = uap->len; - ap.prot = uap->prot; + prot = uap->prot; #if defined(__amd64__) - if (i386_read_exec && (ap.prot & PROT_READ) != 0) - ap.prot |= PROT_EXEC; + if (i386_read_exec && (prot & PROT_READ) != 0) + prot |= PROT_EXEC; #endif - return (sys_mprotect(td, &ap)); + return (kern_mprotect(td, (uintptr_t)PTRIN(uap->addr), uap->len, + prot)); } int freebsd32_mmap(struct thread *td, struct freebsd32_mmap_args *uap) { - struct mmap_args ap; - vm_offset_t addr = (vm_offset_t) uap->addr; - vm_size_t len = uap->len; - int prot = uap->prot; - int flags = uap->flags; - int fd = uap->fd; - off_t pos = PAIR32TO64(off_t,uap->pos); + int prot; + prot = uap->prot; #if defined(__amd64__) if (i386_read_exec && (prot & PROT_READ)) prot |= PROT_EXEC; #endif - ap.addr = (void *) addr; - ap.len = len; - ap.prot = prot; - ap.flags = flags; - ap.fd = fd; - ap.pos = pos; - - return (sys_mmap(td, &ap)); + return (kern_mmap(td, (uintptr_t)uap->addr, uap->len, prot, + uap->flags, uap->fd, PAIR32TO64(off_t, uap->pos))); } #ifdef COMPAT_FREEBSD6 @@ -492,17 +480,16 @@ int freebsd6_freebsd32_mmap(struct thread *td, struct freebsd6_freebsd32_mmap_args *uap) { - struct freebsd32_mmap_args ap; + int prot; - ap.addr = uap->addr; - ap.len = uap->len; - ap.prot = uap->prot; - ap.flags = uap->flags; - ap.fd = uap->fd; - ap.pos1 = uap->pos1; - ap.pos2 = uap->pos2; + prot = uap->prot; +#if defined(__amd64__) + if (i386_read_exec && (prot & PROT_READ)) + prot |= PROT_EXEC; +#endif - return (freebsd32_mmap(td, &ap)); + return (kern_mmap(td, (uintptr_t)uap->addr, uap->len, prot, + uap->flags, uap->fd, PAIR32TO64(off_t, uap->pos))); } #endif Modified: stable/11/sys/compat/linux/linux_misc.c ============================================================================== --- stable/11/sys/compat/linux/linux_misc.c Mon Feb 27 11:10:36 2017 (r314333) +++ stable/11/sys/compat/linux/linux_misc.c Mon Feb 27 11:27:46 2017 (r314334) @@ -585,10 +585,8 @@ select_out: int linux_mremap(struct thread *td, struct linux_mremap_args *args) { - struct munmap_args /* { - void *addr; - size_t len; - } */ bsd_args; + uintptr_t addr; + size_t len; int error = 0; #ifdef DEBUG @@ -623,10 +621,9 @@ linux_mremap(struct thread *td, struct l } if (args->new_len < args->old_len) { - bsd_args.addr = - (caddr_t)((uintptr_t)args->addr + args->new_len); - bsd_args.len = args->old_len - args->new_len; - error = sys_munmap(td, &bsd_args); + addr = args->addr + args->new_len; + len = args->old_len - args->new_len; + error = kern_munmap(td, addr, len); } td->td_retval[0] = error ? 0 : (uintptr_t)args->addr; @@ -640,13 +637,9 @@ linux_mremap(struct thread *td, struct l int linux_msync(struct thread *td, struct linux_msync_args *args) { - struct msync_args bsd_args; - bsd_args.addr = (caddr_t)(uintptr_t)args->addr; - bsd_args.len = (uintptr_t)args->len; - bsd_args.flags = args->fl & ~LINUX_MS_SYNC; - - return (sys_msync(td, &bsd_args)); + return (kern_msync(td, args->addr, args->len, + args->fl & ~LINUX_MS_SYNC)); } int Modified: stable/11/sys/compat/linux/linux_mmap.c ============================================================================== --- stable/11/sys/compat/linux/linux_mmap.c Mon Feb 27 11:10:36 2017 (r314333) +++ stable/11/sys/compat/linux/linux_mmap.c Mon Feb 27 11:27:46 2017 (r314334) @@ -41,10 +41,12 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include +#include #include #include @@ -67,15 +69,7 @@ linux_mmap_common(struct thread *td, uin { struct proc *p = td->td_proc; struct vmspace *vms = td->td_proc->p_vmspace; - struct mmap_args /* { - caddr_t addr; - size_t len; - int prot; - int flags; - int fd; - off_t pos; - } */ bsd_args; - int error; + int bsd_flags, error; struct file *fp; cap_rights_t rights; @@ -83,7 +77,7 @@ linux_mmap_common(struct thread *td, uin addr, len, prot, flags, fd, pos); error = 0; - bsd_args.flags = 0; + bsd_flags = 0; fp = NULL; /* @@ -94,21 +88,21 @@ linux_mmap_common(struct thread *td, uin return (EINVAL); if (flags & LINUX_MAP_SHARED) - bsd_args.flags |= MAP_SHARED; + bsd_flags |= MAP_SHARED; if (flags & LINUX_MAP_PRIVATE) - bsd_args.flags |= MAP_PRIVATE; + bsd_flags |= MAP_PRIVATE; if (flags & LINUX_MAP_FIXED) - bsd_args.flags |= MAP_FIXED; + bsd_flags |= MAP_FIXED; if (flags & LINUX_MAP_ANON) { /* Enforce pos to be on page boundary, then ignore. */ if ((pos & PAGE_MASK) != 0) return (EINVAL); pos = 0; - bsd_args.flags |= MAP_ANON; + bsd_flags |= MAP_ANON; } else - bsd_args.flags |= MAP_NOSYNC; + bsd_flags |= MAP_NOSYNC; if (flags & LINUX_MAP_GROWSDOWN) - bsd_args.flags |= MAP_STACK; + bsd_flags |= MAP_STACK; /* * PROT_READ, PROT_WRITE, or PROT_EXEC implies PROT_READ and PROT_EXEC @@ -118,14 +112,13 @@ linux_mmap_common(struct thread *td, uin * * XXX. Linux checks that the file system is not mounted with noexec. */ - bsd_args.prot = prot; #if defined(__amd64__) - linux_fixup_prot(td, &bsd_args.prot); + linux_fixup_prot(td, &prot); #endif /* Linux does not check file descriptor when MAP_ANONYMOUS is set. */ - bsd_args.fd = (bsd_args.flags & MAP_ANON) ? -1 : fd; - if (bsd_args.fd != -1) { + fd = (bsd_flags & MAP_ANON) ? -1 : fd; + if (fd != -1) { /* * Linux follows Solaris mmap(2) description: * The file descriptor fildes is opened with @@ -133,8 +126,7 @@ linux_mmap_common(struct thread *td, uin * protection options specified. */ - error = fget(td, bsd_args.fd, - cap_rights_init(&rights, CAP_MMAP), &fp); + error = fget(td, fd, cap_rights_init(&rights, CAP_MMAP), &fp); if (error != 0) return (error); if (fp->f_type != DTYPE_VNODE) { @@ -205,21 +197,13 @@ linux_mmap_common(struct thread *td, uin * we map the full stack, since we don't have a way * to autogrow it. */ - if (len > STACK_SIZE - GUARD_SIZE) { - bsd_args.addr = (caddr_t)addr; - bsd_args.len = len; - } else { - bsd_args.addr = (caddr_t)addr - - (STACK_SIZE - GUARD_SIZE - len); - bsd_args.len = STACK_SIZE - GUARD_SIZE; + if (len <= STACK_SIZE - GUARD_SIZE) { + addr = addr - (STACK_SIZE - GUARD_SIZE - len); + len = STACK_SIZE - GUARD_SIZE; } - } else { - bsd_args.addr = (caddr_t)addr; - bsd_args.len = len; } - bsd_args.pos = pos; - error = sys_mmap(td, &bsd_args); + error = kern_mmap(td, addr, len, prot, bsd_flags, fd, pos); LINUX_CTR2(mmap2, "return: %d (%p)", error, td->td_retval[0]); @@ -229,16 +213,11 @@ linux_mmap_common(struct thread *td, uin int linux_mprotect_common(struct thread *td, uintptr_t addr, size_t len, int prot) { - struct mprotect_args bsd_args; - - bsd_args.addr = (void *)addr; - bsd_args.len = len; - bsd_args.prot = prot; #if defined(__amd64__) - linux_fixup_prot(td, &bsd_args.prot); + linux_fixup_prot(td, &prot); #endif - return (sys_mprotect(td, &bsd_args)); + return (kern_mprotect(td, addr, len, prot)); } #if defined(__amd64__) Modified: stable/11/sys/kern/kern_descrip.c ============================================================================== --- stable/11/sys/kern/kern_descrip.c Mon Feb 27 11:10:36 2017 (r314333) +++ stable/11/sys/kern/kern_descrip.c Mon Feb 27 11:27:46 2017 (r314334) @@ -820,6 +820,9 @@ kern_dup(struct thread *td, u_int mode, MPASS((flags & ~(FDDUP_FLAG_CLOEXEC)) == 0); MPASS(mode < FDDUP_LASTMODE); + AUDIT_ARG_FD(old); + /* XXXRW: if (flags & FDDUP_FIXED) AUDIT_ARG_FD2(new); */ + /* * Verify we have a valid descriptor to dup from and possibly to * dup to. Unlike dup() and dup2(), fcntl()'s F_DUPFD should Modified: stable/11/sys/kern/sys_generic.c ============================================================================== --- stable/11/sys/kern/sys_generic.c Mon Feb 27 11:10:36 2017 (r314333) +++ stable/11/sys/kern/sys_generic.c Mon Feb 27 11:27:46 2017 (r314334) @@ -363,6 +363,8 @@ dofileread(td, fd, fp, auio, offset, fla struct uio *ktruio = NULL; #endif + AUDIT_ARG_FD(fd); + /* Finish zero length reads right here */ if (auio->uio_resid == 0) { td->td_retval[0] = 0; @@ -576,6 +578,7 @@ dofilewrite(td, fd, fp, auio, offset, fl struct uio *ktruio = NULL; #endif + AUDIT_ARG_FD(fd); auio->uio_rw = UIO_WRITE; auio->uio_td = td; auio->uio_offset = offset; Modified: stable/11/sys/kern/vfs_aio.c ============================================================================== --- stable/11/sys/kern/vfs_aio.c Mon Feb 27 11:10:36 2017 (r314333) +++ stable/11/sys/kern/vfs_aio.c Mon Feb 27 11:27:46 2017 (r314334) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -858,12 +859,9 @@ aio_process_mlock(struct kaiocb *job) ("%s: opcode %d", __func__, job->uaiocb.aio_lio_opcode)); aio_switch_vmspace(job); - error = vm_mlock(job->userproc, job->cred, - __DEVOLATILE(void *, cb->aio_buf), cb->aio_nbytes); - if (error) - aio_complete(job, -1, error); - else - aio_complete(job, 0, 0); + error = kern_mlock(job->userproc, job->cred, + __DEVOLATILE(uintptr_t, cb->aio_buf), cb->aio_nbytes); + aio_complete(job, error != 0 ? -1 : 0, error); } static void Modified: stable/11/sys/sys/syscallsubr.h ============================================================================== --- stable/11/sys/sys/syscallsubr.h Mon Feb 27 11:10:36 2017 (r314333) +++ stable/11/sys/sys/syscallsubr.h Mon Feb 27 11:27:46 2017 (r314334) @@ -138,15 +138,24 @@ int kern_linkat(struct thread *td, int f char *path2, enum uio_seg segflg, int follow); int kern_lutimes(struct thread *td, char *path, enum uio_seg pathseg, struct timeval *tptr, enum uio_seg tptrseg); +int kern_madvise(struct thread *td, uintptr_t addr, size_t len, int behav); int kern_mkdirat(struct thread *td, int fd, char *path, enum uio_seg segflg, int mode); int kern_mkfifoat(struct thread *td, int fd, char *path, enum uio_seg pathseg, int mode); int kern_mknodat(struct thread *td, int fd, char *path, enum uio_seg pathseg, int mode, int dev); +int kern_mlock(struct proc *proc, struct ucred *cred, uintptr_t addr, + size_t len); +int kern_mmap(struct thread *td, uintptr_t addr, size_t size, int prot, + int flags, int fd, off_t pos); +int kern_mprotect(struct thread *td, uintptr_t addr, size_t size, int prot); int kern_msgctl(struct thread *, int, int, struct msqid_ds *); int kern_msgrcv(struct thread *, int, void *, size_t, long, int, long *); int kern_msgsnd(struct thread *, int, const void *, size_t, int, long); +int kern_msync(struct thread *td, uintptr_t addr, size_t size, int flags); +int kern_munlock(struct thread *td, uintptr_t addr, size_t size); +int kern_munmap(struct thread *td, uintptr_t addr, size_t size); int kern_nanosleep(struct thread *td, struct timespec *rqt, struct timespec *rmt); int kern_ogetdirentries(struct thread *td, struct ogetdirentries_args *uap, Modified: stable/11/sys/vm/vm_extern.h ============================================================================== --- stable/11/sys/vm/vm_extern.h Mon Feb 27 11:10:36 2017 (r314333) +++ stable/11/sys/vm/vm_extern.h Mon Feb 27 11:27:46 2017 (r314334) @@ -114,6 +114,5 @@ struct sf_buf *vm_imgact_map_page(vm_obj void vm_imgact_unmap_page(struct sf_buf *sf); void vm_thread_dispose(struct thread *td); int vm_thread_new(struct thread *td, int pages); -int vm_mlock(struct proc *, struct ucred *, const void *, size_t); #endif /* _KERNEL */ #endif /* !_VM_EXTERN_H_ */ Modified: stable/11/sys/vm/vm_mmap.c ============================================================================== --- stable/11/sys/vm/vm_mmap.c Mon Feb 27 11:10:36 2017 (r314333) +++ stable/11/sys/vm/vm_mmap.c Mon Feb 27 11:27:46 2017 (r314334) @@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -169,26 +170,29 @@ struct mmap_args { #endif int -sys_mmap(td, uap) - struct thread *td; - struct mmap_args *uap; +sys_mmap(struct thread *td, struct mmap_args *uap) { + + return (kern_mmap(td, (uintptr_t)uap->addr, uap->len, uap->prot, + uap->flags, uap->fd, uap->pos)); +} + +int +kern_mmap(struct thread *td, uintptr_t addr0, size_t size, int prot, int flags, + int fd, off_t pos) +{ + struct vmspace *vms; struct file *fp; vm_offset_t addr; - vm_size_t size, pageoff; + vm_size_t pageoff; vm_prot_t cap_maxprot; - int align, error, flags, prot; - off_t pos; - struct vmspace *vms = td->td_proc->p_vmspace; + int align, error; cap_rights_t rights; - addr = (vm_offset_t) uap->addr; - size = uap->len; - prot = uap->prot; - flags = uap->flags; - pos = uap->pos; - + vms = td->td_proc->p_vmspace; fp = NULL; + AUDIT_ARG_FD(fd); + addr = addr0; /* * Ignore old flags that used to be defined but did not do anything. @@ -205,8 +209,8 @@ sys_mmap(td, uap) * pos. */ if (!SV_CURPROC_FLAG(SV_AOUT)) { - if ((uap->len == 0 && curproc->p_osrel >= P_OSREL_MAP_ANON) || - ((flags & MAP_ANON) != 0 && (uap->fd != -1 || pos != 0))) + if ((size == 0 && curproc->p_osrel >= P_OSREL_MAP_ANON) || + ((flags & MAP_ANON) != 0 && (fd != -1 || pos != 0))) return (EINVAL); } else { if ((flags & MAP_ANON) != 0) @@ -214,7 +218,7 @@ sys_mmap(td, uap) } if (flags & MAP_STACK) { - if ((uap->fd != -1) || + if ((fd != -1) || ((prot & (PROT_READ | PROT_WRITE)) != (PROT_READ | PROT_WRITE))) return (EINVAL); flags |= MAP_ANON; @@ -334,7 +338,7 @@ sys_mmap(td, uap) } if (prot & PROT_EXEC) cap_rights_set(&rights, CAP_MMAP_X); - error = fget_mmap(td, uap->fd, &rights, &cap_maxprot, &fp); + error = fget_mmap(td, fd, &rights, &cap_maxprot, &fp); if (error != 0) goto done; if ((flags & (MAP_SHARED | MAP_PRIVATE)) == 0 && @@ -361,15 +365,9 @@ done: int freebsd6_mmap(struct thread *td, struct freebsd6_mmap_args *uap) { - struct mmap_args oargs; - oargs.addr = uap->addr; - oargs.len = uap->len; - oargs.prot = uap->prot; - oargs.flags = uap->flags; - oargs.fd = uap->fd; - oargs.pos = uap->pos; - return (sys_mmap(td, &oargs)); + return (kern_mmap(td, (uintptr_t)uap->addr, uap->len, uap->prot, + uap->flags, uap->fd, uap->pos)); } #endif @@ -385,11 +383,8 @@ struct ommap_args { }; #endif int -ommap(td, uap) - struct thread *td; - struct ommap_args *uap; +ommap(struct thread *td, struct ommap_args *uap) { - struct mmap_args nargs; static const char cvtbsdprot[8] = { 0, PROT_EXEC, @@ -400,36 +395,34 @@ ommap(td, uap) PROT_WRITE | PROT_READ, PROT_EXEC | PROT_WRITE | PROT_READ, }; + int flags, prot; #define OMAP_ANON 0x0002 #define OMAP_COPY 0x0020 #define OMAP_SHARED 0x0010 #define OMAP_FIXED 0x0100 - nargs.addr = uap->addr; - nargs.len = uap->len; - nargs.prot = cvtbsdprot[uap->prot & 0x7]; + prot = cvtbsdprot[uap->prot & 0x7]; #ifdef COMPAT_FREEBSD32 #if defined(__amd64__) if (i386_read_exec && SV_PROC_FLAG(td->td_proc, SV_ILP32) && - nargs.prot != 0) - nargs.prot |= PROT_EXEC; + prot != 0) + prot |= PROT_EXEC; #endif #endif - nargs.flags = 0; + flags = 0; if (uap->flags & OMAP_ANON) - nargs.flags |= MAP_ANON; + flags |= MAP_ANON; if (uap->flags & OMAP_COPY) - nargs.flags |= MAP_COPY; + flags |= MAP_COPY; if (uap->flags & OMAP_SHARED) - nargs.flags |= MAP_SHARED; + flags |= MAP_SHARED; else - nargs.flags |= MAP_PRIVATE; + flags |= MAP_PRIVATE; if (uap->flags & OMAP_FIXED) - nargs.flags |= MAP_FIXED; - nargs.fd = uap->fd; - nargs.pos = uap->pos; - return (sys_mmap(td, &nargs)); + flags |= MAP_FIXED; + return (kern_mmap(td, (uintptr_t)uap->addr, uap->len, prot, flags, + uap->fd, uap->pos)); } #endif /* COMPAT_43 */ @@ -442,20 +435,21 @@ struct msync_args { }; #endif int -sys_msync(td, uap) - struct thread *td; - struct msync_args *uap; +sys_msync(struct thread *td, struct msync_args *uap) +{ + + return (kern_msync(td, (uintptr_t)uap->addr, uap->len, uap->flags)); +} + +int +kern_msync(struct thread *td, uintptr_t addr0, size_t size, int flags) { vm_offset_t addr; - vm_size_t size, pageoff; - int flags; + vm_size_t pageoff; vm_map_t map; int rv; - addr = (vm_offset_t) uap->addr; - size = uap->len; - flags = uap->flags; - + addr = addr0; pageoff = (addr & PAGE_MASK); addr -= pageoff; size += pageoff; @@ -494,23 +488,27 @@ struct munmap_args { }; #endif int -sys_munmap(td, uap) - struct thread *td; - struct munmap_args *uap; +sys_munmap(struct thread *td, struct munmap_args *uap) +{ + + return (kern_munmap(td, (uintptr_t)uap->addr, uap->len)); +} + +int +kern_munmap(struct thread *td, uintptr_t addr0, size_t size) { #ifdef HWPMC_HOOKS struct pmckern_map_out pkm; vm_map_entry_t entry; #endif vm_offset_t addr; - vm_size_t size, pageoff; + vm_size_t pageoff; vm_map_t map; - addr = (vm_offset_t) uap->addr; - size = uap->len; if (size == 0) return (EINVAL); + addr = addr0; pageoff = (addr & PAGE_MASK); addr -= pageoff; size += pageoff; @@ -567,18 +565,20 @@ struct mprotect_args { }; #endif int -sys_mprotect(td, uap) - struct thread *td; - struct mprotect_args *uap; +sys_mprotect(struct thread *td, struct mprotect_args *uap) { - vm_offset_t addr; - vm_size_t size, pageoff; - vm_prot_t prot; - addr = (vm_offset_t) uap->addr; - size = uap->len; - prot = uap->prot & VM_PROT_ALL; + return (kern_mprotect(td, (uintptr_t)uap->addr, uap->len, uap->prot)); +} +int +kern_mprotect(struct thread *td, uintptr_t addr0, size_t size, int prot) +{ + vm_offset_t addr; + vm_size_t pageoff; + + addr = addr0; + prot = (prot & VM_PROT_ALL); pageoff = (addr & PAGE_MASK); addr -= pageoff; size += pageoff; @@ -644,15 +644,22 @@ struct madvise_args { int sys_madvise(struct thread *td, struct madvise_args *uap) { - vm_offset_t start, end; + + return (kern_madvise(td, (uintptr_t)uap->addr, uap->len, uap->behav)); +} + +int +kern_madvise(struct thread *td, uintptr_t addr0, size_t len, int behav) +{ vm_map_t map; + vm_offset_t addr, end, start; int flags; /* * Check for our special case, advising the swap pager we are * "immortal." */ - if (uap->behav == MADV_PROTECT) { + if (behav == MADV_PROTECT) { flags = PPROT_SET; return (kern_procctl(td, P_PID, td->td_proc->p_pid, PROC_SPROTECT, &flags)); @@ -661,27 +668,27 @@ sys_madvise(struct thread *td, struct ma /* * Check for illegal behavior */ - if (uap->behav < 0 || uap->behav > MADV_CORE) + if (behav < 0 || behav > MADV_CORE) return (EINVAL); /* * Check for illegal addresses. Watch out for address wrap... Note * that VM_*_ADDRESS are not constants due to casts (argh). */ map = &td->td_proc->p_vmspace->vm_map; - if ((vm_offset_t)uap->addr < vm_map_min(map) || - (vm_offset_t)uap->addr + uap->len > vm_map_max(map)) + addr = addr0; + if (addr < vm_map_min(map) || addr + len > vm_map_max(map)) return (EINVAL); - if (((vm_offset_t) uap->addr + uap->len) < (vm_offset_t) uap->addr) + if ((addr + len) < addr) return (EINVAL); /* * Since this routine is only advisory, we default to conservative * behavior. */ - start = trunc_page((vm_offset_t) uap->addr); - end = round_page((vm_offset_t) uap->addr + uap->len); + start = trunc_page(addr); + end = round_page(addr + len); - if (vm_map_madvise(map, start, end, uap->behav)) + if (vm_map_madvise(map, start, end, behav)) return (EINVAL); return (0); } @@ -952,11 +959,12 @@ int sys_mlock(struct thread *td, struct mlock_args *uap) { - return (vm_mlock(td->td_proc, td->td_ucred, uap->addr, uap->len)); + return (kern_mlock(td->td_proc, td->td_ucred, + __DECONST(uintptr_t, uap->addr), uap->len)); } int -vm_mlock(struct proc *proc, struct ucred *cred, const void *addr0, size_t len) +kern_mlock(struct proc *proc, struct ucred *cred, uintptr_t addr0, size_t len) { vm_offset_t addr, end, last, start; vm_size_t npages, size; @@ -967,7 +975,7 @@ vm_mlock(struct proc *proc, struct ucred error = priv_check_cred(cred, PRIV_VM_MLOCK, 0); if (error) return (error); - addr = (vm_offset_t)addr0; + addr = addr0; size = len; last = addr + size; start = trunc_page(addr); @@ -1124,12 +1132,16 @@ struct munlock_args { }; #endif int -sys_munlock(td, uap) - struct thread *td; - struct munlock_args *uap; +sys_munlock(struct thread *td, struct munlock_args *uap) +{ + + return (kern_munlock(td, (uintptr_t)uap->addr, uap->len)); +} + +int +kern_munlock(struct thread *td, uintptr_t addr0, size_t size) { vm_offset_t addr, end, last, start; - vm_size_t size; #ifdef RACCT vm_map_t map; #endif @@ -1138,8 +1150,7 @@ sys_munlock(td, uap) error = priv_check(td, PRIV_VM_MUNLOCK); if (error) return (error); - addr = (vm_offset_t)uap->addr; - size = uap->len; + addr = addr0; last = addr + size; start = trunc_page(addr); end = round_page(last); @@ -1184,6 +1195,7 @@ vm_mmap_vnode(struct thread *td, vm_size locktype = LK_SHARED; if ((error = vget(vp, locktype, td)) != 0) return (error); + AUDIT_ARG_VNODE1(vp); foff = *foffp; flags = *flagsp; obj = vp->v_object; From owner-svn-src-all@freebsd.org Mon Feb 27 13:05:18 2017 Return-Path: Delivered-To: svn-src-all@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 6DD4CCED0EA; Mon, 27 Feb 2017 13:05:18 +0000 (UTC) (envelope-from avg@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 324AFD8F; Mon, 27 Feb 2017 13:05:18 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RD5Hoo077426; Mon, 27 Feb 2017 13:05:17 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RD5HOi077424; Mon, 27 Feb 2017 13:05:17 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201702271305.v1RD5HOi077424@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 27 Feb 2017 13:05:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314335 - stable/10/sys/crypto/sha2 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 13:05:18 -0000 Author: avg Date: Mon Feb 27 13:05:17 2017 New Revision: 314335 URL: https://svnweb.freebsd.org/changeset/base/314335 Log: MFC r300966: Retune SHA2 code for improved performance on CPUs with more ILP... Modified: stable/10/sys/crypto/sha2/sha256c.c stable/10/sys/crypto/sha2/sha512c.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/crypto/sha2/sha256c.c ============================================================================== --- stable/10/sys/crypto/sha2/sha256c.c Mon Feb 27 11:27:46 2017 (r314334) +++ stable/10/sys/crypto/sha2/sha256c.c Mon Feb 27 13:05:17 2017 (r314335) @@ -78,6 +78,26 @@ be32dec_vect(uint32_t *dst, const unsign #endif /* BYTE_ORDER != BIG_ENDIAN */ +/* SHA256 round constants. */ +static const uint32_t K[64] = { + 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, + 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, + 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, + 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, + 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, + 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, + 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, + 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, + 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, + 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, + 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, + 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, + 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, + 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, + 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, + 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2 +}; + /* Elementary functions used by SHA256 */ #define Ch(x, y, z) ((x & (y ^ z)) ^ z) #define Maj(x, y, z) ((x & (y | z)) | (y & z)) @@ -90,18 +110,21 @@ be32dec_vect(uint32_t *dst, const unsign /* SHA256 round function */ #define RND(a, b, c, d, e, f, g, h, k) \ - t0 = h + S1(e) + Ch(e, f, g) + k; \ - t1 = S0(a) + Maj(a, b, c); \ - d += t0; \ - h = t0 + t1; + h += S1(e) + Ch(e, f, g) + k; \ + d += h; \ + h += S0(a) + Maj(a, b, c); /* Adjusted round function for rotating state */ -#define RNDr(S, W, i, k) \ +#define RNDr(S, W, i, ii) \ RND(S[(64 - i) % 8], S[(65 - i) % 8], \ S[(66 - i) % 8], S[(67 - i) % 8], \ S[(68 - i) % 8], S[(69 - i) % 8], \ S[(70 - i) % 8], S[(71 - i) % 8], \ - W[i] + k) + W[i + ii] + K[i + ii]) + +/* Message schedule computation */ +#define MSCH(W, ii, i) \ + W[i + ii + 16] = s1(W[i + ii + 14]) + W[i + ii + 9] + s0(W[i + ii + 1]) + W[i + ii] /* * SHA256 block compression function. The 256-bit state is transformed via @@ -112,82 +135,52 @@ SHA256_Transform(uint32_t * state, const { uint32_t W[64]; uint32_t S[8]; - uint32_t t0, t1; int i; - /* 1. Prepare message schedule W. */ + /* 1. Prepare the first part of the message schedule W. */ be32dec_vect(W, block, 64); - for (i = 16; i < 64; i++) - W[i] = s1(W[i - 2]) + W[i - 7] + s0(W[i - 15]) + W[i - 16]; /* 2. Initialize working variables. */ memcpy(S, state, 32); /* 3. Mix. */ - RNDr(S, W, 0, 0x428a2f98); - RNDr(S, W, 1, 0x71374491); - RNDr(S, W, 2, 0xb5c0fbcf); - RNDr(S, W, 3, 0xe9b5dba5); - RNDr(S, W, 4, 0x3956c25b); - RNDr(S, W, 5, 0x59f111f1); - RNDr(S, W, 6, 0x923f82a4); - RNDr(S, W, 7, 0xab1c5ed5); - RNDr(S, W, 8, 0xd807aa98); - RNDr(S, W, 9, 0x12835b01); - RNDr(S, W, 10, 0x243185be); - RNDr(S, W, 11, 0x550c7dc3); - RNDr(S, W, 12, 0x72be5d74); - RNDr(S, W, 13, 0x80deb1fe); - RNDr(S, W, 14, 0x9bdc06a7); - RNDr(S, W, 15, 0xc19bf174); - RNDr(S, W, 16, 0xe49b69c1); - RNDr(S, W, 17, 0xefbe4786); - RNDr(S, W, 18, 0x0fc19dc6); - RNDr(S, W, 19, 0x240ca1cc); - RNDr(S, W, 20, 0x2de92c6f); - RNDr(S, W, 21, 0x4a7484aa); - RNDr(S, W, 22, 0x5cb0a9dc); - RNDr(S, W, 23, 0x76f988da); - RNDr(S, W, 24, 0x983e5152); - RNDr(S, W, 25, 0xa831c66d); - RNDr(S, W, 26, 0xb00327c8); - RNDr(S, W, 27, 0xbf597fc7); - RNDr(S, W, 28, 0xc6e00bf3); - RNDr(S, W, 29, 0xd5a79147); - RNDr(S, W, 30, 0x06ca6351); - RNDr(S, W, 31, 0x14292967); - RNDr(S, W, 32, 0x27b70a85); - RNDr(S, W, 33, 0x2e1b2138); - RNDr(S, W, 34, 0x4d2c6dfc); - RNDr(S, W, 35, 0x53380d13); - RNDr(S, W, 36, 0x650a7354); - RNDr(S, W, 37, 0x766a0abb); - RNDr(S, W, 38, 0x81c2c92e); - RNDr(S, W, 39, 0x92722c85); - RNDr(S, W, 40, 0xa2bfe8a1); - RNDr(S, W, 41, 0xa81a664b); - RNDr(S, W, 42, 0xc24b8b70); - RNDr(S, W, 43, 0xc76c51a3); - RNDr(S, W, 44, 0xd192e819); - RNDr(S, W, 45, 0xd6990624); - RNDr(S, W, 46, 0xf40e3585); - RNDr(S, W, 47, 0x106aa070); - RNDr(S, W, 48, 0x19a4c116); - RNDr(S, W, 49, 0x1e376c08); - RNDr(S, W, 50, 0x2748774c); - RNDr(S, W, 51, 0x34b0bcb5); - RNDr(S, W, 52, 0x391c0cb3); - RNDr(S, W, 53, 0x4ed8aa4a); - RNDr(S, W, 54, 0x5b9cca4f); - RNDr(S, W, 55, 0x682e6ff3); - RNDr(S, W, 56, 0x748f82ee); - RNDr(S, W, 57, 0x78a5636f); - RNDr(S, W, 58, 0x84c87814); - RNDr(S, W, 59, 0x8cc70208); - RNDr(S, W, 60, 0x90befffa); - RNDr(S, W, 61, 0xa4506ceb); - RNDr(S, W, 62, 0xbef9a3f7); - RNDr(S, W, 63, 0xc67178f2); + for (i = 0; i < 64; i += 16) { + RNDr(S, W, 0, i); + RNDr(S, W, 1, i); + RNDr(S, W, 2, i); + RNDr(S, W, 3, i); + RNDr(S, W, 4, i); + RNDr(S, W, 5, i); + RNDr(S, W, 6, i); + RNDr(S, W, 7, i); + RNDr(S, W, 8, i); + RNDr(S, W, 9, i); + RNDr(S, W, 10, i); + RNDr(S, W, 11, i); + RNDr(S, W, 12, i); + RNDr(S, W, 13, i); + RNDr(S, W, 14, i); + RNDr(S, W, 15, i); + + if (i == 48) + break; + MSCH(W, 0, i); + MSCH(W, 1, i); + MSCH(W, 2, i); + MSCH(W, 3, i); + MSCH(W, 4, i); + MSCH(W, 5, i); + MSCH(W, 6, i); + MSCH(W, 7, i); + MSCH(W, 8, i); + MSCH(W, 9, i); + MSCH(W, 10, i); + MSCH(W, 11, i); + MSCH(W, 12, i); + MSCH(W, 13, i); + MSCH(W, 14, i); + MSCH(W, 15, i); + } /* 4. Mix local working variables into global state */ for (i = 0; i < 8; i++) @@ -205,22 +198,29 @@ static unsigned char PAD[64] = { static void SHA256_Pad(SHA256_CTX * ctx) { - unsigned char len[8]; - uint32_t r, plen; - - /* - * Convert length to a vector of bytes -- we do this now rather - * than later because the length will change after we pad. - */ - be64enc(len, ctx->count); + size_t r; - /* Add 1--64 bytes so that the resulting length is 56 mod 64 */ + /* Figure out how many bytes we have buffered. */ r = (ctx->count >> 3) & 0x3f; - plen = (r < 56) ? (56 - r) : (120 - r); - SHA256_Update(ctx, PAD, (size_t)plen); - /* Add the terminating bit-count */ - SHA256_Update(ctx, len, 8); + /* Pad to 56 mod 64, transforming if we finish a block en route. */ + if (r < 56) { + /* Pad to 56 mod 64. */ + memcpy(&ctx->buf[r], PAD, 56 - r); + } else { + /* Finish the current block and mix. */ + memcpy(&ctx->buf[r], PAD, 64 - r); + SHA256_Transform(ctx->state, ctx->buf); + + /* The start of the final block is all zeroes. */ + memset(&ctx->buf[0], 0, 56); + } + + /* Add the terminating bit-count. */ + be64enc(&ctx->buf[56], ctx->count); + + /* Mix in the final block. */ + SHA256_Transform(ctx->state, ctx->buf); } /* SHA-256 initialization. Begins a SHA-256 operation. */ Modified: stable/10/sys/crypto/sha2/sha512c.c ============================================================================== --- stable/10/sys/crypto/sha2/sha512c.c Mon Feb 27 11:27:46 2017 (r314334) +++ stable/10/sys/crypto/sha2/sha512c.c Mon Feb 27 13:05:17 2017 (r314335) @@ -81,6 +81,50 @@ be64dec_vect(uint64_t *dst, const unsign #endif /* BYTE_ORDER != BIG_ENDIAN */ +/* SHA512 round constants. */ +static const uint64_t K[80] = { + 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, + 0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL, + 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL, + 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL, + 0xd807aa98a3030242ULL, 0x12835b0145706fbeULL, + 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL, + 0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, + 0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL, + 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL, + 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL, + 0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL, + 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL, + 0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, + 0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL, + 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL, + 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL, + 0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL, + 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL, + 0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, + 0x81c2c92e47edaee6ULL, 0x92722c851482353bULL, + 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL, + 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL, + 0xd192e819d6ef5218ULL, 0xd69906245565a910ULL, + 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL, + 0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, + 0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL, + 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL, + 0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL, + 0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL, + 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL, + 0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, + 0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL, + 0xca273eceea26619cULL, 0xd186b8c721c0c207ULL, + 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL, + 0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL, + 0x113f9804bef90daeULL, 0x1b710b35131c471bULL, + 0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, + 0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL, + 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL, + 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL +}; + /* Elementary functions used by SHA512 */ #define Ch(x, y, z) ((x & (y ^ z)) ^ z) #define Maj(x, y, z) ((x & (y | z)) | (y & z)) @@ -93,18 +137,21 @@ be64dec_vect(uint64_t *dst, const unsign /* SHA512 round function */ #define RND(a, b, c, d, e, f, g, h, k) \ - t0 = h + S1(e) + Ch(e, f, g) + k; \ - t1 = S0(a) + Maj(a, b, c); \ - d += t0; \ - h = t0 + t1; + h += S1(e) + Ch(e, f, g) + k; \ + d += h; \ + h += S0(a) + Maj(a, b, c); /* Adjusted round function for rotating state */ -#define RNDr(S, W, i, k) \ +#define RNDr(S, W, i, ii) \ RND(S[(80 - i) % 8], S[(81 - i) % 8], \ S[(82 - i) % 8], S[(83 - i) % 8], \ S[(84 - i) % 8], S[(85 - i) % 8], \ S[(86 - i) % 8], S[(87 - i) % 8], \ - W[i] + k) + W[i + ii] + K[i + ii]) + +/* Message schedule computation */ +#define MSCH(W, ii, i) \ + W[i + ii + 16] = s1(W[i + ii + 14]) + W[i + ii + 9] + s0(W[i + ii + 1]) + W[i + ii] /* * SHA512 block compression function. The 512-bit state is transformed via @@ -115,98 +162,52 @@ SHA512_Transform(uint64_t * state, const { uint64_t W[80]; uint64_t S[8]; - uint64_t t0, t1; int i; - /* 1. Prepare message schedule W. */ + /* 1. Prepare the first part of the message schedule W. */ be64dec_vect(W, block, SHA512_BLOCK_LENGTH); - for (i = 16; i < 80; i++) - W[i] = s1(W[i - 2]) + W[i - 7] + s0(W[i - 15]) + W[i - 16]; /* 2. Initialize working variables. */ memcpy(S, state, SHA512_DIGEST_LENGTH); /* 3. Mix. */ - RNDr(S, W, 0, 0x428a2f98d728ae22ULL); - RNDr(S, W, 1, 0x7137449123ef65cdULL); - RNDr(S, W, 2, 0xb5c0fbcfec4d3b2fULL); - RNDr(S, W, 3, 0xe9b5dba58189dbbcULL); - RNDr(S, W, 4, 0x3956c25bf348b538ULL); - RNDr(S, W, 5, 0x59f111f1b605d019ULL); - RNDr(S, W, 6, 0x923f82a4af194f9bULL); - RNDr(S, W, 7, 0xab1c5ed5da6d8118ULL); - RNDr(S, W, 8, 0xd807aa98a3030242ULL); - RNDr(S, W, 9, 0x12835b0145706fbeULL); - RNDr(S, W, 10, 0x243185be4ee4b28cULL); - RNDr(S, W, 11, 0x550c7dc3d5ffb4e2ULL); - RNDr(S, W, 12, 0x72be5d74f27b896fULL); - RNDr(S, W, 13, 0x80deb1fe3b1696b1ULL); - RNDr(S, W, 14, 0x9bdc06a725c71235ULL); - RNDr(S, W, 15, 0xc19bf174cf692694ULL); - RNDr(S, W, 16, 0xe49b69c19ef14ad2ULL); - RNDr(S, W, 17, 0xefbe4786384f25e3ULL); - RNDr(S, W, 18, 0x0fc19dc68b8cd5b5ULL); - RNDr(S, W, 19, 0x240ca1cc77ac9c65ULL); - RNDr(S, W, 20, 0x2de92c6f592b0275ULL); - RNDr(S, W, 21, 0x4a7484aa6ea6e483ULL); - RNDr(S, W, 22, 0x5cb0a9dcbd41fbd4ULL); - RNDr(S, W, 23, 0x76f988da831153b5ULL); - RNDr(S, W, 24, 0x983e5152ee66dfabULL); - RNDr(S, W, 25, 0xa831c66d2db43210ULL); - RNDr(S, W, 26, 0xb00327c898fb213fULL); - RNDr(S, W, 27, 0xbf597fc7beef0ee4ULL); - RNDr(S, W, 28, 0xc6e00bf33da88fc2ULL); - RNDr(S, W, 29, 0xd5a79147930aa725ULL); - RNDr(S, W, 30, 0x06ca6351e003826fULL); - RNDr(S, W, 31, 0x142929670a0e6e70ULL); - RNDr(S, W, 32, 0x27b70a8546d22ffcULL); - RNDr(S, W, 33, 0x2e1b21385c26c926ULL); - RNDr(S, W, 34, 0x4d2c6dfc5ac42aedULL); - RNDr(S, W, 35, 0x53380d139d95b3dfULL); - RNDr(S, W, 36, 0x650a73548baf63deULL); - RNDr(S, W, 37, 0x766a0abb3c77b2a8ULL); - RNDr(S, W, 38, 0x81c2c92e47edaee6ULL); - RNDr(S, W, 39, 0x92722c851482353bULL); - RNDr(S, W, 40, 0xa2bfe8a14cf10364ULL); - RNDr(S, W, 41, 0xa81a664bbc423001ULL); - RNDr(S, W, 42, 0xc24b8b70d0f89791ULL); - RNDr(S, W, 43, 0xc76c51a30654be30ULL); - RNDr(S, W, 44, 0xd192e819d6ef5218ULL); - RNDr(S, W, 45, 0xd69906245565a910ULL); - RNDr(S, W, 46, 0xf40e35855771202aULL); - RNDr(S, W, 47, 0x106aa07032bbd1b8ULL); - RNDr(S, W, 48, 0x19a4c116b8d2d0c8ULL); - RNDr(S, W, 49, 0x1e376c085141ab53ULL); - RNDr(S, W, 50, 0x2748774cdf8eeb99ULL); - RNDr(S, W, 51, 0x34b0bcb5e19b48a8ULL); - RNDr(S, W, 52, 0x391c0cb3c5c95a63ULL); - RNDr(S, W, 53, 0x4ed8aa4ae3418acbULL); - RNDr(S, W, 54, 0x5b9cca4f7763e373ULL); - RNDr(S, W, 55, 0x682e6ff3d6b2b8a3ULL); - RNDr(S, W, 56, 0x748f82ee5defb2fcULL); - RNDr(S, W, 57, 0x78a5636f43172f60ULL); - RNDr(S, W, 58, 0x84c87814a1f0ab72ULL); - RNDr(S, W, 59, 0x8cc702081a6439ecULL); - RNDr(S, W, 60, 0x90befffa23631e28ULL); - RNDr(S, W, 61, 0xa4506cebde82bde9ULL); - RNDr(S, W, 62, 0xbef9a3f7b2c67915ULL); - RNDr(S, W, 63, 0xc67178f2e372532bULL); - RNDr(S, W, 64, 0xca273eceea26619cULL); - RNDr(S, W, 65, 0xd186b8c721c0c207ULL); - RNDr(S, W, 66, 0xeada7dd6cde0eb1eULL); - RNDr(S, W, 67, 0xf57d4f7fee6ed178ULL); - RNDr(S, W, 68, 0x06f067aa72176fbaULL); - RNDr(S, W, 69, 0x0a637dc5a2c898a6ULL); - RNDr(S, W, 70, 0x113f9804bef90daeULL); - RNDr(S, W, 71, 0x1b710b35131c471bULL); - RNDr(S, W, 72, 0x28db77f523047d84ULL); - RNDr(S, W, 73, 0x32caab7b40c72493ULL); - RNDr(S, W, 74, 0x3c9ebe0a15c9bebcULL); - RNDr(S, W, 75, 0x431d67c49c100d4cULL); - RNDr(S, W, 76, 0x4cc5d4becb3e42b6ULL); - RNDr(S, W, 77, 0x597f299cfc657e2aULL); - RNDr(S, W, 78, 0x5fcb6fab3ad6faecULL); - RNDr(S, W, 79, 0x6c44198c4a475817ULL); + for (i = 0; i < 80; i += 16) { + RNDr(S, W, 0, i); + RNDr(S, W, 1, i); + RNDr(S, W, 2, i); + RNDr(S, W, 3, i); + RNDr(S, W, 4, i); + RNDr(S, W, 5, i); + RNDr(S, W, 6, i); + RNDr(S, W, 7, i); + RNDr(S, W, 8, i); + RNDr(S, W, 9, i); + RNDr(S, W, 10, i); + RNDr(S, W, 11, i); + RNDr(S, W, 12, i); + RNDr(S, W, 13, i); + RNDr(S, W, 14, i); + RNDr(S, W, 15, i); + + if (i == 64) + break; + MSCH(W, 0, i); + MSCH(W, 1, i); + MSCH(W, 2, i); + MSCH(W, 3, i); + MSCH(W, 4, i); + MSCH(W, 5, i); + MSCH(W, 6, i); + MSCH(W, 7, i); + MSCH(W, 8, i); + MSCH(W, 9, i); + MSCH(W, 10, i); + MSCH(W, 11, i); + MSCH(W, 12, i); + MSCH(W, 13, i); + MSCH(W, 14, i); + MSCH(W, 15, i); + } /* 4. Mix local working variables into global state */ for (i = 0; i < 8; i++) @@ -228,22 +229,29 @@ static unsigned char PAD[SHA512_BLOCK_LE static void SHA512_Pad(SHA512_CTX * ctx) { - unsigned char len[16]; - uint64_t r, plen; - - /* - * Convert length to a vector of bytes -- we do this now rather - * than later because the length will change after we pad. - */ - be64enc_vect(len, ctx->count, 16); + size_t r; - /* Add 1--128 bytes so that the resulting length is 112 mod 128 */ + /* Figure out how many bytes we have buffered. */ r = (ctx->count[1] >> 3) & 0x7f; - plen = (r < 112) ? (112 - r) : (240 - r); - SHA512_Update(ctx, PAD, (size_t)plen); - /* Add the terminating bit-count */ - SHA512_Update(ctx, len, 16); + /* Pad to 112 mod 128, transforming if we finish a block en route. */ + if (r < 112) { + /* Pad to 112 mod 128. */ + memcpy(&ctx->buf[r], PAD, 112 - r); + } else { + /* Finish the current block and mix. */ + memcpy(&ctx->buf[r], PAD, 128 - r); + SHA512_Transform(ctx->state, ctx->buf); + + /* The start of the final block is all zeroes. */ + memset(&ctx->buf[0], 0, 112); + } + + /* Add the terminating bit-count. */ + be64enc_vect(&ctx->buf[112], ctx->count, 16); + + /* Mix in the final block. */ + SHA512_Transform(ctx->state, ctx->buf); } /* SHA-512 initialization. Begins a SHA-512 operation. */ From owner-svn-src-all@freebsd.org Mon Feb 27 13:59:03 2017 Return-Path: Delivered-To: svn-src-all@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 8B4A3CEF687; Mon, 27 Feb 2017 13:59:03 +0000 (UTC) (envelope-from hselasky@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 5A6E81B1; Mon, 27 Feb 2017 13:59:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RDx2n9097531; Mon, 27 Feb 2017 13:59:02 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RDx2qV097530; Mon, 27 Feb 2017 13:59:02 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201702271359.v1RDx2qV097530@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 27 Feb 2017 13:59:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314336 - head/sys/compat/linuxkpi/common/include/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 13:59:03 -0000 Author: hselasky Date: Mon Feb 27 13:59:02 2017 New Revision: 314336 URL: https://svnweb.freebsd.org/changeset/base/314336 Log: Define __sum16 type in the LinuxKPI. MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/include/linux/types.h Modified: head/sys/compat/linuxkpi/common/include/linux/types.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/types.h Mon Feb 27 13:05:17 2017 (r314335) +++ head/sys/compat/linuxkpi/common/include/linux/types.h Mon Feb 27 13:59:02 2017 (r314336) @@ -57,6 +57,7 @@ typedef unsigned int uint; typedef unsigned gfp_t; typedef uint64_t loff_t; typedef vm_paddr_t resource_size_t; +typedef uint16_t __bitwise__ __sum16; typedef u64 phys_addr_t; From owner-svn-src-all@freebsd.org Mon Feb 27 14:02:13 2017 Return-Path: Delivered-To: svn-src-all@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 47C02CEF82A for ; Mon, 27 Feb 2017 14:02:13 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: from mail-yw0-x22e.google.com (mail-yw0-x22e.google.com [IPv6:2607:f8b0:4002:c05::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 10B83807 for ; Mon, 27 Feb 2017 14:02:12 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: by mail-yw0-x22e.google.com with SMTP id p77so36601251ywg.1 for ; Mon, 27 Feb 2017 06:02:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuxi-nl.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=fHqYQNBv5NxBvRsb+L+5F86AOB4sEIjeRmTQtO02egc=; b=LQyEQwXOLkVC6QAW9CssBW+jLj1YxY/JwNX3fCBRZ01C2yQXP0YOQ0QjpBglVPgMTh kkCAV993oEs1pnLdLQkLxshyewtyxWKPoRY/jPxL4r9IZiCyB+e11Rx4aPrP01lnSQrq DTueFRp11vzlYnOBamXF/RQwGqWvfY+5l7S8EGJJ2aEhUWGlbuP4vGZ4k9xa/8dN2V5E BqEj3vYpivqXEajEM+jk7BpWM5awv7FgXlz3SpkkRzg4/sR6TzSh82jLZEk2x5F6MOKl 5/GZXSPJydMSL/zEp6uc0qdaOxDQJmtD2q7hWvgFuItyCAWBH+9MPZbKeCM7e5yzQK9y fDKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=fHqYQNBv5NxBvRsb+L+5F86AOB4sEIjeRmTQtO02egc=; b=N5RvpzW7ZY8/67P6uhZwvwz+F9LDIJT10B3pU9yKiW4GSiwJSq5ieFAHp/ffwGuRBr cIdFCvU1JquPwHpnQezICOSbRJGnX4RRtBJDUvrOYwq/mhivJ0gTcqh+/DikUExhvMFr uVbJIkoy+Dfy1NB5rxZIV2DfvEUIPTxWoHfWulLhpAbaSTAsrPB1neRriqFybEEdahTx QEpH1CfcN3vHGNrWuBFIPsXbLoj3awZ6vfI5wirbdyS+kalo4suvjPjGOgpn6YWZho9v T64JxNu0+/ugLq06MPTebC1zYJmOxk0US8G01TBX+Tfxk7UYAdRny3YduxkRK3qDwar2 S6+Q== X-Gm-Message-State: AMke39lZH1t3D1gQZRk9ny31warBCE7fPDt86XwDH8r54dlnuzdRihrdz61WvPqPGTtr7yPtCIfpfhUCfLPyKw== X-Received: by 10.13.220.65 with SMTP id f62mr12184736ywe.6.1488204131878; Mon, 27 Feb 2017 06:02:11 -0800 (PST) MIME-Version: 1.0 Received: by 10.129.51.198 with HTTP; Mon, 27 Feb 2017 06:01:41 -0800 (PST) In-Reply-To: <201702271305.v1RD5HOi077424@repo.freebsd.org> References: <201702271305.v1RD5HOi077424@repo.freebsd.org> From: Ed Schouten Date: Mon, 27 Feb 2017 15:01:41 +0100 Message-ID: Subject: Re: svn commit: r314335 - stable/10/sys/crypto/sha2 To: Andriy Gapon Cc: src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 14:02:13 -0000 Hi Andriy, 2017-02-27 14:05 GMT+01:00 Andriy Gapon : > +/* Message schedule computation */ > +#define MSCH(W, ii, i) \ > + W[i + ii + 16] = s1(W[i + ii + 14]) + W[i + ii + 9] + s0(W[i + ii + 1]) + W[i + ii] [snip] > uint32_t W[64]; [snip] > + for (i = 0; i < 64; i += 16) { > + RNDr(S, W, 1, i); > + RNDr(S, W, 2, i); > + RNDr(S, W, 3, i); > + RNDr(S, W, 4, i); > + RNDr(S, W, 5, i); > + RNDr(S, W, 6, i); > + RNDr(S, W, 7, i); > + RNDr(S, W, 8, i); > + RNDr(S, W, 9, i); > + RNDr(S, W, 10, i); > + RNDr(S, W, 11, i); > + RNDr(S, W, 12, i); > + RNDr(S, W, 13, i); > + RNDr(S, W, 14, i); > + RNDr(S, W, 15, i); > + > + if (i == 48) > + break; > + MSCH(W, 0, i); > + MSCH(W, 1, i); > + MSCH(W, 2, i); > + MSCH(W, 3, i); > + MSCH(W, 4, i); > + MSCH(W, 5, i); > + MSCH(W, 6, i); > + MSCH(W, 7, i); > + MSCH(W, 8, i); > + MSCH(W, 9, i); > + MSCH(W, 10, i); > + MSCH(W, 11, i); > + MSCH(W, 12, i); > + MSCH(W, 13, i); > + MSCH(W, 14, i); > + MSCH(W, 15, i); > + } Something interesting that I noticed some time ago when comparing the various SHA-{256,512} implementations: there is no need to store the entire extended message in W. During every iteration of this loop, RNDr() and MSCH() never go more than 16 elements back. Say, if you were to modify MSCH() to something like this: > +#define MSCH(W, ii) \ > + W[ii] += s1(W[(ii + 14) % 16]) + W[(ii + 9) % 16] + s0(W[(ii + 1)) % 16]) Then it will compute the next chunk of the extended message in-place. RNDr() must then be adjusted to use W[i] instead of W[i + ii], of course. W then only needs to hold 16 elements instead of 64 or 80. -- Ed Schouten Nuxi, 's-Hertogenbosch, the Netherlands KvK-nr.: 62051717 From owner-svn-src-all@freebsd.org Mon Feb 27 14:38:18 2017 Return-Path: Delivered-To: svn-src-all@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 97F37CEFC2B; Mon, 27 Feb 2017 14:38:18 +0000 (UTC) (envelope-from hselasky@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 4D7FD661; Mon, 27 Feb 2017 14:38:18 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1REcHjc015579; Mon, 27 Feb 2017 14:38:17 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1REcHRQ015578; Mon, 27 Feb 2017 14:38:17 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201702271438.v1REcHRQ015578@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 27 Feb 2017 14:38:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314337 - head/sys/compat/linuxkpi/common/include/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 14:38:18 -0000 Author: hselasky Date: Mon Feb 27 14:38:17 2017 New Revision: 314337 URL: https://svnweb.freebsd.org/changeset/base/314337 Log: Implement more bit operation functions in the LinuxKPI. Some minor whitespace nits while at it. Obtained from: kmacy @ MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/include/linux/bitops.h Modified: head/sys/compat/linuxkpi/common/include/linux/bitops.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/bitops.h Mon Feb 27 13:59:02 2017 (r314336) +++ head/sys/compat/linuxkpi/common/include/linux/bitops.h Mon Feb 27 14:38:17 2017 (r314337) @@ -35,6 +35,7 @@ #include #include #include +#include #define BIT(nr) (1UL << (nr)) #define BIT_ULL(nr) (1ULL << (nr)) @@ -43,6 +44,7 @@ #else #define BITS_PER_LONG 32 #endif + #define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) % BITS_PER_LONG)) #define BITMAP_LAST_WORD_MASK(n) (~0UL >> (BITS_PER_LONG - (n))) #define BITS_TO_LONGS(n) howmany((n), BITS_PER_LONG) @@ -51,6 +53,12 @@ #define GENMASK(h, l) (((~0UL) >> (BITS_PER_LONG - (h) - 1)) & ((~0UL) << (l))) #define BITS_PER_BYTE 8 +#define hweight8(x) bitcount((uint8_t)(x)) +#define hweight16(x) bitcount16(x) +#define hweight32(x) bitcount32(x) +#define hweight64(x) bitcount64(x) +#define hweight_long(x) bitcountl(x) + static inline int __ffs(int mask) { @@ -75,10 +83,15 @@ __flsl(long mask) return (flsl(mask) - 1); } +static inline int +fls64(uint64_t mask) +{ + return (flsll(mask)); +} + static inline uint32_t ror32(uint32_t word, unsigned int shift) { - return ((word >> shift) | (word << (32 - shift))); } @@ -542,4 +555,12 @@ bitmap_equal(const unsigned long *pa, return (1); } +static inline uint64_t +sign_extend64(uint64_t value, int index) +{ + uint8_t shift = 63 - index; + + return ((int64_t)(value << shift) >> shift); +} + #endif /* _LINUX_BITOPS_H_ */ From owner-svn-src-all@freebsd.org Mon Feb 27 14:59:01 2017 Return-Path: Delivered-To: svn-src-all@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 B0A99CEFB81; Mon, 27 Feb 2017 14:59:01 +0000 (UTC) (envelope-from mav@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 8AE61BE5; Mon, 27 Feb 2017 14:59:01 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1REx0bB023767; Mon, 27 Feb 2017 14:59:00 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1REx0sn023764; Mon, 27 Feb 2017 14:59:00 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201702271459.v1REx0sn023764@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 27 Feb 2017 14:59:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314338 - head/sys/cam/ctl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 14:59:01 -0000 Author: mav Date: Mon Feb 27 14:59:00 2017 New Revision: 314338 URL: https://svnweb.freebsd.org/changeset/base/314338 Log: Polish handling of different reset flavours. The biggest change is that ctl_remove_initiator() now generates I_T NEXUS LOSS event, cleaning part of LUs state related to the initiator. MFC after: 2 weeks Modified: head/sys/cam/ctl/ctl.c head/sys/cam/ctl/ctl_private.h head/sys/cam/ctl/ctl_tpc.c Modified: head/sys/cam/ctl/ctl.c ============================================================================== --- head/sys/cam/ctl/ctl.c Mon Feb 27 14:38:17 2017 (r314337) +++ head/sys/cam/ctl/ctl.c Mon Feb 27 14:59:00 2017 (r314338) @@ -478,15 +478,15 @@ static int ctl_scsiio_precheck(struct ct struct ctl_scsiio *ctsio); static int ctl_scsiio(struct ctl_scsiio *ctsio); -static int ctl_bus_reset(struct ctl_softc *ctl_softc, union ctl_io *io); -static int ctl_target_reset(struct ctl_softc *ctl_softc, union ctl_io *io, - ctl_ua_type ua_type); -static int ctl_do_lun_reset(struct ctl_lun *lun, union ctl_io *io, +static int ctl_target_reset(union ctl_io *io); +static void ctl_do_lun_reset(struct ctl_lun *lun, uint32_t initidx, ctl_ua_type ua_type); -static int ctl_lun_reset(struct ctl_softc *ctl_softc, union ctl_io *io); +static int ctl_lun_reset(union ctl_io *io); static int ctl_abort_task(union ctl_io *io); static int ctl_abort_task_set(union ctl_io *io); static int ctl_query_task(union ctl_io *io, int task_set); +static void ctl_i_t_nexus_loss(struct ctl_softc *softc, uint32_t initidx, + ctl_ua_type ua_type); static int ctl_i_t_nexus_reset(union ctl_io *io); static int ctl_query_async_event(union ctl_io *io); static void ctl_run_task(union ctl_io *io); @@ -1288,6 +1288,9 @@ ctl_isc_iid_sync(struct ctl_softc *softc return; } iid = msg->hdr.nexus.initid; + if (port->wwpn_iid[iid].in_use != 0 && + msg->iid.in_use == 0) + ctl_i_t_nexus_loss(softc, iid, CTL_UA_POWERON); port->wwpn_iid[iid].in_use = msg->iid.in_use; port->wwpn_iid[iid].wwpn = msg->iid.wwpn; free(port->wwpn_iid[iid].name, M_CTL); @@ -2027,6 +2030,7 @@ int ctl_remove_initiator(struct ctl_port *port, int iid) { struct ctl_softc *softc = port->ctl_softc; + int last; mtx_assert(&softc->ctl_lock, MA_NOTOWNED); @@ -2037,9 +2041,11 @@ ctl_remove_initiator(struct ctl_port *po } mtx_lock(&softc->ctl_lock); - port->wwpn_iid[iid].in_use--; + last = (--port->wwpn_iid[iid].in_use == 0); port->wwpn_iid[iid].last_use = time_uptime; mtx_unlock(&softc->ctl_lock); + if (last) + ctl_i_t_nexus_loss(softc, iid, CTL_UA_POWERON); ctl_isc_announce_iid(port, iid); return (0); @@ -2144,11 +2150,6 @@ ctl_add_initiator(struct ctl_port *port, __func__, port->targ_port, iid, wwpn, name, (uintmax_t)port->wwpn_iid[iid].wwpn, port->wwpn_iid[iid].name); - - /* - * XXX KDM clear pending_sense and pending_ua on each LUN - * for this initiator. - */ } take: free(port->wwpn_iid[iid].name, M_CTL); @@ -11603,50 +11604,42 @@ bailout: return (retval); } -/* - * Since we only implement one target right now, a bus reset simply resets - * our single target. - */ static int -ctl_bus_reset(struct ctl_softc *softc, union ctl_io *io) -{ - return(ctl_target_reset(softc, io, CTL_UA_BUS_RESET)); -} - -static int -ctl_target_reset(struct ctl_softc *softc, union ctl_io *io, - ctl_ua_type ua_type) +ctl_target_reset(union ctl_io *io) { + struct ctl_softc *softc = CTL_SOFTC(io); struct ctl_port *port = CTL_PORT(io); struct ctl_lun *lun; - int retval; + uint32_t initidx; + ctl_ua_type ua_type; if (!(io->io_hdr.flags & CTL_FLAG_FROM_OTHER_SC)) { union ctl_ha_msg msg_info; msg_info.hdr.nexus = io->io_hdr.nexus; - if (ua_type==CTL_UA_TARG_RESET) - msg_info.task.task_action = CTL_TASK_TARGET_RESET; - else - msg_info.task.task_action = CTL_TASK_BUS_RESET; + msg_info.task.task_action = io->taskio.task_action; msg_info.hdr.msg_type = CTL_MSG_MANAGE_TASKS; msg_info.hdr.original_sc = NULL; msg_info.hdr.serializing_sc = NULL; ctl_ha_msg_send(CTL_HA_CHAN_CTL, &msg_info, sizeof(msg_info.task), M_WAITOK); } - retval = 0; + initidx = ctl_get_initindex(&io->io_hdr.nexus); + if (io->taskio.task_action == CTL_TASK_TARGET_RESET) + ua_type = CTL_UA_TARG_RESET; + else + ua_type = CTL_UA_BUS_RESET; mtx_lock(&softc->ctl_lock); STAILQ_FOREACH(lun, &softc->lun_list, links) { if (port != NULL && ctl_lun_map_to_port(port, lun->lun) == UINT32_MAX) continue; - retval += ctl_do_lun_reset(lun, io, ua_type); + ctl_do_lun_reset(lun, initidx, ua_type); } mtx_unlock(&softc->ctl_lock); io->taskio.task_status = CTL_TASK_FUNCTION_COMPLETE; - return (retval); + return (0); } /* @@ -11670,66 +11663,51 @@ ctl_target_reset(struct ctl_softc *softc * * XXX KDM for now, we're setting unit attention for all initiators. */ -static int -ctl_do_lun_reset(struct ctl_lun *lun, union ctl_io *io, ctl_ua_type ua_type) +static void +ctl_do_lun_reset(struct ctl_lun *lun, uint32_t initidx, ctl_ua_type ua_type) { union ctl_io *xio; -#if 0 - uint32_t initidx; -#endif int i; mtx_lock(&lun->lun_lock); - /* - * Run through the OOA queue and abort each I/O. - */ + /* Abort tasks. */ for (xio = (union ctl_io *)TAILQ_FIRST(&lun->ooa_queue); xio != NULL; xio = (union ctl_io *)TAILQ_NEXT(&xio->io_hdr, ooa_links)) { xio->io_hdr.flags |= CTL_FLAG_ABORT | CTL_FLAG_ABORT_STATUS; } - - /* - * This version sets unit attention for every - */ -#if 0 - initidx = ctl_get_initindex(&io->io_hdr.nexus); - ctl_est_ua_all(lun, initidx, ua_type); -#else - ctl_est_ua_all(lun, -1, ua_type); -#endif - - /* - * A reset (any kind, really) clears reservations established with - * RESERVE/RELEASE. It does not clear reservations established - * with PERSISTENT RESERVE OUT, but we don't support that at the - * moment anyway. See SPC-2, section 5.6. SPC-3 doesn't address - * reservations made with the RESERVE/RELEASE commands, because - * those commands are obsolete in SPC-3. - */ - lun->flags &= ~CTL_LUN_RESERVED; - + /* Clear CA. */ for (i = 0; i < CTL_MAX_PORTS; i++) { free(lun->pending_sense[i], M_CTL); lun->pending_sense[i] = NULL; } - lun->prevent_count = 0; + /* Clear reservation. */ + lun->flags &= ~CTL_LUN_RESERVED; + /* Clear prevent media removal. */ if (lun->prevent) { for (i = 0; i < CTL_MAX_INITIATORS; i++) ctl_clear_mask(lun->prevent, i); + lun->prevent_count = 0; } + /* Clear TPC status */ + ctl_tpc_lun_clear(lun, -1); + /* Establish UA. */ +#if 0 + ctl_est_ua_all(lun, initidx, ua_type); +#else + ctl_est_ua_all(lun, -1, ua_type); +#endif mtx_unlock(&lun->lun_lock); - - return (0); } static int -ctl_lun_reset(struct ctl_softc *softc, union ctl_io *io) +ctl_lun_reset(union ctl_io *io) { + struct ctl_softc *softc = CTL_SOFTC(io); struct ctl_lun *lun; - uint32_t targ_lun; - int retval; + uint32_t targ_lun, initidx; targ_lun = io->io_hdr.nexus.targ_mapped_lun; + initidx = ctl_get_initindex(&io->io_hdr.nexus); mtx_lock(&softc->ctl_lock); if (targ_lun >= CTL_MAX_LUNS || (lun = softc->ctl_luns[targ_lun]) == NULL) { @@ -11737,7 +11715,7 @@ ctl_lun_reset(struct ctl_softc *softc, u io->taskio.task_status = CTL_TASK_LUN_DOES_NOT_EXIST; return (1); } - retval = ctl_do_lun_reset(lun, io, CTL_UA_LUN_RESET); + ctl_do_lun_reset(lun, initidx, CTL_UA_LUN_RESET); mtx_unlock(&softc->ctl_lock); io->taskio.task_status = CTL_TASK_FUNCTION_COMPLETE; @@ -11752,7 +11730,7 @@ ctl_lun_reset(struct ctl_softc *softc, u ctl_ha_msg_send(CTL_HA_CHAN_CTL, &msg_info, sizeof(msg_info.task), M_WAITOK); } - return (retval); + return (0); } static void @@ -11832,12 +11810,46 @@ ctl_abort_task_set(union ctl_io *io) return (0); } +static void +ctl_i_t_nexus_loss(struct ctl_softc *softc, uint32_t initidx, + ctl_ua_type ua_type) +{ + struct ctl_lun *lun; + struct scsi_sense_data *ps; + uint32_t p, i; + + p = initidx / CTL_MAX_INIT_PER_PORT; + i = initidx % CTL_MAX_INIT_PER_PORT; + mtx_lock(&softc->ctl_lock); + STAILQ_FOREACH(lun, &softc->lun_list, links) { + mtx_lock(&lun->lun_lock); + /* Abort tasks. */ + ctl_abort_tasks_lun(lun, p, i, 1); + /* Clear CA. */ + ps = lun->pending_sense[p]; + if (ps != NULL) + ps[i].error_code = 0; + /* Clear reservation. */ + if ((lun->flags & CTL_LUN_RESERVED) && (lun->res_idx == initidx)) + lun->flags &= ~CTL_LUN_RESERVED; + /* Clear prevent media removal. */ + if (lun->prevent && ctl_is_set(lun->prevent, initidx)) { + ctl_clear_mask(lun->prevent, initidx); + lun->prevent_count--; + } + /* Clear TPC status */ + ctl_tpc_lun_clear(lun, initidx); + /* Establish UA. */ + ctl_est_ua(lun, initidx, ua_type); + mtx_unlock(&lun->lun_lock); + } + mtx_unlock(&softc->ctl_lock); +} + static int ctl_i_t_nexus_reset(union ctl_io *io) { struct ctl_softc *softc = CTL_SOFTC(io); - struct ctl_lun *lun; - struct scsi_sense_data *ps; uint32_t initidx; if (!(io->io_hdr.flags & CTL_FLAG_FROM_OTHER_SC)) { @@ -11853,24 +11865,7 @@ ctl_i_t_nexus_reset(union ctl_io *io) } initidx = ctl_get_initindex(&io->io_hdr.nexus); - mtx_lock(&softc->ctl_lock); - STAILQ_FOREACH(lun, &softc->lun_list, links) { - mtx_lock(&lun->lun_lock); - ctl_abort_tasks_lun(lun, io->io_hdr.nexus.targ_port, - io->io_hdr.nexus.initid, 1); - ps = lun->pending_sense[initidx / CTL_MAX_INIT_PER_PORT]; - if (ps != NULL) - ps[initidx % CTL_MAX_INIT_PER_PORT].error_code = 0; - if ((lun->flags & CTL_LUN_RESERVED) && (lun->res_idx == initidx)) - lun->flags &= ~CTL_LUN_RESERVED; - if (lun->prevent && ctl_is_set(lun->prevent, initidx)) { - ctl_clear_mask(lun->prevent, initidx); - lun->prevent_count--; - } - ctl_est_ua(lun, initidx, CTL_UA_I_T_NEXUS_LOSS); - mtx_unlock(&lun->lun_lock); - } - mtx_unlock(&softc->ctl_lock); + ctl_i_t_nexus_loss(softc, initidx, CTL_UA_I_T_NEXUS_LOSS); io->taskio.task_status = CTL_TASK_FUNCTION_COMPLETE; return (0); } @@ -12079,7 +12074,6 @@ ctl_query_async_event(union ctl_io *io) static void ctl_run_task(union ctl_io *io) { - struct ctl_softc *softc = CTL_SOFTC(io); int retval = 1; CTL_DEBUG_PRINT(("ctl_run_task\n")); @@ -12101,13 +12095,11 @@ ctl_run_task(union ctl_io *io) retval = ctl_i_t_nexus_reset(io); break; case CTL_TASK_LUN_RESET: - retval = ctl_lun_reset(softc, io); + retval = ctl_lun_reset(io); break; case CTL_TASK_TARGET_RESET: - retval = ctl_target_reset(softc, io, CTL_UA_TARG_RESET); - break; case CTL_TASK_BUS_RESET: - retval = ctl_bus_reset(softc, io); + retval = ctl_target_reset(io); break; case CTL_TASK_PORT_LOGIN: break; Modified: head/sys/cam/ctl/ctl_private.h ============================================================================== --- head/sys/cam/ctl/ctl_private.h Mon Feb 27 14:38:17 2017 (r314337) +++ head/sys/cam/ctl/ctl_private.h Mon Feb 27 14:59:00 2017 (r314338) @@ -528,6 +528,7 @@ int ctl_get_lba_status(struct ctl_scsiio void ctl_tpc_init(struct ctl_softc *softc); void ctl_tpc_shutdown(struct ctl_softc *softc); void ctl_tpc_lun_init(struct ctl_lun *lun); +void ctl_tpc_lun_clear(struct ctl_lun *lun, uint32_t initidx); void ctl_tpc_lun_shutdown(struct ctl_lun *lun); int ctl_inquiry_evpd_tpc(struct ctl_scsiio *ctsio, int alloc_len); int ctl_receive_copy_status_lid1(struct ctl_scsiio *ctsio); Modified: head/sys/cam/ctl/ctl_tpc.c ============================================================================== --- head/sys/cam/ctl/ctl_tpc.c Mon Feb 27 14:38:17 2017 (r314337) +++ head/sys/cam/ctl/ctl_tpc.c Mon Feb 27 14:59:00 2017 (r314338) @@ -222,6 +222,21 @@ ctl_tpc_lun_init(struct ctl_lun *lun) } void +ctl_tpc_lun_clear(struct ctl_lun *lun, uint32_t initidx) +{ + struct tpc_list *list, *tlist; + + TAILQ_FOREACH_SAFE(list, &lun->tpc_lists, links, tlist) { + if (initidx != -1 && list->init_idx != initidx) + continue; + if (!list->completed) + continue; + TAILQ_REMOVE(&lun->tpc_lists, list, links); + free(list, M_CTL); + } +} + +void ctl_tpc_lun_shutdown(struct ctl_lun *lun) { struct ctl_softc *softc = lun->ctl_softc; From owner-svn-src-all@freebsd.org Mon Feb 27 15:15:17 2017 Return-Path: Delivered-To: svn-src-all@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 282C5CF035D; Mon, 27 Feb 2017 15:15:17 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from mx1.scaleengine.net (mx1.scaleengine.net [209.51.186.6]) (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 0AD0794E; Mon, 27 Feb 2017 15:15:16 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from [10.145.2.129] (unknown [209.171.88.129]) (Authenticated sender: allanjude.freebsd@scaleengine.com) by mx1.scaleengine.net (Postfix) with ESMTPSA id 98CB613480; Mon, 27 Feb 2017 15:15:12 +0000 (UTC) Date: Mon, 27 Feb 2017 07:15:07 -0800 User-Agent: K-9 Mail for Android In-Reply-To: References: <201702271305.v1RD5HOi077424@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: svn commit: r314335 - stable/10/sys/crypto/sha2 To: Ed Schouten , Andriy Gapon , cperciva@freebsd.org CC: src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org From: Allan Jude Message-ID: X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 15:15:17 -0000 On February 27, 2017 6:01:41 AM PST, Ed Schouten wrote: >Hi Andriy, > >2017-02-27 14:05 GMT+01:00 Andriy Gapon : >> +/* Message schedule computation */ >> +#define MSCH(W, ii, i) \ >> + W[i + ii + 16] =3D s1(W[i + ii + 14]) + W[i + ii + 9] + s0(W[i >+ ii + 1]) + W[i + ii] > >[snip] > >> uint32_t W[64]; > >[snip] > >> + for (i =3D 0; i < 64; i +=3D 16) { >> + RNDr(S, W, 1, i); >> + RNDr(S, W, 2, i); >> + RNDr(S, W, 3, i); >> + RNDr(S, W, 4, i); >> + RNDr(S, W, 5, i); >> + RNDr(S, W, 6, i); >> + RNDr(S, W, 7, i); >> + RNDr(S, W, 8, i); >> + RNDr(S, W, 9, i); >> + RNDr(S, W, 10, i); >> + RNDr(S, W, 11, i); >> + RNDr(S, W, 12, i); >> + RNDr(S, W, 13, i); >> + RNDr(S, W, 14, i); >> + RNDr(S, W, 15, i); >> + >> + if (i =3D=3D 48) >> + break; >> + MSCH(W, 0, i); >> + MSCH(W, 1, i); >> + MSCH(W, 2, i); >> + MSCH(W, 3, i); >> + MSCH(W, 4, i); >> + MSCH(W, 5, i); >> + MSCH(W, 6, i); >> + MSCH(W, 7, i); >> + MSCH(W, 8, i); >> + MSCH(W, 9, i); >> + MSCH(W, 10, i); >> + MSCH(W, 11, i); >> + MSCH(W, 12, i); >> + MSCH(W, 13, i); >> + MSCH(W, 14, i); >> + MSCH(W, 15, i); >> + } > >Something interesting that I noticed some time ago when comparing the >various SHA-{256,512} implementations: there is no need to store the >entire extended message in W=2E During every iteration of this loop, >RNDr() and MSCH() never go more than 16 elements back=2E > >Say, if you were to modify MSCH() to something like this: > >> +#define MSCH(W, ii) \ >> + W[ii] +=3D s1(W[(ii + 14) % 16]) + W[(ii + 9) % 16] + s0(W[(ii >+ 1)) % 16]) > >Then it will compute the next chunk of the extended message in-place=2E >RNDr() must then be adjusted to use W[i] instead of W[i + ii], of >course=2E W then only needs to hold 16 elements instead of 64 or 80=2E Add Colin, author of the original code --=20 Allan Jude From owner-svn-src-all@freebsd.org Mon Feb 27 15:30:28 2017 Return-Path: Delivered-To: svn-src-all@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 4BD52CF08B0; Mon, 27 Feb 2017 15:30:28 +0000 (UTC) (envelope-from ae@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 1BC211CE; Mon, 27 Feb 2017 15:30:28 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RFURXQ035474; Mon, 27 Feb 2017 15:30:27 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RFUR41035473; Mon, 27 Feb 2017 15:30:27 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201702271530.v1RFUR41035473@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Mon, 27 Feb 2017 15:30:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314339 - head/sbin/setkey X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 15:30:28 -0000 Author: ae Date: Mon Feb 27 15:30:27 2017 New Revision: 314339 URL: https://svnweb.freebsd.org/changeset/base/314339 Log: Document that the size of AH ICV for HMAC-SHA2-NNN should be half of NNN bits as described in RFC4868. PR: 215978 Modified: head/sbin/setkey/setkey.8 Modified: head/sbin/setkey/setkey.8 ============================================================================== --- head/sbin/setkey/setkey.8 Mon Feb 27 14:59:00 2017 (r314338) +++ head/sbin/setkey/setkey.8 Mon Feb 27 15:30:27 2017 (r314339) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 6, 2017 +.Dd February 27, 2017 .Dt SETKEY 8 .Os .\" @@ -593,12 +593,11 @@ keyed-md5 128 ah: 96bit ICV (no documen keyed-sha1 160 ah: 96bit ICV (no document) 160 ah-old: 128bit ICV (no document) null 0 to 2048 for debugging -hmac-sha2-256 256 ah: 96bit ICV - (draft-ietf-ipsec-ciph-sha-256-00) +hmac-sha2-256 256 ah: 128bit ICV (RFC4868) 256 ah-old: 128bit ICV (no document) -hmac-sha2-384 384 ah: 96bit ICV (no document) +hmac-sha2-384 384 ah: 192bit ICV (RFC4868) 384 ah-old: 128bit ICV (no document) -hmac-sha2-512 512 ah: 96bit ICV (no document) +hmac-sha2-512 512 ah: 256bit ICV (RFC4868) 512 ah-old: 128bit ICV (no document) hmac-ripemd160 160 ah: 96bit ICV (RFC2857) ah-old: 128bit ICV (no document) From owner-svn-src-all@freebsd.org Mon Feb 27 15:31:16 2017 Return-Path: Delivered-To: svn-src-all@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 CC63ACF0926; Mon, 27 Feb 2017 15:31:16 +0000 (UTC) (envelope-from royger@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 9934A5F5; Mon, 27 Feb 2017 15:31:16 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RFVFEO036206; Mon, 27 Feb 2017 15:31:15 GMT (envelope-from royger@FreeBSD.org) Received: (from royger@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RFVFUa036205; Mon, 27 Feb 2017 15:31:15 GMT (envelope-from royger@FreeBSD.org) Message-Id: <201702271531.v1RFVFUa036205@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: royger set sender to royger@FreeBSD.org using -f From: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= Date: Mon, 27 Feb 2017 15:31:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314340 - head/sys/dev/xen/gntdev X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 15:31:16 -0000 Author: royger Date: Mon Feb 27 15:31:15 2017 New Revision: 314340 URL: https://svnweb.freebsd.org/changeset/base/314340 Log: xen/gntdev: prevent unsynchronized accesses to the map entry vm_map_lookup_done should only be called when the gntdev has finished poking at the entry. Reported by: alc Reviewed by: alc MFC after: 1 week Sponsored by: Citrix Systems R&D Modified: head/sys/dev/xen/gntdev/gntdev.c Modified: head/sys/dev/xen/gntdev/gntdev.c ============================================================================== --- head/sys/dev/xen/gntdev/gntdev.c Mon Feb 27 15:30:27 2017 (r314339) +++ head/sys/dev/xen/gntdev/gntdev.c Mon Feb 27 15:31:15 2017 (r314340) @@ -743,26 +743,34 @@ gntdev_get_offset_for_vaddr(struct ioctl vm_prot_t prot; boolean_t wired; struct gntdev_gmap *gmap; + int rc; map = &td->td_proc->p_vmspace->vm_map; error = vm_map_lookup(&map, arg->vaddr, VM_PROT_NONE, &entry, &mem, &pindex, &prot, &wired); if (error != KERN_SUCCESS) return (EINVAL); - vm_map_lookup_done(map, entry); if ((mem->type != OBJT_MGTDEVICE) || - (mem->un_pager.devp.ops != &gntdev_gmap_pg_ops)) - return (EINVAL); + (mem->un_pager.devp.ops != &gntdev_gmap_pg_ops)) { + rc = EINVAL; + goto out; + } gmap = mem->handle; if (gmap == NULL || - (entry->end - entry->start) != (gmap->count * PAGE_SIZE)) - return (EINVAL); + (entry->end - entry->start) != (gmap->count * PAGE_SIZE)) { + rc = EINVAL; + goto out; + } arg->count = gmap->count; arg->offset = gmap->file_index; - return (0); + rc = 0; + +out: + vm_map_lookup_done(map, entry); + return (rc); } /*-------------------- Grant Mapping Pager ----------------------------------*/ From owner-svn-src-all@freebsd.org Mon Feb 27 15:32:58 2017 Return-Path: Delivered-To: svn-src-all@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 06064CF0B77; Mon, 27 Feb 2017 15:32:58 +0000 (UTC) (envelope-from asomers@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 C9780D2B; Mon, 27 Feb 2017 15:32:57 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RFWuoO039327; Mon, 27 Feb 2017 15:32:56 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RFWusN039326; Mon, 27 Feb 2017 15:32:56 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201702271532.v1RFWusN039326@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 27 Feb 2017 15:32:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314341 - head/etc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 15:32:58 -0000 Author: asomers Date: Mon Feb 27 15:32:56 2017 New Revision: 314341 URL: https://svnweb.freebsd.org/changeset/base/314341 Log: Update devd.conf for ports change 421360 Ports change 421360 changed the name and UID of the postgres user Reviewed by: trasz, imp, girgen MFC after: 3 weeks Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D9746 Modified: head/etc/devd.conf Modified: head/etc/devd.conf ============================================================================== --- head/etc/devd.conf Mon Feb 27 15:31:15 2017 (r314340) +++ head/etc/devd.conf Mon Feb 27 15:32:56 2017 (r314341) @@ -312,10 +312,10 @@ notify 10 { }; # This example works around a memory leak in PostgreSQL, restarting -# it when the "user:pgsql:swap:devctl=1G" rctl(8) rule gets triggered. +# it when the "user:postgres:swap:devctl=1G" rctl(8) rule gets triggered. notify 0 { match "system" "RCTL"; - match "rule" "user:70:swap:.*"; + match "rule" "user:770:swap:.*"; action "/usr/local/etc/rc.d/postgresql restart"; }; From owner-svn-src-all@freebsd.org Mon Feb 27 15:37:40 2017 Return-Path: Delivered-To: svn-src-all@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 0766CCF0CBB; Mon, 27 Feb 2017 15:37:40 +0000 (UTC) (envelope-from novel@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 CB07D2E0; Mon, 27 Feb 2017 15:37:39 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RFbcdc039668; Mon, 27 Feb 2017 15:37:38 GMT (envelope-from novel@FreeBSD.org) Received: (from novel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RFbcsV039667; Mon, 27 Feb 2017 15:37:38 GMT (envelope-from novel@FreeBSD.org) Message-Id: <201702271537.v1RFbcsV039667@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: novel set sender to novel@FreeBSD.org using -f From: Roman Bogorodskiy Date: Mon, 27 Feb 2017 15:37:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314342 - head/usr.sbin/bhyve X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 15:37:40 -0000 Author: novel (ports committer) Date: Mon Feb 27 15:37:38 2017 New Revision: 314342 URL: https://svnweb.freebsd.org/changeset/base/314342 Log: bhyve: document virtio-console in the manpage Reviewed by: bcr, wblock, jceel Approved by: grehan Differential Revision: https://reviews.freebsd.org/D9564 Modified: head/usr.sbin/bhyve/bhyve.8 Modified: head/usr.sbin/bhyve/bhyve.8 ============================================================================== --- head/usr.sbin/bhyve/bhyve.8 Mon Feb 27 15:32:56 2017 (r314341) +++ head/usr.sbin/bhyve/bhyve.8 Mon Feb 27 15:37:38 2017 (r314342) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 9, 2016 +.Dd February 27, 2017 .Dt BHYVE 8 .Os .Sh NAME @@ -171,6 +171,10 @@ Virtio network interface. Virtio block storage interface. .It Li virtio-rnd Virtio RNG interface. +.It Li virtio-console +Virtio console interface, which exposes multiple ports +to the guest in the form of simple char devices for simple IO +between the guest and host userspaces. .It Li ahci AHCI controller attached to arbitrary devices. .It Li ahci-cd @@ -270,6 +274,31 @@ The host device must have been reserved .Va pptdev loader variable as described in .Xr vmm 4 . +.Pp +Virtio console devices: +.Bl -tag -width 10n +.It Li port1= Ns Pa /path/to/port1.sock Ns ,anotherport= Ns Pa ... +A maximum of 16 ports per device can be created. +Every port is named and corresponds to a Unix domain socket created by +.Nm . +.Nm +accepts at most one connection per port at a time. +.Pp +Limitations: +.Bl -bullet -offset 2n +.It +Due to lack of destructors in +.Nm , +sockets on the filesystem must be cleaned up manually after +.Nm +exits. +.It +There is no way to use the "console port" feature, nor the console port +resize as of now. +.It +Emergency write is advertised, but no-op as of now. +.El +.El .El .It Fl S Wire guest memory. From owner-svn-src-all@freebsd.org Mon Feb 27 16:53:53 2017 Return-Path: Delivered-To: svn-src-all@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 EF44ECF000C; Mon, 27 Feb 2017 16:53:53 +0000 (UTC) (envelope-from dchagin@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 A2363886; Mon, 27 Feb 2017 16:53:53 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RGrq9b070764; Mon, 27 Feb 2017 16:53:52 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RGrqlK070763; Mon, 27 Feb 2017 16:53:52 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201702271653.v1RGrqlK070763@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Mon, 27 Feb 2017 16:53:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314343 - head/sys/compat/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 16:53:54 -0000 Author: dchagin Date: Mon Feb 27 16:53:52 2017 New Revision: 314343 URL: https://svnweb.freebsd.org/changeset/base/314343 Log: Unify eventfd ioctl method and use it for other similar interfaces. MFC after: 1 month Modified: head/sys/compat/linux/linux_event.c Modified: head/sys/compat/linux/linux_event.c ============================================================================== --- head/sys/compat/linux/linux_event.c Mon Feb 27 15:37:38 2017 (r314342) +++ head/sys/compat/linux/linux_event.c Mon Feb 27 16:53:52 2017 (r314343) @@ -177,7 +177,7 @@ static struct fileops timerfdops = { .fo_read = timerfd_read, .fo_write = invfo_rdwr, .fo_truncate = invfo_truncate, - .fo_ioctl = invfo_ioctl, + .fo_ioctl = eventfd_ioctl, .fo_poll = timerfd_poll, .fo_kqfilter = timerfd_kqfilter, .fo_stat = timerfd_stat, @@ -760,7 +760,7 @@ eventfd_read(struct file *fp, struct uio mtx_lock(&efd->efd_lock); retry: if (efd->efd_count == 0) { - if ((efd->efd_flags & LINUX_O_NONBLOCK) != 0) { + if ((fp->f_flag & FNONBLOCK) != 0) { mtx_unlock(&efd->efd_lock); return (EAGAIN); } @@ -811,7 +811,7 @@ eventfd_write(struct file *fp, struct ui mtx_lock(&efd->efd_lock); retry: if (UINT64_MAX - efd->efd_count <= count) { - if ((efd->efd_flags & LINUX_O_NONBLOCK) != 0) { + if ((fp->f_flag & FNONBLOCK) != 0) { mtx_unlock(&efd->efd_lock); /* Do not not return the number of bytes written */ uio->uio_resid += sizeof(eventfd_t); @@ -927,19 +927,18 @@ static int eventfd_ioctl(struct file *fp, u_long cmd, void *data, struct ucred *active_cred, struct thread *td) { - struct eventfd *efd; - efd = fp->f_data; - if (fp->f_type != DTYPE_LINUXEFD || efd == NULL) + if (fp->f_data == NULL || (fp->f_type != DTYPE_LINUXEFD && + fp->f_type != DTYPE_LINUXTFD)) return (EINVAL); switch (cmd) { case FIONBIO: - if (*(int *)data) - efd->efd_flags |= LINUX_O_NONBLOCK; + if ((*(int *)data)) + atomic_set_int(&fp->f_flag, FNONBLOCK); else - efd->efd_flags &= ~LINUX_O_NONBLOCK; + atomic_clear_int(&fp->f_flag, FNONBLOCK); case FIOASYNC: return (0); default: From owner-svn-src-all@freebsd.org Mon Feb 27 16:55:10 2017 Return-Path: Delivered-To: svn-src-all@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 9D6ADCF0081; Mon, 27 Feb 2017 16:55:10 +0000 (UTC) (envelope-from dchagin@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 6A5FC9CD; Mon, 27 Feb 2017 16:55:10 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RGt9Zq070881; Mon, 27 Feb 2017 16:55:09 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RGt9Hi070880; Mon, 27 Feb 2017 16:55:09 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201702271655.v1RGt9Hi070880@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Mon, 27 Feb 2017 16:55:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314344 - head/sys/compat/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 16:55:10 -0000 Author: dchagin Date: Mon Feb 27 16:55:09 2017 New Revision: 314344 URL: https://svnweb.freebsd.org/changeset/base/314344 Log: Return EINVAL when an invalid file descriptor specified. MFC after: 1 month Modified: head/sys/compat/linux/linux_event.c Modified: head/sys/compat/linux/linux_event.c ============================================================================== --- head/sys/compat/linux/linux_event.c Mon Feb 27 16:53:52 2017 (r314343) +++ head/sys/compat/linux/linux_event.c Mon Feb 27 16:55:09 2017 (r314344) @@ -729,7 +729,7 @@ eventfd_close(struct file *fp, struct th efd = fp->f_data; if (fp->f_type != DTYPE_LINUXEFD || efd == NULL) - return (EBADF); + return (EINVAL); seldrain(&efd->efd_sel); knlist_destroy(&efd->efd_sel.si_note); @@ -751,7 +751,7 @@ eventfd_read(struct file *fp, struct uio efd = fp->f_data; if (fp->f_type != DTYPE_LINUXEFD || efd == NULL) - return (EBADF); + return (EINVAL); if (uio->uio_resid < sizeof(eventfd_t)) return (EINVAL); @@ -797,7 +797,7 @@ eventfd_write(struct file *fp, struct ui efd = fp->f_data; if (fp->f_type != DTYPE_LINUXEFD || efd == NULL) - return (EBADF); + return (EINVAL); if (uio->uio_resid < sizeof(eventfd_t)) return (EINVAL); From owner-svn-src-all@freebsd.org Mon Feb 27 17:04:37 2017 Return-Path: Delivered-To: svn-src-all@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 43020CF03DE; Mon, 27 Feb 2017 17:04:37 +0000 (UTC) (envelope-from bms@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 1048FA8; Mon, 27 Feb 2017 17:04:36 +0000 (UTC) (envelope-from bms@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RH4aFk074743; Mon, 27 Feb 2017 17:04:36 GMT (envelope-from bms@FreeBSD.org) Received: (from bms@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RH4aFT074742; Mon, 27 Feb 2017 17:04:36 GMT (envelope-from bms@FreeBSD.org) Message-Id: <201702271704.v1RH4aFT074742@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bms set sender to bms@FreeBSD.org using -f From: Bruce M Simpson Date: Mon, 27 Feb 2017 17:04:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314345 - head/sys/dev/usb/controller X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 17:04:37 -0000 Author: bms Date: Mon Feb 27 17:04:35 2017 New Revision: 314345 URL: https://svnweb.freebsd.org/changeset/base/314345 Log: Add ID for NEC uPD720202 xHCI controller. MFC after: 1 month Modified: head/sys/dev/usb/controller/xhci_pci.c Modified: head/sys/dev/usb/controller/xhci_pci.c ============================================================================== --- head/sys/dev/usb/controller/xhci_pci.c Mon Feb 27 16:55:09 2017 (r314344) +++ head/sys/dev/usb/controller/xhci_pci.c Mon Feb 27 17:04:35 2017 (r314345) @@ -100,6 +100,8 @@ xhci_pci_match(device_t self) case 0x01941033: return ("NEC uPD720200 USB 3.0 controller"); + case 0x00151912: + return ("NEC uPD720202 USB 3.0 controller"); case 0x10001b73: return ("Fresco Logic FL1000G USB 3.0 controller"); From owner-svn-src-all@freebsd.org Mon Feb 27 17:12:18 2017 Return-Path: Delivered-To: svn-src-all@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 5E01CCF07CC; Mon, 27 Feb 2017 17:12:18 +0000 (UTC) (envelope-from manu@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 2D6C4197; Mon, 27 Feb 2017 17:12:18 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RHCHGn079494; Mon, 27 Feb 2017 17:12:17 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RHCHrK079493; Mon, 27 Feb 2017 17:12:17 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201702271712.v1RHCHrK079493@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Mon, 27 Feb 2017 17:12:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314346 - head/sys/arm/allwinner/clkng X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 17:12:18 -0000 Author: manu Date: Mon Feb 27 17:12:17 2017 New Revision: 314346 URL: https://svnweb.freebsd.org/changeset/base/314346 Log: allwinner: Correct some clocks name for H3 CCU. Modified: head/sys/arm/allwinner/clkng/ccu_h3.c Modified: head/sys/arm/allwinner/clkng/ccu_h3.c ============================================================================== --- head/sys/arm/allwinner/clkng/ccu_h3.c Mon Feb 27 17:04:35 2017 (r314345) +++ head/sys/arm/allwinner/clkng/ccu_h3.c Mon Feb 27 17:12:17 2017 (r314346) @@ -147,9 +147,9 @@ static struct aw_ccung_gate h3_ccu_gates CCU_GATE(H3_CLK_BUS_SPDIF, "bus-spdif", "apb1", 0x68, 1) CCU_GATE(H3_CLK_BUS_PIO, "bus-pio", "apb1", 0x68, 5) CCU_GATE(H3_CLK_BUS_THS, "bus-ths", "apb1", 0x68, 8) - CCU_GATE(H3_CLK_BUS_I2S0, "bus-i2c0", "apb1", 0x68, 12) - CCU_GATE(H3_CLK_BUS_I2S1, "bus-i2c1", "apb1", 0x68, 13) - CCU_GATE(H3_CLK_BUS_I2S2, "bus-i2c2", "apb1", 0x68, 14) + CCU_GATE(H3_CLK_BUS_I2S0, "bus-i2s0", "apb1", 0x68, 12) + CCU_GATE(H3_CLK_BUS_I2S1, "bus-i2s1", "apb1", 0x68, 13) + CCU_GATE(H3_CLK_BUS_I2S2, "bus-i2s2", "apb1", 0x68, 14) CCU_GATE(H3_CLK_BUS_I2C0, "bus-i2c0", "apb2", 0x6c, 0) CCU_GATE(H3_CLK_BUS_I2C1, "bus-i2c1", "apb2", 0x6c, 1) From owner-svn-src-all@freebsd.org Mon Feb 27 17:18:06 2017 Return-Path: Delivered-To: svn-src-all@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 EA919CF0902; Mon, 27 Feb 2017 17:18:06 +0000 (UTC) (envelope-from avg@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 A1AAD79B; Mon, 27 Feb 2017 17:18:06 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RHI5H8079890; Mon, 27 Feb 2017 17:18:05 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RHI5wG079888; Mon, 27 Feb 2017 17:18:05 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201702271718.v1RHI5wG079888@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 27 Feb 2017 17:18:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314347 - in stable/11/sys: kern vm X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 17:18:07 -0000 Author: avg Date: Mon Feb 27 17:18:05 2017 New Revision: 314347 URL: https://svnweb.freebsd.org/changeset/base/314347 Log: MFC r313730: try to fix RACCT_RSS accounting Modified: stable/11/sys/kern/kern_racct.c stable/11/sys/vm/vm_pageout.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/kern/kern_racct.c ============================================================================== --- stable/11/sys/kern/kern_racct.c Mon Feb 27 17:12:17 2017 (r314346) +++ stable/11/sys/kern/kern_racct.c Mon Feb 27 17:18:05 2017 (r314347) @@ -1014,10 +1014,13 @@ racct_proc_exit(struct proc *p) racct_set_locked(p, RACCT_CPU, runtime, 0); racct_add_cred_locked(p->p_ucred, RACCT_PCTCPU, pct); + KASSERT(p->p_racct->r_resources[RACCT_RSS] == 0, + ("process reaped with %ju allocated for RSS\n", + p->p_racct->r_resources[RACCT_RSS])); for (i = 0; i <= RACCT_MAX; i++) { if (p->p_racct->r_resources[i] == 0) continue; - if (!RACCT_IS_RECLAIMABLE(i)) + if (!RACCT_IS_RECLAIMABLE(i)) continue; racct_set_locked(p, i, 0, 0); } Modified: stable/11/sys/vm/vm_pageout.c ============================================================================== --- stable/11/sys/vm/vm_pageout.c Mon Feb 27 17:12:17 2017 (r314346) +++ stable/11/sys/vm/vm_pageout.c Mon Feb 27 17:18:05 2017 (r314347) @@ -1806,12 +1806,14 @@ again: if (size >= limit) { vm_pageout_map_deactivate_pages( &vm->vm_map, limit); + size = vmspace_resident_count(vm); } #ifdef RACCT if (racct_enable) { rsize = IDX_TO_OFF(size); PROC_LOCK(p); - racct_set(p, RACCT_RSS, rsize); + if (p->p_state == PRS_NORMAL) + racct_set(p, RACCT_RSS, rsize); ravailable = racct_get_available(p, RACCT_RSS); PROC_UNLOCK(p); if (rsize > ravailable) { @@ -1837,7 +1839,8 @@ again: size = vmspace_resident_count(vm); rsize = IDX_TO_OFF(size); PROC_LOCK(p); - racct_set(p, RACCT_RSS, rsize); + if (p->p_state == PRS_NORMAL) + racct_set(p, RACCT_RSS, rsize); PROC_UNLOCK(p); if (rsize > ravailable) tryagain = 1; From owner-svn-src-all@freebsd.org Mon Feb 27 17:18:09 2017 Return-Path: Delivered-To: svn-src-all@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 34852CF0930; Mon, 27 Feb 2017 17:18:09 +0000 (UTC) (envelope-from avg@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 D9D8A7A3; Mon, 27 Feb 2017 17:18:08 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RHI7hC079936; Mon, 27 Feb 2017 17:18:07 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RHI7Dx079934; Mon, 27 Feb 2017 17:18:07 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201702271718.v1RHI7Dx079934@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 27 Feb 2017 17:18:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314348 - in stable/10/sys: kern vm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 17:18:09 -0000 Author: avg Date: Mon Feb 27 17:18:07 2017 New Revision: 314348 URL: https://svnweb.freebsd.org/changeset/base/314348 Log: MFC r313730: try to fix RACCT_RSS accounting Modified: stable/10/sys/kern/kern_racct.c stable/10/sys/vm/vm_pageout.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/kern_racct.c ============================================================================== --- stable/10/sys/kern/kern_racct.c Mon Feb 27 17:18:05 2017 (r314347) +++ stable/10/sys/kern/kern_racct.c Mon Feb 27 17:18:07 2017 (r314348) @@ -1008,10 +1008,13 @@ racct_proc_exit(struct proc *p) racct_set_locked(p, RACCT_CPU, runtime); racct_add_cred_locked(p->p_ucred, RACCT_PCTCPU, pct); + KASSERT(p->p_racct->r_resources[RACCT_RSS] == 0, + ("process reaped with %ju allocated for RSS\n", + p->p_racct->r_resources[RACCT_RSS])); for (i = 0; i <= RACCT_MAX; i++) { if (p->p_racct->r_resources[i] == 0) continue; - if (!RACCT_IS_RECLAIMABLE(i)) + if (!RACCT_IS_RECLAIMABLE(i)) continue; racct_set_locked(p, i, 0); } Modified: stable/10/sys/vm/vm_pageout.c ============================================================================== --- stable/10/sys/vm/vm_pageout.c Mon Feb 27 17:18:05 2017 (r314347) +++ stable/10/sys/vm/vm_pageout.c Mon Feb 27 17:18:07 2017 (r314348) @@ -1981,12 +1981,14 @@ again: if (size >= limit) { vm_pageout_map_deactivate_pages( &vm->vm_map, limit); + size = vmspace_resident_count(vm); } #ifdef RACCT if (racct_enable) { rsize = IDX_TO_OFF(size); PROC_LOCK(p); - racct_set(p, RACCT_RSS, rsize); + if (p->p_state == PRS_NORMAL) + racct_set(p, RACCT_RSS, rsize); ravailable = racct_get_available(p, RACCT_RSS); PROC_UNLOCK(p); if (rsize > ravailable) { @@ -2012,7 +2014,8 @@ again: size = vmspace_resident_count(vm); rsize = IDX_TO_OFF(size); PROC_LOCK(p); - racct_set(p, RACCT_RSS, rsize); + if (p->p_state == PRS_NORMAL) + racct_set(p, RACCT_RSS, rsize); PROC_UNLOCK(p); if (rsize > ravailable) tryagain = 1; From owner-svn-src-all@freebsd.org Mon Feb 27 17:20:45 2017 Return-Path: Delivered-To: svn-src-all@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 DDB50CF0A5A; Mon, 27 Feb 2017 17:20:45 +0000 (UTC) (envelope-from avg@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 AA7A7B28; Mon, 27 Feb 2017 17:20:45 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RHKiJE080109; Mon, 27 Feb 2017 17:20:44 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RHKiwc080108; Mon, 27 Feb 2017 17:20:44 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201702271720.v1RHKiwc080108@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 27 Feb 2017 17:20:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314349 - stable/11/sys/x86/x86 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 17:20:46 -0000 Author: avg Date: Mon Feb 27 17:20:44 2017 New Revision: 314349 URL: https://svnweb.freebsd.org/changeset/base/314349 Log: MFC r313752,r314035: mca: use time_uptime instead of ticks for CMCI throttling Modified: stable/11/sys/x86/x86/mca.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/x86/x86/mca.c ============================================================================== --- stable/11/sys/x86/x86/mca.c Mon Feb 27 17:18:07 2017 (r314348) +++ stable/11/sys/x86/x86/mca.c Mon Feb 27 17:20:44 2017 (r314349) @@ -73,7 +73,7 @@ enum scan_mode { */ struct cmc_state { int max_threshold; - int last_intr; + time_t last_intr; }; #endif @@ -533,7 +533,7 @@ cmci_update(enum scan_mode mode, int ban cc = &cmc_state[PCPU_GET(cpuid)][bank]; ctl = rdmsr(MSR_MC_CTL2(bank)); count = (rec->mr_status & MC_STATUS_COR_COUNT) >> 38; - delta = (u_int)(ticks - cc->last_intr); + delta = (u_int)(time_uptime - cc->last_intr); /* * If an interrupt was received less than cmc_throttle seconds @@ -550,7 +550,7 @@ cmci_update(enum scan_mode mode, int ban ctl |= limit; wrmsr(MSR_MC_CTL2(bank), limit); } - cc->last_intr = ticks; + cc->last_intr = time_uptime; return; } @@ -857,7 +857,7 @@ cmci_resume(int i) return; cc = &cmc_state[PCPU_GET(cpuid)][i]; - cc->last_intr = -ticks; + cc->last_intr = 0; ctl = rdmsr(MSR_MC_CTL2(i)); ctl &= ~MC_CTL2_THRESHOLD; ctl |= MC_CTL2_CMCI_EN | 1; From owner-svn-src-all@freebsd.org Mon Feb 27 17:20:51 2017 Return-Path: Delivered-To: svn-src-all@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 2BC61CF0A90; Mon, 27 Feb 2017 17:20:51 +0000 (UTC) (envelope-from avg@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 EF72AB7C; Mon, 27 Feb 2017 17:20:50 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RHKojc080160; Mon, 27 Feb 2017 17:20:50 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RHKofs080159; Mon, 27 Feb 2017 17:20:50 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201702271720.v1RHKofs080159@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 27 Feb 2017 17:20:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314350 - stable/10/sys/x86/x86 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 17:20:51 -0000 Author: avg Date: Mon Feb 27 17:20:49 2017 New Revision: 314350 URL: https://svnweb.freebsd.org/changeset/base/314350 Log: MFC r313752,r314035: mca: use time_uptime instead of ticks for CMCI throttling Modified: stable/10/sys/x86/x86/mca.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/x86/x86/mca.c ============================================================================== --- stable/10/sys/x86/x86/mca.c Mon Feb 27 17:20:44 2017 (r314349) +++ stable/10/sys/x86/x86/mca.c Mon Feb 27 17:20:49 2017 (r314350) @@ -73,7 +73,7 @@ enum scan_mode { */ struct cmc_state { int max_threshold; - int last_intr; + time_t last_intr; }; #endif @@ -535,7 +535,7 @@ cmci_update(enum scan_mode mode, int ban cc = &cmc_state[PCPU_GET(cpuid)][bank]; ctl = rdmsr(MSR_MC_CTL2(bank)); count = (rec->mr_status & MC_STATUS_COR_COUNT) >> 38; - delta = (u_int)(ticks - cc->last_intr); + delta = (u_int)(time_uptime - cc->last_intr); /* * If an interrupt was received less than cmc_throttle seconds @@ -552,7 +552,7 @@ cmci_update(enum scan_mode mode, int ban ctl |= limit; wrmsr(MSR_MC_CTL2(bank), limit); } - cc->last_intr = ticks; + cc->last_intr = time_uptime; return; } @@ -852,7 +852,7 @@ cmci_resume(int i) return; cc = &cmc_state[PCPU_GET(cpuid)][i]; - cc->last_intr = -ticks; + cc->last_intr = 0; ctl = rdmsr(MSR_MC_CTL2(i)); ctl &= ~MC_CTL2_THRESHOLD; ctl |= MC_CTL2_CMCI_EN | 1; From owner-svn-src-all@freebsd.org Mon Feb 27 17:23:43 2017 Return-Path: Delivered-To: svn-src-all@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 8877DCF0C4B; Mon, 27 Feb 2017 17:23:43 +0000 (UTC) (envelope-from avg@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 4E2FDFFA; Mon, 27 Feb 2017 17:23:43 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RHNg7F083772; Mon, 27 Feb 2017 17:23:42 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RHNgba083771; Mon, 27 Feb 2017 17:23:42 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201702271723.v1RHNgba083771@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 27 Feb 2017 17:23:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314351 - stable/10/sys/dev/jedec_ts X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 17:23:43 -0000 Author: avg Date: Mon Feb 27 17:23:42 2017 New Revision: 314351 URL: https://svnweb.freebsd.org/changeset/base/314351 Log: MFC r314037: jedec_ts: fix slave address check Modified: stable/10/sys/dev/jedec_ts/jedec_ts.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/jedec_ts/jedec_ts.c ============================================================================== --- stable/10/sys/dev/jedec_ts/jedec_ts.c Mon Feb 27 17:20:49 2017 (r314350) +++ stable/10/sys/dev/jedec_ts/jedec_ts.c Mon Feb 27 17:23:42 2017 (r314351) @@ -104,7 +104,7 @@ ts_attach(device_t dev) uint8_t addr; addr = smbus_get_addr(dev); - if ((addr & 0x30) != 0x30) { + if ((addr & 0xf0) != 0x30) { /* Up to 8 slave devices starting at 0x30. */ return (ENXIO); } From owner-svn-src-all@freebsd.org Mon Feb 27 17:24:03 2017 Return-Path: Delivered-To: svn-src-all@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 32FD4CF0CB9; Mon, 27 Feb 2017 17:24:03 +0000 (UTC) (envelope-from avg@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 F3C30183; Mon, 27 Feb 2017 17:24:02 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RHO2iv084127; Mon, 27 Feb 2017 17:24:02 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RHO27h084126; Mon, 27 Feb 2017 17:24:02 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201702271724.v1RHO27h084126@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 27 Feb 2017 17:24:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314352 - stable/11/sys/dev/jedec_ts X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 17:24:03 -0000 Author: avg Date: Mon Feb 27 17:24:01 2017 New Revision: 314352 URL: https://svnweb.freebsd.org/changeset/base/314352 Log: MFC r314037: jedec_ts: fix slave address check Modified: stable/11/sys/dev/jedec_ts/jedec_ts.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/jedec_ts/jedec_ts.c ============================================================================== --- stable/11/sys/dev/jedec_ts/jedec_ts.c Mon Feb 27 17:23:42 2017 (r314351) +++ stable/11/sys/dev/jedec_ts/jedec_ts.c Mon Feb 27 17:24:01 2017 (r314352) @@ -104,7 +104,7 @@ ts_attach(device_t dev) uint8_t addr; addr = smbus_get_addr(dev); - if ((addr & 0x30) != 0x30) { + if ((addr & 0xf0) != 0x30) { /* Up to 8 slave devices starting at 0x30. */ return (ENXIO); } From owner-svn-src-all@freebsd.org Mon Feb 27 17:25:53 2017 Return-Path: Delivered-To: svn-src-all@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 75E4DCF0D81; Mon, 27 Feb 2017 17:25:53 +0000 (UTC) (envelope-from avg@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 4293B75A; Mon, 27 Feb 2017 17:25:53 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RHPq4g084581; Mon, 27 Feb 2017 17:25:52 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RHPq2a084580; Mon, 27 Feb 2017 17:25:52 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201702271725.v1RHPq2a084580@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 27 Feb 2017 17:25:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314353 - stable/11/share/man/man4 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 17:25:53 -0000 Author: avg Date: Mon Feb 27 17:25:52 2017 New Revision: 314353 URL: https://svnweb.freebsd.org/changeset/base/314353 Log: MFC r314183: add jedec_ts.4 to the list of manual pages Modified: stable/11/share/man/man4/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man4/Makefile ============================================================================== --- stable/11/share/man/man4/Makefile Mon Feb 27 17:24:01 2017 (r314352) +++ stable/11/share/man/man4/Makefile Mon Feb 27 17:25:52 2017 (r314353) @@ -240,6 +240,7 @@ MAN= aac.4 \ ixgbe.4 \ ixl.4 \ ixlv.4 \ + jedec_ts.4 \ jme.4 \ joy.4 \ kbdmux.4 \ From owner-svn-src-all@freebsd.org Mon Feb 27 17:25:58 2017 Return-Path: Delivered-To: svn-src-all@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 372BBCF0DBC; Mon, 27 Feb 2017 17:25:58 +0000 (UTC) (envelope-from avg@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 0689C787; Mon, 27 Feb 2017 17:25:57 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RHPvWW084633; Mon, 27 Feb 2017 17:25:57 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RHPvc7084632; Mon, 27 Feb 2017 17:25:57 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201702271725.v1RHPvc7084632@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 27 Feb 2017 17:25:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314354 - stable/10/share/man/man4 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 17:25:58 -0000 Author: avg Date: Mon Feb 27 17:25:56 2017 New Revision: 314354 URL: https://svnweb.freebsd.org/changeset/base/314354 Log: MFC r314183: add jedec_ts.4 to the list of manual pages Modified: stable/10/share/man/man4/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/Makefile ============================================================================== --- stable/10/share/man/man4/Makefile Mon Feb 27 17:25:52 2017 (r314353) +++ stable/10/share/man/man4/Makefile Mon Feb 27 17:25:56 2017 (r314354) @@ -222,6 +222,7 @@ MAN= aac.4 \ ixgbe.4 \ ixl.4 \ ixlv.4 \ + jedec_ts.4 \ jme.4 \ joy.4 \ kbdmux.4 \ From owner-svn-src-all@freebsd.org Mon Feb 27 17:27:25 2017 Return-Path: Delivered-To: svn-src-all@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 29612CF0EA8; Mon, 27 Feb 2017 17:27:25 +0000 (UTC) (envelope-from avg@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 EC9CEA40; Mon, 27 Feb 2017 17:27:24 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RHROQi084790; Mon, 27 Feb 2017 17:27:24 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RHROBB084789; Mon, 27 Feb 2017 17:27:24 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201702271727.v1RHROBB084789@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 27 Feb 2017 17:27:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314355 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 17:27:25 -0000 Author: avg Date: Mon Feb 27 17:27:23 2017 New Revision: 314355 URL: https://svnweb.freebsd.org/changeset/base/314355 Log: MFC r314059: zfs: move zio_taskq_basedc under SYSDC Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Mon Feb 27 17:25:56 2017 (r314354) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Mon Feb 27 17:27:23 2017 (r314355) @@ -167,8 +167,8 @@ id_t zio_taskq_psrset_bind = PS_NONE; #endif #ifdef SYSDC boolean_t zio_taskq_sysdc = B_TRUE; /* use SDC scheduling class */ -#endif uint_t zio_taskq_basedc = 80; /* base duty cycle */ +#endif boolean_t spa_create_process = B_TRUE; /* no process ==> no sysdc */ extern int zfs_sync_pass_deferred_free; From owner-svn-src-all@freebsd.org Mon Feb 27 17:27:43 2017 Return-Path: Delivered-To: svn-src-all@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 78E42CF0EED; Mon, 27 Feb 2017 17:27:43 +0000 (UTC) (envelope-from avg@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 4756AB76; Mon, 27 Feb 2017 17:27:43 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RHRgYA084843; Mon, 27 Feb 2017 17:27:42 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RHRg4Q084842; Mon, 27 Feb 2017 17:27:42 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201702271727.v1RHRg4Q084842@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 27 Feb 2017 17:27:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314356 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 17:27:43 -0000 Author: avg Date: Mon Feb 27 17:27:42 2017 New Revision: 314356 URL: https://svnweb.freebsd.org/changeset/base/314356 Log: MFC r314059: zfs: move zio_taskq_basedc under SYSDC Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Mon Feb 27 17:27:23 2017 (r314355) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Mon Feb 27 17:27:42 2017 (r314356) @@ -168,8 +168,8 @@ id_t zio_taskq_psrset_bind = PS_NONE; #endif #ifdef SYSDC boolean_t zio_taskq_sysdc = B_TRUE; /* use SDC scheduling class */ -#endif uint_t zio_taskq_basedc = 80; /* base duty cycle */ +#endif boolean_t spa_create_process = B_TRUE; /* no process ==> no sysdc */ extern int zfs_sync_pass_deferred_free; From owner-svn-src-all@freebsd.org Mon Feb 27 17:36:32 2017 Return-Path: Delivered-To: svn-src-all@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 C0592CEF4FC; Mon, 27 Feb 2017 17:36:32 +0000 (UTC) (envelope-from avg@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 8D9D732D; Mon, 27 Feb 2017 17:36:32 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RHaV0t088929; Mon, 27 Feb 2017 17:36:31 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RHaVFl088928; Mon, 27 Feb 2017 17:36:31 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201702271736.v1RHaVFl088928@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 27 Feb 2017 17:36:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314357 - head/sys/x86/x86 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 17:36:32 -0000 Author: avg Date: Mon Feb 27 17:36:31 2017 New Revision: 314357 URL: https://svnweb.freebsd.org/changeset/base/314357 Log: fix lvt_mode: edge-triggered interrupt mode is set by clearing APIC_LVT_TM The fixed is used only to fix up buggy MPTable information and the trigger mode is probably ignored for the relevant interrupt types anyway. Still, it's better to be standards compliant and have the code do what it says it does. Discussed with: jhb MFC after: 5 days Modified: head/sys/x86/x86/local_apic.c Modified: head/sys/x86/x86/local_apic.c ============================================================================== --- head/sys/x86/x86/local_apic.c Mon Feb 27 17:27:42 2017 (r314356) +++ head/sys/x86/x86/local_apic.c Mon Feb 27 17:36:31 2017 (r314357) @@ -398,7 +398,7 @@ lvt_mode(struct lapic *la, u_int pin, ui if (!lvt->lvt_edgetrigger && bootverbose) { printf("lapic%u: Forcing LINT%u to edge trigger\n", la->la_id, pin); - value |= APIC_LVT_TM; + value &= ~APIC_LVT_TM; } /* Use a vector of 0. */ break; From owner-svn-src-all@freebsd.org Mon Feb 27 17:50:39 2017 Return-Path: Delivered-To: svn-src-all@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 78506CEF991; Mon, 27 Feb 2017 17:50:39 +0000 (UTC) (envelope-from mav@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 455C9F59; Mon, 27 Feb 2017 17:50:39 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RHoc9R093325; Mon, 27 Feb 2017 17:50:38 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RHoc7Q093324; Mon, 27 Feb 2017 17:50:38 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201702271750.v1RHoc7Q093324@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 27 Feb 2017 17:50:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314358 - head/sys/dev/firewire X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 17:50:39 -0000 Author: mav Date: Mon Feb 27 17:50:38 2017 New Revision: 314358 URL: https://svnweb.freebsd.org/changeset/base/314358 Log: Announce that sbp_targ(4) does not support initiator mode. MFC after: 1 week Modified: head/sys/dev/firewire/sbp_targ.c Modified: head/sys/dev/firewire/sbp_targ.c ============================================================================== --- head/sys/dev/firewire/sbp_targ.c Mon Feb 27 17:36:31 2017 (r314357) +++ head/sys/dev/firewire/sbp_targ.c Mon Feb 27 17:50:38 2017 (r314358) @@ -1324,7 +1324,8 @@ sbp_targ_action1(struct cam_sim *sim, un | PIT_DISCONNECT | PIT_TERM_IO; cpi->transport = XPORT_SPI; /* FIXME add XPORT_FW type to cam */ - cpi->hba_misc = PIM_NOBUSRESET | PIM_NO_6_BYTE; + cpi->hba_misc = PIM_NOINITIATOR | PIM_NOBUSRESET | + PIM_NO_6_BYTE; cpi->hba_eng_cnt = 0; cpi->max_target = 7; /* XXX */ cpi->max_lun = MAX_LUN - 1; From owner-svn-src-all@freebsd.org Mon Feb 27 17:54:02 2017 Return-Path: Delivered-To: svn-src-all@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 AD836CEFBC9; Mon, 27 Feb 2017 17:54:02 +0000 (UTC) (envelope-from oshogbo@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 61BD93DD; Mon, 27 Feb 2017 17:54:02 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RHs1pN096910; Mon, 27 Feb 2017 17:54:01 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RHs1LI096908; Mon, 27 Feb 2017 17:54:01 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201702271754.v1RHs1LI096908@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski Date: Mon, 27 Feb 2017 17:54:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314359 - in head: sbin/geom/class/part sys/geom/part X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 17:54:02 -0000 Author: oshogbo Date: Mon Feb 27 17:54:01 2017 New Revision: 314359 URL: https://svnweb.freebsd.org/changeset/base/314359 Log: Add sysctl to control auto resize of the GEOM metadata. Reviewed by: AllanJude Differential Revision: https://reviews.freebsd.org/D9603 Modified: head/sbin/geom/class/part/gpart.8 head/sys/geom/part/g_part.c Modified: head/sbin/geom/class/part/gpart.8 ============================================================================== --- head/sbin/geom/class/part/gpart.8 Mon Feb 27 17:50:38 2017 (r314358) +++ head/sbin/geom/class/part/gpart.8 Mon Feb 27 17:54:01 2017 (r314359) @@ -1146,6 +1146,18 @@ variables can be used to control the beh GEOM class. The default value is shown next to each variable. .Bl -tag -width indent +.It Va kern.geom.part.auto_resize: No 1 +This variable controls automatic resize behavior of +.Nm +GEOM class. +When this variable is enable and new size of provider is detected, the schema +metadata is resized but all changes are not saved to disk, until +.Cm gpart commit +is run to confirm changes. +This behavior is also reported with diagnostic message: +.Sy "GEOM_PART: (provider) was automatically resized." +.Sy "Use `gpart commit (provider)` to save changes or `gpart undo (provider)`" +.Sy "to revert them." .It Va kern.geom.part.check_integrity : No 1 This variable controls the behaviour of metadata integrity checks. When integrity checks are enabled, the Modified: head/sys/geom/part/g_part.c ============================================================================== --- head/sys/geom/part/g_part.c Mon Feb 27 17:50:38 2017 (r314358) +++ head/sys/geom/part/g_part.c Mon Feb 27 17:54:01 2017 (r314359) @@ -135,6 +135,10 @@ static u_int check_integrity = 1; SYSCTL_UINT(_kern_geom_part, OID_AUTO, check_integrity, CTLFLAG_RWTUN, &check_integrity, 1, "Enable integrity checking"); +static u_int auto_resize = 1; +SYSCTL_UINT(_kern_geom_part, OID_AUTO, auto_resize, + CTLFLAG_RW, &auto_resize, 1, + "Enable auto resize"); /* * The GEOM partitioning class. @@ -2095,6 +2099,9 @@ g_part_resize(struct g_consumer *cp) G_PART_TRACE((G_T_TOPOLOGY, "%s(%s)", __func__, cp->provider->name)); g_topology_assert(); + if (auto_resize == 0) + return; + table = cp->geom->softc; if (table->gpt_opened == 0) { if (g_access(cp, 1, 1, 1) != 0) From owner-svn-src-all@freebsd.org Mon Feb 27 18:00:41 2017 Return-Path: Delivered-To: svn-src-all@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 58BC3CEFCD8; Mon, 27 Feb 2017 18:00:41 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) Received: from mail-lf0-x233.google.com (mail-lf0-x233.google.com [IPv6:2a00:1450:4010:c07::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C8F5198C; Mon, 27 Feb 2017 18:00:40 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) Received: by mail-lf0-x233.google.com with SMTP id z127so36676873lfa.2; Mon, 27 Feb 2017 10:00:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=waaIPLS1EME5Pm6OPCs7tPE5YOrUHHpFaKk6z+8beMY=; b=j/8T+rKuM6DNPGhk186rc+XyIoFyc8q0WOiowhj3agIThMQF30sQ89wzzF0h23e++H RFs2GtS36EYmbahnU/7+Y4YKynokGK5AvLzyorGPMPHyFVcZXdQcCbZFMcwtKNBfraH0 vDOboUKO5SmmXsKdUeynMn7IHiXms41rOAxLyxHSu9cZf/v87gGwzqgZVg+E/Lo8bRpX yxDffXko9oh+o/9T6Fza6XOxduUqOBOZ2jqh2DrBO+mw/zqxwYwWq6JHC+0wP4SKK9Kj hkOIpFBcpdGLfaMb+r0JkbBml7xjxVLgG+w6oXJPcvOkqE/Ju+o27wjF8bRlaCvzsTgr 1XOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=waaIPLS1EME5Pm6OPCs7tPE5YOrUHHpFaKk6z+8beMY=; b=gcFk+gbUsUALEyIS0nc1fWsqhPxyYl88iBkAhOKNuSLhADuOYK3O5kR85O0OKnraMi 6wrmL0xuknIDMCwDGup6vncQX1gfWSYg/hyHneVoJao69LotxhOdeVF5FjjgOitTc2fZ nzBCfLIoZaZzZbhvWevz/r3U9tFRpBLrK+HgZ3QqiGyEMhtgXNMlYF45ouDI7e51CG7B L6E0i/aX/C13pruZJHFcdBff41thWcCUhahgr+7wyUaM7JgW2siPEMhciJYldIhfXDG4 RbEmdosUS1I2oUkdOuYoruXKtR56EoMauE2zTcmEyCmYJJS2WsABz0hADsLyGYIjH6ca UYdg== X-Gm-Message-State: AMke39ngpeiLQ5oD2864orn9QxZdNl7OAXGxQYeH8bspmtJqrkux+HnsGWmR3CB9oDs5ZQ== X-Received: by 10.25.170.1 with SMTP id t1mr5412446lfe.105.1488218438610; Mon, 27 Feb 2017 10:00:38 -0800 (PST) Received: from x-wing (89-69-123-169.dynamic.chello.pl. [89.69.123.169]) by smtp.gmail.com with ESMTPSA id t125sm2767864lff.31.2017.02.27.10.00.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Feb 2017 10:00:37 -0800 (PST) Sender: Mariusz Zaborski Date: Mon, 27 Feb 2017 20:00:37 +0100 From: Mariusz Zaborski To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314359 - in head: sbin/geom/class/part sys/geom/part Message-ID: <20170227190037.GA77465@x-wing> References: <201702271754.v1RHs1LI096908@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="nFreZHaLTZJo0R7j" Content-Disposition: inline In-Reply-To: <201702271754.v1RHs1LI096908@repo.freebsd.org> User-Agent: Mutt/1.7.2 (2016-11-26) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 18:00:41 -0000 --nFreZHaLTZJo0R7j Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Feb 27, 2017 at 05:54:01PM +0000, Mariusz Zaborski wrote: > Author: oshogbo > Date: Mon Feb 27 17:54:01 2017 > New Revision: 314359 > URL: https://svnweb.freebsd.org/changeset/base/314359 >=20 > Log: > Add sysctl to control auto resize of the GEOM metadata. > =20 > Reviewed by: AllanJude > Differential Revision: https://reviews.freebsd.org/D9603 Sorry, I think I should add: Discussed with: ae Sorry about that, Mariusz Zaborski >=20 > Modified: > head/sbin/geom/class/part/gpart.8 > head/sys/geom/part/g_part.c >=20 > Modified: head/sbin/geom/class/part/gpart.8 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sbin/geom/class/part/gpart.8 Mon Feb 27 17:50:38 2017 (r314358) > +++ head/sbin/geom/class/part/gpart.8 Mon Feb 27 17:54:01 2017 (r314359) > @@ -1146,6 +1146,18 @@ variables can be used to control the beh > GEOM class. > The default value is shown next to each variable. > .Bl -tag -width indent > +.It Va kern.geom.part.auto_resize: No 1 > +This variable controls automatic resize behavior of > +.Nm > +GEOM class. > +When this variable is enable and new size of provider is detected, the s= chema > +metadata is resized but all changes are not saved to disk, until > +.Cm gpart commit > +is run to confirm changes. > +This behavior is also reported with diagnostic message: > +.Sy "GEOM_PART: (provider) was automatically resized." > +.Sy "Use `gpart commit (provider)` to save changes or `gpart undo (provi= der)`" > +.Sy "to revert them." > .It Va kern.geom.part.check_integrity : No 1 > This variable controls the behaviour of metadata integrity checks. > When integrity checks are enabled, the >=20 > Modified: head/sys/geom/part/g_part.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/geom/part/g_part.c Mon Feb 27 17:50:38 2017 (r314358) > +++ head/sys/geom/part/g_part.c Mon Feb 27 17:54:01 2017 (r314359) > @@ -135,6 +135,10 @@ static u_int check_integrity =3D 1; > SYSCTL_UINT(_kern_geom_part, OID_AUTO, check_integrity, > CTLFLAG_RWTUN, &check_integrity, 1, > "Enable integrity checking"); > +static u_int auto_resize =3D 1; > +SYSCTL_UINT(_kern_geom_part, OID_AUTO, auto_resize, > + CTLFLAG_RW, &auto_resize, 1, > + "Enable auto resize"); > =20 > /* > * The GEOM partitioning class. > @@ -2095,6 +2099,9 @@ g_part_resize(struct g_consumer *cp) > G_PART_TRACE((G_T_TOPOLOGY, "%s(%s)", __func__, cp->provider->name)); > g_topology_assert(); > =20 > + if (auto_resize =3D=3D 0) > + return; > + > table =3D cp->geom->softc; > if (table->gpt_opened =3D=3D 0) { > if (g_access(cp, 1, 1, 1) !=3D 0) > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" --nFreZHaLTZJo0R7j Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkD1x0xkJXVVY1Gwf38KEGuLGxWQFAli0d1UACgkQ38KEGuLG xWSFrw//cVyObvZYWjDaBooj//IQ+FVBUuKgruGrghs2qKsfhYKjZfdsZZfsRou2 pepUlkH1fh1xHeYj42Pbnp2EDhqoQUJPqib8uwEKVtR80ji2AfB5UVC4fzQfMWfe lpbMiQWW0UEbKVRwoOgZLPUN/5Gp8wXTUUTM0jkATMrZ50Zxtls11315PYtTLXtz zbjK474Nhypd/M8zuEhoqgs3Rq/kT3TbgeLF5HD75mFRNsNlPkEUCYMhbkuKKg8M ObwYZMplCr72iDqSxq4eEqLu9NcEaVOllDQ2qozXoc/8OC6G9adt4vblgBwuA6qw ZH0mOS9wNwgDhJLcJJcNy+ex93E9xEjhonfexoSpSOVNLumPnEcC4ktI3WMbI/yX Z1HENRelgtqULn0cktVTSGxo6NTOXBN3LskkwIwCq+kD/gVHZiHtVeUv+uCqwbeA 1EfhJM4YpEdbPxoEpM3dW3FK6JtU5Bbr+d5wMWavquxlbhKnhi0m3iNOtZ8kxUAh lFId1uoDxCjKLkYWfgiIvekWr+9uZZlQMjxv1LeR+QKCPLBMjV72Nl8LYuTnEVXm lnkbmOPTcxvVWwBpyMo3DVzr1shEfRtE/9Yt26iJyScHfefgCoFg9PsM8okuuet2 wB0mAPdtbbj5+4IZYH2KwKTrgzK9EOyQndDq9fvcW9u4pbMQ7Hs= =BJD7 -----END PGP SIGNATURE----- --nFreZHaLTZJo0R7j-- From owner-svn-src-all@freebsd.org Mon Feb 27 19:46:28 2017 Return-Path: Delivered-To: svn-src-all@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 8A962CF0748; Mon, 27 Feb 2017 19:46:28 +0000 (UTC) (envelope-from br@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 5A699E91; Mon, 27 Feb 2017 19:46:28 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RJkR7g039410; Mon, 27 Feb 2017 19:46:27 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RJkRri039409; Mon, 27 Feb 2017 19:46:27 GMT (envelope-from br@FreeBSD.org) Message-Id: <201702271946.v1RJkRri039409@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Mon, 27 Feb 2017 19:46:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314360 - head/sys/dev/uart X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 19:46:28 -0000 Author: br Date: Mon Feb 27 19:46:27 2017 New Revision: 314360 URL: https://svnweb.freebsd.org/changeset/base/314360 Log: Revert r314212 as it break Allwinner boards. Reported by: manu Modified: head/sys/dev/uart/uart_dev_snps.c Modified: head/sys/dev/uart/uart_dev_snps.c ============================================================================== --- head/sys/dev/uart/uart_dev_snps.c Mon Feb 27 17:54:01 2017 (r314359) +++ head/sys/dev/uart/uart_dev_snps.c Mon Feb 27 19:46:27 2017 (r314360) @@ -104,7 +104,7 @@ static struct ofw_compat_data compat_dat { "snps,dw-apb-uart", (uintptr_t)&uart_snps_class }, { NULL, (uintptr_t)NULL } }; -UART_FDT_CLASS_AND_DEVICE(compat_data); +UART_FDT_CLASS(compat_data); #ifdef EXT_RESOURCES static int From owner-svn-src-all@freebsd.org Mon Feb 27 19:51:28 2017 Return-Path: Delivered-To: svn-src-all@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 79742CF07E9; Mon, 27 Feb 2017 19:51:28 +0000 (UTC) (envelope-from gonzo@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 45BE5145; Mon, 27 Feb 2017 19:51:28 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RJpReZ040294; Mon, 27 Feb 2017 19:51:27 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RJpRYY040293; Mon, 27 Feb 2017 19:51:27 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <201702271951.v1RJpRYY040293@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Mon, 27 Feb 2017 19:51:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314361 - stable/11/sys/dev/atkbdc X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 19:51:28 -0000 Author: gonzo Date: Mon Feb 27 19:51:27 2017 New Revision: 314361 URL: https://svnweb.freebsd.org/changeset/base/314361 Log: MFC r313757: [psm] Fix calculation for clickpad softbuttons at the top On laptops like the ThinkPad X240, ClickPad buttons are located at the top. The hw.psm.synaptics.softbuttons_y sysctl was supposed to allow this by setting the value to a negative one (e.g. -1700). However, the condition was wrong (double negative), and doing that placed the buttons in an unreachable area. PR: 216342 Submitted by: Greg V Modified: stable/11/sys/dev/atkbdc/psm.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/atkbdc/psm.c ============================================================================== --- stable/11/sys/dev/atkbdc/psm.c Mon Feb 27 19:46:27 2017 (r314360) +++ stable/11/sys/dev/atkbdc/psm.c Mon Feb 27 19:51:27 2017 (r314361) @@ -3194,7 +3194,7 @@ psmgestures(struct psm_softc *sc, finger if (sc->synhw.capClickPad && ms->button & MOUSE_BUTTON1DOWN) { y_ok = sc->syninfo.softbuttons_y >= 0 ? start_y < sc->syninfo.softbuttons_y : - start_y > max_y - sc->syninfo.softbuttons_y; + start_y > max_y + sc->syninfo.softbuttons_y; center_button = MOUSE_BUTTON2DOWN; center_x = sc->syninfo.softbutton2_x; From owner-svn-src-all@freebsd.org Mon Feb 27 20:08:47 2017 Return-Path: Delivered-To: svn-src-all@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 B6D66CF0E33; Mon, 27 Feb 2017 20:08:47 +0000 (UTC) (envelope-from br@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 5C3A8E72; Mon, 27 Feb 2017 20:08:47 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RK8kWW047277; Mon, 27 Feb 2017 20:08:46 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RK8g2C047240; Mon, 27 Feb 2017 20:08:42 GMT (envelope-from br@FreeBSD.org) Message-Id: <201702272008.v1RK8g2C047240@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Mon, 27 Feb 2017 20:08:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314362 - in head/sys: arm/at91 arm/cavium/cns11xx arm/nvidia arm/xscale/i8134x arm/xscale/ixp425 arm/xscale/pxa dev/uart mips/adm5120 mips/alchemy mips/atheros mips/atheros/ar531x mips... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 20:08:47 -0000 Author: br Date: Mon Feb 27 20:08:42 2017 New Revision: 314362 URL: https://svnweb.freebsd.org/changeset/base/314362 Log: Allow setting access-width for UART registers. This is required for FDT's standard "reg-io-width" property (similar to "reg-shift" property) found in many DTS files. This fixes operation on Altera Arria 10 SOC Development Kit, where standard ns8250 uart allows 4-byte access only. Reviewed by: kan, marcel Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D9785 Modified: head/sys/arm/at91/uart_bus_at91usart.c head/sys/arm/cavium/cns11xx/uart_bus_ec.c head/sys/arm/nvidia/tegra_uart.c head/sys/arm/xscale/i8134x/uart_bus_i81342.c head/sys/arm/xscale/ixp425/uart_bus_ixp425.c head/sys/arm/xscale/pxa/uart_bus_pxa.c head/sys/dev/uart/uart.h head/sys/dev/uart/uart_bus.h head/sys/dev/uart/uart_bus_acpi.c head/sys/dev/uart/uart_bus_ebus.c head/sys/dev/uart/uart_bus_fdt.c head/sys/dev/uart/uart_bus_isa.c head/sys/dev/uart/uart_bus_pccard.c head/sys/dev/uart/uart_bus_pci.c head/sys/dev/uart/uart_bus_puc.c head/sys/dev/uart/uart_bus_scc.c head/sys/dev/uart/uart_core.c head/sys/dev/uart/uart_cpu.h head/sys/dev/uart/uart_cpu_arm64.c head/sys/dev/uart/uart_cpu_fdt.c head/sys/dev/uart/uart_cpu_fdt.h head/sys/dev/uart/uart_dev_snps.c head/sys/mips/adm5120/uart_bus_adm5120.c head/sys/mips/alchemy/uart_bus_alchemy.c head/sys/mips/atheros/ar531x/uart_bus_ar5315.c head/sys/mips/atheros/uart_bus_ar71xx.c head/sys/mips/atheros/uart_bus_ar933x.c head/sys/mips/broadcom/uart_bus_chipc.c head/sys/mips/cavium/uart_bus_octeonusart.c head/sys/mips/idt/uart_bus_rc32434.c head/sys/mips/ingenic/jz4780_uart.c head/sys/mips/malta/uart_bus_maltausart.c head/sys/mips/rmi/uart_bus_xlr_iodi.c head/sys/mips/rt305x/uart_bus_rt305x.c head/sys/powerpc/psim/uart_iobus.c head/sys/sparc64/pci/sbbc.c Modified: head/sys/arm/at91/uart_bus_at91usart.c ============================================================================== --- head/sys/arm/at91/uart_bus_at91usart.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/arm/at91/uart_bus_at91usart.c Mon Feb 27 20:08:42 2017 (r314362) @@ -104,7 +104,7 @@ usart_at91_probe(device_t dev) sc->sc_class = &at91_usart_class; if (sc->sc_class->uc_rclk == 0) sc->sc_class->uc_rclk = at91_master_clock; - return (uart_bus_probe(dev, 0, 0, 0, device_get_unit(dev))); + return (uart_bus_probe(dev, 0, 0, 0, 0, device_get_unit(dev))); } Modified: head/sys/arm/cavium/cns11xx/uart_bus_ec.c ============================================================================== --- head/sys/arm/cavium/cns11xx/uart_bus_ec.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/arm/cavium/cns11xx/uart_bus_ec.c Mon Feb 27 20:08:42 2017 (r314362) @@ -69,7 +69,7 @@ uart_ec_probe(device_t dev) sc = device_get_softc(dev); sc->sc_class = &uart_ns8250_class; - status = uart_bus_probe(dev, EC_UART_REGSHIFT, EC_UART_CLOCK, 0, 0); + status = uart_bus_probe(dev, EC_UART_REGSHIFT, 0, EC_UART_CLOCK, 0, 0); return (status); } Modified: head/sys/arm/nvidia/tegra_uart.c ============================================================================== --- head/sys/arm/nvidia/tegra_uart.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/arm/nvidia/tegra_uart.c Mon Feb 27 20:08:42 2017 (r314362) @@ -216,7 +216,7 @@ tegra_uart_probe(device_t dev) device_printf(dev, "Cannot enable UART clock: %d\n", rv); return (ENXIO); } - return (uart_bus_probe(dev, shift, (int)freq, 0, 0)); + return (uart_bus_probe(dev, shift, 0, (int)freq, 0, 0)); } static int Modified: head/sys/arm/xscale/i8134x/uart_bus_i81342.c ============================================================================== --- head/sys/arm/xscale/i8134x/uart_bus_i81342.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/arm/xscale/i8134x/uart_bus_i81342.c Mon Feb 27 20:08:42 2017 (r314362) @@ -83,7 +83,7 @@ uart_i81342_probe(device_t dev) 0x40 | 0x10); bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres); - err = uart_bus_probe(dev, 2, 33334000, 0, device_get_unit(dev)); + err = uart_bus_probe(dev, 2, 0, 33334000, 0, device_get_unit(dev)); sc->sc_rxfifosz = sc->sc_txfifosz = 1; return (err); } Modified: head/sys/arm/xscale/ixp425/uart_bus_ixp425.c ============================================================================== --- head/sys/arm/xscale/ixp425/uart_bus_ixp425.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/arm/xscale/ixp425/uart_bus_ixp425.c Mon Feb 27 20:08:42 2017 (r314362) @@ -78,5 +78,5 @@ uart_ixp425_probe(device_t dev) if (bootverbose) device_printf(dev, "rclk %u\n", rclk); - return uart_bus_probe(dev, 0, rclk, 0, 0); + return uart_bus_probe(dev, 0, 0, rclk, 0, 0); } Modified: head/sys/arm/xscale/pxa/uart_bus_pxa.c ============================================================================== --- head/sys/arm/xscale/pxa/uart_bus_pxa.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/arm/xscale/pxa/uart_bus_pxa.c Mon Feb 27 20:08:42 2017 (r314362) @@ -97,7 +97,7 @@ uart_pxa_probe(device_t dev) sc = device_get_softc(dev); sc->sc_class = &uart_ns8250_class; - return(uart_bus_probe(dev, 2, PXA2X0_COM_FREQ, 0, 0)); + return(uart_bus_probe(dev, 2, 0, PXA2X0_COM_FREQ, 0, 0)); } DRIVER_MODULE(uart, pxa, uart_pxa_driver, uart_devclass, 0, 0); Modified: head/sys/dev/uart/uart.h ============================================================================== --- head/sys/dev/uart/uart.h Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/dev/uart/uart.h Mon Feb 27 20:08:42 2017 (r314362) @@ -41,14 +41,48 @@ struct uart_bas { u_int chan; u_int rclk; u_int regshft; + u_int regiowidth; }; #define uart_regofs(bas, reg) ((reg) << (bas)->regshft) +#define uart_regiowidth(bas) ((bas)->regiowidth) -#define uart_getreg(bas, reg) \ - bus_space_read_1((bas)->bst, (bas)->bsh, uart_regofs(bas, reg)) -#define uart_setreg(bas, reg, value) \ - bus_space_write_1((bas)->bst, (bas)->bsh, uart_regofs(bas, reg), value) +static inline uint32_t +uart_getreg(struct uart_bas *bas, int reg) +{ + uint32_t ret; + + switch (uart_regiowidth(bas)) { + case 4: + ret = bus_space_read_4(bas->bst, bas->bsh, uart_regofs(bas, reg)); + break; + case 2: + ret = bus_space_read_2(bas->bst, bas->bsh, uart_regofs(bas, reg)); + break; + default: + ret = bus_space_read_1(bas->bst, bas->bsh, uart_regofs(bas, reg)); + break; + } + + return (ret); +} + +static inline void +uart_setreg(struct uart_bas *bas, int reg, int value) +{ + + switch (uart_regiowidth(bas)) { + case 4: + bus_space_write_4(bas->bst, bas->bsh, uart_regofs(bas, reg), value); + break; + case 2: + bus_space_write_2(bas->bst, bas->bsh, uart_regofs(bas, reg), value); + break; + default: + bus_space_write_1(bas->bst, bas->bsh, uart_regofs(bas, reg), value); + break; + } +} /* * XXX we don't know the length of the bus space address range in use by Modified: head/sys/dev/uart/uart_bus.h ============================================================================== --- head/sys/dev/uart/uart_bus.h Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/dev/uart/uart_bus.h Mon Feb 27 20:08:42 2017 (r314362) @@ -63,6 +63,7 @@ struct uart_class { u_int uc_range; /* Bus space address range. */ u_int uc_rclk; /* Default rclk for this device. */ u_int uc_rshift; /* Default regshift for this device. */ + u_int uc_riowidth; /* Default reg io width for this device. */ }; struct uart_softc { @@ -137,7 +138,7 @@ int uart_bus_detach(device_t dev); int uart_bus_resume(device_t dev); serdev_intr_t *uart_bus_ihand(device_t dev, int ipend); int uart_bus_ipend(device_t dev); -int uart_bus_probe(device_t dev, int regshft, int rclk, int rid, int chan); +int uart_bus_probe(device_t dev, int regshft, int regiowidth, int rclk, int rid, int chan); int uart_bus_sysdev(device_t dev); void uart_sched_softih(struct uart_softc *, uint32_t); Modified: head/sys/dev/uart/uart_bus_acpi.c ============================================================================== --- head/sys/dev/uart/uart_bus_acpi.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/dev/uart/uart_bus_acpi.c Mon Feb 27 20:08:42 2017 (r314362) @@ -109,13 +109,13 @@ uart_acpi_probe(device_t dev) #if defined(__i386__) || defined(__amd64__) if (!ISA_PNP_PROBE(parent, dev, acpi_ns8250_ids)) { sc->sc_class = &uart_ns8250_class; - return (uart_bus_probe(dev, 0, 0, 0, 0)); + return (uart_bus_probe(dev, 0, 0, 0, 0, 0)); } /* Add checks for non-ns8250 IDs here. */ #elif defined(__aarch64__) if ((sc->sc_class = uart_acpi_find_device(dev)) != NULL) - return (uart_bus_probe(dev, 2, 0, 0, 0)); + return (uart_bus_probe(dev, 2, 0, 0, 0, 0)); #endif return (ENXIO); Modified: head/sys/dev/uart/uart_bus_ebus.c ============================================================================== --- head/sys/dev/uart/uart_bus_ebus.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/dev/uart/uart_bus_ebus.c Mon Feb 27 20:08:42 2017 (r314362) @@ -97,7 +97,7 @@ uart_ebus_probe(device_t dev) return (ENXIO); } sc->sc_class = &uart_ns8250_class; - return (uart_bus_probe(dev, 0, 0, 0, 0)); + return (uart_bus_probe(dev, 0, 0, 0, 0, 0)); } return (ENXIO); Modified: head/sys/dev/uart/uart_bus_fdt.c ============================================================================== --- head/sys/dev/uart/uart_bus_fdt.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/dev/uart/uart_bus_fdt.c Mon Feb 27 20:08:42 2017 (r314362) @@ -90,6 +90,15 @@ uart_fdt_get_shift(phandle_t node, pcell return (0); } +int +uart_fdt_get_io_width(phandle_t node, pcell_t *cell) +{ + + if ((OF_getencprop(node, "reg-io-width", cell, sizeof(*cell))) <= 0) + return (-1); + return (0); +} + static uintptr_t uart_fdt_find_device(device_t dev) { @@ -154,14 +163,15 @@ uart_fdt_find_by_node(phandle_t node, in int uart_cpu_fdt_probe(struct uart_class **classp, bus_space_tag_t *bst, - bus_space_handle_t *bsh, int *baud, u_int *rclk, u_int *shiftp) + bus_space_handle_t *bsh, int *baud, u_int *rclk, u_int *shiftp, + u_int *iowidthp) { const char *propnames[] = {"stdout-path", "linux,stdout-path", "stdout", "stdin-path", "stdin", NULL}; const char **name; struct uart_class *class; phandle_t node, chosen; - pcell_t br, clk, shift; + pcell_t br, clk, shift, iowidth; char *cp; int err; @@ -212,6 +222,9 @@ uart_cpu_fdt_probe(struct uart_class **c if (uart_fdt_get_shift(node, &shift) != 0) shift = uart_getregshift(class); + if (uart_fdt_get_io_width(node, &iowidth) != 0) + iowidth = uart_getregiowidth(class); + if (OF_getencprop(node, "current-speed", &br, sizeof(br)) <= 0) br = 0; @@ -223,6 +236,7 @@ uart_cpu_fdt_probe(struct uart_class **c *baud = br; *rclk = clk; *shiftp = shift; + *iowidthp = iowidth; return (0); } @@ -232,7 +246,7 @@ uart_fdt_probe(device_t dev) { struct uart_softc *sc; phandle_t node; - pcell_t clock, shift; + pcell_t clock, shift, iowidth; int err; sc = device_get_softc(dev); @@ -250,8 +264,10 @@ uart_fdt_probe(device_t dev) return (err); if (uart_fdt_get_shift(node, &shift) != 0) shift = uart_getregshift(sc->sc_class); + if (uart_fdt_get_io_width(node, &iowidth) != 0) + iowidth = uart_getregiowidth(sc->sc_class); - return (uart_bus_probe(dev, (int)shift, (int)clock, 0, 0)); + return (uart_bus_probe(dev, (int)shift, (int)iowidth, (int)clock, 0, 0)); } DRIVER_MODULE(uart, simplebus, uart_fdt_driver, uart_devclass, 0, 0); Modified: head/sys/dev/uart/uart_bus_isa.c ============================================================================== --- head/sys/dev/uart/uart_bus_isa.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/dev/uart/uart_bus_isa.c Mon Feb 27 20:08:42 2017 (r314362) @@ -165,7 +165,7 @@ uart_isa_probe(device_t dev) /* Probe PnP _and_ non-PnP ns8250 here. */ sc->sc_class = &uart_ns8250_class; - return (uart_bus_probe(dev, 0, 0, 0, 0)); + return (uart_bus_probe(dev, 0, 0, 0, 0, 0)); } DRIVER_MODULE(uart, isa, uart_isa_driver, uart_devclass, 0, 0); Modified: head/sys/dev/uart/uart_bus_pccard.c ============================================================================== --- head/sys/dev/uart/uart_bus_pccard.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/dev/uart/uart_bus_pccard.c Mon Feb 27 20:08:42 2017 (r314362) @@ -93,7 +93,7 @@ uart_pccard_attach(device_t dev) sc = device_get_softc(dev); sc->sc_class = &uart_ns8250_class; - error = uart_bus_probe(dev, 0, 0, 0, 0); + error = uart_bus_probe(dev, 0, 0, 0, 0, 0); if (error > 0) return (error); return (uart_bus_attach(dev)); Modified: head/sys/dev/uart/uart_bus_pci.c ============================================================================== --- head/sys/dev/uart/uart_bus_pci.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/dev/uart/uart_bus_pci.c Mon Feb 27 20:08:42 2017 (r314362) @@ -201,7 +201,7 @@ uart_pci_probe(device_t dev) return (ENXIO); match: - result = uart_bus_probe(dev, id->regshft, id->rclk, id->rid, 0); + result = uart_bus_probe(dev, id->regshft, 0, id->rclk, id->rid, 0); /* Bail out on error. */ if (result > 0) return (result); Modified: head/sys/dev/uart/uart_bus_puc.c ============================================================================== --- head/sys/dev/uart/uart_bus_puc.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/dev/uart/uart_bus_puc.c Mon Feb 27 20:08:42 2017 (r314362) @@ -81,7 +81,7 @@ uart_puc_probe(device_t dev) if (BUS_READ_IVAR(parent, dev, PUC_IVAR_CLOCK, &rclk)) rclk = 0; - return (uart_bus_probe(dev, 0, rclk, 0, 0)); + return (uart_bus_probe(dev, 0, 0, rclk, 0, 0)); } DRIVER_MODULE(uart, puc, uart_puc_driver, uart_devclass, 0, 0); Modified: head/sys/dev/uart/uart_bus_scc.c ============================================================================== --- head/sys/dev/uart/uart_bus_scc.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/dev/uart/uart_bus_scc.c Mon Feb 27 20:08:42 2017 (r314362) @@ -112,7 +112,7 @@ uart_scc_probe(device_t dev) BUS_READ_IVAR(parent, dev, SCC_IVAR_REGSHFT, &rs)) return (ENXIO); - return (uart_bus_probe(dev, rs, cl, 0, ch)); + return (uart_bus_probe(dev, rs, 0, cl, 0, ch)); } DRIVER_MODULE(uart, scc, uart_scc_driver, uart_devclass, 0, 0); Modified: head/sys/dev/uart/uart_core.c ============================================================================== --- head/sys/dev/uart/uart_core.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/dev/uart/uart_core.c Mon Feb 27 20:08:42 2017 (r314362) @@ -256,6 +256,12 @@ uart_getregshift(struct uart_class *uc) return ((uc != NULL) ? uc->uc_rshift : 0); } +u_int +uart_getregiowidth(struct uart_class *uc) +{ + return ((uc != NULL) ? uc->uc_riowidth : 0); +} + /* * Schedule a soft interrupt. We do this on the 0 to !0 transition * of the TTY pending interrupt status. @@ -485,7 +491,7 @@ uart_bus_sysdev(device_t dev) } int -uart_bus_probe(device_t dev, int regshft, int rclk, int rid, int chan) +uart_bus_probe(device_t dev, int regshft, int regiowidth, int rclk, int rid, int chan) { struct uart_softc *sc; struct uart_devinfo *sysdev; @@ -543,6 +549,7 @@ uart_bus_probe(device_t dev, int regshft sc->sc_bas.bst = rman_get_bustag(sc->sc_rres); sc->sc_bas.chan = chan; sc->sc_bas.regshft = regshft; + sc->sc_bas.regiowidth = regiowidth; sc->sc_bas.rclk = (rclk == 0) ? sc->sc_class->uc_rclk : rclk; SLIST_FOREACH(sysdev, &uart_sysdevs, next) { Modified: head/sys/dev/uart/uart_cpu.h ============================================================================== --- head/sys/dev/uart/uart_cpu.h Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/dev/uart/uart_cpu.h Mon Feb 27 20:08:42 2017 (r314362) @@ -80,6 +80,7 @@ const char *uart_getname(struct uart_cla struct uart_ops *uart_getops(struct uart_class *); int uart_getrange(struct uart_class *); u_int uart_getregshift(struct uart_class *); +u_int uart_getregiowidth(struct uart_class *); void uart_add_sysdev(struct uart_devinfo *); Modified: head/sys/dev/uart/uart_cpu_arm64.c ============================================================================== --- head/sys/dev/uart/uart_cpu_arm64.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/dev/uart/uart_cpu_arm64.c Mon Feb 27 20:08:42 2017 (r314362) @@ -155,7 +155,7 @@ uart_cpu_getdev(int devtype, struct uart struct uart_class *class; bus_space_handle_t bsh; bus_space_tag_t bst; - u_int rclk, shift; + u_int rclk, shift, iowidth; int br, err; /* Allow overriding the FDT using the environment. */ @@ -174,7 +174,7 @@ uart_cpu_getdev(int devtype, struct uart #ifdef FDT if (err != 0) { err = uart_cpu_fdt_probe(&class, &bst, &bsh, &br, &rclk, - &shift); + &shift, &iowidth); } #endif if (err != 0) @@ -185,6 +185,7 @@ uart_cpu_getdev(int devtype, struct uart */ di->bas.chan = 0; di->bas.regshft = shift; + di->bas.regiowidth = iowidth; di->baudrate = br; di->bas.rclk = rclk; di->ops = uart_getops(class); Modified: head/sys/dev/uart/uart_cpu_fdt.c ============================================================================== --- head/sys/dev/uart/uart_cpu_fdt.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/dev/uart/uart_cpu_fdt.c Mon Feb 27 20:08:42 2017 (r314362) @@ -76,7 +76,7 @@ uart_cpu_getdev(int devtype, struct uart struct uart_class *class; bus_space_tag_t bst; bus_space_handle_t bsh; - u_int shift, rclk; + u_int shift, iowidth, rclk; int br, err; /* Allow overriding the FDT using the environment. */ @@ -88,7 +88,7 @@ uart_cpu_getdev(int devtype, struct uart if (devtype != UART_DEV_CONSOLE) return (ENXIO); - err = uart_cpu_fdt_probe(&class, &bst, &bsh, &br, &rclk, &shift); + err = uart_cpu_fdt_probe(&class, &bst, &bsh, &br, &rclk, &shift, &iowidth); if (err != 0) return (err); @@ -97,6 +97,7 @@ uart_cpu_getdev(int devtype, struct uart */ di->bas.chan = 0; di->bas.regshft = shift; + di->bas.regiowidth = iowidth; di->baudrate = br; di->bas.rclk = rclk; di->ops = uart_getops(class); Modified: head/sys/dev/uart/uart_cpu_fdt.h ============================================================================== --- head/sys/dev/uart/uart_cpu_fdt.h Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/dev/uart/uart_cpu_fdt.h Mon Feb 27 20:08:42 2017 (r314362) @@ -51,8 +51,9 @@ SET_DECLARE(uart_fdt_class_set, struct o DATA_SET(uart_fdt_class_set, data) int uart_cpu_fdt_probe(struct uart_class **, bus_space_tag_t *, - bus_space_handle_t *, int *, u_int *, u_int *); + bus_space_handle_t *, int *, u_int *, u_int *, u_int *); int uart_fdt_get_clock(phandle_t node, pcell_t *cell); int uart_fdt_get_shift(phandle_t node, pcell_t *cell); +int uart_fdt_get_io_width(phandle_t node, pcell_t *cell); #endif /* _DEV_UART_CPU_FDT_H_ */ Modified: head/sys/dev/uart/uart_dev_snps.c ============================================================================== --- head/sys/dev/uart/uart_dev_snps.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/dev/uart/uart_dev_snps.c Mon Feb 27 20:08:42 2017 (r314362) @@ -136,7 +136,7 @@ snps_probe(device_t dev) struct snps_softc *sc; struct uart_class *uart_class; phandle_t node; - uint32_t shift, clock; + uint32_t shift, iowidth, clock; uint64_t freq; int error; #ifdef EXT_RESOURCES @@ -159,6 +159,8 @@ snps_probe(device_t dev) node = ofw_bus_get_node(dev); if (OF_getencprop(node, "reg-shift", &shift, sizeof(shift)) <= 0) shift = 0; + if (OF_getencprop(node, "reg-io-width", &iowidth, sizeof(iowidth)) <= 0) + iowidth = 1; if (OF_getencprop(node, "clock-frequency", &clock, sizeof(clock)) <= 0) clock = 0; @@ -200,7 +202,7 @@ snps_probe(device_t dev) if (bootverbose && clock == 0) device_printf(dev, "could not determine frequency\n"); - error = uart_bus_probe(dev, (int)shift, (int)clock, 0, 0); + error = uart_bus_probe(dev, (int)shift, (int)iowidth, (int)clock, 0, 0); if (error != 0) return (error); Modified: head/sys/mips/adm5120/uart_bus_adm5120.c ============================================================================== --- head/sys/mips/adm5120/uart_bus_adm5120.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/mips/adm5120/uart_bus_adm5120.c Mon Feb 27 20:08:42 2017 (r314362) @@ -87,7 +87,7 @@ uart_adm5120_probe(device_t dev) sc->sc_class = &uart_adm5120_uart_class; bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas)); - return (uart_bus_probe(dev, 0, 0, 0, 0)); + return (uart_bus_probe(dev, 0, 0, 0, 0, 0)); } DRIVER_MODULE(uart, obio, uart_adm5120_driver, uart_devclass, 0, 0); Modified: head/sys/mips/alchemy/uart_bus_alchemy.c ============================================================================== --- head/sys/mips/alchemy/uart_bus_alchemy.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/mips/alchemy/uart_bus_alchemy.c Mon Feb 27 20:08:42 2017 (r314362) @@ -81,7 +81,7 @@ uart_alchemy_probe(device_t dev) sc->sc_class = &uart_ns8250_class; bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas)); - return (uart_bus_probe(dev, 0, 0, 0, 0)); + return (uart_bus_probe(dev, 0, 0, 0, 0, 0)); } DRIVER_MODULE(uart, obio, uart_alchemy_driver, uart_devclass, 0, 0); Modified: head/sys/mips/atheros/ar531x/uart_bus_ar5315.c ============================================================================== --- head/sys/mips/atheros/ar531x/uart_bus_ar5315.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/mips/atheros/ar531x/uart_bus_ar5315.c Mon Feb 27 20:08:42 2017 (r314362) @@ -83,7 +83,7 @@ uart_ar5315_probe(device_t dev) sc->sc_bas.bst = mips_bus_space_generic; sc->sc_bas.bsh = ar531x_uart_addr() + 3; - return (uart_bus_probe(dev, 2, freq, 0, 0)); + return (uart_bus_probe(dev, 2, 0, freq, 0, 0)); } DRIVER_MODULE(uart, apb, uart_ar5315_driver, uart_devclass, 0, 0); Modified: head/sys/mips/atheros/uart_bus_ar71xx.c ============================================================================== --- head/sys/mips/atheros/uart_bus_ar71xx.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/mips/atheros/uart_bus_ar71xx.c Mon Feb 27 20:08:42 2017 (r314362) @@ -83,7 +83,7 @@ uart_ar71xx_probe(device_t dev) sc->sc_bas.bst = mips_bus_space_generic; sc->sc_bas.bsh = MIPS_PHYS_TO_KSEG1(AR71XX_UART_ADDR) + 3; - return (uart_bus_probe(dev, 2, freq, 0, 0)); + return (uart_bus_probe(dev, 2, 0, freq, 0, 0)); } #ifdef EARLY_PRINTF Modified: head/sys/mips/atheros/uart_bus_ar933x.c ============================================================================== --- head/sys/mips/atheros/uart_bus_ar933x.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/mips/atheros/uart_bus_ar933x.c Mon Feb 27 20:08:42 2017 (r314362) @@ -88,7 +88,7 @@ uart_ar933x_probe(device_t dev) sc->sc_bas.bst = mips_bus_space_generic; sc->sc_bas.bsh = MIPS_PHYS_TO_KSEG1(AR71XX_UART_ADDR); - return (uart_bus_probe(dev, 2, freq, 0, 0)); + return (uart_bus_probe(dev, 2, 0, freq, 0, 0)); } /* Modified: head/sys/mips/broadcom/uart_bus_chipc.c ============================================================================== --- head/sys/mips/broadcom/uart_bus_chipc.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/mips/broadcom/uart_bus_chipc.c Mon Feb 27 20:08:42 2017 (r314362) @@ -61,7 +61,7 @@ uart_chipc_probe(device_t dev) sc->sc_class = &uart_ns8250_class; rclk = bcm_get_uart_rclk(bcm_get_platform()); - return (uart_bus_probe(dev, 0, rclk, 0, 0)); + return (uart_bus_probe(dev, 0, 0, rclk, 0, 0)); } static device_method_t uart_chipc_methods[] = { Modified: head/sys/mips/cavium/uart_bus_octeonusart.c ============================================================================== --- head/sys/mips/cavium/uart_bus_octeonusart.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/mips/cavium/uart_bus_octeonusart.c Mon Feb 27 20:08:42 2017 (r314362) @@ -105,7 +105,7 @@ uart_octeon_probe(device_t dev) if (bus_space_map(sc->sc_bas.bst, CVMX_MIO_UARTX_RBR(0), uart_getrange(sc->sc_class), 0, &sc->sc_bas.bsh) != 0) return (ENXIO); - return (uart_bus_probe(dev, sc->sc_bas.regshft, 0, 0, unit)); + return (uart_bus_probe(dev, sc->sc_bas.regshft, 0, 0, 0, unit)); } DRIVER_MODULE(uart, obio, uart_octeon_driver, uart_devclass, 0, 0); Modified: head/sys/mips/idt/uart_bus_rc32434.c ============================================================================== --- head/sys/mips/idt/uart_bus_rc32434.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/mips/idt/uart_bus_rc32434.c Mon Feb 27 20:08:42 2017 (r314362) @@ -94,7 +94,7 @@ uart_rc32434_probe(device_t dev) sc->sc_bas.bst = mips_bus_space_generic; sc->sc_bas.bsh = MIPS_PHYS_TO_KSEG1(IDT_BASE_UART0); - return (uart_bus_probe(dev, 2, 330000000UL/2, 0, 0)); + return (uart_bus_probe(dev, 2, 0, 330000000UL/2, 0, 0)); } DRIVER_MODULE(uart, obio, uart_rc32434_driver, uart_devclass, 0, 0); Modified: head/sys/mips/ingenic/jz4780_uart.c ============================================================================== --- head/sys/mips/ingenic/jz4780_uart.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/mips/ingenic/jz4780_uart.c Mon Feb 27 20:08:42 2017 (r314362) @@ -179,7 +179,7 @@ jz4780_uart_probe(device_t dev) device_printf(dev, "got UART clock: %lld\n", freq); sc->ns8250_base.base.sc_class = (struct uart_class *)cd->ocd_data; shift = jz4780_uart_get_shift(dev); - return (uart_bus_probe(dev, shift, (int)freq, 0, 0)); + return (uart_bus_probe(dev, shift, 0, (int)freq, 0, 0)); } static int Modified: head/sys/mips/malta/uart_bus_maltausart.c ============================================================================== --- head/sys/mips/malta/uart_bus_maltausart.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/mips/malta/uart_bus_maltausart.c Mon Feb 27 20:08:42 2017 (r314362) @@ -85,7 +85,7 @@ uart_malta_probe(device_t dev) sc->sc_sysdev->bas.bsh = MIPS_PHYS_TO_KSEG1(MALTA_UART0ADR); sc->sc_bas.bst = mips_bus_space_generic; sc->sc_bas.bsh = MIPS_PHYS_TO_KSEG1(MALTA_UART0ADR); - return(uart_bus_probe(dev, 0, 0, 0, 0)); + return(uart_bus_probe(dev, 0, 0, 0, 0, 0)); } DRIVER_MODULE(uart, obio, uart_malta_driver, uart_devclass, 0, 0); Modified: head/sys/mips/rmi/uart_bus_xlr_iodi.c ============================================================================== --- head/sys/mips/rmi/uart_bus_xlr_iodi.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/mips/rmi/uart_bus_xlr_iodi.c Mon Feb 27 20:08:42 2017 (r314362) @@ -74,7 +74,7 @@ uart_iodi_probe(device_t dev) sc->sc_bas.bst = rmi_bus_space; sc->sc_bas.bsh = MIPS_PHYS_TO_KSEG1(XLR_UART0ADDR); /* regshft = 2, rclk = 66000000, rid = 0, chan = 0 */ - return (uart_bus_probe(dev, 2, 66000000, 0, 0)); + return (uart_bus_probe(dev, 2, 0, 66000000, 0, 0)); } DRIVER_MODULE(uart, iodi, uart_iodi_driver, uart_devclass, 0, 0); Modified: head/sys/mips/rt305x/uart_bus_rt305x.c ============================================================================== --- head/sys/mips/rt305x/uart_bus_rt305x.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/mips/rt305x/uart_bus_rt305x.c Mon Feb 27 20:08:42 2017 (r314362) @@ -87,7 +87,7 @@ uart_rt305x_probe(device_t dev) sc->sc_bas.bsh = MIPS_PHYS_TO_KSEG1(device_get_unit(dev)?UARTLITE_BASE:UART_BASE); - return (uart_bus_probe(dev, 2, SYSTEM_CLOCK, 0, 0)); + return (uart_bus_probe(dev, 2, 0, SYSTEM_CLOCK, 0, 0)); } DRIVER_MODULE(uart, obio, uart_rt305x_driver, uart_devclass, 0, 0); Modified: head/sys/powerpc/psim/uart_iobus.c ============================================================================== --- head/sys/powerpc/psim/uart_iobus.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/powerpc/psim/uart_iobus.c Mon Feb 27 20:08:42 2017 (r314362) @@ -81,7 +81,7 @@ uart_iobus_probe(device_t dev) sc->sc_class = &uart_ns8250_class; device_set_desc(dev, "PSIM serial port"); - return (uart_bus_probe(dev, 0, 0, 0, 0)); + return (uart_bus_probe(dev, 0, 0, 0, 0, 0)); } DRIVER_MODULE(uart, iobus, uart_iobus_driver, uart_devclass, 0, 0); Modified: head/sys/sparc64/pci/sbbc.c ============================================================================== --- head/sys/sparc64/pci/sbbc.c Mon Feb 27 19:51:27 2017 (r314361) +++ head/sys/sparc64/pci/sbbc.c Mon Feb 27 20:08:42 2017 (r314362) @@ -618,7 +618,7 @@ sbbc_uart_sbbc_probe(device_t dev) sc = device_get_softc(dev); sc->sc_class = &uart_sbbc_class; device_set_desc(dev, "Serengeti console"); - return (uart_bus_probe(dev, 0, 0, SBBC_PCI_BAR, 0)); + return (uart_bus_probe(dev, 0, 0, 0, SBBC_PCI_BAR, 0)); } /* From owner-svn-src-all@freebsd.org Mon Feb 27 20:50:22 2017 Return-Path: Delivered-To: svn-src-all@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 8B4FCCF0891; Mon, 27 Feb 2017 20:50:22 +0000 (UTC) (envelope-from gonzo@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 4DBD29AC; Mon, 27 Feb 2017 20:50:22 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RKoLKC063149; Mon, 27 Feb 2017 20:50:21 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RKoLm5063146; Mon, 27 Feb 2017 20:50:21 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <201702272050.v1RKoLm5063146@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Mon, 27 Feb 2017 20:50:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314363 - in stable/11/sys: conf dev/intel modules modules/intelspi X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 20:50:22 -0000 Author: gonzo Date: Mon Feb 27 20:50:21 2017 New Revision: 314363 URL: https://svnweb.freebsd.org/changeset/base/314363 Log: MFC r310645: [intelspi] Add SPI driver for Intel BayTrail SoC Add SPI mode (PIO-only) support for Intel Synchronous Serial Port that can be found in several Intel's products starting from PXA family. Most of implementations have slight differences in behavior and in addresses for registers subset. This driver covers only BayTrail SoC implementation for it's the only hardware I have to test it on. Driver attaches to ACPI bus only and does not have PCI or FDT support for now due to lack of hardware to test it on. "intelspi" is the best name I've managed to come up with. Linux driver name (spi-pxa2xx) does not make sense because current implementation does not support actual PXA2xx SoCs. And as far as I know there is no codename assigned to Intel SSP chip. Reviewed by: br, manu Differential Revision: https://reviews.freebsd.org/D8896 Added: stable/11/sys/dev/intel/ - copied from r310645, head/sys/dev/intel/ stable/11/sys/modules/intelspi/ - copied from r310645, head/sys/modules/intelspi/ Modified: stable/11/sys/conf/files.amd64 stable/11/sys/conf/files.i386 stable/11/sys/modules/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/conf/files.amd64 ============================================================================== --- stable/11/sys/conf/files.amd64 Mon Feb 27 20:08:42 2017 (r314362) +++ stable/11/sys/conf/files.amd64 Mon Feb 27 20:50:21 2017 (r314363) @@ -227,6 +227,7 @@ dev/if_ndis/if_ndis.c optional ndis dev/if_ndis/if_ndis_pccard.c optional ndis pccard dev/if_ndis/if_ndis_pci.c optional ndis cardbus | ndis pci dev/if_ndis/if_ndis_usb.c optional ndis usb +dev/intel/spi.c optional intelspi dev/io/iodev.c optional io dev/ioat/ioat.c optional ioat pci dev/ioat/ioat_test.c optional ioat pci Modified: stable/11/sys/conf/files.i386 ============================================================================== --- stable/11/sys/conf/files.i386 Mon Feb 27 20:08:42 2017 (r314362) +++ stable/11/sys/conf/files.i386 Mon Feb 27 20:50:21 2017 (r314363) @@ -275,6 +275,7 @@ dev/if_ndis/if_ndis.c optional ndis dev/if_ndis/if_ndis_pccard.c optional ndis pccard dev/if_ndis/if_ndis_pci.c optional ndis cardbus | ndis pci dev/if_ndis/if_ndis_usb.c optional ndis usb +dev/intel/spi.c optional intelspi dev/io/iodev.c optional io dev/ipmi/ipmi.c optional ipmi dev/ipmi/ipmi_acpi.c optional ipmi acpi Modified: stable/11/sys/modules/Makefile ============================================================================== --- stable/11/sys/modules/Makefile Mon Feb 27 20:08:42 2017 (r314362) +++ stable/11/sys/modules/Makefile Mon Feb 27 20:50:21 2017 (r314363) @@ -165,6 +165,7 @@ SUBDIR= \ ${_igb} \ ${_iir} \ imgact_binmisc \ + ${_intelspi} \ ${_io} \ ${_ioat} \ ${_ipoib} \ @@ -623,6 +624,7 @@ _hyperv= hyperv _ichwd= ichwd _ida= ida _iir= iir +_intelspi= intelspi _ipmi= ipmi _ips= ips _isci= isci From owner-svn-src-all@freebsd.org Mon Feb 27 21:12:01 2017 Return-Path: Delivered-To: svn-src-all@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 7C5EACEE3A2 for ; Mon, 27 Feb 2017 21:12:01 +0000 (UTC) (envelope-from 0100015a8166758f-6cf526bf-b390-40d6-afce-0d8a3b72b248-000000@amazonses.com) Received: from a8-13.smtp-out.amazonses.com (a8-13.smtp-out.amazonses.com [54.240.8.13]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 41C17DEA for ; Mon, 27 Feb 2017 21:12:00 +0000 (UTC) (envelope-from 0100015a8166758f-6cf526bf-b390-40d6-afce-0d8a3b72b248-000000@amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ae7m2yrxjw65l2cqdpjxuucyrvy564tn; d=tarsnap.com; t=1488229660; h=Subject:To:References:Cc:From:Message-ID:Date:MIME-Version:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=ug+jEsYIPhvDxpcreueQRI3XLnOiMpxh6gd4lc+iB7w=; b=Hzm8LrFwTDsqe/8PSZqhv8lDyfvzs2aryPFQfo3A7tN+bSfgfpbcHVMiYDtOw3uq ZW0tDXi9fgEmQN4R4VkZ+tFZmwJkXEFyI2G+b/jb3gHsG3rAu4yi1jQqTVbggQbzBao WAUA0Cvxnq+wuxF4j1CMNJl/BRJup8GZnlwkUs3Y= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=6gbrjpgwjskckoa6a5zn6fwqkn67xbtw; d=amazonses.com; t=1488229660; h=Subject:To:References:Cc:From:Message-ID:Date:MIME-Version:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=ug+jEsYIPhvDxpcreueQRI3XLnOiMpxh6gd4lc+iB7w=; b=fNRzGskv2LPOpW3Nt/K0mqQSLQXdOupx1c8R029qB6rXJlvHHlcqJkuQDqUbjbvF U3mZeZYe/Tg5TpJ37mRHIpJ99zXXLzMUieQN08dDf2xjI7bxp8eOl17Hcvo9NbJhv3G By6xatWR78zxFyVbIJGviqAhl+vGC0thcctWxAQo= Subject: Re: svn commit: r314335 - stable/10/sys/crypto/sha2 To: Ed Schouten , Andriy Gapon References: <201702271305.v1RD5HOi077424@repo.freebsd.org> Cc: src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org From: Colin Percival Message-ID: <0100015a8166758f-6cf526bf-b390-40d6-afce-0d8a3b72b248-000000@email.amazonses.com> Date: Mon, 27 Feb 2017 21:07:40 +0000 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-SES-Outgoing: 2017.02.27-54.240.8.13 Feedback-ID: 1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 21:12:01 -0000 On 02/27/17 06:01, Ed Schouten wrote: > Something interesting that I noticed some time ago when comparing the > various SHA-{256,512} implementations: there is no need to store the > entire extended message in W. During every iteration of this loop, > RNDr() and MSCH() never go more than 16 elements back. > > Say, if you were to modify MSCH() to something like this: > >> +#define MSCH(W, ii) \ >> + W[ii] += s1(W[(ii + 14) % 16]) + W[(ii + 9) % 16] + s0(W[(ii + 1)) % 16]) > > Then it will compute the next chunk of the extended message in-place. > RNDr() must then be adjusted to use W[i] instead of W[i + ii], of > course. W then only needs to hold 16 elements instead of 64 or 80. I tried this, and it was slower. The larger array avoids write-after-read accesses and results in better code being emitted due to more flexible instruction scheduling. -- Colin Percival Security Officer Emeritus, FreeBSD | The power to serve Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From owner-svn-src-all@freebsd.org Mon Feb 27 21:15:10 2017 Return-Path: Delivered-To: svn-src-all@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 D7940CEE72C for ; Mon, 27 Feb 2017 21:15:10 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: from mail-yw0-x234.google.com (mail-yw0-x234.google.com [IPv6:2607:f8b0:4002:c05::234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9E990217 for ; Mon, 27 Feb 2017 21:15:10 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: by mail-yw0-x234.google.com with SMTP id p77so45788376ywg.1 for ; Mon, 27 Feb 2017 13:15:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuxi-nl.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=UxA5OUe1MEE6lGaUZt5gLA4lUYkidGHazz68m0zWuq4=; b=YWUk5VkMvTTlk/izGK9u0ZxbVumgQgiEpdi6+sL1HmRzm+7jz3OXokbb0ixKLT3zpw /rK0R6M7iHiaqlgEUnjwLWQaxPRqDd+WNniBxEj1PmzKMc4qc8m4dZ0LKbVtNv+FubhN qsIJN0cu9AmubEnqv+Vz0fJyZcWuu2oJFxScm9kgJhFlxFDQjueUuB/duaM/DRAZzUfk 4bJXai2nMeMOLp+1dvnjIut/aRXJKHTmCESVC99Oldbjh87Is6JGz0bMXf//XSyrGReL wS8a2EASIZX4eexsbT8yPeyXP4Upw3qHL6pUYd2hSubKrLHQXwbdLJcravIWv2edgQZk 3Gbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=UxA5OUe1MEE6lGaUZt5gLA4lUYkidGHazz68m0zWuq4=; b=rXdkjjvCpw9gn/WoALrpWsLoOFnmvHiPoaRWkJaG/vloa8mBPXUsQr0owJrklmK7UL 3ouRWb4arj+RX2oI7EREnb7i6QuBDL68C+9rXYt3NhCQCIu+6CAvA2T5pDtS3BvUY5bU 7jXyBlBbpH4l0Xl4/KspXY+HIqqUFDaTn315dvYrwD4OlVWdVpdwOMDJ0sI0OFu6OYmG NjKzmJZcEcttnr9YjDSP3lau1h1X+2sYutfyS5BKpRmdRGebPJpYciFjM9QzxCQestb9 k66aOzfFEuZlWvzf0o90RA/zhxOYe3t0A5StSnYWDx1TI6dA5QwZu7j7XqlTFFZvMw2p v7sg== X-Gm-Message-State: AMke39n+dzVwlJR8bNtEEU3HVCAjcy91jJNCiBUbe+bxT0qrvC4hzgHWDO6OgRUy7TyXcUmeGuGTf3Ti1w235g== X-Received: by 10.13.225.142 with SMTP id k136mr12978092ywe.178.1488230109224; Mon, 27 Feb 2017 13:15:09 -0800 (PST) MIME-Version: 1.0 Received: by 10.129.51.198 with HTTP; Mon, 27 Feb 2017 13:14:38 -0800 (PST) In-Reply-To: <0100015a8166843e-66ad72c4-7cc0-4fc5-95eb-47b5ea66b36f-000000@email.amazonses.com> References: <201702271305.v1RD5HOi077424@repo.freebsd.org> <0100015a8166843e-66ad72c4-7cc0-4fc5-95eb-47b5ea66b36f-000000@email.amazonses.com> From: Ed Schouten Date: Mon, 27 Feb 2017 22:14:38 +0100 Message-ID: Subject: Re: svn commit: r314335 - stable/10/sys/crypto/sha2 To: Colin Percival Cc: Andriy Gapon , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 21:15:10 -0000 2017-02-27 22:07 GMT+01:00 Colin Percival : > I tried this, and it was slower. The larger array avoids write-after-read > accesses and results in better code being emitted due to more flexible > instruction scheduling. Ah, makes sense. Thanks for testing this regardless! -- Ed Schouten Nuxi, 's-Hertogenbosch, the Netherlands KvK-nr.: 62051717 From owner-svn-src-all@freebsd.org Mon Feb 27 22:50:17 2017 Return-Path: Delivered-To: svn-src-all@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 0FAA3CF0BCA; Mon, 27 Feb 2017 22:50:17 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A377D6A4; Mon, 27 Feb 2017 22:50:16 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-wm0-f49.google.com with SMTP id v186so72526173wmd.0; Mon, 27 Feb 2017 14:50:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=SzJH79dUzKMaDclymixoEcjdWQHwWIfA44Rszq3QpYM=; b=B4NHLVIVTqvOV1DClZLlc0x+EAKSEb1O3DGes1TESewZmxQ4ryBW2C4U3BZWcL+xuz w1XIJkDKp0MzSsvQ37qCaBihsIJlM+LsjyX7IEqOQjl6PzcQXbRiEnS/DvZnzutic+EH 9LxX4nz1UDJWYijlVW7lwRvD0VciPalBQ3hPrNEAWyrXlOd97QnIzjgDYDOY0aYGxkNH TomgUdh4CA83ZJiI9hjj+MCb4ciRVXcMhMaUcKij8+cyWCNJ/WP7QKLDCiWm2rsLsPGV l7zPd+YTf4tOAuJ5Isto4PrSQLfTiVvvE5y9GA02Ovu/7CynwCg0wm9sIt/+AyaQmpaT SyqQ== X-Gm-Message-State: AMke39mnWmwYD2c9YbBNyVTrRpTxPGdcrH0EwRopcXJCpqUaaLMkpdMOmeW1mFcu4Dqtaw== X-Received: by 10.28.208.201 with SMTP id h192mr13292320wmg.100.1488235336452; Mon, 27 Feb 2017 14:42:16 -0800 (PST) Received: from mail-wr0-f178.google.com (mail-wr0-f178.google.com. [209.85.128.178]) by smtp.gmail.com with ESMTPSA id w207sm142494wmw.1.2017.02.27.14.42.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Feb 2017 14:42:15 -0800 (PST) Received: by mail-wr0-f178.google.com with SMTP id g10so62060054wrg.2; Mon, 27 Feb 2017 14:42:15 -0800 (PST) X-Received: by 10.223.167.138 with SMTP id j10mr16462137wrc.178.1488235335620; Mon, 27 Feb 2017 14:42:15 -0800 (PST) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 10.80.152.82 with HTTP; Mon, 27 Feb 2017 14:42:15 -0800 (PST) In-Reply-To: <20170203062806.A2690@besplex.bde.org> References: <201701310326.v0V3QW30024375@repo.freebsd.org> <20170202184819.GP2092@kib.kiev.ua> <20170203062806.A2690@besplex.bde.org> From: Conrad Meyer Date: Mon, 27 Feb 2017 14:42:15 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r313006 - in head: sys/conf sys/libkern sys/libkern/x86 sys/sys tests/sys/kern To: Bruce Evans Cc: Konstantin Belousov , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 22:50:17 -0000 On Thu, Feb 2, 2017 at 12:29 PM, Bruce Evans wrote: > I've almost finished fixing and optimizing this. I didn't manage to fix > all the compiler pessimizations, but the result is within 5% of optimal > for buffers larger than a few K. Hi Bruce, Did you ever get to a final patch that you are satisfied with? It would be good to get this improvement into the tree. Thanks, Conrad From owner-svn-src-all@freebsd.org Mon Feb 27 22:53:27 2017 Return-Path: Delivered-To: svn-src-all@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 00CDDCF0D96; Mon, 27 Feb 2017 22:53:27 +0000 (UTC) (envelope-from gonzo@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 C1260AE3; Mon, 27 Feb 2017 22:53:26 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RMrPHY014120; Mon, 27 Feb 2017 22:53:25 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RMrPsq014119; Mon, 27 Feb 2017 22:53:25 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <201702272253.v1RMrPsq014119@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Mon, 27 Feb 2017 22:53:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314364 - stable/11/sys/dev/sdhci X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 22:53:27 -0000 Author: gonzo Date: Mon Feb 27 22:53:25 2017 New Revision: 314364 URL: https://svnweb.freebsd.org/changeset/base/314364 Log: MFC r313712: [sdhci_acpi] Add support for Bay Trail SDHC SD card slot Add ACPI device 80860F14 with _UID 3 to the list of known devices. It make SD card available on NUCs and Minnowboard. Previously added _UID 1 covered only eMMC devices. Reported by: kib@ Modified: stable/11/sys/dev/sdhci/sdhci_acpi.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/sdhci/sdhci_acpi.c ============================================================================== --- stable/11/sys/dev/sdhci/sdhci_acpi.c Mon Feb 27 20:50:21 2017 (r314363) +++ stable/11/sys/dev/sdhci/sdhci_acpi.c Mon Feb 27 22:53:25 2017 (r314364) @@ -60,9 +60,11 @@ static const struct sdhci_acpi_device { const char *desc; u_int quirks; } sdhci_acpi_devices[] = { - { "80860F14", 1, "Intel Bay Trail eMMC 4.5 Controller", + { "80860F14", 1, "Intel Bay Trail SD Host Controller", SDHCI_QUIRK_ALL_SLOTS_NON_REMOVABLE | SDHCI_QUIRK_INTEL_POWER_UP_RESET }, + { "80860F14", 3, "Intel Bay Trail SD Host Controller", + SDHCI_QUIRK_INTEL_POWER_UP_RESET }, { "80860F16", 0, "Intel Bay Trail SD Host Controller", 0 }, { NULL, 0, NULL, 0} From owner-svn-src-all@freebsd.org Mon Feb 27 23:38:53 2017 Return-Path: Delivered-To: svn-src-all@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 3CB99CF0879; Mon, 27 Feb 2017 23:38:53 +0000 (UTC) (envelope-from davidcs@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 0514282; Mon, 27 Feb 2017 23:38:52 +0000 (UTC) (envelope-from davidcs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RNcqoe029751; Mon, 27 Feb 2017 23:38:52 GMT (envelope-from davidcs@FreeBSD.org) Received: (from davidcs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RNcpZP029746; Mon, 27 Feb 2017 23:38:51 GMT (envelope-from davidcs@FreeBSD.org) Message-Id: <201702272338.v1RNcpZP029746@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: davidcs set sender to davidcs@FreeBSD.org using -f From: David C Somayajulu Date: Mon, 27 Feb 2017 23:38:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314365 - head/sys/dev/bxe X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 23:38:53 -0000 Author: davidcs Date: Mon Feb 27 23:38:51 2017 New Revision: 314365 URL: https://svnweb.freebsd.org/changeset/base/314365 Log: 1. state checks in bxe_tx_mq_start_locked() and bxe_tx_mq_start() to sync threads during interface down or detach. 2. add sysctl to set pause frame parameters 3. increase max segs for TSO packets to BXE_TSO_MAX_SEGMENTS (32) 4. add debug messages for PHY 5. HW LRO support restricted to FreeBSD versions 8.x and above. Submitted by:Vaishali.Kulkarni@cavium.com MFC after:5 days Modified: head/sys/dev/bxe/bxe.c head/sys/dev/bxe/bxe.h head/sys/dev/bxe/bxe_elink.c head/sys/dev/bxe/bxe_stats.c head/sys/dev/bxe/bxe_stats.h Modified: head/sys/dev/bxe/bxe.c ============================================================================== --- head/sys/dev/bxe/bxe.c Mon Feb 27 22:53:25 2017 (r314364) +++ head/sys/dev/bxe/bxe.c Mon Feb 27 23:38:51 2017 (r314365) @@ -27,7 +27,7 @@ #include __FBSDID("$FreeBSD$"); -#define BXE_DRIVER_VERSION "1.78.89" +#define BXE_DRIVER_VERSION "1.78.90" #include "bxe.h" #include "ecore_sp.h" @@ -496,12 +496,19 @@ static const struct { 4, STATS_FLAGS_FUNC, "mbuf_alloc_tpa"}, { STATS_OFFSET32(tx_queue_full_return), 4, STATS_FLAGS_FUNC, "tx_queue_full_return"}, + { STATS_OFFSET32(bxe_tx_mq_sc_state_failures), + 4, STATS_FLAGS_FUNC, "bxe_tx_mq_sc_state_failures"}, { STATS_OFFSET32(tx_request_link_down_failures), 4, STATS_FLAGS_FUNC, "tx_request_link_down_failures"}, { STATS_OFFSET32(bd_avail_too_less_failures), 4, STATS_FLAGS_FUNC, "bd_avail_too_less_failures"}, { STATS_OFFSET32(tx_mq_not_empty), - 4, STATS_FLAGS_FUNC, "tx_mq_not_empty"} + 4, STATS_FLAGS_FUNC, "tx_mq_not_empty"}, + { STATS_OFFSET32(nsegs_path1_errors), + 4, STATS_FLAGS_FUNC, "nsegs_path1_errors"}, + { STATS_OFFSET32(nsegs_path2_errors), + 4, STATS_FLAGS_FUNC, "nsegs_path2_errors"} + }; @@ -616,12 +623,19 @@ static const struct { 4, "mbuf_alloc_tpa"}, { Q_STATS_OFFSET32(tx_queue_full_return), 4, "tx_queue_full_return"}, + { Q_STATS_OFFSET32(bxe_tx_mq_sc_state_failures), + 4, "bxe_tx_mq_sc_state_failures"}, { Q_STATS_OFFSET32(tx_request_link_down_failures), 4, "tx_request_link_down_failures"}, { Q_STATS_OFFSET32(bd_avail_too_less_failures), 4, "bd_avail_too_less_failures"}, { Q_STATS_OFFSET32(tx_mq_not_empty), - 4, "tx_mq_not_empty"} + 4, "tx_mq_not_empty"}, + { Q_STATS_OFFSET32(nsegs_path1_errors), + 4, "nsegs_path1_errors"}, + { Q_STATS_OFFSET32(nsegs_path2_errors), + 4, "nsegs_path2_errors"} + }; @@ -692,6 +706,7 @@ static void bxe_handle_fp_tq(void *conte static int bxe_add_cdev(struct bxe_softc *sc); static void bxe_del_cdev(struct bxe_softc *sc); +int bxe_grc_dump(struct bxe_softc *sc); static int bxe_alloc_buf_rings(struct bxe_softc *sc); static void bxe_free_buf_rings(struct bxe_softc *sc); @@ -5231,12 +5246,24 @@ bxe_tx_encap(struct bxe_fastpath *fp, st fp->eth_q_stats.tx_dma_mapping_failure++; /* No sense in trying to defrag/copy chain, drop it. :( */ rc = error; - } - else { - /* if the chain is still too long then drop it */ - if (__predict_false(nsegs > BXE_MAX_SEGMENTS)) { - bus_dmamap_unload(fp->tx_mbuf_tag, tx_buf->m_map); - rc = ENODEV; + } else { + /* if the chain is still too long then drop it */ + if(m0->m_pkthdr.csum_flags & CSUM_TSO) { + /* + * in case TSO is enabled nsegs should be checked against + * BXE_TSO_MAX_SEGMENTS + */ + if (__predict_false(nsegs > BXE_TSO_MAX_SEGMENTS)) { + bus_dmamap_unload(fp->tx_mbuf_tag, tx_buf->m_map); + fp->eth_q_stats.nsegs_path1_errors++; + rc = ENODEV; + } + } else { + if (__predict_false(nsegs > BXE_MAX_SEGMENTS)) { + bus_dmamap_unload(fp->tx_mbuf_tag, tx_buf->m_map); + fp->eth_q_stats.nsegs_path2_errors++; + rc = ENODEV; + } } } } @@ -5636,6 +5663,11 @@ bxe_tx_mq_start_locked(struct bxe_softc BXE_FP_TX_LOCK_ASSERT(fp); + if (sc->state != BXE_STATE_OPEN) { + fp->eth_q_stats.bxe_tx_mq_sc_state_failures++; + return ENETDOWN; + } + if (!tx_br) { BLOGE(sc, "Multiqueue TX and no buf_ring!\n"); return (EINVAL); @@ -5757,6 +5789,11 @@ bxe_tx_mq_start(struct ifnet *ifp, fp = &sc->fp[fp_index]; + if (sc->state != BXE_STATE_OPEN) { + fp->eth_q_stats.bxe_tx_mq_sc_state_failures++; + return ENETDOWN; + } + if (BXE_FP_TX_TRYLOCK(fp)) { rc = bxe_tx_mq_start_locked(sc, ifp, fp, m); BXE_FP_TX_UNLOCK(fp); @@ -5779,7 +5816,7 @@ bxe_mq_flush(struct ifnet *ifp) for (i = 0; i < sc->num_queues; i++) { fp = &sc->fp[i]; - if (fp->state != BXE_FP_STATE_OPEN) { + if (fp->state != BXE_FP_STATE_IRQ) { BLOGD(sc, DBG_LOAD, "Not clearing fp[%02d] buf_ring (state=%d)\n", fp->index, fp->state); continue; @@ -5996,6 +6033,7 @@ bxe_free_mem(struct bxe_softc *sc) static int bxe_alloc_mem(struct bxe_softc *sc) { + int context_size; int allocated; int i; @@ -6990,7 +7028,7 @@ bxe_link_attn(struct bxe_softc *sc) /* Make sure that we are synced with the current statistics */ bxe_stats_handle(sc, STATS_EVENT_STOP); - + BLOGI(sc, "link_vars phy_flags : %x\n", sc->link_vars.phy_flags); elink_link_update(&sc->link_params, &sc->link_vars); if (sc->link_vars.link_up) { @@ -11195,7 +11233,9 @@ bxe_get_q_flags(struct bxe_softc *sc, if (if_getcapenable(sc->ifp) & IFCAP_LRO) { bxe_set_bit(ECORE_Q_FLG_TPA, &flags); +#if __FreeBSD_version >= 800000 bxe_set_bit(ECORE_Q_FLG_TPA_IPV6, &flags); +#endif } if (leading) { @@ -11632,13 +11672,13 @@ static void bxe_calc_fc_adv(struct bxe_softc *sc) { uint8_t cfg_idx = bxe_get_link_cfg_idx(sc); + + + sc->port.advertising[cfg_idx] &= ~(ADVERTISED_Asym_Pause | + ADVERTISED_Pause); + switch (sc->link_vars.ieee_fc & MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_MASK) { - case MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_NONE: - default: - sc->port.advertising[cfg_idx] &= ~(ADVERTISED_Asym_Pause | - ADVERTISED_Pause); - break; case MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH: sc->port.advertising[cfg_idx] |= (ADVERTISED_Asym_Pause | @@ -11648,6 +11688,10 @@ bxe_calc_fc_adv(struct bxe_softc *sc) case MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC: sc->port.advertising[cfg_idx] |= ADVERTISED_Asym_Pause; break; + + default: + break; + } } @@ -11729,15 +11773,17 @@ bxe_link_report_locked(struct bxe_softc return; } + ELINK_DEBUG_P2(sc, "Change in link status : cur_data = %x, last_reported_link = %x\n", + cur_data.link_report_flags, sc->last_reported_link.link_report_flags); sc->link_cnt++; + ELINK_DEBUG_P1(sc, "link status change count = %x\n", sc->link_cnt); /* report new link params and remember the state for the next time */ memcpy(&sc->last_reported_link, &cur_data, sizeof(cur_data)); if (bxe_test_bit(BXE_LINK_REPORT_LINK_DOWN, &cur_data.link_report_flags)) { if_link_state_change(sc->ifp, LINK_STATE_DOWN); - BLOGI(sc, "NIC Link is Down\n"); } else { const char *duplex; const char *flow; @@ -11745,8 +11791,10 @@ bxe_link_report_locked(struct bxe_softc if (bxe_test_and_clear_bit(BXE_LINK_REPORT_FULL_DUPLEX, &cur_data.link_report_flags)) { duplex = "full"; + ELINK_DEBUG_P0(sc, "link set to full duplex\n"); } else { duplex = "half"; + ELINK_DEBUG_P0(sc, "link set to half duplex\n"); } /* @@ -12647,6 +12695,7 @@ bxe_init_ifnet(struct bxe_softc *sc) ifmedia_set(&sc->ifmedia, (IFM_ETHER | IFM_AUTO)); sc->ifmedia.ifm_media = sc->ifmedia.ifm_cur->ifm_media; /* XXX ? */ + BLOGI(sc, "IFMEDIA flags : %x\n", sc->ifmedia.ifm_media); /* allocate the ifnet structure */ if ((ifp = if_gethandle(IFT_ETHER)) == NULL) { @@ -13995,6 +14044,8 @@ bxe_link_settings_supported(struct bxe_s BLOGD(sc, DBG_LOAD, "PHY supported 0=0x%08x 1=0x%08x\n", sc->port.supported[0], sc->port.supported[1]); + ELINK_DEBUG_P2(sc, "PHY supported 0=0x%08x 1=0x%08x\n", + sc->port.supported[0], sc->port.supported[1]); } static void @@ -14059,6 +14110,8 @@ bxe_link_settings_requested(struct bxe_s sc->link_params.req_duplex[idx] = DUPLEX_HALF; sc->port.advertising[idx] |= (ADVERTISED_10baseT_Half | ADVERTISED_TP); + ELINK_DEBUG_P1(sc, "driver requesting DUPLEX_HALF req_duplex = %x!\n", + sc->link_params.req_duplex[idx]); } else { BLOGE(sc, "Invalid NVRAM config link_config=0x%08x " "speed_cap_mask=0x%08x\n", @@ -14163,6 +14216,11 @@ bxe_link_settings_requested(struct bxe_s sc->link_params.req_duplex[idx], sc->link_params.req_flow_ctrl[idx], sc->port.advertising[idx]); + ELINK_DEBUG_P3(sc, "req_line_speed=%d req_duplex=%d " + "advertising=0x%x\n", + sc->link_params.req_line_speed[idx], + sc->link_params.req_duplex[idx], + sc->port.advertising[idx]); } } @@ -14175,11 +14233,12 @@ bxe_get_phy_info(struct bxe_softc *sc) /* shmem data already read in bxe_get_shmem_info() */ - BLOGD(sc, DBG_LOAD, "lane_config=0x%08x speed_cap_mask0=0x%08x " + ELINK_DEBUG_P3(sc, "lane_config=0x%08x speed_cap_mask0=0x%08x " "link_config0=0x%08x\n", sc->link_params.lane_config, sc->link_params.speed_cap_mask[0], sc->port.link_config[0]); + bxe_link_settings_supported(sc, sc->link_params.switch_cfg); bxe_link_settings_requested(sc); @@ -14210,6 +14269,7 @@ bxe_get_phy_info(struct bxe_softc *sc) /* get the media type */ bxe_media_detect(sc); + ELINK_DEBUG_P1(sc, "detected media type\n", sc->media); } static void @@ -15565,6 +15625,86 @@ bxe_sysctl_eth_q_stat(SYSCTL_HANDLER_ARG return (sysctl_handle_64(oidp, &value, 0, req)); } +static void bxe_force_link_reset(struct bxe_softc *sc) +{ + + bxe_acquire_phy_lock(sc); + elink_link_reset(&sc->link_params, &sc->link_vars, 1); + bxe_release_phy_lock(sc); +} + +static int +bxe_sysctl_pauseparam(SYSCTL_HANDLER_ARGS) +{ + struct bxe_softc *sc = (struct bxe_softc *)arg1;; + uint32_t cfg_idx = bxe_get_link_cfg_idx(sc); + int rc = 0; + int error; + int result; + + + error = sysctl_handle_int(oidp, &sc->bxe_pause_param, 0, req); + + if (error || !req->newptr) { + return (error); + } + if ((sc->bxe_pause_param < 0) || (sc->bxe_pause_param > 8)) { + BLOGW(sc, "invalid pause param (%d) - use intergers between 1 & 8\n",sc->bxe_pause_param); + sc->bxe_pause_param = 8; + } + + result = (sc->bxe_pause_param << PORT_FEATURE_FLOW_CONTROL_SHIFT); + + + if((result & 0x400) && !(sc->port.supported[cfg_idx] & ELINK_SUPPORTED_Autoneg)) { + BLOGW(sc, "Does not support Autoneg pause_param %d\n", sc->bxe_pause_param); + return -EINVAL; + } + + if(IS_MF(sc)) + return 0; + sc->link_params.req_flow_ctrl[cfg_idx] = ELINK_FLOW_CTRL_AUTO; + if(result & ELINK_FLOW_CTRL_RX) + sc->link_params.req_flow_ctrl[cfg_idx] |= ELINK_FLOW_CTRL_RX; + + if(result & ELINK_FLOW_CTRL_TX) + sc->link_params.req_flow_ctrl[cfg_idx] |= ELINK_FLOW_CTRL_TX; + if(sc->link_params.req_flow_ctrl[cfg_idx] == ELINK_FLOW_CTRL_AUTO) + sc->link_params.req_flow_ctrl[cfg_idx] = ELINK_FLOW_CTRL_NONE; + + if(result & 0x400) { + if (sc->link_params.req_line_speed[cfg_idx] == ELINK_SPEED_AUTO_NEG) { + sc->link_params.req_flow_ctrl[cfg_idx] = + ELINK_FLOW_CTRL_AUTO; + } + sc->link_params.req_fc_auto_adv = 0; + if (result & ELINK_FLOW_CTRL_RX) + sc->link_params.req_fc_auto_adv |= ELINK_FLOW_CTRL_RX; + + if (result & ELINK_FLOW_CTRL_TX) + sc->link_params.req_fc_auto_adv |= ELINK_FLOW_CTRL_TX; + if (!sc->link_params.req_fc_auto_adv) + sc->link_params.req_fc_auto_adv |= ELINK_FLOW_CTRL_NONE; + } + if (IS_PF(sc)) { + if (sc->link_vars.link_up) { + bxe_stats_handle(sc, STATS_EVENT_STOP); + } + if (if_getdrvflags(sc->ifp) & IFF_DRV_RUNNING) { + bxe_force_link_reset(sc); + bxe_acquire_phy_lock(sc); + + rc = elink_phy_init(&sc->link_params, &sc->link_vars); + + bxe_release_phy_lock(sc); + + bxe_calc_fc_adv(sc); + } + } + return rc; +} + + static void bxe_add_sysctls(struct bxe_softc *sc) { @@ -15665,6 +15805,12 @@ bxe_add_sysctls(struct bxe_softc *sc) CTLFLAG_RW, &sc->rx_budget, 0, "rx processing budget"); + SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "pause_param", + CTLTYPE_UINT | CTLFLAG_RW, sc, 0, + bxe_sysctl_pauseparam, "IU", + "need pause frames- DEF:0/TX:1/RX:2/BOTH:3/AUTO:4/AUTOTX:5/AUTORX:6/AUTORXTX:7/NONE:8"); + + SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "state", CTLTYPE_UINT | CTLFLAG_RW, sc, 0, bxe_sysctl_state, "IU", "dump driver state"); @@ -17999,6 +18145,7 @@ bxe_reset_port(struct bxe_softc *sc) int port = SC_PORT(sc); uint32_t val; + ELINK_DEBUG_P0(sc, "bxe_reset_port called\n"); /* reset physical Link */ bxe_link_reset(sc); @@ -18501,8 +18648,6 @@ bxe_grc_dump(struct bxe_softc *sc) uint32_t reg_val; uint32_t reg_addr; uint32_t cmd_offset; - int context_size; - int allocated; struct ecore_ilt *ilt = SC_ILT(sc); struct bxe_fastpath *fp; struct ilt_client_info *ilt_cli; @@ -18597,67 +18742,80 @@ bxe_grc_dump(struct bxe_softc *sc) bxe_pretend_func(sc, SC_ABS_FUNC(sc)); - context_size = (sizeof(union cdu_context) * BXE_L2_CID_COUNT(sc)); - for (i = 0, allocated = 0; allocated < context_size; i++) { - - BLOGI(sc, "cdu_context i %d paddr %#jx vaddr %p size 0x%zx\n", i, - (uintmax_t)sc->context[i].vcxt_dma.paddr, - sc->context[i].vcxt_dma.vaddr, - sc->context[i].size); - allocated += sc->context[i].size; - } - BLOGI(sc, "fw stats start_paddr %#jx end_paddr %#jx vaddr %p size 0x%x\n", - (uintmax_t)sc->fw_stats_req_mapping, - (uintmax_t)sc->fw_stats_data_mapping, - sc->fw_stats_req, (sc->fw_stats_req_size + sc->fw_stats_data_size)); - BLOGI(sc, "def_status_block paddr %p vaddr %p size 0x%zx\n", - (void *)sc->def_sb_dma.paddr, sc->def_sb, - sizeof(struct host_sp_status_block)); - BLOGI(sc, "event_queue paddr %#jx vaddr %p size 0x%x\n", - (uintmax_t)sc->eq_dma.paddr, sc->eq_dma.vaddr, BCM_PAGE_SIZE); - BLOGI(sc, "slow path paddr %#jx vaddr %p size 0x%zx\n", - (uintmax_t)sc->sp_dma.paddr, sc->sp_dma.vaddr, - sizeof(struct bxe_slowpath)); - BLOGI(sc, "slow path queue paddr %#jx vaddr %p size 0x%x\n", - (uintmax_t)sc->spq_dma.paddr, sc->spq_dma.vaddr, BCM_PAGE_SIZE); - BLOGI(sc, "fw_buf paddr %#jx vaddr %p size 0x%x\n", - (uintmax_t)sc->gz_buf_dma.paddr, sc->gz_buf_dma.vaddr, - FW_BUF_SIZE); - for (i = 0; i < sc->num_queues; i++) { - fp = &sc->fp[i]; - BLOGI(sc, "FP status block fp %d paddr %#jx vaddr %p size 0x%zx\n", i, - (uintmax_t)fp->sb_dma.paddr, fp->sb_dma.vaddr, - sizeof(union bxe_host_hc_status_block)); - BLOGI(sc, "TX BD CHAIN fp %d paddr %#jx vaddr %p size 0x%x\n", i, - (uintmax_t)fp->tx_dma.paddr, fp->tx_dma.vaddr, - (BCM_PAGE_SIZE * TX_BD_NUM_PAGES)); - BLOGI(sc, "RX BD CHAIN fp %d paddr %#jx vaddr %p size 0x%x\n", i, - (uintmax_t)fp->rx_dma.paddr, fp->rx_dma.vaddr, - (BCM_PAGE_SIZE * RX_BD_NUM_PAGES)); - BLOGI(sc, "RX RCQ CHAIN fp %d paddr %#jx vaddr %p size 0x%zx\n", i, - (uintmax_t)fp->rcq_dma.paddr, fp->rcq_dma.vaddr, - (BCM_PAGE_SIZE * RCQ_NUM_PAGES)); - BLOGI(sc, "RX SGE CHAIN fp %d paddr %#jx vaddr %p size 0x%x\n", i, - (uintmax_t)fp->rx_sge_dma.paddr, fp->rx_sge_dma.vaddr, - (BCM_PAGE_SIZE * RX_SGE_NUM_PAGES)); - } - - ilt_cli = &ilt->clients[1]; - for (i = ilt_cli->start; i <= ilt_cli->end; i++) { - BLOGI(sc, "ECORE_ILT paddr %#jx vaddr %p size 0x%x\n", - (uintmax_t)(((struct bxe_dma *)((&ilt->lines[i])->page))->paddr), - ((struct bxe_dma *)((&ilt->lines[i])->page))->vaddr, BCM_PAGE_SIZE); - } - - - cmd_offset = DMAE_REG_CMD_MEM; - for (i = 0; i < 224; i++) { - reg_addr = (cmd_offset +(i * 4)); - reg_val = REG_RD(sc, reg_addr); - BLOGI(sc, "DMAE_REG_CMD_MEM i=%d reg_addr 0x%x reg_val 0x%08x\n",i, - reg_addr, reg_val); - } + if(sc->state == BXE_STATE_OPEN) { + if(sc->fw_stats_req != NULL) { + BLOGI(sc, "fw stats start_paddr %#jx end_paddr %#jx vaddr %p size 0x%x\n", + (uintmax_t)sc->fw_stats_req_mapping, + (uintmax_t)sc->fw_stats_data_mapping, + sc->fw_stats_req, (sc->fw_stats_req_size + sc->fw_stats_data_size)); + } + if(sc->def_sb != NULL) { + BLOGI(sc, "def_status_block paddr %p vaddr %p size 0x%zx\n", + (void *)sc->def_sb_dma.paddr, sc->def_sb, + sizeof(struct host_sp_status_block)); + } + if(sc->eq_dma.vaddr != NULL) { + BLOGI(sc, "event_queue paddr %#jx vaddr %p size 0x%x\n", + (uintmax_t)sc->eq_dma.paddr, sc->eq_dma.vaddr, BCM_PAGE_SIZE); + } + if(sc->sp_dma.vaddr != NULL) { + BLOGI(sc, "slow path paddr %#jx vaddr %p size 0x%zx\n", + (uintmax_t)sc->sp_dma.paddr, sc->sp_dma.vaddr, + sizeof(struct bxe_slowpath)); + } + if(sc->spq_dma.vaddr != NULL) { + BLOGI(sc, "slow path queue paddr %#jx vaddr %p size 0x%x\n", + (uintmax_t)sc->spq_dma.paddr, sc->spq_dma.vaddr, BCM_PAGE_SIZE); + } + if(sc->gz_buf_dma.vaddr != NULL) { + BLOGI(sc, "fw_buf paddr %#jx vaddr %p size 0x%x\n", + (uintmax_t)sc->gz_buf_dma.paddr, sc->gz_buf_dma.vaddr, + FW_BUF_SIZE); + } + for (i = 0; i < sc->num_queues; i++) { + fp = &sc->fp[i]; + if(fp->sb_dma.vaddr != NULL && fp->tx_dma.vaddr != NULL && + fp->rx_dma.vaddr != NULL && fp->rcq_dma.vaddr != NULL && + fp->rx_sge_dma.vaddr != NULL) { + + BLOGI(sc, "FP status block fp %d paddr %#jx vaddr %p size 0x%zx\n", i, + (uintmax_t)fp->sb_dma.paddr, fp->sb_dma.vaddr, + sizeof(union bxe_host_hc_status_block)); + BLOGI(sc, "TX BD CHAIN fp %d paddr %#jx vaddr %p size 0x%x\n", i, + (uintmax_t)fp->tx_dma.paddr, fp->tx_dma.vaddr, + (BCM_PAGE_SIZE * TX_BD_NUM_PAGES)); + BLOGI(sc, "RX BD CHAIN fp %d paddr %#jx vaddr %p size 0x%x\n", i, + (uintmax_t)fp->rx_dma.paddr, fp->rx_dma.vaddr, + (BCM_PAGE_SIZE * RX_BD_NUM_PAGES)); + BLOGI(sc, "RX RCQ CHAIN fp %d paddr %#jx vaddr %p size 0x%zx\n", i, + (uintmax_t)fp->rcq_dma.paddr, fp->rcq_dma.vaddr, + (BCM_PAGE_SIZE * RCQ_NUM_PAGES)); + BLOGI(sc, "RX SGE CHAIN fp %d paddr %#jx vaddr %p size 0x%x\n", i, + (uintmax_t)fp->rx_sge_dma.paddr, fp->rx_sge_dma.vaddr, + (BCM_PAGE_SIZE * RX_SGE_NUM_PAGES)); + } + } + if(ilt != NULL ) { + ilt_cli = &ilt->clients[1]; + if(ilt->lines != NULL) { + for (i = ilt_cli->start; i <= ilt_cli->end; i++) { + BLOGI(sc, "ECORE_ILT paddr %#jx vaddr %p size 0x%x\n", + (uintmax_t)(((struct bxe_dma *)((&ilt->lines[i])->page))->paddr), + ((struct bxe_dma *)((&ilt->lines[i])->page))->vaddr, BCM_PAGE_SIZE); + } + } + } + + + cmd_offset = DMAE_REG_CMD_MEM; + for (i = 0; i < 224; i++) { + reg_addr = (cmd_offset +(i * 4)); + reg_val = REG_RD(sc, reg_addr); + BLOGI(sc, "DMAE_REG_CMD_MEM i=%d reg_addr 0x%x reg_val 0x%08x\n",i, + reg_addr, reg_val); + } + } BLOGI(sc, "Collection of grcdump done\n"); sc->grcdump_done = 1; Modified: head/sys/dev/bxe/bxe.h ============================================================================== --- head/sys/dev/bxe/bxe.h Mon Feb 27 22:53:25 2017 (r314364) +++ head/sys/dev/bxe/bxe.h Mon Feb 27 23:38:51 2017 (r314365) @@ -1335,7 +1335,7 @@ struct bxe_softc { struct ifmedia ifmedia; /* network interface media structure */ int media; - int state; /* device state */ + volatile int state; /* device state */ #define BXE_STATE_CLOSED 0x0000 #define BXE_STATE_OPENING_WAITING_LOAD 0x1000 #define BXE_STATE_OPENING_WAITING_PORT 0x2000 @@ -1794,7 +1794,7 @@ struct bxe_softc { unsigned int trigger_grcdump; unsigned int grcdump_done; unsigned int grcdump_started; - + int bxe_pause_param; void *eeprom; }; /* struct bxe_softc */ @@ -2300,7 +2300,6 @@ void bxe_dump_mem(struct bxe_softc *sc, uint8_t *mem, uint32_t len); void bxe_dump_mbuf_data(struct bxe_softc *sc, char *pTag, struct mbuf *m, uint8_t contents); -extern int bxe_grc_dump(struct bxe_softc *sc); #if __FreeBSD_version >= 800000 #if (__FreeBSD_version >= 1001513 && __FreeBSD_version < 1100000) ||\ Modified: head/sys/dev/bxe/bxe_elink.c ============================================================================== --- head/sys/dev/bxe/bxe_elink.c Mon Feb 27 22:53:25 2017 (r314364) +++ head/sys/dev/bxe/bxe_elink.c Mon Feb 27 23:38:51 2017 (r314365) @@ -4333,6 +4333,7 @@ static void elink_pause_resolve(struct e * although we advertised both, need to enable * RX only. */ + if (params->req_fc_auto_adv == ELINK_FLOW_CTRL_BOTH) { ELINK_DEBUG_P0(sc, "Flow Control: RX & TX\n"); vars->flow_ctrl = ELINK_FLOW_CTRL_BOTH; @@ -5538,6 +5539,7 @@ static void elink_sync_link(struct elink vars->link_up = (vars->link_status & LINK_STATUS_LINK_UP); if (vars->link_up) { ELINK_DEBUG_P0(sc, "phy link up\n"); + ELINK_DEBUG_P1(sc, "link status = %x\n", vars->link_status); vars->phy_link_up = 1; vars->duplex = DUPLEX_FULL; @@ -6443,6 +6445,8 @@ static elink_status_t elink_get_link_spe vars->flow_ctrl = ELINK_FLOW_CTRL_NONE; vars->mac_type = ELINK_MAC_TYPE_NONE; } + ELINK_DEBUG_P2(sc, " in elink_get_link_speed_duplex vars->link_status = %x, vars->duplex = %x\n", + vars->link_status, vars->duplex); ELINK_DEBUG_P2(sc, " phy_link_up %x line_speed %d\n", vars->phy_link_up, vars->line_speed); return ELINK_STATUS_OK; @@ -6462,8 +6466,16 @@ static elink_status_t elink_link_setting MDIO_REG_BANK_GP_STATUS, MDIO_GP_STATUS_TOP_AN_STATUS1, &gp_status); - if (gp_status & MDIO_GP_STATUS_TOP_AN_STATUS1_DUPLEX_STATUS) + if (gp_status & MDIO_GP_STATUS_TOP_AN_STATUS1_DUPLEX_STATUS) { duplex = DUPLEX_FULL; + ELINK_DEBUG_P1(sc, "duplex status read from phy is = %x\n", + duplex); + } else { + ELINK_DEBUG_P1(sc, "phy status does not allow interface to be FULL_DUPLEX : %x\n", + gp_status); + } + + if (gp_status & MDIO_GP_STATUS_TOP_AN_STATUS1_LINK_STATUS) link_up = 1; speed_mask = gp_status & ELINK_GP_STATUS_SPEED_MASK; @@ -6539,6 +6551,8 @@ static elink_status_t elink_warpcore_rea elink_cl45_read(sc, phy, MDIO_WC_DEVAD, MDIO_WC_REG_DIGITAL5_LINK_STATUS, &link_up); link_up &= 0x1; + ELINK_DEBUG_P1(sc, "params->loopback_mode link_up read = %x\n", + link_up); } else if ((phy->req_line_speed > ELINK_SPEED_10000) && (phy->supported & ELINK_SUPPORTED_20000baseMLD2_Full)) { uint16_t temp_link_up; @@ -6568,6 +6582,8 @@ static elink_status_t elink_warpcore_rea elink_cl45_read(sc, phy, MDIO_AN_DEVAD, MDIO_AN_REG_STATUS, &an_link); link_up |= (an_link & (1<<2)); + ELINK_DEBUG_P2(sc,"an_link = %x, link_up = %x\n", an_link, + link_up); } if (link_up && ELINK_SINGLE_MEDIA_DIRECT(params)) { uint16_t pd, gp_status4; @@ -6587,12 +6603,17 @@ static elink_status_t elink_warpcore_rea if (pd & (1<<15)) vars->link_status |= LINK_STATUS_PARALLEL_DETECTION_USED; + ELINK_DEBUG_P2(sc, "pd = %x, link_status = %x\n", + pd, vars->link_status); } elink_ext_phy_resolve_fc(phy, params, vars); vars->duplex = duplex; + ELINK_DEBUG_P3(sc, " ELINK_SINGLE_MEDIA_DIRECT duplex %x flow_ctrl 0x%x link_status 0x%x\n", + vars->duplex, vars->flow_ctrl, vars->link_status); } } - + ELINK_DEBUG_P3(sc, "duplex %x flow_ctrl 0x%x link_status 0x%x\n", + vars->duplex, vars->flow_ctrl, vars->link_status); if ((vars->link_status & LINK_STATUS_AUTO_NEGOTIATE_COMPLETE) && ELINK_SINGLE_MEDIA_DIRECT(params)) { uint16_t val; @@ -6607,7 +6628,8 @@ static elink_status_t elink_warpcore_rea MDIO_CL73_IEEEB1_AN_ADV2_ADVR_10G_KR)) vars->link_status |= LINK_STATUS_LINK_PARTNER_10GXFD_CAPABLE; - + ELINK_DEBUG_P2(sc, "val = %x, link_status = %x\n", + val, vars->link_status); elink_cl45_read(sc, phy, MDIO_WC_DEVAD, MDIO_WC_REG_DIGITAL3_LP_UP1, &val); @@ -6617,6 +6639,8 @@ static elink_status_t elink_warpcore_rea if (val & (MDIO_OVER_1G_UP1_10G | MDIO_OVER_1G_UP1_10GH)) vars->link_status |= LINK_STATUS_LINK_PARTNER_10GXFD_CAPABLE; + ELINK_DEBUG_P2(sc, "val = %x, link_status = %x\n", + val, vars->link_status); } @@ -7808,6 +7832,19 @@ elink_status_t elink_link_update(struct ELINK_DEBUG_P1(sc, "Active external phy selected: %x\n", active_external_phy); } + + ELINK_DEBUG_P3(sc, "vars : phy_flags = %x, mac_type = %x, phy_link_up = %x\n", + vars->phy_flags, vars->mac_type, vars->phy_link_up); + ELINK_DEBUG_P3(sc, "vars : link_up = %x, line_speed = %x, duplex = %x\n", + vars->link_up, vars->line_speed, vars->duplex); + ELINK_DEBUG_P3(sc, "vars : flow_ctrl = %x, ieee_fc = %x, link_status = %x\n", + vars->flow_ctrl, vars->ieee_fc, vars->link_status); + ELINK_DEBUG_P3(sc, "vars : eee_status = %x, fault_detected = %x, check_kr2_recovery_cnt = %x\n", + vars->eee_status, vars->fault_detected, vars->check_kr2_recovery_cnt); + ELINK_DEBUG_P3(sc, "vars : periodic_flags = %x, aeu_int_mask = %x, rx_tx_asic_rst = %x\n", + vars->periodic_flags, vars->aeu_int_mask, vars->rx_tx_asic_rst); + ELINK_DEBUG_P2(sc, "vars : turn_to_run_wc_rt = %x, rsrv2 = %x\n", + vars->turn_to_run_wc_rt, vars->rsrv2); for (phy_index = ELINK_EXT_PHY1; phy_index < params->num_phys; phy_index++) { @@ -7835,6 +7872,7 @@ elink_status_t elink_link_update(struct " link speed %d\n", vars->line_speed, ext_phy_line_speed); vars->phy_link_up = 0; + ELINK_DEBUG_P0(sc, "phy_link_up set to 0\n"); } else if (prev_line_speed != vars->line_speed) { REG_WR(sc, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4, 0); @@ -7883,6 +7921,12 @@ elink_status_t elink_link_update(struct ELINK_SINGLE_MEDIA_DIRECT(params)) && (phy_vars[active_external_phy].fault_detected == 0)); + if(vars->link_up) { + ELINK_DEBUG_P0(sc, "local phy and external phy are up\n"); + } else { + ELINK_DEBUG_P0(sc, "either local phy or external phy or both are down\n"); + } + /* Update the PFC configuration in case it was changed */ if (params->feature_config_flags & ELINK_FEATURE_CONFIG_PFC_ENABLED) vars->link_status |= LINK_STATUS_PFC_ENABLED; @@ -12943,6 +12987,8 @@ static void elink_populate_preemphasis(s phy->tx_preemphasis[i << 1] = ((tx>>16) & 0xffff); phy->tx_preemphasis[(i << 1) + 1] = (tx & 0xffff); + ELINK_DEBUG_P2(sc,"phy->rx_preemphasis = %x, phy->tx_preemphasis = %x\n", + phy->rx_preemphasis[i << 1], phy->tx_preemphasis[i << 1]); } } @@ -13070,6 +13116,8 @@ static elink_status_t elink_populate_int phy->flags |= ELINK_FLAGS_MDC_MDIO_WA; else phy->flags |= ELINK_FLAGS_MDC_MDIO_WA_B0; + ELINK_DEBUG_P3(sc, "media_type = %x, flags = %x, supported = %x\n", + phy->media_type, phy->flags, phy->supported); } else { switch (switch_cfg) { @@ -13300,6 +13348,9 @@ static void elink_phy_def_cfg(struct eli break; } + ELINK_DEBUG_P2(sc, "Default config phy idx %x, req_duplex config %x\n", + phy_index, phy->req_duplex); + switch (link_config & PORT_FEATURE_FLOW_CONTROL_MASK) { case PORT_FEATURE_FLOW_CONTROL_AUTO: phy->req_flow_ctrl = ELINK_FLOW_CTRL_AUTO; @@ -13317,6 +13368,8 @@ static void elink_phy_def_cfg(struct eli phy->req_flow_ctrl = ELINK_FLOW_CTRL_NONE; break; } + ELINK_DEBUG_P3(sc, "Requested Duplex = %x, line_speed = %x, flow_ctrl = %x\n", + phy->req_duplex, phy->req_line_speed, phy->req_flow_ctrl); } uint32_t elink_phy_selection(struct elink_params *params) @@ -13924,6 +13977,18 @@ elink_status_t elink_phy_init(struct eli /* Check if link flap can be avoided */ lfa_status = elink_check_lfa(params); + ELINK_DEBUG_P3(sc, " params : port = %x, loopback_mode = %x req_duplex = %x\n", + params->port, params->loopback_mode, params->req_duplex[0]); + ELINK_DEBUG_P3(sc, " params : switch_cfg = %x, lane_config = %x req_duplex[1] = %x\n", + params->switch_cfg, params->lane_config, params->req_duplex[1]); + ELINK_DEBUG_P3(sc, " params : chip_id = %x, feature_config_flags = %x, num_phys = %x\n", + params->chip_id, params->feature_config_flags, params->num_phys); + ELINK_DEBUG_P3(sc, " params : rsrv = %x, eee_mode = %x, hw_led_mode = x\n", + params->rsrv, params->eee_mode, params->hw_led_mode); + ELINK_DEBUG_P3(sc, " params : multi_phy = %x, req_fc_auto_adv = %x, link_flags = %x\n", + params->multi_phy_config, params->req_fc_auto_adv, params->link_flags); + ELINK_DEBUG_P2(sc, " params : lfa_base = %x, link_attr = %x\n", + params->lfa_base, params->link_attr_sync); if (lfa_status == 0) { ELINK_DEBUG_P0(sc, "Link Flap Avoidance in progress\n"); return elink_avoid_link_flap(params, vars); Modified: head/sys/dev/bxe/bxe_stats.c ============================================================================== --- head/sys/dev/bxe/bxe_stats.c Mon Feb 27 22:53:25 2017 (r314364) +++ head/sys/dev/bxe/bxe_stats.c Mon Feb 27 23:38:51 2017 (r314365) @@ -36,6 +36,8 @@ __FBSDID("$FreeBSD$"); #define BITS_PER_LONG 64 #endif +extern int bxe_grc_dump(struct bxe_softc *sc); + static inline long bxe_hilo(uint32_t *hiref) { Modified: head/sys/dev/bxe/bxe_stats.h ============================================================================== --- head/sys/dev/bxe/bxe_stats.h Mon Feb 27 22:53:25 2017 (r314364) +++ head/sys/dev/bxe/bxe_stats.h Mon Feb 27 23:38:51 2017 (r314365) @@ -267,9 +267,13 @@ struct bxe_eth_stats { /* num. of times tx queue full occurred */ uint32_t tx_queue_full_return; /* debug stats */ + uint32_t bxe_tx_mq_sc_state_failures; uint32_t tx_request_link_down_failures; uint32_t bd_avail_too_less_failures; uint32_t tx_mq_not_empty; + uint32_t nsegs_path1_errors; + uint32_t nsegs_path2_errors; + }; @@ -378,9 +382,13 @@ struct bxe_eth_q_stats { uint32_t tx_queue_full_return; /* debug stats */ + uint32_t bxe_tx_mq_sc_state_failures; uint32_t tx_request_link_down_failures; uint32_t bd_avail_too_less_failures; uint32_t tx_mq_not_empty; + uint32_t nsegs_path1_errors; + uint32_t nsegs_path2_errors; + }; struct bxe_eth_stats_old { From owner-svn-src-all@freebsd.org Tue Feb 28 00:56:35 2017 Return-Path: Delivered-To: svn-src-all@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 5DE70CEFC1D; Tue, 28 Feb 2017 00:56:35 +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 296CE62A; Tue, 28 Feb 2017 00:56:35 +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 v1S0uYck060287; Tue, 28 Feb 2017 00:56:34 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1S0uX8t060278; Tue, 28 Feb 2017 00:56:33 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201702280056.v1S0uX8t060278@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Tue, 28 Feb 2017 00:56:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314366 - in stable/10/lib/libnetbsd: . sys X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 00:56:35 -0000 Author: ngie Date: Tue Feb 28 00:56:33 2017 New Revision: 314366 URL: https://svnweb.freebsd.org/changeset/base/314366 Log: Note: this change reintroduces r314020 after r314327, r314330, and r314332 MFC r313404: Improve libnetbsd compatibility with NetBSD This change is being made to diff reduce/reduce duplication in contrib/netbsd-tests and to facilitate further porting of software from NetBSD Add the following headers: - sys/event.h: -- sys/types.h is required for kqueue on FreeBSD, but not NetBSD. - sys/types.h: -- NBBY is defined in sys/param.h on FreeBSD, not sys/types.h like on NetBSD. Pull in sys/param.h to have parity with NetBSD. - sys/wait.h: -- Define wrusage as __wrusage for parity with NetBSD typedef. - glob.h -- Define __gl_stat_t as "struct stat" for parity with NetBSD typedef. - pthread.h: -- Pull in pthread_np.h for _np functions defined separately on FreeBSD. Improve compatibility with NetBSD in the following headers: - sha1.h: -- define SHA1_CTX as SHA_CTX -- define SHA1Final as SHA1_Final - sha2.h: -- #include sha384 to pick up all of the SHA 384 bit macros and definitions. - util.h: -- Add sys/types.h to util.h to pollute the header for types used in flags_to_string and string_to_flags (u_long) as NetBSD doesn't require them for the functions. Added: stable/10/lib/libnetbsd/glob.h - copied unchanged from r313404, head/lib/libnetbsd/glob.h stable/10/lib/libnetbsd/pthread.h - copied unchanged from r313404, head/lib/libnetbsd/pthread.h stable/10/lib/libnetbsd/sys/event.h - copied unchanged from r313404, head/lib/libnetbsd/sys/event.h stable/10/lib/libnetbsd/sys/types.h - copied unchanged from r313404, head/lib/libnetbsd/sys/types.h stable/10/lib/libnetbsd/sys/wait.h - copied unchanged from r313404, head/lib/libnetbsd/sys/wait.h Modified: stable/10/lib/libnetbsd/sha1.h stable/10/lib/libnetbsd/sha2.h stable/10/lib/libnetbsd/util.h Directory Properties: stable/10/ (props changed) Copied: stable/10/lib/libnetbsd/glob.h (from r313404, head/lib/libnetbsd/glob.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/lib/libnetbsd/glob.h Tue Feb 28 00:56:33 2017 (r314366, copy of r313404, head/lib/libnetbsd/glob.h) @@ -0,0 +1,39 @@ +/*- + * Copyright (c) 2017 Dell, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _LIBNETBSD_GLOB_H_ +#define _LIBNETBSD_GLOB_H_ + +#include_next + +#ifndef __gl_stat_t +#define __gl_stat_t struct stat +#endif + +#endif Copied: stable/10/lib/libnetbsd/pthread.h (from r313404, head/lib/libnetbsd/pthread.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/lib/libnetbsd/pthread.h Tue Feb 28 00:56:33 2017 (r314366, copy of r313404, head/lib/libnetbsd/pthread.h) @@ -0,0 +1,36 @@ +/*- + * Copyright (c) 2017 Dell, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _LIBNETBSD_PTHREAD_H_ +#define _LIBNETBSD_PTHREAD_H_ + +#include_next +#include + +#endif Modified: stable/10/lib/libnetbsd/sha1.h ============================================================================== --- stable/10/lib/libnetbsd/sha1.h Mon Feb 27 23:38:51 2017 (r314365) +++ stable/10/lib/libnetbsd/sha1.h Tue Feb 28 00:56:33 2017 (r314366) @@ -35,8 +35,11 @@ #include +#define SHA1_CTX SHA_CTX + #define SHA1End SHA1_End #define SHA1File SHA1_File +#define SHA1Final SHA1_Final #define SHA1Init SHA1_Init #define SHA1Update SHA1_Update Modified: stable/10/lib/libnetbsd/sha2.h ============================================================================== --- stable/10/lib/libnetbsd/sha2.h Mon Feb 27 23:38:51 2017 (r314365) +++ stable/10/lib/libnetbsd/sha2.h Tue Feb 28 00:56:33 2017 (r314366) @@ -34,6 +34,7 @@ #define _SHA2_H_ #include +#include #include #endif /* _SHA2_H_ */ Copied: stable/10/lib/libnetbsd/sys/event.h (from r313404, head/lib/libnetbsd/sys/event.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/lib/libnetbsd/sys/event.h Tue Feb 28 00:56:33 2017 (r314366, copy of r313404, head/lib/libnetbsd/sys/event.h) @@ -0,0 +1,42 @@ +/*- + * Copyright (c) 2017 Dell, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ * + */ + +#ifndef _LIBNETBSD_SYS_EVENT_H_ +#define _LIBNETBSD_SYS_EVENT_H_ + +/* + * kqueue on FreeBSD requires sys/event.h, which in turn uses uintptr_t + * (defined in sys/types.h), so in order to accomodate their requirements, + * pull in sys/types.h as part of event.h. + */ +#include + +#include_next + +#endif Copied: stable/10/lib/libnetbsd/sys/types.h (from r313404, head/lib/libnetbsd/sys/types.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/lib/libnetbsd/sys/types.h Tue Feb 28 00:56:33 2017 (r314366, copy of r313404, head/lib/libnetbsd/sys/types.h) @@ -0,0 +1,37 @@ +/*- + * Copyright (c) 2017 Dell, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ * + */ + +#ifndef _LIBNETBSD_SYS_TYPES_H_ +#define _LIBNETBSD_SYS_TYPES_H_ + +#include_next + +#include /* For NBBY */ + +#endif Copied: stable/10/lib/libnetbsd/sys/wait.h (from r313404, head/lib/libnetbsd/sys/wait.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/lib/libnetbsd/sys/wait.h Tue Feb 28 00:56:33 2017 (r314366, copy of r313404, head/lib/libnetbsd/sys/wait.h) @@ -0,0 +1,37 @@ +/*- + * Copyright (c) 2017 Dell, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ * + */ + +#ifndef _LIBNETBSD_SYS_WAIT_H_ +#define _LIBNETBSD_SYS_WAIT_H_ + +#include_next + +#define wrusage __wrusage + +#endif Modified: stable/10/lib/libnetbsd/util.h ============================================================================== --- stable/10/lib/libnetbsd/util.h Mon Feb 27 23:38:51 2017 (r314365) +++ stable/10/lib/libnetbsd/util.h Tue Feb 28 00:56:33 2017 (r314366) @@ -30,12 +30,13 @@ * SUCH DAMAGE. */ -#ifndef _UTIL_H_ -#define _UTIL_H_ +#ifndef _LIBNETBSD_UTIL_H_ +#define _LIBNETBSD_UTIL_H_ +#include #include char *flags_to_string(u_long flags, const char *def); int string_to_flags(char **stringp, u_long *setp, u_long *clrp); -#endif /* _UTIL_H_ */ +#endif From owner-svn-src-all@freebsd.org Tue Feb 28 00:57:46 2017 Return-Path: Delivered-To: svn-src-all@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 B45ADCEFCCD; Tue, 28 Feb 2017 00:57:46 +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 83A98807; Tue, 28 Feb 2017 00:57:46 +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 v1S0vjwL060387; Tue, 28 Feb 2017 00:57:45 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1S0vjIR060386; Tue, 28 Feb 2017 00:57:45 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201702280057.v1S0vjIR060386@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Tue, 28 Feb 2017 00:57:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314367 - stable/11/tools/build/mk X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 00:57:46 -0000 Author: ngie Date: Tue Feb 28 00:57:45 2017 New Revision: 314367 URL: https://svnweb.freebsd.org/changeset/base/314367 Log: MFC r314244: Remove MK_OBJC block It is no longer represented via src.conf(5) Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/11/ (props changed) Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/11/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 28 00:56:33 2017 (r314366) +++ stable/11/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 28 00:57:45 2017 (r314367) @@ -6666,10 +6666,6 @@ OLD_FILES+=usr/share/man/man8/ntpq.8.gz OLD_FILES+=usr/share/man/man8/ntptime.8.gz .endif -#.if ${MK_OBJC} == no -# to be filled in -#.endif - .if ${MK_OPENSSH} == no OLD_FILES+=etc/rc.d/sshd OLD_FILES+=etc/ssh/moduli From owner-svn-src-all@freebsd.org Tue Feb 28 00:58:17 2017 Return-Path: Delivered-To: svn-src-all@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 BCC22CEFD56; Tue, 28 Feb 2017 00:58:17 +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 85D9D948; Tue, 28 Feb 2017 00:58:17 +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 v1S0wGEq060454; Tue, 28 Feb 2017 00:58:16 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1S0wGQN060453; Tue, 28 Feb 2017 00:58:16 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201702280058.v1S0wGQN060453@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Tue, 28 Feb 2017 00:58:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314368 - stable/10/tools/build/mk X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 00:58:17 -0000 Author: ngie Date: Tue Feb 28 00:58:16 2017 New Revision: 314368 URL: https://svnweb.freebsd.org/changeset/base/314368 Log: MFC r314244: Remove MK_OBJC block It is no longer represented via src.conf(5) Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/10/ (props changed) Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 28 00:57:45 2017 (r314367) +++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 28 00:58:16 2017 (r314368) @@ -4043,10 +4043,6 @@ OLD_FILES+=usr/share/man/man8/ntpq.8.gz OLD_FILES+=usr/share/man/man8/ntptime.8.gz .endif -#.if ${MK_OBJC} == no -# to be filled in -#.endif - .if ${MK_OPENSSH} == no OLD_FILES+=usr/bin/sftp OLD_FILES+=usr/bin/ssh From owner-svn-src-all@freebsd.org Tue Feb 28 02:27:52 2017 Return-Path: Delivered-To: svn-src-all@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 96559CEFEA6; Tue, 28 Feb 2017 02:27:52 +0000 (UTC) (envelope-from shurd@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 6E4BEF40; Tue, 28 Feb 2017 02:27:52 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1S2RpwO094907; Tue, 28 Feb 2017 02:27:51 GMT (envelope-from shurd@FreeBSD.org) Received: (from shurd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1S2RpsS094905; Tue, 28 Feb 2017 02:27:51 GMT (envelope-from shurd@FreeBSD.org) Message-Id: <201702280227.v1S2RpsS094905@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: shurd set sender to shurd@FreeBSD.org using -f From: Stephen Hurd Date: Tue, 28 Feb 2017 02:27:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314369 - head/sys/dev/bnxt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 02:27:52 -0000 Author: shurd (ports committer) Date: Tue Feb 28 02:27:51 2017 New Revision: 314369 URL: https://svnweb.freebsd.org/changeset/base/314369 Log: bnxt: propagate RSS hash type to the network stack. RSS hash type will be used to identify the CPU on to which, a receive packet will be queued. This patch extracts the "RSS hash type" from the receive completion and sends it to the stack. Submitted by: Venkatkumar Duvvuru Reviewed by: shurd Approved by: sbruno MFC after: 1 week Sponsored by: Broadcom Limited Differential Revision: https://reviews.freebsd.org/D9685 Modified: head/sys/dev/bnxt/bnxt.h head/sys/dev/bnxt/bnxt_txrx.c Modified: head/sys/dev/bnxt/bnxt.h ============================================================================== --- head/sys/dev/bnxt/bnxt.h Tue Feb 28 00:58:16 2017 (r314368) +++ head/sys/dev/bnxt/bnxt.h Tue Feb 28 02:27:51 2017 (r314369) @@ -92,6 +92,14 @@ __FBSDID("$FreeBSD$"); #define BNXT_MAX_MTU 9000 +#define BNXT_RSS_HASH_TYPE_TCPV4 0 +#define BNXT_RSS_HASH_TYPE_UDPV4 1 +#define BNXT_RSS_HASH_TYPE_IPV4 2 +#define BNXT_RSS_HASH_TYPE_TCPV6 3 +#define BNXT_RSS_HASH_TYPE_UDPV6 4 +#define BNXT_RSS_HASH_TYPE_IPV6 5 +#define BNXT_GET_RSS_PROFILE_ID(rss_hash_type) ((rss_hash_type >> 1) & 0x1F) + /* Completion related defines */ #define CMP_VALID(cmp, v_bit) \ ((!!(((struct cmpl_base *)(cmp))->info3_v & htole32(CMPL_BASE_V))) == !!(v_bit) ) Modified: head/sys/dev/bnxt/bnxt_txrx.c ============================================================================== --- head/sys/dev/bnxt/bnxt_txrx.c Tue Feb 28 00:58:16 2017 (r314368) +++ head/sys/dev/bnxt/bnxt_txrx.c Tue Feb 28 02:27:51 2017 (r314369) @@ -412,6 +412,37 @@ cmpl_invalid: return avail; } +static void +bnxt_set_rsstype(if_rxd_info_t ri, uint8_t rss_hash_type) +{ + uint8_t rss_profile_id; + + rss_profile_id = BNXT_GET_RSS_PROFILE_ID(rss_hash_type); + switch (rss_profile_id) { + case BNXT_RSS_HASH_TYPE_TCPV4: + ri->iri_rsstype = M_HASHTYPE_RSS_TCP_IPV4; + break; + case BNXT_RSS_HASH_TYPE_UDPV4: + ri->iri_rsstype = M_HASHTYPE_RSS_UDP_IPV4; + break; + case BNXT_RSS_HASH_TYPE_IPV4: + ri->iri_rsstype = M_HASHTYPE_RSS_IPV4; + break; + case BNXT_RSS_HASH_TYPE_TCPV6: + ri->iri_rsstype = M_HASHTYPE_RSS_TCP_IPV6; + break; + case BNXT_RSS_HASH_TYPE_UDPV6: + ri->iri_rsstype = M_HASHTYPE_RSS_UDP_IPV6; + break; + case BNXT_RSS_HASH_TYPE_IPV6: + ri->iri_rsstype = M_HASHTYPE_RSS_IPV6; + break; + default: + ri->iri_rsstype = M_HASHTYPE_OPAQUE; + break; + } +} + static int bnxt_pkt_get_l2(struct bnxt_softc *softc, if_rxd_info_t ri, struct bnxt_cp_ring *cpr, uint16_t flags_type) @@ -429,13 +460,7 @@ bnxt_pkt_get_l2(struct bnxt_softc *softc /* Extract from the first 16-byte BD */ if (flags_type & RX_PKT_CMPL_FLAGS_RSS_VALID) { ri->iri_flowid = le32toh(rcp->rss_hash); - /* - * TODO: Extract something useful from rcp->rss_hash_type - * (undocumented) - * May be documented in the "LSI ES" - * also check the firmware code. - */ - ri->iri_rsstype = M_HASHTYPE_OPAQUE; + bnxt_set_rsstype(ri, rcp->rss_hash_type); } else { ri->iri_rsstype = M_HASHTYPE_NONE; @@ -515,13 +540,7 @@ bnxt_pkt_get_tpa(struct bnxt_softc *soft /* Extract from the first 16-byte BD */ if (le16toh(tpas->low.flags_type) & RX_TPA_START_CMPL_FLAGS_RSS_VALID) { ri->iri_flowid = le32toh(tpas->low.rss_hash); - /* - * TODO: Extract something useful from tpas->low.rss_hash_type - * (undocumented) - * May be documented in the "LSI ES" - * also check the firmware code. - */ - ri->iri_rsstype = M_HASHTYPE_OPAQUE; + bnxt_set_rsstype(ri, tpas->low.rss_hash_type); } else { ri->iri_rsstype = M_HASHTYPE_NONE; From owner-svn-src-all@freebsd.org Tue Feb 28 02:54:34 2017 Return-Path: Delivered-To: svn-src-all@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 6EB70CF0ADE; Tue, 28 Feb 2017 02:54:34 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail108.syd.optusnet.com.au (mail108.syd.optusnet.com.au [211.29.132.59]) by mx1.freebsd.org (Postfix) with ESMTP id E7539DB; Tue, 28 Feb 2017 02:54:33 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from besplex.bde.org (c122-106-153-191.carlnfd1.nsw.optusnet.com.au [122.106.153.191]) by mail108.syd.optusnet.com.au (Postfix) with ESMTPS id 1358F1A4B9F; Tue, 28 Feb 2017 13:27:53 +1100 (AEDT) Date: Tue, 28 Feb 2017 13:27:52 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Conrad Meyer cc: Bruce Evans , Konstantin Belousov , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r313006 - in head: sys/conf sys/libkern sys/libkern/x86 sys/sys tests/sys/kern In-Reply-To: Message-ID: <20170228121335.Q2733@besplex.bde.org> References: <201701310326.v0V3QW30024375@repo.freebsd.org> <20170202184819.GP2092@kib.kiev.ua> <20170203062806.A2690@besplex.bde.org> MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="0-952914049-1488248872=:2733" X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.2 cv=KeqiiUQD c=1 sm=1 tr=0 a=Tj3pCpwHnMupdyZSltBt7Q==:117 a=Tj3pCpwHnMupdyZSltBt7Q==:17 a=nlC_4_pT8q9DhB4Ho9EA:9 a=PO7r1zJSAAAA:8 a=gxlKNWXeVbEL2LKZ7v0A:9 a=CjuIK1q_8ugA:10 a=Q5FP2KuElgoRmTHqiFAA:9 a=MfUaAa4m8WcA:10 a=Oa0T6EYmKFNB-xRHvYM1:22 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 02:54:34 -0000 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --0-952914049-1488248872=:2733 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed On Mon, 27 Feb 2017, Conrad Meyer wrote: > On Thu, Feb 2, 2017 at 12:29 PM, Bruce Evans wrote: >> I've almost finished fixing and optimizing this. I didn't manage to fix >> all the compiler pessimizations, but the result is within 5% of optimal >> for buffers larger than a few K. > > Did you ever get to a final patch that you are satisfied with? It > would be good to get this improvement into the tree. I'm happy with this version (attached and partly enclosed). You need to test it in the kernel and commit it (I on;y did simple correctness tests in userland). X Index: conf/files.amd64 X =================================================================== X --- conf/files.amd64 (revision 314363) X +++ conf/files.amd64 (working copy) X @@ -545,6 +545,9 @@ X isa/vga_isa.c optional vga X kern/kern_clocksource.c standard X kern/link_elf_obj.c standard X +libkern/x86/crc32_sse42.c standard X +libkern/memmove.c standard X +libkern/memset.c standard Also fix some nearby disorder. X ... X Index: libkern/x86/crc32_sse42.c X =================================================================== X --- libkern/x86/crc32_sse42.c (revision 314363) X +++ libkern/x86/crc32_sse42.c (working copy) X @@ -31,15 +31,41 @@ X */ X #ifdef USERSPACE_TESTING X #include X +#include X #else X #include X +#include X #include X -#include X -#include X #endif Also fix minor #include errors. X X -#include X +static __inline uint32_t X +_mm_crc32_u8(uint32_t x, uint8_t y) X +{ X + /* X + * clang (at least 3.9.[0-1]) pessimizes "rm" (y) and "m" (y) X + * significantly and "r" (y) a lot by copying y to a different X + * local variable (on the stack or in a register), so only use X + * the latter. This costs a register and an instruction but X + * not a uop. X + */ X + __asm("crc32b %1,%0" : "+r" (x) : "r" (y)); X + return (x); X +} Using intrinsics avoids the silly copying via the stack, and allows more unrolling. Old gcc does more unrolling with just asms. Unrolling is almost useless (some details below). X @@ -47,12 +73,14 @@ X * Block sizes for three-way parallel crc computation. LONG and SHORT must X * both be powers of two. X */ X -#define LONG 8192 X -#define SHORT 256 X +#define LONG 128 X +#define SHORT 64 These are aggressively low. Note that small buffers aren't handled very well. SHORT = 64 means that a buffer of size 3 * 64 = 192 is handled entirely by the "SHORT" loop. 192 is not very small, but any smaller than that and overheads for adjustment at the end of the loop are too large for the "SHORT" loop to be worth doing. Almost any value of LONG larger than 128 works OK now, but if LONG is large then it gives too much work for the "SHORT" loop, since normal buffer sizes are not a multiple of 3. E.g., with the old LONG and SHORT, a buffer of size 128 was decomposed as 5 * 24K (done almost optimally by the "LONG" loop) + 10 * 768 (done a bit less optimally by the "SHORT" loop) + 10 * 768 + 64 * 8 (done pessimally). I didn't get around to ifdefing this for i386. On i386, the loops take twice as many crc32 instructions for a given byte count, so the timing is satisfed by a byte count half as large, so SHORT and LONG can be reduced by a factor of 2 to give faster handling for small buffers without affecting the speed for large buffers significantly. X X /* Tables for hardware crc that shift a crc by LONG and SHORT zeros. */ X static uint32_t crc32c_long[4][256]; X +static uint32_t crc32c_2long[4][256]; X static uint32_t crc32c_short[4][256]; X +static uint32_t crc32c_2short[4][256]; I didn't get around to updating the comment. 2long shifts by 2*LONG zeros, etc. Shifts by 3N are done by adding shifts by 1N and 2N in parallel. I couldn't get the direct 3N shift to run any faster. X @@ -190,7 +220,11 @@ X const size_t align = 4; X #endif X const unsigned char *next, *end; X - uint64_t crc0, crc1, crc2; /* need to be 64 bits for crc32q */ X +#ifdef __amd64__ X + uint64_t crc0, crc1, crc2; X +#else X + uint32_t crc0, crc1, crc2; X +#endif X X next = buf; X crc0 = crc; 64 bits of course isn't needed for i386. It isn't needed for amd64 either. I think the crc32 instruction zeros the top 32 bits so they can be ignored. However, when I modified the asm to return 32 bits to tell the compiler about this (which the intrinsic wouldn't be able to do) and used 32 bits here, this was just slightly slower. For some intermediate crc calculations, only 32 bits are used, and the compiler can see this. clang on amd64 optimizes this better than gcc, starting with all the intermediate crc variables declared as 64 bits. gcc generates worst code when some of the intermediates are declared as 32 bits. So keep using 64 bits on amd64 here. X @@ -202,6 +236,7 @@ X len--; X } X X +#if LONG > SHORT X /* X * Compute the crc on sets of LONG*3 bytes, executing three independent X * crc instructions, each on LONG bytes -- this is optimized for the LONG = SHORT = 64 works OK on Haswell, but I suspect that slower CPUs benefit from larger values and I want to keep SHORT as small as possible for the fastest CPUs. X @@ -209,6 +244,7 @@ X * have a throughput of one crc per cycle, but a latency of three X * cycles. X */ X + crc = 0; X while (len >= LONG * 3) { X crc1 = 0; X crc2 = 0; X @@ -229,16 +265,64 @@ X #endif X next += align; X } while (next < end); X - crc0 = crc32c_shift(crc32c_long, crc0) ^ crc1; X - crc0 = crc32c_shift(crc32c_long, crc0) ^ crc2; X + /*- X + * Update the crc. Try to do it in parallel with the inner X + * loop. 'crc' is used to accumulate crc0 and crc1 X + * produced by the inner loop so that the next iteration X + * of the loop doesn't depend on anything except crc2. X + * X + * The full expression for the update is: X + * crc = S*S*S*crc + S*S*crc0 + S*crc1 X + * where the terms are polynomials modulo the CRC polynomial. X + * We regroup this subtly as: X + * crc = S*S * (S*crc + crc0) + S*crc1. X + * This has an extra dependency which reduces possible X + * parallelism for the expression, but it turns out to be X + * best to intentionally delay evaluation of this expression X + * so that it competes less with the inner loop. X + * X + * We also intentionally reduce parallelism by feedng back X + * crc2 to the inner loop as crc0 instead of accumulating X + * it in crc. This synchronizes the loop with crc update. X + * CPU and/or compiler schedulers produced bad order without X + * this. X + * X + * Shifts take about 12 cycles each, so 3 here with 2 X + * parallelizable take about 24 cycles and the crc update X + * takes slightly longer. 8 dependent crc32 instructions X + * can run in 24 cycles, so the 3-way blocking is worse X + * than useless for sizes less than 8 * = 64 X + * on amd64. In practice, SHORT = 32 confirms these X + * timing calculations by giving a small improvement X + * starting at size 96. Then the inner loop takes about X + * 12 cycles and the crc update about 24, but these are X + * partly in parallel so the total time is less than the X + * 36 cycles that 12 dependent crc32 instructions would X + * take. X + * X + * To have a chance of completely hiding the overhead for X + * the crc update, the inner loop must take considerably X + * longer than 24 cycles. LONG = 64 makes the inner loop X + * take about 24 cycles, so is not quite large enough. X + * LONG = 128 works OK. Unhideable overheads are about X + * 12 cycles per inner loop. All assuming timing like X + * Haswell. X + */ X + crc = crc32c_shift(crc32c_long, crc) ^ crc0; X + crc1 = crc32c_shift(crc32c_long, crc1); X + crc = crc32c_shift(crc32c_2long, crc) ^ crc1; X + crc0 = crc2; X next += LONG * 2; X len -= LONG * 3; X } X + crc0 ^= crc; X +#endif /* LONG > SHORT */ X X /* X * Do the same thing, but now on SHORT*3 blocks for the remaining data X * less than a LONG*3 block X */ X + crc = 0; X while (len >= SHORT * 3) { X crc1 = 0; X crc2 = 0; See the comment. X @@ -259,11 +343,14 @@ X #endif X next += align; When SHORT is about what it is (64), on amd64 the "SHORT" loop has 24 crc32 instructions and compilers sometimes to unroll them all. This makes little difference. X } while (next < end); X - crc0 = crc32c_shift(crc32c_short, crc0) ^ crc1; X - crc0 = crc32c_shift(crc32c_short, crc0) ^ crc2; X + crc = crc32c_shift(crc32c_short, crc) ^ crc0; X + crc1 = crc32c_shift(crc32c_short, crc1); X + crc = crc32c_shift(crc32c_2short, crc) ^ crc1; X + crc0 = crc2; X next += SHORT * 2; X len -= SHORT * 3; X } X + crc0 ^= crc; The change is perhaps easier to understand without looking at the comment. We accumulate changes in crc instead of into crc0, so that the next iteration can start without waiting for accumulation. This requires more shifting steps, and we try to arrange these optimally. X X /* Compute the crc on the remaining bytes at native word size. */ X end = next + (len - (len & (align - 1))); The adjustments for alignment are slow if they are not null, and wasteful if they are null, but have relatively little cost for the non-small buffers that are handled well, so I didn't remove them. Bruce --0-952914049-1488248872=:2733 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="crc32.dif" Content-Transfer-Encoding: BASE64 Content-ID: <20170228132752.J2733@besplex.bde.org> Content-Description: Content-Disposition: attachment; filename="crc32.dif" SW5kZXg6IGNvbmYvZmlsZXMuYW1kNjQNCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0NCi0tLSBjb25mL2ZpbGVzLmFtZDY0CShyZXZpc2lvbiAzMTQzNjMpDQor KysgY29uZi9maWxlcy5hbWQ2NAkod29ya2luZyBjb3B5KQ0KQEAgLTU0NSw2 ICs1NDUsOSBAQA0KIGlzYS92Z2FfaXNhLmMJCQlvcHRpb25hbAl2Z2ENCiBr ZXJuL2tlcm5fY2xvY2tzb3VyY2UuYwkJc3RhbmRhcmQNCiBrZXJuL2xpbmtf ZWxmX29iai5jCQlzdGFuZGFyZA0KK2xpYmtlcm4veDg2L2NyYzMyX3NzZTQy LmMJc3RhbmRhcmQNCitsaWJrZXJuL21lbW1vdmUuYwkJc3RhbmRhcmQNCits aWJrZXJuL21lbXNldC5jCQlzdGFuZGFyZA0KICMNCiAjIElBMzIgYmluYXJ5 IHN1cHBvcnQNCiAjDQpAQCAtNjAyLDE0ICs2MDUsNiBAQA0KIGNvbXBhdC9u ZGlzL3N1YnJfdXNiZC5jCQlvcHRpb25hbAluZGlzYXBpIHBjaQ0KIGNvbXBh dC9uZGlzL3dpbng2NF93cmFwLlMJb3B0aW9uYWwJbmRpc2FwaSBwY2kNCiAj DQotY3JjMzJfc3NlNDIubwkJCXN0YW5kYXJkCQkJCVwNCi0JZGVwZW5kZW5j eQkiJFMvbGlia2Vybi94ODYvY3JjMzJfc3NlNDIuYyIJCQlcDQotCWNvbXBp bGUtd2l0aAkiJHtDQ30gLWMgJHtDRkxBR1M6Ti1ub3N0ZGluY30gJHtXRVJS T1J9ICR7UFJPRn0gLW1zc2U0ICR7LklNUFNSQ30iIFwNCi0Jbm8taW1wbGlj aXQtcnVsZQkJCQkJCVwNCi0JY2xlYW4JCSJjcmMzMl9zc2U0Mi5vIg0KLWxp Ymtlcm4vbWVtbW92ZS5jCQlzdGFuZGFyZA0KLWxpYmtlcm4vbWVtc2V0LmMJ CXN0YW5kYXJkDQotIw0KICMgeDg2IHJlYWwgbW9kZSBCSU9TIGVtdWxhdG9y LCByZXF1aXJlZCBieSBkcG1zL3BjaS92ZXNhDQogIw0KIGNvbXBhdC94ODZi aW9zL3g4NmJpb3MuYwlvcHRpb25hbCB4ODZiaW9zIHwgZHBtcyB8IHBjaSB8 IHZlc2ENCkluZGV4OiBjb25mL2ZpbGVzLmkzODYNCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0NCi0tLSBjb25mL2ZpbGVzLmkzODYJKHJldmlzaW9uIDMxNDM2 MykNCisrKyBjb25mL2ZpbGVzLmkzODYJKHdvcmtpbmcgY29weSkNCkBAIC01 NTcsMTEgKzU1Nyw2IEBADQoga2Vybi9pbWdhY3RfYW91dC5jCQlvcHRpb25h bCBjb21wYXRfYW91dA0KIGtlcm4vaW1nYWN0X2d6aXAuYwkJb3B0aW9uYWwg Z3ppcA0KIGtlcm4vc3Vicl9zZmJ1Zi5jCQlzdGFuZGFyZA0KLWNyYzMyX3Nz ZTQyLm8JCQlzdGFuZGFyZAkJCQlcDQotCWRlcGVuZGVuY3kJIiRTL2xpYmtl cm4veDg2L2NyYzMyX3NzZTQyLmMiCQkJXA0KLQljb21waWxlLXdpdGgJIiR7 Q0N9IC1jICR7Q0ZMQUdTOk4tbm9zdGRpbmN9ICR7V0VSUk9SfSAke1BST0Z9 IC1tc3NlNCAkey5JTVBTUkN9IiBcDQotCW5vLWltcGxpY2l0LXJ1bGUJCQkJ CQlcDQotCWNsZWFuCQkiY3JjMzJfc3NlNDIubyINCiBsaWJrZXJuL2RpdmRp My5jCQlzdGFuZGFyZA0KIGxpYmtlcm4vZmZzbGwuYwkJCXN0YW5kYXJkDQog bGlia2Vybi9mbHNsbC5jCQkJc3RhbmRhcmQNCkBAIC01NzIsNiArNTY3LDcg QEANCiBsaWJrZXJuL3VjbXBkaTIuYwkJc3RhbmRhcmQNCiBsaWJrZXJuL3Vk aXZkaTMuYwkJc3RhbmRhcmQNCiBsaWJrZXJuL3Vtb2RkaTMuYwkJc3RhbmRh cmQNCitsaWJrZXJuL3g4Ni9jcmMzMl9zc2U0Mi5jCXN0YW5kYXJkDQogaTM4 Ni94Ym94L3hib3guYwkJb3B0aW9uYWwgeGJveA0KIGkzODYveGJveC94Ym94 ZmIuYwkJb3B0aW9uYWwgeGJveGZiDQogZGV2L2ZiL2Jvb3RfZm9udC5jCQlv cHRpb25hbCB4Ym94ZmINCkluZGV4OiBsaWJrZXJuL3g4Ni9jcmMzMl9zc2U0 Mi5jDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gbGlia2Vybi94ODYv Y3JjMzJfc3NlNDIuYwkocmV2aXNpb24gMzE0MzYzKQ0KKysrIGxpYmtlcm4v eDg2L2NyYzMyX3NzZTQyLmMJKHdvcmtpbmcgY29weSkNCkBAIC0zMSwxNSAr MzEsNDEgQEANCiAgKi8NCiAjaWZkZWYgVVNFUlNQQUNFX1RFU1RJTkcNCiAj aW5jbHVkZSA8c3RkaW50Lmg+DQorI2luY2x1ZGUgPHN0ZGxpYi5oPg0KICNl bHNlDQogI2luY2x1ZGUgPHN5cy9wYXJhbS5oPg0KKyNpbmNsdWRlIDxzeXMv c3lzdG0uaD4NCiAjaW5jbHVkZSA8c3lzL2tlcm5lbC5oPg0KLSNpbmNsdWRl IDxzeXMvbGlia2Vybi5oPg0KLSNpbmNsdWRlIDxzeXMvc3lzdG0uaD4NCiAj ZW5kaWYNCiANCi0jaW5jbHVkZSA8bm1taW50cmluLmg+DQorc3RhdGljIF9f aW5saW5lIHVpbnQzMl90DQorX21tX2NyYzMyX3U4KHVpbnQzMl90IHgsIHVp bnQ4X3QgeSkNCit7DQorCS8qDQorCSAqIGNsYW5nIChhdCBsZWFzdCAzLjku WzAtMV0pIHBlc3NpbWl6ZXMgInJtIiAoeSkgYW5kICJtIiAoeSkNCisJICog c2lnbmlmaWNhbnRseSBhbmQgInIiICh5KSBhIGxvdCBieSBjb3B5aW5nIHkg dG8gYSBkaWZmZXJlbnQNCisJICogbG9jYWwgdmFyaWFibGUgKG9uIHRoZSBz dGFjayBvciBpbiBhIHJlZ2lzdGVyKSwgc28gb25seSB1c2UNCisJICogdGhl IGxhdHRlci4gIFRoaXMgY29zdHMgYSByZWdpc3RlciBhbmQgYW4gaW5zdHJ1 Y3Rpb24gYnV0DQorCSAqIG5vdCBhIHVvcC4NCisJICovDQorCV9fYXNtKCJj cmMzMmIgJTEsJTAiIDogIityIiAoeCkgOiAiciIgKHkpKTsNCisJcmV0dXJu ICh4KTsNCit9DQogDQorc3RhdGljIF9faW5saW5lIHVpbnQzMl90DQorX21t X2NyYzMyX3UzMih1aW50MzJfdCB4LCB1aW50MzJfdCB5KQ0KK3sNCisJX19h c20oImNyYzMybCAlMSwlMCIgOiAiK3IiICh4KSA6ICJyIiAoeSkpOw0KKwly ZXR1cm4gKHgpOw0KK30NCisNCitzdGF0aWMgX19pbmxpbmUgdWludDY0X3QN CitfbW1fY3JjMzJfdTY0KHVpbnQ2NF90IHgsIHVpbnQ2NF90IHkpDQorew0K KwlfX2FzbSgiY3JjMzJxICUxLCUwIiA6ICIrciIgKHgpIDogInIiICh5KSk7 DQorCXJldHVybiAoeCk7DQorfQ0KKw0KIC8qIENSQy0zMkMgKGlTQ1NJKSBw b2x5bm9taWFsIGluIHJldmVyc2VkIGJpdCBvcmRlci4gKi8NCiAjZGVmaW5l IFBPTFkJMHg4MmY2M2I3OA0KIA0KQEAgLTQ3LDEyICs3MywxNCBAQA0KICAq IEJsb2NrIHNpemVzIGZvciB0aHJlZS13YXkgcGFyYWxsZWwgY3JjIGNvbXB1 dGF0aW9uLiAgTE9ORyBhbmQgU0hPUlQgbXVzdA0KICAqIGJvdGggYmUgcG93 ZXJzIG9mIHR3by4NCiAgKi8NCi0jZGVmaW5lIExPTkcJODE5Mg0KLSNkZWZp bmUgU0hPUlQJMjU2DQorI2RlZmluZSBMT05HCTEyOA0KKyNkZWZpbmUgU0hP UlQJNjQNCiANCiAvKiBUYWJsZXMgZm9yIGhhcmR3YXJlIGNyYyB0aGF0IHNo aWZ0IGEgY3JjIGJ5IExPTkcgYW5kIFNIT1JUIHplcm9zLiAqLw0KIHN0YXRp YyB1aW50MzJfdCBjcmMzMmNfbG9uZ1s0XVsyNTZdOw0KK3N0YXRpYyB1aW50 MzJfdCBjcmMzMmNfMmxvbmdbNF1bMjU2XTsNCiBzdGF0aWMgdWludDMyX3Qg Y3JjMzJjX3Nob3J0WzRdWzI1Nl07DQorc3RhdGljIHVpbnQzMl90IGNyYzMy Y18yc2hvcnRbNF1bMjU2XTsNCiANCiAvKg0KICAqIE11bHRpcGx5IGEgbWF0 cml4IHRpbWVzIGEgdmVjdG9yIG92ZXIgdGhlIEdhbG9pcyBmaWVsZCBvZiB0 d28gZWxlbWVudHMsDQpAQCAtMTcxLDcgKzE5OSw5IEBADQogY3JjMzJjX2lu aXRfaHcodm9pZCkNCiB7DQogCWNyYzMyY196ZXJvcyhjcmMzMmNfbG9uZywg TE9ORyk7DQorCWNyYzMyY196ZXJvcyhjcmMzMmNfMmxvbmcsIDIgKiBMT05H KTsNCiAJY3JjMzJjX3plcm9zKGNyYzMyY19zaG9ydCwgU0hPUlQpOw0KKwlj cmMzMmNfemVyb3MoY3JjMzJjXzJzaG9ydCwgMiAqIFNIT1JUKTsNCiB9DQog I2lmZGVmIF9LRVJORUwNCiBTWVNJTklUKGNyYzMyY19zc2U0MiwgU0lfU1VC X0xPQ0ssIFNJX09SREVSX0FOWSwgY3JjMzJjX2luaXRfaHcsIE5VTEwpOw0K QEAgLTE5MCw3ICsyMjAsMTEgQEANCiAJY29uc3Qgc2l6ZV90IGFsaWduID0g NDsNCiAjZW5kaWYNCiAJY29uc3QgdW5zaWduZWQgY2hhciAqbmV4dCwgKmVu ZDsNCi0JdWludDY0X3QgY3JjMCwgY3JjMSwgY3JjMjsgICAgICAvKiBuZWVk IHRvIGJlIDY0IGJpdHMgZm9yIGNyYzMycSAqLw0KKyNpZmRlZiBfX2FtZDY0 X18NCisJdWludDY0X3QgY3JjMCwgY3JjMSwgY3JjMjsNCisjZWxzZQ0KKwl1 aW50MzJfdCBjcmMwLCBjcmMxLCBjcmMyOw0KKyNlbmRpZg0KIA0KIAluZXh0 ID0gYnVmOw0KIAljcmMwID0gY3JjOw0KQEAgLTIwMiw2ICsyMzYsNyBAQA0K IAkJbGVuLS07DQogCX0NCiANCisjaWYgTE9ORyA+IFNIT1JUDQogCS8qDQog CSAqIENvbXB1dGUgdGhlIGNyYyBvbiBzZXRzIG9mIExPTkcqMyBieXRlcywg ZXhlY3V0aW5nIHRocmVlIGluZGVwZW5kZW50DQogCSAqIGNyYyBpbnN0cnVj dGlvbnMsIGVhY2ggb24gTE9ORyBieXRlcyAtLSB0aGlzIGlzIG9wdGltaXpl ZCBmb3IgdGhlDQpAQCAtMjA5LDYgKzI0NCw3IEBADQogCSAqIGhhdmUgYSB0 aHJvdWdocHV0IG9mIG9uZSBjcmMgcGVyIGN5Y2xlLCBidXQgYSBsYXRlbmN5 IG9mIHRocmVlDQogCSAqIGN5Y2xlcy4NCiAJICovDQorCWNyYyA9IDA7DQog CXdoaWxlIChsZW4gPj0gTE9ORyAqIDMpIHsNCiAJCWNyYzEgPSAwOw0KIAkJ Y3JjMiA9IDA7DQpAQCAtMjI5LDE2ICsyNjUsNjQgQEANCiAjZW5kaWYNCiAJ CQluZXh0ICs9IGFsaWduOw0KIAkJfSB3aGlsZSAobmV4dCA8IGVuZCk7DQot CQljcmMwID0gY3JjMzJjX3NoaWZ0KGNyYzMyY19sb25nLCBjcmMwKSBeIGNy YzE7DQotCQljcmMwID0gY3JjMzJjX3NoaWZ0KGNyYzMyY19sb25nLCBjcmMw KSBeIGNyYzI7DQorCQkvKi0NCisJCSAqIFVwZGF0ZSB0aGUgY3JjLiAgVHJ5 IHRvIGRvIGl0IGluIHBhcmFsbGVsIHdpdGggdGhlIGlubmVyDQorCQkgKiBs b29wLiAgJ2NyYycgaXMgdXNlZCB0byBhY2N1bXVsYXRlIGNyYzAgYW5kIGNy YzENCisJCSAqIHByb2R1Y2VkIGJ5IHRoZSBpbm5lciBsb29wIHNvIHRoYXQg dGhlIG5leHQgaXRlcmF0aW9uDQorCQkgKiBvZiB0aGUgbG9vcCBkb2Vzbid0 IGRlcGVuZCBvbiBhbnl0aGluZyBleGNlcHQgY3JjMi4NCisJCSAqDQorCQkg KiBUaGUgZnVsbCBleHByZXNzaW9uIGZvciB0aGUgdXBkYXRlIGlzOg0KKwkJ ICogICAgIGNyYyA9IFMqUypTKmNyYyArIFMqUypjcmMwICsgUypjcmMxDQor CQkgKiB3aGVyZSB0aGUgdGVybXMgYXJlIHBvbHlub21pYWxzIG1vZHVsbyB0 aGUgQ1JDIHBvbHlub21pYWwuDQorCQkgKiBXZSByZWdyb3VwIHRoaXMgc3Vi dGx5IGFzOg0KKwkJICogICAgIGNyYyA9IFMqUyAqIChTKmNyYyArIGNyYzAp ICsgUypjcmMxLg0KKwkJICogVGhpcyBoYXMgYW4gZXh0cmEgZGVwZW5kZW5j eSB3aGljaCByZWR1Y2VzIHBvc3NpYmxlDQorCQkgKiBwYXJhbGxlbGlzbSBm b3IgdGhlIGV4cHJlc3Npb24sIGJ1dCBpdCB0dXJucyBvdXQgdG8gYmUNCisJ CSAqIGJlc3QgdG8gaW50ZW50aW9uYWxseSBkZWxheSBldmFsdWF0aW9uIG9m IHRoaXMgZXhwcmVzc2lvbg0KKwkJICogc28gdGhhdCBpdCBjb21wZXRlcyBs ZXNzIHdpdGggdGhlIGlubmVyIGxvb3AuDQorCQkgKg0KKwkJICogV2UgYWxz byBpbnRlbnRpb25hbGx5IHJlZHVjZSBwYXJhbGxlbGlzbSBieSBmZWVkbmcg YmFjaw0KKwkJICogY3JjMiB0byB0aGUgaW5uZXIgbG9vcCBhcyBjcmMwIGlu c3RlYWQgb2YgYWNjdW11bGF0aW5nDQorCQkgKiBpdCBpbiBjcmMuICBUaGlz IHN5bmNocm9uaXplcyB0aGUgbG9vcCB3aXRoIGNyYyB1cGRhdGUuDQorCQkg KiBDUFUgYW5kL29yIGNvbXBpbGVyIHNjaGVkdWxlcnMgcHJvZHVjZWQgYmFk IG9yZGVyIHdpdGhvdXQNCisJCSAqIHRoaXMuDQorCQkgKg0KKwkJICogU2hp ZnRzIHRha2UgYWJvdXQgMTIgY3ljbGVzIGVhY2gsIHNvIDMgaGVyZSB3aXRo IDINCisJCSAqIHBhcmFsbGVsaXphYmxlIHRha2UgYWJvdXQgMjQgY3ljbGVz IGFuZCB0aGUgY3JjIHVwZGF0ZQ0KKwkJICogdGFrZXMgc2xpZ2h0bHkgbG9u Z2VyLiAgOCBkZXBlbmRlbnQgY3JjMzIgaW5zdHJ1Y3Rpb25zDQorCQkgKiBj YW4gcnVuIGluIDI0IGN5Y2xlcywgc28gdGhlIDMtd2F5IGJsb2NraW5nIGlz IHdvcnNlDQorCQkgKiB0aGFuIHVzZWxlc3MgZm9yIHNpemVzIGxlc3MgdGhh biA4ICogPHdvcmQgc2l6ZT4gPSA2NA0KKwkJICogb24gYW1kNjQuICBJbiBw cmFjdGljZSwgU0hPUlQgPSAzMiBjb25maXJtcyB0aGVzZQ0KKwkJICogdGlt aW5nIGNhbGN1bGF0aW9ucyBieSBnaXZpbmcgYSBzbWFsbCBpbXByb3ZlbWVu dA0KKwkJICogc3RhcnRpbmcgYXQgc2l6ZSA5Ni4gIFRoZW4gdGhlIGlubmVy IGxvb3AgdGFrZXMgYWJvdXQNCisJCSAqIDEyIGN5Y2xlcyBhbmQgdGhlIGNy YyB1cGRhdGUgYWJvdXQgMjQsIGJ1dCB0aGVzZSBhcmUNCisJCSAqIHBhcnRs eSBpbiBwYXJhbGxlbCBzbyB0aGUgdG90YWwgdGltZSBpcyBsZXNzIHRoYW4g dGhlDQorCQkgKiAzNiBjeWNsZXMgdGhhdCAxMiBkZXBlbmRlbnQgY3JjMzIg aW5zdHJ1Y3Rpb25zIHdvdWxkDQorCQkgKiB0YWtlLg0KKwkJICoNCisJCSAq IFRvIGhhdmUgYSBjaGFuY2Ugb2YgY29tcGxldGVseSBoaWRpbmcgdGhlIG92 ZXJoZWFkIGZvcg0KKwkJICogdGhlIGNyYyB1cGRhdGUsIHRoZSBpbm5lciBs b29wIG11c3QgdGFrZSBjb25zaWRlcmFibHkNCisJCSAqIGxvbmdlciB0aGFu IDI0IGN5Y2xlcy4gIExPTkcgPSA2NCBtYWtlcyB0aGUgaW5uZXIgbG9vcA0K KwkJICogdGFrZSBhYm91dCAyNCBjeWNsZXMsIHNvIGlzIG5vdCBxdWl0ZSBs YXJnZSBlbm91Z2guDQorCQkgKiBMT05HID0gMTI4IHdvcmtzIE9LLiAgVW5o aWRlYWJsZSBvdmVyaGVhZHMgYXJlIGFib3V0DQorCQkgKiAxMiBjeWNsZXMg cGVyIGlubmVyIGxvb3AuICBBbGwgYXNzdW1pbmcgdGltaW5nIGxpa2UNCisJ CSAqIEhhc3dlbGwuDQorCQkgKi8NCisJCWNyYyA9IGNyYzMyY19zaGlmdChj cmMzMmNfbG9uZywgY3JjKSBeIGNyYzA7DQorCQljcmMxID0gY3JjMzJjX3No aWZ0KGNyYzMyY19sb25nLCBjcmMxKTsNCisJCWNyYyA9IGNyYzMyY19zaGlm dChjcmMzMmNfMmxvbmcsIGNyYykgXiBjcmMxOw0KKwkJY3JjMCA9IGNyYzI7 DQogCQluZXh0ICs9IExPTkcgKiAyOw0KIAkJbGVuIC09IExPTkcgKiAzOw0K IAl9DQorCWNyYzAgXj0gY3JjOw0KKyNlbmRpZiAvKiBMT05HID4gU0hPUlQg Ki8NCiANCiAJLyoNCiAJICogRG8gdGhlIHNhbWUgdGhpbmcsIGJ1dCBub3cg b24gU0hPUlQqMyBibG9ja3MgZm9yIHRoZSByZW1haW5pbmcgZGF0YQ0KIAkg KiBsZXNzIHRoYW4gYSBMT05HKjMgYmxvY2sNCiAJICovDQorCWNyYyA9IDA7 DQogCXdoaWxlIChsZW4gPj0gU0hPUlQgKiAzKSB7DQogCQljcmMxID0gMDsN CiAJCWNyYzIgPSAwOw0KQEAgLTI1OSwxMSArMzQzLDE0IEBADQogI2VuZGlm DQogCQkJbmV4dCArPSBhbGlnbjsNCiAJCX0gd2hpbGUgKG5leHQgPCBlbmQp Ow0KLQkJY3JjMCA9IGNyYzMyY19zaGlmdChjcmMzMmNfc2hvcnQsIGNyYzAp IF4gY3JjMTsNCi0JCWNyYzAgPSBjcmMzMmNfc2hpZnQoY3JjMzJjX3Nob3J0 LCBjcmMwKSBeIGNyYzI7DQorCQljcmMgPSBjcmMzMmNfc2hpZnQoY3JjMzJj X3Nob3J0LCBjcmMpIF4gY3JjMDsNCisJCWNyYzEgPSBjcmMzMmNfc2hpZnQo Y3JjMzJjX3Nob3J0LCBjcmMxKTsNCisJCWNyYyA9IGNyYzMyY19zaGlmdChj cmMzMmNfMnNob3J0LCBjcmMpIF4gY3JjMTsNCisJCWNyYzAgPSBjcmMyOw0K IAkJbmV4dCArPSBTSE9SVCAqIDI7DQogCQlsZW4gLT0gU0hPUlQgKiAzOw0K IAl9DQorCWNyYzAgXj0gY3JjOw0KIA0KIAkvKiBDb21wdXRlIHRoZSBjcmMg b24gdGhlIHJlbWFpbmluZyBieXRlcyBhdCBuYXRpdmUgd29yZCBzaXplLiAq Lw0KIAllbmQgPSBuZXh0ICsgKGxlbiAtIChsZW4gJiAoYWxpZ24gLSAxKSkp Ow0K --0-952914049-1488248872=:2733-- From owner-svn-src-all@freebsd.org Tue Feb 28 03:43:49 2017 Return-Path: Delivered-To: svn-src-all@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 0481FCEF59B; Tue, 28 Feb 2017 03:43:49 +0000 (UTC) (envelope-from sepherosa@gmail.com) Received: from mail-ua0-x233.google.com (mail-ua0-x233.google.com [IPv6:2607:f8b0:400c:c08::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B46F7AEB; Tue, 28 Feb 2017 03:43:48 +0000 (UTC) (envelope-from sepherosa@gmail.com) Received: by mail-ua0-x233.google.com with SMTP id f54so343721uaa.1; Mon, 27 Feb 2017 19:43:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=GaSKfr1KXlUheEjbXVtD0DOc36zGhrjxy14MdoUNhSM=; b=tuh0MADX8DaQsOhCGIyIAHMpc7VbHrLtfqLvpaOCcIaf39aJ7eiG08WbGX92gmk4YJ 9PAAvsKpsIwiNN12QR8kyT/pQndDn+V3CA349oxEZD831xFK7hQwNUIwiuf/yTasWz91 GqsK9bdnPRj+QUblgzV2covSWFv+jyVc18bdqmW8qUtA9aYNlru78d9aX2ljH1VczucN xwij1qheSFUyMg1N6P6wI4FGmX66u9lI74rIbJqC6aRV/sCKHoljLuOhxlgQQD7piXPC 8WJZd2k6TCgepSYob3FU8XgUfmDNCx/+2UvyOflMzLywKce8mTIVzS0IODbtQ35oFTnd YtHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=GaSKfr1KXlUheEjbXVtD0DOc36zGhrjxy14MdoUNhSM=; b=ew0Cce0uegYaeNRo3RS0BW2L6eqOAvQ81zHdckU+s+b05JPqn9ZgJ7WcNaUr4EEb1Z IxuXB/euep10q1jJXb7fnm+AAX415yiyOa3eWnrUZJaQ5wAa6qX+C73Udh9fd6kG5nBj 4hge7e9oS5q6gkCR8NRYiLwAn9+uoeTw8A4pXNFbM7LDn8BmLNpLIXDTeHkvU+o7czmS 7dovKbFBXnW37CQTFjpUUBxSAXV9W+2wAYGfXXH6M2B1yEcY8JlaMytKurZBxvaBzKd2 KR/cWOfgYAvDlMiqEoYfbO45eyGlbL6s3FLGAbSom1MSVZtO1ql04z0f1AlgluHARhW6 FXdQ== X-Gm-Message-State: AMke39liXMoLQGlQvMI1bT9SL6fDkEAQ63ULkzEysUNeE1Sn7Ojy3mqrkieH9XmMxoOIdwBriasdPixbWH9ASA== X-Received: by 10.176.90.139 with SMTP id w11mr81334uae.106.1488253427717; Mon, 27 Feb 2017 19:43:47 -0800 (PST) MIME-Version: 1.0 Received: by 10.176.66.193 with HTTP; Mon, 27 Feb 2017 19:43:47 -0800 (PST) In-Reply-To: <201702280227.v1S2RpsS094905@repo.freebsd.org> References: <201702280227.v1S2RpsS094905@repo.freebsd.org> From: Sepherosa Ziehau Date: Tue, 28 Feb 2017 11:43:47 +0800 Message-ID: Subject: Re: svn commit: r314369 - head/sys/dev/bnxt To: Stephen Hurd Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 03:43:49 -0000 On Tue, Feb 28, 2017 at 10:27 AM, Stephen Hurd wrote: > Modified: head/sys/dev/bnxt/bnxt_txrx.c > ============================================================================== > --- head/sys/dev/bnxt/bnxt_txrx.c Tue Feb 28 00:58:16 2017 (r314368) > +++ head/sys/dev/bnxt/bnxt_txrx.c Tue Feb 28 02:27:51 2017 (r314369) > @@ -412,6 +412,37 @@ cmpl_invalid: > return avail; > } > > +static void > +bnxt_set_rsstype(if_rxd_info_t ri, uint8_t rss_hash_type) > +{ > + uint8_t rss_profile_id; > + > + rss_profile_id = BNXT_GET_RSS_PROFILE_ID(rss_hash_type); > + switch (rss_profile_id) { > + default: > + ri->iri_rsstype = M_HASHTYPE_OPAQUE; > + break; Is it a hash value or just ring index? If its a hash value, you should set it to M_HASHTYPE_OPAQUE_HASH here. Thanks, sephe From owner-svn-src-all@freebsd.org Tue Feb 28 04:13:21 2017 Return-Path: Delivered-To: svn-src-all@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 C57F4CF039E; Tue, 28 Feb 2017 04:13:21 +0000 (UTC) (envelope-from jhibbits@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 924AFEC4; Tue, 28 Feb 2017 04:13:21 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1S4DKXP037537; Tue, 28 Feb 2017 04:13:20 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1S4DKFl037536; Tue, 28 Feb 2017 04:13:20 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201702280413.v1S4DKFl037536@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Tue, 28 Feb 2017 04:13:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314370 - head/sys/powerpc/include X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 04:13:21 -0000 Author: jhibbits Date: Tue Feb 28 04:13:20 2017 New Revision: 314370 URL: https://svnweb.freebsd.org/changeset/base/314370 Log: Unbreak kernel breakpoints, broken for ~4 years now When committing DTrace in 2012/2013 era I inadvertently broke breakpoints, by setting EXC_DTRACE to the same value as BKPT_INST. Change EXC_DTRACE to a different, yet logically identical, trap (tw ,31,31). MFC after: 2 weeks Modified: head/sys/powerpc/include/trap.h Modified: head/sys/powerpc/include/trap.h ============================================================================== --- head/sys/powerpc/include/trap.h Tue Feb 28 02:27:51 2017 (r314369) +++ head/sys/powerpc/include/trap.h Tue Feb 28 04:13:20 2017 (r314370) @@ -126,7 +126,7 @@ #define EXC_PGM_TRAP (1UL << 17) /* DTrace trap opcode. */ -#define EXC_DTRACE 0x7c810808 +#define EXC_DTRACE 0x7ffff808 /* Magic pointer to store TOC base and other info for trap handlers on ppc64 */ #define TRAP_GENTRAP 0x1f0 From owner-svn-src-all@freebsd.org Tue Feb 28 04:31:29 2017 Return-Path: Delivered-To: svn-src-all@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 D9A29CF090B; Tue, 28 Feb 2017 04:31:29 +0000 (UTC) (envelope-from jhibbits@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 9042C8E0; Tue, 28 Feb 2017 04:31:29 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1S4VSin044441; Tue, 28 Feb 2017 04:31:28 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1S4VSE2044440; Tue, 28 Feb 2017 04:31:28 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201702280431.v1S4VSE2044440@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Tue, 28 Feb 2017 04:31:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314371 - head/sys/powerpc/powerpc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 04:31:30 -0000 Author: jhibbits Date: Tue Feb 28 04:31:28 2017 New Revision: 314371 URL: https://svnweb.freebsd.org/changeset/base/314371 Log: Make kernel breakpoints work for book-e Add the necessary bits to enable kernel breakpoints for Book-E. The entrypoint for program exception is very trivial, so rather than expand it to be similar to AIM, add it into the standard trap handler. This wasn't blocked out as Book-E specific because it is only a minor redundancy over AIM, which should have already called db_trap_glue() at this point. If it's going to panic with a fatal trap anywya, it doesn't matter if it goes through this path again. Modified: head/sys/powerpc/powerpc/trap.c Modified: head/sys/powerpc/powerpc/trap.c ============================================================================== --- head/sys/powerpc/powerpc/trap.c Tue Feb 28 04:13:20 2017 (r314370) +++ head/sys/powerpc/powerpc/trap.c Tue Feb 28 04:31:28 2017 (r314371) @@ -97,6 +97,10 @@ static int handle_user_slb_spill(pmap_t extern int n_slbs; #endif +#ifdef KDB +int db_trap_glue(struct trapframe *); /* Called from trap_subr.S */ +#endif + struct powerpc_exception { u_int vector; char *name; @@ -338,9 +342,13 @@ trap(struct trapframe *frame) KASSERT(cold || td->td_ucred != NULL, ("kernel trap doesn't have ucred")); switch (type) { -#ifdef KDTRACE_HOOKS case EXC_PGM: +#ifdef KDTRACE_HOOKS +#ifdef AIM if (frame->srr1 & EXC_PGM_TRAP) { +#else + if (frame->cpu.booke.esr & ESR_PTR) { +#endif if (*(uint32_t *)frame->srr0 == EXC_DTRACE) { if (dtrace_invop_jump_addr != NULL) { dtrace_invop_jump_addr(frame); @@ -348,8 +356,12 @@ trap(struct trapframe *frame) } } } - break; #endif +#ifdef KDB + if (db_trap_glue(frame)) + return; +#endif + break; #if defined(__powerpc64__) && defined(AIM) case EXC_DSE: if ((frame->dar & SEGMENT_MASK) == USER_ADDR) { @@ -833,11 +845,10 @@ fix_unaligned(struct thread *td, struct } #ifdef KDB -int db_trap_glue(struct trapframe *); /* Called from trap_subr.S */ - int db_trap_glue(struct trapframe *frame) { + if (!(frame->srr1 & PSL_PR) && (frame->exc == EXC_TRC || frame->exc == EXC_RUNMODETRC #ifdef AIM @@ -845,6 +856,7 @@ db_trap_glue(struct trapframe *frame) && (frame->srr1 & EXC_PGM_TRAP)) #else || (frame->exc == EXC_DEBUG) + || (frame->cpu.booke.esr & ESR_PTR) #endif || frame->exc == EXC_BPT || frame->exc == EXC_DSI)) { @@ -856,7 +868,8 @@ db_trap_glue(struct trapframe *frame) #ifdef AIM if (type == EXC_PGM && (frame->srr1 & EXC_PGM_TRAP)) { #else - if (frame->cpu.booke.esr & ESR_PTR) { + if (type == EXC_DEBUG || + (frame->cpu.booke.esr & ESR_PTR)) { #endif type = T_BREAKPOINT; } From owner-svn-src-all@freebsd.org Tue Feb 28 04:48:31 2017 Return-Path: Delivered-To: svn-src-all@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 BEB06CF0DB0; Tue, 28 Feb 2017 04:48:31 +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 8E3ACF8B; Tue, 28 Feb 2017 04:48:31 +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 v1S4mUju049537; Tue, 28 Feb 2017 04:48:30 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1S4mUK7049536; Tue, 28 Feb 2017 04:48:30 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201702280448.v1S4mUK7049536@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Tue, 28 Feb 2017 04:48:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314372 - head/sys/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 04:48:31 -0000 Author: ngie Date: Tue Feb 28 04:48:30 2017 New Revision: 314372 URL: https://svnweb.freebsd.org/changeset/base/314372 Log: Use "build" instead of "all" when building ports modules "all" in ports currently means "stage the ports", which requires root today, and brings to light other potential issues, like ENAMETOOLONG with staged directories (bug 161481, etc). This fixes buildkernel for me when run as a non-root user, assuming all of the prerequisites have been installed beforehand and are up-to-date. MFC after: 1 month Discussed with: swills (IRC) Sponsored by: Dell EMC Isilon Modified: head/sys/conf/kern.post.mk Modified: head/sys/conf/kern.post.mk ============================================================================== --- head/sys/conf/kern.post.mk Tue Feb 28 04:31:28 2017 (r314371) +++ head/sys/conf/kern.post.mk Tue Feb 28 04:48:30 2017 (r314372) @@ -79,7 +79,7 @@ PORTSMODULESENV=\ all: .for __i in ${PORTS_MODULES} @${ECHO} "===> Ports module ${__i} (all)" - cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B clean all + cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B clean build .endfor .for __target in install reinstall clean From owner-svn-src-all@freebsd.org Tue Feb 28 05:14:46 2017 Return-Path: Delivered-To: svn-src-all@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 1D564CF1361; Tue, 28 Feb 2017 05:14:46 +0000 (UTC) (envelope-from glebius@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 DB8B6CE2; Tue, 28 Feb 2017 05:14:45 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1S5Ejm5060903; Tue, 28 Feb 2017 05:14:45 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1S5EhPq060885; Tue, 28 Feb 2017 05:14:43 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201702280514.v1S5EhPq060885@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 28 Feb 2017 05:14:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314373 - in head: . etc/defaults etc/rc.d lib/libc/regex share/man/man4/man4.i386 share/man/man5 sys/amd64/conf sys/boot/forth sys/compat/svr4 sys/conf sys/dev/streams sys/i386/conf sy... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 05:14:46 -0000 Author: glebius Date: Tue Feb 28 05:14:42 2017 New Revision: 314373 URL: https://svnweb.freebsd.org/changeset/base/314373 Log: Remove SVR4 (System V Release 4) binary compatibility support. UNIX System V Release 4 is operating system released in 1988. It ceased to exist in early 2000-s. Deleted: head/share/man/man4/man4.i386/streams.4 head/share/man/man4/man4.i386/svr4.4 head/sys/compat/svr4/ head/sys/dev/streams/ head/sys/i386/svr4/ head/sys/modules/streams/ head/sys/modules/svr4/ Modified: head/ObsoleteFiles.inc head/etc/defaults/rc.conf head/etc/rc.d/abi head/lib/libc/regex/re_format.7 head/share/man/man4/man4.i386/Makefile head/share/man/man5/rc.conf.5 head/sys/amd64/conf/NOTES head/sys/boot/forth/loader.conf head/sys/conf/files head/sys/conf/files.i386 head/sys/conf/options.amd64 head/sys/conf/options.i386 head/sys/i386/conf/NOTES head/sys/kern/makesyscalls.sh head/sys/modules/Makefile head/sys/net/if.c head/usr.sbin/bsdconfig/startup/include/messages.subr head/usr.sbin/bsdconfig/startup/misc Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Tue Feb 28 04:48:30 2017 (r314372) +++ head/ObsoleteFiles.inc Tue Feb 28 05:14:42 2017 (r314373) @@ -38,6 +38,11 @@ # xargs -n1 | sort | uniq -d; # done +# 20170226: SVR4 compatibility removed +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/share/man/man4/streams.4 +OLD_FILES+=usr/share/man/man4/svr4.4 +.endif # 20170219: OpenPAM RADULA upgrade removed the libpam tests OLD_FILES+=usr/tests/lib/libpam/Kyuafile OLD_FILES+=usr/tests/lib/libpam/t_openpam_ctype Modified: head/etc/defaults/rc.conf ============================================================================== --- head/etc/defaults/rc.conf Tue Feb 28 04:48:30 2017 (r314372) +++ head/etc/defaults/rc.conf Tue Feb 28 05:14:42 2017 (r314373) @@ -630,7 +630,6 @@ firstboot_sentinel="/firstboot" # Script # Emulation/compatibility services provided by /etc/rc.d/abi sysvipc_enable="NO" # Load System V IPC primitives at startup (or NO). linux_enable="NO" # Linux binary compatibility loaded at startup (or NO). -svr4_enable="NO" # SysVR4 emulation loaded at startup (or NO). clear_tmp_enable="NO" # Clear /tmp at startup. clear_tmp_X="YES" # Clear and recreate X11-related directories in /tmp ldconfig_insecure="NO" # Set to YES to disable ldconfig security checks Modified: head/etc/rc.d/abi ============================================================================== --- head/etc/rc.d/abi Tue Feb 28 04:48:30 2017 (r314372) +++ head/etc/rc.d/abi Tue Feb 28 05:14:42 2017 (r314373) @@ -43,25 +43,18 @@ linux_start() fi } -svr4_start() -{ - echo -n ' svr4' - load_kld -m svr4elf svr4 -} - abi_start() { local _echostop _echostop= - if checkyesno sysvipc_enable || checkyesno linux_enable || checkyesno svr4_enable; then + if checkyesno sysvipc_enable || checkyesno linux_enable; then echo -n 'Additional ABI support:' _echostop=yes fi checkyesno sysvipc_enable && sysv_start checkyesno linux_enable && linux_start - checkyesno svr4_enable && svr4_start [ -n "${_echostop}" ] && echo '.' } Modified: head/lib/libc/regex/re_format.7 ============================================================================== --- head/lib/libc/regex/re_format.7 Tue Feb 28 04:48:30 2017 (r314372) +++ head/lib/libc/regex/re_format.7 Tue Feb 28 05:14:42 2017 (r314373) @@ -319,7 +319,7 @@ The additional word delimiters and .Ql \e> are provided to ease compatibility with traditional -.Xr svr4 4 +SVR4 systems but are not portable and should be avoided. .Pp In the event that an RE could match more than one substring of a given Modified: head/share/man/man4/man4.i386/Makefile ============================================================================== --- head/share/man/man4/man4.i386/Makefile Tue Feb 28 04:48:30 2017 (r314372) +++ head/share/man/man4/man4.i386/Makefile Tue Feb 28 05:14:42 2017 (r314373) @@ -25,8 +25,6 @@ MAN= aic.4 \ pnpbios.4 \ sbni.4 \ smapi.4 \ - streams.4 \ - svr4.4 \ vpd.4 \ vx.4 Modified: head/share/man/man5/rc.conf.5 ============================================================================== --- head/share/man/man5/rc.conf.5 Tue Feb 28 04:48:30 2017 (r314372) +++ head/share/man/man5/rc.conf.5 Tue Feb 28 05:14:42 2017 (r314373) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 10, 2016 +.Dd February 26, 2017 .Dt RC.CONF 5 .Os .Sh NAME @@ -3631,11 +3631,6 @@ Set to .Dq Li YES to enable Linux/ELF binary emulation at system initial boot time. -.It Va svr4_enable -.Pq Vt bool -If set to -.Dq Li YES , -enable SysVR4 emulation at boot time. .It Va sysvipc_enable .Pq Vt bool If set to Modified: head/sys/amd64/conf/NOTES ============================================================================== --- head/sys/amd64/conf/NOTES Tue Feb 28 04:48:30 2017 (r314372) +++ head/sys/amd64/conf/NOTES Tue Feb 28 05:14:42 2017 (r314373) @@ -633,27 +633,6 @@ options LINPROCFS # and PSEUDOFS) options LINSYSFS -# -# SysVR4 ABI emulation -# -# The svr4 ABI emulator can be statically compiled into the kernel or loaded as -# a KLD module. -# The STREAMS network emulation code can also be compiled statically or as a -# module. If loaded as a module, it must be loaded before the svr4 module -# (the /usr/sbin/svr4 script does this for you). If compiling statically, -# the `streams' device must be configured into any kernel which also -# specifies COMPAT_SVR4. It is possible to have a statically-configured -# STREAMS device and a dynamically loadable svr4 emulator; the /usr/sbin/svr4 -# script understands that it doesn't need to load the `streams' module under -# those circumstances. -# Caveat: At this time, `options KTRACE' is required for the svr4 emulator -# (whether static or dynamic). -# -#XXX#options COMPAT_SVR4 # build emulator statically -#XXX#options DEBUG_SVR4 # enable verbose debugging -#XXX#device streams # STREAMS network driver (required for svr4). - - ##################################################################### # VM OPTIONS Modified: head/sys/boot/forth/loader.conf ============================================================================== --- head/sys/boot/forth/loader.conf Tue Feb 28 04:48:30 2017 (r314372) +++ head/sys/boot/forth/loader.conf Tue Feb 28 05:14:42 2017 (r314373) @@ -273,8 +273,6 @@ cloudabi64_load="NO" # 64-bit CloudABI ibcs2_load="NO" # IBCS2 (SCO) emulation ibcs2_coff_load="NO" linux_load="NO" # Linux emulation -svr4_load="NO" # SystemV R4 emulation -streams_load="NO" # System V streams module ############################################################## Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Tue Feb 28 04:48:30 2017 (r314372) +++ head/sys/conf/files Tue Feb 28 05:14:42 2017 (r314373) @@ -2959,7 +2959,6 @@ dev/stg/tmc18c30_pccard.c optional stg p dev/stg/tmc18c30_pci.c optional stg pci dev/stg/tmc18c30_subr.c optional stg dev/stge/if_stge.c optional stge -dev/streams/streams.c optional streams dev/sym/sym_hipd.c optional sym \ dependency "$S/dev/sym/sym_{conf,defs}.h" dev/syscons/blank/blank_saver.c optional blank_saver Modified: head/sys/conf/files.i386 ============================================================================== --- head/sys/conf/files.i386 Tue Feb 28 04:48:30 2017 (r314372) +++ head/sys/conf/files.i386 Tue Feb 28 05:14:42 2017 (r314373) @@ -43,18 +43,6 @@ linux_vdso.so optional compat_linux \ no-implicit-rule \ clean "linux_vdso.so" # -svr4_genassym.o optional compat_svr4 \ - dependency "$S/i386/svr4/svr4_genassym.c" \ - compile-with "${CC} ${CFLAGS:N-flto:N-fno-common} -c ${.IMPSRC}" \ - no-obj no-implicit-rule \ - clean "svr4_genassym.o" -# -svr4_assym.h optional compat_svr4 \ - dependency "$S/kern/genassym.sh svr4_genassym.o" \ - compile-with "sh $S/kern/genassym.sh svr4_genassym.o > ${.TARGET}" \ - no-obj no-implicit-rule before-depend \ - clean "svr4_assym.h" -# font.h optional sc_dflt_font \ compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ no-obj no-implicit-rule before-depend \ @@ -127,22 +115,6 @@ compat/ndis/subr_ntoskrnl.c optional ndi compat/ndis/subr_pe.c optional ndisapi pci compat/ndis/subr_usbd.c optional ndisapi pci compat/ndis/winx32_wrap.S optional ndisapi pci -compat/svr4/imgact_svr4.c optional compat_svr4 -compat/svr4/svr4_fcntl.c optional compat_svr4 -compat/svr4/svr4_filio.c optional compat_svr4 -compat/svr4/svr4_ioctl.c optional compat_svr4 -compat/svr4/svr4_ipc.c optional compat_svr4 -compat/svr4/svr4_misc.c optional compat_svr4 -compat/svr4/svr4_resource.c optional compat_svr4 -compat/svr4/svr4_signal.c optional compat_svr4 -compat/svr4/svr4_socket.c optional compat_svr4 -compat/svr4/svr4_sockio.c optional compat_svr4 -compat/svr4/svr4_stat.c optional compat_svr4 -compat/svr4/svr4_stream.c optional compat_svr4 -compat/svr4/svr4_syscallnames.c optional compat_svr4 -compat/svr4/svr4_sysent.c optional compat_svr4 -compat/svr4/svr4_sysvec.c optional compat_svr4 -compat/svr4/svr4_termios.c optional compat_svr4 bf_enc.o optional crypto | ipsec | ipsec_support \ dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ @@ -546,11 +518,6 @@ i386/linux/linux_sysent.c optional compa i386/linux/linux_sysvec.c optional compat_linux i386/pci/pci_cfgreg.c optional pci i386/pci/pci_pir.c optional pci -i386/svr4/svr4_locore.s optional compat_svr4 \ - dependency "svr4_assym.h" \ - warning "COMPAT_SVR4 is broken and should be avoided" -i386/svr4/svr4_machdep.c optional compat_svr4 -# isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/kern_clocksource.c standard Modified: head/sys/conf/options.amd64 ============================================================================== --- head/sys/conf/options.amd64 Tue Feb 28 04:48:30 2017 (r314372) +++ head/sys/conf/options.amd64 Tue Feb 28 05:14:42 2017 (r314373) @@ -18,8 +18,6 @@ COMPAT_FREEBSD32 opt_compat.h #IBCS2 opt_dontuse.h #COMPAT_LINUX opt_dontuse.h COMPAT_LINUX32 opt_compat.h -#COMPAT_SVR4 opt_dontuse.h -#DEBUG_SVR4 opt_svr4.h LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h NDISAPI opt_dontuse.h Modified: head/sys/conf/options.i386 ============================================================================== --- head/sys/conf/options.i386 Tue Feb 28 04:48:30 2017 (r314372) +++ head/sys/conf/options.i386 Tue Feb 28 05:14:42 2017 (r314373) @@ -24,8 +24,6 @@ PV_STATS opt_pmap.h COMPAT_AOUT opt_dontuse.h IBCS2 opt_dontuse.h COMPAT_LINUX opt_dontuse.h -COMPAT_SVR4 opt_dontuse.h -DEBUG_SVR4 opt_svr4.h LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h NDISAPI opt_dontuse.h Modified: head/sys/i386/conf/NOTES ============================================================================== --- head/sys/i386/conf/NOTES Tue Feb 28 04:48:30 2017 (r314372) +++ head/sys/i386/conf/NOTES Tue Feb 28 05:14:42 2017 (r314373) @@ -954,26 +954,6 @@ options LINPROCFS # and PSEUDOFS) options LINSYSFS -# -# SysVR4 ABI emulation -# -# The svr4 ABI emulator can be statically compiled into the kernel or loaded as -# a KLD module. -# The STREAMS network emulation code can also be compiled statically or as a -# module. If loaded as a module, it must be loaded before the svr4 module -# (the /usr/sbin/svr4 script does this for you). If compiling statically, -# the `streams' device must be configured into any kernel which also -# specifies COMPAT_SVR4. It is possible to have a statically-configured -# STREAMS device and a dynamically loadable svr4 emulator; the /usr/sbin/svr4 -# script understands that it doesn't need to load the `streams' module under -# those circumstances. -# Caveat: At this time, `options KTRACE' is required for the svr4 emulator -# (whether static or dynamic). -# -options COMPAT_SVR4 # build emulator statically -options DEBUG_SVR4 # enable verbose debugging -device streams # STREAMS network driver (required for svr4). - # Enable NDIS binary driver support options NDISAPI device ndis Modified: head/sys/kern/makesyscalls.sh ============================================================================== --- head/sys/kern/makesyscalls.sh Tue Feb 28 04:48:30 2017 (r314372) +++ head/sys/kern/makesyscalls.sh Tue Feb 28 05:14:42 2017 (r314373) @@ -455,9 +455,8 @@ sed -e ' if (!flag("NOPROTO") && !flag("NODEF")) { if (funcname == "nosys" || funcname == "lkmnosys" || funcname == "sysarch" || funcname ~ /^freebsd/ || - funcname ~ /^linux/ || funcname ~ /^svr4/ || - funcname ~ /^ibcs2/ || funcname ~ /^xenix/ || - funcname ~ /^cloudabi/) { + funcname ~ /^linux/ || funcname ~ /^ibcs2/ || + funcname ~ /^xenix/ || funcname ~ /^cloudabi/) { printf("%s\t%s(struct thread *, struct %s *)", rettype, funcname, argalias) > sysdcl } else { @@ -476,9 +475,8 @@ sed -e ' } else { if (funcname == "nosys" || funcname == "sysarch" || funcname == "lkmnosys" || funcname ~ /^freebsd/ || - funcname ~ /^linux/ || funcname ~ /^svr4/ || - funcname ~ /^ibcs2/ || funcname ~ /^xenix/ || - funcname ~ /^cloudabi/) { + funcname ~ /^linux/ || funcname ~ /^ibcs2/ || + funcname ~ /^xenix/ || funcname ~ /^cloudabi/) { printf("%s, %s, NULL, 0, 0, %s, %s },", funcname, auditev, flags, thr_flag) > sysent column = column + length(funcname) + length(auditev) + length(flags) + 3 } else { Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Tue Feb 28 04:48:30 2017 (r314372) +++ head/sys/modules/Makefile Tue Feb 28 05:14:42 2017 (r314373) @@ -350,8 +350,6 @@ SUBDIR= \ ste \ ${_stg} \ stge \ - ${_streams} \ - ${_svr4} \ ${_sym} \ ${_syscons} \ sysvipc \ @@ -732,9 +730,7 @@ _nsp= nsp _pcfclock= pcfclock _pst= pst _sbni= sbni -_streams= streams _stg= stg -_svr4= svr4 _cm= cm .if ${MK_SOURCELESS_UCODE} != "no" _ctau= ctau Modified: head/sys/net/if.c ============================================================================== --- head/sys/net/if.c Tue Feb 28 04:48:30 2017 (r314372) +++ head/sys/net/if.c Tue Feb 28 05:14:42 2017 (r314373) @@ -2703,9 +2703,6 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, return (error); } -/* COMPAT_SVR4 */ -#define OSIOCGIFCONF _IOWR('i', 20, struct ifconf) - #ifdef COMPAT_FREEBSD32 struct ifconf32 { int32_t ifc_len; @@ -2745,7 +2742,6 @@ ifioctl(struct socket *so, u_long cmd, c switch (cmd) { case SIOCGIFCONF: - case OSIOCGIFCONF: /* COMPAT_SVR4 */ error = ifconf(cmd, data); CURVNET_RESTORE(); return (error); @@ -3017,15 +3013,6 @@ again: if (prison_if(curthread->td_ucred, sa) != 0) continue; addrs++; - /* COMPAT_SVR4 */ - if (cmd == OSIOCGIFCONF) { - struct osockaddr *osa = - (struct osockaddr *)&ifr.ifr_addr; - ifr.ifr_addr = *sa; - osa->sa_family = sa->sa_family; - sbuf_bcat(sb, &ifr, sizeof(ifr)); - max_len += sizeof(ifr); - } else if (sa->sa_len <= sizeof(*sa)) { ifr.ifr_addr = *sa; sbuf_bcat(sb, &ifr, sizeof(ifr)); Modified: head/usr.sbin/bsdconfig/startup/include/messages.subr ============================================================================== --- head/usr.sbin/bsdconfig/startup/include/messages.subr Tue Feb 28 04:48:30 2017 (r314372) +++ head/usr.sbin/bsdconfig/startup/include/messages.subr Tue Feb 28 05:14:42 2017 (r314373) @@ -101,8 +101,6 @@ msg_show_value_desc="Show configured sta msg_startup="Startup" msg_startup_dirs="Startup dirs" msg_startup_dirs_desc="Set the list of dirs to look for startup scripts" -msg_svr4="SVR4" -msg_svr4_desc="This host wants to be able to run SVR4 binaries." msg_toggle_startup_services="Toggle Startup Services" msg_unknown_startup_menu_selection="Unknown startup menu selection" msg_value_required="Value Required" Modified: head/usr.sbin/bsdconfig/startup/misc ============================================================================== --- head/usr.sbin/bsdconfig/startup/misc Tue Feb 28 04:48:30 2017 (r314372) +++ head/usr.sbin/bsdconfig/startup/misc Tue Feb 28 05:14:42 2017 (r314373) @@ -74,7 +74,6 @@ dialog_menu_main() var_list="$var_list apm_enable ibcs2_enable - svr4_enable " # END-QUOTE fi @@ -96,7 +95,6 @@ dialog_menu_main() export msg_accounting msg_accounting_desc export msg_lpd msg_lpd_desc export msg_sco msg_sco_desc - export msg_svr4 msg_svr4_desc :| awk \ -v uname_p="$UNAME_P" \ -v menu_tags="$DIALOG_MENU_TAGS" \ @@ -238,18 +236,6 @@ dialog_menu_main() tag = sprintf(mtag_fmt, char, mark, subtag) mprint(tag, ENVIRON["msg_sco_desc"]) if (ditem == char) defaultitem = tag - - # - # SVR4: This host wants to be able to run SVR4 - # binaries. - # - char = substr(menu_tags, i++, 1) - mark = ( ENVIRON["svr4_enable"] ~ \ - /^[Yy][Ee][Ss]$/ ? "X" : " " ) - subtag = ENVIRON["msg_svr4"] - tag = sprintf(mtag_fmt, char, mark, subtag) - mprint(tag, ENVIRON["msg_svr4_desc"]) - if (ditem == char) defaultitem = tag } printf "\"\n" @@ -360,9 +346,6 @@ while :; do ?" ["?"] $msg_sco") f_eval_catch -dk err "$0" f_sysrc_set \ 'f_sysrc_set ibcs2_enable "%s"' "$reverse" ;; - ?" ["?"] $msg_svr4") - f_eval_catch -dk err "$0" f_sysrc_set \ - 'f_sysrc_set svr4_enable "%s"' "$reverse" ;; # Multi-variable On/Off toggle bits ?" ["?"] $msg_nis_client") if f_eval_catch -dk err "$0" f_sysrc_set \ From owner-svn-src-all@freebsd.org Tue Feb 28 05:17:52 2017 Return-Path: Delivered-To: svn-src-all@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 35767CF143A; Tue, 28 Feb 2017 05:17:52 +0000 (UTC) (envelope-from mav@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 0359BE6B; Tue, 28 Feb 2017 05:17:51 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1S5HpbV061062; Tue, 28 Feb 2017 05:17:51 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1S5Hp73061061; Tue, 28 Feb 2017 05:17:51 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201702280517.v1S5Hp73061061@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Tue, 28 Feb 2017 05:17:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314374 - head/sys/dev/firewire X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 05:17:52 -0000 Author: mav Date: Tue Feb 28 05:17:50 2017 New Revision: 314374 URL: https://svnweb.freebsd.org/changeset/base/314374 Log: Add safety check against too long CDB. SBP-2 specification defined maximum CDB length as 12 bytes. Newer SBP-3 specification allows CDB of any size, but this driver is too old. Proper solution would be to look on maximal ORB size supported by the target. MFC after: 1 week Modified: head/sys/dev/firewire/sbp.c Modified: head/sys/dev/firewire/sbp.c ============================================================================== --- head/sys/dev/firewire/sbp.c Tue Feb 28 05:14:42 2017 (r314373) +++ head/sys/dev/firewire/sbp.c Tue Feb 28 05:17:50 2017 (r314374) @@ -2367,6 +2367,11 @@ END_DEBUG xpt_done(ccb); return; } + if (csio->cdb_len > sizeof(ocb->orb) - 5 * sizeof(uint32_t)) { + ccb->ccb_h.status = CAM_REQ_INVALID; + xpt_done(ccb); + return; + } #if 0 /* if we are in probe stage, pass only probe commands */ if (sdev->status == SBP_DEV_PROBE) { From owner-svn-src-all@freebsd.org Tue Feb 28 05:24:08 2017 Return-Path: Delivered-To: svn-src-all@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 0C668CF1685; Tue, 28 Feb 2017 05:24:08 +0000 (UTC) (envelope-from mav@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 B0A0C32D; Tue, 28 Feb 2017 05:24:07 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1S5O6hJ064774; Tue, 28 Feb 2017 05:24:06 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1S5O6N0064773; Tue, 28 Feb 2017 05:24:06 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201702280524.v1S5O6N0064773@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Tue, 28 Feb 2017 05:24:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314375 - head/sys/dev/firewire X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 05:24:08 -0000 Author: mav Date: Tue Feb 28 05:24:06 2017 New Revision: 314375 URL: https://svnweb.freebsd.org/changeset/base/314375 Log: Remove some locking not needed for modern CAM. This driver is full of LORs. This change allows to reduce deadlock chance from 100% to level that allows some tests to be done. MFC after: 2 weeks Modified: head/sys/dev/firewire/sbp_targ.c Modified: head/sys/dev/firewire/sbp_targ.c ============================================================================== --- head/sys/dev/firewire/sbp_targ.c Tue Feb 28 05:17:50 2017 (r314374) +++ head/sys/dev/firewire/sbp_targ.c Tue Feb 28 05:24:06 2017 (r314375) @@ -317,10 +317,8 @@ sbp_targ_post_busreset(void *arg) unit = &sc->unit; if ((sc->flags & F_FREEZED) == 0) { - SBP_LOCK(sc); sc->flags |= F_FREEZED; xpt_freeze_simq(sc->sim, /*count*/1); - SBP_UNLOCK(sc); } else { printf("%s: already freezed\n", __func__); } @@ -367,10 +365,8 @@ sbp_targ_post_explore(void *arg) struct sbp_targ_softc *sc; sc = (struct sbp_targ_softc *)arg; - SBP_LOCK(sc); sc->flags &= ~F_FREEZED; xpt_release_simq(sc->sim, /*run queue*/TRUE); - SBP_UNLOCK(sc); return; } @@ -869,18 +865,14 @@ sbp_targ_cam_done(struct fw_xfer *xfer) printf("%s: CAM_SEND_STATUS not set %0x\n", __func__, ccb->ccb_h.flags); ccb->ccb_h.status = CAM_REQ_CMP; } - SBP_LOCK(orbi->sc); xpt_done(ccb); - SBP_UNLOCK(orbi->sc); } else { orbi->status.len = 1; sbp_targ_status_FIFO(orbi, orbi->login->fifo_hi, orbi->login->fifo_lo, /*dequeue*/1); ccb->ccb_h.status = CAM_REQ_ABORTED; - SBP_LOCK(orbi->sc); xpt_done(ccb); - SBP_UNLOCK(orbi->sc); } } @@ -1456,9 +1448,7 @@ sbp_targ_cmd_handler(struct fw_xfer *xfe sbp_targ_remove_orb_info(orbi->login, orbi); free(orbi, M_SBP_TARG); atio->ccb_h.status = CAM_REQ_ABORTED; - SBP_LOCK(orbi->sc); xpt_done((union ccb*)atio); - SBP_UNLOCK(orbi->sc); goto done0; } orbi->state = ORBI_STATUS_ATIO; @@ -1530,9 +1520,7 @@ sbp_targ_cmd_handler(struct fw_xfer *xfe orbi->data_lo = orb[3]; orbi->orb4 = *orb4; - SBP_LOCK(orbi->sc); xpt_done((union ccb*)atio); - SBP_UNLOCK(orbi->sc); done0: fw_xfer_free(xfer); return; @@ -2023,8 +2011,8 @@ sbp_targ_detach(device_t dev) SBP_LOCK(sc); xpt_free_path(sc->path); xpt_bus_deregister(cam_sim_path(sc->sim)); - SBP_UNLOCK(sc); cam_sim_free(sc->sim, /*free_devq*/TRUE); + SBP_UNLOCK(sc); for (i = 0; i < MAX_LUN; i++) { lstate = sc->lstate[i]; From owner-svn-src-all@freebsd.org Tue Feb 28 06:28:18 2017 Return-Path: Delivered-To: svn-src-all@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 920BFCF1107; Tue, 28 Feb 2017 06:28:18 +0000 (UTC) (envelope-from mav@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 5EAC920D; Tue, 28 Feb 2017 06:28:18 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1S6SHcv088538; Tue, 28 Feb 2017 06:28:17 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1S6SHwO088537; Tue, 28 Feb 2017 06:28:17 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201702280628.v1S6SHwO088537@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Tue, 28 Feb 2017 06:28:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314376 - stable/11/sys/dev/iscsi X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 06:28:18 -0000 Author: mav Date: Tue Feb 28 06:28:17 2017 New Revision: 314376 URL: https://svnweb.freebsd.org/changeset/base/314376 Log: MFC r313738: Temporary attach AHS to BHS to calculate header digest. Modified: stable/11/sys/dev/iscsi/icl_soft.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/iscsi/icl_soft.c ============================================================================== --- stable/11/sys/dev/iscsi/icl_soft.c Tue Feb 28 05:24:06 2017 (r314375) +++ stable/11/sys/dev/iscsi/icl_soft.c Tue Feb 28 06:28:17 2017 (r314376) @@ -389,10 +389,10 @@ icl_pdu_check_header_digest(struct icl_p *availablep -= ISCSI_HEADER_DIGEST_SIZE; - /* - * XXX: Handle AHS. - */ + /* Temporary attach AHS to BHS to calculate header digest. */ + request->ip_bhs_mbuf->m_next = request->ip_ahs_mbuf; valid_digest = icl_mbuf_to_crc32c(request->ip_bhs_mbuf); + request->ip_bhs_mbuf->m_next = NULL; if (received_digest != valid_digest) { ICL_WARN("header digest check failed; got 0x%x, " "should be 0x%x", received_digest, valid_digest); From owner-svn-src-all@freebsd.org Tue Feb 28 06:29:46 2017 Return-Path: Delivered-To: svn-src-all@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 37E6BCF11A6; Tue, 28 Feb 2017 06:29:46 +0000 (UTC) (envelope-from mav@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 EE20B3C3; Tue, 28 Feb 2017 06:29:45 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1S6Tjfo088668; Tue, 28 Feb 2017 06:29:45 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1S6Tjpx088667; Tue, 28 Feb 2017 06:29:45 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201702280629.v1S6Tjpx088667@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Tue, 28 Feb 2017 06:29:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314377 - stable/11/sys/dev/iscsi X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 06:29:46 -0000 Author: mav Date: Tue Feb 28 06:29:44 2017 New Revision: 314377 URL: https://svnweb.freebsd.org/changeset/base/314377 Log: MFC r313731: Do not rely on data alignment after m_pullup(). In general case m_pullup() does not really guarantee any data alignment. Instead of depenting on side effects caused by data being always copied out of mbuf cluster (which is probably a bug by itself), always allocate aligned BHS buffer and read data there directly from socket. While there, reuse new icl_conn_receive_buf() function to read digests. The code could probably be even more optimized to aggregate those reads, but until that done, this is still easier then the way it was before. Modified: stable/11/sys/dev/iscsi/icl_soft.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/iscsi/icl_soft.c ============================================================================== --- stable/11/sys/dev/iscsi/icl_soft.c Tue Feb 28 06:28:17 2017 (r314376) +++ stable/11/sys/dev/iscsi/icl_soft.c Tue Feb 28 06:29:44 2017 (r314377) @@ -169,6 +169,40 @@ icl_conn_receive(struct icl_conn *ic, si return (m); } +static int +icl_conn_receive_buf(struct icl_conn *ic, void *buf, size_t len) +{ + struct iovec iov[1]; + struct uio uio; + struct socket *so; + int error, flags; + + so = ic->ic_socket; + + memset(&uio, 0, sizeof(uio)); + iov[0].iov_base = buf; + iov[0].iov_len = len; + uio.uio_iov = iov; + uio.uio_iovcnt = 1; + uio.uio_offset = 0; + uio.uio_resid = len; + uio.uio_segflg = UIO_SYSSPACE; + uio.uio_rw = UIO_READ; + + flags = MSG_DONTWAIT; + error = soreceive(so, NULL, &uio, NULL, NULL, &flags); + if (error != 0) { + ICL_DEBUG("soreceive error %d", error); + return (-1); + } + if (uio.uio_resid != 0) { + ICL_DEBUG("short read"); + return (-1); + } + + return (0); +} + static struct icl_pdu * icl_pdu_new_empty(struct icl_conn *ic, int flags) { @@ -229,7 +263,7 @@ icl_soft_conn_new_pdu(struct icl_conn *i ip->ip_bhs_mbuf = m_getm2(NULL, sizeof(struct iscsi_bhs), flags, MT_DATA, M_PKTHDR); if (ip->ip_bhs_mbuf == NULL) { - ICL_WARN("failed to allocate %zd bytes", sizeof(*ip)); + ICL_WARN("failed to allocate BHS mbuf"); icl_pdu_free(ip); return (NULL); } @@ -308,28 +342,13 @@ icl_pdu_size(const struct icl_pdu *respo static int icl_pdu_receive_bhs(struct icl_pdu *request, size_t *availablep) { - struct mbuf *m; - m = icl_conn_receive(request->ip_conn, sizeof(struct iscsi_bhs)); - if (m == NULL) { + if (icl_conn_receive_buf(request->ip_conn, + request->ip_bhs, sizeof(struct iscsi_bhs))) { ICL_DEBUG("failed to receive BHS"); return (-1); } - request->ip_bhs_mbuf = m_pullup(m, sizeof(struct iscsi_bhs)); - if (request->ip_bhs_mbuf == NULL) { - ICL_WARN("m_pullup failed"); - return (-1); - } - request->ip_bhs = mtod(request->ip_bhs_mbuf, struct iscsi_bhs *); - - /* - * XXX: For architectures with strict alignment requirements - * we may need to allocate ip_bhs and copy the data into it. - * For some reason, though, not doing this doesn't seem - * to cause problems; tested on sparc64. - */ - *availablep -= sizeof(struct iscsi_bhs); return (0); } @@ -371,22 +390,17 @@ icl_mbuf_to_crc32c(const struct mbuf *m0 static int icl_pdu_check_header_digest(struct icl_pdu *request, size_t *availablep) { - struct mbuf *m; uint32_t received_digest, valid_digest; if (request->ip_conn->ic_header_crc32c == false) return (0); - m = icl_conn_receive(request->ip_conn, ISCSI_HEADER_DIGEST_SIZE); - if (m == NULL) { + CTASSERT(sizeof(received_digest) == ISCSI_HEADER_DIGEST_SIZE); + if (icl_conn_receive_buf(request->ip_conn, + &received_digest, ISCSI_HEADER_DIGEST_SIZE)) { ICL_DEBUG("failed to receive header digest"); return (-1); } - - CTASSERT(sizeof(received_digest) == ISCSI_HEADER_DIGEST_SIZE); - m_copydata(m, 0, ISCSI_HEADER_DIGEST_SIZE, (void *)&received_digest); - m_freem(m); - *availablep -= ISCSI_HEADER_DIGEST_SIZE; /* Temporary attach AHS to BHS to calculate header digest. */ @@ -526,7 +540,6 @@ icl_pdu_receive_data_segment(struct icl_ static int icl_pdu_check_data_digest(struct icl_pdu *request, size_t *availablep) { - struct mbuf *m; uint32_t received_digest, valid_digest; if (request->ip_conn->ic_data_crc32c == false) @@ -535,16 +548,12 @@ icl_pdu_check_data_digest(struct icl_pdu if (request->ip_data_len == 0) return (0); - m = icl_conn_receive(request->ip_conn, ISCSI_DATA_DIGEST_SIZE); - if (m == NULL) { + CTASSERT(sizeof(received_digest) == ISCSI_DATA_DIGEST_SIZE); + if (icl_conn_receive_buf(request->ip_conn, + &received_digest, ISCSI_DATA_DIGEST_SIZE)) { ICL_DEBUG("failed to receive data digest"); return (-1); } - - CTASSERT(sizeof(received_digest) == ISCSI_DATA_DIGEST_SIZE); - m_copydata(m, 0, ISCSI_DATA_DIGEST_SIZE, (void *)&received_digest); - m_freem(m); - *availablep -= ISCSI_DATA_DIGEST_SIZE; /* @@ -580,7 +589,7 @@ icl_conn_receive_pdu(struct icl_conn *ic if (ic->ic_receive_state == ICL_CONN_STATE_BHS) { KASSERT(ic->ic_receive_pdu == NULL, ("ic->ic_receive_pdu != NULL")); - request = icl_pdu_new_empty(ic, M_NOWAIT); + request = icl_soft_conn_new_pdu(ic, M_NOWAIT); if (request == NULL) { ICL_DEBUG("failed to allocate PDU; " "dropping connection"); From owner-svn-src-all@freebsd.org Tue Feb 28 06:30:44 2017 Return-Path: Delivered-To: svn-src-all@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 0D1FECF121A; Tue, 28 Feb 2017 06:30:44 +0000 (UTC) (envelope-from mav@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 C92A079D; Tue, 28 Feb 2017 06:30:43 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1S6UgX4088779; Tue, 28 Feb 2017 06:30:42 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1S6UgLH088778; Tue, 28 Feb 2017 06:30:42 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201702280630.v1S6UgLH088778@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Tue, 28 Feb 2017 06:30:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314378 - stable/11/sys/dev/iscsi X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 06:30:44 -0000 Author: mav Date: Tue Feb 28 06:30:42 2017 New Revision: 314378 URL: https://svnweb.freebsd.org/changeset/base/314378 Log: MFC r313739: Directly call m_gethdr() instead of m_getm2() for BHS. All this code is based on assumption that data will be stored in one piece, and since buffer size if known and fixed, it is easier to hardcode it. Modified: stable/11/sys/dev/iscsi/icl_soft.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/iscsi/icl_soft.c ============================================================================== --- stable/11/sys/dev/iscsi/icl_soft.c Tue Feb 28 06:29:44 2017 (r314377) +++ stable/11/sys/dev/iscsi/icl_soft.c Tue Feb 28 06:30:42 2017 (r314378) @@ -260,8 +260,8 @@ icl_soft_conn_new_pdu(struct icl_conn *i if (ip == NULL) return (NULL); - ip->ip_bhs_mbuf = m_getm2(NULL, sizeof(struct iscsi_bhs), - flags, MT_DATA, M_PKTHDR); + CTASSERT(sizeof(struct iscsi_bhs) <= MHLEN); + ip->ip_bhs_mbuf = m_gethdr(flags, MT_DATA); if (ip->ip_bhs_mbuf == NULL) { ICL_WARN("failed to allocate BHS mbuf"); icl_pdu_free(ip); From owner-svn-src-all@freebsd.org Tue Feb 28 06:31:35 2017 Return-Path: Delivered-To: svn-src-all@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 65939CF1384; Tue, 28 Feb 2017 06:31:35 +0000 (UTC) (envelope-from mav@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 1C737A77; Tue, 28 Feb 2017 06:31:35 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1S6VYwE089527; Tue, 28 Feb 2017 06:31:34 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1S6VY4r089526; Tue, 28 Feb 2017 06:31:34 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201702280631.v1S6VY4r089526@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Tue, 28 Feb 2017 06:31:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314379 - stable/11/sys/cam/ctl X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 06:31:35 -0000 Author: mav Date: Tue Feb 28 06:31:34 2017 New Revision: 314379 URL: https://svnweb.freebsd.org/changeset/base/314379 Log: MFC r313744: No need to erase sense_data when sense_len is set to zero. Modified: stable/11/sys/cam/ctl/ctl_error.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cam/ctl/ctl_error.c ============================================================================== --- stable/11/sys/cam/ctl/ctl_error.c Tue Feb 28 06:30:42 2017 (r314378) +++ stable/11/sys/cam/ctl/ctl_error.c Tue Feb 28 06:31:34 2017 (r314379) @@ -920,10 +920,7 @@ ctl_set_data_phase_error(struct ctl_scsi void ctl_set_reservation_conflict(struct ctl_scsiio *ctsio) { - struct scsi_sense_data *sense; - sense = &ctsio->sense_data; - memset(sense, 0, sizeof(*sense)); ctsio->scsi_status = SCSI_STATUS_RESERV_CONFLICT; ctsio->sense_len = 0; ctsio->io_hdr.status = CTL_SCSI_ERROR; @@ -932,10 +929,7 @@ ctl_set_reservation_conflict(struct ctl_ void ctl_set_queue_full(struct ctl_scsiio *ctsio) { - struct scsi_sense_data *sense; - sense = &ctsio->sense_data; - memset(sense, 0, sizeof(*sense)); ctsio->scsi_status = SCSI_STATUS_QUEUE_FULL; ctsio->sense_len = 0; ctsio->io_hdr.status = CTL_SCSI_ERROR; @@ -944,10 +938,7 @@ ctl_set_queue_full(struct ctl_scsiio *ct void ctl_set_busy(struct ctl_scsiio *ctsio) { - struct scsi_sense_data *sense; - sense = &ctsio->sense_data; - memset(sense, 0, sizeof(*sense)); ctsio->scsi_status = SCSI_STATUS_BUSY; ctsio->sense_len = 0; ctsio->io_hdr.status = CTL_SCSI_ERROR; @@ -956,10 +947,7 @@ ctl_set_busy(struct ctl_scsiio *ctsio) void ctl_set_task_aborted(struct ctl_scsiio *ctsio) { - struct scsi_sense_data *sense; - sense = &ctsio->sense_data; - memset(sense, 0, sizeof(*sense)); ctsio->scsi_status = SCSI_STATUS_TASK_ABORTED; ctsio->sense_len = 0; ctsio->io_hdr.status = CTL_CMD_ABORTED; @@ -992,10 +980,7 @@ ctl_set_space_alloc_fail(struct ctl_scsi void ctl_set_success(struct ctl_scsiio *ctsio) { - struct scsi_sense_data *sense; - sense = &ctsio->sense_data; - memset(sense, 0, sizeof(*sense)); ctsio->scsi_status = SCSI_STATUS_OK; ctsio->sense_len = 0; ctsio->io_hdr.status = CTL_SUCCESS; From owner-svn-src-all@freebsd.org Tue Feb 28 06:32:02 2017 Return-Path: Delivered-To: svn-src-all@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 DF064CF1400; Tue, 28 Feb 2017 06:32:02 +0000 (UTC) (envelope-from mav@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 86DD4C0D; Tue, 28 Feb 2017 06:32:02 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1S6W1UQ092390; Tue, 28 Feb 2017 06:32:01 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1S6W1Oc092389; Tue, 28 Feb 2017 06:32:01 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201702280632.v1S6W1Oc092389@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Tue, 28 Feb 2017 06:32:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314380 - stable/10/sys/cam/ctl X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 06:32:03 -0000 Author: mav Date: Tue Feb 28 06:32:01 2017 New Revision: 314380 URL: https://svnweb.freebsd.org/changeset/base/314380 Log: MFC r313744: No need to erase sense_data when sense_len is set to zero. Modified: stable/10/sys/cam/ctl/ctl_error.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cam/ctl/ctl_error.c ============================================================================== --- stable/10/sys/cam/ctl/ctl_error.c Tue Feb 28 06:31:34 2017 (r314379) +++ stable/10/sys/cam/ctl/ctl_error.c Tue Feb 28 06:32:01 2017 (r314380) @@ -920,10 +920,7 @@ ctl_set_data_phase_error(struct ctl_scsi void ctl_set_reservation_conflict(struct ctl_scsiio *ctsio) { - struct scsi_sense_data *sense; - sense = &ctsio->sense_data; - memset(sense, 0, sizeof(*sense)); ctsio->scsi_status = SCSI_STATUS_RESERV_CONFLICT; ctsio->sense_len = 0; ctsio->io_hdr.status = CTL_SCSI_ERROR; @@ -932,10 +929,7 @@ ctl_set_reservation_conflict(struct ctl_ void ctl_set_queue_full(struct ctl_scsiio *ctsio) { - struct scsi_sense_data *sense; - sense = &ctsio->sense_data; - memset(sense, 0, sizeof(*sense)); ctsio->scsi_status = SCSI_STATUS_QUEUE_FULL; ctsio->sense_len = 0; ctsio->io_hdr.status = CTL_SCSI_ERROR; @@ -944,10 +938,7 @@ ctl_set_queue_full(struct ctl_scsiio *ct void ctl_set_busy(struct ctl_scsiio *ctsio) { - struct scsi_sense_data *sense; - sense = &ctsio->sense_data; - memset(sense, 0, sizeof(*sense)); ctsio->scsi_status = SCSI_STATUS_BUSY; ctsio->sense_len = 0; ctsio->io_hdr.status = CTL_SCSI_ERROR; @@ -956,10 +947,7 @@ ctl_set_busy(struct ctl_scsiio *ctsio) void ctl_set_task_aborted(struct ctl_scsiio *ctsio) { - struct scsi_sense_data *sense; - sense = &ctsio->sense_data; - memset(sense, 0, sizeof(*sense)); ctsio->scsi_status = SCSI_STATUS_TASK_ABORTED; ctsio->sense_len = 0; ctsio->io_hdr.status = CTL_CMD_ABORTED; @@ -992,10 +980,7 @@ ctl_set_space_alloc_fail(struct ctl_scsi void ctl_set_success(struct ctl_scsiio *ctsio) { - struct scsi_sense_data *sense; - sense = &ctsio->sense_data; - memset(sense, 0, sizeof(*sense)); ctsio->scsi_status = SCSI_STATUS_OK; ctsio->sense_len = 0; ctsio->io_hdr.status = CTL_SUCCESS; From owner-svn-src-all@freebsd.org Tue Feb 28 06:46:44 2017 Return-Path: Delivered-To: svn-src-all@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 2569BCF16CB; Tue, 28 Feb 2017 06:46:44 +0000 (UTC) (envelope-from mav@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 E4769616; Tue, 28 Feb 2017 06:46:43 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1S6kg1U096646; Tue, 28 Feb 2017 06:46:42 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1S6kf9G096633; Tue, 28 Feb 2017 06:46:41 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201702280646.v1S6kf9G096633@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Tue, 28 Feb 2017 06:46:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314381 - in stable/11/sys: cam/scsi dev/advansys dev/aha dev/ahci dev/arcmsr dev/ata dev/buslogic dev/hptmv dev/mvs dev/ncr dev/siis dev/sym dev/trm X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 06:46:44 -0000 Author: mav Date: Tue Feb 28 06:46:41 2017 New Revision: 314381 URL: https://svnweb.freebsd.org/changeset/base/314381 Log: MFC r313949: Remove dead mentions of CAM target mode APIs from drivers. This makes grepping kernel for target mode implementation much easier. Modified: stable/11/sys/cam/scsi/scsi_low.c stable/11/sys/dev/advansys/advansys.c stable/11/sys/dev/aha/aha.c stable/11/sys/dev/ahci/ahci.c stable/11/sys/dev/arcmsr/arcmsr.c stable/11/sys/dev/ata/ata-all.c stable/11/sys/dev/buslogic/bt.c stable/11/sys/dev/hptmv/entry.c stable/11/sys/dev/mvs/mvs.c stable/11/sys/dev/ncr/ncr.c stable/11/sys/dev/siis/siis.c stable/11/sys/dev/sym/sym_hipd.c stable/11/sys/dev/trm/trm.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cam/scsi/scsi_low.c ============================================================================== --- stable/11/sys/cam/scsi/scsi_low.c Tue Feb 28 06:32:01 2017 (r314380) +++ stable/11/sys/cam/scsi/scsi_low.c Tue Feb 28 06:46:41 2017 (r314381) @@ -479,15 +479,6 @@ scsi_low_scsi_action_cam(sim, ccb) #endif /* SCSI_LOW_DEBUG */ break; - case XPT_EN_LUN: /* Enable LUN as a target */ - case XPT_TARGET_IO: /* Execute target I/O request */ - case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */ - case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/ - /* XXX Implement */ - ccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(ccb); - break; - case XPT_ABORT: /* Abort the specified CCB */ #ifdef SCSI_LOW_DIAGNOSTIC if (target == CAM_TARGET_WILDCARD || lun == CAM_LUN_WILDCARD) Modified: stable/11/sys/dev/advansys/advansys.c ============================================================================== --- stable/11/sys/dev/advansys/advansys.c Tue Feb 28 06:32:01 2017 (r314380) +++ stable/11/sys/dev/advansys/advansys.c Tue Feb 28 06:46:41 2017 (r314381) @@ -233,10 +233,6 @@ adv_action(struct cam_sim *sim, union cc break; } case XPT_RESET_DEV: /* Bus Device Reset the specified SCSI device */ - case XPT_TARGET_IO: /* Execute target I/O request */ - case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */ - case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/ - case XPT_EN_LUN: /* Enable LUN as a target */ case XPT_ABORT: /* Abort the specified CCB */ /* XXX Implement */ ccb->ccb_h.status = CAM_REQ_INVALID; Modified: stable/11/sys/dev/aha/aha.c ============================================================================== --- stable/11/sys/dev/aha/aha.c Tue Feb 28 06:32:01 2017 (r314380) +++ stable/11/sys/dev/aha/aha.c Tue Feb 28 06:46:41 2017 (r314381) @@ -838,10 +838,6 @@ ahaaction(struct cam_sim *sim, union ccb } break; } - case XPT_EN_LUN: /* Enable LUN as a target */ - case XPT_TARGET_IO: /* Execute target I/O request */ - case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */ - case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/ case XPT_ABORT: /* Abort the specified CCB */ /* XXX Implement */ ccb->ccb_h.status = CAM_REQ_INVALID; Modified: stable/11/sys/dev/ahci/ahci.c ============================================================================== --- stable/11/sys/dev/ahci/ahci.c Tue Feb 28 06:32:01 2017 (r314380) +++ stable/11/sys/dev/ahci/ahci.c Tue Feb 28 06:46:41 2017 (r314381) @@ -2570,10 +2570,6 @@ ahciaction(struct cam_sim *sim, union cc } ahci_begin_transaction(ch, ccb); return; - case XPT_EN_LUN: /* Enable LUN as a target */ - case XPT_TARGET_IO: /* Execute target I/O request */ - case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */ - case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/ case XPT_ABORT: /* Abort the specified CCB */ /* XXX Implement */ ccb->ccb_h.status = CAM_REQ_INVALID; Modified: stable/11/sys/dev/arcmsr/arcmsr.c ============================================================================== --- stable/11/sys/dev/arcmsr/arcmsr.c Tue Feb 28 06:32:01 2017 (r314380) +++ stable/11/sys/dev/arcmsr/arcmsr.c Tue Feb 28 06:46:41 2017 (r314381) @@ -2883,12 +2883,6 @@ static void arcmsr_action(struct cam_sim } break; } - case XPT_TARGET_IO: { - /* target mode not yet support vendor specific commands. */ - pccb->ccb_h.status |= CAM_REQ_CMP; - xpt_done(pccb); - break; - } case XPT_PATH_INQ: { struct ccb_pathinq *cpi = &pccb->cpi; @@ -2938,7 +2932,6 @@ static void arcmsr_action(struct cam_sim pabort_ccb = pccb->cab.abort_ccb; switch (pabort_ccb->ccb_h.func_code) { case XPT_ACCEPT_TARGET_IO: - case XPT_IMMED_NOTIFY: case XPT_CONT_TARGET_IO: if(arcmsr_seek_cmd2abort(pabort_ccb)==TRUE) { pabort_ccb->ccb_h.status |= CAM_REQ_ABORTED; Modified: stable/11/sys/dev/ata/ata-all.c ============================================================================== --- stable/11/sys/dev/ata/ata-all.c Tue Feb 28 06:32:01 2017 (r314380) +++ stable/11/sys/dev/ata/ata-all.c Tue Feb 28 06:46:41 2017 (r314381) @@ -1013,10 +1013,6 @@ ataaction(struct cam_sim *sim, union ccb } ata_cam_begin_transaction(dev, ccb); return; - case XPT_EN_LUN: /* Enable LUN as a target */ - case XPT_TARGET_IO: /* Execute target I/O request */ - case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */ - case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/ case XPT_ABORT: /* Abort the specified CCB */ /* XXX Implement */ ccb->ccb_h.status = CAM_REQ_INVALID; Modified: stable/11/sys/dev/buslogic/bt.c ============================================================================== --- stable/11/sys/dev/buslogic/bt.c Tue Feb 28 06:32:01 2017 (r314380) +++ stable/11/sys/dev/buslogic/bt.c Tue Feb 28 06:46:41 2017 (r314381) @@ -1233,10 +1233,6 @@ btaction(struct cam_sim *sim, union ccb } break; } - case XPT_EN_LUN: /* Enable LUN as a target */ - case XPT_TARGET_IO: /* Execute target I/O request */ - case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */ - case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/ case XPT_ABORT: /* Abort the specified CCB */ /* XXX Implement */ ccb->ccb_h.status = CAM_REQ_INVALID; Modified: stable/11/sys/dev/hptmv/entry.c ============================================================================== --- stable/11/sys/dev/hptmv/entry.c Tue Feb 28 06:32:01 2017 (r314380) +++ stable/11/sys/dev/hptmv/entry.c Tue Feb 28 06:46:41 2017 (r314381) @@ -2289,10 +2289,6 @@ hpt_action(struct cam_sim *sim, union cc break; case XPT_RESET_DEV: /* Bus Device Reset the specified SCSI device */ - case XPT_EN_LUN: /* Enable LUN as a target */ - case XPT_TARGET_IO: /* Execute target I/O request */ - case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */ - case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/ case XPT_ABORT: /* Abort the specified CCB */ case XPT_TERM_IO: /* Terminate the I/O process */ /* XXX Implement */ Modified: stable/11/sys/dev/mvs/mvs.c ============================================================================== --- stable/11/sys/dev/mvs/mvs.c Tue Feb 28 06:32:01 2017 (r314380) +++ stable/11/sys/dev/mvs/mvs.c Tue Feb 28 06:46:41 2017 (r314381) @@ -2288,10 +2288,6 @@ mvsaction(struct cam_sim *sim, union ccb } mvs_begin_transaction(dev, ccb); return; - case XPT_EN_LUN: /* Enable LUN as a target */ - case XPT_TARGET_IO: /* Execute target I/O request */ - case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */ - case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/ case XPT_ABORT: /* Abort the specified CCB */ /* XXX Implement */ ccb->ccb_h.status = CAM_REQ_INVALID; Modified: stable/11/sys/dev/ncr/ncr.c ============================================================================== --- stable/11/sys/dev/ncr/ncr.c Tue Feb 28 06:32:01 2017 (r314380) +++ stable/11/sys/dev/ncr/ncr.c Tue Feb 28 06:46:41 2017 (r314381) @@ -4152,10 +4152,6 @@ ncr_action (struct cam_sim *sim, union c break; } case XPT_RESET_DEV: /* Bus Device Reset the specified SCSI device */ - case XPT_EN_LUN: /* Enable LUN as a target */ - case XPT_TARGET_IO: /* Execute target I/O request */ - case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */ - case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/ case XPT_ABORT: /* Abort the specified CCB */ /* XXX Implement */ ccb->ccb_h.status = CAM_REQ_INVALID; Modified: stable/11/sys/dev/siis/siis.c ============================================================================== --- stable/11/sys/dev/siis/siis.c Tue Feb 28 06:32:01 2017 (r314380) +++ stable/11/sys/dev/siis/siis.c Tue Feb 28 06:46:41 2017 (r314381) @@ -1835,10 +1835,6 @@ siisaction(struct cam_sim *sim, union cc } siis_begin_transaction(dev, ccb); return; - case XPT_EN_LUN: /* Enable LUN as a target */ - case XPT_TARGET_IO: /* Execute target I/O request */ - case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */ - case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/ case XPT_ABORT: /* Abort the specified CCB */ /* XXX Implement */ ccb->ccb_h.status = CAM_REQ_INVALID; Modified: stable/11/sys/dev/sym/sym_hipd.c ============================================================================== --- stable/11/sys/dev/sym/sym_hipd.c Tue Feb 28 06:32:01 2017 (r314380) +++ stable/11/sys/dev/sym/sym_hipd.c Tue Feb 28 06:46:41 2017 (r314381) @@ -8090,11 +8090,6 @@ static void sym_action2(struct cam_sim * sym_init (np, 1); sym_xpt_done2(np, ccb, CAM_REQ_CMP); break; - case XPT_ACCEPT_TARGET_IO: - case XPT_CONT_TARGET_IO: - case XPT_EN_LUN: - case XPT_NOTIFY_ACK: - case XPT_IMMED_NOTIFY: case XPT_TERM_IO: default: sym_xpt_done2(np, ccb, CAM_REQ_INVALID); Modified: stable/11/sys/dev/trm/trm.c ============================================================================== --- stable/11/sys/dev/trm/trm.c Tue Feb 28 06:32:01 2017 (r314380) +++ stable/11/sys/dev/trm/trm.c Tue Feb 28 06:46:41 2017 (r314381) @@ -543,11 +543,6 @@ trm_action(struct cam_sim *psim, union c target_lun = pccb->ccb_h.target_lun; switch (pccb->ccb_h.func_code) { - case XPT_NOOP: - TRM_DPRINTF(" XPT_NOOP \n"); - pccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(pccb); - break; /* * Execute the requested I/O operation */ @@ -623,16 +618,6 @@ trm_action(struct cam_sim *psim, union c } break; } - case XPT_GDEV_TYPE: - TRM_DPRINTF(" XPT_GDEV_TYPE \n"); - pccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(pccb); - break; - case XPT_GDEVLIST: - TRM_DPRINTF(" XPT_GDEVLIST \n"); - pccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(pccb); - break; /* * Path routing inquiry * Path Inquiry CCB @@ -661,76 +646,33 @@ trm_action(struct cam_sim *psim, union c cpi->protocol_version = SCSI_REV_2; cpi->ccb_h.status = CAM_REQ_CMP; xpt_done(pccb); - } break; + } /* - * Release a frozen SIM queue - * Release SIM Queue + * XPT_ABORT = 0x10, Abort the specified CCB + * Abort XPT request CCB */ - case XPT_REL_SIMQ: - TRM_DPRINTF(" XPT_REL_SIMQ \n"); - pccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(pccb); - break; - /* - * Set Asynchronous Callback Parameters - * Set Asynchronous Callback CCB - */ - case XPT_SASYNC_CB: - TRM_DPRINTF(" XPT_SASYNC_CB \n"); - pccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(pccb); - break; - /* - * Set device type information - * Set Device Type CCB - */ - case XPT_SDEV_TYPE: - TRM_DPRINTF(" XPT_SDEV_TYPE \n"); - pccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(pccb); - break; - /* - * Get EDT entries matching the given pattern - */ - case XPT_DEV_MATCH: - TRM_DPRINTF(" XPT_DEV_MATCH \n"); - pccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(pccb); - break; - /* - * Turn on debugging for a bus, target or lun - */ - case XPT_DEBUG: - TRM_DPRINTF(" XPT_DEBUG \n"); - pccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(pccb); - break; - /* - * XPT_ABORT = 0x10, Abort the specified CCB - * Abort XPT request CCB - */ case XPT_ABORT: TRM_DPRINTF(" XPT_ABORT \n"); pccb->ccb_h.status = CAM_REQ_INVALID; xpt_done(pccb); break; /* - * Reset the specified SCSI bus - * Reset SCSI Bus CCB - */ - case XPT_RESET_BUS: { + * Reset the specified SCSI bus + * Reset SCSI Bus CCB + */ + case XPT_RESET_BUS: { int i; TRM_DPRINTF(" XPT_RESET_BUS \n"); - trm_reset(pACB); + trm_reset(pACB); pACB->ACBFlag=0; for (i=0; i<500; i++) DELAY(1000); pccb->ccb_h.status = CAM_REQ_CMP; xpt_done(pccb); - } break; + } /* * Bus Device Reset the specified SCSI device * Reset SCSI Device CCB @@ -929,92 +871,6 @@ trm_action(struct cam_sim *psim, union c cam_calc_geometry(&pccb->ccg, /*extended*/1); xpt_done(pccb); break; - case XPT_ENG_INQ: - TRM_DPRINTF(" XPT_ENG_INQ \n"); - pccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(pccb); - break; - /* - * HBA execute engine request - * This structure must match SCSIIO size - */ - case XPT_ENG_EXEC: - TRM_DPRINTF(" XPT_ENG_EXEC \n"); - pccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(pccb); - break; - /* - * XPT_EN_LUN = 0x30, Enable LUN as a target - * Target mode structures. - */ - case XPT_EN_LUN: - /* - * Don't (yet?) support vendor - * specific commands. - */ - TRM_DPRINTF(" XPT_EN_LUN \n"); - pccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(pccb); - break; - /* - * Execute target I/O request - */ - case XPT_TARGET_IO: - /* - * Don't (yet?) support vendor - * specific commands. - */ - TRM_DPRINTF(" XPT_TARGET_IO \n"); - pccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(pccb); - break; - /* - * Accept Host Target Mode CDB - */ - case XPT_ACCEPT_TARGET_IO: - /* - * Don't (yet?) support vendor - * specific commands. - */ - TRM_DPRINTF(" XPT_ACCEPT_TARGET_IO \n"); - pccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(pccb); - break; - /* - * Continue Host Target I/O Connection - */ - case XPT_CONT_TARGET_IO: - /* - * Don't (yet?) support vendor - * specific commands. - */ - TRM_DPRINTF(" XPT_CONT_TARGET_IO \n"); - pccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(pccb); - break; - /* - * Notify Host Target driver of event - */ - case XPT_IMMED_NOTIFY: - TRM_DPRINTF(" XPT_IMMED_NOTIFY \n"); - pccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(pccb); - break; - /* - * Acknowledgement of event - */ - case XPT_NOTIFY_ACK: - TRM_DPRINTF(" XPT_NOTIFY_ACK \n"); - pccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(pccb); - break; - /* - * XPT_VUNIQUE = 0x80 - */ - case XPT_VUNIQUE: - pccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(pccb); - break; default: pccb->ccb_h.status = CAM_REQ_INVALID; xpt_done(pccb); From owner-svn-src-all@freebsd.org Tue Feb 28 09:50:36 2017 Return-Path: Delivered-To: svn-src-all@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 21A1ECEEC3C; Tue, 28 Feb 2017 09:50:36 +0000 (UTC) (envelope-from sephe@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 D7318E3C; Tue, 28 Feb 2017 09:50:35 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1S9oYFD070926; Tue, 28 Feb 2017 09:50:34 GMT (envelope-from sephe@FreeBSD.org) Received: (from sephe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1S9oYr7070925; Tue, 28 Feb 2017 09:50:34 GMT (envelope-from sephe@FreeBSD.org) Message-Id: <201702280950.v1S9oYr7070925@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sephe set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau Date: Tue, 28 Feb 2017 09:50:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314382 - head/sys/dev/hyperv/netvsc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 09:50:36 -0000 Author: sephe Date: Tue Feb 28 09:50:34 2017 New Revision: 314382 URL: https://svnweb.freebsd.org/changeset/base/314382 Log: hyperv/hn: Simplify RNDIS packet data offset calculation. MFC after: 1 week Sponsored by: Microsoft Differential Revision: https://reviews.freebsd.org/D9699 Modified: head/sys/dev/hyperv/netvsc/if_hn.c Modified: head/sys/dev/hyperv/netvsc/if_hn.c ============================================================================== --- head/sys/dev/hyperv/netvsc/if_hn.c Tue Feb 28 06:46:41 2017 (r314381) +++ head/sys/dev/hyperv/netvsc/if_hn.c Tue Feb 28 09:50:34 2017 (r314382) @@ -1784,9 +1784,6 @@ hn_rndis_pktinfo_append(struct rndis_pac pi->rm_type = pi_type; pi->rm_pktinfooffset = RNDIS_PKTINFO_OFFSET; - /* Data immediately follow per-packet-info. */ - pkt->rm_dataoffset += pi_size; - /* Update RNDIS packet msg length */ pkt->rm_len += pi_size; @@ -1932,7 +1929,7 @@ hn_encap(struct ifnet *ifp, struct hn_tx pkt->rm_type = REMOTE_NDIS_PACKET_MSG; pkt->rm_len = sizeof(*pkt) + m_head->m_pkthdr.len; - pkt->rm_dataoffset = sizeof(*pkt); + pkt->rm_dataoffset = 0; pkt->rm_datalen = m_head->m_pkthdr.len; pkt->rm_oobdataoffset = 0; pkt->rm_oobdatalen = 0; @@ -2003,7 +2000,7 @@ hn_encap(struct ifnet *ifp, struct hn_tx pkt_hlen = pkt->rm_pktinfooffset + pkt->rm_pktinfolen; /* Convert RNDIS packet message offsets */ - pkt->rm_dataoffset = hn_rndis_pktmsg_offset(pkt->rm_dataoffset); + pkt->rm_dataoffset = hn_rndis_pktmsg_offset(pkt_hlen); pkt->rm_pktinfooffset = hn_rndis_pktmsg_offset(pkt->rm_pktinfooffset); /* From owner-svn-src-all@freebsd.org Tue Feb 28 11:05:47 2017 Return-Path: Delivered-To: svn-src-all@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 206ACCF1002; Tue, 28 Feb 2017 11:05:47 +0000 (UTC) (envelope-from manu@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 D46733B4; Tue, 28 Feb 2017 11:05:46 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SB5jXP001917; Tue, 28 Feb 2017 11:05:45 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SB5jOj001916; Tue, 28 Feb 2017 11:05:45 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201702281105.v1SB5jOj001916@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Tue, 28 Feb 2017 11:05:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314383 - head/sys/arm/allwinner/clkng X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 11:05:47 -0000 Author: manu Date: Tue Feb 28 11:05:45 2017 New Revision: 314383 URL: https://svnweb.freebsd.org/changeset/base/314383 Log: allwinner: NM clock: Add value for fixed factor. The register func for aw_clk_nm didn't copy the value needed for the fixed factor, resulting in all fixed factor not working on NM clocks. Modified: head/sys/arm/allwinner/clkng/aw_clk_nm.c Modified: head/sys/arm/allwinner/clkng/aw_clk_nm.c ============================================================================== --- head/sys/arm/allwinner/clkng/aw_clk_nm.c Tue Feb 28 09:50:34 2017 (r314382) +++ head/sys/arm/allwinner/clkng/aw_clk_nm.c Tue Feb 28 11:05:45 2017 (r314383) @@ -331,11 +331,13 @@ aw_clk_nm_register(struct clkdom *clkdom sc->m.shift = clkdef->m.shift; sc->m.width = clkdef->m.width; sc->m.mask = ((1 << sc->m.width) - 1) << sc->m.shift; + sc->m.value = clkdef->m.value; sc->m.flags = clkdef->m.flags; sc->n.shift = clkdef->n.shift; sc->n.width = clkdef->n.width; sc->n.mask = ((1 << sc->n.width) - 1) << sc->n.shift; + sc->n.value = clkdef->n.value; sc->n.flags = clkdef->n.flags; sc->frac.freq0 = clkdef->frac.freq0; From owner-svn-src-all@freebsd.org Tue Feb 28 11:38:13 2017 Return-Path: Delivered-To: svn-src-all@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 4A5D6CF19E5; Tue, 28 Feb 2017 11:38:13 +0000 (UTC) (envelope-from manu@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 091C997A; Tue, 28 Feb 2017 11:38:12 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SBcCcK013585; Tue, 28 Feb 2017 11:38:12 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SBcBNI013580; Tue, 28 Feb 2017 11:38:11 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201702281138.v1SBcBNI013580@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Tue, 28 Feb 2017 11:38:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314384 - head/sys/arm/allwinner/clkng X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 11:38:13 -0000 Author: manu Date: Tue Feb 28 11:38:11 2017 New Revision: 314384 URL: https://svnweb.freebsd.org/changeset/base/314384 Log: allwinner: NKMP clock: add update bit The PLL_DDR clock have an update bit which need to be set after changing the value, add the possibility to define one for NKMP clocks. This allow us to add the missing clocks. We now have the full list of clocks created under the clock domain. Modified: head/sys/arm/allwinner/clkng/aw_clk.h head/sys/arm/allwinner/clkng/aw_clk_nkmp.c head/sys/arm/allwinner/clkng/aw_clk_nkmp.h head/sys/arm/allwinner/clkng/ccu_h3.c head/sys/arm/allwinner/clkng/ccu_h3.h Modified: head/sys/arm/allwinner/clkng/aw_clk.h ============================================================================== --- head/sys/arm/allwinner/clkng/aw_clk.h Tue Feb 28 11:05:45 2017 (r314383) +++ head/sys/arm/allwinner/clkng/aw_clk.h Tue Feb 28 11:38:11 2017 (r314384) @@ -64,6 +64,7 @@ struct aw_clk_init { #define AW_CLK_REPARENT 0x0008 #define AW_CLK_SCALE_CHANGE 0x0010 #define AW_CLK_HAS_FRAC 0x0020 +#define AW_CLK_HAS_UPDATE 0x0040 #define AW_CLK_FACTOR_POWER_OF_TWO 0x0001 #define AW_CLK_FACTOR_ZERO_BASED 0x0002 @@ -218,6 +219,48 @@ aw_clk_factor_get_value(struct aw_clk_fa .flags = _flags, \ } +#define NKMP_CLK_WITH_UPDATE(_clkname, \ + _id, _name, _pnames, \ + _offset, \ + _n_shift, _n_width, _n_value, _n_flags, \ + _k_shift, _k_width, _k_value, _k_flags, \ + _m_shift, _m_width, _m_value, _m_flags, \ + _p_shift, _p_width, _p_value, _p_flags, \ + _gate, \ + _lock, _lock_retries, \ + _update, \ + _flags) \ + static struct aw_clk_nkmp_def _clkname = { \ + .clkdef = { \ + .id = _id, \ + .name = _name, \ + .parent_names = _pnames, \ + .parent_cnt = nitems(_pnames), \ + }, \ + .offset = _offset, \ + .n.shift = _n_shift, \ + .n.width = _n_width, \ + .n.value = _n_value, \ + .n.flags = _n_flags, \ + .k.shift = _k_shift, \ + .k.width = _k_width, \ + .k.value = _k_value, \ + .k.flags = _k_flags, \ + .m.shift = _m_shift, \ + .m.width = _m_width, \ + .m.value = _m_value, \ + .m.flags = _m_flags, \ + .p.shift = _p_shift, \ + .p.width = _p_width, \ + .p.value = _p_value, \ + .p.flags = _p_flags, \ + .gate_shift = _gate, \ + .lock_shift = _lock, \ + .lock_retries = _lock_retries, \ + .update_shift = _update, \ + .flags = _flags | AW_CLK_HAS_UPDATE, \ + } + #define NM_CLK(_clkname, _id, _name, _pnames, \ _offset, \ _nshift, _nwidth, _nvalue, _nflags, \ Modified: head/sys/arm/allwinner/clkng/aw_clk_nkmp.c ============================================================================== --- head/sys/arm/allwinner/clkng/aw_clk_nkmp.c Tue Feb 28 11:05:45 2017 (r314383) +++ head/sys/arm/allwinner/clkng/aw_clk_nkmp.c Tue Feb 28 11:38:11 2017 (r314384) @@ -58,6 +58,7 @@ struct aw_clk_nkmp_sc { uint32_t gate_shift; uint32_t lock_shift; uint32_t lock_retries; + uint32_t update_shift; uint32_t flags; }; @@ -263,6 +264,14 @@ aw_clk_nkmp_set_freq(struct clknode *clk WRITE4(clk, sc->offset, val); DELAY(2000); + if ((sc->flags & AW_CLK_HAS_UPDATE) != 0) { + DEVICE_LOCK(clk); + READ4(clk, sc->offset, &val); + val |= 1 << sc->update_shift; + WRITE4(clk, sc->offset, val); + DELAY(2000); + } + if ((sc->flags & AW_CLK_HAS_LOCK) != 0) { for (retry = 0; retry < sc->lock_retries; retry++) { READ4(clk, sc->offset, &val); @@ -354,6 +363,7 @@ aw_clk_nkmp_register(struct clkdom *clkd sc->gate_shift = clkdef->gate_shift; sc->lock_shift = clkdef->lock_shift; sc->lock_retries = clkdef->lock_retries; + sc->update_shift = clkdef->update_shift; sc->flags = clkdef->flags; clknode_register(clkdom, clk); Modified: head/sys/arm/allwinner/clkng/aw_clk_nkmp.h ============================================================================== --- head/sys/arm/allwinner/clkng/aw_clk_nkmp.h Tue Feb 28 11:05:45 2017 (r314383) +++ head/sys/arm/allwinner/clkng/aw_clk_nkmp.h Tue Feb 28 11:38:11 2017 (r314384) @@ -44,6 +44,7 @@ struct aw_clk_nkmp_def { uint32_t gate_shift; uint32_t lock_shift; uint32_t lock_retries; + uint32_t update_shift; uint32_t flags; }; Modified: head/sys/arm/allwinner/clkng/ccu_h3.c ============================================================================== --- head/sys/arm/allwinner/clkng/ccu_h3.c Tue Feb 28 11:05:45 2017 (r314383) +++ head/sys/arm/allwinner/clkng/ccu_h3.c Tue Feb 28 11:38:11 2017 (r314384) @@ -177,15 +177,17 @@ static struct aw_ccung_gate h3_ccu_gates CCU_GATE(H3_CLK_I2S1, "i2s1", "i2s1mux", 0xB4, 31) CCU_GATE(H3_CLK_I2S2, "i2s2", "i2s2mux", 0xB8, 31) - /* CCU_GATE(H3_CLK_DRAM_VE, "dram-ve", "dram", 0x100, 0) */ - /* CCU_GATE(H3_CLK_DRAM_VE, "dram-csi", "dram", 0x100, 1) */ - /* CCU_GATE(H3_CLK_DRAM_VE, "dram-deinterlace", "dram", 0x100, 2) */ - /* CCU_GATE(H3_CLK_DRAM_VE, "dram-ts", "dram", 0x100, 3) */ + CCU_GATE(H3_CLK_DRAM_VE, "dram-ve", "dram", 0x100, 0) + CCU_GATE(H3_CLK_DRAM_CSI, "dram-csi", "dram", 0x100, 1) + CCU_GATE(H3_CLK_DRAM_DEINTERLACE, "dram-deinterlace", "dram", 0x100, 2) + CCU_GATE(H3_CLK_DRAM_TS, "dram-ts", "dram", 0x100, 3) CCU_GATE(H3_CLK_AC_DIG, "ac-dig", "pll_audio", 0x140, 31) CCU_GATE(H3_CLK_AVS, "avs", "osc24M", 0x144, 31) + CCU_GATE(H3_CLK_CSI_MISC, "csi-misc", "osc24M", 0x130, 31) + CCU_GATE(H3_CLK_HDMI_DDC, "hdmi-ddc", "osc24M", 0x154, 31) }; @@ -265,10 +267,19 @@ NM_CLK_WITH_FRAC(pll_ve_clk, 270000000, 297000000, /* freq0, freq1 */ 24, 25); /* mode sel, freq sel */ -/* - * Needs a update bit on nkmp or special clk static const char *pll_ddr_parents[] = {"osc24M"}; - */ +NKMP_CLK_WITH_UPDATE(pll_ddr_clk, + H3_CLK_PLL_DDR, /* id */ + "pll_ddr", pll_ddr_parents, /* name, parents */ + 0x20, /* offset */ + 8, 5, 0, 0, /* n factor */ + 4, 2, 0, 0, /* k factor */ + 0, 2, 0, 0, /* m factor */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* p factor (fake) */ + 31, /* gate */ + 28, 1000, /* lock */ + 20, /* update */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ static const char *pll_periph0_parents[] = {"osc24M"}; static const char *pll_periph0_2x_parents[] = {"pll_periph0"}; @@ -283,6 +294,14 @@ NKMP_CLK(pll_periph0_clk, 31, /* gate */ 28, 1000, /* lock */ AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ +FIXED_CLK(pll_periph0_2x_clk, + H3_CLK_PLL_PERIPH0_2X, /* id */ + "pll_periph0-2x", /* name */ + pll_periph0_2x_parents, /* parent */ + 0, /* freq */ + 2, /* mult */ + 1, /* div */ + 0); /* flags */ static const char *pll_gpu_parents[] = {"osc24M"}; NM_CLK_WITH_FRAC(pll_gpu_clk, @@ -496,32 +515,122 @@ NM_CLK(spdif_clk, 31, /* gate */ AW_CLK_HAS_GATE); /* flags */ -FIXED_CLK(pll_periph0_2x_clk, - H3_CLK_PLL_PERIPH0_2X, /* id */ - "pll_periph0-2x", /* name */ - pll_periph0_2x_parents, /* parent */ - 0, /* freq */ - 2, /* mult */ - 1, /* div */ - 0); /* flags */ +static const char *dram_parents[] = {"pll_ddr", "pll_periph0-2x"}; +NM_CLK(dram_clk, + H3_CLK_DRAM, "dram", dram_parents, /* id, name, parents */ + 0xF4, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 20, 2, /* mux */ + 0, /* gate */ + AW_CLK_HAS_MUX); /* flags */ + +static const char *de_parents[] = {"pll_periph0-2x", "pll_de"}; +NM_CLK(de_clk, + H3_CLK_DE, "de", de_parents, /* id, name, parents */ + 0x104, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ -/* DRAM clock 0xF4 */ -/* DE gating 0x104 */ -/* TCON0 0x118 */ -/* TVE 0x120 */ -/* Deinterlace 0x124 */ -/* CSI_MISC 0x130 */ -/* CSI 0x134 */ -/* VE 0x13C */ -/* HDMI 0x150 */ -/* MBUS 0x15C */ -/* GPU 0x1A0 */ +static const char *tcon0_parents[] = {"pll_video"}; +NM_CLK(tcon0_clk, + H3_CLK_TCON0, "tcon0", tcon0_parents, /* id, name, parents */ + 0x118, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +static const char *tve_parents[] = {"pll_de", "pll_periph1"}; +NM_CLK(tve_clk, + H3_CLK_TVE, "tve", tve_parents, /* id, name, parents */ + 0x120, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +static const char *deinterlace_parents[] = {"pll_periph0", "pll_periph1"}; +NM_CLK(deinterlace_clk, + H3_CLK_DEINTERLACE, "deinterlace", deinterlace_parents, /* id, name, parents */ + 0x124, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +static const char *csi_sclk_parents[] = {"pll_periph0", "pll_periph1"}; +NM_CLK(csi_sclk_clk, + H3_CLK_CSI_SCLK, "csi-sclk", csi_sclk_parents, /* id, name, parents */ + 0x134, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 16, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +static const char *csi_mclk_parents[] = {"osc24M", "pll_video", "pll_periph1"}; +NM_CLK(csi_mclk_clk, + H3_CLK_CSI_MCLK, "csi-mclk", csi_mclk_parents, /* id, name, parents */ + 0x134, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 8, 2, /* mux */ + 15, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +static const char *ve_parents[] = {"pll_ve"}; +NM_CLK(ve_clk, + H3_CLK_VE, "ve", ve_parents, /* id, name, parents */ + 0x13C, /* offset */ + 16, 3, 0, 0, /* n factor */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* m factor (fake) */ + 0, 0, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE); /* flags */ + +static const char *hdmi_parents[] = {"pll_video"}; +NM_CLK(hdmi_clk, + H3_CLK_HDMI, "hdmi", hdmi_parents, /* id, name, parents */ + 0x150, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +static const char *mbus_parents[] = {"osc24M", "pll_periph0-2x", "pll_ddr"}; +NM_CLK(mbus_clk, + H3_CLK_MBUS, "mbus", mbus_parents, /* id, name, parents */ + 0x15C, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 3, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +static const char *gpu_parents[] = {"pll_gpu"}; +NM_CLK(gpu_clk, + H3_CLK_GPU, "gpu", gpu_parents, /* id, name, parents */ + 0x1A0, /* offset */ + 0, 2, 0, 0, /* n factor */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* m factor (fake) */ + 0, 0, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE); /* flags */ static struct aw_clk_nkmp_def *nkmp_clks[] = { &pll_cpux_clk, &pll_audio_clk, &pll_periph0_clk, &pll_periph1_clk, + &pll_ddr_clk, }; static struct aw_clk_nm_def *nm_clks[] = { @@ -539,6 +648,17 @@ static struct aw_clk_nm_def *nm_clks[] = &spi0_clk, &spi1_clk, &spdif_clk, + &dram_clk, + &de_clk, + &tcon0_clk, + &tve_clk, + &deinterlace_clk, + &csi_sclk_clk, + &csi_mclk_clk, + &ve_clk, + &hdmi_clk, + &mbus_clk, + &gpu_clk, }; static struct aw_clk_prediv_mux_def *prediv_mux_clks[] = { @@ -569,6 +689,7 @@ static struct clk_fixed_def *fixed_facto static struct aw_clk_init init_clks[] = { {"ahb1", "pll_periph0", 0, false}, {"ahb2", "pll_periph0", 0, false}, + {"dram", "pll_ddr", 0, false}, }; void Modified: head/sys/arm/allwinner/clkng/ccu_h3.h ============================================================================== --- head/sys/arm/allwinner/clkng/ccu_h3.h Tue Feb 28 11:05:45 2017 (r314383) +++ head/sys/arm/allwinner/clkng/ccu_h3.h Tue Feb 28 11:38:11 2017 (r314384) @@ -98,14 +98,12 @@ #define H3_CLK_PLL_GPU 11 #define H3_CLK_PLL_PERIPH1 12 #define H3_CLK_PLL_DE 13 - #define H3_CLK_CPUX 14 #define H3_CLK_AXI 15 #define H3_CLK_AHB1 16 #define H3_CLK_APB1 17 #define H3_CLK_APB2 18 #define H3_CLK_AHB2 19 - #define H3_CLK_BUS_CE 20 #define H3_CLK_BUS_DMA 21 #define H3_CLK_BUS_MMC0 22 @@ -155,7 +153,6 @@ #define H3_CLK_BUS_SCR 66 #define H3_CLK_BUS_EPHY 67 #define H3_CLK_BUS_DBG 68 - #define H3_CLK_THS 69 #define H3_CLK_NAND 70 #define H3_CLK_MMC0 71 @@ -183,7 +180,7 @@ #define H3_CLK_USBOHCI1 93 #define H3_CLK_USBOHCI2 94 #define H3_CLK_USBOHCI3 95 - +#define H3_CLK_DRAM 96 #define H3_CLK_DRAM_VE 97 #define H3_CLK_DRAM_CSI 98 #define H3_CLK_DRAM_DEINTERLACE 99 @@ -200,7 +197,7 @@ #define H3_CLK_AVS 110 #define H3_CLK_HDMI 111 #define H3_CLK_HDMI_DDC 112 - +#define H3_CLK_MBUS 113 #define H3_CLK_GPU 114 void ccu_h3_register_clocks(struct aw_ccung_softc *sc); From owner-svn-src-all@freebsd.org Tue Feb 28 11:41:59 2017 Return-Path: Delivered-To: svn-src-all@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 2A6A7CF1C55; Tue, 28 Feb 2017 11:41:59 +0000 (UTC) (envelope-from avg@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 EDEA9DB7; Tue, 28 Feb 2017 11:41:58 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SBfwqC016509; Tue, 28 Feb 2017 11:41:58 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SBfwdK016508; Tue, 28 Feb 2017 11:41:58 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201702281141.v1SBfwdK016508@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Tue, 28 Feb 2017 11:41:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314385 - stable/11/sys/x86/x86 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 11:41:59 -0000 Author: avg Date: Tue Feb 28 11:41:57 2017 New Revision: 314385 URL: https://svnweb.freebsd.org/changeset/base/314385 Log: MFC r313751: mca: fix writes to MSR_MC_CTL2 in cmci_update Modified: stable/11/sys/x86/x86/mca.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/x86/x86/mca.c ============================================================================== --- stable/11/sys/x86/x86/mca.c Tue Feb 28 11:38:11 2017 (r314384) +++ stable/11/sys/x86/x86/mca.c Tue Feb 28 11:41:57 2017 (r314385) @@ -548,7 +548,7 @@ cmci_update(enum scan_mode mode, int ban limit = min(limit << 1, cc->max_threshold); ctl &= ~MC_CTL2_THRESHOLD; ctl |= limit; - wrmsr(MSR_MC_CTL2(bank), limit); + wrmsr(MSR_MC_CTL2(bank), ctl); } cc->last_intr = time_uptime; return; @@ -581,7 +581,7 @@ cmci_update(enum scan_mode mode, int ban if ((ctl & MC_CTL2_THRESHOLD) != limit) { ctl &= ~MC_CTL2_THRESHOLD; ctl |= limit; - wrmsr(MSR_MC_CTL2(bank), limit); + wrmsr(MSR_MC_CTL2(bank), ctl); } } #endif From owner-svn-src-all@freebsd.org Tue Feb 28 11:42:06 2017 Return-Path: Delivered-To: svn-src-all@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 2154FCF1C8C; Tue, 28 Feb 2017 11:42:06 +0000 (UTC) (envelope-from avg@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 E4F98E08; Tue, 28 Feb 2017 11:42:05 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SBg5Po016685; Tue, 28 Feb 2017 11:42:05 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SBg5BZ016684; Tue, 28 Feb 2017 11:42:05 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201702281142.v1SBg5BZ016684@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Tue, 28 Feb 2017 11:42:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314386 - stable/10/sys/x86/x86 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 11:42:06 -0000 Author: avg Date: Tue Feb 28 11:42:04 2017 New Revision: 314386 URL: https://svnweb.freebsd.org/changeset/base/314386 Log: MFC r313751: mca: fix writes to MSR_MC_CTL2 in cmci_update Modified: stable/10/sys/x86/x86/mca.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/x86/x86/mca.c ============================================================================== --- stable/10/sys/x86/x86/mca.c Tue Feb 28 11:41:57 2017 (r314385) +++ stable/10/sys/x86/x86/mca.c Tue Feb 28 11:42:04 2017 (r314386) @@ -550,7 +550,7 @@ cmci_update(enum scan_mode mode, int ban limit = min(limit << 1, cc->max_threshold); ctl &= ~MC_CTL2_THRESHOLD; ctl |= limit; - wrmsr(MSR_MC_CTL2(bank), limit); + wrmsr(MSR_MC_CTL2(bank), ctl); } cc->last_intr = time_uptime; return; @@ -583,7 +583,7 @@ cmci_update(enum scan_mode mode, int ban if ((ctl & MC_CTL2_THRESHOLD) != limit) { ctl &= ~MC_CTL2_THRESHOLD; ctl |= limit; - wrmsr(MSR_MC_CTL2(bank), limit); + wrmsr(MSR_MC_CTL2(bank), ctl); } } #endif From owner-svn-src-all@freebsd.org Tue Feb 28 11:56:18 2017 Return-Path: Delivered-To: svn-src-all@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 C2AFECF112D; Tue, 28 Feb 2017 11:56:18 +0000 (UTC) (envelope-from mav@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 88EDB90B; Tue, 28 Feb 2017 11:56:18 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SBuHcb021648; Tue, 28 Feb 2017 11:56:17 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SBuHhi021647; Tue, 28 Feb 2017 11:56:17 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201702281156.v1SBuHhi021647@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Tue, 28 Feb 2017 11:56:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314387 - head/sys/cam/ctl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 11:56:18 -0000 Author: mav Date: Tue Feb 28 11:56:17 2017 New Revision: 314387 URL: https://svnweb.freebsd.org/changeset/base/314387 Log: Make ctl_queue_sense() not sleep. It may be called in non-sleepable frontend context. MFC after: 2 weeks Modified: head/sys/cam/ctl/ctl.c Modified: head/sys/cam/ctl/ctl.c ============================================================================== --- head/sys/cam/ctl/ctl.c Tue Feb 28 11:42:04 2017 (r314386) +++ head/sys/cam/ctl/ctl.c Tue Feb 28 11:56:17 2017 (r314387) @@ -13146,21 +13146,15 @@ ctl_queue_sense(union ctl_io *io) initidx = ctl_get_initindex(&io->io_hdr.nexus); p = initidx / CTL_MAX_INIT_PER_PORT; - if ((ps = lun->pending_sense[p]) == NULL) { - mtx_unlock(&lun->lun_lock); - ps = malloc(sizeof(*ps) * CTL_MAX_INIT_PER_PORT, M_CTL, - M_WAITOK | M_ZERO); - mtx_lock(&lun->lun_lock); - if (lun->pending_sense[p] == NULL) { - lun->pending_sense[p] = ps; - } else { - free(ps, M_CTL); - ps = lun->pending_sense[p]; - } + if (lun->pending_sense[p] == NULL) { + lun->pending_sense[p] = malloc(sizeof(*ps) * CTL_MAX_INIT_PER_PORT, + M_CTL, M_NOWAIT | M_ZERO); + } + if ((ps = lun->pending_sense[p]) != NULL) { + ps += initidx % CTL_MAX_INIT_PER_PORT; + memset(ps, 0, sizeof(*ps)); + memcpy(ps, &io->scsiio.sense_data, io->scsiio.sense_len); } - ps += initidx % CTL_MAX_INIT_PER_PORT; - memset(ps, 0, sizeof(*ps)); - memcpy(ps, &io->scsiio.sense_data, io->scsiio.sense_len); mtx_unlock(&lun->lun_lock); bailout: From owner-svn-src-all@freebsd.org Tue Feb 28 14:02:18 2017 Return-Path: Delivered-To: svn-src-all@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 BD4D4CF1020; Tue, 28 Feb 2017 14:02:18 +0000 (UTC) (envelope-from br@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 8C0FDCAB; Tue, 28 Feb 2017 14:02:18 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SE2H7t072670; Tue, 28 Feb 2017 14:02:17 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SE2GRw072657; Tue, 28 Feb 2017 14:02:16 GMT (envelope-from br@FreeBSD.org) Message-Id: <201702281402.v1SE2GRw072657@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Tue, 28 Feb 2017 14:02:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314389 - in head/sys: arm/altera/socfpga arm/conf boot/fdt/dts/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 14:02:18 -0000 Author: br Date: Tue Feb 28 14:02:16 2017 New Revision: 314389 URL: https://svnweb.freebsd.org/changeset/base/314389 Log: Add support for Intel Arria 10 SoC Development Kit. Use standard DTS files for SOCKIT and SOCDK. Sponsored by: DARPA, AFRL Added: head/sys/arm/conf/SOCDK (contents, props changed) head/sys/arm/conf/SOCFPGA (contents, props changed) head/sys/boot/fdt/dts/arm/socfpga_arria10_socdk_sdmmc.dts (contents, props changed) head/sys/boot/fdt/dts/arm/socfpga_cyclone5_sockit_beri_sdmmc.dts (contents, props changed) head/sys/boot/fdt/dts/arm/socfpga_cyclone5_sockit_sdmmc.dts (contents, props changed) Deleted: head/sys/arm/conf/SOCKIT.common head/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts head/sys/boot/fdt/dts/arm/socfpga-sockit.dts head/sys/boot/fdt/dts/arm/socfpga.dtsi Modified: head/sys/arm/altera/socfpga/socfpga_machdep.c head/sys/arm/altera/socfpga/socfpga_manager.c head/sys/arm/altera/socfpga/socfpga_mp.c head/sys/arm/altera/socfpga/socfpga_mp.h head/sys/arm/altera/socfpga/socfpga_rstmgr.c head/sys/arm/altera/socfpga/socfpga_rstmgr.h head/sys/arm/conf/SOCKIT head/sys/arm/conf/SOCKIT-BERI Modified: head/sys/arm/altera/socfpga/socfpga_machdep.c ============================================================================== --- head/sys/arm/altera/socfpga/socfpga_machdep.c Tue Feb 28 12:05:58 2017 (r314388) +++ head/sys/arm/altera/socfpga/socfpga_machdep.c Tue Feb 28 14:02:16 2017 (r314389) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2014 Ruslan Bukin + * Copyright (c) 2014-2017 Ruslan Bukin * All rights reserved. * * This software was developed by SRI International and the University of @@ -83,24 +83,43 @@ socfpga_devmap_init(platform_t plat) return (0); } +static int +socfpga_a10_devmap_init(platform_t plat) +{ + + /* UART */ + devmap_add_entry(0xffc00000, 0x100000); + + /* USB OTG */ + devmap_add_entry(0xffb00000, 0x100000); + + /* dwmmc */ + devmap_add_entry(0xff800000, 0x100000); + + /* scu */ + devmap_add_entry(0xfff00000, 0x100000); + + return (0); +} + static void -socfpga_cpu_reset(platform_t plat) +_socfpga_cpu_reset(platform_t plat, uint32_t reg) { uint32_t paddr; bus_addr_t vaddr; phandle_t node; - if (rstmgr_warmreset() == 0) + if (rstmgr_warmreset(reg) == 0) goto end; - node = OF_finddevice("rstmgr"); + node = OF_finddevice("/soc/rstmgr"); if (node == -1) goto end; if ((OF_getencprop(node, "reg", &paddr, sizeof(paddr))) > 0) { if (bus_space_map(fdtbus_bs_tag, paddr, 0x8, 0, &vaddr) == 0) { bus_space_write_4(fdtbus_bs_tag, vaddr, - RSTMGR_CTRL, CTRL_SWWARMRSTREQ); + reg, CTRL_SWWARMRSTREQ); } } @@ -108,16 +127,38 @@ end: while (1); } +static void +socfpga_cpu_reset(platform_t plat) +{ + + _socfpga_cpu_reset(plat, RSTMGR_CTRL); +} + +static void +socfpga_a10_cpu_reset(platform_t plat) +{ + + _socfpga_cpu_reset(plat, RSTMGR_A10_CTRL); +} + static platform_method_t socfpga_methods[] = { PLATFORMMETHOD(platform_devmap_init, socfpga_devmap_init), PLATFORMMETHOD(platform_cpu_reset, socfpga_cpu_reset), - #ifdef SMP PLATFORMMETHOD(platform_mp_setmaxid, socfpga_mp_setmaxid), PLATFORMMETHOD(platform_mp_start_ap, socfpga_mp_start_ap), #endif - PLATFORMMETHOD_END, }; +FDT_PLATFORM_DEF(socfpga, "socfpga", 0, "altr,socfpga-cyclone5", 200); -FDT_PLATFORM_DEF(socfpga, "socfpga", 0, "altr,socfpga", 0); +static platform_method_t socfpga_a10_methods[] = { + PLATFORMMETHOD(platform_devmap_init, socfpga_a10_devmap_init), + PLATFORMMETHOD(platform_cpu_reset, socfpga_a10_cpu_reset), +#ifdef SMP + PLATFORMMETHOD(platform_mp_setmaxid, socfpga_mp_setmaxid), + PLATFORMMETHOD(platform_mp_start_ap, socfpga_a10_mp_start_ap), +#endif + PLATFORMMETHOD_END, +}; +FDT_PLATFORM_DEF(socfpga_a10, "socfpga", 0, "altr,socfpga-arria10", 200); Modified: head/sys/arm/altera/socfpga/socfpga_manager.c ============================================================================== --- head/sys/arm/altera/socfpga/socfpga_manager.c Tue Feb 28 12:05:58 2017 (r314388) +++ head/sys/arm/altera/socfpga/socfpga_manager.c Tue Feb 28 14:02:16 2017 (r314389) @@ -377,7 +377,7 @@ fpgamgr_probe(device_t dev) if (!ofw_bus_status_okay(dev)) return (ENXIO); - if (!ofw_bus_is_compatible(dev, "altr,fpga-mgr")) + if (!ofw_bus_is_compatible(dev, "altr,socfpga-fpga-mgr")) return (ENXIO); device_set_desc(dev, "FPGA Manager"); Modified: head/sys/arm/altera/socfpga/socfpga_mp.c ============================================================================== --- head/sys/arm/altera/socfpga/socfpga_mp.c Tue Feb 28 12:05:58 2017 (r314388) +++ head/sys/arm/altera/socfpga/socfpga_mp.c Tue Feb 28 14:02:16 2017 (r314389) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2014 Ruslan Bukin + * Copyright (c) 2014-2017 Ruslan Bukin * All rights reserved. * * This software was developed by SRI International and the University of @@ -50,8 +50,10 @@ __FBSDID("$FreeBSD$"); #include #include +#include #define SCU_PHYSBASE 0xFFFEC000 +#define SCU_PHYSBASE_A10 0xFFFFC000 #define SCU_SIZE 0x100 #define SCU_CONTROL_REG 0x00 @@ -69,11 +71,12 @@ __FBSDID("$FreeBSD$"); #define RSTMGR_PHYSBASE 0xFFD05000 #define RSTMGR_SIZE 0x100 -#define MPUMODRST 0x10 -#define MPUMODRST_CPU1 (1 << 1) #define RAM_PHYSBASE 0x0 -#define RAM_SIZE 0x1000 +#define RAM_SIZE 0x1000 + +#define SOCFPGA_SOCKIT 1 +#define SOCFPGA_SOCDK 2 extern char *mpentry_addr; static void socfpga_trampoline(void); @@ -109,15 +112,22 @@ socfpga_mp_setmaxid(platform_t plat) mp_maxid = ncpu - 1; } -void -socfpga_mp_start_ap(platform_t plat) + +static void +_socfpga_mp_start_ap(platform_t plat, uint32_t platid) { bus_space_handle_t scu, rst, ram; int reg; - if (bus_space_map(fdtbus_bs_tag, SCU_PHYSBASE, - SCU_SIZE, 0, &scu) != 0) + if (platid == SOCFPGA_SOCDK) { + if (bus_space_map(fdtbus_bs_tag, SCU_PHYSBASE_A10, + SCU_SIZE, 0, &scu) != 0) panic("Couldn't map the SCU\n"); + } else { + if (bus_space_map(fdtbus_bs_tag, SCU_PHYSBASE, + SCU_SIZE, 0, &scu) != 0) + panic("Couldn't map the SCU\n"); + } if (bus_space_map(fdtbus_bs_tag, RSTMGR_PHYSBASE, RSTMGR_SIZE, 0, &rst) != 0) panic("Couldn't map the reset manager (RSTMGR)\n"); @@ -139,7 +149,13 @@ socfpga_mp_start_ap(platform_t plat) bus_space_write_4(fdtbus_bs_tag, scu, SCU_DIAG_CONTROL, reg); /* Put CPU1 to reset state */ - bus_space_write_4(fdtbus_bs_tag, rst, MPUMODRST, MPUMODRST_CPU1); + if (platid == SOCFPGA_SOCDK) { + bus_space_write_4(fdtbus_bs_tag, rst, + RSTMGR_A10_MPUMODRST, MPUMODRST_CPU1); + } else { + bus_space_write_4(fdtbus_bs_tag, rst, + RSTMGR_MPUMODRST, MPUMODRST_CPU1); + } /* Enable the SCU, then clean the cache on this core */ reg = bus_space_read_4(fdtbus_bs_tag, scu, SCU_CONTROL_REG); @@ -154,7 +170,13 @@ socfpga_mp_start_ap(platform_t plat) dcache_wbinv_poc_all(); /* Put CPU1 out from reset */ - bus_space_write_4(fdtbus_bs_tag, rst, MPUMODRST, 0); + if (platid == SOCFPGA_SOCDK) { + bus_space_write_4(fdtbus_bs_tag, rst, + RSTMGR_A10_MPUMODRST, 0); + } else { + bus_space_write_4(fdtbus_bs_tag, rst, + RSTMGR_MPUMODRST, 0); + } dsb(); sev(); @@ -163,3 +185,18 @@ socfpga_mp_start_ap(platform_t plat) bus_space_unmap(fdtbus_bs_tag, rst, RSTMGR_SIZE); bus_space_unmap(fdtbus_bs_tag, ram, RAM_SIZE); } + +void +socfpga_a10_mp_start_ap(platform_t plat) +{ + + _socfpga_mp_start_ap(plat, SOCFPGA_SOCDK); +} + +void +socfpga_mp_start_ap(platform_t plat) +{ + + _socfpga_mp_start_ap(plat, SOCFPGA_SOCKIT); +} + Modified: head/sys/arm/altera/socfpga/socfpga_mp.h ============================================================================== --- head/sys/arm/altera/socfpga/socfpga_mp.h Tue Feb 28 12:05:58 2017 (r314388) +++ head/sys/arm/altera/socfpga/socfpga_mp.h Tue Feb 28 14:02:16 2017 (r314389) @@ -30,5 +30,6 @@ void socfpga_mp_setmaxid(platform_t); void socfpga_mp_start_ap(platform_t); +void socfpga_a10_mp_start_ap(platform_t); #endif /* _SOCFPGA_MP_H_ */ Modified: head/sys/arm/altera/socfpga/socfpga_rstmgr.c ============================================================================== --- head/sys/arm/altera/socfpga/socfpga_rstmgr.c Tue Feb 28 12:05:58 2017 (r314388) +++ head/sys/arm/altera/socfpga/socfpga_rstmgr.c Tue Feb 28 14:02:16 2017 (r314389) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2014 Ruslan Bukin + * Copyright (c) 2014-2017 Ruslan Bukin * All rights reserved. * * This software was developed by SRI International and the University of @@ -166,7 +166,7 @@ rstmgr_sysctl(SYSCTL_HANDLER_ARGS) } int -rstmgr_warmreset(void) +rstmgr_warmreset(uint32_t reg) { struct rstmgr_softc *sc; @@ -175,8 +175,7 @@ rstmgr_warmreset(void) return (1); /* Request warm reset */ - WRITE4(sc, RSTMGR_CTRL, - CTRL_SWWARMRSTREQ); + WRITE4(sc, reg, CTRL_SWWARMRSTREQ); return (0); } @@ -214,6 +213,7 @@ rstmgr_probe(device_t dev) return (ENXIO); device_set_desc(dev, "Reset Manager"); + return (BUS_PROBE_DEFAULT); } Modified: head/sys/arm/altera/socfpga/socfpga_rstmgr.h ============================================================================== --- head/sys/arm/altera/socfpga/socfpga_rstmgr.h Tue Feb 28 12:05:58 2017 (r314388) +++ head/sys/arm/altera/socfpga/socfpga_rstmgr.h Tue Feb 28 14:02:16 2017 (r314389) @@ -35,6 +35,7 @@ #define CTRL_SWWARMRSTREQ (1 << 1) /* Trigger warm reset */ #define RSTMGR_COUNTS 0x8 /* Reset Cycles Count */ #define RSTMGR_MPUMODRST 0x10 /* MPU Module Reset */ +#define MPUMODRST_CPU1 (1 << 1) #define RSTMGR_PERMODRST 0x14 /* Peripheral Module Reset */ #define RSTMGR_PER2MODRST 0x18 /* Peripheral 2 Module Reset */ #define RSTMGR_BRGMODRST 0x1C /* Bridge Module Reset */ @@ -43,4 +44,7 @@ #define BRGMODRST_HPS2FPGA (1 << 0) #define RSTMGR_MISCMODRST 0x20 /* Miscellaneous Module Reset */ -int rstmgr_warmreset(void); +#define RSTMGR_A10_CTRL 0xC /* Control */ +#define RSTMGR_A10_MPUMODRST 0x20 /* MPU Module Reset */ + +int rstmgr_warmreset(uint32_t reg); Added: head/sys/arm/conf/SOCDK ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/conf/SOCDK Tue Feb 28 14:02:16 2017 (r314389) @@ -0,0 +1,30 @@ +# +# Kernel configuration for Altera Arria10 SOC Development Kit. +# +# For more information on this file, please read the config(5) manual page, +# and/or the handbook section on Kernel Configuration Files: +# +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. +# +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD$ + +#NO_UNIVERSE + +include "SOCFPGA" +ident SOCDK + +options ROOTDEVNAME=\"ufs:/dev/mmcsd0s4\" + +# Flattened Device Tree +options FDT_DTB_STATIC +makeoptions FDT_DTS_FILE=socfpga_arria10_socdk_sdmmc.dts Added: head/sys/arm/conf/SOCFPGA ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/conf/SOCFPGA Tue Feb 28 14:02:16 2017 (r314389) @@ -0,0 +1,97 @@ +# +# Kernel configuration for Altera SOCFPGA development kits. +# +# For more information on this file, please read the config(5) manual page, +# and/or the handbook section on Kernel Configuration Files: +# +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. +# +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD$ + +ident SOCFPGA +include "std.armv6" +include "../altera/socfpga/std.socfpga" + +makeoptions MODULES_OVERRIDE="" + +makeoptions WERROR="-Werror" + +options SCHED_ULE # ULE scheduler +options PLATFORM # Platform based SoC +options PLATFORM_SMP +options SMP # Enable multiple cores +options MULTIDELAY + +# NFS root from boopt/dhcp +#options BOOTP +#options BOOTP_NFSROOT +#options BOOTP_COMPAT +#options BOOTP_NFSV3 +#options BOOTP_WIRED_TO=ue0 + +# Interrupt controller +device gic +options INTRNG + +# ARM MPCore timer +device mpcore_timer + +# MMC/SD/SDIO Card slot support +device mmc # mmc/sd bus +device mmcsd # mmc/sd flash cards +device dwmmc + +# Pseudo devices + +device loop +device random +device pty +device md +device gpio + +# USB support +options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. +device usb +device dwcotg + +device umass +device scbus # SCSI bus (required for ATA/SCSI) +device da # Direct Access (disks) +device pass + +# Serial ports +device uart +device uart_snps + +# I2C (TWSI) +device iic +device iicbus + +# SPI +device spibus + +# Ethernet +device ether +device mii +device smsc +device smscphy +device dwc +device micphy + +# USB ethernet support, requires miibus +device miibus +device axe # ASIX Electronics USB Ethernet +device bpf # Berkeley packet filter + +# Flattened Device Tree +options FDT # Configure using FDT/DTB data Modified: head/sys/arm/conf/SOCKIT ============================================================================== --- head/sys/arm/conf/SOCKIT Tue Feb 28 12:05:58 2017 (r314388) +++ head/sys/arm/conf/SOCKIT Tue Feb 28 14:02:16 2017 (r314389) @@ -20,11 +20,11 @@ #NO_UNIVERSE +include "SOCFPGA" ident SOCKIT -include "SOCKIT.common" -options ROOTDEVNAME=\"ufs:/dev/da0\" +options ROOTDEVNAME=\"ufs:/dev/mmcsd0s4\" # Flattened Device Tree options FDT_DTB_STATIC -makeoptions FDT_DTS_FILE=socfpga-sockit.dts +makeoptions FDT_DTS_FILE=socfpga_cyclone5_sockit_sdmmc.dts Modified: head/sys/arm/conf/SOCKIT-BERI ============================================================================== --- head/sys/arm/conf/SOCKIT-BERI Tue Feb 28 12:05:58 2017 (r314388) +++ head/sys/arm/conf/SOCKIT-BERI Tue Feb 28 14:02:16 2017 (r314389) @@ -18,8 +18,10 @@ # # $FreeBSD$ +#NO_UNIVERSE + +include "SOCFPGA" ident SOCKIT-BERI -include "SOCKIT.common" options ROOTDEVNAME=\"ufs:/dev/mmcsd0s4\" @@ -32,4 +34,4 @@ device altera_pio # Flattened Device Tree options FDT_DTB_STATIC -makeoptions FDT_DTS_FILE=socfpga-sockit-beri.dts +makeoptions FDT_DTS_FILE=socfpga_cyclone5_sockit_beri_sdmmc.dts Added: head/sys/boot/fdt/dts/arm/socfpga_arria10_socdk_sdmmc.dts ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/boot/fdt/dts/arm/socfpga_arria10_socdk_sdmmc.dts Tue Feb 28 14:02:16 2017 (r314389) @@ -0,0 +1,82 @@ +/*- + * Copyright (c) 2017 Ruslan Bukin + * All rights reserved. + * + * This software was developed by SRI International and the University of + * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237 + * ("CTSRD"), as part of the DARPA CRASH research programme. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +/dts-v1/; +#include "socfpga_arria10_socdk.dtsi" + +/ { + model = "Altera SOCFPGA Arria 10"; + compatible = "altr,socfpga-arria10", "altr,socfpga"; + + /* Reserve first page for secondary CPU trampoline code */ + memreserve = < 0x00000000 0x1000 >; + + soc { + /* Local timer */ + timer@ffffc600 { + clock-frequency = <200000000>; + }; + + /* Global timer */ + global_timer: timer@ffffc200 { + compatible = "arm,cortex-a9-global-timer"; + reg = <0xffffc200 0x20>; + interrupts = <1 11 0x301>; + clock-frequency = <200000000>; + }; + }; + + chosen { + stdin = "serial1"; + stdout = "serial1"; + }; +}; + +&uart1 { + clock-frequency = < 50000000 >; +}; + +&mmc { + status = "okay"; + num-slots = <1>; + cap-sd-highspeed; + broken-cd; + bus-width = <4>; + bus-frequency = <200000000>; +}; + +&i2c1 { + lcd@28 { + compatible = "newhaven,nhd-0216k3z-nsw-bbw"; + reg = <0x28>; + }; +}; Added: head/sys/boot/fdt/dts/arm/socfpga_cyclone5_sockit_beri_sdmmc.dts ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/boot/fdt/dts/arm/socfpga_cyclone5_sockit_beri_sdmmc.dts Tue Feb 28 14:02:16 2017 (r314389) @@ -0,0 +1,153 @@ +/*- + * Copyright (c) 2017 Ruslan Bukin + * All rights reserved. + * + * This software was developed by SRI International and the University of + * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237 + * ("CTSRD"), as part of the DARPA CRASH research programme. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +/* /dts-v1/; */ +#include "socfpga_cyclone5_sockit.dts" + +/ { + model = "Terasic SoCkit"; + compatible = "altr,socfpga-cyclone5", "altr,socfpga"; + + memreserve = < 0x00000000 0x1000 >, /* SMP trampoline */ + < 0x00001000 0x1000 >, /* virtio block */ + < 0x00002000 0x1000 >; /* virtio net */ + + soc { + /* Local timer */ + timer@fffec600 { + clock-frequency = <200000000>; + }; + + /* Global timer */ + global_timer: timer@fffec200 { + compatible = "arm,cortex-a9-global-timer"; + reg = <0xfffec200 0x20>; + interrupts = <1 11 0xf04>; + clock-frequency = <200000000>; + }; + + beri_mem0: mem@d0000000 { + compatible = "sri-cambridge,beri-mem"; + reg = <0xd0000000 0x10000000>; /* 256mb */ + status = "okay"; + }; + + pio0: pio@c0020000 { + compatible = "altr,pio"; + reg = <0xc0020000 0x1000>; /* recv */ + interrupts = < 76 >; + status = "okay"; + }; + + pio1: pio@c0021000 { + compatible = "altr,pio"; + reg = <0xc0021000 0x1000>; /* send */ + interrupts = < 82 >; /* not in use on arm side */ + status = "okay"; + }; + + pio2: pio@c0022000 { + compatible = "altr,pio"; + reg = <0xc0022000 0x1000>; /* recv */ + interrupts = < 77 >; + status = "okay"; + }; + + pio3: pio@c0023000 { + compatible = "altr,pio"; + reg = <0xc0023000 0x1000>; /* send */ + interrupts = < 83 >; /* not in use on arm side */ + status = "okay"; + }; + + beri_vtblk: vtblk@00001000 { + compatible = "sri-cambridge,beri-vtblk"; + reg = <0x00001000 0x1000>; + pio-recv = <&pio0>; + pio-send = <&pio1>; + beri-mem = <&beri_mem0>; + status = "okay"; + }; + + beri_vtnet: vtnet@00002000 { + compatible = "sri-cambridge,beri-vtnet"; + reg = <0x00002000 0x1000>; + pio-recv = <&pio2>; + pio-send = <&pio3>; + beri-mem = <&beri_mem0>; + status = "okay"; + }; + + beri_debug: ring@c0000000 { + compatible = "sri-cambridge,beri-ring"; + reg = <0xc0000000 0x3000>; + interrupts = < 72 73 >; + device_name = "beri_debug"; + data_size = <0x1000>; + data_read = <0x0>; + data_write = <0x1000>; + control_read = <0x2000>; + control_write = <0x2010>; + status = "okay"; + }; + + beri_console: ring@c0004000 { + compatible = "sri-cambridge,beri-ring"; + reg = <0xc0004000 0x3000>; + interrupts = < 74 75 >; + device_name = "beri_console"; + data_size = <0x1000>; + data_read = <0x0>; + data_write = <0x1000>; + control_read = <0x2000>; + control_write = <0x2010>; + status = "okay"; + }; + }; + + chosen { + stdin = "serial0"; + stdout = "serial0"; + }; +}; + +&mmc0 { + bus-frequency = <25000000>; +}; + +&uart0 { + clock-frequency = <100000000>; +}; + +&uart1 { + status = "disabled"; +}; Added: head/sys/boot/fdt/dts/arm/socfpga_cyclone5_sockit_sdmmc.dts ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/boot/fdt/dts/arm/socfpga_cyclone5_sockit_sdmmc.dts Tue Feb 28 14:02:16 2017 (r314389) @@ -0,0 +1,74 @@ +/*- + * Copyright (c) 2017 Ruslan Bukin + * All rights reserved. + * + * This software was developed by SRI International and the University of + * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237 + * ("CTSRD"), as part of the DARPA CRASH research programme. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +/* /dts-v1/; */ +#include "socfpga_cyclone5_sockit.dts" + +/ { + model = "Terasic SoCkit"; + compatible = "altr,socfpga-cyclone5", "altr,socfpga"; + + /* Reserve first page for secondary CPU trampoline code */ + memreserve = < 0x00000000 0x1000 >; + + soc { + /* Local timer */ + timer@fffec600 { + clock-frequency = <200000000>; + }; + + /* Global timer */ + global_timer: timer@fffec200 { + compatible = "arm,cortex-a9-global-timer"; + reg = <0xfffec200 0x20>; + interrupts = <1 11 0xf04>; + clock-frequency = <200000000>; + }; + }; + + chosen { + stdin = "serial0"; + stdout = "serial0"; + }; +}; + +&mmc0 { + bus-frequency = <25000000>; +}; + +&uart0 { + clock-frequency = <100000000>; +}; + +&uart1 { + status = "disabled"; +}; From owner-svn-src-all@freebsd.org Tue Feb 28 14:20:35 2017 Return-Path: Delivered-To: svn-src-all@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 76F78CF145C; Tue, 28 Feb 2017 14:20:35 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from fry.fubar.geek.nz (fry.fubar.geek.nz [139.59.165.16]) by mx1.freebsd.org (Postfix) with ESMTP id B6E4E6A9; Tue, 28 Feb 2017 14:20:34 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from zapp (global-5-142.nat-2.net.cam.ac.uk [131.111.5.142]) by fry.fubar.geek.nz (Postfix) with ESMTPSA id 745424E633; Tue, 28 Feb 2017 14:19:57 +0000 (UTC) Date: Tue, 28 Feb 2017 14:19:54 +0000 From: Andrew Turner To: Ruslan Bukin Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314389 - in head/sys: arm/altera/socfpga arm/conf boot/fdt/dts/arm Message-ID: <20170228141954.25098ee4@zapp> In-Reply-To: <201702281402.v1SE2GRw072657@repo.freebsd.org> References: <201702281402.v1SE2GRw072657@repo.freebsd.org> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.29; amd64-portbld-freebsd12.0) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 14:20:35 -0000 On Tue, 28 Feb 2017 14:02:16 +0000 (UTC) Ruslan Bukin wrote: > Author: br > Date: Tue Feb 28 14:02:16 2017 > New Revision: 314389 > URL: https://svnweb.freebsd.org/changeset/base/314389 > > Log: > Add support for Intel Arria 10 SoC Development Kit. > Use standard DTS files for SOCKIT and SOCDK. > > Sponsored by: DARPA, AFRL > > Added: > head/sys/arm/conf/SOCDK (contents, props changed) > head/sys/arm/conf/SOCFPGA (contents, props changed) > head/sys/boot/fdt/dts/arm/socfpga_arria10_socdk_sdmmc.dts > (contents, props changed) > head/sys/boot/fdt/dts/arm/socfpga_cyclone5_sockit_beri_sdmmc.dts > (contents, props changed) > head/sys/boot/fdt/dts/arm/socfpga_cyclone5_sockit_sdmmc.dts > (contents, props changed) Deleted: head/sys/arm/conf/SOCKIT.common > head/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts > head/sys/boot/fdt/dts/arm/socfpga-sockit.dts > head/sys/boot/fdt/dts/arm/socfpga.dtsi Modified: > head/sys/arm/altera/socfpga/socfpga_machdep.c > head/sys/arm/altera/socfpga/socfpga_manager.c > head/sys/arm/altera/socfpga/socfpga_mp.c > head/sys/arm/altera/socfpga/socfpga_mp.h > head/sys/arm/altera/socfpga/socfpga_rstmgr.c > head/sys/arm/altera/socfpga/socfpga_rstmgr.h > head/sys/arm/conf/SOCKIT > head/sys/arm/conf/SOCKIT-BERI > > Modified: head/sys/arm/altera/socfpga/socfpga_machdep.c > ============================================================================== > --- head/sys/arm/altera/socfpga/socfpga_machdep.c Tue Feb 28 > 12:05:58 2017 (r314388) +++ > head/sys/arm/altera/socfpga/socfpga_machdep.c Tue Feb 28 > 14:02:16 2017 (r314389) @@ -1,5 +1,5 @@ /*- > - * Copyright (c) 2014 Ruslan Bukin > + * Copyright (c) 2014-2017 Ruslan Bukin > * All rights reserved. > * > * This software was developed by SRI International and the > University of @@ -83,24 +83,43 @@ socfpga_devmap_init(platform_t plat) > return (0); > } > > +static int > +socfpga_a10_devmap_init(platform_t plat) You should create a SOC_ALTERA_ARRIA10 (or similar) option and use it to conditionally compile this code. > +{ > + > + /* UART */ > + devmap_add_entry(0xffc00000, 0x100000); > + > + /* USB OTG */ > + devmap_add_entry(0xffb00000, 0x100000); > + > + /* dwmmc */ > + devmap_add_entry(0xff800000, 0x100000); > + > + /* scu */ > + devmap_add_entry(0xfff00000, 0x100000); > + > + return (0); > +} > + > static void > -socfpga_cpu_reset(platform_t plat) > +_socfpga_cpu_reset(platform_t plat, uint32_t reg) Why are you passing the platform_t into this? And reg should be a bus_size_t. > { > uint32_t paddr; > bus_addr_t vaddr; > phandle_t node; > > - if (rstmgr_warmreset() == 0) > + if (rstmgr_warmreset(reg) == 0) > goto end; > > - node = OF_finddevice("rstmgr"); > + node = OF_finddevice("/soc/rstmgr"); > if (node == -1) > goto end; > > if ((OF_getencprop(node, "reg", &paddr, sizeof(paddr))) > 0) > { if (bus_space_map(fdtbus_bs_tag, paddr, 0x8, 0, &vaddr) == 0) { > bus_space_write_4(fdtbus_bs_tag, vaddr, > - RSTMGR_CTRL, CTRL_SWWARMRSTREQ); > + reg, CTRL_SWWARMRSTREQ); > } > } > > @@ -108,16 +127,38 @@ end: > while (1); > } > > +static void > +socfpga_cpu_reset(platform_t plat) > +{ > + > + _socfpga_cpu_reset(plat, RSTMGR_CTRL); > +} > + > +static void > +socfpga_a10_cpu_reset(platform_t plat) > +{ > + > + _socfpga_cpu_reset(plat, RSTMGR_A10_CTRL); > +} these two and the methods below should be under SOC_ checks. > + > static platform_method_t socfpga_methods[] = { > PLATFORMMETHOD(platform_devmap_init, > socfpga_devmap_init), PLATFORMMETHOD(platform_cpu_reset, > socfpga_cpu_reset), - > #ifdef SMP > PLATFORMMETHOD(platform_mp_setmaxid, > socfpga_mp_setmaxid), PLATFORMMETHOD(platform_mp_start_ap, > socfpga_mp_start_ap), #endif > - > PLATFORMMETHOD_END, > }; > +FDT_PLATFORM_DEF(socfpga, "socfpga", 0, "altr,socfpga-cyclone5", > 200); > -FDT_PLATFORM_DEF(socfpga, "socfpga", 0, "altr,socfpga", 0); > +static platform_method_t socfpga_a10_methods[] = { > + PLATFORMMETHOD(platform_devmap_init, > socfpga_a10_devmap_init), > + PLATFORMMETHOD(platform_cpu_reset, > socfpga_a10_cpu_reset), +#ifdef SMP > + PLATFORMMETHOD(platform_mp_setmaxid, > socfpga_mp_setmaxid), > + PLATFORMMETHOD(platform_mp_start_ap, > socfpga_a10_mp_start_ap), +#endif > + PLATFORMMETHOD_END, > +}; > +FDT_PLATFORM_DEF(socfpga_a10, "socfpga", 0, "altr,socfpga-arria10", > 200); > > Modified: head/sys/arm/altera/socfpga/socfpga_manager.c > ============================================================================== > --- head/sys/arm/altera/socfpga/socfpga_manager.c Tue Feb 28 > 12:05:58 2017 (r314388) +++ > head/sys/arm/altera/socfpga/socfpga_manager.c Tue Feb 28 > 14:02:16 2017 (r314389) @@ -377,7 +377,7 @@ > fpgamgr_probe(device_t dev) if (!ofw_bus_status_okay(dev)) return > (ENXIO); > - if (!ofw_bus_is_compatible(dev, "altr,fpga-mgr")) > + if (!ofw_bus_is_compatible(dev, "altr,socfpga-fpga-mgr")) > return (ENXIO); > > device_set_desc(dev, "FPGA Manager"); > > Modified: head/sys/arm/altera/socfpga/socfpga_mp.c > ============================================================================== > --- head/sys/arm/altera/socfpga/socfpga_mp.c Tue Feb 28 > 12:05:58 2017 (r314388) +++ > head/sys/arm/altera/socfpga/socfpga_mp.c Tue Feb 28 14:02:16 > 2017 (r314389) @@ -1,5 +1,5 @@ /*- > - * Copyright (c) 2014 Ruslan Bukin > + * Copyright (c) 2014-2017 Ruslan Bukin > * All rights reserved. > * > * This software was developed by SRI International and the > University of @@ -50,8 +50,10 @@ __FBSDID("$FreeBSD$"); > #include > > #include > +#include > > #define SCU_PHYSBASE 0xFFFEC000 > +#define SCU_PHYSBASE_A10 0xFFFFC000 > #define SCU_SIZE 0x100 > > #define SCU_CONTROL_REG 0x00 > @@ -69,11 +71,12 @@ __FBSDID("$FreeBSD$"); > > #define RSTMGR_PHYSBASE 0xFFD05000 > #define RSTMGR_SIZE 0x100 > -#define MPUMODRST 0x10 > -#define MPUMODRST_CPU1 (1 << 1) > > #define RAM_PHYSBASE 0x0 > -#define RAM_SIZE 0x1000 > +#define RAM_SIZE 0x1000 > + > +#define SOCFPGA_SOCKIT 1 > +#define SOCFPGA_SOCDK 2 > > extern char *mpentry_addr; > static void socfpga_trampoline(void); > @@ -109,15 +112,22 @@ socfpga_mp_setmaxid(platform_t plat) > mp_maxid = ncpu - 1; > } > > -void > -socfpga_mp_start_ap(platform_t plat) > + > +static void > +_socfpga_mp_start_ap(platform_t plat, uint32_t platid) > { > bus_space_handle_t scu, rst, ram; > int reg; > > - if (bus_space_map(fdtbus_bs_tag, SCU_PHYSBASE, > - SCU_SIZE, 0, &scu) != 0) > + if (platid == SOCFPGA_SOCDK) { This should become a switch, with options protected by the SOC_ options, and a panic in the default case. > + if (bus_space_map(fdtbus_bs_tag, SCU_PHYSBASE_A10, > + SCU_SIZE, 0, &scu) != 0) > panic("Couldn't map the SCU\n"); The indentation here is odd. > + } else { > + if (bus_space_map(fdtbus_bs_tag, SCU_PHYSBASE, > + SCU_SIZE, 0, &scu) != 0) > + panic("Couldn't map the SCU\n"); > + } > if (bus_space_map(fdtbus_bs_tag, RSTMGR_PHYSBASE, > RSTMGR_SIZE, 0, &rst) != 0) > panic("Couldn't map the reset manager (RSTMGR)\n"); > @@ -139,7 +149,13 @@ socfpga_mp_start_ap(platform_t plat) > bus_space_write_4(fdtbus_bs_tag, scu, SCU_DIAG_CONTROL, reg); > > /* Put CPU1 to reset state */ > - bus_space_write_4(fdtbus_bs_tag, rst, MPUMODRST, > MPUMODRST_CPU1); > + if (platid == SOCFPGA_SOCDK) { > + bus_space_write_4(fdtbus_bs_tag, rst, > + RSTMGR_A10_MPUMODRST, MPUMODRST_CPU1); > + } else { > + bus_space_write_4(fdtbus_bs_tag, rst, > + RSTMGR_MPUMODRST, MPUMODRST_CPU1); > + } > > /* Enable the SCU, then clean the cache on this core */ > reg = bus_space_read_4(fdtbus_bs_tag, scu, SCU_CONTROL_REG); > @@ -154,7 +170,13 @@ socfpga_mp_start_ap(platform_t plat) > dcache_wbinv_poc_all(); > > /* Put CPU1 out from reset */ > - bus_space_write_4(fdtbus_bs_tag, rst, MPUMODRST, 0); > + if (platid == SOCFPGA_SOCDK) { > + bus_space_write_4(fdtbus_bs_tag, rst, > + RSTMGR_A10_MPUMODRST, 0); > + } else { > + bus_space_write_4(fdtbus_bs_tag, rst, > + RSTMGR_MPUMODRST, 0); > + } > > dsb(); > sev(); > @@ -163,3 +185,18 @@ socfpga_mp_start_ap(platform_t plat) > bus_space_unmap(fdtbus_bs_tag, rst, RSTMGR_SIZE); > bus_space_unmap(fdtbus_bs_tag, ram, RAM_SIZE); > } > + > +void > +socfpga_a10_mp_start_ap(platform_t plat) > +{ > + > + _socfpga_mp_start_ap(plat, SOCFPGA_SOCDK); > +} > + > +void > +socfpga_mp_start_ap(platform_t plat) > +{ > + > + _socfpga_mp_start_ap(plat, SOCFPGA_SOCKIT); > +} > + > > Modified: head/sys/arm/altera/socfpga/socfpga_mp.h > ============================================================================== > --- head/sys/arm/altera/socfpga/socfpga_mp.h Tue Feb 28 > 12:05:58 2017 (r314388) +++ > head/sys/arm/altera/socfpga/socfpga_mp.h Tue Feb 28 14:02:16 > 2017 (r314389) @@ -30,5 +30,6 @@ > void socfpga_mp_setmaxid(platform_t); > void socfpga_mp_start_ap(platform_t); > +void socfpga_a10_mp_start_ap(platform_t); > > #endif /* _SOCFPGA_MP_H_ */ > > Modified: head/sys/arm/altera/socfpga/socfpga_rstmgr.c > ============================================================================== > --- head/sys/arm/altera/socfpga/socfpga_rstmgr.c Tue Feb 28 > 12:05:58 2017 (r314388) +++ > head/sys/arm/altera/socfpga/socfpga_rstmgr.c Tue Feb 28 > 14:02:16 2017 (r314389) @@ -1,5 +1,5 @@ /*- > - * Copyright (c) 2014 Ruslan Bukin > + * Copyright (c) 2014-2017 Ruslan Bukin > * All rights reserved. > * > * This software was developed by SRI International and the > University of @@ -166,7 +166,7 @@ rstmgr_sysctl(SYSCTL_HANDLER_ARGS) > } > > int > -rstmgr_warmreset(void) > +rstmgr_warmreset(uint32_t reg) > { > struct rstmgr_softc *sc; > > @@ -175,8 +175,7 @@ rstmgr_warmreset(void) > return (1); > > /* Request warm reset */ > - WRITE4(sc, RSTMGR_CTRL, > - CTRL_SWWARMRSTREQ); > + WRITE4(sc, reg, CTRL_SWWARMRSTREQ); > > return (0); > } > @@ -214,6 +213,7 @@ rstmgr_probe(device_t dev) > return (ENXIO); > > device_set_desc(dev, "Reset Manager"); > + > return (BUS_PROBE_DEFAULT); > } > > > Modified: head/sys/arm/altera/socfpga/socfpga_rstmgr.h > ============================================================================== > --- head/sys/arm/altera/socfpga/socfpga_rstmgr.h Tue Feb 28 > 12:05:58 2017 (r314388) +++ > head/sys/arm/altera/socfpga/socfpga_rstmgr.h Tue Feb 28 > 14:02:16 2017 (r314389) @@ -35,6 +35,7 @@ #define > CTRL_SWWARMRSTREQ (1 << 1) /* Trigger warm reset */ > #define RSTMGR_COUNTS 0x8 /* Reset > Cycles Count */ #define RSTMGR_MPUMODRST 0x10 /* > MPU Module Reset */ +#define > MPUMODRST_CPU1 (1 << 1) #define > RSTMGR_PERMODRST 0x14 /* Peripheral Module Reset */ > #define RSTMGR_PER2MODRST 0x18 /* Peripheral 2 > Module Reset */ #define RSTMGR_BRGMODRST 0x1C /* > Bridge Module Reset */ @@ -43,4 +44,7 @@ #define > BRGMODRST_HPS2FPGA (1 << 0) #define > RSTMGR_MISCMODRST 0x20 /* Miscellaneous Module Reset */ > -int rstmgr_warmreset(void); +#define > RSTMGR_A10_CTRL 0xC /* Control */ > +#define RSTMGR_A10_MPUMODRST 0x20 /* MPU Module > Reset */ + +int rstmgr_warmreset(uint32_t reg); > > Added: head/sys/arm/conf/SOCDK > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is > newly added) +++ head/sys/arm/conf/SOCDK Tue Feb 28 14:02:16 > 2017 (r314389) @@ -0,0 +1,30 @@ > +# > +# Kernel configuration for Altera Arria10 SOC Development Kit. > +# > +# For more information on this file, please read the config(5) > manual page, +# and/or the handbook section on Kernel Configuration > Files: +# > +# > http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html > +# +# The handbook is also available locally > in /usr/share/doc/handbook +# if you've installed the doc > distribution, otherwise always see the +# FreeBSD World Wide Web > server (http://www.FreeBSD.org/) for the +# latest information. > +# > +# An exhaustive list of options and more detailed explanations of the > +# device lines is also present in the ../../conf/NOTES and NOTES > files. +# If you are in doubt as to the purpose or necessity of a > line, check first +# in NOTES. > +# > +# $FreeBSD$ > + > +#NO_UNIVERSE > + > +include "SOCFPGA" > +ident SOCDK > + > +options ROOTDEVNAME=\"ufs:/dev/mmcsd0s4\" > + > +# Flattened Device Tree > +options FDT_DTB_STATIC > +makeoptions FDT_DTS_FILE=socfpga_arria10_socdk_sdmmc.dts Can we move away from ROOTDEVNAME and FDT_DTB_STATIC? It stops this from being used in a GENERIC kernel. Andrew From owner-svn-src-all@freebsd.org Tue Feb 28 14:42:59 2017 Return-Path: Delivered-To: svn-src-all@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 3BDC2CF1D41; Tue, 28 Feb 2017 14:42:59 +0000 (UTC) (envelope-from br@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 0B9E36D6; Tue, 28 Feb 2017 14:42:58 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SEgwHm088391; Tue, 28 Feb 2017 14:42:58 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SEgwKU088390; Tue, 28 Feb 2017 14:42:58 GMT (envelope-from br@FreeBSD.org) Message-Id: <201702281442.v1SEgwKU088390@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Tue, 28 Feb 2017 14:42:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314390 - head/sys/dev/usb/controller X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 14:42:59 -0000 Author: br Date: Tue Feb 28 14:42:57 2017 New Revision: 314390 URL: https://svnweb.freebsd.org/changeset/base/314390 Log: Add compatible string. This restores USB attaching on SOCKIT board after reusing standard DTS files. Sponsored by: DARPA, AFRL Modified: head/sys/dev/usb/controller/dwc_otg_fdt.c Modified: head/sys/dev/usb/controller/dwc_otg_fdt.c ============================================================================== --- head/sys/dev/usb/controller/dwc_otg_fdt.c Tue Feb 28 14:02:16 2017 (r314389) +++ head/sys/dev/usb/controller/dwc_otg_fdt.c Tue Feb 28 14:42:57 2017 (r314390) @@ -57,6 +57,12 @@ __FBSDID("$FreeBSD$"); static device_probe_t dwc_otg_probe; +static struct ofw_compat_data compat_data[] = { + { "synopsys,designware-hs-otg2", 1 }, + { "snps,dwc2", 1 }, + { NULL, 0 } +}; + static int dwc_otg_probe(device_t dev) { @@ -64,7 +70,7 @@ dwc_otg_probe(device_t dev) if (!ofw_bus_status_okay(dev)) return (ENXIO); - if (!ofw_bus_is_compatible(dev, "synopsys,designware-hs-otg2")) + if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data) return (ENXIO); device_set_desc(dev, "DWC OTG 2.0 integrated USB controller"); From owner-svn-src-all@freebsd.org Tue Feb 28 14:48:53 2017 Return-Path: Delivered-To: svn-src-all@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 920EBCF1E17; Tue, 28 Feb 2017 14:48:53 +0000 (UTC) (envelope-from kib@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 53D4A916; Tue, 28 Feb 2017 14:48:53 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SEmqR3088690; Tue, 28 Feb 2017 14:48:52 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SEmqYs088689; Tue, 28 Feb 2017 14:48:52 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201702281448.v1SEmqYs088689@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 28 Feb 2017 14:48:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314391 - stable/11/sys/sys X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 14:48:53 -0000 Author: kib Date: Tue Feb 28 14:48:52 2017 New Revision: 314391 URL: https://svnweb.freebsd.org/changeset/base/314391 Log: MFC r313734: Add RLIM_SAVED_MAX and RLIM_SAVED_CUR symbols. Modified: stable/11/sys/sys/resource.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/sys/resource.h ============================================================================== --- stable/11/sys/sys/resource.h Tue Feb 28 14:42:57 2017 (r314390) +++ stable/11/sys/sys/resource.h Tue Feb 28 14:48:52 2017 (r314391) @@ -119,8 +119,8 @@ struct __wrusage { #define RLIM_NLIMITS 15 /* number of resource limits */ #define RLIM_INFINITY ((rlim_t)(((__uint64_t)1 << 63) - 1)) -/* XXX Missing: RLIM_SAVED_MAX, RLIM_SAVED_CUR */ - +#define RLIM_SAVED_MAX RLIM_INFINITY +#define RLIM_SAVED_CUR RLIM_INFINITY /* * Resource limit string identifiers From owner-svn-src-all@freebsd.org Tue Feb 28 15:03:35 2017 Return-Path: Delivered-To: svn-src-all@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 5CB6BCF04CA; Tue, 28 Feb 2017 15:03:35 +0000 (UTC) (envelope-from kib@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 2B93EE82; Tue, 28 Feb 2017 15:03:35 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SF3Y27097546; Tue, 28 Feb 2017 15:03:34 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SF3YX4097545; Tue, 28 Feb 2017 15:03:34 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201702281503.v1SF3YX4097545@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 28 Feb 2017 15:03:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314392 - stable/10/sys/sys X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 15:03:35 -0000 Author: kib Date: Tue Feb 28 15:03:34 2017 New Revision: 314392 URL: https://svnweb.freebsd.org/changeset/base/314392 Log: MFC r313734: Add RLIM_SAVED_MAX and RLIM_SAVED_CUR symbols. Modified: stable/10/sys/sys/resource.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/sys/resource.h ============================================================================== --- stable/10/sys/sys/resource.h Tue Feb 28 14:48:52 2017 (r314391) +++ stable/10/sys/sys/resource.h Tue Feb 28 15:03:34 2017 (r314392) @@ -107,8 +107,8 @@ struct __wrusage { #define RLIM_NLIMITS 13 /* number of resource limits */ #define RLIM_INFINITY ((rlim_t)(((uint64_t)1 << 63) - 1)) -/* XXX Missing: RLIM_SAVED_MAX, RLIM_SAVED_CUR */ - +#define RLIM_SAVED_MAX RLIM_INFINITY +#define RLIM_SAVED_CUR RLIM_INFINITY /* * Resource limit string identifiers From owner-svn-src-all@freebsd.org Tue Feb 28 15:11:35 2017 Return-Path: Delivered-To: svn-src-all@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 8D329CF07F9; Tue, 28 Feb 2017 15:11:35 +0000 (UTC) (envelope-from manu@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 4B9A220B; Tue, 28 Feb 2017 15:11:35 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SFBYxW001506; Tue, 28 Feb 2017 15:11:34 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SFBYAv001503; Tue, 28 Feb 2017 15:11:34 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201702281511.v1SFBYAv001503@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Tue, 28 Feb 2017 15:11:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314393 - head/sys/arm/allwinner/clkng X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 15:11:35 -0000 Author: manu Date: Tue Feb 28 15:11:33 2017 New Revision: 314393 URL: https://svnweb.freebsd.org/changeset/base/314393 Log: allwinner: nkmp: Add MUX capability Some NKMP clocks have a mux options. Add the capability to aw_clk_nkmp. Modified: head/sys/arm/allwinner/clkng/aw_clk.h head/sys/arm/allwinner/clkng/aw_clk_nkmp.c head/sys/arm/allwinner/clkng/aw_clk_nkmp.h Modified: head/sys/arm/allwinner/clkng/aw_clk.h ============================================================================== --- head/sys/arm/allwinner/clkng/aw_clk.h Tue Feb 28 15:03:34 2017 (r314392) +++ head/sys/arm/allwinner/clkng/aw_clk.h Tue Feb 28 15:11:33 2017 (r314393) @@ -219,6 +219,48 @@ aw_clk_factor_get_value(struct aw_clk_fa .flags = _flags, \ } +#define NKMP_CLK_WITH_MUX(_clkname, \ + _id, _name, _pnames, \ + _offset, \ + _n_shift, _n_width, _n_value, _n_flags, \ + _k_shift, _k_width, _k_value, _k_flags, \ + _m_shift, _m_width, _m_value, _m_flags, \ + _p_shift, _p_width, _p_value, _p_flags, \ + _mux_shift, _mux_width, _gate, \ + _lock, _lock_retries, \ + _flags) \ + static struct aw_clk_nkmp_def _clkname = { \ + .clkdef = { \ + .id = _id, \ + .name = _name, \ + .parent_names = _pnames, \ + .parent_cnt = nitems(_pnames), \ + }, \ + .offset = _offset, \ + .n.shift = _n_shift, \ + .n.width = _n_width, \ + .n.value = _n_value, \ + .n.flags = _n_flags, \ + .k.shift = _k_shift, \ + .k.width = _k_width, \ + .k.value = _k_value, \ + .k.flags = _k_flags, \ + .m.shift = _m_shift, \ + .m.width = _m_width, \ + .m.value = _m_value, \ + .m.flags = _m_flags, \ + .p.shift = _p_shift, \ + .p.width = _p_width, \ + .p.value = _p_value, \ + .p.flags = _p_flags, \ + .mux_shift = _mux_shift, \ + .mux_width = _mux_width, \ + .gate_shift = _gate, \ + .lock_shift = _lock, \ + .lock_retries = _lock_retries, \ + .flags = _flags, \ + } + #define NKMP_CLK_WITH_UPDATE(_clkname, \ _id, _name, _pnames, \ _offset, \ Modified: head/sys/arm/allwinner/clkng/aw_clk_nkmp.c ============================================================================== --- head/sys/arm/allwinner/clkng/aw_clk_nkmp.c Tue Feb 28 15:03:34 2017 (r314392) +++ head/sys/arm/allwinner/clkng/aw_clk_nkmp.c Tue Feb 28 15:11:33 2017 (r314393) @@ -55,6 +55,8 @@ struct aw_clk_nkmp_sc { struct aw_clk_factor m; struct aw_clk_factor p; + uint32_t mux_shift; + uint32_t mux_mask; uint32_t gate_shift; uint32_t lock_shift; uint32_t lock_retries; @@ -77,7 +79,21 @@ struct aw_clk_nkmp_sc { static int aw_clk_nkmp_init(struct clknode *clk, device_t dev) { - clknode_init_parent_idx(clk, 0); + struct aw_clk_nkmp_sc *sc; + uint32_t val, idx; + + sc = clknode_get_softc(clk); + + idx = 0; + if ((sc->flags & AW_CLK_HAS_MUX) != 0) { + DEVICE_LOCK(clk); + READ4(clk, sc->offset, &val); + DEVICE_UNLOCK(clk); + + idx = (val & sc->mux_mask) >> sc->mux_shift; + } + + clknode_init_parent_idx(clk, idx); return (0); } @@ -104,6 +120,27 @@ aw_clk_nkmp_set_gate(struct clknode *clk return (0); } +static int +aw_clk_nkmp_set_mux(struct clknode *clk, int index) +{ + struct aw_clk_nkmp_sc *sc; + uint32_t val; + + sc = clknode_get_softc(clk); + + if ((sc->flags & AW_CLK_HAS_MUX) != 0) + return (0); + + DEVICE_LOCK(clk); + READ4(clk, sc->offset, &val); + val &= ~(sc->mux_mask >> sc->mux_shift); + val |= index << sc->mux_shift; + WRITE4(clk, sc->offset, val); + DEVICE_UNLOCK(clk); + + return (0); +} + static uint64_t aw_clk_nkmp_find_best(struct aw_clk_nkmp_sc *sc, uint64_t fparent, uint64_t *fout, uint32_t *factor_n, uint32_t *factor_k, uint32_t *factor_m, uint32_t *factor_p) @@ -314,6 +351,7 @@ static clknode_method_t aw_nkmp_clknode_ /* Device interface */ CLKNODEMETHOD(clknode_init, aw_clk_nkmp_init), CLKNODEMETHOD(clknode_set_gate, aw_clk_nkmp_set_gate), + CLKNODEMETHOD(clknode_set_mux, aw_clk_nkmp_set_mux), CLKNODEMETHOD(clknode_recalc_freq, aw_clk_nkmp_recalc), CLKNODEMETHOD(clknode_set_freq, aw_clk_nkmp_set_freq), CLKNODEMETHOD_END @@ -360,6 +398,9 @@ aw_clk_nkmp_register(struct clkdom *clkd sc->p.value = clkdef->p.value; sc->p.flags = clkdef->p.flags; + sc->mux_shift = clkdef->mux_shift; + sc->mux_mask = ((1 << clkdef->mux_width) - 1) << sc->mux_shift; + sc->gate_shift = clkdef->gate_shift; sc->lock_shift = clkdef->lock_shift; sc->lock_retries = clkdef->lock_retries; Modified: head/sys/arm/allwinner/clkng/aw_clk_nkmp.h ============================================================================== --- head/sys/arm/allwinner/clkng/aw_clk_nkmp.h Tue Feb 28 15:03:34 2017 (r314392) +++ head/sys/arm/allwinner/clkng/aw_clk_nkmp.h Tue Feb 28 15:11:33 2017 (r314393) @@ -41,6 +41,8 @@ struct aw_clk_nkmp_def { struct aw_clk_factor n; struct aw_clk_factor p; + uint32_t mux_shift; + uint32_t mux_width; uint32_t gate_shift; uint32_t lock_shift; uint32_t lock_retries; From owner-svn-src-all@freebsd.org Tue Feb 28 15:44:22 2017 Return-Path: Delivered-To: svn-src-all@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 C643ACF10C5; Tue, 28 Feb 2017 15:44:22 +0000 (UTC) (envelope-from manu@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 8AD79B41; Tue, 28 Feb 2017 15:44:22 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SFiLTT013428; Tue, 28 Feb 2017 15:44:21 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SFiL8k013424; Tue, 28 Feb 2017 15:44:21 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201702281544.v1SFiL8k013424@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Tue, 28 Feb 2017 15:44:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314394 - in head/sys/arm/allwinner: a31 clkng X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 15:44:22 -0000 Author: manu Date: Tue Feb 28 15:44:21 2017 New Revision: 314394 URL: https://svnweb.freebsd.org/changeset/base/314394 Log: allwinner: A31: Add ccung driver This adds clocks support for the aw_ccung on the A31 SoC. Newer DTS files require this. All the clocks except two CSI are defined and exported on the clock domain. Added: head/sys/arm/allwinner/clkng/ccu_a31.c (contents, props changed) head/sys/arm/allwinner/clkng/ccu_a31.h (contents, props changed) Modified: head/sys/arm/allwinner/a31/files.a31 head/sys/arm/allwinner/clkng/aw_ccung.c Modified: head/sys/arm/allwinner/a31/files.a31 ============================================================================== --- head/sys/arm/allwinner/a31/files.a31 Tue Feb 28 15:11:33 2017 (r314393) +++ head/sys/arm/allwinner/a31/files.a31 Tue Feb 28 15:44:21 2017 (r314394) @@ -1,5 +1,6 @@ # $FreeBSD$ +arm/allwinner/clkng/ccu_a31.c standard arm/allwinner/a31/a31_padconf.c standard arm/allwinner/a31/a31_r_padconf.c standard arm/allwinner/a31/a31s_padconf.c standard Modified: head/sys/arm/allwinner/clkng/aw_ccung.c ============================================================================== --- head/sys/arm/allwinner/clkng/aw_ccung.c Tue Feb 28 15:11:33 2017 (r314393) +++ head/sys/arm/allwinner/clkng/aw_ccung.c Tue Feb 28 15:44:21 2017 (r314394) @@ -54,6 +54,10 @@ __FBSDID("$FreeBSD$"); #include #include +#if defined(SOC_ALLWINNER_A31) +#include +#endif + #if defined(SOC_ALLWINNER_H3) #include #endif @@ -70,10 +74,17 @@ static struct resource_spec aw_ccung_spe #define H3_CCU 1 #endif +#if defined(SOC_ALLWINNER_A31) +#define A31_CCU 2 +#endif + static struct ofw_compat_data compat_data[] = { #if defined(SOC_ALLWINNER_H3) { "allwinner,sun8i-h3-ccu", H3_CCU }, #endif +#if defined(SOC_ALLWINNER_A31) + { "allwinner,sun6i-a31-ccu", A31_CCU }, +#endif {NULL, 0 } }; @@ -295,6 +306,11 @@ aw_ccung_attach(device_t dev) ccu_h3_register_clocks(sc); break; #endif +#if defined(SOC_ALLWINNER_A31) + case A31_CCU: + ccu_a31_register_clocks(sc); + break; +#endif } if (sc->gates) Added: head/sys/arm/allwinner/clkng/ccu_a31.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/allwinner/clkng/ccu_a31.c Tue Feb 28 15:44:21 2017 (r314394) @@ -0,0 +1,936 @@ +/*- + * Copyright (c) 2017 Emmanuel Vadot + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "ccu_a31.h" + +static struct aw_ccung_reset a31_ccu_resets[] = { + CCU_RESET(A31_RST_USB_PHY0, 0xcc, 0) + CCU_RESET(A31_RST_USB_PHY1, 0xcc, 1) + CCU_RESET(A31_RST_USB_PHY2, 0xcc, 2) + + CCU_RESET(A31_RST_AHB1_MIPI_DSI, 0x2c0, 1) + CCU_RESET(A31_RST_AHB1_SS, 0x2c0, 5) + CCU_RESET(A31_RST_AHB1_DMA, 0x2c0, 6) + CCU_RESET(A31_RST_AHB1_MMC0, 0x2c0, 8) + CCU_RESET(A31_RST_AHB1_MMC1, 0x2c0, 9) + CCU_RESET(A31_RST_AHB1_MMC2, 0x2c0, 10) + CCU_RESET(A31_RST_AHB1_MMC3, 0x2c0, 11) + CCU_RESET(A31_RST_AHB1_NAND1, 0x2c0, 12) + CCU_RESET(A31_RST_AHB1_NAND0, 0x2c0, 13) + CCU_RESET(A31_RST_AHB1_SDRAM, 0x2c0, 14) + CCU_RESET(A31_RST_AHB1_EMAC, 0x2c0, 17) + CCU_RESET(A31_RST_AHB1_TS, 0x2c0, 18) + CCU_RESET(A31_RST_AHB1_HSTIMER, 0x2c0, 19) + CCU_RESET(A31_RST_AHB1_SPI0, 0x2c0, 20) + CCU_RESET(A31_RST_AHB1_SPI1, 0x2c0, 21) + CCU_RESET(A31_RST_AHB1_SPI2, 0x2c0, 22) + CCU_RESET(A31_RST_AHB1_SPI3, 0x2c0, 23) + CCU_RESET(A31_RST_AHB1_OTG, 0x2c0, 24) + CCU_RESET(A31_RST_AHB1_EHCI0, 0x2c0, 26) + CCU_RESET(A31_RST_AHB1_EHCI1, 0x2c0, 27) + CCU_RESET(A31_RST_AHB1_OHCI0, 0x2c0, 29) + CCU_RESET(A31_RST_AHB1_OHCI1, 0x2c0, 30) + CCU_RESET(A31_RST_AHB1_OHCI2, 0x2c0, 31) + + CCU_RESET(A31_RST_AHB1_VE, 0x2c4, 0) + CCU_RESET(A31_RST_AHB1_LCD0, 0x2c4, 4) + CCU_RESET(A31_RST_AHB1_LCD1, 0x2c4, 5) + CCU_RESET(A31_RST_AHB1_CSI, 0x2c4, 8) + CCU_RESET(A31_RST_AHB1_HDMI, 0x2c4, 11) + CCU_RESET(A31_RST_AHB1_BE0, 0x2c4, 12) + CCU_RESET(A31_RST_AHB1_BE1, 0x2c4, 13) + CCU_RESET(A31_RST_AHB1_FE0, 0x2c4, 14) + CCU_RESET(A31_RST_AHB1_FE1, 0x2c4, 15) + CCU_RESET(A31_RST_AHB1_MP, 0x2c4, 18) + CCU_RESET(A31_RST_AHB1_GPU, 0x2c4, 20) + CCU_RESET(A31_RST_AHB1_DEU0, 0x2c4, 23) + CCU_RESET(A31_RST_AHB1_DEU1, 0x2c4, 24) + CCU_RESET(A31_RST_AHB1_DRC0, 0x2c4, 25) + CCU_RESET(A31_RST_AHB1_DRC1, 0x2c4, 26) + + CCU_RESET(A31_RST_AHB1_LVDS, 0x2c8, 0) + + CCU_RESET(A31_RST_APB1_CODEC, 0x2d0, 0) + CCU_RESET(A31_RST_APB1_SPDIF, 0x2d0, 1) + CCU_RESET(A31_RST_APB1_DIGITAL_MIC, 0x2d0, 4) + CCU_RESET(A31_RST_APB1_DAUDIO0, 0x2d0, 12) + CCU_RESET(A31_RST_APB1_DAUDIO1, 0x2d0, 13) + + CCU_RESET(A31_RST_APB2_I2C0, 0x2d8, 0) + CCU_RESET(A31_RST_APB2_I2C1, 0x2d8, 1) + CCU_RESET(A31_RST_APB2_I2C2, 0x2d8, 2) + CCU_RESET(A31_RST_APB2_I2C3, 0x2d8, 3) + CCU_RESET(A31_RST_APB2_UART0, 0x2d8, 16) + CCU_RESET(A31_RST_APB2_UART1, 0x2d8, 17) + CCU_RESET(A31_RST_APB2_UART2, 0x2d8, 18) + CCU_RESET(A31_RST_APB2_UART3, 0x2d8, 19) + CCU_RESET(A31_RST_APB2_UART4, 0x2d8, 20) + CCU_RESET(A31_RST_APB2_UART5, 0x2d8, 21) +}; + +static struct aw_ccung_gate a31_ccu_gates[] = { + CCU_GATE(A31_CLK_AHB1_MIPIDSI, "ahb1-mipidsi", "ahb1", 0x60, 1) + CCU_GATE(A31_CLK_AHB1_SS, "ahb1-ss", "ahb1", 0x60, 5) + CCU_GATE(A31_CLK_AHB1_DMA, "ahb1-dma", "ahb1", 0x60, 6) + CCU_GATE(A31_CLK_AHB1_MMC0, "ahb1-mmc0", "ahb1", 0x60, 8) + CCU_GATE(A31_CLK_AHB1_MMC1, "ahb1-mmc1", "ahb1", 0x60, 9) + CCU_GATE(A31_CLK_AHB1_MMC2, "ahb1-mmc2", "ahb1", 0x60, 10) + CCU_GATE(A31_CLK_AHB1_MMC3, "ahb1-mmc3", "ahb1", 0x60, 11) + CCU_GATE(A31_CLK_AHB1_NAND1, "ahb1-nand1", "ahb1", 0x60, 12) + CCU_GATE(A31_CLK_AHB1_NAND0, "ahb1-nand0", "ahb1", 0x60, 13) + CCU_GATE(A31_CLK_AHB1_SDRAM, "ahb1-sdram", "ahb1", 0x60, 14) + CCU_GATE(A31_CLK_AHB1_EMAC, "ahb1-emac", "ahb1", 0x60, 17) + CCU_GATE(A31_CLK_AHB1_TS, "ahb1-ts", "ahb1", 0x60, 18) + CCU_GATE(A31_CLK_AHB1_HSTIMER, "ahb1-hstimer", "ahb1", 0x60, 19) + CCU_GATE(A31_CLK_AHB1_SPI0, "ahb1-spi0", "ahb1", 0x60, 20) + CCU_GATE(A31_CLK_AHB1_SPI1, "ahb1-spi1", "ahb1", 0x60, 21) + CCU_GATE(A31_CLK_AHB1_SPI2, "ahb1-spi2", "ahb1", 0x60, 22) + CCU_GATE(A31_CLK_AHB1_SPI3, "ahb1-spi3", "ahb1", 0x60, 23) + CCU_GATE(A31_CLK_AHB1_OTG, "ahb1-otg", "ahb1", 0x60, 24) + CCU_GATE(A31_CLK_AHB1_EHCI0, "ahb1-ehci0", "ahb1", 0x60, 26) + CCU_GATE(A31_CLK_AHB1_EHCI1, "ahb1-ehci1", "ahb1", 0x60, 27) + CCU_GATE(A31_CLK_AHB1_OHCI0, "ahb1-ohci0", "ahb1", 0x60, 29) + CCU_GATE(A31_CLK_AHB1_OHCI1, "ahb1-ohci1", "ahb1", 0x60, 30) + CCU_GATE(A31_CLK_AHB1_OHCI2, "ahb1-ohci2", "ahb1", 0x60, 31) + CCU_GATE(A31_CLK_AHB1_VE, "ahb1-ve", "ahb1", 0x64, 0) + CCU_GATE(A31_CLK_AHB1_LCD0, "ahb1-lcd0", "ahb1", 0x64, 4) + CCU_GATE(A31_CLK_AHB1_LCD1, "ahb1-lcd1", "ahb1", 0x64, 5) + CCU_GATE(A31_CLK_AHB1_CSI, "ahb1-csi", "ahb1", 0x64, 8) + CCU_GATE(A31_CLK_AHB1_HDMI, "ahb1-hdmi", "ahb1", 0x64, 11) + CCU_GATE(A31_CLK_AHB1_BE0, "ahb1-be0", "ahb1", 0x64, 12) + CCU_GATE(A31_CLK_AHB1_BE1, "ahb1-be1", "ahb1", 0x64, 13) + CCU_GATE(A31_CLK_AHB1_FE0, "ahb1-fe0", "ahb1", 0x64, 14) + CCU_GATE(A31_CLK_AHB1_FE1, "ahb1-fe1", "ahb1", 0x64, 15) + CCU_GATE(A31_CLK_AHB1_MP, "ahb1-mp", "ahb1", 0x64, 18) + CCU_GATE(A31_CLK_AHB1_GPU, "ahb1-gpu", "ahb1", 0x64, 20) + CCU_GATE(A31_CLK_AHB1_DEU0, "ahb1-deu0", "ahb1", 0x64, 23) + CCU_GATE(A31_CLK_AHB1_DEU1, "ahb1-deu1", "ahb1", 0x64, 24) + CCU_GATE(A31_CLK_AHB1_DRC0, "ahb1-drc0", "ahb1", 0x64, 25) + CCU_GATE(A31_CLK_AHB1_DRC1, "ahb1-drc1", "ahb1", 0x64, 26) + + CCU_GATE(A31_CLK_APB1_CODEC, "apb1-codec", "apb1", 0x68, 0) + CCU_GATE(A31_CLK_APB1_SPDIF, "apb1-spdif", "apb1", 0x68, 1) + CCU_GATE(A31_CLK_APB1_DIGITAL_MIC, "apb1-digital-mic", "apb1", 0x68, 4) + CCU_GATE(A31_CLK_APB1_PIO, "apb1-pio", "apb1", 0x68, 5) + CCU_GATE(A31_CLK_APB1_DAUDIO0, "apb1-daudio0", "apb1", 0x68, 12) + CCU_GATE(A31_CLK_APB1_DAUDIO1, "apb1-daudio1", "apb1", 0x68, 13) + + CCU_GATE(A31_CLK_APB2_I2C0, "apb2-i2c0", "apb2", 0x6c, 0) + CCU_GATE(A31_CLK_APB2_I2C1, "apb2-i2c1", "apb2", 0x6c, 1) + CCU_GATE(A31_CLK_APB2_I2C2, "apb2-i2c2", "apb2", 0x6c, 2) + CCU_GATE(A31_CLK_APB2_I2C3, "apb2-i2c3", "apb2", 0x6c, 3) + CCU_GATE(A31_CLK_APB2_UART0, "apb2-uart0", "apb2", 0x6c, 16) + CCU_GATE(A31_CLK_APB2_UART1, "apb2-uart1", "apb2", 0x6c, 17) + CCU_GATE(A31_CLK_APB2_UART2, "apb2-uart2", "apb2", 0x6c, 18) + CCU_GATE(A31_CLK_APB2_UART3, "apb2-uart3", "apb2", 0x6c, 19) + CCU_GATE(A31_CLK_APB2_UART4, "apb2-uart4", "apb2", 0x6c, 20) + CCU_GATE(A31_CLK_APB2_UART5, "apb2-uart5", "apb2", 0x6c, 21) + + CCU_GATE(A31_CLK_DAUDIO0, "daudio0", "daudio0mux", 0xb0, 31) + CCU_GATE(A31_CLK_DAUDIO1, "daudio1", "daudio1mux", 0xb4, 31) + + CCU_GATE(A31_CLK_USB_PHY0, "usb-phy0", "osc24M", 0xcc, 8) + CCU_GATE(A31_CLK_USB_PHY1, "usb-phy1", "osc24M", 0xcc, 9) + CCU_GATE(A31_CLK_USB_PHY2, "usb-phy2", "osc24M", 0xcc, 10) + CCU_GATE(A31_CLK_USB_OHCI0, "usb-ohci0", "osc24M", 0xcc, 16) + CCU_GATE(A31_CLK_USB_OHCI1, "usb-ohci1", "osc24M", 0xcc, 17) + CCU_GATE(A31_CLK_USB_OHCI2, "usb-ohci2", "osc24M", 0xcc, 18) + + CCU_GATE(A31_CLK_DRAM_VE, "dram-ve", "mdfs", 0x100, 0) + CCU_GATE(A31_CLK_DRAM_CSI_ISP, "dram-csi_isp", "mdfs", 0x100, 1) + CCU_GATE(A31_CLK_DRAM_TS, "dram-ts", "mdfs", 0x100, 3) + CCU_GATE(A31_CLK_DRAM_DRC0, "dram-drc0", "mdfs", 0x100, 16) + CCU_GATE(A31_CLK_DRAM_DRC1, "dram-drc1", "mdfs", 0x100, 17) + CCU_GATE(A31_CLK_DRAM_DEU0, "dram-deu0", "mdfs", 0x100, 18) + CCU_GATE(A31_CLK_DRAM_DEU1, "dram-deu1", "mdfs", 0x100, 19) + CCU_GATE(A31_CLK_DRAM_FE0, "dram-fe0", "mdfs", 0x100, 24) + CCU_GATE(A31_CLK_DRAM_FE1, "dram-fe1", "mdfs", 0x100, 25) + CCU_GATE(A31_CLK_DRAM_BE0, "dram-be0", "mdfs", 0x100, 26) + CCU_GATE(A31_CLK_DRAM_BE1, "dram-be1", "mdfs", 0x100, 27) + CCU_GATE(A31_CLK_DRAM_MP, "dram-mp", "mdfs", 0x100, 28) + + CCU_GATE(A31_CLK_CODEC, "codec", "pll_audio", 0x140, 31) + + CCU_GATE(A31_CLK_AVS, "avs", "pll_audio", 0x144, 31) + + CCU_GATE(A31_CLK_DIGITAL_MIC, "digital-mic", "pll_audio", 0x148, 31) + + CCU_GATE(A31_CLK_HDMI_DDC, "hdmi-ddc", "osc24M", 0x150, 30) + + CCU_GATE(A31_CLK_PS, "ps", "lcd1_ch1", 0x154, 31) +}; + +static const char *pll_parents[] = {"osc24M"}; + +NKMP_CLK(pll_cpu_clk, + A31_CLK_PLL_CPU, /* id */ + "pll_cpu", pll_parents, /* name, parents */ + 0x00, /* offset */ + 8, 5, 0, 0, /* n factor */ + 4, 2, 0, 0, /* k factor */ + 0, 2, 0, 0, /* m factor */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* p factor (fake) */ + 31, /* gate */ + 28, 1000, /* lock */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK | AW_CLK_SCALE_CHANGE); /* flags */ + +NKMP_CLK(pll_audio_clk, + A31_CLK_PLL_AUDIO, /* id */ + "pll_audio", pll_parents, /* name, parents */ + 0x08, /* offset */ + 8, 7, 0, 0, /* n factor */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* k factor (fake) */ + 0, 4, 1, 0, /* m factor */ + 16, 3, 1, 0, /* p factor */ + 31, /* gate */ + 28, 1000, /* lock */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ + +static const char *pll_audio_mult_parents[] = {"pll_audio"}; +FIXED_CLK(pll_audio_2x_clk, + A31_CLK_PLL_AUDIO_2X, /* id */ + "pll_audio-2x", /* name */ + pll_audio_mult_parents, /* parent */ + 0, /* freq */ + 2, /* mult */ + 1, /* div */ + 0); /* flags */ +FIXED_CLK(pll_audio_4x_clk, + A31_CLK_PLL_AUDIO_4X, /* id */ + "pll_audio-4x", /* name */ + pll_audio_mult_parents, /* parent */ + 0, /* freq */ + 4, /* mult */ + 1, /* div */ + 0); /* flags */ +FIXED_CLK(pll_audio_8x_clk, + A31_CLK_PLL_AUDIO_8X, /* id */ + "pll_audio-8x", /* name */ + pll_audio_mult_parents, /* parent */ + 0, /* freq */ + 8, /* mult */ + 1, /* div */ + 0); /* flags */ + +NM_CLK_WITH_FRAC(pll_video0_clk, + A31_CLK_PLL_VIDEO0, /* id */ + "pll_video0", pll_parents, /* name, parents */ + 0x10, /* offset */ + 8, 7, 0, 0, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 31, 28, 1000, /* gate, lock, lock retries */ + AW_CLK_HAS_LOCK, /* flags */ + 270000000, 297000000, /* freq0, freq1 */ + 24, 25); /* mode sel, freq sel */ + +static const char *pll_video0_2x_parents[] = {"pll_video0"}; +FIXED_CLK(pll_video0_2x_clk, + A31_CLK_PLL_VIDEO0_2X, /* id */ + "pll_video0-2x", /* name */ + pll_video0_2x_parents, /* parent */ + 0, /* freq */ + 2, /* mult */ + 1, /* div */ + 0); /* flags */ + +NM_CLK_WITH_FRAC(pll_ve_clk, + A31_CLK_PLL_VE, /* id */ + "pll_ve", pll_parents, /* name, parents */ + 0x18, /* offset */ + 8, 7, 0, 0, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 31, 28, 1000, /* gate, lock, lock retries */ + AW_CLK_HAS_LOCK, /* flags */ + 270000000, 297000000, /* freq0, freq1 */ + 24, 25); /* mode sel, freq sel */ + +NKMP_CLK_WITH_UPDATE(pll_ddr_clk, + A31_CLK_PLL_DDR, /* id */ + "pll_ddr", pll_parents, /* name, parents */ + 0x20, /* offset */ + 8, 5, 0, 0, /* n factor */ + 4, 2, 0, 0, /* k factor */ + 0, 2, 0, 0, /* m factor */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* p factor (fake) */ + 31, /* gate */ + 28, 1000, /* lock */ + 20, /* update */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ + +NKMP_CLK(pll_periph_clk, + A31_CLK_PLL_PERIPH, /* id */ + "pll_periph", pll_parents, /* name, parents */ + 0x28, /* offset */ + 8, 4, 0, 0, /* n factor */ + 5, 2, 1, 0, /* k factor */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* m factor (fake) */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* p factor (fake) */ + 31, /* gate */ + 28, 1000, /* lock */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ + +static const char *pll_periph_2x_parents[] = {"pll_periph"}; +FIXED_CLK(pll_periph_2x_clk, + A31_CLK_PLL_PERIPH_2X, /* id */ + "pll_periph-2x", /* name */ + pll_periph_2x_parents, /* parent */ + 0, /* freq */ + 2, /* mult */ + 1, /* div */ + 0); /* flags */ + +NM_CLK_WITH_FRAC(pll_video1_clk, + A31_CLK_PLL_VIDEO1, /* id */ + "pll_video1", pll_parents, /* name, parents */ + 0x30, /* offset */ + 8, 7, 0, 0, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 31, 28, 1000, /* gate, lock, lock retries */ + AW_CLK_HAS_LOCK, /* flags */ + 270000000, 297000000, /* freq0, freq1 */ + 24, 25); /* mode sel, freq sel */ + +static const char *pll_video1_2x_parents[] = {"pll_video1"}; +FIXED_CLK(pll_video1_2x_clk, + A31_CLK_PLL_VIDEO1_2X, /* id */ + "pll_video1-2x", /* name */ + pll_video1_2x_parents, /* parent */ + 0, /* freq */ + 2, /* mult */ + 1, /* div */ + 0); /* flags */ + +NM_CLK_WITH_FRAC(pll_gpu_clk, + A31_CLK_PLL_GPU, /* id */ + "pll_gpu", pll_parents, /* name, parents */ + 0x38, /* offset */ + 8, 7, 0, 0, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 31, 28, 1000, /* gate, lock, lock retries */ + AW_CLK_HAS_LOCK, /* flags */ + 270000000, 297000000, /* freq0, freq1 */ + 24, 25); /* mode sel, freq sel */ + +static const char *pll_mipi_parents[] = {"pll_video0", "pll_video1"}; +NKMP_CLK(pll_mipi_clk, + A31_CLK_PLL_MIPI, /* id */ + "pll_mipi", pll_mipi_parents, /* name, parents */ + 0x40, /* offset */ + 8, 4, 0, 0, /* n factor */ + 4, 2, 1, 0, /* k factor */ + 0, 2, 0, 0, /* m factor (fake) */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* p factor (fake) */ + 31, /* gate */ + 28, 1000, /* lock */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ + +NM_CLK_WITH_FRAC(pll9_clk, + A31_CLK_PLL9, /* id */ + "pll9", pll_parents, /* name, parents */ + 0x44, /* offset */ + 8, 7, 0, 0, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 31, 28, 1000, /* gate, lock, lock retries */ + AW_CLK_HAS_LOCK, /* flags */ + 270000000, 297000000, /* freq0, freq1 */ + 24, 25); /* mode sel, freq sel */ + +NM_CLK_WITH_FRAC(pll10_clk, + A31_CLK_PLL10, /* id */ + "pll10", pll_parents, /* name, parents */ + 0x48, /* offset */ + 8, 7, 0, 0, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 31, 28, 1000, /* gate, lock, lock retries */ + AW_CLK_HAS_LOCK, /* flags */ + 270000000, 297000000, /* freq0, freq1 */ + 24, 25); /* mode sel, freq sel */ + +static struct clk_div_table axi_div_table[] = { + { .value = 0, .divider = 1, }, + { .value = 1, .divider = 2, }, + { .value = 2, .divider = 3, }, + { .value = 3, .divider = 4, }, + { .value = 4, .divider = 4, }, + { .value = 5, .divider = 4, }, + { .value = 6, .divider = 4, }, + { .value = 7, .divider = 4, }, + { }, +}; +static const char *axi_parents[] = {"cpu"}; +DIV_CLK(axi_clk, + A31_CLK_AXI, /* id */ + "axi", axi_parents, /* name, parents */ + 0x50, /* offset */ + 0, 2, /* shift, mask */ + 0, axi_div_table); /* flags, div table */ + +static const char *cpu_parents[] = {"osc32k", "osc24M", "pll_cpu", "pll_cpu"}; +MUX_CLK(cpu_clk, + A31_CLK_CPU, /* id */ + "cpu", cpu_parents, /* name, parents */ + 0x50, 16, 2); /* offset, shift, width */ + +static const char *ahb1_parents[] = {"osc32k", "osc24M", "axi", "pll_periph"}; +PREDIV_CLK(ahb1_clk, + A31_CLK_AHB1, /* id */ + "ahb1", ahb1_parents, /* name, parents */ + 0x54, /* offset */ + 12, 2, /* mux */ + 4, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* div */ + 6, 2, 0, AW_CLK_FACTOR_HAS_COND, /* prediv */ + 12, 2, 3); /* prediv condition */ + +static const char *apb1_parents[] = {"ahb1"}; +static struct clk_div_table apb1_div_table[] = { + { .value = 0, .divider = 2, }, + { .value = 1, .divider = 2, }, + { .value = 2, .divider = 4, }, + { .value = 3, .divider = 8, }, + { }, +}; +DIV_CLK(apb1_clk, + A31_CLK_APB1, /* id */ + "apb1", apb1_parents, /* name, parents */ + 0x54, /* offset */ + 8, 2, /* shift, mask */ + CLK_DIV_WITH_TABLE, /* flags */ + apb1_div_table); /* div table */ + +static const char *apb2_parents[] = {"osc32k", "osc24M", "pll_periph", "pll_periph"}; +NM_CLK(apb2_clk, + A31_CLK_APB2, /* id */ + "apb2", apb2_parents, /* name, parents */ + 0x58, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 5, 0, 0, /* m factor */ + 24, 2, /* mux */ + 0, /* gate */ + AW_CLK_HAS_MUX); + +static const char *mod_parents[] = {"osc24M", "pll_periph"}; +NM_CLK(nand0_clk, + A31_CLK_NAND0, "nand0", mod_parents, /* id, name, parents */ + 0x80, /* offset */ + 16, 3, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ + +NM_CLK(nand1_clk, + A31_CLK_NAND1, "nand1", mod_parents, /* id, name, parents */ + 0x80, /* offset */ + 16, 3, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ + +NM_CLK(mmc0_clk, + A31_CLK_MMC0, "mmc0", mod_parents, /* id, name, parents */ + 0x88, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX | + AW_CLK_REPARENT); /* flags */ + +NM_CLK(mmc1_clk, + A31_CLK_MMC1, "mmc1", mod_parents, /* id, name, parents */ + 0x8c, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX | + AW_CLK_REPARENT); /* flags */ + +NM_CLK(mmc2_clk, + A31_CLK_MMC2, "mmc2", mod_parents, /* id, name, parents */ + 0x90, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX | + AW_CLK_REPARENT); /* flags */ + +NM_CLK(mmc3_clk, + A31_CLK_MMC2, "mmc3", mod_parents, /* id, name, parents */ + 0x94, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX | + AW_CLK_REPARENT); /* flags */ + +static const char *ts_parents[] = {"osc24M", "pll_periph"}; +NM_CLK(ts_clk, + A31_CLK_TS, "ts", ts_parents, /* id, name, parents */ + 0x98, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 4, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ + +NM_CLK(ss_clk, + A31_CLK_SS, "ss", mod_parents, /* id, name, parents */ + 0x9C, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 4, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ + +NM_CLK(spi0_clk, + A31_CLK_SPI0, "spi0", mod_parents, /* id, name, parents */ + 0xA0, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 4, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ + +NM_CLK(spi1_clk, + A31_CLK_SPI1, "spi1", mod_parents, /* id, name, parents */ + 0xA4, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 4, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ + +NM_CLK(spi2_clk, + A31_CLK_SPI2, "spi2", mod_parents, /* id, name, parents */ + 0xA8, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 4, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ + +NM_CLK(spi3_clk, + A31_CLK_SPI3, "spi3", mod_parents, /* id, name, parents */ + 0xAC, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 4, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ + + +static const char *daudio_parents[] = {"pll_audio-8x", "pll_audio-4x", "pll_audio-2x", "pll_audio"}; +MUX_CLK(daudio0mux_clk, + 0, + "daudio0mux", daudio_parents, + 0xb0, 16, 2); +MUX_CLK(daudio1mux_clk, + 0, + "daudio1mux", daudio_parents, + 0xb4, 16, 2); + +static const char *mdfs_parents[] = {"pll_ddr", "pll_periph"}; +NM_CLK(mdfs_clk, + A31_CLK_MDFS, "mdfs", mdfs_parents, /* id, name, parents */ + 0xF0, /* offset */ + 16, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 4, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ + +static const char *dram_parents[] = {"pll_ddr", "pll_periph"}; +NM_CLK(sdram0_clk, + A31_CLK_SDRAM0, "sdram0", dram_parents, /* id, name, parents */ + 0xF4, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 4, 1, /* mux */ + 0, /* gate */ + AW_CLK_HAS_MUX); /* flags */ +NM_CLK(sdram1_clk, + A31_CLK_SDRAM1, "sdram1", dram_parents, /* id, name, parents */ + 0xF4, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 8, 4, 0, 0, /* m factor */ + 12, 1, /* mux */ + 0, /* gate */ + AW_CLK_HAS_MUX); /* flags */ + +static const char *befe_parents[] = {"pll_video0", "pll_video1", "pll_periph-2x", "pll_gpu", "pll9", "pll10"}; +NM_CLK(be0_clk, + A31_CLK_BE0, "be0", befe_parents, /* id, name, parents */ + 0x104, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 24, 3, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +NM_CLK(be1_clk, + A31_CLK_BE1, "be1", befe_parents, /* id, name, parents */ + 0x108, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 24, 3, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +NM_CLK(fe0_clk, + A31_CLK_FE0, "fe0", befe_parents, /* id, name, parents */ + 0x104, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 24, 3, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ +NM_CLK(fe1_clk, + A31_CLK_FE1, "fe1", befe_parents, /* id, name, parents */ + 0x108, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 24, 3, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +static const char *mp_parents[] = {"pll_video0", "pll_video1", "pll9", "pll10"}; +NM_CLK(mp_clk, + A31_CLK_MP, "mp", mp_parents, /* id, name, parents */ + 0x108, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 24, 3, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +static const char *lcd_ch0_parents[] = {"pll_video0", "pll_video1", "pll_video0-2x", "pll_video1-2x", "pll_mipi"}; +NM_CLK(lcd0_ch0_clk, + A31_CLK_LCD0_CH0, "lcd0_ch0", lcd_ch0_parents, /* id, name, parents */ + 0x118, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* m factor (fake )*/ + 24, 3, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +NM_CLK(lcd1_ch0_clk, + A31_CLK_LCD1_CH0, "lcd1_ch0", lcd_ch0_parents, /* id, name, parents */ + 0x11C, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* m factor (fake )*/ + 24, 3, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +static const char *lcd_ch1_parents[] = {"pll_video0", "pll_video1", "pll_video0-2x", "pll_video1-2x"}; +NM_CLK(lcd0_ch1_clk, + A31_CLK_LCD0_CH1, "lcd0_ch1", lcd_ch1_parents, /* id, name, parents */ + 0x12C, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 24, 3, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +NM_CLK(lcd1_ch1_clk, + A31_CLK_LCD1_CH1, "lcd1_ch1", lcd_ch1_parents, /* id, name, parents */ + 0x130, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 24, 3, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +/* CSI0 0x134 Need Mux table */ +/* CSI1 0x138 Need Mux table */ + +static const char *ve_parents[] = {"pll_ve"}; +NM_CLK(ve_clk, + A31_CLK_VE, "ve", ve_parents, /* id, name, parents */ + 0x13C, /* offset */ + 16, 3, 0, 0, /* n factor */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* m factor (fake) */ + 0, 0, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE); /* flags */ + +NM_CLK(hdmi_clk, + A31_CLK_HDMI, "hdmi", lcd_ch1_parents, /* id, name, parents */ + 0x150, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 0, 0, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE); /* flags */ + +static const char *mbus_parents[] = {"osc24M", "pll_periph", "pll_ddr"}; +NM_CLK(mbus0_clk, + A31_CLK_MBUS0, "mbus0", mbus_parents, /* id, name, parents */ + 0x15C, /* offset */ + 16, 2, 0, 0, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +NM_CLK(mbus1_clk, + A31_CLK_MBUS1, "mbus1", mbus_parents, /* id, name, parents */ + 0x160, /* offset */ + 16, 2, 0, 0, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +static const char *mipi_parents[] = {"pll_video0", "pll_video1", "pll_video0-2x", "pll_video1-2x"}; +NM_CLK(mipi_dsi_clk, + A31_CLK_MIPI_DSI, "mipi_dsi", mipi_parents, /* id, name, parents */ + 0x168, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 16, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +NM_CLK(mipi_dsi_dphy_clk, + A31_CLK_MIPI_DSI_DPHY, "mipi_dsi_dphy", mipi_parents, /* id, name, parents */ + 0x168, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 8, 2, /* mux */ + 15, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +NM_CLK(mipi_csi_dphy_clk, + A31_CLK_MIPI_CSI_DPHY, "mipi_csi_dphy", mipi_parents, /* id, name, parents */ + 0x16C, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 8, 2, /* mux */ + 15, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +static const char *iep_parents[] = {"pll_video0", "pll_video1", "pll_periph-2x", "pll_gpu", "pll9", "pll10"}; + +NM_CLK(iep_drc0_clk, + A31_CLK_IEP_DRC0, "iep_drc0", iep_parents, /* id, name, parents */ + 0x180, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +NM_CLK(iep_drc1_clk, + A31_CLK_IEP_DRC1, "iep_drc1", iep_parents, /* id, name, parents */ + 0x184, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +NM_CLK(iep_deu0_clk, + A31_CLK_IEP_DEU0, "iep_deu0", iep_parents, /* id, name, parents */ + 0x188, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +NM_CLK(iep_deu1_clk, + A31_CLK_IEP_DEU1, "iep_deu1", iep_parents, /* id, name, parents */ + 0x18C, /* offset */ + 0, 0, 1, AW_CLK_FACTOR_FIXED, /* n factor (fake) */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ + +static const char *gpu_parents[] = {"pll_gpu", "pll_periph-2x", "pll_video0", "pll_video1", "pll9", "pll10"}; +PREDIV_CLK(gpu_core_clk, + A31_CLK_GPU_CORE, /* id */ + "gpu_core", gpu_parents, /* name, parents */ + 0x1A0, /* offset */ + 24, 3, /* mux */ + 0, 3, 0, 0, /* div */ + 0, 0, 3, AW_CLK_FACTOR_HAS_COND | AW_CLK_FACTOR_FIXED, /* prediv */ + 24, 2, 1); /* prediv condition */ + +PREDIV_CLK(gpu_memory_clk, + A31_CLK_GPU_MEMORY, /* id */ + "gpu_memory", gpu_parents, /* name, parents */ + 0x1A4, /* offset */ + 24, 3, /* mux */ + 0, 3, 0, 0, /* div */ + 0, 0, 3, AW_CLK_FACTOR_HAS_COND | AW_CLK_FACTOR_FIXED, /* prediv */ + 24, 2, 1); /* prediv condition */ + +PREDIV_CLK(gpu_hyd_clk, + A31_CLK_GPU_HYD, /* id */ + "gpu_hyd", gpu_parents, /* name, parents */ + 0x1A8, /* offset */ + 24, 3, /* mux */ + 0, 3, 0, 0, /* div */ + 0, 0, 3, AW_CLK_FACTOR_HAS_COND | AW_CLK_FACTOR_FIXED, /* prediv */ + 24, 2, 1); /* prediv condition */ + +/* ATS 0x1B0 */ +/* Trace 0x1B4 */ + +static struct aw_clk_nkmp_def *nkmp_clks[] = { + &pll_cpu_clk, + &pll_audio_clk, + &pll_periph_clk, + &pll_ddr_clk, + &pll_mipi_clk, +}; + +static struct aw_clk_nm_def *nm_clks[] = { + &pll_video0_clk, + &pll_ve_clk, + &pll_video1_clk, + &pll_gpu_clk, + &pll9_clk, + &pll10_clk, + &apb2_clk, + &nand0_clk, + &nand1_clk, + &mmc0_clk, + &mmc1_clk, + &mmc2_clk, + &mmc3_clk, + &ts_clk, + &ss_clk, + &spi0_clk, + &spi1_clk, + &spi2_clk, + &spi3_clk, + &mdfs_clk, + &sdram0_clk, + &sdram1_clk, + &be0_clk, + &be1_clk, + &fe0_clk, + &fe1_clk, + &mp_clk, + &lcd0_ch0_clk, + &lcd1_ch0_clk, + &lcd0_ch1_clk, + &lcd1_ch1_clk, + &ve_clk, + &hdmi_clk, + &mbus0_clk, + &mbus1_clk, + &mipi_dsi_clk, + &mipi_dsi_dphy_clk, + &mipi_csi_dphy_clk, + &iep_drc0_clk, + &iep_drc1_clk, + &iep_deu0_clk, + &iep_deu1_clk, +}; + +static struct aw_clk_prediv_mux_def *prediv_mux_clks[] = { + &ahb1_clk, + &gpu_core_clk, + &gpu_memory_clk, + &gpu_hyd_clk, +}; + +static struct clk_div_def *div_clks[] = { + &axi_clk, + &apb1_clk, +}; + +static struct clk_mux_def *mux_clks[] = { + &cpu_clk, + &daudio0mux_clk, + &daudio1mux_clk, +}; + +static struct clk_fixed_def *fixed_factor_clks[] = { + &pll_audio_2x_clk, + &pll_audio_4x_clk, + &pll_audio_8x_clk, + &pll_video0_2x_clk, + &pll_periph_2x_clk, + &pll_video1_2x_clk, +}; + +static struct aw_clk_init init_clks[] = { +}; + +void +ccu_a31_register_clocks(struct aw_ccung_softc *sc) +{ + int i; + + sc->resets = a31_ccu_resets; + sc->nresets = nitems(a31_ccu_resets); + sc->gates = a31_ccu_gates; + sc->ngates = nitems(a31_ccu_gates); + sc->clk_init = init_clks; + sc->n_clk_init = nitems(init_clks); + + for (i = 0; i < nitems(nkmp_clks); i++) + aw_clk_nkmp_register(sc->clkdom, nkmp_clks[i]); + for (i = 0; i < nitems(nm_clks); i++) + aw_clk_nm_register(sc->clkdom, nm_clks[i]); + for (i = 0; i < nitems(prediv_mux_clks); i++) + aw_clk_prediv_mux_register(sc->clkdom, prediv_mux_clks[i]); + + for (i = 0; i < nitems(mux_clks); i++) + clknode_mux_register(sc->clkdom, mux_clks[i]); + for (i = 0; i < nitems(div_clks); i++) + clknode_div_register(sc->clkdom, div_clks[i]); + for (i = 0; i < nitems(fixed_factor_clks); i++) + clknode_fixed_register(sc->clkdom, fixed_factor_clks[i]); +} Added: head/sys/arm/allwinner/clkng/ccu_a31.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/allwinner/clkng/ccu_a31.h Tue Feb 28 15:44:21 2017 (r314394) @@ -0,0 +1,250 @@ +/*- + * Copyright (c) 2017 Emmanuel Vadot + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Feb 28 16:20:35 2017 Return-Path: Delivered-To: svn-src-all@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 37020CF1955; Tue, 28 Feb 2017 16:20:35 +0000 (UTC) (envelope-from br@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 0F8E4D25; Tue, 28 Feb 2017 16:20:34 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SGKYPH025405; Tue, 28 Feb 2017 16:20:34 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SGKX06025400; Tue, 28 Feb 2017 16:20:33 GMT (envelope-from br@FreeBSD.org) Message-Id: <201702281620.v1SGKX06025400@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Tue, 28 Feb 2017 16:20:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314395 - in head/sys: arm/altera/socfpga arm/conf conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 16:20:35 -0000 Author: br Date: Tue Feb 28 16:20:33 2017 New Revision: 314395 URL: https://svnweb.freebsd.org/changeset/base/314395 Log: Add SOC_ALTERA_* kernel options per each SoC and use it to conditionally compile the code. Reviewed by: andrew Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D9836 Modified: head/sys/arm/altera/socfpga/socfpga_machdep.c head/sys/arm/altera/socfpga/socfpga_mp.c head/sys/arm/conf/SOCFPGA head/sys/conf/options.arm Modified: head/sys/arm/altera/socfpga/socfpga_machdep.c ============================================================================== --- head/sys/arm/altera/socfpga/socfpga_machdep.c Tue Feb 28 15:44:21 2017 (r314394) +++ head/sys/arm/altera/socfpga/socfpga_machdep.c Tue Feb 28 16:20:33 2017 (r314395) @@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$"); #include "platform_if.h" +#if defined(SOC_ALTERA_CYCLONE5) static int socfpga_devmap_init(platform_t plat) { @@ -82,7 +83,9 @@ socfpga_devmap_init(platform_t plat) return (0); } +#endif +#if defined(SOC_ALTERA_ARRIA10) static int socfpga_a10_devmap_init(platform_t plat) { @@ -101,9 +104,10 @@ socfpga_a10_devmap_init(platform_t plat) return (0); } +#endif static void -_socfpga_cpu_reset(platform_t plat, uint32_t reg) +_socfpga_cpu_reset(bus_size_t reg) { uint32_t paddr; bus_addr_t vaddr; @@ -127,20 +131,25 @@ end: while (1); } +#if defined(SOC_ALTERA_CYCLONE5) static void socfpga_cpu_reset(platform_t plat) { - _socfpga_cpu_reset(plat, RSTMGR_CTRL); + _socfpga_cpu_reset(RSTMGR_CTRL); } +#endif +#if defined(SOC_ALTERA_ARRIA10) static void socfpga_a10_cpu_reset(platform_t plat) { - _socfpga_cpu_reset(plat, RSTMGR_A10_CTRL); + _socfpga_cpu_reset(RSTMGR_A10_CTRL); } +#endif +#if defined(SOC_ALTERA_CYCLONE5) static platform_method_t socfpga_methods[] = { PLATFORMMETHOD(platform_devmap_init, socfpga_devmap_init), PLATFORMMETHOD(platform_cpu_reset, socfpga_cpu_reset), @@ -151,7 +160,9 @@ static platform_method_t socfpga_methods PLATFORMMETHOD_END, }; FDT_PLATFORM_DEF(socfpga, "socfpga", 0, "altr,socfpga-cyclone5", 200); +#endif +#if defined(SOC_ALTERA_ARRIA10) static platform_method_t socfpga_a10_methods[] = { PLATFORMMETHOD(platform_devmap_init, socfpga_a10_devmap_init), PLATFORMMETHOD(platform_cpu_reset, socfpga_a10_cpu_reset), @@ -162,3 +173,4 @@ static platform_method_t socfpga_a10_met PLATFORMMETHOD_END, }; FDT_PLATFORM_DEF(socfpga_a10, "socfpga", 0, "altr,socfpga-arria10", 200); +#endif Modified: head/sys/arm/altera/socfpga/socfpga_mp.c ============================================================================== --- head/sys/arm/altera/socfpga/socfpga_mp.c Tue Feb 28 15:44:21 2017 (r314394) +++ head/sys/arm/altera/socfpga/socfpga_mp.c Tue Feb 28 16:20:33 2017 (r314395) @@ -75,8 +75,8 @@ __FBSDID("$FreeBSD$"); #define RAM_PHYSBASE 0x0 #define RAM_SIZE 0x1000 -#define SOCFPGA_SOCKIT 1 -#define SOCFPGA_SOCDK 2 +#define SOCFPGA_ARRIA10 1 +#define SOCFPGA_CYCLONE5 2 extern char *mpentry_addr; static void socfpga_trampoline(void); @@ -112,22 +112,31 @@ socfpga_mp_setmaxid(platform_t plat) mp_maxid = ncpu - 1; } - static void -_socfpga_mp_start_ap(platform_t plat, uint32_t platid) +_socfpga_mp_start_ap(uint32_t platid) { bus_space_handle_t scu, rst, ram; int reg; - if (platid == SOCFPGA_SOCDK) { + switch (platid) { +#if defined(SOC_ALTERA_ARRIA10) + case SOCFPGA_ARRIA10: if (bus_space_map(fdtbus_bs_tag, SCU_PHYSBASE_A10, SCU_SIZE, 0, &scu) != 0) - panic("Couldn't map the SCU\n"); - } else { + panic("Couldn't map the SCU\n"); + break; +#endif +#if defined(SOC_ALTERA_CYCLONE5) + case SOCFPGA_CYCLONE5: if (bus_space_map(fdtbus_bs_tag, SCU_PHYSBASE, SCU_SIZE, 0, &scu) != 0) - panic("Couldn't map the SCU\n"); + panic("Couldn't map the SCU\n"); + break; +#endif + default: + panic("Unknown platform id %d\n", platid); } + if (bus_space_map(fdtbus_bs_tag, RSTMGR_PHYSBASE, RSTMGR_SIZE, 0, &rst) != 0) panic("Couldn't map the reset manager (RSTMGR)\n"); @@ -149,12 +158,21 @@ _socfpga_mp_start_ap(platform_t plat, ui bus_space_write_4(fdtbus_bs_tag, scu, SCU_DIAG_CONTROL, reg); /* Put CPU1 to reset state */ - if (platid == SOCFPGA_SOCDK) { + switch (platid) { +#if defined(SOC_ALTERA_ARRIA10) + case SOCFPGA_ARRIA10: bus_space_write_4(fdtbus_bs_tag, rst, RSTMGR_A10_MPUMODRST, MPUMODRST_CPU1); - } else { + break; +#endif +#if defined(SOC_ALTERA_CYCLONE5) + case SOCFPGA_CYCLONE5: bus_space_write_4(fdtbus_bs_tag, rst, RSTMGR_MPUMODRST, MPUMODRST_CPU1); + break; +#endif + default: + panic("Unknown platform id %d\n", platid); } /* Enable the SCU, then clean the cache on this core */ @@ -170,12 +188,21 @@ _socfpga_mp_start_ap(platform_t plat, ui dcache_wbinv_poc_all(); /* Put CPU1 out from reset */ - if (platid == SOCFPGA_SOCDK) { + switch (platid) { +#if defined(SOC_ALTERA_ARRIA10) + case SOCFPGA_ARRIA10: bus_space_write_4(fdtbus_bs_tag, rst, RSTMGR_A10_MPUMODRST, 0); - } else { + break; +#endif +#if defined(SOC_ALTERA_CYCLONE5) + case SOCFPGA_CYCLONE5: bus_space_write_4(fdtbus_bs_tag, rst, RSTMGR_MPUMODRST, 0); + break; +#endif + default: + panic("Unknown platform id %d\n", platid); } dsb(); @@ -186,17 +213,20 @@ _socfpga_mp_start_ap(platform_t plat, ui bus_space_unmap(fdtbus_bs_tag, ram, RAM_SIZE); } +#if defined(SOC_ALTERA_ARRIA10) void socfpga_a10_mp_start_ap(platform_t plat) { - _socfpga_mp_start_ap(plat, SOCFPGA_SOCDK); + _socfpga_mp_start_ap(SOCFPGA_ARRIA10); } +#endif +#if defined(SOC_ALTERA_CYCLONE5) void socfpga_mp_start_ap(platform_t plat) { - _socfpga_mp_start_ap(plat, SOCFPGA_SOCKIT); + _socfpga_mp_start_ap(SOCFPGA_CYCLONE5); } - +#endif Modified: head/sys/arm/conf/SOCFPGA ============================================================================== --- head/sys/arm/conf/SOCFPGA Tue Feb 28 15:44:21 2017 (r314394) +++ head/sys/arm/conf/SOCFPGA Tue Feb 28 16:20:33 2017 (r314395) @@ -32,6 +32,9 @@ options PLATFORM_SMP options SMP # Enable multiple cores options MULTIDELAY +options SOC_ALTERA_ARRIA10 +options SOC_ALTERA_CYCLONE5 + # NFS root from boopt/dhcp #options BOOTP #options BOOTP_NFSROOT Modified: head/sys/conf/options.arm ============================================================================== --- head/sys/conf/options.arm Tue Feb 28 15:44:21 2017 (r314394) +++ head/sys/conf/options.arm Tue Feb 28 16:20:33 2017 (r314395) @@ -50,6 +50,8 @@ SOC_ALLWINNER_A31S opt_global.h SOC_ALLWINNER_A33 opt_global.h SOC_ALLWINNER_A83T opt_global.h SOC_ALLWINNER_H3 opt_global.h +SOC_ALTERA_ARRIA10 opt_global.h +SOC_ALTERA_CYCLONE5 opt_global.h SOC_BCM2835 opt_global.h SOC_BCM2836 opt_global.h SOC_IMX51 opt_global.h From owner-svn-src-all@freebsd.org Tue Feb 28 18:03:37 2017 Return-Path: Delivered-To: svn-src-all@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 9A55ECF17B2; Tue, 28 Feb 2017 18:03:37 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mx1.sbone.de (bird.sbone.de [46.4.1.90]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 2F347DFB; Tue, 28 Feb 2017 18:03:36 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 4FFB725D3860; Tue, 28 Feb 2017 18:03:28 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 45782D1F8BC; Tue, 28 Feb 2017 18:03:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id ppkKRG28UHuj; Tue, 28 Feb 2017 18:03:25 +0000 (UTC) Received: from [192.168.124.1] (fresh-tun0-ula.sbone.de [IPv6:fde9:577b:c1a9:4920:2ef0:eeff:fe03:ee34]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 373FBD1F835; Tue, 28 Feb 2017 18:03:25 +0000 (UTC) From: "Bjoern A. Zeeb" To: "Dag-Erling =?utf-8?q?Sm=C3=B8rgrav?=" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r308996 - head/lib/libfetch Date: Tue, 28 Feb 2017 18:03:24 +0000 Message-ID: <77B1B45A-D837-4853-B1E9-958D3B0DD519@lists.zabbadoz.net> In-Reply-To: <201611221330.uAMDU7fg052989@repo.freebsd.org> References: <201611221330.uAMDU7fg052989@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Mailer: MailMate (2.0BETAr6080) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 18:03:37 -0000 On 22 Nov 2016, at 13:30, Dag-Erling Smørgrav wrote: > Author: des > Date: Tue Nov 22 13:30:07 2016 > New Revision: 308996 > URL: https://svnweb.freebsd.org/changeset/base/308996 > > Log: > Refactor fetch_connect() and fetch_bind() to improve readability and > avoid > repeating the same DNS lookups. > > MFC after: 3 weeks > > Modified: > head/lib/libfetch/common.c > head/lib/libfetch/common.h > head/lib/libfetch/ftp.c > > Modified: head/lib/libfetch/common.c > ============================================================================== > --- head/lib/libfetch/common.c Tue Nov 22 13:24:57 2016 (r308995) > +++ head/lib/libfetch/common.c Tue Nov 22 13:30:07 2016 (r308996) > @@ -1,5 +1,5 @@ > /*- > - * Copyright (c) 1998-2014 Dag-Erling Smørgrav > + * Copyright (c) 1998-2016 Dag-Erling Smørgrav > * Copyright (c) 2013 Michael Gmelin > * All rights reserved. > * > @@ -241,27 +241,83 @@ fetch_ref(conn_t *conn) > > > /* > + * Resolve an address > + */ > +struct addrinfo * > +fetch_resolve(const char *addr, int port, int af) > +{ > + char hbuf[256], sbuf[8]; > + struct addrinfo hints, *res; > + const char *sep, *host, *service; > + int err, len; > + > + /* split address if necessary */ > + err = EAI_SYSTEM; > + if ((sep = strchr(addr, ':')) != NULL) { > + len = snprintf(hbuf, sizeof(hbuf), > + "%.*s", (int)(sep - addr), addr); > + if (len < 0) > + return (NULL); > + if (len >= (int)sizeof(hbuf)) { > + errno = ENAMETOOLONG; > + fetch_syserr(); > + return (NULL); > + } > + host = hbuf; > + service = sep + 1; I believe this code is what broke fetch http://[::1]:6666/ just to give an example; and the printf traces will not reveal this but “addr†at this point has no more addr:port in it given the function arguments, right? > + } else if (port != 0) { > + if (port < 1 || port > 65535) { > + errno = EINVAL; > + fetch_syserr(); > + return (NULL); > + } > + if (snprintf(sbuf, sizeof(sbuf), "%d", port) < 0) { > + fetch_syserr(); > + return (NULL); > + } > + host = addr; > + service = sbuf; > + } else { > + host = addr; > + service = NULL; > + } > + > + /* resolve */ > + fetch_info("resolving host = %s service = %s af = %d", > + host, service, af); > + memset(&hints, 0, sizeof(hints)); > + hints.ai_family = af; > + hints.ai_socktype = SOCK_STREAM; > + hints.ai_flags = AI_ADDRCONFIG; > + if ((err = getaddrinfo(host, service, &hints, &res)) != 0) { > + netdb_seterr(err); > + fetch_info("getaddrinfo() failed: %s", gai_strerror(err)); > + return (NULL); > + } From owner-svn-src-all@freebsd.org Tue Feb 28 18:10:05 2017 Return-Path: Delivered-To: svn-src-all@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 317AFCF1961; Tue, 28 Feb 2017 18:10:05 +0000 (UTC) (envelope-from bz@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 01503130; Tue, 28 Feb 2017 18:10:04 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SIA4Lq068349; Tue, 28 Feb 2017 18:10:04 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SIA4Nd068348; Tue, 28 Feb 2017 18:10:04 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201702281810.v1SIA4Nd068348@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Tue, 28 Feb 2017 18:10:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314396 - head/lib/libfetch X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 18:10:05 -0000 Author: bz Date: Tue Feb 28 18:10:03 2017 New Revision: 314396 URL: https://svnweb.freebsd.org/changeset/base/314396 Log: Properly indent a default: label and avoid crashing when running under -v but cannot connect due to trying to print an int as %s [1]. Reported by: andrew [1] MFC after: 3 days Modified: head/lib/libfetch/common.c Modified: head/lib/libfetch/common.c ============================================================================== --- head/lib/libfetch/common.c Tue Feb 28 16:20:33 2017 (r314395) +++ head/lib/libfetch/common.c Tue Feb 28 18:10:03 2017 (r314396) @@ -153,7 +153,7 @@ fetch_syserr(void) case EHOSTDOWN: fetchLastErrCode = FETCH_DOWN; break; -default: + default: fetchLastErrCode = FETCH_UNKNOWN; } snprintf(fetchLastErrString, MAXERRSTRING, "%s", strerror(errno)); @@ -371,7 +371,7 @@ fetch_connect(const char *host, int port } if (err != 0) { if (verbose) - fetch_info("failed to connect to %s:%s", host, port); + fetch_info("failed to connect to %s:%d", host, port); goto syserr; } From owner-svn-src-all@freebsd.org Tue Feb 28 18:16:10 2017 Return-Path: Delivered-To: svn-src-all@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 2F9B2CF1D18; Tue, 28 Feb 2017 18:16:10 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [96.47.65.170]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 078BE930; Tue, 28 Feb 2017 18:16:09 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net [73.231.226.104]) by mail.baldwin.cx (Postfix) with ESMTPSA id A644710A7FA; Tue, 28 Feb 2017 13:16:01 -0500 (EST) From: John Baldwin To: Gleb Smirnoff Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314373 - in head: . etc/defaults etc/rc.d lib/libc/regex share/man/man4/man4.i386 share/man/man5 sys/amd64/conf sys/boot/forth sys/compat/svr4 sys/conf sys/dev/streams sys/i386/conf sy... Date: Tue, 28 Feb 2017 09:47:32 -0800 Message-ID: <1969312.3TTRqhLH9r@ralph.baldwin.cx> User-Agent: KMail/4.14.10 (FreeBSD/11.0-STABLE; KDE/4.14.10; amd64; ; ) In-Reply-To: <201702280514.v1S5EhPq060885@repo.freebsd.org> References: <201702280514.v1S5EhPq060885@repo.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Tue, 28 Feb 2017 13:16:01 -0500 (EST) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 18:16:10 -0000 On Tuesday, February 28, 2017 05:14:43 AM Gleb Smirnoff wrote: > Author: glebius > Date: Tue Feb 28 05:14:42 2017 > New Revision: 314373 > URL: https://svnweb.freebsd.org/changeset/base/314373 > > Log: > Remove SVR4 (System V Release 4) binary compatibility support. > > UNIX System V Release 4 is operating system released in 1988. It ceased > to exist in early 2000-s. Thanks. Is there any socket code we kept just for streams support that we can now remove as well? Also: 'Relnotes: yes' -- John Baldwin From owner-svn-src-all@freebsd.org Tue Feb 28 18:25:08 2017 Return-Path: Delivered-To: svn-src-all@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 16A7DCF1F89; Tue, 28 Feb 2017 18:25:08 +0000 (UTC) (envelope-from scottl@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 D8743DE9; Tue, 28 Feb 2017 18:25:07 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SIP6t3075874; Tue, 28 Feb 2017 18:25:06 GMT (envelope-from scottl@FreeBSD.org) Received: (from scottl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SIP6qx075872; Tue, 28 Feb 2017 18:25:06 GMT (envelope-from scottl@FreeBSD.org) Message-Id: <201702281825.v1SIP6qx075872@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: scottl set sender to scottl@FreeBSD.org using -f From: Scott Long Date: Tue, 28 Feb 2017 18:25:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314397 - in head: share/man/man9 sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 18:25:08 -0000 Author: scottl Date: Tue Feb 28 18:25:06 2017 New Revision: 314397 URL: https://svnweb.freebsd.org/changeset/base/314397 Log: Implement sbuf_prf(), which takes an sbuf and outputs it to stdout in the non-kernel case and to the console+log in the kernel case. For the kernel case it hooks the putbuf() machinery underneath printf(9) so that the buffer is written completely atomically and without a copy into another temporary buffer. This is useful for fixing compound console/log messages that become broken and interleaved when multiple threads are competing for the console. Reviewed by: ken, imp Sponsored by: Netflix Modified: head/share/man/man9/sbuf.9 head/sys/kern/subr_prf.c Modified: head/share/man/man9/sbuf.9 ============================================================================== --- head/share/man/man9/sbuf.9 Tue Feb 28 18:10:03 2017 (r314396) +++ head/share/man/man9/sbuf.9 Tue Feb 28 18:25:06 2017 (r314397) @@ -57,7 +57,8 @@ .Nm sbuf_delete , .Nm sbuf_start_section , .Nm sbuf_end_section , -.Nm sbuf_hexdump +.Nm sbuf_hexdump , +.Nm sbuf_putbuf .Nd safe string composition .Sh SYNOPSIS .In sys/types.h @@ -124,6 +125,8 @@ .Fa "const char *hdr" .Fa "int flags" .Fc +.Ft void +.Fn sbuf_putbuf "struct sbuf *s" .In sys/sysctl.h .Ft struct sbuf * .Fn sbuf_new_for_sysctl "struct sbuf *s" "char *buf" "int length" "struct sysctl_req *req" @@ -472,6 +475,12 @@ representation of the bytes if possible. See the .Xr hexdump 3 man page for more details on the interface. +.Pp +The +.Fn sbuf_putbuf +function printfs the sbuf to stdout if in userland, and to the console +and log if in the kernel. +It does not drain the buffer or update any pointers. .Sh NOTES If an operation caused an .Fa sbuf Modified: head/sys/kern/subr_prf.c ============================================================================== --- head/sys/kern/subr_prf.c Tue Feb 28 18:10:03 2017 (r314396) +++ head/sys/kern/subr_prf.c Tue Feb 28 18:25:06 2017 (r314397) @@ -411,6 +411,23 @@ vprintf(const char *fmt, va_list ap) } static void +prf_putbuf(char *bufr, int flags, int pri) +{ + + if (flags & TOLOG) + msglogstr(bufr, pri, /*filter_cr*/1); + + if (flags & TOCONS) { + if ((panicstr == NULL) && (constty != NULL)) + msgbuf_addstr(&consmsgbuf, -1, + bufr, /*filter_cr*/ 0); + + if ((constty == NULL) ||(always_console_output)) + cnputs(bufr); + } +} + +static void putbuf(int c, struct putchar_arg *ap) { /* Check if no console output buffer was provided. */ @@ -431,18 +448,7 @@ putbuf(int c, struct putchar_arg *ap) /* Check if the buffer needs to be flushed. */ if (ap->remain == 2 || c == '\n') { - - if (ap->flags & TOLOG) - msglogstr(ap->p_bufr, ap->pri, /*filter_cr*/1); - - if (ap->flags & TOCONS) { - if ((panicstr == NULL) && (constty != NULL)) - msgbuf_addstr(&consmsgbuf, -1, - ap->p_bufr, /*filter_cr*/ 0); - - if ((constty == NULL) ||(always_console_output)) - cnputs(ap->p_bufr); - } + prf_putbuf(ap->p_bufr, ap->flags, ap->pri); ap->p_next = ap->p_bufr; ap->remain = ap->n_bufr; @@ -1221,3 +1227,19 @@ counted_warning(unsigned *counter, const } } #endif + +#ifdef _KERNEL +void +sbuf_putbuf(struct sbuf *sb) +{ + + prf_putbuf(sbuf_data(sb), TOLOG | TOCONS, -1); +} +#else +void +sbuf_putbuf(struct sbuf *sb) +{ + + printf("%s", sbuf_data(sb)); +} +#endif From owner-svn-src-all@freebsd.org Tue Feb 28 18:48:14 2017 Return-Path: Delivered-To: svn-src-all@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 482C1CF161B; Tue, 28 Feb 2017 18:48:14 +0000 (UTC) (envelope-from avg@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 22C448B; Tue, 28 Feb 2017 18:48:14 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SImDVh084111; Tue, 28 Feb 2017 18:48:13 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SImDie084109; Tue, 28 Feb 2017 18:48:13 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201702281848.v1SImDie084109@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Tue, 28 Feb 2017 18:48:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314398 - in head/sys/x86: include x86 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 18:48:14 -0000 Author: avg Date: Tue Feb 28 18:48:12 2017 New Revision: 314398 URL: https://svnweb.freebsd.org/changeset/base/314398 Log: Local APIC: add support for extended LVT entries found in AMD processors The extended LVT entries can be used to configure interrupt delivery for various events that are internal to a processor and can use this feature. All current processors that support the feature have four of such entries. The entries are all masked upon the processor reset, but it's possible that firmware may use some of them. BIOS and Kernel Developer's Guides for some processor models do not assign any particular names to the extended LVTs, while other BKDGs provide names and suggested usage for them. However, there is no fixed mapping between the LVTs and the processor events in any processor model that supports the feature. Any entry can be assigned to any event. The assignment is done by programming an offset of an entry into configuration bits corresponding to an event. This change does not expose the flexibility that the feature offers. The change adds just a single method to configure a hardcoded extended LVT entry to deliver APIC_CMC_INT. The method is designed to be used with Machine Check Error Thresholding mechanism on supported processor models. For references please see BKDGs for families 10h - 16h and specifically descriptions of APIC30, APIC400, APIC[530:500] registers. For a description of the Error Thresholding mechanism see, for example, BKDG for family 10h, section 2.12.1.6. http://developer.amd.com/resources/developer-guides-manuals/ Thanks to jhb and kib for their suggestions. Reviewed by: kib Discussed with: jhb MFC after: 5 weeks Relnotes: maybe Differential Revision: https://reviews.freebsd.org/D9612 Modified: head/sys/x86/include/apicreg.h head/sys/x86/include/apicvar.h head/sys/x86/x86/local_apic.c Modified: head/sys/x86/include/apicreg.h ============================================================================== --- head/sys/x86/include/apicreg.h Tue Feb 28 18:25:06 2017 (r314397) +++ head/sys/x86/include/apicreg.h Tue Feb 28 18:48:12 2017 (r314398) @@ -241,17 +241,32 @@ enum LAPIC_REGISTERS { LAPIC_CCR_TIMER = 0x39, LAPIC_DCR_TIMER = 0x3e, LAPIC_SELF_IPI = 0x3f, /* Only in x2APIC */ + LAPIC_EXT_FEATURES = 0x40, /* AMD */ + LAPIC_EXT_CTRL = 0x41, /* AMD */ + LAPIC_EXT_SEOI = 0x42, /* AMD */ + LAPIC_EXT_IER0 = 0x48, /* AMD */ + LAPIC_EXT_IER1 = 0x49, /* AMD */ + LAPIC_EXT_IER2 = 0x4a, /* AMD */ + LAPIC_EXT_IER3 = 0x4b, /* AMD */ + LAPIC_EXT_IER4 = 0x4c, /* AMD */ + LAPIC_EXT_IER5 = 0x4d, /* AMD */ + LAPIC_EXT_IER6 = 0x4e, /* AMD */ + LAPIC_EXT_IER7 = 0x4f, /* AMD */ + LAPIC_EXT_LVT0 = 0x50, /* AMD */ + LAPIC_EXT_LVT1 = 0x51, /* AMD */ + LAPIC_EXT_LVT2 = 0x52, /* AMD */ + LAPIC_EXT_LVT3 = 0x53, /* AMD */ }; +#define LAPIC_MEM_MUL 0x10 + /* - * The LAPIC_SELF_IPI register only exists in x2APIC mode. The - * formula below is applicable only to reserve the memory region, - * i.e. for xAPIC mode, where LAPIC_SELF_IPI finely serves as the - * address past end of the region. + * Although some registers are available on AMD processors only, + * it's not a big waste to reserve them on all platforms. + * However, we need to watch out for this space being assigned for + * non-APIC purposes in the future processor models. */ -#define LAPIC_MEM_REGION (LAPIC_SELF_IPI * 0x10) - -#define LAPIC_MEM_MUL 0x10 +#define LAPIC_MEM_REGION ((LAPIC_EXT_LVT3 + 1) * LAPIC_MEM_MUL) /****************************************************************************** * I/O APIC structure @@ -295,6 +310,7 @@ typedef struct IOAPIC ioapic_t; #define APIC_VER_MAXLVT 0x00ff0000 #define MAXLVTSHIFT 16 #define APIC_VER_EOI_SUPPRESSION 0x01000000 +#define APIC_VER_AMD_EXT_SPACE 0x80000000 /* fields in LDR */ #define APIC_LDR_RESERVED 0x00ffffff @@ -418,6 +434,13 @@ typedef struct IOAPIC ioapic_t; #define APIC_TDCR_128 0x0a #define APIC_TDCR_1 0x0b +/* Constants related to AMD Extended APIC Features Register */ +#define APIC_EXTF_ELVT_MASK 0x00ff0000 +#define APIC_EXTF_ELVT_SHIFT 16 +#define APIC_EXTF_EXTID_CAP 0x00000004 +#define APIC_EXTF_SEIO_CAP 0x00000002 +#define APIC_EXTF_IER_CAP 0x00000001 + /* LVT table indices */ #define APIC_LVT_LINT0 0 #define APIC_LVT_LINT1 1 @@ -428,6 +451,13 @@ typedef struct IOAPIC ioapic_t; #define APIC_LVT_CMCI 6 #define APIC_LVT_MAX APIC_LVT_CMCI +/* AMD extended LVT constants, seem to be assigned by fiat */ +#define APIC_ELVT_IBS 0 /* Instruction based sampling */ +#define APIC_ELVT_MCA 1 /* MCE thresholding */ +#define APIC_ELVT_DEI 2 /* Deferred error interrupt */ +#define APIC_ELVT_SBI 3 /* Sideband interface */ +#define APIC_ELVT_MAX APIC_ELVT_SBI + /****************************************************************************** * I/O APIC defines */ Modified: head/sys/x86/include/apicvar.h ============================================================================== --- head/sys/x86/include/apicvar.h Tue Feb 28 18:25:06 2017 (r314397) +++ head/sys/x86/include/apicvar.h Tue Feb 28 18:48:12 2017 (r314398) @@ -232,6 +232,9 @@ struct apic_ops { /* CMC */ void (*enable_cmc)(void); + /* AMD ELVT */ + int (*enable_mca_elvt)(void); + /* IPI */ void (*ipi_raw)(register_t, u_int); void (*ipi_vectored)(u_int, int); @@ -396,6 +399,13 @@ lapic_enable_cmc(void) apic_ops.enable_cmc(); } +static inline int +lapic_enable_mca_elvt(void) +{ + + return (apic_ops.enable_mca_elvt()); +} + static inline void lapic_ipi_raw(register_t icrlo, u_int dest) { Modified: head/sys/x86/x86/local_apic.c ============================================================================== --- head/sys/x86/x86/local_apic.c Tue Feb 28 18:25:06 2017 (r314397) +++ head/sys/x86/x86/local_apic.c Tue Feb 28 18:48:12 2017 (r314398) @@ -122,6 +122,7 @@ struct lvt { struct lapic { struct lvt la_lvts[APIC_LVT_MAX + 1]; + struct lvt la_elvts[APIC_ELVT_MAX + 1];; u_int la_id:8; u_int la_cluster:4; u_int la_cluster_id:2; @@ -146,6 +147,14 @@ static struct lvt lvts[APIC_LVT_MAX + 1] { 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_CMC_INT }, /* CMCI */ }; +/* Global defaults for AMD local APIC ELVT entries. */ +static struct lvt elvts[APIC_ELVT_MAX + 1] = { + { 1, 1, 1, 0, APIC_LVT_DM_FIXED, 0 }, + { 1, 1, 1, 0, APIC_LVT_DM_FIXED, APIC_CMC_INT }, + { 1, 1, 1, 0, APIC_LVT_DM_FIXED, 0 }, + { 1, 1, 1, 0, APIC_LVT_DM_FIXED, 0 }, +}; + static inthand_t *ioint_handlers[] = { NULL, /* 0 - 31 */ IDTVEC(apic_isr1), /* 32 - 63 */ @@ -319,6 +328,7 @@ static int native_lapic_enable_pmc(void static void native_lapic_disable_pmc(void); static void native_lapic_reenable_pmc(void); static void native_lapic_enable_cmc(void); +static int native_lapic_enable_mca_elvt(void); static int native_lapic_set_lvt_mask(u_int apic_id, u_int lvt, u_char masked); static int native_lapic_set_lvt_mode(u_int apic_id, u_int lvt, @@ -357,6 +367,7 @@ struct apic_ops apic_ops = { .disable_pmc = native_lapic_disable_pmc, .reenable_pmc = native_lapic_reenable_pmc, .enable_cmc = native_lapic_enable_cmc, + .enable_mca_elvt = native_lapic_enable_mca_elvt, #ifdef SMP .ipi_raw = native_lapic_ipi_raw, .ipi_vectored = native_lapic_ipi_vectored, @@ -371,15 +382,8 @@ struct apic_ops apic_ops = { }; static uint32_t -lvt_mode(struct lapic *la, u_int pin, uint32_t value) +lvt_mode_impl(struct lapic *la, struct lvt *lvt, u_int pin, uint32_t value) { - struct lvt *lvt; - - KASSERT(pin <= APIC_LVT_MAX, ("%s: pin %u out of range", __func__, pin)); - if (la->la_lvts[pin].lvt_active) - lvt = &la->la_lvts[pin]; - else - lvt = &lvts[pin]; value &= ~(APIC_LVT_M | APIC_LVT_TM | APIC_LVT_IIPP | APIC_LVT_DM | APIC_LVT_VECTOR); @@ -411,6 +415,38 @@ lvt_mode(struct lapic *la, u_int pin, ui return (value); } +static uint32_t +lvt_mode(struct lapic *la, u_int pin, uint32_t value) +{ + struct lvt *lvt; + + KASSERT(pin <= APIC_LVT_MAX, + ("%s: pin %u out of range", __func__, pin)); + if (la->la_lvts[pin].lvt_active) + lvt = &la->la_lvts[pin]; + else + lvt = &lvts[pin]; + + return (lvt_mode_impl(la, lvt, pin, value)); +} + +static uint32_t +elvt_mode(struct lapic *la, u_int idx, uint32_t value) +{ + struct lvt *elvt; + + KASSERT(idx <= APIC_ELVT_MAX, + ("%s: idx %u out of range", __func__, idx)); + + elvt = &la->la_elvts[idx]; + KASSERT(elvt->lvt_active, ("%s: ELVT%u is not active", __func__, idx)); + KASSERT(elvt->lvt_edgetrigger, + ("%s: ELVT%u is not edge triggered", __func__, idx)); + KASSERT(elvt->lvt_activehi, + ("%s: ELVT%u is not active high", __func__, idx)); + return (lvt_mode_impl(la, elvt, idx, value)); +} + /* * Map the local APIC and setup necessary interrupt vectors. */ @@ -583,6 +619,10 @@ native_lapic_create(u_int apic_id, int b lapics[apic_id].la_lvts[i] = lvts[i]; lapics[apic_id].la_lvts[i].lvt_active = 0; } + for (i = 0; i <= APIC_ELVT_MAX; i++) { + lapics[apic_id].la_elvts[i] = elvts[i]; + lapics[apic_id].la_elvts[i].lvt_active = 0; + } for (i = 0; i <= APIC_NUM_IOINTS; i++) lapics[apic_id].la_ioint_irqs[i] = -1; lapics[apic_id].la_ioint_irqs[IDT_SYSCALL - APIC_IO_INTS] = IRQ_SYSCALL; @@ -602,18 +642,49 @@ native_lapic_create(u_int apic_id, int b #endif } +static inline uint32_t +amd_read_ext_features(void) +{ + uint32_t version; + + if (cpu_vendor_id != CPU_VENDOR_AMD) + return (0); + version = lapic_read32(LAPIC_VERSION); + if ((version & APIC_VER_AMD_EXT_SPACE) != 0) + return (lapic_read32(LAPIC_EXT_FEATURES)); + else + return (0); +} + +static inline uint32_t +amd_read_elvt_count(void) +{ + uint32_t extf; + uint32_t count; + + extf = amd_read_ext_features(); + count = (extf & APIC_EXTF_ELVT_MASK) >> APIC_EXTF_ELVT_SHIFT; + count = min(count, APIC_ELVT_MAX + 1); + return (count); +} + /* * Dump contents of local APIC registers */ static void native_lapic_dump(const char* str) { + uint32_t version; uint32_t maxlvt; + uint32_t extf; + int elvt_count; + int i; - maxlvt = (lapic_read32(LAPIC_VERSION) & APIC_VER_MAXLVT) >> MAXLVTSHIFT; + version = lapic_read32(LAPIC_VERSION); + maxlvt = (version & APIC_VER_MAXLVT) >> MAXLVTSHIFT; printf("cpu%d %s:\n", PCPU_GET(cpuid), str); printf(" ID: 0x%08x VER: 0x%08x LDR: 0x%08x DFR: 0x%08x", - lapic_read32(LAPIC_ID), lapic_read32(LAPIC_VERSION), + lapic_read32(LAPIC_ID), version, lapic_read32(LAPIC_LDR), x2apic_mode ? 0 : lapic_read32(LAPIC_DFR)); if ((cpu_feature2 & CPUID2_X2APIC) != 0) printf(" x2APIC: %d", x2apic_mode); @@ -628,6 +699,14 @@ native_lapic_dump(const char* str) printf("\n"); if (maxlvt >= APIC_LVT_CMCI) printf(" cmci: 0x%08x\n", lapic_read32(LAPIC_LVT_CMCI)); + extf = amd_read_ext_features(); + if (extf != 0) { + printf(" AMD ext features: 0x%08x\n", extf); + elvt_count = amd_read_elvt_count(); + for (i = 0; i < elvt_count; i++) + printf(" AMD elvt%d: 0x%08x\n", i, + lapic_read32(LAPIC_EXT_LVT0 + i)); + } } static void @@ -645,15 +724,19 @@ static void native_lapic_setup(int boot) { struct lapic *la; + uint32_t version; uint32_t maxlvt; register_t saveintr; char buf[MAXCOMLEN + 1]; + int elvt_count; + int i; saveintr = intr_disable(); la = &lapics[lapic_id()]; KASSERT(la->la_present, ("missing APIC structure")); - maxlvt = (lapic_read32(LAPIC_VERSION) & APIC_VER_MAXLVT) >> MAXLVTSHIFT; + version = lapic_read32(LAPIC_VERSION); + maxlvt = (version & APIC_VER_MAXLVT) >> MAXLVTSHIFT; /* Initialize the TPR to allow all interrupts. */ lapic_set_tpr(0); @@ -718,6 +801,13 @@ native_lapic_setup(int boot) lapic_read32(LAPIC_LVT_CMCI))); } + elvt_count = amd_read_elvt_count(); + for (i = 0; i < elvt_count; i++) { + if (la->la_elvts[i].lvt_active) + lapic_write32(LAPIC_EXT_LVT0 + i, + elvt_mode(la, i, lapic_read32(LAPIC_EXT_LVT0 + i))); + } + intr_restore(saveintr); } @@ -1311,6 +1401,37 @@ native_lapic_enable_cmc(void) printf("lapic%u: CMCI unmasked\n", apic_id); } +static int +native_lapic_enable_mca_elvt(void) +{ + u_int apic_id; + uint32_t value; + int elvt_count; + +#ifdef DEV_ATPIC + if (lapic_map == NULL) + return (-1); +#endif + + apic_id = PCPU_GET(apic_id); + KASSERT(lapics[apic_id].la_present, + ("%s: missing APIC %u", __func__, apic_id)); + elvt_count = amd_read_elvt_count(); + if (elvt_count <= APIC_ELVT_MCA) + return (-1); + + value = lapic_read32(LAPIC_EXT_LVT0 + APIC_ELVT_MCA); + if ((value & APIC_LVT_M) == 0) { + printf("AMD MCE Thresholding Extended LVT is already active\n"); + return (-1); + } + lapics[apic_id].la_elvts[APIC_ELVT_MCA].lvt_masked = 0; + lapics[apic_id].la_elvts[APIC_ELVT_MCA].lvt_active = 1; + if (bootverbose) + printf("lapic%u: MCE Thresholding ELVT unmasked\n", apic_id); + return (APIC_ELVT_MCA); +} + void lapic_handle_error(void) { From owner-svn-src-all@freebsd.org Tue Feb 28 18:58:42 2017 Return-Path: Delivered-To: svn-src-all@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 BA9A4CF193C; Tue, 28 Feb 2017 18:58:42 +0000 (UTC) (envelope-from rpokala@mac.com) Received: from mr11p00im-asmtp003.me.com (mr11p00im-asmtp003.me.com [17.110.69.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9C67B940; Tue, 28 Feb 2017 18:58:42 +0000 (UTC) (envelope-from rpokala@mac.com) Received: from process-dkim-sign-daemon.mr11p00im-asmtp003.me.com by mr11p00im-asmtp003.me.com (Oracle Communications Messaging Server 7.0.5.38.0 64bit (built Feb 26 2016)) id <0OM300I00LZFAM00@mr11p00im-asmtp003.me.com>; Tue, 28 Feb 2017 18:58:00 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mac.com; s=4d515a; t=1488308280; bh=EvxZGqX4Zmp30kqDWj1X1xh94ZXGCKsKDO5PFsVdRqc=; h=Date:Subject:From:To:Message-id:MIME-version:Content-type; b=RXmgymzGie7LC0xy9t+I5ByxMiZFEqzHMUpYU0OlM2bE/MQpaUfDWE7UB1dHfjyEv Qen6FabBGDw2OR/imFsD205nZUDebgsV6guVqrsgczQ+swVUEcIl6kgzULm/cU8G1L T5O9NvZ1JFxiHbGCcax2r3mNzIHWj86GMVPedFw0jxix48Wrbt5xxFFIZbrxsss/Y6 qzLSZagvnYfsd0V5OCXX2JvsWeKehWR+I0okDJxInhThMCFqb/IZQ2L57A6tQrnsSW 2Zb4H88mLM5ZymjNeX0fDDFNZicnrfj/XW0VZGpvz5rKGslv4qX0I3iwMUtOiJDtRA jojRZ2HJIKfgA== Received: from icloud.com ([127.0.0.1]) by mr11p00im-asmtp003.me.com (Oracle Communications Messaging Server 7.0.5.38.0 64bit (built Feb 26 2016)) with ESMTPSA id <0OM3009A6M0MMP40@mr11p00im-asmtp003.me.com>; Tue, 28 Feb 2017 18:57:59 +0000 (GMT) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-02-28_15:,, signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 clxscore=1034 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1701120000 definitions=main-1702280166 User-Agent: Microsoft-MacOutlook/f.1f.0.170216 Date: Tue, 28 Feb 2017 10:57:57 -0800 Subject: Re: svn commit: r314373 - in head: . etc/defaults etc/rc.d lib/libc/regex share/man/man4/man4.i386 share/man/man5 sys/amd64/conf sys/boot/forth sys/compat/svr4 sys/conf sys/dev/streams sys/i386/conf sy... From: Ravi Pokala Sender: "Pokala, Ravi" To: John Baldwin , Gleb Smirnoff Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-id: Thread-topic: svn commit: r314373 - in head: . etc/defaults etc/rc.d lib/libc/regex share/man/man4/man4.i386 share/man/man5 sys/amd64/conf sys/boot/forth sys/compat/svr4 sys/conf sys/dev/streams sys/i386/conf sy... References: <201702280514.v1S5EhPq060885@repo.freebsd.org> <1969312.3TTRqhLH9r@ralph.baldwin.cx> In-reply-to: <1969312.3TTRqhLH9r@ralph.baldwin.cx> MIME-version: 1.0 Content-type: text/plain; charset=UTF-8 Content-transfer-encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 18:58:42 -0000 Shouldn't this also get an UPDATING entry, and/or a bump in __FreeBSD_version? -Ravi (rpokala@) -----Original Message----- > From: on behalf of John Baldwin > Date: 2017-02-28, Tuesday at 09:47 > To: Gleb Smirnoff > Cc: , , > Subject: Re: svn commit: r314373 - in head: . etc/defaults etc/rc.d lib/libc/regex share/man/man4/man4.i386 share/man/man5 sys/amd64/conf sys/boot/forth sys/compat/svr4 sys/conf sys/dev/streams sys/i386/conf sy... > > On Tuesday, February 28, 2017 05:14:43 AM Gleb Smirnoff wrote: >> Author: glebius >> Date: Tue Feb 28 05:14:42 2017 >> New Revision: 314373 >> URL: https://svnweb.freebsd.org/changeset/base/314373 >> >> Log: >> Remove SVR4 (System V Release 4) binary compatibility support. >> >> UNIX System V Release 4 is operating system released in 1988. It ceased >> to exist in early 2000-s. > > Thanks. Is there any socket code we kept just for streams support that > we can now remove as well? > > Also: 'Relnotes: yes' > > -- > John Baldwin From owner-svn-src-all@freebsd.org Tue Feb 28 19:02:00 2017 Return-Path: Delivered-To: svn-src-all@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 C6660CF1B34; Tue, 28 Feb 2017 19:02:00 +0000 (UTC) (envelope-from scottl@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 92FCACE0; Tue, 28 Feb 2017 19:02:00 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SJ1xD3089704; Tue, 28 Feb 2017 19:01:59 GMT (envelope-from scottl@FreeBSD.org) Received: (from scottl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SJ1xKE089703; Tue, 28 Feb 2017 19:01:59 GMT (envelope-from scottl@FreeBSD.org) Message-Id: <201702281901.v1SJ1xKE089703@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: scottl set sender to scottl@FreeBSD.org using -f From: Scott Long Date: Tue, 28 Feb 2017 19:01:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314399 - head/sys/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 19:02:00 -0000 Author: scottl Date: Tue Feb 28 19:01:59 2017 New Revision: 314399 URL: https://svnweb.freebsd.org/changeset/base/314399 Log: Add prototype for sbuf_putbuf() Sponsored by: Netflix Modified: head/sys/sys/sbuf.h Modified: head/sys/sys/sbuf.h ============================================================================== --- head/sys/sys/sbuf.h Tue Feb 28 18:48:12 2017 (r314398) +++ head/sys/sys/sbuf.h Tue Feb 28 19:01:59 2017 (r314399) @@ -99,6 +99,7 @@ void sbuf_start_section(struct sbuf *, ssize_t sbuf_end_section(struct sbuf *, ssize_t, size_t, int); void sbuf_hexdump(struct sbuf *, const void *, int, const char *, int); +void sbuf_putbuf(struct sbuf *); #ifdef _KERNEL struct uio; From owner-svn-src-all@freebsd.org Tue Feb 28 19:20:49 2017 Return-Path: Delivered-To: svn-src-all@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 18226CF1E3F; Tue, 28 Feb 2017 19:20:49 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebi.us (glebi.us [96.95.210.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cell.glebi.us", Issuer "cell.glebi.us" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id EE1EA311; Tue, 28 Feb 2017 19:20:48 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebi.us (localhost [127.0.0.1]) by cell.glebi.us (8.15.2/8.15.2) with ESMTPS id v1SJKluO016138 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 28 Feb 2017 11:20:47 -0800 (PST) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebi.us (8.15.2/8.15.2/Submit) id v1SJKl8a016137; Tue, 28 Feb 2017 11:20:47 -0800 (PST) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebi.us: glebius set sender to glebius@FreeBSD.org using -f Date: Tue, 28 Feb 2017 11:20:47 -0800 From: Gleb Smirnoff To: John Baldwin Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314373 - in head: . etc/defaults etc/rc.d lib/libc/regex share/man/man4/man4.i386 share/man/man5 sys/amd64/conf sys/boot/forth sys/compat/svr4 sys/conf sys/dev/streams sys/i386/conf sy... Message-ID: <20170228192047.GI1044@FreeBSD.org> References: <201702280514.v1S5EhPq060885@repo.freebsd.org> <1969312.3TTRqhLH9r@ralph.baldwin.cx> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1969312.3TTRqhLH9r@ralph.baldwin.cx> User-Agent: Mutt/1.7.2 (2016-11-26) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 19:20:49 -0000 On Tue, Feb 28, 2017 at 09:47:32AM -0800, John Baldwin wrote: J> On Tuesday, February 28, 2017 05:14:43 AM Gleb Smirnoff wrote: J> > Author: glebius J> > Date: Tue Feb 28 05:14:42 2017 J> > New Revision: 314373 J> > URL: https://svnweb.freebsd.org/changeset/base/314373 J> > J> > Log: J> > Remove SVR4 (System V Release 4) binary compatibility support. J> > J> > UNIX System V Release 4 is operating system released in 1988. It ceased J> > to exist in early 2000-s. J> J> Thanks. Is there any socket code we kept just for streams support that J> we can now remove as well? I didn't notice any. Somewhat unrelated: there is COMPAT_OLDSOCK, which I'd be happy to remove as well. The rationale is the same: there are huge concerns that the code actually works, and wasn't broken during decades. -- Totus tuus, Glebius. From owner-svn-src-all@freebsd.org Tue Feb 28 19:27:43 2017 Return-Path: Delivered-To: svn-src-all@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 00790CF124A; Tue, 28 Feb 2017 19:27:42 +0000 (UTC) (envelope-from np@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 AE8B4C28; Tue, 28 Feb 2017 19:27:42 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SJRf8u099758; Tue, 28 Feb 2017 19:27:41 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SJRfok099754; Tue, 28 Feb 2017 19:27:41 GMT (envelope-from np@FreeBSD.org) Message-Id: <201702281927.v1SJRfok099754@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Tue, 28 Feb 2017 19:27:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314400 - in head/sys: dev/cxgbe/iw_cxgbe ofed/drivers/infiniband/core X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 19:27:43 -0000 Author: np Date: Tue Feb 28 19:27:41 2017 New Revision: 314400 URL: https://svnweb.freebsd.org/changeset/base/314400 Log: cxgbe/iw_cxgbe: fix various double-close panics with iWARP sockets. Sockets representing the TCP endpoints for iWARP connections are allocated by the ibcore module. Before this revision they were closed either by the ibcore module or the iw_cxgbe hardware driver depending on the state transitions during connection teardown. This is error prone and there were cases where both iw_cxgbe and ibcore closed the socket leading to double-free panics. The fix is to let ibcore close the sockets it creates and never do it in the driver. - Use sodisconnect instead of soclose (preceded by solinger = 0) in the driver to tear down an RDMA connection abruptly. This does what's intended without releasing the socket's fd reference. - Close the socket in ibcore when the iWARP iw_cm_id is destroyed. This works for all kinds of sockets: clients that initiate connections, listeners, and sockets accepted off of listeners. Reviewed by: Steve Wise @ Open Grid Computing, hselasky@ MFC after: 3 days Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D9796 Modified: head/sys/dev/cxgbe/iw_cxgbe/cm.c head/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h head/sys/ofed/drivers/infiniband/core/cma.c head/sys/ofed/drivers/infiniband/core/iwcm.c Modified: head/sys/dev/cxgbe/iw_cxgbe/cm.c ============================================================================== --- head/sys/dev/cxgbe/iw_cxgbe/cm.c Tue Feb 28 19:01:59 2017 (r314399) +++ head/sys/dev/cxgbe/iw_cxgbe/cm.c Tue Feb 28 19:27:41 2017 (r314400) @@ -92,9 +92,7 @@ static void *alloc_ep(int size, gfp_t fl void __free_ep(struct c4iw_ep_common *epc); static int find_route(__be32 local_ip, __be32 peer_ip, __be16 local_port, __be16 peer_port, u8 tos, struct nhop4_extended *pnh4); -static int close_socket(struct c4iw_ep_common *epc, int close); -static int shutdown_socket(struct c4iw_ep_common *epc); -static void abort_socket(struct c4iw_ep *ep); +static void close_socket(struct socket *so); static int send_mpa_req(struct c4iw_ep *ep); static int send_mpa_reject(struct c4iw_ep *ep, const void *pdata, u8 plen); static int send_mpa_reply(struct c4iw_ep *ep, const void *pdata, u8 plen); @@ -111,7 +109,8 @@ static void process_peer_close(struct c4 static void process_conn_error(struct c4iw_ep *ep); static void process_close_complete(struct c4iw_ep *ep); static void ep_timeout(unsigned long arg); -static void init_sock(struct c4iw_ep_common *epc); +static void init_iwarp_socket(struct socket *so, void *arg); +static void uninit_iwarp_socket(struct socket *so); static void process_data(struct c4iw_ep *ep); static void process_connected(struct c4iw_ep *ep); static int c4iw_so_upcall(struct socket *so, void *arg, int waitflag); @@ -319,87 +318,12 @@ find_route(__be32 local_ip, __be32 peer_ return err; } -static int -close_socket(struct c4iw_ep_common *epc, int close) -{ - struct socket *so = epc->so; - int rc; - - CTR5(KTR_IW_CXGBE, "%s:csoB so %p, ep %p, state %s, tid %d", __func__, - so, epc, states[epc->state], - ((struct c4iw_ep *)epc)->hwtid); - mutex_lock(&epc->so_mutex); - if ((so == NULL) || (so->so_count == 0)) { - mutex_unlock(&epc->so_mutex); - CTR5(KTR_IW_CXGBE, "%s:cso1 so %p, ep %p, state %s, tid %d", - __func__, so, epc, states[epc->state], - ((struct c4iw_ep *)epc)->hwtid); - return -EINVAL; - } - - SOCK_LOCK(so); - soupcall_clear(so, SO_RCV); - SOCK_UNLOCK(so); - - if (close) - rc = soclose(so); - else - rc = soshutdown(so, SHUT_WR | SHUT_RD); - epc->so = NULL; - - mutex_unlock(&epc->so_mutex); - return (rc); -} - -static int -shutdown_socket(struct c4iw_ep_common *epc) -{ - - struct socket *so = epc->so; - int rc; - - CTR5(KTR_IW_CXGBE, "%s:ssoB so %p, ep %p, state %s, tid %d", __func__, - epc->so, epc, states[epc->state], - ((struct c4iw_ep *)epc)->hwtid); - mutex_lock(&epc->so_mutex); - if ((so == NULL) || (so->so_count == 0)) { - mutex_unlock(&epc->so_mutex); - CTR5(KTR_IW_CXGBE, "%s:sso1 so %p, ep %p, state %s, tid %d", - __func__, epc->so, epc, states[epc->state], - ((struct c4iw_ep *)epc)->hwtid); - return -EINVAL; - } - rc = soshutdown(so, SHUT_WR); - mutex_unlock(&epc->so_mutex); - return rc; -} - static void -abort_socket(struct c4iw_ep *ep) +close_socket(struct socket *so) { - struct sockopt sopt; - int rc; - struct linger l; - - CTR5(KTR_IW_CXGBE, "%s ep %p so %p state %s tid %d", __func__, ep, - ep->com.so, states[ep->com.state], ep->hwtid); - mutex_lock(&ep->com.so_mutex); - l.l_onoff = 1; - l.l_linger = 0; - /* linger_time of 0 forces RST to be sent */ - sopt.sopt_dir = SOPT_SET; - sopt.sopt_level = SOL_SOCKET; - sopt.sopt_name = SO_LINGER; - sopt.sopt_val = (caddr_t)&l; - sopt.sopt_valsize = sizeof l; - sopt.sopt_td = NULL; - rc = sosetopt(ep->com.so, &sopt); - if (rc) { - log(LOG_ERR, "%s: can't set linger to 0, no RST! err %d\n", - __func__, rc); - } - mutex_unlock(&ep->com.so_mutex); + uninit_iwarp_socket(so); + sodisconnect(so); } static void @@ -429,7 +353,7 @@ process_peer_close(struct c4iw_ep *ep) disconnect = 0; STOP_EP_TIMER(ep); - close_socket(&ep->com, 0); + close_socket(ep->com.so); deref_cm_id(&ep->com); release = 1; break; @@ -486,7 +410,7 @@ process_peer_close(struct c4iw_ep *ep) c4iw_modify_qp(ep->com.qp->rhp, ep->com.qp, C4IW_QP_ATTR_NEXT_STATE, &attrs, 1); } - close_socket(&ep->com, 0); + close_socket(ep->com.so); close_complete_upcall(ep, 0); __state_set(&ep->com, DEAD); release = 1; @@ -595,14 +519,7 @@ process_conn_error(struct c4iw_ep *ep) } if (state != ABORTING) { - if (ep->parent_ep) { - CTR2(KTR_IW_CXGBE, "%s:pce1 %p", __func__, ep); - close_socket(&ep->com, 1); - } else { - CTR2(KTR_IW_CXGBE, "%s:pce2 %p", __func__, ep); - close_socket(&ep->com, 0); - } - + close_socket(ep->com.so); __state_set(&ep->com, DEAD); c4iw_put_ep(&ep->com); } @@ -648,16 +565,7 @@ process_close_complete(struct c4iw_ep *e &attrs, 1); } - if (ep->parent_ep) { - - CTR2(KTR_IW_CXGBE, "%s:pcc3 %p", __func__, ep); - close_socket(&ep->com, 1); - } - else { - - CTR2(KTR_IW_CXGBE, "%s:pcc4 %p", __func__, ep); - close_socket(&ep->com, 0); - } + close_socket(ep->com.so); close_complete_upcall(ep, 0); __state_set(&ep->com, DEAD); release = 1; @@ -688,23 +596,15 @@ process_close_complete(struct c4iw_ep *e } static void -init_sock(struct c4iw_ep_common *epc) +init_iwarp_socket(struct socket *so, void *arg) { int rc; struct sockopt sopt; - struct socket *so = epc->so; int on = 1; - mutex_lock(&epc->so_mutex); - if ((so == NULL) || (so->so_count == 0)) { - mutex_unlock(&epc->so_mutex); - CTR5(KTR_IW_CXGBE, "%s:iso1 so %p, ep %p, state %s, tid %d", - __func__, so, epc, states[epc->state], - ((struct c4iw_ep *)epc)->hwtid); - return; - } + /* Note that SOCK_LOCK(so) is same as SOCKBUF_LOCK(&so->so_rcv) */ SOCK_LOCK(so); - soupcall_set(so, SO_RCV, c4iw_so_upcall, epc); + soupcall_set(so, SO_RCV, c4iw_so_upcall, arg); so->so_state |= SS_NBIO; SOCK_UNLOCK(so); sopt.sopt_dir = SOPT_SET; @@ -718,7 +618,15 @@ init_sock(struct c4iw_ep_common *epc) log(LOG_ERR, "%s: can't set TCP_NODELAY on so %p (%d)\n", __func__, so, rc); } - mutex_unlock(&epc->so_mutex); +} + +static void +uninit_iwarp_socket(struct socket *so) +{ + + SOCKBUF_LOCK(&so->so_rcv); + soupcall_clear(so, SO_RCV); + SOCKBUF_UNLOCK(&so->so_rcv); } static void @@ -759,18 +667,18 @@ process_data(struct c4iw_ep *ep) static void process_connected(struct c4iw_ep *ep) { + struct socket *so = ep->com.so; - if ((ep->com.so->so_state & SS_ISCONNECTED) && !ep->com.so->so_error) { + if ((so->so_state & SS_ISCONNECTED) && !so->so_error) { if (send_mpa_req(ep)) goto err; - } - else { - connect_reply_upcall(ep, -ep->com.so->so_error); + } else { + connect_reply_upcall(ep, -so->so_error); goto err; } return; err: - close_socket(&ep->com, 0); + close_socket(so); state_set(&ep->com, DEAD); c4iw_put_ep(&ep->com); return; @@ -785,23 +693,9 @@ process_newconn(struct iw_cm_id *parent_ struct c4iw_ep *parent_ep = parent_cm_id->provider_data; int ret = 0; - if (!child_so) { - CTR4(KTR_IW_CXGBE, - "%s: parent so %p, parent ep %p, child so %p, invalid so", - __func__, parent_ep->com.so, parent_ep, child_so); - log(LOG_ERR, "%s: invalid child socket\n", __func__); - return; - } - child_ep = alloc_ep(sizeof(*child_ep), M_NOWAIT); - if (!child_ep) { - CTR3(KTR_IW_CXGBE, "%s: parent so %p, parent ep %p, ENOMEM", - __func__, parent_ep->com.so, parent_ep); - log(LOG_ERR, "%s: failed to allocate ep entry\n", __func__); - return; - } - SOCKBUF_LOCK(&child_so->so_rcv); - soupcall_set(child_so, SO_RCV, c4iw_so_upcall, child_ep); - SOCKBUF_UNLOCK(&child_so->so_rcv); + MPASS(child_so != NULL); + + child_ep = alloc_ep(sizeof(*child_ep), M_WAITOK); CTR5(KTR_IW_CXGBE, "%s: parent so %p, parent ep %p, child so %p, child ep %p", @@ -821,6 +715,7 @@ process_newconn(struct iw_cm_id *parent_ free(local, M_SONAME); free(remote, M_SONAME); + init_iwarp_socket(child_so, &child_ep->com); c4iw_get_ep(&parent_ep->com); init_timer(&child_ep->timer); state_set(&child_ep->com, MPA_REQ_WAIT); @@ -1038,7 +933,6 @@ alloc_ep(int size, gfp_t gfp) kref_init(&epc->kref); mutex_init(&epc->mutex); - mutex_init(&epc->so_mutex); c4iw_init_wr_wait(&epc->wr_wait); return (epc); @@ -1359,30 +1253,47 @@ static void close_complete_upcall(struct CTR2(KTR_IW_CXGBE, "%s:ccuE %p", __func__, ep); } -static int send_abort(struct c4iw_ep *ep) +static int +send_abort(struct c4iw_ep *ep) { - int err; + struct socket *so = ep->com.so; + struct sockopt sopt; + int rc; + struct linger l; - CTR2(KTR_IW_CXGBE, "%s:abB %p", __func__, ep); - abort_socket(ep); + CTR5(KTR_IW_CXGBE, "%s ep %p so %p state %s tid %d", __func__, ep, so, + states[ep->com.state], ep->hwtid); - /* - * Since socket options were set as l_onoff=1 and l_linger=0 in in - * abort_socket, invoking soclose here sends a RST (reset) to the peer. - */ - err = close_socket(&ep->com, 1); + l.l_onoff = 1; + l.l_linger = 0; + + /* linger_time of 0 forces RST to be sent */ + sopt.sopt_dir = SOPT_SET; + sopt.sopt_level = SOL_SOCKET; + sopt.sopt_name = SO_LINGER; + sopt.sopt_val = (caddr_t)&l; + sopt.sopt_valsize = sizeof l; + sopt.sopt_td = NULL; + rc = sosetopt(so, &sopt); + if (rc != 0) { + log(LOG_ERR, "%s: sosetopt(%p, linger = 0) failed with %d.\n", + __func__, so, rc); + } + + uninit_iwarp_socket(so); + sodisconnect(so); set_bit(ABORT_CONN, &ep->com.history); - CTR2(KTR_IW_CXGBE, "%s:abE %p", __func__, ep); /* - * TBD: iw_cgbe driver should receive ABORT reply for every ABORT + * TBD: iw_cxgbe driver should receive ABORT reply for every ABORT * request it has sent. But the current TOE driver is not propagating * this ABORT reply event (via do_abort_rpl) to iw_cxgbe. So as a work- * around de-refer 'ep' (which was refered before sending ABORT request) * here instead of doing it in abort_rpl() handler of iw_cxgbe driver. */ c4iw_put_ep(&ep->com); - return err; + + return (0); } static void peer_close_upcall(struct c4iw_ep *ep) @@ -2213,7 +2124,6 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct c4iw_dev *dev = to_c4iw_dev(cm_id->device); struct c4iw_ep *ep = NULL; struct nhop4_extended nh4; - struct toedev *tdev; CTR2(KTR_IW_CXGBE, "%s:ccB %p", __func__, cm_id); @@ -2266,8 +2176,6 @@ int c4iw_connect(struct iw_cm_id *cm_id, ep->com.thread = curthread; ep->com.so = cm_id->so; - init_sock(&ep->com); - /* find a route */ err = find_route( cm_id->local_addr.sin_addr.s_addr, @@ -2283,22 +2191,11 @@ int c4iw_connect(struct iw_cm_id *cm_id, goto fail2; } - if (!(nh4.nh_ifp->if_capenable & IFCAP_TOE)) { - - CTR2(KTR_IW_CXGBE, "%s:cc8 %p", __func__, ep); - printf("%s - interface not TOE capable.\n", __func__); - close_socket(&ep->com, 0); + if (!(nh4.nh_ifp->if_capenable & IFCAP_TOE) || + TOEDEV(nh4.nh_ifp) == NULL) { err = -ENOPROTOOPT; goto fail3; } - tdev = TOEDEV(nh4.nh_ifp); - - if (tdev == NULL) { - - CTR2(KTR_IW_CXGBE, "%s:cc9 %p", __func__, ep); - printf("%s - No toedev for interface.\n", __func__); - goto fail3; - } fib4_free_nh_ext(RT_DEFAULT_FIB, &nh4); state_set(&ep->com, CONNECTING); @@ -2309,19 +2206,18 @@ int c4iw_connect(struct iw_cm_id *cm_id, ep->com.thread); if (!err) { - CTR2(KTR_IW_CXGBE, "%s:cca %p", __func__, ep); + init_iwarp_socket(cm_id->so, &ep->com); goto out; } else { - close_socket(&ep->com, 0); goto fail2; } fail3: - CTR2(KTR_IW_CXGBE, "%s:ccb %p", __func__, ep); fib4_free_nh_ext(RT_DEFAULT_FIB, &nh4); fail2: deref_cm_id(&ep->com); c4iw_put_ep(&ep->com); + ep = NULL; /* CTR shouldn't display already-freed ep. */ out: CTR2(KTR_IW_CXGBE, "%s:ccE %p", __func__, ep); return err; @@ -2465,7 +2361,7 @@ int c4iw_ep_disconnect(struct c4iw_ep *e if (!ep->parent_ep) __state_set(&ep->com, MORIBUND); - ret = shutdown_socket(&ep->com); + ret = sodisconnect(ep->com.so); } if (ret) { Modified: head/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h ============================================================================== --- head/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h Tue Feb 28 19:01:59 2017 (r314399) +++ head/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h Tue Feb 28 19:27:41 2017 (r314400) @@ -754,7 +754,6 @@ struct c4iw_ep_common { int rpl_done; struct thread *thread; struct socket *so; - struct mutex so_mutex; }; struct c4iw_listen_ep { Modified: head/sys/ofed/drivers/infiniband/core/cma.c ============================================================================== --- head/sys/ofed/drivers/infiniband/core/cma.c Tue Feb 28 19:01:59 2017 (r314399) +++ head/sys/ofed/drivers/infiniband/core/cma.c Tue Feb 28 19:27:41 2017 (r314400) @@ -1072,8 +1072,6 @@ static void cma_release_port(struct rdma kfree(bind_list); } mutex_unlock(&lock); - if (id_priv->sock) - sock_release(id_priv->sock); } static void cma_leave_mc_groups(struct rdma_id_private *id_priv) Modified: head/sys/ofed/drivers/infiniband/core/iwcm.c ============================================================================== --- head/sys/ofed/drivers/infiniband/core/iwcm.c Tue Feb 28 19:01:59 2017 (r314399) +++ head/sys/ofed/drivers/infiniband/core/iwcm.c Tue Feb 28 19:27:41 2017 (r314400) @@ -528,24 +528,15 @@ iw_init_sock(struct iw_cm_id *cm_id) } static int -iw_close_socket(struct iw_cm_id *cm_id, int close) +iw_uninit_socket(struct iw_cm_id *cm_id) { struct socket *so = cm_id->so; - int rc; - SOCK_LOCK(so); soupcall_clear(so, SO_RCV); SOCK_UNLOCK(so); - if (close) - rc = soclose(so); - else - rc = soshutdown(so, SHUT_WR | SHUT_RD); - - cm_id->so = NULL; - - return rc; + return (0); } static int @@ -554,18 +545,17 @@ iw_create_listen(struct iw_cm_id *cm_id, int rc; iw_init_sock(cm_id); - rc = solisten(cm_id->so, backlog, curthread); + rc = -solisten(cm_id->so, backlog, curthread); if (rc != 0) - iw_close_socket(cm_id, 0); - return rc; + iw_uninit_socket(cm_id); + return (rc); } static int iw_destroy_listen(struct iw_cm_id *cm_id) { - int rc; - rc = iw_close_socket(cm_id, 0); - return rc; + + return (iw_uninit_socket(cm_id)); } @@ -663,6 +653,9 @@ void iw_destroy_cm_id(struct iw_cm_id *c wait_for_completion(&cm_id_priv->destroy_comp); + if (cm_id->so) + sock_release(cm_id->so); + free_cm_id(cm_id_priv); } EXPORT_SYMBOL(iw_destroy_cm_id); From owner-svn-src-all@freebsd.org Tue Feb 28 19:32:46 2017 Return-Path: Delivered-To: svn-src-all@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 AE88FCF157D; Tue, 28 Feb 2017 19:32:46 +0000 (UTC) (envelope-from jhb@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 7E669136; Tue, 28 Feb 2017 19:32:46 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SJWj0x003556; Tue, 28 Feb 2017 19:32:45 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SJWjP8003555; Tue, 28 Feb 2017 19:32:45 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201702281932.v1SJWjP8003555@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Tue, 28 Feb 2017 19:32:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314401 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 19:32:46 -0000 Author: jhb Date: Tue Feb 28 19:32:45 2017 New Revision: 314401 URL: https://svnweb.freebsd.org/changeset/base/314401 Log: Don't remove ofwdump.8 on FreeBSD/mips. FreeBSD/mips has installed ofwdump by default since r288232. Sponsored by: DARPA / AFRL Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Tue Feb 28 19:27:41 2017 (r314400) +++ head/ObsoleteFiles.inc Tue Feb 28 19:32:45 2017 (r314401) @@ -8346,7 +8346,7 @@ OLD_FILES+=usr/share/man/man8/boot_i386. .endif .if ${TARGET_ARCH} != "aarch64" && ${TARGET} != "arm" && \ ${TARGET_ARCH} != "powerpc" && ${TARGET_ARCH} != "powerpc64" && \ - ${TARGET_ARCH} != "sparc64" + ${TARGET_ARCH} != "sparc64" && ${TARGET} != "mips" OLD_FILES+=usr/share/man/man8/ofwdump.8.gz .endif OLD_FILES+=usr/share/man/man8/mount_reiserfs.8.gz From owner-svn-src-all@freebsd.org Tue Feb 28 19:36:07 2017 Return-Path: Delivered-To: svn-src-all@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 6898BCF1648; Tue, 28 Feb 2017 19:36:07 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebi.us (glebi.us [96.95.210.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cell.glebi.us", Issuer "cell.glebi.us" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 3751E337; Tue, 28 Feb 2017 19:36:06 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebi.us (localhost [127.0.0.1]) by cell.glebi.us (8.15.2/8.15.2) with ESMTPS id v1SJa6BO016263 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 28 Feb 2017 11:36:06 -0800 (PST) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebi.us (8.15.2/8.15.2/Submit) id v1SJa5sw016262; Tue, 28 Feb 2017 11:36:05 -0800 (PST) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebi.us: glebius set sender to glebius@FreeBSD.org using -f Date: Tue, 28 Feb 2017 11:36:05 -0800 From: Gleb Smirnoff To: Ravi Pokala Cc: John Baldwin , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314373 - in head: . etc/defaults etc/rc.d lib/libc/regex share/man/man4/man4.i386 share/man/man5 sys/amd64/conf sys/boot/forth sys/compat/svr4 sys/conf sys/dev/streams sys/i386/conf sy... Message-ID: <20170228193605.GJ1044@FreeBSD.org> References: <201702280514.v1S5EhPq060885@repo.freebsd.org> <1969312.3TTRqhLH9r@ralph.baldwin.cx> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.7.2 (2016-11-26) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 19:36:07 -0000 Ravi, this should go into Relnotes, my failure that I didn't put the tag. I don't think this deserves UPDATING entry, since it doesn't require any action from a person who updates from sources. I don't think this requires __FreeBSD_version bump, since the latter is used to assist compilation of open source application that use changed API. The change removed support to run binaries. On Tue, Feb 28, 2017 at 10:57:57AM -0800, Ravi Pokala wrote: R> Shouldn't this also get an UPDATING entry, and/or a bump in __FreeBSD_version? R> R> -Ravi (rpokala@) R> R> -----Original Message----- R> > From: on behalf of John Baldwin R> > Date: 2017-02-28, Tuesday at 09:47 R> > To: Gleb Smirnoff R> > Cc: , , R> > Subject: Re: svn commit: r314373 - in head: . etc/defaults etc/rc.d lib/libc/regex share/man/man4/man4.i386 share/man/man5 sys/amd64/conf sys/boot/forth sys/compat/svr4 sys/conf sys/dev/streams sys/i386/conf sy... R> > R> > On Tuesday, February 28, 2017 05:14:43 AM Gleb Smirnoff wrote: R> >> Author: glebius R> >> Date: Tue Feb 28 05:14:42 2017 R> >> New Revision: 314373 R> >> URL: https://svnweb.freebsd.org/changeset/base/314373 R> >> R> >> Log: R> >> Remove SVR4 (System V Release 4) binary compatibility support. R> >> R> >> UNIX System V Release 4 is operating system released in 1988. It ceased R> >> to exist in early 2000-s. R> > R> > Thanks. Is there any socket code we kept just for streams support that R> > we can now remove as well? R> > R> > Also: 'Relnotes: yes' R> > R> > -- R> > John Baldwin R> R> R> -- Totus tuus, Glebius. From owner-svn-src-all@freebsd.org Tue Feb 28 19:39:14 2017 Return-Path: Delivered-To: svn-src-all@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 89E13CF1813; Tue, 28 Feb 2017 19:39:14 +0000 (UTC) (envelope-from bjkfbsd@gmail.com) Received: from mail-ot0-x22c.google.com (mail-ot0-x22c.google.com [IPv6:2607:f8b0:4003:c0f::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BD2585B; Tue, 28 Feb 2017 19:39:14 +0000 (UTC) (envelope-from bjkfbsd@gmail.com) Received: by mail-ot0-x22c.google.com with SMTP id x10so14990724otb.1; Tue, 28 Feb 2017 11:39:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=hearQpMXc+zh3USphvDF+oSsrQYzglAmypQblpWeGSo=; b=t60I98WmH8PHLx/N9Pa2/xvjQ6/PeJAMBRHaYwNfMnz9UecFwClM4Q+9f4SP0waenY S7Z8o1jORW0dgbqXkT3irlB0kRH93bcb+BY7cqw/adJbT8TDV08VR4ehBU6rJ4LTluDR O/jMbhjWVsAmnOzLiX3ixlx9ycvzEtW6ZfgZbqXJIeGZ87aVa1EuHXRSdM7/rdpgR24w 1QKBMs5e0XeKSVKbRBTgidcvpoDJXoFx79+X53jciGfVKxTh3cr1YMQkG0AAKFAo8zdh Ti45hfOmJWjkCru5mIw/AjiXtGzml96F929K7KWjczaxSdaSzCm5QYI3stk1nN6SFcmS qxDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=hearQpMXc+zh3USphvDF+oSsrQYzglAmypQblpWeGSo=; b=Xrv1mCF6233iyTDgURyolEfBn51605HN3mNgHkvAp7mvd9Xu/BU1Qz9D8t/3v2sx12 W+q/RHq1DCJGZuFdmyt3IGRnE9nKStU9mZCTH+0G20/giotRqRLTerA5G6uCN+Kvwy9x IUpbBo3+icobFsxAnaLl3LfKxPeFIwRPK+y5eCaa7PdXeKczDr/qfYnn26z7OnykyvU3 mmW9VuQEjs//nqUJWr8aSJTJ++Sq/YgNiT9Loz3aSpGdNXnFqcU/R0ya3+EaTQUak1Ho hYYlBSQQf2zXMJq9jF3S1F9wEHXlAIJnjto+rKlM+1r6wylsD2nlkoJ2XxDk//BYRg0O ey2Q== X-Gm-Message-State: AMke39moN4La6XNKW3Zh8awiySzrLChmZeOKo4bDlSqRuFlRZdTXzAPHzRM48OlOfDTgymFCzxuVnwisMIWQPA== X-Received: by 10.157.43.19 with SMTP id o19mr1867024otb.149.1488310753334; Tue, 28 Feb 2017 11:39:13 -0800 (PST) MIME-Version: 1.0 Received: by 10.182.88.138 with HTTP; Tue, 28 Feb 2017 11:39:12 -0800 (PST) In-Reply-To: <20170228193605.GJ1044@FreeBSD.org> References: <201702280514.v1S5EhPq060885@repo.freebsd.org> <1969312.3TTRqhLH9r@ralph.baldwin.cx> <20170228193605.GJ1044@FreeBSD.org> From: Benjamin Kaduk Date: Tue, 28 Feb 2017 13:39:12 -0600 Message-ID: Subject: Re: svn commit: r314373 - in head: . etc/defaults etc/rc.d lib/libc/regex share/man/man4/man4.i386 share/man/man5 sys/amd64/conf sys/boot/forth sys/compat/svr4 sys/conf sys/dev/streams sys/i386/conf sy... To: Gleb Smirnoff Cc: Ravi Pokala , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , John Baldwin Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 19:39:14 -0000 On Tue, Feb 28, 2017 at 1:36 PM, Gleb Smirnoff wrote: > Ravi, > > this should go into Relnotes, my failure that I didn't put the tag. > > I don't think this deserves UPDATING entry, since it doesn't require > any action from a person who updates from sources. > > I don't think this requires __FreeBSD_version bump, since the latter > is used to assist compilation of open source application that use > changed API. The change removed support to run binaries. > That is not the only use of __FreeBSD_version, which is (at least) exposed to the ports collection and can cause conditional changes in what are shipped by ports. Which is not to say that any current ports ship affected binaries, of course, but just to point out that the scope of the symbol is broader than stated. -Ben From owner-svn-src-all@freebsd.org Tue Feb 28 19:49:22 2017 Return-Path: Delivered-To: svn-src-all@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 A634DCF1ED3; Tue, 28 Feb 2017 19:49:22 +0000 (UTC) (envelope-from dchagin@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 75CDA214; Tue, 28 Feb 2017 19:49:22 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SJnLOA007714; Tue, 28 Feb 2017 19:49:21 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SJnLTC007713; Tue, 28 Feb 2017 19:49:21 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201702281949.v1SJnLTC007713@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Tue, 28 Feb 2017 19:49:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314402 - head/sys/compat/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 19:49:22 -0000 Author: dchagin Date: Tue Feb 28 19:49:21 2017 New Revision: 314402 URL: https://svnweb.freebsd.org/changeset/base/314402 Log: FreeBSD does not have analgue for epill EPOLLPRI event type. So, do not set EPOLLPRI event acidently. Also, do not set EPOLLWRNORM and EPOLLRDNORM events as epoll do not set this events. MFC after: 1 month Modified: head/sys/compat/linux/linux_event.c Modified: head/sys/compat/linux/linux_event.c ============================================================================== --- head/sys/compat/linux/linux_event.c Tue Feb 28 19:32:45 2017 (r314401) +++ head/sys/compat/linux/linux_event.c Tue Feb 28 19:49:21 2017 (r314402) @@ -357,14 +357,15 @@ kevent_to_epoll(struct kevent *kevent, s return; } + /* XXX EPOLLPRI, EPOLLHUP */ switch (kevent->filter) { case EVFILT_READ: - l_event->events = LINUX_EPOLLIN|LINUX_EPOLLRDNORM|LINUX_EPOLLPRI; + l_event->events = LINUX_EPOLLIN; if ((kevent->flags & EV_EOF) != 0) l_event->events |= LINUX_EPOLLRDHUP; break; case EVFILT_WRITE: - l_event->events = LINUX_EPOLLOUT|LINUX_EPOLLWRNORM; + l_event->events = LINUX_EPOLLOUT; break; } } From owner-svn-src-all@freebsd.org Tue Feb 28 19:54:23 2017 Return-Path: Delivered-To: svn-src-all@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 9FEDFCF214E; Tue, 28 Feb 2017 19:54:23 +0000 (UTC) (envelope-from dchagin@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 6F8E5AE8; Tue, 28 Feb 2017 19:54:23 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SJsMGs011751; Tue, 28 Feb 2017 19:54:22 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SJsMSV011750; Tue, 28 Feb 2017 19:54:22 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201702281954.v1SJsMSV011750@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Tue, 28 Feb 2017 19:54:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314403 - head/sys/compat/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 19:54:23 -0000 Author: dchagin Date: Tue Feb 28 19:54:22 2017 New Revision: 314403 URL: https://svnweb.freebsd.org/changeset/base/314403 Log: Linux epoll return ENOENT error in case when op is EPOLL_CTL_MOD or EPOLL_CTL_DEL, and fd is not registered with this epoll instance. MFC after: 1 month Modified: head/sys/compat/linux/linux_event.c Modified: head/sys/compat/linux/linux_event.c ============================================================================== --- head/sys/compat/linux/linux_event.c Tue Feb 28 19:49:21 2017 (r314402) +++ head/sys/compat/linux/linux_event.c Tue Feb 28 19:54:22 2017 (r314403) @@ -483,11 +483,6 @@ linux_epoll_ctl(struct thread *td, struc switch (args->op) { case LINUX_EPOLL_CTL_MOD: - /* - * We don't memorize which events were set for this FD - * on this level, so just delete all we could have set: - * EVFILT_READ and EVFILT_WRITE, ignoring any errors - */ error = epoll_delete_all_events(td, epfp, args->fd); if (error != 0) goto leave0; @@ -644,19 +639,11 @@ epoll_delete_event(struct thread *td, st struct kevent_copyops k_ops = { &ciargs, NULL, epoll_kev_copyin}; - int error; ciargs.changelist = &kev; EV_SET(&kev, fd, filter, EV_DELETE | EV_DISABLE, 0, 0, 0); - error = kern_kevent_fp(td, epfp, 1, 0, &k_ops, NULL); - - /* - * here we ignore ENONT, because we don't keep track of events here - */ - if (error == ENOENT) - error = 0; - return (error); + return (kern_kevent_fp(td, epfp, 1, 0, &k_ops, NULL)); } static int @@ -667,8 +654,8 @@ epoll_delete_all_events(struct thread *t error1 = epoll_delete_event(td, epfp, fd, EVFILT_READ); error2 = epoll_delete_event(td, epfp, fd, EVFILT_WRITE); - /* report any errors we got */ - return (error1 == 0 ? error2 : error1); + /* return 0 if at least one result positive */ + return (error1 == 0 ? 0 : error2); } static int From owner-svn-src-all@freebsd.org Tue Feb 28 19:55:18 2017 Return-Path: Delivered-To: svn-src-all@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 0960FCF21C1; Tue, 28 Feb 2017 19:55:18 +0000 (UTC) (envelope-from dchagin@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 CD1EDC42; Tue, 28 Feb 2017 19:55:17 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SJtGDn011859; Tue, 28 Feb 2017 19:55:16 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SJtGeG011858; Tue, 28 Feb 2017 19:55:16 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201702281955.v1SJtGeG011858@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Tue, 28 Feb 2017 19:55:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314404 - head/sys/compat/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 19:55:18 -0000 Author: dchagin Date: Tue Feb 28 19:55:16 2017 New Revision: 314404 URL: https://svnweb.freebsd.org/changeset/base/314404 Log: Linux epoll return EEXIST on case when op is EPOLL_CTL_ADD, and the supplied file descriptor fd is already registered with this epoll instance. MFC after: 1 month Modified: head/sys/compat/linux/linux_event.c Modified: head/sys/compat/linux/linux_event.c ============================================================================== --- head/sys/compat/linux/linux_event.c Tue Feb 28 19:54:22 2017 (r314403) +++ head/sys/compat/linux/linux_event.c Tue Feb 28 19:55:16 2017 (r314404) @@ -481,15 +481,34 @@ linux_epoll_ctl(struct thread *td, struc ciargs.changelist = kev; + if (args->op != LINUX_EPOLL_CTL_DEL) { + kev_flags = EV_ADD | EV_ENABLE; + error = epoll_to_kevent(td, epfp, args->fd, &le, + &kev_flags, kev, &nchanges); + if (error != 0) + goto leave0; + } + switch (args->op) { case LINUX_EPOLL_CTL_MOD: error = epoll_delete_all_events(td, epfp, args->fd); if (error != 0) goto leave0; - /* FALLTHROUGH */ + break; case LINUX_EPOLL_CTL_ADD: - kev_flags = EV_ADD | EV_ENABLE; + /* + * kqueue_register() return ENOENT if event does not exists + * and the EV_ADD flag is not set. + */ + kev[0].flags &= ~EV_ADD; + error = kqfd_register(args->epfd, &kev[0], td, 1); + if (error != ENOENT) { + error = EEXIST; + goto leave0; + } + error = 0; + kev[0].flags |= EV_ADD; break; case LINUX_EPOLL_CTL_DEL: @@ -502,11 +521,6 @@ linux_epoll_ctl(struct thread *td, struc goto leave0; } - error = epoll_to_kevent(td, epfp, args->fd, &le, &kev_flags, - kev, &nchanges); - if (error != 0) - goto leave0; - epoll_fd_install(td, args->fd, le.data); error = kern_kevent_fp(td, epfp, nchanges, 0, &k_ops, NULL); From owner-svn-src-all@freebsd.org Tue Feb 28 20:06:35 2017 Return-Path: Delivered-To: svn-src-all@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 50BCBCF263E; Tue, 28 Feb 2017 20:06:35 +0000 (UTC) (envelope-from jkim@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 E94D6828; Tue, 28 Feb 2017 20:06:34 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SK6YCh015937; Tue, 28 Feb 2017 20:06:34 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SK6V1v015913; Tue, 28 Feb 2017 20:06:31 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201702282006.v1SK6V1v015913@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Tue, 28 Feb 2017 20:06:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314405 - in vendor-sys/acpica/dist: . generate/unix/iasl source/common source/compiler source/components/debugger source/components/disassembler source/components/dispatcher source/com... X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 20:06:35 -0000 Author: jkim Date: Tue Feb 28 20:06:31 2017 New Revision: 314405 URL: https://svnweb.freebsd.org/changeset/base/314405 Log: Import ACPICA 20170224. Added: vendor-sys/acpica/dist/source/compiler/cvcompiler.c (contents, props changed) vendor-sys/acpica/dist/source/compiler/cvdisasm.c (contents, props changed) vendor-sys/acpica/dist/source/compiler/cvparser.c (contents, props changed) vendor-sys/acpica/dist/source/include/acconvert.h (contents, props changed) Modified: vendor-sys/acpica/dist/changes.txt vendor-sys/acpica/dist/generate/unix/iasl/Makefile vendor-sys/acpica/dist/source/common/adisasm.c vendor-sys/acpica/dist/source/common/adwalk.c vendor-sys/acpica/dist/source/common/dmextern.c vendor-sys/acpica/dist/source/common/dmtables.c vendor-sys/acpica/dist/source/common/dmtbinfo.c vendor-sys/acpica/dist/source/compiler/aslcodegen.c vendor-sys/acpica/dist/source/compiler/aslcompile.c vendor-sys/acpica/dist/source/compiler/aslcompiler.h vendor-sys/acpica/dist/source/compiler/aslcompiler.l vendor-sys/acpica/dist/source/compiler/asldebug.c vendor-sys/acpica/dist/source/compiler/asldefine.h vendor-sys/acpica/dist/source/compiler/aslfiles.c vendor-sys/acpica/dist/source/compiler/aslglobal.h vendor-sys/acpica/dist/source/compiler/aslhelp.c vendor-sys/acpica/dist/source/compiler/asllength.c vendor-sys/acpica/dist/source/compiler/aslmap.c vendor-sys/acpica/dist/source/compiler/asloffset.c vendor-sys/acpica/dist/source/compiler/asloperands.c vendor-sys/acpica/dist/source/compiler/asloptions.c vendor-sys/acpica/dist/source/compiler/aslprimaries.y vendor-sys/acpica/dist/source/compiler/aslprintf.c vendor-sys/acpica/dist/source/compiler/aslresources.y vendor-sys/acpica/dist/source/compiler/aslrules.y vendor-sys/acpica/dist/source/compiler/aslstartup.c vendor-sys/acpica/dist/source/compiler/aslsupport.l vendor-sys/acpica/dist/source/compiler/asltree.c vendor-sys/acpica/dist/source/compiler/asltypes.h vendor-sys/acpica/dist/source/compiler/aslwalks.c vendor-sys/acpica/dist/source/compiler/dttable1.c vendor-sys/acpica/dist/source/compiler/dttemplate.h vendor-sys/acpica/dist/source/components/debugger/dbmethod.c vendor-sys/acpica/dist/source/components/debugger/dbxface.c vendor-sys/acpica/dist/source/components/disassembler/dmcstyle.c vendor-sys/acpica/dist/source/components/disassembler/dmdeferred.c vendor-sys/acpica/dist/source/components/disassembler/dmnames.c vendor-sys/acpica/dist/source/components/disassembler/dmopcode.c vendor-sys/acpica/dist/source/components/disassembler/dmutils.c vendor-sys/acpica/dist/source/components/disassembler/dmwalk.c vendor-sys/acpica/dist/source/components/dispatcher/dscontrol.c vendor-sys/acpica/dist/source/components/dispatcher/dsmthdat.c vendor-sys/acpica/dist/source/components/dispatcher/dsobject.c vendor-sys/acpica/dist/source/components/dispatcher/dsopcode.c vendor-sys/acpica/dist/source/components/dispatcher/dsutils.c vendor-sys/acpica/dist/source/components/dispatcher/dswexec.c vendor-sys/acpica/dist/source/components/dispatcher/dswload2.c vendor-sys/acpica/dist/source/components/executer/exmisc.c vendor-sys/acpica/dist/source/components/executer/exnames.c vendor-sys/acpica/dist/source/components/executer/exoparg1.c vendor-sys/acpica/dist/source/components/executer/exoparg2.c vendor-sys/acpica/dist/source/components/executer/exoparg6.c vendor-sys/acpica/dist/source/components/executer/exresolv.c vendor-sys/acpica/dist/source/components/executer/exstore.c vendor-sys/acpica/dist/source/components/executer/exstoren.c vendor-sys/acpica/dist/source/components/hardware/hwvalid.c vendor-sys/acpica/dist/source/components/namespace/nsaccess.c vendor-sys/acpica/dist/source/components/namespace/nsrepair.c vendor-sys/acpica/dist/source/components/namespace/nsrepair2.c vendor-sys/acpica/dist/source/components/namespace/nsutils.c vendor-sys/acpica/dist/source/components/parser/psargs.c vendor-sys/acpica/dist/source/components/parser/psloop.c vendor-sys/acpica/dist/source/components/parser/psobject.c vendor-sys/acpica/dist/source/components/parser/psopcode.c vendor-sys/acpica/dist/source/components/parser/psopinfo.c vendor-sys/acpica/dist/source/components/parser/psparse.c vendor-sys/acpica/dist/source/components/parser/pstree.c vendor-sys/acpica/dist/source/components/parser/psutils.c vendor-sys/acpica/dist/source/components/utilities/utalloc.c vendor-sys/acpica/dist/source/components/utilities/utcache.c vendor-sys/acpica/dist/source/components/utilities/utdebug.c vendor-sys/acpica/dist/source/components/utilities/utresrc.c vendor-sys/acpica/dist/source/components/utilities/utxferror.c vendor-sys/acpica/dist/source/include/acconfig.h vendor-sys/acpica/dist/source/include/acdisasm.h vendor-sys/acpica/dist/source/include/acglobal.h vendor-sys/acpica/dist/source/include/aclocal.h vendor-sys/acpica/dist/source/include/acmacros.h vendor-sys/acpica/dist/source/include/acopcode.h vendor-sys/acpica/dist/source/include/acpixf.h vendor-sys/acpica/dist/source/include/actbl2.h vendor-sys/acpica/dist/source/include/amlcode.h vendor-sys/acpica/dist/source/tools/acpisrc/astable.c Modified: vendor-sys/acpica/dist/changes.txt ============================================================================== --- vendor-sys/acpica/dist/changes.txt Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/changes.txt Tue Feb 28 20:06:31 2017 (r314405) @@ -1,7 +1,68 @@ ---------------------------------------- +24 February 2017. Summary of changes for version 20170224: + + +1) ACPICA kernel-resident subsystem: + +Interpreter: Fixed two issues with the control method return value auto- +repair feature, where an attempt to double-delete an internal object +could result in an ACPICA warning (for _CID repair and others). No fault +occurs, however, because the attempted deletion (actually a release to an +internal cache) is detected and ignored via object poisoning. + +Debugger: Fixed an AML interpreter mutex issue during the single stepping +of control methods. If certain debugger commands are executed during +stepping, a mutex aquire/release error could occur. Lv Zheng. + +Fixed some issues generating ACPICA with the Intel C compiler by +restoring the original behavior and compiler-specific include file in +acenv.h. Lv Zheng. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. + + Current Release: + Non-Debug Version: 141.7K Code, 58.5K Data, 200.2K Total + Debug Version: 207.5K Code, 82.7K Data, 290.2K Total + Previous Release: + Non-Debug Version: 137.4K Code, 52.6K Data, 190.0K Total + Debug Version: 201.5K Code, 82.2K Data, 283.7K Total + + +2) iASL Compiler/Disassembler and Tools: + +iASL/Disassembler: A preliminary version of a new ASL-to-ASL+ conversion +tool has been designed, implemented, and included in this release. The +key feature of this utility is that the original comments within the +input ASL file are preserved during the conversion process, and included +within the converted ASL+ file -- thus creating a transparent conversion +of existing ASL files to ASL+ (ASL 2.0). Erik Schmauss. + + Usage: iasl -ca // Output is a .dsl file with +converted code + +iASL/Disassembler: Improved the detection and correct disassembly of +Switch/Case operators. This feature detects sequences of if/elseif/else +operators that originated from ASL Switch/Case/Default operators and +emits the original operators. David Box. + +iASL: Improved the IORT ACPI table support in the following areas. Lv +Zheng: + Clear MappingOffset if the MappingCount is zero. + Fix the disassembly of the SMMU GSU interrupt offset. + Update the template file for the IORT table. + +Disassembler: Enhanced the detection and disassembly of resource +template/descriptor within a Buffer object. An EndTag descriptor is now +required to have a zero second byte, since all known ASL compilers emit +this. This helps eliminate incorrect decisions when a buffer is +disassembled (false positives on resource templates). + +---------------------------------------- 19 January 2017. Summary of changes for version 20170119: -This release is available at https://acpica.org/downloads 1) General ACPICA software: Modified: vendor-sys/acpica/dist/generate/unix/iasl/Makefile ============================================================================== --- vendor-sys/acpica/dist/generate/unix/iasl/Makefile Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/generate/unix/iasl/Makefile Tue Feb 28 20:06:31 2017 (r314405) @@ -105,6 +105,9 @@ OBJECTS = \ $(OBJDIR)/aslwalks.o\ $(OBJDIR)/aslxref.o\ $(OBJDIR)/aslxrefout.o\ + $(OBJDIR)/cvcompiler.o\ + $(OBJDIR)/cvdisasm.o\ + $(OBJDIR)/cvparser.o\ $(OBJDIR)/cmfsize.o\ $(OBJDIR)/dbfileio.o\ $(OBJDIR)/dmbuffer.o\ Modified: vendor-sys/acpica/dist/source/common/adisasm.c ============================================================================== --- vendor-sys/acpica/dist/source/common/adisasm.c Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/common/adisasm.c Tue Feb 28 20:06:31 2017 (r314405) @@ -326,6 +326,21 @@ AdDisassembleOneTable ( ACPI_OWNER_ID OwnerId; +#ifdef ACPI_ASL_COMPILER + + /* + * For ASL-/ASL+ converter: replace the temporary "XXXX" + * table signature with the original. This "XXXX" makes + * it harder for the AML interpreter to run the badaml + * (.xxx) file produced from the converter in case if + * it fails to get deleted. + */ + if (Gbl_CaptureComments) + { + strncpy (Table->Signature, AcpiGbl_TableSig, 4); + } +#endif + /* ForceAmlDisassembly means to assume the table contains valid AML */ if (!AcpiGbl_ForceAmlDisassembly && !AcpiUtIsAmlTable (Table)) @@ -475,6 +490,7 @@ AdReparseOneTable ( ACPI_OWNER_ID OwnerId) { ACPI_STATUS Status; + ACPI_COMMENT_ADDR_NODE *AddrListHead; fprintf (stderr, @@ -508,6 +524,15 @@ AdReparseOneTable ( AcpiDmAddExternalsToNamespace (); + /* For -ca option: clear the list of comment addresses. */ + + while (AcpiGbl_CommentAddrListHead) + { + AddrListHead= AcpiGbl_CommentAddrListHead; + AcpiGbl_CommentAddrListHead = AcpiGbl_CommentAddrListHead->Next; + AcpiOsFree(AddrListHead); + } + /* Parse the table again. No need to reload it, however */ Status = AdParseTable (Table, NULL, FALSE, FALSE); Modified: vendor-sys/acpica/dist/source/common/adwalk.c ============================================================================== --- vendor-sys/acpica/dist/source/common/adwalk.c Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/common/adwalk.c Tue Feb 28 20:06:31 2017 (r314405) @@ -878,7 +878,7 @@ AcpiDmXrefDescendingOp ( * method. */ if (!(Op->Asl.Parent && - (Op->Asl.Parent->Asl.AmlOpcode == AML_COND_REF_OF_OP))) + (Op->Asl.Parent->Asl.AmlOpcode == AML_CONDITIONAL_REF_OF_OP))) { if (Node) { Modified: vendor-sys/acpica/dist/source/common/dmextern.c ============================================================================== --- vendor-sys/acpica/dist/source/common/dmextern.c Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/common/dmextern.c Tue Feb 28 20:06:31 2017 (r314405) @@ -1165,6 +1165,31 @@ AcpiDmEmitExternals ( /******************************************************************************* * + * FUNCTION: AcpiDmEmitExternal + * + * PARAMETERS: Op External Parse Object + * + * RETURN: None + * + * DESCRIPTION: Emit an External() ASL statement for the current External + * parse object + * + ******************************************************************************/ + +void +AcpiDmEmitExternal ( + ACPI_PARSE_OBJECT *NameOp, + ACPI_PARSE_OBJECT *TypeOp) +{ + AcpiOsPrintf ("External ("); + AcpiDmNamestring (NameOp->Common.Value.Name); + AcpiOsPrintf ("%s)\n", + AcpiDmGetObjectTypeName ((ACPI_OBJECT_TYPE) TypeOp->Common.Value.Integer)); +} + + +/******************************************************************************* + * * FUNCTION: AcpiDmUnresolvedWarning * * PARAMETERS: Type - Where to output the warning. Modified: vendor-sys/acpica/dist/source/common/dmtables.c ============================================================================== --- vendor-sys/acpica/dist/source/common/dmtables.c Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/common/dmtables.c Tue Feb 28 20:06:31 2017 (r314405) @@ -47,6 +47,8 @@ #include "actables.h" #include "acparser.h" #include "acapps.h" +#include "acmacros.h" +#include "acconvert.h" #define _COMPONENT ACPI_TOOLS @@ -202,6 +204,14 @@ AdCreateTableHeader ( AcpiOsPrintf (" */\n"); /* + * Print comments that come before this definition block. + */ + if (Gbl_CaptureComments) + { + ASL_CV_PRINT_ONE_COMMENT(AcpiGbl_ParseOpRoot,AML_COMMENT_STANDARD, NULL, 0); + } + + /* * Open the ASL definition block. * * Note: the AMLFilename string is left zero-length in order to just let @@ -388,6 +398,7 @@ AdParseTable ( AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER); AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER)); + ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength); /* Create the root object */ @@ -397,6 +408,17 @@ AdParseTable ( return (AE_NO_MEMORY); } +#ifdef ACPI_ASL_COMPILER + if (Gbl_CaptureComments) + { + AcpiGbl_ParseOpRoot->Common.CvFilename = AcpiGbl_FileTreeRoot->Filename; + } + else + { + AcpiGbl_ParseOpRoot->Common.CvFilename = NULL; + } +#endif + /* Create and initialize a new walk state */ WalkState = AcpiDsCreateWalkState (0, AcpiGbl_ParseOpRoot, NULL, NULL); Modified: vendor-sys/acpica/dist/source/common/dmtbinfo.c ============================================================================== --- vendor-sys/acpica/dist/source/common/dmtbinfo.c Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/common/dmtbinfo.c Tue Feb 28 20:06:31 2017 (r314405) @@ -171,6 +171,7 @@ #define ACPI_IORT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_IORT_NAMED_COMPONENT,f) #define ACPI_IORT2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_IORT_ROOT_COMPLEX,f) #define ACPI_IORT3_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_IORT_SMMU,f) +#define ACPI_IORT3A_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_IORT_SMMU_GSI,f) #define ACPI_IORT4_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_IORT_SMMU_V3,f) #define ACPI_IORTA_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_IORT_MEMORY_ACCESS,f) #define ACPI_IORTH_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_IORT_NODE,f) @@ -259,6 +260,7 @@ #define ACPI_GTDT0a_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_GTDT_TIMER_ENTRY,f,o) #define ACPI_GTDT1_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_GTDT_WATCHDOG,f,o) #define ACPI_IORT3_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_IORT_SMMU,f,o) +#define ACPI_IORT3a_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_IORT_SMMU_GSI,f,o) #define ACPI_IORT4_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_IORT_SMMU_V3,f,o) #define ACPI_IORTA_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_IORT_MEMORY_ACCESS,f,o) #define ACPI_IORTM_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_IORT_ID_MAPPING,f,o) @@ -1549,8 +1551,12 @@ ACPI_DMTABLE_INFO AcpiDmTableI ACPI_DMTABLE_INFO AcpiDmTableInfoIort3a[] = { - {ACPI_DMT_UINT64, 0, "SMMU_NSgIrpt Interrupt", 0}, - {ACPI_DMT_UINT64, 0, "SMMU_NSgCfgIrpt Interrupt", 0}, + {ACPI_DMT_UINT32, ACPI_IORT3A_OFFSET (NSgIrpt), "NSgIrpt", 0}, + {ACPI_DMT_UINT32, ACPI_IORT3A_OFFSET (NSgIrptFlags), "NSgIrpt Flags (decoded below)", 0}, + {ACPI_DMT_FLAG0, ACPI_IORT3a_FLAG_OFFSET (NSgIrptFlags, 0), "Edge Triggered", 0}, + {ACPI_DMT_UINT32, ACPI_IORT3A_OFFSET (NSgCfgIrpt), "NSgCfgIrpt", 0}, + {ACPI_DMT_UINT32, ACPI_IORT3A_OFFSET (NSgCfgIrptFlags), "NSgCfgIrpt Flags (decoded below)", 0}, + {ACPI_DMT_FLAG0, ACPI_IORT3a_FLAG_OFFSET (NSgCfgIrptFlags, 0), "Edge Triggered", 0}, ACPI_DMT_TERMINATOR }; Modified: vendor-sys/acpica/dist/source/compiler/aslcodegen.c ============================================================================== --- vendor-sys/acpica/dist/source/compiler/aslcodegen.c Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/compiler/aslcodegen.c Tue Feb 28 20:06:31 2017 (r314405) @@ -44,6 +44,7 @@ #include "aslcompiler.h" #include "aslcompiler.y.h" #include "amlcode.h" +#include "acconvert.h" #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslcodegen") @@ -57,12 +58,6 @@ CgAmlWriteWalk ( void *Context); static void -CgLocalWriteAmlData ( - ACPI_PARSE_OBJECT *Op, - void *Buffer, - UINT32 Length); - -static void CgWriteAmlOpcode ( ACPI_PARSE_OBJECT *Op); @@ -206,7 +201,7 @@ CgAmlWriteWalk ( * ******************************************************************************/ -static void +void CgLocalWriteAmlData ( ACPI_PARSE_OBJECT *Op, void *Buffer, @@ -261,6 +256,15 @@ CgWriteAmlOpcode ( return; } + /* + * Before printing the bytecode, generate comment byte codes + * associated with this node. + */ + if (Gbl_CaptureComments) + { + CgWriteAmlComment(Op); + } + switch (Op->Asl.AmlOpcode) { case AML_UNASSIGNED_OPCODE: @@ -416,6 +420,8 @@ CgWriteTableHeader ( ACPI_PARSE_OBJECT *Op) { ACPI_PARSE_OBJECT *Child; + UINT32 CommentLength; + ACPI_COMMENT_NODE *Current; /* AML filename */ @@ -425,6 +431,21 @@ CgWriteTableHeader ( /* Signature */ Child = Child->Asl.Next; + + /* + * For ASL-/ASL+ converter: replace the table signature with + * "XXXX" and save the original table signature. This results in an AML + * file with the signature "XXXX". The converter should remove this AML + * file. In the event where this AML file does not get deleted, the + * "XXXX" table signature prevents this AML file from running on the AML + * interpreter. + */ + if (Gbl_CaptureComments) + { + strncpy(AcpiGbl_TableSig, Child->Asl.Value.String, 4); + Child->Asl.Value.String = ACPI_SIG_XXXX; + } + strncpy (TableHeader.Signature, Child->Asl.Value.String, 4); /* Revision */ @@ -466,6 +487,50 @@ CgWriteTableHeader ( TableHeader.Length = sizeof (ACPI_TABLE_HEADER) + Op->Asl.AmlSubtreeLength; + + /* Calculate the comment lengths for this definition block parseOp */ + + if (Gbl_CaptureComments) + { + CvDbgPrint ("Calculating comment lengths for %s in write header\n", + Op->Asl.ParseOpName); + + /* + * Take the filename without extensions, add 3 for the new extension + * and another 3 for the a908 bytecode and null terminator. + */ + TableHeader.Length += strrchr (Gbl_ParseTreeRoot->Asl.Filename, '.') + - Gbl_ParseTreeRoot->Asl.Filename + 1 + 3 + 3; + Op->Asl.AmlSubtreeLength += + strlen (Gbl_ParseTreeRoot->Asl.Filename) + 3; + CvDbgPrint (" Length: %lu\n", + strlen (Gbl_ParseTreeRoot->Asl.Filename) + 3); + + if (Op->Asl.CommentList) + { + Current = Op->Asl.CommentList; + while (Current) + { + CommentLength = strlen (Current->Comment)+3; + CvDbgPrint ("Length of standard comment): %d\n", CommentLength); + CvDbgPrint (" Comment string: %s\n\n", Current->Comment); + TableHeader.Length += CommentLength; + Op->Asl.AmlSubtreeLength += CommentLength; + Current = Current->Next; + CvDbgPrint (" Length: %u\n", CommentLength); + } + } + if (Op->Asl.CloseBraceComment) + { + CommentLength = strlen (Op->Asl.CloseBraceComment)+3; + CvDbgPrint ("Length of inline comment +3: %d\n", CommentLength); + CvDbgPrint (" Comment string: %s\n\n", Op->Asl.CloseBraceComment); + TableHeader.Length += CommentLength; + Op->Asl.AmlSubtreeLength += CommentLength; + CvDbgPrint (" Length: %u\n", CommentLength); + } + } + TableHeader.Checksum = 0; Op->Asl.FinalAmlOffset = ftell (Gbl_Files[ASL_FILE_AML_OUTPUT].Handle); @@ -492,13 +557,13 @@ CgWriteTableHeader ( static void CgUpdateHeader ( - ACPI_PARSE_OBJECT *Op) + ACPI_PARSE_OBJECT *Op) { - signed char Sum; - UINT32 i; - UINT32 Length; - UINT8 FileByte; - UINT8 Checksum; + signed char Sum; + UINT32 i; + UINT32 Length; + UINT8 FileByte; + UINT8 Checksum; /* Calculate the checksum over the entire definition block */ @@ -580,6 +645,12 @@ CgWriteNode ( ASL_RESOURCE_NODE *Rnode; + /* Write all comments here. */ + if (Gbl_CaptureComments) + { + CgWriteAmlComment(Op); + } + /* Always check for DEFAULT_ARG and other "Noop" nodes */ /* TBD: this may not be the best place for this check */ @@ -641,6 +712,10 @@ CgWriteNode ( case PARSEOP_DEFINITION_BLOCK: CgWriteTableHeader (Op); + if (Gbl_CaptureComments) + { + CgWriteAmlDefBlockComment (Op); + } break; case PARSEOP_NAMESEG: Modified: vendor-sys/acpica/dist/source/compiler/aslcompile.c ============================================================================== --- vendor-sys/acpica/dist/source/compiler/aslcompile.c Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/compiler/aslcompile.c Tue Feb 28 20:06:31 2017 (r314405) @@ -285,8 +285,17 @@ CmDoCompile ( { Event = UtBeginEvent ("Resolve all Externals"); DbgPrint (ASL_DEBUG_OUTPUT, "\nResolve Externals\n\n"); - TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_TWICE, - ExAmlExternalWalkBegin, ExAmlExternalWalkEnd, NULL); + + if (Gbl_DoExternalsInPlace) + { + TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_DOWNWARD, + ExAmlExternalWalkBegin, NULL, NULL); + } + else + { + TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_TWICE, + ExAmlExternalWalkBegin, ExAmlExternalWalkEnd, NULL); + } UtEndEvent (Event); } @@ -347,6 +356,18 @@ CmDoCompile ( NULL, &AnalysisWalkInfo); UtEndEvent (Event); + /* + * ASL-/ASL+ converter: Gbl_ParseTreeRoot->CommentList contains the + * very last comment of a given ASL file because it's the last constructed + * node during compilation. We take the very last comment and save it in a + * global for it to be used by the disassembler. + */ + if (Gbl_CaptureComments) + { + AcpiGbl_LastListHead = Gbl_ParseTreeRoot->Asl.CommentList; + Gbl_ParseTreeRoot->Asl.CommentList = NULL; + } + /* Calculate all AML package lengths */ Event = UtBeginEvent ("Finish AML package length generation"); @@ -800,7 +821,11 @@ CmCleanupAndExit ( /* Final cleanup after compiling one file */ - CmDeleteCaches (); + if (!Gbl_DoAslConversion) + { + CmDeleteCaches (); + } + } Modified: vendor-sys/acpica/dist/source/compiler/aslcompiler.h ============================================================================== --- vendor-sys/acpica/dist/source/compiler/aslcompiler.h Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/compiler/aslcompiler.h Tue Feb 28 20:06:31 2017 (r314405) @@ -576,6 +576,12 @@ void CgGenerateAmlOutput ( void); +void +CgLocalWriteAmlData ( + ACPI_PARSE_OBJECT *Op, + void *Buffer, + UINT32 Length); + /* * aslfile @@ -1359,4 +1365,14 @@ ACPI_STATUS DtCreateTemplates ( char **argv); + +/* + * ASL/ASL+ converter debug + */ +void +CvDbgPrint ( + char *Fmt, + ...); + + #endif /* __ASLCOMPILER_H */ Modified: vendor-sys/acpica/dist/source/compiler/aslcompiler.l ============================================================================== --- vendor-sys/acpica/dist/source/compiler/aslcompiler.l Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/compiler/aslcompiler.l Tue Feb 28 20:06:31 2017 (r314405) @@ -44,6 +44,7 @@ #include "aslcompiler.h" #include "aslcompiler.y.h" +#include "acconvert.h" #include #include @@ -66,10 +67,10 @@ YYSTYPE AslCompilerlval; static void AslDoLineDirective (void); -static char +static BOOLEAN AslDoComment (void); -static char +static BOOLEAN AslDoCommentType2 (void); static char Modified: vendor-sys/acpica/dist/source/compiler/asldebug.c ============================================================================== --- vendor-sys/acpica/dist/source/compiler/asldebug.c Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/compiler/asldebug.c Tue Feb 28 20:06:31 2017 (r314405) @@ -60,6 +60,40 @@ UtDumpParseOpName ( /******************************************************************************* * + * FUNCTION: CvDbgPrint + * + * PARAMETERS: Type - Type of output + * Fmt - Printf format string + * ... - variable printf list + * + * RETURN: None + * + * DESCRIPTION: Print statement for debug messages within the converter. + * + ******************************************************************************/ + +void +CvDbgPrint ( + char *Fmt, + ...) +{ + va_list Args; + + + if (!Gbl_CaptureComments || !AcpiGbl_DebugAslConversion) + { + return; + } + + va_start (Args, Fmt); + (void) vfprintf (AcpiGbl_ConvDebugFile, Fmt, Args); + va_end (Args); + return; +} + + +/******************************************************************************* + * * FUNCTION: UtDumpIntegerOp * * PARAMETERS: Op - Current parse op Modified: vendor-sys/acpica/dist/source/compiler/asldefine.h ============================================================================== --- vendor-sys/acpica/dist/source/compiler/asldefine.h Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/compiler/asldefine.h Tue Feb 28 20:06:31 2017 (r314405) @@ -159,7 +159,6 @@ /* * Macros for debug output */ - #define DEBUG_MAX_LINE_LENGTH 61 #define DEBUG_SPACES_PER_INDENT 3 #define DEBUG_FULL_LINE_LENGTH 71 @@ -185,4 +184,11 @@ " %08X %04X %04X %01X %04X %04X %05X %05X "\ "%08X %08X %08X %08X %08X %08X %04X %02d %5d %5d %5d %5d\n" +/* + * Macros for ASL/ASL+ converter + */ +#define COMMENT_CAPTURE_ON Gbl_CommentState.CaptureComments = TRUE; +#define COMMENT_CAPTURE_OFF Gbl_CommentState.CaptureComments = FALSE; + + #endif /* ASLDEFINE.H */ Modified: vendor-sys/acpica/dist/source/compiler/aslfiles.c ============================================================================== --- vendor-sys/acpica/dist/source/compiler/aslfiles.c Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/compiler/aslfiles.c Tue Feb 28 20:06:31 2017 (r314405) @@ -511,8 +511,14 @@ FlOpenAmlOutputFile ( if (!Filename) { /* Create the output AML filename */ - - Filename = FlGenerateFilename (FilenamePrefix, FILE_SUFFIX_AML_CODE); + if (!Gbl_CaptureComments) + { + Filename = FlGenerateFilename (FilenamePrefix, FILE_SUFFIX_AML_CODE); + } + else + { + Filename = FlGenerateFilename (FilenamePrefix, FILE_SUFFIX_CONVERT_AML); + } if (!Filename) { AslCommonError (ASL_ERROR, ASL_MSG_OUTPUT_FILENAME, @@ -854,6 +860,28 @@ FlOpenMiscOutputFiles ( AslCompilerFileHeader (ASL_FILE_NAMESPACE_OUTPUT); } + /* Create a debug file for the converter */ + + if (AcpiGbl_DebugAslConversion) + { + Filename = FlGenerateFilename (FilenamePrefix, FILE_SUFFIX_CONVERT_DEBUG); + if (!Filename) + { + AslCommonError (ASL_ERROR, ASL_MSG_LISTING_FILENAME, + 0, 0, 0, 0, NULL, NULL); + return (AE_ERROR); + } + + /* Open the converter debug file, text mode */ + + FlOpenFile (ASL_FILE_CONV_DEBUG_OUTPUT, Filename, "w+t"); + + AslCompilerSignon (ASL_FILE_CONV_DEBUG_OUTPUT); + AslCompilerFileHeader (ASL_FILE_CONV_DEBUG_OUTPUT); + + AcpiGbl_ConvDebugFile = Gbl_Files[ASL_FILE_CONV_DEBUG_OUTPUT].Handle; + } + return (AE_OK); } Modified: vendor-sys/acpica/dist/source/compiler/aslglobal.h ============================================================================== --- vendor-sys/acpica/dist/source/compiler/aslglobal.h Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/compiler/aslglobal.h Tue Feb 28 20:06:31 2017 (r314405) @@ -84,7 +84,8 @@ ASL_FILE_INFO Gbl_ {NULL, NULL, "C Include: ", "C Header Output"}, {NULL, NULL, "Offset Table: ", "C Offset Table Output"}, {NULL, NULL, "Device Map: ", "Device Map Output"}, - {NULL, NULL, "Cross Ref: ", "Cross-reference Output"} + {NULL, NULL, "Cross Ref: ", "Cross-reference Output"}, + {NULL, NULL, "Converter db :", "Converter debug Output"} }; #else @@ -113,7 +114,7 @@ extern int AslCompilerd #define ASL_DEFAULT_LINE_BUFFER_SIZE (1024 * 32) /* 32K */ -#define ASL_MSG_BUFFER_SIZE 4096 +#define ASL_MSG_BUFFER_SIZE (1024 * 32) /* 32k */ #define ASL_MAX_DISABLED_MESSAGES 32 #define HEX_TABLE_LINE_SIZE 8 #define HEX_LISTING_LINE_SIZE 8 @@ -182,6 +183,9 @@ ASL_EXTERN BOOLEAN ASL_ ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_DoTypechecking, TRUE); ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_EnableReferenceTypechecking, FALSE); ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_DoExternals, TRUE); +ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_DoExternalsInPlace, FALSE); +ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_DoAslConversion, FALSE); +ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_OptimizeTrivialParseNodes, TRUE); #define HEX_OUTPUT_NONE 0 @@ -265,6 +269,20 @@ ASL_EXTERN char ASL_ ASL_EXTERN UINT8 ASL_INIT_GLOBAL (Gbl_PruneDepth, 0); ASL_EXTERN UINT16 ASL_INIT_GLOBAL (Gbl_PruneType, 0); +ASL_EXTERN ASL_FILE_NODE ASL_INIT_GLOBAL (*Gbl_IncludeFileStack, NULL); + +/* Specific to the -q option */ + +ASL_EXTERN ASL_COMMENT_STATE Gbl_CommentState; + + +/* + * Determines if an inline comment should be saved in the InlineComment or NodeEndComment + * field of ACPI_PARSE_OBJECT. + */ +ASL_EXTERN ACPI_COMMENT_NODE ASL_INIT_GLOBAL (*Gbl_Comment_List_Head, NULL); +ASL_EXTERN ACPI_COMMENT_NODE ASL_INIT_GLOBAL (*Gbl_Comment_List_Tail, NULL); +ASL_EXTERN char ASL_INIT_GLOBAL (*Gbl_Inline_Comment_Buffer, NULL); /* Static structures */ Modified: vendor-sys/acpica/dist/source/compiler/aslhelp.c ============================================================================== --- vendor-sys/acpica/dist/source/compiler/aslhelp.c Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/compiler/aslhelp.c Tue Feb 28 20:06:31 2017 (r314405) @@ -69,9 +69,10 @@ Usage ( ACPI_USAGE_HEADER ("iasl [Options] [Files]"); printf ("\nGeneral:\n"); - ACPI_OPTION ("-@ ", "Specify command file"); - ACPI_OPTION ("-I ", "Specify additional include directory"); - ACPI_OPTION ("-p ", "Specify path/filename prefix for all output files"); + ACPI_OPTION ("-@ ", "Specify command file"); + ACPI_OPTION ("-I ", "Specify additional include directory"); + ACPI_OPTION ("-p ", "Specify path/filename prefix for all output files"); + ACPI_OPTION ("-ca ", "convert a given ASL file to ASL+ (retains comments)"); ACPI_OPTION ("-v", "Display compiler version"); ACPI_OPTION ("-vd", "Display compiler build date and time"); ACPI_OPTION ("-vo", "Enable optimization comments"); @@ -153,6 +154,7 @@ Usage ( ACPI_OPTION ("-vt", "Dump binary table data in hex format within output file"); printf ("\nDebug Options:\n"); + ACPI_OPTION ("-bc", "Create converter debug file (*.cdb)"); ACPI_OPTION ("-bf", "Create debug file (full output) (*.txt)"); ACPI_OPTION ("-bs", "Create debug file (parse tree only) (*.txt)"); ACPI_OPTION ("-bp ", "Prune ASL parse tree"); Modified: vendor-sys/acpica/dist/source/compiler/asllength.c ============================================================================== --- vendor-sys/acpica/dist/source/compiler/asllength.c Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/compiler/asllength.c Tue Feb 28 20:06:31 2017 (r314405) @@ -44,6 +44,7 @@ #include "aslcompiler.h" #include "aslcompiler.y.h" #include "amlcode.h" +#include "acconvert.h" #define _COMPONENT ACPI_COMPILER @@ -136,7 +137,9 @@ LnPackageLengthWalk ( Op->Asl.AmlLength + Op->Asl.AmlOpcodeLength + Op->Asl.AmlPkgLenBytes + - Op->Asl.AmlSubtreeLength); + Op->Asl.AmlSubtreeLength + + CvCalculateCommentLengths (Op) + ); } return (AE_OK); } Modified: vendor-sys/acpica/dist/source/compiler/aslmap.c ============================================================================== --- vendor-sys/acpica/dist/source/compiler/aslmap.c Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/compiler/aslmap.c Tue Feb 28 20:06:31 2017 (r314405) @@ -166,7 +166,7 @@ const ASL_MAPPING_ENTRY AslKeywordMa /* BITSPERBYTE_SEVEN */ OP_TABLE_ENTRY (AML_BYTE_OP, 2, 0, 0), /* BITSPERBYTE_SIX */ OP_TABLE_ENTRY (AML_BYTE_OP, 1, 0, 0), /* BREAK */ OP_TABLE_ENTRY (AML_BREAK_OP, 0, 0, 0), -/* BREAKPOINT */ OP_TABLE_ENTRY (AML_BREAK_POINT_OP, 0, 0, 0), +/* BREAKPOINT */ OP_TABLE_ENTRY (AML_BREAKPOINT_OP, 0, 0, 0), /* BUFFER */ OP_TABLE_ENTRY (AML_BUFFER_OP, 0, NODE_AML_PACKAGE, ACPI_BTYPE_BUFFER), /* BUSMASTERTYPE_MASTER */ OP_TABLE_ENTRY (AML_BYTE_OP, 1, 0, 0), /* BUSMASTERTYPE_NOTMASTER */ OP_TABLE_ENTRY (AML_BYTE_OP, 0, 0, 0), @@ -176,12 +176,12 @@ const ASL_MAPPING_ENTRY AslKeywordMa /* CLOCKPHASE_SECOND */ OP_TABLE_ENTRY (AML_BYTE_OP, 1, 0, 0), /* CLOCKPOLARITY_HIGH */ OP_TABLE_ENTRY (AML_BYTE_OP, 1, 0, 0), /* CLOCKPOLARITY_LOW */ OP_TABLE_ENTRY (AML_BYTE_OP, 0, 0, 0), -/* CONCATENATE */ OP_TABLE_ENTRY (AML_CONCAT_OP, 0, 0, ACPI_BTYPE_COMPUTE_DATA), -/* CONCATENATERESTEMPLATE */ OP_TABLE_ENTRY (AML_CONCAT_RES_OP, 0, 0, ACPI_BTYPE_BUFFER), -/* CONDREFOF */ OP_TABLE_ENTRY (AML_COND_REF_OF_OP, 0, 0, ACPI_BTYPE_INTEGER), +/* CONCATENATE */ OP_TABLE_ENTRY (AML_CONCATENATE_OP, 0, 0, ACPI_BTYPE_COMPUTE_DATA), +/* CONCATENATERESTEMPLATE */ OP_TABLE_ENTRY (AML_CONCATENATE_TEMPLATE_OP,0, 0, ACPI_BTYPE_BUFFER), +/* CONDREFOF */ OP_TABLE_ENTRY (AML_CONDITIONAL_REF_OF_OP, 0, 0, ACPI_BTYPE_INTEGER), /* CONNECTION */ OP_TABLE_ENTRY (AML_INT_CONNECTION_OP, 0, 0, 0), /* CONTINUE */ OP_TABLE_ENTRY (AML_CONTINUE_OP, 0, 0, 0), -/* COPY */ OP_TABLE_ENTRY (AML_COPY_OP, 0, 0, ACPI_BTYPE_DATA_REFERENCE), +/* COPYOBJECT */ OP_TABLE_ENTRY (AML_COPY_OBJECT_OP, 0, 0, ACPI_BTYPE_DATA_REFERENCE), /* CREATEBITFIELD */ OP_TABLE_ENTRY (AML_CREATE_BIT_FIELD_OP, 0, 0, 0), /* CREATEBYTEFIELD */ OP_TABLE_ENTRY (AML_CREATE_BYTE_FIELD_OP, 0, 0, 0), /* CREATEDWORDFIELD */ OP_TABLE_ENTRY (AML_CREATE_DWORD_FIELD_OP, 0, 0, 0), @@ -261,14 +261,14 @@ const ASL_MAPPING_ENTRY AslKeywordMa /* IORESTRICT_PRESERVE */ OP_TABLE_ENTRY (AML_BYTE_OP, 3, 0, 0), /* IRQ */ OP_TABLE_ENTRY (AML_DEFAULT_ARG_OP, 0, 0, 0), /* IRQNOFLAGS */ OP_TABLE_ENTRY (AML_DEFAULT_ARG_OP, 0, 0, 0), -/* LAND */ OP_TABLE_ENTRY (AML_LAND_OP, 0, 0, ACPI_BTYPE_INTEGER), -/* LEQUAL */ OP_TABLE_ENTRY (AML_LEQUAL_OP, 0, 0, ACPI_BTYPE_INTEGER), -/* LGREATER */ OP_TABLE_ENTRY (AML_LGREATER_OP, 0, 0, ACPI_BTYPE_INTEGER), -/* LGREATEREQUAL */ OP_TABLE_ENTRY (AML_LGREATEREQUAL_OP, 0, 0, ACPI_BTYPE_INTEGER), -/* LLESS */ OP_TABLE_ENTRY (AML_LLESS_OP, 0, 0, ACPI_BTYPE_INTEGER), -/* LLESSEQUAL */ OP_TABLE_ENTRY (AML_LLESSEQUAL_OP, 0, 0, ACPI_BTYPE_INTEGER), -/* LNOT */ OP_TABLE_ENTRY (AML_LNOT_OP, 0, 0, ACPI_BTYPE_INTEGER), -/* LNOTEQUAL */ OP_TABLE_ENTRY (AML_LNOTEQUAL_OP, 0, 0, ACPI_BTYPE_INTEGER), +/* LAND */ OP_TABLE_ENTRY (AML_LOGICAL_AND_OP, 0, 0, ACPI_BTYPE_INTEGER), +/* LEQUAL */ OP_TABLE_ENTRY (AML_LOGICAL_EQUAL_OP, 0, 0, ACPI_BTYPE_INTEGER), +/* LGREATER */ OP_TABLE_ENTRY (AML_LOGICAL_GREATER_OP, 0, 0, ACPI_BTYPE_INTEGER), +/* LGREATEREQUAL */ OP_TABLE_ENTRY (AML_LOGICAL_GREATER_EQUAL_OP,0, 0, ACPI_BTYPE_INTEGER), +/* LLESS */ OP_TABLE_ENTRY (AML_LOGICAL_LESS_OP, 0, 0, ACPI_BTYPE_INTEGER), +/* LLESSEQUAL */ OP_TABLE_ENTRY (AML_LOGICAL_LESS_EQUAL_OP, 0, 0, ACPI_BTYPE_INTEGER), +/* LNOT */ OP_TABLE_ENTRY (AML_LOGICAL_NOT_OP, 0, 0, ACPI_BTYPE_INTEGER), +/* LNOTEQUAL */ OP_TABLE_ENTRY (AML_LOGICAL_NOT_EQUAL_OP, 0, 0, ACPI_BTYPE_INTEGER), /* LOAD */ OP_TABLE_ENTRY (AML_LOAD_OP, 0, 0, 0), /* LOADTABLE */ OP_TABLE_ENTRY (AML_LOAD_TABLE_OP, 0, 0, ACPI_BTYPE_DDB_HANDLE), /* LOCAL0 */ OP_TABLE_ENTRY (AML_LOCAL0, 0, 0, ACPI_BTYPE_OBJECTS_AND_REFS), @@ -281,7 +281,7 @@ const ASL_MAPPING_ENTRY AslKeywordMa /* LOCAL7 */ OP_TABLE_ENTRY (AML_LOCAL7, 0, 0, ACPI_BTYPE_OBJECTS_AND_REFS), /* LOCKRULE_LOCK */ OP_TABLE_ENTRY (AML_BYTE_OP, AML_FIELD_LOCK_ALWAYS, 0, 0), /* LOCKRULE_NOLOCK */ OP_TABLE_ENTRY (AML_BYTE_OP, AML_FIELD_LOCK_NEVER, 0, 0), -/* LOR */ OP_TABLE_ENTRY (AML_LOR_OP, 0, 0, ACPI_BTYPE_INTEGER), +/* LOR */ OP_TABLE_ENTRY (AML_LOGICAL_OR_OP, 0, 0, ACPI_BTYPE_INTEGER), /* MATCH */ OP_TABLE_ENTRY (AML_MATCH_OP, 0, 0, ACPI_BTYPE_INTEGER), /* MATCHTYPE_MEQ */ OP_TABLE_ENTRY (AML_RAW_DATA_BYTE, MATCH_MEQ, 0, ACPI_BTYPE_INTEGER), /* MATCHTYPE_MGE */ OP_TABLE_ENTRY (AML_RAW_DATA_BYTE, MATCH_MGE, 0, ACPI_BTYPE_INTEGER), @@ -347,7 +347,7 @@ const ASL_MAPPING_ENTRY AslKeywordMa /* PIN_PULLDEFAULT */ OP_TABLE_ENTRY (AML_BYTE_OP, 0, 0, 0), /* PIN_PULLDOWN */ OP_TABLE_ENTRY (AML_BYTE_OP, 2, 0, 0), /* PIN_PULLUP */ OP_TABLE_ENTRY (AML_BYTE_OP, 1, 0, 0), -/* POWERRESOURCE */ OP_TABLE_ENTRY (AML_POWER_RES_OP, 0, NODE_AML_PACKAGE, 0), +/* POWERRESOURCE */ OP_TABLE_ENTRY (AML_POWER_RESOURCE_OP, 0, NODE_AML_PACKAGE, 0), /* PROCESSOR */ OP_TABLE_ENTRY (AML_PROCESSOR_OP, 0, NODE_AML_PACKAGE, 0), /* QWORDCONST */ OP_TABLE_ENTRY (AML_RAW_DATA_QWORD, 0, 0, ACPI_BTYPE_INTEGER), /* QWORDIO */ OP_TABLE_ENTRY (AML_BYTE_OP, 0, 0, 0), @@ -412,8 +412,8 @@ const ASL_MAPPING_ENTRY AslKeywordMa /* TIMER */ OP_TABLE_ENTRY (AML_TIMER_OP, 0, 0, ACPI_BTYPE_INTEGER), /* TOBCD */ OP_TABLE_ENTRY (AML_TO_BCD_OP, 0, 0, ACPI_BTYPE_INTEGER), /* TOBUFFER */ OP_TABLE_ENTRY (AML_TO_BUFFER_OP, 0, 0, ACPI_BTYPE_BUFFER), -/* TODECIMALSTRING */ OP_TABLE_ENTRY (AML_TO_DECSTRING_OP, 0, 0, ACPI_BTYPE_STRING), -/* TOHEXSTRING */ OP_TABLE_ENTRY (AML_TO_HEXSTRING_OP, 0, 0, ACPI_BTYPE_STRING), +/* TODECIMALSTRING */ OP_TABLE_ENTRY (AML_TO_DECIMAL_STRING_OP, 0, 0, ACPI_BTYPE_STRING), +/* TOHEXSTRING */ OP_TABLE_ENTRY (AML_TO_HEX_STRING_OP, 0, 0, ACPI_BTYPE_STRING), /* TOINTEGER */ OP_TABLE_ENTRY (AML_TO_INTEGER_OP, 0, 0, ACPI_BTYPE_INTEGER), /* TOSTRING */ OP_TABLE_ENTRY (AML_TO_STRING_OP, 0, 0, ACPI_BTYPE_STRING), /* TOUUID */ OP_TABLE_ENTRY (AML_DWORD_OP, 0, NODE_AML_PACKAGE, ACPI_BTYPE_INTEGER), @@ -428,7 +428,7 @@ const ASL_MAPPING_ENTRY AslKeywordMa /* UPDATERULE_ONES */ OP_TABLE_ENTRY (AML_BYTE_OP, AML_FIELD_UPDATE_WRITE_AS_ONES, 0, 0), /* UPDATERULE_PRESERVE */ OP_TABLE_ENTRY (AML_BYTE_OP, AML_FIELD_UPDATE_PRESERVE, 0, 0), /* UPDATERULE_ZEROS */ OP_TABLE_ENTRY (AML_BYTE_OP, AML_FIELD_UPDATE_WRITE_AS_ZEROS,0, 0), -/* VAR_PACKAGE */ OP_TABLE_ENTRY (AML_VAR_PACKAGE_OP, 0, NODE_AML_PACKAGE, ACPI_BTYPE_PACKAGE), +/* VARIABLE_PACKAGE */ OP_TABLE_ENTRY (AML_VARIABLE_PACKAGE_OP, 0, NODE_AML_PACKAGE, ACPI_BTYPE_PACKAGE), /* VENDORLONG */ OP_TABLE_ENTRY (AML_BYTE_OP, 0, 0, 0), /* VENDORSHORT */ OP_TABLE_ENTRY (AML_BYTE_OP, 0, 0, 0), /* WAIT */ OP_TABLE_ENTRY (AML_WAIT_OP, 0, 0, ACPI_BTYPE_INTEGER), Modified: vendor-sys/acpica/dist/source/compiler/asloffset.c ============================================================================== --- vendor-sys/acpica/dist/source/compiler/asloffset.c Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/compiler/asloffset.c Tue Feb 28 20:06:31 2017 (r314405) @@ -185,7 +185,7 @@ LsAmlOffsetWalk ( break; case AML_PACKAGE_OP: - case AML_VAR_PACKAGE_OP: + case AML_VARIABLE_PACKAGE_OP: /* Get the package element count */ Modified: vendor-sys/acpica/dist/source/compiler/asloperands.c ============================================================================== --- vendor-sys/acpica/dist/source/compiler/asloperands.c Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/compiler/asloperands.c Tue Feb 28 20:06:31 2017 (r314405) @@ -321,7 +321,7 @@ OpnDoFieldCommon ( Next->Asl.ParseOpcode = PARSEOP_DEFAULT_ARG; PkgLengthNode->Asl.ParseOpcode = PARSEOP_DEFAULT_ARG; } - else if (NewBitOffset == CurrentBitOffset) + else if ((NewBitOffset == CurrentBitOffset) && Gbl_OptimizeTrivialParseNodes) { /* * Offset is redundant; we don't need to output an @@ -352,7 +352,8 @@ OpnDoFieldCommon ( CurrentBitOffset += NewBitOffset; if ((NewBitOffset == 0) && - (Next->Asl.ParseOpcode == PARSEOP_RESERVED_BYTES)) + (Next->Asl.ParseOpcode == PARSEOP_RESERVED_BYTES) && + Gbl_OptimizeTrivialParseNodes) { /* * Unnamed field with a bit length of zero. We can @@ -1072,7 +1073,7 @@ OpnAttachNameToNode ( case AML_METHOD_OP: case AML_MUTEX_OP: case AML_REGION_OP: - case AML_POWER_RES_OP: + case AML_POWER_RESOURCE_OP: case AML_PROCESSOR_OP: case AML_THERMAL_ZONE_OP: case AML_NAME_OP: Modified: vendor-sys/acpica/dist/source/compiler/asloptions.c ============================================================================== --- vendor-sys/acpica/dist/source/compiler/asloptions.c Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/compiler/asloptions.c Tue Feb 28 20:06:31 2017 (r314405) @@ -68,7 +68,7 @@ AslDoResponseFile ( #define ASL_TOKEN_SEPARATORS " \t\n" -#define ASL_SUPPORTED_OPTIONS "@:a:b|c|d^D:e:f^gh^i|I:l^m:no|p:P^r:s|t|T+G^v^w|x:z" +#define ASL_SUPPORTED_OPTIONS "@:a:b|c|d^D:e:f^gh^i|I:l^m:no|p:P^q^r:s|t|T+G^v^w|x:z" static char ASL_BUILD_DATE[] = __DATE__; static char ASL_BUILD_TIME[] = __TIME__; @@ -209,6 +209,24 @@ AslDoOptions ( switch (AcpiGbl_Optarg[0]) { + + case 'c': + + printf ("Debug ASL to ASL+ conversion\n"); + + Gbl_DoAslConversion = TRUE; + Gbl_FoldConstants = FALSE; + Gbl_IntegerOptimizationFlag = FALSE; + Gbl_ReferenceOptimizationFlag = FALSE; + Gbl_OptimizeTrivialParseNodes = FALSE; + Gbl_CaptureComments = TRUE; + AcpiGbl_DoDisassemblerOptimizations = FALSE; + AcpiGbl_DebugAslConversion = TRUE; + AcpiGbl_DmEmitExternalOpcodes = TRUE; + Gbl_DoExternalsInPlace = TRUE; + + return (0); + case 'f': AslCompilerdebug = 1; /* same as yydebug */ @@ -260,6 +278,22 @@ AslDoOptions ( switch (AcpiGbl_Optarg[0]) { + + case 'a': + + printf ("Convert ASL to ASL+ with comments\n"); + Gbl_DoAslConversion = TRUE; + Gbl_FoldConstants = FALSE; + Gbl_IntegerOptimizationFlag = FALSE; + Gbl_ReferenceOptimizationFlag = FALSE; + Gbl_OptimizeTrivialParseNodes = FALSE; + Gbl_CaptureComments = TRUE; + AcpiGbl_DoDisassemblerOptimizations = FALSE; + AcpiGbl_DmEmitExternalOpcodes = TRUE; + Gbl_DoExternalsInPlace = TRUE; + + return (0); + case 'r': Gbl_NoResourceChecking = TRUE; @@ -552,6 +586,8 @@ AslDoOptions ( Gbl_FoldConstants = FALSE; Gbl_IntegerOptimizationFlag = FALSE; Gbl_ReferenceOptimizationFlag = FALSE; + Gbl_OptimizeTrivialParseNodes = FALSE; + break; case 'c': @@ -570,15 +606,21 @@ AslDoOptions ( case 'e': - /* iASL: Disable External opcode generation */ - - Gbl_DoExternals = FALSE; - /* Disassembler: Emit embedded external operators */ AcpiGbl_DmEmitExternalOpcodes = TRUE; break; + case 'E': + + /* + * iASL: keep External opcodes in place. + * No affect if Gbl_DoExternals is false. + */ + + Gbl_DoExternalsInPlace = TRUE; + break; + case 'f': /* Disable folding on "normal" expressions */ @@ -643,6 +685,17 @@ AslDoOptions ( Gbl_UseDefaultAmlFilename = FALSE; break; + case 'q': /* ASL/ASl+ converter: compile only and leave badaml. */ + + printf ("Convert ASL to ASL+ with comments\n"); + Gbl_FoldConstants = FALSE; + Gbl_IntegerOptimizationFlag = FALSE; + Gbl_ReferenceOptimizationFlag = FALSE; + Gbl_OptimizeTrivialParseNodes = FALSE; + Gbl_CaptureComments = TRUE; + Gbl_DoExternalsInPlace = TRUE; + return (0); + case 'r': /* Override revision found in table header */ Gbl_RevisionOverride = (UINT8) strtoul (AcpiGbl_Optarg, NULL, 0); Modified: vendor-sys/acpica/dist/source/compiler/aslprimaries.y ============================================================================== --- vendor-sys/acpica/dist/source/compiler/aslprimaries.y Tue Feb 28 19:55:16 2017 (r314404) +++ vendor-sys/acpica/dist/source/compiler/aslprimaries.y Tue Feb 28 20:06:31 2017 (r314405) @@ -2,6 +2,8 @@ NoEcho(' /****************************************************************************** * *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Feb 28 20:07:06 2017 Return-Path: Delivered-To: svn-src-all@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 3E82FCF26B0; Tue, 28 Feb 2017 20:07:06 +0000 (UTC) (envelope-from jkim@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 E6E9896D; Tue, 28 Feb 2017 20:07:05 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SK74x0016087; Tue, 28 Feb 2017 20:07:04 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SK74ma016086; Tue, 28 Feb 2017 20:07:04 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201702282007.v1SK74ma016086@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Tue, 28 Feb 2017 20:07:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314406 - vendor-sys/acpica/20170224 X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 20:07:06 -0000 Author: jkim Date: Tue Feb 28 20:07:04 2017 New Revision: 314406 URL: https://svnweb.freebsd.org/changeset/base/314406 Log: Tag ACPICA 20170224. Added: vendor-sys/acpica/20170224/ - copied from r314405, vendor-sys/acpica/dist/ From owner-svn-src-all@freebsd.org Tue Feb 28 20:16:32 2017 Return-Path: Delivered-To: svn-src-all@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 D0647CF29B0; Tue, 28 Feb 2017 20:16:32 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 8543BE6; Tue, 28 Feb 2017 20:16:31 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id ioC7cUXIykevuioC8cTWxl; Tue, 28 Feb 2017 13:16:25 -0700 X-Authority-Analysis: v=2.2 cv=BLbDlBYG c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=n2v9WMKugxEA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=tvpdN5K5xn0UcfjhY6QA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy8 [10.2.2.6]) by spqr.komquats.com (Postfix) with ESMTPS id CB74B481; Tue, 28 Feb 2017 12:16:22 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id v1SKGMI1069864; Tue, 28 Feb 2017 12:16:22 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201702282016.v1SKGMI1069864@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Scott Long cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314399 - head/sys/sys In-Reply-To: Message from Scott Long of "Tue, 28 Feb 2017 19:01:59 +0000." <201702281901.v1SJ1xKE089703@repo.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 28 Feb 2017 12:16:22 -0800 X-CMAE-Envelope: MS4wfOFzpFSva8M1tOIVrpEIvYBayaaO5oPS3DXYNynT/blj+HNpIwbfF+bgKXJpLCHE2dpry5OA8PGCIGWGo4eZAVHUsez+A/84aAOtD3N3hIl0dt8PCga7 vIfHjMvU6worLS6KnukA+YDvFCP1OnLw0tqX05f6JvtVIKEyem/EUU+SFXgexH4oQEBocZdFLt7ZA/09WVlqoKAgZqTvf71oQFsqdY9Ryu5zupskpCW63vGI BmZDLYESMnBr2cfBohyDiYc4TpM8nyUuTXNWOKXqdWslH/vWT93ukER/DH1S3NC5 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 20:16:32 -0000 In message <201702281901.v1SJ1xKE089703@repo.freebsd.org>, Scott Long writes: > Author: scottl > Date: Tue Feb 28 19:01:59 2017 > New Revision: 314399 > URL: https://svnweb.freebsd.org/changeset/base/314399 > > Log: > Add prototype for sbuf_putbuf() > > Sponsored by: Netflix > > Modified: > head/sys/sys/sbuf.h > > Modified: head/sys/sys/sbuf.h > ============================================================================= > = > --- head/sys/sys/sbuf.h Tue Feb 28 18:48:12 2017 (r314398) > +++ head/sys/sys/sbuf.h Tue Feb 28 19:01:59 2017 (r314399) > @@ -99,6 +99,7 @@ void sbuf_start_section(struct sbuf *, > ssize_t sbuf_end_section(struct sbuf *, ssize_t, size_t, int); > void sbuf_hexdump(struct sbuf *, const void *, int, const char *, > int); > +void sbuf_putbuf(struct sbuf *); > > #ifdef _KERNEL > struct uio; > > Hi Scott, This causes, /opt/src/svn-current/lib/libsbuf/../../sys/kern/subr_prf.c:1243:2: error: implicitly declaring library function 'printf' with type 'int (const char *, ...)' [-Werror,-Wimplicit-function-declaration] printf("%s", sbuf_data(sb)); ^ /opt/src/svn-current/lib/libsbuf/../../sys/kern/subr_prf.c:1243:2: note: include the header or explicitly provide a declaration for 'printf' 1 error generated. *** [subr_prf.pico] Error code 1 make[4]: stopped in /opt/src/svn-current/lib/libsbuf 1 error ... and the fix... Index: sys/kern/subr_prf.c =================================================================== --- sys/kern/subr_prf.c (revision 314404) +++ sys/kern/subr_prf.c (working copy) @@ -60,6 +60,8 @@ #include #include #include +#else +#include #endif #include #include -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. From owner-svn-src-all@freebsd.org Tue Feb 28 20:23:27 2017 Return-Path: Delivered-To: svn-src-all@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 0976DCF2EC4; Tue, 28 Feb 2017 20:23:27 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id B70BFC30; Tue, 28 Feb 2017 20:23:26 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id ioItcUaRukevuioIvcTatR; Tue, 28 Feb 2017 13:23:25 -0700 X-Authority-Analysis: v=2.2 cv=BLbDlBYG c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=n2v9WMKugxEA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=eZJB0bVEOwotBFmLijgA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy8 [10.2.2.6]) by spqr.komquats.com (Postfix) with ESMTPS id 492E24AC; Tue, 28 Feb 2017 12:23:23 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id v1SKNM9o091732; Tue, 28 Feb 2017 12:23:22 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201702282023.v1SKNM9o091732@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Cy Schubert cc: Scott Long , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314399 - head/sys/sys In-Reply-To: Message from Cy Schubert of "Tue, 28 Feb 2017 12:16:22 -0800." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 28 Feb 2017 12:23:22 -0800 X-CMAE-Envelope: MS4wfIxvBrXtDwVVwB9eZ7gomNFU9L60Juu2eTG8sYVjrbQsDySL8IzZjVU1FsCYgjCQazd9TMAsX5Vk8E+r0zimCmbqhuj0VwlpjDQoMVC56XQuTcSPGecj pyreCY+P0LT1dLtDemFjBsyPlx47YaaQgpDY6lYNHzsiEtDir1+vW9XF0pAKjvAlk2FpilbXr6SAtfWZQkBrCrfinfbLh4KWxpjY+nTlLlMH56IH79PeK1GU 52+rXjaFNfktHznoxaVsljmPtXPb/aEjoSr0KVXLTXLni5ENqkWKOkQOIS8IQ5Cw X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 20:23:27 -0000 Cy Schubert writes: > In message <201702281901.v1SJ1xKE089703@repo.freebsd.org>, Scott Long > writes: > > Author: scottl > > Date: Tue Feb 28 19:01:59 2017 > > New Revision: 314399 > > URL: https://svnweb.freebsd.org/changeset/base/314399 > > > > Log: > > Add prototype for sbuf_putbuf() > > > > Sponsored by: Netflix > > > > Modified: > > head/sys/sys/sbuf.h > > > > Modified: head/sys/sys/sbuf.h > > =========================================================================== > == > > = > > --- head/sys/sys/sbuf.h Tue Feb 28 18:48:12 2017 (r314398) > > +++ head/sys/sys/sbuf.h Tue Feb 28 19:01:59 2017 (r314399) > > @@ -99,6 +99,7 @@ void sbuf_start_section(struct sbuf *, > > ssize_t sbuf_end_section(struct sbuf *, ssize_t, size_t, int); > > void sbuf_hexdump(struct sbuf *, const void *, int, const c > har *, > > int); > > +void sbuf_putbuf(struct sbuf *); > > > > #ifdef _KERNEL > > struct uio; > > > > > > Hi Scott, > > This causes, > > /opt/src/svn-current/lib/libsbuf/../../sys/kern/subr_prf.c:1243:2: error: > implicitly declaring library function 'printf' with type 'int (const char > *, ...)' [-Werror,-Wimplicit-function-declaration] > printf("%s", sbuf_data(sb)); > ^ > /opt/src/svn-current/lib/libsbuf/../../sys/kern/subr_prf.c:1243:2: note: > include the header or explicitly provide a declaration for > 'printf' > 1 error generated. > *** [subr_prf.pico] Error code 1 > > make[4]: stopped in /opt/src/svn-current/lib/libsbuf > 1 error > > > ... and the fix... > > Index: sys/kern/subr_prf.c > =================================================================== > --- sys/kern/subr_prf.c (revision 314404) > +++ sys/kern/subr_prf.c (working copy) > @@ -60,6 +60,8 @@ > #include > #include > #include > +#else > +#include > #endif > #include > #include I picked the wrong one in exmh. This should be for r314397 instead. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. From owner-svn-src-all@freebsd.org Tue Feb 28 20:25:47 2017 Return-Path: Delivered-To: svn-src-all@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 0AF4ACF2FDA; Tue, 28 Feb 2017 20:25:47 +0000 (UTC) (envelope-from imp@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 CEBDEE43; Tue, 28 Feb 2017 20:25:46 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SKPj5s023892; Tue, 28 Feb 2017 20:25:45 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SKPjv0023890; Tue, 28 Feb 2017 20:25:45 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201702282025.v1SKPjv0023890@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 28 Feb 2017 20:25:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314407 - in head/sys/dev/usb: . serial X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 20:25:47 -0000 Author: imp Date: Tue Feb 28 20:25:45 2017 New Revision: 314407 URL: https://svnweb.freebsd.org/changeset/base/314407 Log: Add support for Vodafone/Huawei K3771. See also http://www.draisberghof.de/usb_modeswitch/device_reference.txt Submitted by: Dean Hamstead Pull Request: https://github.com/freebsd/freebsd/pull/76 Modified: head/sys/dev/usb/serial/u3g.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/serial/u3g.c ============================================================================== --- head/sys/dev/usb/serial/u3g.c Tue Feb 28 20:07:04 2017 (r314406) +++ head/sys/dev/usb/serial/u3g.c Tue Feb 28 20:25:45 2017 (r314407) @@ -316,6 +316,8 @@ static const STRUCT_USB_HOST_ID u3g_devs U3G_DEV(HUAWEI, MOBILE, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, E1752, U3GINIT_HUAWEISCSI), U3G_DEV(HUAWEI, E1820, U3GINIT_HUAWEISCSI), + U3G_DEV(HUAWEI, K3771, U3GINIT_HUAWEI), + U3G_DEV(HUAWEI, K3771_INIT, U3GINIT_HUAWEISCSI2), U3G_DEV(HUAWEI, K3772, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, K3772_INIT, U3GINIT_HUAWEISCSI2), U3G_DEV(HUAWEI, K3765, U3GINIT_HUAWEI), Modified: head/sys/dev/usb/usbdevs ============================================================================== --- head/sys/dev/usb/usbdevs Tue Feb 28 20:07:04 2017 (r314406) +++ head/sys/dev/usb/usbdevs Tue Feb 28 20:25:45 2017 (r314407) @@ -2434,7 +2434,9 @@ product HUAWEI E1752 0x1446 3G modem product HUAWEI K4505 0x1464 3G modem product HUAWEI K3765 0x1465 3G modem product HUAWEI E1820 0x14ac E1820 HSPA+ USB Slider +product HUAWEI K3771 0x14c4 K3771 Initial product HUAWEI K3770 0x14c9 3G modem +product HUAWEI K3771 0x14ca K3771 product HUAWEI K3772 0x14cf K3772 product HUAWEI K3770_INIT 0x14d1 K3770 Initial product HUAWEI E3131_INIT 0x14fe 3G modem initial From owner-svn-src-all@freebsd.org Tue Feb 28 20:26:01 2017 Return-Path: Delivered-To: svn-src-all@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 BB78DCF101F; Tue, 28 Feb 2017 20:26:01 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-wr0-f178.google.com (mail-wr0-f178.google.com [209.85.128.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5C5CAF35; Tue, 28 Feb 2017 20:26:00 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-wr0-f178.google.com with SMTP id g10so16525699wrg.2; Tue, 28 Feb 2017 12:26:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=deCl6MK+Hh8yhRgplBQewUjj9o6RbJemcSyGQlfQBiY=; b=mfxB8366SW71IxCy7ngIzKUkyVOziJntJhMMb7vslwNmHBug/yar62V/h+Oggl4rFb QLdFWeLr035Pj31y6gzLzxtZkDmCNZ0rgS7W3xu5hGnna6PN7OmDk0DYa6jJ3MrIl+6g mn3wkXRyVR2dHnZi9GgNnz0kPSXfd/zguiv4FEpoH0oBsaGhnGNkZTK/wpD3HxMZG4d0 s+k0rLy6zPNCLY3Iwud8Vt5Ek4fj86GKburUIoUdaflofIhS+d8AjoyDQu2QqKZ9X4Sy juGJ0uB5/91RN+LqHUIx/cxGXgPUURWenqb/MI66MZMPMq+x3ajQlkfRAIBZcFgk0RrD u2Iw== X-Gm-Message-State: AMke39k8ZO5m8X+w648Sznv5ogECnZ1h+PtIjED6mNE0DvwozntQZbhkt824SJh2xJSYyA== X-Received: by 10.223.150.15 with SMTP id b15mr3747857wra.191.1488312042067; Tue, 28 Feb 2017 12:00:42 -0800 (PST) Received: from mail-wr0-f174.google.com (mail-wr0-f174.google.com. [209.85.128.174]) by smtp.gmail.com with ESMTPSA id y65sm19848749wmb.5.2017.02.28.12.00.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Feb 2017 12:00:41 -0800 (PST) Received: by mail-wr0-f174.google.com with SMTP id g10so16131276wrg.2; Tue, 28 Feb 2017 12:00:41 -0800 (PST) X-Received: by 10.223.167.138 with SMTP id j10mr3810667wrc.178.1488312041843; Tue, 28 Feb 2017 12:00:41 -0800 (PST) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 10.80.152.82 with HTTP; Tue, 28 Feb 2017 12:00:41 -0800 (PST) In-Reply-To: <201702281955.v1SJtGeG011858@repo.freebsd.org> References: <201702281955.v1SJtGeG011858@repo.freebsd.org> From: Conrad Meyer Date: Tue, 28 Feb 2017 12:00:41 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r314404 - head/sys/compat/linux To: Dmitry Chagin Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 20:26:01 -0000 On Tue, Feb 28, 2017 at 11:55 AM, Dmitry Chagin wrote: > Author: dchagin > Date: Tue Feb 28 19:55:16 2017 > New Revision: 314404 > URL: https://svnweb.freebsd.org/changeset/base/314404 > > Log: > Linux epoll return EEXIST on case when op is EPOLL_CTL_ADD, and the supplied > file descriptor fd is already registered with this epoll instance. Hi Dmitry, Do we have an automated test suite for epoll behavior compliance? If you have some existing test programs you're using to determine compatibility, it would be good to adapt those to a test framework and commit them as well. Thanks, Conrad From owner-svn-src-all@freebsd.org Tue Feb 28 20:34:26 2017 Return-Path: Delivered-To: svn-src-all@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 E7C85CF16AB; Tue, 28 Feb 2017 20:34:26 +0000 (UTC) (envelope-from imp@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 B4DA494F; Tue, 28 Feb 2017 20:34:26 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SKYPRZ027763; Tue, 28 Feb 2017 20:34:25 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SKYPtx027762; Tue, 28 Feb 2017 20:34:25 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201702282034.v1SKYPtx027762@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 28 Feb 2017 20:34:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314408 - head/include/arpa X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 20:34:27 -0000 Author: imp Date: Tue Feb 28 20:34:25 2017 New Revision: 314408 URL: https://svnweb.freebsd.org/changeset/base/314408 Log: Fix include/arpa/nameser_compat.h by adding T_DNAME definition. Fixes Apache trafficserver Submitted by: John J. Rushford Pull Request: https://github.com/freebsd/freebsd/pull/104 Modified: head/include/arpa/nameser_compat.h Modified: head/include/arpa/nameser_compat.h ============================================================================== --- head/include/arpa/nameser_compat.h Tue Feb 28 20:25:45 2017 (r314407) +++ head/include/arpa/nameser_compat.h Tue Feb 28 20:34:25 2017 (r314408) @@ -175,6 +175,7 @@ typedef struct { #define T_ATMA ns_t_atma #define T_NAPTR ns_t_naptr #define T_A6 ns_t_a6 +#define T_DNAME ns_t_dname #define T_OPT ns_t_opt #define T_TSIG ns_t_tsig #define T_IXFR ns_t_ixfr From owner-svn-src-all@freebsd.org Tue Feb 28 20:50:51 2017 Return-Path: Delivered-To: svn-src-all@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 55C4DCF1BB6; Tue, 28 Feb 2017 20:50:51 +0000 (UTC) (envelope-from pfg@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 0CC2D1D2; Tue, 28 Feb 2017 20:50:50 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SKooF4032026; Tue, 28 Feb 2017 20:50:50 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SKooRd032024; Tue, 28 Feb 2017 20:50:50 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201702282050.v1SKooRd032024@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Tue, 28 Feb 2017 20:50:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314409 - head/usr.bin/dc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 20:50:51 -0000 Author: pfg Date: Tue Feb 28 20:50:49 2017 New Revision: 314409 URL: https://svnweb.freebsd.org/changeset/base/314409 Log: dc(1): Introduce e command, equivalent to p, but writes to stderr Obtained from: OpenBSD MFC after: 2 weeks Modified: head/usr.bin/dc/bcode.c head/usr.bin/dc/dc.1 Modified: head/usr.bin/dc/bcode.c ============================================================================== --- head/usr.bin/dc/bcode.c Tue Feb 28 20:34:25 2017 (r314408) +++ head/usr.bin/dc/bcode.c Tue Feb 28 20:50:49 2017 (r314409) @@ -69,6 +69,7 @@ static __inline struct number *pop_numbe static __inline char *pop_string(void); static __inline void clear_stack(void); static __inline void print_tos(void); +static void print_err(void); static void pop_print(void); static void pop_printn(void); static __inline void print_stack(void); @@ -198,6 +199,7 @@ static const struct jump_entry jump_tabl { 'a', to_ascii }, { 'c', clear_stack }, { 'd', dup }, + { 'e', print_err }, { 'f', print_stack }, { 'i', set_ibase }, { 'k', set_scale }, @@ -508,6 +510,18 @@ print_tos(void) } static void +print_err(void) +{ + struct value *value = tos(); + if (value != NULL) { + print_value(stderr, value, "", bmachine.obase); + (void)putc('\n', stderr); + } + else + warnx("stack empty"); +} + +static void pop_print(void) { struct value *value = pop(); Modified: head/usr.bin/dc/dc.1 ============================================================================== --- head/usr.bin/dc/dc.1 Tue Feb 28 20:34:25 2017 (r314408) +++ head/usr.bin/dc/dc.1 Tue Feb 28 20:50:49 2017 (r314409) @@ -35,7 +35,7 @@ .\" .\" @(#)dc.1 8.1 (Berkeley) 6/6/93 .\" -.Dd April 16, 2014 +.Dd February 27, 2017 .Dt DC 1 .Os .Sh NAME @@ -196,6 +196,10 @@ operator is a non-portable extension. All values on the stack are popped. .It Ic d The top value on the stack is duplicated. +.It Ic e +Equivalent to +.Ic p , +except that the output is written to the standard error stream. .It Ic f All values on the stack are printed, separated by newlines. .It Ic G From owner-svn-src-all@freebsd.org Tue Feb 28 20:51:21 2017 Return-Path: Delivered-To: svn-src-all@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 D1D51CF1D68; Tue, 28 Feb 2017 20:51:21 +0000 (UTC) (envelope-from oshogbo@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 9ECB03B8; Tue, 28 Feb 2017 20:51:21 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SKpKlN034814; Tue, 28 Feb 2017 20:51:20 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SKpK1q034813; Tue, 28 Feb 2017 20:51:20 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201702282051.v1SKpK1q034813@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski Date: Tue, 28 Feb 2017 20:51:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314410 - head/sys/geom/part X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 20:51:21 -0000 Author: oshogbo Date: Tue Feb 28 20:51:20 2017 New Revision: 314410 URL: https://svnweb.freebsd.org/changeset/base/314410 Log: The kern.geom.part.auto_resize should be tunable. Modified: head/sys/geom/part/g_part.c Modified: head/sys/geom/part/g_part.c ============================================================================== --- head/sys/geom/part/g_part.c Tue Feb 28 20:50:49 2017 (r314409) +++ head/sys/geom/part/g_part.c Tue Feb 28 20:51:20 2017 (r314410) @@ -137,7 +137,7 @@ SYSCTL_UINT(_kern_geom_part, OID_AUTO, c "Enable integrity checking"); static u_int auto_resize = 1; SYSCTL_UINT(_kern_geom_part, OID_AUTO, auto_resize, - CTLFLAG_RW, &auto_resize, 1, + CTLFLAG_RWTUN, &auto_resize, 1, "Enable auto resize"); /* From owner-svn-src-all@freebsd.org Tue Feb 28 21:07:21 2017 Return-Path: Delivered-To: svn-src-all@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 1D5B9CF2007; Tue, 28 Feb 2017 21:07:21 +0000 (UTC) (envelope-from dim@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 C89E2D84; Tue, 28 Feb 2017 21:07:20 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SL7JYl039707; Tue, 28 Feb 2017 21:07:19 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SL7IJj039692; Tue, 28 Feb 2017 21:07:18 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201702282107.v1SL7IJj039692@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 28 Feb 2017 21:07:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314411 - in vendor/llvm/dist: docs lib/CodeGen test/CodeGen/X86 test/tools/llvm-xray/X86 test/tools/llvm-xray/X86/Inputs tools/llvm-xray X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 21:07:21 -0000 Author: dim Date: Tue Feb 28 21:07:18 2017 New Revision: 314411 URL: https://svnweb.freebsd.org/changeset/base/314411 Log: Vendor import of llvm release_40 branch r296509: https://llvm.org/svn/llvm-project/llvm/branches/release_40@296509 Added: vendor/llvm/dist/test/CodeGen/X86/pr30284.ll Modified: vendor/llvm/dist/docs/ReleaseNotes.rst vendor/llvm/dist/lib/CodeGen/ExecutionDepsFix.cpp vendor/llvm/dist/test/tools/llvm-xray/X86/Inputs/simple-xray-instrmap.yaml vendor/llvm/dist/test/tools/llvm-xray/X86/account-simple-case.yaml vendor/llvm/dist/test/tools/llvm-xray/X86/account-simple-sorting.yaml vendor/llvm/dist/test/tools/llvm-xray/X86/convert-roundtrip.yaml vendor/llvm/dist/test/tools/llvm-xray/X86/convert-to-yaml.txt vendor/llvm/dist/test/tools/llvm-xray/X86/convert-with-debug-syms.txt vendor/llvm/dist/test/tools/llvm-xray/X86/convert-with-standalone-instrmap.txt vendor/llvm/dist/test/tools/llvm-xray/X86/convert-with-yaml-instrmap.txt vendor/llvm/dist/test/tools/llvm-xray/X86/extract-instrmap.ll vendor/llvm/dist/tools/llvm-xray/xray-converter.cc vendor/llvm/dist/tools/llvm-xray/xray-extract.cc Modified: vendor/llvm/dist/docs/ReleaseNotes.rst ============================================================================== --- vendor/llvm/dist/docs/ReleaseNotes.rst Tue Feb 28 20:51:20 2017 (r314410) +++ vendor/llvm/dist/docs/ReleaseNotes.rst Tue Feb 28 21:07:18 2017 (r314411) @@ -20,6 +20,14 @@ have questions or comments, the `LLVM De `_ is a good place to send them. +New Versioning Scheme +===================== +Starting with this release, LLVM is using a +`new versioning scheme `_, +increasing the major version number with each major release. Stable updates to +this release will be versioned 4.0.x, and the next major release, six months +from now, will be version 5.0.0. + Non-comprehensive list of changes in this release ================================================= * Minimum compiler version to build has been raised to GCC 4.8 and VS 2015. @@ -238,6 +246,34 @@ Most of the work behind the scenes has b assembly, and also fixing some assertions we would hit on some well-formed inputs. +Changes to the MIPS Target +----------------------------- + +**During this release the MIPS target has:** + +* IAS is now enabled by default for Debian mips64el. +* Added support for the two operand form for many instructions. +* Added the following macros: unaligned load/store, seq, double word load/store for O32. +* Improved the parsing of complex memory offset expressions. +* Enabled the integrated assembler by default for Debian mips64el. +* Added a generic scheduler based on the interAptiv CPU. +* Added support for thread local relocations. +* Added recip, rsqrt, evp, dvp, synci instructions in IAS. +* Optimized the generation of constants from some cases. + +**The following issues have been fixed:** + +* Thread local debug information is correctly recorded. +* MSA intrinsics are now range checked. +* Fixed an issue with MSA and the no-odd-spreg abi. +* Fixed some corner cases in handling forbidden slots for MIPSR6. +* Fixed an issue with jumps not being converted to relative branches for assembly. +* Fixed the handling of local symbols and jal instruction. +* N32/N64 no longer have their relocation tables sorted as per their ABIs. +* Fixed a crash when half-precision floating point conversion MSA intrinsics are used. +* Fixed several crashes involving FastISel. +* Corrected the corrected definitions for aui/daui/dahi/dati for MIPSR6. + Changes to the OCaml bindings ----------------------------- Modified: vendor/llvm/dist/lib/CodeGen/ExecutionDepsFix.cpp ============================================================================== --- vendor/llvm/dist/lib/CodeGen/ExecutionDepsFix.cpp Tue Feb 28 20:51:20 2017 (r314410) +++ vendor/llvm/dist/lib/CodeGen/ExecutionDepsFix.cpp Tue Feb 28 21:07:18 2017 (r314411) @@ -707,9 +707,8 @@ void ExeDepsFix::visitSoftInstr(MachineI // Kill off any remaining uses that don't match available, and build a list of // incoming DomainValues that we want to merge. - SmallVector Regs; - for (SmallVectorImpl::iterator i=used.begin(), e=used.end(); i!=e; ++i) { - int rx = *i; + SmallVector Regs; + for (int rx : used) { assert(LiveRegs && "no space allocated for live registers"); const LiveReg &LR = LiveRegs[rx]; // This useless DomainValue could have been missed above. @@ -718,16 +717,11 @@ void ExeDepsFix::visitSoftInstr(MachineI continue; } // Sorted insertion. - bool Inserted = false; - for (SmallVectorImpl::iterator i = Regs.begin(), e = Regs.end(); - i != e && !Inserted; ++i) { - if (LR.Def < i->Def) { - Inserted = true; - Regs.insert(i, LR); - } - } - if (!Inserted) - Regs.push_back(LR); + auto I = std::upper_bound(Regs.begin(), Regs.end(), &LR, + [](const LiveReg *LHS, const LiveReg *RHS) { + return LHS->Def < RHS->Def; + }); + Regs.insert(I, &LR); } // doms are now sorted in order of appearance. Try to merge them all, giving @@ -735,14 +729,14 @@ void ExeDepsFix::visitSoftInstr(MachineI DomainValue *dv = nullptr; while (!Regs.empty()) { if (!dv) { - dv = Regs.pop_back_val().Value; + dv = Regs.pop_back_val()->Value; // Force the first dv to match the current instruction. dv->AvailableDomains = dv->getCommonDomains(available); assert(dv->AvailableDomains && "Domain should have been filtered"); continue; } - DomainValue *Latest = Regs.pop_back_val().Value; + DomainValue *Latest = Regs.pop_back_val()->Value; // Skip already merged values. if (Latest == dv || Latest->Next) continue; Added: vendor/llvm/dist/test/CodeGen/X86/pr30284.ll ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/llvm/dist/test/CodeGen/X86/pr30284.ll Tue Feb 28 21:07:18 2017 (r314411) @@ -0,0 +1,22 @@ +; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py +; RUN: llc < %s -mtriple=i386-unknown-linux-gnu -mattr=avx512dq | FileCheck %s + +define void @f_f___un_3C_unf_3E_un_3C_unf_3E_() { +; CHECK-LABEL: f_f___un_3C_unf_3E_un_3C_unf_3E_: +; CHECK: # BB#0: +; CHECK-NEXT: vmovapd 0, %zmm0 +; CHECK-NEXT: vmovapd 64, %zmm1 +; CHECK-NEXT: vmovapd {{.*#+}} zmm2 = [0,16,0,16,0,16,0,16,0,16,0,16,0,16,0,16] +; CHECK-NEXT: kshiftrw $8, %k0, %k1 +; CHECK-NEXT: vorpd %zmm2, %zmm1, %zmm1 {%k1} +; CHECK-NEXT: vorpd %zmm2, %zmm0, %zmm0 {%k1} +; CHECK-NEXT: vmovapd %zmm0, 0 +; CHECK-NEXT: vmovapd %zmm1, 64 +; CHECK-NEXT: retl + %a_load22 = load <16 x i64>, <16 x i64>* null, align 1 + %bitop = or <16 x i64> %a_load22, + %v.i = load <16 x i64>, <16 x i64>* null + %v1.i41 = select <16 x i1> undef, <16 x i64> %bitop, <16 x i64> %v.i + store <16 x i64> %v1.i41, <16 x i64>* null + ret void +} Modified: vendor/llvm/dist/test/tools/llvm-xray/X86/Inputs/simple-xray-instrmap.yaml ============================================================================== --- vendor/llvm/dist/test/tools/llvm-xray/X86/Inputs/simple-xray-instrmap.yaml Tue Feb 28 20:51:20 2017 (r314410) +++ vendor/llvm/dist/test/tools/llvm-xray/X86/Inputs/simple-xray-instrmap.yaml Tue Feb 28 21:07:18 2017 (r314411) @@ -1,14 +1,8 @@ --- -- { id: 1, address: 0x000000000041CA40, function: 0x000000000041CA40, kind: function-enter, - always-instrument: true } -- { id: 1, address: 0x000000000041CA50, function: 0x000000000041CA40, kind: tail-exit, - always-instrument: true } -- { id: 2, address: 0x000000000041CA70, function: 0x000000000041CA70, kind: function-enter, - always-instrument: true } -- { id: 2, address: 0x000000000041CA7C, function: 0x000000000041CA70, kind: tail-exit, - always-instrument: true } -- { id: 3, address: 0x000000000041CAA0, function: 0x000000000041CAA0, kind: function-enter, - always-instrument: true } -- { id: 3, address: 0x000000000041CAB4, function: 0x000000000041CAA0, kind: function-exit, - always-instrument: true } +- { id: 1, address: 0x000000000041CA40, function: 0x000000000041CA40, kind: function-enter, always-instrument: true } +- { id: 1, address: 0x000000000041CA50, function: 0x000000000041CA40, kind: tail-exit, always-instrument: true } +- { id: 2, address: 0x000000000041CA70, function: 0x000000000041CA70, kind: function-enter, always-instrument: true } +- { id: 2, address: 0x000000000041CA7C, function: 0x000000000041CA70, kind: tail-exit, always-instrument: true } +- { id: 3, address: 0x000000000041CAA0, function: 0x000000000041CAA0, kind: function-enter, always-instrument: true } +- { id: 3, address: 0x000000000041CAB4, function: 0x000000000041CAA0, kind: function-exit, always-instrument: true } ... Modified: vendor/llvm/dist/test/tools/llvm-xray/X86/account-simple-case.yaml ============================================================================== --- vendor/llvm/dist/test/tools/llvm-xray/X86/account-simple-case.yaml Tue Feb 28 20:51:20 2017 (r314410) +++ vendor/llvm/dist/test/tools/llvm-xray/X86/account-simple-case.yaml Tue Feb 28 21:07:18 2017 (r314411) @@ -7,10 +7,8 @@ header: nonstop-tsc: true cycle-frequency: 2601000000 records: - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter, - tsc: 10001 } - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit, - tsc: 10100 } + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter, tsc: 10001 } + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit, tsc: 10100 } ... #CHECK: Functions with latencies: 1 Modified: vendor/llvm/dist/test/tools/llvm-xray/X86/account-simple-sorting.yaml ============================================================================== --- vendor/llvm/dist/test/tools/llvm-xray/X86/account-simple-sorting.yaml Tue Feb 28 20:51:20 2017 (r314410) +++ vendor/llvm/dist/test/tools/llvm-xray/X86/account-simple-sorting.yaml Tue Feb 28 21:07:18 2017 (r314411) @@ -17,27 +17,17 @@ header: cycle-frequency: 1 records: # Function id: 1 - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter, - tsc: 10001 } - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit, - tsc: 10100 } - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter, - tsc: 10101 } - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit, - tsc: 10200 } - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter, - tsc: 10201 } - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit, - tsc: 10300 } + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter, tsc: 10001 } + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit, tsc: 10100 } + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter, tsc: 10101 } + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit, tsc: 10200 } + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter, tsc: 10201 } + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit, tsc: 10300 } # Function id: 2 - - { type: 0, func-id: 2, cpu: 1, thread: 222, kind: function-enter, - tsc: 10001 } - - { type: 0, func-id: 2, cpu: 1, thread: 222, kind: function-exit, - tsc: 10002 } - - { type: 0, func-id: 2, cpu: 1, thread: 222, kind: function-enter, - tsc: 10101 } - - { type: 0, func-id: 2, cpu: 1, thread: 222, kind: function-exit, - tsc: 10102 } + - { type: 0, func-id: 2, cpu: 1, thread: 222, kind: function-enter, tsc: 10001 } + - { type: 0, func-id: 2, cpu: 1, thread: 222, kind: function-exit, tsc: 10002 } + - { type: 0, func-id: 2, cpu: 1, thread: 222, kind: function-enter, tsc: 10101 } + - { type: 0, func-id: 2, cpu: 1, thread: 222, kind: function-exit, tsc: 10102 } #DEFAULT: Functions with latencies: 2 #DEFAULT-NEXT: funcid count [ min, med, 90p, 99p, max] sum function Modified: vendor/llvm/dist/test/tools/llvm-xray/X86/convert-roundtrip.yaml ============================================================================== --- vendor/llvm/dist/test/tools/llvm-xray/X86/convert-roundtrip.yaml Tue Feb 28 20:51:20 2017 (r314410) +++ vendor/llvm/dist/test/tools/llvm-xray/X86/convert-roundtrip.yaml Tue Feb 28 21:07:18 2017 (r314411) @@ -7,10 +7,8 @@ header: nonstop-tsc: true cycle-frequency: 2601000000 records: - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter, - tsc: 10001 } - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit, - tsc: 10100 } + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter, tsc: 10001 } + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit, tsc: 10100 } ... #CHECK: --- @@ -21,8 +19,6 @@ records: #CHECK-NEXT: nonstop-tsc: true #CHECK-NEXT: cycle-frequency: 2601000000 #CHECK-NEXT: records: -#CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 1, thread: 111, kind: function-enter, -#CHECK-NEXT: tsc: 10001 } -#CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 1, thread: 111, kind: function-exit, -#CHECK-NEXT: tsc: 10100 } +#CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 1, thread: 111, kind: function-enter, tsc: 10001 } +#CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 1, thread: 111, kind: function-exit, tsc: 10100 } #CHECK-NEXT: ... Modified: vendor/llvm/dist/test/tools/llvm-xray/X86/convert-to-yaml.txt ============================================================================== --- vendor/llvm/dist/test/tools/llvm-xray/X86/convert-to-yaml.txt Tue Feb 28 20:51:20 2017 (r314410) +++ vendor/llvm/dist/test/tools/llvm-xray/X86/convert-to-yaml.txt Tue Feb 28 21:07:18 2017 (r314411) @@ -8,16 +8,10 @@ ; CHECK-NEXT: nonstop-tsc: true ; CHECK-NEXT: cycle-frequency: 2601000000 ; CHECK-NEXT: records: -; CHECK-NEXT: - { type: 0, func-id: 3, function: '3', cpu: 37, thread: 84697, kind: function-enter, -; CHECK-NEXT: tsc: 3315356841453914 } -; CHECK-NEXT: - { type: 0, func-id: 2, function: '2', cpu: 37, thread: 84697, kind: function-enter, -; CHECK-NEXT: tsc: 3315356841454542 } -; CHECK-NEXT: - { type: 0, func-id: 2, function: '2', cpu: 37, thread: 84697, kind: function-exit, -; CHECK-NEXT: tsc: 3315356841454670 } -; CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 37, thread: 84697, kind: function-enter, -; CHECK-NEXT: tsc: 3315356841454762 } -; CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 37, thread: 84697, kind: function-exit, -; CHECK-NEXT: tsc: 3315356841454802 } -; CHECK-NEXT: - { type: 0, func-id: 3, function: '3', cpu: 37, thread: 84697, kind: function-exit, -; CHECK-NEXT: tsc: 3315356841494828 } +; CHECK-NEXT: - { type: 0, func-id: 3, function: '3', cpu: 37, thread: 84697, kind: function-enter, tsc: 3315356841453914 } +; CHECK-NEXT: - { type: 0, func-id: 2, function: '2', cpu: 37, thread: 84697, kind: function-enter, tsc: 3315356841454542 } +; CHECK-NEXT: - { type: 0, func-id: 2, function: '2', cpu: 37, thread: 84697, kind: function-exit, tsc: 3315356841454670 } +; CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 37, thread: 84697, kind: function-enter, tsc: 3315356841454762 } +; CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 37, thread: 84697, kind: function-exit, tsc: 3315356841454802 } +; CHECK-NEXT: - { type: 0, func-id: 3, function: '3', cpu: 37, thread: 84697, kind: function-exit, tsc: 3315356841494828 } ; CHECK-NEXT: ... Modified: vendor/llvm/dist/test/tools/llvm-xray/X86/convert-with-debug-syms.txt ============================================================================== --- vendor/llvm/dist/test/tools/llvm-xray/X86/convert-with-debug-syms.txt Tue Feb 28 20:51:20 2017 (r314410) +++ vendor/llvm/dist/test/tools/llvm-xray/X86/convert-with-debug-syms.txt Tue Feb 28 21:07:18 2017 (r314411) @@ -8,16 +8,10 @@ ; CHECK-NEXT: nonstop-tsc: true ; CHECK-NEXT: cycle-frequency: 2601000000 ; CHECK-NEXT: records: -; CHECK-NEXT: - { type: 0, func-id: 3, function: main, cpu: 37, thread: 84697, kind: function-enter, -; CHECK-NEXT: tsc: 3315356841453914 } -; CHECK-NEXT: - { type: 0, func-id: 2, function: {{.*foo.*}}, cpu: 37, thread: 84697, kind: function-enter, -; CHECK-NEXT: tsc: 3315356841454542 } -; CHECK-NEXT: - { type: 0, func-id: 2, function: {{.*foo.*}}, cpu: 37, thread: 84697, kind: function-exit, -; CHECK-NEXT: tsc: 3315356841454670 } -; CHECK-NEXT: - { type: 0, func-id: 1, function: {{.*bar.*}}, cpu: 37, thread: 84697, kind: function-enter, -; CHECK-NEXT: tsc: 3315356841454762 } -; CHECK-NEXT: - { type: 0, func-id: 1, function: {{.*bar.*}}, cpu: 37, thread: 84697, kind: function-exit, -; CHECK-NEXT: tsc: 3315356841454802 } -; CHECK-NEXT: - { type: 0, func-id: 3, function: main, cpu: 37, thread: 84697, kind: function-exit, -; CHECK-NEXT: tsc: 3315356841494828 } +; CHECK-NEXT: - { type: 0, func-id: 3, function: main, cpu: 37, thread: 84697, kind: function-enter, tsc: 3315356841453914 } +; CHECK-NEXT: - { type: 0, func-id: 2, function: {{.*foo.*}}, cpu: 37, thread: 84697, kind: function-enter, tsc: 3315356841454542 } +; CHECK-NEXT: - { type: 0, func-id: 2, function: {{.*foo.*}}, cpu: 37, thread: 84697, kind: function-exit, tsc: 3315356841454670 } +; CHECK-NEXT: - { type: 0, func-id: 1, function: {{.*bar.*}}, cpu: 37, thread: 84697, kind: function-enter, tsc: 3315356841454762 } +; CHECK-NEXT: - { type: 0, func-id: 1, function: {{.*bar.*}}, cpu: 37, thread: 84697, kind: function-exit, tsc: 3315356841454802 } +; CHECK-NEXT: - { type: 0, func-id: 3, function: main, cpu: 37, thread: 84697, kind: function-exit, tsc: 3315356841494828 } ; CHECK-NEXT: ... Modified: vendor/llvm/dist/test/tools/llvm-xray/X86/convert-with-standalone-instrmap.txt ============================================================================== --- vendor/llvm/dist/test/tools/llvm-xray/X86/convert-with-standalone-instrmap.txt Tue Feb 28 20:51:20 2017 (r314410) +++ vendor/llvm/dist/test/tools/llvm-xray/X86/convert-with-standalone-instrmap.txt Tue Feb 28 21:07:18 2017 (r314411) @@ -8,16 +8,10 @@ ; CHECK-NEXT: nonstop-tsc: true ; CHECK-NEXT: cycle-frequency: 2601000000 ; CHECK-NEXT: records: -; CHECK-NEXT: - { type: 0, func-id: 3, function: '@(41caa0)', cpu: 37, thread: 84697, -; CHECK-NEXT: kind: function-enter, tsc: 3315356841453914 } -; CHECK-NEXT: - { type: 0, func-id: 2, function: '@(41ca70)', cpu: 37, thread: 84697, -; CHECK-NEXT: kind: function-enter, tsc: 3315356841454542 } -; CHECK-NEXT: - { type: 0, func-id: 2, function: '@(41ca70)', cpu: 37, thread: 84697, -; CHECK-NEXT: kind: function-exit, tsc: 3315356841454670 } -; CHECK-NEXT: - { type: 0, func-id: 1, function: '@(41ca40)', cpu: 37, thread: 84697, -; CHECK-NEXT: kind: function-enter, tsc: 3315356841454762 } -; CHECK-NEXT: - { type: 0, func-id: 1, function: '@(41ca40)', cpu: 37, thread: 84697, -; CHECK-NEXT: kind: function-exit, tsc: 3315356841454802 } -; CHECK-NEXT: - { type: 0, func-id: 3, function: '@(41caa0)', cpu: 37, thread: 84697, -; CHECK-NEXT: kind: function-exit, tsc: 3315356841494828 } +; CHECK-NEXT: - { type: 0, func-id: 3, function: '@(41caa0)', cpu: 37, thread: 84697, kind: function-enter, tsc: 3315356841453914 } +; CHECK-NEXT: - { type: 0, func-id: 2, function: '@(41ca70)', cpu: 37, thread: 84697, kind: function-enter, tsc: 3315356841454542 } +; CHECK-NEXT: - { type: 0, func-id: 2, function: '@(41ca70)', cpu: 37, thread: 84697, kind: function-exit, tsc: 3315356841454670 } +; CHECK-NEXT: - { type: 0, func-id: 1, function: '@(41ca40)', cpu: 37, thread: 84697, kind: function-enter, tsc: 3315356841454762 } +; CHECK-NEXT: - { type: 0, func-id: 1, function: '@(41ca40)', cpu: 37, thread: 84697, kind: function-exit, tsc: 3315356841454802 } +; CHECK-NEXT: - { type: 0, func-id: 3, function: '@(41caa0)', cpu: 37, thread: 84697, kind: function-exit, tsc: 3315356841494828 } ; CHECK-NEXT: ... Modified: vendor/llvm/dist/test/tools/llvm-xray/X86/convert-with-yaml-instrmap.txt ============================================================================== --- vendor/llvm/dist/test/tools/llvm-xray/X86/convert-with-yaml-instrmap.txt Tue Feb 28 20:51:20 2017 (r314410) +++ vendor/llvm/dist/test/tools/llvm-xray/X86/convert-with-yaml-instrmap.txt Tue Feb 28 21:07:18 2017 (r314411) @@ -8,16 +8,10 @@ ; CHECK-NEXT: nonstop-tsc: true ; CHECK-NEXT: cycle-frequency: 2601000000 ; CHECK-NEXT: records: -; CHECK-NEXT: - { type: 0, func-id: 3, function: '3', cpu: 37, thread: 84697, kind: function-enter, -; CHECK-NEXT: tsc: 3315356841453914 } -; CHECK-NEXT: - { type: 0, func-id: 2, function: '2', cpu: 37, thread: 84697, kind: function-enter, -; CHECK-NEXT: tsc: 3315356841454542 } -; CHECK-NEXT: - { type: 0, func-id: 2, function: '2', cpu: 37, thread: 84697, kind: function-exit, -; CHECK-NEXT: tsc: 3315356841454670 } -; CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 37, thread: 84697, kind: function-enter, -; CHECK-NEXT: tsc: 3315356841454762 } -; CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 37, thread: 84697, kind: function-exit, -; CHECK-NEXT: tsc: 3315356841454802 } -; CHECK-NEXT: - { type: 0, func-id: 3, function: '3', cpu: 37, thread: 84697, kind: function-exit, -; CHECK-NEXT: tsc: 3315356841494828 } +; CHECK-NEXT: - { type: 0, func-id: 3, function: '3', cpu: 37, thread: 84697, kind: function-enter, tsc: 3315356841453914 } +; CHECK-NEXT: - { type: 0, func-id: 2, function: '2', cpu: 37, thread: 84697, kind: function-enter, tsc: 3315356841454542 } +; CHECK-NEXT: - { type: 0, func-id: 2, function: '2', cpu: 37, thread: 84697, kind: function-exit, tsc: 3315356841454670 } +; CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 37, thread: 84697, kind: function-enter, tsc: 3315356841454762 } +; CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 37, thread: 84697, kind: function-exit, tsc: 3315356841454802 } +; CHECK-NEXT: - { type: 0, func-id: 3, function: '3', cpu: 37, thread: 84697, kind: function-exit, tsc: 3315356841494828 } ; CHECK-NEXT: ... Modified: vendor/llvm/dist/test/tools/llvm-xray/X86/extract-instrmap.ll ============================================================================== --- vendor/llvm/dist/test/tools/llvm-xray/X86/extract-instrmap.ll Tue Feb 28 20:51:20 2017 (r314410) +++ vendor/llvm/dist/test/tools/llvm-xray/X86/extract-instrmap.ll Tue Feb 28 21:07:18 2017 (r314411) @@ -4,12 +4,8 @@ ; RUN: llvm-xray extract %S/Inputs/elf64-example.bin | FileCheck %s ; CHECK: --- -; CHECK-NEXT: - { id: 1, address: 0x000000000041C900, function: 0x000000000041C900, kind: function-enter, -; CHECK-NEXT: always-instrument: true } -; CHECK-NEXT: - { id: 1, address: 0x000000000041C912, function: 0x000000000041C900, kind: function-exit, -; CHECK-NEXT: always-instrument: true } -; CHECK-NEXT: - { id: 2, address: 0x000000000041C930, function: 0x000000000041C930, kind: function-enter, -; CHECK-NEXT: always-instrument: true } -; CHECK-NEXT: - { id: 2, address: 0x000000000041C946, function: 0x000000000041C930, kind: function-exit, -; CHECK-NEXT: always-instrument: true } +; CHECK-NEXT: - { id: 1, address: 0x000000000041C900, function: 0x000000000041C900, kind: function-enter, always-instrument: true } +; CHECK-NEXT: - { id: 1, address: 0x000000000041C912, function: 0x000000000041C900, kind: function-exit, always-instrument: true } +; CHECK-NEXT: - { id: 2, address: 0x000000000041C930, function: 0x000000000041C930, kind: function-enter, always-instrument: true } +; CHECK-NEXT: - { id: 2, address: 0x000000000041C946, function: 0x000000000041C930, kind: function-exit, always-instrument: true } ; CHECK-NEXT: ... Modified: vendor/llvm/dist/tools/llvm-xray/xray-converter.cc ============================================================================== --- vendor/llvm/dist/tools/llvm-xray/xray-converter.cc Tue Feb 28 20:51:20 2017 (r314410) +++ vendor/llvm/dist/tools/llvm-xray/xray-converter.cc Tue Feb 28 21:07:18 2017 (r314411) @@ -98,7 +98,7 @@ void TraceConverter::exportAsYAML(const : std::to_string(R.FuncId), R.TSC, R.TId}); } - Output Out(OS); + Output Out(OS, nullptr, 0); Out << Trace; } Modified: vendor/llvm/dist/tools/llvm-xray/xray-extract.cc ============================================================================== --- vendor/llvm/dist/tools/llvm-xray/xray-extract.cc Tue Feb 28 20:51:20 2017 (r314410) +++ vendor/llvm/dist/tools/llvm-xray/xray-extract.cc Tue Feb 28 21:07:18 2017 (r314411) @@ -270,7 +270,7 @@ void InstrumentationMapExtractor::export YAMLSleds.push_back({FunctionIds[Sled.Function], Sled.Address, Sled.Function, Sled.Kind, Sled.AlwaysInstrument}); } - Output Out(OS); + Output Out(OS, nullptr, 0); Out << YAMLSleds; } From owner-svn-src-all@freebsd.org Tue Feb 28 21:07:24 2017 Return-Path: Delivered-To: svn-src-all@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 4A4D7CF200B; Tue, 28 Feb 2017 21:07:24 +0000 (UTC) (envelope-from dim@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 01842D8B; Tue, 28 Feb 2017 21:07:23 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SL7NLN039753; Tue, 28 Feb 2017 21:07:23 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SL7NLu039752; Tue, 28 Feb 2017 21:07:23 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201702282107.v1SL7NLu039752@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 28 Feb 2017 21:07:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314412 - vendor/llvm/llvm-release_40-r296509 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 21:07:24 -0000 Author: dim Date: Tue Feb 28 21:07:22 2017 New Revision: 314412 URL: https://svnweb.freebsd.org/changeset/base/314412 Log: Tag llvm release_40 branch r296509. Added: vendor/llvm/llvm-release_40-r296509/ - copied from r314411, vendor/llvm/dist/ From owner-svn-src-all@freebsd.org Tue Feb 28 21:07:30 2017 Return-Path: Delivered-To: svn-src-all@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 625CFCF2044; Tue, 28 Feb 2017 21:07:30 +0000 (UTC) (envelope-from dim@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 09B66DE1; Tue, 28 Feb 2017 21:07:29 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SL7ThD039802; Tue, 28 Feb 2017 21:07:29 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SL7T6Z039801; Tue, 28 Feb 2017 21:07:29 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201702282107.v1SL7T6Z039801@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 28 Feb 2017 21:07:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314413 - vendor/clang/clang-release_40-r296509 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 21:07:30 -0000 Author: dim Date: Tue Feb 28 21:07:28 2017 New Revision: 314413 URL: https://svnweb.freebsd.org/changeset/base/314413 Log: Tag clang release_40 branch r296509. Added: vendor/clang/clang-release_40-r296509/ - copied from r314412, vendor/clang/dist/ From owner-svn-src-all@freebsd.org Tue Feb 28 21:07:33 2017 Return-Path: Delivered-To: svn-src-all@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 DFCB3CF205D; Tue, 28 Feb 2017 21:07:33 +0000 (UTC) (envelope-from dim@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 931FEE49; Tue, 28 Feb 2017 21:07:33 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SL7Whh039848; Tue, 28 Feb 2017 21:07:32 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SL7Wa0039847; Tue, 28 Feb 2017 21:07:32 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201702282107.v1SL7Wa0039847@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 28 Feb 2017 21:07:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314414 - vendor/compiler-rt/compiler-rt-release_40-r296509 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 21:07:34 -0000 Author: dim Date: Tue Feb 28 21:07:32 2017 New Revision: 314414 URL: https://svnweb.freebsd.org/changeset/base/314414 Log: Tag compiler-rt release_40 branch r296509. Added: vendor/compiler-rt/compiler-rt-release_40-r296509/ - copied from r314413, vendor/compiler-rt/dist/ From owner-svn-src-all@freebsd.org Tue Feb 28 21:07:39 2017 Return-Path: Delivered-To: svn-src-all@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 6FEBCCF20B0; Tue, 28 Feb 2017 21:07:39 +0000 (UTC) (envelope-from dim@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 269EEEF9; Tue, 28 Feb 2017 21:07:39 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SL7cew039898; Tue, 28 Feb 2017 21:07:38 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SL7c0a039896; Tue, 28 Feb 2017 21:07:38 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201702282107.v1SL7c0a039896@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 28 Feb 2017 21:07:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314415 - vendor/libc++/libc++-release_40-r296509 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 21:07:39 -0000 Author: dim Date: Tue Feb 28 21:07:38 2017 New Revision: 314415 URL: https://svnweb.freebsd.org/changeset/base/314415 Log: Tag libc++ release_40 branch r296509. Added: vendor/libc++/libc++-release_40-r296509/ - copied from r314414, vendor/libc++/dist/ From owner-svn-src-all@freebsd.org Tue Feb 28 21:07:42 2017 Return-Path: Delivered-To: svn-src-all@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 C5F37CF20E5; Tue, 28 Feb 2017 21:07:42 +0000 (UTC) (envelope-from dim@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 77DF5F4A; Tue, 28 Feb 2017 21:07:42 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SL7fiC039948; Tue, 28 Feb 2017 21:07:41 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SL7f9j039947; Tue, 28 Feb 2017 21:07:41 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201702282107.v1SL7f9j039947@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 28 Feb 2017 21:07:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314416 - vendor/lld/lld-release_40-r296509 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 21:07:42 -0000 Author: dim Date: Tue Feb 28 21:07:41 2017 New Revision: 314416 URL: https://svnweb.freebsd.org/changeset/base/314416 Log: Tag lld release_40 branch r296509. Added: vendor/lld/lld-release_40-r296509/ - copied from r314415, vendor/lld/dist/ From owner-svn-src-all@freebsd.org Tue Feb 28 21:07:48 2017 Return-Path: Delivered-To: svn-src-all@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 3FF04CF213A; Tue, 28 Feb 2017 21:07:48 +0000 (UTC) (envelope-from dim@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 E6E46FFF; Tue, 28 Feb 2017 21:07:47 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SL7kP6039997; Tue, 28 Feb 2017 21:07:46 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SL7kM0039996; Tue, 28 Feb 2017 21:07:46 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201702282107.v1SL7kM0039996@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 28 Feb 2017 21:07:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314417 - vendor/lldb/lldb-release_40-r296509 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 21:07:48 -0000 Author: dim Date: Tue Feb 28 21:07:46 2017 New Revision: 314417 URL: https://svnweb.freebsd.org/changeset/base/314417 Log: Tag lldb release_40 branch r296509. Added: vendor/lldb/lldb-release_40-r296509/ - copied from r314416, vendor/lldb/dist/ From owner-svn-src-all@freebsd.org Tue Feb 28 21:18:46 2017 Return-Path: Delivered-To: svn-src-all@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 F2B49CF23B4; Tue, 28 Feb 2017 21:18:46 +0000 (UTC) (envelope-from jkim@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 C2976DD7; Tue, 28 Feb 2017 21:18:46 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SLIjk4044324; Tue, 28 Feb 2017 21:18:45 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SLIjke044323; Tue, 28 Feb 2017 21:18:45 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201702282118.v1SLIjke044323@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Tue, 28 Feb 2017 21:18:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314419 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 21:18:47 -0000 Author: jkim Date: Tue Feb 28 21:18:45 2017 New Revision: 314419 URL: https://svnweb.freebsd.org/changeset/base/314419 Log: Include stdio.h to fix libsbuf build. Reviewed by: scottl Modified: head/sys/kern/subr_prf.c Modified: head/sys/kern/subr_prf.c ============================================================================== --- head/sys/kern/subr_prf.c Tue Feb 28 21:18:23 2017 (r314418) +++ head/sys/kern/subr_prf.c Tue Feb 28 21:18:45 2017 (r314419) @@ -76,6 +76,7 @@ __FBSDID("$FreeBSD$"); #include #else #include +#include #endif #ifdef _KERNEL From owner-svn-src-all@freebsd.org Tue Feb 28 21:27:53 2017 Return-Path: Delivered-To: svn-src-all@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 34128CF25FE; Tue, 28 Feb 2017 21:27:53 +0000 (UTC) (envelope-from scottl@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 03BEF66B; Tue, 28 Feb 2017 21:27:52 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SLRqna048320; Tue, 28 Feb 2017 21:27:52 GMT (envelope-from scottl@FreeBSD.org) Received: (from scottl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SLRqDH048319; Tue, 28 Feb 2017 21:27:52 GMT (envelope-from scottl@FreeBSD.org) Message-Id: <201702282127.v1SLRqDH048319@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: scottl set sender to scottl@FreeBSD.org using -f From: Scott Long Date: Tue, 28 Feb 2017 21:27:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314420 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 21:27:53 -0000 Author: scottl Date: Tue Feb 28 21:27:51 2017 New Revision: 314420 URL: https://svnweb.freebsd.org/changeset/base/314420 Log: Provide a comment on why stdio.h needs to be included. Modified: head/sys/kern/subr_prf.c Modified: head/sys/kern/subr_prf.c ============================================================================== --- head/sys/kern/subr_prf.c Tue Feb 28 21:18:45 2017 (r314419) +++ head/sys/kern/subr_prf.c Tue Feb 28 21:27:51 2017 (r314420) @@ -76,6 +76,13 @@ __FBSDID("$FreeBSD$"); #include #else #include +#endif + +/* + * This is needed for sbuf_putbuf() when compiled into userland. Due to the + * shared nature of this file, it's the only place to put it. + */ +#ifndef _KERNEL #include #endif From owner-svn-src-all@freebsd.org Tue Feb 28 21:30:45 2017 Return-Path: Delivered-To: svn-src-all@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 EDFCECF26D1; Tue, 28 Feb 2017 21:30:45 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebi.us (glebi.us [96.95.210.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cell.glebi.us", Issuer "cell.glebi.us" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id D2DE2911; Tue, 28 Feb 2017 21:30:45 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebi.us (localhost [127.0.0.1]) by cell.glebi.us (8.15.2/8.15.2) with ESMTPS id v1SLUiYS017237 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 28 Feb 2017 13:30:44 -0800 (PST) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebi.us (8.15.2/8.15.2/Submit) id v1SLUiXU017236; Tue, 28 Feb 2017 13:30:44 -0800 (PST) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebi.us: glebius set sender to glebius@FreeBSD.org using -f Date: Tue, 28 Feb 2017 13:30:44 -0800 From: Gleb Smirnoff To: Benjamin Kaduk Cc: Ravi Pokala , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , John Baldwin Subject: Re: svn commit: r314373 - in head: . etc/defaults etc/rc.d lib/libc/regex share/man/man4/man4.i386 share/man/man5 sys/amd64/conf sys/boot/forth sys/compat/svr4 sys/conf sys/dev/streams sys/i386/conf sy... Message-ID: <20170228213044.GK1044@FreeBSD.org> References: <201702280514.v1S5EhPq060885@repo.freebsd.org> <1969312.3TTRqhLH9r@ralph.baldwin.cx> <20170228193605.GJ1044@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.7.2 (2016-11-26) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 21:30:46 -0000 On Tue, Feb 28, 2017 at 01:39:12PM -0600, Benjamin Kaduk wrote: B> > I don't think this deserves UPDATING entry, since it doesn't require B> > any action from a person who updates from sources. B> > B> > I don't think this requires __FreeBSD_version bump, since the latter B> > is used to assist compilation of open source application that use B> > changed API. The change removed support to run binaries. B> > B> B> That is not the only use of __FreeBSD_version, which is (at least) exposed B> to the ports collection and can cause conditional changes in what are B> shipped by ports. B> Which is not to say that any current ports ship affected binaries, of B> course, but just to point out that the scope of the symbol is broader than B> stated. How can I check the __FreeBSD_version in a port Makefile? My understanding is that there is no standard way for such thing. Of course I can parse /usr/include/sys/param.h... My understanding is that the constant is for sources only: https://www.freebsd.org/doc/en/books/porters-handbook/porting-versions.html -- Totus tuus, Glebius. From owner-svn-src-all@freebsd.org Tue Feb 28 21:32:52 2017 Return-Path: Delivered-To: svn-src-all@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 39109CF2833; Tue, 28 Feb 2017 21:32:52 +0000 (UTC) (envelope-from bjkfbsd@gmail.com) Received: from mail-wr0-x236.google.com (mail-wr0-x236.google.com [IPv6:2a00:1450:400c:c0c::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E50B4D03; Tue, 28 Feb 2017 21:32:51 +0000 (UTC) (envelope-from bjkfbsd@gmail.com) Received: by mail-wr0-x236.google.com with SMTP id u48so17561859wrc.0; Tue, 28 Feb 2017 13:32:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=IEm+IZjSqj9pSDQK3T1C55pkV5KO9nal4pvg6Zm9FWI=; b=cTipb+CW2fQunVFrDolzk1hkU387WzDIOMXnSK2p7wa6agc5pAeXLJZy0/5CAym8kY q5PSPLdZL79bNu8SmwHGy4BbzhuYHqvnr2zOAkXMg6DzS3QygM6yD7unvGg6bAmBt4qV KbOwbVmZ72x8vZv1ahR20hJLaviUZ4FDwaN6Gx/7ecnV113D4DV2PFAILO/EbnCXIhIV WLiwL8wKBAzqlN73Kk4+YoL3hSOR82znY6aoeR8aTVMU3Q2f0370vcPA5TNjRiqHT4sD 5CCqVafbx9+13QWQ2Nl6ajt7q8zjhIoN0642IawcvBI57vwTb5Cv6JDY8rIyft2xBw66 XqIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=IEm+IZjSqj9pSDQK3T1C55pkV5KO9nal4pvg6Zm9FWI=; b=eEuJ3FO3zbzA8lzJxysGeoH06cULf4k95374oZrhSeQoC1nTSBL+dkO4N12/QIQ3k4 k5FObzXgUQg+TFnlGsbvqLe1sWXeW/KOqlSLzTysirDnTEKOh/urP2PK9QUZ80U8pNNZ g+Uy3AYGuOpiWWGznlztTE2ORwqtaeu0Sbvbb1xYqm9m6ovpOK9nGkdnP/jcwucGJYHI nFnON7Ijw62Wgyk4qE4hXm5RFD9EP1JVhhJ8snqnWetDS4DXdWGoLh7SgNcjyjs1L+Xi +aacMeD6h+PrN/J/dtr9pLRHN2hfiOSKdMgQHjGao6Um0mlQv4XTMtKkqjuErSCPudcN dWPg== X-Gm-Message-State: AMke39lVAFiw7CH7KeCeDCvneHSv20avwGZb39zv0Q5xHjCK0UJc/oQCFghHrxlWC+7ZmstTRJJeZ9zTPucoVg== X-Received: by 10.223.133.205 with SMTP id 13mr4436112wru.1.1488317570147; Tue, 28 Feb 2017 13:32:50 -0800 (PST) MIME-Version: 1.0 Received: by 10.80.195.3 with HTTP; Tue, 28 Feb 2017 13:32:49 -0800 (PST) In-Reply-To: <20170228213044.GK1044@FreeBSD.org> References: <201702280514.v1S5EhPq060885@repo.freebsd.org> <1969312.3TTRqhLH9r@ralph.baldwin.cx> <20170228193605.GJ1044@FreeBSD.org> <20170228213044.GK1044@FreeBSD.org> From: Benjamin Kaduk Date: Tue, 28 Feb 2017 15:32:49 -0600 Message-ID: Subject: Re: svn commit: r314373 - in head: . etc/defaults etc/rc.d lib/libc/regex share/man/man4/man4.i386 share/man/man5 sys/amd64/conf sys/boot/forth sys/compat/svr4 sys/conf sys/dev/streams sys/i386/conf sy... To: Gleb Smirnoff Cc: Ravi Pokala , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , John Baldwin Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 21:32:52 -0000 On Tue, Feb 28, 2017 at 3:30 PM, Gleb Smirnoff wrote: > On Tue, Feb 28, 2017 at 01:39:12PM -0600, Benjamin Kaduk wrote: > B> > I don't think this deserves UPDATING entry, since it doesn't require > B> > any action from a person who updates from sources. > B> > > B> > I don't think this requires __FreeBSD_version bump, since the latter > B> > is used to assist compilation of open source application that use > B> > changed API. The change removed support to run binaries. > B> > > B> > B> That is not the only use of __FreeBSD_version, which is (at least) > exposed > B> to the ports collection and can cause conditional changes in what are > B> shipped by ports. > B> Which is not to say that any current ports ship affected binaries, of > B> course, but just to point out that the scope of the symbol is broader > than > B> stated. > > How can I check the __FreeBSD_version in a port Makefile? My understanding > is that there is no standard way for such thing. Of course I can parse > /usr/include/sys/param.h... > > My understanding is that the constant is for sources only: > > https://www.freebsd.org/doc/en/books/porters-handbook/ > porting-versions.html > > Look for OSVERSION in /usr/ports/Mk/bsd.port.mk -Ben From owner-svn-src-all@freebsd.org Tue Feb 28 21:39:02 2017 Return-Path: Delivered-To: svn-src-all@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 44070CF2955; Tue, 28 Feb 2017 21:39:02 +0000 (UTC) (envelope-from imp@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 13D17F76; Tue, 28 Feb 2017 21:39:02 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SLd12J052502; Tue, 28 Feb 2017 21:39:01 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SLd1Pe052501; Tue, 28 Feb 2017 21:39:01 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201702282139.v1SLd1Pe052501@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 28 Feb 2017 21:39:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314422 - head/sys/mips/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 21:39:02 -0000 Author: imp Date: Tue Feb 28 21:39:00 2017 New Revision: 314422 URL: https://svnweb.freebsd.org/changeset/base/314422 Log: Update PICOSTATION_M2HP Make the random number generator work so we can do WPA encryption on the AP's. Submitted by: Michael Vale Pull Request: https://github.com/freebsd/freebsd/pull/16 Modified: head/sys/mips/conf/PICOSTATION_M2HP Modified: head/sys/mips/conf/PICOSTATION_M2HP ============================================================================== --- head/sys/mips/conf/PICOSTATION_M2HP Tue Feb 28 21:30:26 2017 (r314421) +++ head/sys/mips/conf/PICOSTATION_M2HP Tue Feb 28 21:39:00 2017 (r314422) @@ -68,3 +68,6 @@ device arswitch # Enable GPIO device gpio device gpioled + +# RNG +device random From owner-svn-src-all@freebsd.org Tue Feb 28 21:39:09 2017 Return-Path: Delivered-To: svn-src-all@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 E3D33CF297C; Tue, 28 Feb 2017 21:39:09 +0000 (UTC) (envelope-from imp@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 B3C1FFD2; Tue, 28 Feb 2017 21:39:09 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SLd8DK052556; Tue, 28 Feb 2017 21:39:08 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SLd8el052555; Tue, 28 Feb 2017 21:39:08 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201702282139.v1SLd8el052555@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 28 Feb 2017 21:39:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314423 - head/sys/mips/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 21:39:10 -0000 Author: imp Date: Tue Feb 28 21:39:08 2017 New Revision: 314423 URL: https://svnweb.freebsd.org/changeset/base/314423 Log: Fix arge0 mdio bus This makes arge0 phy's attach. Submitted by: Michael Vale Pull Request: https://github.com/freebsd/freebsd/pull/16 Modified: head/sys/mips/conf/PICOSTATION_M2HP.hints Modified: head/sys/mips/conf/PICOSTATION_M2HP.hints ============================================================================== --- head/sys/mips/conf/PICOSTATION_M2HP.hints Tue Feb 28 21:39:00 2017 (r314422) +++ head/sys/mips/conf/PICOSTATION_M2HP.hints Tue Feb 28 21:39:08 2017 (r314423) @@ -1,8 +1,8 @@ # $FreeBSD$ -# arge1 MDIO bus +# arge0 MDIO bus hint.argemdio.0.at="nexus0" -hint.argemdio.0.maddr=0x1a000000 +hint.argemdio.0.maddr=0x19000000 hint.argemdio.0.msize=0x1000 hint.argemdio.0.order=0 From owner-svn-src-all@freebsd.org Tue Feb 28 21:47:02 2017 Return-Path: Delivered-To: svn-src-all@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 27F0BCF2CAA; Tue, 28 Feb 2017 21:47:02 +0000 (UTC) (envelope-from vangyzen@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 CECDF8E3; Tue, 28 Feb 2017 21:47:01 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SLl0ee056375; Tue, 28 Feb 2017 21:47:00 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SLl0iF056373; Tue, 28 Feb 2017 21:47:00 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <201702282147.v1SLl0iF056373@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen Date: Tue, 28 Feb 2017 21:47:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314424 - in head: include lib/libc/gen X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 21:47:02 -0000 Author: vangyzen Date: Tue Feb 28 21:47:00 2017 New Revision: 314424 URL: https://svnweb.freebsd.org/changeset/base/314424 Log: Sort declaration of sem_clockwait_np Also mention in sem_timedwait(3), because POSIX does, and because the user will need it for clockid_t, struct timespec, and TIMER_ABSTIME. Reported by: bde MFC after: 9 days X-MFC with: r314179 Sponsored by: Dell EMC Modified: head/include/semaphore.h head/lib/libc/gen/sem_timedwait.3 Modified: head/include/semaphore.h ============================================================================== --- head/include/semaphore.h Tue Feb 28 21:39:08 2017 (r314423) +++ head/include/semaphore.h Tue Feb 28 21:47:00 2017 (r314424) @@ -52,6 +52,10 @@ typedef struct _sem sem_t; struct timespec; __BEGIN_DECLS +#if __BSD_VISIBLE +int sem_clockwait_np(sem_t * __restrict, __clockid_t, int, + const struct timespec *, struct timespec *); +#endif int sem_close(sem_t *); int sem_destroy(sem_t *); int sem_getvalue(sem_t * __restrict, int * __restrict); @@ -59,10 +63,6 @@ int sem_init(sem_t *, int, unsigned int sem_t *sem_open(const char *, int, ...); int sem_post(sem_t *); int sem_timedwait(sem_t * __restrict, const struct timespec * __restrict); -#if __BSD_VISIBLE -int sem_clockwait_np(sem_t * __restrict, __clockid_t, int, - const struct timespec *, struct timespec *); -#endif int sem_trywait(sem_t *); int sem_unlink(const char *); int sem_wait(sem_t *); Modified: head/lib/libc/gen/sem_timedwait.3 ============================================================================== --- head/lib/libc/gen/sem_timedwait.3 Tue Feb 28 21:39:08 2017 (r314423) +++ head/lib/libc/gen/sem_timedwait.3 Tue Feb 28 21:47:00 2017 (r314424) @@ -34,7 +34,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 23, 2017 +.Dd February 28, 2017 .Dt SEM_TIMEDWAIT 3 .Os .Sh NAME @@ -45,6 +45,7 @@ .Lb libc .Sh SYNOPSIS .In semaphore.h +.In time.h .Ft int .Fn sem_timedwait "sem_t * restrict sem" "const struct timespec * restrict abs_timeout" .Ft int From owner-svn-src-all@freebsd.org Tue Feb 28 22:09:33 2017 Return-Path: Delivered-To: svn-src-all@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 6363CCF13A3; Tue, 28 Feb 2017 22:09:33 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-wr0-f175.google.com (mail-wr0-f175.google.com [209.85.128.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0463C64F; Tue, 28 Feb 2017 22:09:32 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-wr0-f175.google.com with SMTP id g10so18026717wrg.2; Tue, 28 Feb 2017 14:09:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=YXmYtCjG+mYe96kcVzXR28Qabwo34D5yNekZZZQdvMI=; b=k9bQkGX+GEvaGFvWTRKwgEldNfVTc50vLhfDWBDFHLGbAKhkpUQwu+Ol5gL6bdpF1W k5yNj7K4goBAc0uf9DTmYRxruRtBNUK6H0WL7owycZ/kTnyAN28YUiiskmTHiUkprjTa 3TtrJak6fq/jZk2XGnhyJ9tcxrER3XPOIvndd7NZRNHjrOeShnzVayygqpzeHVF8e5x5 EucyxOvA2klMSDDrOHfKxiEtKAxVfk1nIfYkd7wmgt9hTwaeba46FuIqvN2n972tZFN/ VTXRjZ5SSP9NtRKF93Tnp9rP5m5FRSlT30HljUvVlxgd+R//xzK6wAjBVfjYR1JQrLbU sR5w== X-Gm-Message-State: AMke39lvHAKmOS8zIJQsIkXawhbA0vFChmfFvP/nGOFvWHGXt3GXjCJiRnfbUcgejDMo9A== X-Received: by 10.223.155.193 with SMTP id e1mr3778191wrc.86.1488319365021; Tue, 28 Feb 2017 14:02:45 -0800 (PST) Received: from mail-wr0-f174.google.com (mail-wr0-f174.google.com. [209.85.128.174]) by smtp.gmail.com with ESMTPSA id 63sm2636438wmp.9.2017.02.28.14.02.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Feb 2017 14:02:44 -0800 (PST) Received: by mail-wr0-f174.google.com with SMTP id l37so17918190wrc.1; Tue, 28 Feb 2017 14:02:44 -0800 (PST) X-Received: by 10.223.146.131 with SMTP id 3mr4472818wrn.198.1488319364764; Tue, 28 Feb 2017 14:02:44 -0800 (PST) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 10.80.152.82 with HTTP; Tue, 28 Feb 2017 14:02:44 -0800 (PST) In-Reply-To: <201702282127.v1SLRqDH048319@repo.freebsd.org> References: <201702282127.v1SLRqDH048319@repo.freebsd.org> From: Conrad Meyer Date: Tue, 28 Feb 2017 14:02:44 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r314420 - head/sys/kern To: Scott Long Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 22:09:33 -0000 On Tue, Feb 28, 2017 at 1:27 PM, Scott Long wrote: > Author: scottl > Date: Tue Feb 28 21:27:51 2017 > New Revision: 314420 > URL: https://svnweb.freebsd.org/changeset/base/314420 > > Log: > Provide a comment on why stdio.h needs to be included. > > Modified: > head/sys/kern/subr_prf.c > > Modified: head/sys/kern/subr_prf.c > ============================================================================== > --- head/sys/kern/subr_prf.c Tue Feb 28 21:18:45 2017 (r314419) > +++ head/sys/kern/subr_prf.c Tue Feb 28 21:27:51 2017 (r314420) > @@ -76,6 +76,13 @@ __FBSDID("$FreeBSD$"); > #include > #else > #include > +#endif > + > +/* > + * This is needed for sbuf_putbuf() when compiled into userland. Due to the > + * shared nature of this file, it's the only place to put it. Couldn't it go in the #else clause above? Best, Conrad From owner-svn-src-all@freebsd.org Tue Feb 28 22:17:24 2017 Return-Path: Delivered-To: svn-src-all@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 790C5CF1673; Tue, 28 Feb 2017 22:17:24 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 0F10CB53; Tue, 28 Feb 2017 22:17:23 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id v1SMHIkM021775 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 1 Mar 2017 00:17:19 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua v1SMHIkM021775 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id v1SMHIPR021774; Wed, 1 Mar 2017 00:17:18 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 1 Mar 2017 00:17:18 +0200 From: Konstantin Belousov To: Gleb Smirnoff Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314373 - in head: . etc/defaults etc/rc.d lib/libc/regex share/man/man4/man4.i386 share/man/man5 sys/amd64/conf sys/boot/forth sys/compat/svr4 sys/conf sys/dev/streams sys/i386/conf sy... Message-ID: <20170228221718.GL2092@kib.kiev.ua> References: <201702280514.v1S5EhPq060885@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201702280514.v1S5EhPq060885@repo.freebsd.org> User-Agent: Mutt/1.7.2 (2016-11-26) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 22:17:24 -0000 On Tue, Feb 28, 2017 at 05:14:43AM +0000, Gleb Smirnoff wrote: > Author: glebius > Date: Tue Feb 28 05:14:42 2017 > New Revision: 314373 > URL: https://svnweb.freebsd.org/changeset/base/314373 > > Log: > Remove SVR4 (System V Release 4) binary compatibility support. > > UNIX System V Release 4 is operating system released in 1988. It ceased > to exist in early 2000-s. It is also Solaris ABI which was emulated. Since the stuff is removed, the i386 LSOL26CALLS LDT selector is no longer needed. From owner-svn-src-all@freebsd.org Tue Feb 28 22:18:07 2017 Return-Path: Delivered-To: svn-src-all@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 2387CCF16E6; Tue, 28 Feb 2017 22:18:07 +0000 (UTC) (envelope-from asomers@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 E2B2CC94; Tue, 28 Feb 2017 22:18:06 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SMI5Vl068130; Tue, 28 Feb 2017 22:18:05 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SMI5Is068122; Tue, 28 Feb 2017 22:18:05 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201702282218.v1SMI5Is068122@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 28 Feb 2017 22:18:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314425 - in stable/10: etc/mtree sbin/devd usr.bin/cmp usr.bin/cmp/tests usr.bin/tail usr.bin/tail/tests usr.sbin/route6d X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 22:18:07 -0000 Author: asomers Date: Tue Feb 28 22:18:05 2017 New Revision: 314425 URL: https://svnweb.freebsd.org/changeset/base/314425 Log: MFC r311572, r311895, r311928, r311985, r312395, r312417 r311572: Fix file descriptor leaks in cmp(1) Also, add a few test cases Reported by: Coverity CID: 271624 275338 Reviewed by: ngie MFC after: 4 weeks Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D9074 r311895: Fix memory leaks during "tail -r" of an irregular file * Rewrite r_buf to use standard tail queues instead of a hand-rolled circular linked list. Free dynamic allocations when done. * Remove an optimization for the case where the file is a multiple of 128KB in size and there is a scarcity of memory. * Add ATF tests for "tail -r" and its variants. Reported by: Valgrind Reviewed by: ngie MFC after: 4 weeks Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D9067 r311928: Fix build of usr.bin/tail with GCC Submitted by: pluknet Reported by: pluknet MFC after: 27 days X-MFC-with: 311895 Sponsored by: Spectra Logic Corp r311985: Fix uninitialized variable CIDs in route6d The variables in question are actually return arguments, but it's still good form to initialize them. Reported by: Coverity CID: 979679 979680 MFC after: 4 weeks Sponsored by: Spectra Logic Corp r312395: Fix several Coverity CIDs in devd CID 1362055, 1362054: File descriptor leaks during shutdown CID 1362013: Potential null-termination fail with long network device names CID 1362097: Uncaught exception during memory pressure CID 1362017, 1362016: Unchecked errors, possibly resulting in weird behavior if two devd instances start at the same time. CID 1362015: Unchecked error that will probably never fail Reported by: Coverity CID: 1362055 1362054 1362013 1362097 1362017 1362016 1362015 MFC after: 4 weeks Sponsored by: Spectra Logic Corp r312417: Fix build of devd with GCC 4.2 Reported by: olivier Pointy-hat-to: asomers MFC after: 27 days X-MFC-with: 312395 Sponsored by: Spectra Logic Corp Added: stable/10/usr.bin/cmp/tests/cmp_test2.sh - copied unchanged from r311572, head/usr.bin/cmp/tests/cmp_test2.sh stable/10/usr.bin/tail/tests/ - copied from r311895, head/usr.bin/tail/tests/ Modified: stable/10/etc/mtree/BSD.tests.dist stable/10/sbin/devd/devd.cc stable/10/usr.bin/cmp/special.c stable/10/usr.bin/cmp/tests/Makefile stable/10/usr.bin/tail/Makefile stable/10/usr.bin/tail/reverse.c stable/10/usr.sbin/route6d/route6d.c Directory Properties: stable/10/ (props changed) Modified: stable/10/etc/mtree/BSD.tests.dist ============================================================================== --- stable/10/etc/mtree/BSD.tests.dist Tue Feb 28 21:47:00 2017 (r314424) +++ stable/10/etc/mtree/BSD.tests.dist Tue Feb 28 22:18:05 2017 (r314425) @@ -608,6 +608,8 @@ regress.multitest.out .. .. + tail + .. tar .. timeout Modified: stable/10/sbin/devd/devd.cc ============================================================================== --- stable/10/sbin/devd/devd.cc Tue Feb 28 21:47:00 2017 (r314424) +++ stable/10/sbin/devd/devd.cc Tue Feb 28 22:18:05 2017 (r314425) @@ -95,6 +95,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include "devd.h" /* C compatible definitions */ @@ -372,7 +373,7 @@ media::do_match(config &c) s = socket(PF_INET, SOCK_DGRAM, 0); if (s >= 0) { memset(&ifmr, 0, sizeof(ifmr)); - strncpy(ifmr.ifm_name, value.c_str(), sizeof(ifmr.ifm_name)); + strlcpy(ifmr.ifm_name, value.c_str(), sizeof(ifmr.ifm_name)); if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) >= 0 && ifmr.ifm_status & IFM_AVALID) { @@ -856,8 +857,10 @@ create_socket(const char *name, int sock if (::bind(fd, (struct sockaddr *) & sun, slen) < 0) err(1, "bind"); listen(fd, 4); - chown(name, 0, 0); /* XXX - root.wheel */ - chmod(name, 0666); + if (chown(name, 0, 0)) /* XXX - root.wheel */ + err(1, "chown"); + if (chmod(name, 0666)) + err(1, "chmod"); return (fd); } @@ -1043,7 +1046,13 @@ event_loop(void) buffer[rv] = '\0'; while (buffer[--rv] == '\n') buffer[rv] = '\0'; - process_event(buffer); + try { + process_event(buffer); + } + catch (std::length_error e) { + devdlog(LOG_ERR, "Dropping event %s " + "due to low memory", buffer); + } } else if (rv < 0) { if (errno != EINTR) break; @@ -1061,6 +1070,8 @@ event_loop(void) if (FD_ISSET(seqpacket_fd, &fds)) new_client(seqpacket_fd, SOCK_SEQPACKET); } + close(seqpacket_fd); + close(stream_fd); close(fd); } @@ -1203,7 +1214,8 @@ check_devd_enabled() if (val == 0) { warnx("Setting " SYSCTL " to 1000"); val = 1000; - sysctlbyname(SYSCTL, NULL, NULL, &val, sizeof(val)); + if (sysctlbyname(SYSCTL, NULL, NULL, &val, sizeof(val))) + err(1, "sysctlbyname"); } } Modified: stable/10/usr.bin/cmp/special.c ============================================================================== --- stable/10/usr.bin/cmp/special.c Tue Feb 28 21:47:00 2017 (r314424) +++ stable/10/usr.bin/cmp/special.c Tue Feb 28 22:18:05 2017 (r314425) @@ -99,6 +99,8 @@ eof: if (ferror(fp1)) } else if (feof(fp2)) eofmsg(file2); + fclose(fp2); + fclose(fp1); if (dfound) exit(DIFF_EXIT); } Modified: stable/10/usr.bin/cmp/tests/Makefile ============================================================================== --- stable/10/usr.bin/cmp/tests/Makefile Tue Feb 28 21:47:00 2017 (r314424) +++ stable/10/usr.bin/cmp/tests/Makefile Tue Feb 28 22:18:05 2017 (r314425) @@ -2,6 +2,7 @@ .include +ATF_TESTS_SH+= cmp_test2 NETBSD_ATF_TESTS_SH= cmp_test .include Copied: stable/10/usr.bin/cmp/tests/cmp_test2.sh (from r311572, head/usr.bin/cmp/tests/cmp_test2.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/usr.bin/cmp/tests/cmp_test2.sh Tue Feb 28 22:18:05 2017 (r314425, copy of r311572, head/usr.bin/cmp/tests/cmp_test2.sh) @@ -0,0 +1,67 @@ +# Copyright (c) 2017 Alan Somers +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +# $FreeBSD$ + +atf_test_case special +special_head() { + atf_set "descr" "Test cmp(1)'s handling of non-regular files" +} +special_body() { + echo 0123456789abcdef > a + echo 0123456789abcdeg > b + cat a | atf_check -s exit:0 cmp a - + cat a | atf_check -s exit:0 cmp - a + cat b | atf_check -s not-exit:0 cmp a - + cat b | atf_check -s not-exit:0 cmp - a + true +} + +atf_test_case symlink +symlink_head() { + atf_set "descr" "Test cmp(1)'s handling of symlinks" +} +symlink_body() { + echo 0123456789abcdef > a + echo 0123456789abcdeg > b + ln -s a a.lnk + ln -s b b.lnk + ln -s a a2.lnk + cp a adup + ln -s adup adup.lnk + atf_check -s exit:0 cmp a a.lnk + atf_check -s exit:0 cmp a.lnk a + atf_check -s not-exit:0 -o ignore cmp a b.lnk + atf_check -s not-exit:0 -o ignore cmp b.lnk a + atf_check -s not-exit:0 -o ignore -e ignore cmp -h a a.lnk + atf_check -s not-exit:0 -o ignore -e ignore cmp -h a.lnk a + atf_check -s exit:0 cmp -h a.lnk a2.lnk + atf_check -s not-exit:0 -o ignore -e ignore cmp -h a.lnk adup.lnk +} + +atf_init_test_cases() +{ + atf_add_test_case special + atf_add_test_case symlink +} Modified: stable/10/usr.bin/tail/Makefile ============================================================================== --- stable/10/usr.bin/tail/Makefile Tue Feb 28 21:47:00 2017 (r314424) +++ stable/10/usr.bin/tail/Makefile Tue Feb 28 22:18:05 2017 (r314425) @@ -1,7 +1,13 @@ # $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +.include + PROG= tail SRCS= forward.c misc.c read.c reverse.c tail.c +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include Modified: stable/10/usr.bin/tail/reverse.c ============================================================================== --- stable/10/usr.bin/tail/reverse.c Tue Feb 28 21:47:00 2017 (r314424) +++ stable/10/usr.bin/tail/reverse.c Tue Feb 28 22:18:05 2017 (r314425) @@ -40,6 +40,7 @@ static char sccsid[] = "@(#)reverse.c 8. __FBSDID("$FreeBSD$"); #include +#include #include #include @@ -169,12 +170,12 @@ r_reg(FILE *fp, const char *fn, enum STY ierr(fn); } -typedef struct bf { - struct bf *next; - struct bf *prev; - int len; - char *l; -} BF; +#define BSZ (128 * 1024) +typedef struct bfelem { + TAILQ_ENTRY(bfelem) entries; + size_t len; + char l[BSZ]; +} bfelem_t; /* * r_buf -- display a non-regular file in reverse order by line. @@ -189,64 +190,44 @@ typedef struct bf { static void r_buf(FILE *fp, const char *fn) { - BF *mark, *tl, *tr; - int ch, len, llen; + struct bfelem *tl, *first = NULL; + size_t llen; char *p; - off_t enomem; + off_t enomem = 0; + TAILQ_HEAD(bfhead, bfelem) head; + + TAILQ_INIT(&head); + + while (!feof(fp)) { + size_t len; - tl = NULL; -#define BSZ (128 * 1024) - for (mark = NULL, enomem = 0;;) { /* * Allocate a new block and link it into place in a doubly * linked list. If out of memory, toss the LRU block and * keep going. */ - if (enomem || (tl = malloc(sizeof(BF))) == NULL || - (tl->l = malloc(BSZ)) == NULL) { - if (!mark) + while ((tl = malloc(sizeof(bfelem_t))) == NULL) { + first = TAILQ_FIRST(&head); + if (TAILQ_EMPTY(&head)) err(1, "malloc"); - if (enomem) - tl = tl->next; - else { - if (tl) - free(tl); - tl = mark; - } - enomem += tl->len; - } else if (mark) { - tl->next = mark; - tl->prev = mark->prev; - mark->prev->next = tl; - mark->prev = tl; - } else { - mark = tl; - mark->next = mark->prev = mark; + enomem += first->len; + TAILQ_REMOVE(&head, first, entries); + free(first); } + TAILQ_INSERT_TAIL(&head, tl, entries); /* Fill the block with input data. */ - for (p = tl->l, len = 0; - len < BSZ && (ch = getc(fp)) != EOF; ++len) - *p++ = ch; - - if (ferror(fp)) { - ierr(fn); - return; - } - - /* - * If no input data for this block and we tossed some data, - * recover it. - */ - if (!len && enomem) { - enomem -= tl->len; - tl = tl->prev; - break; + len = 0; + while ((!feof(fp)) && len < BSZ) { + p = tl->l + len; + len += fread(p, 1, BSZ - len, fp); + if (ferror(fp)) { + ierr(fn); + return; + } } tl->len = len; - if (ch == EOF) - break; } if (enomem) { @@ -255,37 +236,46 @@ r_buf(FILE *fp, const char *fn) } /* - * Step through the blocks in the reverse order read. The last char - * is special, ignore whether newline or not. + * Now print the lines in reverse order + * Outline: + * Scan backward for "\n", + * print forward to the end of the buffers + * free any buffers that start after the "\n" just found + * Loop */ - for (mark = tl;;) { - for (p = tl->l + (len = tl->len) - 1, llen = 0; len--; - --p, ++llen) - if (*p == '\n') { - if (llen) { + tl = TAILQ_LAST(&head, bfhead); + first = TAILQ_FIRST(&head); + while (tl != NULL) { + struct bfelem *temp; + + for (p = tl->l + tl->len - 1, llen = 0; p >= tl->l; + --p, ++llen) { + int start = (tl == first && p == tl->l); + + if ((*p == '\n') || start) { + struct bfelem *tr; + + if (start && llen) + WR(p, llen + 1); + else if (llen) WR(p + 1, llen); - llen = 0; - } - if (tl == mark) - continue; - for (tr = tl->next; tr->len; tr = tr->next) { - WR(tr->l, tr->len); - tr->len = 0; - if (tr == mark) - break; + tr = TAILQ_NEXT(tl, entries); + llen = 0; + if (tr != NULL) { + TAILQ_FOREACH_FROM_SAFE(tr, &head, + entries, temp) { + if (tr->len) + WR(&tr->l, tr->len); + TAILQ_REMOVE(&head, tr, + entries); + free(tr); + } } } + } tl->len = llen; - if ((tl = tl->prev) == mark) - break; - } - tl = tl->next; - if (tl->len) { - WR(tl->l, tl->len); - tl->len = 0; - } - while ((tl = tl->next)->len) { - WR(tl->l, tl->len); - tl->len = 0; + tl = TAILQ_PREV(tl, bfhead, entries); } + TAILQ_REMOVE(&head, first, entries); + free(first); } Modified: stable/10/usr.sbin/route6d/route6d.c ============================================================================== --- stable/10/usr.sbin/route6d/route6d.c Tue Feb 28 21:47:00 2017 (r314424) +++ stable/10/usr.sbin/route6d/route6d.c Tue Feb 28 22:18:05 2017 (r314425) @@ -1063,6 +1063,7 @@ sendpacket(struct sockaddr_in6 *sin6, in iov[0].iov_len = len; m.msg_iov = iov; m.msg_iovlen = 1; + m.msg_flags = 0; if (!idx) { m.msg_control = NULL; m.msg_controllen = 0; @@ -1127,6 +1128,7 @@ riprecv(void) cm = (struct cmsghdr *)cmsgbuf; m.msg_control = (caddr_t)cm; m.msg_controllen = sizeof(cmsgbuf); + m.msg_flags = 0; if ((len = recvmsg(ripsock, &m, 0)) < 0) { fatal("recvmsg"); /*NOTREACHED*/ From owner-svn-src-all@freebsd.org Tue Feb 28 22:22:54 2017 Return-Path: Delivered-To: svn-src-all@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 BC687CF190F; Tue, 28 Feb 2017 22:22:54 +0000 (UTC) (envelope-from imp@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 85E70CA; Tue, 28 Feb 2017 22:22:54 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SMMr88071825; Tue, 28 Feb 2017 22:22:53 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SMMrhS071824; Tue, 28 Feb 2017 22:22:53 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201702282222.v1SMMrhS071824@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 28 Feb 2017 22:22:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314426 - head/sys/dev/usb X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 22:22:54 -0000 Author: imp Date: Tue Feb 28 22:22:53 2017 New Revision: 314426 URL: https://svnweb.freebsd.org/changeset/base/314426 Log: This should have been K3771_INIT. Pointy Hat to: imp@ Modified: head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/usbdevs ============================================================================== --- head/sys/dev/usb/usbdevs Tue Feb 28 22:18:05 2017 (r314425) +++ head/sys/dev/usb/usbdevs Tue Feb 28 22:22:53 2017 (r314426) @@ -2434,7 +2434,7 @@ product HUAWEI E1752 0x1446 3G modem product HUAWEI K4505 0x1464 3G modem product HUAWEI K3765 0x1465 3G modem product HUAWEI E1820 0x14ac E1820 HSPA+ USB Slider -product HUAWEI K3771 0x14c4 K3771 Initial +product HUAWEI K3771_INIT 0x14c4 K3771 Initial product HUAWEI K3770 0x14c9 3G modem product HUAWEI K3771 0x14ca K3771 product HUAWEI K3772 0x14cf K3772 From owner-svn-src-all@freebsd.org Tue Feb 28 22:49:43 2017 Return-Path: Delivered-To: svn-src-all@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 9A0B6CF217A; Tue, 28 Feb 2017 22:49:43 +0000 (UTC) (envelope-from asomers@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 650531E8; Tue, 28 Feb 2017 22:49:43 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SMngIo079973; Tue, 28 Feb 2017 22:49:42 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SMnflQ079965; Tue, 28 Feb 2017 22:49:41 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201702282249.v1SMnflQ079965@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 28 Feb 2017 22:49:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314427 - in stable/11: etc/mtree sbin/devd usr.bin/cmp usr.bin/cmp/tests usr.bin/tail usr.bin/tail/tests usr.sbin/route6d X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 22:49:43 -0000 Author: asomers Date: Tue Feb 28 22:49:41 2017 New Revision: 314427 URL: https://svnweb.freebsd.org/changeset/base/314427 Log: MFC r311572, r311895, r311928, r311985, r312395, r312417 r311572: Fix file descriptor leaks in cmp(1) Also, add a few test cases Reported by: Coverity CID: 271624 275338 Reviewed by: ngie MFC after: 4 weeks Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D9074 r311895: Fix memory leaks during "tail -r" of an irregular file * Rewrite r_buf to use standard tail queues instead of a hand-rolled circular linked list. Free dynamic allocations when done. * Remove an optimization for the case where the file is a multiple of 128KB in size and there is a scarcity of memory. * Add ATF tests for "tail -r" and its variants. Reported by: Valgrind Reviewed by: ngie MFC after: 4 weeks Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D9067 r311928: Fix build of usr.bin/tail with GCC Submitted by: pluknet Reported by: pluknet MFC after: 27 days X-MFC-with: 311895 Sponsored by: Spectra Logic Corp r311985: Fix uninitialized variable CIDs in route6d The variables in question are actually return arguments, but it's still good form to initialize them. Reported by: Coverity CID: 979679 979680 MFC after: 4 weeks Sponsored by: Spectra Logic Corp r312395: Fix several Coverity CIDs in devd CID 1362055, 1362054: File descriptor leaks during shutdown CID 1362013: Potential null-termination fail with long network device names CID 1362097: Uncaught exception during memory pressure CID 1362017, 1362016: Unchecked errors, possibly resulting in weird behavior if two devd instances start at the same time. CID 1362015: Unchecked error that will probably never fail Reported by: Coverity CID: 1362055 1362054 1362013 1362097 1362017 1362016 1362015 MFC after: 4 weeks Sponsored by: Spectra Logic Corp r312417: Fix build of devd with GCC 4.2 Reported by: olivier Pointy-hat-to: asomers MFC after: 27 days X-MFC-with: 312395 Sponsored by: Spectra Logic Corp Added: stable/11/usr.bin/cmp/tests/cmp_test2.sh - copied unchanged from r311572, head/usr.bin/cmp/tests/cmp_test2.sh stable/11/usr.bin/tail/tests/ - copied from r311895, head/usr.bin/tail/tests/ Modified: stable/11/etc/mtree/BSD.tests.dist stable/11/sbin/devd/devd.cc stable/11/usr.bin/cmp/special.c stable/11/usr.bin/cmp/tests/Makefile stable/11/usr.bin/tail/Makefile stable/11/usr.bin/tail/reverse.c stable/11/usr.sbin/route6d/route6d.c Directory Properties: stable/11/ (props changed) Modified: stable/11/etc/mtree/BSD.tests.dist ============================================================================== --- stable/11/etc/mtree/BSD.tests.dist Tue Feb 28 22:22:53 2017 (r314426) +++ stable/11/etc/mtree/BSD.tests.dist Tue Feb 28 22:49:41 2017 (r314427) @@ -632,6 +632,8 @@ .. soelim .. + tail + .. tar .. timeout Modified: stable/11/sbin/devd/devd.cc ============================================================================== --- stable/11/sbin/devd/devd.cc Tue Feb 28 22:22:53 2017 (r314426) +++ stable/11/sbin/devd/devd.cc Tue Feb 28 22:49:41 2017 (r314427) @@ -95,6 +95,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include "devd.h" /* C compatible definitions */ @@ -372,7 +373,7 @@ media::do_match(config &c) s = socket(PF_INET, SOCK_DGRAM, 0); if (s >= 0) { memset(&ifmr, 0, sizeof(ifmr)); - strncpy(ifmr.ifm_name, value.c_str(), sizeof(ifmr.ifm_name)); + strlcpy(ifmr.ifm_name, value.c_str(), sizeof(ifmr.ifm_name)); if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) >= 0 && ifmr.ifm_status & IFM_AVALID) { @@ -871,8 +872,10 @@ create_socket(const char *name, int sock if (::bind(fd, (struct sockaddr *) & sun, slen) < 0) err(1, "bind"); listen(fd, 4); - chown(name, 0, 0); /* XXX - root.wheel */ - chmod(name, 0666); + if (chown(name, 0, 0)) /* XXX - root.wheel */ + err(1, "chown"); + if (chmod(name, 0666)) + err(1, "chmod"); return (fd); } @@ -1058,7 +1061,13 @@ event_loop(void) buffer[rv] = '\0'; while (buffer[--rv] == '\n') buffer[rv] = '\0'; - process_event(buffer); + try { + process_event(buffer); + } + catch (std::length_error e) { + devdlog(LOG_ERR, "Dropping event %s " + "due to low memory", buffer); + } } else if (rv < 0) { if (errno != EINTR) break; @@ -1076,6 +1085,8 @@ event_loop(void) if (FD_ISSET(seqpacket_fd, &fds)) new_client(seqpacket_fd, SOCK_SEQPACKET); } + close(seqpacket_fd); + close(stream_fd); close(fd); } @@ -1218,7 +1229,8 @@ check_devd_enabled() if (val == 0) { warnx("Setting " SYSCTL " to 1000"); val = 1000; - sysctlbyname(SYSCTL, NULL, NULL, &val, sizeof(val)); + if (sysctlbyname(SYSCTL, NULL, NULL, &val, sizeof(val))) + err(1, "sysctlbyname"); } } Modified: stable/11/usr.bin/cmp/special.c ============================================================================== --- stable/11/usr.bin/cmp/special.c Tue Feb 28 22:22:53 2017 (r314426) +++ stable/11/usr.bin/cmp/special.c Tue Feb 28 22:49:41 2017 (r314427) @@ -99,6 +99,8 @@ eof: if (ferror(fp1)) } else if (feof(fp2)) eofmsg(file2); + fclose(fp2); + fclose(fp1); if (dfound) exit(DIFF_EXIT); } Modified: stable/11/usr.bin/cmp/tests/Makefile ============================================================================== --- stable/11/usr.bin/cmp/tests/Makefile Tue Feb 28 22:22:53 2017 (r314426) +++ stable/11/usr.bin/cmp/tests/Makefile Tue Feb 28 22:49:41 2017 (r314427) @@ -2,6 +2,7 @@ .include +ATF_TESTS_SH+= cmp_test2 NETBSD_ATF_TESTS_SH= cmp_test .include Copied: stable/11/usr.bin/cmp/tests/cmp_test2.sh (from r311572, head/usr.bin/cmp/tests/cmp_test2.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/usr.bin/cmp/tests/cmp_test2.sh Tue Feb 28 22:49:41 2017 (r314427, copy of r311572, head/usr.bin/cmp/tests/cmp_test2.sh) @@ -0,0 +1,67 @@ +# Copyright (c) 2017 Alan Somers +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +# $FreeBSD$ + +atf_test_case special +special_head() { + atf_set "descr" "Test cmp(1)'s handling of non-regular files" +} +special_body() { + echo 0123456789abcdef > a + echo 0123456789abcdeg > b + cat a | atf_check -s exit:0 cmp a - + cat a | atf_check -s exit:0 cmp - a + cat b | atf_check -s not-exit:0 cmp a - + cat b | atf_check -s not-exit:0 cmp - a + true +} + +atf_test_case symlink +symlink_head() { + atf_set "descr" "Test cmp(1)'s handling of symlinks" +} +symlink_body() { + echo 0123456789abcdef > a + echo 0123456789abcdeg > b + ln -s a a.lnk + ln -s b b.lnk + ln -s a a2.lnk + cp a adup + ln -s adup adup.lnk + atf_check -s exit:0 cmp a a.lnk + atf_check -s exit:0 cmp a.lnk a + atf_check -s not-exit:0 -o ignore cmp a b.lnk + atf_check -s not-exit:0 -o ignore cmp b.lnk a + atf_check -s not-exit:0 -o ignore -e ignore cmp -h a a.lnk + atf_check -s not-exit:0 -o ignore -e ignore cmp -h a.lnk a + atf_check -s exit:0 cmp -h a.lnk a2.lnk + atf_check -s not-exit:0 -o ignore -e ignore cmp -h a.lnk adup.lnk +} + +atf_init_test_cases() +{ + atf_add_test_case special + atf_add_test_case symlink +} Modified: stable/11/usr.bin/tail/Makefile ============================================================================== --- stable/11/usr.bin/tail/Makefile Tue Feb 28 22:22:53 2017 (r314426) +++ stable/11/usr.bin/tail/Makefile Tue Feb 28 22:49:41 2017 (r314427) @@ -1,7 +1,13 @@ # $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +.include + PROG= tail SRCS= forward.c misc.c read.c reverse.c tail.c +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include Modified: stable/11/usr.bin/tail/reverse.c ============================================================================== --- stable/11/usr.bin/tail/reverse.c Tue Feb 28 22:22:53 2017 (r314426) +++ stable/11/usr.bin/tail/reverse.c Tue Feb 28 22:49:41 2017 (r314427) @@ -40,6 +40,7 @@ static char sccsid[] = "@(#)reverse.c 8. __FBSDID("$FreeBSD$"); #include +#include #include #include @@ -169,12 +170,12 @@ r_reg(FILE *fp, const char *fn, enum STY ierr(fn); } -typedef struct bf { - struct bf *next; - struct bf *prev; - int len; - char *l; -} BF; +#define BSZ (128 * 1024) +typedef struct bfelem { + TAILQ_ENTRY(bfelem) entries; + size_t len; + char l[BSZ]; +} bfelem_t; /* * r_buf -- display a non-regular file in reverse order by line. @@ -189,64 +190,44 @@ typedef struct bf { static void r_buf(FILE *fp, const char *fn) { - BF *mark, *tl, *tr; - int ch, len, llen; + struct bfelem *tl, *first = NULL; + size_t llen; char *p; - off_t enomem; + off_t enomem = 0; + TAILQ_HEAD(bfhead, bfelem) head; + + TAILQ_INIT(&head); + + while (!feof(fp)) { + size_t len; - tl = NULL; -#define BSZ (128 * 1024) - for (mark = NULL, enomem = 0;;) { /* * Allocate a new block and link it into place in a doubly * linked list. If out of memory, toss the LRU block and * keep going. */ - if (enomem || (tl = malloc(sizeof(BF))) == NULL || - (tl->l = malloc(BSZ)) == NULL) { - if (!mark) + while ((tl = malloc(sizeof(bfelem_t))) == NULL) { + first = TAILQ_FIRST(&head); + if (TAILQ_EMPTY(&head)) err(1, "malloc"); - if (enomem) - tl = tl->next; - else { - if (tl) - free(tl); - tl = mark; - } - enomem += tl->len; - } else if (mark) { - tl->next = mark; - tl->prev = mark->prev; - mark->prev->next = tl; - mark->prev = tl; - } else { - mark = tl; - mark->next = mark->prev = mark; + enomem += first->len; + TAILQ_REMOVE(&head, first, entries); + free(first); } + TAILQ_INSERT_TAIL(&head, tl, entries); /* Fill the block with input data. */ - for (p = tl->l, len = 0; - len < BSZ && (ch = getc(fp)) != EOF; ++len) - *p++ = ch; - - if (ferror(fp)) { - ierr(fn); - return; - } - - /* - * If no input data for this block and we tossed some data, - * recover it. - */ - if (!len && enomem) { - enomem -= tl->len; - tl = tl->prev; - break; + len = 0; + while ((!feof(fp)) && len < BSZ) { + p = tl->l + len; + len += fread(p, 1, BSZ - len, fp); + if (ferror(fp)) { + ierr(fn); + return; + } } tl->len = len; - if (ch == EOF) - break; } if (enomem) { @@ -255,37 +236,46 @@ r_buf(FILE *fp, const char *fn) } /* - * Step through the blocks in the reverse order read. The last char - * is special, ignore whether newline or not. + * Now print the lines in reverse order + * Outline: + * Scan backward for "\n", + * print forward to the end of the buffers + * free any buffers that start after the "\n" just found + * Loop */ - for (mark = tl;;) { - for (p = tl->l + (len = tl->len) - 1, llen = 0; len--; - --p, ++llen) - if (*p == '\n') { - if (llen) { + tl = TAILQ_LAST(&head, bfhead); + first = TAILQ_FIRST(&head); + while (tl != NULL) { + struct bfelem *temp; + + for (p = tl->l + tl->len - 1, llen = 0; p >= tl->l; + --p, ++llen) { + int start = (tl == first && p == tl->l); + + if ((*p == '\n') || start) { + struct bfelem *tr; + + if (start && llen) + WR(p, llen + 1); + else if (llen) WR(p + 1, llen); - llen = 0; - } - if (tl == mark) - continue; - for (tr = tl->next; tr->len; tr = tr->next) { - WR(tr->l, tr->len); - tr->len = 0; - if (tr == mark) - break; + tr = TAILQ_NEXT(tl, entries); + llen = 0; + if (tr != NULL) { + TAILQ_FOREACH_FROM_SAFE(tr, &head, + entries, temp) { + if (tr->len) + WR(&tr->l, tr->len); + TAILQ_REMOVE(&head, tr, + entries); + free(tr); + } } } + } tl->len = llen; - if ((tl = tl->prev) == mark) - break; - } - tl = tl->next; - if (tl->len) { - WR(tl->l, tl->len); - tl->len = 0; - } - while ((tl = tl->next)->len) { - WR(tl->l, tl->len); - tl->len = 0; + tl = TAILQ_PREV(tl, bfhead, entries); } + TAILQ_REMOVE(&head, first, entries); + free(first); } Modified: stable/11/usr.sbin/route6d/route6d.c ============================================================================== --- stable/11/usr.sbin/route6d/route6d.c Tue Feb 28 22:22:53 2017 (r314426) +++ stable/11/usr.sbin/route6d/route6d.c Tue Feb 28 22:49:41 2017 (r314427) @@ -1062,6 +1062,7 @@ sendpacket(struct sockaddr_in6 *sin6, in iov[0].iov_len = len; m.msg_iov = iov; m.msg_iovlen = 1; + m.msg_flags = 0; if (!idx) { m.msg_control = NULL; m.msg_controllen = 0; @@ -1126,6 +1127,7 @@ riprecv(void) cm = (struct cmsghdr *)cmsgbuf; m.msg_control = (caddr_t)cm; m.msg_controllen = sizeof(cmsgbuf); + m.msg_flags = 0; if ((len = recvmsg(ripsock, &m, 0)) < 0) { fatal("recvmsg"); /*NOTREACHED*/ From owner-svn-src-all@freebsd.org Tue Feb 28 22:49:46 2017 Return-Path: Delivered-To: svn-src-all@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 92F2ACF219A; Tue, 28 Feb 2017 22:49:46 +0000 (UTC) (envelope-from imp@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 5243A1F6; Tue, 28 Feb 2017 22:49:46 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SMnjpD080021; Tue, 28 Feb 2017 22:49:45 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SMnjuO080020; Tue, 28 Feb 2017 22:49:45 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201702282249.v1SMnjuO080020@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 28 Feb 2017 22:49:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314428 - head/sys/mips/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 22:49:46 -0000 Author: imp Date: Tue Feb 28 22:49:45 2017 New Revision: 314428 URL: https://svnweb.freebsd.org/changeset/base/314428 Log: Add Ubiquiti Rocket M support Updated to use geom_uzip Submitted by: Michael Vale Pull Request: https://github.com/freebsd/freebsd/pull/16 Added: head/sys/mips/conf/ROCKET_M2HP (contents, props changed) head/sys/mips/conf/ROCKET_M2HP.hints (contents, props changed) Added: head/sys/mips/conf/ROCKET_M2HP ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/mips/conf/ROCKET_M2HP Tue Feb 28 22:49:45 2017 (r314428) @@ -0,0 +1,70 @@ +# +# Specific board setup for the Rocket M2 HP board. +# +# This board has the following hardware: +# +# + AR7241 CPU SoC +# + AR9287 Wifi +# + Integrated switch (XXX speed?) +# + 8MB flash +# + 32MB RAM +# + uboot environment + +# $FreeBSD$ + +#NO_UNIVERSE + +include "AR724X_BASE" +ident "ROCKET_M2HP" +hints "ROCKET_M2HP.hints" + +options AR71XX_REALMEM=32*1024*1024 + +options AR71XX_ENV_UBOOT + +# Limit inlines +makeoptions INLINE_LIMIT=768 + +# We bite the performance overhead for now; the kernel won't +# fit if the mutexes are inlined. +options MUTEX_NOINLINE +options RWLOCK_NOINLINE +options SX_NOINLINE + +# There's no need to enable swapping on this platform. +options NO_SWAPPING + +# For DOS - enable if required +# options MSDOSFS + +# uncompress - to boot read-only lzma natively from flash +device geom_uzip +options GEOM_UZIP +options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\" + +# Not enough space for these.. +nooptions INVARIANTS +nooptions INVARIANT_SUPPORT +nooptions WITNESS +nooptions WITNESS_SKIPSPIN +nooptions DEBUG_REDZONE +nooptions DEBUG_MEMGUARD + +# Used for the static uboot partition map +device geom_map + +# Options needed for the EEPROM based calibration/PCI configuration data. +options AR71XX_ATH_EEPROM # Fetch EEPROM/PCI config from flash +options ATH_EEPROM_FIRMWARE # Use EEPROM from flash +device firmware # Used by the above + +# Options required for miiproxy and mdiobus +options ARGE_MDIO # Export an MDIO bus separate from arge +device miiproxy # MDIO bus <-> MII PHY rendezvous + +device etherswitch +device arswitch + +# Enable GPIO +device gpio +device gpioled Added: head/sys/mips/conf/ROCKET_M2HP.hints ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/mips/conf/ROCKET_M2HP.hints Tue Feb 28 22:49:45 2017 (r314428) @@ -0,0 +1,103 @@ +# $FreeBSD$ + +# arge1 MDIO bus +hint.argemdio.0.at="nexus0" +hint.argemdio.0.maddr=0x1a000000 +hint.argemdio.0.msize=0x1000 +hint.argemdio.0.order=0 + +# Override MAC Address with the one on EEPROM +hint.arge.0.eeprommac=0x1fff0000 + +# arge0: dedicated switch port; RMII; dedicated PHY 4 on switch, connected +# via internal switch MDIO bus. +hint.arge.0.media=100 # Map to 100/full +hint.arge.0.fduplex=1 # +hint.arge.0.phymask=0x10 # PHY4 +hint.arge.0.mdio=mdioproxy1 # .. off of the switch mdiobus + +# arge1: nail to 1000/full, RMII - connected to the switch +hint.arge.1.media=1000 # Map to 1000/full +hint.arge.1.fduplex=1 # +hint.arge.1.phymask=0x0 # no directly mapped PHYs + +# +# AR7240 switch config +# +hint.arswitch.0.at="mdio0" +hint.arswitch.0.is_7240=1 # We need to be explicitly told this +hint.arswitch.0.numphys=4 # 4 active switch PHYs (PHY 0 -> 3) +hint.arswitch.0.phy4cpu=1 # Yes, PHY 4 == dedicated PHY +hint.arswitch.0.is_rgmii=0 # No, not RGMII +hint.arswitch.0.is_gmii=0 # No, not GMII + +# ath0 hint - pcie slot 0 +hint.pcib.0.bus.0.0.0.ath_fixup_addr=0x1fff1000 +hint.pcib.0.bus.0.0.0.ath_fixup_size=4096 + +# ath +hint.ath.0.eeprom_firmware="pcib.0.bus.0.0.0.eeprom_firmware" + +# GPIO pins +# Pin 0: red led (sig1) +# Pin 1: yellow led (sig2) +# Pin 11: green len (sig3) +# Pin 7: green len (sig4) +# Pin 12: Reset switch +hint.gpio.0.pinmask=0x1883 + +# Signal leds +hint.gpioled.0.at="gpiobus0" +hint.gpioled.0.name="sig1" +hint.gpioled.0.pins=0x0001 # pin 0 +hint.gpioled.1.at="gpiobus0" +hint.gpioled.1.name="sig2" +hint.gpioled.1.pins=0x0002 # pin 1 +hint.gpioled.2.at="gpiobus0" +hint.gpioled.2.name="sig3" +hint.gpioled.2.pins=0x0800 # pin 11 +hint.gpioled.3.at="gpiobus0" +hint.gpioled.3.name="sig4" +hint.gpioled.3.pins=0x0080 # pin 7 + +# GEOM_MAP +# +# Rocket M2 HP +# +# mtdparts=ar7240-nor0:256k(u-boot),64k(u-boot-env),1024k(kernel),6528k(rootfs),256k(cfg),64k(EEPROM) + +hint.map.0.at="flash/spi0" +hint.map.0.start=0x00000000 +hint.map.0.end=0x00040000 # 256k u-boot +hint.map.0.name="u-boot" +hint.map.0.readonly=1 + +hint.map.1.at="flash/spi0" +hint.map.1.start=0x00040000 +hint.map.1.end=0x00050000 # 64k u-boot-env +hint.map.1.name="u-boot-env" +hint.map.1.readonly=1 + +hint.map.2.at="flash/spi0" +hint.map.2.start=0x00050000 +hint.map.2.end="search:0x00100000:0x10000:.!/bin/sh" +hint.map.2.name="kernel" +hint.map.2.readonly=1 + +hint.map.3.at="flash/spi0" +hint.map.3.start="search:0x00100000:0x10000:.!/bin/sh" +hint.map.3.end=0x007b0000 +hint.map.3.name="rootfs" +hint.map.3.readonly=0 + +hint.map.4.at="flash/spi0" +hint.map.4.start=0x007b0000 +hint.map.4.end=0x007f0000 # 256k cfg +hint.map.4.name="cfg" +hint.map.4.readonly=0 + +hint.map.5.at="flash/spi0" +hint.map.5.start=0x007f0000 +hint.map.5.end=0x00800000 # 64k EEPROM +hint.map.5.name="eeprom" +hint.map.5.readonly=1 From owner-svn-src-all@freebsd.org Tue Feb 28 22:54:53 2017 Return-Path: Delivered-To: svn-src-all@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 F3308CF2834; Tue, 28 Feb 2017 22:54:53 +0000 (UTC) (envelope-from kib@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 C2AE21C7; Tue, 28 Feb 2017 22:54:53 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SMsqYJ086615; Tue, 28 Feb 2017 22:54:52 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SMsq0l086613; Tue, 28 Feb 2017 22:54:52 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201702282254.v1SMsq0l086613@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 28 Feb 2017 22:54:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314429 - in head/sys: amd64/amd64 i386/i386 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 22:54:54 -0000 Author: kib Date: Tue Feb 28 22:54:52 2017 New Revision: 314429 URL: https://svnweb.freebsd.org/changeset/base/314429 Log: Initialize pcb_save for thread0. Otherwise kernel traps on NULL dereference if fpu_kern(9) is used from the thread0 context. Reported by: cem Reviewed by: cem, jhb Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/amd64/amd64/machdep.c head/sys/i386/i386/machdep.c Modified: head/sys/amd64/amd64/machdep.c ============================================================================== --- head/sys/amd64/amd64/machdep.c Tue Feb 28 22:49:45 2017 (r314428) +++ head/sys/amd64/amd64/machdep.c Tue Feb 28 22:54:52 2017 (r314429) @@ -1734,6 +1734,7 @@ hammer_time(u_int64_t modulep, u_int64_t * area. */ thread0.td_pcb = get_pcb_td(&thread0); + thread0.td_pcb->pcb_save = get_pcb_user_save_td(&thread0); bzero(get_pcb_user_save_td(&thread0), cpu_max_ext_state_size); if (use_xsave) { xhdr = (struct xstate_hdr *)(get_pcb_user_save_td(&thread0) + Modified: head/sys/i386/i386/machdep.c ============================================================================== --- head/sys/i386/i386/machdep.c Tue Feb 28 22:49:45 2017 (r314428) +++ head/sys/i386/i386/machdep.c Tue Feb 28 22:54:52 2017 (r314429) @@ -2420,6 +2420,7 @@ init386(int first) * area. */ thread0.td_pcb = get_pcb_td(&thread0); + thread0.td_pcb->pcb_save = get_pcb_user_save_td(&thread0); bzero(get_pcb_user_save_td(&thread0), cpu_max_ext_state_size); if (use_xsave) { xhdr = (struct xstate_hdr *)(get_pcb_user_save_td(&thread0) + From owner-svn-src-all@freebsd.org Tue Feb 28 22:58:21 2017 Return-Path: Delivered-To: svn-src-all@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 55C6ECF28C7; Tue, 28 Feb 2017 22:58:21 +0000 (UTC) (envelope-from ae@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 22D203B4; Tue, 28 Feb 2017 22:58:21 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SMwKib086829; Tue, 28 Feb 2017 22:58:20 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SMwKdj086828; Tue, 28 Feb 2017 22:58:20 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201702282258.v1SMwKdj086828@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Tue, 28 Feb 2017 22:58:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314430 - head/sys/netinet6 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 22:58:21 -0000 Author: ae Date: Tue Feb 28 22:58:19 2017 New Revision: 314430 URL: https://svnweb.freebsd.org/changeset/base/314430 Log: When IPv6 fragments reassembly is complete, update mbuf's csum_data and csum_flags using information from all fragments. This fixes dropping of reassembled packets due to wrong checksum when the IPv6 checksum offloading is enabled on a network card. Obtained from: Yandex LLC MFC after: 1 week Sponsored by: Yandex LLC Modified: head/sys/netinet6/frag6.c Modified: head/sys/netinet6/frag6.c ============================================================================== --- head/sys/netinet6/frag6.c Tue Feb 28 22:54:52 2017 (r314429) +++ head/sys/netinet6/frag6.c Tue Feb 28 22:58:19 2017 (r314430) @@ -528,6 +528,11 @@ insert: af6 = ip6af->ip6af_down; frag6_deq(ip6af); while (af6 != (struct ip6asfrag *)q6) { + m->m_pkthdr.csum_flags &= + IP6_REASS_MBUF(af6)->m_pkthdr.csum_flags; + m->m_pkthdr.csum_data += + IP6_REASS_MBUF(af6)->m_pkthdr.csum_data; + af6dwn = af6->ip6af_down; frag6_deq(af6); while (t->m_next) @@ -538,6 +543,10 @@ insert: af6 = af6dwn; } + while (m->m_pkthdr.csum_data & 0xffff0000) + m->m_pkthdr.csum_data = (m->m_pkthdr.csum_data & 0xffff) + + (m->m_pkthdr.csum_data >> 16); + /* adjust offset to point where the original next header starts */ offset = ip6af->ip6af_offset - sizeof(struct ip6_frag); free(ip6af, M_FTABLE); From owner-svn-src-all@freebsd.org Tue Feb 28 23:03:52 2017 Return-Path: Delivered-To: svn-src-all@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 A7107CF2B0E; Tue, 28 Feb 2017 23:03:52 +0000 (UTC) (envelope-from asomers@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 7377DB9A; Tue, 28 Feb 2017 23:03:52 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SN3pgJ090564; Tue, 28 Feb 2017 23:03:51 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SN3px8090563; Tue, 28 Feb 2017 23:03:51 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201702282303.v1SN3px8090563@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 28 Feb 2017 23:03:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314431 - stable/11/cddl/usr.sbin/zfsd X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 23:03:52 -0000 Author: asomers Date: Tue Feb 28 23:03:51 2017 New Revision: 314431 URL: https://svnweb.freebsd.org/changeset/base/314431 Log: MFC r312396: Fix an unchecked return value in zfsd It's pretty unlikely to actually hit this, but good to check it anyway Reported by: Coverity CID: 1362018 MFC after: 4 weeks Sponsored by: Spectra Logic Corp Modified: stable/11/cddl/usr.sbin/zfsd/case_file.cc Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/usr.sbin/zfsd/case_file.cc ============================================================================== --- stable/11/cddl/usr.sbin/zfsd/case_file.cc Tue Feb 28 22:58:19 2017 (r314430) +++ stable/11/cddl/usr.sbin/zfsd/case_file.cc Tue Feb 28 23:03:51 2017 (r314431) @@ -656,8 +656,11 @@ CaseFile::DeSerializeFile(const char *fi uint64_t vdevGUID; nvlist_t *vdevConf; - sscanf(fileName, "pool_%" PRIu64 "_vdev_%" PRIu64 ".case", - &poolGUID, &vdevGUID); + if (sscanf(fileName, "pool_%" PRIu64 "_vdev_%" PRIu64 ".case", + &poolGUID, &vdevGUID) != 2) { + throw ZfsdException("CaseFile::DeSerialize: " + "Unintelligible CaseFile filename %s.\n", fileName); + } existingCaseFile = Find(Guid(poolGUID), Guid(vdevGUID)); if (existingCaseFile != NULL) { /* From owner-svn-src-all@freebsd.org Tue Feb 28 23:06:46 2017 Return-Path: Delivered-To: svn-src-all@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 7B475CF2B8B; Tue, 28 Feb 2017 23:06:46 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-wr0-f172.google.com (mail-wr0-f172.google.com [209.85.128.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1BF1DD06; Tue, 28 Feb 2017 23:06:45 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-wr0-f172.google.com with SMTP id u108so18777830wrb.3; Tue, 28 Feb 2017 15:06:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=0YRKcH8VJJhEOInTqSvhsPn0UoVZ7qaJA3jt5cZIGRI=; b=qxw0QBXkNm/+mrM5P6BLqp4H+pgoVQMlNpNE4EStdirATfncehWtGhFkZFn3Z2FK07 Ev2kt+PZz7I7pM8o0vfcbSI9EVRaF1nEkK/z0fx7zwp9kr2YuJcBeR3BJoSfYE3fIFA8 BmLXCxJuJZfR/oLZEuFUh15WaEKwddrp2jV3yOU51sdudTz1PUkK2rydCuqWoRu4DpYp 121bh9N5vfF1ZxMgEWESPsfKQvy/MqP249+VSw0feQUFnqNy+PZn3FeE074fZl1YO7A/ SMcenZKvH9w5+8cz/CnA6aUZ9ahn5iKGkOcrw1T5obDwWWSmY1knIwKPVYwbB5c/UneR 2MHg== X-Gm-Message-State: AMke39k+o3gkQuw25yrF8czVmeUDMNOcoGW9gui5TaXccx49GmchSh/25H9dbETh6BYiUg== X-Received: by 10.223.169.1 with SMTP id u1mr4315333wrc.53.1488322764667; Tue, 28 Feb 2017 14:59:24 -0800 (PST) Received: from mail-wr0-f180.google.com (mail-wr0-f180.google.com. [209.85.128.180]) by smtp.gmail.com with ESMTPSA id u198sm20311682wmf.9.2017.02.28.14.59.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Feb 2017 14:59:24 -0800 (PST) Received: by mail-wr0-f180.google.com with SMTP id l37so18623837wrc.1; Tue, 28 Feb 2017 14:59:24 -0800 (PST) X-Received: by 10.223.162.211 with SMTP id t19mr4426255wra.57.1488322764427; Tue, 28 Feb 2017 14:59:24 -0800 (PST) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 10.80.152.82 with HTTP; Tue, 28 Feb 2017 14:59:23 -0800 (PST) In-Reply-To: <201702282254.v1SMsq0l086613@repo.freebsd.org> References: <201702282254.v1SMsq0l086613@repo.freebsd.org> From: Conrad Meyer Date: Tue, 28 Feb 2017 14:59:23 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r314429 - in head/sys: amd64/amd64 i386/i386 To: Konstantin Belousov Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 23:06:46 -0000 Thanks! On Tue, Feb 28, 2017 at 2:54 PM, Konstantin Belousov wrote: > Author: kib > Date: Tue Feb 28 22:54:52 2017 > New Revision: 314429 > URL: https://svnweb.freebsd.org/changeset/base/314429 > > Log: > Initialize pcb_save for thread0. > > Otherwise kernel traps on NULL dereference if fpu_kern(9) is used from the > thread0 context. > > Reported by: cem > Reviewed by: cem, jhb > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > > Modified: > head/sys/amd64/amd64/machdep.c > head/sys/i386/i386/machdep.c > > Modified: head/sys/amd64/amd64/machdep.c > ============================================================================== > --- head/sys/amd64/amd64/machdep.c Tue Feb 28 22:49:45 2017 (r314428) > +++ head/sys/amd64/amd64/machdep.c Tue Feb 28 22:54:52 2017 (r314429) > @@ -1734,6 +1734,7 @@ hammer_time(u_int64_t modulep, u_int64_t > * area. > */ > thread0.td_pcb = get_pcb_td(&thread0); > + thread0.td_pcb->pcb_save = get_pcb_user_save_td(&thread0); > bzero(get_pcb_user_save_td(&thread0), cpu_max_ext_state_size); > if (use_xsave) { > xhdr = (struct xstate_hdr *)(get_pcb_user_save_td(&thread0) + > > Modified: head/sys/i386/i386/machdep.c > ============================================================================== > --- head/sys/i386/i386/machdep.c Tue Feb 28 22:49:45 2017 (r314428) > +++ head/sys/i386/i386/machdep.c Tue Feb 28 22:54:52 2017 (r314429) > @@ -2420,6 +2420,7 @@ init386(int first) > * area. > */ > thread0.td_pcb = get_pcb_td(&thread0); > + thread0.td_pcb->pcb_save = get_pcb_user_save_td(&thread0); > bzero(get_pcb_user_save_td(&thread0), cpu_max_ext_state_size); > if (use_xsave) { > xhdr = (struct xstate_hdr *)(get_pcb_user_save_td(&thread0) + > From owner-svn-src-all@freebsd.org Tue Feb 28 23:24:10 2017 Return-Path: Delivered-To: svn-src-all@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 3C0BFCF204C; Tue, 28 Feb 2017 23:24:10 +0000 (UTC) (envelope-from cognet@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 090219AA; Tue, 28 Feb 2017 23:24:09 +0000 (UTC) (envelope-from cognet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SNO9uo098421; Tue, 28 Feb 2017 23:24:09 GMT (envelope-from cognet@FreeBSD.org) Received: (from cognet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SNO90x098420; Tue, 28 Feb 2017 23:24:09 GMT (envelope-from cognet@FreeBSD.org) Message-Id: <201702282324.v1SNO90x098420@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cognet set sender to cognet@FreeBSD.org using -f From: Olivier Houchard Date: Tue, 28 Feb 2017 23:24:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314432 - vendor-sys/ck/dist/src X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 23:24:10 -0000 Author: cognet Date: Tue Feb 28 23:24:08 2017 New Revision: 314432 URL: https://svnweb.freebsd.org/changeset/base/314432 Log: Import CK as of commit 24d26965d1a28039062ba3bcf9433b623f3d2c5e, to get a fix in ck_epoch Modified: vendor-sys/ck/dist/src/ck_epoch.c Modified: vendor-sys/ck/dist/src/ck_epoch.c ============================================================================== --- vendor-sys/ck/dist/src/ck_epoch.c Tue Feb 28 23:03:51 2017 (r314431) +++ vendor-sys/ck/dist/src/ck_epoch.c Tue Feb 28 23:24:08 2017 (r314432) @@ -309,11 +309,12 @@ ck_epoch_scan(struct ck_epoch *global, { ck_stack_entry_t *cursor; - *af = false; if (cr == NULL) { cursor = CK_STACK_FIRST(&global->records); + *af = false; } else { cursor = &cr->record_next; + *af = true; } while (cursor != NULL) { From owner-svn-src-all@freebsd.org Tue Feb 28 23:26:51 2017 Return-Path: Delivered-To: svn-src-all@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 DADB2CF214D; Tue, 28 Feb 2017 23:26:51 +0000 (UTC) (envelope-from asomers@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 A7018C41; Tue, 28 Feb 2017 23:26:51 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SNQo0Z098583; Tue, 28 Feb 2017 23:26:50 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SNQorv098582; Tue, 28 Feb 2017 23:26:50 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201702282326.v1SNQorv098582@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 28 Feb 2017 23:26:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314433 - stable/11/sys/cam/scsi X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 23:26:52 -0000 Author: asomers Date: Tue Feb 28 23:26:50 2017 New Revision: 314433 URL: https://svnweb.freebsd.org/changeset/base/314433 Log: MFC r312553: Fix "camcontrol timestamp -s" with LTO-7 drives The length of the scsi_set_timestamp_parameters struct was incorrect. LTO-5 drives don't care, but LTO-7 drives do. Reviewed by: Sam Klopsch MFC after: 2 weeks Sponsored by: Spectra Logic Corp Modified: stable/11/sys/cam/scsi/scsi_all.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cam/scsi/scsi_all.h ============================================================================== --- stable/11/sys/cam/scsi/scsi_all.h Tue Feb 28 23:24:08 2017 (r314432) +++ stable/11/sys/cam/scsi/scsi_all.h Tue Feb 28 23:26:50 2017 (r314433) @@ -3039,7 +3039,7 @@ struct scsi_set_timestamp_parameters { uint8_t reserved1[4]; uint8_t timestamp[6]; - uint8_t reserved2[4]; + uint8_t reserved2[2]; }; struct scsi_report_timestamp_parameter_data From owner-svn-src-all@freebsd.org Tue Feb 28 23:27:01 2017 Return-Path: Delivered-To: svn-src-all@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 0E963CF219E; Tue, 28 Feb 2017 23:27:01 +0000 (UTC) (envelope-from cognet@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 B7879C9D; Tue, 28 Feb 2017 23:27:00 +0000 (UTC) (envelope-from cognet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SNQxeh098628; Tue, 28 Feb 2017 23:26:59 GMT (envelope-from cognet@FreeBSD.org) Received: (from cognet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SNQx4w098627; Tue, 28 Feb 2017 23:26:59 GMT (envelope-from cognet@FreeBSD.org) Message-Id: <201702282326.v1SNQx4w098627@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cognet set sender to cognet@FreeBSD.org using -f From: Olivier Houchard Date: Tue, 28 Feb 2017 23:26:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314434 - vendor-sys/ck/20170228 X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 23:27:01 -0000 Author: cognet Date: Tue Feb 28 23:26:59 2017 New Revision: 314434 URL: https://svnweb.freebsd.org/changeset/base/314434 Log: Tag CK import as of commit 24d26965d1a28039062ba3bcf9433b623f3d2c5e Added: vendor-sys/ck/20170228/ - copied from r314432, vendor-sys/ck/dist/ From owner-svn-src-all@freebsd.org Tue Feb 28 23:30:16 2017 Return-Path: Delivered-To: svn-src-all@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 57E65CF22CB; Tue, 28 Feb 2017 23:30:16 +0000 (UTC) (envelope-from cognet@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 2763AFDB; Tue, 28 Feb 2017 23:30:16 +0000 (UTC) (envelope-from cognet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SNUFO1099028; Tue, 28 Feb 2017 23:30:15 GMT (envelope-from cognet@FreeBSD.org) Received: (from cognet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SNUFBK099025; Tue, 28 Feb 2017 23:30:15 GMT (envelope-from cognet@FreeBSD.org) Message-Id: <201702282330.v1SNUFBK099025@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cognet set sender to cognet@FreeBSD.org using -f From: Olivier Houchard Date: Tue, 28 Feb 2017 23:30:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314435 - in head/sys/contrib/ck: include src X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 23:30:16 -0000 Author: cognet Date: Tue Feb 28 23:30:14 2017 New Revision: 314435 URL: https://svnweb.freebsd.org/changeset/base/314435 Log: Merge CK as of commit 24d26965d1a28039062ba3bcf9433b623f3d2c5e, to get a fix in ck_epoch. Modified: head/sys/contrib/ck/include/ck_md.h head/sys/contrib/ck/src/ck_epoch.c Directory Properties: head/sys/contrib/ck/ (props changed) Modified: head/sys/contrib/ck/include/ck_md.h ============================================================================== --- head/sys/contrib/ck/include/ck_md.h Tue Feb 28 23:26:59 2017 (r314434) +++ head/sys/contrib/ck/include/ck_md.h Tue Feb 28 23:30:14 2017 (r314435) @@ -57,7 +57,7 @@ #define CK_MD_RMO #endif /* CK_MD_RMO */ -#define CK_VERSION "0.5.2" +#define CK_VERSION "0.6.0" #define CK_GIT_SHA "" /* Modified: head/sys/contrib/ck/src/ck_epoch.c ============================================================================== --- head/sys/contrib/ck/src/ck_epoch.c Tue Feb 28 23:26:59 2017 (r314434) +++ head/sys/contrib/ck/src/ck_epoch.c Tue Feb 28 23:30:14 2017 (r314435) @@ -309,11 +309,12 @@ ck_epoch_scan(struct ck_epoch *global, { ck_stack_entry_t *cursor; - *af = false; if (cr == NULL) { cursor = CK_STACK_FIRST(&global->records); + *af = false; } else { cursor = &cr->record_next; + *af = true; } while (cursor != NULL) { From owner-svn-src-all@freebsd.org Tue Feb 28 23:43:00 2017 Return-Path: Delivered-To: svn-src-all@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 1A3A6CF2802; Tue, 28 Feb 2017 23:43:00 +0000 (UTC) (envelope-from imp@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 6E392D82; Tue, 28 Feb 2017 23:42:59 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SNgwA6007142; Tue, 28 Feb 2017 23:42:58 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SNgmAx007045; Tue, 28 Feb 2017 23:42:48 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201702282342.v1SNgmAx007045@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 28 Feb 2017 23:42:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314436 - in head: bin/cat bin/chflags bin/chmod bin/cp bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/hostname bin/kill bin/ln bin/ls bin/mkdir bin/mv bin/pax bin/ps bin/pwd... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 23:43:00 -0000 Author: imp Date: Tue Feb 28 23:42:47 2017 New Revision: 314436 URL: https://svnweb.freebsd.org/changeset/base/314436 Log: Renumber copyright clause 4 Renumber cluase 4 to 3, per what everybody else did when BSD granted them permission to remove clause 3. My insistance on keeping the same numbering for legal reasons is too pedantic, so give up on that point. Submitted by: Jan Schaumann Pull Request: https://github.com/freebsd/freebsd/pull/96 Modified: head/bin/cat/cat.1 head/bin/cat/cat.c head/bin/chflags/chflags.1 head/bin/chflags/chflags.c head/bin/chmod/chmod.1 head/bin/chmod/chmod.c head/bin/cp/cp.1 head/bin/cp/cp.c head/bin/cp/extern.h head/bin/cp/utils.c head/bin/date/date.1 head/bin/date/date.c head/bin/date/extern.h head/bin/date/netdate.c head/bin/dd/args.c head/bin/dd/conv.c head/bin/dd/conv_tab.c head/bin/dd/dd.1 head/bin/dd/dd.c head/bin/dd/dd.h head/bin/dd/extern.h head/bin/dd/misc.c head/bin/dd/position.c head/bin/df/df.1 head/bin/df/df.c head/bin/domainname/domainname.1 head/bin/domainname/domainname.c head/bin/echo/echo.1 head/bin/echo/echo.c head/bin/ed/cbc.c head/bin/hostname/hostname.1 head/bin/hostname/hostname.c head/bin/kill/kill.1 head/bin/kill/kill.c head/bin/ln/ln.1 head/bin/ln/ln.c head/bin/ln/symlink.7 head/bin/ls/cmp.c head/bin/ls/extern.h head/bin/ls/ls.1 head/bin/ls/ls.c head/bin/ls/ls.h head/bin/ls/print.c head/bin/ls/util.c head/bin/mkdir/mkdir.1 head/bin/mkdir/mkdir.c head/bin/mv/mv.1 head/bin/mv/mv.c head/bin/pax/ar_io.c head/bin/pax/ar_subs.c head/bin/pax/buf_subs.c head/bin/pax/cache.c head/bin/pax/cache.h head/bin/pax/cpio.c head/bin/pax/cpio.h head/bin/pax/extern.h head/bin/pax/file_subs.c head/bin/pax/ftree.c head/bin/pax/ftree.h head/bin/pax/gen_subs.c head/bin/pax/options.c head/bin/pax/options.h head/bin/pax/pat_rep.c head/bin/pax/pat_rep.h head/bin/pax/pax.1 head/bin/pax/pax.c head/bin/pax/pax.h head/bin/pax/sel_subs.c head/bin/pax/sel_subs.h head/bin/pax/tables.c head/bin/pax/tables.h head/bin/pax/tar.c head/bin/pax/tar.h head/bin/pax/tty_subs.c head/bin/ps/extern.h head/bin/ps/fmt.c head/bin/ps/keyword.c head/bin/ps/nlist.c head/bin/ps/print.c head/bin/ps/ps.1 head/bin/ps/ps.c head/bin/ps/ps.h head/bin/pwd/pwd.1 head/bin/pwd/pwd.c head/bin/rcp/extern.h head/bin/rcp/rcp.1 head/bin/rcp/rcp.c head/bin/rcp/util.c head/bin/realpath/realpath.1 head/bin/realpath/realpath.c head/bin/rm/rm.1 head/bin/rm/rm.c head/bin/rmdir/rmdir.1 head/bin/rmdir/rmdir.c head/bin/sh/alias.c head/bin/sh/alias.h head/bin/sh/arith.h head/bin/sh/bltin/bltin.h head/bin/sh/bltin/echo.c head/bin/sh/builtins.def head/bin/sh/cd.c head/bin/sh/cd.h head/bin/sh/error.c head/bin/sh/error.h head/bin/sh/eval.c head/bin/sh/eval.h head/bin/sh/exec.c head/bin/sh/exec.h head/bin/sh/expand.c head/bin/sh/expand.h head/bin/sh/funcs/cmv head/bin/sh/funcs/dirs head/bin/sh/funcs/login head/bin/sh/funcs/newgrp head/bin/sh/funcs/popd head/bin/sh/funcs/pushd head/bin/sh/funcs/suspend head/bin/sh/histedit.c head/bin/sh/input.c head/bin/sh/input.h head/bin/sh/jobs.c head/bin/sh/jobs.h head/bin/sh/mail.c head/bin/sh/mail.h head/bin/sh/main.c head/bin/sh/main.h head/bin/sh/memalloc.c head/bin/sh/memalloc.h head/bin/sh/miscbltin.c head/bin/sh/mkbuiltins head/bin/sh/mknodes.c head/bin/sh/mksyntax.c head/bin/sh/mktokens head/bin/sh/myhistedit.h head/bin/sh/mystring.c head/bin/sh/mystring.h head/bin/sh/nodes.c.pat head/bin/sh/nodetypes head/bin/sh/options.c head/bin/sh/options.h head/bin/sh/output.c head/bin/sh/output.h head/bin/sh/parser.c head/bin/sh/parser.h head/bin/sh/redir.c head/bin/sh/redir.h head/bin/sh/sh.1 head/bin/sh/shell.h head/bin/sh/show.c head/bin/sh/show.h head/bin/sh/trap.c head/bin/sh/trap.h head/bin/sh/var.c head/bin/sh/var.h head/bin/sleep/sleep.1 head/bin/sleep/sleep.c head/bin/stty/cchar.c head/bin/stty/extern.h head/bin/stty/gfmt.c head/bin/stty/key.c head/bin/stty/modes.c head/bin/stty/print.c head/bin/stty/stty.1 head/bin/stty/stty.c head/bin/stty/stty.h head/bin/stty/util.c head/bin/sync/sync.8 head/bin/sync/sync.c head/bin/test/test.1 head/contrib/libarchive/libarchive/archive_entry.c head/contrib/libarchive/libarchive/archive_read_support_filter_compress.c head/contrib/libxo/libxo/xo_syslog.c head/contrib/libxo/tests/gettext/po/pig_latin/strerror.po head/contrib/libxo/tests/gettext/strerror.pot head/contrib/ofed/libcxgb4/src/queue.h head/contrib/openbsm/compat/queue.h head/contrib/openbsm/compat/vis.h head/contrib/sendmail/LICENSE head/contrib/tzcode/stdtime/ctime.3 head/crypto/heimdal/lib/roken/qsort.c head/lib/libc/amd64/SYS.h head/lib/libc/amd64/gen/_setjmp.S head/lib/libc/amd64/gen/setjmp.S head/lib/libc/amd64/gen/sigsetjmp.S head/lib/libc/amd64/sys/brk.S head/lib/libc/amd64/sys/cerror.S head/lib/libc/amd64/sys/exect.S head/lib/libc/amd64/sys/sbrk.S head/lib/libc/amd64/sys/setlogin.S head/lib/libc/amd64/sys/sigreturn.S head/lib/libc/amd64/sys/vfork.S head/lib/libc/compat-43/creat.2 head/lib/libc/compat-43/creat.c head/lib/libc/compat-43/gethostid.3 head/lib/libc/compat-43/gethostid.c head/lib/libc/compat-43/getwd.c head/lib/libc/compat-43/killpg.2 head/lib/libc/compat-43/killpg.c head/lib/libc/compat-43/sethostid.c head/lib/libc/compat-43/setpgrp.c head/lib/libc/compat-43/setrgid.c head/lib/libc/compat-43/setruid.3 head/lib/libc/compat-43/setruid.c head/lib/libc/compat-43/sigcompat.c head/lib/libc/compat-43/sigpause.2 head/lib/libc/compat-43/sigsetmask.2 head/lib/libc/compat-43/sigvec.2 head/lib/libc/db/btree/bt_close.c head/lib/libc/db/btree/bt_conv.c head/lib/libc/db/btree/bt_debug.c head/lib/libc/db/btree/bt_delete.c head/lib/libc/db/btree/bt_get.c head/lib/libc/db/btree/bt_open.c head/lib/libc/db/btree/bt_overflow.c head/lib/libc/db/btree/bt_page.c head/lib/libc/db/btree/bt_put.c head/lib/libc/db/btree/bt_search.c head/lib/libc/db/btree/bt_seq.c head/lib/libc/db/btree/bt_split.c head/lib/libc/db/btree/bt_utils.c head/lib/libc/db/btree/btree.h head/lib/libc/db/btree/extern.h head/lib/libc/db/db/db.c head/lib/libc/db/hash/extern.h head/lib/libc/db/hash/hash.c head/lib/libc/db/hash/hash.h head/lib/libc/db/hash/hash_bigkey.c head/lib/libc/db/hash/hash_buf.c head/lib/libc/db/hash/hash_func.c head/lib/libc/db/hash/hash_log2.c head/lib/libc/db/hash/hash_page.c head/lib/libc/db/hash/ndbm.c head/lib/libc/db/hash/page.h head/lib/libc/db/man/btree.3 head/lib/libc/db/man/dbopen.3 head/lib/libc/db/man/hash.3 head/lib/libc/db/man/mpool.3 head/lib/libc/db/man/recno.3 head/lib/libc/db/mpool/mpool.c head/lib/libc/db/recno/extern.h head/lib/libc/db/recno/rec_close.c head/lib/libc/db/recno/rec_delete.c head/lib/libc/db/recno/rec_get.c head/lib/libc/db/recno/rec_open.c head/lib/libc/db/recno/rec_put.c head/lib/libc/db/recno/rec_search.c head/lib/libc/db/recno/rec_seq.c head/lib/libc/db/recno/rec_utils.c head/lib/libc/db/recno/recno.h head/lib/libc/db/test/btree.tests/main.c head/lib/libc/db/test/dbtest.c head/lib/libc/db/test/hash.tests/driver2.c head/lib/libc/db/test/hash.tests/tcreat3.c head/lib/libc/db/test/hash.tests/tdel.c head/lib/libc/db/test/hash.tests/thash4.c head/lib/libc/db/test/hash.tests/tread2.c head/lib/libc/db/test/hash.tests/tseq.c head/lib/libc/db/test/hash.tests/tverify.c head/lib/libc/gen/__xuname.c head/lib/libc/gen/alarm.3 head/lib/libc/gen/alarm.c head/lib/libc/gen/assert.c head/lib/libc/gen/clock.3 head/lib/libc/gen/clock.c head/lib/libc/gen/closedir.c head/lib/libc/gen/confstr.3 head/lib/libc/gen/confstr.c head/lib/libc/gen/crypt.c head/lib/libc/gen/ctermid.3 head/lib/libc/gen/daemon.3 head/lib/libc/gen/daemon.c head/lib/libc/gen/devname.3 head/lib/libc/gen/devname.c head/lib/libc/gen/directory.3 head/lib/libc/gen/disklabel.c head/lib/libc/gen/err.3 head/lib/libc/gen/err.c head/lib/libc/gen/errlst.c head/lib/libc/gen/exec.3 head/lib/libc/gen/exec.c head/lib/libc/gen/fnmatch.3 head/lib/libc/gen/fnmatch.c head/lib/libc/gen/frexp.3 head/lib/libc/gen/fstab.c head/lib/libc/gen/fts-compat.c head/lib/libc/gen/fts.3 head/lib/libc/gen/fts.c head/lib/libc/gen/getbootfile.3 head/lib/libc/gen/getbootfile.c head/lib/libc/gen/getbsize.3 head/lib/libc/gen/getbsize.c head/lib/libc/gen/getcap.3 head/lib/libc/gen/getcap.c head/lib/libc/gen/getcwd.3 head/lib/libc/gen/getcwd.c head/lib/libc/gen/getdiskbyname.3 head/lib/libc/gen/getdomainname.3 head/lib/libc/gen/getdomainname.c head/lib/libc/gen/getfsent.3 head/lib/libc/gen/getgrent.3 head/lib/libc/gen/getgrouplist.3 head/lib/libc/gen/getgrouplist.c head/lib/libc/gen/gethostname.3 head/lib/libc/gen/gethostname.c head/lib/libc/gen/getloadavg.3 head/lib/libc/gen/getloadavg.c head/lib/libc/gen/getlogin.c head/lib/libc/gen/getmntinfo.3 head/lib/libc/gen/getmntinfo.c head/lib/libc/gen/getnetgrent.3 head/lib/libc/gen/getnetgrent.c head/lib/libc/gen/getosreldate.c head/lib/libc/gen/getpagesize.3 head/lib/libc/gen/getpagesize.c head/lib/libc/gen/getpass.3 head/lib/libc/gen/getpwent.3 head/lib/libc/gen/getttyent.3 head/lib/libc/gen/getttyent.c head/lib/libc/gen/getusershell.3 head/lib/libc/gen/getusershell.c head/lib/libc/gen/getvfsbyname.3 head/lib/libc/gen/getvfsbyname.c head/lib/libc/gen/glob.3 head/lib/libc/gen/glob.c head/lib/libc/gen/initgroups.3 head/lib/libc/gen/initgroups.c head/lib/libc/gen/isatty.c head/lib/libc/gen/ldexp.3 head/lib/libc/gen/modf.3 head/lib/libc/gen/nice.3 head/lib/libc/gen/nice.c head/lib/libc/gen/nlist.3 head/lib/libc/gen/nlist.c head/lib/libc/gen/opendir.c head/lib/libc/gen/pause.3 head/lib/libc/gen/pause.c head/lib/libc/gen/popen.3 head/lib/libc/gen/popen.c head/lib/libc/gen/psignal.3 head/lib/libc/gen/psignal.c head/lib/libc/gen/pw_scan.c head/lib/libc/gen/pw_scan.h head/lib/libc/gen/raise.3 head/lib/libc/gen/raise.c head/lib/libc/gen/readdir.c head/lib/libc/gen/rewinddir.c head/lib/libc/gen/scandir.3 head/lib/libc/gen/scandir.c head/lib/libc/gen/seekdir.c head/lib/libc/gen/setdomainname.c head/lib/libc/gen/sethostname.c head/lib/libc/gen/setjmp.3 head/lib/libc/gen/setjmperr.c head/lib/libc/gen/setmode.3 head/lib/libc/gen/setmode.c head/lib/libc/gen/siginterrupt.3 head/lib/libc/gen/siginterrupt.c head/lib/libc/gen/siglist.c head/lib/libc/gen/signal.3 head/lib/libc/gen/signal.c head/lib/libc/gen/sigsetops.3 head/lib/libc/gen/sigsetops.c head/lib/libc/gen/sleep.3 head/lib/libc/gen/sleep.c head/lib/libc/gen/strtofflags.3 head/lib/libc/gen/strtofflags.c head/lib/libc/gen/sysconf.3 head/lib/libc/gen/sysconf.c head/lib/libc/gen/sysctl.3 head/lib/libc/gen/sysctl.c head/lib/libc/gen/syslog.3 head/lib/libc/gen/syslog.c head/lib/libc/gen/tcgetpgrp.3 head/lib/libc/gen/tcsendbreak.3 head/lib/libc/gen/tcsetattr.3 head/lib/libc/gen/tcsetpgrp.3 head/lib/libc/gen/telldir.c head/lib/libc/gen/termios.c head/lib/libc/gen/time.3 head/lib/libc/gen/time.c head/lib/libc/gen/times.3 head/lib/libc/gen/times.c head/lib/libc/gen/timezone.3 head/lib/libc/gen/timezone.c head/lib/libc/gen/ttyname.3 head/lib/libc/gen/ttyname.c head/lib/libc/gen/ttyslot.c head/lib/libc/gen/tzset.3 head/lib/libc/gen/ualarm.3 head/lib/libc/gen/ualarm.c head/lib/libc/gen/uname.3 head/lib/libc/gen/uname.c head/lib/libc/gen/usleep.3 head/lib/libc/gen/usleep.c head/lib/libc/gen/utime.3 head/lib/libc/gen/utime.c head/lib/libc/gen/valloc.3 head/lib/libc/gen/valloc.c head/lib/libc/gen/wait.c head/lib/libc/gen/wait3.c head/lib/libc/gen/waitpid.c head/lib/libc/gmon/gmon.c head/lib/libc/gmon/mcount.c head/lib/libc/gmon/moncontrol.3 head/lib/libc/i386/SYS.h head/lib/libc/i386/gen/_setjmp.S head/lib/libc/i386/gen/fabs.S head/lib/libc/i386/gen/setjmp.S head/lib/libc/i386/gen/sigsetjmp.S head/lib/libc/i386/string/bcopy.S head/lib/libc/i386/sys/Ovfork.S head/lib/libc/i386/sys/brk.S head/lib/libc/i386/sys/cerror.S head/lib/libc/i386/sys/exect.S head/lib/libc/i386/sys/i386_get_ldt.2 head/lib/libc/i386/sys/sbrk.S head/lib/libc/i386/sys/setlogin.S head/lib/libc/i386/sys/sigreturn.S head/lib/libc/i386/sys/syscall.S head/lib/libc/inet/inet_addr.c head/lib/libc/inet/inet_lnaof.c head/lib/libc/inet/inet_makeaddr.c head/lib/libc/inet/inet_netof.c head/lib/libc/inet/inet_network.c head/lib/libc/inet/inet_ntoa.c head/lib/libc/locale/ascii.c head/lib/libc/locale/ctype.3 head/lib/libc/locale/digittoint.3 head/lib/libc/locale/euc.5 head/lib/libc/locale/gbk.c head/lib/libc/locale/isalnum.3 head/lib/libc/locale/isalpha.3 head/lib/libc/locale/isascii.3 head/lib/libc/locale/isblank.3 head/lib/libc/locale/iscntrl.3 head/lib/libc/locale/isctype.c head/lib/libc/locale/isdigit.3 head/lib/libc/locale/isgraph.3 head/lib/libc/locale/islower.3 head/lib/libc/locale/isprint.3 head/lib/libc/locale/ispunct.3 head/lib/libc/locale/isspace.3 head/lib/libc/locale/isupper.3 head/lib/libc/locale/iswalnum.3 head/lib/libc/locale/iswctype.c head/lib/libc/locale/isxdigit.3 head/lib/libc/locale/localeconv.3 head/lib/libc/locale/localeconv.c head/lib/libc/locale/mblen.3 head/lib/libc/locale/mbstowcs.3 head/lib/libc/locale/mbtowc.3 head/lib/libc/locale/multibyte.3 head/lib/libc/locale/none.c head/lib/libc/locale/rune.c head/lib/libc/locale/runetype.c head/lib/libc/locale/setlocale.3 head/lib/libc/locale/setlocale.c head/lib/libc/locale/setrunelocale.c head/lib/libc/locale/table.c head/lib/libc/locale/toascii.3 head/lib/libc/locale/tolower.3 head/lib/libc/locale/tolower.c head/lib/libc/locale/toupper.3 head/lib/libc/locale/toupper.c head/lib/libc/locale/towlower.3 head/lib/libc/locale/towupper.3 head/lib/libc/locale/utf8.5 head/lib/libc/locale/wcstoimax.c head/lib/libc/locale/wcstol.c head/lib/libc/locale/wcstoll.c head/lib/libc/locale/wcstombs.3 head/lib/libc/locale/wcstoul.c head/lib/libc/locale/wcstoull.c head/lib/libc/locale/wcstoumax.c head/lib/libc/locale/wctomb.3 head/lib/libc/locale/wcwidth.c head/lib/libc/net/byteorder.3 head/lib/libc/net/gethostbydns.c head/lib/libc/net/gethostbyht.c head/lib/libc/net/gethostbyname.3 head/lib/libc/net/getipnodebyname.3 head/lib/libc/net/getnetbydns.c head/lib/libc/net/getnetbyht.c head/lib/libc/net/getnetent.3 head/lib/libc/net/getproto.c head/lib/libc/net/getprotoent.3 head/lib/libc/net/getprotoent.c head/lib/libc/net/getprotoname.c head/lib/libc/net/getservent.3 head/lib/libc/net/getservent.c head/lib/libc/net/inet.3 head/lib/libc/net/inet_net.3 head/lib/libc/net/linkaddr.3 head/lib/libc/net/linkaddr.c head/lib/libc/net/map_v4v6.c head/lib/libc/net/nsdispatch.3 head/lib/libc/net/rcmd.3 head/lib/libc/net/rcmd.c head/lib/libc/net/rcmdsh.3 head/lib/libc/net/recv.c head/lib/libc/net/resolver.3 head/lib/libc/net/send.c head/lib/libc/quad/TESTS/divrem.c head/lib/libc/quad/TESTS/mul.c head/lib/libc/quad/adddi3.c head/lib/libc/quad/anddi3.c head/lib/libc/quad/ashldi3.c head/lib/libc/quad/ashrdi3.c head/lib/libc/quad/cmpdi2.c head/lib/libc/quad/divdi3.c head/lib/libc/quad/fixdfdi.c head/lib/libc/quad/fixsfdi.c head/lib/libc/quad/fixunsdfdi.c head/lib/libc/quad/fixunssfdi.c head/lib/libc/quad/floatdidf.c head/lib/libc/quad/floatdisf.c head/lib/libc/quad/floatunsdidf.c head/lib/libc/quad/iordi3.c head/lib/libc/quad/lshldi3.c head/lib/libc/quad/lshrdi3.c head/lib/libc/quad/moddi3.c head/lib/libc/quad/muldi3.c head/lib/libc/quad/negdi2.c head/lib/libc/quad/notdi2.c head/lib/libc/quad/qdivrem.c head/lib/libc/quad/quad.h head/lib/libc/quad/subdi3.c head/lib/libc/quad/ucmpdi2.c head/lib/libc/quad/udivdi3.c head/lib/libc/quad/umoddi3.c head/lib/libc/quad/xordi3.c head/lib/libc/regex/cname.h head/lib/libc/regex/engine.c head/lib/libc/regex/regcomp.c head/lib/libc/regex/regerror.c head/lib/libc/regex/regex.3 head/lib/libc/regex/regex2.h head/lib/libc/regex/regexec.c head/lib/libc/regex/regfree.c head/lib/libc/regex/utils.h head/lib/libc/resolv/herror.c head/lib/libc/resolv/res_comp.c head/lib/libc/resolv/res_debug.c head/lib/libc/resolv/res_init.c head/lib/libc/resolv/res_mkquery.c head/lib/libc/resolv/res_query.c head/lib/libc/resolv/res_send.c head/lib/libc/sparc64/SYS.h head/lib/libc/sparc64/fpu/fpu.c head/lib/libc/sparc64/fpu/fpu_add.c head/lib/libc/sparc64/fpu/fpu_arith.h head/lib/libc/sparc64/fpu/fpu_compare.c head/lib/libc/sparc64/fpu/fpu_div.c head/lib/libc/sparc64/fpu/fpu_emu.h head/lib/libc/sparc64/fpu/fpu_explode.c head/lib/libc/sparc64/fpu/fpu_implode.c head/lib/libc/sparc64/fpu/fpu_mul.c head/lib/libc/sparc64/fpu/fpu_sqrt.c head/lib/libc/sparc64/fpu/fpu_subr.c head/lib/libc/sparc64/gen/_setjmp.S head/lib/libc/sparc64/gen/fixunsdfsi.S head/lib/libc/sparc64/gen/setjmp.S head/lib/libc/sparc64/sys/brk.S head/lib/libc/sparc64/sys/cerror.S head/lib/libc/sparc64/sys/exect.S head/lib/libc/sparc64/sys/sbrk.S head/lib/libc/sparc64/sys/setlogin.S head/lib/libc/stdio/fclose.3 head/lib/libc/stdio/ferror.3 head/lib/libc/stdio/fflush.3 head/lib/libc/stdio/fgetln.3 head/lib/libc/stdio/fgets.3 head/lib/libc/stdio/fgetwln.3 head/lib/libc/stdio/fgetws.3 head/lib/libc/stdio/floatio.h head/lib/libc/stdio/fopen.3 head/lib/libc/stdio/fputs.3 head/lib/libc/stdio/fputws.3 head/lib/libc/stdio/fread.3 head/lib/libc/stdio/fseek.3 head/lib/libc/stdio/funopen.3 head/lib/libc/stdio/fvwrite.h head/lib/libc/stdio/getc.3 head/lib/libc/stdio/getwc.3 head/lib/libc/stdio/glue.h head/lib/libc/stdio/local.h head/lib/libc/stdio/mktemp.3 head/lib/libc/stdio/printf.3 head/lib/libc/stdio/printfcommon.h head/lib/libc/stdio/printflocal.h head/lib/libc/stdio/putc.3 head/lib/libc/stdio/putwc.3 head/lib/libc/stdio/remove.3 head/lib/libc/stdio/scanf.3 head/lib/libc/stdio/setbuf.3 head/lib/libc/stdio/stdio.3 head/lib/libc/stdio/tmpnam.3 head/lib/libc/stdio/ungetc.3 head/lib/libc/stdio/ungetwc.3 head/lib/libc/stdio/wprintf.3 head/lib/libc/stdio/wscanf.3 head/lib/libc/stdtime/strftime.3 head/lib/libc/sys/_exit.2 head/lib/libc/sys/accept.2 head/lib/libc/sys/access.2 head/lib/libc/sys/acct.2 head/lib/libc/sys/adjtime.2 head/lib/libc/sys/bind.2 head/lib/libc/sys/brk.2 head/lib/libc/sys/chdir.2 head/lib/libc/sys/chflags.2 head/lib/libc/sys/chmod.2 head/lib/libc/sys/chown.2 head/lib/libc/sys/chroot.2 head/lib/libc/sys/clock_gettime.2 head/lib/libc/sys/close.2 head/lib/libc/sys/connect.2 head/lib/libc/sys/dup.2 head/lib/libc/sys/execve.2 head/lib/libc/sys/fcntl.2 head/lib/libc/sys/flock.2 head/lib/libc/sys/fork.2 head/lib/libc/sys/fsync.2 head/lib/libc/sys/getdirentries.2 head/lib/libc/sys/getdtablesize.2 head/lib/libc/sys/getfh.2 head/lib/libc/sys/getfsstat.2 head/lib/libc/sys/getgid.2 head/lib/libc/sys/getgroups.2 head/lib/libc/sys/getitimer.2 head/lib/libc/sys/getlogin.2 head/lib/libc/sys/getpeername.2 head/lib/libc/sys/getpgrp.2 head/lib/libc/sys/getpid.2 head/lib/libc/sys/getpriority.2 head/lib/libc/sys/getrlimit.2 head/lib/libc/sys/getrusage.2 head/lib/libc/sys/getsockname.2 head/lib/libc/sys/getsockopt.2 head/lib/libc/sys/gettimeofday.2 head/lib/libc/sys/getuid.2 head/lib/libc/sys/intro.2 head/lib/libc/sys/ioctl.2 head/lib/libc/sys/issetugid.2 head/lib/libc/sys/kill.2 head/lib/libc/sys/ktrace.2 head/lib/libc/sys/link.2 head/lib/libc/sys/listen.2 head/lib/libc/sys/lseek.2 head/lib/libc/sys/madvise.2 head/lib/libc/sys/mincore.2 head/lib/libc/sys/minherit.2 head/lib/libc/sys/mkdir.2 head/lib/libc/sys/mkfifo.2 head/lib/libc/sys/mknod.2 head/lib/libc/sys/mlock.2 head/lib/libc/sys/mmap.2 head/lib/libc/sys/mount.2 head/lib/libc/sys/mprotect.2 head/lib/libc/sys/msync.2 head/lib/libc/sys/munmap.2 head/lib/libc/sys/nanosleep.2 head/lib/libc/sys/nfssvc.2 head/lib/libc/sys/open.2 head/lib/libc/sys/pathconf.2 head/lib/libc/sys/pipe.2 head/lib/libc/sys/posix_fadvise.2 head/lib/libc/sys/posix_fallocate.2 head/lib/libc/sys/profil.2 head/lib/libc/sys/quotactl.2 head/lib/libc/sys/read.2 head/lib/libc/sys/readlink.2 head/lib/libc/sys/reboot.2 head/lib/libc/sys/recv.2 head/lib/libc/sys/rename.2 head/lib/libc/sys/revoke.2 head/lib/libc/sys/rmdir.2 head/lib/libc/sys/select.2 head/lib/libc/sys/send.2 head/lib/libc/sys/setgroups.2 head/lib/libc/sys/setpgid.2 head/lib/libc/sys/setregid.2 head/lib/libc/sys/setreuid.2 head/lib/libc/sys/setsid.2 head/lib/libc/sys/setuid.2 head/lib/libc/sys/shutdown.2 head/lib/libc/sys/sigaction.2 head/lib/libc/sys/sigaltstack.2 head/lib/libc/sys/sigpending.2 head/lib/libc/sys/sigprocmask.2 head/lib/libc/sys/sigreturn.2 head/lib/libc/sys/sigstack.2 head/lib/libc/sys/sigsuspend.2 head/lib/libc/sys/socket.2 head/lib/libc/sys/socketpair.2 head/lib/libc/sys/stat.2 head/lib/libc/sys/statfs.2 head/lib/libc/sys/swapon.2 head/lib/libc/sys/symlink.2 head/lib/libc/sys/sync.2 head/lib/libc/sys/sysarch.2 head/lib/libc/sys/syscall.2 head/lib/libc/sys/truncate.2 head/lib/libc/sys/umask.2 head/lib/libc/sys/undelete.2 head/lib/libc/sys/unlink.2 head/lib/libc/sys/utimensat.2 head/lib/libc/sys/utimes.2 head/lib/libc/sys/vfork.2 head/lib/libc/sys/wait.2 head/lib/libc/sys/write.2 head/lib/libcompat/4.1/ftime.3 head/lib/libcompat/4.3/re_comp.3 head/lib/libcompat/4.3/re_comp.c head/lib/libcompat/4.3/rexec.3 head/lib/libcompat/4.3/rexec.c head/lib/libcompat/4.4/cuserid.c head/lib/libcrypt/crypt.3 head/lib/libifconfig/libifconfig.c head/lib/libkvm/kvm.3 head/lib/libkvm/kvm.c head/lib/libkvm/kvm.h head/lib/libkvm/kvm_amd64.c head/lib/libkvm/kvm_arm.c head/lib/libkvm/kvm_geterr.3 head/lib/libkvm/kvm_getloadavg.3 head/lib/libkvm/kvm_getloadavg.c head/lib/libkvm/kvm_getprocs.3 head/lib/libkvm/kvm_i386.c head/lib/libkvm/kvm_nlist.3 head/lib/libkvm/kvm_open.3 head/lib/libkvm/kvm_private.c head/lib/libkvm/kvm_private.h head/lib/libkvm/kvm_proc.c head/lib/libkvm/kvm_read.3 head/lib/libkvm/kvm_sparc64.c head/lib/libstand/amd64/_setjmp.S head/lib/libstand/arp.c head/lib/libstand/bootp.c head/lib/libstand/close.c head/lib/libstand/closeall.c head/lib/libstand/dev.c head/lib/libstand/ether.c head/lib/libstand/fstat.c head/lib/libstand/getopt.c head/lib/libstand/gets.c head/lib/libstand/i386/_setjmp.S head/lib/libstand/in_cksum.c head/lib/libstand/inet_ntoa.c head/lib/libstand/ioctl.c head/lib/libstand/iodesc.h head/lib/libstand/lseek.c head/lib/libstand/net.c head/lib/libstand/net.h head/lib/libstand/nfsv2.h head/lib/libstand/nullfs.c head/lib/libstand/open.c head/lib/libstand/printf.c head/lib/libstand/qdivrem.c head/lib/libstand/quad.h head/lib/libstand/random.c head/lib/libstand/rarp.c head/lib/libstand/read.c head/lib/libstand/rpc.c head/lib/libstand/rpc.h head/lib/libstand/rpcv2.h head/lib/libstand/saioctl.h head/lib/libstand/sparc64/_setjmp.S head/lib/libstand/stand.h head/lib/libstand/stat.c head/lib/libstand/strcasecmp.c head/lib/libstand/strdup.c head/lib/libstand/strerror.c head/lib/libstand/strtol.c head/lib/libstand/strtoul.c head/lib/libstand/twiddle.c head/lib/libstand/udp.c head/lib/libstand/write.c head/lib/libsysdecode/utrace.c head/lib/libutil/hexdump.c head/lib/libutil/login_tty.c head/lib/libutil/pty.c head/lib/libutil/pw_util.c head/lib/libutil/uucplock.c head/lib/liby/main.c head/lib/liby/yyerror.c head/lib/msun/man/acos.3 head/lib/msun/man/acosh.3 head/lib/msun/man/asin.3 head/lib/msun/man/asinh.3 head/lib/msun/man/atan.3 head/lib/msun/man/atan2.3 head/lib/msun/man/atanh.3 head/lib/msun/man/ceil.3 head/lib/msun/man/copysign.3 head/lib/msun/man/cos.3 head/lib/msun/man/cosh.3 head/lib/msun/man/erf.3 head/lib/msun/man/exp.3 head/lib/msun/man/fabs.3 head/lib/msun/man/floor.3 head/lib/msun/man/fmod.3 head/lib/msun/man/hypot.3 head/lib/msun/man/ieee.3 head/lib/msun/man/ieee_test.3 head/lib/msun/man/ilogb.3 head/lib/msun/man/j0.3 head/lib/msun/man/lgamma.3 head/lib/msun/man/math.3 head/lib/msun/man/nextafter.3 head/lib/msun/man/remainder.3 head/lib/msun/man/rint.3 head/lib/msun/man/scalbn.3 head/lib/msun/man/sin.3 head/lib/msun/man/sinh.3 head/lib/msun/man/sqrt.3 head/lib/msun/man/tan.3 head/lib/msun/man/tanh.3 head/lib/ncurses/ncurses/pathnames.h head/lib/ncurses/ncurses/termcap.c head/libexec/rtld-elf/rtld_printf.c head/libexec/rtld-elf/rtld_utrace.h head/release/picobsd/tinyware/passwd/extern.h head/release/picobsd/tinyware/passwd/pw_util.h head/sbin/badsect/badsect.8 head/sbin/badsect/badsect.c head/sbin/bsdlabel/bsdlabel.8 head/sbin/bsdlabel/pathnames.h head/sbin/clri/clri.8 head/sbin/clri/clri.c head/sbin/devd/devd.cc head/sbin/dmesg/dmesg.8 head/sbin/dmesg/dmesg.c head/sbin/dump/dump.8 head/sbin/dump/dump.h head/sbin/dump/dumprmt.c head/sbin/dump/itime.c head/sbin/dump/main.c head/sbin/dump/optr.c head/sbin/dump/pathnames.h head/sbin/dump/tape.c head/sbin/dump/traverse.c head/sbin/dump/unctime.c head/sbin/dumpfs/dumpfs.8 head/sbin/dumpfs/dumpfs.c head/sbin/dumpon/dumpon.8 head/sbin/dumpon/dumpon.c head/sbin/fsck/preen.c head/sbin/fsck_ffs/dir.c head/sbin/fsck_ffs/fsck.h head/sbin/fsck_ffs/fsck_ffs.8 head/sbin/fsck_ffs/fsutil.c head/sbin/fsck_ffs/gjournal.c head/sbin/fsck_ffs/globs.c head/sbin/fsck_ffs/inode.c head/sbin/fsck_ffs/main.c head/sbin/fsck_ffs/pass1.c head/sbin/fsck_ffs/pass1b.c head/sbin/fsck_ffs/pass2.c head/sbin/fsck_ffs/pass3.c head/sbin/fsck_ffs/pass4.c head/sbin/fsck_ffs/pass5.c head/sbin/fsck_ffs/setup.c head/sbin/fsck_ffs/utilities.c head/sbin/ifconfig/af_inet.c head/sbin/ifconfig/af_inet6.c head/sbin/ifconfig/af_link.c head/sbin/ifconfig/ifclone.c head/sbin/ifconfig/ifconfig.8 head/sbin/ifconfig/ifconfig.c head/sbin/init/init.8 head/sbin/init/init.c head/sbin/init/pathnames.h head/sbin/mknod/mknod.8 head/sbin/mknod/mknod.c head/sbin/mount/getmntopts.3 head/sbin/mount/getmntopts.c head/sbin/mount/mntopts.h head/sbin/mount/mount.8 head/sbin/mount/mount.c head/sbin/mount/mount_fs.c head/sbin/mount/pathnames.h head/sbin/mount/vfslist.c head/sbin/mount_cd9660/mount_cd9660.8 head/sbin/mount_cd9660/mount_cd9660.c head/sbin/mount_fusefs/mount_fusefs.8 head/sbin/mount_nfs/mount_nfs.8 head/sbin/mount_nfs/mount_nfs.c head/sbin/mount_nullfs/mount_nullfs.8 head/sbin/mount_nullfs/mount_nullfs.c head/sbin/mount_udf/mount_udf.c head/sbin/mount_unionfs/mount_unionfs.8 head/sbin/mount_unionfs/mount_unionfs.c head/sbin/newfs/mkfs.c head/sbin/newfs/newfs.8 head/sbin/newfs/newfs.c head/sbin/newfs/newfs.h head/sbin/nfsiod/nfsiod.8 head/sbin/nfsiod/nfsiod.c head/sbin/ping/ping.8 head/sbin/ping/ping.c head/sbin/ping6/ping6.c head/sbin/quotacheck/preen.c head/sbin/quotacheck/quotacheck.8 head/sbin/quotacheck/quotacheck.c head/sbin/quotacheck/quotacheck.h head/sbin/reboot/boot_i386.8 head/sbin/reboot/reboot.8 head/sbin/reboot/reboot.c head/sbin/restore/dirs.c head/sbin/restore/extern.h head/sbin/restore/interactive.c head/sbin/restore/main.c head/sbin/restore/restore.8 head/sbin/restore/restore.c head/sbin/restore/restore.h head/sbin/restore/symtab.c head/sbin/restore/tape.c head/sbin/restore/utilities.c head/sbin/route/route.8 head/sbin/route/route.c head/sbin/routed/defs.h head/sbin/routed/if.c head/sbin/routed/input.c head/sbin/routed/main.c head/sbin/routed/output.c head/sbin/routed/parms.c head/sbin/routed/pathnames.h head/sbin/routed/radix.c head/sbin/routed/radix.h head/sbin/routed/rdisc.c head/sbin/routed/routed.8 head/sbin/routed/rtquery/rtquery.c head/sbin/routed/table.c head/sbin/routed/trace.c head/sbin/savecore/savecore.8 head/sbin/savecore/savecore.c head/sbin/shutdown/shutdown.8 head/sbin/shutdown/shutdown.c head/sbin/swapon/swapon.8 head/sbin/swapon/swapon.c head/sbin/sysctl/sysctl.8 head/sbin/sysctl/sysctl.c head/sbin/tunefs/tunefs.8 head/sbin/tunefs/tunefs.c head/sbin/umount/umount.8 head/sbin/umount/umount.c head/share/doc/smm/03.fsck/0.t head/share/doc/smm/03.fsck/1.t head/share/doc/smm/03.fsck/2.t head/share/doc/smm/03.fsck/3.t head/share/doc/smm/03.fsck/4.t head/share/doc/usd/04.csh/csh.1 head/share/doc/usd/04.csh/csh.2 head/share/doc/usd/04.csh/csh.3 head/share/doc/usd/04.csh/csh.4 head/share/doc/usd/04.csh/csh.a head/share/doc/usd/04.csh/csh.g head/share/doc/usd/04.csh/tabs head/share/man/man4/lo.4 head/sys/amd64/amd64/apic_vector.S head/sys/amd64/amd64/atpic_vector.S head/sys/amd64/amd64/cpu_switch.S head/sys/amd64/amd64/exception.S head/sys/amd64/amd64/fpu.c head/sys/amd64/amd64/genassym.c head/sys/amd64/amd64/mem.c head/sys/amd64/amd64/support.S head/sys/amd64/ia32/ia32_signal.c head/sys/amd64/include/asm.h head/sys/amd64/include/asmacros.h head/sys/amd64/include/cpu.h head/sys/amd64/include/cpufunc.h head/sys/amd64/include/exec.h head/sys/amd64/include/fpu.h head/sys/amd64/include/limits.h head/sys/amd64/include/pcb.h head/sys/amd64/include/pmap.h head/sys/amd64/include/proc.h head/sys/amd64/include/profile.h head/sys/amd64/include/reloc.h head/sys/amd64/include/segments.h head/sys/amd64/include/tss.h head/sys/amd64/linux/linux_support.s head/sys/amd64/linux32/linux32_support.s head/sys/amd64/vmm/vmm_stat.h head/sys/arm/arm/mem.c head/sys/arm/include/_align.h head/sys/arm/include/_limits.h head/sys/arm/include/limits.h head/sys/arm/include/signal.h head/sys/arm/include/stdarg.h head/sys/boot/geli/pwgets.c head/sys/conf/systags.sh head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_devid.h head/sys/contrib/dev/uath/ar5523.bin.uu head/sys/ddb/db_ps.c head/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h head/sys/dev/fdc/fdc.c head/sys/dev/ic/i8253reg.h head/sys/dev/ic/nec765.h head/sys/dev/ic/ns16550.h head/sys/dev/iscsi/icl_soft_proxy.c head/sys/dev/md/md.c head/sys/dev/nmdm/nmdm.c head/sys/dev/ofw/openfirmio.c head/sys/dev/ofw/openfirmio.h head/sys/dev/sio/sio.c head/sys/dev/sio/sioreg.h head/sys/dev/sio/siovar.h head/sys/dev/usb/usb_pf.c head/sys/dev/usb/usb_pf.h head/sys/fs/autofs/autofs.c head/sys/fs/cd9660/cd9660_bmap.c head/sys/fs/cd9660/cd9660_lookup.c head/sys/fs/cd9660/cd9660_mount.h head/sys/fs/cd9660/cd9660_node.c head/sys/fs/cd9660/cd9660_node.h head/sys/fs/cd9660/cd9660_rrip.c head/sys/fs/cd9660/cd9660_rrip.h head/sys/fs/cd9660/cd9660_util.c head/sys/fs/cd9660/cd9660_vfsops.c head/sys/fs/cd9660/cd9660_vnops.c head/sys/fs/cd9660/iso.h head/sys/fs/cd9660/iso_rrip.h head/sys/fs/deadfs/dead_vnops.c head/sys/fs/fifofs/fifo_vnops.c head/sys/fs/nfs/nfs.h head/sys/fs/nfs/nfs_commonkrpc.c head/sys/fs/nfs/nfs_commonport.c head/sys/fs/nfs/nfs_commonsubs.c head/sys/fs/nfs/nfs_var.h head/sys/fs/nfs/nfsm_subs.h head/sys/fs/nfs/nfsport.h head/sys/fs/nfs/nfsproto.h head/sys/fs/nfs/nfsrvcache.h head/sys/fs/nfs/rpcv2.h head/sys/fs/nfs/xdr_subs.h head/sys/fs/nfsclient/nfs.h head/sys/fs/nfsclient/nfs_clbio.c head/sys/fs/nfsclient/nfs_clcomsubs.c head/sys/fs/nfsclient/nfs_clkrpc.c head/sys/fs/nfsclient/nfs_clnfsiod.c head/sys/fs/nfsclient/nfs_clnode.c head/sys/fs/nfsclient/nfs_clport.c head/sys/fs/nfsclient/nfs_clrpcops.c head/sys/fs/nfsclient/nfs_clsubs.c head/sys/fs/nfsclient/nfs_clvfsops.c head/sys/fs/nfsclient/nfs_clvnops.c head/sys/fs/nfsclient/nfsmount.h head/sys/fs/nfsclient/nfsnode.h head/sys/fs/nfsserver/nfs_nfsdcache.c head/sys/fs/nfsserver/nfs_nfsdkrpc.c head/sys/fs/nfsserver/nfs_nfsdport.c head/sys/fs/nfsserver/nfs_nfsdserv.c head/sys/fs/nfsserver/nfs_nfsdsocket.c head/sys/fs/nfsserver/nfs_nfsdsubs.c head/sys/fs/nullfs/null.h head/sys/fs/nullfs/null_subr.c head/sys/fs/nullfs/null_vfsops.c head/sys/fs/nullfs/null_vnops.c head/sys/fs/procfs/procfs.h head/sys/fs/procfs/procfs_dbregs.c head/sys/fs/procfs/procfs_fpregs.c head/sys/fs/procfs/procfs_map.c head/sys/fs/procfs/procfs_mem.c head/sys/fs/procfs/procfs_note.c head/sys/fs/procfs/procfs_osrel.c head/sys/fs/procfs/procfs_regs.c head/sys/fs/procfs/procfs_status.c head/sys/fs/procfs/procfs_type.c head/sys/fs/unionfs/union.h head/sys/fs/unionfs/union_subr.c head/sys/fs/unionfs/union_vfsops.c head/sys/fs/unionfs/union_vnops.c head/sys/i386/i386/apic_vector.s head/sys/i386/i386/atpic_vector.s head/sys/i386/i386/exception.s head/sys/i386/i386/genassym.c head/sys/i386/i386/in_cksum.c head/sys/i386/i386/locore.s head/sys/i386/i386/mem.c head/sys/i386/i386/support.s head/sys/i386/i386/swtch.s head/sys/i386/include/asm.h head/sys/i386/include/asmacros.h head/sys/i386/include/cpu.h head/sys/i386/include/cpufunc.h head/sys/i386/include/exec.h head/sys/i386/include/frame.h head/sys/i386/include/limits.h head/sys/i386/include/npx.h head/sys/i386/include/param.h head/sys/i386/include/pcb.h head/sys/i386/include/pmap.h head/sys/i386/include/proc.h head/sys/i386/include/profile.h head/sys/i386/include/reloc.h head/sys/i386/include/segments.h head/sys/i386/include/signal.h head/sys/i386/include/tss.h head/sys/i386/include/varargs.h head/sys/i386/include/vmparam.h head/sys/i386/isa/npx.c head/sys/i386/linux/linux_support.s head/sys/isa/isareg.h head/sys/isa/rtc.h head/sys/libkern/ashldi3.c head/sys/libkern/ashrdi3.c head/sys/libkern/bcmp.c head/sys/libkern/bsearch.c head/sys/libkern/cmpdi2.c head/sys/libkern/divdi3.c head/sys/libkern/fnmatch.c head/sys/libkern/lshrdi3.c head/sys/libkern/mcount.c head/sys/libkern/memchr.c head/sys/libkern/memcmp.c head/sys/libkern/moddi3.c head/sys/libkern/qdivrem.c head/sys/libkern/qsort.c head/sys/libkern/quad.h head/sys/libkern/random.c head/sys/libkern/scanc.c head/sys/libkern/strcat.c head/sys/libkern/strchr.c head/sys/libkern/strcmp.c head/sys/libkern/strcpy.c head/sys/libkern/strncpy.c head/sys/libkern/strrchr.c head/sys/libkern/strsep.c head/sys/libkern/strstr.c head/sys/libkern/strtol.c head/sys/libkern/strtoq.c head/sys/libkern/strtoul.c head/sys/libkern/strtouq.c head/sys/libkern/ucmpdi2.c head/sys/libkern/udivdi3.c head/sys/libkern/umoddi3.c head/sys/mips/include/_align.h head/sys/mips/include/_limits.h head/sys/mips/include/asm.h head/sys/mips/include/cpu.h head/sys/mips/include/cpuinfo.h head/sys/mips/include/endian.h head/sys/mips/include/exec.h head/sys/mips/include/limits.h head/sys/mips/include/mips_opcode.h head/sys/mips/include/param.h head/sys/mips/include/pcb.h head/sys/mips/include/pmap.h head/sys/mips/include/proc.h head/sys/mips/include/profile.h head/sys/mips/include/ptrace.h head/sys/mips/include/reg.h head/sys/mips/include/regnum.h head/sys/mips/include/signal.h head/sys/mips/include/sysarch.h head/sys/mips/include/trap.h head/sys/mips/include/ucontext.h head/sys/mips/include/varargs.h head/sys/mips/include/vmparam.h head/sys/mips/mips/autoconf.c head/sys/mips/mips/exception.S head/sys/mips/mips/fp.S head/sys/mips/mips/genassym.c head/sys/mips/mips/locore.S head/sys/mips/mips/machdep.c head/sys/mips/mips/mem.c head/sys/mips/mips/pm_machdep.c head/sys/mips/mips/pmap.c head/sys/mips/mips/swtch.S head/sys/mips/mips/trap.c head/sys/mips/mips/vm_machdep.c head/sys/net/bpf.c head/sys/net/bpf.h head/sys/net/bpf_buffer.c head/sys/net/bpf_filter.c head/sys/net/bpfdesc.h head/sys/net/if.c head/sys/net/if.h head/sys/net/if_arc.h head/sys/net/if_arp.h head/sys/net/if_clone.c head/sys/net/if_clone.h head/sys/net/if_disc.c head/sys/net/if_dl.h head/sys/net/if_edsc.c head/sys/net/if_ethersubr.c head/sys/net/if_fwsubr.c head/sys/net/if_llc.h head/sys/net/if_loop.c head/sys/net/if_types.h head/sys/net/if_var.h head/sys/net/ifq.h head/sys/net/radix.c head/sys/net/radix.h head/sys/net/raw_cb.c head/sys/net/raw_cb.h head/sys/net/raw_usrreq.c head/sys/net/route.c head/sys/net/route.h head/sys/net/route_var.h head/sys/net/rtsock.c head/sys/net/slcompress.c head/sys/net/slcompress.h head/sys/netinet/icmp6.h head/sys/netinet/icmp_var.h head/sys/netinet/if_ether.c head/sys/netinet/if_ether.h head/sys/netinet/igmp.c head/sys/netinet/igmp.h head/sys/netinet/igmp_var.h head/sys/netinet/in.c head/sys/netinet/in.h head/sys/netinet/in_cksum.c head/sys/netinet/in_fib.c head/sys/netinet/in_fib.h head/sys/netinet/in_pcb.c head/sys/netinet/in_pcb.h head/sys/netinet/in_proto.c head/sys/netinet/in_systm.h head/sys/netinet/in_var.h head/sys/netinet/ip.h head/sys/netinet/ip6.h head/sys/netinet/ip_divert.c head/sys/netinet/ip_icmp.c head/sys/netinet/ip_icmp.h head/sys/netinet/ip_input.c head/sys/netinet/ip_mroute.c head/sys/netinet/ip_mroute.h head/sys/netinet/ip_options.c head/sys/netinet/ip_options.h head/sys/netinet/ip_output.c head/sys/netinet/ip_reass.c head/sys/netinet/ip_var.h head/sys/netinet/raw_ip.c head/sys/netinet/sctp_syscalls.c head/sys/netinet/tcp.h head/sys/netinet/tcp_debug.c head/sys/netinet/tcp_debug.h head/sys/netinet/tcp_fsm.h head/sys/netinet/tcp_input.c head/sys/netinet/tcp_output.c head/sys/netinet/tcp_reass.c head/sys/netinet/tcp_seq.h head/sys/netinet/tcp_stacks/fastpath.c head/sys/netinet/tcp_subr.c head/sys/netinet/tcp_syncache.h head/sys/netinet/tcp_timer.c head/sys/netinet/tcp_timer.h head/sys/netinet/tcp_timewait.c head/sys/netinet/tcp_usrreq.c head/sys/netinet/tcp_var.h head/sys/netinet/tcpip.h head/sys/netinet/udp.h head/sys/netinet/udp_usrreq.c head/sys/netinet/udp_var.h head/sys/netinet6/icmp6.c head/sys/netinet6/in6.c head/sys/netinet6/in6.h head/sys/netinet6/in6_cksum.c head/sys/netinet6/in6_fib.c head/sys/netinet6/in6_fib.h head/sys/netinet6/in6_pcb.c head/sys/netinet6/in6_pcb.h head/sys/netinet6/in6_proto.c head/sys/netinet6/in6_src.c head/sys/netinet6/in6_var.h head/sys/netinet6/ip6_input.c head/sys/netinet6/ip6_mroute.c head/sys/netinet6/ip6_output.c head/sys/netinet6/ip6_var.h head/sys/netinet6/ip6protosw.h head/sys/netinet6/mld6.c head/sys/netinet6/raw_ip6.c head/sys/netinet6/tcp6_var.h head/sys/netinet6/udp6_usrreq.c head/sys/netinet6/udp6_var.h head/sys/nfs/nfs_common.h head/sys/nfs/nfs_diskless.c head/sys/nfs/nfs_nfssvc.c head/sys/nfs/nfsdiskless.h head/sys/nfs/nfsproto.h head/sys/nfs/nfssvc.h head/sys/nfs/xdr_subs.h head/sys/nfsclient/nfs.h head/sys/nfsclient/nfsargs.h head/sys/nfsclient/nfsm_subs.h head/sys/nfsclient/nfsmount.h head/sys/nfsclient/nfsnode.h head/sys/nfsclient/nfsstats.h head/sys/nfsserver/nfs.h head/sys/nfsserver/nfsm_subs.h head/sys/nfsserver/nfsrvcache.h head/sys/nfsserver/nfsrvstats.h head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c head/sys/powerpc/include/_limits.h head/sys/powerpc/include/endian.h head/sys/powerpc/include/ieee.h head/sys/powerpc/include/limits.h head/sys/powerpc/include/ptrace.h head/sys/powerpc/powerpc/bcopy.c head/sys/powerpc/powerpc/genassym.c head/sys/powerpc/powerpc/intr_machdep.c head/sys/powerpc/powerpc/mem.c head/sys/rpc/rpcm_subs.h head/sys/sparc64/include/_types.h head/sys/sparc64/include/asm.h head/sys/sparc64/include/bus_common.h head/sys/sparc64/include/cpu.h head/sys/sparc64/include/endian.h head/sys/sparc64/include/ieee.h head/sys/sparc64/include/iommureg.h head/sys/sparc64/include/pmap.h head/sys/sparc64/include/proc.h head/sys/sparc64/include/ptrace.h head/sys/sparc64/include/reg.h head/sys/sparc64/include/signal.h head/sys/sparc64/include/sysarch.h head/sys/sparc64/include/varargs.h head/sys/sparc64/include/vmparam.h head/sys/sparc64/sbus/sbusvar.h head/sys/sparc64/sparc64/bus_machdep.c head/sys/sparc64/sparc64/in_cksum.c head/sys/sparc64/sparc64/intr_machdep.c head/sys/sparc64/sparc64/machdep.c head/sys/sparc64/sparc64/mem.c head/sys/sparc64/sparc64/pmap.c head/sys/sparc64/sparc64/trap.c head/sys/sparc64/sparc64/vm_machdep.c head/sys/sys/_callout.h head/sys/sys/_iovec.h head/sys/sys/_kstack_cache.h head/sys/sys/_sigset.h head/sys/sys/_sockaddr_storage.h head/sys/sys/_termios.h head/sys/sys/_timespec.h head/sys/sys/acct.h head/sys/sys/bio.h head/sys/sys/bitstring.h head/sys/sys/blist.h head/sys/sys/buf.h head/sys/sys/callout.h head/sys/sys/cdefs.h head/sys/sys/conf.h head/sys/sys/cons.h head/sys/sys/ctype.h head/sys/sys/dir.h head/sys/sys/dirent.h head/sys/sys/disk/bsd.h head/sys/sys/disk/mbr.h head/sys/sys/disklabel.h head/sys/sys/diskmbr.h head/sys/sys/dkstat.h head/sys/sys/domain.h head/sys/sys/errno.h head/sys/sys/exec.h head/sys/sys/fbio.h head/sys/sys/fcntl.h head/sys/sys/file.h head/sys/sys/filedesc.h head/sys/sys/filio.h head/sys/sys/gmon.h head/sys/sys/imgact.h head/sys/sys/imgact_aout.h head/sys/sys/ioccom.h head/sys/sys/ioctl.h head/sys/sys/ioctl_compat.h head/sys/sys/ipc.h head/sys/sys/ktrace.h head/sys/sys/libkern.h head/sys/sys/limits.h head/sys/sys/lockf.h head/sys/sys/malloc.h head/sys/sys/mdioctl.h head/sys/sys/mman.h head/sys/sys/mount.h head/sys/sys/msgbuf.h head/sys/sys/mtio.h head/sys/sys/namei.h head/sys/sys/nlist_aout.h head/sys/sys/numa.h head/sys/sys/param.h head/sys/sys/pcpu.h head/sys/sys/proc.h head/sys/sys/protosw.h head/sys/sys/ptrace.h head/sys/sys/queue.h head/sys/sys/reboot.h head/sys/sys/resource.h head/sys/sys/resourcevar.h head/sys/sys/select.h head/sys/sys/selinfo.h head/sys/sys/sigio.h head/sys/sys/signal.h head/sys/sys/signalvar.h head/sys/sys/sockbuf.h head/sys/sys/socket.h head/sys/sys/socketvar.h head/sys/sys/sockio.h head/sys/sys/sockopt.h head/sys/sys/sockstate.h head/sys/sys/stat.h head/sys/sys/sun_disklabel.h head/sys/sys/sysctl.h head/sys/sys/sysent.h head/sys/sys/syslimits.h head/sys/sys/syslog.h head/sys/sys/systm.h head/sys/sys/time.h head/sys/sys/timeb.h head/sys/sys/times.h head/sys/sys/timespec.h head/sys/sys/ttycom.h head/sys/sys/ttydefaults.h head/sys/sys/types.h head/sys/sys/ucred.h head/sys/sys/uio.h head/sys/sys/un.h head/sys/sys/unistd.h head/sys/sys/unpcb.h head/sys/sys/user.h head/sys/sys/utsname.h head/sys/sys/vmmeter.h head/sys/sys/vnode.h head/sys/sys/wait.h head/sys/tools/makeobjops.awk head/sys/tools/vnode_if.awk head/sys/ufs/ffs/ffs_alloc.c head/sys/ufs/ffs/ffs_balloc.c head/sys/ufs/ffs/ffs_extern.h head/sys/ufs/ffs/ffs_inode.c head/sys/ufs/ffs/ffs_tables.c head/sys/ufs/ffs/ffs_vfsops.c head/sys/ufs/ffs/ffs_vnops.c head/sys/ufs/ufs/inode.h head/sys/ufs/ufs/quota.h head/sys/ufs/ufs/ufs_bmap.c head/sys/ufs/ufs/ufs_extern.h head/sys/ufs/ufs/ufs_inode.c head/sys/ufs/ufs/ufs_lookup.c head/sys/ufs/ufs/ufs_quota.c head/sys/ufs/ufs/ufs_vfsops.c head/sys/ufs/ufs/ufs_vnops.c head/sys/ufs/ufs/ufsmount.h head/sys/vm/device_pager.c head/sys/vm/pmap.h head/sys/vm/swap_pager.h head/sys/vm/vm.h head/sys/vm/vm_extern.h head/sys/vm/vm_glue.c head/sys/vm/vm_init.c head/sys/vm/vm_kern.c head/sys/vm/vm_kern.h head/sys/vm/vm_map.c head/sys/vm/vm_map.h head/sys/vm/vm_meter.c head/sys/vm/vm_mmap.c head/sys/vm/vm_object.c head/sys/vm/vm_object.h head/sys/vm/vm_page.c head/sys/vm/vm_page.h head/sys/vm/vm_pageout.h head/sys/vm/vm_pager.c head/sys/vm/vm_pager.h head/sys/vm/vm_param.h head/sys/vm/vm_unix.c head/sys/vm/vnode_pager.h head/sys/x86/include/_limits.h head/sys/x86/include/endian.h head/sys/x86/include/fpu.h head/sys/x86/include/frame.h head/sys/x86/include/psl.h head/sys/x86/include/ptrace.h head/sys/x86/include/reg.h head/sys/x86/include/segments.h head/sys/x86/include/signal.h head/sys/x86/include/specialreg.h head/sys/x86/include/sysarch.h head/sys/x86/include/trap.h head/sys/x86/isa/clock.c head/sys/x86/isa/icu.h head/sys/x86/isa/isa_dma.c head/sys/x86/isa/nmi.c head/sys/x86/x86/autoconf.c head/sys/x86/x86/delay.c head/tools/regression/aio/aiop/aiop.c head/usr.bin/apply/apply.1 head/usr.bin/apply/apply.c head/usr.bin/banner/banner.6 head/usr.bin/banner/banner.c head/usr.bin/basename/basename.1 head/usr.bin/basename/basename.c head/usr.bin/biff/biff.1 head/usr.bin/biff/biff.c head/usr.bin/calendar/calendar.1 head/usr.bin/calendar/calendar.c head/usr.bin/calendar/calendar.h head/usr.bin/calendar/day.c head/usr.bin/calendar/io.c head/usr.bin/calendar/locale.c head/usr.bin/calendar/pathnames.h head/usr.bin/calendar/pom.c head/usr.bin/cap_mkdb/cap_mkdb.1 head/usr.bin/cap_mkdb/cap_mkdb.c head/usr.bin/checknr/checknr.1 head/usr.bin/checknr/checknr.c head/usr.bin/chpass/chpass.1 head/usr.bin/chpass/table.c head/usr.bin/cksum/cksum.1 head/usr.bin/cksum/cksum.c head/usr.bin/cksum/crc.c head/usr.bin/cksum/extern.h head/usr.bin/cksum/print.c head/usr.bin/cksum/sum1.c head/usr.bin/cksum/sum2.c head/usr.bin/cmp/cmp.1 head/usr.bin/cmp/cmp.c head/usr.bin/cmp/extern.h head/usr.bin/cmp/misc.c head/usr.bin/cmp/regular.c head/usr.bin/cmp/special.c head/usr.bin/col/col.1 head/usr.bin/col/col.c head/usr.bin/colcrt/colcrt.1 head/usr.bin/colcrt/colcrt.c head/usr.bin/colrm/colrm.1 head/usr.bin/colrm/colrm.c head/usr.bin/column/column.1 head/usr.bin/column/column.c head/usr.bin/comm/comm.1 head/usr.bin/comm/comm.c head/usr.bin/compress/compress.1 head/usr.bin/compress/compress.c head/usr.bin/compress/zopen.3 head/usr.bin/compress/zopen.c head/usr.bin/ctags/C.c head/usr.bin/ctags/ctags.1 head/usr.bin/ctags/ctags.c head/usr.bin/ctags/ctags.h head/usr.bin/ctags/fortran.c head/usr.bin/ctags/lisp.c head/usr.bin/ctags/print.c head/usr.bin/ctags/tree.c head/usr.bin/ctags/yacc.c head/usr.bin/cut/cut.1 head/usr.bin/cut/cut.c head/usr.bin/dirname/dirname.c head/usr.bin/du/du.1 head/usr.bin/du/du.c head/usr.bin/env/env.1 head/usr.bin/env/env.c head/usr.bin/expand/expand.1 head/usr.bin/expand/expand.c head/usr.bin/false/false.1 head/usr.bin/false/false.c head/usr.bin/find/extern.h head/usr.bin/find/find.1 head/usr.bin/find/find.c head/usr.bin/find/find.h head/usr.bin/find/function.c head/usr.bin/find/ls.c head/usr.bin/find/main.c head/usr.bin/find/misc.c head/usr.bin/find/operator.c head/usr.bin/find/option.c head/usr.bin/finger/extern.h head/usr.bin/finger/finger.1 head/usr.bin/finger/finger.c head/usr.bin/finger/finger.h head/usr.bin/finger/lprint.c head/usr.bin/finger/net.c head/usr.bin/finger/sprint.c head/usr.bin/finger/util.c head/usr.bin/fmt/fmt.1 head/usr.bin/fold/fold.1 head/usr.bin/fold/fold.c head/usr.bin/from/from.1 head/usr.bin/from/from.c head/usr.bin/fstat/fstat.1 head/usr.bin/fstat/fstat.c head/usr.bin/gcore/extern.h head/usr.bin/gcore/gcore.1 head/usr.bin/gcore/gcore.c head/usr.bin/gprof/amd64.h head/usr.bin/gprof/aout.c head/usr.bin/gprof/arcs.c head/usr.bin/gprof/arm.h head/usr.bin/gprof/dfn.c head/usr.bin/gprof/elf.c head/usr.bin/gprof/gprof.1 head/usr.bin/gprof/gprof.c head/usr.bin/gprof/gprof.h head/usr.bin/gprof/hertz.c head/usr.bin/gprof/i386.h head/usr.bin/gprof/lookup.c head/usr.bin/gprof/mips.h head/usr.bin/gprof/pathnames.h head/usr.bin/gprof/powerpc.h head/usr.bin/gprof/printgprof.c head/usr.bin/gprof/printlist.c head/usr.bin/gprof/sparc64.h head/usr.bin/head/head.1 head/usr.bin/head/head.c head/usr.bin/hexdump/conv.c head/usr.bin/hexdump/display.c head/usr.bin/hexdump/hexdump.1 head/usr.bin/hexdump/hexdump.c head/usr.bin/hexdump/hexdump.h head/usr.bin/hexdump/hexsyntax.c head/usr.bin/hexdump/od.1 head/usr.bin/hexdump/odsyntax.c head/usr.bin/hexdump/parse.c head/usr.bin/id/groups.1 head/usr.bin/id/id.1 head/usr.bin/id/id.c head/usr.bin/id/whoami.1 head/usr.bin/join/join.1 head/usr.bin/join/join.c head/usr.bin/jot/jot.1 head/usr.bin/jot/jot.c head/usr.bin/kdump/kdump.1 head/usr.bin/kdump/kdump.c head/usr.bin/ktrace/ktrace.1 head/usr.bin/ktrace/ktrace.c head/usr.bin/ktrace/ktrace.h head/usr.bin/ktrace/subr.c head/usr.bin/lam/lam.1 head/usr.bin/lam/lam.c head/usr.bin/last/last.1 head/usr.bin/last/last.c head/usr.bin/lastcomm/lastcomm.1 head/usr.bin/lastcomm/lastcomm.c head/usr.bin/lastcomm/pathnames.h head/usr.bin/leave/leave.1 head/usr.bin/leave/leave.c head/usr.bin/locate/locate/pathnames.h head/usr.bin/lock/lock.1 head/usr.bin/lock/lock.c head/usr.bin/logger/logger.1 head/usr.bin/logger/logger.c head/usr.bin/login/login.1 head/usr.bin/login/pathnames.h head/usr.bin/logname/logname.1 head/usr.bin/logname/logname.c head/usr.bin/look/look.1 head/usr.bin/look/look.c head/usr.bin/look/pathnames.h head/usr.bin/lorder/lorder.1 head/usr.bin/lorder/lorder.sh head/usr.bin/mail/cmd1.c head/usr.bin/mail/cmd2.c head/usr.bin/mail/cmd3.c head/usr.bin/mail/cmdtab.c head/usr.bin/mail/collect.c head/usr.bin/mail/def.h head/usr.bin/mail/edit.c head/usr.bin/mail/extern.h head/usr.bin/mail/fio.c head/usr.bin/mail/getname.c head/usr.bin/mail/glob.h head/usr.bin/mail/head.c head/usr.bin/mail/lex.c head/usr.bin/mail/list.c head/usr.bin/mail/mail.1 head/usr.bin/mail/main.c head/usr.bin/mail/names.c head/usr.bin/mail/pathnames.h head/usr.bin/mail/popen.c head/usr.bin/mail/quit.c head/usr.bin/mail/rcv.h head/usr.bin/mail/send.c head/usr.bin/mail/strings.c head/usr.bin/mail/temp.c head/usr.bin/mail/tty.c head/usr.bin/mail/util.c head/usr.bin/mail/v7.local.c head/usr.bin/mail/vars.c head/usr.bin/mail/version.c head/usr.bin/mesg/mesg.1 head/usr.bin/mkdep/mkdep.1 head/usr.bin/mkdep/mkdep.gcc.sh head/usr.bin/mkdep/mkdep.sh head/usr.bin/mkfifo/mkfifo.1 head/usr.bin/mkfifo/mkfifo.c head/usr.bin/mklocale/extern.h head/usr.bin/mklocale/ldef.h head/usr.bin/mklocale/lex.l head/usr.bin/mklocale/mklocale.1 head/usr.bin/mklocale/yacc.y head/usr.bin/mkstr/mkstr.1 head/usr.bin/mkstr/mkstr.c head/usr.bin/mktemp/mktemp.1 head/usr.bin/msgs/msgs.1 head/usr.bin/msgs/msgs.c head/usr.bin/msgs/pathnames.h head/usr.bin/mt/mt.1 head/usr.bin/mt/mt.c head/usr.bin/netstat/flowtable.c head/usr.bin/netstat/if.c head/usr.bin/netstat/inet.c head/usr.bin/netstat/inet6.c head/usr.bin/netstat/ipsec.c head/usr.bin/netstat/main.c head/usr.bin/netstat/netstat.1 head/usr.bin/netstat/netstat.h head/usr.bin/netstat/pfkey.c head/usr.bin/netstat/route.c head/usr.bin/netstat/unix.c head/usr.bin/nfsstat/nfsstat.1 head/usr.bin/nfsstat/nfsstat.c head/usr.bin/nice/nice.1 head/usr.bin/nice/nice.c head/usr.bin/nohup/nohup.1 head/usr.bin/nohup/nohup.c head/usr.bin/pagesize/pagesize.1 head/usr.bin/pagesize/pagesize.sh head/usr.bin/passwd/passwd.1 head/usr.bin/paste/paste.1 head/usr.bin/paste/paste.c head/usr.bin/printenv/printenv.1 head/usr.bin/printenv/printenv.c head/usr.bin/printf/printf.1 head/usr.bin/printf/printf.c head/usr.bin/quota/quota.1 head/usr.bin/quota/quota.c head/usr.bin/renice/renice.8 head/usr.bin/renice/renice.c head/usr.bin/rev/rev.1 head/usr.bin/rev/rev.c head/usr.bin/rlogin/rlogin.1 head/usr.bin/rs/rs.1 head/usr.bin/rs/rs.c head/usr.bin/rsh/rsh.1 head/usr.bin/rup/rup.1 head/usr.bin/ruptime/ruptime.1 head/usr.bin/ruptime/ruptime.c head/usr.bin/rusers/rusers.1 head/usr.bin/rwall/rwall.1 head/usr.bin/rwho/rwho.1 head/usr.bin/rwho/rwho.c head/usr.bin/script/script.1 head/usr.bin/script/script.c head/usr.bin/sed/compile.c head/usr.bin/sed/defs.h head/usr.bin/sed/extern.h head/usr.bin/sed/main.c head/usr.bin/sed/misc.c head/usr.bin/sed/process.c head/usr.bin/sed/sed.1 head/usr.bin/sed/tests/multi_test.sh head/usr.bin/shar/shar.1 head/usr.bin/shar/shar.sh head/usr.bin/showmount/showmount.8 head/usr.bin/showmount/showmount.c head/usr.bin/split/split.1 head/usr.bin/split/split.c head/usr.bin/su/su.1 head/usr.bin/su/su.c head/usr.bin/systat/cmds.c head/usr.bin/systat/cmdtab.c head/usr.bin/systat/devs.c head/usr.bin/systat/extern.h head/usr.bin/systat/fetch.c head/usr.bin/systat/icmp.c head/usr.bin/systat/icmp6.c head/usr.bin/systat/iostat.c head/usr.bin/systat/ip.c head/usr.bin/systat/ip6.c head/usr.bin/systat/keyboard.c head/usr.bin/systat/main.c head/usr.bin/systat/netcmds.c head/usr.bin/systat/netstat.c head/usr.bin/systat/pigs.c head/usr.bin/systat/sctp.c head/usr.bin/systat/swap.c head/usr.bin/systat/systat.1 head/usr.bin/systat/systat.h head/usr.bin/systat/tcp.c head/usr.bin/systat/vmstat.c head/usr.bin/systat/zarc.c head/usr.bin/tail/extern.h head/usr.bin/tail/forward.c head/usr.bin/tail/misc.c head/usr.bin/tail/read.c head/usr.bin/tail/reverse.c head/usr.bin/tail/tail.1 head/usr.bin/tail/tail.c head/usr.bin/talk/ctl.c head/usr.bin/talk/ctl_transact.c head/usr.bin/talk/display.c head/usr.bin/talk/get_addrs.c head/usr.bin/talk/get_names.c head/usr.bin/talk/init_disp.c head/usr.bin/talk/invite.c head/usr.bin/talk/io.c head/usr.bin/talk/look_up.c head/usr.bin/talk/msgs.c head/usr.bin/talk/talk.1 head/usr.bin/talk/talk.c head/usr.bin/talk/talk.h head/usr.bin/talk/talk_ctl.h head/usr.bin/tcopy/tcopy.1 head/usr.bin/tcopy/tcopy.c head/usr.bin/tee/tee.1 head/usr.bin/tee/tee.c head/usr.bin/tftp/main.c head/usr.bin/tftp/tftp.1 head/usr.bin/tftp/tftp.c head/usr.bin/tftp/tftp.h head/usr.bin/time/time.1 head/usr.bin/time/time.c head/usr.bin/touch/touch.1 head/usr.bin/touch/touch.c head/usr.bin/tput/clear.sh head/usr.bin/tput/tput.1 head/usr.bin/tput/tput.c head/usr.bin/tr/extern.h head/usr.bin/tr/str.c head/usr.bin/tr/tr.1 head/usr.bin/tr/tr.c head/usr.bin/true/true.1 head/usr.bin/true/true.c head/usr.bin/tset/extern.h head/usr.bin/tset/map.c head/usr.bin/tset/misc.c head/usr.bin/tset/set.c head/usr.bin/tset/term.c head/usr.bin/tset/tset.1 head/usr.bin/tset/tset.c head/usr.bin/tset/wrterm.c head/usr.bin/tsort/tsort.1 head/usr.bin/tsort/tsort.c head/usr.bin/tty/tty.1 head/usr.bin/tty/tty.c head/usr.bin/uname/uname.1 head/usr.bin/unexpand/unexpand.c head/usr.bin/uniq/uniq.1 head/usr.bin/uniq/uniq.c head/usr.bin/users/users.1 head/usr.bin/users/users.cc head/usr.bin/uudecode/uudecode.c head/usr.bin/uuencode/uuencode.1 head/usr.bin/uuencode/uuencode.c head/usr.bin/uuencode/uuencode.format.5 head/usr.bin/vgrind/extern.h head/usr.bin/vgrind/pathnames.h head/usr.bin/vgrind/regexp.c head/usr.bin/vgrind/vfontedpr.c head/usr.bin/vgrind/vgrind.1 head/usr.bin/vgrind/vgrind.sh head/usr.bin/vgrind/vgrindefs.5 head/usr.bin/vgrind/vgrindefs.src head/usr.bin/vmstat/vmstat.8 head/usr.bin/vmstat/vmstat.c head/usr.bin/w/extern.h head/usr.bin/w/pr_time.c head/usr.bin/w/proc_compare.c head/usr.bin/w/uptime.1 head/usr.bin/w/w.1 head/usr.bin/w/w.c head/usr.bin/wall/ttymsg.c head/usr.bin/wall/wall.1 head/usr.bin/wall/wall.c head/usr.bin/wc/wc.1 head/usr.bin/wc/wc.c head/usr.bin/what/what.1 head/usr.bin/what/what.c head/usr.bin/who/who.1 head/usr.bin/whois/whois.1 head/usr.bin/whois/whois.c head/usr.bin/write/write.1 head/usr.bin/write/write.c head/usr.bin/xargs/pathnames.h head/usr.bin/xargs/xargs.1 head/usr.bin/xargs/xargs.c head/usr.bin/xstr/pathnames.h head/usr.bin/xstr/xstr.1 head/usr.bin/xstr/xstr.c head/usr.bin/yes/yes.1 head/usr.bin/yes/yes.c head/usr.sbin/accton/accton.c head/usr.sbin/arp/arp.4 head/usr.sbin/arp/arp.8 head/usr.sbin/arp/arp.c head/usr.sbin/autofs/popen.c head/usr.sbin/chown/chgrp.1 head/usr.sbin/chown/chown.8 head/usr.sbin/chown/chown.c head/usr.sbin/chroot/chroot.8 head/usr.sbin/chroot/chroot.c head/usr.sbin/config/config.8 head/usr.sbin/config/config.h head/usr.sbin/config/config.y head/usr.sbin/config/lang.l head/usr.sbin/config/main.c head/usr.sbin/config/mkheaders.c head/usr.sbin/config/mkmakefile.c head/usr.sbin/config/mkoptions.c head/usr.sbin/edquota/edquota.8 head/usr.sbin/edquota/edquota.c head/usr.sbin/edquota/pathnames.h head/usr.sbin/fmtree/mtree.8 head/usr.sbin/gpioctl/gpioctl.8 head/usr.sbin/ifmcstat/printb.c head/usr.sbin/inetd/inetd.8 head/usr.sbin/inetd/inetd.c head/usr.sbin/inetd/inetd.h head/usr.sbin/inetd/pathnames.h head/usr.sbin/iostat/iostat.8 head/usr.sbin/kgmon/kgmon.8 head/usr.sbin/kgmon/kgmon.c head/usr.sbin/lpr/common_source/displayq.c head/usr.sbin/lpr/common_source/lp.h head/usr.sbin/lpr/common_source/lp.local.h head/usr.sbin/lpr/common_source/pathnames.h head/usr.sbin/lpr/common_source/rmjob.c head/usr.sbin/lpr/common_source/startdaemon.c head/usr.sbin/lpr/filters/lpf.c head/usr.sbin/lpr/lpc/cmds.c head/usr.sbin/lpr/lpc/cmdtab.c head/usr.sbin/lpr/lpc/extern.h head/usr.sbin/lpr/lpc/lpc.8 head/usr.sbin/lpr/lpc/lpc.c head/usr.sbin/lpr/lpc/lpc.h head/usr.sbin/lpr/lpd/extern.h head/usr.sbin/lpr/lpd/lpd.8 head/usr.sbin/lpr/lpd/lpd.c head/usr.sbin/lpr/lpd/lpdchar.c head/usr.sbin/lpr/lpd/modes.c head/usr.sbin/lpr/lpd/printjob.c head/usr.sbin/lpr/lpd/recvjob.c head/usr.sbin/lpr/lpq/lpq.1 head/usr.sbin/lpr/lpq/lpq.c head/usr.sbin/lpr/lpr/lpr.1 head/usr.sbin/lpr/lpr/printcap.5 head/usr.sbin/lpr/lprm/lprm.1 head/usr.sbin/lpr/lprm/lprm.c head/usr.sbin/lpr/lptest/lptest.1 head/usr.sbin/lpr/lptest/lptest.c head/usr.sbin/lpr/pac/pac.8 head/usr.sbin/lpr/pac/pac.c head/usr.sbin/mountd/exports.5 head/usr.sbin/mountd/mountd.8 head/usr.sbin/mountd/mountd.c head/usr.sbin/mountd/netgroup.5 head/usr.sbin/mountd/pathnames.h head/usr.sbin/ndp/ndp.c head/usr.sbin/nfsd/nfsd.8 head/usr.sbin/nfsd/nfsd.c head/usr.sbin/nmtree/mtree.5 head/usr.sbin/nologin/nologin.5 head/usr.sbin/nologin/nologin.8 head/usr.sbin/pstat/pstat.8 head/usr.sbin/pstat/pstat.c head/usr.sbin/pwd_mkdb/pwd_mkdb.8 head/usr.sbin/pwd_mkdb/pwd_mkdb.c head/usr.sbin/quotaon/quotaon.8 head/usr.sbin/quotaon/quotaon.c head/usr.sbin/repquota/repquota.8 head/usr.sbin/repquota/repquota.c head/usr.sbin/rmt/rmt.8 head/usr.sbin/rmt/rmt.c head/usr.sbin/rtadvd/advcap.c head/usr.sbin/rwhod/rwhod.8 head/usr.sbin/rwhod/rwhod.c head/usr.sbin/setfib/setfib.c head/usr.sbin/syslogd/pathnames.h head/usr.sbin/syslogd/syslog.conf.5 head/usr.sbin/syslogd/syslogd.8 head/usr.sbin/syslogd/syslogd.c head/usr.sbin/timed/timed/acksend.c head/usr.sbin/timed/timed/byteorder.c head/usr.sbin/timed/timed/candidate.c head/usr.sbin/timed/timed/cksum.c head/usr.sbin/timed/timed/correct.c head/usr.sbin/timed/timed/extern.h head/usr.sbin/timed/timed/globals.h head/usr.sbin/timed/timed/master.c head/usr.sbin/timed/timed/measure.c head/usr.sbin/timed/timed/networkdelta.c head/usr.sbin/timed/timed/pathnames.h head/usr.sbin/timed/timed/readmsg.c head/usr.sbin/timed/timed/slave.c head/usr.sbin/timed/timed/timed.8 head/usr.sbin/timed/timed/timed.c head/usr.sbin/timed/timedc/cmds.c head/usr.sbin/timed/timedc/cmdtab.c head/usr.sbin/timed/timedc/extern.h head/usr.sbin/timed/timedc/timedc.8 head/usr.sbin/timed/timedc/timedc.c head/usr.sbin/timed/timedc/timedc.h head/usr.sbin/traceroute6/traceroute6.c head/usr.sbin/trpt/trpt.8 head/usr.sbin/trpt/trpt.c head/usr.sbin/vipw/vipw.8 head/usr.sbin/vipw/vipw.c head/usr.sbin/ypbind/ypbind.8 head/usr.sbin/yppush/yppush.8 Modified: head/bin/cat/cat.1 ============================================================================== --- head/bin/cat/cat.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/cat/cat.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/cat/cat.c ============================================================================== --- head/bin/cat/cat.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/cat/cat.c Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/chflags/chflags.1 ============================================================================== --- head/bin/chflags/chflags.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/chflags/chflags.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/chflags/chflags.c ============================================================================== --- head/bin/chflags/chflags.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/chflags/chflags.c Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/chmod/chmod.1 ============================================================================== --- head/bin/chmod/chmod.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/chmod/chmod.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/chmod/chmod.c ============================================================================== --- head/bin/chmod/chmod.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/chmod/chmod.c Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/cp/cp.1 ============================================================================== --- head/bin/cp/cp.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/cp/cp.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/cp/cp.c ============================================================================== --- head/bin/cp/cp.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/cp/cp.c Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/cp/extern.h ============================================================================== --- head/bin/cp/extern.h Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/cp/extern.h Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/cp/utils.c ============================================================================== --- head/bin/cp/utils.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/cp/utils.c Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/date/date.1 ============================================================================== --- head/bin/date/date.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/date/date.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/date/date.c ============================================================================== --- head/bin/date/date.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/date/date.c Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/date/extern.h ============================================================================== --- head/bin/date/extern.h Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/date/extern.h Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/date/netdate.c ============================================================================== --- head/bin/date/netdate.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/date/netdate.c Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/dd/args.c ============================================================================== --- head/bin/dd/args.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/dd/args.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/dd/conv.c ============================================================================== --- head/bin/dd/conv.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/dd/conv.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/dd/conv_tab.c ============================================================================== --- head/bin/dd/conv_tab.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/dd/conv_tab.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/dd/dd.1 ============================================================================== --- head/bin/dd/dd.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/dd/dd.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/dd/dd.c ============================================================================== --- head/bin/dd/dd.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/dd/dd.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/dd/dd.h ============================================================================== --- head/bin/dd/dd.h Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/dd/dd.h Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/dd/extern.h ============================================================================== --- head/bin/dd/extern.h Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/dd/extern.h Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/dd/misc.c ============================================================================== --- head/bin/dd/misc.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/dd/misc.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/dd/position.c ============================================================================== --- head/bin/dd/position.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/dd/position.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/df/df.1 ============================================================================== --- head/bin/df/df.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/df/df.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/df/df.c ============================================================================== --- head/bin/df/df.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/df/df.c Tue Feb 28 23:42:47 2017 (r314436) @@ -15,7 +15,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/domainname/domainname.1 ============================================================================== --- head/bin/domainname/domainname.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/domainname/domainname.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/domainname/domainname.c ============================================================================== --- head/bin/domainname/domainname.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/domainname/domainname.c Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/echo/echo.1 ============================================================================== --- head/bin/echo/echo.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/echo/echo.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/echo/echo.c ============================================================================== --- head/bin/echo/echo.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/echo/echo.c Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/ed/cbc.c ============================================================================== --- head/bin/ed/cbc.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/ed/cbc.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/hostname/hostname.1 ============================================================================== --- head/bin/hostname/hostname.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/hostname/hostname.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/hostname/hostname.c ============================================================================== --- head/bin/hostname/hostname.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/hostname/hostname.c Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/kill/kill.1 ============================================================================== --- head/bin/kill/kill.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/kill/kill.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/kill/kill.c ============================================================================== --- head/bin/kill/kill.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/kill/kill.c Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/ln/ln.1 ============================================================================== --- head/bin/ln/ln.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/ln/ln.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/ln/ln.c ============================================================================== --- head/bin/ln/ln.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/ln/ln.c Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/ln/symlink.7 ============================================================================== --- head/bin/ln/symlink.7 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/ln/symlink.7 Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/ls/cmp.c ============================================================================== --- head/bin/ls/cmp.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/ls/cmp.c Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/ls/extern.h ============================================================================== --- head/bin/ls/extern.h Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/ls/extern.h Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/ls/ls.1 ============================================================================== --- head/bin/ls/ls.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/ls/ls.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/ls/ls.c ============================================================================== --- head/bin/ls/ls.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/ls/ls.c Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/ls/ls.h ============================================================================== --- head/bin/ls/ls.h Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/ls/ls.h Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/ls/print.c ============================================================================== --- head/bin/ls/print.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/ls/print.c Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/ls/util.c ============================================================================== --- head/bin/ls/util.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/ls/util.c Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/mkdir/mkdir.1 ============================================================================== --- head/bin/mkdir/mkdir.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/mkdir/mkdir.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/mkdir/mkdir.c ============================================================================== --- head/bin/mkdir/mkdir.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/mkdir/mkdir.c Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/mv/mv.1 ============================================================================== --- head/bin/mv/mv.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/mv/mv.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/mv/mv.c ============================================================================== --- head/bin/mv/mv.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/mv/mv.c Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/ar_io.c ============================================================================== --- head/bin/pax/ar_io.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/ar_io.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/ar_subs.c ============================================================================== --- head/bin/pax/ar_subs.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/ar_subs.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/buf_subs.c ============================================================================== --- head/bin/pax/buf_subs.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/buf_subs.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/cache.c ============================================================================== --- head/bin/pax/cache.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/cache.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/cache.h ============================================================================== --- head/bin/pax/cache.h Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/cache.h Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/cpio.c ============================================================================== --- head/bin/pax/cpio.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/cpio.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/cpio.h ============================================================================== --- head/bin/pax/cpio.h Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/cpio.h Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/extern.h ============================================================================== --- head/bin/pax/extern.h Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/extern.h Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/file_subs.c ============================================================================== --- head/bin/pax/file_subs.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/file_subs.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/ftree.c ============================================================================== --- head/bin/pax/ftree.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/ftree.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/ftree.h ============================================================================== --- head/bin/pax/ftree.h Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/ftree.h Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/gen_subs.c ============================================================================== --- head/bin/pax/gen_subs.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/gen_subs.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/options.c ============================================================================== --- head/bin/pax/options.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/options.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/options.h ============================================================================== --- head/bin/pax/options.h Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/options.h Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/pat_rep.c ============================================================================== --- head/bin/pax/pat_rep.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/pat_rep.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/pat_rep.h ============================================================================== --- head/bin/pax/pat_rep.h Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/pat_rep.h Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/pax.1 ============================================================================== --- head/bin/pax/pax.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/pax.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/pax/pax.c ============================================================================== --- head/bin/pax/pax.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/pax.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/pax.h ============================================================================== --- head/bin/pax/pax.h Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/pax.h Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/sel_subs.c ============================================================================== --- head/bin/pax/sel_subs.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/sel_subs.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/sel_subs.h ============================================================================== --- head/bin/pax/sel_subs.h Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/sel_subs.h Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/tables.c ============================================================================== --- head/bin/pax/tables.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/tables.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/tables.h ============================================================================== --- head/bin/pax/tables.h Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/tables.h Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/tar.c ============================================================================== --- head/bin/pax/tar.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/tar.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/tar.h ============================================================================== --- head/bin/pax/tar.h Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/tar.h Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pax/tty_subs.c ============================================================================== --- head/bin/pax/tty_subs.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pax/tty_subs.c Tue Feb 28 23:42:47 2017 (r314436) @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/ps/extern.h ============================================================================== --- head/bin/ps/extern.h Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/ps/extern.h Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/ps/fmt.c ============================================================================== --- head/bin/ps/fmt.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/ps/fmt.c Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/ps/keyword.c ============================================================================== --- head/bin/ps/keyword.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/ps/keyword.c Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/ps/nlist.c ============================================================================== --- head/bin/ps/nlist.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/ps/nlist.c Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/ps/print.c ============================================================================== --- head/bin/ps/print.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/ps/print.c Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/ps/ps.1 ============================================================================== --- head/bin/ps/ps.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/ps/ps.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/ps/ps.c ============================================================================== --- head/bin/ps/ps.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/ps/ps.c Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/ps/ps.h ============================================================================== --- head/bin/ps/ps.h Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/ps/ps.h Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/pwd/pwd.1 ============================================================================== --- head/bin/pwd/pwd.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pwd/pwd.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/pwd/pwd.c ============================================================================== --- head/bin/pwd/pwd.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/pwd/pwd.c Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/rcp/extern.h ============================================================================== --- head/bin/rcp/extern.h Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/rcp/extern.h Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/rcp/rcp.1 ============================================================================== --- head/bin/rcp/rcp.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/rcp/rcp.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/rcp/rcp.c ============================================================================== --- head/bin/rcp/rcp.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/rcp/rcp.c Tue Feb 28 23:42:47 2017 (r314436) @@ -17,7 +17,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/rcp/util.c ============================================================================== --- head/bin/rcp/util.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/rcp/util.c Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/realpath/realpath.1 ============================================================================== --- head/bin/realpath/realpath.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/realpath/realpath.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: head/bin/realpath/realpath.c ============================================================================== --- head/bin/realpath/realpath.c Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/realpath/realpath.c Tue Feb 28 23:42:47 2017 (r314436) @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: head/bin/rm/rm.1 ============================================================================== --- head/bin/rm/rm.1 Tue Feb 28 23:30:14 2017 (r314435) +++ head/bin/rm/rm.1 Tue Feb 28 23:42:47 2017 (r314436) @@ -13,7 +13,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Feb 28 23:50:56 2017 Return-Path: Delivered-To: svn-src-all@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 6DEF2CF2925; Tue, 28 Feb 2017 23:50:56 +0000 (UTC) (envelope-from linimon@lonesome.com) Received: from mail.soaustin.net (mail.soaustin.net [192.108.105.60]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.soaustin.net", Issuer "StartCom Class 2 IV Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4494C20C; Tue, 28 Feb 2017 23:50:55 +0000 (UTC) (envelope-from linimon@lonesome.com) Received: from lonesome.com (bones.soaustin.net [192.108.105.22]) by mail.soaustin.net (Postfix) with ESMTPSA id EF01016B; Tue, 28 Feb 2017 17:50:54 -0600 (CST) Date: Tue, 28 Feb 2017 17:50:53 -0600 From: Mark Linimon To: Gleb Smirnoff Cc: Benjamin Kaduk , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Ravi Pokala , "src-committers@freebsd.org" , John Baldwin Subject: Re: svn commit: r314373 - in head: . etc/defaults etc/rc.d lib/libc/regex share/man/man4/man4.i386 share/man/man5 sys/amd64/conf sys/boot/forth sys/compat/svr4 sys/conf sys/dev/streams sys/i386/conf sy... Message-ID: <20170228235053.GB10976@lonesome.com> References: <201702280514.v1S5EhPq060885@repo.freebsd.org> <1969312.3TTRqhLH9r@ralph.baldwin.cx> <20170228193605.GJ1044@FreeBSD.org> <20170228213044.GK1044@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170228213044.GK1044@FreeBSD.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 23:50:56 -0000 On Tue, Feb 28, 2017 at 01:30:44PM -0800, Gleb Smirnoff wrote: > How can I check the __FreeBSD_version in a port Makefile? My understanding > is that there is no standard way for such thing. There are hundreds of examples in port Makefiles. I suppose the PH will need to be updated to include some of them. It is hinted at under "INCLUDE" in https://www.freebsd.org/doc/en/books/porters-handbook/dads-noinstall.html but not made specific. Some quick examples: devel/cloudabi-toolchain/Makefile:.if ${OSVERSION} >= 1100100 devel/cvs-syncmail/Makefile:.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000 devel/trio/Makefile.orig:# NB: OSVERSION was not incremented for r308559, so we use the earlier devel/trio/Makefile.orig:# 1200014 as a surrogate for now. devel/trio/Makefile.orig:.if ${OSVERSION} < 1100506 || ( ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200014 ) devel/trio/Makefile.orig:BROKEN_aarch64= needs fixes from r308375, r308487, and/or r308559 devel/trio/Makefile.orig:.endif emulators/i386-wine/Makefile.inc:.if ${OPSYS} != FreeBSD || (!(${OSVERSION} < 1000000) && !(${OSVERSION} >= 1003000 && ${OSVERSION} < 1100000) && !(${OSVERSION} >= 1100121 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1200019 && ${OSVERSION} < 1300000)) lang/ruby22/Makefile:.if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032) && (${ARCH} == "amd64" || ${ARCH} == "i386") lang/tcc/Makefile:.if ${CC:T:M*clang*} || ${OSVERSION} >= 1000024 sysutils/e2fsprogs/Makefile:.if !empty(PORT_OPTIONS:MNOTESTS) && (${OPSYS} == FreeBSD) && (${OSVERSION} >= 1100000 || ((${ARCH} != i386) && (${ARCH} != amd64))) However, I am kind of shocked that this is not well understood -- especially after I have tried so many times to convince src committers to update FreeBSD_version in case of src changes that affect (e.g. break) ports. These are the kinds of things that ports committers have to use to work around changes in the src tree. Skipping OSVERSION updates makes this work more complicated. mcl From owner-svn-src-all@freebsd.org Tue Feb 28 23:55:04 2017 Return-Path: Delivered-To: svn-src-all@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 68264CF2B1B; Tue, 28 Feb 2017 23:55:04 +0000 (UTC) (envelope-from gavin@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 336A57A2; Tue, 28 Feb 2017 23:55:04 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SNt38l011251; Tue, 28 Feb 2017 23:55:03 GMT (envelope-from gavin@FreeBSD.org) Received: (from gavin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SNt3E6011250; Tue, 28 Feb 2017 23:55:03 GMT (envelope-from gavin@FreeBSD.org) Message-Id: <201702282355.v1SNt3E6011250@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gavin set sender to gavin@FreeBSD.org using -f From: Gavin Atkinson Date: Tue, 28 Feb 2017 23:55:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314437 - head/sys/dev/pci X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 23:55:04 -0000 Author: gavin Date: Tue Feb 28 23:55:03 2017 New Revision: 314437 URL: https://svnweb.freebsd.org/changeset/base/314437 Log: Fix spelling mistake in comment, firmwrae -> firmware Modified: head/sys/dev/pci/pci_pci.c Modified: head/sys/dev/pci/pci_pci.c ============================================================================== --- head/sys/dev/pci/pci_pci.c Tue Feb 28 23:42:47 2017 (r314436) +++ head/sys/dev/pci/pci_pci.c Tue Feb 28 23:55:03 2017 (r314437) @@ -2849,7 +2849,7 @@ pcib_request_feature_allow(device_t pcib enum pci_feature feature) { /* - * No host firmwrae we have to negotiate with, so we allow + * No host firmware we have to negotiate with, so we allow * every valid feature requested. */ switch (feature) { From owner-svn-src-all@freebsd.org Tue Feb 28 23:56:15 2017 Return-Path: Delivered-To: svn-src-all@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 BC2F6CF2B90; Tue, 28 Feb 2017 23:56:15 +0000 (UTC) (envelope-from asomers@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 89FF99B0; Tue, 28 Feb 2017 23:56:15 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SNuEpG011339; Tue, 28 Feb 2017 23:56:14 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SNuEcC011338; Tue, 28 Feb 2017 23:56:14 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201702282356.v1SNuEcC011338@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 28 Feb 2017 23:56:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314438 - stable/10/usr.sbin/camdd X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 23:56:15 -0000 Author: asomers Date: Tue Feb 28 23:56:14 2017 New Revision: 314438 URL: https://svnweb.freebsd.org/changeset/base/314438 Log: MFC r312559: Fix misc Coverity defects in camdd(8) CID 1341620 Fix a small memory leak CID 1341630 Though this is technically a false positive, rearrange the code for clarity. CID 1341635 Eliminate dead code CID 1368663 Fix a double mutex unlock in the error path Also: * Use sig_atomic_t for variables accessed from signal handlers * Don't conditionalize free(3) on its argument being non-null Reported by: Coverity CID: 1341620 1341630 1341635 1368663 Reviewed by: ken MFC after: 4 weeks Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D9237 Modified: stable/10/usr.sbin/camdd/camdd.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/camdd/camdd.c ============================================================================== --- stable/10/usr.sbin/camdd/camdd.c Tue Feb 28 23:55:03 2017 (r314437) +++ stable/10/usr.sbin/camdd/camdd.c Tue Feb 28 23:56:14 2017 (r314438) @@ -420,9 +420,9 @@ struct camdd_dev { }; static sem_t camdd_sem; -static int need_exit = 0; -static int error_exit = 0; -static int need_status = 0; +static sig_atomic_t need_exit = 0; +static sig_atomic_t error_exit = 0; +static sig_atomic_t need_status = 0; #ifndef min #define min(a, b) (a < b) ? a : b @@ -712,11 +712,7 @@ camdd_alloc_buf(struct camdd_dev *dev, c return (buf); bailout_error: - if (data_ptr != NULL) - free(data_ptr); - - if (buf != NULL) - free(buf); + free(data_ptr); return (NULL); } @@ -2261,6 +2257,7 @@ camdd_file_run(struct camdd_dev *dev) if (file_dev->tmp_buf == NULL) { buf->status = CAMDD_STATUS_ERROR; error_count++; + pthread_mutex_lock(&dev->mutex); goto bailout; } for (i = 0, cur_offset = 0; i < data->sg_count; i++) { @@ -2983,7 +2980,6 @@ int camdd_rw(struct camdd_io_opts *io_opts, int num_io_opts, uint64_t max_io, int retry_count, int timeout) { - char *device = NULL; struct cam_device *new_cam_dev = NULL; struct camdd_dev *devs[2]; struct timespec start_time; @@ -3003,12 +2999,11 @@ camdd_rw(struct camdd_io_opts *io_opts, for (i = 0; i < num_io_opts; i++) { switch (io_opts[i].dev_type) { case CAMDD_DEV_PASS: { - camdd_argmask new_arglist = CAMDD_ARG_NONE; - int bus = 0, target = 0, lun = 0; - char name[30]; - int rv; - if (isdigit(io_opts[i].dev_name[0])) { + camdd_argmask new_arglist = CAMDD_ARG_NONE; + int bus = 0, target = 0, lun = 0; + int rv; + /* device specified as bus:target[:lun] */ rv = parse_btl(io_opts[i].dev_name, &bus, &target, &lun, &new_arglist); @@ -3024,23 +3019,21 @@ camdd_rw(struct camdd_io_opts *io_opts, lun = 0; new_arglist |= CAMDD_ARG_LUN; } + new_cam_dev = cam_open_btl(bus, target, lun, + O_RDWR, NULL); } else { + char name[30]; + if (cam_get_device(io_opts[i].dev_name, name, sizeof name, &unit) == -1) { warnx("%s", cam_errbuf); error = 1; goto bailout; } - device = strdup(name); - new_arglist |= CAMDD_ARG_DEVICE |CAMDD_ARG_UNIT; + new_cam_dev = cam_open_spec_device(name, unit, + O_RDWR, NULL); } - if (new_arglist & (CAMDD_ARG_BUS | CAMDD_ARG_TARGET)) - new_cam_dev = cam_open_btl(bus, target, lun, - O_RDWR, NULL); - else - new_cam_dev = cam_open_spec_device(device, unit, - O_RDWR, NULL); if (new_cam_dev == NULL) { warnx("%s", cam_errbuf); error = 1; From owner-svn-src-all@freebsd.org Tue Feb 28 23:56:25 2017 Return-Path: Delivered-To: svn-src-all@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 C497BCF2BCF; Tue, 28 Feb 2017 23:56:25 +0000 (UTC) (envelope-from asomers@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 9BF31A2E; Tue, 28 Feb 2017 23:56:25 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SNuOQQ011390; Tue, 28 Feb 2017 23:56:24 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SNuOKK011389; Tue, 28 Feb 2017 23:56:24 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201702282356.v1SNuOKK011389@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 28 Feb 2017 23:56:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314439 - stable/11/usr.sbin/camdd X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 23:56:25 -0000 Author: asomers Date: Tue Feb 28 23:56:24 2017 New Revision: 314439 URL: https://svnweb.freebsd.org/changeset/base/314439 Log: MFC r312559: Fix misc Coverity defects in camdd(8) CID 1341620 Fix a small memory leak CID 1341630 Though this is technically a false positive, rearrange the code for clarity. CID 1341635 Eliminate dead code CID 1368663 Fix a double mutex unlock in the error path Also: * Use sig_atomic_t for variables accessed from signal handlers * Don't conditionalize free(3) on its argument being non-null Reported by: Coverity CID: 1341620 1341630 1341635 1368663 Reviewed by: ken MFC after: 4 weeks Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D9237 Modified: stable/11/usr.sbin/camdd/camdd.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/camdd/camdd.c ============================================================================== --- stable/11/usr.sbin/camdd/camdd.c Tue Feb 28 23:56:14 2017 (r314438) +++ stable/11/usr.sbin/camdd/camdd.c Tue Feb 28 23:56:24 2017 (r314439) @@ -420,9 +420,9 @@ struct camdd_dev { }; static sem_t camdd_sem; -static int need_exit = 0; -static int error_exit = 0; -static int need_status = 0; +static sig_atomic_t need_exit = 0; +static sig_atomic_t error_exit = 0; +static sig_atomic_t need_status = 0; #ifndef min #define min(a, b) (a < b) ? a : b @@ -712,11 +712,7 @@ camdd_alloc_buf(struct camdd_dev *dev, c return (buf); bailout_error: - if (data_ptr != NULL) - free(data_ptr); - - if (buf != NULL) - free(buf); + free(data_ptr); return (NULL); } @@ -2262,6 +2258,7 @@ camdd_file_run(struct camdd_dev *dev) if (file_dev->tmp_buf == NULL) { buf->status = CAMDD_STATUS_ERROR; error_count++; + pthread_mutex_lock(&dev->mutex); goto bailout; } for (i = 0, cur_offset = 0; i < data->sg_count; i++) { @@ -2984,7 +2981,6 @@ int camdd_rw(struct camdd_io_opts *io_opts, int num_io_opts, uint64_t max_io, int retry_count, int timeout) { - char *device = NULL; struct cam_device *new_cam_dev = NULL; struct camdd_dev *devs[2]; struct timespec start_time; @@ -3004,12 +3000,11 @@ camdd_rw(struct camdd_io_opts *io_opts, for (i = 0; i < num_io_opts; i++) { switch (io_opts[i].dev_type) { case CAMDD_DEV_PASS: { - camdd_argmask new_arglist = CAMDD_ARG_NONE; - int bus = 0, target = 0, lun = 0; - char name[30]; - int rv; - if (isdigit(io_opts[i].dev_name[0])) { + camdd_argmask new_arglist = CAMDD_ARG_NONE; + int bus = 0, target = 0, lun = 0; + int rv; + /* device specified as bus:target[:lun] */ rv = parse_btl(io_opts[i].dev_name, &bus, &target, &lun, &new_arglist); @@ -3025,23 +3020,21 @@ camdd_rw(struct camdd_io_opts *io_opts, lun = 0; new_arglist |= CAMDD_ARG_LUN; } + new_cam_dev = cam_open_btl(bus, target, lun, + O_RDWR, NULL); } else { + char name[30]; + if (cam_get_device(io_opts[i].dev_name, name, sizeof name, &unit) == -1) { warnx("%s", cam_errbuf); error = 1; goto bailout; } - device = strdup(name); - new_arglist |= CAMDD_ARG_DEVICE |CAMDD_ARG_UNIT; + new_cam_dev = cam_open_spec_device(name, unit, + O_RDWR, NULL); } - if (new_arglist & (CAMDD_ARG_BUS | CAMDD_ARG_TARGET)) - new_cam_dev = cam_open_btl(bus, target, lun, - O_RDWR, NULL); - else - new_cam_dev = cam_open_spec_device(device, unit, - O_RDWR, NULL); if (new_cam_dev == NULL) { warnx("%s", cam_errbuf); error = 1; From owner-svn-src-all@freebsd.org Wed Mar 1 00:13:59 2017 Return-Path: Delivered-To: svn-src-all@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 D2D85CF1315; Wed, 1 Mar 2017 00:13:59 +0000 (UTC) (envelope-from asomers@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 949BD34A; Wed, 1 Mar 2017 00:13:59 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v210DwDe019109; Wed, 1 Mar 2017 00:13:58 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v210Dwxu019108; Wed, 1 Mar 2017 00:13:58 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201703010013.v210Dwxu019108@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 1 Mar 2017 00:13:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314440 - stable/10/sys/dev/mpr X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 00:13:59 -0000 Author: asomers Date: Wed Mar 1 00:13:58 2017 New Revision: 314440 URL: https://svnweb.freebsd.org/changeset/base/314440 Log: MFC r312995: Initialize a stack variable in mprsas_get_sas_address_for_sata_disk Thought it's difficult to reproduce, I think this variable was responsible for a use-after-free panic when a SATA disk timed out responding to a SATA identify command during boot. Submitted by: slm Reviewed by: slm MFC after: 4 weeks Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D9364 Modified: stable/10/sys/dev/mpr/mpr_sas_lsi.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/mpr/mpr_sas_lsi.c ============================================================================== --- stable/10/sys/dev/mpr/mpr_sas_lsi.c Tue Feb 28 23:56:24 2017 (r314439) +++ stable/10/sys/dev/mpr/mpr_sas_lsi.c Wed Mar 1 00:13:58 2017 (r314440) @@ -893,6 +893,7 @@ mprsas_get_sas_address_for_sata_disk(str u8 sas_status; memset(&ata_identify, 0, sizeof(ata_identify)); + memset(&mpi_reply, 0, sizeof(mpi_reply)); try_count = 0; do { rc = mprsas_get_sata_identify(sc, handle, &mpi_reply, From owner-svn-src-all@freebsd.org Wed Mar 1 00:17:05 2017 Return-Path: Delivered-To: svn-src-all@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 ABD07CF1450; Wed, 1 Mar 2017 00:17:05 +0000 (UTC) (envelope-from asomers@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 787DB6C6; Wed, 1 Mar 2017 00:17:05 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v210H4BK019274; Wed, 1 Mar 2017 00:17:04 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v210H4DH019273; Wed, 1 Mar 2017 00:17:04 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201703010017.v210H4DH019273@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 1 Mar 2017 00:17:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314441 - stable/11/sys/dev/mpr X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 00:17:05 -0000 Author: asomers Date: Wed Mar 1 00:17:04 2017 New Revision: 314441 URL: https://svnweb.freebsd.org/changeset/base/314441 Log: MFC r312995: Initialize a stack variable in mprsas_get_sas_address_for_sata_disk Thought it's difficult to reproduce, I think this variable was responsible for a use-after-free panic when a SATA disk timed out responding to a SATA identify command during boot. Submitted by: slm Reviewed by: slm MFC after: 4 weeks Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D9364 Modified: stable/11/sys/dev/mpr/mpr_sas_lsi.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/mpr/mpr_sas_lsi.c ============================================================================== --- stable/11/sys/dev/mpr/mpr_sas_lsi.c Wed Mar 1 00:13:58 2017 (r314440) +++ stable/11/sys/dev/mpr/mpr_sas_lsi.c Wed Mar 1 00:17:04 2017 (r314441) @@ -893,6 +893,7 @@ mprsas_get_sas_address_for_sata_disk(str u8 sas_status; memset(&ata_identify, 0, sizeof(ata_identify)); + memset(&mpi_reply, 0, sizeof(mpi_reply)); try_count = 0; do { rc = mprsas_get_sata_identify(sc, handle, &mpi_reply, From owner-svn-src-all@freebsd.org Wed Mar 1 00:28:05 2017 Return-Path: Delivered-To: svn-src-all@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 CCCBACF16E4; Wed, 1 Mar 2017 00:28:05 +0000 (UTC) (envelope-from asomers@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 A743EB86; Wed, 1 Mar 2017 00:28:05 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v210S4dp023200; Wed, 1 Mar 2017 00:28:04 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v210S4Ho023199; Wed, 1 Mar 2017 00:28:04 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201703010028.v210S4Ho023199@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 1 Mar 2017 00:28:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314442 - head/tests/sys/netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 00:28:05 -0000 Author: asomers Date: Wed Mar 1 00:28:04 2017 New Revision: 314442 URL: https://svnweb.freebsd.org/changeset/base/314442 Log: Add an ATF test for IPv6 SLAAC with multiple fibs Tests that an interface can get a SLAAC address and that it inserts its routes into the correct fib. Does not test anything to do with NDP. PR: 196361 Reviewed by: Erick Turnquist MFC after: 3 weeks Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D9776 Modified: head/tests/sys/netinet/fibs_test.sh Modified: head/tests/sys/netinet/fibs_test.sh ============================================================================== --- head/tests/sys/netinet/fibs_test.sh Wed Mar 1 00:17:04 2017 (r314441) +++ head/tests/sys/netinet/fibs_test.sh Wed Mar 1 00:28:04 2017 (r314442) @@ -443,6 +443,89 @@ same_ip_multiple_ifaces_inet6_cleanup() cleanup_ifaces } +atf_test_case slaac_on_nondefault_fib6 cleanup +slaac_on_nondefault_fib6_head() +{ + atf_set "descr" "SLAAC correctly installs routes on non-default FIBs" + atf_set "require.user" "root" + atf_set "require.config" "fibs" "allow_sysctl_side_effects" +} +slaac_on_nondefault_fib6_body() +{ + # Configure the epair interfaces to use nonrouteable RFC3849 + # addresses and non-default FIBs + ADDR="2001:db8::2" + GATEWAY="2001:db8::1" + SUBNET="2001:db8:" + MASK="64" + + atf_expect_fail "PR196361 IPv6 network routes don't respect net.add_addr_allfibs=0" + + # Check system configuration + if [ 0 != `sysctl -n net.add_addr_allfibs` ]; then + atf_skip "This test requires net.add_addr_allfibs=0" + fi + get_fibs 2 + + sysctl -n "net.inet6.ip6.rfc6204w3" >> "rfc6204w3.state" + sysctl -n "net.inet6.ip6.forwarding" >> "forwarding.state" + # Enable forwarding so the kernel will send RAs + sysctl net.inet6.ip6.forwarding=1 + # Enable RFC6204W3 mode so the kernel will enable default router + # selection while also forwarding packets + sysctl net.inet6.ip6.rfc6204w3=1 + + # Configure epair interfaces + get_epair + setup_iface "$EPAIRA" "$FIB0" inet6 ${ADDR} ${MASK} + echo ifconfig "$EPAIRB" up inet6 fib $FIB1 -ifdisabled accept_rtadv + ifconfig "$EPAIRB" inet6 -ifdisabled accept_rtadv fib $FIB1 up + rtadvd -p rtadvd.pid -C rtadvd.sock -c /dev/null "$EPAIRA" + rtsol "$EPAIRB" + + # Check SLAAC address + atf_check -o match:"inet6 ${SUBNET}.*prefixlen ${MASK}.*autoconf" \ + ifconfig "$EPAIRB" + # Check local route + atf_check -o match:"${SUBNET}.*\.*lo0" \ + netstat -rnf inet6 -F $FIB1 + # Check subnet route + atf_check -o match:"${SUBNET}:/${MASK}.*\.*$EPAIRB" \ + netstat -rnf inet6 -F $FIB1 + # Check default route + atf_check -o match:"default.*\.*$EPAIRB" \ + netstat -rnf inet6 -F $FIB1 + + # Check that none of the above routes appeared on other routes + for fib in $( seq 0 $(($(sysctl -n net.fibs) - 1))); do + if [ "$fib" = "$FIB1" -o "$fib" = "$FIB0" ]; then + continue + fi + atf_check -o not-match:"${SUBNET}.*\.*lo0" \ + netstat -rnf inet6 -F $fib + atf_check -o not-match:"${SUBNET}:/${MASK}.*\.*$EPAIRB" \ + netstat -rnf inet6 -F $fib + atf_check -o not-match:"default.*\.*$EPAIRB" \ + netstat -rnf inet6 -F $fib + done +} +slaac_on_nondefault_fib6_cleanup() +{ + cleanup_ifaces + if [ -f "rtadvd.pid" ]; then + pkill -F rtadvd.pid + rm rtadvd.pid + fi + if [ -f "rfc6204w3.state" ] ; then + sysctl "net.inet6.ip6.rfc6204w3"=`cat "rfc6204w3.state"` + rm "rfc6204w3.state" + fi + if [ -f "forwarding.state" ] ; then + sysctl "net.inet6.ip6.forwarding"=`cat "forwarding.state"` + rm "forwarding.state" + fi +} + # Regression test for kern/187550 atf_test_case subnet_route_with_multiple_fibs_on_same_subnet cleanup subnet_route_with_multiple_fibs_on_same_subnet_head() @@ -648,6 +731,7 @@ atf_init_test_cases() atf_add_test_case same_ip_multiple_ifaces_fib0 atf_add_test_case same_ip_multiple_ifaces atf_add_test_case same_ip_multiple_ifaces_inet6 + atf_add_test_case slaac_on_nondefault_fib6 atf_add_test_case subnet_route_with_multiple_fibs_on_same_subnet atf_add_test_case subnet_route_with_multiple_fibs_on_same_subnet_inet6 atf_add_test_case udp_dontroute From owner-svn-src-all@freebsd.org Wed Mar 1 00:42:39 2017 Return-Path: Delivered-To: svn-src-all@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 89813CF1BFD; Wed, 1 Mar 2017 00:42:39 +0000 (UTC) (envelope-from avos@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 48DDE6A0; Wed, 1 Mar 2017 00:42:39 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v210gcds030814; Wed, 1 Mar 2017 00:42:38 GMT (envelope-from avos@FreeBSD.org) Received: (from avos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v210gc65030811; Wed, 1 Mar 2017 00:42:38 GMT (envelope-from avos@FreeBSD.org) Message-Id: <201703010042.v210gc65030811@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avos set sender to avos@FreeBSD.org using -f From: Andriy Voskoboinyk Date: Wed, 1 Mar 2017 00:42:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314443 - head/sys/dev/iwn X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 00:42:39 -0000 Author: avos Date: Wed Mar 1 00:42:38 2017 New Revision: 314443 URL: https://svnweb.freebsd.org/changeset/base/314443 Log: iwn: fix data rate parsing for Rx radiotap header. Tested with Intel 6205, MONITOR mode + RTL8188EU, STA mode. Modified: head/sys/dev/iwn/if_iwn.c head/sys/dev/iwn/if_iwnreg.h Modified: head/sys/dev/iwn/if_iwn.c ============================================================================== --- head/sys/dev/iwn/if_iwn.c Wed Mar 1 00:28:04 2017 (r314442) +++ head/sys/dev/iwn/if_iwn.c Wed Mar 1 00:42:38 2017 (r314443) @@ -2667,6 +2667,26 @@ rate2plcp(int rate) return 0; } +static __inline uint8_t +plcp2rate(const uint8_t rate_plcp) +{ + switch (rate_plcp) { + case 0xd: return 12; + case 0xf: return 18; + case 0x5: return 24; + case 0x7: return 36; + case 0x9: return 48; + case 0xb: return 72; + case 0x1: return 96; + case 0x3: return 108; + case 10: return 2; + case 20: return 4; + case 55: return 11; + case 110: return 22; + default: return 0; + } +} + static int iwn_get_1stream_tx_antmask(struct iwn_softc *sc) { @@ -3078,6 +3098,7 @@ iwn_rx_done(struct iwn_softc *sc, struct if (ieee80211_radiotap_active(ic)) { struct iwn_rx_radiotap_header *tap = &sc->sc_rxtap; + uint32_t rate = le32toh(stat->rate); tap->wr_flags = 0; if (stat->flags & htole16(IWN_STAT_FLAG_SHPREAMBLE)) @@ -3085,24 +3106,11 @@ iwn_rx_done(struct iwn_softc *sc, struct tap->wr_dbm_antsignal = (int8_t)rssi; tap->wr_dbm_antnoise = (int8_t)nf; tap->wr_tsft = stat->tstamp; - switch (stat->rate) { - /* CCK rates. */ - case 10: tap->wr_rate = 2; break; - case 20: tap->wr_rate = 4; break; - case 55: tap->wr_rate = 11; break; - case 110: tap->wr_rate = 22; break; - /* OFDM rates. */ - case 0xd: tap->wr_rate = 12; break; - case 0xf: tap->wr_rate = 18; break; - case 0x5: tap->wr_rate = 24; break; - case 0x7: tap->wr_rate = 36; break; - case 0x9: tap->wr_rate = 48; break; - case 0xb: tap->wr_rate = 72; break; - case 0x1: tap->wr_rate = 96; break; - case 0x3: tap->wr_rate = 108; break; - /* Unknown rate: should not happen. */ - default: tap->wr_rate = 0; - } + if (rate & IWN_RFLAG_MCS) { + tap->wr_rate = rate & IWN_RFLAG_RATE_MCS; + tap->wr_rate |= IEEE80211_RATE_MCS; + } else + tap->wr_rate = plcp2rate(rate & IWN_RFLAG_RATE); } /* Modified: head/sys/dev/iwn/if_iwnreg.h ============================================================================== --- head/sys/dev/iwn/if_iwnreg.h Wed Mar 1 00:28:04 2017 (r314442) +++ head/sys/dev/iwn/if_iwnreg.h Wed Mar 1 00:42:38 2017 (r314443) @@ -736,6 +736,10 @@ struct iwn4965_node_info { uint32_t reserved7; } __packed; +#define IWN_RFLAG_RATE 0xff +#define IWN_RFLAG_RATE_MCS 0x1f +#define IWN_RFLAG_HT40_DUP 0x20 + #define IWN_RFLAG_MCS (1 << 8) #define IWN_RFLAG_CCK (1 << 9) #define IWN_RFLAG_GREENFIELD (1 << 10) From owner-svn-src-all@freebsd.org Wed Mar 1 00:49:53 2017 Return-Path: Delivered-To: svn-src-all@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 2B75ACF1D83 for ; Wed, 1 Mar 2017 00:49:53 +0000 (UTC) (envelope-from scottl@netflix.com) Received: from mail-pf0-x22b.google.com (mail-pf0-x22b.google.com [IPv6:2607:f8b0:400e:c00::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F0257955 for ; Wed, 1 Mar 2017 00:49:52 +0000 (UTC) (envelope-from scottl@netflix.com) Received: by mail-pf0-x22b.google.com with SMTP id w189so6189567pfb.0 for ; Tue, 28 Feb 2017 16:49:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netflix.com; s=google; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=gS56KBIDZ8+vy/Z4HOUtF49XExZ8VZMMeHzO7935BWY=; b=jRKw7sqL/vnHPVXDfJHv3E8ld3kJ42ALi7uz+6SYg/SN7vaZr1TFy+MuDqKEWJwwix hNjJFSDvzJiC9gvwqgA0etTdh8rP5ZJXshSmGzTD3I1URy5muUkxuyeUDLv+5txdP2ps HZ+iUBPdKAM7P3dLpVQlePGr/yoZEnO+IRydc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=gS56KBIDZ8+vy/Z4HOUtF49XExZ8VZMMeHzO7935BWY=; b=R2GmjhkWJyuz8hk42Pc1UqskQisKGSph69k1/EeKN9mO6DBbqbvl/4dh1HgW/rNGrY UBiVAdq5yLyL6kd+odUu7Pd5PicRy9QGyz5WwaaBeU9tbJ0T0p45gdvLMLSm6RfAAzWo NFDNccQ3tVcQIqOJawOiwSbbDS4H/QJfI8RwzuDDtOt/ZY0v+Q1QASCDF1y5t2w7QQlF 7KjLcjkzDXjnHDHcD/5KD1p8n3YHXOO+TiUGm1Nu1C6/FUTjwerEsu1dGfxi2210UXPG AZKM18k1NaPhp3AC/sK+DABIDk2HfrcLCa40NlHCwWioafNWRiQG3eflE8hWQ8GF2zVm tX+w== X-Gm-Message-State: AMke39kBh/uv3S8UxNTsXhYLfBUOFcW29Ch1d2w5xCdWqWx22WpCxOlkYT0/CrJtselmRl6o X-Received: by 10.84.216.15 with SMTP id m15mr6730899pli.22.1488329392524; Tue, 28 Feb 2017 16:49:52 -0800 (PST) Received: from ?IPv6:2600:1010:b01f:88f8:64c6:d797:6b37:3ac1? ([2600:1010:b01f:88f8:64c6:d797:6b37:3ac1]) by smtp.gmail.com with ESMTPSA id 187sm6370049pff.17.2017.02.28.16.49.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Feb 2017 16:49:51 -0800 (PST) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 10.2 \(3259\)) Subject: Re: svn commit: r314420 - head/sys/kern From: Scott Long In-Reply-To: Date: Tue, 28 Feb 2017 16:49:50 -0800 Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <201702282127.v1SLRqDH048319@repo.freebsd.org> To: cem@freebsd.org X-Mailer: Apple Mail (2.3259) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 00:49:53 -0000 Sure, but it doesn=E2=80=99t match the comments in that if-else = construct. Scott > On Feb 28, 2017, at 2:02 PM, Conrad Meyer wrote: >=20 > On Tue, Feb 28, 2017 at 1:27 PM, Scott Long = wrote: >> Author: scottl >> Date: Tue Feb 28 21:27:51 2017 >> New Revision: 314420 >> URL: https://svnweb.freebsd.org/changeset/base/314420 >>=20 >> Log: >> Provide a comment on why stdio.h needs to be included. >>=20 >> Modified: >> head/sys/kern/subr_prf.c >>=20 >> Modified: head/sys/kern/subr_prf.c >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- head/sys/kern/subr_prf.c Tue Feb 28 21:18:45 2017 = (r314419) >> +++ head/sys/kern/subr_prf.c Tue Feb 28 21:27:51 2017 = (r314420) >> @@ -76,6 +76,13 @@ __FBSDID("$FreeBSD$"); >> #include >> #else >> #include >> +#endif >> + >> +/* >> + * This is needed for sbuf_putbuf() when compiled into userland. = Due to the >> + * shared nature of this file, it's the only place to put it. >=20 > Couldn't it go in the #else clause above? >=20 > Best, > Conrad >=20 From owner-svn-src-all@freebsd.org Wed Mar 1 01:17:52 2017 Return-Path: Delivered-To: svn-src-all@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 78EB1CF27DE; Wed, 1 Mar 2017 01:17:52 +0000 (UTC) (envelope-from pfg@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 3A9CEAB6; Wed, 1 Mar 2017 01:17:52 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v211Hp1k043268; Wed, 1 Mar 2017 01:17:51 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v211Hpp6043267; Wed, 1 Mar 2017 01:17:51 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201703010117.v211Hpp6043267@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Wed, 1 Mar 2017 01:17:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314444 - stable/11/usr.bin/dc X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 01:17:52 -0000 Author: pfg Date: Wed Mar 1 01:17:51 2017 New Revision: 314444 URL: https://svnweb.freebsd.org/changeset/base/314444 Log: MFC r314316: dc(1): Catch up with OpenBSD tag. OpenBSD rev 1.12 corresponds to our SVN r275162. Update the tag to make easier future updates. No functional change. Modified: stable/11/usr.bin/dc/stack.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/dc/stack.c ============================================================================== --- stable/11/usr.bin/dc/stack.c Wed Mar 1 00:42:38 2017 (r314443) +++ stable/11/usr.bin/dc/stack.c Wed Mar 1 01:17:51 2017 (r314444) @@ -1,4 +1,4 @@ -/* $OpenBSD: stack.c,v 1.11 2009/10/27 23:59:37 deraadt Exp $ */ +/* $OpenBSD: stack.c,v 1.12 2014/11/26 15:05:51 otto Exp $ */ /* * Copyright (c) 2003, Otto Moerbeek From owner-svn-src-all@freebsd.org Wed Mar 1 01:19:42 2017 Return-Path: Delivered-To: svn-src-all@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 A08A3CF2863; Wed, 1 Mar 2017 01:19:42 +0000 (UTC) (envelope-from pfg@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 6FE11C0C; Wed, 1 Mar 2017 01:19:42 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v211JfSX043388; Wed, 1 Mar 2017 01:19:41 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v211JfIM043387; Wed, 1 Mar 2017 01:19:41 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201703010119.v211JfIM043387@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Wed, 1 Mar 2017 01:19:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314445 - stable/10/usr.bin/dc X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 01:19:42 -0000 Author: pfg Date: Wed Mar 1 01:19:41 2017 New Revision: 314445 URL: https://svnweb.freebsd.org/changeset/base/314445 Log: MFC r314316: dc(1): Catch up with OpenBSD tag. OpenBSD rev 1.12 corresponds to our SVN r275162. Update the tag to make easier future updates. No functional change. Modified: stable/10/usr.bin/dc/stack.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.bin/dc/stack.c ============================================================================== --- stable/10/usr.bin/dc/stack.c Wed Mar 1 01:17:51 2017 (r314444) +++ stable/10/usr.bin/dc/stack.c Wed Mar 1 01:19:41 2017 (r314445) @@ -1,4 +1,4 @@ -/* $OpenBSD: stack.c,v 1.11 2009/10/27 23:59:37 deraadt Exp $ */ +/* $OpenBSD: stack.c,v 1.12 2014/11/26 15:05:51 otto Exp $ */ /* * Copyright (c) 2003, Otto Moerbeek From owner-svn-src-all@freebsd.org Wed Mar 1 01:44:41 2017 Return-Path: Delivered-To: svn-src-all@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 A2D30CF2E71; Wed, 1 Mar 2017 01:44:41 +0000 (UTC) (envelope-from emaste@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 4A7E5A32; Wed, 1 Mar 2017 01:44:41 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v211ieIX054785; Wed, 1 Mar 2017 01:44:40 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v211ieAf054784; Wed, 1 Mar 2017 01:44:40 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201703010144.v211ieAf054784@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 1 Mar 2017 01:44:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314446 - stable/10/contrib/tzcode/stdtime X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 01:44:41 -0000 Author: emaste Date: Wed Mar 1 01:44:40 2017 New Revision: 314446 URL: https://svnweb.freebsd.org/changeset/base/314446 Log: MFC r313774: localtime: return NULL if time_t out of range of struct tm Previously we would truncate tm.tm_year for any time_t corresponding to a year that does not fit in int. This issue was discovered because it caused the bash-static build to fail when linking with LLD. As reported by Rafael Espíndola: Configure has AC_FUNC_MKTIME which expands to a test of mktime that fails with the freebsd implementation. Given that, bash compiles a mktime.o file that defines just mktime and uses localtime. That goes in a .a file that is before libc. The freebsd libc defines mktime in localtime.o, which also defines localtime among other functions. When lld sees an undefined reference to mktime from libc, it uses the bash provided one and then tries to find a definition of localtime. It is found on libc's localtime.o, but now we have a duplicated error. The reason it works with bfd is that bash doesn't use mktime directly and the undefined reference from libc is resolved to the libc implementation. It would also fail to link if bash itself directly used mktime. The bash-static configure test verifies that, for many values of t, either localtime(t) returns NULL or mktime(localtime(t)) == t. This test failed when localtime returned a truncated tm_year. This was fixed in tzcode in 2004 but has persisted in our tree since rS2708. Sponsored by: The FreeBSD Foundation Modified: stable/10/contrib/tzcode/stdtime/localtime.c Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/tzcode/stdtime/localtime.c ============================================================================== --- stable/10/contrib/tzcode/stdtime/localtime.c Wed Mar 1 01:19:41 2017 (r314445) +++ stable/10/contrib/tzcode/stdtime/localtime.c Wed Mar 1 01:44:40 2017 (r314446) @@ -1460,14 +1460,13 @@ const time_t * const timep; } _RWLOCK_RDLOCK(&lcl_rwlock); tzset_basic(1); - localsub(timep, 0L, p_tm); + p_tm = localsub(timep, 0L, p_tm); _RWLOCK_UNLOCK(&lcl_rwlock); - return(p_tm); } else { tzset_basic(0); - localsub(timep, 0L, &tm); - return(&tm); + p_tm = localsub(timep, 0L, &tm); } + return(p_tm); } /* @@ -1481,7 +1480,7 @@ struct tm * tmp; { _RWLOCK_RDLOCK(&lcl_rwlock); tzset_basic(1); - localsub(timep, 0L, tmp); + tmp = localsub(timep, 0L, tmp); _RWLOCK_UNLOCK(&lcl_rwlock); return tmp; } From owner-svn-src-all@freebsd.org Wed Mar 1 01:45:54 2017 Return-Path: Delivered-To: svn-src-all@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 03FABCF2EEA; Wed, 1 Mar 2017 01:45:54 +0000 (UTC) (envelope-from emaste@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 AB00BB8A; Wed, 1 Mar 2017 01:45:53 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v211jqqN054888; Wed, 1 Mar 2017 01:45:52 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v211jqPc054887; Wed, 1 Mar 2017 01:45:52 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201703010145.v211jqPc054887@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 1 Mar 2017 01:45:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314447 - stable/11/contrib/tzcode/stdtime X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 01:45:54 -0000 Author: emaste Date: Wed Mar 1 01:45:52 2017 New Revision: 314447 URL: https://svnweb.freebsd.org/changeset/base/314447 Log: MFC r313774: localtime: return NULL if time_t out of range of struct tm Previously we would truncate tm.tm_year for any time_t corresponding to a year that does not fit in int. This issue was discovered because it caused the bash-static build to fail when linking with LLD. As reported by Rafael Espíndola: Configure has AC_FUNC_MKTIME which expands to a test of mktime that fails with the freebsd implementation. Given that, bash compiles a mktime.o file that defines just mktime and uses localtime. That goes in a .a file that is before libc. The freebsd libc defines mktime in localtime.o, which also defines localtime among other functions. When lld sees an undefined reference to mktime from libc, it uses the bash provided one and then tries to find a definition of localtime. It is found on libc's localtime.o, but now we have a duplicated error. The reason it works with bfd is that bash doesn't use mktime directly and the undefined reference from libc is resolved to the libc implementation. It would also fail to link if bash itself directly used mktime. The bash-static configure test verifies that, for many values of t, either localtime(t) returns NULL or mktime(localtime(t)) == t. This test failed when localtime returned a truncated tm_year. This was fixed in tzcode in 2004 but has persisted in our tree since rS2708. Sponsored by: The FreeBSD Foundation Modified: stable/11/contrib/tzcode/stdtime/localtime.c Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/tzcode/stdtime/localtime.c ============================================================================== --- stable/11/contrib/tzcode/stdtime/localtime.c Wed Mar 1 01:44:40 2017 (r314446) +++ stable/11/contrib/tzcode/stdtime/localtime.c Wed Mar 1 01:45:52 2017 (r314447) @@ -1453,14 +1453,13 @@ localtime(const time_t *const timep) } _RWLOCK_RDLOCK(&lcl_rwlock); tzset_basic(1); - localsub(timep, 0L, p_tm); + p_tm = localsub(timep, 0L, p_tm); _RWLOCK_UNLOCK(&lcl_rwlock); - return(p_tm); } else { tzset_basic(0); - localsub(timep, 0L, &tm); - return(&tm); + p_tm = localsub(timep, 0L, &tm); } + return(p_tm); } /* @@ -1472,7 +1471,7 @@ localtime_r(const time_t *const timep, s { _RWLOCK_RDLOCK(&lcl_rwlock); tzset_basic(1); - localsub(timep, 0L, tmp); + tmp = localsub(timep, 0L, tmp); _RWLOCK_UNLOCK(&lcl_rwlock); return tmp; } From owner-svn-src-all@freebsd.org Wed Mar 1 01:48:12 2017 Return-Path: Delivered-To: svn-src-all@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 80077CF2FBA for ; Wed, 1 Mar 2017 01:48:12 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qk0-x232.google.com (mail-qk0-x232.google.com [IPv6:2607:f8b0:400d:c09::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 30744DBC for ; Wed, 1 Mar 2017 01:48:12 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qk0-x232.google.com with SMTP id n127so48310936qkf.0 for ; Tue, 28 Feb 2017 17:48:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=zmS5gIpX0g+8a4Aj5fo3CaDscVKv2keMuIrJBdH/3ys=; b=T8IgkSFzcHNm3kYcfdfHmouUgudWURjCCzm2LYaSkFcHJycVxP2vPz8FTKw5mqEhrS 7KyomLEI7hWIyI9GyWNbRBq2ek7z5n5vKadqUTXJhrNcgyVdCTARHvGHlXBUzwWQqEbC wi20BtCx8tGQMTg4MewqkhNFpstCjTWNF+/HjSfGMni9P6xuu7hHHKvSnZfmfxaN7qft sm21AxVt4hKtR+7Fq5PmY5JUce3yLUhCHnr6p57cNrcsNTQhhP2tFo60+DZ5N8Iva5n9 BQcugwNT8Ec5otQyf1TFDYQnQ39zB0+gFoHO8AUnQR9ekpLB52toqz3QF+lsA1wdlUTZ qVbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=zmS5gIpX0g+8a4Aj5fo3CaDscVKv2keMuIrJBdH/3ys=; b=l+oyfLsek/FKAQ+WKcFgBiExj093pVpJp2wzYsZj/bFky5CJcHvzq0ug0/fPxuNmSQ eBuqjDwxe0dWoCzFf8bzY0kZzuj+ZFsTCeQwM4Aw0KYvys/OcYg8GNBV1B6BUk6tCfqb uU22O0KmbSVA4R5p1PeN8yHq0z9wpPbcEI0yTQrLT8EMAPog14vveOhFvziGE7QyjtCI Iddw88VS31W200HoUsnPxmDoxXKcWPbF+u35mAwCzGbom1wmT9bG+JlgbgqRDX0IUkJ/ jheHL4Fp2IYGynzSbLUUsuZgzjFim1TaqBZlyRB6DYm/NCS680gqONVZzgXPXsYAbc0H 7F+Q== X-Gm-Message-State: AMke39m7dXL9ATygnmrN2waXJPaVTnYlQTtPsg3nBD5GugfZbd3S8fuaeOwdO/XxalB+HxQ1 X-Received: by 10.237.34.8 with SMTP id n8mr7211040qtc.98.1488332891074; Tue, 28 Feb 2017 17:48:11 -0800 (PST) Received: from mutt-hbsd ([63.88.83.66]) by smtp.gmail.com with ESMTPSA id k51sm817283qtf.31.2017.02.28.17.48.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2017 17:48:10 -0800 (PST) Date: Tue, 28 Feb 2017 20:48:09 -0500 From: Shawn Webb To: Warner Losh Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314436 - in head: bin/cat bin/chflags bin/chmod bin/cp bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/hostname bin/kill bin/ln bin/ls bin/mkdir bin/mv bin/pax bin/ps bin/pwd... Message-ID: <20170301014809.7reingqvkw4qqagb@mutt-hbsd> References: <201702282342.v1SNgmAx007045@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="je7ifup2m43v6sdu" Content-Disposition: inline In-Reply-To: <201702282342.v1SNgmAx007045@repo.freebsd.org> X-Operating-System: FreeBSD mutt-hbsd 12.0-CURRENT-HBSD FreeBSD 12.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0x6A84658F52456EEE User-Agent: NeoMutt/20170206 (1.7.2) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 01:48:12 -0000 --je7ifup2m43v6sdu Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Feb 28, 2017 at 11:42:48PM +0000, Warner Losh wrote: > Author: imp > Date: Tue Feb 28 23:42:47 2017 > New Revision: 314436 > URL: https://svnweb.freebsd.org/changeset/base/314436 >=20 > Log: > Renumber copyright clause 4 > =20 > Renumber cluase 4 to 3, per what everybody else did when BSD granted > them permission to remove clause 3. My insistance on keeping the same > numbering for legal reasons is too pedantic, so give up on that point. > =20 > Submitted by: Jan Schaumann > Pull Request: https://github.com/freebsd/freebsd/pull/96 This breaks building arm64 world at a minimum. --=20 Shawn Webb Cofounder and Security Engineer HardenedBSD GPG Key ID: 0x6A84658F52456EEE GPG Key Fingerprint: 2ABA B6BD EF6A F486 BE89 3D9E 6A84 658F 5245 6EEE --je7ifup2m43v6sdu Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEKrq2ve9q9Ia+iT2eaoRlj1JFbu4FAli2KFcACgkQaoRlj1JF bu5HCw/+Mxx/hgXmLgqKbsoLfhgX/ST6rnsXh6TcccMgM7OthYtURgQdQ6Xo6PL3 j//aphctYzusEo+sMRiHHefiEZiLlIPta/JSTUrsdYYSUHKmlIPSxILm4j27opF+ PioCQ/0PdqZ/AS581ImxyjpkVKy/UqlWkonr2QFwQ3YWDz43z4pGN+P42dCZuyBi t0M+Xm2aA7OZoyRoFktIDRxyL9thg4wHqfH0chGO9jZzOSYGlYJ9jxSKdVxqnwdb RTnXZxs11woO+Le760+s/xf7a9gi/MoyJ5E8A6k+VFFiALOH1bFWTDDETj9s8sDl C5EiIW/jPsLGSxiBw9wK91Gm2lfytllwq1mrH3UrqKCXj17QT2YBRkzqBoaTTuAX FlQKYN9wbMwJjJlD2r8uSoca0UH/OpAiw2hxeNX1J0IKTGuVahUrFK4AGyWe8CB+ OI6HqLgoQg+qZ9WNaWBNixtYNiUsyvHv+tt0dJETdiezhoL0/SD5C4SOfCsOxPKu wQVs054rBPLZxXwzQMIlzKuSmcxjjfIxw/QovXIBxYuXWv5mdyVwwGKh8Z4YYPa5 Far2IYm4ptwincoV5cQ6bL2dOX1W9w1Em8eszAIVDV1CMVDsjoliwm0PH/tNHMi1 dX1u64MEWyOMvdhu31Ex+p3UmW75s7aNQwThfpFgXPgTJ6/bmJk= =jlOH -----END PGP SIGNATURE----- --je7ifup2m43v6sdu-- From owner-svn-src-all@freebsd.org Wed Mar 1 02:07:52 2017 Return-Path: Delivered-To: svn-src-all@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 A08A4CF235A; Wed, 1 Mar 2017 02:07:52 +0000 (UTC) (envelope-from imp@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 44F978D8; Wed, 1 Mar 2017 02:07:52 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2127pIc062833; Wed, 1 Mar 2017 02:07:51 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2127pcv062832; Wed, 1 Mar 2017 02:07:51 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201703010207.v2127pcv062832@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 1 Mar 2017 02:07:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314448 - head/sys/libkern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 02:07:52 -0000 Author: imp Date: Wed Mar 1 02:07:51 2017 New Revision: 314448 URL: https://svnweb.freebsd.org/changeset/base/314448 Log: strstr.c was inadvertently blasted with a copy of isa_nmi.c. Revert and remove clause 3 while I'm here. Modified: head/sys/libkern/strstr.c Modified: head/sys/libkern/strstr.c ============================================================================== --- head/sys/libkern/strstr.c Wed Mar 1 01:45:52 2017 (r314447) +++ head/sys/libkern/strstr.c Wed Mar 1 02:07:51 2017 (r314448) @@ -1,9 +1,9 @@ /*- - * Copyright (c) 1991 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by - * William Jolitz. + * Chris Torek. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -28,42 +28,32 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 */ #include __FBSDID("$FreeBSD$"); -#include -#include -#include - -#include - -#define NMI_PARITY 0x04 -#define NMI_EPARITY 0x02 +#include +#include /* - * Handle a NMI, possibly a machine check. - * return true to panic system, false to ignore. + * Find the first occurrence of find in s. */ -int -isa_nmi(int cd) +char * +strstr(const char *s, const char *find) { - int retval = 0; - int port = inb(0x33); + char c, sc; + size_t len; - log(LOG_CRIT, "NMI PC98 port = %x\n", port); - if (port & NMI_PARITY) { - log(LOG_CRIT, "BASE RAM parity error, likely hardware failure."); - retval = 1; - } else if (port & NMI_EPARITY) { - log(LOG_CRIT, "EXTENDED RAM parity error, likely hardware failure."); - retval = 1; - } else { - log(LOG_CRIT, "\nNMI Resume ??\n"); + if ((c = *find++) != 0) { + len = strlen(find); + do { + do { + if ((sc = *s++) == 0) + return (NULL); + } while (sc != c); + } while (strncmp(s, find, len) != 0); + s--; } - - return(retval); + return (__DECONST(char *, s)); } From owner-svn-src-all@freebsd.org Wed Mar 1 02:10:42 2017 Return-Path: Delivered-To: svn-src-all@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 672BBCF23FD; Wed, 1 Mar 2017 02:10:42 +0000 (UTC) (envelope-from imp@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 357D6A5F; Wed, 1 Mar 2017 02:10:42 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v212Af1b063669; Wed, 1 Mar 2017 02:10:41 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v212AeEg063663; Wed, 1 Mar 2017 02:10:40 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201703010210.v212AeEg063663@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 1 Mar 2017 02:10:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314449 - in head: release/picobsd/tinyware/passwd sys/arm/include sys/mips/include usr.bin/locate/locate X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 02:10:42 -0000 Author: imp Date: Wed Mar 1 02:10:40 2017 New Revision: 314449 URL: https://svnweb.freebsd.org/changeset/base/314449 Log: Revert prior commit to restore the files mangled by my "fixing" merge conflicts for a git rebase I tried to do. Modified: head/release/picobsd/tinyware/passwd/extern.h head/release/picobsd/tinyware/passwd/pw_util.h head/sys/arm/include/_align.h head/sys/mips/include/cpuinfo.h head/usr.bin/locate/locate/pathnames.h Modified: head/release/picobsd/tinyware/passwd/extern.h ============================================================================== --- head/release/picobsd/tinyware/passwd/extern.h Wed Mar 1 02:07:51 2017 (r314448) +++ head/release/picobsd/tinyware/passwd/extern.h Wed Mar 1 02:10:40 2017 (r314449) @@ -1,6 +1,6 @@ -/*- - * Copyright (c) 1982, 1986, 1988, 1993 - * The Regents of the University of California. All rights reserved. +/* + * Copyright (c) 1994 + * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,7 +10,11 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -26,17 +30,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * + * From: @(#)extern.h 8.1 (Berkeley) 4/2/94 * $FreeBSD$ */ -#ifndef _NETINET_IP6_IPSEC_H_ -#define _NETINET_IP6_IPSEC_H_ - -int ip6_ipsec_filtertunnel(struct mbuf *); -int ip6_ipsec_fwd(struct mbuf *); -int ip6_ipsec_input(struct mbuf *, int); -int ip6_ipsec_output(struct mbuf **, struct inpcb *, int *); -#if 0 -int ip6_ipsec_mtu(struct mbuf *); -#endif -#endif +int krb_passwd(char *, char *, char *, char *); +int local_passwd(char *); Modified: head/release/picobsd/tinyware/passwd/pw_util.h ============================================================================== --- head/release/picobsd/tinyware/passwd/pw_util.h Wed Mar 1 02:07:51 2017 (r314448) +++ head/release/picobsd/tinyware/passwd/pw_util.h Wed Mar 1 02:10:40 2017 (r314449) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1987, 1988, 1993 + * Copyright (c) 1994 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,7 +10,11 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -26,22 +30,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)disklabel.h 8.2 (Berkeley) 7/10/94 + * @(#)pw_util.h 8.2 (Berkeley) 4/1/94 + * * $FreeBSD$ */ -#ifndef _SYS_DISKPC98_H_ -#define _SYS_DISKPC98_H_ - -#include -#include - -#define DOSMID_386BSD __DOSMID_386BSD -#define DOSSID_386BSD __DOSSID_386BSD - -void pc98_partition_dec(void const *pp, struct pc98_partition *d); -void pc98_partition_enc(void *pp, struct pc98_partition *d); - -#define DIOCSPC98 _IOW('M', 129, u_char[8192]) - -#endif /* !_SYS_DISKPC98_H_ */ +void pw_edit(int); +void pw_error(const char *, int, int); +void pw_init(void); +int pw_lock(void); +int pw_mkdb(const char *); +void pw_prompt(void); +int pw_tmp(void); Modified: head/sys/arm/include/_align.h ============================================================================== --- head/sys/arm/include/_align.h Wed Mar 1 02:07:51 2017 (r314448) +++ head/sys/arm/include/_align.h Wed Mar 1 02:10:40 2017 (r314449) @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2001 David E. O'Brien * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. * @@ -13,7 +14,11 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -29,35 +34,23 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)isa.h 5.7 (Berkeley) 5/9/91 + * from: @(#)param.h 5.8 (Berkeley) 6/28/91 * $FreeBSD$ */ -#ifndef _PC98_PC98_PC98_H_ -#define _PC98_PC98_PC98_H_ +#ifndef _ARM_INCLUDE__ALIGN_H_ +#define _ARM_INCLUDE__ALIGN_H_ /* - * PC98 Bus conventions - * modified for PC9801 by A.Kojima F.Ukai M.Ishii - * Kyoto University Microcomputer Club (KMC) + * Round p (pointer or byte index) up to the hardware-required alignment which + * is sufficient for any data type, pointer or numeric. The resulting type + * is equivelent to arm's uintptr_t (but is purposely spelled "unsigned" here). */ +#if __ARM_ARCH >= 6 +#define _ALIGNBYTES (sizeof(int) - 1) +#else +#define _ALIGNBYTES (sizeof(long long) - 1) +#endif +#define _ALIGN(p) (((unsigned)(p) + _ALIGNBYTES) & ~_ALIGNBYTES) -/* - * Input / Output Port Assignments -- PC98 IO address ... very dirty (^_^; - */ - -#define IO_ICU1 0x000 /* 8259A Interrupt Controller #1 */ -#define IO_ICU2 0x008 /* 8259A Interrupt Controller #2 */ -#define IO_RTC 0x020 /* 4990A RTC */ -#define IO_SYSPORT 0x031 /* 8255A System Port */ -#define IO_KBD 0x041 /* 8251A Keyboard */ -#define IO_COM2 0x0B1 /* 8251A RS232C serial I/O (ext) */ -#define IO_COM3 0x0B9 /* 8251A RS232C serial I/O (ext) */ -#define IO_FDPORT 0x0BE /* FD I/F port (1M<->640K,EMTON) */ - -/* - * Input / Output Port Sizes - */ -#define IO_KBDSIZE 16 /* 8042 Keyboard controllers */ - -#endif /* !_PC98_PC98_PC98_H_ */ +#endif /* !_ARM_INCLUDE__ALIGN_H_ */ Modified: head/sys/mips/include/cpuinfo.h ============================================================================== --- head/sys/mips/include/cpuinfo.h Wed Mar 1 02:07:51 2017 (r314448) +++ head/sys/mips/include/cpuinfo.h Wed Mar 1 02:10:40 2017 (r314449) @@ -1,7 +1,12 @@ +/* $NetBSD: cpu.h,v 1.70 2003/01/17 23:36:08 thorpej Exp $ */ + /*- - * Copyright (c) 1987, 1988, 1993 + * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. * + * This code is derived from software contributed to Berkeley by + * Ralph Campbell and Rick Macklem. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +15,11 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -26,50 +35,50 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)disklabel.h 8.2 (Berkeley) 7/10/94 * $FreeBSD$ + * @(#)cpu.h 8.4 (Berkeley) 1/4/94 + */ + +#ifndef _CPUINFO_H_ +#define _CPUINFO_H_ + +/* + * Exported definitions unique to NetBSD/mips cpu support. */ -#ifndef _SYS_DISK_PC98_H_ -#define _SYS_DISK_PC98_H_ +#ifdef _KERNEL +#ifndef LOCORE -#define PC98_BBSECTOR 1 /* DOS boot block relative sector number */ -#define PC98_PARTOFF 0 -#define PC98_PARTSIZE 32 -#define PC98_NPARTS 16 -#define PC98_MAGICOFS 510 -#define PC98_MAGIC 0xAA55 - -#define PC98_MID_BOOTABLE 0x80 -#define PC98_MID_MASK 0x7f -#define PC98_MID_386BSD 0x14 - -#define PC98_SID_ACTIVE 0x80 -#define PC98_SID_MASK 0x7f -#define PC98_SID_386BSD 0x44 - -#define __DOSMID_386BSD (PC98_MID_386BSD | PC98_MID_BOOTABLE) -#define __DOSSID_386BSD (PC98_SID_386BSD | PC98_SID_ACTIVE) -#define PC98_PTYP_386BSD (__DOSSID_386BSD << 8 | __DOSMID_386BSD) - -struct pc98_partition { - unsigned char dp_mid; - unsigned char dp_sid; - unsigned char dp_dum1; - unsigned char dp_dum2; - unsigned char dp_ipl_sct; - unsigned char dp_ipl_head; - unsigned short dp_ipl_cyl; - unsigned char dp_ssect; /* starting sector */ - unsigned char dp_shd; /* starting head */ - unsigned short dp_scyl; /* starting cylinder */ - unsigned char dp_esect; /* end sector */ - unsigned char dp_ehd; /* end head */ - unsigned short dp_ecyl; /* end cylinder */ - unsigned char dp_name[16]; +struct mips_cpuinfo { + u_int8_t cpu_vendor; + u_int8_t cpu_rev; + u_int8_t cpu_impl; + u_int8_t tlb_type; + u_int32_t tlb_pgmask; + u_int16_t tlb_nentries; + u_int8_t icache_virtual; + boolean_t cache_coherent_dma; + boolean_t userlocal_reg; + struct { + u_int32_t ic_size; + u_int8_t ic_linesize; + u_int8_t ic_nways; + u_int16_t ic_nsets; + u_int32_t dc_size; + u_int8_t dc_linesize; + u_int8_t dc_nways; + u_int16_t dc_nsets; + } l1; + struct { + u_int32_t dc_size; + u_int8_t dc_linesize; + u_int8_t dc_nways; + u_int16_t dc_nsets; + } l2; }; -#ifdef CTASSERT -CTASSERT(sizeof (struct pc98_partition) == PC98_PARTSIZE); -#endif -#endif /* !_SYS_DISK_PC98_H_ */ +extern struct mips_cpuinfo cpuinfo; + +#endif /* !LOCORE */ +#endif /* _KERNEL */ +#endif /* _CPUINFO_H_ */ Modified: head/usr.bin/locate/locate/pathnames.h ============================================================================== --- head/usr.bin/locate/locate/pathnames.h Wed Mar 1 02:07:51 2017 (r314448) +++ head/usr.bin/locate/locate/pathnames.h Wed Mar 1 02:10:40 2017 (r314449) @@ -1,6 +1,6 @@ -/*- - * Copyright (c) 1982, 1986, 1988, 1993 - * The Regents of the University of California. All rights reserved. +/* + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,7 +10,11 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -26,15 +30,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * + * @(#)pathnames.h 8.1 (Berkeley) 6/6/93 * $FreeBSD$ */ -#ifndef _NETINET_IP_IPSEC_H_ -#define _NETINET_IP_IPSEC_H_ - -int ip_ipsec_filtertunnel(struct mbuf *); -int ip_ipsec_fwd(struct mbuf *); -int ip_ipsec_input(struct mbuf *, int); -int ip_ipsec_mtu(struct mbuf *, int); -int ip_ipsec_output(struct mbuf **, struct inpcb *, int *); -#endif +#define _PATH_FCODES "/var/db/locate.database" From owner-svn-src-all@freebsd.org Wed Mar 1 03:03:36 2017 Return-Path: Delivered-To: svn-src-all@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 002B8CF2135 for ; Wed, 1 Mar 2017 03:03:35 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x233.google.com (mail-io0-x233.google.com [IPv6:2607:f8b0:4001:c06::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B0AFAB52 for ; Wed, 1 Mar 2017 03:03:35 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x233.google.com with SMTP id j18so22680346ioe.2 for ; Tue, 28 Feb 2017 19:03:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=O05V13b5JQ+yL3wAYhN4jpzDgzV2AYdYfN/hI4IW4ek=; b=HVD/Uj2tWydBN7jsZm1FWzGWhK6qu/ZbFaQTxzNjP+ZfPBPBV0bn/Wa6RDeIQZQzr3 DtLJ0UtocFQKfAH2skd91kX24BZpWEwtdjRNCfircIugErJmjurwrdgrqpfTUM65IYY6 FM9/GOh1GMNBocgrtBC6ffH6r3uzpTudQctJeaMVG/BnfY6dE9L+vfpH3fCd4LnjC+Be 97+V7kDcRAmuJF1TDa7o7iLaz4T719SbTzgTB/ydi3bgvQXCFHbcAlzZh65UL5zrPPgY 1gD4DEHP6RLNn9h4cvWctpGW2giXWu27BpBteeZSPUmuhrFbD/MxfgQnpikDkMi+8cgb mn1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=O05V13b5JQ+yL3wAYhN4jpzDgzV2AYdYfN/hI4IW4ek=; b=gp48BtEBvo1EqQtmqxodwhIdZFBy15ucBNUe6afU1+ZOVhTNlHIuI1K3Wj951xmn/p ZGqOtUDTFSVsyqslwf5i1xgcQ8aKLkOteBH0xVEjE+7VWH3xP062FJuwcl5iVzwy4LaF 0LVbjpFiuNFOyzrQKkl+WfND6TaTipa8jov3+6pk+G1fcTZDA2XDH3IPT5ua1gggToBa mSQ8en/xaosXibaCbnYxTijQT5rlTOV1z52EabF2DBk7hbCIsHqqJtC3QT57rVEfOifA zOONShtI1IArwS2dTAAaW6NlBTpxGLkShQLR5q64o6AgHTajsAbpzcsRX77LUTa/NQ4q V1rg== X-Gm-Message-State: AMke39msXoaG+l8qKNzvcCNA2fGoiO1QLiMJSiJfsLJiMAdolqeshg/o+mTr6il5VG95Een4HgtssHAejJbvMg== X-Received: by 10.107.198.193 with SMTP id w184mr6357055iof.19.1488337414959; Tue, 28 Feb 2017 19:03:34 -0800 (PST) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.134.129 with HTTP; Tue, 28 Feb 2017 19:03:34 -0800 (PST) X-Originating-IP: [50.253.99.174] In-Reply-To: <20170301014809.7reingqvkw4qqagb@mutt-hbsd> References: <201702282342.v1SNgmAx007045@repo.freebsd.org> <20170301014809.7reingqvkw4qqagb@mutt-hbsd> From: Warner Losh Date: Tue, 28 Feb 2017 20:03:34 -0700 X-Google-Sender-Auth: AnWNLvSI8z_wqRcs05nb5YlA7ys Message-ID: Subject: Re: svn commit: r314436 - in head: bin/cat bin/chflags bin/chmod bin/cp bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/hostname bin/kill bin/ln bin/ls bin/mkdir bin/mv bin/pax bin/ps bin/pwd... To: Shawn Webb Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 03:03:36 -0000 On Tue, Feb 28, 2017 at 6:48 PM, Shawn Webb wrote: > On Tue, Feb 28, 2017 at 11:42:48PM +0000, Warner Losh wrote: >> Author: imp >> Date: Tue Feb 28 23:42:47 2017 >> New Revision: 314436 >> URL: https://svnweb.freebsd.org/changeset/base/314436 >> >> Log: >> Renumber copyright clause 4 >> >> Renumber cluase 4 to 3, per what everybody else did when BSD granted >> them permission to remove clause 3. My insistance on keeping the same >> numbering for legal reasons is too pedantic, so give up on that point. >> >> Submitted by: Jan Schaumann >> Pull Request: https://github.com/freebsd/freebsd/pull/96 > > This breaks building arm64 world at a minimum. Yea, in resolving the conflicts with git, my inexperience botched it. I believe I've fixed it. Warner From owner-svn-src-all@freebsd.org Wed Mar 1 03:31:14 2017 Return-Path: Delivered-To: svn-src-all@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 1CC15CF2637; Wed, 1 Mar 2017 03:31:14 +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 DD7D7A79; Wed, 1 Mar 2017 03:31:13 +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 v213VDiX097995; Wed, 1 Mar 2017 03:31:13 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v213VDQ7097994; Wed, 1 Mar 2017 03:31:13 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010331.v213VDQ7097994@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 03:31:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314450 - head/contrib/netbsd-tests/lib/libc/stdlib X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 03:31:14 -0000 Author: ngie Date: Wed Mar 1 03:31:12 2017 New Revision: 314450 URL: https://svnweb.freebsd.org/changeset/base/314450 Log: Add additional __FreeBSD_version guards around the hsearch_r testcases The reasoning for this is the same as r276046: to ease MFCing the tests to ^/stable/10 . This was accidentally missed in r313439 MFC after: 1 week X-MFC with: r313439 Sponsored by: Dell EMC Isilon Modified: head/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c Modified: head/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c ============================================================================== --- head/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c Wed Mar 1 02:10:40 2017 (r314449) +++ head/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c Wed Mar 1 03:31:12 2017 (r314450) @@ -287,6 +287,7 @@ ATF_TC_BODY(hsearch_r_basic, tc) } #endif +#if defined(__FreeBSD__) && 1100027 <= __FreeBSD_version ATF_TC(hsearch_r_duplicate); ATF_TC_HEAD(hsearch_r_duplicate, tc) { @@ -394,6 +395,7 @@ ATF_TC_BODY(hsearch_r_two, tc) hdestroy_r(&t); } +#endif ATF_TP_ADD_TCS(tp) { From owner-svn-src-all@freebsd.org Wed Mar 1 03:59:20 2017 Return-Path: Delivered-To: svn-src-all@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 0E9F1CF2EF5; Wed, 1 Mar 2017 03:59:20 +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 C2589C45; Wed, 1 Mar 2017 03:59:19 +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 v213xIGo007118; Wed, 1 Mar 2017 03:59:18 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v213xIVu007116; Wed, 1 Mar 2017 03:59:18 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010359.v213xIVu007116@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 03:59:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314451 - head/usr.sbin/uathload X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 03:59:20 -0000 Author: ngie Date: Wed Mar 1 03:59:18 2017 New Revision: 314451 URL: https://svnweb.freebsd.org/changeset/base/314451 Log: Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones The SRCTOP conversion simplifies pathing in make/displayed output. Also, while here, change a hardcoded path to ar5523.bin.uu in the make target with ${.ALLSRC} . MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/uathload/Makefile Modified: head/usr.sbin/uathload/Makefile ============================================================================== --- head/usr.sbin/uathload/Makefile Wed Mar 1 03:31:12 2017 (r314450) +++ head/usr.sbin/uathload/Makefile Wed Mar 1 03:59:18 2017 (r314451) @@ -10,7 +10,7 @@ FILESMODE= 444 CLEANFILES= ar5523.bin -ar5523.bin: ${.CURDIR}/../../sys/contrib/dev/uath/ar5523.bin.uu - uudecode -p ${.CURDIR}/../../sys/contrib/dev/uath/ar5523.bin.uu > ${.TARGET} +ar5523.bin: ${SRCTOP}/sys/contrib/dev/uath/ar5523.bin.uu + uudecode -p ${.ALLSRC} > ${.TARGET} .include From owner-svn-src-all@freebsd.org Wed Mar 1 04:00:18 2017 Return-Path: Delivered-To: svn-src-all@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 A6E86CF2F84; Wed, 1 Mar 2017 04:00:18 +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 7319FDA8; Wed, 1 Mar 2017 04:00:18 +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 v2140HO8007252; Wed, 1 Mar 2017 04:00:17 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2140HU8007251; Wed, 1 Mar 2017 04:00:17 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010400.v2140HU8007251@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 04:00:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314452 - head/usr.sbin/fstyp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:00:18 -0000 Author: ngie Date: Wed Mar 1 04:00:17 2017 New Revision: 314452 URL: https://svnweb.freebsd.org/changeset/base/314452 Log: Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/fstyp/Makefile Modified: head/usr.sbin/fstyp/Makefile ============================================================================== --- head/usr.sbin/fstyp/Makefile Wed Mar 1 03:59:18 2017 (r314451) +++ head/usr.sbin/fstyp/Makefile Wed Mar 1 04:00:17 2017 (r314452) @@ -26,15 +26,15 @@ CFLAGS+=-I${.CURDIR}/../../sys IGNORE_PRAGMA= YES CFLAGS+= -DNEED_SOLARIS_BOOLEAN -DHAVE_ZFS -CFLAGS+= -I${.CURDIR}/../../sys/cddl/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris/lib/libumem -CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libnvpair -CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common/sys -CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/head +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head .endif LIBADD= geom md From owner-svn-src-all@freebsd.org Wed Mar 1 04:02:38 2017 Return-Path: Delivered-To: svn-src-all@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 361A5CF014F; Wed, 1 Mar 2017 04:02:38 +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 F19F91BA; Wed, 1 Mar 2017 04:02:37 +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 v2142bi6010813; Wed, 1 Mar 2017 04:02:37 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2142bsk010812; Wed, 1 Mar 2017 04:02:37 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010402.v2142bsk010812@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 04:02:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314453 - head/usr.sbin/yp_mkdb X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:02:38 -0000 Author: ngie Date: Wed Mar 1 04:02:36 2017 New Revision: 314453 URL: https://svnweb.freebsd.org/changeset/base/314453 Log: Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/yp_mkdb/Makefile Modified: head/usr.sbin/yp_mkdb/Makefile ============================================================================== --- head/usr.sbin/yp_mkdb/Makefile Wed Mar 1 04:00:17 2017 (r314452) +++ head/usr.sbin/yp_mkdb/Makefile Wed Mar 1 04:02:36 2017 (r314453) @@ -1,13 +1,13 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../libexec/ypxfr ${.CURDIR}/../ypserv +.PATH: ${SRCTOP}/libexec/ypxfr ${SRCTOP}/usr.sbin/ypserv PROG= yp_mkdb MAN= yp_mkdb.8 SRCS= yp_mkdb.c yp_dblookup.c yp_dbwrite.c CFLAGS+= -Dyp_error=warnx -CFLAGS+= -I${.CURDIR}/../../libexec/ypxfr -I${.CURDIR}/../../usr.sbin/ypserv +CFLAGS+= -I${SRCTOP}/libexec/ypxfr -I${SRCTOP}/usr.sbin/ypserv WARNS?= 1 From owner-svn-src-all@freebsd.org Wed Mar 1 04:12:26 2017 Return-Path: Delivered-To: svn-src-all@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 61F7ACF05B3; Wed, 1 Mar 2017 04:12:26 +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 16ACB934; Wed, 1 Mar 2017 04:12:26 +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 v214CP7l014642; Wed, 1 Mar 2017 04:12:25 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214CPfq014641; Wed, 1 Mar 2017 04:12:25 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010412.v214CPfq014641@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 04:12:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314454 - head/usr.sbin/rpc.lockd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:12:26 -0000 Author: ngie Date: Wed Mar 1 04:12:24 2017 New Revision: 314454 URL: https://svnweb.freebsd.org/changeset/base/314454 Log: Use .ALLSRC instead of RPCSRC This is a trivial simplification in the Makefile, meant to serve as a good example for what to do with rules like this. MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/rpc.lockd/Makefile Modified: head/usr.sbin/rpc.lockd/Makefile ============================================================================== --- head/usr.sbin/rpc.lockd/Makefile Wed Mar 1 04:02:36 2017 (r314453) +++ head/usr.sbin/rpc.lockd/Makefile Wed Mar 1 04:12:24 2017 (r314454) @@ -17,10 +17,10 @@ RPCSRC= ${DESTDIR}/usr/include/rpcsvc/nl RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C nlm_prot_svc.c: ${RPCSRC} - ${RPCGEN} -m -o ${.TARGET} ${RPCSRC} + ${RPCGEN} -m -o ${.TARGET} ${.ALLSRC} nlm_prot.h: ${RPCSRC} - ${RPCGEN} -h -o ${.TARGET} ${RPCSRC} + ${RPCGEN} -h -o ${.TARGET} ${.ALLSRC} test: ${.CURDIR}/test.c cc -o test ${.CURDIR}/test.c -lrpcsvc From owner-svn-src-all@freebsd.org Wed Mar 1 04:13:33 2017 Return-Path: Delivered-To: svn-src-all@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 0B97ACF0685; Wed, 1 Mar 2017 04:13:33 +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 C9360AA4; Wed, 1 Mar 2017 04:13:32 +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 v214DVve014718; Wed, 1 Mar 2017 04:13:31 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214DVq5014717; Wed, 1 Mar 2017 04:13:31 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010413.v214DVq5014717@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 04:13:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314455 - head/usr.sbin/rpc.statd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:13:33 -0000 Author: ngie Date: Wed Mar 1 04:13:31 2017 New Revision: 314455 URL: https://svnweb.freebsd.org/changeset/base/314455 Log: Use .ALLSRC instead of RPCSRC This is a trivial simplification in the Makefile, meant to serve as a good example for what to do with rules like this. MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/rpc.statd/Makefile Modified: head/usr.sbin/rpc.statd/Makefile ============================================================================== --- head/usr.sbin/rpc.statd/Makefile Wed Mar 1 04:12:24 2017 (r314454) +++ head/usr.sbin/rpc.statd/Makefile Wed Mar 1 04:13:31 2017 (r314455) @@ -15,10 +15,10 @@ RPCSRC= ${DESTDIR}/usr/include/rpcsvc/sm RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C sm_inter_svc.c: ${RPCSRC} - ${RPCGEN} -m -o ${.TARGET} ${RPCSRC} + ${RPCGEN} -m -o ${.TARGET} ${.ALLSRC} sm_inter.h: ${RPCSRC} - ${RPCGEN} -h -o ${.TARGET} ${RPCSRC} + ${RPCGEN} -h -o ${.TARGET} ${.ALLSRC} test: test.c cc -o test test.c -lrpcsvc From owner-svn-src-all@freebsd.org Wed Mar 1 04:14:42 2017 Return-Path: Delivered-To: svn-src-all@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 C510BCF0702; Wed, 1 Mar 2017 04:14:42 +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 92571C00; Wed, 1 Mar 2017 04:14:42 +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 v214Efb6014796; Wed, 1 Mar 2017 04:14:41 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214Efe3014795; Wed, 1 Mar 2017 04:14:41 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010414.v214Efe3014795@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 04:14:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314456 - head/usr.sbin/rpc.yppasswdd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:14:42 -0000 Author: ngie Date: Wed Mar 1 04:14:41 2017 New Revision: 314456 URL: https://svnweb.freebsd.org/changeset/base/314456 Log: Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones This simplifies pathing in make/displayed output. MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/rpc.yppasswdd/Makefile Modified: head/usr.sbin/rpc.yppasswdd/Makefile ============================================================================== --- head/usr.sbin/rpc.yppasswdd/Makefile Wed Mar 1 04:13:31 2017 (r314455) +++ head/usr.sbin/rpc.yppasswdd/Makefile Wed Mar 1 04:14:41 2017 (r314456) @@ -2,8 +2,8 @@ RPCDIR= ${DESTDIR}/usr/include/rpcsvc -.PATH: ${.CURDIR}/../../usr.sbin/ypserv ${.CURDIR}/../../usr.bin/chpass \ - ${.CURDIR}/../../libexec/ypxfr ${RPCDIR} +.PATH: ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/usr.bin/chpass \ + ${SRCTOP}/libexec/ypxfr ${RPCDIR} PROG= rpc.yppasswdd SCRIPTS=yppwupdate @@ -16,9 +16,9 @@ GENSRCS=yp.h yp_clnt.c yppasswd.h yppass WARNS?= 5 CFLAGS+= -fno-strict-aliasing -CFLAGS+= -I${.CURDIR}/../../usr.sbin/vipw \ - -I${.CURDIR}/../../usr.sbin/ypserv \ - -I${.CURDIR}/../../libexec/ypxfr \ +CFLAGS+= -I${SRCTOP}/usr.sbin/vipw \ + -I${SRCTOP}/usr.sbin/ypserv \ + -I${SRCTOP}/libexec/ypxfr \ -I${.CURDIR} -I. LIBADD= rpcsvc crypt util From owner-svn-src-all@freebsd.org Wed Mar 1 04:16:41 2017 Return-Path: Delivered-To: svn-src-all@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 9A396CF0788; Wed, 1 Mar 2017 04:16:41 +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 6332FD6A; Wed, 1 Mar 2017 04:16:41 +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 v214GePI014915; Wed, 1 Mar 2017 04:16:40 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214Gemk014914; Wed, 1 Mar 2017 04:16:40 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010416.v214Gemk014914@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 04:16:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314457 - head/usr.sbin/rpc.ypupdated X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:16:41 -0000 Author: ngie Date: Wed Mar 1 04:16:40 2017 New Revision: 314457 URL: https://svnweb.freebsd.org/changeset/base/314457 Log: Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones The SRCTOP conversion simplifies pathing in make/displayed output. Also, while here, change a hardcoded path to ${RPCDIR}/ypupdate_prot.x in the make targets with ${.ALLSRC} . MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/rpc.ypupdated/Makefile Modified: head/usr.sbin/rpc.ypupdated/Makefile ============================================================================== --- head/usr.sbin/rpc.ypupdated/Makefile Wed Mar 1 04:14:41 2017 (r314456) +++ head/usr.sbin/rpc.ypupdated/Makefile Wed Mar 1 04:16:40 2017 (r314457) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../ypserv ${.CURDIR}/../../libexec/ypxfr +.PATH: ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/libexec/ypxfr PROG= rpc.ypupdated MAN= @@ -9,7 +9,7 @@ SRCS= ypupdate_prot_svc.c ypupdate_prot. yp_dblookup.c yp_dbwrite.c yp_dbdelete.c yp_dbupdate.c #CFLAGS+= -DYP -CFLAGS+= -I${.CURDIR}/../ypserv -I. -I${.CURDIR}/../../libexec/ypxfr +CFLAGS+= -I${SRCTOP}/usr.sbin/ypserv -I. -I${SRCTOP}/libexec/ypxfr WARNS?= 1 @@ -24,10 +24,10 @@ RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C # ypupdated_main.c can see it. ypupdate_prot_svc.c: ${RPCDIR}/ypupdate_prot.x rm -f ${.TARGET} - ${RPCGEN} -m ${RPCDIR}/ypupdate_prot.x | \ + ${RPCGEN} -m ${.ALLSRC} | \ sed s/"static int _rpcsvcstate"/"int _rpcsvcstate"/g > ${.TARGET} ypupdate_prot.h: ${RPCDIR}/ypupdate_prot.x - ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/ypupdate_prot.x + ${RPCGEN} -h -o ${.TARGET} ${.ALLSRC} .include From owner-svn-src-all@freebsd.org Wed Mar 1 04:17:19 2017 Return-Path: Delivered-To: svn-src-all@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 D4BF6CF07EE; Wed, 1 Mar 2017 04:17:19 +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 A11F7EAD; Wed, 1 Mar 2017 04:17:19 +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 v214HI5H014984; Wed, 1 Mar 2017 04:17:18 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214HIhv014982; Wed, 1 Mar 2017 04:17:18 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010417.v214HIhv014982@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 04:17:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314458 - in head/usr.sbin: tcpdchk tcpdmatch X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:17:19 -0000 Author: ngie Date: Wed Mar 1 04:17:18 2017 New Revision: 314458 URL: https://svnweb.freebsd.org/changeset/base/314458 Log: Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones This simplifies pathing in make/displayed output. MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/tcpdchk/Makefile head/usr.sbin/tcpdmatch/Makefile Modified: head/usr.sbin/tcpdchk/Makefile ============================================================================== --- head/usr.sbin/tcpdchk/Makefile Wed Mar 1 04:16:40 2017 (r314457) +++ head/usr.sbin/tcpdchk/Makefile Wed Mar 1 04:17:18 2017 (r314458) @@ -2,7 +2,7 @@ .include -.PATH: ${.CURDIR}/../../contrib/tcp_wrappers +.PATH: ${SRCTOP}/contrib/tcp_wrappers PROG= tcpdchk MAN= tcpdchk.8 Modified: head/usr.sbin/tcpdmatch/Makefile ============================================================================== --- head/usr.sbin/tcpdmatch/Makefile Wed Mar 1 04:16:40 2017 (r314457) +++ head/usr.sbin/tcpdmatch/Makefile Wed Mar 1 04:17:18 2017 (r314458) @@ -2,7 +2,7 @@ .include -.PATH: ${.CURDIR}/../../contrib/tcp_wrappers +.PATH: ${SRCTOP}/contrib/tcp_wrappers PROG= tcpdmatch MAN= tcpdmatch.8 From owner-svn-src-all@freebsd.org Wed Mar 1 04:18:00 2017 Return-Path: Delivered-To: svn-src-all@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 A04A0CF08C0; Wed, 1 Mar 2017 04:18:00 +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 6D73860; Wed, 1 Mar 2017 04:18:00 +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 v214Hxfa015049; Wed, 1 Mar 2017 04:17:59 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214HxwF015048; Wed, 1 Mar 2017 04:17:59 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010417.v214HxwF015048@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 04:17:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314459 - in head/usr.sbin: traceroute traceroute6 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:18:00 -0000 Author: ngie Date: Wed Mar 1 04:17:59 2017 New Revision: 314459 URL: https://svnweb.freebsd.org/changeset/base/314459 Log: Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones This simplifies pathing in make/displayed output. MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/traceroute/Makefile head/usr.sbin/traceroute6/Makefile Modified: head/usr.sbin/traceroute/Makefile ============================================================================== --- head/usr.sbin/traceroute/Makefile Wed Mar 1 04:17:18 2017 (r314458) +++ head/usr.sbin/traceroute/Makefile Wed Mar 1 04:17:59 2017 (r314459) @@ -2,7 +2,7 @@ .include -TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute +TRACEROUTE_DISTDIR?= ${SRCTOP}/contrib/traceroute .PATH: ${TRACEROUTE_DISTDIR} PROG= traceroute Modified: head/usr.sbin/traceroute6/Makefile ============================================================================== --- head/usr.sbin/traceroute6/Makefile Wed Mar 1 04:17:18 2017 (r314458) +++ head/usr.sbin/traceroute6/Makefile Wed Mar 1 04:17:59 2017 (r314459) @@ -13,7 +13,7 @@ # A PARTICULAR PURPOSE. # $FreeBSD$ -TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute +TRACEROUTE_DISTDIR?= ${SRCTOP}/contrib/traceroute .PATH: ${TRACEROUTE_DISTDIR} PROG= traceroute6 From owner-svn-src-all@freebsd.org Wed Mar 1 04:18:29 2017 Return-Path: Delivered-To: svn-src-all@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 68010CF0963; Wed, 1 Mar 2017 04:18:29 +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 37F171B3; Wed, 1 Mar 2017 04:18:29 +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 v214ISQu015112; Wed, 1 Mar 2017 04:18:28 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214IS0d015111; Wed, 1 Mar 2017 04:18:28 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010418.v214IS0d015111@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 04:18:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314460 - head/usr.sbin/ypldap X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:18:29 -0000 Author: ngie Date: Wed Mar 1 04:18:28 2017 New Revision: 314460 URL: https://svnweb.freebsd.org/changeset/base/314460 Log: Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones This simplifies pathing in make/displayed output. MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/ypldap/Makefile Modified: head/usr.sbin/ypldap/Makefile ============================================================================== --- head/usr.sbin/ypldap/Makefile Wed Mar 1 04:17:59 2017 (r314459) +++ head/usr.sbin/ypldap/Makefile Wed Mar 1 04:18:28 2017 (r314460) @@ -12,8 +12,8 @@ MAN= ypldap.8 ypldap.conf.5 LIBADD= openbsd event util rpcsvc CFLAGS+=-I${.CURDIR} -CFLAGS+=-I${.CURDIR}/../../contrib/pf/libevent -CFLAGS+=-I${.CURDIR}/../../lib/libopenbsd +CFLAGS+=-I${SRCTOP}/contrib/pf/libevent +CFLAGS+=-I${SRCTOP}/lib/libopenbsd WARNS= 2 From owner-svn-src-all@freebsd.org Wed Mar 1 04:19:06 2017 Return-Path: Delivered-To: svn-src-all@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 1E816CF0A5C; Wed, 1 Mar 2017 04:19:06 +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 DFEEC371; Wed, 1 Mar 2017 04:19:05 +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 v214J4ij015180; Wed, 1 Mar 2017 04:19:04 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214J4ia015179; Wed, 1 Mar 2017 04:19:04 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010419.v214J4ia015179@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 04:19:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314461 - head/usr.sbin/zonectl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:19:06 -0000 Author: ngie Date: Wed Mar 1 04:19:04 2017 New Revision: 314461 URL: https://svnweb.freebsd.org/changeset/base/314461 Log: Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones This simplifies pathing in make/displayed output. MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/zonectl/Makefile Modified: head/usr.sbin/zonectl/Makefile ============================================================================== --- head/usr.sbin/zonectl/Makefile Wed Mar 1 04:18:28 2017 (r314460) +++ head/usr.sbin/zonectl/Makefile Wed Mar 1 04:19:04 2017 (r314461) @@ -2,7 +2,7 @@ PROG= zonectl SRCS= zonectl.c -SDIR= ${.CURDIR}/../../sys +SDIR= ${SRCTOP}/sys LIBADD= cam sbuf util MAN= zonectl.8 CFLAGS+=-g -O0 From owner-svn-src-all@freebsd.org Wed Mar 1 04:22:25 2017 Return-Path: Delivered-To: svn-src-all@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 3B986CF0D4B; Wed, 1 Mar 2017 04:22:25 +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 0B25F99F; Wed, 1 Mar 2017 04:22:24 +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 v214MO5g018152; Wed, 1 Mar 2017 04:22:24 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214MO0x018151; Wed, 1 Mar 2017 04:22:24 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010422.v214MO0x018151@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 04:22:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314462 - head/usr.sbin/rpc.ypxfrd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:22:25 -0000 Author: ngie Date: Wed Mar 1 04:22:23 2017 New Revision: 314462 URL: https://svnweb.freebsd.org/changeset/base/314462 Log: Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones The SRCTOP conversion simplifies pathing in make/displayed output. Also, while here, change a hardcoded path to ${RPCDIR}/ypxfrd.x in the make targets with ${.ALLSRC} . MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/rpc.ypxfrd/Makefile Modified: head/usr.sbin/rpc.ypxfrd/Makefile ============================================================================== --- head/usr.sbin/rpc.ypxfrd/Makefile Wed Mar 1 04:19:04 2017 (r314461) +++ head/usr.sbin/rpc.ypxfrd/Makefile Wed Mar 1 04:22:23 2017 (r314462) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../usr.sbin/ypserv +.PATH: ${SRCTOP}/usr.sbin/ypserv PROG= rpc.ypxfrd MAN= rpc.ypxfrd.8 @@ -15,14 +15,14 @@ LIBADD= rpcsvc CLEANFILES= ypxfrd_svc.c ypxfrd.h -RPCDIR= ${.CURDIR}/../../include/rpcsvc +RPCDIR= ${SRCTOP}/include/rpcsvc RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C # We need to remove the 'static' keyword from _rpcsvcstate so that # ypxfrd_main.c can see it. ypxfrd_svc.c: ${RPCDIR}/ypxfrd.x rm -f ${.TARGET} - ${RPCGEN} -m ${RPCDIR}/ypxfrd.x | \ + ${RPCGEN} -m ${.ALLSRC} | \ sed s/"static int _rpcsvcstate"/"int _rpcsvcstate"/g > ${.TARGET} # ypxfrd_xdr.c: ${RPCDIR}/ypxfrd.x @@ -31,6 +31,6 @@ ypxfrd_svc.c: ${RPCDIR}/ypxfrd.x ypxfrd.h: ${RPCDIR}/ypxfrd.x rm -f ${.TARGET} - ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/ypxfrd.x + ${RPCGEN} -h -o ${.TARGET} ${.ALLSRC} .include From owner-svn-src-all@freebsd.org Wed Mar 1 04:23:54 2017 Return-Path: Delivered-To: svn-src-all@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 72E01CF0E01; Wed, 1 Mar 2017 04:23:54 +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 42966B1A; Wed, 1 Mar 2017 04:23:54 +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 v214NraU018898; Wed, 1 Mar 2017 04:23:53 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214Nr8L018897; Wed, 1 Mar 2017 04:23:53 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010423.v214Nr8L018897@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 04:23:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314463 - head/usr.sbin/tzsetup X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:23:54 -0000 Author: ngie Date: Wed Mar 1 04:23:53 2017 New Revision: 314463 URL: https://svnweb.freebsd.org/changeset/base/314463 Log: Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones This simplifies pathing in make/displayed output. MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/tzsetup/Makefile Modified: head/usr.sbin/tzsetup/Makefile ============================================================================== --- head/usr.sbin/tzsetup/Makefile Wed Mar 1 04:22:23 2017 (r314462) +++ head/usr.sbin/tzsetup/Makefile Wed Mar 1 04:23:53 2017 (r314463) @@ -9,7 +9,7 @@ CFLAGS+= -I. .if ${MK_DIALOG} != no WARNS?= 3 -CFLAGS+= -I${.CURDIR}/../../contrib/dialog -DHAVE_DIALOG +CFLAGS+= -I${SRCTOP}/contrib/dialog -DHAVE_DIALOG LIBADD= dialog ncursesw .endif From owner-svn-src-all@freebsd.org Wed Mar 1 04:24:26 2017 Return-Path: Delivered-To: svn-src-all@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 48CBCCF0E7B; Wed, 1 Mar 2017 04:24:26 +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 18784C86; Wed, 1 Mar 2017 04:24:26 +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 v214OPAl018961; Wed, 1 Mar 2017 04:24:25 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214OPdB018960; Wed, 1 Mar 2017 04:24:25 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010424.v214OPdB018960@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 04:24:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314464 - head/usr.sbin/yppush X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:24:26 -0000 Author: ngie Date: Wed Mar 1 04:24:24 2017 New Revision: 314464 URL: https://svnweb.freebsd.org/changeset/base/314464 Log: Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones This simplifies pathing in make/displayed output. MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/yppush/Makefile Modified: head/usr.sbin/yppush/Makefile ============================================================================== --- head/usr.sbin/yppush/Makefile Wed Mar 1 04:23:53 2017 (r314463) +++ head/usr.sbin/yppush/Makefile Wed Mar 1 04:24:24 2017 (r314464) @@ -1,8 +1,7 @@ # $FreeBSD$ -RPCDIR= ${.CURDIR}/../../include/rpcsvc -.PATH: ${RPCDIR} ${.CURDIR}/../../usr.sbin/ypserv \ - ${.CURDIR}/../../libexec/ypxfr +RPCDIR= ${SRCTOP}/include/rpcsvc +.PATH: ${RPCDIR} ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/libexec/ypxfr PROG= yppush MAN= yppush.8 @@ -10,7 +9,7 @@ SRCS= ypxfr_getmap.c yp_dblookup.c yp_er ${GENSRCS} GENSRCS=yp.h yp_clnt.c yppush_svc.c -CFLAGS+= -I. -I${.CURDIR}/../../libexec/ypxfr +CFLAGS+= -I. -I${SRCTOP}/libexec/ypxfr WARNS?= 2 From owner-svn-src-all@freebsd.org Wed Mar 1 04:24:31 2017 Return-Path: Delivered-To: svn-src-all@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 A008FCF0EA9; Wed, 1 Mar 2017 04:24:31 +0000 (UTC) (envelope-from mav@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 6DCB2CB2; Wed, 1 Mar 2017 04:24:31 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v214OUNZ019011; Wed, 1 Mar 2017 04:24:30 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214OU21019010; Wed, 1 Mar 2017 04:24:30 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201703010424.v214OU21019010@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Wed, 1 Mar 2017 04:24:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314465 - stable/11/sys/dev/iscsi X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:24:31 -0000 Author: mav Date: Wed Mar 1 04:24:30 2017 New Revision: 314465 URL: https://svnweb.freebsd.org/changeset/base/314465 Log: MFC r313779: Fix handling of negative sbspace() return values. I found that at least with Chelsio NICs TOE sockets quite often report negative sbspace() values. Using unsigned variable to store it resulted in attempts to aggregate too much data in one sosend() call, that caused errors and following connection termination. Modified: stable/11/sys/dev/iscsi/icl_soft.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/iscsi/icl_soft.c ============================================================================== --- stable/11/sys/dev/iscsi/icl_soft.c Wed Mar 1 04:24:24 2017 (r314464) +++ stable/11/sys/dev/iscsi/icl_soft.c Wed Mar 1 04:24:30 2017 (r314465) @@ -892,7 +892,7 @@ icl_conn_send_pdus(struct icl_conn *ic, { struct icl_pdu *request, *request2; struct socket *so; - size_t available, size, size2; + long available, size, size2; int coalesced, error; ICL_CONN_LOCK_ASSERT_NOT(ic); @@ -931,7 +931,7 @@ icl_conn_send_pdus(struct icl_conn *ic, if (available < size) { #if 1 ICL_DEBUG("no space to send; " - "have %zd, need %zd", + "have %ld, need %ld", available, size); #endif so->so_snd.sb_lowat = size; @@ -978,7 +978,7 @@ icl_conn_send_pdus(struct icl_conn *ic, } #if 0 if (coalesced > 1) { - ICL_DEBUG("coalesced %d PDUs into %zd bytes", + ICL_DEBUG("coalesced %d PDUs into %ld bytes", coalesced, size); } #endif From owner-svn-src-all@freebsd.org Wed Mar 1 04:24:58 2017 Return-Path: Delivered-To: svn-src-all@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 F3A78CF0F80; Wed, 1 Mar 2017 04:24:57 +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 C3367EEE; Wed, 1 Mar 2017 04:24:57 +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 v214Oufu019067; Wed, 1 Mar 2017 04:24:56 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214OuqM019066; Wed, 1 Mar 2017 04:24:56 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010424.v214OuqM019066@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 04:24:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314466 - head/usr.sbin/ypserv X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:24:58 -0000 Author: ngie Date: Wed Mar 1 04:24:56 2017 New Revision: 314466 URL: https://svnweb.freebsd.org/changeset/base/314466 Log: Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones This simplifies pathing in make/displayed output. MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/ypserv/Makefile Modified: head/usr.sbin/ypserv/Makefile ============================================================================== --- head/usr.sbin/ypserv/Makefile Wed Mar 1 04:24:30 2017 (r314465) +++ head/usr.sbin/ypserv/Makefile Wed Mar 1 04:24:56 2017 (r314466) @@ -2,9 +2,8 @@ .include -RPCDIR= ${.CURDIR}/../../include/rpcsvc -.PATH: ${RPCDIR} \ - ${.CURDIR}/common +RPCDIR= ${SRCTOP}/include/rpcsvc +.PATH: ${RPCDIR} ${.CURDIR}/common PROG= ypserv MAN= ypserv.8 ypinit.8 From owner-svn-src-all@freebsd.org Wed Mar 1 04:27:59 2017 Return-Path: Delivered-To: svn-src-all@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 73E1ACF2042; Wed, 1 Mar 2017 04:27:59 +0000 (UTC) (envelope-from imp@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 26F54F2; Wed, 1 Mar 2017 04:27:59 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v214Rwc2019208; Wed, 1 Mar 2017 04:27:58 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214RwnH019207; Wed, 1 Mar 2017 04:27:58 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201703010427.v214RwnH019207@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 1 Mar 2017 04:27:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314467 - head/sys/dev/usb/input X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:27:59 -0000 Author: imp Date: Wed Mar 1 04:27:58 2017 New Revision: 314467 URL: https://svnweb.freebsd.org/changeset/base/314467 Log: Make wsp process a single touchpad tap and interpret it as a left-click event. It can be disabled setting the new hw.usb.wsp.enable_single_tap_clicks sysctl to 0. Submitted by: K Staring Pull Request: https://github.com/freebsd/freebsd/pull/97 Modified: head/sys/dev/usb/input/wsp.c Modified: head/sys/dev/usb/input/wsp.c ============================================================================== --- head/sys/dev/usb/input/wsp.c Wed Mar 1 04:24:56 2017 (r314466) +++ head/sys/dev/usb/input/wsp.c Wed Mar 1 04:27:58 2017 (r314467) @@ -87,6 +87,7 @@ static struct wsp_tuning { int pressure_untouch_threshold; int pressure_tap_threshold; int scr_hor_threshold; + int enable_single_tap_clicks; } wsp_tuning = { @@ -96,6 +97,7 @@ static struct wsp_tuning { .pressure_untouch_threshold = 10, .pressure_tap_threshold = 120, .scr_hor_threshold = 20, + .enable_single_tap_clicks = 1, }; static void @@ -107,6 +109,7 @@ wsp_runing_rangecheck(struct wsp_tuning WSP_CLAMP(ptun->pressure_untouch_threshold, 1, 255); WSP_CLAMP(ptun->pressure_tap_threshold, 1, 255); WSP_CLAMP(ptun->scr_hor_threshold, 1, 255); + WSP_CLAMP(ptun->enable_single_tap_clicks, 0, 1); } SYSCTL_INT(_hw_usb_wsp, OID_AUTO, scale_factor, CTLFLAG_RWTUN, @@ -121,6 +124,8 @@ SYSCTL_INT(_hw_usb_wsp, OID_AUTO, pressu &wsp_tuning.pressure_tap_threshold, 0, "tap pressure threshold"); SYSCTL_INT(_hw_usb_wsp, OID_AUTO, scr_hor_threshold, CTLFLAG_RWTUN, &wsp_tuning.scr_hor_threshold, 0, "horizontal scrolling threshold"); +SYSCTL_INT(_hw_usb_wsp, OID_AUTO, enable_single_tap_clicks, CTLFLAG_RWTUN, + &wsp_tuning.enable_single_tap_clicks, 0, "enable single tap clicks"); /* * Some tables, structures, definitions and constant values for the @@ -966,7 +971,7 @@ wsp_intr_callback(struct usb_xfer *xfer, */ switch (sc->ntaps) { case 1: - if (!(params->caps & HAS_INTEGRATED_BUTTON)) { + if (!(params->caps & HAS_INTEGRATED_BUTTON) || tun.enable_single_tap_clicks) { wsp_add_to_queue(sc, 0, 0, 0, MOUSE_BUTTON1DOWN); DPRINTFN(WSP_LLEVEL_INFO, "LEFT CLICK!\n"); } From owner-svn-src-all@freebsd.org Wed Mar 1 04:35:23 2017 Return-Path: Delivered-To: svn-src-all@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 A129DCF226C; Wed, 1 Mar 2017 04:35:23 +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 4BD2F843; Wed, 1 Mar 2017 04:35:23 +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 v214ZMD5022973; Wed, 1 Mar 2017 04:35:22 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214ZMG2022970; Wed, 1 Mar 2017 04:35:22 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010435.v214ZMG2022970@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 04:35:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314468 - in head/usr.sbin/zic: . zdump zic X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:35:23 -0000 Author: ngie Date: Wed Mar 1 04:35:21 2017 New Revision: 314468 URL: https://svnweb.freebsd.org/changeset/base/314468 Log: Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones Also, use :H where possible/sensical to manipulate .CURDIR-relative paths This simplifies pathing in make/displayed output. MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/zic/Makefile.inc head/usr.sbin/zic/zdump/Makefile head/usr.sbin/zic/zic/Makefile Modified: head/usr.sbin/zic/Makefile.inc ============================================================================== --- head/usr.sbin/zic/Makefile.inc Wed Mar 1 04:27:58 2017 (r314467) +++ head/usr.sbin/zic/Makefile.inc Wed Mar 1 04:35:21 2017 (r314468) @@ -1,3 +1,3 @@ # $FreeBSD$ -.include "${.CURDIR}/../../Makefile.inc" +.include "${SRCTOP}/usr.sbin/Makefile.inc" Modified: head/usr.sbin/zic/zdump/Makefile ============================================================================== --- head/usr.sbin/zic/zdump/Makefile Wed Mar 1 04:27:58 2017 (r314467) +++ head/usr.sbin/zic/zdump/Makefile Wed Mar 1 04:35:21 2017 (r314468) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/tzcode/zic +.PATH: ${SRCTOP}/contrib/tzcode/zic PROG= zdump MAN= zdump.8 @@ -8,7 +8,7 @@ SRCS= zdump.c ialloc.c scheck.c CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"${SHAREDIR}/zoneinfo\" -Demkdir=mkdir -CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime +CFLAGS+= -I${.CURDIR:H} -I${SRCTOP}/contrib/tzcode/stdtime WARNS?= 2 Modified: head/usr.sbin/zic/zic/Makefile ============================================================================== --- head/usr.sbin/zic/zic/Makefile Wed Mar 1 04:27:58 2017 (r314467) +++ head/usr.sbin/zic/zic/Makefile Wed Mar 1 04:35:21 2017 (r314468) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/tzcode/zic +.PATH: ${SRCTOP}/contrib/tzcode/zic PROG= zic MAN= zic.8 @@ -9,7 +9,7 @@ SRCS= zic.c ialloc.c scheck.c CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"${SHAREDIR}/zoneinfo\" -Demkdir=mkdir CFLAGS+= -DHAVE_STRERROR -DHAVE_UNISTD_H -CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime +CFLAGS+= -I${.CURDIR:H} -I${SRCTOP}/contrib/tzcode/stdtime WARNS?= 2 From owner-svn-src-all@freebsd.org Wed Mar 1 04:40:58 2017 Return-Path: Delivered-To: svn-src-all@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 5BE79CF2378; Wed, 1 Mar 2017 04:40:58 +0000 (UTC) (envelope-from imp@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 28F2DA66; Wed, 1 Mar 2017 04:40:58 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v214evEg023204; Wed, 1 Mar 2017 04:40:57 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214ev08023203; Wed, 1 Mar 2017 04:40:57 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201703010440.v214ev08023203@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 1 Mar 2017 04:40:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314469 - head/sys/dev/twa X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:40:58 -0000 Author: imp Date: Wed Mar 1 04:40:57 2017 New Revision: 314469 URL: https://svnweb.freebsd.org/changeset/base/314469 Log: Update tw_cl_share.h to allow 255 LUNs TW_CL_MAX_NUM_LUNS should not be 16 but I presume 255. I have a 3ware controller with more than 16 volumes (LUN's) and otherwise all LUN's above the 16'th are not working. Submitted by: jcatrysse Pull Request: https://github.com/freebsd/freebsd/pull/100 Modified: head/sys/dev/twa/tw_cl_share.h Modified: head/sys/dev/twa/tw_cl_share.h ============================================================================== --- head/sys/dev/twa/tw_cl_share.h Wed Mar 1 04:35:21 2017 (r314468) +++ head/sys/dev/twa/tw_cl_share.h Wed Mar 1 04:40:57 2017 (r314469) @@ -68,7 +68,7 @@ #define TW_CL_MAX_NUM_UNITS 32 /* max # of units we support */ #endif /* TW_OSL_ENCLOSURE_SUPPORT */ -#define TW_CL_MAX_NUM_LUNS 16 /* max # of LUN's we support */ +#define TW_CL_MAX_NUM_LUNS 255 /* max # of LUN's we support */ #define TW_CL_MAX_IO_SIZE 0x20000 /* 128K */ /* From owner-svn-src-all@freebsd.org Wed Mar 1 04:42:01 2017 Return-Path: Delivered-To: svn-src-all@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 5EB01CF2505; Wed, 1 Mar 2017 04:42:01 +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 1FE85C71; Wed, 1 Mar 2017 04:42:01 +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 v214g0iG026725; Wed, 1 Mar 2017 04:42:00 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214fxer026718; Wed, 1 Mar 2017 04:41:59 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010441.v214fxer026718@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 04:41:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314470 - in head/usr.sbin/unbound: anchor checkconf control daemon X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:42:01 -0000 Author: ngie Date: Wed Mar 1 04:41:59 2017 New Revision: 314470 URL: https://svnweb.freebsd.org/changeset/base/314470 Log: Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones This simplifies pathing in make/displayed output. MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/unbound/anchor/Makefile head/usr.sbin/unbound/checkconf/Makefile head/usr.sbin/unbound/control/Makefile head/usr.sbin/unbound/daemon/Makefile Modified: head/usr.sbin/unbound/anchor/Makefile ============================================================================== --- head/usr.sbin/unbound/anchor/Makefile Wed Mar 1 04:40:57 2017 (r314469) +++ head/usr.sbin/unbound/anchor/Makefile Wed Mar 1 04:41:59 2017 (r314470) @@ -1,9 +1,9 @@ # $FreeBSD$ # Vendor sources and generated files -LDNSDIR= ${.CURDIR}/../../../contrib/ldns -UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound -EXPATDIR= ${.CURDIR}/../../../contrib/expat +LDNSDIR= ${SRCTOP}/contrib/ldns +UNBOUNDDIR= ${SRCTOP}/contrib/unbound +EXPATDIR= ${SRCTOP}/contrib/expat .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/doc Modified: head/usr.sbin/unbound/checkconf/Makefile ============================================================================== --- head/usr.sbin/unbound/checkconf/Makefile Wed Mar 1 04:40:57 2017 (r314469) +++ head/usr.sbin/unbound/checkconf/Makefile Wed Mar 1 04:41:59 2017 (r314470) @@ -1,8 +1,8 @@ # $FreeBSD$ # Vendor sources and generated files -LDNSDIR= ${.CURDIR}/../../../contrib/ldns -UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound +LDNSDIR= ${SRCTOP}/contrib/ldns +UNBOUNDDIR= ${SRCTOP}/contrib/unbound .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc Modified: head/usr.sbin/unbound/control/Makefile ============================================================================== --- head/usr.sbin/unbound/control/Makefile Wed Mar 1 04:40:57 2017 (r314469) +++ head/usr.sbin/unbound/control/Makefile Wed Mar 1 04:41:59 2017 (r314470) @@ -1,8 +1,8 @@ # $FreeBSD$ # Vendor sources and generated files -LDNSDIR= ${.CURDIR}/../../../contrib/ldns -UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound +LDNSDIR= ${SRCTOP}/contrib/ldns +UNBOUNDDIR= ${SRCTOP}/contrib/unbound .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc Modified: head/usr.sbin/unbound/daemon/Makefile ============================================================================== --- head/usr.sbin/unbound/daemon/Makefile Wed Mar 1 04:40:57 2017 (r314469) +++ head/usr.sbin/unbound/daemon/Makefile Wed Mar 1 04:41:59 2017 (r314470) @@ -1,8 +1,8 @@ # $FreeBSD$ # Vendor sources and generated files -LDNSDIR= ${.CURDIR}/../../../contrib/ldns -UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound +LDNSDIR= ${SRCTOP}/contrib/ldns +UNBOUNDDIR= ${SRCTOP}/contrib/unbound .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/daemon ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc From owner-svn-src-all@freebsd.org Wed Mar 1 04:47:23 2017 Return-Path: Delivered-To: svn-src-all@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 D478FCF259D; Wed, 1 Mar 2017 04:47:23 +0000 (UTC) (envelope-from imp@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 967DDF78; Wed, 1 Mar 2017 04:47:23 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v214lMVG026958; Wed, 1 Mar 2017 04:47:22 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214lM4c026957; Wed, 1 Mar 2017 04:47:22 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201703010447.v214lM4c026957@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 1 Mar 2017 04:47:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314471 - head/sys/net X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:47:23 -0000 Author: imp Date: Wed Mar 1 04:47:22 2017 New Revision: 314471 URL: https://svnweb.freebsd.org/changeset/base/314471 Log: Fix VNET - DAD detected duplicate IPv6 address Assign a hopefully unique, locally administered etheraddr. - for epairNa & epairNb Submitted by: Catalin Pull Request: https://github.com/freebsd/freebsd/pull/92 Modified: head/sys/net/if_epair.c Modified: head/sys/net/if_epair.c ============================================================================== --- head/sys/net/if_epair.c Wed Mar 1 04:41:59 2017 (r314470) +++ head/sys/net/if_epair.c Wed Mar 1 04:47:22 2017 (r314471) @@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -724,6 +725,7 @@ epair_clone_create(struct if_clone *ifc, ifp = scb->ifp; /* Assign a hopefully unique, locally administered etheraddr. */ eaddr[0] = 0x02; + eaddr[1] = arc4random() & 0xff; eaddr[3] = (ifp->if_index >> 8) & 0xff; eaddr[4] = ifp->if_index & 0xff; eaddr[5] = 0x0b; From owner-svn-src-all@freebsd.org Wed Mar 1 04:54:10 2017 Return-Path: Delivered-To: svn-src-all@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 0663ACF27AF; Wed, 1 Mar 2017 04:54:10 +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 BD09D65F; Wed, 1 Mar 2017 04:54:09 +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 v214s8hf030673; Wed, 1 Mar 2017 04:54:08 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214s7ti030654; Wed, 1 Mar 2017 04:54:07 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010454.v214s7ti030654@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 04:54:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314472 - in head/usr.sbin/ntp: doc doc/drivers doc/drivers/icons doc/drivers/scripts doc/hints doc/icons doc/pic doc/scripts libntp libntpevent libopts libparse ntp-keygen ntpd ntpdate... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:54:10 -0000 Author: ngie Date: Wed Mar 1 04:54:06 2017 New Revision: 314472 URL: https://svnweb.freebsd.org/changeset/base/314472 Log: Simplify/improve idioms in usr.sbin/ntp Makefiles - Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones. This simplifies pathing in make/displayed output. - Also, use :H where possible/sensical to manipulate .CURDIR-relative paths - Remove superfluous bsd.own.mk .includes which are already handled via src.opts.mk .includes MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/ntp/doc/Makefile head/usr.sbin/ntp/doc/drivers/Makefile head/usr.sbin/ntp/doc/drivers/icons/Makefile head/usr.sbin/ntp/doc/drivers/scripts/Makefile head/usr.sbin/ntp/doc/hints/Makefile head/usr.sbin/ntp/doc/icons/Makefile head/usr.sbin/ntp/doc/pic/Makefile head/usr.sbin/ntp/doc/scripts/Makefile head/usr.sbin/ntp/libntp/Makefile head/usr.sbin/ntp/libntpevent/Makefile head/usr.sbin/ntp/libopts/Makefile head/usr.sbin/ntp/libparse/Makefile head/usr.sbin/ntp/ntp-keygen/Makefile head/usr.sbin/ntp/ntpd/Makefile head/usr.sbin/ntp/ntpdate/Makefile head/usr.sbin/ntp/ntpdc/Makefile head/usr.sbin/ntp/ntpq/Makefile head/usr.sbin/ntp/ntptime/Makefile head/usr.sbin/ntp/sntp/Makefile Modified: head/usr.sbin/ntp/doc/Makefile ============================================================================== --- head/usr.sbin/ntp/doc/Makefile Wed Mar 1 04:47:22 2017 (r314471) +++ head/usr.sbin/ntp/doc/Makefile Wed Mar 1 04:54:06 2017 (r314472) @@ -25,10 +25,9 @@ FILES= access.html accopt.html assoc.htm MAN= ntp.conf.5 ntp.keys.5 MAN+= ntp-keygen.8 ntpd.8 ntpdate.8 ntpdc.8 ntpq.8 ntptime.8 sntp.8 -.PATH: ${.CURDIR}/../../../contrib/ntp/html \ - ${.CURDIR}/../../../contrib/ntp/util \ - ${.CURDIR}/../../../contrib/ntp/util \ - ${.CURDIR}/../../../contrib/ntp/ntpd \ - ${.CURDIR}/../../../contrib/ntp/ntpsnmpd +.PATH: ${SRCTOP}/contrib/ntp/html \ + ${SRCTOP}/contrib/ntp/util \ + ${SRCTOP}/contrib/ntp/ntpd \ + ${SRCTOP}/contrib/ntp/ntpsnmpd .include Modified: head/usr.sbin/ntp/doc/drivers/Makefile ============================================================================== --- head/usr.sbin/ntp/doc/drivers/Makefile Wed Mar 1 04:47:22 2017 (r314471) +++ head/usr.sbin/ntp/doc/drivers/Makefile Wed Mar 1 04:54:06 2017 (r314472) @@ -16,6 +16,6 @@ FILES= driver1.html driver10.html driver driver9.html mx4200data.html oncore-shmem.html tf582_4.html .endif -.PATH: ${.CURDIR}/../../../../contrib/ntp/html/drivers +.PATH: ${SRCTOP}/contrib/ntp/html/drivers .include Modified: head/usr.sbin/ntp/doc/drivers/icons/Makefile ============================================================================== --- head/usr.sbin/ntp/doc/drivers/icons/Makefile Wed Mar 1 04:47:22 2017 (r314471) +++ head/usr.sbin/ntp/doc/drivers/icons/Makefile Wed Mar 1 04:54:06 2017 (r314472) @@ -8,6 +8,6 @@ FILESDIR= ${SHAREDIR}/doc/ntp/drivers/ic FILES= home.gif mail2.gif .endif -.PATH: ${.CURDIR}/../../../../../contrib/ntp/html/drivers/icons +.PATH: ${SRCTOP}/contrib/ntp/html/drivers/icons .include Modified: head/usr.sbin/ntp/doc/drivers/scripts/Makefile ============================================================================== --- head/usr.sbin/ntp/doc/drivers/scripts/Makefile Wed Mar 1 04:47:22 2017 (r314471) +++ head/usr.sbin/ntp/doc/drivers/scripts/Makefile Wed Mar 1 04:54:06 2017 (r314472) @@ -8,6 +8,6 @@ FILESDIR= ${SHAREDIR}/doc/ntp/drivers/sc FILES= footer.txt style.css .endif -.PATH: ${.CURDIR}/../../../../../contrib/ntp/html/drivers/scripts +.PATH: ${SRCTOP}/contrib/ntp/html/drivers/scripts .include Modified: head/usr.sbin/ntp/doc/hints/Makefile ============================================================================== --- head/usr.sbin/ntp/doc/hints/Makefile Wed Mar 1 04:47:22 2017 (r314471) +++ head/usr.sbin/ntp/doc/hints/Makefile Wed Mar 1 04:54:06 2017 (r314472) @@ -12,6 +12,6 @@ FILES= a-ux aix bsdi changes decosf1 dec sun4 svr4-dell svr4_package todo vxworks.html winnt.html .endif -.PATH: ${.CURDIR}/../../../../contrib/ntp/html/hints +.PATH: ${SRCTOP}/contrib/ntp/html/hints .include Modified: head/usr.sbin/ntp/doc/icons/Makefile ============================================================================== --- head/usr.sbin/ntp/doc/icons/Makefile Wed Mar 1 04:47:22 2017 (r314471) +++ head/usr.sbin/ntp/doc/icons/Makefile Wed Mar 1 04:54:06 2017 (r314472) @@ -8,6 +8,6 @@ FILESDIR= ${SHAREDIR}/doc/ntp/icons FILES= home.gif mail2.gif sitemap.png .endif -.PATH: ${.CURDIR}/../../../../contrib/ntp/html/icons +.PATH: ${SRCTOP}/contrib/ntp/html/icons .include Modified: head/usr.sbin/ntp/doc/pic/Makefile ============================================================================== --- head/usr.sbin/ntp/doc/pic/Makefile Wed Mar 1 04:47:22 2017 (r314471) +++ head/usr.sbin/ntp/doc/pic/Makefile Wed Mar 1 04:54:06 2017 (r314472) @@ -22,6 +22,6 @@ FILES= 9400n.jpg alice11.gif alice13.gif wingdorothy.gif .endif -.PATH: ${.CURDIR}/../../../../contrib/ntp/html/pic +.PATH: ${SRCTOP}/contrib/ntp/html/pic .include Modified: head/usr.sbin/ntp/doc/scripts/Makefile ============================================================================== --- head/usr.sbin/ntp/doc/scripts/Makefile Wed Mar 1 04:47:22 2017 (r314471) +++ head/usr.sbin/ntp/doc/scripts/Makefile Wed Mar 1 04:54:06 2017 (r314472) @@ -10,6 +10,6 @@ FILES= accopt.txt audio.txt authopt.txt misc.txt miscopt.txt monopt.txt refclock.txt special.txt style.css .endif -.PATH: ${.CURDIR}/../../../../contrib/ntp/html/scripts +.PATH: ${SRCTOP}/contrib/ntp/html/scripts .include Modified: head/usr.sbin/ntp/libntp/Makefile ============================================================================== --- head/usr.sbin/ntp/libntp/Makefile Wed Mar 1 04:47:22 2017 (r314471) +++ head/usr.sbin/ntp/libntp/Makefile Wed Mar 1 04:54:06 2017 (r314472) @@ -1,10 +1,10 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/ntp/libntp \ - ${.CURDIR}/../../../contrib/ntp/lib/isc \ - ${.CURDIR}/../../../contrib/ntp/lib/isc/nls \ - ${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads \ - ${.CURDIR}/../../../contrib/ntp/lib/isc/unix \ +.PATH: ${SRCTOP}/contrib/ntp/libntp \ + ${SRCTOP}/contrib/ntp/lib/isc \ + ${SRCTOP}/contrib/ntp/lib/isc/nls \ + ${SRCTOP}/contrib/ntp/lib/isc/pthreads \ + ${SRCTOP}/contrib/ntp/lib/isc/unix \ LIB= ntp INTERNALLIB= Modified: head/usr.sbin/ntp/libntpevent/Makefile ============================================================================== --- head/usr.sbin/ntp/libntpevent/Makefile Wed Mar 1 04:47:22 2017 (r314471) +++ head/usr.sbin/ntp/libntpevent/Makefile Wed Mar 1 04:54:06 2017 (r314472) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/ntp/sntp/libevent +.PATH: ${SRCTOP}/contrib/ntp/sntp/libevent LIB= ntpevent INTERNALLIB= @@ -25,8 +25,8 @@ NTP_ATOMIC=sparc64 NTP_ATOMIC=noatomic .endif -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \ - -I${.CURDIR}/../../../contrib/ntp/sntp/libevent/include \ +CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ + -I${SRCTOP}/contrib/ntp/sntp/libevent/include \ -I${.CURDIR}/ CFLAGS+= -DHAVE_BSD_NICE -DHAVE_STDINT_H Modified: head/usr.sbin/ntp/libopts/Makefile ============================================================================== --- head/usr.sbin/ntp/libopts/Makefile Wed Mar 1 04:47:22 2017 (r314471) +++ head/usr.sbin/ntp/libopts/Makefile Wed Mar 1 04:54:06 2017 (r314472) @@ -1,14 +1,14 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/ntp/sntp/libopts +.PATH: ${SRCTOP}/contrib/ntp/sntp/libopts LIB= opts INTERNALLIB= SRCS= libopts.c -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \ - -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \ - -I${.CURDIR}/../ +CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ + -I${SRCTOP}/contrib/ntp/sntp/libopts \ + -I${.CURDIR:H} .include Modified: head/usr.sbin/ntp/libparse/Makefile ============================================================================== --- head/usr.sbin/ntp/libparse/Makefile Wed Mar 1 04:47:22 2017 (r314471) +++ head/usr.sbin/ntp/libparse/Makefile Wed Mar 1 04:54:06 2017 (r314472) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/ntp/libparse +.PATH: ${SRCTOP}/contrib/ntp/libparse LIB= parse INTERNALLIB= @@ -12,8 +12,8 @@ SRCS= binio.c clk_computime.c clk_dcf700 info_trimble.c mfp_mul.c parse.c parse_conf.c \ trim_info.c -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/include -I${.CURDIR}/../ +CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/include -I${.CURDIR:H} .include Modified: head/usr.sbin/ntp/ntp-keygen/Makefile ============================================================================== --- head/usr.sbin/ntp/ntp-keygen/Makefile Wed Mar 1 04:47:22 2017 (r314471) +++ head/usr.sbin/ntp/ntp-keygen/Makefile Wed Mar 1 04:54:06 2017 (r314472) @@ -4,21 +4,21 @@ MAN= .include -.PATH: ${.CURDIR}/../../../contrib/ntp/util \ - ${.CURDIR}/../../../contrib/ntp/ntpd +.PATH: ${SRCTOP}/contrib/ntp/util \ + ${SRCTOP}/contrib/ntp/ntpd PROG= ntp-keygen SRCS= ntp-keygen.c ntp-keygen-opts.c -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \ - -I${.CURDIR}/../../../contrib/ntp/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/${NTP_ATOMIC}/include \ - -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \ - -I${.CURDIR}/../../../lib/libc/${MACHINE_ARCH} \ - -I${.CURDIR}/../ +CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ + -I${SRCTOP}/contrib/ntp/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/${NTP_ATOMIC}/include \ + -I${SRCTOP}/contrib/ntp/sntp/libopts \ + -I${.CURDIR}/lib/libc/${MACHINE_ARCH} \ + -I${.CURDIR:H} LIBADD+= ntp opts pthread Modified: head/usr.sbin/ntp/ntpd/Makefile ============================================================================== --- head/usr.sbin/ntp/ntpd/Makefile Wed Mar 1 04:47:22 2017 (r314471) +++ head/usr.sbin/ntp/ntpd/Makefile Wed Mar 1 04:54:06 2017 (r314472) @@ -4,7 +4,7 @@ MAN= .include -.PATH: ${.CURDIR}/../../../contrib/ntp/ntpd \ +.PATH: ${SRCTOP}/contrib/ntp/ntpd \ ${.OBJDIR} PROG= ntpd @@ -27,13 +27,13 @@ SRCS= cmd_args.c ntp_config.c ntp_contro refclock_tt560.c refclock_ulink.c refclock_wwv.c refclock_wwvb.c \ refclock_zyfer.c version.c -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/ntpd \ - -I${.CURDIR}/../../../contrib/ntp/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \ - -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \ - -I${.CURDIR}/../ \ +CFLAGS+= -I${SRCTOP}/contrib/ntp/ntpd \ + -I${SRCTOP}/contrib/ntp/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \ + -I${SRCTOP}/contrib/ntp/sntp/libopts \ + -I${.CURDIR:H} \ -I${.CURDIR} LIBADD= parse ntp m opts pthread @@ -46,7 +46,7 @@ LIBADD+= md CLEANFILES+= .version version.c -version.c: - sh -e ${.CURDIR}/../scripts/mkver ntpd +version.c: + sh -e ${.CURDIR:H}/scripts/mkver ntpd .include Modified: head/usr.sbin/ntp/ntpdate/Makefile ============================================================================== --- head/usr.sbin/ntp/ntpdate/Makefile Wed Mar 1 04:47:22 2017 (r314471) +++ head/usr.sbin/ntp/ntpdate/Makefile Wed Mar 1 04:54:06 2017 (r314472) @@ -2,17 +2,17 @@ .include -.PATH: ${.CURDIR}/../../../contrib/ntp/ntpdate +.PATH: ${SRCTOP}/contrib/ntp/ntpdate PROG= ntpdate MAN= SRCS= ntpdate.c version.c -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/include/ \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include/ \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \ - -I${.CURDIR}/../ +CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/include/ \ + -I${SRCTOP}/contrib/ntp/lib/isc/unix/include/ \ + -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \ + -I${.CURDIR:H} LIBADD= ntp m pthread Modified: head/usr.sbin/ntp/ntpdc/Makefile ============================================================================== --- head/usr.sbin/ntp/ntpdc/Makefile Wed Mar 1 04:47:22 2017 (r314471) +++ head/usr.sbin/ntp/ntpdc/Makefile Wed Mar 1 04:54:06 2017 (r314472) @@ -3,20 +3,19 @@ MAN= .include -.include -.PATH: ${.CURDIR}/../../../contrib/ntp/ntpdc +.PATH: ${SRCTOP}/contrib/ntp/ntpdc PROG= ntpdc SRCS= ntpdc.c ntpdc_ops.c ntpdc-opts.c version.c -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \ - -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \ - -I${.CURDIR}/../../../lib/libc/${MACHINE_ARCH} \ - -I${.CURDIR}/../ -I${.CURDIR} +CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \ + -I${SRCTOP}/contrib/ntp/sntp/libopts \ + -I${.CURDIR}/lib/libc/${MACHINE_ARCH} \ + -I${.CURDIR:H} -I${.CURDIR} LIBADD= edit ntp m opts pthread CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \ Modified: head/usr.sbin/ntp/ntpq/Makefile ============================================================================== --- head/usr.sbin/ntp/ntpq/Makefile Wed Mar 1 04:47:22 2017 (r314471) +++ head/usr.sbin/ntp/ntpq/Makefile Wed Mar 1 04:54:06 2017 (r314472) @@ -3,23 +3,22 @@ MAN= .include -.include -.PATH: ${.CURDIR}/../../../contrib/ntp/ntpq +.PATH: ${SRCTOP}/contrib/ntp/ntpq BINDIR= /usr/bin PROG= ntpq SRCS= ntpq.c ntpq-opts.c ntpq-subs.c version.c -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \ - -I${.CURDIR}/../../../contrib/ntp/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/${NTP_ATOMIC}/include \ - -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \ - -I${.CURDIR}/../ +CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ + -I${SRCTOP}/contrib/ntp/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/${NTP_ATOMIC}/include \ + -I${SRCTOP}/contrib/ntp/sntp/libopts \ + -I${.CURDIR:H} LIBADD+= edit ntp opts m pthread Modified: head/usr.sbin/ntp/ntptime/Makefile ============================================================================== --- head/usr.sbin/ntp/ntptime/Makefile Wed Mar 1 04:47:22 2017 (r314471) +++ head/usr.sbin/ntp/ntptime/Makefile Wed Mar 1 04:54:06 2017 (r314472) @@ -1,15 +1,15 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/ntp/util +.PATH: ${SRCTOP}/contrib/ntp/util PROG= ntptime MAN= -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/include/ \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include/ \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \ - -I${.CURDIR}/../ +CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/include/ \ + -I${SRCTOP}/contrib/ntp/lib/isc/unix/include/ \ + -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \ + -I${.CURDIR:H} LIBADD= ntp pthread Modified: head/usr.sbin/ntp/sntp/Makefile ============================================================================== --- head/usr.sbin/ntp/sntp/Makefile Wed Mar 1 04:47:22 2017 (r314471) +++ head/usr.sbin/ntp/sntp/Makefile Wed Mar 1 04:54:06 2017 (r314472) @@ -2,23 +2,23 @@ .include -.PATH: ${.CURDIR}/../../../contrib/ntp/sntp +.PATH: ${SRCTOP}/contrib/ntp/sntp PROG= sntp MK_MAN= no SRCS= crypto.c kod_management.c log.c main.c networking.c \ sntp-opts.c sntp.c utilities.c -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \ - -I${.CURDIR}/../../../contrib/ntp/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \ - -I${.CURDIR}/../../../contrib/ntp/sntp \ - -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \ - -I${.CURDIR}/../../../contrib/ntp/sntp/libevent/include \ - -I${.CURDIR}/../libntpevent \ - -I${.CURDIR}/../ +CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ + -I${SRCTOP}/contrib/ntp/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \ + -I${SRCTOP}/contrib/ntp/sntp \ + -I${SRCTOP}/contrib/ntp/sntp/libopts \ + -I${SRCTOP}/contrib/ntp/sntp/libevent/include \ + -I${.CURDIR:H}/libntpevent \ + -I${.CURDIR:H} LIBADD= m opts ntp ntpevent pthread From owner-svn-src-all@freebsd.org Wed Mar 1 05:05:12 2017 Return-Path: Delivered-To: svn-src-all@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 CEC22CF207D; Wed, 1 Mar 2017 05:05:12 +0000 (UTC) (envelope-from imp@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 0D643247D; Wed, 1 Mar 2017 05:05:06 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21556Cs034585; Wed, 1 Mar 2017 05:05:06 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21556lZ034584; Wed, 1 Mar 2017 05:05:06 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201703010505.v21556lZ034584@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 1 Mar 2017 05:05:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314473 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 05:05:12 -0000 Author: imp Date: Wed Mar 1 05:05:05 2017 New Revision: 314473 URL: https://svnweb.freebsd.org/changeset/base/314473 Log: Create README.md file for viewing on github. This is a lightly edited README using github's MARKDOWN. Submitted by: Johan Pull Request: https://github.com/freebsd/freebsd/pull/56 Added: head/README.md (contents, props changed) Added: head/README.md ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/README.md Wed Mar 1 05:05:05 2017 (r314473) @@ -0,0 +1,86 @@ +FreeBSD Source: +--------------- +This is the top level of the FreeBSD source directory. This file +was last revised on: +$FreeBSD$ + +For copyright information, please see the file COPYRIGHT in this +directory (additional copyright information also exists for some +sources in this tree - please see the specific source directories for +more information). + +The Makefile in this directory supports a number of targets for +building components (or all) of the FreeBSD source tree. See build(7) +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html +for more information, including setting make(1) variables. + +The `buildkernel` and `installkernel` targets build and install +the kernel and the modules (see below). Please see the top of +the Makefile in this directory for more information on the +standard build targets and compile-time flags. + +Building a kernel is a somewhat more involved process. See build(7), config(8), +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html +for more information. + +Note: If you want to build and install the kernel with the +`buildkernel` and `installkernel` targets, you might need to build +world before. More information is available in the handbook. + +The kernel configuration files reside in the `sys//conf` +sub-directory. GENERIC is the default configuration used in release builds. +NOTES contains entries and documentation for all possible +devices, not just those commonly used. + + +Source Roadmap: +--------------- +``` +bin System/user commands. + +cddl Various commands and libraries under the Common Development + and Distribution License. + +contrib Packages contributed by 3rd parties. + +crypto Cryptography stuff (see crypto/README). + +etc Template files for /etc. + +gnu Various commands and libraries under the GNU Public License. + Please see gnu/COPYING* for more information. + +include System include files. + +kerberos5 Kerberos5 (Heimdal) package. + +lib System libraries. + +libexec System daemons. + +release Release building Makefile & associated tools. + +rescue Build system for statically linked /rescue utilities. + +sbin System commands. + +secure Cryptographic libraries and commands. + +share Shared resources. + +sys Kernel sources. + +tests Regression tests which can be run by Kyua. See tests/README + for additional information. + +tools Utilities for regression testing and miscellaneous tasks. + +usr.bin User commands. + +usr.sbin System administration commands. +``` + +For information on synchronizing your source tree with one or more of +the FreeBSD Project's development branches, please see: + + http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/synching.html From owner-svn-src-all@freebsd.org Wed Mar 1 05:06:24 2017 Return-Path: Delivered-To: svn-src-all@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 194FECF290F; Wed, 1 Mar 2017 05:06:24 +0000 (UTC) (envelope-from mjg@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 3EAC5652EE; Wed, 1 Mar 2017 05:06:23 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2156Miq034674; Wed, 1 Mar 2017 05:06:22 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2156MNW034671; Wed, 1 Mar 2017 05:06:22 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201703010506.v2156MNW034671@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Wed, 1 Mar 2017 05:06:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314474 - in head/sys: kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 05:06:24 -0000 Author: mjg Date: Wed Mar 1 05:06:21 2017 New Revision: 314474 URL: https://svnweb.freebsd.org/changeset/base/314474 Log: locks: ensure proper barriers are used with atomic ops when necessary Unclear how, but the locking routine for mutexes was using the *release* barrier instead of acquire. This must have been either a copy-pasto or bad completion. Going through other uses of atomics shows no barriers in: - upgrade routines (addressed in this patch) - sections protected with turnstile locks - this should be fine as necessary barriers are in the worst case provided by turnstile unlock I would like to thank Mark Millard and andreast@ for reporting the problem and testing previous patches before the issue got identified. ps. .-'---`-. ,' `. | \ | \ \ _ \ ,\ _ ,'-,/-)\ ( * \ \,' ,' ,'-) `._,) -',-') \/ ''/ ) / / / ,'-' Hardware provided by: IBM LTC Modified: head/sys/kern/kern_rwlock.c head/sys/kern/kern_sx.c head/sys/sys/mutex.h Modified: head/sys/kern/kern_rwlock.c ============================================================================== --- head/sys/kern/kern_rwlock.c Wed Mar 1 05:05:05 2017 (r314473) +++ head/sys/kern/kern_rwlock.c Wed Mar 1 05:06:21 2017 (r314474) @@ -1151,7 +1151,7 @@ __rw_try_upgrade(volatile uintptr_t *c, if (RW_READERS(v) > 1) break; if (!(v & RW_LOCK_WAITERS)) { - success = atomic_cmpset_ptr(&rw->rw_lock, v, tid); + success = atomic_cmpset_acq_ptr(&rw->rw_lock, v, tid); if (!success) continue; break; Modified: head/sys/kern/kern_sx.c ============================================================================== --- head/sys/kern/kern_sx.c Wed Mar 1 05:05:05 2017 (r314473) +++ head/sys/kern/kern_sx.c Wed Mar 1 05:06:21 2017 (r314474) @@ -410,7 +410,7 @@ sx_try_upgrade_(struct sx *sx, const cha * we will wake up the exclusive waiters when we drop the lock. */ x = sx->sx_lock & SX_LOCK_EXCLUSIVE_WAITERS; - success = atomic_cmpset_ptr(&sx->sx_lock, SX_SHARERS_LOCK(1) | x, + success = atomic_cmpset_acq_ptr(&sx->sx_lock, SX_SHARERS_LOCK(1) | x, (uintptr_t)curthread | x); LOCK_LOG_TRY("XUPGRADE", &sx->lock_object, 0, success, file, line); if (success) { Modified: head/sys/sys/mutex.h ============================================================================== --- head/sys/sys/mutex.h Wed Mar 1 05:05:05 2017 (r314473) +++ head/sys/sys/mutex.h Wed Mar 1 05:06:21 2017 (r314474) @@ -185,7 +185,7 @@ void thread_lock_flags_(struct thread *, atomic_cmpset_acq_ptr(&(mp)->mtx_lock, MTX_UNOWNED, (tid)) #define _mtx_obtain_lock_fetch(mp, vp, tid) \ - atomic_fcmpset_rel_ptr(&(mp)->mtx_lock, vp, (tid)) + atomic_fcmpset_acq_ptr(&(mp)->mtx_lock, vp, (tid)) /* Try to release mtx_lock if it is unrecursed and uncontested. */ #define _mtx_release_lock(mp, tid) \ From owner-svn-src-all@freebsd.org Wed Mar 1 05:13:10 2017 Return-Path: Delivered-To: svn-src-all@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 E214ECF3E48; Wed, 1 Mar 2017 05:13:10 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg0-x244.google.com (mail-pg0-x244.google.com [IPv6:2607:f8b0:400e:c05::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AF64D655AC; Wed, 1 Mar 2017 05:13:10 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg0-x244.google.com with SMTP id 25so4522756pgy.3; Tue, 28 Feb 2017 21:13:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:mime-version:from:in-reply-to:date:cc:message-id:references :to; bh=tGY6z9G7Qw2fxu61GWKSujKbPjShKv6FoNIU0gqSlXI=; b=XcBNa0e+mmv5hm+33BIgBJSWOpS1Uy39kfZ4ltt67CijCc6rmdJxRvuUOdAVXiNJZ3 XUZrqNDVZ5KqCTit0SnJ7goDX+pwofl/VseC+nuGCQLpjtC0tlS8+xBHXQI4WTYkliSa diP/7Qvdnz8PNAFtKqfszmroeea9y4ej9qNhZ7lutaW/tQ49UQoIEkxEBV+H2wcMNuQz Ox0YM6BvcFK3GafWdSLaUqUVTiSjNjVweFHSTXsQXUXz1d2ptVNnI0zPoXBi57+D8KhG QwS8oz9M/b9UmSDA++FNG8HDx9YDm7Vd5RmRlrSUvkmjpnNVOrgiQ6yxeC95PvjDj4vy sJcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:mime-version:from:in-reply-to:date:cc :message-id:references:to; bh=tGY6z9G7Qw2fxu61GWKSujKbPjShKv6FoNIU0gqSlXI=; b=MkLB6TzkTydBGz+gnGOiCjurkP36SzpHzNN+bFOjuJ7a18NSjXdCZr+u7VBzDhOQV8 7AxXo8G4dCrOcb9iHj9XBNuC8kKOfAkBKn3r7+MLbT+Dp+bxrtHA8SjPyeiZWg6Z+wny tpcw0KTVcYQmfG5x8okgi6wpspOICnIt4tVfqAKIbqajR5q3F3kUKxoSz5Oi1T5zzEtN 2SAnrQwBEfbN8DcHHx1H8UZtkAvC8TrcElR/ShhlaeRYugn2RfRKG4hiSZzHrzokVPWc MM5f1lM4NRhxovflHNkVDlo96BT+cAgiRGGr0TzwI8JTD0gDW8NWKDv/2iBWAgOOG2Z2 b6Dw== X-Gm-Message-State: AMke39koFCuE4WBtV7cHOj7eIvl20AMVLVNh0P6s+7xS0cz3UZ0yT0+bDd4Y3NOScgcYDA== X-Received: by 10.84.217.212 with SMTP id d20mr7836130plj.53.1488345190132; Tue, 28 Feb 2017 21:13:10 -0800 (PST) Received: from pinklady.local (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id p17sm7256232pfi.97.2017.02.28.21.13.09 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Feb 2017 21:13:09 -0800 (PST) Subject: Re: svn commit: r314473 - head Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Content-Type: multipart/signed; boundary="Apple-Mail=_B160EB82-D19D-4645-8448-4A108AB962AC"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail From: "Ngie Cooper (yaneurabeya)" In-Reply-To: <201703010505.v21556lZ034584@repo.freebsd.org> Date: Tue, 28 Feb 2017 21:13:08 -0800 Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: <6C4E3882-623D-4536-9080-A004A67D6ED1@gmail.com> References: <201703010505.v21556lZ034584@repo.freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 05:13:11 -0000 --Apple-Mail=_B160EB82-D19D-4645-8448-4A108AB962AC Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Feb 28, 2017, at 21:05, Warner Losh wrote: >=20 > Author: imp > Date: Wed Mar 1 05:05:05 2017 > New Revision: 314473 > URL: https://svnweb.freebsd.org/changeset/base/314473 >=20 > Log: > Create README.md file for viewing on github. >=20 > This is a lightly edited README using github's MARKDOWN. >=20 > Submitted by: Johan > Pull Request: https://github.com/freebsd/freebsd/pull/56 Cool! Would it make sense to refer to the other file? Also, this = might make it a bit interesting for projects that fork FreeBSD and hack = on it when doing future merges, but that=E2=80=99s a caveat that those = projects will have to deal with when the time comes to merge this in. Thanks! -Ngie --Apple-Mail=_B160EB82-D19D-4645-8448-4A108AB962AC Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJYtlhkAAoJEPWDqSZpMIYVTPAQAMiLs069sPgd5aS9nYyZK7+w 4PRrXfiWlKUO2I7d0I22GPXHtkhBIT9e7s9w74b/tMvk7VdxpDbZdjPjqIkrFADg PmZ/ytI6RVVRbRAkoSv5hK6CnbOWpnb5GVRPG2079+s1VM7mcvdsAJeetT5kAkuf +sHE+uzUXI35lT14iXccem29lJyCm7j6uR/JjJmJtPSJstzySXuBO5lo7MTag+rv QoAuHiR0E5BFisFIVdluQlzE3JhZP12xj4fDgEQx15BWwNIwp+JA9e4Cd8JF5JhR XnIamsKynALYqc2ToRlF4DT8LcwwRBxFPJRpTuPUI+ye0F0n/z9WNI+hRDrFihdz dKJajEfHZ4139oSNHWdmkIamQTXS5FtqW+HdgQsUGzsV52TcgiKmSASt5fWmb+KN WfPZa47y986EXbySKikObEkZtaTFqJ8JCneNZqfCozMl2G3rLMWTN2q59U1R98rq P7LC+eoC3uyTqF7oyE7NdqkY3EQ3CYSFGSheqorPU6o0zI8fzqBcjSrtoarLbF/O I8Jcyfjtt9pRLr/Fa+phdzPqT6UuvjiLKXdUo70oAHj7XJM6Xrdo2/PIi7saThhj yiW9VSWVZ6QBgQeg7TcjYcVzpQLzJjwiucylw98g4ncJSg8t5Oc9j3U5mVhgv0hx QPTvcu4TO7tIqb8fnhBX =OwNK -----END PGP SIGNATURE----- --Apple-Mail=_B160EB82-D19D-4645-8448-4A108AB962AC-- From owner-svn-src-all@freebsd.org Wed Mar 1 05:14:47 2017 Return-Path: Delivered-To: svn-src-all@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 D1087CF21C4; Wed, 1 Mar 2017 05:14:47 +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 9C2D81212; Wed, 1 Mar 2017 05:14:47 +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 v215EkMt038488; Wed, 1 Mar 2017 05:14:46 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v215EjLc038475; Wed, 1 Mar 2017 05:14:45 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010514.v215EjLc038475@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 05:14:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314475 - in head/usr.sbin/lpr: chkprintcap filters filters.ru/koi2855 filters.ru/koi2alt lpc lpd lpq lpr lprm lptest pac X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 05:14:48 -0000 Author: ngie Date: Wed Mar 1 05:14:45 2017 New Revision: 314475 URL: https://svnweb.freebsd.org/changeset/base/314475 Log: Simplify idioms in usr.sbin/lpr Makefiles Use :H instead of .CURDIR-relative pathing to simplify make output, etc. MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/lpr/chkprintcap/Makefile head/usr.sbin/lpr/filters.ru/koi2855/Makefile head/usr.sbin/lpr/filters.ru/koi2alt/Makefile head/usr.sbin/lpr/filters/Makefile head/usr.sbin/lpr/lpc/Makefile head/usr.sbin/lpr/lpd/Makefile head/usr.sbin/lpr/lpq/Makefile head/usr.sbin/lpr/lpr/Makefile head/usr.sbin/lpr/lprm/Makefile head/usr.sbin/lpr/lptest/Makefile head/usr.sbin/lpr/pac/Makefile Modified: head/usr.sbin/lpr/chkprintcap/Makefile ============================================================================== --- head/usr.sbin/lpr/chkprintcap/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/chkprintcap/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -1,12 +1,12 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../common_source +.PATH: ${.CURDIR:H}/common_source PROG= chkprintcap MAN= chkprintcap.8 SRCS= chkprintcap.c skimprintcap.c -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source LIBADD= lpr Modified: head/usr.sbin/lpr/filters.ru/koi2855/Makefile ============================================================================== --- head/usr.sbin/lpr/filters.ru/koi2855/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/filters.ru/koi2855/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -3,6 +3,6 @@ PROG= koi2855 MAN= -CFLAGS+= -I${.CURDIR}/../../common_source +CFLAGS+= -I${.CURDIR:H:H}/common_source .include Modified: head/usr.sbin/lpr/filters.ru/koi2alt/Makefile ============================================================================== --- head/usr.sbin/lpr/filters.ru/koi2alt/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/filters.ru/koi2alt/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -3,6 +3,6 @@ PROG= koi2alt MAN= -CFLAGS+= -I${.CURDIR}/../../common_source +CFLAGS+= -I${.CURDIR:H:H}/common_source .include Modified: head/usr.sbin/lpr/filters/Makefile ============================================================================== --- head/usr.sbin/lpr/filters/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/filters/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -6,6 +6,6 @@ BINDIR= ${LIBEXECDIR}/lpr PROG= lpf MAN= -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source .include Modified: head/usr.sbin/lpr/lpc/Makefile ============================================================================== --- head/usr.sbin/lpr/lpc/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/lpc/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -1,7 +1,7 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../common_source +.PATH: ${.CURDIR:H}/common_source PROG= lpc MAN= lpc.8 @@ -9,7 +9,7 @@ SRCS= lpc.c cmds.c cmdtab.c movejobs.c BINGRP= daemon BINMODE= 2555 -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source WARNS?= 0 Modified: head/usr.sbin/lpr/lpd/Makefile ============================================================================== --- head/usr.sbin/lpr/lpd/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/lpd/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -5,7 +5,7 @@ PROG= lpd MAN= lpd.8 SRCS= lpd.c printjob.c recvjob.c lpdchar.c modes.c -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source WARNS?= 1 Modified: head/usr.sbin/lpr/lpq/Makefile ============================================================================== --- head/usr.sbin/lpr/lpq/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/lpq/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -8,7 +8,7 @@ BINOWN= root BINGRP= daemon BINMODE= 6555 -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source LIBADD= lpr Modified: head/usr.sbin/lpr/lpr/Makefile ============================================================================== --- head/usr.sbin/lpr/lpr/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/lpr/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -1,7 +1,7 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../common_source +.PATH: ${.CURDIR:H}/common_source BINDIR= /usr/bin @@ -11,7 +11,7 @@ BINOWN= root BINGRP= daemon BINMODE= 6555 -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source WARNS?= 2 Modified: head/usr.sbin/lpr/lprm/Makefile ============================================================================== --- head/usr.sbin/lpr/lprm/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/lprm/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -1,7 +1,7 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../common_source +.PATH: ${.CURDIR:H}/common_source BINDIR= /usr/bin @@ -10,7 +10,7 @@ BINOWN= root BINGRP= daemon BINMODE= 6555 -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source LIBADD= lpr Modified: head/usr.sbin/lpr/lptest/Makefile ============================================================================== --- head/usr.sbin/lpr/lptest/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/lptest/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -3,6 +3,6 @@ PROG= lptest -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source .include Modified: head/usr.sbin/lpr/pac/Makefile ============================================================================== --- head/usr.sbin/lpr/pac/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/pac/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -1,12 +1,12 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../common_source +.PATH: ${.CURDIR:H}/common_source PROG= pac MAN= pac.8 -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source LIBADD= lpr From owner-svn-src-all@freebsd.org Wed Mar 1 05:18:23 2017 Return-Path: Delivered-To: svn-src-all@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 B28E4CF48CB; Wed, 1 Mar 2017 05:18:23 +0000 (UTC) (envelope-from mjg@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 826DA1F70; Wed, 1 Mar 2017 05:18:23 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v215IM0G038671; Wed, 1 Mar 2017 05:18:22 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v215IMCS038670; Wed, 1 Mar 2017 05:18:22 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201703010518.v215IMCS038670@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Wed, 1 Mar 2017 05:18:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314476 - head/sys/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 05:18:23 -0000 Author: mjg Date: Wed Mar 1 05:18:22 2017 New Revision: 314476 URL: https://svnweb.freebsd.org/changeset/base/314476 Log: locks: fix compilation with KTR wihout KTR_LOCKS While here wrap the overly long line. Reported by: np Modified: head/sys/sys/lock.h Modified: head/sys/sys/lock.h ============================================================================== --- head/sys/sys/lock.h Wed Mar 1 05:14:45 2017 (r314475) +++ head/sys/sys/lock.h Wed Mar 1 05:18:22 2017 (r314476) @@ -125,7 +125,8 @@ struct lock_class { * calling conventions for this debugging code in modules so that modules can * work with both debug and non-debug kernels. */ -#if defined(KLD_MODULE) || defined(WITNESS) || defined(INVARIANTS) || defined(INVARIANT_SUPPORT) || defined(LOCK_PROFILING) || (defined(KTR) && (KTR_COMPILE & KTR_LOCK)) +#if defined(KLD_MODULE) || defined(WITNESS) || defined(INVARIANTS) || \ + defined(INVARIANT_SUPPORT) || defined(LOCK_PROFILING) || defined(KTR) #define LOCK_DEBUG 1 #else #define LOCK_DEBUG 0 From owner-svn-src-all@freebsd.org Wed Mar 1 05:18:44 2017 Return-Path: Delivered-To: svn-src-all@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 9B907CF497E; Wed, 1 Mar 2017 05:18:44 +0000 (UTC) (envelope-from imp@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 6B544AF; Wed, 1 Mar 2017 05:18:44 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v215IhqE038732; Wed, 1 Mar 2017 05:18:43 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v215IhaM038730; Wed, 1 Mar 2017 05:18:43 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201703010518.v215IhaM038730@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 1 Mar 2017 05:18:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314477 - head/sys/dev/ichwd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 05:18:44 -0000 Author: imp Date: Wed Mar 1 05:18:43 2017 New Revision: 314477 URL: https://svnweb.freebsd.org/changeset/base/314477 Log: Fixed TCO v3 tick convert TCO v3's internal timer is stored as seconds. Submitted by: Denir Li Pull Request: https://github.com/freebsd/freebsd/pull/51 Pull Request: https://github.com/freebsd/freebsd/pull/52 Modified: head/sys/dev/ichwd/ichwd.c head/sys/dev/ichwd/ichwd.h Modified: head/sys/dev/ichwd/ichwd.c ============================================================================== --- head/sys/dev/ichwd/ichwd.c Wed Mar 1 05:18:22 2017 (r314476) +++ head/sys/dev/ichwd/ichwd.c Wed Mar 1 05:18:43 2017 (r314477) @@ -512,7 +512,13 @@ ichwd_event(void *arg, unsigned int cmd, /* convert from power-of-two-ns to WDT ticks */ cmd &= WD_INTERVAL; - timeout = ((uint64_t)1 << cmd) / ICHWD_TICK; + + if (sc->tco_version == 3) { + timeout = ((uint64_t)1 << cmd) / ICHWD_TCO_V3_TICK; + } else { + timeout = ((uint64_t)1 << cmd) / ICHWD_TICK; + } + if (cmd) { if (!sc->active) ichwd_tmr_enable(sc); Modified: head/sys/dev/ichwd/ichwd.h ============================================================================== --- head/sys/dev/ichwd/ichwd.h Wed Mar 1 05:18:22 2017 (r314476) +++ head/sys/dev/ichwd/ichwd.h Wed Mar 1 05:18:43 2017 (r314477) @@ -345,7 +345,9 @@ struct ichwd_softc { #define TCO_RLD1_TMR_MAX 0x003f #define TCO_RLD2_TMR_MAX 0x03ff -/* approximate length in nanoseconds of one WDT tick (about 0.6 sec) */ +/* approximate length in nanoseconds of one WDT tick (about 0.6 sec) for TCO v1/v2 */ #define ICHWD_TICK 600000000 +/* approximate length in nanoseconds of one WDT tick (about 1.0 sec) for TCO v3 */ +#define ICHWD_TCO_V3_TICK 1000000000 #endif From owner-svn-src-all@freebsd.org Wed Mar 1 05:21:22 2017 Return-Path: Delivered-To: svn-src-all@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 DE2DDCF4FC6; Wed, 1 Mar 2017 05:21:22 +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 AD731669; Wed, 1 Mar 2017 05:21:22 +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 v215LLZk041008; Wed, 1 Mar 2017 05:21:21 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v215LLh3041005; Wed, 1 Mar 2017 05:21:21 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010521.v215LLh3041005@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 05:21:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314479 - in head/usr.sbin/fifolog: fifolog_create fifolog_reader fifolog_writer X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 05:21:23 -0000 Author: ngie Date: Wed Mar 1 05:21:21 2017 New Revision: 314479 URL: https://svnweb.freebsd.org/changeset/base/314479 Log: Use :H to manipulate .CURDIR-relative paths instead of ../ This simplifies make output MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/fifolog/fifolog_create/Makefile head/usr.sbin/fifolog/fifolog_reader/Makefile head/usr.sbin/fifolog/fifolog_writer/Makefile Modified: head/usr.sbin/fifolog/fifolog_create/Makefile ============================================================================== --- head/usr.sbin/fifolog/fifolog_create/Makefile Wed Mar 1 05:19:35 2017 (r314478) +++ head/usr.sbin/fifolog/fifolog_create/Makefile Wed Mar 1 05:21:21 2017 (r314479) @@ -2,7 +2,7 @@ PROG= fifolog_create -CFLAGS+= -I${.CURDIR}/../lib +CFLAGS+= -I${.CURDIR:H}/lib LIBADD= util fifolog Modified: head/usr.sbin/fifolog/fifolog_reader/Makefile ============================================================================== --- head/usr.sbin/fifolog/fifolog_reader/Makefile Wed Mar 1 05:19:35 2017 (r314478) +++ head/usr.sbin/fifolog/fifolog_reader/Makefile Wed Mar 1 05:21:21 2017 (r314479) @@ -2,7 +2,7 @@ PROG= fifolog_reader -CFLAGS+= -I${.CURDIR}/../lib +CFLAGS+= -I${.CURDIR:H}/lib MAN= Modified: head/usr.sbin/fifolog/fifolog_writer/Makefile ============================================================================== --- head/usr.sbin/fifolog/fifolog_writer/Makefile Wed Mar 1 05:19:35 2017 (r314478) +++ head/usr.sbin/fifolog/fifolog_writer/Makefile Wed Mar 1 05:21:21 2017 (r314479) @@ -2,7 +2,7 @@ PROG= fifolog_writer -CFLAGS+= -I${.CURDIR}/../lib +CFLAGS+= -I${.CURDIR:H}/lib MAN= From owner-svn-src-all@freebsd.org Wed Mar 1 05:19:36 2017 Return-Path: Delivered-To: svn-src-all@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 C330BCF4B05; Wed, 1 Mar 2017 05:19:36 +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 814A51E1; Wed, 1 Mar 2017 05:19:36 +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 v215JZpT038811; Wed, 1 Mar 2017 05:19:35 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v215JZTr038806; Wed, 1 Mar 2017 05:19:35 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010519.v215JZTr038806@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 05:19:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314478 - in head/usr.sbin/ntp: libntp ntpdate ntpdc ntpq X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 05:19:36 -0000 Author: ngie Date: Wed Mar 1 05:19:35 2017 New Revision: 314478 URL: https://svnweb.freebsd.org/changeset/base/314478 Log: Simplify idioms in Makefiles further - Use SRCTOP-relative paths instead of .CURDIR-relative ones where possible - Use :H to manipulate .CURDIR in areas instead of ..-relative paths. MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/ntp/libntp/Makefile head/usr.sbin/ntp/ntpdate/Makefile head/usr.sbin/ntp/ntpdc/Makefile head/usr.sbin/ntp/ntpq/Makefile Modified: head/usr.sbin/ntp/libntp/Makefile ============================================================================== --- head/usr.sbin/ntp/libntp/Makefile Wed Mar 1 05:18:43 2017 (r314477) +++ head/usr.sbin/ntp/libntp/Makefile Wed Mar 1 05:19:35 2017 (r314478) @@ -73,14 +73,14 @@ ISC_SRCS= assertions.c \ SRCS= ${NTP_SRCS} ${ISC_SRCS} version.c -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \ - -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \ - -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \ - -I${.CURDIR}/../../../lib/libc/${MACHINE_ARCH} \ - -I${.CURDIR}/../../../lib/libedit/edit \ - -I${.CURDIR}/../ \ +CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \ + -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \ + -I${SRCTOP}/contrib/ntp/sntp/libopts \ + -I${SRCTOP}/lib/libc/${MACHINE_ARCH} \ + -I${SRCTOP}/lib/libedit/edit \ + -I${.CURDIR:H} \ -I${.CURDIR}/ CFLAGS+= -DHAVE_BSD_NICE -DHAVE_STDINT_H @@ -88,6 +88,6 @@ CFLAGS+= -DHAVE_BSD_NICE -DHAVE_STDINT_H CLEANFILES+= .version version.c version.c: - sh -e ${.CURDIR}/../scripts/mkver ntpd + sh -e ${.CURDIR:H}/scripts/mkver ntpd .include Modified: head/usr.sbin/ntp/ntpdate/Makefile ============================================================================== --- head/usr.sbin/ntp/ntpdate/Makefile Wed Mar 1 05:18:43 2017 (r314477) +++ head/usr.sbin/ntp/ntpdate/Makefile Wed Mar 1 05:19:35 2017 (r314478) @@ -24,7 +24,7 @@ LIBADD+= md CLEANFILES+= .version version.c -version.c: - sh -e ${.CURDIR}/../scripts/mkver ntpdate +version.c: + sh -e ${.CURDIR:H}/scripts/mkver ntpdate .include Modified: head/usr.sbin/ntp/ntpdc/Makefile ============================================================================== --- head/usr.sbin/ntp/ntpdc/Makefile Wed Mar 1 05:18:43 2017 (r314477) +++ head/usr.sbin/ntp/ntpdc/Makefile Wed Mar 1 05:19:35 2017 (r314478) @@ -30,6 +30,6 @@ LIBADD+= md CLEANFILES+= .version version.c version.c: - sh -e ${.CURDIR}/../scripts/mkver ntpdc + sh -e ${.CURDIR:H}/scripts/mkver ntpdc .include Modified: head/usr.sbin/ntp/ntpq/Makefile ============================================================================== --- head/usr.sbin/ntp/ntpq/Makefile Wed Mar 1 05:18:43 2017 (r314477) +++ head/usr.sbin/ntp/ntpq/Makefile Wed Mar 1 05:19:35 2017 (r314478) @@ -34,6 +34,6 @@ CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_ CLEANFILES+= .version version.c version.c: - sh -e ${.CURDIR}/../scripts/mkver ntpq + sh -e ${.CURDIR:H}/scripts/mkver ntpq .include From owner-svn-src-all@freebsd.org Wed Mar 1 05:30:52 2017 Return-Path: Delivered-To: svn-src-all@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 723B4CF6FCC for ; Wed, 1 Mar 2017 05:30:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x234.google.com (mail-io0-x234.google.com [IPv6:2607:f8b0:4001:c06::234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3955E1061 for ; Wed, 1 Mar 2017 05:30:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x234.google.com with SMTP id j18so24199387ioe.2 for ; Tue, 28 Feb 2017 21:30:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=1NS0P/iiHAQXsJX08msu/pN7GdCNlYZFm6eMJmpg6CU=; b=ay9ZH+ITedANg/NLtjO6na8Ysf360PwskJRqVaSXMkG6o+yLsfMahbOrVZtXkbQ4sL UU3vqcniyt5r4xR3hm4vqAWSv31GiqnN8/Esw9UO4hG5UE14eEpOv+h/e2oBBPBL9a9d tg1vxBTnYoE1sIaCjHwpgaMB0BX14rqWnvvLXI1LLcVNguQzcoF2+4XTZPCtLPm1boAk MFT4Znbw402Ql48MYkWZRk/Tkzp0AnBFGauPOW+fz9C7bVL2mAWNpTT/Py4iWXfuwOzf 9qS29gI0wstJcfUV8SYMiz7odehn1x0gZwDf5VRKmXLzw/QQ1B3P3HOwcEZeCwE4UMDv zaqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=1NS0P/iiHAQXsJX08msu/pN7GdCNlYZFm6eMJmpg6CU=; b=ZcWsTImlPVKNFkTGcGqSoYrgHw2DEfnLWGZCIlu2XPj0sanAiAO3n3wMTzK1zUxfMG s2G9XFaB2wBwnkg0LDhnS9DHl2KfMV9BhxEBc4glcYUUaZ8SaTrpoGM9B7bjFaoD5L2D FAe5u4hdy0gqCrGT7NiSSMqFGC9qgWdWeSqS4pw6S0XPdVSwlz9jpidTRAvbuw+YnbGe IsZrECAERdMG6kYdNECl4Eoq9PA4fbTZ9/Lfd7/kzJbBzRSuGKHdQsJtvBzdDoq/kZk4 fq9/t97FzaNA+rfLGtqae3yOpfb6u0/9hT0Nz0fcH9MgHXdtI1dPFU2B56SPZaZkDHMm qWBg== X-Gm-Message-State: AMke39mMw4dF/rTgekQJS7K2yX5vzKsxcFxY421EqPKBWsXBQ9lliCbSEwNfyHCl5nJPBNiyBjEI59YWBTz7vw== X-Received: by 10.107.198.193 with SMTP id w184mr6760557iof.19.1488346251585; Tue, 28 Feb 2017 21:30:51 -0800 (PST) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.134.129 with HTTP; Tue, 28 Feb 2017 21:30:51 -0800 (PST) X-Originating-IP: [50.253.99.174] In-Reply-To: <20170301.141856.1441900213581775162.hrs@allbsd.org> References: <201703010447.v214lM4c026957@repo.freebsd.org> <20170301.141856.1441900213581775162.hrs@allbsd.org> From: Warner Losh Date: Tue, 28 Feb 2017 22:30:51 -0700 X-Google-Sender-Auth: VyjEa6VUAqJNuvAfAed35Hxk-XE Message-ID: Subject: Re: svn commit: r314471 - head/sys/net To: Hiroki Sato Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 05:30:52 -0000 On Tue, Feb 28, 2017 at 10:18 PM, Hiroki Sato wrote: > Warner Losh wrote > in <201703010447.v214lM4c026957@repo.freebsd.org>: > > im> Author: imp > im> Date: Wed Mar 1 04:47:22 2017 > im> New Revision: 314471 > im> URL: https://svnweb.freebsd.org/changeset/base/314471 > im> > im> Log: > im> Fix VNET - DAD detected duplicate IPv6 address > im> > im> Assign a hopefully unique, locally administered etheraddr. - for > im> epairNa & epairNb > im> > im> Submitted by: Catalin > im> Pull Request: https://github.com/freebsd/freebsd/pull/92 > > This was discussed in D1858. epairNa and epairNb never have the same > L2 addr because eaddr[5] is unique. If the goal of this change is to > prevent a conflict of L2 addrs with epairNs created in another vnet > jail on the same system or on the same network, eaddr[5] of epairNa > (around l.839) must also be randomized at least. > > While I am still for a deterministic value because changing the L2 > addr every time when rebooting a vnet jail is annoying, but if we use > some random numbers for the vendor bits, I think eaddr[2] should be > initialized in the same way. It's clear the consensus there was 'no go' and I don't wish to override it. I didn't know about that, so I'll revert. Warner From owner-svn-src-all@freebsd.org Wed Mar 1 05:21:42 2017 Return-Path: Delivered-To: svn-src-all@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 C95BFCF50E0; Wed, 1 Mar 2017 05:21:42 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mail.allbsd.org (gatekeeper.allbsd.org [IPv6:2001:2f0:104:e001::32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.allbsd.org", Issuer "RapidSSL SHA256 CA - G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5B55C80B; Wed, 1 Mar 2017 05:21:42 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mail-d.allbsd.org (p2027-ipbf1605funabasi.chiba.ocn.ne.jp [123.225.191.27]) (authenticated bits=56) by mail.allbsd.org (8.15.2/8.15.2) with ESMTPSA id v215LHZO058610 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) (Client CN "/OU=GT07882699/OU=See+20www.rapidssl.com/resources/cps+20+28c+2915/OU=Domain+20Control+20Validated+20-+20RapidSSL+28R+29/CN=*.allbsd.org", Issuer "/C=US/O=GeoTrust+20Inc./CN=RapidSSL+20SHA256+20CA+20-+20G3"); Wed, 1 Mar 2017 14:21:38 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from alph.allbsd.org (alph.allbsd.org [192.168.0.10]) by mail-d.allbsd.org (8.15.2/8.15.2) with ESMTPS id v215K1r6030540 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 1 Mar 2017 14:20:01 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from localhost (localhost [IPv6:::1]) (authenticated bits=0) by alph.allbsd.org (8.15.2/8.15.2) with ESMTPA id v215JxH5030521; Wed, 1 Mar 2017 14:20:00 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Wed, 01 Mar 2017 14:18:56 +0900 (JST) Message-Id: <20170301.141856.1441900213581775162.hrs@allbsd.org> To: imp@FreeBSD.org Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314471 - head/sys/net From: Hiroki Sato In-Reply-To: <201703010447.v214lM4c026957@repo.freebsd.org> References: <201703010447.v214lM4c026957@repo.freebsd.org> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="--Security_Multipart(Wed_Mar__1_14_18_56_2017_794)--" Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.99 at gatekeeper.allbsd.org X-Virus-Status: Clean X-Greylist: Sender DNS name whitelisted, not delayed by milter-greylist-4.4.3 (mail.allbsd.org [133.31.130.32]); Wed, 01 Mar 2017 14:21:39 +0900 (JST) X-Spam-Status: No, score=-97.9 required=13.0 tests=CONTENT_TYPE_PRESENT, QENCPTR1,URIBL_SC2_SURBL,URIBL_XS_SURBL,USER_IN_WHITELIST autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on gatekeeper.allbsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 05:21:42 -0000 ----Security_Multipart(Wed_Mar__1_14_18_56_2017_794)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Warner Losh wrote in <201703010447.v214lM4c026957@repo.freebsd.org>: im> Author: imp im> Date: Wed Mar 1 04:47:22 2017 im> New Revision: 314471 im> URL: https://svnweb.freebsd.org/changeset/base/314471 im> im> Log: im> Fix VNET - DAD detected duplicate IPv6 address im> im> Assign a hopefully unique, locally administered etheraddr. - for im> epairNa & epairNb im> im> Submitted by: Catalin im> Pull Request: https://github.com/freebsd/freebsd/pull/92 This was discussed in D1858. epairNa and epairNb never have the same L2 addr because eaddr[5] is unique. If the goal of this change is to prevent a conflict of L2 addrs with epairNs created in another vnet jail on the same system or on the same network, eaddr[5] of epairNa (around l.839) must also be randomized at least. While I am still for a deterministic value because changing the L2 addr every time when rebooting a vnet jail is annoying, but if we use some random numbers for the vendor bits, I think eaddr[2] should be initialized in the same way. -- Hiroki ----Security_Multipart(Wed_Mar__1_14_18_56_2017_794)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAli2WcAACgkQTyzT2CeTzy3cgwCfSH1sjv8JnBtTChyd5tfzFPBL OhsAoIiIp6t4mPSTvL1ufxuj/wXVpRW/ =8aF5 -----END PGP SIGNATURE----- ----Security_Multipart(Wed_Mar__1_14_18_56_2017_794)---- From owner-svn-src-all@freebsd.org Wed Mar 1 05:29:01 2017 Return-Path: Delivered-To: svn-src-all@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 233D7CF69F0 for ; Wed, 1 Mar 2017 05:29:01 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x22d.google.com (mail-io0-x22d.google.com [IPv6:2607:f8b0:4001:c06::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E071ADB2 for ; Wed, 1 Mar 2017 05:29:00 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x22d.google.com with SMTP id f84so23107448ioj.0 for ; Tue, 28 Feb 2017 21:29:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-transfer-encoding; bh=3nj7I7qMCADNYZKZGJ0dfBHDpWfJfxIX8lW9VBbQxb0=; b=Rf2hCNuRU1mJ3bmlbSlBcOr8GFTeEgrDsgJzPbMsBf0JWeZQaVDFg8MydaqbPS5z3x BHehgOIbwoyVR8Msg/LpSzwZa39WjfPWlgrBAnFJDzQWftZ5o42HOdKJjyh38kTTbmis EzRafoNbaD35/CS+4TDMTynhnQHUl8+rNqeDZiZw7XXi/LlqosnxG6aQFTAGsg7gXHFB jjL88IUpj7Ph5u+keHBqIXK7Mtxfq06MrUlmNwmoc9O1neSzRv+EArQPtngq+mWnDkPW dVFPFLH/4Q+qa+rfDMYm9bziEFXcrzLynyComIWyIeFOuBtQHDhS1ROKadS99eqE9EUY VXGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-transfer-encoding; bh=3nj7I7qMCADNYZKZGJ0dfBHDpWfJfxIX8lW9VBbQxb0=; b=JDNqXtD/nqDNdT41PI+s/TPKLhwl2HFF8Px/RrhQ4O8Bxt9d7CwBGSGtlft89JJUow jU9uVOdiaYpeDTrspeyT7wMBOA4MZQaCR+LZkaOgb5y+97HhaEUKud+sO/jfICu45NIf iD3XLAcrU/k7cvrdNnp3LUQG4CMZDzswgp/1LlRftctk2Q/JEjtngdWqSxkyL952d56d nOolaM/ZTgCNJ6nFwoIrfkp9qLgrgBdbEcYjPjAuFr1ZQbAiEPvYA2KgEVXOAEmmwezi 7tneZmOgRz9YU7b+36cpZtgf/9HJfUNzEUBhk/yfEAlIseppouErLaAOXUXNNrUcSyQd ZRlg== X-Gm-Message-State: AMke39kSbeeebN44ivabGjZoCxNL3mWjPcl7MHoDwISZ7hn/pGWGsGMdqirBwTvPwOkGOqtJUH3Ji8x/0bVjnQ== X-Received: by 10.107.174.220 with SMTP id n89mr7226735ioo.166.1488346139803; Tue, 28 Feb 2017 21:28:59 -0800 (PST) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.134.129 with HTTP; Tue, 28 Feb 2017 21:28:59 -0800 (PST) X-Originating-IP: [50.253.99.174] In-Reply-To: <6C4E3882-623D-4536-9080-A004A67D6ED1@gmail.com> References: <201703010505.v21556lZ034584@repo.freebsd.org> <6C4E3882-623D-4536-9080-A004A67D6ED1@gmail.com> From: Warner Losh Date: Tue, 28 Feb 2017 22:28:59 -0700 X-Google-Sender-Auth: dlXUAlNouH17iDciL6HLVsfBh-E Message-ID: Subject: Re: svn commit: r314473 - head To: "Ngie Cooper (yaneurabeya)" Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 05:29:01 -0000 On Tue, Feb 28, 2017 at 10:13 PM, Ngie Cooper (yaneurabeya) wrote: > >> On Feb 28, 2017, at 21:05, Warner Losh wrote: >> >> Author: imp >> Date: Wed Mar 1 05:05:05 2017 >> New Revision: 314473 >> URL: https://svnweb.freebsd.org/changeset/base/314473 >> >> Log: >> Create README.md file for viewing on github. >> >> This is a lightly edited README using github's MARKDOWN. >> >> Submitted by: Johan >> Pull Request: https://github.com/freebsd/freebsd/pull/56 > > Cool! Would it make sense to refer to the other file? Also, this = might make it a bit interesting for projects that fork FreeBSD and hack on = it when doing future merges, but that=E2=80=99s a caveat that those project= s will have to deal with when the time comes to merge this in. Don't know what's best... That's a good question. I'm inclined to leave it alone for now... Warner From owner-svn-src-all@freebsd.org Wed Mar 1 05:44:39 2017 Return-Path: Delivered-To: svn-src-all@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 42A82CF5AEB; Wed, 1 Mar 2017 05:44:39 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg0-x241.google.com (mail-pg0-x241.google.com [IPv6:2607:f8b0:400e:c05::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0F8551E99; Wed, 1 Mar 2017 05:44:39 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg0-x241.google.com with SMTP id 25so4616235pgy.3; Tue, 28 Feb 2017 21:44:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:mime-version:from:in-reply-to:date:cc:message-id:references :to; bh=0EUPC1Kg5epcieUTCEEku4/Cs+tNpmqhEJgw2yV1eoc=; b=ElRUIBQVfumnLw/IZHy+VYkvIKUs20cStMLkOMz2uoVEQDf5Ue7ne3oYwOIUSo8LZG hb4EtX7J6AKHz6bqiJZubYa+QS0zK9TtQjxQDYDuCcYVldPPaUFV+i9uvyBiuRczHvwH bbiCSZsr1DNdKIl7vy2InoWt1JpTAng6nulLBdAXlrsn8/bUtlcoAkj6BEg3Zegjs7aO aDrnubiAPG+5TM27sCAnJbpCeq29QS+eJNHqOaRsy+ubQ0gGAk3Kx3A2S+a0rN2cHkVn l06Aw4tcUJBBB0uNXg/Kfa5sVEhAiJ51Wf3CRUwL4QvOHd2kfTUPKdMi23YwnGh2vR+6 7ShQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:mime-version:from:in-reply-to:date:cc :message-id:references:to; bh=0EUPC1Kg5epcieUTCEEku4/Cs+tNpmqhEJgw2yV1eoc=; b=KjTy3H0h9Ell+pOVX5MKDtMmo/cn0W9emqsBwcPlWOc10DQ3lg+C9tE8jeT6FHGhLT Q78xOshvvHDGJky+hw8sSyEMNDb/OyGCqQlWNDphM5wP2pCH+ERZiZFTjQH391D84mCb Fc2RtqpvIXMyriyG0g6GcTV5BODpszu3yL0I/QeSZChm2fFATvnowiln/IiI9H0QdTTj ciKzUnTmaNJnpEOlG3QLF/MieJliTXRbam+yiUxKBldikhFacuhM2+9QSU0it9JYe4q/ bOmEswZ4M2l/NpGtjY34tWjdzqWsZUO/aKoQVh5rL1Z4y5A7N61PGHB9Ipj/h3t19MgK bkug== X-Gm-Message-State: AMke39kms6AGCGnCGwGABK05vJ2e/OClz5FTTLaQ53iA8xPIjOwfJJq7LRFjrnK0oWd6Ng== X-Received: by 10.98.14.217 with SMTP id 86mr6858695pfo.79.1488347078681; Tue, 28 Feb 2017 21:44:38 -0800 (PST) Received: from pinklady.local (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id p129sm7450974pfp.118.2017.02.28.21.44.37 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Feb 2017 21:44:38 -0800 (PST) Subject: Re: svn commit: r314464 - head/usr.sbin/yppush Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Content-Type: multipart/signed; boundary="Apple-Mail=_7BB28971-239D-4DC8-8053-8E7FAE8F03CC"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail From: "Ngie Cooper (yaneurabeya)" In-Reply-To: <201703010538.v215cqqW053998@pdx.rh.CN85.dnsmgr.net> Date: Tue, 28 Feb 2017 21:44:36 -0800 Cc: Ngie Cooper , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: References: <201703010538.v215cqqW053998@pdx.rh.CN85.dnsmgr.net> To: "Rodney W. Grimes" X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 05:44:39 -0000 --Apple-Mail=_7BB28971-239D-4DC8-8053-8E7FAE8F03CC Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Feb 28, 2017, at 21:38, Rodney W. Grimes = wrote: >=20 > Would it be possible to not do this as 1000 commits? Yes, but I=E2=80=99m trying to do this in a way that allows me = to backport all of the changes as easily as possible to ^/stable/10 (on = the other side of the coin, I=E2=80=99ve run into dependent commits of = other MFCs that required sweeping changes in order to make my changes = possible). I do think your point is valid though and I can probably strike = some middle ground with my changes. I think grouping it up by 2nd level = directory (like I did with usr.bin/svn) makes the most sense. Thank you, -Ngie --Apple-Mail=_7BB28971-239D-4DC8-8053-8E7FAE8F03CC Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJYtl/FAAoJEPWDqSZpMIYVlecP/ROL75w6y0ym4NuTGdIDt4fb dZRwTCLV0RwwcqXpb8azbaUemLpeFeGFXVRFUGLxJHuNR3ELt34QlHL/4yXQHlIG vWM/YR8PGPopWhFtXMZzwK6nQ923vzG38OHpqZTnKRj2bkeoq2fhJ4h12iOKCs6S z+kp0DTeiejZ7DjiOU/sXNXPlWJB4z9BxeYQZF2eCAvD+CNseIqfdYLmTC5ZFMjm rONJvH7irGoEQ8npo+c6jtCv1rTvIGQsNxYdjab4jYs2Fz0b2Lq52BqpsXqNvEOL IT+jnyUtAuMoeRq+N33FhhrwpeBWpnnmtxwopsMBMkMwT8/88NmdivSaLys0FPrV U0oYPRKa3c45dCrbzRU+5S+6umlNoFgieCyHWnWORO+EgIK7lDoKv87uj60VoZDX cxyeKnQIOz6RMPEy5osKWQ/vryD+uVaohLDAMhI6IBrgWD61EpCS6zmxW+AqHsgY OsQlLynznFBcErWqbcILsuN88Rz724BK5Ku4x9NCWT71NgU7Z30JwsOIKCNLSMLo +SvFGN8aGT9qdeZWz6gnZ+XWdWiI82orOnn733M9RaGLDVvKaPReZT8eLjplU21C r+LyGwFwygrF20tDh6B28WMG2ystY+BYNJGzpOvylCLX28Fz1u81Z9QBNweJmF2R wKYxZktXXvGoavPLFqO8 =aSkM -----END PGP SIGNATURE----- --Apple-Mail=_7BB28971-239D-4DC8-8053-8E7FAE8F03CC-- From owner-svn-src-all@freebsd.org Wed Mar 1 05:38:06 2017 Return-Path: Delivered-To: svn-src-all@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 42B55CF5727; Wed, 1 Mar 2017 05:38:06 +0000 (UTC) (envelope-from imp@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 123831834; Wed, 1 Mar 2017 05:38:06 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v215c5JE046674; Wed, 1 Mar 2017 05:38:05 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v215c5KO046673; Wed, 1 Mar 2017 05:38:05 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201703010538.v215c5KO046673@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 1 Mar 2017 05:38:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314480 - head/sys/net X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 05:38:06 -0000 Author: imp Date: Wed Mar 1 05:38:04 2017 New Revision: 314480 URL: https://svnweb.freebsd.org/changeset/base/314480 Log: Back out r314471. In https://reviews.freebsd.org/D1858 it was clear that this shouldn't go in. I was unaware when I merged the pull request. I don't wish to upset the status quo, so backout per project practice. Pull Request: https://github.com/freebsd/freebsd/pull/92 Noted by: hrs@ Modified: head/sys/net/if_epair.c Modified: head/sys/net/if_epair.c ============================================================================== --- head/sys/net/if_epair.c Wed Mar 1 05:21:21 2017 (r314479) +++ head/sys/net/if_epair.c Wed Mar 1 05:38:04 2017 (r314480) @@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include @@ -725,7 +724,6 @@ epair_clone_create(struct if_clone *ifc, ifp = scb->ifp; /* Assign a hopefully unique, locally administered etheraddr. */ eaddr[0] = 0x02; - eaddr[1] = arc4random() & 0xff; eaddr[3] = (ifp->if_index >> 8) & 0xff; eaddr[4] = ifp->if_index & 0xff; eaddr[5] = 0x0b; From owner-svn-src-all@freebsd.org Wed Mar 1 05:38:57 2017 Return-Path: Delivered-To: svn-src-all@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 3812ACF58D4; Wed, 1 Mar 2017 05:38:57 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0D317192F; Wed, 1 Mar 2017 05:38:56 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v215cqqq053999; Tue, 28 Feb 2017 21:38:52 -0800 (PST) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd-rwg@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v215cqqW053998; Tue, 28 Feb 2017 21:38:52 -0800 (PST) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <201703010538.v215cqqW053998@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314464 - head/usr.sbin/yppush In-Reply-To: <201703010424.v214OPdB018960@repo.freebsd.org> To: Ngie Cooper Date: Tue, 28 Feb 2017 21:38:52 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 05:38:57 -0000 Would it be possible to not do this as 1000 commits? > Author: ngie > Date: Wed Mar 1 04:24:24 2017 > New Revision: 314464 > URL: https://svnweb.freebsd.org/changeset/base/314464 > > Log: > Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones > > This simplifies pathing in make/displayed output. > > MFC after: 1 week > Sponsored by: Dell EMC Isilon > > Modified: > head/usr.sbin/yppush/Makefile > > Modified: head/usr.sbin/yppush/Makefile > ============================================================================== > --- head/usr.sbin/yppush/Makefile Wed Mar 1 04:23:53 2017 (r314463) > +++ head/usr.sbin/yppush/Makefile Wed Mar 1 04:24:24 2017 (r314464) > @@ -1,8 +1,7 @@ > # $FreeBSD$ > > -RPCDIR= ${.CURDIR}/../../include/rpcsvc > -.PATH: ${RPCDIR} ${.CURDIR}/../../usr.sbin/ypserv \ > - ${.CURDIR}/../../libexec/ypxfr > +RPCDIR= ${SRCTOP}/include/rpcsvc > +.PATH: ${RPCDIR} ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/libexec/ypxfr > > PROG= yppush > MAN= yppush.8 > @@ -10,7 +9,7 @@ SRCS= ypxfr_getmap.c yp_dblookup.c yp_er > ${GENSRCS} > GENSRCS=yp.h yp_clnt.c yppush_svc.c > > -CFLAGS+= -I. -I${.CURDIR}/../../libexec/ypxfr > +CFLAGS+= -I. -I${SRCTOP}/libexec/ypxfr > > WARNS?= 2 > > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Wed Mar 1 05:53:43 2017 Return-Path: Delivered-To: svn-src-all@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 09703CF56EF; Wed, 1 Mar 2017 05:53:43 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AB2EF959; Wed, 1 Mar 2017 05:53:42 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v215rfi4054072; Tue, 28 Feb 2017 21:53:41 -0800 (PST) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd-rwg@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v215rfIj054071; Tue, 28 Feb 2017 21:53:41 -0800 (PST) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <201703010553.v215rfIj054071@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314464 - head/usr.sbin/yppush In-Reply-To: To: "Ngie Cooper (yaneurabeya)" Date: Tue, 28 Feb 2017 21:53:41 -0800 (PST) CC: Ngie Cooper , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 05:53:43 -0000 -- Start of PGP signed section. [ Charset UTF-8 unsupported, converting... ] > > > On Feb 28, 2017, at 21:38, Rodney W. Grimes wrote: > > > > Would it be possible to not do this as 1000 commits? > > Yes, but I?m trying to do this in a way that allows me to backport all of the changes as easily as possible to ^/stable/10 (on the other side of the coin, I?ve run into dependent commits of other MFCs that required sweeping changes in order to make my changes possible). > I do think your point is valid though and I can probably strike some middle ground with my changes. I think grouping it up by 2nd level directory (like I did with usr.bin/svn) makes the most sense. > Thank you, Yes, that is what I was thinking. Note that I dont agree with this change, but I have probably missed a discussion that is allowing it to move forward. It makes the logfiles of make output now src tree possition dependent, but I am probalby the only person in the universe that has ever run a diff on the output of make world. It may also be possible to split this into some phases to reduce some of your issues, only do the {.CURDIR}/../../foo -> ${SRCTOP}/bar/foo in one pass and some of the other fixes in another pass. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Wed Mar 1 05:53:55 2017 Return-Path: Delivered-To: svn-src-all@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 5977ACF574E; Wed, 1 Mar 2017 05:53:55 +0000 (UTC) (envelope-from imp@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 1BA9A9B9; Wed, 1 Mar 2017 05:53:55 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v215rsBf054186; Wed, 1 Mar 2017 05:53:54 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v215rsMY054184; Wed, 1 Mar 2017 05:53:54 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201703010553.v215rsMY054184@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 1 Mar 2017 05:53:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314481 - head/sys/mips/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 05:53:55 -0000 Author: imp Date: Wed Mar 1 05:53:53 2017 New Revision: 314481 URL: https://svnweb.freebsd.org/changeset/base/314481 Log: Add kernel support for the TP-LINK MR3040. Submitted by: Chris Christensen Pull Request: https://github.com/freebsd/freebsd/pull/38 Added: head/sys/mips/conf/TP-MR3040 (contents, props changed) head/sys/mips/conf/TP-MR3040.hints (contents, props changed) Added: head/sys/mips/conf/TP-MR3040 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/mips/conf/TP-MR3040 Wed Mar 1 05:53:53 2017 (r314481) @@ -0,0 +1,70 @@ +# +# TP Link MR3040 - an AR9331 based SoC wifi device. +# +# This is for the 32 RAM/4 flash part. There is little to no +# chance that this will ever boot FreeBSD directly from the 3.5MB +# of flash. The kernel can fit into the space, but userland is just +# too big even when stripped down to its limits. +# +# * AR9331 SoC +# * 32MB RAM +# * 4MB flash +# * Integrated 1x1 2GHz wifi and 10/100 bridge +# * USB powered +# * USB storage +# + +# $FreeBSD$ +# + +#NO_UNIVERSE + +# Include the default AR933x parameters +include "std.AR933X" + +ident TP-MR3040 + +# Override hints with board values +hints "TP-MR3040.hints" + +# Board memory - 32MB +options AR71XX_REALMEM=(32*1024*1024) + +# i2c GPIO bus +device gpioiic +device iicbb +device iicbus +device iic + +# Options required for miiproxy and mdiobus +options ARGE_MDIO # Export an MDIO bus separate from arge +device miiproxy # MDIO bus <-> MII PHY rendezvous + +device etherswitch +device arswitch + +# Enable the uboot environment stuff rather then the +# redboot stuff. +options AR71XX_ENV_UBOOT + +# uzip - to boot read-only lzma natively from flash +device geom_uzip +options GEOM_UZIP +options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\" + +# Used for the static uboot partition map +device geom_map + +# Boot off of the rootfs, as defined in the geom_map setup. +# Probably, this should be a USB device as the memory available +# compressed rootfs is simply too small for FreeBSD +#options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\" + +# Boot off of a uboot tftp ramdisk kernel image. Because the flash +# on this unit is so small, this is the only way to do dev work. +# For full deployment, you will *have* to use a usb storage device +# as a rootfs and use the flash to hold the kernel only. +#options MD_ROOT # md device usable as a potential root device +#options MD_ROOT_SIZE=10240 +#makeoptions MFS_IMAGE=/tftpboot/mfsroot-tl-mr3040.img.ulzma +options ROOTDEVNAME=\"ufs:da0\" Added: head/sys/mips/conf/TP-MR3040.hints ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/mips/conf/TP-MR3040.hints Wed Mar 1 05:53:53 2017 (r314481) @@ -0,0 +1,101 @@ +# +# This file adds to the values in AR933X_BASE.hints +# +# $FreeBSD$ + +# mdiobus on arge1 +hint.argemdio.0.at="nexus0" +hint.argemdio.0.maddr=0x1a000000 +hint.argemdio.0.msize=0x1000 +hint.argemdio.0.order=0 + +# There's no need to set the ar933x GMAC configuration bits. +# This just creates a switch instance and correctly uses it. + +# Embedded Atheros Switch +hint.arswitch.0.at="mdio0" + +# XXX this should really say it's an AR933x switch, as there +# are some vlan specific differences here! +hint.arswitch.0.is_7240=1 +hint.arswitch.0.numphys=4 +hint.arswitch.0.phy4cpu=1 # phy 4 is a "CPU" separate PHY +hint.arswitch.0.is_rgmii=0 +hint.arswitch.0.is_gmii=1 # arge1 <-> switch PHY is GMII + +# arge0 - MII, autoneg, phy(4) +hint.arge.0.phymask=0x10 # PHY4 +hint.arge.0.mdio=mdioproxy1 # .. off of the switch mdiobus + +# arge1 - GMII, 1000/full +hint.arge.1.phymask=0x0 # No directly mapped PHYs +hint.arge.1.media=1000 +hint.arge.1.fduplex=1 + +# Where the ART is - last 64k in the flash +# 0x9fff1000 ? +hint.ath.0.eepromaddr=0x1fff0000 +hint.ath.0.eepromsize=16384 + +# The board 16MiB flash layout in uboot env: +# +# 256k(u-boot),64k(u-boot-env),2752k(rootfs),896k(uImage),64k(NVRAM),64k(ART) + +# However, it boots from 0x9f050000, which is the front of the flsah! +# Thus the kernel/rootfs are switched around. + +# 256KB +hint.map.0.at="flash/spi0" +hint.map.0.start=0x00000000 +hint.map.0.end=0x00040000 +hint.map.0.name="uboot" +hint.map.0.readonly=1 + +# 64KB +hint.map.1.at="flash/spi0" +hint.map.1.start=0x00040000 +hint.map.1.end=0x00050000 +hint.map.1.name="uboot-env" +hint.map.1.readonly=0 + +# 2752KB +hint.map.2.at="flash/spi0" +hint.map.2.start=0x00050000 +hint.map.2.end="search:0x00100000:0x10000:.!/bin/sh" +hint.map.2.name="kernel" +hint.map.2.readonly=0 + +# 896KB +hint.map.3.at="flash/spi0" +hint.map.3.start="search:0x00100000:0x10000:.!/bin/sh" +hint.map.3.end=0x003e0000 +hint.map.3.name="rootfs" +hint.map.3.readonly=0 + +# 64K NVRAM +hint.map.4.at="flash/spi0" +hint.map.4.start=0x003e0000 +hint.map.4.end=0x003f0000 +hint.map.4.name="cfg" +hint.map.4.readonly=0 + +# 64K ART +hint.map.5.at="flash/spi0" +hint.map.5.start=0x003f0000 +hint.map.5.end=0x00400000 +hint.map.5.name="art" +hint.map.5.readonly=1 + +# GPIO specific configuration block + +# Don't flip on anything that isn't already enabled. +# This includes leaving the SPI CS1/CS2 pins as GPIO pins as they're +# not used here. +hint.gpio.0.function_set=0x00000000 +hint.gpio.0.function_clear=0x00000000 + +# These are the GPIO LEDs and buttons which can be software controlled. +#hint.gpio.0.pinmask=0x001c02ae +#hint.gpio.0.pinmask=0x00001803 + +# XXX TODO: the button and LEDs! From owner-svn-src-all@freebsd.org Wed Mar 1 05:45:27 2017 Return-Path: Delivered-To: svn-src-all@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 AB39CCF5CD7; Wed, 1 Mar 2017 05:45:27 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 887211FAF; Wed, 1 Mar 2017 05:45:27 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v215jPRT054052; Tue, 28 Feb 2017 21:45:25 -0800 (PST) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd-rwg@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v215jPSG054051; Tue, 28 Feb 2017 21:45:25 -0800 (PST) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <201703010545.v215jPSG054051@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314473 - head In-Reply-To: <201703010505.v21556lZ034584@repo.freebsd.org> To: Warner Losh Date: Tue, 28 Feb 2017 21:45:25 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 05:45:27 -0000 > Author: imp > Date: Wed Mar 1 05:05:05 2017 > New Revision: 314473 > URL: https://svnweb.freebsd.org/changeset/base/314473 > > Log: > Create README.md file for viewing on github. > > This is a lightly edited README using github's MARKDOWN. > > Submitted by: Johan > Pull Request: https://github.com/freebsd/freebsd/pull/56 > > Added: > head/README.md (contents, props changed) > > Added: head/README.md > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/README.md Wed Mar 1 05:05:05 2017 (r314473) > @@ -0,0 +1,86 @@ > +FreeBSD Source: > +--------------- > +This is the top level of the FreeBSD source directory. This file > +was last revised on: > +$FreeBSD$ > + > +For copyright information, please see the file COPYRIGHT in this > +directory (additional copyright information also exists for some > +sources in this tree - please see the specific source directories for > +more information). > + > +The Makefile in this directory supports a number of targets for > +building components (or all) of the FreeBSD source tree. See build(7) > +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html > +for more information, including setting make(1) variables. > + > +The `buildkernel` and `installkernel` targets build and install > +the kernel and the modules (see below). Please see the top of > +the Makefile in this directory for more information on the > +standard build targets and compile-time flags. > + > +Building a kernel is a somewhat more involved process. See build(7), config(8), > +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html > +for more information. > + > +Note: If you want to build and install the kernel with the > +`buildkernel` and `installkernel` targets, you might need to build > +world before. More information is available in the handbook. > + > +The kernel configuration files reside in the `sys//conf` > +sub-directory. GENERIC is the default configuration used in release builds. > +NOTES contains entries and documentation for all possible > +devices, not just those commonly used. > + > + > +Source Roadmap: > +--------------- Is there someway this can be a pointer to the usr/src part of hier(7) and have hier(7) updated to reflect current reality? Also lots and lots of trailing white space... This should be a pointer to hier(7) > +``` > +bin System/user commands. > + > +cddl Various commands and libraries under the Common Development > + and Distribution License. > + > +contrib Packages contributed by 3rd parties. > + > +crypto Cryptography stuff (see crypto/README). > + > +etc Template files for /etc. > + > +gnu Various commands and libraries under the GNU Public License. > + Please see gnu/COPYING* for more information. > + > +include System include files. > + > +kerberos5 Kerberos5 (Heimdal) package. > + > +lib System libraries. > + > +libexec System daemons. > + > +release Release building Makefile & associated tools. > + > +rescue Build system for statically linked /rescue utilities. > + > +sbin System commands. > + > +secure Cryptographic libraries and commands. > + > +share Shared resources. > + > +sys Kernel sources. > + > +tests Regression tests which can be run by Kyua. See tests/README > + for additional information. > + > +tools Utilities for regression testing and miscellaneous tasks. > + > +usr.bin User commands. > + > +usr.sbin System administration commands. > +``` > + > +For information on synchronizing your source tree with one or more of > +the FreeBSD Project's development branches, please see: > + > + http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/synching.html > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Wed Mar 1 07:16:56 2017 Return-Path: Delivered-To: svn-src-all@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 2019ACF32AB; Wed, 1 Mar 2017 07:16:56 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf0-x244.google.com (mail-pf0-x244.google.com [IPv6:2607:f8b0:400e:c00::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EA5571ED; Wed, 1 Mar 2017 07:16:55 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pf0-x244.google.com with SMTP id b5so374462pfa.0; Tue, 28 Feb 2017 23:16:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:mime-version:from:in-reply-to:date:cc:message-id:references :to; bh=Judm7PfH7tsTntYRtHTKkdzF9KqaAosT+mI4Ho/SMsg=; b=l2CV3kVD7+lU4TZwcGAHZNSWUmoD5VxsOxNwS1ZAQBRAH5oTECPFcxswCAC1wYOaFL E1WUONUQTyMuvdZt9o6z6YDcYr+F942pYixpLzPcRLF5wYCAeslPHEAW56WA4MqEkzte nMw4xmbUU+XwcA1QDKHMAGJfjtPa5IpCOsyf8fyr9Y9DVMtdlUtJKVJI2jRGk/9o2asx jAvyPY/lnF9Y3a7oYZ0EkMoyJihYdtjXXKR1RnP0A3GxKEFPfXfT+sTUITdvDU0upzss MpZOyKuSH6W4RCgAkQe/afeuzPtCchMfqB/mz8eYjqIAeGMXa8zCDVGExPC1cQ1MQRrn tc5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:mime-version:from:in-reply-to:date:cc :message-id:references:to; bh=Judm7PfH7tsTntYRtHTKkdzF9KqaAosT+mI4Ho/SMsg=; b=lYu0Hf2L9DZn77kBFBAJp5iBXC6wmNoWrKGv81Edli8bp9cK903Ld/d1RzIA2fY7rV CYlxWeRKrbgOY91Ov1lNssTpvvdMpSj5+t8zxdZHWF9+RuySk2QzVxuckob/5/9yh1Or HwSrKVUDVQJzlTl+ekxXSMStY7c51BS8dH0tpDHWN4byP0Lf5cPCVd3I1cXPgHbZrgQZ Or6lcCdybCdTarxLsCfyljiqYuUci0Byw/X9bx9S4+O07Zq2dcClgy4rVwc3grwVolHt 4yQZ1t/kklZXsoMbxvbhnSkDI2GOvijVB8mrDTfOKpnVhWKdxFwJm9ksdONDEUIa+Jbw oDLw== X-Gm-Message-State: AMke39liS542CEhJm2fQhUmFSB+UYXruIiN8b9b9wRby4H/ehIae/I20xCrzrVp4/aUokA== X-Received: by 10.84.224.133 with SMTP id s5mr8151019plj.93.1488352615423; Tue, 28 Feb 2017 23:16:55 -0800 (PST) Received: from pinklady.local (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id 202sm8186641pfa.6.2017.02.28.23.16.54 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Feb 2017 23:16:54 -0800 (PST) Subject: Re: svn commit: r314464 - head/usr.sbin/yppush Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Content-Type: multipart/signed; boundary="Apple-Mail=_7AA1D18F-7151-4F75-A0EC-614455F1C8A5"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail From: "Ngie Cooper (yaneurabeya)" In-Reply-To: <201703010553.v215rfIj054071@pdx.rh.CN85.dnsmgr.net> Date: Tue, 28 Feb 2017 23:16:53 -0800 Cc: Ngie Cooper , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: <04EB01C9-6115-44A3-89EB-A8ED37A107E5@gmail.com> References: <201703010553.v215rfIj054071@pdx.rh.CN85.dnsmgr.net> To: "Rodney W. Grimes" X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 07:16:56 -0000 --Apple-Mail=_7AA1D18F-7151-4F75-A0EC-614455F1C8A5 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Feb 28, 2017, at 21:53, Rodney W. Grimes = wrote: >=20 > -- Start of PGP signed section. > [ Charset UTF-8 unsupported, converting... ] >>=20 >>> On Feb 28, 2017, at 21:38, Rodney W. Grimes = wrote: >>>=20 >>> Would it be possible to not do this as 1000 commits? >>=20 >> Yes, but I?m trying to do this in a way that allows me to = backport all of the changes as easily as possible to ^/stable/10 (on the = other side of the coin, I?ve run into dependent commits of other MFCs = that required sweeping changes in order to make my changes possible). >> I do think your point is valid though and I can probably strike = some middle ground with my changes. I think grouping it up by 2nd level = directory (like I did with usr.bin/svn) makes the most sense. >> Thank you, >=20 > Yes, that is what I was thinking. Note that I dont agree with this = change, > but I have probably missed a discussion that is allowing it to move = forward. > It makes the logfiles of make output now src tree possition dependent, > but I am probalby the only person in the universe that has ever run a > diff on the output of make world. It was much the same way before, i.e. .CURDIR was a full path. My doing = this achieves what you described, it helps dumb tools (like Jenkins) = dedupe warnings though, and it also makes it easier to fork/build on = different components in the source tree (I recently embarked on joining = a forked copy of syslogd at $work, and using SRCTOP helps me achieve = that, in the sense that I don=E2=80=99t need to duplicate Makefiles). > It may also be possible to split this into some phases to reduce some = of > your issues, only do the {.CURDIR}/../../foo -> ${SRCTOP}/bar/foo in = one pass and > some of the other fixes in another pass. Yeah. That seems reasonable (I will split it up into larger chunks). Thanks, -Ngie --Apple-Mail=_7AA1D18F-7151-4F75-A0EC-614455F1C8A5 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJYtnVlAAoJEPWDqSZpMIYVjYEP/1v8c2BjppCdqW0S2avqi3t+ xVbROW5JCL0vRTfizl33T9+Ztcec2LuYTnNaoqmSyHSLa6dO0Wov0MTmxm3Mr6zG v102d1FKEO/f002dBprsWYIftHNEtDmN/K1WD+cHsxf156yUERm/2yKb8aeWs7yv fo2Q4lxI/z0yycdcAl6vmHWu7Bp4aloMPqEErDApEWLqlQxJgWcD96vetdf/iaq2 yF9PvHtaFnuOBE/a6KkDHLcayRk77YTEzvErJ69o1RaMrMxc+VY+htnMbhvs4Isx 1kLWBv5L2Eu7PkyH1Rf7kURtyj+htzkS1DoS8FJzAoUARsisBaQdjjyRqEJ+A3bn G/yyiKIRi1mw687abZOJ30aXm2Qm+l8ruUaz/Cn4s/NJpEl355blQlllqiLKtszz XSv8DyIe+JSvRs/EBRaeW3rQ59X8ppep2+3D4TzWpWNjGJbx1/HvPq87DhfIn0Hs nZxTmDxobTNfLMEoPR1xWXBy2rr68s8HsiN7Rw3dP7MTIGOsgDDquSrGlXBBJq+L GO/c1zhV1KxH2oHGioiSYrM4lmWl31PP43fFpUAWv68WzM00D4n1JbATJ6p3UztZ GaqHvfgaMfpMT7QQwvOA031go1P/xx2nX6jLqYroxizoKpcrGTzbp040POP7KxMh a8hhg6MQeW40O1086n0i =E2aP -----END PGP SIGNATURE----- --Apple-Mail=_7AA1D18F-7151-4F75-A0EC-614455F1C8A5-- From owner-svn-src-all@freebsd.org Wed Mar 1 08:01:44 2017 Return-Path: Delivered-To: svn-src-all@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 863CECF2738; Wed, 1 Mar 2017 08:01:44 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "vps1.elischer.org", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id CCA32859; Wed, 1 Mar 2017 08:01:43 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from Julian-MBP3.local (220-253-188-71.dyn.iinet.net.au [220.253.188.71]) (authenticated bits=0) by vps1.elischer.org (8.15.2/8.15.2) with ESMTPSA id v2181bVD018360 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Wed, 1 Mar 2017 00:01:40 -0800 (PST) (envelope-from julian@freebsd.org) Subject: Re: svn commit: r314465 - stable/11/sys/dev/iscsi To: Alexander Motin , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org References: <201703010424.v214OU21019010@repo.freebsd.org> From: Julian Elischer Message-ID: Date: Wed, 1 Mar 2017 16:01:31 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <201703010424.v214OU21019010@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 08:01:44 -0000 Might be an idea to add a comment in a good place pointing out that that should not be unsigned so that the next person doesn't make the same mistake.. On 1/3/17 12:24 pm, Alexander Motin wrote: > Author: mav > Date: Wed Mar 1 04:24:30 2017 > New Revision: 314465 > URL: https://svnweb.freebsd.org/changeset/base/314465 > > Log: > MFC r313779: Fix handling of negative sbspace() return values. > > I found that at least with Chelsio NICs TOE sockets quite often report > negative sbspace() values. Using unsigned variable to store it resulted > in attempts to aggregate too much data in one sosend() call, that caused > errors and following connection termination. > > Modified: > stable/11/sys/dev/iscsi/icl_soft.c > Directory Properties: > stable/11/ (props changed) > > Modified: stable/11/sys/dev/iscsi/icl_soft.c > ============================================================================== > --- stable/11/sys/dev/iscsi/icl_soft.c Wed Mar 1 04:24:24 2017 (r314464) > +++ stable/11/sys/dev/iscsi/icl_soft.c Wed Mar 1 04:24:30 2017 (r314465) > @@ -892,7 +892,7 @@ icl_conn_send_pdus(struct icl_conn *ic, > { > struct icl_pdu *request, *request2; > struct socket *so; > - size_t available, size, size2; > + long available, size, size2; > int coalesced, error; > > ICL_CONN_LOCK_ASSERT_NOT(ic); > @@ -931,7 +931,7 @@ icl_conn_send_pdus(struct icl_conn *ic, > if (available < size) { > #if 1 > ICL_DEBUG("no space to send; " > - "have %zd, need %zd", > + "have %ld, need %ld", > available, size); > #endif > so->so_snd.sb_lowat = size; > @@ -978,7 +978,7 @@ icl_conn_send_pdus(struct icl_conn *ic, > } > #if 0 > if (coalesced > 1) { > - ICL_DEBUG("coalesced %d PDUs into %zd bytes", > + ICL_DEBUG("coalesced %d PDUs into %ld bytes", > coalesced, size); > } > #endif > > From owner-svn-src-all@freebsd.org Wed Mar 1 08:24:18 2017 Return-Path: Delivered-To: svn-src-all@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 5FE50CF2ECE; Wed, 1 Mar 2017 08:24:18 +0000 (UTC) (envelope-from sephe@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 2F7C0689; Wed, 1 Mar 2017 08:24:18 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v218OHgT012586; Wed, 1 Mar 2017 08:24:17 GMT (envelope-from sephe@FreeBSD.org) Received: (from sephe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v218OH01012585; Wed, 1 Mar 2017 08:24:17 GMT (envelope-from sephe@FreeBSD.org) Message-Id: <201703010824.v218OH01012585@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sephe set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau Date: Wed, 1 Mar 2017 08:24:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314483 - head/sys/dev/hyperv/netvsc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 08:24:18 -0000 Author: sephe Date: Wed Mar 1 08:24:17 2017 New Revision: 314483 URL: https://svnweb.freebsd.org/changeset/base/314483 Log: hyperv/hn: Simplify RNDIS packet total length calculation. MFC after: 1 week Sponsored by: Microsoft Differential Revision: https://reviews.freebsd.org/D9712 Modified: head/sys/dev/hyperv/netvsc/if_hn.c Modified: head/sys/dev/hyperv/netvsc/if_hn.c ============================================================================== --- head/sys/dev/hyperv/netvsc/if_hn.c Wed Mar 1 08:22:51 2017 (r314482) +++ head/sys/dev/hyperv/netvsc/if_hn.c Wed Mar 1 08:24:17 2017 (r314483) @@ -1784,9 +1784,6 @@ hn_rndis_pktinfo_append(struct rndis_pac pi->rm_type = pi_type; pi->rm_pktinfooffset = RNDIS_PKTINFO_OFFSET; - /* Update RNDIS packet msg length */ - pkt->rm_len += pi_size; - return (pi->rm_data); } @@ -1928,7 +1925,7 @@ hn_encap(struct ifnet *ifp, struct hn_tx } pkt->rm_type = REMOTE_NDIS_PACKET_MSG; - pkt->rm_len = sizeof(*pkt) + m_head->m_pkthdr.len; + pkt->rm_len = m_head->m_pkthdr.len; pkt->rm_dataoffset = 0; pkt->rm_datalen = m_head->m_pkthdr.len; pkt->rm_oobdataoffset = 0; @@ -1999,6 +1996,8 @@ hn_encap(struct ifnet *ifp, struct hn_tx } pkt_hlen = pkt->rm_pktinfooffset + pkt->rm_pktinfolen; + /* Fixup RNDIS packet message total length */ + pkt->rm_len += pkt_hlen; /* Convert RNDIS packet message offsets */ pkt->rm_dataoffset = hn_rndis_pktmsg_offset(pkt_hlen); pkt->rm_pktinfooffset = hn_rndis_pktmsg_offset(pkt->rm_pktinfooffset); From owner-svn-src-all@freebsd.org Wed Mar 1 08:31:21 2017 Return-Path: Delivered-To: svn-src-all@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 DDEF8CF102C; Wed, 1 Mar 2017 08:31:21 +0000 (UTC) (envelope-from florian.ermisch@mailbox.org) Received: from mx1.mailbox.org (mx1.mailbox.org [80.241.60.212]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.mailbox.org", Issuer "SwissSign Server Silver CA 2014 - G22" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A0561A8A; Wed, 1 Mar 2017 08:31:21 +0000 (UTC) (envelope-from florian.ermisch@mailbox.org) Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 9E37145025; Wed, 1 Mar 2017 09:22:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mailbox.org; h= message-id:from:from:subject:subject:content-transfer-encoding :content-type:content-type:mime-version:references:in-reply-to :date:date:received; s=mail20150812; t=1488356513; bh=WbY4Kjzg+C r9+Pfuy6hkMNXo15tVgIODzuIY5txmTFQ=; b=uQTsnGrdKX3OKXQvpddUc5GgYI +5TsE2XeDKXdnelh598dGQtSssa6/KcZ3uLfojLaRGpvjev8otA8f61OGW93sGfy L2wzpFKwmLXHokK8uri0k2G4d+q9/eSfy66phHMTFJDTqzNF6mdIgwm6gtcap0u4 P1oZT3d6kxcOkSwzN0ubJ0IJi9kHdtCaQ96pyYhuE/VGDttzI2hkVrdwe9L5A9jo 4uYXTl2RnqBK31BBmfTrwYhFp6tqTx3mIQqksh2SqJUTt4kAmgm3+xI2jP7bVlYm ZmM9LHZNuAL/0Mdg3i2MSfzspHd8k2vsKdLh0GxMD0wnNk+2+rI89cjykjXw== X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id riNiHNGirZmN; Wed, 1 Mar 2017 09:21:53 +0100 (CET) Date: Wed, 01 Mar 2017 09:21:50 +0100 In-Reply-To: <201703010545.v215jPSG054051@pdx.rh.CN85.dnsmgr.net> References: <201703010545.v215jPSG054051@pdx.rh.CN85.dnsmgr.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: svn commit: r314473 - head To: svn-src-head@freebsd.org, "Rodney W. Grimes" , Warner Losh CC: svn-src-all@freebsd.org,src-committers@freebsd.org From: Florian Ermisch Message-ID: <3C4A5F75-A1C3-4E71-9782-CA051BA3BF2E@mailbox.org> X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 08:31:22 -0000 Am 1=2E M=C3=A4rz 2017 06:45:25 MEZ schrieb "Rodney W=2E Grimes" : >> Author: imp >> Date: Wed Mar 1 05:05:05 2017 >> New Revision: 314473 >> URL: https://svnweb=2Efreebsd=2Eorg/changeset/base/314473 >>=20 >> Log: >> Create README=2Emd file for viewing on github=2E >> =20 >> This is a lightly edited README using github's MARKDOWN=2E >> =20 >> Submitted by: Johan >> Pull Request: https://github=2Ecom/freebsd/freebsd/pull/56 >>=20 >> Added: >> head/README=2Emd (contents, props changed) >> [=E2=80=A6] > [=E2=80=A6] >Also lots and lots of trailing white space=2E=2E=2E > >[=E2=80=A6] Trailing whitespace can be significant in markdown: Two trailing spaces force a=20 linebreak in the rendered output=2E=20 Regards, Florian From owner-svn-src-all@freebsd.org Wed Mar 1 08:50:43 2017 Return-Path: Delivered-To: svn-src-all@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 3AE47CF1A10; Wed, 1 Mar 2017 08:50:43 +0000 (UTC) (envelope-from sephe@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 0A68E6EB; Wed, 1 Mar 2017 08:50:42 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v218ogUq020758; Wed, 1 Mar 2017 08:50:42 GMT (envelope-from sephe@FreeBSD.org) Received: (from sephe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v218og56020757; Wed, 1 Mar 2017 08:50:42 GMT (envelope-from sephe@FreeBSD.org) Message-Id: <201703010850.v218og56020757@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sephe set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau Date: Wed, 1 Mar 2017 08:50:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314484 - head/sys/dev/hyperv/netvsc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 08:50:43 -0000 Author: sephe Date: Wed Mar 1 08:50:41 2017 New Revision: 314484 URL: https://svnweb.freebsd.org/changeset/base/314484 Log: hyperv/hn: Make sure that RNDIS packet message is at least 4B aligned. MFC after: 1 week Sponsored by: Microsoft Differential Revision: https://reviews.freebsd.org/D9713 Modified: head/sys/dev/hyperv/netvsc/hn_rndis.c Modified: head/sys/dev/hyperv/netvsc/hn_rndis.c ============================================================================== --- head/sys/dev/hyperv/netvsc/hn_rndis.c Wed Mar 1 08:24:17 2017 (r314483) +++ head/sys/dev/hyperv/netvsc/hn_rndis.c Wed Mar 1 08:50:41 2017 (r314484) @@ -841,9 +841,22 @@ hn_rndis_init(struct hn_softc *sc) sc->hn_rndis_agg_pkts = comp->rm_pktmaxcnt; sc->hn_rndis_agg_align = 1U << comp->rm_align; + if (sc->hn_rndis_agg_align < sizeof(uint32_t)) { + /* + * The RNDIS packet messsage encap assumes that the RNDIS + * packet message is at least 4 bytes aligned. Fix up the + * alignment here, if the remote side sets the alignment + * too low. + */ + if_printf(sc->hn_ifp, "fixup RNDIS aggpkt align: %u -> %zu\n", + sc->hn_rndis_agg_align, sizeof(uint32_t)); + sc->hn_rndis_agg_align = sizeof(uint32_t); + } + if (bootverbose) { - if_printf(sc->hn_ifp, "RNDIS ver %u.%u, pktsz %u, pktcnt %u, " - "align %u\n", comp->rm_ver_major, comp->rm_ver_minor, + if_printf(sc->hn_ifp, "RNDIS ver %u.%u, " + "aggpkt size %u, aggpkt cnt %u, aggpkt align %u\n", + comp->rm_ver_major, comp->rm_ver_minor, sc->hn_rndis_agg_size, sc->hn_rndis_agg_pkts, sc->hn_rndis_agg_align); } From owner-svn-src-all@freebsd.org Wed Mar 1 09:05:14 2017 Return-Path: Delivered-To: svn-src-all@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 3569ACF312E; Wed, 1 Mar 2017 09:05:14 +0000 (UTC) (envelope-from sephe@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 F3C35FB3; Wed, 1 Mar 2017 09:05:13 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2195DtA028378; Wed, 1 Mar 2017 09:05:13 GMT (envelope-from sephe@FreeBSD.org) Received: (from sephe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2195DLH028377; Wed, 1 Mar 2017 09:05:13 GMT (envelope-from sephe@FreeBSD.org) Message-Id: <201703010905.v2195DLH028377@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sephe set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau Date: Wed, 1 Mar 2017 09:05:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314485 - head/sys/dev/hyperv/netvsc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 09:05:14 -0000 Author: sephe Date: Wed Mar 1 09:05:12 2017 New Revision: 314485 URL: https://svnweb.freebsd.org/changeset/base/314485 Log: hyperv/hn: Misaligned chimney sending buffers should not be used MFC after: 1 week Sponsored by: Microsoft Differential Revision: https://reviews.freebsd.org/D9714 Modified: head/sys/dev/hyperv/netvsc/hn_nvs.c Modified: head/sys/dev/hyperv/netvsc/hn_nvs.c ============================================================================== --- head/sys/dev/hyperv/netvsc/hn_nvs.c Wed Mar 1 08:50:41 2017 (r314484) +++ head/sys/dev/hyperv/netvsc/hn_nvs.c Wed Mar 1 09:05:12 2017 (r314485) @@ -272,12 +272,17 @@ hn_nvs_conn_chim(struct hn_softc *sc) error = EIO; goto cleanup; } - if (sectsz == 0) { + if (sectsz == 0 || sectsz % sizeof(uint32_t) != 0) { /* * Can't use chimney sending buffer; done! */ - if_printf(sc->hn_ifp, "zero chimney sending buffer " - "section size\n"); + if (sectsz == 0) { + if_printf(sc->hn_ifp, "zero chimney sending buffer " + "section size\n"); + } else { + if_printf(sc->hn_ifp, "misaligned chimney sending " + "buffers, section size: %u\n", sectsz); + } sc->hn_chim_szmax = 0; sc->hn_chim_cnt = 0; sc->hn_flags |= HN_FLAG_CHIM_CONNECTED; From owner-svn-src-all@freebsd.org Wed Mar 1 10:22:08 2017 Return-Path: Delivered-To: svn-src-all@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 8BAC4CF317A; Wed, 1 Mar 2017 10:22:08 +0000 (UTC) (envelope-from kib@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 3D8F8BAA; Wed, 1 Mar 2017 10:22:08 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21AM7Sn056828; Wed, 1 Mar 2017 10:22:07 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21AM7p4056827; Wed, 1 Mar 2017 10:22:07 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201703011022.v21AM7p4056827@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 1 Mar 2017 10:22:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314486 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 10:22:08 -0000 Author: kib Date: Wed Mar 1 10:22:07 2017 New Revision: 314486 URL: https://svnweb.freebsd.org/changeset/base/314486 Log: When deallocating the vm object in elf_map_insert() due to vm_map_insert() failure, drop the vnode lock around the call to vm_object_deallocate(). Since the deallocated object is the vm object of the vnode, we might get the vnode lock recursion there. In fact, it is almost impossible to make vm_map_insert() failing there on stock kernel. Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Modified: head/sys/kern/imgact_elf.c Modified: head/sys/kern/imgact_elf.c ============================================================================== --- head/sys/kern/imgact_elf.c Wed Mar 1 09:05:12 2017 (r314485) +++ head/sys/kern/imgact_elf.c Wed Mar 1 10:22:07 2017 (r314486) @@ -422,13 +422,14 @@ __elfN(map_partial)(vm_map_t map, vm_obj } static int -__elfN(map_insert)(vm_map_t map, vm_object_t object, vm_ooffset_t offset, - vm_offset_t start, vm_offset_t end, vm_prot_t prot, int cow) +__elfN(map_insert)(struct image_params *imgp, vm_map_t map, vm_object_t object, + vm_ooffset_t offset, vm_offset_t start, vm_offset_t end, vm_prot_t prot, + int cow) { struct sf_buf *sf; vm_offset_t off; vm_size_t sz; - int error, rv; + int error, locked, rv; if (start != trunc_page(start)) { rv = __elfN(map_partial)(map, object, offset, start, @@ -480,8 +481,12 @@ __elfN(map_insert)(vm_map_t map, vm_obje rv = vm_map_insert(map, object, offset, start, end, prot, VM_PROT_ALL, cow); vm_map_unlock(map); - if (rv != KERN_SUCCESS) + if (rv != KERN_SUCCESS) { + locked = VOP_ISLOCKED(imgp->vp); + VOP_UNLOCK(imgp->vp, 0); vm_object_deallocate(object); + vn_lock(imgp->vp, locked | LK_RETRY); + } } return (rv); } else { @@ -538,7 +543,7 @@ __elfN(load_section)(struct image_params cow = MAP_COPY_ON_WRITE | MAP_PREFAULT | (prot & VM_PROT_WRITE ? 0 : MAP_DISABLE_COREDUMP); - rv = __elfN(map_insert)(map, + rv = __elfN(map_insert)(imgp, map, object, file_addr, /* file offset */ map_addr, /* virtual start */ @@ -568,8 +573,8 @@ __elfN(load_section)(struct image_params /* This had damn well better be true! */ if (map_len != 0) { - rv = __elfN(map_insert)(map, NULL, 0, map_addr, map_addr + - map_len, VM_PROT_ALL, 0); + rv = __elfN(map_insert)(imgp, map, NULL, 0, map_addr, + map_addr + map_len, VM_PROT_ALL, 0); if (rv != KERN_SUCCESS) { return (EINVAL); } From owner-svn-src-all@freebsd.org Wed Mar 1 10:28:17 2017 Return-Path: Delivered-To: svn-src-all@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 37ADECF333E; Wed, 1 Mar 2017 10:28:17 +0000 (UTC) (envelope-from kib@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 07950F1F; Wed, 1 Mar 2017 10:28:16 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21ASG39059237; Wed, 1 Mar 2017 10:28:16 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21ASGO1059236; Wed, 1 Mar 2017 10:28:16 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201703011028.v21ASGO1059236@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 1 Mar 2017 10:28:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314487 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 10:28:17 -0000 Author: kib Date: Wed Mar 1 10:28:15 2017 New Revision: 314487 URL: https://svnweb.freebsd.org/changeset/base/314487 Log: Use vm_map_insert() instead of vm_map_find() in elf_map_insert(). Elf_map_insert() needs to create mapping at the known fixed address. Usage of vm_map_find() assumes, on the other hand, that any suitable address space range above or equal the specified hint, is acceptable. Due to operating on the fresh or cleared address space, vm_map_find() usually creates mapping starting exactly at hint. Switch to vm_map_insert() use to clearly request fixed mapping from the VM. Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Modified: head/sys/kern/imgact_elf.c Modified: head/sys/kern/imgact_elf.c ============================================================================== --- head/sys/kern/imgact_elf.c Wed Mar 1 10:22:07 2017 (r314486) +++ head/sys/kern/imgact_elf.c Wed Mar 1 10:28:15 2017 (r314487) @@ -452,9 +452,10 @@ __elfN(map_insert)(struct image_params * * The mapping is not page aligned. This means we have * to copy the data. Sigh. */ - rv = vm_map_find(map, NULL, 0, &start, end - start, 0, - VMFS_NO_SPACE, prot | VM_PROT_WRITE, VM_PROT_ALL, - 0); + vm_map_lock(map); + rv = vm_map_insert(map, NULL, 0, start, end, + prot | VM_PROT_WRITE, VM_PROT_ALL, 0); + vm_map_unlock(map); if (rv != KERN_SUCCESS) return (rv); if (object == NULL) From owner-svn-src-all@freebsd.org Wed Mar 1 10:55:14 2017 Return-Path: Delivered-To: svn-src-all@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 47AA7CF3A40; Wed, 1 Mar 2017 10:55:14 +0000 (UTC) (envelope-from br@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 1766811B; Wed, 1 Mar 2017 10:55:14 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21AtDv7070617; Wed, 1 Mar 2017 10:55:13 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21AtD7V070616; Wed, 1 Mar 2017 10:55:13 GMT (envelope-from br@FreeBSD.org) Message-Id: <201703011055.v21AtD7V070616@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Wed, 1 Mar 2017 10:55:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314488 - head/sys/boot/fdt/dts/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 10:55:14 -0000 Author: br Date: Wed Mar 1 10:55:12 2017 New Revision: 314488 URL: https://svnweb.freebsd.org/changeset/base/314488 Log: Set USB OTG mode to host (missed in vendor DTS for some reason). Sponsored by: DARPA, AFRL Modified: head/sys/boot/fdt/dts/arm/socfpga_arria10_socdk_sdmmc.dts Modified: head/sys/boot/fdt/dts/arm/socfpga_arria10_socdk_sdmmc.dts ============================================================================== --- head/sys/boot/fdt/dts/arm/socfpga_arria10_socdk_sdmmc.dts Wed Mar 1 10:28:15 2017 (r314487) +++ head/sys/boot/fdt/dts/arm/socfpga_arria10_socdk_sdmmc.dts Wed Mar 1 10:55:12 2017 (r314488) @@ -80,3 +80,7 @@ reg = <0x28>; }; }; + +&usb0 { + dr_mode = "host"; +}; From owner-svn-src-all@freebsd.org Wed Mar 1 11:39:30 2017 Return-Path: Delivered-To: svn-src-all@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 C79FCCF367A; Wed, 1 Mar 2017 11:39:30 +0000 (UTC) (envelope-from kib@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 8DA2A25C; Wed, 1 Mar 2017 11:39:30 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21BdTZM087459; Wed, 1 Mar 2017 11:39:29 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21BdTou087458; Wed, 1 Mar 2017 11:39:29 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201703011139.v21BdTou087458@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 1 Mar 2017 11:39:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314489 - head/sys/compat/ia32 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 11:39:30 -0000 Author: kib Date: Wed Mar 1 11:39:29 2017 New Revision: 314489 URL: https://svnweb.freebsd.org/changeset/base/314489 Log: With the removal of IA64, the only arch which uses ia32 compat is amd64. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Modified: head/sys/compat/ia32/ia32_sysvec.c Modified: head/sys/compat/ia32/ia32_sysvec.c ============================================================================== --- head/sys/compat/ia32/ia32_sysvec.c Wed Mar 1 10:55:12 2017 (r314488) +++ head/sys/compat/ia32/ia32_sysvec.c Wed Mar 1 11:39:29 2017 (r314489) @@ -120,11 +120,8 @@ struct sysentvec ia32_freebsd_sysvec = { .sv_setregs = ia32_setregs, .sv_fixlimit = ia32_fixlimit, .sv_maxssiz = &ia32_maxssiz, - .sv_flags = -#ifdef __amd64__ - SV_SHP | SV_TIMEKEEP | -#endif - SV_ABI_FREEBSD | SV_IA32 | SV_ILP32, + .sv_flags = SV_ABI_FREEBSD | SV_IA32 | SV_ILP32 | + SV_SHP | SV_TIMEKEEP, .sv_set_syscall_retval = ia32_set_syscall_retval, .sv_fetch_syscall_args = ia32_fetch_syscall_args, .sv_syscallnames = freebsd32_syscallnames, From owner-svn-src-all@freebsd.org Wed Mar 1 12:10:26 2017 Return-Path: Delivered-To: svn-src-all@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 42C73CF25B3; Wed, 1 Mar 2017 12:10:26 +0000 (UTC) (envelope-from kib@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 129DF942; Wed, 1 Mar 2017 12:10:26 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21CAP1x099244; Wed, 1 Mar 2017 12:10:25 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21CAPiY099243; Wed, 1 Mar 2017 12:10:25 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201703011210.v21CAPiY099243@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 1 Mar 2017 12:10:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314490 - head/sys/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 12:10:26 -0000 Author: kib Date: Wed Mar 1 12:10:24 2017 New Revision: 314490 URL: https://svnweb.freebsd.org/changeset/base/314490 Log: Add some explanation for SV_TIMEKEEP flag. Sponsored by: The FreeBSD Foundation MFC after: 3 days Modified: head/sys/sys/sysent.h Modified: head/sys/sys/sysent.h ============================================================================== --- head/sys/sys/sysent.h Wed Mar 1 11:39:29 2017 (r314489) +++ head/sys/sys/sysent.h Wed Mar 1 12:10:24 2017 (r314490) @@ -138,7 +138,7 @@ struct sysentvec { #define SV_AOUT 0x008000 /* a.out executable. */ #define SV_SHP 0x010000 /* Shared page. */ #define SV_CAPSICUM 0x020000 /* Force cap_enter() on startup. */ -#define SV_TIMEKEEP 0x040000 +#define SV_TIMEKEEP 0x040000 /* Shared page timehands. */ #define SV_ABI_MASK 0xff #define SV_ABI_ERRNO(p, e) ((p)->p_sysent->sv_errsize <= 0 ? e : \ From owner-svn-src-all@freebsd.org Wed Mar 1 13:45:41 2017 Return-Path: Delivered-To: svn-src-all@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 E2DB4CF3EDB; Wed, 1 Mar 2017 13:45:41 +0000 (UTC) (envelope-from avg@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 AFBE99DE; Wed, 1 Mar 2017 13:45:41 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21Dje2Q038126; Wed, 1 Mar 2017 13:45:40 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21DjeFS038125; Wed, 1 Mar 2017 13:45:40 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703011345.v21DjeFS038125@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Wed, 1 Mar 2017 13:45:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314491 - stable/11/sys/sys X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 13:45:42 -0000 Author: avg Date: Wed Mar 1 13:45:40 2017 New Revision: 314491 URL: https://svnweb.freebsd.org/changeset/base/314491 Log: MFC r314100: fix a typo in __STDC_VERSION__ in __min_size requirements Modified: stable/11/sys/sys/cdefs.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/sys/cdefs.h ============================================================================== --- stable/11/sys/sys/cdefs.h Wed Mar 1 12:10:24 2017 (r314490) +++ stable/11/sys/sys/cdefs.h Wed Mar 1 13:45:40 2017 (r314491) @@ -349,7 +349,7 @@ * void bar(int myArray[__min_size(10)]); */ #if !defined(__cplusplus) && \ - (!defined(__STDC_VERSION) || (__STDC_VERSION__ >= 199901)) + (!defined(__STDC_VERSION__) || (__STDC_VERSION__ >= 199901)) #define __min_size(x) static (x) #else #define __min_size(x) (x) From owner-svn-src-all@freebsd.org Wed Mar 1 13:45:52 2017 Return-Path: Delivered-To: svn-src-all@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 32146CF3F19; Wed, 1 Mar 2017 13:45:52 +0000 (UTC) (envelope-from avg@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 F3343A78; Wed, 1 Mar 2017 13:45:51 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21DjpN6038181; Wed, 1 Mar 2017 13:45:51 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21DjpM9038180; Wed, 1 Mar 2017 13:45:51 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703011345.v21DjpM9038180@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Wed, 1 Mar 2017 13:45:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314492 - stable/10/sys/sys X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 13:45:52 -0000 Author: avg Date: Wed Mar 1 13:45:50 2017 New Revision: 314492 URL: https://svnweb.freebsd.org/changeset/base/314492 Log: MFC r314100: fix a typo in __STDC_VERSION__ in __min_size requirements Modified: stable/10/sys/sys/cdefs.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/sys/cdefs.h ============================================================================== --- stable/10/sys/sys/cdefs.h Wed Mar 1 13:45:40 2017 (r314491) +++ stable/10/sys/sys/cdefs.h Wed Mar 1 13:45:50 2017 (r314492) @@ -340,7 +340,7 @@ * void bar(int myArray[__min_size(10)]); */ #if !defined(__cplusplus) && \ - (!defined(__STDC_VERSION) || (__STDC_VERSION__ >= 199901)) + (!defined(__STDC_VERSION__) || (__STDC_VERSION__ >= 199901)) #define __min_size(x) static (x) #else #define __min_size(x) (x) From owner-svn-src-all@freebsd.org Wed Mar 1 13:47:30 2017 Return-Path: Delivered-To: svn-src-all@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 2750FCEE022; Wed, 1 Mar 2017 13:47:30 +0000 (UTC) (envelope-from avg@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 E839FCB1; Wed, 1 Mar 2017 13:47:29 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21DlSvn038297; Wed, 1 Mar 2017 13:47:28 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21DlSnb038296; Wed, 1 Mar 2017 13:47:28 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703011347.v21DlSnb038296@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Wed, 1 Mar 2017 13:47:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314493 - stable/11/sys/sys X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 13:47:30 -0000 Author: avg Date: Wed Mar 1 13:47:28 2017 New Revision: 314493 URL: https://svnweb.freebsd.org/changeset/base/314493 Log: MFC r314101: don't use C99 static array indices with older GCC versions Sponsored by: Panzura Modified: stable/11/sys/sys/cdefs.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/sys/cdefs.h ============================================================================== --- stable/11/sys/sys/cdefs.h Wed Mar 1 13:45:50 2017 (r314492) +++ stable/11/sys/sys/cdefs.h Wed Mar 1 13:47:28 2017 (r314493) @@ -349,6 +349,7 @@ * void bar(int myArray[__min_size(10)]); */ #if !defined(__cplusplus) && \ + (defined(__clang__) || __GNUC_PREREQ__(4, 6)) && \ (!defined(__STDC_VERSION__) || (__STDC_VERSION__ >= 199901)) #define __min_size(x) static (x) #else From owner-svn-src-all@freebsd.org Wed Mar 1 13:47:38 2017 Return-Path: Delivered-To: svn-src-all@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 52A30CEE073; Wed, 1 Mar 2017 13:47:38 +0000 (UTC) (envelope-from avg@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 1FA32D1E; Wed, 1 Mar 2017 13:47:38 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21DlbNd038347; Wed, 1 Mar 2017 13:47:37 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21DlbYi038346; Wed, 1 Mar 2017 13:47:37 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703011347.v21DlbYi038346@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Wed, 1 Mar 2017 13:47:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314494 - stable/10/sys/sys X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 13:47:38 -0000 Author: avg Date: Wed Mar 1 13:47:36 2017 New Revision: 314494 URL: https://svnweb.freebsd.org/changeset/base/314494 Log: MFC r314101: don't use C99 static array indices with older GCC versions Sponsored by: Panzura Modified: stable/10/sys/sys/cdefs.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/sys/cdefs.h ============================================================================== --- stable/10/sys/sys/cdefs.h Wed Mar 1 13:47:28 2017 (r314493) +++ stable/10/sys/sys/cdefs.h Wed Mar 1 13:47:36 2017 (r314494) @@ -340,6 +340,7 @@ * void bar(int myArray[__min_size(10)]); */ #if !defined(__cplusplus) && \ + (defined(__clang__) || __GNUC_PREREQ__(4, 6)) && \ (!defined(__STDC_VERSION__) || (__STDC_VERSION__ >= 199901)) #define __min_size(x) static (x) #else From owner-svn-src-all@freebsd.org Wed Mar 1 14:58:26 2017 Return-Path: Delivered-To: svn-src-all@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 D0DF8CF09A9 for ; Wed, 1 Mar 2017 14:58:26 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x233.google.com (mail-it0-x233.google.com [IPv6:2607:f8b0:4001:c0b::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8FB09DA6 for ; Wed, 1 Mar 2017 14:58:26 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x233.google.com with SMTP id 203so31849542ith.0 for ; Wed, 01 Mar 2017 06:58:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=wUMXvz1ENB6AlJaWlmQKU/pLH4Xt+6NA4gAWQ4u1hcM=; b=WZps99cvZGF6wEG8b8SNsTyLchDuJA9c6wbIk4MW5jtLGgNWwX8xSIfnaZUJoDNt6A MW5XHa9KbqB4ybGHfUS6T/0Dn3jm2U1/2VY9TPIDKS7fqK/ZtM9Rk7AGi+poCrAAY4Yg 5B7rI+svjSAX/7p/pQLQG/zSSSDys/5e6n+aBVgpk4VLerd3xtVa0LI2oWsqlgZjwqjv O6DU0GBtqtl+Fr++9i/l6fKssTiHirUP4GCVVulKUpkl7uZsqzRxIdn1l2EbjIu2NDXk NLOto0c4ApSbDC7SSMAnPT8SszUgnb7+QkE5CSxPrMAV6RzAjeWrKWirOavEnpeIM5Nh Dp5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=wUMXvz1ENB6AlJaWlmQKU/pLH4Xt+6NA4gAWQ4u1hcM=; b=KT/AF2AR6xx0pweV0JdPqe9RcOKrta5/TbSjz/T0PA3pQK8PSBexfJo+rwsWzL4zCl 3ac5d1+AVLTnP3XuaJxD94VO0WRFk8anKYq1fSE4qAJ+9pCViT0B/Xpz9uK8k2v4h6vm x8Nkb2vmlT5OyOAaUnvwBac+7GBMELQFrTQE8iouyEHcxC/lmhIKJZ1j7cyOmjnG0gc1 kxZk6B+r/QlbXBxQAKVJ9AlNaAcwmRQI3SfUP1FrcSleMz5AT2YmQJkpAOpZRsTsm7kQ xw87D+kDCPYbv9TyXZizLOKmIDy3NATda5HnKUf5Au1WHZcApvo7dOVjZid8bGRw8bxl kocA== X-Gm-Message-State: AMke39n52KM+IukxGNqIZrwbs5y71JeYRlQhUr3xBVhshnUyei7BJuXpg0FsSz5cl1OcxolNCb89lF+tsuoSfg== X-Received: by 10.36.147.71 with SMTP id y68mr4596084itd.85.1488380305809; Wed, 01 Mar 2017 06:58:25 -0800 (PST) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.134.129 with HTTP; Wed, 1 Mar 2017 06:58:25 -0800 (PST) X-Originating-IP: [50.253.99.174] In-Reply-To: <201703010545.v215jPSG054051@pdx.rh.CN85.dnsmgr.net> References: <201703010505.v21556lZ034584@repo.freebsd.org> <201703010545.v215jPSG054051@pdx.rh.CN85.dnsmgr.net> From: Warner Losh Date: Wed, 1 Mar 2017 07:58:25 -0700 X-Google-Sender-Auth: dADhe-JmNCugtzSkr-oExfbf68k Message-ID: Subject: Re: svn commit: r314473 - head To: "Rodney W. Grimes" Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 14:58:26 -0000 On Tue, Feb 28, 2017 at 10:45 PM, Rodney W. Grimes wrote: >> Author: imp >> Date: Wed Mar 1 05:05:05 2017 >> New Revision: 314473 >> URL: https://svnweb.freebsd.org/changeset/base/314473 >> >> Log: >> Create README.md file for viewing on github. >> >> This is a lightly edited README using github's MARKDOWN. >> >> Submitted by: Johan >> Pull Request: https://github.com/freebsd/freebsd/pull/56 >> >> Added: >> head/README.md (contents, props changed) >> >> Added: head/README.md >> ============================================================================== >> --- /dev/null 00:00:00 1970 (empty, because file is newly added) >> +++ head/README.md Wed Mar 1 05:05:05 2017 (r314473) >> @@ -0,0 +1,86 @@ >> +FreeBSD Source: >> +--------------- >> +This is the top level of the FreeBSD source directory. This file >> +was last revised on: >> +$FreeBSD$ >> + >> +For copyright information, please see the file COPYRIGHT in this >> +directory (additional copyright information also exists for some >> +sources in this tree - please see the specific source directories for >> +more information). >> + >> +The Makefile in this directory supports a number of targets for >> +building components (or all) of the FreeBSD source tree. See build(7) >> +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html >> +for more information, including setting make(1) variables. >> + >> +The `buildkernel` and `installkernel` targets build and install >> +the kernel and the modules (see below). Please see the top of >> +the Makefile in this directory for more information on the >> +standard build targets and compile-time flags. >> + >> +Building a kernel is a somewhat more involved process. See build(7), config(8), >> +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html >> +for more information. >> + >> +Note: If you want to build and install the kernel with the >> +`buildkernel` and `installkernel` targets, you might need to build >> +world before. More information is available in the handbook. >> + >> +The kernel configuration files reside in the `sys//conf` >> +sub-directory. GENERIC is the default configuration used in release builds. >> +NOTES contains entries and documentation for all possible >> +devices, not just those commonly used. >> + >> + >> +Source Roadmap: >> +--------------- > > Is there someway this can be a pointer to the usr/src part of > hier(7) and have hier(7) updated to reflect current reality? > > Also lots and lots of trailing white space... > > This should be a pointer to hier(7) It's a verbatim copy of README converted to markdown. Maybe README should be fixed and this regenerated. The trailing whitespace is part of the conversion and not a mistake. If you want to update README and hier(7) and have README.md generated from that automatically, be my guest. None of that was in the submission, and the submission was useful as it was. Warner From owner-svn-src-all@freebsd.org Wed Mar 1 15:39:59 2017 Return-Path: Delivered-To: svn-src-all@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 E1DD4CF263D; Wed, 1 Mar 2017 15:39:59 +0000 (UTC) (envelope-from emaste@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 BC768B1D; Wed, 1 Mar 2017 15:39:59 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21FdwXm083036; Wed, 1 Mar 2017 15:39:58 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21FdwN7083035; Wed, 1 Mar 2017 15:39:58 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201703011539.v21FdwN7083035@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 1 Mar 2017 15:39:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314495 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 15:40:00 -0000 Author: emaste Date: Wed Mar 1 15:39:58 2017 New Revision: 314495 URL: https://svnweb.freebsd.org/changeset/base/314495 Log: Remove hard line breaks from README.md This is rendered with variable-width formatting and a proportional font, so hard line breaks before 80 cols are undesired. Modified: head/README.md Modified: head/README.md ============================================================================== --- head/README.md Wed Mar 1 13:47:36 2017 (r314494) +++ head/README.md Wed Mar 1 15:39:58 2017 (r314495) @@ -1,35 +1,35 @@ FreeBSD Source: --------------- -This is the top level of the FreeBSD source directory. This file -was last revised on: +This is the top level of the FreeBSD source directory. This file +was last revised on: $FreeBSD$ -For copyright information, please see the file COPYRIGHT in this -directory (additional copyright information also exists for some -sources in this tree - please see the specific source directories for +For copyright information, please see the file COPYRIGHT in this +directory (additional copyright information also exists for some +sources in this tree - please see the specific source directories for more information). -The Makefile in this directory supports a number of targets for -building components (or all) of the FreeBSD source tree. See build(7) -and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html -for more information, including setting make(1) variables. - -The `buildkernel` and `installkernel` targets build and install -the kernel and the modules (see below). Please see the top of -the Makefile in this directory for more information on the +The Makefile in this directory supports a number of targets for +building components (or all) of the FreeBSD source tree. See build(7) +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html +for more information, including setting make(1) variables. + +The `buildkernel` and `installkernel` targets build and install +the kernel and the modules (see below). Please see the top of +the Makefile in this directory for more information on the standard build targets and compile-time flags. -Building a kernel is a somewhat more involved process. See build(7), config(8), -and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html +Building a kernel is a somewhat more involved process. See build(7), config(8), +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html for more information. -Note: If you want to build and install the kernel with the -`buildkernel` and `installkernel` targets, you might need to build +Note: If you want to build and install the kernel with the +`buildkernel` and `installkernel` targets, you might need to build world before. More information is available in the handbook. -The kernel configuration files reside in the `sys//conf` -sub-directory. GENERIC is the default configuration used in release builds. -NOTES contains entries and documentation for all possible +The kernel configuration files reside in the `sys//conf` +sub-directory. GENERIC is the default configuration used in release builds. +NOTES contains entries and documentation for all possible devices, not just those commonly used. @@ -80,7 +80,7 @@ usr.bin User commands. usr.sbin System administration commands. ``` -For information on synchronizing your source tree with one or more of +For information on synchronizing your source tree with one or more of the FreeBSD Project's development branches, please see: http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/synching.html From owner-svn-src-all@freebsd.org Wed Mar 1 15:49:57 2017 Return-Path: Delivered-To: svn-src-all@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 76C6ECF2B40; Wed, 1 Mar 2017 15:49:57 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4B63E6E8; Wed, 1 Mar 2017 15:49:56 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v21FntP8056899; Wed, 1 Mar 2017 07:49:55 -0800 (PST) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd-rwg@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v21FnsgJ056898; Wed, 1 Mar 2017 07:49:54 -0800 (PST) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <201703011549.v21FnsgJ056898@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314473 - head In-Reply-To: <3C4A5F75-A1C3-4E71-9782-CA051BA3BF2E@mailbox.org> To: Florian Ermisch Date: Wed, 1 Mar 2017 07:49:54 -0800 (PST) CC: svn-src-head@freebsd.org, Warner Losh , svn-src-all@freebsd.org, src-committers@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 15:49:57 -0000 [ Charset UTF-8 unsupported, converting... ] > > > Am 1. M?rz 2017 06:45:25 MEZ schrieb "Rodney W. Grimes" : > >> Author: imp > >> Date: Wed Mar 1 05:05:05 2017 > >> New Revision: 314473 > >> URL: https://svnweb.freebsd.org/changeset/base/314473 > >> > >> Log: > >> Create README.md file for viewing on github. > >> > >> This is a lightly edited README using github's MARKDOWN. > >> > >> Submitted by: Johan > >> Pull Request: https://github.com/freebsd/freebsd/pull/56 > >> > >> Added: > >> head/README.md (contents, props changed) > >> [?] > > [?] > >Also lots and lots of trailing white space... > > > >[?] > > Trailing whitespace can be significant in > markdown: Two trailing spaces force a > linebreak in the rendered output. You have to be kidding me? Anything that treats white space as a significant part of the syntax is... well.. broken by design. Yes, including phython. A quick google yeilds me this about github markdown: (Technical note: Markdown Here uses GFM line breaks, so there's no need to use MD's two-space line breaks.) And wordpress's use of markdown also has abaondon this. I would say lets please abaondon it as a bad idea as it appears as if git/github can use something called GFM? -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Wed Mar 1 15:53:52 2017 Return-Path: Delivered-To: svn-src-all@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 7DABCCF2FBE for ; Wed, 1 Mar 2017 15:53:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x232.google.com (mail-io0-x232.google.com [IPv6:2607:f8b0:4001:c06::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4557FDE6 for ; Wed, 1 Mar 2017 15:53:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x232.google.com with SMTP id 90so33821001ios.1 for ; Wed, 01 Mar 2017 07:53:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=TrMVw3X3O1HWDcekPOIZAJN4njknBM4X2WpMTeFo14U=; b=TUHDPA28HEBDHCqwUoDPtsfKCe3UnTEgmFEyEj6mlyFgwAFBi4Z9SzowtNLo4lCliP mX9PbKRjofoPvmGOdmBOuaVpB9nxDjrWFoA+yimK7udUeFG2s1MydW3FU15HHK4iKrwT rcuLv9tQgSjwSvOid0XWCFA8oDyllU/q5oJAAdjSloThDejhbF0qnkX6TX85xtqJ/vmX PD9ysLvIRvwbeTU9JbeyfpRCFtGcSasp/oHVO1Jf0OM4jB6sKiTJPuBS/+cVgWl7v2lY nP+pH7pwxc91QlSLVxoME8notXJCCy0L1bF0nth7FunLLfC0wjg0kZGNNYmzzhCbUKA9 xM6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=TrMVw3X3O1HWDcekPOIZAJN4njknBM4X2WpMTeFo14U=; b=XDY5cRsLXyn3gb+6fPyZ5PYqXOLvlQQXby/GBvUgXqg5p68LBgMUhXh93ETWItsd6M luE7NBSMY7+ZiV7LOs15he4uTapFNKe124ImdVdE0b0E7rV0D5G7mrAD/JVcjaCc2rcb er0ubEHCbczSvDotittsmtI70iNbLsiect2ukHOdQED04bens+OQQROwBGhsgmuE46Tn 8UkQiPtQ8wDaQdZOkhnJ6DuOzuBCr+GH65QyL3yzTwkcalNQ1Mu5ki7aTbqeyshxkiLN iowdS6jRKN12oek8psCUP3hXaO+9Ye/oZvvn9Escm/+T3BI0lFfPgfxvRIzegTz+gMYf rw0w== X-Gm-Message-State: AMke39mxo5X/NpmRpk1COuRXV6cbgREndbGCnU5i9xrrphfAucAlIEsRONYPzUnchUzC5qvkXCwqFBQQ3akNDw== X-Received: by 10.107.134.94 with SMTP id i91mr9024850iod.0.1488383631390; Wed, 01 Mar 2017 07:53:51 -0800 (PST) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.134.129 with HTTP; Wed, 1 Mar 2017 07:53:50 -0800 (PST) X-Originating-IP: [50.253.99.174] In-Reply-To: <201703011549.v21FnsgJ056898@pdx.rh.CN85.dnsmgr.net> References: <3C4A5F75-A1C3-4E71-9782-CA051BA3BF2E@mailbox.org> <201703011549.v21FnsgJ056898@pdx.rh.CN85.dnsmgr.net> From: Warner Losh Date: Wed, 1 Mar 2017 08:53:50 -0700 X-Google-Sender-Auth: A-LPr1_clHF6S5Bs7gsEdkcLuS4 Message-ID: Subject: Re: svn commit: r314473 - head To: "Rodney W. Grimes" Cc: Florian Ermisch , "svn-src-head@freebsd.org" , Warner Losh , "svn-src-all@freebsd.org" , src-committers Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 15:53:52 -0000 On Wed, Mar 1, 2017 at 8:49 AM, Rodney W. Grimes wrote: > [ Charset UTF-8 unsupported, converting... ] >> >> >> Am 1. M?rz 2017 06:45:25 MEZ schrieb "Rodney W. Grimes" : >> >> Author: imp >> >> Date: Wed Mar 1 05:05:05 2017 >> >> New Revision: 314473 >> >> URL: https://svnweb.freebsd.org/changeset/base/314473 >> >> >> >> Log: >> >> Create README.md file for viewing on github. >> >> >> >> This is a lightly edited README using github's MARKDOWN. >> >> >> >> Submitted by: Johan >> >> Pull Request: https://github.com/freebsd/freebsd/pull/56 >> >> >> >> Added: >> >> head/README.md (contents, props changed) >> >> [?] >> > [?] >> >Also lots and lots of trailing white space... >> > >> >[?] >> >> Trailing whitespace can be significant in >> markdown: Two trailing spaces force a >> linebreak in the rendered output. > > You have to be kidding me? Anything that treats white space as > a significant part of the syntax is... well.. broken by design. > > Yes, including phython. > > A quick google yeilds me this about github markdown: > (Technical note: Markdown Here uses GFM line breaks, so > there's no need to use MD's two-space line breaks.) > > And wordpress's use of markdown also has abaondon this. > > I would say lets please abaondon it as a bad idea as it > appears as if git/github can use something called GFM? Knock yourself out if you want to do something better, or get someone else (not me) to do something better. Ed's already made things look a bit better, so if you can improve on that work great. Warner From owner-svn-src-all@freebsd.org Wed Mar 1 15:54:59 2017 Return-Path: Delivered-To: svn-src-all@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 97D5ECE40A3 for ; Wed, 1 Mar 2017 15:54:59 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from pmta2.delivery6.ore.mailhop.org (pmta2.delivery6.ore.mailhop.org [54.200.129.228]) (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 7B8A46F for ; Wed, 1 Mar 2017 15:54:59 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-User: 5650a952-fe97-11e6-b3c2-c9f38144898e X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 73.78.92.27 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [73.78.92.27]) by outbound2.ore.mailhop.org (Halon) with ESMTPSA id 5650a952-fe97-11e6-b3c2-c9f38144898e; Wed, 01 Mar 2017 15:54:22 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id v21FspSv006786; Wed, 1 Mar 2017 08:54:51 -0700 (MST) (envelope-from ian@freebsd.org) Message-ID: <1488383691.60166.12.camel@freebsd.org> Subject: Re: svn commit: r314464 - head/usr.sbin/yppush From: Ian Lepore To: "Rodney W. Grimes" , "Ngie Cooper (yaneurabeya)" Cc: Ngie Cooper , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Wed, 01 Mar 2017 08:54:51 -0700 In-Reply-To: <201703010553.v215rfIj054071@pdx.rh.CN85.dnsmgr.net> References: <201703010553.v215rfIj054071@pdx.rh.CN85.dnsmgr.net> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.18.5.1 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 15:54:59 -0000 On Tue, 2017-02-28 at 21:53 -0800, Rodney W. Grimes wrote: > -- Start of PGP signed section. > [ Charset UTF-8 unsupported, converting... ] > > > > > > > > > > On Feb 28, 2017, at 21:38, Rodney W. Grimes > > N85.dnsmgr.net> wrote: > > > > > > Would it be possible to not do this as 1000 commits? > > Yes, but I?m trying to do this in a way that allows me to > > backport all of the changes as easily as possible to ^/stable/10 > > (on the other side of the coin, I?ve run into dependent commits of > > other MFCs that required sweeping changes in order to make my > > changes possible). > > I do think your point is valid though and I can probably strike > > some middle ground with my changes. I think grouping it up by 2nd > > level directory (like I did with usr.bin/svn) makes the most sense. > > Thank you, > Yes, that is what I was thinking.  Note that I dont agree with this > change, > but I have probably missed a discussion that is allowing it to move > forward. > It makes the logfiles of make output now src tree possition > dependent, > but I am probalby the only person in the universe that has ever run a > diff on the output of make world. > > It may also be possible to split this into some phases to reduce some > of > your issues, only do the {.CURDIR}/../../foo -> ${SRCTOP}/bar/foo in > one pass and > some of the other fixes in another pass. > > You're not the only one who has diffed build output logs (I suspect anyone who has to maintain a non-trivial build infrastructure has done so), and you're not the only one who thinks that changing relative paths to absolute is a bad idea. -- Ian From owner-svn-src-all@freebsd.org Wed Mar 1 15:56:00 2017 Return-Path: Delivered-To: svn-src-all@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 9DD1DCE4138; Wed, 1 Mar 2017 15:56:00 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-it0-x22c.google.com (mail-it0-x22c.google.com [IPv6:2607:f8b0:4001:c0b::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5FE7D1DE; Wed, 1 Mar 2017 15:56:00 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-it0-x22c.google.com with SMTP id 203so100784639ith.0; Wed, 01 Mar 2017 07:56:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=KFj7RQlOQ/MCJyBg3E5DMJisNl7IiinueCslMWw/1xg=; b=IGQ06AhtkXCih0ygNU6yVB8CcR8G7pLahgrS8zom+Lzl7Is8nGUxxbLf8p9ttHa2ZM VAjcrfrYqh7kA63vmP4Bke+4ljAWHM2k3+8BpBq76EUi3Jk+c93ljX6ezEMje7DNB5ng jUDkXIVS+33TEWnQvivsfGw4En16a+ezaCAOXMup8WQGoVCOoarvvdHgD919XmV+FwTZ /79KlzEoOFu2i8F6spl51bIAlK+Hn+StZY5iHtegAN3gNyViuTqjBgpFogwIoVn1CzxE 3elrVu+pRFxX85v9R9Tyq5TKYyvQOipCWgVX3SMJNjmoJlui5W+hBW/fnvvY7cj6Wobm s/qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=KFj7RQlOQ/MCJyBg3E5DMJisNl7IiinueCslMWw/1xg=; b=e3elptOubnrlwbPjQ37af5nFUvDzulaTb+mIwg2aYXSc/DhPMz8/4fqJTWWuZZU6BH nl9BM5QfVgX8us4fwyFx8zw7g8lNjKpJFul7Y1kcoJ5UOtIOXQ/1OlLLMrEAUOs3lfbM UJEQhe6PmAld2AXql09vkICV/XfF1cYB3gqFCK277PdUNkwejeQMj3NNcKytWLSIvnpx upyu1mf8RLHsIpFqUX4R+1codyYbM87TSByDIIR4Xnj9lCcEf38RzFEhEtEvzUPDGRlk kd4/qnKgR39eDInPRnmdcRZN4rJIhdHyx/sbbrxic6j99RQRsdSKweWya4CUDl8XgoUU n7Wg== X-Gm-Message-State: AMke39kKRiO1SOQI0p9CvljQk+w7lLy7bVRJQpl4+9G0/Lt3phRQ7+Hdbqd84sc1fnKD/FHQrWPef/e+1uskjw== X-Received: by 10.36.209.198 with SMTP id w189mr5014616itg.83.1488383759838; Wed, 01 Mar 2017 07:55:59 -0800 (PST) MIME-Version: 1.0 Sender: carpeddiem@gmail.com Received: by 10.107.12.162 with HTTP; Wed, 1 Mar 2017 07:55:39 -0800 (PST) In-Reply-To: References: <201703010505.v21556lZ034584@repo.freebsd.org> <201703010545.v215jPSG054051@pdx.rh.CN85.dnsmgr.net> From: Ed Maste Date: Wed, 1 Mar 2017 10:55:39 -0500 X-Google-Sender-Auth: 0ecXYx6B7blt8y45ESyA_zONKRY Message-ID: Subject: Re: svn commit: r314473 - head To: Warner Losh Cc: "Rodney W. Grimes" , Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 15:56:00 -0000 On 1 March 2017 at 09:58, Warner Losh wrote: > > It's a verbatim copy of README converted to markdown. Maybe README > should be fixed and this regenerated. The trailing whitespace is part > of the conversion and not a mistake. I think the whitespace is a mistake, since the markdown version is rendered in variable width with proportional font, so hard 80-col wrapping is undesirable. I've removed the whitespace in r314495. > If you want to update README and hier(7) and have README.md generated > from that automatically, be my guest. None of that was in the > submission, and the submission was useful as it was. I'm happy for us to have a README.md although we now have the issue of keeping them in sync (if we want to). There are some minor things that we don't want to make completely identical -- for example, the rendered version claims "This file was last revised on: $FreeBSD$" because the svn-git exporter does not expand $FreeBSD$. I think we ought to just remove that sentence from the markdown version. Perhaps this suggests we don't try to keep them in sync, which is likely fine as they'll generally be seen by different groups of people (markdown for those browsing the project on GitHub, plain README for those with an installed source tree). From owner-svn-src-all@freebsd.org Wed Mar 1 16:04:42 2017 Return-Path: Delivered-To: svn-src-all@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 D0902CE442B; Wed, 1 Mar 2017 16:04:42 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AD89DA28; Wed, 1 Mar 2017 16:04:42 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v21G4dAb056986; Wed, 1 Mar 2017 08:04:39 -0800 (PST) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd-rwg@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v21G4dq6056985; Wed, 1 Mar 2017 08:04:39 -0800 (PST) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <201703011604.v21G4dq6056985@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314473 - head In-Reply-To: To: Warner Losh Date: Wed, 1 Mar 2017 08:04:39 -0800 (PST) CC: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 16:04:42 -0000 > On Tue, Feb 28, 2017 at 10:45 PM, Rodney W. Grimes > wrote: > >> Author: imp > >> Date: Wed Mar 1 05:05:05 2017 > >> New Revision: 314473 > >> URL: https://svnweb.freebsd.org/changeset/base/314473 > >> > >> Log: > >> Create README.md file for viewing on github. > >> > >> This is a lightly edited README using github's MARKDOWN. > >> > >> Submitted by: Johan > >> Pull Request: https://github.com/freebsd/freebsd/pull/56 > >> > >> Added: > >> head/README.md (contents, props changed) > >> > >> Added: head/README.md > >> ============================================================================== > >> --- /dev/null 00:00:00 1970 (empty, because file is newly added) > >> +++ head/README.md Wed Mar 1 05:05:05 2017 (r314473) > >> @@ -0,0 +1,86 @@ > >> +FreeBSD Source: > >> +--------------- > >> +This is the top level of the FreeBSD source directory. This file > >> +was last revised on: > >> +$FreeBSD$ > >> + > >> +For copyright information, please see the file COPYRIGHT in this > >> +directory (additional copyright information also exists for some > >> +sources in this tree - please see the specific source directories for > >> +more information). > >> + > >> +The Makefile in this directory supports a number of targets for > >> +building components (or all) of the FreeBSD source tree. See build(7) > >> +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html > >> +for more information, including setting make(1) variables. > >> + > >> +The `buildkernel` and `installkernel` targets build and install > >> +the kernel and the modules (see below). Please see the top of > >> +the Makefile in this directory for more information on the > >> +standard build targets and compile-time flags. > >> + > >> +Building a kernel is a somewhat more involved process. See build(7), config(8), > >> +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html > >> +for more information. > >> + > >> +Note: If you want to build and install the kernel with the > >> +`buildkernel` and `installkernel` targets, you might need to build > >> +world before. More information is available in the handbook. > >> + > >> +The kernel configuration files reside in the `sys//conf` > >> +sub-directory. GENERIC is the default configuration used in release builds. > >> +NOTES contains entries and documentation for all possible > >> +devices, not just those commonly used. > >> + > >> + > >> +Source Roadmap: > >> +--------------- > > > > Is there someway this can be a pointer to the usr/src part of > > hier(7) and have hier(7) updated to reflect current reality? > > > > Also lots and lots of trailing white space... > > > > This should be a pointer to hier(7) > > It's a verbatim copy of README converted to markdown. Maybe README > should be fixed and this regenerated. Yes, but then couldnt this be a pointer to readme? We have this documented now in 3 places that are gona just get further out of sync. Or at least add a note to README that says you need to update README.md if you touch this file. > The trailing whitespace is part > of the conversion and not a mistake. I have learned this now and responded else where. It appears that there are ways to do this in markdown without using trailing double spaces as a syntax item. > If you want to update README and hier(7) and have README.md generated > from that automatically, be my guest. None of that was in the > submission, and the submission was useful as it was. I agree that the submission is useful, as the README.md file, just would like to see some polish put on it so it doesnt suffer the same bitrot that hier(7) has. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Wed Mar 1 16:10:51 2017 Return-Path: Delivered-To: svn-src-all@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 90139CE4673; Wed, 1 Mar 2017 16:10:51 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 47FE0D91; Wed, 1 Mar 2017 16:10:50 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v21GAn3w057020; Wed, 1 Mar 2017 08:10:49 -0800 (PST) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd-rwg@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v21GAnQF057019; Wed, 1 Mar 2017 08:10:49 -0800 (PST) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <201703011610.v21GAnQF057019@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314464 - head/usr.sbin/yppush In-Reply-To: <1488383691.60166.12.camel@freebsd.org> To: Ian Lepore Date: Wed, 1 Mar 2017 08:10:49 -0800 (PST) CC: "Ngie Cooper (yaneurabeya)" , Ngie Cooper , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 16:10:51 -0000 [ Charset ISO-8859-1 unsupported, converting... ] > On Tue, 2017-02-28 at 21:53 -0800, Rodney W. Grimes wrote: > > -- Start of PGP signed section. > > [ Charset UTF-8 unsupported, converting... ] > > > > > > > > > > > > > > On Feb 28, 2017, at 21:38, Rodney W. Grimes > > > N85.dnsmgr.net> wrote: > > > > > > > > Would it be possible to not do this as 1000 commits? > > > Yes, but I?m trying to do this in a way that allows me to > > > backport all of the changes as easily as possible to ^/stable/10 > > > (on the other side of the coin, I?ve run into dependent commits of > > > other MFCs that required sweeping changes in order to make my > > > changes possible). > > > I do think your point is valid though and I can probably strike > > > some middle ground with my changes. I think grouping it up by 2nd > > > level directory (like I did with usr.bin/svn) makes the most sense. > > > Thank you, > > Yes, that is what I was thinking.??Note that I dont agree with this > > change, > > but I have probably missed a discussion that is allowing it to move > > forward. > > It makes the logfiles of make output now src tree possition > > dependent, > > but I am probalby the only person in the universe that has ever run a > > diff on the output of make world. > > > > It may also be possible to split this into some phases to reduce some > > of > > your issues, only do the {.CURDIR}/../../foo -> ${SRCTOP}/bar/foo in > > one pass and > > some of the other fixes in another pass. > > > > > > You're not the only one who has diffed build output logs (I suspect > anyone who has to maintain a non-trivial build infrastructure has done > so), and you're not the only one who thinks that changing relative > paths to absolute is a bad idea. Was there any @developers or @hackers discussion on this before such a wide sweeping and non-trival change was undertaken? I may of wrongly assumed that this was discussed and though to be a good idea for some reason(s). -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Wed Mar 1 16:11:11 2017 Return-Path: Delivered-To: svn-src-all@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 BAED9CE46C3 for ; Wed, 1 Mar 2017 16:11:11 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x236.google.com (mail-io0-x236.google.com [IPv6:2607:f8b0:4001:c06::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 81DEFFFA for ; Wed, 1 Mar 2017 16:11:11 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x236.google.com with SMTP id f84so33090096ioj.0 for ; Wed, 01 Mar 2017 08:11:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=s0+dmz5TxKX2v58IZIHPTelo6tC8OO8kqiooLAIs1pE=; b=Ngj0xoH7qAlLLi0IyPbdK1Pr85eEI4K7DtaoyGLno/iYwvqRse7hKmBahYdnOdtv20 2kd7CNJqSmKyntwcxG+I4sQBoznXbOm3PbA0cFJTpEAdeIoIZ0sYJpAmbmCSpJjoOvpD 3rSzVQvIgmK9mo2eeNvlwkMG6Q7A1xI3WcYfF7jjctjA2OH9J2153jJeRpdw0zaVfrTZ 9uDVtBvOAfWvWUiVmDKr+U3uF9wSqYeAfsCZlIF5dAWoMnIWMHW1VdnBJR4Hv5jBvwSO 7etb0B6du9cPwVBnCgKrYP0++pZrXoLnGtlvNTj9ECBcwPnkfNaNWuNz2sEveMf3nmCV 0BMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=s0+dmz5TxKX2v58IZIHPTelo6tC8OO8kqiooLAIs1pE=; b=Q6dWq3nZQyP/rDqzOZYvmUIF5/2iKoyr9iqErKw1AayKd0g1ZQKUsD+ZR4lkOTqiqB 14p52BrzxdW/+eEugW+Nntb6GQz0ROoy97uWY2aGr6UKU5FEQ523Jf2+kTixsrYOdGCR K649om/4VIv/JxXctBKtxYLBAwVvNv9NBrr5E31MrtIlx0eNbHON2UcEzQIf2aw+G0J4 wF+aYKf8Wf2m9M5vosM7xdh4Tvl6QvBbZS8nQMHBRQTP2rPrQd7FkT1ADgaJp3UIEgSq HIw/ex+3/FklN0GVA+SUzGSWTo3mBiK9d1YHtw8N0lvv9UHhoN06zRdh2VNzvwmvqIB0 5rrg== X-Gm-Message-State: AMke39nY/kWueO2WtNgiS8AAEfLLUwthJuRYYJ3LBnk48VLtOyHz/oarGtsXndyze8xmegEOPGN6dAfWOgG5+g== X-Received: by 10.107.134.94 with SMTP id i91mr9131111iod.0.1488384670657; Wed, 01 Mar 2017 08:11:10 -0800 (PST) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.134.129 with HTTP; Wed, 1 Mar 2017 08:11:10 -0800 (PST) X-Originating-IP: [50.253.99.174] In-Reply-To: <201703011604.v21G4dq6056985@pdx.rh.CN85.dnsmgr.net> References: <201703011604.v21G4dq6056985@pdx.rh.CN85.dnsmgr.net> From: Warner Losh Date: Wed, 1 Mar 2017 09:11:10 -0700 X-Google-Sender-Auth: a0X3_fnvH901XYPVNZIOwLCSgzc Message-ID: Subject: Re: svn commit: r314473 - head To: "Rodney W. Grimes" Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 16:11:11 -0000 On Wed, Mar 1, 2017 at 9:04 AM, Rodney W. Grimes wrote: >> On Tue, Feb 28, 2017 at 10:45 PM, Rodney W. Grimes >> wrote: >> >> Author: imp >> >> Date: Wed Mar 1 05:05:05 2017 >> >> New Revision: 314473 >> >> URL: https://svnweb.freebsd.org/changeset/base/314473 >> >> >> >> Log: >> >> Create README.md file for viewing on github. >> >> >> >> This is a lightly edited README using github's MARKDOWN. >> >> >> >> Submitted by: Johan >> >> Pull Request: https://github.com/freebsd/freebsd/pull/56 >> >> >> >> Added: >> >> head/README.md (contents, props changed) >> >> >> >> Added: head/README.md >> >> ============================================================================== >> >> --- /dev/null 00:00:00 1970 (empty, because file is newly added) >> >> +++ head/README.md Wed Mar 1 05:05:05 2017 (r314473) >> >> @@ -0,0 +1,86 @@ >> >> +FreeBSD Source: >> >> +--------------- >> >> +This is the top level of the FreeBSD source directory. This file >> >> +was last revised on: >> >> +$FreeBSD$ >> >> + >> >> +For copyright information, please see the file COPYRIGHT in this >> >> +directory (additional copyright information also exists for some >> >> +sources in this tree - please see the specific source directories for >> >> +more information). >> >> + >> >> +The Makefile in this directory supports a number of targets for >> >> +building components (or all) of the FreeBSD source tree. See build(7) >> >> +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html >> >> +for more information, including setting make(1) variables. >> >> + >> >> +The `buildkernel` and `installkernel` targets build and install >> >> +the kernel and the modules (see below). Please see the top of >> >> +the Makefile in this directory for more information on the >> >> +standard build targets and compile-time flags. >> >> + >> >> +Building a kernel is a somewhat more involved process. See build(7), config(8), >> >> +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html >> >> +for more information. >> >> + >> >> +Note: If you want to build and install the kernel with the >> >> +`buildkernel` and `installkernel` targets, you might need to build >> >> +world before. More information is available in the handbook. >> >> + >> >> +The kernel configuration files reside in the `sys//conf` >> >> +sub-directory. GENERIC is the default configuration used in release builds. >> >> +NOTES contains entries and documentation for all possible >> >> +devices, not just those commonly used. >> >> + >> >> + >> >> +Source Roadmap: >> >> +--------------- >> > >> > Is there someway this can be a pointer to the usr/src part of >> > hier(7) and have hier(7) updated to reflect current reality? >> > >> > Also lots and lots of trailing white space... >> > >> > This should be a pointer to hier(7) >> >> It's a verbatim copy of README converted to markdown. Maybe README >> should be fixed and this regenerated. > > Yes, but then couldnt this be a pointer to readme? We have this > documented now in 3 places that are gona just get further out > of sync. Or at least add a note to README that says you need > to update README.md if you touch this file. README changes about once every other year. Not worth the churn. >> The trailing whitespace is part >> of the conversion and not a mistake. > > I have learned this now and responded else where. It appears > that there are ways to do this in markdown without using > trailing double spaces as a syntax item. > >> If you want to update README and hier(7) and have README.md generated >> from that automatically, be my guest. None of that was in the >> submission, and the submission was useful as it was. > > I agree that the submission is useful, as the README.md file, > just would like to see some polish put on it so it doesnt > suffer the same bitrot that hier(7) has. I can't see what polish we could put here that would prevent that. If heir(7) is so horrible, fix it. Looking at it now shows just a tiny bit of rot in /usr/include and maybe /usr/share/doc. Warner From owner-svn-src-all@freebsd.org Wed Mar 1 16:17:59 2017 Return-Path: Delivered-To: svn-src-all@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 B1203CE4AF9; Wed, 1 Mar 2017 16:17:59 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6C827786; Wed, 1 Mar 2017 16:17:59 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v21GHuTH057101; Wed, 1 Mar 2017 08:17:56 -0800 (PST) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd-rwg@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v21GHuiI057100; Wed, 1 Mar 2017 08:17:56 -0800 (PST) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <201703011617.v21GHuiI057100@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314473 - head In-Reply-To: To: Ed Maste Date: Wed, 1 Mar 2017 08:17:56 -0800 (PST) CC: Warner Losh , Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 16:17:59 -0000 [ Charset UTF-8 unsupported, converting... ] > On 1 March 2017 at 09:58, Warner Losh wrote: > > > > It's a verbatim copy of README converted to markdown. Maybe README > > should be fixed and this regenerated. The trailing whitespace is part > > of the conversion and not a mistake. > > I think the whitespace is a mistake, since the markdown version is > rendered in variable width with proportional font, so hard 80-col > wrapping is undesirable. I've removed the whitespace in r314495. Thank you Ed, this makes much more sense for me too. > > If you want to update README and hier(7) and have README.md generated > > from that automatically, be my guest. None of that was in the > > submission, and the submission was useful as it was. > > I'm happy for us to have a README.md although we now have the issue of > keeping them in sync (if we want to). I have no objection what so ever to the README.md file. > There are some minor things that we don't want to make completely > identical -- for example, the rendered version claims "This file was > last revised on: $FreeBSD$" because the svn-git exporter does not > expand $FreeBSD$. I think we ought to just remove that sentence from > the markdown version. What about a From: line using the $FreeBSD$ of README? At least that might give some a notion that they should change README if they find something wrong in README.md? > Perhaps this suggests we don't try to keep them in sync, which is > likely fine as they'll generally be seen by different groups of people > (markdown for those browsing the project on GitHub, plain README for > those with an installed source tree). I would think 2 files with the same basename of README being used by 2 different groups for the same purpose, a map of the src, should be syncronized some how. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Wed Mar 1 16:30:00 2017 Return-Path: Delivered-To: svn-src-all@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 EFE96CE4E40; Wed, 1 Mar 2017 16:30:00 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C3A68ECA; Wed, 1 Mar 2017 16:30:00 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v21GTwKX057153; Wed, 1 Mar 2017 08:29:58 -0800 (PST) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd-rwg@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v21GTwdA057152; Wed, 1 Mar 2017 08:29:58 -0800 (PST) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <201703011629.v21GTwdA057152@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314473 - head In-Reply-To: To: Warner Losh Date: Wed, 1 Mar 2017 08:29:57 -0800 (PST) CC: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , src-committers , Warner Losh X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 16:30:01 -0000 > On Wed, Mar 1, 2017 at 9:04 AM, Rodney W. Grimes > wrote: > >> On Tue, Feb 28, 2017 at 10:45 PM, Rodney W. Grimes > >> wrote: > >> >> Author: imp > >> >> Date: Wed Mar 1 05:05:05 2017 > >> >> New Revision: 314473 > >> >> URL: https://svnweb.freebsd.org/changeset/base/314473 > >> >> > >> >> Log: > >> >> Create README.md file for viewing on github. > >> >> > >> >> This is a lightly edited README using github's MARKDOWN. > >> >> > >> >> Submitted by: Johan > >> >> Pull Request: https://github.com/freebsd/freebsd/pull/56 > >> >> > >> >> Added: > >> >> head/README.md (contents, props changed) > >> >> > >> >> Added: head/README.md > >> >> ============================================================================== > >> >> --- /dev/null 00:00:00 1970 (empty, because file is newly added) > >> >> +++ head/README.md Wed Mar 1 05:05:05 2017 (r314473) > >> >> @@ -0,0 +1,86 @@ > >> >> +FreeBSD Source: > >> >> +--------------- > >> >> +This is the top level of the FreeBSD source directory. This file > >> >> +was last revised on: > >> >> +$FreeBSD$ > >> >> + > >> >> +For copyright information, please see the file COPYRIGHT in this > >> >> +directory (additional copyright information also exists for some > >> >> +sources in this tree - please see the specific source directories for > >> >> +more information). > >> >> + > >> >> +The Makefile in this directory supports a number of targets for > >> >> +building components (or all) of the FreeBSD source tree. See build(7) > >> >> +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html > >> >> +for more information, including setting make(1) variables. > >> >> + > >> >> +The `buildkernel` and `installkernel` targets build and install > >> >> +the kernel and the modules (see below). Please see the top of > >> >> +the Makefile in this directory for more information on the > >> >> +standard build targets and compile-time flags. > >> >> + > >> >> +Building a kernel is a somewhat more involved process. See build(7), config(8), > >> >> +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html > >> >> +for more information. > >> >> + > >> >> +Note: If you want to build and install the kernel with the > >> >> +`buildkernel` and `installkernel` targets, you might need to build > >> >> +world before. More information is available in the handbook. > >> >> + > >> >> +The kernel configuration files reside in the `sys//conf` > >> >> +sub-directory. GENERIC is the default configuration used in release builds. > >> >> +NOTES contains entries and documentation for all possible > >> >> +devices, not just those commonly used. > >> >> + > >> >> + > >> >> +Source Roadmap: > >> >> +--------------- > >> > > >> > Is there someway this can be a pointer to the usr/src part of > >> > hier(7) and have hier(7) updated to reflect current reality? > >> > > >> > Also lots and lots of trailing white space... > >> > > >> > This should be a pointer to hier(7) > >> > >> It's a verbatim copy of README converted to markdown. Maybe README > >> should be fixed and this regenerated. > > > > Yes, but then couldnt this be a pointer to readme? We have this > > documented now in 3 places that are gona just get further out > > of sync. Or at least add a note to README that says you need > > to update README.md if you touch this file. > > README changes about once every other year. Not worth the churn. And exactly what makes it a bad idea to have the same infromation stored in 2, now 3 different places. With no pointers to the duplicated data for a human to follow it almost makes it certain that things well diverge. > >> The trailing whitespace is part > >> of the conversion and not a mistake. > > > > I have learned this now and responded else where. It appears > > that there are ways to do this in markdown without using > > trailing double spaces as a syntax item. > > > >> If you want to update README and hier(7) and have README.md generated > >> from that automatically, be my guest. None of that was in the > >> submission, and the submission was useful as it was. > > > > I agree that the submission is useful, as the README.md file, > > just would like to see some polish put on it so it doesnt > > suffer the same bitrot that hier(7) has. > > I can't see what polish we could put here that would prevent that. If > heir(7) is so horrible, fix it. Looking at it now shows just a tiny > bit of rot in /usr/include and maybe /usr/share/doc. There are 21 directors in /usr/src, 20 of them documented in README, 18 of them documented in hier(7). I'll rectifiy this if and when I get my commit bit. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Wed Mar 1 16:30:50 2017 Return-Path: Delivered-To: svn-src-all@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 F38CECE4F0B; Wed, 1 Mar 2017 16:30:50 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D300ED0; Wed, 1 Mar 2017 16:30:50 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1033) id 25C19282E; Wed, 1 Mar 2017 16:30:50 +0000 (UTC) Date: Wed, 1 Mar 2017 16:30:50 +0000 From: Alexey Dokuchaev To: Ian Lepore Cc: "Rodney W. Grimes" , "Ngie Cooper (yaneurabeya)" , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , Ngie Cooper Subject: Re: svn commit: r314464 - head/usr.sbin/yppush Message-ID: <20170301163050.GA81295@FreeBSD.org> References: <201703010553.v215rfIj054071@pdx.rh.CN85.dnsmgr.net> <1488383691.60166.12.camel@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1488383691.60166.12.camel@freebsd.org> User-Agent: Mutt/1.7.1 (2016-10-04) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 16:30:51 -0000 On Wed, Mar 01, 2017 at 08:54:51AM -0700, Ian Lepore wrote: > ... > You're not the only one who has diffed build output logs (I suspect > anyone who has to maintain a non-trivial build infrastructure has done > so), and you're not the only one who thinks that changing relative > paths to absolute is a bad idea. +1. Relative paths are so much nicer (and they are usually shorter as well). I didn't respond to these changes only because .CURDIR itself is expanded to a full path, so arguing if one wants some ../../ within what's inherently starts with a slash seems pointless. ./danfe From owner-svn-src-all@freebsd.org Wed Mar 1 16:44:01 2017 Return-Path: Delivered-To: svn-src-all@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 0AEAECF1423; Wed, 1 Mar 2017 16:44:01 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B2A63E35; Wed, 1 Mar 2017 16:43:59 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v21GhuuZ057214; Wed, 1 Mar 2017 08:43:56 -0800 (PST) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd-rwg@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v21GhtaI057213; Wed, 1 Mar 2017 08:43:55 -0800 (PST) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <201703011643.v21GhtaI057213@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314464 - head/usr.sbin/yppush In-Reply-To: <20170301163050.GA81295@FreeBSD.org> To: Alexey Dokuchaev Date: Wed, 1 Mar 2017 08:43:55 -0800 (PST) CC: Ian Lepore , "Ngie Cooper (yaneurabeya)" , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , Ngie Cooper X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 16:44:01 -0000 > On Wed, Mar 01, 2017 at 08:54:51AM -0700, Ian Lepore wrote: > > ... > > You're not the only one who has diffed build output logs (I suspect > > anyone who has to maintain a non-trivial build infrastructure has done > > so), and you're not the only one who thinks that changing relative > > paths to absolute is a bad idea. > > +1. Relative paths are so much nicer (and they are usually shorter as > well). I didn't respond to these changes only because .CURDIR itself > is expanded to a full path, so arguing if one wants some ../../ within > what's inherently starts with a slash seems pointless. True, in the normal use relative paths are shorter, but in how this actually all goes about the use of ${SRCTOP} vs ${.CURDIR} yeilds both short strings in the Makefile, and shorter output in the log. Your reasoning is also why I was somewhat quiet on it when I saw it start to be merged into -stable, which was the first place I saw it. I *thought* at that point the whole of -current had already been converted and this was just coming over with other nearby changes. I believe we have some other full path things that have crept forward into the production release, but that may be in ports only. Nope bad full paths links I found in just a few seconds: lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chfn -> /usr/bin/chpass lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chsh -> /usr/bin/chpass lrwxr-xr-x 1 root wheel 7 Nov 30 02:27 cpio -> bsdcpio lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 mailq -> /usr/sbin/mailwrapper lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 newaliases -> /usr/sbin/mailwrapper lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pgrep -> /bin/pgrep lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pkill -> /bin/pkill lrwxr-xr-x 1 root wheel 6 Nov 30 02:27 tar -> bsdtar lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 ypchfn -> /usr/bin/chpass lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 ypchpass -> /usr/bin/chpass lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 ypchsh -> /usr/bin/chpass lrwxr-xr-x 1 root wheel 15 Nov 30 02:27 yppasswd -> /usr/bin/passwd This breaks the abilty to mv usr/bin and have the right stuff happen if you invoke usr/bin.moved/mailq. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Wed Mar 1 16:57:32 2017 Return-Path: Delivered-To: svn-src-all@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 E7741CF17FD; Wed, 1 Mar 2017 16:57:32 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C8052A2C; Wed, 1 Mar 2017 16:57:32 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1033) id 210EB3382; Wed, 1 Mar 2017 16:57:32 +0000 (UTC) Date: Wed, 1 Mar 2017 16:57:32 +0000 From: Alexey Dokuchaev To: "Rodney W. Grimes" Cc: Ian Lepore , "Ngie Cooper (yaneurabeya)" , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , Ngie Cooper Subject: Re: svn commit: r314464 - head/usr.sbin/yppush Message-ID: <20170301165732.GA1093@FreeBSD.org> References: <20170301163050.GA81295@FreeBSD.org> <201703011643.v21GhtaI057213@pdx.rh.CN85.dnsmgr.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201703011643.v21GhtaI057213@pdx.rh.CN85.dnsmgr.net> User-Agent: Mutt/1.7.1 (2016-10-04) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 16:57:33 -0000 On Wed, Mar 01, 2017 at 08:43:55AM -0800, Rodney W. Grimes wrote: > I believe we have some other full path things that have crept > forward into the production release, but that may be in ports > only. Nope bad full paths links I found in just a few seconds: > > lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chfn -> /usr/bin/chpass > lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chsh -> /usr/bin/chpass > lrwxr-xr-x 1 root wheel 7 Nov 30 02:27 cpio -> bsdcpio > lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 mailq -> /usr/sbin/mailwrapper > lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 newaliases -> /usr/sbin/mailwrapper > lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pgrep -> /bin/pgrep > lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pkill -> /bin/pkill > [...] Jeez, this is all so bogus! Imagine accessing those remotely via NFS mount and watch things break hell in all weird ways. :-( ./danfe From owner-svn-src-all@freebsd.org Wed Mar 1 16:59:20 2017 Return-Path: Delivered-To: svn-src-all@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 7BF68CF190F; Wed, 1 Mar 2017 16:59:20 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0B6E8BF7; Wed, 1 Mar 2017 16:59:20 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: by mail-wm0-x243.google.com with SMTP id m70so8373841wma.1; Wed, 01 Mar 2017 08:59:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=6+G+HDafH5OUZ3ohcGP1ffVces1Yf+PvyxJZwOkKBnw=; b=W6K1MT/vCBXmgm3El4vGMoDdPgqKWZMT/IlUOcjl4CSy0ChevoBqLNth44QPeMOg2G 6eOZ41+Et/Nir5ZJnIPwslrMSQc5Z3HDfiDO6f72jE7tXNTcr5v/ViLBbKcpiXek7LIV 0WGsdcbg4k1vNkKNe83cGsI9tHOPoR+8SfXCI1act7ffzuM+1KTNEzl84lVNcm/UB5Jv bnrVWvBhBuzesSyYciMr5/BG5lpe+2MEwpxjUXSYqTGMVKLOsp+C3SUs+loVO/mxnzHj Nqh3m8cly91gW/qpU439hlJwtw9oYMnzxRg3G1v9oV9dxYpggQmXn5oLafU5urYen0B2 x8hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=6+G+HDafH5OUZ3ohcGP1ffVces1Yf+PvyxJZwOkKBnw=; b=bAVKG2VT+jBFQNL/jNZHgk1J2HkVOhdv5N7dEW7FUbbGY4uT01rZciX0SAerOUy5ss o+WF3UygRnfCaved41RGWkxXTkdQthG/mAHGmQIBPOJW5jaAuYFbf2NLZB2raYFv9QpU ivgGI7jiTkU2rfNBEqd9v5xoCPcMKqWxguLlvTTsQqM2gBEPichkHfja62j+CagSU2HI DrVljwAu/bLJIB+AYKIYXXsu/e8ahQY5Mkd7guGTQSgur0aBlPALIX2M+jI6UNsz/vZY Kb1Zv0y6Rk+udgzl6zMSwMVZV29TvPiRTuobVMZVakmKBLm2MQ1B3EDYuxKlE8rE5JIG Px4Q== X-Gm-Message-State: AMke39kglOXfgz/jOR4ATQ5Z0vkgMD1MKBMWRYynjLyN4HsUzAZ2A8VF5SDfzM5LXZhTug== X-Received: by 10.28.57.131 with SMTP id g125mr4154090wma.33.1488387558488; Wed, 01 Mar 2017 08:59:18 -0800 (PST) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by smtp.gmail.com with ESMTPSA id z88sm7384911wrb.26.2017.03.01.08.59.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Mar 2017 08:59:17 -0800 (PST) Sender: Baptiste Daroussin Date: Wed, 1 Mar 2017 17:59:16 +0100 From: Baptiste Daroussin To: "Rodney W. Grimes" Cc: Alexey Dokuchaev , src-committers , Ian Lepore , svn-src-all@freebsd.org, "Ngie Cooper (yaneurabeya)" , svn-src-head@freebsd.org, Ngie Cooper Subject: Re: svn commit: r314464 - head/usr.sbin/yppush Message-ID: <20170301165916.kuizbr2w5l2beoac@ivaldir.etoilebsd.net> References: <20170301163050.GA81295@FreeBSD.org> <201703011643.v21GhtaI057213@pdx.rh.CN85.dnsmgr.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ati2n6uvzjsuspua" Content-Disposition: inline In-Reply-To: <201703011643.v21GhtaI057213@pdx.rh.CN85.dnsmgr.net> User-Agent: NeoMutt/20170206 (1.7.2) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 16:59:20 -0000 --ati2n6uvzjsuspua Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Mar 01, 2017 at 08:43:55AM -0800, Rodney W. Grimes wrote: > > On Wed, Mar 01, 2017 at 08:54:51AM -0700, Ian Lepore wrote: > > > ... > > > You're not the only one who has diffed build output logs (I suspect > > > anyone who has to maintain a non-trivial build infrastructure has done > > > so), and you're not the only one who thinks that changing relative > > > paths to absolute is a bad idea. > >=20 > > +1. Relative paths are so much nicer (and they are usually shorter as > > well). I didn't respond to these changes only because .CURDIR itself > > is expanded to a full path, so arguing if one wants some ../../ within > > what's inherently starts with a slash seems pointless. >=20 > True, in the normal use relative paths are shorter, but in how this > actually all goes about the use of ${SRCTOP} vs ${.CURDIR} yeilds > both short strings in the Makefile, and shorter output in the log. And making the logs with relative path would actually be hard given how make works or maybe I'm missing something >=20 > Your reasoning is also why I was somewhat quiet on it when I saw it > start to be merged into -stable, which was the first place I saw it. > I *thought* at that point the whole of -current had already been > converted and this was just coming over with other nearby changes. >=20 > I believe we have some other full path things that have crept > forward into the production release, but that may be in ports > only. Nope bad full paths links I found in just a few seconds: >=20 > lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chfn -> /usr/bin/chpass > lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chsh -> /usr/bin/chpass > lrwxr-xr-x 1 root wheel 7 Nov 30 02:27 cpio -> bsdcpio > lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 mailq -> /usr/sbin/mai= lwrapper > lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 newaliases -> /usr/sbi= n/mailwrapper > lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pgrep -> /bin/pgrep > lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pkill -> /bin/pkill > lrwxr-xr-x 1 root wheel 6 Nov 30 02:27 tar -> bsdtar > lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 ypchfn -> /usr/bin/chp= ass > lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 ypchpass -> /usr/bin/c= hpass > lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 ypchsh -> /usr/bin/chp= ass > lrwxr-xr-x 1 root wheel 15 Nov 30 02:27 yppasswd -> /usr/bin/p= asswd >=20 > This breaks the abilty to mv usr/bin and have the right stuff > happen if you invoke usr/bin.moved/mailq. Almost every was with absolute path for the symlinks, we have changed "rece= ntly" most (all?) of the symlinks for libraries (.so files) into relative to be a= ble to have a proper sysroot, and yes I agree we should go further and make all= the symlinks relative which is very easy install just add the option -l sr and = magic happen :) Best regards, Bapt --ati2n6uvzjsuspua Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAli2/eEACgkQY4mL3PG3 PlrDCA/9EWm78GgYCgaRDk0Yol5nzMotpoLcH4f/A7+n6n33NKNjukgtpI+MlXHe taOU5k2cx4KQR845aBKAFzyAe1G90yoy+AW0Ib8g89IZeQcS3H1dJJsH/srMqke6 iPYsQN+MBfn5vf5JMz56BTfbzVEPpd/TVXes9DwciAKF0oH0qdNif+dYawmPZD3V EHt4IRC0tJrw1rgmLrZCPBcn6m0StSxwN20GXENyLCHOFUDsNcCMe6BaTtk2Fm+l iXfp52PYz3C9D1nSi6gdFe1kgHdVRDWeZltUnWFOuz2uN83ohmzXvJ/lqwLhaMsA I2Nx2F43+2D+hoA6CdBkFvKKKNNzD9Js0qjfz5j3TOl8H6DOlZZPE7S8SnYa7Tw0 0zViqkFAUi4tKIIg79BUZjAUNZBsNjeqCzm246i/Zn5cRviL+pSPnz9ySBSOcIQ/ SCpLmvkslFFaRt5WZBGZUq4JP2L5zVuacdvjmWU9IIfwCf9RNtqCiUEsSJrk3vHt qizj1SvQMdkqRO2lJJ3FrnGcxiTjpF245ww9qEC9HRHi5gBVTCNSg/qk9w21U3VX b/hgLH3+Ms/PNTcjNEMPbrPN4GcuLYOubug8F21tDPrBQhp65d8kAXs2IGs+E8YU lrSEcjhV6QrY9OSv91Jesx43wL8Bu9Zqywmal7wQskV0rGWk984= =pd+Z -----END PGP SIGNATURE----- --ati2n6uvzjsuspua-- From owner-svn-src-all@freebsd.org Wed Mar 1 17:01:54 2017 Return-Path: Delivered-To: svn-src-all@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 41C49CF1C59; Wed, 1 Mar 2017 17:01:54 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io0-x22f.google.com (mail-io0-x22f.google.com [IPv6:2607:f8b0:4001:c06::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0A601EDC; Wed, 1 Mar 2017 17:01:54 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io0-x22f.google.com with SMTP id f84so34219116ioj.0; Wed, 01 Mar 2017 09:01:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=6KLOAlXvnfcIQRzyRfygLe6ZlIa8MSVZ3QXmRU6zEZM=; b=G2J66WqCNRlJryKXrvpNgu9bvrXyTuJmEZfMcJDRSOT4UJZVrAsU4GQUorn/3uyNS0 30E3K+2Y3Jo+DoxwoFDFOLzEeen37A1+dN7gHRgalIf3pzHve4MpYTARnY4PwdPkoiiI um/0TLmdNjPm4Tlv+0xxalyVdpPqAUGf+NTpRAfmHkq2qWtPHv80oLA22ED8m3k/jYI9 HiX3VU2AjDk+R3peQMqNn6wNzC8DAoxkta9cpIjt4h/iwNtlIdsCKu88xNUZ9ykuZ1qZ 7ffgbXGsz9cm4ySngi2+keMrO8vJAP2XKnmSyRIL4s0in7gzVTBhCS73IZM0t7SDMKP7 oy0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=6KLOAlXvnfcIQRzyRfygLe6ZlIa8MSVZ3QXmRU6zEZM=; b=HPcPeYnts3eGYxYaxQe9VJTPMqRJ6/ZOFWZPn4F4hYS4LfXhJjXkd2ILuEC8w+ZQjb 64abxti1SaQU9YumbZaG0Y3TSCfcJlA9YxmsiQg96e+OuGpcOnDQn9xl3ERO2esbrxe5 660NW2H0+4GV03LDXsPS9PiTaUtEjggsNbHWU25azcNRrrAwKtZoIwNUDkEZMcnc5KMy FZhlcUkg+wFDPvy+RWQPVCvKZwUPghkuO29LT2kKPI9F9uceLmyJB4u1APmGKNxcoXVF JU1PiWFO2/FfScVge0f/1iZQTC9CZUuzAeZT2QeCOTf5tNF2fndtTwUZ3u6uSOWxnuRD J2oQ== X-Gm-Message-State: AMke39n7eAmYkmqfXPZrU4PNiXMChGCXHCwCtS1+e/7ggQL0jwP2AHICwE73TSKGlLpQVAxUnCEdfKKjwuRpOQ== X-Received: by 10.107.195.73 with SMTP id t70mr10677183iof.155.1488387712866; Wed, 01 Mar 2017 09:01:52 -0800 (PST) MIME-Version: 1.0 Sender: carpeddiem@gmail.com Received: by 10.107.12.162 with HTTP; Wed, 1 Mar 2017 09:01:32 -0800 (PST) In-Reply-To: <201702272008.v1RK8g2C047240@repo.freebsd.org> References: <201702272008.v1RK8g2C047240@repo.freebsd.org> From: Ed Maste Date: Wed, 1 Mar 2017 12:01:32 -0500 X-Google-Sender-Auth: G5NPF6bdTPYmpN1yTUu2ehBFIGU Message-ID: Subject: Re: svn commit: r314362 - in head/sys: arm/at91 arm/cavium/cns11xx arm/nvidia arm/xscale/i8134x arm/xscale/ixp425 arm/xscale/pxa dev/uart mips/adm5120 mips/alchemy mips/atheros mips/atheros/ar531x mips... To: Ruslan Bukin Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 17:01:54 -0000 On 27 February 2017 at 15:08, Ruslan Bukin wrote: > Author: br > Date: Mon Feb 27 20:08:42 2017 > New Revision: 314362 > URL: https://svnweb.freebsd.org/changeset/base/314362 Tinderbox build is currently failing in mips XLP, XLP64, XLPN32 with: In file included from /scratch/tmp/emaste/freebsd/sys/mips/nlm/xlp_pci.c:51: /scratch/tmp/emaste/freebsd/sys/dev/uart/uart.h: In function 'uart_getreg': /scratch/tmp/emaste/freebsd/sys/dev/uart/uart.h:57: warning: implicit declaration of function 'bus_space_read_4' From owner-svn-src-all@freebsd.org Wed Mar 1 17:08:13 2017 Return-Path: Delivered-To: svn-src-all@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 0BFBECF1D95; Wed, 1 Mar 2017 17:08:13 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 688C83DB; Wed, 1 Mar 2017 17:08:12 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v21H89uu057585; Wed, 1 Mar 2017 09:08:09 -0800 (PST) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd-rwg@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v21H89XW057584; Wed, 1 Mar 2017 09:08:09 -0800 (PST) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <201703011708.v21H89XW057584@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314464 - head/usr.sbin/yppush In-Reply-To: <20170301165916.kuizbr2w5l2beoac@ivaldir.etoilebsd.net> To: Baptiste Daroussin Date: Wed, 1 Mar 2017 09:08:09 -0800 (PST) CC: Alexey Dokuchaev , src-committers , Ian Lepore , svn-src-all@FreeBSD.org, "Ngie Cooper (yaneurabeya)" , svn-src-head@FreeBSD.org, Ngie Cooper X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 17:08:13 -0000 -- Start of PGP signed section. > On Wed, Mar 01, 2017 at 08:43:55AM -0800, Rodney W. Grimes wrote: > > > On Wed, Mar 01, 2017 at 08:54:51AM -0700, Ian Lepore wrote: > > > > ... > > > > You're not the only one who has diffed build output logs (I suspect > > > > anyone who has to maintain a non-trivial build infrastructure has done > > > > so), and you're not the only one who thinks that changing relative > > > > paths to absolute is a bad idea. > > > > > > +1. Relative paths are so much nicer (and they are usually shorter as > > > well). I didn't respond to these changes only because .CURDIR itself > > > is expanded to a full path, so arguing if one wants some ../../ within > > > what's inherently starts with a slash seems pointless. > > > > True, in the normal use relative paths are shorter, but in how this > > actually all goes about the use of ${SRCTOP} vs ${.CURDIR} yeilds > > both short strings in the Makefile, and shorter output in the log. > > And making the logs with relative path would actually be hard given how make > works or maybe I'm missing something Yes, iirc even the output from make -n well have the pathnames all expanded to full lengths. I dont believe there is any short way to fix that. > > Your reasoning is also why I was somewhat quiet on it when I saw it > > start to be merged into -stable, which was the first place I saw it. > > I *thought* at that point the whole of -current had already been > > converted and this was just coming over with other nearby changes. > > > > I believe we have some other full path things that have crept > > forward into the production release, but that may be in ports > > only. Nope bad full paths links I found in just a few seconds: > > > > lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chfn -> /usr/bin/chpass > > lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chsh -> /usr/bin/chpass > > lrwxr-xr-x 1 root wheel 7 Nov 30 02:27 cpio -> bsdcpio > > lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 mailq -> /usr/sbin/mailwrapper > > lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 newaliases -> /usr/sbin/mailwrapper > > lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pgrep -> /bin/pgrep > > lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pkill -> /bin/pkill > > lrwxr-xr-x 1 root wheel 6 Nov 30 02:27 tar -> bsdtar > > lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 ypchfn -> /usr/bin/chpass > > lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 ypchpass -> /usr/bin/chpass > > lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 ypchsh -> /usr/bin/chpass > > lrwxr-xr-x 1 root wheel 15 Nov 30 02:27 yppasswd -> /usr/bin/passwd > > > > This breaks the abilty to mv usr/bin and have the right stuff > > happen if you invoke usr/bin.moved/mailq. > > Almost every was with absolute path for the symlinks, we have changed "recently" > most (all?) of the symlinks for libraries (.so files) into relative to be able > to have a proper sysroot, and yes I agree we should go further and make all the > symlinks relative which is very easy install just add the option -l sr and magic > happen :) At one point in history I can promise you that ALL symlinks in the release where shortest possible relative path. So any absolute links that entered the system got created by developers who where not aware that they should always use a relative link for anything landing in DESTDIR. This creates breakge on so many levels we should make a rapid correction to this regression. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Wed Mar 1 17:31:41 2017 Return-Path: Delivered-To: svn-src-all@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 BDAB3CF2632 for ; Wed, 1 Mar 2017 17:31:41 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x233.google.com (mail-it0-x233.google.com [IPv6:2607:f8b0:4001:c0b::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 858E282C for ; Wed, 1 Mar 2017 17:31:41 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x233.google.com with SMTP id m27so12702985iti.1 for ; Wed, 01 Mar 2017 09:31:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=5zspRLrYp9IwYH4HSJCTq/c07HAccmIBJZVeYwmPkkM=; b=ZxsYlJPUOdE8bHsljZrcXO7mJlX+57aXGHO0bFD+XK47vJb3J1xOAVjUi6ZAm/kduT 0Qe/Pgi4Fw3VMRJRFyC87Ui+dnXc6n58VsCZLN8sLvtobXiS2FxDZfZbZTqOPfBH+iEI /YMFZja9wE5ZajJbiHONBYBzamv4DW9n/rlfg5BsAewMFpjFOaB+cS0Wahe8mFj6LOW2 AFqYCPv+ent8cRI+Y2xsd4AqQOfqEKH1YOapUG+gB+LJ7YnH2bmL+fubHJzGgTgf7t/d srJqfavU2YdZ7dwogyHcuf0DKkVXsiibdMm2lRBkqGyNFYK1NCc44NaDZH7z4jz1g7Lj m5Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=5zspRLrYp9IwYH4HSJCTq/c07HAccmIBJZVeYwmPkkM=; b=nI0+7hvdFXfQAgZfAeOvWZ9mfd0n2qWIz+pSw9uFeQ7N6Pe5XDLQfCZ3eBlhEVjl/i DorwvM+ydxSnXF+kW3yatbfTRpTetp708mWBubVLk+AY7IjPirO75cac9RXM8uhZVyD2 yLpOnO5rqeOz0x7D/HhwZL2lKUQATF/CJWpbREk4hLH5/prhqDIVGeRYedxNU4ufotPd G0tgnniBmcADxslVcqCRVQ7IswY+PjSZIRHH9EXDPrcR7crsKf2Ilm+iJVaGk1w5nOpZ CmGpGFSKw/cFSivr+/CXYlmPqsRowQybFkGzqxFk96nJ0N1fVGG+Lu96qQ+NUkE9YtOC kZkA== X-Gm-Message-State: AMke39kbUdXkUREZdFz8wmV4No0BjGhsv9Gj7vDu9azduAMWF+vwhyNf02kgm/cRNaT5EK9bgxWBs0vMXnhhrQ== X-Received: by 10.36.79.13 with SMTP id c13mr5468121itb.103.1488389500091; Wed, 01 Mar 2017 09:31:40 -0800 (PST) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.134.129 with HTTP; Wed, 1 Mar 2017 09:31:39 -0800 (PST) X-Originating-IP: [50.253.99.174] In-Reply-To: <201703011629.v21GTwdA057152@pdx.rh.CN85.dnsmgr.net> References: <201703011629.v21GTwdA057152@pdx.rh.CN85.dnsmgr.net> From: Warner Losh Date: Wed, 1 Mar 2017 10:31:39 -0700 X-Google-Sender-Auth: jW4TD_OPrTldoaItzIGGQ7nhGQA Message-ID: Subject: Re: svn commit: r314473 - head To: "Rodney W. Grimes" Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , src-committers , Warner Losh Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 17:31:41 -0000 On Wed, Mar 1, 2017 at 9:29 AM, Rodney W. Grimes wrote: > I'll rectifiy this if and when I get my commit bit. In the mean time, you could submit a Bugzilla or a github pull request :) Warner From owner-svn-src-all@freebsd.org Wed Mar 1 17:35:57 2017 Return-Path: Delivered-To: svn-src-all@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 B2992CF28A5; Wed, 1 Mar 2017 17:35:57 +0000 (UTC) (envelope-from mav@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 7F042B40; Wed, 1 Mar 2017 17:35:57 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21HZuIn030187; Wed, 1 Mar 2017 17:35:56 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21HZum2030186; Wed, 1 Mar 2017 17:35:56 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201703011735.v21HZum2030186@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Wed, 1 Mar 2017 17:35:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314496 - head/sys/cam/ctl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 17:35:57 -0000 Author: mav Date: Wed Mar 1 17:35:56 2017 New Revision: 314496 URL: https://svnweb.freebsd.org/changeset/base/314496 Log: Add check missed in r314257. MFC after: 11 days Modified: head/sys/cam/ctl/ctl.c Modified: head/sys/cam/ctl/ctl.c ============================================================================== --- head/sys/cam/ctl/ctl.c Wed Mar 1 15:39:58 2017 (r314495) +++ head/sys/cam/ctl/ctl.c Wed Mar 1 17:35:56 2017 (r314496) @@ -9550,7 +9550,7 @@ ctl_inquiry_evpd_devid(struct ctl_scsiio if (port && port->port_type == CTL_PORT_FC) proto = SCSI_PROTO_FC << 4; - else if (port->port_type == CTL_PORT_SAS) + else if (port && port->port_type == CTL_PORT_SAS) proto = SCSI_PROTO_SAS << 4; else if (port && port->port_type == CTL_PORT_ISCSI) proto = SCSI_PROTO_ISCSI << 4; From owner-svn-src-all@freebsd.org Wed Mar 1 18:03:33 2017 Return-Path: Delivered-To: svn-src-all@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 7BBFCCF3707; Wed, 1 Mar 2017 18:03:33 +0000 (UTC) (envelope-from ae@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 4B3BE63B; Wed, 1 Mar 2017 18:03:33 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21I3WYR043240; Wed, 1 Mar 2017 18:03:32 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21I3WxQ043239; Wed, 1 Mar 2017 18:03:32 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201703011803.v21I3WxQ043239@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Wed, 1 Mar 2017 18:03:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314497 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 18:03:33 -0000 Author: ae Date: Wed Mar 1 18:03:32 2017 New Revision: 314497 URL: https://svnweb.freebsd.org/changeset/base/314497 Log: Do not invoke the resize event when previous provider's size was zero. This is similar to r303637 fix for geom_disk. Reported by: avg Tested by: avg MFC after: 1 week Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c Wed Mar 1 17:35:56 2017 (r314496) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c Wed Mar 1 18:03:32 2017 (r314497) @@ -278,7 +278,16 @@ zvol_size_changed(zvol_state_t *zv, uint if (pp == NULL) return; g_topology_lock(); - g_resize_provider(pp, zv->zv_volsize); + + /* + * Do not invoke resize event when initial size was zero. + * ZVOL initializes the size on first open, this is not + * real resizing. + */ + if (pp->mediasize == 0) + pp->mediasize = zv->zv_volsize; + else + g_resize_provider(pp, zv->zv_volsize); g_topology_unlock(); } #endif /* illumos */ From owner-svn-src-all@freebsd.org Wed Mar 1 18:03:36 2017 Return-Path: Delivered-To: svn-src-all@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 3CFECCF3729; Wed, 1 Mar 2017 18:03:36 +0000 (UTC) (envelope-from ian@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 09DAD642; Wed, 1 Mar 2017 18:03:35 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21I3Z0t043284; Wed, 1 Mar 2017 18:03:35 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21I3Zv1043283; Wed, 1 Mar 2017 18:03:35 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703011803.v21I3Zv1043283@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 1 Mar 2017 18:03:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314498 - stable/11/sys/conf X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 18:03:36 -0000 Author: ian Date: Wed Mar 1 18:03:34 2017 New Revision: 314498 URL: https://svnweb.freebsd.org/changeset/base/314498 Log: MFC r310430: Use ${.OBJDIR} to refer to the kernel build object dir, instead of trying to recreate it from ${MAKEOBJDIRPREFIX} and ${SRC_BASE} and ${KERNCONF}, the latter being especially problematic when KERNCONF is set to the names of multiple kernel configs. Modified: stable/11/sys/conf/kern.post.mk Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/conf/kern.post.mk ============================================================================== --- stable/11/sys/conf/kern.post.mk Wed Mar 1 18:03:32 2017 (r314497) +++ stable/11/sys/conf/kern.post.mk Wed Mar 1 18:03:34 2017 (r314498) @@ -63,7 +63,7 @@ OSRELDATE!= awk '/^\#define[[:space:]]*_ ${MAKEOBJDIRPREFIX}${SRC_BASE}/include/osreldate.h .endif # Keep the related ports builds in the obj directory so that they are only rebuilt once per kernel build -WRKDIRPREFIX?= ${MAKEOBJDIRPREFIX}${SRC_BASE}/sys/${KERNCONF} +WRKDIRPREFIX?= ${.OBJDIR} PORTSMODULESENV=\ env \ -u CC \ From owner-svn-src-all@freebsd.org Wed Mar 1 18:05:42 2017 Return-Path: Delivered-To: svn-src-all@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 052DBCF3803; Wed, 1 Mar 2017 18:05:42 +0000 (UTC) (envelope-from ian@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 C888395F; Wed, 1 Mar 2017 18:05:41 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21I5ecx043403; Wed, 1 Mar 2017 18:05:40 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21I5eaQ043402; Wed, 1 Mar 2017 18:05:40 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703011805.v21I5eaQ043402@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 1 Mar 2017 18:05:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314499 - stable/11/sys/dev/gpio X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 18:05:42 -0000 Author: ian Date: Wed Mar 1 18:05:40 2017 New Revision: 314499 URL: https://svnweb.freebsd.org/changeset/base/314499 Log: MFC r311658: Only write to *active once, even when GPIO_ACTIVE_LOW is set. Modified: stable/11/sys/dev/gpio/ofw_gpiobus.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/gpio/ofw_gpiobus.c ============================================================================== --- stable/11/sys/dev/gpio/ofw_gpiobus.c Wed Mar 1 18:03:34 2017 (r314498) +++ stable/11/sys/dev/gpio/ofw_gpiobus.c Wed Mar 1 18:05:40 2017 (r314499) @@ -176,9 +176,10 @@ gpio_pin_is_active(gpio_pin_t pin, bool return (rv); } - *active = tmp != 0; if (pin->flags & GPIO_ACTIVE_LOW) - *active = !(*active); + *active = tmp == 0; + else + *active = tmp != 0; return (0); } From owner-svn-src-all@freebsd.org Wed Mar 1 18:19:47 2017 Return-Path: Delivered-To: svn-src-all@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 C8E30CF3FDB; Wed, 1 Mar 2017 18:19:47 +0000 (UTC) (envelope-from ian@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 980D2394; Wed, 1 Mar 2017 18:19:47 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21IJkr5047533; Wed, 1 Mar 2017 18:19:46 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21IJkC5047532; Wed, 1 Mar 2017 18:19:46 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703011819.v21IJkC5047532@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 1 Mar 2017 18:19:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314500 - stable/11/sys/dev/usb/serial X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 18:19:47 -0000 Author: ian Date: Wed Mar 1 18:19:46 2017 New Revision: 314500 URL: https://svnweb.freebsd.org/changeset/base/314500 Log: MFC r303346: Actually return line status register values from umoscom_cfg_get_status(). The hardware delivers ns16550-compatible status bits, which is what the usb_serial code expects, so no need for translation, no need for a local variable to hold a temporary lsr result. Modified: stable/11/sys/dev/usb/serial/umoscom.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/usb/serial/umoscom.c ============================================================================== --- stable/11/sys/dev/usb/serial/umoscom.c Wed Mar 1 18:05:40 2017 (r314499) +++ stable/11/sys/dev/usb/serial/umoscom.c Wed Mar 1 18:19:46 2017 (r314500) @@ -523,14 +523,16 @@ static void umoscom_cfg_get_status(struct ucom_softc *ucom, uint8_t *p_lsr, uint8_t *p_msr) { struct umoscom_softc *sc = ucom->sc_parent; - uint8_t lsr; uint8_t msr; DPRINTFN(5, "\n"); - /* read status registers */ + /* + * Read status registers. MSR bits need translation from ns16550 to + * SER_* values. LSR bits are ns16550 in hardware and ucom. + */ - lsr = umoscom_cfg_read(sc, UMOSCOM_LSR); + *p_lsr = umoscom_cfg_read(sc, UMOSCOM_LSR); msr = umoscom_cfg_read(sc, UMOSCOM_MSR); /* translate bits */ From owner-svn-src-all@freebsd.org Wed Mar 1 18:23:32 2017 Return-Path: Delivered-To: svn-src-all@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 E389BCF3189; Wed, 1 Mar 2017 18:23:32 +0000 (UTC) (envelope-from ian@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 A3406A2E; Wed, 1 Mar 2017 18:23:32 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21INVCK051207; Wed, 1 Mar 2017 18:23:31 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21INUNl051196; Wed, 1 Mar 2017 18:23:30 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703011823.v21INUNl051196@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 1 Mar 2017 18:23:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314501 - stable/11/sys/dev/usb/serial X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 18:23:33 -0000 Author: ian Date: Wed Mar 1 18:23:30 2017 New Revision: 314501 URL: https://svnweb.freebsd.org/changeset/base/314501 Log: MFC r303347, r303350, r303351, r303353: Translate modem status reg bits from ns16550 to SER_* values used by the tty layer. Annotate the usb-serial drivers which always return 0 for line status, so that it'll be easier to find and fix them in the future. Also annotate a switch case fall-through per style(9). Modified: stable/11/sys/dev/usb/serial/u3g.c stable/11/sys/dev/usb/serial/uark.c stable/11/sys/dev/usb/serial/ubsa.c stable/11/sys/dev/usb/serial/uchcom.c stable/11/sys/dev/usb/serial/ufoma.c stable/11/sys/dev/usb/serial/umcs.c stable/11/sys/dev/usb/serial/umct.c stable/11/sys/dev/usb/serial/umodem.c stable/11/sys/dev/usb/serial/uplcom.c stable/11/sys/dev/usb/serial/uslcom.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/usb/serial/u3g.c ============================================================================== --- stable/11/sys/dev/usb/serial/u3g.c Wed Mar 1 18:19:46 2017 (r314500) +++ stable/11/sys/dev/usb/serial/u3g.c Wed Mar 1 18:23:30 2017 (r314501) @@ -1102,6 +1102,7 @@ u3g_cfg_get_status(struct ucom_softc *uc { struct u3g_softc *sc = ucom->sc_parent; + /* XXX Note: sc_lsr is always zero */ *lsr = sc->sc_lsr[ucom->sc_subunit]; *msr = sc->sc_msr[ucom->sc_subunit]; } Modified: stable/11/sys/dev/usb/serial/uark.c ============================================================================== --- stable/11/sys/dev/usb/serial/uark.c Wed Mar 1 18:19:46 2017 (r314500) +++ stable/11/sys/dev/usb/serial/uark.c Wed Mar 1 18:23:30 2017 (r314501) @@ -427,6 +427,7 @@ uark_cfg_get_status(struct ucom_softc *u { struct uark_softc *sc = ucom->sc_parent; + /* XXX Note: sc_lsr is always zero */ *lsr = sc->sc_lsr; *msr = sc->sc_msr; } Modified: stable/11/sys/dev/usb/serial/ubsa.c ============================================================================== --- stable/11/sys/dev/usb/serial/ubsa.c Wed Mar 1 18:19:46 2017 (r314500) +++ stable/11/sys/dev/usb/serial/ubsa.c Wed Mar 1 18:23:30 2017 (r314501) @@ -650,11 +650,19 @@ ubsa_intr_callback(struct usb_xfer *xfer usbd_copy_out(pc, 0, buf, sizeof(buf)); /* - * incidentally, Belkin adapter status bits match - * UART 16550 bits + * MSR bits need translation from ns16550 to SER_* values. + * LSR bits are ns16550 in hardware and ucom. */ + sc->sc_msr = 0; + if (buf[3] & UBSA_MSR_CTS) + sc->sc_msr |= SER_CTS; + if (buf[3] & UBSA_MSR_DCD) + sc->sc_msr |= SER_DCD; + if (buf[3] & UBSA_MSR_RI) + sc->sc_msr |= SER_RI; + if (buf[3] & UBSA_MSR_DSR) + sc->sc_msr |= SER_DSR; sc->sc_lsr = buf[2]; - sc->sc_msr = buf[3]; DPRINTF("lsr = 0x%02x, msr = 0x%02x\n", sc->sc_lsr, sc->sc_msr); @@ -663,7 +671,7 @@ ubsa_intr_callback(struct usb_xfer *xfer } else { DPRINTF("ignoring short packet, %d bytes\n", actlen); } - + /* FALLTHROUGH */ case USB_ST_SETUP: tr_setup: usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_len(xfer)); Modified: stable/11/sys/dev/usb/serial/uchcom.c ============================================================================== --- stable/11/sys/dev/usb/serial/uchcom.c Wed Mar 1 18:19:46 2017 (r314500) +++ stable/11/sys/dev/usb/serial/uchcom.c Wed Mar 1 18:23:30 2017 (r314501) @@ -625,6 +625,7 @@ uchcom_cfg_get_status(struct ucom_softc DPRINTF("\n"); + /* XXX Note: sc_lsr is always zero */ *lsr = sc->sc_lsr; *msr = sc->sc_msr; } Modified: stable/11/sys/dev/usb/serial/ufoma.c ============================================================================== --- stable/11/sys/dev/usb/serial/ufoma.c Wed Mar 1 18:19:46 2017 (r314500) +++ stable/11/sys/dev/usb/serial/ufoma.c Wed Mar 1 18:23:30 2017 (r314501) @@ -900,6 +900,7 @@ ufoma_cfg_get_status(struct ucom_softc * { struct ufoma_softc *sc = ucom->sc_parent; + /* XXX Note: sc_lsr is always zero */ *lsr = sc->sc_lsr; *msr = sc->sc_msr; } Modified: stable/11/sys/dev/usb/serial/umcs.c ============================================================================== --- stable/11/sys/dev/usb/serial/umcs.c Wed Mar 1 18:19:46 2017 (r314500) +++ stable/11/sys/dev/usb/serial/umcs.c Wed Mar 1 18:23:30 2017 (r314501) @@ -743,15 +743,26 @@ umcs7840_cfg_get_status(struct ucom_soft { struct umcs7840_softc *sc = ucom->sc_parent; uint8_t pn = ucom->sc_portno; - uint8_t hw_lsr = 0; /* local line status register */ uint8_t hw_msr = 0; /* local modem status register */ - /* Read LSR & MSR */ - umcs7840_get_UART_reg_sync(sc, pn, MCS7840_UART_REG_LSR, &hw_lsr); + /* + * Read status registers. MSR bits need translation from ns16550 to + * SER_* values. LSR bits are ns16550 in hardware and ucom. + */ + umcs7840_get_UART_reg_sync(sc, pn, MCS7840_UART_REG_LSR, lsr); umcs7840_get_UART_reg_sync(sc, pn, MCS7840_UART_REG_MSR, &hw_msr); - *lsr = hw_lsr; - *msr = hw_msr; + if (hw_msr & MCS7840_UART_MSR_NEGCTS) + *msr |= SER_CTS; + + if (hw_msr & MCS7840_UART_MSR_NEGDCD) + *msr |= SER_DCD; + + if (hw_msr & MCS7840_UART_MSR_NEGRI) + *msr |= SER_RI; + + if (hw_msr & MCS7840_UART_MSR_NEGDSR) + *msr |= SER_DSR; DPRINTF("Port %d status: LSR=%02x MSR=%02x\n", ucom->sc_portno, *lsr, *msr); } Modified: stable/11/sys/dev/usb/serial/umct.c ============================================================================== --- stable/11/sys/dev/usb/serial/umct.c Wed Mar 1 18:19:46 2017 (r314500) +++ stable/11/sys/dev/usb/serial/umct.c Wed Mar 1 18:23:30 2017 (r314501) @@ -86,6 +86,15 @@ __FBSDID("$FreeBSD$"); #define UMCT_SET_MCR 10 /* Set Modem Control Register */ #define UMCT_SET_MCR_SIZE 1 +#define UMCT_MSR_CTS_CHG 0x01 +#define UMCT_MSR_DSR_CHG 0x02 +#define UMCT_MSR_RI_CHG 0x04 +#define UMCT_MSR_CD_CHG 0x08 +#define UMCT_MSR_CTS 0x10 +#define UMCT_MSR_RTS 0x20 +#define UMCT_MSR_RI 0x40 +#define UMCT_MSR_CD 0x80 + #define UMCT_INTR_INTERVAL 100 #define UMCT_IFACE_INDEX 0 #define UMCT_CONFIG_INDEX 0 @@ -384,11 +393,23 @@ umct_intr_callback_sub(struct usb_xfer * pc = usbd_xfer_get_frame(xfer, 0); usbd_copy_out(pc, 0, buf, sizeof(buf)); - sc->sc_msr = buf[0]; + /* + * MSR bits need translation from ns16550 to SER_* values. + * LSR bits are ns16550 in hardware and ucom. + */ + sc->sc_msr = 0; + if (buf[0] & UMCT_MSR_CTS) + sc->sc_msr |= SER_CTS; + if (buf[0] & UMCT_MSR_CD) + sc->sc_msr |= SER_DCD; + if (buf[0] & UMCT_MSR_RI) + sc->sc_msr |= SER_RI; + if (buf[0] & UMCT_MSR_RTS) + sc->sc_msr |= SER_DSR; sc->sc_lsr = buf[1]; ucom_status_change(&sc->sc_ucom); - + /* FALLTHROUGH */ case USB_ST_SETUP: tr_setup: usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_len(xfer)); Modified: stable/11/sys/dev/usb/serial/umodem.c ============================================================================== --- stable/11/sys/dev/usb/serial/umodem.c Wed Mar 1 18:19:46 2017 (r314500) +++ stable/11/sys/dev/usb/serial/umodem.c Wed Mar 1 18:23:30 2017 (r314501) @@ -558,6 +558,7 @@ umodem_cfg_get_status(struct ucom_softc DPRINTF("\n"); + /* XXX Note: sc_lsr is always zero */ *lsr = sc->sc_lsr; *msr = sc->sc_msr; } Modified: stable/11/sys/dev/usb/serial/uplcom.c ============================================================================== --- stable/11/sys/dev/usb/serial/uplcom.c Wed Mar 1 18:19:46 2017 (r314500) +++ stable/11/sys/dev/usb/serial/uplcom.c Wed Mar 1 18:23:30 2017 (r314501) @@ -807,6 +807,7 @@ uplcom_cfg_get_status(struct ucom_softc DPRINTF("\n"); + /* XXX Note: sc_lsr is always zero */ *lsr = sc->sc_lsr; *msr = sc->sc_msr; } Modified: stable/11/sys/dev/usb/serial/uslcom.c ============================================================================== --- stable/11/sys/dev/usb/serial/uslcom.c Wed Mar 1 18:19:46 2017 (r314500) +++ stable/11/sys/dev/usb/serial/uslcom.c Wed Mar 1 18:23:30 2017 (r314501) @@ -704,6 +704,7 @@ uslcom_get_status(struct ucom_softc *uco DPRINTF("\n"); + /* XXX Note: sc_lsr is always zero */ *lsr = sc->sc_lsr; *msr = sc->sc_msr; } From owner-svn-src-all@freebsd.org Wed Mar 1 18:37:37 2017 Return-Path: Delivered-To: svn-src-all@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 52FEBCF34B5; Wed, 1 Mar 2017 18:37:37 +0000 (UTC) (envelope-from sbruno@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 2DB4D12C; Wed, 1 Mar 2017 18:37:37 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21Iban8055501; Wed, 1 Mar 2017 18:37:36 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21IbaLj055498; Wed, 1 Mar 2017 18:37:36 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201703011837.v21IbaLj055498@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Wed, 1 Mar 2017 18:37:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314502 - in head/sys: kern net sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 18:37:37 -0000 Author: sbruno Date: Wed Mar 1 18:37:35 2017 New Revision: 314502 URL: https://svnweb.freebsd.org/changeset/base/314502 Log: Make gtaskqueue compatible with drm-next such that they can be used with the linuxkpi tasklets. Submitted by: mmacy@nextbsd.org Reported by: hps Modified: head/sys/kern/subr_gtaskqueue.c head/sys/net/iflib.c head/sys/sys/gtaskqueue.h Modified: head/sys/kern/subr_gtaskqueue.c ============================================================================== --- head/sys/kern/subr_gtaskqueue.c Wed Mar 1 18:23:30 2017 (r314501) +++ head/sys/kern/subr_gtaskqueue.c Wed Mar 1 18:37:35 2017 (r314502) @@ -52,6 +52,8 @@ static MALLOC_DEFINE(M_GTASKQUEUE, "task static void gtaskqueue_thread_enqueue(void *); static void gtaskqueue_thread_loop(void *arg); +TASKQGROUP_DEFINE(softirq, mp_ncpus, 1); + struct gtaskqueue_busy { struct gtask *tb_running; TAILQ_ENTRY(gtaskqueue_busy) tb_link; Modified: head/sys/net/iflib.c ============================================================================== --- head/sys/net/iflib.c Wed Mar 1 18:23:30 2017 (r314501) +++ head/sys/net/iflib.c Wed Mar 1 18:37:35 2017 (r314502) @@ -480,7 +480,6 @@ MODULE_VERSION(iflib, 1); MODULE_DEPEND(iflib, pci, 1, 1, 1); MODULE_DEPEND(iflib, ether, 1, 1, 1); -TASKQGROUP_DEFINE(if_io_tqg, mp_ncpus, 1); TASKQGROUP_DEFINE(if_config_tqg, 1, 1); #ifndef IFLIB_DEBUG_COUNTERS @@ -3922,7 +3921,7 @@ iflib_device_deregister(if_ctx_t ctx) if (ctx->ifc_led_dev != NULL) led_destroy(ctx->ifc_led_dev); /* XXX drain any dependent tasks */ - tqg = qgroup_if_io_tqg; + tqg = qgroup_softirq; for (txq = ctx->ifc_txqs, i = 0; i < NTXQSETS(ctx); i++, txq++) { callout_drain(&txq->ift_timer); callout_drain(&txq->ift_db_check); @@ -4552,7 +4551,7 @@ iflib_irq_alloc_generic(if_ctx_t ctx, if q = &ctx->ifc_txqs[qid]; info = &ctx->ifc_txqs[qid].ift_filter_info; gtask = &ctx->ifc_txqs[qid].ift_task; - tqg = qgroup_if_io_tqg; + tqg = qgroup_softirq; fn = _task_fn_tx; GROUPTASK_INIT(gtask, 0, fn, q); break; @@ -4560,7 +4559,7 @@ iflib_irq_alloc_generic(if_ctx_t ctx, if q = &ctx->ifc_rxqs[qid]; info = &ctx->ifc_rxqs[qid].ifr_filter_info; gtask = &ctx->ifc_rxqs[qid].ifr_task; - tqg = qgroup_if_io_tqg; + tqg = qgroup_softirq; fn = _task_fn_rx; GROUPTASK_INIT(gtask, 0, fn, q); break; @@ -4611,13 +4610,13 @@ iflib_softirq_alloc_generic(if_ctx_t ctx case IFLIB_INTR_TX: q = &ctx->ifc_txqs[qid]; gtask = &ctx->ifc_txqs[qid].ift_task; - tqg = qgroup_if_io_tqg; + tqg = qgroup_softirq; fn = _task_fn_tx; break; case IFLIB_INTR_RX: q = &ctx->ifc_rxqs[qid]; gtask = &ctx->ifc_rxqs[qid].ifr_task; - tqg = qgroup_if_io_tqg; + tqg = qgroup_softirq; fn = _task_fn_rx; break; case IFLIB_INTR_IOV: @@ -4661,7 +4660,7 @@ iflib_legacy_setup(if_ctx_t ctx, driver_ q = &ctx->ifc_rxqs[0]; info = &rxq[0].ifr_filter_info; gtask = &rxq[0].ifr_task; - tqg = qgroup_if_io_tqg; + tqg = qgroup_softirq; tqrid = irq->ii_rid = *rid; fn = _task_fn_rx; @@ -4678,7 +4677,7 @@ iflib_legacy_setup(if_ctx_t ctx, driver_ taskqgroup_attach(tqg, gtask, q, tqrid, name); GROUPTASK_INIT(&txq->ift_task, 0, _task_fn_tx, txq); - taskqgroup_attach(qgroup_if_io_tqg, &txq->ift_task, txq, tqrid, "tx"); + taskqgroup_attach(qgroup_softirq, &txq->ift_task, txq, tqrid, "tx"); return (0); } @@ -4728,7 +4727,7 @@ void iflib_io_tqg_attach(struct grouptask *gt, void *uniq, int cpu, char *name) { - taskqgroup_attach_cpu(qgroup_if_io_tqg, gt, uniq, cpu, -1, name); + taskqgroup_attach_cpu(qgroup_softirq, gt, uniq, cpu, -1, name); } void Modified: head/sys/sys/gtaskqueue.h ============================================================================== --- head/sys/sys/gtaskqueue.h Wed Mar 1 18:23:30 2017 (r314501) +++ head/sys/sys/gtaskqueue.h Wed Mar 1 18:37:35 2017 (r314502) @@ -119,5 +119,6 @@ SYSINIT(taskqgroup_adj_##name, SI_SUB_SM #endif /* EARLY_AP_STARTUP */ TASKQGROUP_DECLARE(net); +TASKQGROUP_DECLARE(softirq); #endif /* !_SYS_GTASKQUEUE_H_ */ From owner-svn-src-all@freebsd.org Wed Mar 1 18:53:09 2017 Return-Path: Delivered-To: svn-src-all@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 490C0CF38BE; Wed, 1 Mar 2017 18:53:09 +0000 (UTC) (envelope-from ian@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 EBD7ED3D; Wed, 1 Mar 2017 18:53:08 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21Ir8qR063256; Wed, 1 Mar 2017 18:53:08 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21Ir54W063233; Wed, 1 Mar 2017 18:53:05 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703011853.v21Ir54W063233@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 1 Mar 2017 18:53:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314503 - in stable/11/sys/arm: altera/socfpga broadcom/bcm2835 freescale/imx freescale/vybrid lpc mv rockchip ti ti/am335x versatile xilinx X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 18:53:09 -0000 Author: ian Date: Wed Mar 1 18:53:05 2017 New Revision: 314503 URL: https://svnweb.freebsd.org/changeset/base/314503 Log: MFC r308640: Use the correct OF_getencprop over OF_getprop + fdt32_to_cpu to read integer data from the device tree. Modified: stable/11/sys/arm/altera/socfpga/socfpga_common.c stable/11/sys/arm/altera/socfpga/socfpga_rstmgr.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_fb.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_machdep.c stable/11/sys/arm/freescale/imx/imx51_ipuv3.c stable/11/sys/arm/freescale/imx/imx51_ipuv3_fbd.c stable/11/sys/arm/freescale/imx/imx6_ssi.c stable/11/sys/arm/freescale/vybrid/vf_common.c stable/11/sys/arm/freescale/vybrid/vf_dcu4.c stable/11/sys/arm/freescale/vybrid/vf_edma.c stable/11/sys/arm/freescale/vybrid/vf_iomuxc.c stable/11/sys/arm/freescale/vybrid/vf_sai.c stable/11/sys/arm/lpc/lpc_fb.c stable/11/sys/arm/lpc/lpc_timer.c stable/11/sys/arm/mv/gpio.c stable/11/sys/arm/mv/mv_machdep.c stable/11/sys/arm/rockchip/rk30xx_gpio.c stable/11/sys/arm/ti/am335x/am335x_lcd.c stable/11/sys/arm/ti/am335x/am335x_lcd_syscons.c stable/11/sys/arm/ti/ti_adc.c stable/11/sys/arm/ti/ti_sdhci.c stable/11/sys/arm/versatile/sp804.c stable/11/sys/arm/xilinx/zy7_slcr.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/altera/socfpga/socfpga_common.c ============================================================================== --- stable/11/sys/arm/altera/socfpga/socfpga_common.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/altera/socfpga/socfpga_common.c Wed Mar 1 18:53:05 2017 (r314503) @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include @@ -47,7 +46,7 @@ __FBSDID("$FreeBSD$"); void cpu_reset(void) { - uint32_t addr, paddr; + uint32_t paddr; bus_addr_t vaddr; phandle_t node; @@ -58,9 +57,8 @@ cpu_reset(void) if (node == -1) goto end; - if ((OF_getprop(node, "reg", &paddr, sizeof(paddr))) > 0) { - addr = fdt32_to_cpu(paddr); - if (bus_space_map(fdtbus_bs_tag, addr, 0x8, 0, &vaddr) == 0) { + if ((OF_getencprop(node, "reg", &paddr, sizeof(paddr))) > 0) { + if (bus_space_map(fdtbus_bs_tag, paddr, 0x8, 0, &vaddr) == 0) { bus_space_write_4(fdtbus_bs_tag, vaddr, RSTMGR_CTRL, CTRL_SWWARMRSTREQ); } Modified: stable/11/sys/arm/altera/socfpga/socfpga_rstmgr.c ============================================================================== --- stable/11/sys/arm/altera/socfpga/socfpga_rstmgr.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/altera/socfpga/socfpga_rstmgr.c Wed Mar 1 18:53:05 2017 (r314503) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include @@ -84,7 +83,7 @@ enum { static int l3remap(struct rstmgr_softc *sc, int remap, int enable) { - uint32_t addr, paddr; + uint32_t paddr; bus_addr_t vaddr; phandle_t node; int reg; @@ -106,9 +105,8 @@ l3remap(struct rstmgr_softc *sc, int rem return (1); } - if ((OF_getprop(node, "reg", &paddr, sizeof(paddr))) > 0) { - addr = fdt32_to_cpu(paddr); - if (bus_space_map(fdtbus_bs_tag, addr, 0x4, 0, &vaddr) == 0) { + if ((OF_getencprop(node, "reg", &paddr, sizeof(paddr))) > 0) { + if (bus_space_map(fdtbus_bs_tag, paddr, 0x4, 0, &vaddr) == 0) { bus_space_write_4(fdtbus_bs_tag, vaddr, L3REGS_REMAP, reg); return (0); Modified: stable/11/sys/arm/broadcom/bcm2835/bcm2835_fb.c ============================================================================== --- stable/11/sys/arm/broadcom/bcm2835/bcm2835_fb.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/broadcom/bcm2835/bcm2835_fb.c Wed Mar 1 18:53:05 2017 (r314503) @@ -474,15 +474,15 @@ bcmfb_configure(int flags) if ((root != 0) && (display = fdt_find_compatible(root, "broadcom,bcm2835-fb", 1))) { if (sc->width == 0) { - if ((OF_getprop(display, "broadcom,width", + if ((OF_getencprop(display, "broadcom,width", &cell, sizeof(cell))) > 0) - sc->width = (int)fdt32_to_cpu(cell); + sc->width = cell; } if (sc->height == 0) { if ((OF_getprop(display, "broadcom,height", &cell, sizeof(cell))) > 0) - sc->height = (int)fdt32_to_cpu(cell); + sc->height = cell; } } Modified: stable/11/sys/arm/broadcom/bcm2835/bcm2835_machdep.c ============================================================================== --- stable/11/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Wed Mar 1 18:53:05 2017 (r314503) @@ -78,13 +78,15 @@ bcm2835_late_init(platform_t plat) system = OF_finddevice("/system"); if (system != 0) { - len = OF_getprop(system, "linux,serial", &cells, sizeof(cells)); + len = OF_getencprop(system, "linux,serial", cells, + sizeof(cells)); if (len > 0) - board_set_serial(fdt64_to_cpu(*((uint64_t *)cells))); + board_set_serial(((uint64_t)cells[0]) << 32 | cells[1]); - len = OF_getprop(system, "linux,revision", &cells, sizeof(cells)); + len = OF_getencprop(system, "linux,revision", cells, + sizeof(cells)); if (len > 0) - board_set_revision(fdt32_to_cpu(*((uint32_t *)cells))); + board_set_revision(cells[0]); } } Modified: stable/11/sys/arm/freescale/imx/imx51_ipuv3.c ============================================================================== --- stable/11/sys/arm/freescale/imx/imx51_ipuv3.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/freescale/imx/imx51_ipuv3.c Wed Mar 1 18:53:05 2017 (r314503) @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include @@ -313,10 +312,10 @@ ipu3_fb_attach(device_t dev) * On i.MX53, the offset is 0. */ node = ofw_bus_get_node(dev); - if ((OF_getprop(node, "reg", ®, sizeof(reg))) <= 0) + if ((OF_getencprop(node, "reg", ®, sizeof(reg))) <= 0) base = 0; else - base = fdt32_to_cpu(reg) - IPU_CM_BASE(0); + base = reg - IPU_CM_BASE(0); /* map controller registers */ err = bus_space_map(iot, IPU_CM_BASE(base), IPU_CM_SIZE, 0, &ioh); if (err) Modified: stable/11/sys/arm/freescale/imx/imx51_ipuv3_fbd.c ============================================================================== --- stable/11/sys/arm/freescale/imx/imx51_ipuv3_fbd.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/freescale/imx/imx51_ipuv3_fbd.c Wed Mar 1 18:53:05 2017 (r314503) @@ -222,10 +222,10 @@ ipu3_fb_attach(device_t dev) * On i.MX53, the offset is 0. */ node = ofw_bus_get_node(dev); - if ((OF_getprop(node, "reg", ®, sizeof(reg))) <= 0) + if ((OF_getencprop(node, "reg", ®, sizeof(reg))) <= 0) base = 0; else - base = fdt32_to_cpu(reg) - IPU_CM_BASE(0); + base = reg - IPU_CM_BASE(0); /* map controller registers */ err = bus_space_map(iot, IPU_CM_BASE(base), IPU_CM_SIZE, 0, &ioh); if (err) Modified: stable/11/sys/arm/freescale/imx/imx6_ssi.c ============================================================================== --- stable/11/sys/arm/freescale/imx/imx6_ssi.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/freescale/imx/imx6_ssi.c Wed Mar 1 18:53:05 2017 (r314503) @@ -447,12 +447,12 @@ find_sdma_controller(struct sc_info *sc) if ((len = OF_getproplen(node, "dmas")) <= 0) return (ENXIO); - OF_getprop(node, "dmas", &dts_value, len); + OF_getencprop(node, "dmas", &dts_value, len); - sc->sdma_ev_rx = fdt32_to_cpu(dts_value[1]); - sc->sdma_ev_tx = fdt32_to_cpu(dts_value[5]); + sc->sdma_ev_rx = dts_value[1]; + sc->sdma_ev_tx = dts_value[5]; - sdma_node = OF_node_from_xref(fdt32_to_cpu(dts_value[0])); + sdma_node = OF_node_from_xref(dts_value[0]); sdma_sc = NULL; Modified: stable/11/sys/arm/freescale/vybrid/vf_common.c ============================================================================== --- stable/11/sys/arm/freescale/vybrid/vf_common.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/freescale/vybrid/vf_common.c Wed Mar 1 18:53:05 2017 (r314503) @@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include @@ -44,16 +43,15 @@ void cpu_reset(void) { phandle_t src; - uint32_t addr, paddr; + uint32_t paddr; bus_addr_t vaddr; if (src_swreset() == 0) goto end; src = OF_finddevice("src"); - if ((src != 0) && (OF_getprop(src, "reg", &paddr, sizeof(paddr))) > 0) { - addr = fdt32_to_cpu(paddr); - if (bus_space_map(fdtbus_bs_tag, addr, 0x10, 0, &vaddr) == 0) { + if ((src != 0) && (OF_getencprop(src, "reg", &paddr, sizeof(paddr))) > 0) { + if (bus_space_map(fdtbus_bs_tag, paddr, 0x10, 0, &vaddr) == 0) { bus_space_write_4(fdtbus_bs_tag, vaddr, 0x00, SW_RST); } } Modified: stable/11/sys/arm/freescale/vybrid/vf_dcu4.c ============================================================================== --- stable/11/sys/arm/freescale/vybrid/vf_dcu4.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/freescale/vybrid/vf_dcu4.c Wed Mar 1 18:53:05 2017 (r314503) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include @@ -246,37 +245,37 @@ get_panel_info(struct dcu_softc *sc, str /* panel size */ if ((len = OF_getproplen(node, "panel-size")) <= 0) return (ENXIO); - OF_getprop(node, "panel-size", &dts_value, len); - panel->width = fdt32_to_cpu(dts_value[0]); - panel->height = fdt32_to_cpu(dts_value[1]); + OF_getencprop(node, "panel-size", dts_value, len); + panel->width = dts_value[0]; + panel->height = dts_value[1]; /* hsync */ if ((len = OF_getproplen(node, "panel-hsync")) <= 0) return (ENXIO); - OF_getprop(node, "panel-hsync", &dts_value, len); - panel->h_back_porch = fdt32_to_cpu(dts_value[0]); - panel->h_pulse_width = fdt32_to_cpu(dts_value[1]); - panel->h_front_porch = fdt32_to_cpu(dts_value[2]); + OF_getencprop(node, "panel-hsync", dts_value, len); + panel->h_back_porch = dts_value[0]; + panel->h_pulse_width = dts_value[1]; + panel->h_front_porch = dts_value[2]; /* vsync */ if ((len = OF_getproplen(node, "panel-vsync")) <= 0) return (ENXIO); - OF_getprop(node, "panel-vsync", &dts_value, len); - panel->v_back_porch = fdt32_to_cpu(dts_value[0]); - panel->v_pulse_width = fdt32_to_cpu(dts_value[1]); - panel->v_front_porch = fdt32_to_cpu(dts_value[2]); + OF_getencprop(node, "panel-vsync", dts_value, len); + panel->v_back_porch = dts_value[0]; + panel->v_pulse_width = dts_value[1]; + panel->v_front_porch = dts_value[2]; /* clk divider */ if ((len = OF_getproplen(node, "panel-clk-div")) <= 0) return (ENXIO); - OF_getprop(node, "panel-clk-div", &dts_value, len); - panel->clk_div = fdt32_to_cpu(dts_value[0]); + OF_getencprop(node, "panel-clk-div", dts_value, len); + panel->clk_div = dts_value[0]; /* backlight pin */ if ((len = OF_getproplen(node, "panel-backlight-pin")) <= 0) return (ENXIO); - OF_getprop(node, "panel-backlight-pin", &dts_value, len); - panel->backlight_pin = fdt32_to_cpu(dts_value[0]); + OF_getencprop(node, "panel-backlight-pin", dts_value, len); + panel->backlight_pin = dts_value[0]; return (0); } Modified: stable/11/sys/arm/freescale/vybrid/vf_edma.c ============================================================================== --- stable/11/sys/arm/freescale/vybrid/vf_edma.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/freescale/vybrid/vf_edma.c Wed Mar 1 18:53:05 2017 (r314503) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include @@ -284,8 +283,8 @@ edma_attach(device_t dev) if ((len = OF_getproplen(node, "device-id")) <= 0) return (ENXIO); - OF_getprop(node, "device-id", &dts_value, len); - sc->device_id = fdt32_to_cpu(dts_value); + OF_getencprop(node, "device-id", &dts_value, len); + sc->device_id = dts_value; sc->dma_stop = dma_stop; sc->dma_setup = dma_setup; Modified: stable/11/sys/arm/freescale/vybrid/vf_iomuxc.c ============================================================================== --- stable/11/sys/arm/freescale/vybrid/vf_iomuxc.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/freescale/vybrid/vf_iomuxc.c Wed Mar 1 18:53:05 2017 (r314503) @@ -148,12 +148,12 @@ pinmux_set(struct iomuxc_softc *sc) continue; if ((len = OF_getproplen(child, "iomux_config")) > 0) { - OF_getprop(child, "iomux_config", &iomux_config, len); + OF_getencprop(child, "iomux_config", iomux_config, len); values = len / (sizeof(uint32_t)); for (i = 0; i < values; i += 2) { - pin = fdt32_to_cpu(iomux_config[i]); - pin_cfg = fdt32_to_cpu(iomux_config[i+1]); + pin = iomux_config[i]; + pin_cfg = iomux_config[i+1]; #if 0 device_printf(sc->dev, "Set pin %d to 0x%08x\n", pin, pin_cfg); Modified: stable/11/sys/arm/freescale/vybrid/vf_sai.c ============================================================================== --- stable/11/sys/arm/freescale/vybrid/vf_sai.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/freescale/vybrid/vf_sai.c Wed Mar 1 18:53:05 2017 (r314503) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include @@ -424,19 +423,19 @@ find_edma_controller(struct sc_info *sc) if ((len = OF_getproplen(node, "edma-mux-group")) <= 0) return (ENXIO); - OF_getprop(node, "edma-src-transmit", &dts_value, len); - edma_src_transmit = fdt32_to_cpu(dts_value); - OF_getprop(node, "edma-mux-group", &dts_value, len); - edma_mux_group = fdt32_to_cpu(dts_value); - OF_getprop(node, "edma-controller", &dts_value, len); - edma_node = OF_node_from_xref(fdt32_to_cpu(dts_value)); + OF_getencprop(node, "edma-src-transmit", &dts_value, len); + edma_src_transmit = dts_value; + OF_getencprop(node, "edma-mux-group", &dts_value, len); + edma_mux_group = dts_value; + OF_getencprop(node, "edma-controller", &dts_value, len); + edma_node = OF_node_from_xref(dts_value); if ((len = OF_getproplen(edma_node, "device-id")) <= 0) { return (ENXIO); } - OF_getprop(edma_node, "device-id", &dts_value, len); - edma_device_id = fdt32_to_cpu(dts_value); + OF_getencprop(edma_node, "device-id", &dts_value, len); + edma_device_id = dts_value; edma_sc = NULL; Modified: stable/11/sys/arm/lpc/lpc_fb.c ============================================================================== --- stable/11/sys/arm/lpc/lpc_fb.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/lpc/lpc_fb.c Wed Mar 1 18:53:05 2017 (r314503) @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include @@ -280,10 +279,9 @@ lpc_fb_intr(void *arg) static int lpc_fb_fdt_read(phandle_t node, const char *name, uint32_t *ret) { - if (OF_getprop(node, name, ret, sizeof(uint32_t)) <= 0) + if (OF_getencprop(node, name, ret, sizeof(uint32_t)) <= 0) return (ENOENT); - *ret = fdt32_to_cpu(*ret); return (0); } Modified: stable/11/sys/arm/lpc/lpc_timer.c ============================================================================== --- stable/11/sys/arm/lpc/lpc_timer.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/lpc/lpc_timer.c Wed Mar 1 18:53:05 2017 (r314503) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include @@ -158,7 +157,7 @@ lpc_timer_attach(device_t dev) /* Get PERIPH_CLK encoded in parent bus 'bus-frequency' property */ node = ofw_bus_get_node(dev); - if (OF_getprop(OF_parent(node), "bus-frequency", &freq, + if (OF_getencprop(OF_parent(node), "bus-frequency", &freq, sizeof(pcell_t)) <= 0) { bus_release_resources(dev, lpc_timer_spec, sc->lt_res); bus_teardown_intr(dev, sc->lt_res[2], intrcookie); @@ -166,8 +165,6 @@ lpc_timer_attach(device_t dev) return (ENXIO); } - freq = fdt32_to_cpu(freq); - /* Set desired frequency in event timer and timecounter */ sc->lt_et.et_frequency = (uint64_t)freq; lpc_timecounter.tc_frequency = (uint64_t)freq; Modified: stable/11/sys/arm/mv/gpio.c ============================================================================== --- stable/11/sys/arm/mv/gpio.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/mv/gpio.c Wed Mar 1 18:53:05 2017 (r314503) @@ -113,7 +113,7 @@ struct gpio_ctrl_entry { gpios_phandler_t handler; }; -int mv_handle_gpios_prop(phandle_t ctrl, pcell_t *gpios, int len); +static int mv_handle_gpios_prop(phandle_t ctrl, pcell_t *gpios, int len); int gpio_get_config_from_dt(void); struct gpio_ctrl_entry gpio_controllers[] = { @@ -540,7 +540,7 @@ mv_gpio_value_set(uint32_t pin, uint8_t mv_gpio_reg_clear(reg, pin); } -int +static int mv_handle_gpios_prop(phandle_t ctrl, pcell_t *gpios, int len) { pcell_t gpio_cells, pincnt; @@ -554,10 +554,8 @@ mv_handle_gpios_prop(phandle_t ctrl, pce /* Node is not a GPIO controller. */ return (ENXIO); - if (OF_getprop(ctrl, "#gpio-cells", &gpio_cells, sizeof(pcell_t)) < 0) + if (OF_getencprop(ctrl, "#gpio-cells", &gpio_cells, sizeof(pcell_t)) < 0) return (ENXIO); - - gpio_cells = fdt32_to_cpu(gpio_cells); if (gpio_cells != 3) return (ENXIO); @@ -567,9 +565,9 @@ mv_handle_gpios_prop(phandle_t ctrl, pce if (fdt_regsize(ctrl, &gpio_ctrl, &size)) return (ENXIO); - if (OF_getprop(ctrl, "pin-count", &pincnt, sizeof(pcell_t)) < 0) + if (OF_getencprop(ctrl, "pin-count", &pincnt, sizeof(pcell_t)) < 0) return (ENXIO); - sc.pin_num = fdt32_to_cpu(pincnt); + sc.pin_num = pincnt; /* * Skip controller reference, since controller's phandle is given @@ -579,9 +577,9 @@ mv_handle_gpios_prop(phandle_t ctrl, pce gpios += inc; for (t = 0; t < tuples; t++) { - pin = fdt32_to_cpu(gpios[0]); - dir = fdt32_to_cpu(gpios[1]); - flags = fdt32_to_cpu(gpios[2]); + pin = gpios[0]; + dir = gpios[1]; + flags = gpios[2]; mv_gpio_configure(pin, flags); @@ -630,7 +628,7 @@ mv_gpio_init(void) return (ENXIO); /* Get 'gpios' property. */ - OF_getprop(child, "gpios", &gpios, len); + OF_getencprop(child, "gpios", gpios, len); e = (struct gpio_ctrl_entry *)&gpio_controllers; @@ -641,7 +639,7 @@ mv_gpio_init(void) * contain a ref. to a node defining GPIO * controller. */ - ctrl = OF_node_from_xref(fdt32_to_cpu(gpios[0])); + ctrl = OF_node_from_xref(gpios[0]); if (fdt_is_compatible(ctrl, e->compat)) /* Call a handler. */ Modified: stable/11/sys/arm/mv/mv_machdep.c ============================================================================== --- stable/11/sys/arm/mv/mv_machdep.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/mv/mv_machdep.c Wed Mar 1 18:53:05 2017 (r314503) @@ -146,21 +146,19 @@ moveon: /* * Process 'pin-count' and 'pin-map' props. */ - if (OF_getprop(node, "pin-count", &pin_count, sizeof(pin_count)) <= 0) + if (OF_getencprop(node, "pin-count", &pin_count, sizeof(pin_count)) <= 0) return (ENXIO); - pin_count = fdt32_to_cpu(pin_count); if (pin_count > MPP_PIN_MAX) return (ERANGE); - if (OF_getprop(node, "#pin-cells", &pin_cells, sizeof(pin_cells)) <= 0) + if (OF_getencprop(node, "#pin-cells", &pin_cells, sizeof(pin_cells)) <= 0) pin_cells = MPP_PIN_CELLS; - pin_cells = fdt32_to_cpu(pin_cells); if (pin_cells > MPP_PIN_CELLS) return (ERANGE); tuple_size = sizeof(pcell_t) * pin_cells; bzero(pinmap, sizeof(pinmap)); - len = OF_getprop(node, "pin-map", pinmap, sizeof(pinmap)); + len = OF_getencprop(node, "pin-map", pinmap, sizeof(pinmap)); if (len <= 0) return (ERANGE); if (len % tuple_size) @@ -175,8 +173,8 @@ moveon: bzero(mpp, sizeof(mpp)); pinmap_ptr = pinmap; for (i = 0; i < pins; i++) { - mpp_pin = fdt32_to_cpu(*pinmap_ptr); - mpp_function = fdt32_to_cpu(*(pinmap_ptr + 1)); + mpp_pin = *pinmap_ptr; + mpp_function = *(pinmap_ptr + 1); mpp[mpp_pin] = mpp_function; pinmap_ptr += pin_cells; } @@ -408,12 +406,10 @@ platform_devmap_init(void) if (fdt_is_compatible(child, "mrvl,lbc")) { /* Check available space */ - if (OF_getprop(child, "bank-count", (void *)&bank_count, + if (OF_getencprop(child, "bank-count", &bank_count, sizeof(bank_count)) <= 0) /* If no property, use default value */ bank_count = 1; - else - bank_count = fdt32_to_cpu(bank_count); if ((i + bank_count) >= FDT_DEVMAP_MAX) return (ENOMEM); Modified: stable/11/sys/arm/rockchip/rk30xx_gpio.c ============================================================================== --- stable/11/sys/arm/rockchip/rk30xx_gpio.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/rockchip/rk30xx_gpio.c Wed Mar 1 18:53:05 2017 (r314503) @@ -526,10 +526,8 @@ rk30_gpios_prop_handle(phandle_t ctrl, p if (sc == NULL) return ENXIO; - if (OF_getprop(ctrl, "#gpio-cells", &gpio_cells, sizeof(pcell_t)) < 0) + if (OF_getencprop(ctrl, "#gpio-cells", &gpio_cells, sizeof(pcell_t)) < 0) return (ENXIO); - - gpio_cells = fdt32_to_cpu(gpio_cells); if (gpio_cells != 2) return (ENXIO); @@ -546,9 +544,9 @@ rk30_gpios_prop_handle(phandle_t ctrl, p inc = sizeof(ihandle_t) / sizeof(pcell_t); gpios += inc; for (t = 0; t < tuples; t++) { - pin = fdt32_to_cpu(gpios[0]); - dir = fdt32_to_cpu(gpios[1]); - flags = fdt32_to_cpu(gpios[2]); + pin = gpios[0]; + dir = gpios[1]; + flags = gpios[2]; for (i = 0; i < sc->sc_gpio_npins; i++) { if (sc->sc_gpio_pins[i].gp_pin == pin) @@ -601,7 +599,7 @@ rk30_gpio_init(void) return (ENXIO); /* Get 'gpios' property. */ - OF_getprop(child, "gpios", &gpios, len); + OF_getencprop(child, "gpios", gpios, len); e = (struct gpio_ctrl_entry *)&gpio_controllers; @@ -612,7 +610,7 @@ rk30_gpio_init(void) * contain a ref. to a node defining GPIO * controller. */ - ctrl = OF_node_from_xref(fdt32_to_cpu(gpios[0])); + ctrl = OF_node_from_xref(gpios[0]); if (fdt_is_compatible(ctrl, e->compat)) /* Call a handler. */ Modified: stable/11/sys/arm/ti/am335x/am335x_lcd.c ============================================================================== --- stable/11/sys/arm/ti/am335x/am335x_lcd.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/ti/am335x/am335x_lcd.c Wed Mar 1 18:53:05 2017 (r314503) @@ -359,13 +359,13 @@ am335x_read_property(device_t dev, phand { pcell_t cell; - if ((OF_getprop(node, name, &cell, sizeof(cell))) <= 0) { + if ((OF_getencprop(node, name, &cell, sizeof(cell))) <= 0) { device_printf(dev, "missing '%s' attribute in LCD panel info\n", name); return (ENXIO); } - *val = fdt32_to_cpu(cell); + *val = cell; return (0); } Modified: stable/11/sys/arm/ti/am335x/am335x_lcd_syscons.c ============================================================================== --- stable/11/sys/arm/ti/am335x/am335x_lcd_syscons.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/ti/am335x/am335x_lcd_syscons.c Wed Mar 1 18:53:05 2017 (r314503) @@ -383,13 +383,13 @@ am335x_syscons_configure(int flags) root = OF_finddevice("/"); if ((root != 0) && (display = am335x_syscons_find_panel_node(root))) { - if ((OF_getprop(display, "panel_width", - &cell, sizeof(cell))) > 0) - va_sc->width = (int)fdt32_to_cpu(cell); - - if ((OF_getprop(display, "panel_height", - &cell, sizeof(cell))) > 0) - va_sc->height = (int)fdt32_to_cpu(cell); + if ((OF_getencprop(display, "panel_width", &cell, + sizeof(cell))) > 0) + va_sc->width = cell; + + if ((OF_getencprop(display, "panel_height", &cell, + sizeof(cell))) > 0) + va_sc->height = cell; } if (va_sc->width == 0) Modified: stable/11/sys/arm/ti/ti_adc.c ============================================================================== --- stable/11/sys/arm/ti/ti_adc.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/ti/ti_adc.c Wed Mar 1 18:53:05 2017 (r314503) @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include #include @@ -767,14 +766,17 @@ ti_adc_attach(device_t dev) /* Read "tsc" node properties */ child = ofw_bus_find_child(node, "tsc"); if (child != 0 && OF_hasprop(child, "ti,wires")) { - if ((OF_getprop(child, "ti,wires", &cell, sizeof(cell))) > 0) - sc->sc_tsc_wires = fdt32_to_cpu(cell); - if ((OF_getprop(child, "ti,coordinate-readouts", &cell, sizeof(cell))) > 0) - sc->sc_coord_readouts = fdt32_to_cpu(cell); - if ((OF_getprop(child, "ti,x-plate-resistance", &cell, sizeof(cell))) > 0) - sc->sc_x_plate_resistance = fdt32_to_cpu(cell); - if ((OF_getprop(child, "ti,charge-delay", &cell, sizeof(cell))) > 0) - sc->sc_charge_delay = fdt32_to_cpu(cell); + if ((OF_getencprop(child, "ti,wires", &cell, sizeof(cell))) > 0) + sc->sc_tsc_wires = cell; + if ((OF_getencprop(child, "ti,coordinate-readouts", &cell, + sizeof(cell))) > 0) + sc->sc_coord_readouts = cell; + if ((OF_getencprop(child, "ti,x-plate-resistance", &cell, + sizeof(cell))) > 0) + sc->sc_x_plate_resistance = cell; + if ((OF_getencprop(child, "ti,charge-delay", &cell, + sizeof(cell))) > 0) + sc->sc_charge_delay = cell; nwire_configs = OF_getencprop_alloc(child, "ti,wire-config", sizeof(*wire_configs), (void **)&wire_configs); if (nwire_configs != sc->sc_tsc_wires) { Modified: stable/11/sys/arm/ti/ti_sdhci.c ============================================================================== --- stable/11/sys/arm/ti/ti_sdhci.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/ti/ti_sdhci.c Wed Mar 1 18:53:05 2017 (r314503) @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include @@ -506,10 +505,10 @@ ti_sdhci_attach(device_t dev) * See if we've got a GPIO-based write detect pin. This is not the * standard documented property for this, we added it in freebsd. */ - if ((OF_getprop(node, "mmchs-wp-gpio-pin", &prop, sizeof(prop))) <= 0) + if ((OF_getencprop(node, "mmchs-wp-gpio-pin", &prop, sizeof(prop))) <= 0) sc->wp_gpio_pin = 0xffffffff; else - sc->wp_gpio_pin = fdt32_to_cpu(prop); + sc->wp_gpio_pin = prop; if (sc->wp_gpio_pin != 0xffffffff) { sc->gpio_dev = devclass_get_device(devclass_find("gpio"), 0); Modified: stable/11/sys/arm/versatile/sp804.c ============================================================================== --- stable/11/sys/arm/versatile/sp804.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/versatile/sp804.c Wed Mar 1 18:53:05 2017 (r314503) @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include @@ -223,8 +222,8 @@ sp804_timer_attach(device_t dev) sc->sysclk_freq = DEFAULT_FREQUENCY; /* Get the base clock frequency */ node = ofw_bus_get_node(dev); - if ((OF_getprop(node, "clock-frequency", &clock, sizeof(clock))) > 0) { - sc->sysclk_freq = fdt32_to_cpu(clock); + if ((OF_getencprop(node, "clock-frequency", &clock, sizeof(clock))) > 0) { + sc->sysclk_freq = clock; } /* Setup and enable the timer */ Modified: stable/11/sys/arm/xilinx/zy7_slcr.c ============================================================================== --- stable/11/sys/arm/xilinx/zy7_slcr.c Wed Mar 1 18:37:35 2017 (r314502) +++ stable/11/sys/arm/xilinx/zy7_slcr.c Wed Mar 1 18:53:05 2017 (r314503) @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include @@ -621,8 +620,8 @@ zy7_slcr_attach(device_t dev) /* Derive PLL frequencies from PS_CLK. */ node = ofw_bus_get_node(dev); - if (OF_getprop(node, "clock-frequency", &cell, sizeof(cell)) > 0) - ps_clk_frequency = fdt32_to_cpu(cell); + if (OF_getencprop(node, "clock-frequency", &cell, sizeof(cell)) > 0) + ps_clk_frequency = cell; else ps_clk_frequency = ZYNQ_DEFAULT_PS_CLK_FREQUENCY; From owner-svn-src-all@freebsd.org Wed Mar 1 19:02:45 2017 Return-Path: Delivered-To: svn-src-all@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 00BA4CF3BC0; Wed, 1 Mar 2017 19:02:45 +0000 (UTC) (envelope-from tsoome@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 BEC9038A; Wed, 1 Mar 2017 19:02:44 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21J2hNY067361; Wed, 1 Mar 2017 19:02:43 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21J2hV7067360; Wed, 1 Mar 2017 19:02:43 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201703011902.v21J2hV7067360@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Wed, 1 Mar 2017 19:02:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314504 - head/sys/boot/zfs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 19:02:45 -0000 Author: tsoome Date: Wed Mar 1 19:02:43 2017 New Revision: 314504 URL: https://svnweb.freebsd.org/changeset/base/314504 Log: loader: r314112 did introduce dereference freed pointer entry CID: 1371675 Reported by: Coverity Reviewed by: jhb, allanjude Approved by: allanjude (mentor) Differential Revision: https://reviews.freebsd.org/D9846 Modified: head/sys/boot/zfs/zfsimpl.c Modified: head/sys/boot/zfs/zfsimpl.c ============================================================================== --- head/sys/boot/zfs/zfsimpl.c Wed Mar 1 18:53:05 2017 (r314503) +++ head/sys/boot/zfs/zfsimpl.c Wed Mar 1 19:02:43 2017 (r314504) @@ -2334,7 +2334,7 @@ zfs_lookup(const struct zfsmount *mount, char path[1024]; int symlinks_followed = 0; struct stat sb; - struct obj_list *entry; + struct obj_list *entry, *tentry; STAILQ_HEAD(, obj_list) on_cache = STAILQ_HEAD_INITIALIZER(on_cache); spa = mount->spa; @@ -2482,7 +2482,7 @@ zfs_lookup(const struct zfsmount *mount, *dnode = dn; done: - STAILQ_FOREACH(entry, &on_cache, entry) + STAILQ_FOREACH_SAFE(entry, &on_cache, entry, tentry) free(entry); return (rc); } From owner-svn-src-all@freebsd.org Wed Mar 1 19:36:34 2017 Return-Path: Delivered-To: svn-src-all@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 B4C14CF356B; Wed, 1 Mar 2017 19:36:34 +0000 (UTC) (envelope-from pfg@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 85E37909; Wed, 1 Mar 2017 19:36:34 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21JaX69079409; Wed, 1 Mar 2017 19:36:33 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21JaXps079403; Wed, 1 Mar 2017 19:36:33 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201703011936.v21JaXps079403@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Wed, 1 Mar 2017 19:36:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314505 - in head/sys/boot: arm/uboot powerpc/kboot powerpc/ofw powerpc/ps3 powerpc/uboot userboot/userboot X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 19:36:34 -0000 Author: pfg Date: Wed Mar 1 19:36:32 2017 New Revision: 314505 URL: https://svnweb.freebsd.org/changeset/base/314505 Log: Split the ficl CFLAGS when they refer to an arch-specific include path. This is a minimal attempt to keep consistency in the Makefiles so that moving ficl to somwehere like contrib will be less error prone. MFC after: 1 week Modified: head/sys/boot/arm/uboot/Makefile head/sys/boot/powerpc/kboot/Makefile head/sys/boot/powerpc/ofw/Makefile head/sys/boot/powerpc/ps3/Makefile head/sys/boot/powerpc/uboot/Makefile head/sys/boot/userboot/userboot/Makefile Modified: head/sys/boot/arm/uboot/Makefile ============================================================================== --- head/sys/boot/arm/uboot/Makefile Wed Mar 1 19:02:43 2017 (r314504) +++ head/sys/boot/arm/uboot/Makefile Wed Mar 1 19:36:32 2017 (r314505) @@ -80,7 +80,8 @@ LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/arm +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl +CFLAGS+= -I${.CURDIR}/../../ficl/arm LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: head/sys/boot/powerpc/kboot/Makefile ============================================================================== --- head/sys/boot/powerpc/kboot/Makefile Wed Mar 1 19:02:43 2017 (r314504) +++ head/sys/boot/powerpc/kboot/Makefile Wed Mar 1 19:36:32 2017 (r314505) @@ -64,7 +64,8 @@ LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl +CFLAGS+= -I${.CURDIR}/../../ficl/powerpc LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: head/sys/boot/powerpc/ofw/Makefile ============================================================================== --- head/sys/boot/powerpc/ofw/Makefile Wed Mar 1 19:02:43 2017 (r314504) +++ head/sys/boot/powerpc/ofw/Makefile Wed Mar 1 19:36:32 2017 (r314505) @@ -63,7 +63,8 @@ LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl +CFLAGS+= -I${.CURDIR}/../../ficl/powerpc LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: head/sys/boot/powerpc/ps3/Makefile ============================================================================== --- head/sys/boot/powerpc/ps3/Makefile Wed Mar 1 19:02:43 2017 (r314504) +++ head/sys/boot/powerpc/ps3/Makefile Wed Mar 1 19:36:32 2017 (r314505) @@ -64,7 +64,8 @@ LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl +CFLAGS+= -I${.CURDIR}/../../ficl/powerpc LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: head/sys/boot/powerpc/uboot/Makefile ============================================================================== --- head/sys/boot/powerpc/uboot/Makefile Wed Mar 1 19:02:43 2017 (r314504) +++ head/sys/boot/powerpc/uboot/Makefile Wed Mar 1 19:36:32 2017 (r314505) @@ -69,7 +69,8 @@ LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl +CFLAGS+= -I${.CURDIR}/../../ficl/powerpc LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: head/sys/boot/userboot/userboot/Makefile ============================================================================== --- head/sys/boot/userboot/userboot/Makefile Wed Mar 1 19:02:43 2017 (r314504) +++ head/sys/boot/userboot/userboot/Makefile Wed Mar 1 19:36:32 2017 (r314505) @@ -43,7 +43,8 @@ NEWVERSWHAT= "User boot" ${MACHINE_CPUAR .if ${MK_FORTH} != "no" BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386 +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl +CFLAGS+= -I${.CURDIR}/../../ficl/i386 CFLAGS+= -DBF_DICTSIZE=15000 LIBFICL= ${.OBJDIR}/../ficl/libficl.a .endif From owner-svn-src-all@freebsd.org Wed Mar 1 19:55:11 2017 Return-Path: Delivered-To: svn-src-all@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 80D32CF3980; Wed, 1 Mar 2017 19:55:11 +0000 (UTC) (envelope-from ian@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 1DCCD1D2; Wed, 1 Mar 2017 19:55:11 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21JtAsT087165; Wed, 1 Mar 2017 19:55:10 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21Jt5IT087115; Wed, 1 Mar 2017 19:55:05 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703011955.v21Jt5IT087115@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 1 Mar 2017 19:55:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314506 - in stable/11/sys: arm/allwinner arm/altera/socfpga arm/amlogic/aml8726 arm/annapurna/alpine arm/arm arm/at91 arm/broadcom/bcm2835 arm/freescale/imx arm/freescale/vybrid arm/in... X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 19:55:11 -0000 Author: ian Date: Wed Mar 1 19:55:04 2017 New Revision: 314506 URL: https://svnweb.freebsd.org/changeset/base/314506 Log: MFC r306262, r306267, r310021: (needed to avoid conflicts on later merges) Remove bus_dma_get_range and bus_dma_get_range_nb on armv6. We only need this on a few earlier arm SoCs. Restrict where we need to define fdt_fixup_table to just PowerPC and Marvell. Add the missing void to function signatures in much of the arm code. Modified: stable/11/sys/arm/allwinner/a10_common.c stable/11/sys/arm/allwinner/aw_machdep.c stable/11/sys/arm/allwinner/aw_wdog.c stable/11/sys/arm/altera/socfpga/socfpga_common.c stable/11/sys/arm/altera/socfpga/socfpga_machdep.c stable/11/sys/arm/amlogic/aml8726/aml8726_identsoc.c stable/11/sys/arm/amlogic/aml8726/aml8726_machdep.c stable/11/sys/arm/amlogic/aml8726/aml8726_wdt.c stable/11/sys/arm/annapurna/alpine/alpine_machdep.c stable/11/sys/arm/annapurna/alpine/common.c stable/11/sys/arm/arm/busdma_machdep-v6.c stable/11/sys/arm/arm/cpufunc.c stable/11/sys/arm/arm/db_trace.c stable/11/sys/arm/arm/physmem.c stable/11/sys/arm/arm/platform.c stable/11/sys/arm/arm/undefined.c stable/11/sys/arm/at91/at91_common.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_common.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_machdep.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_wdog.c stable/11/sys/arm/freescale/imx/imx6_anatop.c stable/11/sys/arm/freescale/imx/imx6_machdep.c stable/11/sys/arm/freescale/imx/imx6_src.c stable/11/sys/arm/freescale/imx/imx_common.c stable/11/sys/arm/freescale/imx/imx_machdep.c stable/11/sys/arm/freescale/vybrid/vf_common.c stable/11/sys/arm/freescale/vybrid/vf_machdep.c stable/11/sys/arm/include/bus_dma.h stable/11/sys/arm/lpc/lpc_gpio.c stable/11/sys/arm/lpc/lpc_intc.c stable/11/sys/arm/mv/mv_machdep.c stable/11/sys/arm/nvidia/tegra124/tegra124_machdep.c stable/11/sys/arm/nvidia/tegra_efuse.c stable/11/sys/arm/qemu/virt_common.c stable/11/sys/arm/qemu/virt_machdep.c stable/11/sys/arm/rockchip/rk30xx_common.c stable/11/sys/arm/rockchip/rk30xx_machdep.c stable/11/sys/arm/rockchip/rk30xx_wdog.c stable/11/sys/arm/samsung/exynos/exynos5_common.c stable/11/sys/arm/samsung/exynos/exynos5_machdep.c stable/11/sys/arm/ti/am335x/am335x_dmtpps.c stable/11/sys/arm/ti/ti_common.c stable/11/sys/arm/ti/ti_machdep.c stable/11/sys/arm/versatile/versatile_common.c stable/11/sys/arm/versatile/versatile_machdep.c stable/11/sys/arm/xilinx/zy7_machdep.c stable/11/sys/arm/xilinx/zy7_slcr.c stable/11/sys/arm/xscale/pxa/pxa_gpio.c stable/11/sys/arm/xscale/pxa/pxa_icu.c stable/11/sys/arm/xscale/pxa/pxa_space.c stable/11/sys/arm/xscale/pxa/pxa_timer.c stable/11/sys/dev/ofw/ofw_fdt.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/allwinner/a10_common.c ============================================================================== --- stable/11/sys/arm/allwinner/a10_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/allwinner/a10_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -38,10 +38,6 @@ __FBSDID("$FreeBSD$"); #include #include -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int Modified: stable/11/sys/arm/allwinner/aw_machdep.c ============================================================================== --- stable/11/sys/arm/allwinner/aw_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/allwinner/aw_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -36,7 +36,6 @@ #include __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include #include #include @@ -147,18 +146,6 @@ allwinner_devmap_init(platform_t plat) return (0); } -struct arm32_dma_range * -bus_dma_get_range(void) -{ - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - return (0); -} - void cpu_reset() { Modified: stable/11/sys/arm/allwinner/aw_wdog.c ============================================================================== --- stable/11/sys/arm/allwinner/aw_wdog.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/allwinner/aw_wdog.c Wed Mar 1 19:55:04 2017 (r314506) @@ -238,7 +238,7 @@ aw_wdog_shutdown_fn(void *private, int h } void -aw_wdog_watchdog_reset() +aw_wdog_watchdog_reset(void) { if (aw_wdog_sc == NULL) { Modified: stable/11/sys/arm/altera/socfpga/socfpga_common.c ============================================================================== --- stable/11/sys/arm/altera/socfpga/socfpga_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/altera/socfpga/socfpga_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -68,10 +68,6 @@ end: while (1); } -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: stable/11/sys/arm/altera/socfpga/socfpga_machdep.c ============================================================================== --- stable/11/sys/arm/altera/socfpga/socfpga_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/altera/socfpga/socfpga_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -34,7 +34,6 @@ #include __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include #include #include @@ -100,17 +99,3 @@ platform_devmap_init(void) return (0); } - -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} Modified: stable/11/sys/arm/amlogic/aml8726/aml8726_identsoc.c ============================================================================== --- stable/11/sys/arm/amlogic/aml8726/aml8726_identsoc.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/amlogic/aml8726/aml8726_identsoc.c Wed Mar 1 19:55:04 2017 (r314506) @@ -87,7 +87,7 @@ static const struct { }; void -aml8726_identify_soc() +aml8726_identify_soc(void) { int err; struct resource res; Modified: stable/11/sys/arm/amlogic/aml8726/aml8726_machdep.c ============================================================================== --- stable/11/sys/arm/amlogic/aml8726/aml8726_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/amlogic/aml8726/aml8726_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$"); #include "opt_platform.h" -#define _ARM32_BUS_DMA_PRIVATE #include #include #include @@ -57,7 +56,7 @@ vm_offset_t aml8726_aobus_kva_base; #endif static void -aml8726_fixup_busfreq() +aml8726_fixup_busfreq(void) { phandle_t node; pcell_t freq, prop; @@ -165,24 +164,6 @@ platform_devmap_init(void) return (0); } -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG #ifndef DEV_GIC static int Modified: stable/11/sys/arm/amlogic/aml8726/aml8726_wdt.c ============================================================================== --- stable/11/sys/arm/amlogic/aml8726/aml8726_wdt.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/amlogic/aml8726/aml8726_wdt.c Wed Mar 1 19:55:04 2017 (r314506) @@ -290,7 +290,7 @@ EARLY_DRIVER_MODULE(wdt, simplebus, aml8 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); void -cpu_reset() +cpu_reset(void) { /* Watchdog has not yet been initialized */ Modified: stable/11/sys/arm/annapurna/alpine/alpine_machdep.c ============================================================================== --- stable/11/sys/arm/annapurna/alpine/alpine_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/annapurna/alpine/alpine_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include #include #include @@ -131,17 +130,3 @@ platform_devmap_init(void) devmap_add_entry(al_devmap_pa, al_devmap_size); return (0); } - -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} Modified: stable/11/sys/arm/annapurna/alpine/common.c ============================================================================== --- stable/11/sys/arm/annapurna/alpine/common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/annapurna/alpine/common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -56,9 +56,6 @@ __FBSDID("$FreeBSD$"); #define LOCK 0x00000001 extern bus_addr_t al_devmap_pa; -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; static int alpine_get_wdt_base(uint32_t *pbase, uint32_t *psize); static int alpine_pic_decode_fdt(uint32_t iparent, uint32_t *intr, Modified: stable/11/sys/arm/arm/busdma_machdep-v6.c ============================================================================== --- stable/11/sys/arm/arm/busdma_machdep-v6.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/arm/busdma_machdep-v6.c Wed Mar 1 19:55:04 2017 (r314506) @@ -33,7 +33,6 @@ #include __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include #include #include @@ -90,14 +89,6 @@ struct bus_dma_tag { bus_dma_lock_t *lockfunc; void *lockfuncarg; struct bounce_zone *bounce_zone; - /* - * DMA range for this tag. If the page doesn't fall within - * one of these ranges, an error is returned. The caller - * may then decide what to do with the transfer. If the - * range pointer is NULL, it is ignored. - */ - struct arm32_dma_range *ranges; - int _nranges; }; struct bounce_page { @@ -402,22 +393,6 @@ must_bounce(bus_dma_tag_t dmat, bus_dmam return (0); } -static __inline struct arm32_dma_range * -_bus_dma_inrange(struct arm32_dma_range *ranges, int nranges, - bus_addr_t curaddr) -{ - struct arm32_dma_range *dr; - int i; - - for (i = 0, dr = ranges; i < nranges; i++, dr++) { - if (curaddr >= dr->dr_sysbase && - round_page(curaddr) <= (dr->dr_sysbase + dr->dr_len)) - return (dr); - } - - return (NULL); -} - /* * Convenience function for manipulating driver locks from busdma (during * busdma_swi, for example). Drivers that don't provide their own locks @@ -502,8 +477,6 @@ bus_dma_tag_create(bus_dma_tag_t parent, newtag->flags = flags; newtag->ref_count = 1; /* Count ourself */ newtag->map_count = 0; - newtag->ranges = bus_dma_get_range(); - newtag->_nranges = bus_dma_get_range_nb(); if (lockfunc != NULL) { newtag->lockfunc = lockfunc; newtag->lockfuncarg = lockfuncarg; @@ -987,22 +960,6 @@ _bus_dmamap_addseg(bus_dma_tag_t dmat, b sgsize = (baddr - curaddr); } - if (dmat->ranges) { - struct arm32_dma_range *dr; - - dr = _bus_dma_inrange(dmat->ranges, dmat->_nranges, - curaddr); - if (dr == NULL) { - _bus_dmamap_unload(dmat, map); - return (0); - } - /* - * In a valid DMA range. Translate the physical - * memory address to an address in the DMA window. - */ - curaddr = (curaddr - dr->dr_sysbase) + dr->dr_busbase; - } - /* * Insert chunk into a segment, coalescing with * previous segment if possible. Modified: stable/11/sys/arm/arm/cpufunc.c ============================================================================== --- stable/11/sys/arm/arm/cpufunc.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/arm/cpufunc.c Wed Mar 1 19:55:04 2017 (r314506) @@ -585,7 +585,7 @@ static int arm_dcache_l2_assoc; static int arm_dcache_l2_linesize; static void -get_cachetype_cp15() +get_cachetype_cp15(void) { u_int ctype, isize, dsize, cpuid; u_int clevel, csize, i, sel; @@ -700,7 +700,7 @@ get_cachetype_cp15() */ int -set_cpufuncs() +set_cpufuncs(void) { cputype = cpu_ident(); cputype &= CPU_ID_CPU_MASK; Modified: stable/11/sys/arm/arm/db_trace.c ============================================================================== --- stable/11/sys/arm/arm/db_trace.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/arm/db_trace.c Wed Mar 1 19:55:04 2017 (r314506) @@ -130,7 +130,7 @@ db_stack_trace_cmd(struct unwind_state * } void -db_md_list_watchpoints() +db_md_list_watchpoints(void) { dbg_show_watchpoint(); Modified: stable/11/sys/arm/arm/physmem.c ============================================================================== --- stable/11/sys/arm/arm/physmem.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/arm/physmem.c Wed Mar 1 19:55:04 2017 (r314506) @@ -145,7 +145,7 @@ physmem_dump_tables(int (*prfunc)(const * Print the contents of the static mapping table. Used for bootverbose. */ void -arm_physmem_print_tables() +arm_physmem_print_tables(void) { physmem_dump_tables(printf); Modified: stable/11/sys/arm/arm/platform.c ============================================================================== --- stable/11/sys/arm/arm/platform.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/arm/platform.c Wed Mar 1 19:55:04 2017 (r314506) @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); * through a previously registered kernel object. */ -#define _ARM32_BUS_DMA_PRIVATE #include #include #include Modified: stable/11/sys/arm/arm/undefined.c ============================================================================== --- stable/11/sys/arm/arm/undefined.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/arm/undefined.c Wed Mar 1 19:55:04 2017 (r314506) @@ -165,7 +165,7 @@ gdb_trapper(u_int addr, u_int insn, stru static struct undefined_handler gdb_uh; void -undefined_init() +undefined_init(void) { int loop; Modified: stable/11/sys/arm/at91/at91_common.c ============================================================================== --- stable/11/sys/arm/at91/at91_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/at91/at91_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -49,10 +49,6 @@ __FBSDID("$FreeBSD$"); extern const struct devmap_entry at91_devmap[]; -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_aic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: stable/11/sys/arm/broadcom/bcm2835/bcm2835_common.c ============================================================================== --- stable/11/sys/arm/broadcom/bcm2835/bcm2835_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/broadcom/bcm2835/bcm2835_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -46,10 +46,6 @@ __FBSDID("$FreeBSD$"); #include #include -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_intc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: stable/11/sys/arm/broadcom/bcm2835/bcm2835_machdep.c ============================================================================== --- stable/11/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -42,7 +42,6 @@ #include __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include #include #include @@ -115,19 +114,7 @@ bcm2836_devmap_init(platform_t plat) } #endif -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} -int -bus_dma_get_range_nb(void) -{ - - return (0); -} void cpu_reset() Modified: stable/11/sys/arm/broadcom/bcm2835/bcm2835_wdog.c ============================================================================== --- stable/11/sys/arm/broadcom/bcm2835/bcm2835_wdog.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/broadcom/bcm2835/bcm2835_wdog.c Wed Mar 1 19:55:04 2017 (r314506) @@ -191,7 +191,7 @@ bcmwd_watchdog_fn(void *private, u_int c } void -bcmwd_watchdog_reset() +bcmwd_watchdog_reset(void) { if (bcmwd_lsc == NULL) Modified: stable/11/sys/arm/freescale/imx/imx6_anatop.c ============================================================================== --- stable/11/sys/arm/freescale/imx/imx6_anatop.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/freescale/imx/imx6_anatop.c Wed Mar 1 19:55:04 2017 (r314506) @@ -776,7 +776,7 @@ imx6_anatop_probe(device_t dev) } uint32_t -imx6_get_cpu_clock() +imx6_get_cpu_clock(void) { uint32_t corediv, plldiv; Modified: stable/11/sys/arm/freescale/imx/imx6_machdep.c ============================================================================== --- stable/11/sys/arm/freescale/imx/imx6_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/freescale/imx/imx6_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -52,10 +52,6 @@ __FBSDID("$FreeBSD$"); #include "platform_if.h" -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - static uint32_t gpio1_node; #ifndef INTRNG Modified: stable/11/sys/arm/freescale/imx/imx6_src.c ============================================================================== --- stable/11/sys/arm/freescale/imx/imx6_src.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/freescale/imx/imx6_src.c Wed Mar 1 19:55:04 2017 (r314506) @@ -70,7 +70,7 @@ WR4(struct src_softc *sc, bus_size_t off } int -src_reset_ipu() +src_reset_ipu(void) { uint32_t reg; int timeout = 10000; Modified: stable/11/sys/arm/freescale/imx/imx_common.c ============================================================================== --- stable/11/sys/arm/freescale/imx/imx_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/freescale/imx/imx_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -50,10 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_intc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: stable/11/sys/arm/freescale/imx/imx_machdep.c ============================================================================== --- stable/11/sys/arm/freescale/imx/imx_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/freescale/imx/imx_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include #include #include @@ -54,20 +53,6 @@ SYSCTL_UINT(_hw_imx, OID_AUTO, last_rese SYSCTL_STRING(_hw_imx, OID_AUTO, last_reset_reason, CTLFLAG_RD, "unknown", 0, "Last reset reason"); -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - /* * This code which manipulates the watchdog hardware is here to implement * cpu_reset() because the watchdog is the only way for software to reset the Modified: stable/11/sys/arm/freescale/vybrid/vf_common.c ============================================================================== --- stable/11/sys/arm/freescale/vybrid/vf_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/freescale/vybrid/vf_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -60,10 +60,6 @@ end: while (1); } -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: stable/11/sys/arm/freescale/vybrid/vf_machdep.c ============================================================================== --- stable/11/sys/arm/freescale/vybrid/vf_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/freescale/vybrid/vf_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -30,7 +30,6 @@ #include __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include #include #include @@ -78,17 +77,3 @@ platform_devmap_init(void) return (0); } - -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} Modified: stable/11/sys/arm/include/bus_dma.h ============================================================================== --- stable/11/sys/arm/include/bus_dma.h Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/include/bus_dma.h Wed Mar 1 19:55:04 2017 (r314506) @@ -72,7 +72,7 @@ #define BUS_DMA_TAG_VALID(t) ((t) != (bus_dma_tag_t)0) -#ifdef _ARM32_BUS_DMA_PRIVATE +#if defined(_ARM32_BUS_DMA_PRIVATE) && __ARM_ARCH < 6 /* * arm32_dma_range * Modified: stable/11/sys/arm/lpc/lpc_gpio.c ============================================================================== --- stable/11/sys/arm/lpc/lpc_gpio.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/lpc/lpc_gpio.c Wed Mar 1 19:55:04 2017 (r314506) @@ -518,7 +518,7 @@ lpc_gpio_get_state(device_t dev, int pin } void -lpc_gpio_init() +lpc_gpio_init(void) { bus_space_tag_t bst; bus_space_handle_t bsh; Modified: stable/11/sys/arm/lpc/lpc_intc.c ============================================================================== --- stable/11/sys/arm/lpc/lpc_intc.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/lpc/lpc_intc.c Wed Mar 1 19:55:04 2017 (r314506) @@ -227,10 +227,6 @@ lpc_intc_eoi(void *data) } -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: stable/11/sys/arm/mv/mv_machdep.c ============================================================================== --- stable/11/sys/arm/mv/mv_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/mv/mv_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -428,6 +428,7 @@ platform_devmap_init(void) return (0); } +#if __ARM_ARCH < 6 struct arm32_dma_range * bus_dma_get_range(void) { @@ -441,6 +442,7 @@ bus_dma_get_range_nb(void) return (0); } +#endif #if defined(CPU_MV_PJ4B) #ifdef DDB Modified: stable/11/sys/arm/nvidia/tegra124/tegra124_machdep.c ============================================================================== --- stable/11/sys/arm/nvidia/tegra124/tegra124_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/nvidia/tegra124/tegra124_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#define _ARM32_BUS_DMA_PRIVATE #include "opt_platform.h" #include @@ -62,24 +61,6 @@ __FBSDID("$FreeBSD$"); PMC_SCRATCH0_MODE_BOOTLOADER | \ PMC_SCRATCH0_MODE_RCM) -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - static vm_offset_t tegra124_lastaddr(platform_t plat) { Modified: stable/11/sys/arm/nvidia/tegra_efuse.c ============================================================================== --- stable/11/sys/arm/nvidia/tegra_efuse.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/nvidia/tegra_efuse.c Wed Mar 1 19:55:04 2017 (r314506) @@ -237,7 +237,7 @@ tegra_fuse_read_4(int addr) { static void -tegra_efuse_dump_sku() +tegra_efuse_dump_sku(void) { printf(" TEGRA SKU Info:\n"); printf(" chip_id: %u\n", tegra_sku_info.chip_id); Modified: stable/11/sys/arm/qemu/virt_common.c ============================================================================== --- stable/11/sys/arm/qemu/virt_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/qemu/virt_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -37,10 +37,6 @@ __FBSDID("$FreeBSD$"); #include -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG fdt_pic_decode_t fdt_pic_table[] = { &gic_decode_fdt, Modified: stable/11/sys/arm/qemu/virt_machdep.c ============================================================================== --- stable/11/sys/arm/qemu/virt_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/qemu/virt_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -30,7 +30,6 @@ #include __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include #include #include @@ -45,20 +44,6 @@ __FBSDID("$FreeBSD$"); #include "platform_if.h" -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - void cpu_reset(void) { Modified: stable/11/sys/arm/rockchip/rk30xx_common.c ============================================================================== --- stable/11/sys/arm/rockchip/rk30xx_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/rockchip/rk30xx_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -38,10 +38,6 @@ __FBSDID("$FreeBSD$"); #include #include -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_aintc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: stable/11/sys/arm/rockchip/rk30xx_machdep.c ============================================================================== --- stable/11/sys/arm/rockchip/rk30xx_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/rockchip/rk30xx_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -34,7 +34,6 @@ #include __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include #include #include @@ -92,20 +91,6 @@ platform_devmap_init(void) return (0); } -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - void cpu_reset() { Modified: stable/11/sys/arm/rockchip/rk30xx_wdog.c ============================================================================== --- stable/11/sys/arm/rockchip/rk30xx_wdog.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/rockchip/rk30xx_wdog.c Wed Mar 1 19:55:04 2017 (r314506) @@ -171,7 +171,7 @@ rk30_wd_watchdog_fn(void *private, u_int } void -rk30_wd_watchdog_reset() +rk30_wd_watchdog_reset(void) { bus_space_handle_t bsh; Modified: stable/11/sys/arm/samsung/exynos/exynos5_common.c ============================================================================== --- stable/11/sys/arm/samsung/exynos/exynos5_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/samsung/exynos/exynos5_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -49,10 +49,6 @@ cpu_reset(void) while (1); } -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: stable/11/sys/arm/samsung/exynos/exynos5_machdep.c ============================================================================== --- stable/11/sys/arm/samsung/exynos/exynos5_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/samsung/exynos/exynos5_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -30,7 +30,6 @@ #include __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include #include #include @@ -83,17 +82,3 @@ platform_devmap_init(void) return (0); } - -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} Modified: stable/11/sys/arm/ti/am335x/am335x_dmtpps.c ============================================================================== --- stable/11/sys/arm/ti/am335x/am335x_dmtpps.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/ti/am335x/am335x_dmtpps.c Wed Mar 1 19:55:04 2017 (r314506) @@ -163,7 +163,7 @@ dmtpps_translate_nickname(const char *ni * fails that IS an error, return -1. */ static int -dmtpps_find_tmr_num_by_tunable() +dmtpps_find_tmr_num_by_tunable(void) { struct padinfo *pi; char iname[20]; @@ -201,7 +201,7 @@ dmtpps_find_tmr_num_by_tunable() * input pin. If so, return the timer number, if not return 0. */ static int -dmtpps_find_tmr_num_by_padconf() +dmtpps_find_tmr_num_by_padconf(void) { int err; unsigned int padstate; @@ -225,7 +225,7 @@ dmtpps_find_tmr_num_by_padconf() * configuration. This is done just once, the first time probe() runs. */ static int -dmtpps_find_tmr_num() +dmtpps_find_tmr_num(void) { int tmr_num; Modified: stable/11/sys/arm/ti/ti_common.c ============================================================================== --- stable/11/sys/arm/ti/ti_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/ti/ti_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -49,10 +49,6 @@ __FBSDID("$FreeBSD$"); #include #include -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG #ifdef SOC_TI_AM335X static int Modified: stable/11/sys/arm/ti/ti_machdep.c ============================================================================== --- stable/11/sys/arm/ti/ti_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/ti/ti_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -40,7 +40,6 @@ #include __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include #include #include @@ -96,20 +95,6 @@ ti_am335x_devmap_init(platform_t plat) } #endif -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - void cpu_reset() { Modified: stable/11/sys/arm/versatile/versatile_common.c ============================================================================== --- stable/11/sys/arm/versatile/versatile_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/versatile/versatile_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -46,10 +46,6 @@ __FBSDID("$FreeBSD$"); #include #include -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_intc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: stable/11/sys/arm/versatile/versatile_machdep.c ============================================================================== --- stable/11/sys/arm/versatile/versatile_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/versatile/versatile_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -39,7 +39,6 @@ #include __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include #include #include @@ -102,22 +101,8 @@ platform_devmap_init(void) return (0); } -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - void -cpu_reset() +cpu_reset(void) { printf("cpu_reset\n"); while (1); Modified: stable/11/sys/arm/xilinx/zy7_machdep.c ============================================================================== --- stable/11/sys/arm/xilinx/zy7_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/xilinx/zy7_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -36,7 +36,6 @@ #include __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include #include #include @@ -94,10 +93,6 @@ platform_devmap_init(void) } -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_gic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, @@ -120,22 +115,8 @@ fdt_pic_decode_t fdt_pic_table[] = { }; #endif -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - void -cpu_reset() +cpu_reset(void) { if (zynq7_cpu_reset != NULL) (*zynq7_cpu_reset)(); Modified: stable/11/sys/arm/xilinx/zy7_slcr.c ============================================================================== --- stable/11/sys/arm/xilinx/zy7_slcr.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/xilinx/zy7_slcr.c Wed Mar 1 19:55:04 2017 (r314506) @@ -496,7 +496,7 @@ zy7_pl_fclk_enabled(int unit) } int -zy7_pl_level_shifters_enabled() +zy7_pl_level_shifters_enabled(void) { struct zy7_slcr_softc *sc = zy7_slcr_softc_p; @@ -513,7 +513,7 @@ zy7_pl_level_shifters_enabled() } void -zy7_pl_level_shifters_enable() +zy7_pl_level_shifters_enable(void) { struct zy7_slcr_softc *sc = zy7_slcr_softc_p; @@ -528,7 +528,7 @@ zy7_pl_level_shifters_enable() } void -zy7_pl_level_shifters_disable() +zy7_pl_level_shifters_disable(void) { struct zy7_slcr_softc *sc = zy7_slcr_softc_p; Modified: stable/11/sys/arm/xscale/pxa/pxa_gpio.c ============================================================================== --- stable/11/sys/arm/xscale/pxa/pxa_gpio.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/xscale/pxa/pxa_gpio.c Wed Mar 1 19:55:04 2017 (r314506) @@ -331,7 +331,7 @@ pxa_gpio_unmask_irq(int irq) } int -pxa_gpio_get_next_irq() +pxa_gpio_get_next_irq(void) { struct pxa_gpio_softc *sc; int gpio; Modified: stable/11/sys/arm/xscale/pxa/pxa_icu.c ============================================================================== --- stable/11/sys/arm/xscale/pxa/pxa_icu.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/xscale/pxa/pxa_icu.c Wed Mar 1 19:55:04 2017 (r314506) @@ -171,7 +171,7 @@ arm_unmask_irq(uintptr_t nb) } uint32_t -pxa_icu_get_icip() +pxa_icu_get_icip(void) { return (bus_space_read_4(pxa_icu_softc->pi_bst, @@ -187,7 +187,7 @@ pxa_icu_clear_icip(int irq) } uint32_t -pxa_icu_get_icfp() +pxa_icu_get_icfp(void) { return (bus_space_read_4(pxa_icu_softc->pi_bst, @@ -203,7 +203,7 @@ pxa_icu_clear_icfp(int irq) } uint32_t -pxa_icu_get_icmr() +pxa_icu_get_icmr(void) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Wed Mar 1 20:00:21 2017 Return-Path: Delivered-To: svn-src-all@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 0AFDBCF3BA7; Wed, 1 Mar 2017 20:00:21 +0000 (UTC) (envelope-from ae@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 D71AC758; Wed, 1 Mar 2017 20:00:20 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21K0Jxa087438; Wed, 1 Mar 2017 20:00:19 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21K0JHo087436; Wed, 1 Mar 2017 20:00:19 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201703012000.v21K0JHo087436@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Wed, 1 Mar 2017 20:00:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314507 - in head/sys/netpfil/ipfw: . nptv6 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 20:00:21 -0000 Author: ae Date: Wed Mar 1 20:00:19 2017 New Revision: 314507 URL: https://svnweb.freebsd.org/changeset/base/314507 Log: Fix NPTv6 rule counters when one_pass is not enabled. Consider the rule matching when both @done and @retval values returned from ipfw_run_eaction() are zero. And modify ipfw_nptv6() to return IP_FW_DENY and @done=0 when addresses do not match. Obtained from: Yandex LLC Sponsored by: Yandex LLC Modified: head/sys/netpfil/ipfw/ip_fw2.c head/sys/netpfil/ipfw/nptv6/nptv6.c Modified: head/sys/netpfil/ipfw/ip_fw2.c ============================================================================== --- head/sys/netpfil/ipfw/ip_fw2.c Wed Mar 1 19:55:04 2017 (r314506) +++ head/sys/netpfil/ipfw/ip_fw2.c Wed Mar 1 20:00:19 2017 (r314507) @@ -2565,6 +2565,13 @@ do { \ l = 0; /* in any case exit inner loop */ retval = ipfw_run_eaction(chain, args, cmd, &done); + /* + * If both @retval and @done are zero, + * consider this as rule matching and + * update counters. + */ + if (retval == 0 && done == 0) + IPFW_INC_RULE_COUNTER(f, pktlen); break; default: Modified: head/sys/netpfil/ipfw/nptv6/nptv6.c ============================================================================== --- head/sys/netpfil/ipfw/nptv6/nptv6.c Wed Mar 1 19:55:04 2017 (r314506) +++ head/sys/netpfil/ipfw/nptv6/nptv6.c Wed Mar 1 20:00:19 2017 (r314507) @@ -352,24 +352,24 @@ ipfw_nptv6(struct ip_fw_chain *chain, st int ret; *done = 0; /* try next rule if not matched */ + ret = IP_FW_DENY; icmd = cmd + 1; if (cmd->opcode != O_EXTERNAL_ACTION || cmd->arg1 != V_nptv6_eid || icmd->opcode != O_EXTERNAL_INSTANCE || (cfg = NPTV6_LOOKUP(chain, icmd)) == NULL) - return (0); + return (ret); /* * We need act as router, so when forwarding is disabled - * do nothing. */ if (V_ip6_forwarding == 0 || args->f_id.addr_type != 6) - return (0); + return (ret); /* * NOTE: we expect ipfw_chk() did m_pullup() up to upper level * protocol's headers. Also we skip some checks, that ip6_input(), * ip6_forward(), ip6_fastfwd() and ipfw_chk() already did. */ - ret = IP_FW_DENY; ip6 = mtod(args->m, struct ip6_hdr *); NPTV6_IPDEBUG("eid %u, oid %u, %s -> %s %d", cmd->arg1, icmd->arg1, @@ -384,15 +384,15 @@ ipfw_nptv6(struct ip_fw_chain *chain, st */ if (IN6_ARE_MASKED_ADDR_EQUAL(&ip6->ip6_dst, &cfg->internal, &cfg->mask)) - return (0); + return (ret); ret = nptv6_rewrite_internal(cfg, &args->m, 0); } else if (IN6_ARE_MASKED_ADDR_EQUAL(&ip6->ip6_dst, &cfg->external, &cfg->mask)) ret = nptv6_rewrite_external(cfg, &args->m, 0); else - return (0); + return (ret); /* - * If address wasn't rewrited - free mbuf. + * If address wasn't rewrited - free mbuf and terminate the search. */ if (ret != 0) { if (args->m != NULL) { @@ -400,14 +400,16 @@ ipfw_nptv6(struct ip_fw_chain *chain, st args->m = NULL; /* mark mbuf as consumed */ } NPTV6STAT_INC(cfg, dropped); - } - /* Terminate the search if one_pass is set */ - *done = V_fw_one_pass; - /* Update args->f_id when one_pass is off */ - if (*done == 0 && ret == 0) { - ip6 = mtod(args->m, struct ip6_hdr *); - args->f_id.src_ip6 = ip6->ip6_src; - args->f_id.dst_ip6 = ip6->ip6_dst; + *done = 1; + } else { + /* Terminate the search if one_pass is set */ + *done = V_fw_one_pass; + /* Update args->f_id when one_pass is off */ + if (*done == 0) { + ip6 = mtod(args->m, struct ip6_hdr *); + args->f_id.src_ip6 = ip6->ip6_src; + args->f_id.dst_ip6 = ip6->ip6_dst; + } } return (ret); } From owner-svn-src-all@freebsd.org Wed Mar 1 20:22:27 2017 Return-Path: Delivered-To: svn-src-all@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 45FBBCF34BB; Wed, 1 Mar 2017 20:22:27 +0000 (UTC) (envelope-from ian@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 16BCF954; Wed, 1 Mar 2017 20:22:27 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21KMQVf098270; Wed, 1 Mar 2017 20:22:26 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21KMPJv098266; Wed, 1 Mar 2017 20:22:25 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703012022.v21KMPJv098266@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 1 Mar 2017 20:22:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314508 - in stable/11/sys: arm/ti conf dev/sdhci X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 20:22:27 -0000 Author: ian Date: Wed Mar 1 20:22:25 2017 New Revision: 314508 URL: https://svnweb.freebsd.org/changeset/base/314508 Log: MFC r311734, r311735, r311951, r314071: Add new helper routines for sdhci bridge drivers that use gpio pins for card presence and write protect switch detection. Use the new sdhci_fdt_gpio helper functions to add full support for FDT gpio pins for detecting card insert/remove and write protect for ti_sdhci. Include sys/systm.h for use of bootverbose. Revert to ti_sdhci driver's historic behavior: assume an sd card is writable if the fdt data doesn't provide a gpio pin for reading the write protect switch and also doesn't contain a "wp-disable" property. Added: stable/11/sys/dev/sdhci/sdhci_fdt_gpio.c - copied, changed from r311734, head/sys/dev/sdhci/sdhci_fdt_gpio.c stable/11/sys/dev/sdhci/sdhci_fdt_gpio.h - copied unchanged from r311734, head/sys/dev/sdhci/sdhci_fdt_gpio.h Modified: stable/11/sys/arm/ti/ti_sdhci.c stable/11/sys/conf/files Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/ti/ti_sdhci.c ============================================================================== --- stable/11/sys/arm/ti/ti_sdhci.c Wed Mar 1 20:00:19 2017 (r314507) +++ stable/11/sys/arm/ti/ti_sdhci.c Wed Mar 1 20:22:25 2017 (r314508) @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include "sdhci_if.h" #include @@ -61,7 +62,7 @@ __FBSDID("$FreeBSD$"); struct ti_sdhci_softc { device_t dev; - device_t gpio_dev; + struct sdhci_fdt_gpio * gpio; struct resource * mem_res; struct resource * irq_res; void * intr_cookie; @@ -75,6 +76,7 @@ struct ti_sdhci_softc { uint32_t sdhci_clkdiv; boolean_t disable_highspeed; boolean_t force_card_present; + boolean_t disable_readonly; }; /* @@ -362,20 +364,27 @@ static int ti_sdhci_get_ro(device_t brdev, device_t reqdev) { struct ti_sdhci_softc *sc = device_get_softc(brdev); - unsigned int readonly = 0; - /* If a gpio pin is configured, read it. */ - if (sc->gpio_dev != NULL) { - GPIO_PIN_GET(sc->gpio_dev, sc->wp_gpio_pin, &readonly); - } + if (sc->disable_readonly) + return (0); - return (readonly); + return (sdhci_fdt_gpio_get_readonly(sc->gpio)); +} + +static bool +ti_sdhci_get_card_present(device_t dev, struct sdhci_slot *slot) +{ + struct ti_sdhci_softc *sc = device_get_softc(dev); + + return (sdhci_fdt_gpio_get_present(sc->gpio)); } static int ti_sdhci_detach(device_t dev) { + /* sdhci_fdt_gpio_teardown(sc->gpio); */ + return (EBUSY); } @@ -502,25 +511,6 @@ ti_sdhci_attach(device_t dev) } /* - * See if we've got a GPIO-based write detect pin. This is not the - * standard documented property for this, we added it in freebsd. - */ - if ((OF_getencprop(node, "mmchs-wp-gpio-pin", &prop, sizeof(prop))) <= 0) - sc->wp_gpio_pin = 0xffffffff; - else - sc->wp_gpio_pin = prop; - - if (sc->wp_gpio_pin != 0xffffffff) { - sc->gpio_dev = devclass_get_device(devclass_find("gpio"), 0); - if (sc->gpio_dev == NULL) - device_printf(dev, "Error: No GPIO device, " - "Write Protect pin will not function\n"); - else - GPIO_PIN_SETFLAGS(sc->gpio_dev, sc->wp_gpio_pin, - GPIO_PIN_INPUT); - } - - /* * Set the offset from the device's memory start to the MMCHS registers. * Also for OMAP4 disable high speed mode due to erratum ID i626. */ @@ -572,6 +562,21 @@ ti_sdhci_attach(device_t dev) goto fail; } + /* + * Set up handling of card-detect and write-protect gpio lines. + * + * If there is no write protect info in the fdt data, fall back to the + * historical practice of assuming that the card is writable. This + * works around bad fdt data from the upstream source. The alternative + * would be to trust the sdhci controller's PRESENT_STATE register WP + * bit, but it may say write protect is in effect when it's not if the + * pinmux setup doesn't route the WP signal into the sdchi block. + */ + sc->gpio = sdhci_fdt_gpio_setup(sc->dev, &sc->slot); + + if (!OF_hasprop(node, "wp-gpios") && !OF_hasprop(node, "wp-disable")) + sc->disable_readonly = true; + /* Initialise the MMCHS hardware. */ ti_sdhci_hw_init(dev); @@ -706,6 +711,7 @@ static device_method_t ti_sdhci_methods[ DEVMETHOD(sdhci_write_2, ti_sdhci_write_2), DEVMETHOD(sdhci_write_4, ti_sdhci_write_4), DEVMETHOD(sdhci_write_multi_4, ti_sdhci_write_multi_4), + DEVMETHOD(sdhci_get_card_present, ti_sdhci_get_card_present), DEVMETHOD_END }; Modified: stable/11/sys/conf/files ============================================================================== --- stable/11/sys/conf/files Wed Mar 1 20:00:19 2017 (r314507) +++ stable/11/sys/conf/files Wed Mar 1 20:22:25 2017 (r314508) @@ -2556,6 +2556,7 @@ dev/scc/scc_dev_z8530.c optional scc dev/scd/scd.c optional scd isa dev/scd/scd_isa.c optional scd isa dev/sdhci/sdhci.c optional sdhci +dev/sdhci/sdhci_fdt_gpio.c optional sdhci fdt gpio dev/sdhci/sdhci_if.m optional sdhci dev/sdhci/sdhci_acpi.c optional sdhci acpi dev/sdhci/sdhci_pci.c optional sdhci pci Copied and modified: stable/11/sys/dev/sdhci/sdhci_fdt_gpio.c (from r311734, head/sys/dev/sdhci/sdhci_fdt_gpio.c) ============================================================================== --- head/sys/dev/sdhci/sdhci_fdt_gpio.c Mon Jan 9 01:54:36 2017 (r311734, copy source) +++ stable/11/sys/dev/sdhci/sdhci_fdt_gpio.c Wed Mar 1 20:22:25 2017 (r314508) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Copied: stable/11/sys/dev/sdhci/sdhci_fdt_gpio.h (from r311734, head/sys/dev/sdhci/sdhci_fdt_gpio.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/sys/dev/sdhci/sdhci_fdt_gpio.h Wed Mar 1 20:22:25 2017 (r314508, copy of r311734, head/sys/dev/sdhci/sdhci_fdt_gpio.h) @@ -0,0 +1,69 @@ +/*- + * Copyright (c) 2017 Ian Lepore + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ + */ + +/* + * Support routines usable by any SoC sdhci bridge driver that uses gpio pins + * for card detect and/or write protect, and uses FDT data to describe those + * pins. A bridge driver need only supply a couple 2-line forwarding functions + * to connect the get_present and get_readonly accessors to the corresponding + * driver interface functions, and add setup/teardown calls to its attach and + * detach functions. + */ + +#ifndef _SDHCI_FDT_GPIO_H_ +#define _SDHCI_FDT_GPIO_H_ + +struct sdhci_slot; +struct sdhci_fdt_gpio; + +/* + * sdhci_fdt_gpio_setup() + * sdhci_fdt_gpio_teardown() + * + * Process FDT properties that use gpio pins and set up interrupt handling (if + * supported by hardware) and accessor functions to read the pins. + * + * Setup cannot fail. If the properties are not present, the accessors will + * return the values from standard sdhci registers. If the gpio controller + * can't trigger interrupts on both edges, it configures the slot to use polling + * for card presence detection. If it can't access the gpio pin at all it sets + * up the get_present() accessor to always return true. Likewise the + * get_readonly() accessor always returns false if its pin can't be accessed. + */ +struct sdhci_fdt_gpio *sdhci_fdt_gpio_setup(device_t dev, struct sdhci_slot *slot); +void sdhci_fdt_gpio_teardown(struct sdhci_fdt_gpio *gpio); + +/* + * sdhci_fdt_gpio_get_present() + * sdhci_fdt_gpio_get_readonly() + * + * Gpio pin state accessor functions. + */ +bool sdhci_fdt_gpio_get_present(struct sdhci_fdt_gpio *gpio); +int sdhci_fdt_gpio_get_readonly(struct sdhci_fdt_gpio *gpio); + +#endif From owner-svn-src-all@freebsd.org Wed Mar 1 20:22:37 2017 Return-Path: Delivered-To: svn-src-all@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 EC3BBCF350E; Wed, 1 Mar 2017 20:22:37 +0000 (UTC) (envelope-from dchagin@chd.heemeyer.club) Received: from heemeyer.club (heemeyer.club [108.61.204.158]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "heemeyer.club", Issuer "heemeyer.club" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id BE2409DC; Wed, 1 Mar 2017 20:22:37 +0000 (UTC) (envelope-from dchagin@chd.heemeyer.club) Received: from chd.heemeyer.club (dchagin.static.corbina.ru [78.107.232.239]) by heemeyer.club (8.15.2/8.15.1) with ESMTPS id v21KMQj3013436 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 1 Mar 2017 20:22:28 GMT (envelope-from dchagin@chd.heemeyer.club) X-Authentication-Warning: heemeyer.club: Host dchagin.static.corbina.ru [78.107.232.239] claimed to be chd.heemeyer.club Received: from chd.heemeyer.club (localhost [127.0.0.1]) by chd.heemeyer.club (8.15.2/8.15.1) with ESMTPS id v21KMQjc002862 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 1 Mar 2017 23:22:26 +0300 (MSK) (envelope-from dchagin@chd.heemeyer.club) Received: (from dchagin@localhost) by chd.heemeyer.club (8.15.2/8.15.2/Submit) id v21KMQd8002861; Wed, 1 Mar 2017 23:22:26 +0300 (MSK) (envelope-from dchagin) Date: Wed, 1 Mar 2017 23:22:26 +0300 From: Chagin Dmitry To: Conrad Meyer Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314404 - head/sys/compat/linux Message-ID: <20170301202226.GA2842@chd.heemeyer.club> References: <201702281955.v1SJtGeG011858@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.7.2 (2016-11-26) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 20:22:38 -0000 On Tue, Feb 28, 2017 at 12:00:41PM -0800, Conrad Meyer wrote: > On Tue, Feb 28, 2017 at 11:55 AM, Dmitry Chagin wrote: > > Author: dchagin > > Date: Tue Feb 28 19:55:16 2017 > > New Revision: 314404 > > URL: https://svnweb.freebsd.org/changeset/base/314404 > > > > Log: > > Linux epoll return EEXIST on case when op is EPOLL_CTL_ADD, and the supplied > > file descriptor fd is already registered with this epoll instance. > > Hi Dmitry, > > Do we have an automated test suite for epoll behavior compliance? If > you have some existing test programs you're using to determine > compatibility, it would be good to adapt those to a test framework and > commit them as well. usually we use LTP and glibc (NPTL) tests. Feel free to adapt it From owner-svn-src-all@freebsd.org Wed Mar 1 20:23:22 2017 Return-Path: Delivered-To: svn-src-all@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 C223FCF358D; Wed, 1 Mar 2017 20:23:22 +0000 (UTC) (envelope-from np@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 8F0B5BF7; Wed, 1 Mar 2017 20:23:22 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21KNLpm099090; Wed, 1 Mar 2017 20:23:21 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21KNLOF099089; Wed, 1 Mar 2017 20:23:21 GMT (envelope-from np@FreeBSD.org) Message-Id: <201703012023.v21KNLOF099089@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Wed, 1 Mar 2017 20:23:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314509 - head/sys/dev/cxgbe/iw_cxgbe X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 20:23:22 -0000 Author: np Date: Wed Mar 1 20:23:21 2017 New Revision: 314509 URL: https://svnweb.freebsd.org/changeset/base/314509 Log: cxgbe/iw_cxgbe: Do not check the size of the memory region being registered. T4/5/6 have no internal limit on this size. This is probably a copy paste from the T3 iw_cxgb driver. MFC after: 3 days Sponsored by: Chelsio Communications Modified: head/sys/dev/cxgbe/iw_cxgbe/mem.c Modified: head/sys/dev/cxgbe/iw_cxgbe/mem.c ============================================================================== --- head/sys/dev/cxgbe/iw_cxgbe/mem.c Wed Mar 1 20:22:25 2017 (r314508) +++ head/sys/dev/cxgbe/iw_cxgbe/mem.c Wed Mar 1 20:23:21 2017 (r314509) @@ -341,9 +341,6 @@ static int build_phys_page_list(struct i PAGE_SIZE - 1) & PAGE_MASK; } - if (*total_size > 0xFFFFFFFFULL) - return -ENOMEM; - /* Find largest page shift we can use to cover buffers */ for (*shift = PAGE_SHIFT; *shift < 27; ++(*shift)) if ((1ULL << *shift) & mask) From owner-svn-src-all@freebsd.org Wed Mar 1 20:31:00 2017 Return-Path: Delivered-To: svn-src-all@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 662FACF373D; Wed, 1 Mar 2017 20:31:00 +0000 (UTC) (envelope-from mokhi64@gmail.com) Received: from mail-it0-x236.google.com (mail-it0-x236.google.com [IPv6:2607:f8b0:4001:c0b::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 30B41F2D; Wed, 1 Mar 2017 20:31:00 +0000 (UTC) (envelope-from mokhi64@gmail.com) Received: by mail-it0-x236.google.com with SMTP id 203so38602116ith.0; Wed, 01 Mar 2017 12:31:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=CQOmdaVKQDPN6sEEXi2T9Qdv24PZU3nuUFoz/2zadVI=; b=c4SMhS7ceWKouAJ6n1TuBoMDkNtEqPEmk+s+7IzL2f6PfLnTX6H0kgWG6kuP/CEQdt /jpDeFZcYrtDOy3VBA6j2FbhuwKv7wU8CDrS1NRUux3P8AIyYGnPk8+3TObKIq1C4fv+ NNc0Ti4vlfyARd4feESOScKkcOY7yeYQzAErScf6Ic4v1VHsMKyhsLuPTacS8Yx8GvN+ XQKBeNJSHxqoQKHVReWX+0rpWrNW5W9QksxI15A2rFmGTx/2mwMEuIMvbeDhtdTcuV/e IeStCz6tbgecAQYtx9n3LdsfjED+XoD9xIcbR3vIt02stnhB2tc9mwn565GQ67/MVgyR PUgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=CQOmdaVKQDPN6sEEXi2T9Qdv24PZU3nuUFoz/2zadVI=; b=gXQH/3dLg9RNvzo1xsXqFXEGR55aUBU4+VayS24bBSwYP15oeFOkLYdPhZ3sE7w72g VUG686H0jMtjvxWTENoO8+8Q8k+dffmjJ6JwnW2zaJLjupqz/lw0o4yoUAJL2jKKZKrZ qfvyqdKjEf8NXjFYbn7ujIN4xuFG8TwFf5gC1R/B587321lK0suJlRli+bUlEywinsJV ljMmEWDilEt+7klbzS8ehURnupqxz60OIkiybYtvusaGv5CWv7pPZV7AXiW5Lcr10HBj Wq5KHLqMelNqpSOV/MisZp0J3ljWVSHJ5Tw47bTuNoyZ9PwWmWwbbyz8TkSyox8lZ9PO R19g== X-Gm-Message-State: AMke39mxCYhOjCAFkuSlRYa2iQl0yJwgbG9e8pw6J4iBXFT575VzTngqrJn4/RQkVeZPbBk+3l/2/bgZfJ3Hnw== X-Received: by 10.36.238.202 with SMTP id b193mr6239938iti.39.1488400259276; Wed, 01 Mar 2017 12:30:59 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.168.228 with HTTP; Wed, 1 Mar 2017 12:30:58 -0800 (PST) In-Reply-To: <20170301202226.GA2842@chd.heemeyer.club> References: <201702281955.v1SJtGeG011858@repo.freebsd.org> <20170301202226.GA2842@chd.heemeyer.club> From: mokhi Date: Thu, 2 Mar 2017 00:00:58 +0330 Message-ID: Subject: Re: svn commit: r314404 - head/sys/compat/linux To: Chagin Dmitry Cc: Conrad Meyer , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 20:31:00 -0000 But I think, the case is to run compiled/built-on-linux on FreeBSD. -- Best regards, MMokhi. From owner-svn-src-all@freebsd.org Wed Mar 1 20:57:09 2017 Return-Path: Delivered-To: svn-src-all@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 A11E9CF3180; Wed, 1 Mar 2017 20:57:09 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-wr0-f171.google.com (mail-wr0-f171.google.com [209.85.128.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 31FE613A; Wed, 1 Mar 2017 20:57:08 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-wr0-f171.google.com with SMTP id g10so38755421wrg.2; Wed, 01 Mar 2017 12:57:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc:content-transfer-encoding; bh=AUSyGNvOfQm+ZnFqoaldudC9+pIr4N1San1WShCIU0M=; b=hUJzbOIfzchUqMrZErJVd6WkfKiEzpT62HtoSPJgNvNl5sZr5323Zc8hz8n/Sk5P2x UTwhnZR5JjPFFuC8mvnpKfVMhhaVuyYw/xOwUTGNgm3KPyki1VsdpKmIKSWJd1WONj5A Pe3ivzNpGWCuNUOrjyK9xDJph65Ha0IC6WPW4FXfi/ALtaLcRh2m8g6S0Y3BkTOn6jYu K/7l5SIK7CZLX/VPw/zeogtOJlZfte9m9wvcyGbXC7eMRcm5CUnZOyN3nVW9emJR3Voj sHEyRn2dGUrOA8v5CISD0Anao75U1N03CWW9xLDtFm8wRuaoNvPknzsfZY4udQFnIkEu xjpA== X-Gm-Message-State: AMke39nRrFdH8G23aLnLwQxve+B6mLpG9SLaodZJowXFRLhwiZDZ6sb4UZgJVjhownjnnA== X-Received: by 10.223.155.211 with SMTP id e19mr8620687wrc.74.1488401825618; Wed, 01 Mar 2017 12:57:05 -0800 (PST) Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com. [74.125.82.43]) by smtp.gmail.com with ESMTPSA id s26sm8096623wra.66.2017.03.01.12.57.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Mar 2017 12:57:05 -0800 (PST) Received: by mail-wm0-f43.google.com with SMTP id i17so10653913wmf.0; Wed, 01 Mar 2017 12:57:05 -0800 (PST) X-Received: by 10.28.174.14 with SMTP id x14mr5046333wme.75.1488401824753; Wed, 01 Mar 2017 12:57:04 -0800 (PST) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 10.80.152.82 with HTTP; Wed, 1 Mar 2017 12:57:04 -0800 (PST) In-Reply-To: <20170228121335.Q2733@besplex.bde.org> References: <201701310326.v0V3QW30024375@repo.freebsd.org> <20170202184819.GP2092@kib.kiev.ua> <20170203062806.A2690@besplex.bde.org> <20170228121335.Q2733@besplex.bde.org> From: Conrad Meyer Date: Wed, 1 Mar 2017 12:57:04 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r313006 - in head: sys/conf sys/libkern sys/libkern/x86 sys/sys tests/sys/kern To: Bruce Evans Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 20:57:09 -0000 Hi Bruce, On my laptop (Intel(R) Core(TM) i5-3320M CPU =E2=80=94 Ivy Bridge) I still = see a little worse performance with this patch. Please excuse the ugly graphs, I don't have a better graphing tool set up at this time: https://people.freebsd.org/~cem/crc32/sse42_bde.png https://people.freebsd.org/~cem/crc32/sse42_bde_log.png Best, Conrad On Mon, Feb 27, 2017 at 6:27 PM, Bruce Evans wrote: > On Mon, 27 Feb 2017, Conrad Meyer wrote: > >> On Thu, Feb 2, 2017 at 12:29 PM, Bruce Evans wrot= e: >>> >>> I've almost finished fixing and optimizing this. I didn't manage to fi= x >>> all the compiler pessimizations, but the result is within 5% of optimal >>> for buffers larger than a few K. >> >> >> Did you ever get to a final patch that you are satisfied with? It >> would be good to get this improvement into the tree. > > > I'm happy with this version (attached and partly enclosed). You need to > test it in the kernel and commit it (I on;y did simple correctness tests > in userland). > > X Index: conf/files.amd64 > X =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > X --- conf/files.amd64 (revision 314363) > X +++ conf/files.amd64 (working copy) > X @@ -545,6 +545,9 @@ > X isa/vga_isa.c optional vga > X kern/kern_clocksource.c standard > X kern/link_elf_obj.c standard > X +libkern/x86/crc32_sse42.c standard > X +libkern/memmove.c standard > X +libkern/memset.c standard > > Also fix some nearby disorder. > > X ... > X Index: libkern/x86/crc32_sse42.c > X =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > X --- libkern/x86/crc32_sse42.c (revision 314363) > X +++ libkern/x86/crc32_sse42.c (working copy) > X @@ -31,15 +31,41 @@ > X */ > X #ifdef USERSPACE_TESTING > X #include > X +#include > X #else > X #include > X +#include > X #include > X -#include > X -#include > X #endif > > Also fix minor #include errors. > > X X -#include > X +static __inline uint32_t > X +_mm_crc32_u8(uint32_t x, uint8_t y) > X +{ > X + /* > X + * clang (at least 3.9.[0-1]) pessimizes "rm" (y) and "m" (y) > X + * significantly and "r" (y) a lot by copying y to a different > X + * local variable (on the stack or in a register), so only use > X + * the latter. This costs a register and an instruction but > X + * not a uop. > X + */ > X + __asm("crc32b %1,%0" : "+r" (x) : "r" (y)); > X + return (x); > X +} > > Using intrinsics avoids the silly copying via the stack, and allows more > unrolling. Old gcc does more unrolling with just asms. Unrolling is > almost useless (some details below). > > X @@ -47,12 +73,14 @@ > X * Block sizes for three-way parallel crc computation. LONG and SHORT > must > X * both be powers of two. > X */ > X -#define LONG 8192 > X -#define SHORT 256 > X +#define LONG 128 > X +#define SHORT 64 > > These are aggressively low. > > Note that small buffers aren't handled very well. SHORT =3D 64 means tha= t > a buffer of size 3 * 64 =3D 192 is handled entirely by the "SHORT" loop. > 192 is not very small, but any smaller than that and overheads for > adjustment at the end of the loop are too large for the "SHORT" loop > to be worth doing. Almost any value of LONG larger than 128 works OK > now, but if LONG is large then it gives too much work for the "SHORT" > loop, since normal buffer sizes are not a multiple of 3. E.g., with > the old LONG and SHORT, a buffer of size 128 was decomposed as 5 * 24K > (done almost optimally by the "LONG" loop) + 10 * 768 (done a bit less > optimally by the "SHORT" loop) + 10 * 768 + 64 * 8 (done pessimally). > > I didn't get around to ifdefing this for i386. On i386, the loops take > twice as many crc32 instructions for a given byte count, so the timing > is satisfed by a byte count half as large, so SHORT and LONG can be > reduced by a factor of 2 to give faster handling for small buffers withou= t > affecting the speed for large buffers significantly. > > X X /* Tables for hardware crc that shift a crc by LONG and SHORT zeros.= */ > X static uint32_t crc32c_long[4][256]; > X +static uint32_t crc32c_2long[4][256]; > X static uint32_t crc32c_short[4][256]; > X +static uint32_t crc32c_2short[4][256]; > > I didn't get around to updating the comment. 2long shifts by 2*LONG zero= s, > etc. > > Shifts by 3N are done by adding shifts by 1N and 2N in parallel. I could= n't > get the direct 3N shift to run any faster. > > X @@ -190,7 +220,11 @@ > X const size_t align =3D 4; > X #endif > X const unsigned char *next, *end; > X - uint64_t crc0, crc1, crc2; /* need to be 64 bits for crc32q = */ > X +#ifdef __amd64__ > X + uint64_t crc0, crc1, crc2; > X +#else > X + uint32_t crc0, crc1, crc2; > X +#endif > X X next =3D buf; > X crc0 =3D crc; > > 64 bits of course isn't needed for i386. It isn't needed for amd64 eithe= r. > I think the crc32 instruction zeros the top 32 bits so they can be ignore= d. > However, when I modified the asm to return 32 bits to tell the compiler > about > this (which the intrinsic wouldn't be able to do) and used 32 bits here, > this was just slightly slower. > > For some intermediate crc calculations, only 32 bits are used, and the > compiler can see this. clang on amd64 optimizes this better than gcc, > starting with all the intermediate crc variables declared as 64 bits. > gcc generates worst code when some of the intermediates are declared as > 32 bits. So keep using 64 bits on amd64 here. > > X @@ -202,6 +236,7 @@ > X len--; > X } > X X +#if LONG > SHORT > X /* > X * Compute the crc on sets of LONG*3 bytes, executing three > independent > X * crc instructions, each on LONG bytes -- this is optimized for = the > > LONG =3D SHORT =3D 64 works OK on Haswell, but I suspect that slower CPUs > benefit from larger values and I want to keep SHORT as small as possible > for the fastest CPUs. > > X @@ -209,6 +244,7 @@ > X * have a throughput of one crc per cycle, but a latency of three > X * cycles. > X */ > X + crc =3D 0; > X while (len >=3D LONG * 3) { > X crc1 =3D 0; > X crc2 =3D 0; > X @@ -229,16 +265,64 @@ > X #endif > X next +=3D align; > X } while (next < end); > X - crc0 =3D crc32c_shift(crc32c_long, crc0) ^ crc1; > X - crc0 =3D crc32c_shift(crc32c_long, crc0) ^ crc2; > X + /*- > X + * Update the crc. Try to do it in parallel with the inn= er > X + * loop. 'crc' is used to accumulate crc0 and crc1 > X + * produced by the inner loop so that the next iteration > X + * of the loop doesn't depend on anything except crc2. > X + * > X + * The full expression for the update is: > X + * crc =3D S*S*S*crc + S*S*crc0 + S*crc1 > X + * where the terms are polynomials modulo the CRC > polynomial. > X + * We regroup this subtly as: > X + * crc =3D S*S * (S*crc + crc0) + S*crc1. > > X + * This has an extra dependency which reduces possible > X + * parallelism for the expression, but it turns out to be > X + * best to intentionally delay evaluation of this express= ion > X + * so that it competes less with the inner loop. > X + * > X + * We also intentionally reduce parallelism by feedng bac= k > X + * crc2 to the inner loop as crc0 instead of accumulating > X + * it in crc. This synchronizes the loop with crc update= . > X + * CPU and/or compiler schedulers produced bad order with= out > X + * this. > X + * > X + * Shifts take about 12 cycles each, so 3 here with 2 > X + * parallelizable take about 24 cycles and the crc update > X + * takes slightly longer. 8 dependent crc32 instructions > X + * can run in 24 cycles, so the 3-way blocking is worse > X + * than useless for sizes less than 8 * =3D 6= 4 > X + * on amd64. In practice, SHORT =3D 32 confirms these > X + * timing calculations by giving a small improvement > X + * starting at size 96. Then the inner loop takes about > X + * 12 cycles and the crc update about 24, but these are > X + * partly in parallel so the total time is less than the > X + * 36 cycles that 12 dependent crc32 instructions would > X + * take. > X + * > X + * To have a chance of completely hiding the overhead for > X + * the crc update, the inner loop must take considerably > X + * longer than 24 cycles. LONG =3D 64 makes the inner lo= op > X + * take about 24 cycles, so is not quite large enough. > X + * LONG =3D 128 works OK. Unhideable overheads are about > X + * 12 cycles per inner loop. All assuming timing like > X + * Haswell. > X + */ > X + crc =3D crc32c_shift(crc32c_long, crc) ^ crc0; > X + crc1 =3D crc32c_shift(crc32c_long, crc1); > X + crc =3D crc32c_shift(crc32c_2long, crc) ^ crc1; > X + crc0 =3D crc2; > X next +=3D LONG * 2; > X len -=3D LONG * 3; > X } > X + crc0 ^=3D crc; > X +#endif /* LONG > SHORT */ > X X /* > X * Do the same thing, but now on SHORT*3 blocks for the remaining > data > X * less than a LONG*3 block > X */ > X + crc =3D 0; > X while (len >=3D SHORT * 3) { > X crc1 =3D 0; > X crc2 =3D 0; > > See the comment. > > X @@ -259,11 +343,14 @@ > X #endif > X next +=3D align; > > When SHORT is about what it is (64), on amd64 the "SHORT" loop has 24 crc= 32 > instructions and compilers sometimes to unroll them all. This makes litt= le > difference. > > X } while (next < end); > X - crc0 =3D crc32c_shift(crc32c_short, crc0) ^ crc1; > X - crc0 =3D crc32c_shift(crc32c_short, crc0) ^ crc2; > X + crc =3D crc32c_shift(crc32c_short, crc) ^ crc0; > X + crc1 =3D crc32c_shift(crc32c_short, crc1); > X + crc =3D crc32c_shift(crc32c_2short, crc) ^ crc1; > X + crc0 =3D crc2; > X next +=3D SHORT * 2; > X len -=3D SHORT * 3; > X } > X + crc0 ^=3D crc; > > The change is perhaps easier to understand without looking at the comment= . > We accumulate changes in crc instead of into crc0, so that the next > iteration > can start without waiting for accumulation. This requires more shifting > steps, and we try to arrange these optimally. > > X X /* Compute the crc on the remaining bytes at native word size. */ > X end =3D next + (len - (len & (align - 1))); > > The adjustments for alignment are slow if they are not null, and wasteful > if they are null, but have relatively little cost for the non-small buffe= rs > that are handled well, so I didn't remove them. > > Bruce From owner-svn-src-all@freebsd.org Wed Mar 1 21:02:28 2017 Return-Path: Delivered-To: svn-src-all@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 0F510CF33BC; Wed, 1 Mar 2017 21:02:28 +0000 (UTC) (envelope-from ian@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 C3A547E5; Wed, 1 Mar 2017 21:02:27 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21L2QPH015097; Wed, 1 Mar 2017 21:02:26 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21L2Q8F015094; Wed, 1 Mar 2017 21:02:26 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703012102.v21L2Q8F015094@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 1 Mar 2017 21:02:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314510 - in stable/11/sys: arm/freescale/imx conf dev/sdhci powerpc/mpc85xx X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 21:02:28 -0000 Author: ian Date: Wed Mar 1 21:02:26 2017 New Revision: 314510 URL: https://svnweb.freebsd.org/changeset/base/314510 Log: MFC r308186, r308188, r308231, r308232: Move imx_sdhci driver over to a dev/sdhci in preparation for QorIQ support. Freescale uses eSDHC in both i.MX (ARM) and QorIQ (PowerPC), with slight differences. This is part one in unifying the drivers. Merge i.MX and PowerPC SDHCI drivers Summary: i.MX5 and PowerPC use a very similar eSDHC controller, which is also similar to the uSDHC controller used by i.MX6. The imx_sdhci driver works almost completely with PowerPC, with some minor tweaks. Fix the build. protctl is only used on powerpc. While here, remove the need to check the SVR SPR, as others may be compatible with the p1022-esdhc type. Since it's no longer accessing a powerpc-specific register, drop the #ifdef. Added: stable/11/sys/dev/sdhci/fsl_sdhci.c - copied, changed from r308186, head/sys/dev/sdhci/fsl_sdhci.c Deleted: stable/11/sys/arm/freescale/imx/imx_sdhci.c stable/11/sys/powerpc/mpc85xx/fsl_sdhc.c stable/11/sys/powerpc/mpc85xx/fsl_sdhc.h Modified: stable/11/sys/arm/freescale/imx/files.imx5 stable/11/sys/arm/freescale/imx/files.imx6 stable/11/sys/conf/files.powerpc Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/freescale/imx/files.imx5 ============================================================================== --- stable/11/sys/arm/freescale/imx/files.imx5 Wed Mar 1 20:23:21 2017 (r314509) +++ stable/11/sys/arm/freescale/imx/files.imx5 Wed Mar 1 21:02:26 2017 (r314510) @@ -32,7 +32,7 @@ arm/freescale/imx/imx51_ccm.c standard dev/ata/chipsets/ata-fsl.c optional imxata # SDHCI/MMC -arm/freescale/imx/imx_sdhci.c optional sdhci +dev/sdhci/fsl_sdhci.c optional sdhci # USB OH3 controller (1 OTG, 3 EHCI) arm/freescale/imx/imx_nop_usbphy.c optional ehci Modified: stable/11/sys/arm/freescale/imx/files.imx6 ============================================================================== --- stable/11/sys/arm/freescale/imx/files.imx6 Wed Mar 1 20:23:21 2017 (r314509) +++ stable/11/sys/arm/freescale/imx/files.imx6 Wed Mar 1 21:02:26 2017 (r314510) @@ -32,7 +32,7 @@ arm/freescale/imx/imx6_ipu.c optional v # # Optional devices. # -arm/freescale/imx/imx_sdhci.c optional sdhci +dev/sdhci/fsl_sdhci.c optional sdhci arm/freescale/imx/imx_wdog.c optional imxwdt Modified: stable/11/sys/conf/files.powerpc ============================================================================== --- stable/11/sys/conf/files.powerpc Wed Mar 1 20:23:21 2017 (r314509) +++ stable/11/sys/conf/files.powerpc Wed Mar 1 21:02:26 2017 (r314510) @@ -63,6 +63,7 @@ dev/ofw/ofw_subr.c optional aim powerpc dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac dev/quicc/quicc_bfe_fdt.c optional quicc mpc85xx dev/scc/scc_bfe_macio.c optional scc powermac +dev/sdhci/fsl_sdhci.c optional mpc85xx sdhci dev/sec/sec.c optional sec mpc85xx dev/sound/macio/aoa.c optional snd_davbus | snd_ai2s powermac dev/sound/macio/davbus.c optional snd_davbus powermac @@ -135,7 +136,6 @@ powerpc/mikrotik/platform_rb.c optional powerpc/mpc85xx/atpic.c optional mpc85xx isa powerpc/mpc85xx/ds1553_bus_fdt.c optional ds1553 fdt powerpc/mpc85xx/ds1553_core.c optional ds1553 -powerpc/mpc85xx/fsl_sdhc.c optional mpc85xx sdhc | qoriq_dpaa sdhc powerpc/mpc85xx/i2c.c optional iicbus fdt powerpc/mpc85xx/isa.c optional mpc85xx isa powerpc/mpc85xx/lbc.c optional mpc85xx | qoriq_dpaa Copied and modified: stable/11/sys/dev/sdhci/fsl_sdhci.c (from r308186, head/sys/dev/sdhci/fsl_sdhci.c) ============================================================================== --- head/sys/dev/sdhci/fsl_sdhci.c Wed Nov 2 00:51:09 2016 (r308186, copy source) +++ stable/11/sys/dev/sdhci/fsl_sdhci.c Wed Mar 1 21:02:26 2017 (r314510) @@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$"); /* - * SDHCI driver glue for Freescale i.MX SoC family. + * SDHCI driver glue for Freescale i.MX SoC and QorIQ families. * * This supports both eSDHC (earlier SoCs) and uSDHC (more recent SoCs). */ @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -52,9 +53,11 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef __arm__ #include #include +#endif #include #include @@ -146,7 +149,6 @@ struct fsl_sdhci_softc { #define SDHC_PROT_CDSS (1 << 7) #define SDHC_SYS_CTRL 0x2c -#define SDHC_INT_STATUS 0x30 /* * The clock enable bits exist in different registers for ESDHC vs USDHC, but @@ -169,6 +171,7 @@ static struct ofw_compat_data compat_dat {"fsl,imx6sl-usdhc", HWTYPE_USDHC}, {"fsl,imx53-esdhc", HWTYPE_ESDHC}, {"fsl,imx51-esdhc", HWTYPE_ESDHC}, + {"fsl,esdhc", HWTYPE_ESDHC}, {NULL, HWTYPE_NONE}, }; @@ -397,6 +400,11 @@ fsl_sdhci_write_1(device_t dev, struct s if (off == SDHCI_POWER_CONTROL) { return; } +#ifdef __powerpc__ + /* XXX Reset doesn't seem to work as expected. Do nothing for now. */ + if (off == SDHCI_SOFTWARE_RESET) + return; +#endif val32 = RD4(sc, off & ~3); val32 &= ~(0xff << (off & 3) * 8); @@ -531,17 +539,20 @@ fsl_sdhc_get_clock(struct fsl_sdhci_soft val |= SDHCI_CLOCK_INT_STABLE; /* - * On ESDHC hardware the card bus clock enable is in the usual sdhci - * register but it's a different bit, so transcribe it (note the + * On i.MX ESDHC hardware the card bus clock enable is in the usual + * sdhci register but it's a different bit, so transcribe it (note the * difference between standard SDHCI_ and Freescale SDHC_ prefixes - * here). On USDHC hardware there is a force-on bit, but no force-off - * for the card bus clock (the hardware runs the clock when transfers - * are active no matter what), so we always say the clock is on. + * here). On USDHC and QorIQ ESDHC hardware there is a force-on bit, but + * no force-off for the card bus clock (the hardware runs the clock when + * transfers are active no matter what), so we always say the clock is + * on. * XXX Maybe we should say it's in whatever state the sdhci driver last * set it to. */ if (sc->hwtype == HWTYPE_ESDHC) { +#ifdef __arm__ if (RD4(sc, SDHC_SYS_CTRL) & SDHC_CLK_SDCLKEN) +#endif val |= SDHCI_CLOCK_CARD_EN; } else { val |= SDHCI_CLOCK_CARD_EN; @@ -565,15 +576,18 @@ fsl_sdhc_set_clock(struct fsl_sdhci_soft sc->sdclockreg_freq_bits = val & SDHCI_DIVIDERS_MASK; if (sc->hwtype == HWTYPE_ESDHC) { /* - * The ESDHC hardware requires the driver to manually start and - * stop the sd bus clock. If the enable bit is not set, turn - * off the clock in hardware and we're done, otherwise decode - * the requested frequency. ESDHC hardware is sdhci 2.0; the - * sdhci driver will use the original 8-bit divisor field and - * the "base / 2^N" divisor scheme. + * The i.MX5 ESDHC hardware requires the driver to manually + * start and stop the sd bus clock. If the enable bit is not + * set, turn off the clock in hardware and we're done, otherwise + * decode the requested frequency. ESDHC hardware is sdhci 2.0; + * the sdhci driver will use the original 8-bit divisor field + * and the "base / 2^N" divisor scheme. */ if ((val & SDHCI_CLOCK_CARD_EN) == 0) { +#ifdef __arm__ + /* On QorIQ, this is a reserved bit. */ WR4(sc, SDHCI_CLOCK_CONTROL, val32 & ~SDHC_CLK_SDCLKEN); +#endif return; } @@ -625,6 +639,7 @@ fsl_sdhc_set_clock(struct fsl_sdhci_soft val32 &= ~(SDHC_CLK_DIVISOR_MASK | SDHC_CLK_PRESCALE_MASK); val32 |= divisor << SDHC_CLK_DIVISOR_SHIFT; val32 |= prescale << SDHC_CLK_PRESCALE_SHIFT; + val32 |= SDHC_CLK_IPGEN; WR4(sc, SDHCI_CLOCK_CONTROL, val32); } @@ -710,10 +725,10 @@ fsl_sdhci_intr(void *arg) */ switch (sc->r1bfix_type) { case R1BFIX_NODATA: - intmask = RD4(sc, SDHC_INT_STATUS) & SDHCI_INT_RESPONSE; + intmask = RD4(sc, SDHCI_INT_STATUS) & SDHCI_INT_RESPONSE; break; case R1BFIX_AC12: - intmask = RD4(sc, SDHC_INT_STATUS) & SDHCI_INT_DATA_END; + intmask = RD4(sc, SDHCI_INT_STATUS) & SDHCI_INT_DATA_END; break; default: intmask = 0; @@ -722,8 +737,8 @@ fsl_sdhci_intr(void *arg) if (intmask) { sc->r1bfix_timeout_at = getsbinuptime() + 250 * SBT_1MS; if (!fsl_sdhci_r1bfix_is_wait_done(sc)) { - WR4(sc, SDHC_INT_STATUS, intmask); - bus_barrier(sc->mem_res, SDHC_INT_STATUS, 4, + WR4(sc, SDHCI_INT_STATUS, intmask); + bus_barrier(sc->mem_res, SDHCI_INT_STATUS, 4, BUS_SPACE_BARRIER_WRITE); } } @@ -735,9 +750,53 @@ fsl_sdhci_intr(void *arg) static int fsl_sdhci_get_ro(device_t bus, device_t child) { + struct fsl_sdhci_softc *sc = device_get_softc(bus); + + if (RD4(sc, SDHCI_PRESENT_STATE) & SDHC_PRES_WPSPL) + return (false); + return (true); +} + +#ifdef __powerpc__ +static uint32_t +fsl_sdhci_get_platform_clock(device_t dev) +{ + device_t parent; + phandle_t node; + uint32_t clock; + + node = ofw_bus_get_node(dev); - return (false); + /* Get sdhci node properties */ + if((OF_getprop(node, "clock-frequency", (void *)&clock, + sizeof(clock)) <= 0) || (clock == 0)) { + + /* + * Trying to get clock from parent device (soc) if correct + * clock cannot be acquired from sdhci node. + */ + parent = device_get_parent(dev); + node = ofw_bus_get_node(parent); + + /* Get soc properties */ + if ((OF_getprop(node, "bus-frequency", (void *)&clock, + sizeof(clock)) <= 0) || (clock == 0)) { + device_printf(dev,"Cannot acquire correct sdhci " + "frequency from DTS.\n"); + + return (0); + } + /* eSDHC clock is 1/2 platform clock. */ + clock /= 2; + } + + if (bootverbose) + device_printf(dev, "Acquired clock: %d from DTS\n", clock); + + return (clock); } +#endif + static int fsl_sdhci_detach(device_t dev) @@ -752,6 +811,9 @@ fsl_sdhci_attach(device_t dev) struct fsl_sdhci_softc *sc = device_get_softc(dev); int rid, err; phandle_t node; +#ifdef __powerpc__ + uint32_t protctl; +#endif sc->dev = dev; @@ -807,9 +869,21 @@ fsl_sdhci_attach(device_t dev) * * XXX need named constants for this stuff. */ - WR4(sc, SDHC_WTMK_LVL, 0x08800880); + /* P1022 has the '*_BRST_LEN' fields as reserved, always reading 0x10 */ + if (ofw_bus_is_compatible(dev, "fsl,p1022-esdhc")) + WR4(sc, SDHC_WTMK_LVL, 0x10801080); + else + WR4(sc, SDHC_WTMK_LVL, 0x08800880); + /* + * We read in native byte order in the main driver, but the register + * defaults to little endian. + */ +#ifdef __powerpc__ + sc->baseclk_hz = fsl_sdhci_get_platform_clock(dev); +#else sc->baseclk_hz = imx_ccm_sdhci_hz(); +#endif sc->slot.max_clk = sc->baseclk_hz; /* @@ -830,6 +904,16 @@ fsl_sdhci_attach(device_t dev) /* XXX put real gpio hookup here. */ sc->force_card_present = true; } +#ifdef __powerpc__ + /* Default to big-endian on powerpc */ + protctl = RD4(sc, SDHC_PROT_CTRL); + protctl &= ~SDHC_PROT_EMODE_MASK; + if (OF_hasprop(node, "little-endian")) + protctl |= SDHC_PROT_EMODE_LITTLE; + else + protctl |= SDHC_PROT_EMODE_BIG; + WR4(sc, SDHC_PROT_CTRL, protctl); +#endif callout_init(&sc->r1bfix_callout, 1); sdhci_init_slot(dev, &sc->slot, 0); From owner-svn-src-all@freebsd.org Wed Mar 1 21:05:26 2017 Return-Path: Delivered-To: svn-src-all@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 29BAECF3487; Wed, 1 Mar 2017 21:05:26 +0000 (UTC) (envelope-from ian@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 046F3976; Wed, 1 Mar 2017 21:05:25 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21L5PYC015257; Wed, 1 Mar 2017 21:05:25 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21L5PWt015256; Wed, 1 Mar 2017 21:05:25 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703012105.v21L5PWt015256@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 1 Mar 2017 21:05:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314511 - stable/11/sys/dev/sdhci X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 21:05:26 -0000 Author: ian Date: Wed Mar 1 21:05:24 2017 New Revision: 314511 URL: https://svnweb.freebsd.org/changeset/base/314511 Log: MFC r311736: Use the new sdhci_fdt_gpio helper functions to add full support for FDT gpio pins for detecting card insert/remove and write protect. Modified: stable/11/sys/dev/sdhci/fsl_sdhci.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/sdhci/fsl_sdhci.c ============================================================================== --- stable/11/sys/dev/sdhci/fsl_sdhci.c Wed Mar 1 21:02:26 2017 (r314510) +++ stable/11/sys/dev/sdhci/fsl_sdhci.c Wed Mar 1 21:05:24 2017 (r314511) @@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include #endif +#include #include #include @@ -67,6 +68,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include "sdhci_if.h" struct fsl_sdhci_softc { @@ -77,10 +79,10 @@ struct fsl_sdhci_softc { struct sdhci_slot slot; struct callout r1bfix_callout; sbintime_t r1bfix_timeout_at; + struct sdhci_fdt_gpio * gpio; uint32_t baseclk_hz; uint32_t cmd_and_mode; uint32_t r1bfix_intmask; - boolean_t force_card_present; uint16_t sdclockreg_freq_bits; uint8_t r1bfix_type; uint8_t hwtype; @@ -345,8 +347,6 @@ fsl_sdhci_read_4(device_t dev, struct sd val32 &= 0x000F0F07; val32 |= (wrk32 >> 4) & SDHCI_STATE_DAT_MASK; val32 |= (wrk32 >> 9) & SDHCI_RETUNE_REQUEST; - if (sc->force_card_present) - val32 |= SDHCI_CARD_PRESENT; return (val32); } @@ -752,9 +752,15 @@ fsl_sdhci_get_ro(device_t bus, device_t { struct fsl_sdhci_softc *sc = device_get_softc(bus); - if (RD4(sc, SDHCI_PRESENT_STATE) & SDHC_PRES_WPSPL) - return (false); - return (true); + return (sdhci_fdt_gpio_get_readonly(sc->gpio)); +} + +static bool +fsl_sdhci_get_card_present(device_t dev, struct sdhci_slot *slot) +{ + struct fsl_sdhci_softc *sc = device_get_softc(dev); + + return (sdhci_fdt_gpio_get_present(sc->gpio)); } #ifdef __powerpc__ @@ -802,6 +808,7 @@ static int fsl_sdhci_detach(device_t dev) { + /* sdhci_fdt_gpio_teardown(sc->gpio); */ return (EBUSY); } @@ -810,8 +817,8 @@ fsl_sdhci_attach(device_t dev) { struct fsl_sdhci_softc *sc = device_get_softc(dev); int rid, err; - phandle_t node; #ifdef __powerpc__ + phandle_t node; uint32_t protctl; #endif @@ -887,24 +894,13 @@ fsl_sdhci_attach(device_t dev) sc->slot.max_clk = sc->baseclk_hz; /* - * If the slot is flagged with the non-removable property, set our flag - * to always force the SDHCI_CARD_PRESENT bit on. - * - * XXX Workaround for gpio-based card detect... - * - * We don't have gpio support yet. If there's a cd-gpios property just - * force the SDHCI_CARD_PRESENT bit on for now. If there isn't really a - * card there it will fail to probe at the mmc layer and nothing bad - * happens except instantiating an mmcN device for an empty slot. + * Set up any gpio pin handling described in the FDT data. This cannot + * fail; see comments in sdhci_fdt_gpio.h for details. */ - node = ofw_bus_get_node(dev); - if (OF_hasprop(node, "non-removable")) - sc->force_card_present = true; - else if (OF_hasprop(node, "cd-gpios")) { - /* XXX put real gpio hookup here. */ - sc->force_card_present = true; - } + sc->gpio = sdhci_fdt_gpio_setup(dev, &sc->slot); + #ifdef __powerpc__ + node = ofw_bus_get_node(dev); /* Default to big-endian on powerpc */ protctl = RD4(sc, SDHC_PROT_CTRL); protctl &= ~SDHC_PROT_EMODE_MASK; @@ -974,7 +970,7 @@ static device_method_t fsl_sdhci_methods DEVMETHOD(mmcbr_acquire_host, sdhci_generic_acquire_host), DEVMETHOD(mmcbr_release_host, sdhci_generic_release_host), - /* SDHCI registers accessors */ + /* SDHCI accessors */ DEVMETHOD(sdhci_read_1, fsl_sdhci_read_1), DEVMETHOD(sdhci_read_2, fsl_sdhci_read_2), DEVMETHOD(sdhci_read_4, fsl_sdhci_read_4), @@ -983,6 +979,7 @@ static device_method_t fsl_sdhci_methods DEVMETHOD(sdhci_write_2, fsl_sdhci_write_2), DEVMETHOD(sdhci_write_4, fsl_sdhci_write_4), DEVMETHOD(sdhci_write_multi_4, fsl_sdhci_write_multi_4), + DEVMETHOD(sdhci_get_card_present,fsl_sdhci_get_card_present), { 0, 0 } }; From owner-svn-src-all@freebsd.org Wed Mar 1 21:11:38 2017 Return-Path: Delivered-To: svn-src-all@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 686C4CF3679; Wed, 1 Mar 2017 21:11:38 +0000 (UTC) (envelope-from ian@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 1DAA4D4D; Wed, 1 Mar 2017 21:11:38 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21LBbBp018992; Wed, 1 Mar 2017 21:11:37 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21LBbaT018990; Wed, 1 Mar 2017 21:11:37 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703012111.v21LBbaT018990@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 1 Mar 2017 21:11:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314512 - stable/11/sys/arm/ti/am335x X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 21:11:38 -0000 Author: ian Date: Wed Mar 1 21:11:36 2017 New Revision: 314512 URL: https://svnweb.freebsd.org/changeset/base/314512 Log: MFC r312859: Configure the timer capture pin to input mode in the timer control register, in addition to configuring it as input with the pinmux driver. There was a control register bit commented as "no desc in datasheet". A later revision of the manual reveals the bit to be an input/output control for the timer pin. In addition to configuring capture or pulse mode, you apparently have to separately configure the pin direction in the timer control register. Before this change, the timer block was apparently driving a signal onto a pad configured by pinmux as input. Capture mode still accidentally worked for me during testing because I was using a very strong signal source that just out-muscled the weaker drive from the misconfigured pin. Modified: stable/11/sys/arm/ti/am335x/am335x_dmtpps.c stable/11/sys/arm/ti/am335x/am335x_dmtreg.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/ti/am335x/am335x_dmtpps.c ============================================================================== --- stable/11/sys/arm/ti/am335x/am335x_dmtpps.c Wed Mar 1 21:05:24 2017 (r314511) +++ stable/11/sys/arm/ti/am335x/am335x_dmtpps.c Wed Mar 1 21:11:36 2017 (r314512) @@ -463,6 +463,14 @@ dmtpps_attach(device_t dev) sc->tmr_num = ti_hwmods_get_unit(dev, "timer"); snprintf(sc->tmr_name, sizeof(sc->tmr_name), "DMTimer%d", sc->tmr_num); + /* + * Configure the timer pulse/capture pin to input/capture mode. This is + * required in addition to configuring the pin as input with the pinmux + * controller (which was done via fdt data or tunable at probe time). + */ + sc->tclr = DMT_TCLR_GPO_CFG; + DMTIMER_WRITE4(sc, DMT_TCLR, sc->tclr); + /* Set up timecounter hardware, start it. */ DMTIMER_WRITE4(sc, DMT_TSICR, DMT_TSICR_RESET); while (DMTIMER_READ4(sc, DMT_TIOCP_CFG) & DMT_TIOCP_RESET) Modified: stable/11/sys/arm/ti/am335x/am335x_dmtreg.h ============================================================================== --- stable/11/sys/arm/ti/am335x/am335x_dmtreg.h Wed Mar 1 21:05:24 2017 (r314511) +++ stable/11/sys/arm/ti/am335x/am335x_dmtreg.h Wed Mar 1 21:11:36 2017 (r314512) @@ -62,7 +62,7 @@ #define DMT_TCLR_TRGMODE_BOTH (2 << 10) /* Trigger on match + ovflow */ #define DMT_TCLR_PWM_PTOGGLE (1 << 12) /* PWM toggles */ #define DMT_TCLR_CAP_MODE_2ND (1 << 13) /* Capture second event mode */ -#define DMT_TCLR_GPO_CFG (1 << 14) /* (no descr in datasheet) */ +#define DMT_TCLR_GPO_CFG (1 << 14) /* Tmr pin conf, 0=out, 1=in */ #define DMT_TCRR 0x3C /* Counter Register */ #define DMT_TLDR 0x40 /* Load Reg */ #define DMT_TTGR 0x44 /* Trigger Reg */ From owner-svn-src-all@freebsd.org Wed Mar 1 21:12:52 2017 Return-Path: Delivered-To: svn-src-all@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 64AB3CF386B; Wed, 1 Mar 2017 21:12:52 +0000 (UTC) (envelope-from ian@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 30F66F51; Wed, 1 Mar 2017 21:12:52 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21LCpjZ019079; Wed, 1 Mar 2017 21:12:51 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21LCpNU019077; Wed, 1 Mar 2017 21:12:51 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703012112.v21LCpNU019077@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 1 Mar 2017 21:12:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314513 - in stable/11/sys: arm/freescale/imx dev/usb/controller X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 21:12:52 -0000 Author: ian Date: Wed Mar 1 21:12:50 2017 New Revision: 314513 URL: https://svnweb.freebsd.org/changeset/base/314513 Log: MFC r313674: Enable usb low and full speed devices connected to the imx6 root hubs. Modified: stable/11/sys/arm/freescale/imx/imx6_usbphy.c stable/11/sys/dev/usb/controller/ehci_imx.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/freescale/imx/imx6_usbphy.c ============================================================================== --- stable/11/sys/arm/freescale/imx/imx6_usbphy.c Wed Mar 1 21:11:36 2017 (r314512) +++ stable/11/sys/arm/freescale/imx/imx6_usbphy.c Wed Mar 1 21:12:50 2017 (r314513) @@ -143,6 +143,10 @@ usbphy_attach(device_t dev) bus_write_4(sc->mem_res, CTRL_SET_REG, CTRL_SFTRST); bus_write_4(sc->mem_res, CTRL_CLR_REG, CTRL_SFTRST | CTRL_CLKGATE); + /* Set UTMI+ level 2+3 bits to enable low and full speed devices. */ + bus_write_4(sc->mem_res, CTRL_SET_REG, + CTRL_ENUTMILEVEL2 | CTRL_ENUTMILEVEL3); + /* Power up: clear all bits in the powerdown register. */ bus_write_4(sc->mem_res, PWD_REG, 0); Modified: stable/11/sys/dev/usb/controller/ehci_imx.c ============================================================================== --- stable/11/sys/dev/usb/controller/ehci_imx.c Wed Mar 1 21:11:36 2017 (r314512) +++ stable/11/sys/dev/usb/controller/ehci_imx.c Wed Mar 1 21:12:50 2017 (r314513) @@ -298,8 +298,9 @@ imx_ehci_attach(device_t dev) * Set flags that affect ehci_init() behavior, and hook our post-reset * code into the standard controller code. */ - esc->sc_flags |= EHCI_SCFLG_NORESTERM; + esc->sc_flags |= EHCI_SCFLG_NORESTERM | EHCI_SCFLG_TT; esc->sc_vendor_post_reset = imx_ehci_post_reset; + esc->sc_vendor_get_port_speed = ehci_get_port_speed_portsc; err = ehci_init(esc); if (err != 0) { From owner-svn-src-all@freebsd.org Wed Mar 1 21:18:44 2017 Return-Path: Delivered-To: svn-src-all@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 545EACF392A; Wed, 1 Mar 2017 21:18:44 +0000 (UTC) (envelope-from ian@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 233DF1B8; Wed, 1 Mar 2017 21:18:44 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21LIhUE019361; Wed, 1 Mar 2017 21:18:43 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21LIhaY019359; Wed, 1 Mar 2017 21:18:43 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703012118.v21LIhaY019359@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 1 Mar 2017 21:18:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314514 - in stable/11/sys: arm/ti dev/sdhci X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 21:18:44 -0000 Author: ian Date: Wed Mar 1 21:18:42 2017 New Revision: 314514 URL: https://svnweb.freebsd.org/changeset/base/314514 Log: MFC r314064, r314060: Fix typos in bootverbose printfs... display the write-protect pin info, not the card-detect pin info. Remove a variable that has been unused since r311735 (it should have been removed as part of those changes). Modified: stable/11/sys/arm/ti/ti_sdhci.c stable/11/sys/dev/sdhci/sdhci_fdt_gpio.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/ti/ti_sdhci.c ============================================================================== --- stable/11/sys/arm/ti/ti_sdhci.c Wed Mar 1 21:12:50 2017 (r314513) +++ stable/11/sys/arm/ti/ti_sdhci.c Wed Mar 1 21:18:42 2017 (r314514) @@ -71,7 +71,6 @@ struct ti_sdhci_softc { uint32_t mmchs_reg_off; uint32_t sdhci_reg_off; uint32_t baseclk_hz; - uint32_t wp_gpio_pin; uint32_t cmd_and_mode; uint32_t sdhci_clkdiv; boolean_t disable_highspeed; Modified: stable/11/sys/dev/sdhci/sdhci_fdt_gpio.c ============================================================================== --- stable/11/sys/dev/sdhci/sdhci_fdt_gpio.c Wed Mar 1 21:12:50 2017 (r314513) +++ stable/11/sys/dev/sdhci/sdhci_fdt_gpio.c Wed Mar 1 21:18:42 2017 (r314514) @@ -188,7 +188,7 @@ wp_setup(struct sdhci_fdt_gpio *gpio, ph if (bootverbose) device_printf(dev, "Write protect switch on %s pin %u\n", - device_get_nameunit(gpio->cd_pin->dev), gpio->cd_pin->pin); + device_get_nameunit(gpio->wp_pin->dev), gpio->wp_pin->pin); } struct sdhci_fdt_gpio * From owner-svn-src-all@freebsd.org Wed Mar 1 21:19:47 2017 Return-Path: Delivered-To: svn-src-all@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 BADCECF39A0; Wed, 1 Mar 2017 21:19:47 +0000 (UTC) (envelope-from ian@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 8A22D32C; Wed, 1 Mar 2017 21:19:47 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21LJk7r019440; Wed, 1 Mar 2017 21:19:46 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21LJkLq019439; Wed, 1 Mar 2017 21:19:46 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703012119.v21LJkLq019439@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 1 Mar 2017 21:19:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314515 - stable/11/sys/arm/freescale/imx X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 21:19:47 -0000 Author: ian Date: Wed Mar 1 21:19:46 2017 New Revision: 314515 URL: https://svnweb.freebsd.org/changeset/base/314515 Log: MFC r313917: Change the naming of imx{5,6} gpio pins to exactly match the names used in the reference manual. Modified: stable/11/sys/arm/freescale/imx/imx_gpio.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/freescale/imx/imx_gpio.c ============================================================================== --- stable/11/sys/arm/freescale/imx/imx_gpio.c Wed Mar 1 21:18:42 2017 (r314514) +++ stable/11/sys/arm/freescale/imx/imx_gpio.c Wed Mar 1 21:19:46 2017 (r314515) @@ -728,7 +728,7 @@ imx51_gpio_attach(device_t dev) (READ4(sc, IMX_GPIO_OE_REG) & (1U << i)) ? GPIO_PIN_OUTPUT : GPIO_PIN_INPUT; snprintf(sc->gpio_pins[i].gp_name, GPIOMAXNAME, - "imx_gpio%d.%d", unit, i); + "GPIO%d_IO%02d", unit + 1, i); } #ifdef INTRNG From owner-svn-src-all@freebsd.org Wed Mar 1 21:20:30 2017 Return-Path: Delivered-To: svn-src-all@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 235E6CF3A82; Wed, 1 Mar 2017 21:20:30 +0000 (UTC) (envelope-from ian@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 E4712690; Wed, 1 Mar 2017 21:20:29 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21LKSiK019531; Wed, 1 Mar 2017 21:20:28 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21LKSr5019530; Wed, 1 Mar 2017 21:20:28 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703012120.v21LKSr5019530@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 1 Mar 2017 21:20:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314516 - stable/11/sys/dev/ffec X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 21:20:30 -0000 Author: ian Date: Wed Mar 1 21:20:28 2017 New Revision: 314516 URL: https://svnweb.freebsd.org/changeset/base/314516 Log: MFC r313918: Add definitions for the IEEE-1588 registers. Modified: stable/11/sys/dev/ffec/if_ffecreg.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/ffec/if_ffecreg.h ============================================================================== --- stable/11/sys/dev/ffec/if_ffecreg.h Wed Mar 1 21:19:46 2017 (r314515) +++ stable/11/sys/dev/ffec/if_ffecreg.h Wed Mar 1 21:20:28 2017 (r314516) @@ -186,6 +186,27 @@ __FBSDID("$FreeBSD$"); #define FEC_RACC_PADREM (1 << 0) /* + * IEEE-1588 timer registers + */ + +#define FEC_ATCR_REG 0x0400 +#define FEC_ATCR_SLAVE (1u << 13) +#define FEC_ATCR_CAPTURE (1u << 11) +#define FEC_ATCR_RESTART (1u << 9) +#define FEC_ATCR_PINPER (1u << 7) +#define FEC_ATCR_PEREN (1u << 4) +#define FEC_ATCR_OFFRST (1u << 3) +#define FEC_ATCR_OFFEN (1u << 2) +#define FEC_ATCR_EN (1u << 0) + +#define FEC_ATVR_REG 0x0404 +#define FEC_ATOFF_REG 0x0408 +#define FEC_ATPER_REG 0x040c +#define FEC_ATCOR_REG 0x0410 +#define FEC_ATINC_REG 0x0414 +#define FEC_ATSTMP_REG 0x0418 + +/* * Statistics registers */ #define FEC_RMON_T_DROP 0x200 From owner-svn-src-all@freebsd.org Wed Mar 1 21:31:45 2017 Return-Path: Delivered-To: svn-src-all@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 6FBEFCF3047; Wed, 1 Mar 2017 21:31:45 +0000 (UTC) (envelope-from ian@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 3AE33EFF; Wed, 1 Mar 2017 21:31:45 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21LVia7026177; Wed, 1 Mar 2017 21:31:44 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21LVikJ026176; Wed, 1 Mar 2017 21:31:44 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703012131.v21LVikJ026176@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 1 Mar 2017 21:31:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314517 - stable/11/sys/modules/dtb/imx6 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 21:31:45 -0000 Author: ian Date: Wed Mar 1 21:31:44 2017 New Revision: 314517 URL: https://svnweb.freebsd.org/changeset/base/314517 Log: MFC r313919: Add dtb files for Boundary Devices Nitrogen 6 family boards. Modified: stable/11/sys/modules/dtb/imx6/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/modules/dtb/imx6/Makefile ============================================================================== --- stable/11/sys/modules/dtb/imx6/Makefile Wed Mar 1 21:20:28 2017 (r314516) +++ stable/11/sys/modules/dtb/imx6/Makefile Wed Mar 1 21:31:44 2017 (r314517) @@ -5,6 +5,9 @@ DTS= \ imx6q-cubox-i.dts \ imx6dl-hummingboard.dts \ imx6q-hummingboard.dts \ + imx6dl-nitrogen6x.dts \ + imx6q-nitrogen6_max.dts \ + imx6q-nitrogen6x.dts \ imx6dl-riotboard.dts \ imx6dl-wandboard.dts \ imx6q-wandboard.dts From owner-svn-src-all@freebsd.org Wed Mar 1 21:35:26 2017 Return-Path: Delivered-To: svn-src-all@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 A2D09CF3107; Wed, 1 Mar 2017 21:35:26 +0000 (UTC) (envelope-from bapt@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 6FFB218D; Wed, 1 Mar 2017 21:35:26 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21LZPjs027090; Wed, 1 Mar 2017 21:35:25 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21LZPFP027089; Wed, 1 Mar 2017 21:35:25 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201703012135.v21LZPFP027089@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 1 Mar 2017 21:35:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314518 - vendor/dma/dist X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 21:35:26 -0000 Author: bapt Date: Wed Mar 1 21:35:25 2017 New Revision: 314518 URL: https://svnweb.freebsd.org/changeset/base/314518 Log: Import dma snapshot from git 2017-02-10 The only change is: use basename to select executable identity PR: 216910 Submitted by: Andrej Ebert Modified: vendor/dma/dist/dma.c Modified: vendor/dma/dist/dma.c ============================================================================== --- vendor/dma/dist/dma.c Wed Mar 1 21:31:44 2017 (r314517) +++ vendor/dma/dist/dma.c Wed Mar 1 21:35:25 2017 (r314518) @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -457,7 +458,7 @@ main(int argc, char **argv) bzero(&queue, sizeof(queue)); LIST_INIT(&queue.queue); - if (strcmp(argv[0], "mailq") == 0) { + if (strcmp(basename(argv[0]), "mailq") == 0) { argv++; argc--; showq = 1; if (argc != 0) From owner-svn-src-all@freebsd.org Wed Mar 1 21:37:45 2017 Return-Path: Delivered-To: svn-src-all@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 2702ACF3228; Wed, 1 Mar 2017 21:37:45 +0000 (UTC) (envelope-from bapt@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 E784C3BB; Wed, 1 Mar 2017 21:37:44 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21Lbi1H027228; Wed, 1 Mar 2017 21:37:44 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21LbhVX027226; Wed, 1 Mar 2017 21:37:43 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201703012137.v21LbhVX027226@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 1 Mar 2017 21:37:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314519 - vendor/dma/20170210 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 21:37:45 -0000 Author: bapt Date: Wed Mar 1 21:37:43 2017 New Revision: 314519 URL: https://svnweb.freebsd.org/changeset/base/314519 Log: Tag import of dma 20170210 Added: vendor/dma/20170210/ - copied from r306538, vendor/dma/dist/ Replaced: vendor/dma/20170210/dma-mbox-create.c - copied unchanged from r306539, vendor/dma/dist/dma-mbox-create.c vendor/dma/20170210/dma.c - copied unchanged from r314518, vendor/dma/dist/dma.c Copied: vendor/dma/20170210/dma-mbox-create.c (from r306539, vendor/dma/dist/dma-mbox-create.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/dma/20170210/dma-mbox-create.c Wed Mar 1 21:37:43 2017 (r314519, copy of r306539, vendor/dma/dist/dma-mbox-create.c) @@ -0,0 +1,154 @@ +/* + * Copyright (c) 2010-2014, Simon Schubert <2@0x2c.org>. + * Copyright (c) 2008 The DragonFly Project. All rights reserved. + * + * This code is derived from software contributed to The DragonFly Project + * by Simon Schubert <2@0x2c.org>. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name of The DragonFly Project nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific, prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * This binary is setuid root. Use extreme caution when touching + * user-supplied information. Keep the root window as small as possible. + */ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "dma.h" + + +static void +logfail(int exitcode, const char *fmt, ...) +{ + int oerrno = errno; + va_list ap; + char outs[1024]; + + outs[0] = 0; + if (fmt != NULL) { + va_start(ap, fmt); + vsnprintf(outs, sizeof(outs), fmt, ap); + va_end(ap); + } + + errno = oerrno; + if (*outs != 0) + syslog(LOG_ERR, errno ? "%s: %m" : "%s", outs); + else + syslog(LOG_ERR, errno ? "%m" : "unknown error"); + + exit(exitcode); +} + +/* + * Create a mbox in /var/mail for a given user, or make sure + * the permissions are correct for dma. + */ + +int +main(int argc, char **argv) +{ + const char *user; + struct passwd *pw; + struct group *gr; + uid_t user_uid; + gid_t mail_gid; + int f, maildirfd; + + openlog("dma-mbox-create", 0, LOG_MAIL); + + errno = 0; + gr = getgrnam(DMA_GROUP); + if (!gr) + logfail(EX_CONFIG, "cannot find dma group `%s'", DMA_GROUP); + + mail_gid = gr->gr_gid; + + if (setgid(mail_gid) != 0) + logfail(EX_NOPERM, "cannot set gid to %d (%s)", mail_gid, DMA_GROUP); + if (getegid() != mail_gid) + logfail(EX_NOPERM, "cannot set gid to %d (%s), still at %d", mail_gid, DMA_GROUP, getegid()); + + /* + * We take exactly one argument: the username. + */ + if (argc != 2) { + errno = 0; + logfail(EX_USAGE, "no arguments"); + } + user = argv[1]; + + syslog(LOG_NOTICE, "creating mbox for `%s'", user); + + /* the username may not contain a pathname separator */ + if (strchr(user, '/')) { + errno = 0; + logfail(EX_DATAERR, "path separator in username `%s'", user); + exit(1); + } + + /* verify the user exists */ + errno = 0; + pw = getpwnam(user); + if (!pw) + logfail(EX_NOUSER, "cannot find user `%s'", user); + + maildirfd = open(_PATH_MAILDIR, O_RDONLY); + if (maildirfd < 0) + logfail(EX_NOINPUT, "cannot open maildir %s", _PATH_MAILDIR); + + user_uid = pw->pw_uid; + + f = openat(maildirfd, user, O_RDONLY|O_CREAT|O_NOFOLLOW, 0600); + if (f < 0) + logfail(EX_NOINPUT, "cannot open mbox `%s'", user); + + if (fchown(f, user_uid, mail_gid)) + logfail(EX_OSERR, "cannot change owner of mbox `%s'", user); + + if (fchmod(f, 0620)) + logfail(EX_OSERR, "cannot change permissions of mbox `%s'", + user); + + /* file should be present with the right owner and permissions */ + + syslog(LOG_NOTICE, "successfully created mbox for `%s'", user); + + return (0); +} Copied: vendor/dma/20170210/dma.c (from r314518, vendor/dma/dist/dma.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/dma/20170210/dma.c Wed Mar 1 21:37:43 2017 (r314519, copy of r314518, vendor/dma/dist/dma.c) @@ -0,0 +1,633 @@ +/* + * Copyright (c) 2008-2014, Simon Schubert <2@0x2c.org>. + * Copyright (c) 2008 The DragonFly Project. All rights reserved. + * + * This code is derived from software contributed to The DragonFly Project + * by Simon Schubert <2@0x2c.org>. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name of The DragonFly Project nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific, prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "dfcompat.h" + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "dma.h" + + +static void deliver(struct qitem *); + +struct aliases aliases = LIST_HEAD_INITIALIZER(aliases); +struct strlist tmpfs = SLIST_HEAD_INITIALIZER(tmpfs); +struct authusers authusers = LIST_HEAD_INITIALIZER(authusers); +char username[USERNAME_SIZE]; +uid_t useruid; +const char *logident_base; +char errmsg[ERRMSG_SIZE]; + +static int daemonize = 1; +static int doqueue = 0; + +struct config config = { + .smarthost = NULL, + .port = 25, + .aliases = "/etc/aliases", + .spooldir = "/var/spool/dma", + .authpath = NULL, + .certfile = NULL, + .features = 0, + .mailname = NULL, + .masquerade_host = NULL, + .masquerade_user = NULL, +}; + + +static void +sighup_handler(int signo) +{ + (void)signo; /* so that gcc doesn't complain */ +} + +static char * +set_from(struct queue *queue, const char *osender) +{ + const char *addr; + char *sender; + + if (osender) { + addr = osender; + } else if (getenv("EMAIL") != NULL) { + addr = getenv("EMAIL"); + } else { + if (config.masquerade_user) + addr = config.masquerade_user; + else + addr = username; + } + + if (!strchr(addr, '@')) { + const char *from_host = hostname(); + + if (config.masquerade_host) + from_host = config.masquerade_host; + + if (asprintf(&sender, "%s@%s", addr, from_host) <= 0) + return (NULL); + } else { + sender = strdup(addr); + if (sender == NULL) + return (NULL); + } + + if (strchr(sender, '\n') != NULL) { + errno = EINVAL; + return (NULL); + } + + queue->sender = sender; + return (sender); +} + +static int +read_aliases(void) +{ + yyin = fopen(config.aliases, "r"); + if (yyin == NULL) { + /* + * Non-existing aliases file is not a fatal error + */ + if (errno == ENOENT) + return (0); + /* Other problems are. */ + return (-1); + } + if (yyparse()) + return (-1); /* fatal error, probably malloc() */ + fclose(yyin); + return (0); +} + +static int +do_alias(struct queue *queue, const char *addr) +{ + struct alias *al; + struct stritem *sit; + int aliased = 0; + + LIST_FOREACH(al, &aliases, next) { + if (strcmp(al->alias, addr) != 0) + continue; + SLIST_FOREACH(sit, &al->dests, next) { + if (add_recp(queue, sit->str, EXPAND_ADDR) != 0) + return (-1); + } + aliased = 1; + } + + return (aliased); +} + +int +add_recp(struct queue *queue, const char *str, int expand) +{ + struct qitem *it, *tit; + struct passwd *pw; + char *host; + int aliased = 0; + + it = calloc(1, sizeof(*it)); + if (it == NULL) + return (-1); + it->addr = strdup(str); + if (it->addr == NULL) + return (-1); + + it->sender = queue->sender; + host = strrchr(it->addr, '@'); + if (host != NULL && + (strcmp(host + 1, hostname()) == 0 || + strcmp(host + 1, "localhost") == 0)) { + *host = 0; + } + LIST_FOREACH(tit, &queue->queue, next) { + /* weed out duplicate dests */ + if (strcmp(tit->addr, it->addr) == 0) { + free(it->addr); + free(it); + return (0); + } + } + LIST_INSERT_HEAD(&queue->queue, it, next); + + /** + * Do local delivery if there is no @. + * Do not do local delivery when NULLCLIENT is set. + */ + if (strrchr(it->addr, '@') == NULL && (config.features & NULLCLIENT) == 0) { + it->remote = 0; + if (expand) { + aliased = do_alias(queue, it->addr); + if (!aliased && expand == EXPAND_WILDCARD) + aliased = do_alias(queue, "*"); + if (aliased < 0) + return (-1); + if (aliased) { + LIST_REMOVE(it, next); + } else { + /* Local destination, check */ + pw = getpwnam(it->addr); + if (pw == NULL) + goto out; + /* XXX read .forward */ + endpwent(); + } + } + } else { + it->remote = 1; + } + + return (0); + +out: + free(it->addr); + free(it); + return (-1); +} + +static struct qitem * +go_background(struct queue *queue) +{ + struct sigaction sa; + struct qitem *it; + pid_t pid; + + if (daemonize && daemon(0, 0) != 0) { + syslog(LOG_ERR, "can not daemonize: %m"); + exit(EX_OSERR); + } + daemonize = 0; + + bzero(&sa, sizeof(sa)); + sa.sa_handler = SIG_IGN; + sigaction(SIGCHLD, &sa, NULL); + + LIST_FOREACH(it, &queue->queue, next) { + /* No need to fork for the last dest */ + if (LIST_NEXT(it, next) == NULL) + goto retit; + + pid = fork(); + switch (pid) { + case -1: + syslog(LOG_ERR, "can not fork: %m"); + exit(EX_OSERR); + break; + + case 0: + /* + * Child: + * + * return and deliver mail + */ +retit: + /* + * If necessary, acquire the queue and * mail files. + * If this fails, we probably were raced by another + * process. It is okay to be raced if we're supposed + * to flush the queue. + */ + setlogident("%s", it->queueid); + switch (acquirespool(it)) { + case 0: + break; + case 1: + if (doqueue) + exit(EX_OK); + syslog(LOG_WARNING, "could not lock queue file"); + exit(EX_SOFTWARE); + default: + exit(EX_SOFTWARE); + } + dropspool(queue, it); + return (it); + + default: + /* + * Parent: + * + * fork next child + */ + break; + } + } + + syslog(LOG_CRIT, "reached dead code"); + exit(EX_SOFTWARE); +} + +static void +deliver(struct qitem *it) +{ + int error; + unsigned int backoff = MIN_RETRY, slept; + struct timeval now; + struct stat st; + + snprintf(errmsg, sizeof(errmsg), "unknown bounce reason"); + +retry: + syslog(LOG_INFO, "<%s> trying delivery", it->addr); + + if (it->remote) + error = deliver_remote(it); + else + error = deliver_local(it); + + switch (error) { + case 0: + delqueue(it); + syslog(LOG_INFO, "<%s> delivery successful", it->addr); + exit(EX_OK); + + case 1: + if (stat(it->queuefn, &st) != 0) { + syslog(LOG_ERR, "lost queue file `%s'", it->queuefn); + exit(EX_SOFTWARE); + } + if (gettimeofday(&now, NULL) == 0 && + (now.tv_sec - st.st_mtim.tv_sec > MAX_TIMEOUT)) { + snprintf(errmsg, sizeof(errmsg), + "Could not deliver for the last %d seconds. Giving up.", + MAX_TIMEOUT); + goto bounce; + } + for (slept = 0; slept < backoff;) { + slept += SLEEP_TIMEOUT - sleep(SLEEP_TIMEOUT); + if (flushqueue_since(slept)) { + backoff = MIN_RETRY; + goto retry; + } + } + if (slept >= backoff) { + /* pick the next backoff between [1.5, 2.5) times backoff */ + backoff = backoff + backoff / 2 + random() % backoff; + if (backoff > MAX_RETRY) + backoff = MAX_RETRY; + } + goto retry; + + case -1: + default: + break; + } + +bounce: + bounce(it, errmsg); + /* NOTREACHED */ +} + +void +run_queue(struct queue *queue) +{ + struct qitem *it; + + if (LIST_EMPTY(&queue->queue)) + return; + + it = go_background(queue); + deliver(it); + /* NOTREACHED */ +} + +static void +show_queue(struct queue *queue) +{ + struct qitem *it; + int locked = 0; /* XXX */ + + if (LIST_EMPTY(&queue->queue)) { + printf("Mail queue is empty\n"); + return; + } + + LIST_FOREACH(it, &queue->queue, next) { + printf("ID\t: %s%s\n" + "From\t: %s\n" + "To\t: %s\n", + it->queueid, + locked ? "*" : "", + it->sender, it->addr); + + if (LIST_NEXT(it, next) != NULL) + printf("--\n"); + } +} + +/* + * TODO: + * + * - alias processing + * - use group permissions + * - proper sysexit codes + */ + +int +main(int argc, char **argv) +{ + struct sigaction act; + char *sender = NULL; + struct queue queue; + int i, ch; + int nodot = 0, showq = 0, queue_only = 0; + int recp_from_header = 0; + + set_username(); + + /* + * We never run as root. If called by root, drop permissions + * to the mail user. + */ + if (geteuid() == 0 || getuid() == 0) { + struct passwd *pw; + + errno = 0; + pw = getpwnam(DMA_ROOT_USER); + if (pw == NULL) { + if (errno == 0) + errx(EX_CONFIG, "user '%s' not found", DMA_ROOT_USER); + else + err(EX_OSERR, "cannot drop root privileges"); + } + + if (setuid(pw->pw_uid) != 0) + err(EX_OSERR, "cannot drop root privileges"); + + if (geteuid() == 0 || getuid() == 0) + errx(EX_OSERR, "cannot drop root privileges"); + } + + atexit(deltmp); + init_random(); + + bzero(&queue, sizeof(queue)); + LIST_INIT(&queue.queue); + + if (strcmp(basename(argv[0]), "mailq") == 0) { + argv++; argc--; + showq = 1; + if (argc != 0) + errx(EX_USAGE, "invalid arguments"); + goto skipopts; + } else if (strcmp(argv[0], "newaliases") == 0) { + logident_base = "dma"; + setlogident(NULL); + + if (read_aliases() != 0) + errx(EX_SOFTWARE, "could not parse aliases file `%s'", config.aliases); + exit(EX_OK); + } + + opterr = 0; + while ((ch = getopt(argc, argv, ":A:b:B:C:d:Df:F:h:iL:N:no:O:q:r:R:tUV:vX:")) != -1) { + switch (ch) { + case 'A': + /* -AX is being ignored, except for -A{c,m} */ + if (optarg[0] == 'c' || optarg[0] == 'm') { + break; + } + /* else FALLTRHOUGH */ + case 'b': + /* -bX is being ignored, except for -bp */ + if (optarg[0] == 'p') { + showq = 1; + break; + } else if (optarg[0] == 'q') { + queue_only = 1; + break; + } + /* else FALLTRHOUGH */ + case 'D': + daemonize = 0; + break; + case 'L': + logident_base = optarg; + break; + case 'f': + case 'r': + sender = optarg; + break; + + case 't': + recp_from_header = 1; + break; + + case 'o': + /* -oX is being ignored, except for -oi */ + if (optarg[0] != 'i') + break; + /* else FALLTRHOUGH */ + case 'O': + break; + case 'i': + nodot = 1; + break; + + case 'q': + /* Don't let getopt slup up other arguments */ + if (optarg && *optarg == '-') + optind--; + doqueue = 1; + break; + + /* Ignored options */ + case 'B': + case 'C': + case 'd': + case 'F': + case 'h': + case 'N': + case 'n': + case 'R': + case 'U': + case 'V': + case 'v': + case 'X': + break; + + case ':': + if (optopt == 'q') { + doqueue = 1; + break; + } + /* FALLTHROUGH */ + + default: + fprintf(stderr, "invalid argument: `-%c'\n", optopt); + exit(EX_USAGE); + } + } + argc -= optind; + argv += optind; + opterr = 1; + + if (argc != 0 && (showq || doqueue)) + errx(EX_USAGE, "sending mail and queue operations are mutually exclusive"); + + if (showq + doqueue > 1) + errx(EX_USAGE, "conflicting queue operations"); + +skipopts: + if (logident_base == NULL) + logident_base = "dma"; + setlogident(NULL); + + act.sa_handler = sighup_handler; + act.sa_flags = 0; + sigemptyset(&act.sa_mask); + if (sigaction(SIGHUP, &act, NULL) != 0) + syslog(LOG_WARNING, "can not set signal handler: %m"); + + parse_conf(CONF_PATH "/dma.conf"); + + if (config.authpath != NULL) + parse_authfile(config.authpath); + + if (showq) { + if (load_queue(&queue) < 0) + errlog(EX_NOINPUT, "can not load queue"); + show_queue(&queue); + return (0); + } + + if (doqueue) { + flushqueue_signal(); + if (load_queue(&queue) < 0) + errlog(EX_NOINPUT, "can not load queue"); + run_queue(&queue); + return (0); + } + + if (read_aliases() != 0) + errlog(EX_SOFTWARE, "could not parse aliases file `%s'", config.aliases); + + if ((sender = set_from(&queue, sender)) == NULL) + errlog(EX_SOFTWARE, NULL); + + if (newspoolf(&queue) != 0) + errlog(EX_CANTCREAT, "can not create temp file in `%s'", config.spooldir); + + setlogident("%s", queue.id); + + for (i = 0; i < argc; i++) { + if (add_recp(&queue, argv[i], EXPAND_WILDCARD) != 0) + errlogx(EX_DATAERR, "invalid recipient `%s'", argv[i]); + } + + if (LIST_EMPTY(&queue.queue) && !recp_from_header) + errlogx(EX_NOINPUT, "no recipients"); + + if (readmail(&queue, nodot, recp_from_header) != 0) + errlog(EX_NOINPUT, "can not read mail"); + + if (LIST_EMPTY(&queue.queue)) + errlogx(EX_NOINPUT, "no recipients"); + + if (linkspool(&queue) != 0) + errlog(EX_CANTCREAT, "can not create spools"); + + /* From here on the mail is safe. */ + + if (config.features & DEFER || queue_only) + return (0); + + run_queue(&queue); + + /* NOTREACHED */ + return (0); +} From owner-svn-src-all@freebsd.org Wed Mar 1 21:42:24 2017 Return-Path: Delivered-To: svn-src-all@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 05D7ACF35BF; Wed, 1 Mar 2017 21:42:24 +0000 (UTC) (envelope-from bapt@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 C9B779B4; Wed, 1 Mar 2017 21:42:23 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21LgMqd030264; Wed, 1 Mar 2017 21:42:22 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21LgMnr030263; Wed, 1 Mar 2017 21:42:22 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201703012142.v21LgMnr030263@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 1 Mar 2017 21:42:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314520 - head/contrib/dma X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 21:42:24 -0000 Author: bapt Date: Wed Mar 1 21:42:22 2017 New Revision: 314520 URL: https://svnweb.freebsd.org/changeset/base/314520 Log: Import dma snapshot from git 2017-02-10 The only change is: use basename to select executable identity PR: 216910 Submitted by: Andrej Ebert Modified: head/contrib/dma/dma.c Directory Properties: head/contrib/dma/ (props changed) Modified: head/contrib/dma/dma.c ============================================================================== --- head/contrib/dma/dma.c Wed Mar 1 21:37:43 2017 (r314519) +++ head/contrib/dma/dma.c Wed Mar 1 21:42:22 2017 (r314520) @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -457,7 +458,7 @@ main(int argc, char **argv) bzero(&queue, sizeof(queue)); LIST_INIT(&queue.queue); - if (strcmp(argv[0], "mailq") == 0) { + if (strcmp(basename(argv[0]), "mailq") == 0) { argv++; argc--; showq = 1; if (argc != 0) From owner-svn-src-all@freebsd.org Wed Mar 1 21:45:06 2017 Return-Path: Delivered-To: svn-src-all@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 C4CD7CF37B6; Wed, 1 Mar 2017 21:45:06 +0000 (UTC) (envelope-from ian@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 9F1E4DDE; Wed, 1 Mar 2017 21:45:06 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21Lj54X031109; Wed, 1 Mar 2017 21:45:05 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21Lj3Gp031090; Wed, 1 Mar 2017 21:45:03 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703012145.v21Lj3Gp031090@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 1 Mar 2017 21:45:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314521 - stable/11/sys/arm/conf X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 21:45:06 -0000 Author: ian Date: Wed Mar 1 21:45:03 2017 New Revision: 314521 URL: https://svnweb.freebsd.org/changeset/base/314521 Log: MFC r302506: Remove HZ= from all armv6 configs, put HZ=1000 in std.armv6. Modified: stable/11/sys/arm/conf/ALLWINNER stable/11/sys/arm/conf/ALPINE stable/11/sys/arm/conf/AML8726 stable/11/sys/arm/conf/ARMADA38X stable/11/sys/arm/conf/ARMADAXP stable/11/sys/arm/conf/BEAGLEBONE stable/11/sys/arm/conf/EXYNOS5.common stable/11/sys/arm/conf/IMX53-QSB stable/11/sys/arm/conf/IMX6 stable/11/sys/arm/conf/PANDABOARD stable/11/sys/arm/conf/RK3188 stable/11/sys/arm/conf/RPI-B stable/11/sys/arm/conf/RPI2 stable/11/sys/arm/conf/SOCKIT.common stable/11/sys/arm/conf/TEGRA124 stable/11/sys/arm/conf/VERSATILEPB stable/11/sys/arm/conf/VIRT stable/11/sys/arm/conf/VYBRID stable/11/sys/arm/conf/std.armv6 Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/conf/ALLWINNER ============================================================================== --- stable/11/sys/arm/conf/ALLWINNER Wed Mar 1 21:42:22 2017 (r314520) +++ stable/11/sys/arm/conf/ALLWINNER Wed Mar 1 21:45:03 2017 (r314521) @@ -32,7 +32,6 @@ options SOC_ALLWINNER_A31S options SOC_ALLWINNER_A83T options SOC_ALLWINNER_H3 -options HZ=100 options SCHED_ULE # ULE scheduler options SMP # Enable multiple cores options PLATFORM Modified: stable/11/sys/arm/conf/ALPINE ============================================================================== --- stable/11/sys/arm/conf/ALPINE Wed Mar 1 21:42:22 2017 (r314520) +++ stable/11/sys/arm/conf/ALPINE Wed Mar 1 21:45:03 2017 (r314521) @@ -25,7 +25,6 @@ include "../annapurna/alpine/std.alpine makeoptions MODULES_OVERRIDE="" makeoptions WERROR="-Werror" -options HZ=100 options SCHED_4BSD # 4BSD scheduler options SMP # Enable multiple cores Modified: stable/11/sys/arm/conf/AML8726 ============================================================================== --- stable/11/sys/arm/conf/AML8726 Wed Mar 1 21:42:22 2017 (r314520) +++ stable/11/sys/arm/conf/AML8726 Wed Mar 1 21:45:03 2017 (r314521) @@ -23,7 +23,6 @@ ident AML8726 include "std.armv6" include "../amlogic/aml8726/std.aml8726" -options HZ=100 options SCHED_ULE # ULE scheduler options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. options LINUX_BOOT_ABI Modified: stable/11/sys/arm/conf/ARMADA38X ============================================================================== --- stable/11/sys/arm/conf/ARMADA38X Wed Mar 1 21:42:22 2017 (r314520) +++ stable/11/sys/arm/conf/ARMADA38X Wed Mar 1 21:45:03 2017 (r314521) @@ -19,8 +19,6 @@ options MD_ROOT options ROOTDEVNAME=\"/dev/da0s1a\" options SCHED_ULE # ULE scheduler -#options SCHED_4BSD # 4BSD scheduler - options SMP # Pseudo devices Modified: stable/11/sys/arm/conf/ARMADAXP ============================================================================== --- stable/11/sys/arm/conf/ARMADAXP Wed Mar 1 21:42:22 2017 (r314520) +++ stable/11/sys/arm/conf/ARMADAXP Wed Mar 1 21:45:03 2017 (r314521) @@ -27,7 +27,6 @@ options SOC_MV_ARMADAXP makeoptions WERROR="-Werror" -options HZ=1000 options SCHED_ULE # ULE scheduler options SMP # Enable multiple cores Modified: stable/11/sys/arm/conf/BEAGLEBONE ============================================================================== --- stable/11/sys/arm/conf/BEAGLEBONE Wed Mar 1 21:42:22 2017 (r314520) +++ stable/11/sys/arm/conf/BEAGLEBONE Wed Mar 1 21:45:03 2017 (r314521) @@ -30,7 +30,6 @@ makeoptions MODULES_EXTRA="dtb/am335x am options INTRNG -options HZ=100 options SCHED_4BSD # 4BSD scheduler options PLATFORM Modified: stable/11/sys/arm/conf/EXYNOS5.common ============================================================================== --- stable/11/sys/arm/conf/EXYNOS5.common Wed Mar 1 21:42:22 2017 (r314520) +++ stable/11/sys/arm/conf/EXYNOS5.common Wed Mar 1 21:45:03 2017 (r314521) @@ -21,7 +21,6 @@ makeoptions WERROR="-Werror" include "std.armv6" -options HZ=100 options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking Modified: stable/11/sys/arm/conf/IMX53-QSB ============================================================================== --- stable/11/sys/arm/conf/IMX53-QSB Wed Mar 1 21:42:22 2017 (r314520) +++ stable/11/sys/arm/conf/IMX53-QSB Wed Mar 1 21:45:03 2017 (r314521) @@ -22,8 +22,6 @@ include "IMX53" ident IMX53-QSB -options HZ=250 # 4ms scheduling quantum - # required for netbooting #options BOOTP #options BOOTP_COMPAT Modified: stable/11/sys/arm/conf/IMX6 ============================================================================== --- stable/11/sys/arm/conf/IMX6 Wed Mar 1 21:42:22 2017 (r314520) +++ stable/11/sys/arm/conf/IMX6 Wed Mar 1 21:45:03 2017 (r314521) @@ -26,7 +26,6 @@ options INTRNG options SOC_IMX6 -options HZ=500 # Scheduling quantum is 2 milliseconds. options SCHED_ULE # ULE scheduler #options NFSD # Network Filesystem Server options INCLUDE_CONFIG_FILE # Include this file in kernel Modified: stable/11/sys/arm/conf/PANDABOARD ============================================================================== --- stable/11/sys/arm/conf/PANDABOARD Wed Mar 1 21:42:22 2017 (r314520) +++ stable/11/sys/arm/conf/PANDABOARD Wed Mar 1 21:45:03 2017 (r314521) @@ -30,7 +30,6 @@ hints "PANDABOARD.hints" include "std.armv6" include "../ti/omap4/pandaboard/std.pandaboard" -options HZ=100 options SCHED_ULE # ULE scheduler options PLATFORM options SMP # Enable multiple cores Modified: stable/11/sys/arm/conf/RK3188 ============================================================================== --- stable/11/sys/arm/conf/RK3188 Wed Mar 1 21:42:22 2017 (r314520) +++ stable/11/sys/arm/conf/RK3188 Wed Mar 1 21:45:03 2017 (r314521) @@ -23,7 +23,6 @@ ident RK3188 include "std.armv6" include "../rockchip/std.rk30xx" -options HZ=100 options SCHED_ULE # ULE scheduler options SMP # Enable multiple cores Modified: stable/11/sys/arm/conf/RPI-B ============================================================================== --- stable/11/sys/arm/conf/RPI-B Wed Mar 1 21:42:22 2017 (r314520) +++ stable/11/sys/arm/conf/RPI-B Wed Mar 1 21:45:03 2017 (r314521) @@ -26,7 +26,6 @@ include "../broadcom/bcm2835/std.bcm283 options INTRNG -options HZ=100 options SCHED_4BSD # 4BSD scheduler options PLATFORM Modified: stable/11/sys/arm/conf/RPI2 ============================================================================== --- stable/11/sys/arm/conf/RPI2 Wed Mar 1 21:42:22 2017 (r314520) +++ stable/11/sys/arm/conf/RPI2 Wed Mar 1 21:45:03 2017 (r314521) @@ -26,7 +26,6 @@ include "../broadcom/bcm2835/std.bcm283 options INTRNG -options HZ=100 options SCHED_ULE # ULE scheduler options SMP # Enable multiple cores options PLATFORM Modified: stable/11/sys/arm/conf/SOCKIT.common ============================================================================== --- stable/11/sys/arm/conf/SOCKIT.common Wed Mar 1 21:42:22 2017 (r314520) +++ stable/11/sys/arm/conf/SOCKIT.common Wed Mar 1 21:45:03 2017 (r314521) @@ -25,7 +25,6 @@ makeoptions MODULES_OVERRIDE="" makeoptions WERROR="-Werror" -options HZ=100 options SCHED_ULE # ULE scheduler options SMP # Enable multiple cores Modified: stable/11/sys/arm/conf/TEGRA124 ============================================================================== --- stable/11/sys/arm/conf/TEGRA124 Wed Mar 1 21:42:22 2017 (r314520) +++ stable/11/sys/arm/conf/TEGRA124 Wed Mar 1 21:45:03 2017 (r314521) @@ -23,7 +23,6 @@ include "../nvidia/tegra124/std.tegra12 ident TEGRA124 -options HZ=100 # Scheduling quantum is 10 milliseconds. options SCHED_ULE # ULE scheduler options PLATFORM # Platform based SoC options PLATFORM_SMP Modified: stable/11/sys/arm/conf/VERSATILEPB ============================================================================== --- stable/11/sys/arm/conf/VERSATILEPB Wed Mar 1 21:42:22 2017 (r314520) +++ stable/11/sys/arm/conf/VERSATILEPB Wed Mar 1 21:45:03 2017 (r314521) @@ -29,7 +29,6 @@ makeoptions MODULES_OVERRIDE="" options KERNVIRTADDR=0xc0100000 makeoptions KERNVIRTADDR=0xc0100000 -options HZ=100 options SCHED_4BSD # 4BSD scheduler options LINUX_BOOT_ABI # Process metadata passed from Linux boot loaders Modified: stable/11/sys/arm/conf/VIRT ============================================================================== --- stable/11/sys/arm/conf/VIRT Wed Mar 1 21:42:22 2017 (r314520) +++ stable/11/sys/arm/conf/VIRT Wed Mar 1 21:45:03 2017 (r314521) @@ -23,8 +23,7 @@ ident VIRT include "std.armv6" include "../qemu/std.virt" -options HZ=100 -options SCHED_ULE # 4BSD scheduler +options SCHED_ULE # ULE scheduler options PLATFORM options PLATFORM_SMP options SMP # Enable multiple cores Modified: stable/11/sys/arm/conf/VYBRID ============================================================================== --- stable/11/sys/arm/conf/VYBRID Wed Mar 1 21:42:22 2017 (r314520) +++ stable/11/sys/arm/conf/VYBRID Wed Mar 1 21:45:03 2017 (r314521) @@ -24,7 +24,6 @@ include "../freescale/vybrid/std.vybrid makeoptions WERROR="-Werror" -options HZ=100 options SCHED_4BSD # 4BSD scheduler #options NANDFS # NAND Filesystem #options SMP # Enable multiple cores Modified: stable/11/sys/arm/conf/std.armv6 ============================================================================== --- stable/11/sys/arm/conf/std.armv6 Wed Mar 1 21:42:22 2017 (r314520) +++ stable/11/sys/arm/conf/std.armv6 Wed Mar 1 21:45:03 2017 (r314521) @@ -2,8 +2,8 @@ # # $FreeBSD$ +options HZ=1000 options ARM_L2_PIPT # Only L2 PIPT is supported - options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols From owner-svn-src-all@freebsd.org Wed Mar 1 21:48:16 2017 Return-Path: Delivered-To: svn-src-all@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 ABBD9CF38D6; Wed, 1 Mar 2017 21:48:16 +0000 (UTC) (envelope-from ian@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 7851CC; Wed, 1 Mar 2017 21:48:16 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21LmFvp031283; Wed, 1 Mar 2017 21:48:15 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21LmF30031281; Wed, 1 Mar 2017 21:48:15 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703012148.v21LmF30031281@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 1 Mar 2017 21:48:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314522 - stable/11/sys/boot/fdt/dts/arm X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 21:48:16 -0000 Author: ian Date: Wed Mar 1 21:48:15 2017 New Revision: 314522 URL: https://svnweb.freebsd.org/changeset/base/314522 Log: MFC r309195: Add an ethernet0 alias pointing to the /aix/usb/hub/ethernet node. This is required for u-boot to locate the ethernet node when it's doing fixup of the mac-address property when the user has overridden the default addr. Modified: stable/11/sys/boot/fdt/dts/arm/rpi.dts stable/11/sys/boot/fdt/dts/arm/rpi2.dts Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/boot/fdt/dts/arm/rpi.dts ============================================================================== --- stable/11/sys/boot/fdt/dts/arm/rpi.dts Wed Mar 1 21:45:03 2017 (r314521) +++ stable/11/sys/boot/fdt/dts/arm/rpi.dts Wed Mar 1 21:48:15 2017 (r314522) @@ -298,7 +298,7 @@ reg = <0x00000001>; #address-cells = <1>; #size-cells = <0>; - ethernet { + ethernet: ethernet { compatible = "net,ethernet", "usb,device"; reg = <0x00000001>; @@ -386,6 +386,7 @@ aliases { uart0 = &uart0; + ethernet0 = ðernet; }; chosen { Modified: stable/11/sys/boot/fdt/dts/arm/rpi2.dts ============================================================================== --- stable/11/sys/boot/fdt/dts/arm/rpi2.dts Wed Mar 1 21:45:03 2017 (r314521) +++ stable/11/sys/boot/fdt/dts/arm/rpi2.dts Wed Mar 1 21:48:15 2017 (r314522) @@ -315,7 +315,7 @@ reg = <0x00000001>; #address-cells = <1>; #size-cells = <0>; - ethernet { + ethernet: ethernet { compatible = "net,ethernet", "usb,device"; reg = <0x00000001>; @@ -397,6 +397,7 @@ aliases { uart0 = &uart0; + ethernet0 = ðernet; }; chosen { From owner-svn-src-all@freebsd.org Wed Mar 1 22:32:29 2017 Return-Path: Delivered-To: svn-src-all@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 809BCCF35BE; Wed, 1 Mar 2017 22:32:29 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-qk0-x22e.google.com (mail-qk0-x22e.google.com [IPv6:2607:f8b0:400d:c09::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3C105F4E; Wed, 1 Mar 2017 22:32:29 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-qk0-x22e.google.com with SMTP id u188so95678546qkc.2; Wed, 01 Mar 2017 14:32:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=vX0eDMgMy1aegdlkYZHe/4tf3zjAHU9hza/zrESBy4w=; b=V1wtRe4fabAyOKYD4ZHspOAHw5tbyel8uNWpq40giKjylujdcBJG7qy2o8n36xZLYg PhHZFfvMhSUqIJ4Gi1C4Zr9J+zn4rOorqmwNO1eRUL0a93h+/NzSES9BAW52pdB2SOyo afVb12CGUNcM9erVevuE2K8gUwsqqkPb8UpLJ3DeFLhfmQUA/ByDe7F7A/lux7s6Sv0u 0/s+tfaU/MxyrvxfpapZomkgRTqCD+N2QQTWsP/FKQyex/0fhCM7ZGbtRxdXEH8XkDhn siDEM+a59VEXaWOnwLNXEM1Put04Bw3qs9Tmg8JXdHaDpgkFmcoDpOFsfDh9bi2yvzgH muvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=vX0eDMgMy1aegdlkYZHe/4tf3zjAHU9hza/zrESBy4w=; b=tK/lFnHqvaSQym2ma4WEfdere42eHyAMm+LKYQ4V57UkecH/R8UHvrx9Tg4jP6Xi6W 5VsWFe8gZV7Ukrb/tUbZmbxVWDjI3CvSLmwOdPASdjIyyexA4u/wF+wWcp4AP5SFL0Ad 8mqXXi+j/AY19EELP8f4r5azoBTbPU2vZ62psLtIVEsV7fM3YaeoDmxJi5UQGqPVOfFd +htKTU+3PN6OJzVE6bBLjbDZhIvzVQ/C7Ko5pzK0nGF3g/u+XQfk1YAQ+dpyS8/Iq2bs mHVSQncESHSeIafElHbZEMYB7rLN93zrWHOpBPuutnfjS2aeQJ62IaUMh3uchYp0M1TA 7Wvg== X-Gm-Message-State: AMke39ka/Q8QxzTsBJBB7bRiKC1VDjT+/GjIeWIroeJoBGLzQ0A9VBQXv2OtMX94FV58TvLJXYAtDyvS1hVB3g== X-Received: by 10.237.33.240 with SMTP id m45mr10652386qtc.246.1488407548164; Wed, 01 Mar 2017 14:32:28 -0800 (PST) MIME-Version: 1.0 Received: by 10.140.104.200 with HTTP; Wed, 1 Mar 2017 14:32:27 -0800 (PST) In-Reply-To: <20170301165732.GA1093@FreeBSD.org> References: <20170301163050.GA81295@FreeBSD.org> <201703011643.v21GhtaI057213@pdx.rh.CN85.dnsmgr.net> <20170301165732.GA1093@FreeBSD.org> From: Ngie Cooper Date: Wed, 1 Mar 2017 14:32:27 -0800 Message-ID: Subject: Re: svn commit: r314464 - head/usr.sbin/yppush To: Alexey Dokuchaev Cc: "Rodney W. Grimes" , Ian Lepore , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , src-committers Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 22:32:29 -0000 On Wed, Mar 1, 2017 at 8:57 AM, Alexey Dokuchaev wrote: > On Wed, Mar 01, 2017 at 08:43:55AM -0800, Rodney W. Grimes wrote: >> I believe we have some other full path things that have crept >> forward into the production release, but that may be in ports >> only. Nope bad full paths links I found in just a few seconds: >> >> lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chfn -> /usr/bin/chpass >> lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chsh -> /usr/bin/chpass >> lrwxr-xr-x 1 root wheel 7 Nov 30 02:27 cpio -> bsdcpio >> lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 mailq -> /usr/sbin/mailwrapper >> lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 newaliases -> /usr/sbin/mailwrapper >> lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pgrep -> /bin/pgrep >> lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pkill -> /bin/pkill >> [...] > > Jeez, this is all so bogus! Imagine accessing those remotely via NFS mount > and watch things break hell in all weird ways. :-( This is completely orthogonal to my changes (and has been in place for a number of years). If you'd like to use relative symlinks for programs, then let's definitely do it as part of another change (personally, I think that some of these items could and should be replaced with hardlinks). Thanks, -Ngie From owner-svn-src-all@freebsd.org Wed Mar 1 22:41:24 2017 Return-Path: Delivered-To: svn-src-all@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 BAF19CF3876; Wed, 1 Mar 2017 22:41:24 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-qk0-x22a.google.com (mail-qk0-x22a.google.com [IPv6:2607:f8b0:400d:c09::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 75BD6836; Wed, 1 Mar 2017 22:41:24 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-qk0-x22a.google.com with SMTP id n186so93162089qkb.3; Wed, 01 Mar 2017 14:41:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=/hizwZarKsHXor9AGTSN1XWVQcy1ah3DjsrMKZhDeJw=; b=hjW6w8aWCNFXdVgmqbhvmmQ9Yo2c/m9cPBZyQGS2VQB7R7+GMO6k/lffJaMADKAf+8 U/Aunqabil+2QroUn1moj0t/Ts18z1nM031YOChYl87UrPIWsEXpMcskpglkf1RpogDF 0YQ+qx/tCaqnLbCMOD9oU01fD7uvRc6dWB4OWB1vJov4nSiR9K+RXbEV1Cws87Vb4da2 iko4hv6WdhHr8ohFG02+W/N3YyGm7rNpkvuBWcS8V1WFaXDnToH2PB1tfQL95prJrDBj t93f3WaO4qFMr1ooX1Xd/BPRY62sYz4wx2IRG2QLYQe/7yXyBhohGk1tEyW88d5EWZwR KcVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=/hizwZarKsHXor9AGTSN1XWVQcy1ah3DjsrMKZhDeJw=; b=AVnLXBMEfvQo1UEqjqewC5rRH+VncarQr6XH18WNpCsnUQHqxqkw57ahODPx38GEkN EmRVIUFWOF7mu/eu0BRu5nvNKcROLX1zdF7YviMaVrra3DeVpb0RwO7Ge4vjzkd25mel 3BOOEBR373V5j6RA9QDN6s0zfmbjm5L19D30f/Yp1UmzVPwN8pqMo9bVknkBqj8be/8E IgJhSXu+Sy+6re4DzY7b0qtba3S1NNm58+qzrmSOfXxiYfGpzpixK8PKX0e0oGsIqWCB 5dQHuGx5usps+env0HEd/homwnTIDzHFCp3UiMIK+EReK0snZBXJ3QEff5oTgbe6cLAE xlDA== X-Gm-Message-State: AMke39mptZ7C5/JzpL2UbR3HLCNC2LbJvwNyh/6P8fGTEZr5goKq5+NN+0JzXy+dC/rCy0sXNerYsEvbVRp/oQ== X-Received: by 10.55.18.158 with SMTP id 30mr4767081qks.123.1488408083585; Wed, 01 Mar 2017 14:41:23 -0800 (PST) MIME-Version: 1.0 Received: by 10.140.104.200 with HTTP; Wed, 1 Mar 2017 14:41:23 -0800 (PST) In-Reply-To: <201703011708.v21H89XW057584@pdx.rh.CN85.dnsmgr.net> References: <20170301165916.kuizbr2w5l2beoac@ivaldir.etoilebsd.net> <201703011708.v21H89XW057584@pdx.rh.CN85.dnsmgr.net> From: Ngie Cooper Date: Wed, 1 Mar 2017 14:41:23 -0800 Message-ID: Subject: Re: svn commit: r314464 - head/usr.sbin/yppush To: "Rodney W. Grimes" Cc: Baptiste Daroussin , Alexey Dokuchaev , src-committers , Ian Lepore , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 22:41:24 -0000 On Wed, Mar 1, 2017 at 9:08 AM, Rodney W. Grimes wrote: ... > At one point in history I can promise you that ALL symlinks in the release > where shortest possible relative path. So any absolute links that entered > the system got created by developers who where not aware that they should > always use a relative link for anything landing in DESTDIR. This creates > breakge on so many levels we should make a rapid correction to this > regression. This is why things are that way currently: $ git blame usr.bin/chpass/Makefile| grep ypchfn 780ae7713f72b (gjb 2016-01-28 01:15:57 +0000 29) SYMLINKS+= ${BINDIR}/chpass ${BINDIR}/ypchfn aca2488187113 (wosch 1997-09-13 12:21:25 +0000 35) MLINKS+= chpass.1 ypchpass.1 chpass.1 ypchfn.1 chpass.1 ypchsh.1 5294f47313a2d (gjb 2016-01-28 02:56:30 +0000 39) .for i in chpass chfn chsh ypchpass ypchfn ypchsh $ git log 780ae7713f72b^..780ae7713f72b commit 780ae7713f72b471859c0997295ac0c59695c7b4 Author: gjb Date: Thu Jan 28 01:15:57 2016 +0000 Ensure mtree(8) recognizes chpass(1) is schg. Convert hard links to symbolic links, and remove the 'beforeinstall' and 'afterinstall' chflags(8) execution. Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-pkg/; revision=294966 BINDIR evaluates to /usr/sbin/, so /usr/sbin/chpass is symlinked to /usr/sbin/ypchfn . But, there's no reason why the symlink needs to be hardcoded, or even a symlink at all. Hardlinks would achieve the same thing here IMHO, but gjb changed it in r294966 to be symlinks. The point that might be missed is that changing it from absolute paths to relative paths or otherwise, might break other workflows.. I could just as easily mount /lib, /usr/lib, /usr/sbin, etc as nullfs mountpoints and have a working system on a system root where MACHINE != TARGET, but this is all orthogonal to my changing `${.CURDIR}/../../contrib` (e.g. `foo/usr.sbin/yppush/../../contrib`), etc to ${SRCTOP}/contrib` (e.g. `foo/contrib`). Thanks, -Ngie From owner-svn-src-all@freebsd.org Wed Mar 1 22:42:53 2017 Return-Path: Delivered-To: svn-src-all@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 21C2DCF3A7E; Wed, 1 Mar 2017 22:42:53 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-qk0-x231.google.com (mail-qk0-x231.google.com [IPv6:2607:f8b0:400d:c09::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D071DA94; Wed, 1 Mar 2017 22:42:52 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-qk0-x231.google.com with SMTP id n127so95948874qkf.0; Wed, 01 Mar 2017 14:42:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=BRcqDcF91uaU3HzbvFRrxTdMTDu0ewlmZSjw6qKNWjU=; b=Wf5zlZ6rHO2u3NuJXumJJbrRbcvkF6CZMzS6JvClGd0s7rup7XYBKOHT8fqe6ndBJO cC74SGbjnw6gtAai4jdHA4gCI/azqjz+yhkK5w2NgMBAJ0xYeGmWnZyr6SzS7L/H0nDA 7ywQ+79yz9GWjojB2ye36H1mFLuKqM1j1/wTEU8kLSBkcMoa7DoJXykOSnTWIYuf6vfs 7rw8SiLgdDBT3U6Bn43zlu2TMJN5Z/pA/5hO5MQiuz/Ei8rCVQwq85q5Aj0AH/58Qrnx yMY7QfddjW0NwQmmbfeEwD7b7lbqLNZ/F0Oty8Emtc0CHcVFTYHkO8O+RQXMVEvE+cf9 KAPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=BRcqDcF91uaU3HzbvFRrxTdMTDu0ewlmZSjw6qKNWjU=; b=T62yIZjXV7pmW3O4OEcQYJXTLxfFDpWj9asrVSsvNENI5//AAbxIcjlg/XoxWP2+on f+J3++I5cUbPAVSauIhNg1PoQQL3LtzckfGUq7xN4zL2ickHLJgij4KqovH+wBcr1ZfK Dslx6cTfkMww17NSvp//6rlUV8OqngMzXyxGUSGIpfvRTr6pcrEhSxlVKH/JGt8gtbRd wWHOj8Hhj3FLrbM5pgEE8BgDrLxOpRvyxEjbDeqSF+APX0FfFwijlI88Am2W2SYHhmtL m61BJ0bzrH2KoZEyaob20dzwB4XieJ9AU2x0Lg760z3H09hNFx3uiFdiXLnOcZUN0krl 43Wg== X-Gm-Message-State: AMke39nfS7a7sYDplceuhk7zvv3qt6tVx+vUmUjUXYbcVJJPyXAd6EDFzjh5/QCuFrS6AFsMSw2yGMB3zUVLYw== X-Received: by 10.200.1.14 with SMTP id e14mr14275213qtg.244.1488408172066; Wed, 01 Mar 2017 14:42:52 -0800 (PST) MIME-Version: 1.0 Received: by 10.140.104.200 with HTTP; Wed, 1 Mar 2017 14:42:51 -0800 (PST) In-Reply-To: References: <20170301163050.GA81295@FreeBSD.org> <201703011643.v21GhtaI057213@pdx.rh.CN85.dnsmgr.net> <20170301165732.GA1093@FreeBSD.org> From: Ngie Cooper Date: Wed, 1 Mar 2017 14:42:51 -0800 Message-ID: Subject: Re: svn commit: r314464 - head/usr.sbin/yppush To: Alexey Dokuchaev Cc: "Rodney W. Grimes" , Ian Lepore , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , src-committers Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 22:42:53 -0000 On Wed, Mar 1, 2017 at 2:32 PM, Ngie Cooper wrote: ... > This is completely orthogonal to my changes (and has been in place for > a number of years). If you'd like to use relative symlinks for > programs, then let's definitely do it as part of another change > (personally, I think that some of these items could and should be > replaced with hardlinks). Correction: I was making a general statement that turned out to be false (my bad), so I change the "a number of years" portion of my statement to "since 2016". Please see my other reply in the thread for more details. Thanks, -Ngie From owner-svn-src-all@freebsd.org Wed Mar 1 22:45:14 2017 Return-Path: Delivered-To: svn-src-all@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 2B10FCF3C22; Wed, 1 Mar 2017 22:45:14 +0000 (UTC) (envelope-from ian@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 EC567CC0; Wed, 1 Mar 2017 22:45:13 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21MjDNk054983; Wed, 1 Mar 2017 22:45:13 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21MjCkC054978; Wed, 1 Mar 2017 22:45:12 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703012245.v21MjCkC054978@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 1 Mar 2017 22:45:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314525 - in stable/11/sys: arm/arm arm/include conf X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 22:45:14 -0000 Author: ian Date: Wed Mar 1 22:45:12 2017 New Revision: 314525 URL: https://svnweb.freebsd.org/changeset/base/314525 Log: MFC r306901: ARM: Split identify_arm_cpu() into ARMv4 and ARMv6 variant. On ARMv6, be more verbose about supported CPU features and/or optional instructions. Added: stable/11/sys/arm/arm/identcpu-v4.c - copied unchanged from r306901, head/sys/arm/arm/identcpu-v4.c stable/11/sys/arm/arm/identcpu-v6.c - copied unchanged from r306901, head/sys/arm/arm/identcpu-v6.c Deleted: stable/11/sys/arm/arm/identcpu.c Modified: stable/11/sys/arm/arm/cpuinfo.c stable/11/sys/arm/include/cpuinfo.h stable/11/sys/conf/files.arm Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/arm/cpuinfo.c ============================================================================== --- stable/11/sys/arm/arm/cpuinfo.c Wed Mar 1 21:58:26 2017 (r314524) +++ stable/11/sys/arm/arm/cpuinfo.c Wed Mar 1 22:45:12 2017 (r314525) @@ -111,6 +111,10 @@ cpuinfo_init(void) /* Not yet - CBAR only exist on ARM SMP Cortex A CPUs cpuinfo.cbar = cp15_cbar_get(); */ + if (CPU_CT_FORMAT(cpuinfo.ctr) == CPU_CT_ARMV7) { + cpuinfo.ccsidr = cp15_ccsidr_get(); + cpuinfo.clidr = cp15_clidr_get(); + } /* Test if revidr is implemented */ if (cpuinfo.revidr == cpuinfo.midr) @@ -163,6 +167,7 @@ cpuinfo_get_actlr_modifier(uint32_t *act if (cpuinfo.implementer == CPU_IMPLEMENTER_ARM) { switch (cpuinfo.part_number) { + case CPU_ARCH_CORTEX_A73: case CPU_ARCH_CORTEX_A72: case CPU_ARCH_CORTEX_A57: case CPU_ARCH_CORTEX_A53: Copied: stable/11/sys/arm/arm/identcpu-v4.c (from r306901, head/sys/arm/arm/identcpu-v4.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/sys/arm/arm/identcpu-v4.c Wed Mar 1 22:45:12 2017 (r314525, copy of r306901, head/sys/arm/arm/identcpu-v4.c) @@ -0,0 +1,386 @@ +/* $NetBSD: cpu.c,v 1.55 2004/02/13 11:36:10 wiz Exp $ */ + +/*- + * Copyright (c) 1995 Mark Brinicombe. + * Copyright (c) 1995 Brini. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Brini. + * 4. The name of the company nor the name of the author may be used to + * endorse or promote products derived from this software without specific + * prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY BRINI ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL BRINI OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * RiscBSD kernel project + * + * cpu.c + * + * Probing and configuration for the master CPU + * + * Created : 10/10/95 + */ + +#include +__FBSDID("$FreeBSD$"); +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +char machine[] = "arm"; + +SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, + machine, 0, "Machine class"); + +static const char * const generic_steppings[16] = { + "rev 0", "rev 1", "rev 2", "rev 3", + "rev 4", "rev 5", "rev 6", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + +static const char * const xscale_steppings[16] = { + "step A-0", "step A-1", "step B-0", "step C-0", + "step D-0", "rev 5", "rev 6", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + +static const char * const i80219_steppings[16] = { + "step A-0", "rev 1", "rev 2", "rev 3", + "rev 4", "rev 5", "rev 6", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + +static const char * const i80321_steppings[16] = { + "step A-0", "step B-0", "rev 2", "rev 3", + "rev 4", "rev 5", "rev 6", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + +static const char * const i81342_steppings[16] = { + "step A-0", "rev 1", "rev 2", "rev 3", + "rev 4", "rev 5", "rev 6", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + +/* Steppings for PXA2[15]0 */ +static const char * const pxa2x0_steppings[16] = { + "step A-0", "step A-1", "step B-0", "step B-1", + "step B-2", "step C-0", "rev 6", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + +/* Steppings for PXA255/26x. + * rev 5: PXA26x B0, rev 6: PXA255 A0 + */ +static const char * const pxa255_steppings[16] = { + "rev 0", "rev 1", "rev 2", "step A-0", + "rev 4", "step B-0", "step A-0", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + +/* Stepping for PXA27x */ +static const char * const pxa27x_steppings[16] = { + "step A-0", "step A-1", "step B-0", "step B-1", + "step C-0", "rev 5", "rev 6", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + +static const char * const ixp425_steppings[16] = { + "step 0 (A0)", "rev 1 (ARMv5TE)", "rev 2", "rev 3", + "rev 4", "rev 5", "rev 6", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + +struct cpuidtab { + u_int32_t cpuid; + enum cpu_class cpu_class; + const char *cpu_name; + const char * const *cpu_steppings; +}; + +const struct cpuidtab cpuids[] = { + { CPU_ID_ARM920T, CPU_CLASS_ARM9TDMI, "ARM920T", + generic_steppings }, + { CPU_ID_ARM920T_ALT, CPU_CLASS_ARM9TDMI, "ARM920T", + generic_steppings }, + { CPU_ID_ARM922T, CPU_CLASS_ARM9TDMI, "ARM922T", + generic_steppings }, + { CPU_ID_ARM926EJS, CPU_CLASS_ARM9EJS, "ARM926EJ-S", + generic_steppings }, + { CPU_ID_ARM940T, CPU_CLASS_ARM9TDMI, "ARM940T", + generic_steppings }, + { CPU_ID_ARM946ES, CPU_CLASS_ARM9ES, "ARM946E-S", + generic_steppings }, + { CPU_ID_ARM966ES, CPU_CLASS_ARM9ES, "ARM966E-S", + generic_steppings }, + { CPU_ID_ARM966ESR1, CPU_CLASS_ARM9ES, "ARM966E-S", + generic_steppings }, + { CPU_ID_FA526, CPU_CLASS_ARM9TDMI, "FA526", + generic_steppings }, + { CPU_ID_FA626TE, CPU_CLASS_ARM9ES, "FA626TE", + generic_steppings }, + + { CPU_ID_TI925T, CPU_CLASS_ARM9TDMI, "TI ARM925T", + generic_steppings }, + + { CPU_ID_ARM1020E, CPU_CLASS_ARM10E, "ARM1020E", + generic_steppings }, + { CPU_ID_ARM1022ES, CPU_CLASS_ARM10E, "ARM1022E-S", + generic_steppings }, + { CPU_ID_ARM1026EJS, CPU_CLASS_ARM10EJ, "ARM1026EJ-S", + generic_steppings }, + + { CPU_ID_80200, CPU_CLASS_XSCALE, "i80200", + xscale_steppings }, + + { CPU_ID_80321_400, CPU_CLASS_XSCALE, "i80321 400MHz", + i80321_steppings }, + { CPU_ID_80321_600, CPU_CLASS_XSCALE, "i80321 600MHz", + i80321_steppings }, + { CPU_ID_80321_400_B0, CPU_CLASS_XSCALE, "i80321 400MHz", + i80321_steppings }, + { CPU_ID_80321_600_B0, CPU_CLASS_XSCALE, "i80321 600MHz", + i80321_steppings }, + + { CPU_ID_81342, CPU_CLASS_XSCALE, "i81342", + i81342_steppings }, + + { CPU_ID_80219_400, CPU_CLASS_XSCALE, "i80219 400MHz", + i80219_steppings }, + { CPU_ID_80219_600, CPU_CLASS_XSCALE, "i80219 600MHz", + i80219_steppings }, + + { CPU_ID_PXA27X, CPU_CLASS_XSCALE, "PXA27x", + pxa27x_steppings }, + { CPU_ID_PXA250A, CPU_CLASS_XSCALE, "PXA250", + pxa2x0_steppings }, + { CPU_ID_PXA210A, CPU_CLASS_XSCALE, "PXA210", + pxa2x0_steppings }, + { CPU_ID_PXA250B, CPU_CLASS_XSCALE, "PXA250", + pxa2x0_steppings }, + { CPU_ID_PXA210B, CPU_CLASS_XSCALE, "PXA210", + pxa2x0_steppings }, + { CPU_ID_PXA250C, CPU_CLASS_XSCALE, "PXA255", + pxa255_steppings }, + { CPU_ID_PXA210C, CPU_CLASS_XSCALE, "PXA210", + pxa2x0_steppings }, + + { CPU_ID_IXP425_533, CPU_CLASS_XSCALE, "IXP425 533MHz", + ixp425_steppings }, + { CPU_ID_IXP425_400, CPU_CLASS_XSCALE, "IXP425 400MHz", + ixp425_steppings }, + { CPU_ID_IXP425_266, CPU_CLASS_XSCALE, "IXP425 266MHz", + ixp425_steppings }, + + /* XXX ixp435 steppings? */ + { CPU_ID_IXP435, CPU_CLASS_XSCALE, "IXP435", + ixp425_steppings }, + + { CPU_ID_MV88FR131, CPU_CLASS_MARVELL, "Feroceon 88FR131", + generic_steppings }, + + { CPU_ID_MV88FR571_VD, CPU_CLASS_MARVELL, "Feroceon 88FR571-VD", + generic_steppings }, + + { 0, CPU_CLASS_NONE, NULL, NULL } +}; + +struct cpu_classtab { + const char *class_name; + const char *class_option; +}; + +const struct cpu_classtab cpu_classes[] = { + { "unknown", NULL }, /* CPU_CLASS_NONE */ + { "ARM9TDMI", "CPU_ARM9TDMI" }, /* CPU_CLASS_ARM9TDMI */ + { "ARM9E-S", "CPU_ARM9E" }, /* CPU_CLASS_ARM9ES */ + { "ARM9EJ-S", "CPU_ARM9E" }, /* CPU_CLASS_ARM9EJS */ + { "ARM10E", "CPU_ARM10" }, /* CPU_CLASS_ARM10E */ + { "ARM10EJ", "CPU_ARM10" }, /* CPU_CLASS_ARM10EJ */ + { "XScale", "CPU_XSCALE_..." }, /* CPU_CLASS_XSCALE */ + { "Marvell", "CPU_MARVELL" }, /* CPU_CLASS_MARVELL */ +}; + +/* + * Report the type of the specified arm processor. This uses the generic and + * arm specific information in the cpu structure to identify the processor. + * The remaining fields in the cpu structure are filled in appropriately. + */ + +static const char * const wtnames[] = { + "write-through", + "write-back", + "write-back", + "**unknown 3**", + "**unknown 4**", + "write-back-locking", /* XXX XScale-specific? */ + "write-back-locking-A", + "write-back-locking-B", + "**unknown 8**", + "**unknown 9**", + "**unknown 10**", + "**unknown 11**", + "**unknown 12**", + "**unknown 13**", + "write-back-locking-C", + "**unknown 15**", +}; + +static void +print_enadis(int enadis, char *s) +{ + + printf(" %s %sabled", s, (enadis == 0) ? "dis" : "en"); +} + +enum cpu_class cpu_class = CPU_CLASS_NONE; + +u_int cpu_pfr(int num) +{ + u_int feat; + + switch (num) { + case 0: + __asm __volatile("mrc p15, 0, %0, c0, c1, 0" + : "=r" (feat)); + break; + case 1: + __asm __volatile("mrc p15, 0, %0, c0, c1, 1" + : "=r" (feat)); + break; + default: + panic("Processor Feature Register %d not implemented", num); + break; + } + + return (feat); +} + +void +identify_arm_cpu(void) +{ + u_int cpuid; + u_int8_t ctrl; + int i; + + ctrl = cpu_get_control(); + cpuid = cpu_ident(); + + if (cpuid == 0) { + printf("Processor failed probe - no CPU ID\n"); + return; + } + + for (i = 0; cpuids[i].cpuid != 0; i++) + if (cpuids[i].cpuid == (cpuid & CPU_ID_CPU_MASK)) { + cpu_class = cpuids[i].cpu_class; + printf("CPU: %s %s (%s core)\n", + cpuids[i].cpu_name, + cpuids[i].cpu_steppings[cpuid & + CPU_ID_REVISION_MASK], + cpu_classes[cpu_class].class_name); + break; + } + if (cpuids[i].cpuid == 0) + printf("unknown CPU (ID = 0x%x)\n", cpuid); + + printf(" "); + + if (ctrl & CPU_CONTROL_BEND_ENABLE) + printf(" Big-endian"); + else + printf(" Little-endian"); + + switch (cpu_class) { + case CPU_CLASS_ARM9TDMI: + case CPU_CLASS_ARM9ES: + case CPU_CLASS_ARM9EJS: + case CPU_CLASS_ARM10E: + case CPU_CLASS_ARM10EJ: + case CPU_CLASS_XSCALE: + case CPU_CLASS_MARVELL: + print_enadis(ctrl & CPU_CONTROL_DC_ENABLE, "DC"); + print_enadis(ctrl & CPU_CONTROL_IC_ENABLE, "IC"); +#ifdef CPU_XSCALE_81342 + print_enadis(ctrl & CPU_CONTROL_L2_ENABLE, "L2"); +#endif +#if defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY) + i = sheeva_control_ext(0, 0); + print_enadis(i & MV_WA_ENABLE, "WA"); + print_enadis(i & MV_DC_STREAM_ENABLE, "DC streaming"); + printf("\n "); + print_enadis((i & MV_BTB_DISABLE) == 0, "BTB"); + print_enadis(i & MV_L2_ENABLE, "L2"); + print_enadis((i & MV_L2_PREFETCH_DISABLE) == 0, + "L2 prefetch"); + printf("\n "); +#endif + break; + default: + break; + } + + print_enadis(ctrl & CPU_CONTROL_WBUF_ENABLE, "WB"); + if (ctrl & CPU_CONTROL_LABT_ENABLE) + printf(" LABT"); + else + printf(" EABT"); + + print_enadis(ctrl & CPU_CONTROL_BPRD_ENABLE, "branch prediction"); + printf("\n"); + + /* Print cache info. */ + if (arm_picache_line_size == 0 && arm_pdcache_line_size == 0) + return; + + if (arm_pcache_unified) { + printf(" %dKB/%dB %d-way %s unified cache\n", + arm_pdcache_size / 1024, + arm_pdcache_line_size, arm_pdcache_ways, + wtnames[arm_pcache_type]); + } else { + printf(" %dKB/%dB %d-way instruction cache\n", + arm_picache_size / 1024, + arm_picache_line_size, arm_picache_ways); + printf(" %dKB/%dB %d-way %s data cache\n", + arm_pdcache_size / 1024, + arm_pdcache_line_size, arm_pdcache_ways, + wtnames[arm_pcache_type]); + } +} Copied: stable/11/sys/arm/arm/identcpu-v6.c (from r306901, head/sys/arm/arm/identcpu-v6.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/sys/arm/arm/identcpu-v6.c Wed Mar 1 22:45:12 2017 (r314525, copy of r306901, head/sys/arm/arm/identcpu-v6.c) @@ -0,0 +1,360 @@ +/* $NetBSD: cpu.c,v 1.55 2004/02/13 11:36:10 wiz Exp $ */ + +/*- + * Copyright (c) 1995 Mark Brinicombe. + * Copyright (c) 1995 Brini. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Brini. + * 4. The name of the company nor the name of the author may be used to + * endorse or promote products derived from this software without specific + * prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY BRINI ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL BRINI OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * RiscBSD kernel project + * + * cpu.c + * + * Probing and configuration for the master CPU + * + * Created : 10/10/95 + */ + +#include +__FBSDID("$FreeBSD$"); +#include +#include +#include +#include +#include +#include +#include + +char machine[] = "arm"; + +SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, + machine, 0, "Machine class"); + +static char hw_buf[81]; +static int hw_buf_idx; +static bool hw_buf_newline; + +static struct { + int implementer; + int part_number; + char *impl_name; + char *core_name; +} cpu_names[] = { + {CPU_IMPLEMENTER_ARM, CPU_ARCH_ARM1176, "ARM", "ARM1176"}, + {CPU_IMPLEMENTER_ARM, CPU_ARCH_CORTEX_A5 , "ARM", "Cortex-A5"}, + {CPU_IMPLEMENTER_ARM, CPU_ARCH_CORTEX_A7 , "ARM", "Cortex-A7"}, + {CPU_IMPLEMENTER_ARM, CPU_ARCH_CORTEX_A8 , "ARM", "Cortex-A8"}, + {CPU_IMPLEMENTER_ARM, CPU_ARCH_CORTEX_A9 , "ARM", "Cortex-A9"}, + {CPU_IMPLEMENTER_ARM, CPU_ARCH_CORTEX_A12, "ARM", "Cortex-A12"}, + {CPU_IMPLEMENTER_ARM, CPU_ARCH_CORTEX_A15, "ARM", "Cortex-A15"}, + {CPU_IMPLEMENTER_ARM, CPU_ARCH_CORTEX_A17, "ARM", "Cortex-A17"}, + {CPU_IMPLEMENTER_ARM, CPU_ARCH_CORTEX_A53, "ARM", "Cortex-A53"}, + {CPU_IMPLEMENTER_ARM, CPU_ARCH_CORTEX_A57, "ARM", "Cortex-A57"}, + {CPU_IMPLEMENTER_ARM, CPU_ARCH_CORTEX_A72, "ARM", "Cortex-A72"}, + {CPU_IMPLEMENTER_ARM, CPU_ARCH_CORTEX_A73, "ARM", "Cortex-A73"}, + + {CPU_IMPLEMENTER_MRVL, CPU_ARCH_SHEEVA_581, "Marwell", "PJ4 v7"}, + {CPU_IMPLEMENTER_MRVL, CPU_ARCH_SHEEVA_584, "Marwell", "PJ4MP v7"}, + + {CPU_IMPLEMENTER_QCOM, CPU_ARCH_KRAIT_300, "Qualcomm", "Krait 300"}, +}; + + +static void +print_v5_cache(void) +{ + uint32_t isize, dsize; + uint32_t multiplier; + int pcache_type; + int pcache_unified; + int picache_size; + int picache_line_size; + int picache_ways; + int pdcache_size; + int pdcache_line_size; + int pdcache_ways; + + pcache_unified = 0; + picache_size = 0 ; + picache_line_size = 0 ; + picache_ways = 0 ; + pdcache_size = 0; + pdcache_line_size = 0; + pdcache_ways = 0; + + if ((cpuinfo.ctr & CPU_CT_S) == 0) + pcache_unified = 1; + + /* + * If you want to know how this code works, go read the ARM ARM. + */ + pcache_type = CPU_CT_CTYPE(cpuinfo.ctr); + + if (pcache_unified == 0) { + isize = CPU_CT_ISIZE(cpuinfo.ctr); + multiplier = (isize & CPU_CT_xSIZE_M) ? 3 : 2; + picache_line_size = 1U << (CPU_CT_xSIZE_LEN(isize) + 3); + if (CPU_CT_xSIZE_ASSOC(isize) == 0) { + if (isize & CPU_CT_xSIZE_M) + picache_line_size = 0; /* not present */ + else + picache_ways = 1; + } else { + picache_ways = multiplier << + (CPU_CT_xSIZE_ASSOC(isize) - 1); + } + picache_size = multiplier << (CPU_CT_xSIZE_SIZE(isize) + 8); + } + + dsize = CPU_CT_DSIZE(cpuinfo.ctr); + multiplier = (dsize & CPU_CT_xSIZE_M) ? 3 : 2; + pdcache_line_size = 1U << (CPU_CT_xSIZE_LEN(dsize) + 3); + if (CPU_CT_xSIZE_ASSOC(dsize) == 0) { + if (dsize & CPU_CT_xSIZE_M) + pdcache_line_size = 0; /* not present */ + else + pdcache_ways = 1; + } else { + pdcache_ways = multiplier << + (CPU_CT_xSIZE_ASSOC(dsize) - 1); + } + pdcache_size = multiplier << (CPU_CT_xSIZE_SIZE(dsize) + 8); + + + /* Print cache info. */ + if (picache_line_size == 0 && pdcache_line_size == 0) + return; + + if (pcache_unified) { + printf(" %dKB/%dB %d-way %s unified cache\n", + pdcache_size / 1024, + pdcache_line_size, pdcache_ways, + pcache_type == 0 ? "WT" : "WB"); + } else { + printf(" %dKB/%dB %d-way instruction cache\n", + picache_size / 1024, + picache_line_size, picache_ways); + printf(" %dKB/%dB %d-way %s data cache\n", + pdcache_size / 1024, + pdcache_line_size, pdcache_ways, + pcache_type == 0 ? "WT" : "WB"); + } +} + +static void +print_v7_cache(void ) +{ + uint32_t type, val, size, sets, ways, linesize; + int i; + + printf("LoUU:%d LoC:%d LoUIS:%d \n", + CPU_CLIDR_LOUU(cpuinfo.clidr) + 1, + CPU_CLIDR_LOC(cpuinfo.clidr) + 1, + CPU_CLIDR_LOUIS(cpuinfo.clidr) + 1); + + for (i = 0; i < 7; i++) { + type = CPU_CLIDR_CTYPE(cpuinfo.clidr, i); + if (type == 0) + break; + printf("Cache level %d:\n", i + 1); + if (type == CACHE_DCACHE || type == CACHE_UNI_CACHE || + type == CACHE_SEP_CACHE) { + cp15_csselr_set(i << 1); + val = cp15_ccsidr_get(); + ways = CPUV7_CT_xSIZE_ASSOC(val) + 1; + sets = CPUV7_CT_xSIZE_SET(val) + 1; + linesize = 1 << (CPUV7_CT_xSIZE_LEN(val) + 4); + size = (ways * sets * linesize) / 1024; + + if (type == CACHE_UNI_CACHE) + printf(" %dKB/%dB %d-way unified cache", + size, linesize,ways); + else + printf(" %dKB/%dB %d-way data cache", + size, linesize, ways); + if (val & CPUV7_CT_CTYPE_WT) + printf(" WT"); + if (val & CPUV7_CT_CTYPE_WB) + printf(" WB"); + if (val & CPUV7_CT_CTYPE_RA) + printf(" Read-Alloc"); + if (val & CPUV7_CT_CTYPE_WA) + printf(" Write-Alloc"); + printf("\n"); + } + + if (type == CACHE_ICACHE || type == CACHE_SEP_CACHE) { + cp15_csselr_set(i << 1 | 1); + val = cp15_ccsidr_get(); + ways = CPUV7_CT_xSIZE_ASSOC(val) + 1; + sets = CPUV7_CT_xSIZE_SET(val) + 1; + linesize = 1 << (CPUV7_CT_xSIZE_LEN(val) + 4); + size = (ways * sets * linesize) / 1024; + printf(" %dKB/%dB %d-way instruction cache", + size, linesize, ways); + if (val & CPUV7_CT_CTYPE_WT) + printf(" WT"); + if (val & CPUV7_CT_CTYPE_WB) + printf(" WB"); + if (val & CPUV7_CT_CTYPE_RA) + printf(" Read-Alloc"); + if (val & CPUV7_CT_CTYPE_WA) + printf(" Write-Alloc"); + printf("\n"); + } + } + cp15_csselr_set(0); +} + +static void +add_cap(char *cap) +{ + int len; + + len = strlen(cap); + + if ((hw_buf_idx + len + 2) >= 79) { + printf("%s,\n", hw_buf); + hw_buf_idx = 0; + hw_buf_newline = true; + } + if (hw_buf_newline) + hw_buf_idx += sprintf(hw_buf + hw_buf_idx, " "); + else + hw_buf_idx += sprintf(hw_buf + hw_buf_idx, ", "); + hw_buf_newline = false; + + + hw_buf_idx += sprintf(hw_buf + hw_buf_idx, "%s", cap); +} + +void +identify_arm_cpu(void) +{ + int i; + u_int val; + + /* + * CPU + */ + for(i = 0; i < nitems(cpu_names); i++) { + if (cpu_names[i].implementer == cpuinfo.implementer && + cpu_names[i].part_number == cpuinfo.part_number) { + printf("CPU: %s %s r%dp%d (ECO: 0x%08X)\n", + cpu_names[i].impl_name, cpu_names[i].core_name, + cpuinfo.revision, cpuinfo.patch, + cpuinfo.midr != cpuinfo.revidr ? + cpuinfo.revidr : 0); + break; + } + + } + if (i >= nitems(cpu_names)) + printf("unknown CPU (ID = 0x%x)\n", cpuinfo.midr); + + printf("CPU Features: \n"); + hw_buf_idx = 0; + hw_buf_newline = true; + + val = (cpuinfo.mpidr >> 4)& 0xF; + if (cpuinfo.mpidr & (1 << 31U)) + add_cap("Multiprocessing"); + val = (cpuinfo.id_pfr0 >> 4)& 0xF; + if (val == 1) + add_cap("Thumb"); + else if (val == 3) + add_cap("Thumb2"); + + val = (cpuinfo.id_pfr1 >> 4)& 0xF; + if (val == 1 || val == 2) + add_cap("Security"); + + val = (cpuinfo.id_pfr1 >> 12)& 0xF; + if (val == 1) + add_cap("Virtualization"); + + val = (cpuinfo.id_pfr1 >> 16)& 0xF; + if (val == 1) + add_cap("Generic Timer"); + + val = (cpuinfo.id_mmfr0 >> 0)& 0xF; + if (val == 2) { + add_cap("VMSAv6"); + } else if (val >= 3) { + add_cap("VMSAv7"); + if (val >= 4) + add_cap("PXN"); + if (val >= 5) + add_cap("LPAE"); + } + + val = (cpuinfo.id_mmfr3 >> 20)& 0xF; + if (val == 1) + add_cap("Coherent Walk"); + + if (hw_buf_idx != 0) + printf("%s\n", hw_buf); + + printf("Optional instructions: \n"); + hw_buf_idx = 0; + hw_buf_newline = true; + val = (cpuinfo.id_isar0 >> 24)& 0xF; + if (val == 1) + add_cap("SDIV/UDIV (Thumb)"); + else if (val == 2) + add_cap("SDIV/UDIV"); + + val = (cpuinfo.id_isar2 >> 20)& 0xF; + if (val == 1 || val == 2) + add_cap("UMULL"); + + val = (cpuinfo.id_isar2 >> 16)& 0xF; + if (val == 1 || val == 2 || val == 3) + add_cap("SMULL"); + + val = (cpuinfo.id_isar2 >> 12)& 0xF; + if (val == 1) + add_cap("MLA"); + + val = (cpuinfo.id_isar3 >> 4)& 0xF; + if (val == 1) + add_cap("SIMD"); + else if (val == 3) + add_cap("SIMD(ext)"); + if (hw_buf_idx != 0) + printf("%s\n", hw_buf); + + /* + * Cache + */ + if (CPU_CT_FORMAT(cpuinfo.ctr) == CPU_CT_ARMV7) + print_v7_cache(); + else + print_v5_cache(); +} Modified: stable/11/sys/arm/include/cpuinfo.h ============================================================================== --- stable/11/sys/arm/include/cpuinfo.h Wed Mar 1 21:58:26 2017 (r314524) +++ stable/11/sys/arm/include/cpuinfo.h Wed Mar 1 22:45:12 2017 (r314525) @@ -48,13 +48,14 @@ #define CPU_ARCH_CORTEX_A53 0xD03 #define CPU_ARCH_CORTEX_A57 0xD07 #define CPU_ARCH_CORTEX_A72 0xD08 +#define CPU_ARCH_CORTEX_A73 0xD09 /* QCOM */ #define CPU_ARCH_KRAIT_300 0x06F /* MRVL */ -#define CPU_ARCH_SHEEVA_851 0x581 /* PJ4/PJ4B */ +#define CPU_ARCH_SHEEVA_581 0x581 /* PJ4/PJ4B */ #define CPU_ARCH_SHEEVA_584 0x584 /* PJ4B-MP/PJ4C */ struct cpuinfo { @@ -80,8 +81,10 @@ struct cpuinfo { uint32_t id_isar4; uint32_t id_isar5; uint32_t cbar; + uint32_t ccsidr; + uint32_t clidr; - /* Parsed bits of above registers... */ + /* Parsed bits of above registers... */ /* midr */ int implementer; Modified: stable/11/sys/conf/files.arm ============================================================================== --- stable/11/sys/conf/files.arm Wed Mar 1 21:58:26 2017 (r314524) +++ stable/11/sys/conf/files.arm Wed Mar 1 22:45:12 2017 (r314525) @@ -53,7 +53,8 @@ arm/arm/gdb_machdep.c optional gdb arm/arm/generic_timer.c optional generic_timer arm/arm/gic.c optional gic arm/arm/hdmi_if.m optional hdmi -arm/arm/identcpu.c standard +arm/arm/identcpu-v4.c optional !armv6 +arm/arm/identcpu-v6.c optional armv6 arm/arm/in_cksum.c optional inet | inet6 arm/arm/in_cksum_arm.S optional inet | inet6 arm/arm/intr.c optional !intrng From owner-svn-src-all@freebsd.org Wed Mar 1 23:09:33 2017 Return-Path: Delivered-To: svn-src-all@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 AFD37CF46D6; Wed, 1 Mar 2017 23:09:33 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-qk0-x235.google.com (mail-qk0-x235.google.com [IPv6:2607:f8b0:400d:c09::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 741F8EDD; Wed, 1 Mar 2017 23:09:33 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-qk0-x235.google.com with SMTP id s186so96630681qkb.1; Wed, 01 Mar 2017 15:09:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=0Or0Ig0tW0RnWBHkr71rNNHoDqDBkdKDeI+JjD9ec7g=; b=aJ8x8NYxCJQTWkjJPAlMJRAZNCqp3vQMXiNrzn8Cxii1yqjLMmsMXdEUIoyxVRNdM2 xqFBwxoVJaX8lZkP9VG3Kl8LhRLVCpDISpyOe0YtThcT2NcCk4TicSlaVzj16AuiN0/I YHu5US59mr4HyX4bb9/wxx5D1CDqidRtsM37U1hW2HIJiy55Uw5Xp3pk0vLFndb//T/r zp8axbljghFQTWwjKFB2/s52axLoiO5J3po+yEOUSeOqTVBHXC8uvPfkIDeFkfVeD9pl OlQLoCGyzI7QV8Pc1retn+e2Of/jgovqM5Gu3SWiSnTdsM10J6WVxYxfk6TNGosu2e/b NsQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=0Or0Ig0tW0RnWBHkr71rNNHoDqDBkdKDeI+JjD9ec7g=; b=q0VAAU3kQTAbCBfjyntU1rNFSKdqFMOHN75pUba8kW+6RA1hFUc6/1isJ2uiHFhVPA HhTQlFLQvLCtKWqijyTkkbX/pin/0m6rda4+o8aqAUddqsjrdYdl7CUCN0yKHg1w9INi rS6AP+VRBvvpyhpACwGExdVO5QSN9YcrlB1DByVJQ/L/7w+18vD/1PLmFoJrvdcJiUrK WtzUJ5VeTT3rdW9Gsi7NjgQkUhODerApyzX6o+PD8Gl2faZHLHxUKIVbgmt5bxF5ZlWk bE042Z2PjFbUuzdLz23bshtr8fSdR8oZQgtFE6qDB/pLOOvxvl8QrhDC6tNZ35u27ver w16g== X-Gm-Message-State: AMke39mY/YD6kWPbnMq5vlH++7wA5t0Vyui+faBYeDXFddhJTMHDy7SVV/owpp5w9rwh+Aia6t1BI84h26HXvQ== X-Received: by 10.55.18.158 with SMTP id 30mr4930568qks.123.1488409772389; Wed, 01 Mar 2017 15:09:32 -0800 (PST) MIME-Version: 1.0 Received: by 10.140.104.200 with HTTP; Wed, 1 Mar 2017 15:09:31 -0800 (PST) In-Reply-To: <20170301202226.GA2842@chd.heemeyer.club> References: <201702281955.v1SJtGeG011858@repo.freebsd.org> <20170301202226.GA2842@chd.heemeyer.club> From: Ngie Cooper Date: Wed, 1 Mar 2017 15:09:32 -0800 Message-ID: Subject: Re: svn commit: r314404 - head/sys/compat/linux To: Chagin Dmitry Cc: Conrad Meyer , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 23:09:33 -0000 On Wed, Mar 1, 2017 at 12:22 PM, Chagin Dmitry wrote: ... > usually we use LTP and glibc (NPTL) tests. Feel free to adapt it LTP would probably be the best way to do this. Please feel free to ping me if you need changes ushered into the project (I'm a contributor there). Thanks, -Ngie From owner-svn-src-all@freebsd.org Wed Mar 1 23:14:38 2017 Return-Path: Delivered-To: svn-src-all@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 88A50CF495D; Wed, 1 Mar 2017 23:14:38 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1823F6C5; Wed, 1 Mar 2017 23:14:38 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: by mail-wr0-x244.google.com with SMTP id u108so3426983wrb.2; Wed, 01 Mar 2017 15:14:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=f4FM8Cue9XS9MUMZO1yv17c0GdogSOR1AzoPZ6yrAL0=; b=b+I2t1X3TbO4rgbSAjkYJhB5PT5dQpaIzaygYxXs9UOnkXLhhwwrQAbssuNpDJWVvH 5mDBamVo2761+O2xeKWuXHn9tdxBMCDwOyy1HNEAzK3wtKL7vPWuAEVxedY0Ce9w9/es D5bzO6g8vBVNmt7R3XouC1/8InlhJIsb+yvCQNIrnMF8d+vHZ2V7Y+MI8k5X3hoeZTwJ u2L22osUapvw/cvcoucDj2z714ENGcoQSii2BCXDEp39bnYuhc0r5TREEOgslcrKQJM6 lfBEohlMDBPy3VRaQSyHUZmG4y9IGMrOyRTky0sdq8TbYpLb7P7YEBha532PdLGwp0p4 MJaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=f4FM8Cue9XS9MUMZO1yv17c0GdogSOR1AzoPZ6yrAL0=; b=EnrXChyyWtJSwFjPW5qJonjN1hQ3nlcGQ20sfVlPAEMsNofiVyCGYAQvY3oQMP1lZU H0Y/xgiwv2aZeLLDPX+weDIBqEHAjvoEb6dk7M5D8a3nM8YsXbS7eWs9rsGywIObLHzm ir+Z/EFCUq+BFijEFbTh6DvEE4/+GOLNUE9QV+Qb9mvOflsCSht2yjIQvCd0RxLt/KN2 sWLQO4eFk4YabTOVRIlTQYupvqX79vKn9KTMYjcoiHIsXraCyz064CZUdoou6DUgUSkS +R7baKHKoQoO0fXid7vHR+tyj/DRQpNf9tk27LhTC0B0XvWbgfom1urPx8VT2eEFPnUj aGrg== X-Gm-Message-State: AMke39mTm1plid4Yt7QXEgAFPhc9n5eIREQOugRcQfsP8Vfn0Yza+GXrhYUpscV11yLmIA== X-Received: by 10.223.163.206 with SMTP id m14mr10607016wrb.34.1488410075605; Wed, 01 Mar 2017 15:14:35 -0800 (PST) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by smtp.gmail.com with ESMTPSA id s26sm8447177wra.66.2017.03.01.15.14.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Mar 2017 15:14:34 -0800 (PST) Sender: Baptiste Daroussin Date: Thu, 2 Mar 2017 00:14:33 +0100 From: Baptiste Daroussin To: Ngie Cooper Cc: "Rodney W. Grimes" , Alexey Dokuchaev , src-committers , Ian Lepore , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r314464 - head/usr.sbin/yppush Message-ID: <20170301231433.ux6j2rxmey6xmhct@ivaldir.etoilebsd.net> References: <20170301165916.kuizbr2w5l2beoac@ivaldir.etoilebsd.net> <201703011708.v21H89XW057584@pdx.rh.CN85.dnsmgr.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="4j4l23chfjqgui3u" Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20170206 (1.7.2) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 23:14:38 -0000 --4j4l23chfjqgui3u Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Mar 01, 2017 at 02:41:23PM -0800, Ngie Cooper wrote: > On Wed, Mar 1, 2017 at 9:08 AM, Rodney W. Grimes > wrote: > ... > > At one point in history I can promise you that ALL symlinks in the rele= ase > > where shortest possible relative path. So any absolute links that ente= red > > the system got created by developers who where not aware that they shou= ld > > always use a relative link for anything landing in DESTDIR. This creat= es > > breakge on so many levels we should make a rapid correction to this > > regression. >=20 > This is why things are that way currently: >=20 > $ git blame usr.bin/chpass/Makefile| grep ypchfn > 780ae7713f72b (gjb 2016-01-28 01:15:57 +0000 29) SYMLINKS+=3D > ${BINDIR}/chpass ${BINDIR}/ypchfn > aca2488187113 (wosch 1997-09-13 12:21:25 +0000 35) MLINKS+=3D chpass.1 > ypchpass.1 chpass.1 ypchfn.1 chpass.1 ypchsh.1 > 5294f47313a2d (gjb 2016-01-28 02:56:30 +0000 39) .for i in chpass > chfn chsh ypchpass ypchfn ypchsh For thos in particular I think the right thing is actually to modify instal= l so if it creates hardlinks with chflags it should first check for chflags, rem= ove it make the hardlink and reapply. The issue would be that well you break wh= at chflags are for given you are workarounding it :) Bapt --4j4l23chfjqgui3u Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAli3VdAACgkQY4mL3PG3 PlriqBAA3IbSTeN4l0fB6FQqnMpf4McBKtmyHD0tA6CoXf+R+/d63t+KadLu/Ysh X8u7GiVYgXk/FXZMeDDQ/dvck3PvqB+QnE8PuLhXDgtY7qZHlcdXVxVn41Jrc+zy aKd0gW8jXxyIgwYOCODKKDwT7ClFid1X3JHZoOlrhSmglJwSXJ8oaYJGn4AmLEKd J/d+isiuZXU3xMnbnUTBdWDZucF03APb5w+jFIcIxu/R73uWl0w6WV1G/dE+6YIj pJ/N+VxDIJgqKoh8B/I7vuVSbbKfs0Yrx46O7MAeYYoNX5sM8R0PsTKT8Zx0URTf 46/wiHHiEiQesZSByM5f++JfKZJ0DGwlXNuqmWHsrAz2FX2g/V+9Z9kc3EXEgovS 6SGkEdUcMJpG+cTHup3nRxyPBL9qXo6VLlQOxZg4yqQp1hP56nAWYlB1BYLEPi5g ysYKKTob0nma2ZGo2o6vbD7B9ihoumdhfbzdge1KLnWb7fB07wMW3uqeNDNF+z1V giKEpyzK4+sspsBAb03rw+U9aXcB29+O197wJRn0AFFaStGub9bbAPW3/zsorzNJ EUXF3O9GC8mRyv13ZSvjYeJR3zAr4avImUjCUgOgGJOUdNpUxjKzVgYxESmBBazC osnYlHYWNUCHHwaQqgGpT3/5kcDdkKijHI7TBW2yTu9Ov8S4wZU= =5vrW -----END PGP SIGNATURE----- --4j4l23chfjqgui3u-- From owner-svn-src-all@freebsd.org Wed Mar 1 23:35:42 2017 Return-Path: Delivered-To: svn-src-all@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 47F8BCF4EFE; Wed, 1 Mar 2017 23:35:42 +0000 (UTC) (envelope-from ian@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 13C6C616; Wed, 1 Mar 2017 23:35:42 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21NZfRw074371; Wed, 1 Mar 2017 23:35:41 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21NZf5n074370; Wed, 1 Mar 2017 23:35:41 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703012335.v21NZf5n074370@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 1 Mar 2017 23:35:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314526 - stable/11/sys/arm/arm X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 23:35:42 -0000 Author: ian Date: Wed Mar 1 23:35:40 2017 New Revision: 314526 URL: https://svnweb.freebsd.org/changeset/base/314526 Log: MFC r312251: Remove a bit of armv6 support that didn't get deleted when this file was split from trap.c into trap-v4.c and trap-v6.c. Modified: stable/11/sys/arm/arm/trap-v4.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/arm/trap-v4.c ============================================================================== --- stable/11/sys/arm/arm/trap-v4.c Wed Mar 1 22:45:12 2017 (r314525) +++ stable/11/sys/arm/arm/trap-v4.c Wed Mar 1 23:35:40 2017 (r314526) @@ -139,11 +139,7 @@ static const struct data_abort data_abor {dab_align, "Alignment Fault 3"}, {dab_buserr, "External Linefetch Abort (S)"}, {NULL, "Translation Fault (S)"}, -#if (ARM_MMU_V6 + ARM_MMU_V7) != 0 - {NULL, "Translation Flag Fault"}, -#else {dab_buserr, "External Linefetch Abort (P)"}, -#endif {NULL, "Translation Fault (P)"}, {dab_buserr, "External Non-Linefetch Abort (S)"}, {NULL, "Domain Fault (S)"}, From owner-svn-src-all@freebsd.org Thu Mar 2 00:11:34 2017 Return-Path: Delivered-To: svn-src-all@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 301E4CF4AB0; Thu, 2 Mar 2017 00:11:34 +0000 (UTC) (envelope-from des@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 DAABCDAF; Thu, 2 Mar 2017 00:11:33 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v220BXsV086964; Thu, 2 Mar 2017 00:11:33 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v220BWQ0086961; Thu, 2 Mar 2017 00:11:32 GMT (envelope-from des@FreeBSD.org) Message-Id: <201703020011.v220BWQ0086961@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Thu, 2 Mar 2017 00:11:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314527 - in head: crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat crypto/ope... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 00:11:34 -0000 Author: des Date: Thu Mar 2 00:11:32 2017 New Revision: 314527 URL: https://svnweb.freebsd.org/changeset/base/314527 Log: Upgrade to OpenSSH 7.3p1. Added: head/crypto/openssh/.skipped-commit-ids - copied unchanged from r313010, vendor-crypto/openssh/dist/.skipped-commit-ids head/crypto/openssh/openbsd-compat/bsd-err.c - copied unchanged from r313010, vendor-crypto/openssh/dist/openbsd-compat/bsd-err.c head/crypto/openssh/platform-tracing.c - copied unchanged from r313010, vendor-crypto/openssh/dist/platform-tracing.c head/crypto/openssh/regress/cfginclude.sh - copied unchanged from r313010, vendor-crypto/openssh/dist/regress/cfginclude.sh head/crypto/openssh/regress/misc/ - copied from r313010, vendor-crypto/openssh/dist/regress/misc/ head/crypto/openssh/regress/sshcfgparse.sh - copied unchanged from r313010, vendor-crypto/openssh/dist/regress/sshcfgparse.sh head/crypto/openssh/regress/unittests/utf8/ - copied from r313010, vendor-crypto/openssh/dist/regress/unittests/utf8/ head/crypto/openssh/utf8.c - copied unchanged from r313010, vendor-crypto/openssh/dist/utf8.c head/crypto/openssh/utf8.h - copied unchanged from r313010, vendor-crypto/openssh/dist/utf8.h Deleted: head/crypto/openssh/.cvsignore head/crypto/openssh/openbsd-compat/.cvsignore head/crypto/openssh/openbsd-compat/regress/.cvsignore head/crypto/openssh/regress/.cvsignore head/crypto/openssh/roaming.h head/crypto/openssh/scard/ Modified: head/crypto/openssh/ChangeLog head/crypto/openssh/INSTALL head/crypto/openssh/Makefile.in head/crypto/openssh/PROTOCOL head/crypto/openssh/PROTOCOL.agent head/crypto/openssh/PROTOCOL.certkeys head/crypto/openssh/PROTOCOL.chacha20poly1305 head/crypto/openssh/README head/crypto/openssh/audit-linux.c head/crypto/openssh/auth-krb5.c head/crypto/openssh/auth-options.c head/crypto/openssh/auth-pam.c head/crypto/openssh/auth-pam.h head/crypto/openssh/auth-passwd.c head/crypto/openssh/auth-rh-rsa.c head/crypto/openssh/auth-rhosts.c head/crypto/openssh/auth.c head/crypto/openssh/auth.h head/crypto/openssh/auth2-chall.c head/crypto/openssh/auth2-hostbased.c head/crypto/openssh/auth2.c head/crypto/openssh/authfile.c head/crypto/openssh/canohost.c head/crypto/openssh/canohost.h head/crypto/openssh/channels.c head/crypto/openssh/cipher-bf1.c head/crypto/openssh/cipher.c head/crypto/openssh/clientloop.c head/crypto/openssh/compat.c head/crypto/openssh/config.h head/crypto/openssh/configure.ac head/crypto/openssh/contrib/cygwin/README head/crypto/openssh/contrib/redhat/openssh.spec head/crypto/openssh/contrib/ssh-copy-id head/crypto/openssh/contrib/suse/openssh.spec head/crypto/openssh/defines.h head/crypto/openssh/dh.c head/crypto/openssh/dh.h head/crypto/openssh/kex.c head/crypto/openssh/kex.h head/crypto/openssh/kexc25519.c head/crypto/openssh/kexdh.c head/crypto/openssh/kexdhc.c head/crypto/openssh/kexdhs.c head/crypto/openssh/kexgexs.c head/crypto/openssh/key.c head/crypto/openssh/log.c head/crypto/openssh/log.h head/crypto/openssh/mac.c head/crypto/openssh/mac.h head/crypto/openssh/misc.c head/crypto/openssh/misc.h head/crypto/openssh/moduli head/crypto/openssh/monitor.c head/crypto/openssh/monitor_fdpass.c head/crypto/openssh/monitor_wrap.c head/crypto/openssh/monitor_wrap.h head/crypto/openssh/mux.c head/crypto/openssh/myproposal.h head/crypto/openssh/opacket.h head/crypto/openssh/openbsd-compat/Makefile.in head/crypto/openssh/openbsd-compat/arc4random.c head/crypto/openssh/openbsd-compat/bindresvport.c head/crypto/openssh/openbsd-compat/bsd-asprintf.c head/crypto/openssh/openbsd-compat/bsd-misc.c head/crypto/openssh/openbsd-compat/bsd-misc.h head/crypto/openssh/openbsd-compat/bsd-snprintf.c head/crypto/openssh/openbsd-compat/inet_aton.c head/crypto/openssh/openbsd-compat/openbsd-compat.h head/crypto/openssh/openbsd-compat/port-solaris.h head/crypto/openssh/openbsd-compat/vis.c head/crypto/openssh/openbsd-compat/vis.h head/crypto/openssh/openbsd-compat/xcrypt.c head/crypto/openssh/packet.c head/crypto/openssh/packet.h head/crypto/openssh/pathnames.h head/crypto/openssh/platform.c head/crypto/openssh/platform.h head/crypto/openssh/progressmeter.c head/crypto/openssh/readconf.c head/crypto/openssh/readconf.h head/crypto/openssh/regress/Makefile head/crypto/openssh/regress/agent-getpeereid.sh head/crypto/openssh/regress/cert-hostkey.sh head/crypto/openssh/regress/cert-userkey.sh head/crypto/openssh/regress/cfgparse.sh head/crypto/openssh/regress/connect-privsep.sh head/crypto/openssh/regress/forwarding.sh head/crypto/openssh/regress/integrity.sh head/crypto/openssh/regress/modpipe.c head/crypto/openssh/regress/netcat.c head/crypto/openssh/regress/test-exec.sh head/crypto/openssh/regress/unittests/Makefile head/crypto/openssh/regress/unittests/sshbuf/test_sshbuf_misc.c head/crypto/openssh/regress/unittests/sshkey/test_sshkey.c head/crypto/openssh/regress/unittests/test_helper/Makefile head/crypto/openssh/sandbox-seccomp-filter.c head/crypto/openssh/scp.1 head/crypto/openssh/scp.c head/crypto/openssh/servconf.c head/crypto/openssh/serverloop.c head/crypto/openssh/session.c head/crypto/openssh/session.h head/crypto/openssh/sftp-client.c head/crypto/openssh/sftp-server.c head/crypto/openssh/sftp.1 head/crypto/openssh/sftp.c head/crypto/openssh/ssh-agent.1 head/crypto/openssh/ssh-agent.c head/crypto/openssh/ssh-dss.c head/crypto/openssh/ssh-ecdsa.c head/crypto/openssh/ssh-ed25519.c head/crypto/openssh/ssh-keygen.1 head/crypto/openssh/ssh-keygen.c head/crypto/openssh/ssh-keyscan.c head/crypto/openssh/ssh-rsa.c head/crypto/openssh/ssh.1 head/crypto/openssh/ssh.c head/crypto/openssh/ssh1.h head/crypto/openssh/ssh2.h head/crypto/openssh/ssh_api.c head/crypto/openssh/ssh_config.5 head/crypto/openssh/ssh_namespace.h head/crypto/openssh/sshbuf-getput-basic.c head/crypto/openssh/sshbuf-misc.c head/crypto/openssh/sshbuf.h head/crypto/openssh/sshconnect2.c head/crypto/openssh/sshd.c head/crypto/openssh/sshd_config head/crypto/openssh/sshd_config.5 head/crypto/openssh/sshkey.c head/crypto/openssh/sshkey.h head/crypto/openssh/ttymodes.c head/crypto/openssh/ttymodes.h head/crypto/openssh/version.h head/secure/lib/libssh/Makefile Directory Properties: head/crypto/openssh/ (props changed) Copied: head/crypto/openssh/.skipped-commit-ids (from r313010, vendor-crypto/openssh/dist/.skipped-commit-ids) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/crypto/openssh/.skipped-commit-ids Thu Mar 2 00:11:32 2017 (r314527, copy of r313010, vendor-crypto/openssh/dist/.skipped-commit-ids) @@ -0,0 +1,11 @@ +321065a95a7ccebdd5fd08482a1e19afbf524e35 Update DH groups +d4f699a421504df35254cf1c6f1a7c304fb907ca Remove 1k bit groups +aafe246655b53b52bc32c8a24002bc262f4230f7 Remove intermediate moduli +8fa9cd1dee3c3339ae329cf20fb591db6d605120 put back SSH1 for 6.9 +f31327a48dd4103333cc53315ec53fe65ed8a17a Generate new moduli +edbfde98c40007b7752a4ac106095e060c25c1ef Regen moduli +052fd565e3ff2d8cec3bc957d1788f50c827f8e2 Switch to tame-based sandbox +7cf73737f357492776223da1c09179fa6ba74660 Remove moduli <2k +180d84674be1344e45a63990d60349988187c1ae Update moduli +f6ae971186ba68d066cd102e57d5b0b2c211a5ee systrace is dead. +96c5054e3e1f170c6276902d5bc65bb3b87a2603 remove DEBUGLIBS from Makefile Modified: head/crypto/openssh/ChangeLog ============================================================================== --- head/crypto/openssh/ChangeLog Wed Mar 1 23:35:40 2017 (r314526) +++ head/crypto/openssh/ChangeLog Thu Mar 2 00:11:32 2017 (r314527) @@ -1,8905 +1,9202 @@ -commit 5c35450a0c901d9375fb23343a8dc82397da5f75 +commit 99522ba7ec6963a05c04a156bf20e3ba3605987c Author: Damien Miller -Date: Thu Mar 10 05:04:48 2016 +1100 +Date: Thu Jul 28 08:54:27 2016 +1000 - update versions for release - -commit 9d47b8d3f50c3a6282896df8274147e3b9a38c56 -Author: Damien Miller -Date: Thu Mar 10 05:03:39 2016 +1100 - - sanitise characters destined for xauth(1) + define _OPENBSD_SOURCE for reallocarray on NetBSD - reported by github.com/tintinweb + Report by and debugged with Hisashi T Fujinaka, dtucker nailed + the problem (lack of prototype causing return type confusion). -commit 72b061d4ba0f909501c595d709ea76e06b01e5c9 -Author: Darren Tucker -Date: Fri Feb 26 14:40:04 2016 +1100 +commit 3e1e076550c27c6bbdddf36d8f42bd79fbaaa187 +Author: Damien Miller +Date: Wed Jul 27 08:25:42 2016 +1000 - Add a note about using xlc on AIX. + KNF -commit fd4e4f2416baa2e6565ea49d52aade296bad3e28 -Author: Darren Tucker -Date: Wed Feb 24 10:44:25 2016 +1100 +commit d99ee9c4e5e217e7d05eeec84e9ce641f4675331 +Author: Damien Miller +Date: Wed Jul 27 08:25:23 2016 +1000 - Skip PrintLastLog in config dump mode. - - When DISABLE_LASTLOG is set, do not try to include PrintLastLog in the - config dump since it'll be reported as UNKNOWN. + Linux auditing also needs packet.h -commit 99135c764fa250801da5ec3b8d06cbd0111caae8 +commit 393bd381a45884b589baa9aed4394f1d250255ca Author: Damien Miller -Date: Tue Feb 23 20:17:23 2016 +1100 +Date: Wed Jul 27 08:18:05 2016 +1000 - update spec/README versions ahead of release + fix auditing on Linux + + get_remote_ipaddr() was replaced with ssh_remote_ipaddr() -commit b86a334aaaa4d1e643eb1fd71f718573d6d948b5 +commit 80e766fb089de4f3c92b1600eb99e9495e37c992 Author: Damien Miller -Date: Tue Feb 23 20:16:53 2016 +1100 +Date: Sun Jul 24 21:50:13 2016 +1000 - put back portable patchlevel to p1 + crank version numbers -commit 555dd35ff176847e3c6bd068ba2e8db4022eb24f +commit b1a478792d458f2e938a302e64bab2b520edc1b3 Author: djm@openbsd.org -Date: Tue Feb 23 09:14:34 2016 +0000 +Date: Sun Jul 24 11:45:36 2016 +0000 upstream commit - openssh-7.2 + openssh-7.3 - Upstream-ID: 9db776b26014147fc907ece8460ef2bcb0f11e78 + Upstream-ID: af106a7eb665f642648cf1993e162c899f358718 -commit 1acc058d0a7913838c830ed998a1a1fb5b7864bf -Author: Damien Miller -Date: Tue Feb 23 16:12:13 2016 +1100 +commit 353766e0881f069aeca30275ab706cd60a1a8fdd +Author: Darren Tucker +Date: Sat Jul 23 16:14:42 2016 +1000 - Disable tests where fs perms are incorrect + Move Cygwin IPPORT_RESERVED overrride to defines.h - Some tests have strict requirements on the filesystem permissions - for certain files and directories. This adds a regress/check-perm - tool that copies the relevant logic from sshd to exactly test - the paths in question. This lets us skip tests when the local - filesystem doesn't conform to our expectations rather than - continuing and failing the test run. - - ok dtucker@ + Patch from vinschen at redhat.com. -commit 39f303b1f36d934d8410b05625f25c7bcb75db4d -Author: Damien Miller -Date: Tue Feb 23 12:56:59 2016 +1100 +commit 368dd977ae07afb93f4ecea23615128c95ab2b32 +Author: djm@openbsd.org +Date: Sat Jul 23 02:54:08 2016 +0000 - fix sandbox on OSX Lion - - sshd was failing with: + upstream commit - ssh_sandbox_child: sandbox_init: dlopen(/usr/lib/libsandbox.1.dylib, 261):cw - image not found [preauth] + fix pledge violation with ssh -f; reported by Valentin + Kozamernik ok dtucker@ - caused by chroot before sandboxing. Avoid by explicitly linking libsandbox - to sshd. Spotted by Darren. + Upstream-ID: a61db7988db88d9dac3c4dd70e18876a8edf84aa -commit 0d1451a32c7436e6d3d482351e776bc5e7824ce4 +commit f00211e3c6d24d6ea2b64b4b1209f671f6c1d42e Author: djm@openbsd.org -Date: Tue Feb 23 01:34:14 2016 +0000 +Date: Fri Jul 22 07:00:46 2016 +0000 upstream commit - fix spurious error message when incorrect passphrase - entered for keys; reported by espie@ ok deraadt@ + improve wording; suggested by jmc@ - Upstream-ID: 58b2e46e63ed6912ed1ee780bd3bd8560f9a5899 + Upstream-ID: 55cb0a24c8e0618b3ceec80998dc82c85db2d2f8 -commit 09d87d79741beb85768b5e788d7dfdf4bc3543dc -Author: sobrado@openbsd.org -Date: Sat Feb 20 23:06:23 2016 +0000 +commit 83cbca693c3b0719270e6a0f2efe3f9ee93a65b8 +Author: dtucker@openbsd.org +Date: Fri Jul 22 05:46:11 2016 +0000 upstream commit - set ssh(1) protocol version to 2 only. - - ok djm@ + Lower loglevel for "Authenticated with partial success" + message similar to other similar level. bz#2599, patch from cgallek at + gmail.com, ok markus@ - Upstream-ID: e168daf9d27d7e392e3c9923826bd8e87b2b3a10 + Upstream-ID: 3faab814e947dc7b2e292edede23e94c608cb4dd -commit 9262e07826ba5eebf8423f7ac9e47ec488c47869 -Author: sobrado@openbsd.org -Date: Sat Feb 20 23:02:39 2016 +0000 +commit 10358abd087ab228b7ce2048efc4f3854a9ab9a6 +Author: Damien Miller +Date: Fri Jul 22 14:06:36 2016 +1000 - upstream commit - - add missing ~/.ssh/id_ecdsa and ~/.ssh/id_ed25519 to - IdentityFile. - - ok djm@ + retry waitpid on EINTR failure - Upstream-ID: 6ce99466312e4ae7708017c3665e3edb976f70cf + patch from Jakub Jelen on bz#2581; ok dtucker@ -commit c12f0fdce8f985fca8d71829fd64c5b89dc777f5 -Author: sobrado@openbsd.org -Date: Sat Feb 20 23:01:46 2016 +0000 +commit da88a70a89c800e74ea8e5661ffa127a3cc79a92 +Author: djm@openbsd.org +Date: Fri Jul 22 03:47:36 2016 +0000 upstream commit - AddressFamily defaults to any. - - ok djm@ - - Upstream-ID: 0d94aa06a4b889bf57a7f631c45ba36d24c13e0c - -commit 907091acb188b1057d50c2158f74c3ecf1c2302b -Author: Darren Tucker -Date: Fri Feb 19 09:05:39 2016 +1100 - - Make Solaris privs code build on older systems. + constify a few functions' arguments; patch from Jakub + Jelen bz#2581 - Not all systems with Solaris privs have priv_basicset so factor that - out and provide backward compatibility code. Similarly, not all have - PRIV_NET_ACCESS so wrap that in #ifdef. Based on code from - alex at cooperi.net and djm@ with help from carson at taltos.org and - wieland at purdue.edu. + Upstream-ID: f2043f51454ea37830ff6ad60c8b32b4220f448d -commit 292a8dee14e5e67dcd1b49ba5c7b9023e8420d59 +commit c36d91bd4ebf767f310f7cea88d61d1c15f53ddf Author: djm@openbsd.org -Date: Wed Feb 17 22:20:14 2016 +0000 +Date: Fri Jul 22 03:39:13 2016 +0000 upstream commit - rekey refactor broke SSH1; spotted by Tom G. Christensen + move debug("%p", key) to before key is free'd; probable + undefined behaviour on strict compilers; reported by Jakub Jelen bz#2581 - Upstream-ID: 43f0d57928cc077c949af0bfa71ef574dcb58243 + Upstream-ID: 767f323e1f5819508a0e35e388ec241bac2f953a -commit 3a13cb543df9919aec2fc6b75f3dd3802facaeca +commit 286f5a77c3bfec1e8892ca268087ac885ac871bf Author: djm@openbsd.org -Date: Wed Feb 17 08:57:34 2016 +0000 +Date: Fri Jul 22 03:35:11 2016 +0000 upstream commit - rsa-sha2-512,rsa-sha2-256 cannot be selected explicitly - in *KeyTypes options yet. Remove them from the lists of algorithms for now. - committing on behalf of markus@ ok djm@ + reverse the order in which -J/JumpHost proxies are visited to + be more intuitive and document - Upstream-ID: c6e8820eb8e610ac21551832c0c89684a9a51bb7 + reported by and manpage bits naddy@ + + Upstream-ID: 3a68fd6a841fd6cf8cedf6552a9607ba99df179a -commit a685ae8d1c24fb7c712c55a4f3280ee76f5f1e4b -Author: jmc@openbsd.org -Date: Wed Feb 17 07:38:19 2016 +0000 +commit fcd135c9df440bcd2d5870405ad3311743d78d97 +Author: dtucker@openbsd.org +Date: Thu Jul 21 01:39:35 2016 +0000 upstream commit - since these pages now clearly tell folks to avoid v1, - normalise the docs from a v2 perspective (i.e. stop pointing out which bits - are v2 only); + Skip passwords longer than 1k in length so clients can't + easily DoS sshd by sending very long passwords, causing it to spend CPU + hashing them. feedback djm@, ok markus@. - ok/tweaks djm ok markus + Brought to our attention by tomas.kuthan at oracle.com, shilei-c at + 360.cn and coredump at autistici.org - Upstream-ID: eb474f8c36fb6a532dc05c282f7965e38dcfa129 + Upstream-ID: d0af7d4a2190b63ba1d38eec502bc4be0be9e333 -commit c5c3f3279a0e4044b8de71b70d3570d692d0f29d -Author: djm@openbsd.org -Date: Wed Feb 17 05:29:04 2016 +0000 +commit 324583e8fb3935690be58790425793df619c6d4d +Author: naddy@openbsd.org +Date: Wed Jul 20 10:45:27 2016 +0000 upstream commit - make sandboxed privilege separation the default, not just - for new installs; "absolutely" deraadt@ + Do not clobber the global jump_host variables when + parsing an inactive configuration. ok djm@ - Upstream-ID: 5221ef3b927d2df044e9aa3f5db74ae91743f69b + Upstream-ID: 5362210944d91417d5976346d41ac0b244350d31 -commit eb3f7337a651aa01d5dec019025e6cdc124ed081 +commit 32d921c323b989d28405e78d0a8923d12913d737 Author: jmc@openbsd.org -Date: Tue Feb 16 07:47:54 2016 +0000 +Date: Tue Jul 19 12:59:16 2016 +0000 upstream commit - no need to state that protocol 2 is the default twice; + tweak previous; - Upstream-ID: b1e4c36b0c2e12e338e5b66e2978f2ac953b95eb + Upstream-ID: f3c1a5b3f05dff366f60c028728a2b43f15ff534 -commit e7901efa9b24e5b0c7e74f2c5520d47eead4d005 -Author: djm@openbsd.org -Date: Tue Feb 16 05:11:04 2016 +0000 +commit d7eabc86fa049a12ba2c3fb198bd1d51b37f7025 +Author: dtucker@openbsd.org +Date: Tue Jul 19 11:38:53 2016 +0000 upstream commit - Replace list of ciphers and MACs adjacent to -1/-2 flag - descriptions in ssh(1) with a strong recommendation not to use protocol 1. - Add a similar warning to the Protocol option descriptions in ssh_config(5) - and sshd_config(5); - - prompted by and ok mmcc@ + Allow wildcard for PermitOpen hosts as well as ports. + bz#2582, patch from openssh at mzpqnxow.com and jjelen at redhat.com. ok + markus@ - Upstream-ID: 961f99e5437d50e636feca023978950a232ead5e + Upstream-ID: af0294e9b9394c4e16e991424ca0a47a7cc605f2 -commit 5a0fcb77287342e2fc2ba1cee79b6af108973dc2 -Author: djm@openbsd.org -Date: Tue Feb 16 03:37:48 2016 +0000 +commit b98a2a8348e907b3d71caafd80f0be8fdd075943 +Author: markus@openbsd.org +Date: Mon Jul 18 11:35:33 2016 +0000 upstream commit - add a "Close session" log entry (at loglevel=verbose) to - correspond to the existing "Starting session" one. Also include the session - id number to make multiplexed sessions more apparent. - - feedback and ok dtucker@ + Reduce timing attack against obsolete CBC modes by always + computing the MAC over a fixed size of data. Reported by Jean Paul + Degabriele, Kenny Paterson, Torben Hansen and Martin Albrecht. ok djm@ - Upstream-ID: e72d2ac080e02774376325136e532cb24c2e617c + Upstream-ID: f20a13279b00ba0afbacbcc1f04e62e9d41c2912 -commit 624fd395b559820705171f460dd33d67743d13d6 -Author: djm@openbsd.org -Date: Wed Feb 17 02:24:17 2016 +0000 +commit dbf788b4d9d9490a5fff08a7b09888272bb10fcc +Author: Darren Tucker +Date: Thu Jul 21 14:17:31 2016 +1000 - upstream commit - - include bad $SSH_CONNECTION in failure output + Search users for one with a valid salt. - Upstream-Regress-ID: b22d72edfde78c403aaec2b9c9753ef633cc0529 + If the root account is locked (eg password "!!" or "*LK*") keep looking + until we find a user with a valid salt to use for crypting passwords of + invalid users. ok djm@ -commit 60d860e54b4f199e5e89963b1c086981309753cb +commit e8b58f48fbb1b524fb4f0d4865fa0005d6a4b782 Author: Darren Tucker -Date: Wed Feb 17 13:37:09 2016 +1100 +Date: Mon Jul 18 17:22:49 2016 +1000 - Rollback addition of va_start. + Explicitly specify source files for regress tools. - va_start was added in 0f754e29dd3760fc0b172c1220f18b753fb0957e, however - it has the wrong number of args and it's not usable in non-variadic - functions anyway so it breaks things (for example Solaris 2.6 as - reported by Tom G. Christensen).i ok djm@ + Since adding $(REGRESSLIBS), $? is wrong because it includes only the + changed source files. $< seems like it'd be right however it doesn't + seem to work on some non-GNU makes, so do what works everywhere. -commit 2fee909c3cee2472a98b26eb82696297b81e0d38 +commit eac1bbd06872c273f16ac0f9976b0aef026b701b Author: Darren Tucker -Date: Wed Feb 17 09:48:15 2016 +1100 +Date: Mon Jul 18 17:12:22 2016 +1000 - Look for gethostbyname in libresolv and libnsl. - - Should fix build problem on Solaris 2.6 reported by Tom G. Christensen. + Conditionally include err.h. -commit 5ac712d81a84396aab441a272ec429af5b738302 -Author: Damien Miller -Date: Tue Feb 16 10:45:02 2016 +1100 +commit 0a454147568746c503f669e1ba861f76a2e7a585 +Author: Darren Tucker +Date: Mon Jul 18 16:26:26 2016 +1000 - make existing ssh_malloc_init only for __OpenBSD__ + Remove local implementation of err, errx. + + We now have a shared implementation in libopenbsd-compat. -commit 24c9bded569d9f2449ded73f92fb6d12db7a9eec +commit eb999a4590846ba4d56ddc90bd07c23abfbab7b1 Author: djm@openbsd.org -Date: Mon Feb 15 23:32:37 2016 +0000 +Date: Mon Jul 18 06:08:01 2016 +0000 upstream commit - memleak of algorithm name in mm_answer_sign; reported by - Jakub Jelen + Add some unsigned overflow checks for extra_pad. None of + these are reachable with the amount of padding that we use internally. + bz#2566, pointed out by Torben Hansen. ok markus@ - Upstream-ID: ccd742cd25952240ebd23d7d4d6b605862584d08 + Upstream-ID: 4d4be8450ab2fc1b852d5884339f8e8c31c3fd76 -commit ffb1e7e896139a42ceb78676f637658f44612411 -Author: dtucker@openbsd.org -Date: Mon Feb 15 09:47:49 2016 +0000 +commit c71ba790c304545464bb494de974cdf0f4b5cf1e +Author: Darren Tucker +Date: Mon Jul 18 15:43:25 2016 +1000 - upstream commit - - Add a function to enable security-related malloc_options. - With and ok deraadt@, something similar has been in the snaps for a while. + Add dependency on libs for unit tests. - Upstream-ID: 43a95523b832b7f3b943d2908662191110c380ed + Makes "./configure && make tests" work again. ok djm@ -commit ef39e8c0497ff0564990a4f9e8b7338b3ba3507c -Author: Damien Miller -Date: Tue Feb 16 10:34:39 2016 +1100 +commit 8199d0311aea3e6fd0284c9025e7a83f4ece79e8 +Author: Darren Tucker +Date: Mon Jul 18 13:47:39 2016 +1000 - sync ssh-copy-id with upstream 783ef08b0a75 + Correct location for kexfuzz in clean target. -commit d2d772f55b19bb0e8d03c2fe1b9bb176d9779efd -Author: djm@openbsd.org -Date: Fri Feb 12 00:20:30 2016 +0000 +commit 01558b7b07af43da774d3a11a5c51fa9c310849d +Author: Darren Tucker +Date: Mon Jul 18 09:33:25 2016 +1000 - upstream commit + Handle PAM_MAXTRIES from modules. - avoid fatal() for PKCS11 tokens that present empty key IDs - bz#1773, ok markus@ + bz#2249: handle the case where PAM returns PAM_MAXTRIES by ceasing to offer + password and keyboard-interative authentication methods. Should prevent + "sshd ignoring max retries" warnings in the log. ok djm@ - Upstream-ID: 044a764fee526f2c4a9d530bd10695422d01fc54 + It probably won't trigger with keyboard-interactive in the default + configuration because the retry counter is stored in module-private + storage which goes away with the sshd PAM process (see bz#688). On the + other hand, those cases probably won't log a warning either. -commit e4c918a6c721410792b287c9fd21356a1bed5805 +commit 65c6c6b567ab5ab12945a5ad8e0ab3a8c26119cc Author: djm@openbsd.org -Date: Thu Feb 11 02:56:32 2016 +0000 +Date: Sun Jul 17 04:20:16 2016 +0000 upstream commit - sync crypto algorithm lists in ssh_config(5) and - sshd_config(5) with current reality. bz#2527 + support UTF-8 characters in ssh(1) banners using + schwarze@'s safe fmprintf printer; bz#2058 - Upstream-ID: d7fd1b6c1ed848d866236bcb1d7049d2bb9b2ff6 + feedback schwarze@ ok dtucker@ + + Upstream-ID: a72ce4e3644c957643c9524eea2959e41b91eea7 -commit e30cabfa4ab456a30b3224f7f545f1bdfc4a2517 -Author: djm@openbsd.org -Date: Thu Feb 11 02:21:34 2016 +0000 +commit e4eb7d910976fbfc7ce3e90c95c11b07b483d0d7 +Author: jmc@openbsd.org +Date: Sat Jul 16 06:57:55 2016 +0000 upstream commit - fix regression in openssh-6.8 sftp client: existing - destination directories would incorrectly terminate recursive uploads; - bz#2528 + - add proxyjump to the options list - formatting fixes - + update usage() - Upstream-ID: 3306be469f41f26758e3d447987ac6d662623e18 + ok djm + + Upstream-ID: 43d318e14ce677a2eec8f21ef5ba2f9f68a59457 -commit 714e367226ded4dc3897078be48b961637350b05 -Author: djm@openbsd.org -Date: Tue Feb 9 05:30:04 2016 +0000 +commit af1f084857621f14bd9391aba8033d35886c2455 +Author: dtucker@openbsd.org +Date: Fri Jul 15 05:01:58 2016 +0000 upstream commit - turn off more old crypto in the client: hmac-md5, ripemd, - truncated HMACs, RC4, blowfish. ok markus@ dtucker@ + Reduce the syslog level of some relatively common protocol + events from LOG_CRIT by replacing fatal() calls with logdie(). Part of + bz#2585, ok djm@ - Upstream-ID: 96aa11c2c082be45267a690c12f1d2aae6acd46e + Upstream-ID: 9005805227c94edf6ac02a160f0e199638d288e5 -commit 5a622844ff7f78dcb75e223399f9ef0977e8d0a3 -Author: djm@openbsd.org -Date: Mon Feb 8 23:40:12 2016 +0000 +commit bd5f2b78b69cf38d6049a0de445a79c8595e4a1f +Author: Damien Miller +Date: Fri Jul 15 19:14:48 2016 +1000 - upstream commit + missing openssl/dh.h + +commit 4a984fd342effe5f0aad874a0d538c4322d973c0 +Author: Damien Miller +Date: Fri Jul 15 18:47:07 2016 +1000 + + cast to avoid type warning in error message + +commit 5abfb15ced985c340359ae7fb65a625ed3692b3e +Author: Darren Tucker +Date: Fri Jul 15 14:48:30 2016 +1000 + + Move VA_COPY macro into compat header. - don't attempt to percent_expand() already-canonicalised - addresses, avoiding unnecessary failures when attempting to connect to scoped - IPv6 addresses (that naturally contain '%' characters) + Some AIX compilers unconditionally undefine va_copy but don't set it back + to an internal function, causing link errors. In some compat code we + already use VA_COPY instead so move the two existing instances into the + shared header and use for sshbuf-getput-basic.c too. Should fix building + with at lease some versions of AIX's compiler. bz#2589, ok djm@ + +commit 832b7443b7a8e181c95898bc5d73497b7190decd +Author: Damien Miller +Date: Fri Jul 15 14:45:34 2016 +1000 + + disable ciphers not supported by OpenSSL - Upstream-ID: f24569cffa1a7cbde5f08dc739a72f4d78aa5c6a + bz#2466 ok dtucker@ -commit 19bcf2ea2d17413f2d9730dd2a19575ff86b9b6a +commit 5fbe93fc6fbb2fe211e035703dec759d095e3dd8 +Author: Damien Miller +Date: Fri Jul 15 13:54:31 2016 +1000 + + add a --disable-pkcs11 knob + +commit 679ce88ec2a8e2fe6515261c489e8c1449bb9da9 +Author: Damien Miller +Date: Fri Jul 15 13:44:38 2016 +1000 + + fix newline escaping for unsupported_algorithms + + The hmac-ripemd160 was incorrect and could lead to broken + Makefiles on systems that lacked support for it, but I made + all the others consistent too. + +commit ed877ef653847d056bb433975d731b7a1132a979 Author: djm@openbsd.org -Date: Mon Feb 8 10:57:07 2016 +0000 +Date: Fri Jul 15 00:24:30 2016 +0000 upstream commit - refactor activation of rekeying + Add a ProxyJump ssh_config(5) option and corresponding -J + ssh(1) command-line flag to allow simplified indirection through a SSH + bastion or "jump host". - This makes automatic rekeying internal to the packet code (previously - the server and client loops needed to assist). In doing to it makes - application of rekey limits more accurate by accounting for packets - about to be sent as well as packets queued during rekeying events - themselves. + These options construct a proxy command that connects to the + specified jump host(s) (more than one may be specified) and uses + port-forwarding to establish a connection to the next destination. - Based on a patch from dtucker@ which was in turn based on a patch - Aleksander Adamowski in bz#2521; ok markus@ + This codifies the safest way of indirecting connections through SSH + servers and makes it easy to use. - Upstream-ID: a441227fd64f9739850ca97b4cf794202860fcd8 + ok markus@ + + Upstream-ID: fa899cb8b26d889da8f142eb9774c1ea36b04397 -commit 603ba41179e4b53951c7b90ee95b6ef3faa3f15d -Author: naddy@openbsd.org -Date: Fri Feb 5 13:28:19 2016 +0000 +commit 5c02dd126206a26785379e80f2d3848e4470b711 +Author: Darren Tucker +Date: Fri Jul 15 12:56:39 2016 +1000 - upstream commit + Map umac_ctx struct name too. - Only check errno if read() has returned an error. EOF is - not an error. This fixes a problem where the mux master would sporadically - fail to notice that the client had exited. ok mikeb@ djm@ + Prevents size mismatch linker warnings on Solaris 11. + +commit 283b97ff33ea2c641161950849931bd578de6946 +Author: Darren Tucker +Date: Fri Jul 15 13:49:44 2016 +1000 + + Mitigate timing of disallowed users PAM logins. - Upstream-ID: 3c2dadc21fac6ef64665688aac8a75fffd57ae53 + When sshd decides to not allow a login (eg PermitRootLogin=no) and + it's using PAM, it sends a fake password to PAM so that the timing for + the failure is not noticeably different whether or not the password + is correct. This behaviour can be detected by sending a very long + password string which is slower to hash than the fake password. + + Mitigate by constructing an invalid password that is the same length + as the one from the client and thus takes the same time to hash. + Diff from djm@ -commit 56d7dac790693ce420d225119283bc355cff9185 -Author: jsg@openbsd.org -Date: Fri Feb 5 04:31:21 2016 +0000 +commit 9286875a73b2de7736b5e50692739d314cd8d9dc +Author: Darren Tucker +Date: Fri Jul 15 13:32:45 2016 +1000 + + Determine appropriate salt for invalid users. + + When sshd is processing a non-PAM login for a non-existent user it uses + the string from the fakepw structure as the salt for crypt(3)ing the + password supplied by the client. That string has a Blowfish prefix, so on + systems that don't understand that crypt will fail fast due to an invalid + salt, and even on those that do it may have significantly different timing + from the hash methods used for real accounts (eg sha512). This allows + user enumeration by, eg, sending large password strings. This was noted + by EddieEzra.Harari at verint.com (CVE-2016-6210). + + To mitigate, use the same hash algorithm that root uses for hashing + passwords for users that do not exist on the system. ok djm@ + +commit a162dd5e58ca5b224d7500abe35e1ef32b5de071 +Author: Darren Tucker +Date: Thu Jul 14 21:19:59 2016 +1000 + + OpenSSL 1.1.x not currently supported. + +commit 7df91b01fc558a33941c5c5f31abbcdc53a729fb +Author: Darren Tucker +Date: Thu Jul 14 12:25:24 2016 +1000 + + Check for VIS_ALL. + + If we don't have it, set BROKEN_STRNVIS to activate the compat replacement. + +commit ee67716f61f1042d5e67f91c23707cca5dcdd7d0 +Author: dtucker@openbsd.org +Date: Thu Jul 14 01:24:21 2016 +0000 upstream commit - avoid an uninitialised value when NumberOfPasswordPrompts - is 0 ok markus@ djm@ + Correct equal in test. - Upstream-ID: 11b068d83c2865343aeb46acf1e9eec00f829b6b + Upstream-Regress-ID: 4e32f7a5c57a619c4e8766cb193be2a1327ec37a -commit deae7d52d59c5019c528f977360d87fdda15d20b -Author: djm@openbsd.org -Date: Fri Feb 5 03:07:06 2016 +0000 +commit 372807c2065c8572fdc6478b25cc5ac363743073 +Author: tb@openbsd.org +Date: Mon Jul 11 21:38:13 2016 +0000 upstream commit - mention internal DH-GEX fallback groups; bz#2302 + Add missing "recvfd" pledge promise: Raf Czlonka reported + ssh coredumps when Control* keywords were set in ssh_config. This patch also + fixes similar problems with scp and sftp. - Upstream-ID: e7b395fcca3122cd825515f45a2e41c9a157e09e + ok deraadt, looks good to millert + + Upstream-ID: ca2099eade1ef3e87a79614fefa26a0297ad8a3b -commit cac3b6665f884d46192c0dc98a64112e8b11a766 -Author: djm@openbsd.org -Date: Fri Feb 5 02:37:56 2016 +0000 +commit e0453f3df64bf485c61c7eb6bd12893eee9fe2cd +Author: tedu@openbsd.org +Date: Mon Jul 11 03:19:44 2016 +0000 upstream commit - better description for MaxSessions; bz#2531 + obsolete note about fascistloggin is obsolete. ok djm + dtucker - Upstream-ID: e2c0d74ee185cd1a3e9d4ca1f1b939b745b354da + Upstream-ID: dae60df23b2bb0e89f42661ddd96a7b0d1b7215a -commit 5ef4b0fdcc7a239577a754829b50022b91ab4712 +commit a2333584170a565adf4f209586772ef8053b10b8 +Author: Darren Tucker +Date: Thu Jul 14 10:59:09 2016 +1000 + + Add compat code for missing wcwidth. + + If we don't have wcwidth force fallback implementations of nl_langinfo + and mbtowc. Based on advice from Ingo Schwarze. + +commit 8aaec7050614494014c47510b7e94daf6e644c62 Author: Damien Miller -Date: Wed Jan 27 17:45:56 2016 +1100 +Date: Thu Jul 14 09:48:48 2016 +1000 - avoid FreeBSD RCS Id in comment + fix missing include for systems with err.h + +commit 6310ef27a2567cda66d6cf0c1ad290ee1167f243 +Author: Darren Tucker +Date: Wed Jul 13 14:42:35 2016 +1000 + + Move err.h replacements into compat lib. - Change old $FreeBSD version string in comment so it doesn't - become an RCS ident downstream; requested by des AT des.no + Move implementations of err.h replacement functions into their own file + in the libopenbsd-compat so we can use them in kexfuzz.c too. ok djm@ -commit 696d12683c90d20a0a9c5f4275fc916b7011fb04 -Author: djm@openbsd.org -Date: Thu Feb 4 23:43:48 2016 +0000 +commit f3f2cc8386868f51440c45210098f65f9787449a +Author: Darren Tucker +Date: Mon Jul 11 17:23:38 2016 +1000 - upstream commit + Check for wchar.h and langinfo.h - printf argument casts to avoid warnings on strict - compilers + Wrap includes in the appropriate #ifdefs. + +commit b9c50614eba9d90939b2b119b6e1b7e03b462278 +Author: Damien Miller +Date: Fri Jul 8 13:59:13 2016 +1000 + + whitelist more architectures for seccomp-bpf - Upstream-ID: 7b9f6712cef01865ad29070262d366cf13587c9c + bz#2590 - testing and patch from Jakub Jelen -commit 5658ef2501e785fbbdf5de2dc33b1ff7a4dca73a -Author: millert@openbsd.org -Date: Mon Feb 1 21:18:17 2016 +0000 +commit 18813a32b6fd964037e0f5e1893cb4468ac6a758 +Author: guenther@openbsd.org +Date: Mon Jul 4 18:01:44 2016 +0000 upstream commit - Avoid ugly "DISPLAY "(null)" invalid; disabling X11 - forwarding" message when DISPLAY is not set. This could also result in a - crash on systems with a printf that doesn't handle NULL. OK djm@ + DEBUGLIBS has been broken since the gcc4 switch, so delete + it. CFLAGS contains -g by default anyway - Upstream-ID: 20ee0cfbda678a247264c20ed75362042b90b412 + problem noted by Edgar Pettijohn (edgar (at) pettijohn-web.com) + ok millert@ kettenis@ deraadt@ + + Upstream-Regress-ID: 4a0bb72f95c63f2ae9daa8a040ac23914bddb542 -commit 537f88ec7bcf40bd444ac5584c707c5588c55c43 -Author: dtucker@openbsd.org -Date: Fri Jan 29 05:18:15 2016 +0000 +commit 6d31193d0baa3da339c196ac49625b7ba1c2ecc7 +Author: djm@openbsd.org +Date: Fri Jul 8 03:44:42 2016 +0000 upstream commit - Add regression test for RekeyLimit parsing of >32bit values - (4G and 8G). + Improve crypto ordering for Encrypt-then-MAC (EtM) mode + MAC algorithms. - Upstream-Regress-ID: 548390350c62747b6234f522a99c319eee401328 + Previously we were computing the MAC, decrypting the packet and then + checking the MAC. This gave rise to the possibility of creating a + side-channel oracle in the decryption step, though no such oracle has + been identified. + + This adds a mac_check() function that computes and checks the MAC in + one pass, and uses it to advance MAC checking for EtM algorithms to + before payload decryption. + + Reported by Jean Paul Degabriele, Kenny Paterson, Torben Hansen and + Martin Albrecht. feedback and ok markus@ + + Upstream-ID: 1999bb67cab47dda5b10b80d8155fe83d4a1867b -commit 4c6cb8330460f94e6c7ae28a364236d4188156a3 -Author: dtucker@openbsd.org -Date: Fri Jan 29 23:04:46 2016 +0000 +commit 71f5598f06941f645a451948c4a5125c83828e1c +Author: guenther@openbsd.org +Date: Mon Jul 4 18:01:44 2016 +0000 upstream commit - Remove leftover roaming dead code. ok djm markus. + DEBUGLIBS has been broken since the gcc4 switch, so + delete it. CFLAGS contains -g by default anyway - Upstream-ID: 13d1f9c8b65a5109756bcfd3b74df949d53615be + problem noted by Edgar Pettijohn (edgar (at) pettijohn-web.com) + ok millert@ kettenis@ deraadt@ + + Upstream-ID: 96c5054e3e1f170c6276902d5bc65bb3b87a2603 -commit 28136471809806d6246ef41e4341467a39fe2f91 -Author: djm@openbsd.org -Date: Fri Jan 29 05:46:01 2016 +0000 +commit e683fc6f1c8c7295648dbda679df8307786ec1ce +Author: dtucker@openbsd.org +Date: Thu Jun 30 05:17:05 2016 +0000 upstream commit - include packet type of non-data packets in debug3 output; - ok markus dtucker + Explicitly check for 100% completion to avoid potential + floating point rounding error, which could cause progressmeter to report 99% + on completion. While there invert the test so the 100% case is clearer. with + & ok djm@ - Upstream-ID: 034eaf639acc96459b9c5ce782db9fcd8bd02d41 + Upstream-ID: a166870c5878e422f3c71ff802e2ccd7032f715d -commit 6fd6e28daccafaa35f02741036abe64534c361a1 -Author: dtucker@openbsd.org -Date: Fri Jan 29 03:31:03 2016 +0000 +commit 772e6cec0ed740fc7db618dc30b4134f5a358b43 +Author: jmc@openbsd.org +Date: Wed Jun 29 17:14:28 2016 +0000 upstream commit - Revert "account for packets buffered but not yet - processed" change as it breaks for very small RekeyLimit values due to - continuous rekeying. ok djm@ + sort the -o list; - Upstream-ID: 7e03f636cb45ab60db18850236ccf19079182a19 + Upstream-ID: 1a97465ede8790b4d47cb618269978e07f41f8ac -commit 921ff00b0ac429666fb361d2d6cb1c8fff0006cb -Author: dtucker@openbsd.org -Date: Fri Jan 29 02:54:45 2016 +0000 +commit 46ecd19e554ccca15a7309cd1b6b44bc8e6b84af +Author: djm@openbsd.org +Date: Thu Jun 23 05:17:51 2016 +0000 upstream commit - Allow RekeyLimits in excess of 4G up to 2**63 bits - (limited by the return type of scan_scaled). Part of bz#2521, ok djm. + fix AuthenticationMethods during configuration re-parse; + reported by Juan Francisco Cantero Hurtado - Upstream-ID: 13bea82be566b9704821b1ea05bf7804335c7979 + Upstream-ID: 8ffa1dac25c7577eca8238e825317ab20848f9b4 -commit c0060a65296f01d4634f274eee184c0e93ba0f23 -Author: dtucker@openbsd.org -Date: Fri Jan 29 02:42:46 2016 +0000 +commit 3147e7595d0f2f842a666c844ac53e6c7a253d7e +Author: djm@openbsd.org +Date: Sun Jun 19 07:48:02 2016 +0000 upstream commit - Account for packets buffered but not yet processed when - computing whether or not it is time to perform rekeying. bz#2521, based - loosely on a patch from olo at fb.com, ok djm@ + revert 1.34; causes problems loading public keys - Upstream-ID: 67e268b547f990ed220f3cb70a5624d9bda12b8c + reported by semarie@ + + Upstream-ID: b393794f8935c8b15d98a407fe7721c62d2ed179 -commit 44cf930e670488c85c9efeb373fa5f4b455692ac -Author: djm@openbsd.org -Date: Wed Jan 27 06:44:58 2016 +0000 +commit ad23a75509f4320d43f628c50f0817e3ad12bfa7 +Author: jmc@openbsd.org +Date: Fri Jun 17 06:33:30 2016 +0000 upstream commit - change old $FreeBSD version string in comment so it doesn't - become an RCS ident downstream; requested by des AT des.no + grammar fix; - Upstream-ID: 8ca558c01f184e596b45e4fc8885534b2c864722 + Upstream-ID: 5d5b21c80f1e81db367333ce0bb3e5874fb3e463 -commit ebacd377769ac07d1bf3c75169644336056b7060 +commit 5e28b1a2a3757548b40018cc2493540a17c82e27 Author: djm@openbsd.org -Date: Wed Jan 27 00:53:12 2016 +0000 +Date: Fri Jun 17 05:06:23 2016 +0000 upstream commit - make the debug messages a bit more useful here + translate OpenSSL error codes to something more + meaninful; bz#2522 reported by Jakub Jelen, ok dtucker@ - Upstream-ID: 478ccd4e897e0af8486b294aa63aa3f90ab78d64 + Upstream-ID: 4cb0795a366381724314e6515d57790c5930ffe5 -commit 458abc2934e82034c5c281336d8dc0f910aecad3 -Author: jsg@openbsd.org -Date: Sat Jan 23 05:31:35 2016 +0000 +commit b64faeb5eda7eff8210c754d00464f9fe9d23de5 +Author: djm@openbsd.org +Date: Fri Jun 17 05:03:40 2016 +0000 upstream commit - Zero a stack buffer with explicit_bzero() instead of - memset() when returning from client_loop() for consistency with - buffer_free()/sshbuf_free(). + ban AuthenticationMethods="" and accept + AuthenticationMethods=any for the default behaviour of not requiring multiple + authentication - ok dtucker@ deraadt@ djm@ + bz#2398 from Jakub Jelen; ok dtucker@ - Upstream-ID: bc9975b2095339811c3b954694d7d15ea5c58f66 + Upstream-ID: fabd7f44d59e4518d241d0d01e226435cc23cf27 -commit 65a3c0dacbc7dbb75ddb6a70ebe22d8de084d0b0 +commit 9816fc5daee5ca924dd5c4781825afbaab728877 Author: dtucker@openbsd.org -Date: Wed Jan 20 09:22:39 2016 +0000 +Date: Thu Jun 16 11:00:17 2016 +0000 upstream commit - Include sys/time.h for gettimeofday. From sortie at - maxsi.org. + Include stdarg.h for va_copy as per man page. - Upstream-ID: 6ed0c33b836d9de0a664cd091e86523ecaa2fb3b + Upstream-ID: 105d6b2f1af2fbd9d91c893c436ab121434470bd -commit fc77ccdc2ce6d5d06628b8da5048a6a5f6ffca5a -Author: markus@openbsd.org -Date: Thu Jan 14 22:56:56 2016 +0000 +commit b6cf84b51bc0f5889db48bf29a0c771954ade283 +Author: jmc@openbsd.org +Date: Thu Jun 16 06:10:45 2016 +0000 upstream commit - fd leaks; report Qualys Security Advisory team; ok - deraadt@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Thu Mar 2 00:27:22 2017 Return-Path: Delivered-To: svn-src-all@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 BFF29CF4E54; Thu, 2 Mar 2017 00:27:22 +0000 (UTC) (envelope-from des@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 8CC92756; Thu, 2 Mar 2017 00:27:22 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v220RLx5093816; Thu, 2 Mar 2017 00:27:21 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v220RLGb093815; Thu, 2 Mar 2017 00:27:21 GMT (envelope-from des@FreeBSD.org) Message-Id: <201703020027.v220RLGb093815@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Thu, 2 Mar 2017 00:27:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314528 - head/sbin/md5 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 00:27:22 -0000 Author: des Date: Thu Mar 2 00:27:21 2017 New Revision: 314528 URL: https://svnweb.freebsd.org/changeset/base/314528 Log: Update to reflect that SHA-1 has now been broken. Submitted by: ak MFC after: 1 week Modified: head/sbin/md5/md5.1 Modified: head/sbin/md5/md5.1 ============================================================================== --- head/sbin/md5/md5.1 Thu Mar 2 00:11:32 2017 (r314527) +++ head/sbin/md5/md5.1 Thu Mar 2 00:27:21 2017 (r314528) @@ -1,5 +1,5 @@ .\" $FreeBSD$ -.Dd January 7, 2017 +.Dd March 2, 2017 .Dt MD5 1 .Os .Sh NAME @@ -84,21 +84,17 @@ in a secure manner before being encrypte key under a public-key cryptosystem such as .Tn RSA . .Pp +The .Tn MD5 -has been completely broken as far as finding collisions is -concerned, and should not be relied upon to produce unique outputs. -This also means that -.Tn MD5 -should not be used as part of a cryptographic signature scheme. -At the current time (2014-05-17) there is no publicly known method to -.Dq reverse -MD5, i.e., to find an input given a hash value. -.Pp -.Tn SHA-1 -currently (2014-05-17) has no known collisions, but an attack has been -found which is faster than a brute-force search, placing the security of +and .Tn SHA-1 -in doubt. +algorithms have been proven to be vulnerable to practical collision +attacks and should not be relied upon to produce unique outputs, nor +should they be used as part of a cryptographic signature scheme. +As of 2016-03-02, there is no publicly known method to +.Em reverse +either algorithm, i.e. to find an input that produces a specific +output. .Pp .Tn SHA-512t256 is a version of @@ -111,6 +107,8 @@ The hashes are not interchangeable. .Pp It is recommended that all new applications use .Tn SHA-512 +or +.Tn SKEIN-512 instead of one of the other hash functions. .Pp The following options may be used in any combination and must From owner-svn-src-all@freebsd.org Thu Mar 2 01:14:52 2017 Return-Path: Delivered-To: svn-src-all@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 51855CF1F35; Thu, 2 Mar 2017 01:14:52 +0000 (UTC) (envelope-from jasone@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 1368EFDE; Thu, 2 Mar 2017 01:14:52 +0000 (UTC) (envelope-from jasone@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v221EpoS012989; Thu, 2 Mar 2017 01:14:51 GMT (envelope-from jasone@FreeBSD.org) Received: (from jasone@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v221EnVu012966; Thu, 2 Mar 2017 01:14:49 GMT (envelope-from jasone@FreeBSD.org) Message-Id: <201703020114.v221EnVu012966@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jasone set sender to jasone@FreeBSD.org using -f From: Jason Evans Date: Thu, 2 Mar 2017 01:14:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314529 - in head/contrib/jemalloc: . doc include/jemalloc include/jemalloc/internal src X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 01:14:52 -0000 Author: jasone Date: Thu Mar 2 01:14:48 2017 New Revision: 314529 URL: https://svnweb.freebsd.org/changeset/base/314529 Log: Update jemalloc to 4.5.0. Modified: head/contrib/jemalloc/ChangeLog head/contrib/jemalloc/FREEBSD-Xlist head/contrib/jemalloc/FREEBSD-diffs head/contrib/jemalloc/VERSION head/contrib/jemalloc/doc/jemalloc.3 head/contrib/jemalloc/include/jemalloc/internal/arena.h head/contrib/jemalloc/include/jemalloc/internal/chunk.h head/contrib/jemalloc/include/jemalloc/internal/extent.h head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h head/contrib/jemalloc/include/jemalloc/internal/mb.h head/contrib/jemalloc/include/jemalloc/internal/mutex.h head/contrib/jemalloc/include/jemalloc/internal/private_namespace.h head/contrib/jemalloc/include/jemalloc/internal/tcache.h head/contrib/jemalloc/include/jemalloc/internal/tsd.h head/contrib/jemalloc/include/jemalloc/internal/witness.h head/contrib/jemalloc/include/jemalloc/jemalloc.h head/contrib/jemalloc/src/arena.c head/contrib/jemalloc/src/chunk.c head/contrib/jemalloc/src/chunk_dss.c head/contrib/jemalloc/src/ctl.c head/contrib/jemalloc/src/extent.c head/contrib/jemalloc/src/huge.c head/contrib/jemalloc/src/jemalloc.c head/contrib/jemalloc/src/pages.c head/contrib/jemalloc/src/stats.c head/contrib/jemalloc/src/tcache.c head/contrib/jemalloc/src/witness.c Modified: head/contrib/jemalloc/ChangeLog ============================================================================== --- head/contrib/jemalloc/ChangeLog Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/ChangeLog Thu Mar 2 01:14:48 2017 (r314529) @@ -4,6 +4,41 @@ brevity. Much more detail can be found https://github.com/jemalloc/jemalloc +* 4.5.0 (February 28, 2017) + + This is the first release to benefit from much broader continuous integration + testing, thanks to @davidtgoldblatt. Had we had this testing infrastructure + in place for prior releases, it would have caught all of the most serious + regressions fixed by this release. + + New features: + - Add --disable-thp and the opt.thp to provide opt-out mechanisms for + transparent huge page integration. (@jasone) + - Update zone allocator integration to work with macOS 10.12. (@glandium) + - Restructure *CFLAGS configuration, so that CFLAGS behaves typically, and + EXTRA_CFLAGS provides a way to specify e.g. -Werror during building, but not + during configuration. (@jasone, @ronawho) + + Bug fixes: + - Fix DSS (sbrk(2)-based) allocation. This regression was first released in + 4.3.0. (@jasone) + - Handle race in per size class utilization computation. This functionality + was first released in 4.0.0. (@interwq) + - Fix lock order reversal during gdump. (@jasone) + - Fix-refactor tcache synchronization. This regression was first released in + 4.0.0. (@jasone) + - Fix various JSON-formatted malloc_stats_print() bugs. This functionality + was first released in 4.3.0. (@jasone) + - Fix huge-aligned allocation. This regression was first released in 4.4.0. + (@jasone) + - When transparent huge page integration is enabled, detect what state pages + start in according to the kernel's current operating mode, and only convert + arena chunks to non-huge during purging if that is not their initial state. + This functionality was first released in 4.4.0. (@jasone) + - Fix lg_chunk clamping for the --enable-cache-oblivious --disable-fill case. + This regression was first released in 4.0.0. (@jasone, @428desmo) + - Properly detect sparc64 when building for Linux. (@glaubitz) + * 4.4.0 (December 3, 2016) New features: Modified: head/contrib/jemalloc/FREEBSD-Xlist ============================================================================== --- head/contrib/jemalloc/FREEBSD-Xlist Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/FREEBSD-Xlist Thu Mar 2 01:14:48 2017 (r314529) @@ -49,6 +49,7 @@ include/msvc_compat/ install-sh jemalloc.pc* msvc/ +scripts/ src/valgrind.c src/zone.c test/ Modified: head/contrib/jemalloc/FREEBSD-diffs ============================================================================== --- head/contrib/jemalloc/FREEBSD-diffs Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/FREEBSD-diffs Thu Mar 2 01:14:48 2017 (r314529) @@ -1,5 +1,5 @@ diff --git a/doc/jemalloc.xml.in b/doc/jemalloc.xml.in -index d9c8345..9898c3c 100644 +index c97ab0f..be8dda5 100644 --- a/doc/jemalloc.xml.in +++ b/doc/jemalloc.xml.in @@ -53,11 +53,23 @@ @@ -27,7 +27,7 @@ index d9c8345..9898c3c 100644 Standard API -@@ -2963,4 +2975,18 @@ malloc_conf = "lg_chunk:24";]]> +@@ -2989,4 +3001,18 @@ malloc_conf = "lg_chunk:24";]]> The posix_memalign() function conforms to IEEE Std 1003.1-2001 (POSIX.1). @@ -47,10 +47,10 @@ index d9c8345..9898c3c 100644 + diff --git a/include/jemalloc/internal/arena.h b/include/jemalloc/internal/arena.h -index ce4e602..35360b6 100644 +index 119e3a5..277989f 100644 --- a/include/jemalloc/internal/arena.h +++ b/include/jemalloc/internal/arena.h -@@ -730,8 +730,13 @@ arena_miscelm_get_mutable(arena_chunk_t *chunk, size_t pageind) +@@ -731,8 +731,13 @@ arena_miscelm_get_mutable(arena_chunk_t *chunk, size_t pageind) JEMALLOC_ALWAYS_INLINE const arena_chunk_map_misc_t * arena_miscelm_get_const(const arena_chunk_t *chunk, size_t pageind) { @@ -64,7 +64,7 @@ index ce4e602..35360b6 100644 } JEMALLOC_ALWAYS_INLINE size_t -@@ -790,8 +795,13 @@ arena_mapbitsp_get_mutable(arena_chunk_t *chunk, size_t pageind) +@@ -791,8 +796,13 @@ arena_mapbitsp_get_mutable(arena_chunk_t *chunk, size_t pageind) JEMALLOC_ALWAYS_INLINE const size_t * arena_mapbitsp_get_const(const arena_chunk_t *chunk, size_t pageind) { @@ -79,7 +79,7 @@ index ce4e602..35360b6 100644 JEMALLOC_ALWAYS_INLINE size_t diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in -index e7ace7d..d86c61d 100644 +index e3b499a..827fdbf 100644 --- a/include/jemalloc/internal/jemalloc_internal.h.in +++ b/include/jemalloc/internal/jemalloc_internal.h.in @@ -8,6 +8,9 @@ @@ -122,7 +122,7 @@ index c907d91..4626632 100644 #ifdef _WIN32 # include diff --git a/include/jemalloc/internal/mutex.h b/include/jemalloc/internal/mutex.h -index b442d2d..76518db 100644 +index 2b4b1c3..e03a6d0 100644 --- a/include/jemalloc/internal/mutex.h +++ b/include/jemalloc/internal/mutex.h @@ -57,9 +57,6 @@ struct malloc_mutex_s { @@ -144,10 +144,10 @@ index b442d2d..76518db 100644 #endif /* JEMALLOC_H_EXTERNS */ diff --git a/include/jemalloc/internal/private_symbols.txt b/include/jemalloc/internal/private_symbols.txt -index c1c6c40..c6395fd 100644 +index 60b57e5..056a8fe 100644 --- a/include/jemalloc/internal/private_symbols.txt +++ b/include/jemalloc/internal/private_symbols.txt -@@ -310,7 +310,6 @@ iralloct_realign +@@ -312,7 +312,6 @@ iralloct_realign isalloc isdalloct isqalloc @@ -335,7 +335,7 @@ index f943891..47d032c 100755 +#include "jemalloc_FreeBSD.h" EOF diff --git a/src/jemalloc.c b/src/jemalloc.c -index baead66..8a49f26 100644 +index f73a26c..fcfe204 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -4,6 +4,10 @@ @@ -349,7 +349,7 @@ index baead66..8a49f26 100644 /* Runtime configuration options. */ const char *je_malloc_conf #ifndef _WIN32 -@@ -2775,6 +2779,107 @@ je_malloc_usable_size(JEMALLOC_USABLE_SIZE_CONST void *ptr) +@@ -2781,6 +2785,107 @@ je_malloc_usable_size(JEMALLOC_USABLE_SIZE_CONST void *ptr) */ /******************************************************************************/ /* @@ -457,7 +457,7 @@ index baead66..8a49f26 100644 * The following functions are used by threading libraries for protection of * malloc during fork(). */ -@@ -2913,4 +3018,11 @@ jemalloc_postfork_child(void) +@@ -2922,4 +3027,11 @@ jemalloc_postfork_child(void) ctl_postfork_child(tsd_tsdn(tsd)); } @@ -516,7 +516,7 @@ index 6333e73..13f8d79 100644 +#endif +} diff --git a/src/util.c b/src/util.c -index dd8c236..a4ff287 100755 +index dd8c236..a4ff287 100644 --- a/src/util.c +++ b/src/util.c @@ -67,6 +67,22 @@ wrtmessage(void *cbopaque, const char *s) Modified: head/contrib/jemalloc/VERSION ============================================================================== --- head/contrib/jemalloc/VERSION Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/VERSION Thu Mar 2 01:14:48 2017 (r314529) @@ -1 +1 @@ -4.4.0-0-gf1f76357313e7dcad7262f17a48ff0a2e005fcdc +4.5.0-0-g04380e79f1e2428bd0ad000bbc6e3d2dfc6b66a5 Modified: head/contrib/jemalloc/doc/jemalloc.3 ============================================================================== --- head/contrib/jemalloc/doc/jemalloc.3 Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/doc/jemalloc.3 Thu Mar 2 01:14:48 2017 (r314529) @@ -2,12 +2,12 @@ .\" Title: JEMALLOC .\" Author: Jason Evans .\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 12/04/2016 +.\" Date: 02/28/2017 .\" Manual: User Manual -.\" Source: jemalloc 4.4.0-0-gf1f76357313e7dcad7262f17a48ff0a2e005fcdc +.\" Source: jemalloc 4.5.0-0-g04380e79f1e2428bd0ad000bbc6e3d2dfc6b66a5 .\" Language: English .\" -.TH "JEMALLOC" "3" "12/04/2016" "jemalloc 4.4.0-0-gf1f76357313e" "User Manual" +.TH "JEMALLOC" "3" "02/28/2017" "jemalloc 4.5.0-0-g04380e79f1e2" "User Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,7 +31,7 @@ jemalloc \- general purpose memory allocation functions .SH "LIBRARY" .PP -This manual describes jemalloc 4\&.4\&.0\-0\-gf1f76357313e7dcad7262f17a48ff0a2e005fcdc\&. More information can be found at the +This manual describes jemalloc 4\&.5\&.0\-0\-g04380e79f1e2428bd0ad000bbc6e3d2dfc6b66a5\&. More information can be found at the \m[blue]\fBjemalloc website\fR\m[]\&\s-2\u[1]\d\s+2\&. .PP The following configuration options are enabled in libc\*(Aqs built\-in jemalloc: @@ -779,6 +779,12 @@ config\&.tcache (\fBbool\fR) r\- was not specified during build configuration\&. .RE .PP +config\&.thp (\fBbool\fR) r\- +.RS 4 +\fB\-\-disable\-thp\fR +was not specified during build configuration, and the system supports transparent huge page manipulation\&. +.RE +.PP config\&.tls (\fBbool\fR) r\- .RS 4 \fB\-\-disable\-tls\fR @@ -965,6 +971,11 @@ option for related tuning information\&. \m[blue]\fBValgrind\fR\m[]\&\s-2\u[3]\d\s+2, in which case it is forcefully disabled\&. .RE .PP +opt\&.thp (\fBbool\fR) r\- [\fB\-\-enable\-thp\fR] +.RS 4 +Transparent huge page (THP) integration enabled/disabled\&. When enabled, THPs are explicitly disabled as a side effect of unused dirty page purging for chunks that back small and/or large allocations, because such chunks typically comprise active, unused dirty, and untouched clean pages\&. This option is enabled by default\&. +.RE +.PP opt\&.lg_tcache_max (\fBsize_t\fR) r\- [\fB\-\-enable\-tcache\fR] .RS 4 Maximum size class (log base 2) to cache in the thread\-specific cache (tcache)\&. At a minimum, all small size classes are cached, and at a maximum all large size classes are cached\&. The default maximum is 32 KiB (2^15)\&. Modified: head/contrib/jemalloc/include/jemalloc/internal/arena.h ============================================================================== --- head/contrib/jemalloc/include/jemalloc/internal/arena.h Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/include/jemalloc/internal/arena.h Thu Mar 2 01:14:48 2017 (r314529) @@ -506,6 +506,7 @@ static const size_t large_pad = #endif ; +extern bool opt_thp; extern purge_mode_t opt_purge; extern const char *purge_mode_names[]; extern ssize_t opt_lg_dirty_mult; Modified: head/contrib/jemalloc/include/jemalloc/internal/chunk.h ============================================================================== --- head/contrib/jemalloc/include/jemalloc/internal/chunk.h Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/include/jemalloc/internal/chunk.h Thu Mar 2 01:14:48 2017 (r314529) @@ -52,8 +52,8 @@ chunk_hooks_t chunk_hooks_get(tsdn_t *ts chunk_hooks_t chunk_hooks_set(tsdn_t *tsdn, arena_t *arena, const chunk_hooks_t *chunk_hooks); -bool chunk_register(tsdn_t *tsdn, const void *chunk, - const extent_node_t *node); +bool chunk_register(const void *chunk, const extent_node_t *node, + bool *gdump); void chunk_deregister(const void *chunk, const extent_node_t *node); void *chunk_alloc_base(size_t size); void *chunk_alloc_cache(tsdn_t *tsdn, arena_t *arena, Modified: head/contrib/jemalloc/include/jemalloc/internal/extent.h ============================================================================== --- head/contrib/jemalloc/include/jemalloc/internal/extent.h Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/include/jemalloc/internal/extent.h Thu Mar 2 01:14:48 2017 (r314529) @@ -75,6 +75,11 @@ typedef rb_tree(extent_node_t) extent_tr /******************************************************************************/ #ifdef JEMALLOC_H_EXTERNS +#ifdef JEMALLOC_JET +size_t extent_size_quantize_floor(size_t size); +#endif +size_t extent_size_quantize_ceil(size_t size); + rb_proto(, extent_tree_szsnad_, extent_tree_t, extent_node_t) rb_proto(, extent_tree_ad_, extent_tree_t, extent_node_t) Modified: head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h ============================================================================== --- head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h Thu Mar 2 01:14:48 2017 (r314529) @@ -96,6 +96,13 @@ static const bool config_tcache = false #endif ; +static const bool config_thp = +#ifdef JEMALLOC_THP + true +#else + false +#endif + ; static const bool config_tls = #ifdef JEMALLOC_TLS true @@ -155,7 +162,6 @@ static const bool config_cache_oblivious #include #include #include -#include #endif #include "jemalloc/internal/ph.h" Modified: head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h ============================================================================== --- head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h Thu Mar 2 01:14:48 2017 (r314529) @@ -240,7 +240,6 @@ * Darwin (OS X) uses zones to work around Mach-O symbol override shortcomings. */ /* #undef JEMALLOC_ZONE */ -/* #undef JEMALLOC_ZONE_VERSION */ /* * Methods for determining whether the OS overcommits. @@ -255,6 +254,12 @@ #define JEMALLOC_HAVE_MADVISE /* + * Defined if transparent huge pages are supported via the MADV_[NO]HUGEPAGE + * arguments to madvise(2). + */ +/* #undef JEMALLOC_HAVE_MADVISE_HUGE */ + +/* * Methods for purging unused pages differ between operating systems. * * madvise(..., MADV_FREE) : This marks pages as being unused, such that they @@ -266,10 +271,7 @@ #define JEMALLOC_PURGE_MADVISE_FREE #define JEMALLOC_PURGE_MADVISE_DONTNEED -/* - * Defined if transparent huge pages are supported via the MADV_[NO]HUGEPAGE - * arguments to madvise(2). - */ +/* Defined if transparent huge page support is enabled. */ /* #undef JEMALLOC_THP */ /* Define if operating system has alloca.h header. */ Modified: head/contrib/jemalloc/include/jemalloc/internal/mb.h ============================================================================== --- head/contrib/jemalloc/include/jemalloc/internal/mb.h Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/include/jemalloc/internal/mb.h Thu Mar 2 01:14:48 2017 (r314529) @@ -76,7 +76,7 @@ mb_write(void) : "memory" /* Clobbers. */ ); } -#elif defined(__sparc64__) +#elif defined(__sparc__) && defined(__arch64__) JEMALLOC_INLINE void mb_write(void) { Modified: head/contrib/jemalloc/include/jemalloc/internal/mutex.h ============================================================================== --- head/contrib/jemalloc/include/jemalloc/internal/mutex.h Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/include/jemalloc/internal/mutex.h Thu Mar 2 01:14:48 2017 (r314529) @@ -83,8 +83,8 @@ JEMALLOC_INLINE void malloc_mutex_lock(tsdn_t *tsdn, malloc_mutex_t *mutex) { + witness_assert_not_owner(tsdn, &mutex->witness); if (isthreaded) { - witness_assert_not_owner(tsdn, &mutex->witness); #ifdef _WIN32 # if _WIN32_WINNT >= 0x0600 AcquireSRWLockExclusive(&mutex->lock); @@ -98,16 +98,16 @@ malloc_mutex_lock(tsdn_t *tsdn, malloc_m #else pthread_mutex_lock(&mutex->lock); #endif - witness_lock(tsdn, &mutex->witness); } + witness_lock(tsdn, &mutex->witness); } JEMALLOC_INLINE void malloc_mutex_unlock(tsdn_t *tsdn, malloc_mutex_t *mutex) { + witness_unlock(tsdn, &mutex->witness); if (isthreaded) { - witness_unlock(tsdn, &mutex->witness); #ifdef _WIN32 # if _WIN32_WINNT >= 0x0600 ReleaseSRWLockExclusive(&mutex->lock); @@ -128,16 +128,14 @@ JEMALLOC_INLINE void malloc_mutex_assert_owner(tsdn_t *tsdn, malloc_mutex_t *mutex) { - if (isthreaded) - witness_assert_owner(tsdn, &mutex->witness); + witness_assert_owner(tsdn, &mutex->witness); } JEMALLOC_INLINE void malloc_mutex_assert_not_owner(tsdn_t *tsdn, malloc_mutex_t *mutex) { - if (isthreaded) - witness_assert_not_owner(tsdn, &mutex->witness); + witness_assert_not_owner(tsdn, &mutex->witness); } #endif Modified: head/contrib/jemalloc/include/jemalloc/internal/private_namespace.h ============================================================================== --- head/contrib/jemalloc/include/jemalloc/internal/private_namespace.h Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/include/jemalloc/internal/private_namespace.h Thu Mar 2 01:14:48 2017 (r314529) @@ -223,6 +223,8 @@ #define extent_node_sn_set JEMALLOC_N(extent_node_sn_set) #define extent_node_zeroed_get JEMALLOC_N(extent_node_zeroed_get) #define extent_node_zeroed_set JEMALLOC_N(extent_node_zeroed_set) +#define extent_size_quantize_ceil JEMALLOC_N(extent_size_quantize_ceil) +#define extent_size_quantize_floor JEMALLOC_N(extent_size_quantize_floor) #define extent_tree_ad_destroy JEMALLOC_N(extent_tree_ad_destroy) #define extent_tree_ad_destroy_recurse JEMALLOC_N(extent_tree_ad_destroy_recurse) #define extent_tree_ad_empty JEMALLOC_N(extent_tree_ad_empty) @@ -389,6 +391,7 @@ #define opt_redzone JEMALLOC_N(opt_redzone) #define opt_stats_print JEMALLOC_N(opt_stats_print) #define opt_tcache JEMALLOC_N(opt_tcache) +#define opt_thp JEMALLOC_N(opt_thp) #define opt_utrace JEMALLOC_N(opt_utrace) #define opt_xmalloc JEMALLOC_N(opt_xmalloc) #define opt_zero JEMALLOC_N(opt_zero) @@ -528,6 +531,9 @@ #define tcache_get JEMALLOC_N(tcache_get) #define tcache_get_hard JEMALLOC_N(tcache_get_hard) #define tcache_maxclass JEMALLOC_N(tcache_maxclass) +#define tcache_postfork_child JEMALLOC_N(tcache_postfork_child) +#define tcache_postfork_parent JEMALLOC_N(tcache_postfork_parent) +#define tcache_prefork JEMALLOC_N(tcache_prefork) #define tcache_salloc JEMALLOC_N(tcache_salloc) #define tcache_stats_merge JEMALLOC_N(tcache_stats_merge) #define tcaches JEMALLOC_N(tcaches) @@ -611,14 +617,16 @@ #define valgrind_make_mem_defined JEMALLOC_N(valgrind_make_mem_defined) #define valgrind_make_mem_noaccess JEMALLOC_N(valgrind_make_mem_noaccess) #define valgrind_make_mem_undefined JEMALLOC_N(valgrind_make_mem_undefined) +#define witness_assert_depth JEMALLOC_N(witness_assert_depth) +#define witness_assert_depth_to_rank JEMALLOC_N(witness_assert_depth_to_rank) #define witness_assert_lockless JEMALLOC_N(witness_assert_lockless) #define witness_assert_not_owner JEMALLOC_N(witness_assert_not_owner) #define witness_assert_owner JEMALLOC_N(witness_assert_owner) +#define witness_depth_error JEMALLOC_N(witness_depth_error) #define witness_fork_cleanup JEMALLOC_N(witness_fork_cleanup) #define witness_init JEMALLOC_N(witness_init) #define witness_lock JEMALLOC_N(witness_lock) #define witness_lock_error JEMALLOC_N(witness_lock_error) -#define witness_lockless_error JEMALLOC_N(witness_lockless_error) #define witness_not_owner_error JEMALLOC_N(witness_not_owner_error) #define witness_owner JEMALLOC_N(witness_owner) #define witness_owner_error JEMALLOC_N(witness_owner_error) Modified: head/contrib/jemalloc/include/jemalloc/internal/tcache.h ============================================================================== --- head/contrib/jemalloc/include/jemalloc/internal/tcache.h Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/include/jemalloc/internal/tcache.h Thu Mar 2 01:14:48 2017 (r314529) @@ -149,6 +149,9 @@ bool tcaches_create(tsd_t *tsd, unsigned void tcaches_flush(tsd_t *tsd, unsigned ind); void tcaches_destroy(tsd_t *tsd, unsigned ind); bool tcache_boot(tsdn_t *tsdn); +void tcache_prefork(tsdn_t *tsdn); +void tcache_postfork_parent(tsdn_t *tsdn); +void tcache_postfork_child(tsdn_t *tsdn); #endif /* JEMALLOC_H_EXTERNS */ /******************************************************************************/ Modified: head/contrib/jemalloc/include/jemalloc/internal/tsd.h ============================================================================== --- head/contrib/jemalloc/include/jemalloc/internal/tsd.h Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/include/jemalloc/internal/tsd.h Thu Mar 2 01:14:48 2017 (r314529) @@ -479,13 +479,14 @@ a_name##tsd_wrapper_get(bool init) \ \ if (init && unlikely(wrapper == NULL)) { \ tsd_init_block_t block; \ - wrapper = tsd_init_check_recursion( \ - &a_name##tsd_init_head, &block); \ + wrapper = (a_name##tsd_wrapper_t *) \ + tsd_init_check_recursion(&a_name##tsd_init_head, \ + &block); \ if (wrapper) \ return (wrapper); \ wrapper = (a_name##tsd_wrapper_t *) \ malloc_tsd_malloc(sizeof(a_name##tsd_wrapper_t)); \ - block.data = wrapper; \ + block.data = (void *)wrapper; \ if (wrapper == NULL) { \ malloc_write(": Error allocating" \ " TSD for "#a_name"\n"); \ Modified: head/contrib/jemalloc/include/jemalloc/internal/witness.h ============================================================================== --- head/contrib/jemalloc/include/jemalloc/internal/witness.h Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/include/jemalloc/internal/witness.h Thu Mar 2 01:14:48 2017 (r314529) @@ -12,21 +12,32 @@ typedef int witness_comp_t (const witnes */ #define WITNESS_RANK_OMIT 0U +#define WITNESS_RANK_MIN 1U + #define WITNESS_RANK_INIT 1U #define WITNESS_RANK_CTL 1U -#define WITNESS_RANK_ARENAS 2U +#define WITNESS_RANK_TCACHES 2U +#define WITNESS_RANK_ARENAS 3U + +#define WITNESS_RANK_PROF_DUMP 4U +#define WITNESS_RANK_PROF_BT2GCTX 5U +#define WITNESS_RANK_PROF_TDATAS 6U +#define WITNESS_RANK_PROF_TDATA 7U +#define WITNESS_RANK_PROF_GCTX 8U + +/* + * Used as an argument to witness_assert_depth_to_rank() in order to validate + * depth excluding non-core locks with lower ranks. Since the rank argument to + * witness_assert_depth_to_rank() is inclusive rather than exclusive, this + * definition can have the same value as the minimally ranked core lock. + */ +#define WITNESS_RANK_CORE 9U -#define WITNESS_RANK_PROF_DUMP 3U -#define WITNESS_RANK_PROF_BT2GCTX 4U -#define WITNESS_RANK_PROF_TDATAS 5U -#define WITNESS_RANK_PROF_TDATA 6U -#define WITNESS_RANK_PROF_GCTX 7U - -#define WITNESS_RANK_ARENA 8U -#define WITNESS_RANK_ARENA_CHUNKS 9U -#define WITNESS_RANK_ARENA_NODE_CACHE 10 +#define WITNESS_RANK_ARENA 9U +#define WITNESS_RANK_ARENA_CHUNKS 10U +#define WITNESS_RANK_ARENA_NODE_CACHE 11U -#define WITNESS_RANK_BASE 11U +#define WITNESS_RANK_BASE 12U #define WITNESS_RANK_LEAF 0xffffffffU #define WITNESS_RANK_ARENA_BIN WITNESS_RANK_LEAF @@ -91,10 +102,12 @@ extern witness_not_owner_error_t *witnes void witness_not_owner_error(const witness_t *witness); #endif #ifdef JEMALLOC_JET -typedef void (witness_lockless_error_t)(const witness_list_t *); -extern witness_lockless_error_t *witness_lockless_error; +typedef void (witness_depth_error_t)(const witness_list_t *, + witness_rank_t rank_inclusive, unsigned depth); +extern witness_depth_error_t *witness_depth_error; #else -void witness_lockless_error(const witness_list_t *witnesses); +void witness_depth_error(const witness_list_t *witnesses, + witness_rank_t rank_inclusive, unsigned depth); #endif void witnesses_cleanup(tsd_t *tsd); @@ -111,6 +124,9 @@ void witness_postfork_child(tsd_t *tsd); bool witness_owner(tsd_t *tsd, const witness_t *witness); void witness_assert_owner(tsdn_t *tsdn, const witness_t *witness); void witness_assert_not_owner(tsdn_t *tsdn, const witness_t *witness); +void witness_assert_depth_to_rank(tsdn_t *tsdn, witness_rank_t rank_inclusive, + unsigned depth); +void witness_assert_depth(tsdn_t *tsdn, unsigned depth); void witness_assert_lockless(tsdn_t *tsdn); void witness_lock(tsdn_t *tsdn, witness_t *witness); void witness_unlock(tsdn_t *tsdn, witness_t *witness); @@ -123,6 +139,8 @@ witness_owner(tsd_t *tsd, const witness_ witness_list_t *witnesses; witness_t *w; + cassert(config_debug); + witnesses = tsd_witnessesp_get(tsd); ql_foreach(w, witnesses, link) { if (w == witness) @@ -175,9 +193,10 @@ witness_assert_not_owner(tsdn_t *tsdn, c } JEMALLOC_INLINE void -witness_assert_lockless(tsdn_t *tsdn) -{ +witness_assert_depth_to_rank(tsdn_t *tsdn, witness_rank_t rank_inclusive, + unsigned depth) { tsd_t *tsd; + unsigned d; witness_list_t *witnesses; witness_t *w; @@ -188,10 +207,29 @@ witness_assert_lockless(tsdn_t *tsdn) return; tsd = tsdn_tsd(tsdn); + d = 0; witnesses = tsd_witnessesp_get(tsd); w = ql_last(witnesses, link); - if (w != NULL) - witness_lockless_error(witnesses); + if (w != NULL) { + ql_reverse_foreach(w, witnesses, link) { + if (w->rank < rank_inclusive) { + break; + } + d++; + } + } + if (d != depth) + witness_depth_error(witnesses, rank_inclusive, depth); +} + +JEMALLOC_INLINE void +witness_assert_depth(tsdn_t *tsdn, unsigned depth) { + witness_assert_depth_to_rank(tsdn, WITNESS_RANK_MIN, depth); +} + +JEMALLOC_INLINE void +witness_assert_lockless(tsdn_t *tsdn) { + witness_assert_depth(tsdn, 0); } JEMALLOC_INLINE void Modified: head/contrib/jemalloc/include/jemalloc/jemalloc.h ============================================================================== --- head/contrib/jemalloc/include/jemalloc/jemalloc.h Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/include/jemalloc/jemalloc.h Thu Mar 2 01:14:48 2017 (r314529) @@ -87,12 +87,12 @@ extern "C" { #include #include -#define JEMALLOC_VERSION "4.4.0-0-gf1f76357313e7dcad7262f17a48ff0a2e005fcdc" +#define JEMALLOC_VERSION "4.5.0-0-g04380e79f1e2428bd0ad000bbc6e3d2dfc6b66a5" #define JEMALLOC_VERSION_MAJOR 4 -#define JEMALLOC_VERSION_MINOR 4 +#define JEMALLOC_VERSION_MINOR 5 #define JEMALLOC_VERSION_BUGFIX 0 #define JEMALLOC_VERSION_NREV 0 -#define JEMALLOC_VERSION_GID "f1f76357313e7dcad7262f17a48ff0a2e005fcdc" +#define JEMALLOC_VERSION_GID "04380e79f1e2428bd0ad000bbc6e3d2dfc6b66a5" # define MALLOCX_LG_ALIGN(la) ((int)(la)) # if LG_SIZEOF_PTR == 2 Modified: head/contrib/jemalloc/src/arena.c ============================================================================== --- head/contrib/jemalloc/src/arena.c Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/src/arena.c Thu Mar 2 01:14:48 2017 (r314529) @@ -4,6 +4,8 @@ /******************************************************************************/ /* Data. */ +bool opt_thp = true; +static bool thp_initially_huge; purge_mode_t opt_purge = PURGE_DEFAULT; const char *purge_mode_names[] = { "ratio", @@ -568,8 +570,8 @@ arena_chunk_init_spare(arena_t *arena) } static bool -arena_chunk_register(tsdn_t *tsdn, arena_t *arena, arena_chunk_t *chunk, - size_t sn, bool zero) +arena_chunk_register(arena_t *arena, arena_chunk_t *chunk, size_t sn, bool zero, + bool *gdump) { /* @@ -580,7 +582,7 @@ arena_chunk_register(tsdn_t *tsdn, arena */ extent_node_init(&chunk->node, arena, chunk, chunksize, sn, zero, true); extent_node_achunk_set(&chunk->node, true); - return (chunk_register(tsdn, chunk, &chunk->node)); + return (chunk_register(chunk, &chunk->node, gdump)); } static arena_chunk_t * @@ -591,6 +593,8 @@ arena_chunk_alloc_internal_hard(tsdn_t * size_t sn; malloc_mutex_unlock(tsdn, &arena->lock); + /* prof_gdump() requirement. */ + witness_assert_depth_to_rank(tsdn, WITNESS_RANK_CORE, 0); chunk = (arena_chunk_t *)chunk_alloc_wrapper(tsdn, arena, chunk_hooks, NULL, chunksize, chunksize, &sn, zero, commit); @@ -603,16 +607,20 @@ arena_chunk_alloc_internal_hard(tsdn_t * chunk = NULL; } } - if (chunk != NULL && arena_chunk_register(tsdn, arena, chunk, sn, - *zero)) { - if (!*commit) { - /* Undo commit of header. */ - chunk_hooks->decommit(chunk, chunksize, 0, map_bias << - LG_PAGE, arena->ind); - } - chunk_dalloc_wrapper(tsdn, arena, chunk_hooks, (void *)chunk, - chunksize, sn, *zero, *commit); - chunk = NULL; + if (chunk != NULL) { + bool gdump; + if (arena_chunk_register(arena, chunk, sn, *zero, &gdump)) { + if (!*commit) { + /* Undo commit of header. */ + chunk_hooks->decommit(chunk, chunksize, 0, + map_bias << LG_PAGE, arena->ind); + } + chunk_dalloc_wrapper(tsdn, arena, chunk_hooks, + (void *)chunk, chunksize, sn, *zero, *commit); + chunk = NULL; + } + if (config_prof && opt_prof && gdump) + prof_gdump(tsdn); } malloc_mutex_lock(tsdn, &arena->lock); @@ -627,14 +635,24 @@ arena_chunk_alloc_internal(tsdn_t *tsdn, chunk_hooks_t chunk_hooks = CHUNK_HOOKS_INITIALIZER; size_t sn; + /* prof_gdump() requirement. */ + witness_assert_depth_to_rank(tsdn, WITNESS_RANK_CORE, 1); + malloc_mutex_assert_owner(tsdn, &arena->lock); + chunk = chunk_alloc_cache(tsdn, arena, &chunk_hooks, NULL, chunksize, chunksize, &sn, zero, commit, true); if (chunk != NULL) { - if (arena_chunk_register(tsdn, arena, chunk, sn, *zero)) { + bool gdump; + if (arena_chunk_register(arena, chunk, sn, *zero, &gdump)) { chunk_dalloc_cache(tsdn, arena, &chunk_hooks, chunk, chunksize, sn, true); return (NULL); } + if (config_prof && opt_prof && gdump) { + malloc_mutex_unlock(tsdn, &arena->lock); + prof_gdump(tsdn); + malloc_mutex_lock(tsdn, &arena->lock); + } } if (chunk == NULL) { chunk = arena_chunk_alloc_internal_hard(tsdn, arena, @@ -664,7 +682,9 @@ arena_chunk_init_hard(tsdn_t *tsdn, aren if (chunk == NULL) return (NULL); - chunk->hugepage = true; + if (config_thp && opt_thp) { + chunk->hugepage = thp_initially_huge; + } /* * Initialize the map to contain one maximal free untouched run. Mark @@ -729,14 +749,17 @@ arena_chunk_alloc(tsdn_t *tsdn, arena_t static void arena_chunk_discard(tsdn_t *tsdn, arena_t *arena, arena_chunk_t *chunk) { - size_t sn, hugepage; + size_t sn; + UNUSED bool hugepage JEMALLOC_CC_SILENCE_INIT(false); bool committed; chunk_hooks_t chunk_hooks = CHUNK_HOOKS_INITIALIZER; chunk_deregister(chunk, &chunk->node); sn = extent_node_sn_get(&chunk->node); - hugepage = chunk->hugepage; + if (config_thp && opt_thp) { + hugepage = chunk->hugepage; + } committed = (arena_mapbits_decommitted_get(chunk, map_bias) == 0); if (!committed) { /* @@ -749,13 +772,16 @@ arena_chunk_discard(tsdn_t *tsdn, arena_ chunk_hooks.decommit(chunk, chunksize, 0, map_bias << LG_PAGE, arena->ind); } - if (!hugepage) { + if (config_thp && opt_thp && hugepage != thp_initially_huge) { /* - * Convert chunk back to the default state, so that all - * subsequent chunk allocations start out with chunks that can - * be backed by transparent huge pages. + * Convert chunk back to initial THP state, so that all + * subsequent chunk allocations start out in a consistent state. */ - pages_huge(chunk, chunksize); + if (thp_initially_huge) { + pages_huge(chunk, chunksize); + } else { + pages_nohuge(chunk, chunksize); + } } chunk_dalloc_cache(tsdn, arena, &chunk_hooks, (void *)chunk, chunksize, @@ -1695,13 +1721,13 @@ arena_purge_stashed(tsdn_t *tsdn, arena_ /* * If this is the first run purged within chunk, mark - * the chunk as non-huge. This will prevent all use of - * transparent huge pages for this chunk until the chunk - * as a whole is deallocated. + * the chunk as non-THP-capable. This will prevent all + * use of THPs for this chunk until the chunk as a whole + * is deallocated. */ - if (chunk->hugepage) { - pages_nohuge(chunk, chunksize); - chunk->hugepage = false; + if (config_thp && opt_thp && chunk->hugepage) { + chunk->hugepage = pages_nohuge(chunk, + chunksize); } assert(pageind + npages <= chunk_npages); @@ -2694,6 +2720,7 @@ arena_malloc_hard(tsdn_t *tsdn, arena_t return (arena_malloc_small(tsdn, arena, ind, zero)); if (likely(size <= large_maxclass)) return (arena_malloc_large(tsdn, arena, ind, zero)); + assert(index2size(ind) >= chunksize); return (huge_malloc(tsdn, arena, index2size(ind), zero)); } @@ -3755,11 +3782,78 @@ bin_info_init(void) #undef SC } +static void +init_thp_initially_huge(void) { + int fd; + char buf[sizeof("[always] madvise never\n")]; + ssize_t nread; + static const char *enabled_states[] = { + "[always] madvise never\n", + "always [madvise] never\n", + "always madvise [never]\n" + }; + static const bool thp_initially_huge_states[] = { + true, + false, + false + }; + unsigned i; + + if (config_debug) { + for (i = 0; i < sizeof(enabled_states)/sizeof(const char *); + i++) { + assert(sizeof(buf) > strlen(enabled_states[i])); + } + } + assert(sizeof(enabled_states)/sizeof(const char *) == + sizeof(thp_initially_huge_states)/sizeof(bool)); + +#if defined(JEMALLOC_USE_SYSCALL) && defined(SYS_open) + fd = (int)syscall(SYS_open, + "/sys/kernel/mm/transparent_hugepage/enabled", O_RDONLY); +#else + fd = open("/sys/kernel/mm/transparent_hugepage/enabled", O_RDONLY); +#endif + if (fd == -1) { + goto label_error; + } + +#if defined(JEMALLOC_USE_SYSCALL) && defined(SYS_read) + nread = (ssize_t)syscall(SYS_read, fd, &buf, sizeof(buf)); +#else + nread = read(fd, &buf, sizeof(buf)); +#endif + +#if defined(JEMALLOC_USE_SYSCALL) && defined(SYS_close) + syscall(SYS_close, fd); +#else + close(fd); +#endif + + if (nread < 1) { + goto label_error; + } + for (i = 0; i < sizeof(enabled_states)/sizeof(const char *); + i++) { + if (strncmp(buf, enabled_states[i], (size_t)nread) == 0) { + thp_initially_huge = thp_initially_huge_states[i]; + return; + } + } + +label_error: + thp_initially_huge = false; +} + void arena_boot(void) { unsigned i; + if (config_thp && opt_thp) { + init_thp_initially_huge(); + } + arena_lg_dirty_mult_default_set(opt_lg_dirty_mult); arena_decay_time_default_set(opt_decay_time); @@ -3790,15 +3884,8 @@ arena_boot(void) arena_maxrun = chunksize - (map_bias << LG_PAGE); assert(arena_maxrun > 0); large_maxclass = index2size(size2index(chunksize)-1); - if (large_maxclass > arena_maxrun) { - /* - * For small chunk sizes it's possible for there to be fewer - * non-header pages available than are necessary to serve the - * size classes just below chunksize. - */ - large_maxclass = arena_maxrun; - } assert(large_maxclass > 0); + assert(large_maxclass + large_pad <= arena_maxrun); nlclasses = size2index(large_maxclass) - size2index(SMALL_MAXCLASS); nhclasses = NSIZES - nlclasses - NBINS; Modified: head/contrib/jemalloc/src/chunk.c ============================================================================== --- head/contrib/jemalloc/src/chunk.c Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/src/chunk.c Thu Mar 2 01:14:48 2017 (r314529) @@ -141,7 +141,7 @@ chunk_hooks_assure_initialized(tsdn_t *t } bool -chunk_register(tsdn_t *tsdn, const void *chunk, const extent_node_t *node) +chunk_register(const void *chunk, const extent_node_t *node, bool *gdump) { assert(extent_node_addr_get(node) == chunk); @@ -160,8 +160,7 @@ chunk_register(tsdn_t *tsdn, const void */ high = atomic_read_z(&highchunks); } - if (cur > high && prof_gdump_get_unlocked()) - prof_gdump(tsdn); + *gdump = (cur > high && prof_gdump_get_unlocked()); } return (false); @@ -189,12 +188,17 @@ chunk_deregister(const void *chunk, cons static extent_node_t * chunk_first_best_fit(arena_t *arena, extent_tree_t *chunks_szsnad, size_t size) { + extent_node_t *node; + size_t qsize; extent_node_t key; assert(size == CHUNK_CEILING(size)); - extent_node_init(&key, arena, NULL, size, 0, false, false); - return (extent_tree_szsnad_nsearch(chunks_szsnad, &key)); + qsize = extent_size_quantize_ceil(size); + extent_node_init(&key, arena, NULL, qsize, 0, false, false); + node = extent_tree_szsnad_nsearch(chunks_szsnad, &key); + assert(node == NULL || extent_node_size_get(node) >= size); + return node; } static void * Modified: head/contrib/jemalloc/src/chunk_dss.c ============================================================================== --- head/contrib/jemalloc/src/chunk_dss.c Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/src/chunk_dss.c Thu Mar 2 01:14:48 2017 (r314529) @@ -115,8 +115,9 @@ chunk_alloc_dss(tsdn_t *tsdn, arena_t *a * malloc. */ while (true) { - void *ret, *cpad, *max_cur, *dss_next, *dss_prev; - size_t gap_size, cpad_size; + void *ret, *max_cur, *dss_next, *dss_prev; + void *gap_addr_chunk, *gap_addr_subchunk; + size_t gap_size_chunk, gap_size_subchunk; intptr_t incr; max_cur = chunk_dss_max_update(new_addr); @@ -124,25 +125,32 @@ chunk_alloc_dss(tsdn_t *tsdn, arena_t *a goto label_oom; /* - * Calculate how much padding is necessary to - * chunk-align the end of the DSS. - */ - gap_size = (chunksize - CHUNK_ADDR2OFFSET(dss_max)) & - chunksize_mask; - /* - * Compute how much chunk-aligned pad space (if any) is + * Compute how much chunk-aligned gap space (if any) is * necessary to satisfy alignment. This space can be * recycled for later use. */ - cpad = (void *)((uintptr_t)dss_max + gap_size); - ret = (void *)ALIGNMENT_CEILING((uintptr_t)dss_max, - alignment); - cpad_size = (uintptr_t)ret - (uintptr_t)cpad; + gap_addr_chunk = (void *)(CHUNK_CEILING( + (uintptr_t)max_cur)); + ret = (void *)ALIGNMENT_CEILING( + (uintptr_t)gap_addr_chunk, alignment); + gap_size_chunk = (uintptr_t)ret - + (uintptr_t)gap_addr_chunk; + /* + * Compute the address just past the end of the desired + * allocation space. + */ dss_next = (void *)((uintptr_t)ret + size); - if ((uintptr_t)ret < (uintptr_t)dss_max || - (uintptr_t)dss_next < (uintptr_t)dss_max) + if ((uintptr_t)ret < (uintptr_t)max_cur || + (uintptr_t)dss_next < (uintptr_t)max_cur) goto label_oom; /* Wrap-around. */ - incr = gap_size + cpad_size + size; + /* Compute the increment, including subchunk bytes. */ + gap_addr_subchunk = max_cur; + gap_size_subchunk = (uintptr_t)ret - + (uintptr_t)gap_addr_subchunk; + incr = gap_size_subchunk + size; + + assert((uintptr_t)max_cur + incr == (uintptr_t)ret + + size); /* * Optimistically update dss_max, and roll back below if @@ -157,11 +165,12 @@ chunk_alloc_dss(tsdn_t *tsdn, arena_t *a dss_prev = chunk_dss_sbrk(incr); if (dss_prev == max_cur) { /* Success. */ - if (cpad_size != 0) { + if (gap_size_chunk != 0) { chunk_hooks_t chunk_hooks = CHUNK_HOOKS_INITIALIZER; chunk_dalloc_wrapper(tsdn, arena, - &chunk_hooks, cpad, cpad_size, + &chunk_hooks, gap_addr_chunk, + gap_size_chunk, arena_extent_sn_next(arena), false, true); } Modified: head/contrib/jemalloc/src/ctl.c ============================================================================== --- head/contrib/jemalloc/src/ctl.c Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/src/ctl.c Thu Mar 2 01:14:48 2017 (r314529) @@ -84,6 +84,7 @@ CTL_PROTO(config_prof_libgcc) CTL_PROTO(config_prof_libunwind) CTL_PROTO(config_stats) CTL_PROTO(config_tcache) +CTL_PROTO(config_thp) CTL_PROTO(config_tls) CTL_PROTO(config_utrace) CTL_PROTO(config_valgrind) @@ -104,6 +105,7 @@ CTL_PROTO(opt_utrace) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Thu Mar 2 01:18:48 2017 Return-Path: Delivered-To: svn-src-all@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 F21C2CF2434; Thu, 2 Mar 2017 01:18:48 +0000 (UTC) (envelope-from ian@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 A8100385; Thu, 2 Mar 2017 01:18:48 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v221Il9g013189; Thu, 2 Mar 2017 01:18:47 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v221Iktx013176; Thu, 2 Mar 2017 01:18:46 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703020118.v221Iktx013176@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Thu, 2 Mar 2017 01:18:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314530 - in stable/11/sys: arm/arm arm/include contrib/vchiq/interface/compat X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 01:18:49 -0000 Author: ian Date: Thu Mar 2 01:18:46 2017 New Revision: 314530 URL: https://svnweb.freebsd.org/changeset/base/314530 Log: MFC r312292, r313573: Stop including sys/types.h from arm's machine/atomic.h, fix the places where atomic.h was being included without ensuring that types.h (via param.h) was included first, as required by atomic(9). Remove arm's cpuconf.h, and references to it, after moving a few lines from it into pmap-v4.h where they are used. Other than those few lines of support for different MMU types, nothing in cpuconf.h has been used in our code for quite a while. The file existed to set up a variety of symbols to describe the architecture. Over the past few years we have converted all of our source to use the new architecture symbols standardized by ARM Inc, and predefined by both clang and gcc. Deleted: stable/11/sys/arm/include/cpuconf.h Modified: stable/11/sys/arm/arm/bus_space_asm_generic.S stable/11/sys/arm/arm/cpufunc.c stable/11/sys/arm/arm/identcpu-v4.c stable/11/sys/arm/arm/identcpu-v6.c stable/11/sys/arm/arm/locore-v4.S stable/11/sys/arm/arm/locore-v6.S stable/11/sys/arm/arm/stack_machdep.c stable/11/sys/arm/include/atomic.h stable/11/sys/arm/include/cpufunc.h stable/11/sys/arm/include/pcpu.h stable/11/sys/arm/include/pmap-v4.h stable/11/sys/contrib/vchiq/interface/compat/vchi_bsd.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/arm/bus_space_asm_generic.S ============================================================================== --- stable/11/sys/arm/arm/bus_space_asm_generic.S Thu Mar 2 01:14:48 2017 (r314529) +++ stable/11/sys/arm/arm/bus_space_asm_generic.S Thu Mar 2 01:18:46 2017 (r314530) @@ -36,7 +36,6 @@ */ #include -#include __FBSDID("$FreeBSD$"); /* Modified: stable/11/sys/arm/arm/cpufunc.c ============================================================================== --- stable/11/sys/arm/arm/cpufunc.c Thu Mar 2 01:14:48 2017 (r314529) +++ stable/11/sys/arm/arm/cpufunc.c Thu Mar 2 01:18:46 2017 (r314530) @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #if defined(CPU_XSCALE_81342) Modified: stable/11/sys/arm/arm/identcpu-v4.c ============================================================================== --- stable/11/sys/arm/arm/identcpu-v4.c Thu Mar 2 01:14:48 2017 (r314529) +++ stable/11/sys/arm/arm/identcpu-v4.c Thu Mar 2 01:18:46 2017 (r314530) @@ -43,15 +43,14 @@ #include __FBSDID("$FreeBSD$"); -#include #include +#include #include #include #include #include #include -#include #include char machine[] = "arm"; Modified: stable/11/sys/arm/arm/identcpu-v6.c ============================================================================== --- stable/11/sys/arm/arm/identcpu-v6.c Thu Mar 2 01:14:48 2017 (r314529) +++ stable/11/sys/arm/arm/identcpu-v6.c Thu Mar 2 01:18:46 2017 (r314530) @@ -43,8 +43,8 @@ #include __FBSDID("$FreeBSD$"); -#include #include +#include #include #include #include Modified: stable/11/sys/arm/arm/locore-v4.S ============================================================================== --- stable/11/sys/arm/arm/locore-v4.S Thu Mar 2 01:14:48 2017 (r314529) +++ stable/11/sys/arm/arm/locore-v4.S Thu Mar 2 01:18:46 2017 (r314530) @@ -37,7 +37,6 @@ #include #include #include -#include #include __FBSDID("$FreeBSD$"); Modified: stable/11/sys/arm/arm/locore-v6.S ============================================================================== --- stable/11/sys/arm/arm/locore-v6.S Thu Mar 2 01:14:48 2017 (r314529) +++ stable/11/sys/arm/arm/locore-v6.S Thu Mar 2 01:18:46 2017 (r314530) @@ -34,7 +34,6 @@ #include #include #include -#include #include __FBSDID("$FreeBSD$"); Modified: stable/11/sys/arm/arm/stack_machdep.c ============================================================================== --- stable/11/sys/arm/arm/stack_machdep.c Thu Mar 2 01:14:48 2017 (r314529) +++ stable/11/sys/arm/arm/stack_machdep.c Thu Mar 2 01:18:46 2017 (r314530) @@ -27,8 +27,8 @@ #include __FBSDID("$FreeBSD$"); -#include #include +#include #include #include Modified: stable/11/sys/arm/include/atomic.h ============================================================================== --- stable/11/sys/arm/include/atomic.h Thu Mar 2 01:14:48 2017 (r314529) +++ stable/11/sys/arm/include/atomic.h Thu Mar 2 01:18:46 2017 (r314530) @@ -39,13 +39,10 @@ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ -#include #include #ifndef _KERNEL #include -#else -#include #endif #if __ARM_ARCH >= 6 Modified: stable/11/sys/arm/include/cpufunc.h ============================================================================== --- stable/11/sys/arm/include/cpufunc.h Thu Mar 2 01:14:48 2017 (r314529) +++ stable/11/sys/arm/include/cpufunc.h Thu Mar 2 01:18:46 2017 (r314530) @@ -48,7 +48,6 @@ #include #include -#include static __inline void breakpoint(void) Modified: stable/11/sys/arm/include/pcpu.h ============================================================================== --- stable/11/sys/arm/include/pcpu.h Thu Mar 2 01:14:48 2017 (r314529) +++ stable/11/sys/arm/include/pcpu.h Thu Mar 2 01:18:46 2017 (r314530) @@ -32,8 +32,6 @@ #ifdef _KERNEL -#include - #include #include Modified: stable/11/sys/arm/include/pmap-v4.h ============================================================================== --- stable/11/sys/arm/include/pmap-v4.h Thu Mar 2 01:14:48 2017 (r314529) +++ stable/11/sys/arm/include/pmap-v4.h Thu Mar 2 01:18:46 2017 (r314530) @@ -51,7 +51,30 @@ #define _MACHINE_PMAP_V4_H_ #include -#include + +/* + * Define the MMU types we support based on the cpu types. While the code has + * some theoretical support for multiple MMU types in a single kernel, there are + * no actual working configurations that use that feature. + */ +#if (defined(CPU_ARM9) || defined(CPU_ARM9E) || defined(CPU_FA526)) +#define ARM_MMU_GENERIC 1 +#else +#define ARM_MMU_GENERIC 0 +#endif + +#if (defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ + defined(CPU_XSCALE_81342)) +#define ARM_MMU_XSCALE 1 +#else +#define ARM_MMU_XSCALE 0 +#endif + +#define ARM_NMMUS (ARM_MMU_GENERIC + ARM_MMU_XSCALE) +#if ARM_NMMUS == 0 && !defined(KLD_MODULE) && defined(_KERNEL) +#error ARM_NMMUS is 0 +#endif + /* * Pte related macros */ Modified: stable/11/sys/contrib/vchiq/interface/compat/vchi_bsd.h ============================================================================== --- stable/11/sys/contrib/vchiq/interface/compat/vchi_bsd.h Thu Mar 2 01:14:48 2017 (r314529) +++ stable/11/sys/contrib/vchiq/interface/compat/vchi_bsd.h Thu Mar 2 01:18:46 2017 (r314530) @@ -28,8 +28,8 @@ #ifndef __VCHI_BSD_H__ #define __VCHI_BSD_H__ -#include #include +#include #include #include #include From owner-svn-src-all@freebsd.org Thu Mar 2 01:23:18 2017 Return-Path: Delivered-To: svn-src-all@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 EFAD1CF295D; Thu, 2 Mar 2017 01:23:18 +0000 (UTC) (envelope-from ian@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 B150FB5E; Thu, 2 Mar 2017 01:23:18 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v221NHiO016859; Thu, 2 Mar 2017 01:23:17 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v221NHED016857; Thu, 2 Mar 2017 01:23:17 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703020123.v221NHED016857@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Thu, 2 Mar 2017 01:23:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314531 - in stable/11/etc: . rc.d X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 01:23:19 -0000 Author: ian Date: Thu Mar 2 01:23:17 2017 New Revision: 314531 URL: https://svnweb.freebsd.org/changeset/base/314531 Log: MFC r311103, r311907: Update ntp.conf to use the ntpd pool feature. Our previous ntp.conf file configured 3 servers from freebsd.pool.ntp.org using 3 separate 'server' config lines. That is now replaced with a single 'pool' line which causes ntpd to add multiple servers from the pool. More than just making the config smaller, the pool feature in ntpd has one major advantage over configuring 3 separate servers from a pool: if a server that was added using a 'pool' statement provides bad time (initially or at some later date), ntpd automatically discards it and configures a new different server from the pool without needing to be restarted. These changes also add a 'tos' line to control how many pool servers get added, a 'restrict source' line that is required to allow ntpd to add new peers from the pool, and it deletes a 'restrict 127.127.1.0' line that does nothing and should never have been there (127.127.1.0 is not a valid IP address, it's a refclock identifier). Add "pool" to the keywords that rc.d/ntpdate examines to find a server address in ntp.conf. Modified: stable/11/etc/ntp.conf stable/11/etc/rc.d/ntpdate Directory Properties: stable/11/ (props changed) Modified: stable/11/etc/ntp.conf ============================================================================== --- stable/11/etc/ntp.conf Thu Mar 2 01:18:46 2017 (r314530) +++ stable/11/etc/ntp.conf Thu Mar 2 01:23:17 2017 (r314531) @@ -11,28 +11,43 @@ # # -# The following three servers will give you a random set of three -# NTP servers geographically close to you. -# See http://www.pool.ntp.org/ for details. Note, the pool encourages +# Set the target and limit for adding servers configured via pool statements +# or discovered dynamically via mechanisms such as broadcast and manycast. +# Ntpd automatically adds maxclock-1 servers from configured pools, and may +# add as many as maxclock*2 if necessary to ensure that at least minclock +# servers are providing good consistant time. +# +tos minclock 3 maxclock 6 + +# +# The following pool statement will give you a random set of NTP servers +# geographically close to you. A single pool statement adds multiple +# servers from the pool, according to the tos minclock/maxclock targets. +# See http://www.pool.ntp.org/ for details. Note, pool.ntp.org encourages # users with a static IP and good upstream NTP servers to add a server # to the pool. See http://www.pool.ntp.org/join.html if you are interested. # # The option `iburst' is used for faster initial synchronization. # -server 0.freebsd.pool.ntp.org iburst -server 1.freebsd.pool.ntp.org iburst -server 2.freebsd.pool.ntp.org iburst -#server 3.freebsd.pool.ntp.org iburst +pool 0.freebsd.pool.ntp.org iburst # # If you want to pick yourself which country's public NTP server -# you want sync against, comment out the above servers, uncomment -# the next ones and replace CC with the country's abbreviation. -# Make sure that the hostnames resolve to a proper IP address! -# -# server 0.CC.pool.ntp.org iburst -# server 1.CC.pool.ntp.org iburst -# server 2.CC.pool.ntp.org iburst +# you want to sync against, comment out the above pool, uncomment +# the next one, and replace CC with the country's abbreviation. +# Make sure that the hostname resolves to a proper IP address! +# +# pool 0.CC.pool.ntp.org iburst + +# +# To configure a specific server, such as an organization-wide local +# server, add lines similar to the following. One or more specific +# servers can be configured in addition to, or instead of, any server +# pools specified above. When both are configured, ntpd first adds all +# the specific servers, then adds servers from the pool until the tos +# minclock/maxclock targets are met. +# +#server time.my-internal.org iburst # # Security: @@ -40,11 +55,17 @@ server 2.freebsd.pool.ntp.org iburst # By default, only allow time queries and block all other requests # from unauthenticated clients. # +# The "restrict source" line allows peers to be mobilized when added by +# ntpd from a pool, but does not enable mobilizing a new peer association +# by other dynamic means (broadcast, manycast, ntpq commands, etc). +# # See http://support.ntp.org/bin/view/Support/AccessRestrictions # for more information. # -restrict default limited kod nomodify notrap nopeer noquery -restrict -6 default limited kod nomodify notrap nopeer noquery +restrict default limited kod nomodify notrap noquery nopeer +restrict -6 default limited kod nomodify notrap noquery nopeer +restrict source limited kod nomodify notrap noquery + # # Alternatively, the following rules would block all unauthorized access. # @@ -65,7 +86,6 @@ restrict -6 default limited kod nomodify # The following settings allow unrestricted access from the localhost restrict 127.0.0.1 restrict -6 ::1 -restrict 127.127.1.0 # # If a server loses sync with all upstream servers, NTP clients Modified: stable/11/etc/rc.d/ntpdate ============================================================================== --- stable/11/etc/rc.d/ntpdate Thu Mar 2 01:18:46 2017 (r314530) +++ stable/11/etc/rc.d/ntpdate Thu Mar 2 01:23:17 2017 (r314531) @@ -20,7 +20,7 @@ ntpdate_start() if [ -z "$ntpdate_hosts" -a -f "$ntpdate_config" ]; then ntpdate_hosts=`awk ' /^server[ \t]*127.127/ {next} - /^(server|peer)/ { + /^(server|peer|pool)/ { if ($2 ~/^-/) {print $3} else {print $2}} ' < "$ntpdate_config"` From owner-svn-src-all@freebsd.org Thu Mar 2 01:28:16 2017 Return-Path: Delivered-To: svn-src-all@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 57A5BCF2C9B; Thu, 2 Mar 2017 01:28:16 +0000 (UTC) (envelope-from emaste@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 26A1EE2D; Thu, 2 Mar 2017 01:28:16 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v221SFJG017094; Thu, 2 Mar 2017 01:28:15 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v221SFtF017093; Thu, 2 Mar 2017 01:28:15 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201703020128.v221SFtF017093@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 2 Mar 2017 01:28:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314532 - stable/11/usr.bin/vi/catalog X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 01:28:16 -0000 Author: emaste Date: Thu Mar 2 01:28:15 2017 New Revision: 314532 URL: https://svnweb.freebsd.org/changeset/base/314532 Log: MFC r314139: make vi message catalogues build independent of locale r275234 addressed sort automatically converting 8-bit locales to UTF-8 by using "LANG=C sort", but LC_ALL overrides LANG if set, so the issue may still be present depending on the user's environment. Use LC_ALL=C instead. Reported by: https://tests.reproducible-builds.org/ Sponsored by: The Linux Foundation / Core Infrastructure Initiative Modified: stable/11/usr.bin/vi/catalog/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/vi/catalog/Makefile ============================================================================== --- stable/11/usr.bin/vi/catalog/Makefile Thu Mar 2 01:23:17 2017 (r314531) +++ stable/11/usr.bin/vi/catalog/Makefile Thu Mar 2 01:28:15 2017 (r314532) @@ -39,7 +39,7 @@ CAT+= $c.UTF-8 ${c}: ${c}.base echo "... $c"; \ rm -f $c; \ - env LANG=C sort -u ${.ALLSRC} | \ + env LC_ALL=C sort -u ${.ALLSRC} | \ awk '{ \ if ($$1 == 1) { \ print "\nMESSAGE NUMBER 1 IS NOT LEGAL"; \ @@ -86,13 +86,13 @@ ${c}.check: ${c}.base echo =========================; \ echo "MESSAGES WITH THE SAME MESSAGE ID's (FIX!):"; \ for j in \ - `sed '/^$$/d' < $$f.base | LANG=C sort -u | \ + `sed '/^$$/d' < $$f.base | LC_ALL=C sort -u | \ awk '{print $$1}' | uniq -d`; do \ egrep $$j $$f.base; \ done; \ echo =========================; \ echo "Duplicate messages, both id and message (this is okay):"; \ - sed '/^$$/d' < $$f.base | LANG=C sort | uniq -c | \ + sed '/^$$/d' < $$f.base | LC_ALL=C sort | uniq -c | \ awk '$$1 != 1 { print $$0 }' | sort -n; \ echo =========================) > $c .endfor From owner-svn-src-all@freebsd.org Thu Mar 2 01:39:24 2017 Return-Path: Delivered-To: svn-src-all@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 A815ECF3309; Thu, 2 Mar 2017 01:39:24 +0000 (UTC) (envelope-from scottl@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 76CD678D; Thu, 2 Mar 2017 01:39:24 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v221dNIT020976; Thu, 2 Mar 2017 01:39:23 GMT (envelope-from scottl@FreeBSD.org) Received: (from scottl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v221dNsx020974; Thu, 2 Mar 2017 01:39:23 GMT (envelope-from scottl@FreeBSD.org) Message-Id: <201703020139.v221dNsx020974@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: scottl set sender to scottl@FreeBSD.org using -f From: Scott Long Date: Thu, 2 Mar 2017 01:39:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314533 - head/lib/libsbuf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 01:39:24 -0000 Author: scottl Date: Thu Mar 2 01:39:23 2017 New Revision: 314533 URL: https://svnweb.freebsd.org/changeset/base/314533 Log: Expose the sbuf_putbuf() symbol to libsbuf. There are a few other symbols that are present but not exposed, like get/set/clear flags, not sure if they need to be exposed at this point. Sponsored by: Netflix Modified: head/lib/libsbuf/Symbol.map head/lib/libsbuf/Version.def Modified: head/lib/libsbuf/Symbol.map ============================================================================== --- head/lib/libsbuf/Symbol.map Thu Mar 2 01:28:15 2017 (r314532) +++ head/lib/libsbuf/Symbol.map Thu Mar 2 01:39:23 2017 (r314533) @@ -31,3 +31,8 @@ FBSD_1.3 { FBSD_1.4 { sbuf_hexdump; }; + +FBSD_1.5 { + sbuf_putbuf; +}; + Modified: head/lib/libsbuf/Version.def ============================================================================== --- head/lib/libsbuf/Version.def Thu Mar 2 01:28:15 2017 (r314532) +++ head/lib/libsbuf/Version.def Thu Mar 2 01:39:23 2017 (r314533) @@ -8,3 +8,6 @@ FBSD_1.3 { FBSD_1.4 { } FBSD_1.3; + +FBSD_1.5 { +} FBSD_1.4; From owner-svn-src-all@freebsd.org Thu Mar 2 01:55:15 2017 Return-Path: Delivered-To: svn-src-all@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 363A0CF3F88; Thu, 2 Mar 2017 01:55:15 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D0FA6371; Thu, 2 Mar 2017 01:55:14 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v221tC3q060081; Wed, 1 Mar 2017 17:55:12 -0800 (PST) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd-rwg@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v221tCxY060080; Wed, 1 Mar 2017 17:55:12 -0800 (PST) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <201703020155.v221tCxY060080@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314464 - head/usr.sbin/yppush In-Reply-To: To: Ngie Cooper Date: Wed, 1 Mar 2017 17:55:12 -0800 (PST) CC: Alexey Dokuchaev , Ian Lepore , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , src-committers X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 01:55:15 -0000 > On Wed, Mar 1, 2017 at 8:57 AM, Alexey Dokuchaev wrote: > > On Wed, Mar 01, 2017 at 08:43:55AM -0800, Rodney W. Grimes wrote: > >> I believe we have some other full path things that have crept > >> forward into the production release, but that may be in ports > >> only. Nope bad full paths links I found in just a few seconds: > >> > >> lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chfn -> /usr/bin/chpass > >> lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chsh -> /usr/bin/chpass > >> lrwxr-xr-x 1 root wheel 7 Nov 30 02:27 cpio -> bsdcpio > >> lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 mailq -> /usr/sbin/mailwrapper > >> lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 newaliases -> /usr/sbin/mailwrapper > >> lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pgrep -> /bin/pgrep > >> lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pkill -> /bin/pkill > >> [...] > > > > Jeez, this is all so bogus! Imagine accessing those remotely via NFS mount > > and watch things break hell in all weird ways. :-( > > This is completely orthogonal to my changes (and has been in place for > a number of years). If you'd like to use relative symlinks for > programs, then let's definitely do it as part of another change > (personally, I think that some of these items could and should be > replaced with hardlinks). Yes, this is just something that leaked over into this thread. Note that this is not just something I want to do, this is technically a bug in FreeBSD and a regresion that occured. And yes in general if the binaries live in the same directoy hard rather than soft links should be used, so another regresion. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Thu Mar 2 02:06:28 2017 Return-Path: Delivered-To: svn-src-all@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 19935CF47A9; Thu, 2 Mar 2017 02:06:28 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D4DBED5E; Thu, 2 Mar 2017 02:06:27 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v2226QX4060131; Wed, 1 Mar 2017 18:06:26 -0800 (PST) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd-rwg@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v2226QGL060130; Wed, 1 Mar 2017 18:06:26 -0800 (PST) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <201703020206.v2226QGL060130@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314525 - in stable/11/sys: arm/arm arm/include conf In-Reply-To: <201703012245.v21MjCkC054978@repo.freebsd.org> To: Ian Lepore Date: Wed, 1 Mar 2017 18:06:26 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 02:06:28 -0000 > Author: ian > Date: Wed Mar 1 22:45:12 2017 > New Revision: 314525 > URL: https://svnweb.freebsd.org/changeset/base/314525 ... > > Modified: stable/11/sys/conf/files.arm > ============================================================================== > --- stable/11/sys/conf/files.arm Wed Mar 1 21:58:26 2017 (r314524) > +++ stable/11/sys/conf/files.arm Wed Mar 1 22:45:12 2017 (r314525) > @@ -53,7 +53,8 @@ arm/arm/gdb_machdep.c optional gdb > arm/arm/generic_timer.c optional generic_timer > arm/arm/gic.c optional gic > arm/arm/hdmi_if.m optional hdmi > -arm/arm/identcpu.c standard > +arm/arm/identcpu-v4.c optional !armv6 > +arm/arm/identcpu-v6.c optional armv6 > arm/arm/in_cksum.c optional inet | inet6 > arm/arm/in_cksum_arm.S optional inet | inet6 > arm/arm/intr.c optional !intrng > _______________________________________________ > svn-src-stable-11@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11 > To unsubscribe, send any mail to "svn-src-stable-11-unsubscribe@freebsd.org" If we are adding armv4 as an optional supported cpu type (I didnt think we could run on anything less than an armv6, this patch clearly seems to make that false.) I think we should just do the above as > +arm/arm/identcpu-v4.c optional !armv6 | armv4 > +arm/arm/identcpu-v6.c optional armv6 As your above code would make the config for an armv6 machine be expressed by the lack of a CPU token in the CONFIG file, which is non intutive. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Thu Mar 2 02:11:00 2017 Return-Path: Delivered-To: svn-src-all@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 B5D00CF4A20; Thu, 2 Mar 2017 02:11:00 +0000 (UTC) (envelope-from emaste@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 7D0A3169; Thu, 2 Mar 2017 02:11:00 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v222AxxL033896; Thu, 2 Mar 2017 02:10:59 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v222AxMK033895; Thu, 2 Mar 2017 02:10:59 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201703020210.v222AxMK033895@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 2 Mar 2017 02:10:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314534 - head/share/man/man5 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 02:11:00 -0000 Author: emaste Date: Thu Mar 2 02:10:59 2017 New Revision: 314534 URL: https://svnweb.freebsd.org/changeset/base/314534 Log: regen src.conf.5 after r313169 Sponsored by: The FreeBSD Foundation Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Thu Mar 2 01:39:23 2017 (r314533) +++ head/share/man/man5/src.conf.5 Thu Mar 2 02:10:59 2017 (r314534) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. -.\" from FreeBSD: head/tools/build/options/makeman 306729 2016-10-05 20:12:00Z emaste +.\" from FreeBSD: head/tools/build/options/makeman 313173 2017-02-03 20:17:54Z wblock .\" $FreeBSD$ -.Dd January 28, 2017 +.Dd March 1, 2017 .Dt SRC.CONF 5 .Os .Sh NAME @@ -86,11 +86,11 @@ even if they would be set to .Dq Li FALSE or .Dq Li NO . -Just the existence of an option will cause -it to be honoured by +The presence of an option causes +it to be honored by .Xr make 1 . .Pp -The following list provides a name and short description for variables +This list provides a name and short description for variables that can be used for source builds. .Bl -tag -width indent .It Va WITHOUT_ACCT @@ -163,9 +163,9 @@ Set to not build or install binutils (as of the normal system build. The resulting system cannot build programs from source. .Pp -It is a default setting on +This is a default setting on arm64/aarch64. -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -176,7 +176,7 @@ When set, it also enforces the following Set to build and install binutils (as, ld, objcopy, and objdump) as part of the normal system build. .Pp -It is a default setting on +This is a default setting on amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_BINUTILS_BOOTSTRAP .\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP 295490 2016-02-10 23:57:09Z emaste @@ -187,19 +187,19 @@ The option does not work for build targe toolchain is provided. .Ef .Pp -It is a default setting on +This is a default setting on arm64/aarch64. .It Va WITH_BINUTILS_BOOTSTRAP .\" from FreeBSD: head/tools/build/options/WITH_BINUTILS_BOOTSTRAP 295491 2016-02-11 00:14:00Z emaste Set build binutils (as, ld, objcopy and objdump) as part of the bootstrap process. .Pp -It is a default setting on +This is a default setting on amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_BLACKLIST -.\" from FreeBSD: head/tools/build/options/WITHOUT_BLACKLIST 301554 2016-06-07 16:35:55Z lidl -Set this if you do not want to build blacklistd / blacklistctl. -When set, it also enforces the following options: +.\" from FreeBSD: head/tools/build/options/WITHOUT_BLACKLIST 313169 2017-02-03 19:09:46Z wblock +Set this if you do not want to build blacklistd/blacklistctl. +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -252,7 +252,7 @@ Set to not build contributed bzip2 softw .Bf -symbolic The option has no effect yet. .Ef -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -268,7 +268,7 @@ Set to not build .It Va WITHOUT_CAPSICUM .\" from FreeBSD: head/tools/build/options/WITHOUT_CAPSICUM 229319 2012-01-02 21:57:58Z rwatson Set to not build Capsicum support into system programs. -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -278,16 +278,16 @@ When set, it also enforces the following .\" from FreeBSD: head/tools/build/options/WITHOUT_CASPER 258838 2013-12-02 08:21:28Z pjd Set to not build Casper program and related libraries. .It Va WITH_CCACHE_BUILD -.\" from FreeBSD: head/tools/build/options/WITH_CCACHE_BUILD 297436 2016-03-30 23:53:12Z bdrewery +.\" from FreeBSD: head/tools/build/options/WITH_CCACHE_BUILD 313169 2017-02-03 19:09:46Z wblock Set to use .Xr ccache 1 for the build. No configuration is required except to install the .Sy devel/ccache package. -Using with -.Xr distcc 1 -should set +When using with +.Xr distcc 1 , +set .Sy CCACHE_PREFIX=/usr/local/bin/distcc . The default cache directory of .Pa $HOME/.ccache @@ -325,7 +325,7 @@ and related utilities. .It Va WITHOUT_CDDL .\" from FreeBSD: head/tools/build/options/WITHOUT_CDDL 163861 2006-11-01 09:02:11Z jb Set to not build code licensed under Sun's CDDL. -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -337,9 +337,9 @@ When set, it also enforces the following .\" from FreeBSD: head/tools/build/options/WITHOUT_CLANG 264660 2014-04-18 17:03:58Z imp Set to not build the Clang C/C++ compiler during the regular phase of the build. .Pp -It is a default setting on +This is a default setting on mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf and sparc64/sparc64. -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -351,22 +351,22 @@ When set, it also enforces the following .\" from FreeBSD: head/tools/build/options/WITH_CLANG 264660 2014-04-18 17:03:58Z imp Set to build the Clang C/C++ compiler during the normal phase of the build. .Pp -It is a default setting on +This is a default setting on amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe. .It Va WITHOUT_CLANG_BOOTSTRAP -.\" from FreeBSD: head/tools/build/options/WITHOUT_CLANG_BOOTSTRAP 273177 2014-10-16 18:28:11Z skreuzer -Set to not build the Clang C/C++ compiler during the bootstrap phase of the build. -You must enable either gcc or clang bootstrap to be able to build the system, -unless an alternative compiler is provided via -XCC. +.\" from FreeBSD: head/tools/build/options/WITHOUT_CLANG_BOOTSTRAP 313169 2017-02-03 19:09:46Z wblock +Set to not build the Clang C/C++ compiler during the bootstrap phase of +the build. +To be able to build the system, either gcc or clang bootstrap must be +enabled unless an alternate compiler is provided via XCC. .Pp -It is a default setting on +This is a default setting on mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITH_CLANG_BOOTSTRAP .\" from FreeBSD: head/tools/build/options/WITH_CLANG_BOOTSTRAP 264660 2014-04-18 17:03:58Z imp Set to build the Clang C/C++ compiler during the bootstrap phase of the build. .Pp -It is a default setting on +This is a default setting on amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64 and i386/i386. .It Va WITH_CLANG_EXTRAS .\" from FreeBSD: head/tools/build/options/WITH_CLANG_EXTRAS 231057 2012-02-05 23:56:22Z dim @@ -376,14 +376,14 @@ Set to build additional clang and llvm t Set to avoid building the ARCMigrate, Rewriter and StaticAnalyzer components of the Clang C/C++ compiler. .Pp -It is a default setting on +This is a default setting on mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf and sparc64/sparc64. .It Va WITH_CLANG_FULL .\" from FreeBSD: head/tools/build/options/WITH_CLANG_FULL 246259 2013-02-02 22:28:29Z dim Set to build the ARCMigrate, Rewriter and StaticAnalyzer components of the Clang C/C++ compiler. .Pp -It is a default setting on +This is a default setting on amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe. .It Va WITHOUT_CLANG_IS_CC .\" from FreeBSD: head/tools/build/options/WITHOUT_CLANG_IS_CC 242629 2012-11-05 21:53:23Z brooks @@ -393,7 +393,7 @@ Set to install the GCC compiler as and .Pa /usr/bin/cpp . .Pp -It is a default setting on +This is a default setting on mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITH_CLANG_IS_CC .\" from FreeBSD: head/tools/build/options/WITH_CLANG_IS_CC 235342 2012-05-12 16:12:36Z gjb @@ -403,27 +403,27 @@ Set to install the Clang C/C++ compiler and .Pa /usr/bin/cpp . .Pp -It is a default setting on +This is a default setting on amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64 and i386/i386. .It Va WITHOUT_CPP .\" from FreeBSD: head/tools/build/options/WITHOUT_CPP 156932 2006-03-21 07:50:50Z ru Set to not build .Xr cpp 1 . .It Va WITHOUT_CROSS_COMPILER -.\" from FreeBSD: head/tools/build/options/WITHOUT_CROSS_COMPILER 275138 2014-11-26 20:43:09Z gjb +.\" from FreeBSD: head/tools/build/options/WITHOUT_CROSS_COMPILER 313169 2017-02-03 19:09:46Z wblock Set to not build any cross compiler in the cross-tools stage of buildworld. -If you are compiling a different version of +When compiling a different version of .Fx -than what is installed on the system, you will need to provide an alternate +than what is installed on the system, provide an alternate compiler with XCC to ensure success. -If you are compiling with an identical version of +When compiling with an identical version of .Fx to the host, this option may be safely used. This option may also be safe when the host version of .Fx is close to the sources being built, but all bets are off if there have been any changes to the toolchain between the versions. -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -438,7 +438,7 @@ When set, it also enforces the following .It Va WITHOUT_CRYPT .\" from FreeBSD: head/tools/build/options/WITHOUT_CRYPT 156932 2006-03-21 07:50:50Z ru Set to not build any crypto code. -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -451,7 +451,7 @@ When set, it also enforces the following .Va WITHOUT_OPENSSL .El .Pp -When set, the following options are also in effect: +When set, these options are also in effect: .Pp .Bl -inset -compact .It Va WITHOUT_GSSAPI @@ -481,7 +481,7 @@ It will also prevent building of .Xr gperf 1 and .Xr devd 8 . -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -506,9 +506,14 @@ When set, it also enforces the following Set to avoid building or installing standalone debug files for each executable binary and shared library. .It Va WITHOUT_DIALOG -.\" from FreeBSD: head/tools/build/options/WITHOUT_DIALOG 306375 2016-09-27 18:08:38Z emaste -Set to not build dialog(1), dialog(1,3), and dpv(1,3). -When set, it also enforces the following options: +.\" from FreeBSD: head/tools/build/options/WITHOUT_DIALOG 313169 2017-02-03 19:09:46Z wblock +Set to not build +.Xr dialog 1 , +.Xr dialog 3 , +.Xr dpv 1 , +and +.Xr dpv 3 . +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -518,7 +523,7 @@ When set, it also enforces the following .\" from FreeBSD: head/tools/build/options/WITHOUT_DICT 156932 2006-03-21 07:50:50Z ru Set to not build the Webster dictionary files. .It Va WITH_DIRDEPS_BUILD -.\" from FreeBSD: head/tools/build/options/WITH_DIRDEPS_BUILD 298007 2016-04-14 22:00:49Z bdrewery +.\" from FreeBSD: head/tools/build/options/WITH_DIRDEPS_BUILD 313169 2017-02-03 19:09:46Z wblock This is an experimental build system. For details see http://www.crufty.net/sjg/docs/freebsd-meta-mode.htm. @@ -531,36 +536,37 @@ Makefile.depend files found in each dire .Pp The build can be started from anywhere, and behaves the same. The initial instance of -.Xr make 1 +.Xr make 1 recursively reads .Va DIRDEPS -from Makefile.depend +from +.Pa Makefile.depend , computing a graph of tree dependencies from the current origin. Setting .Va NO_DIRDEPS -will skip checking dirdep dependencies and will only build in the current +skips checking dirdep dependencies and will only build in the current and child directories. .Va NO_DIRDEPS_BELOW -will skip building any dirdeps and only build the current directory. +skips building any dirdeps and only build the current directory. .Pp This also utilizes the .Va WITH_META_MODE logic for incremental builds. .Pp -The build will hide commands ran unless +The build hides commands executed unless .Va NO_SILENT is defined. .Pp Note that there is currently no mass install feature for this. .Pp -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It .Va WITH_INSTALL_AS_USER .El .Pp -When set, the following options are also in effect: +When set, these options are also in effect: .Pp .Bl -inset -compact .It Va WITH_AUTO_OBJ @@ -605,11 +611,11 @@ This must be set in the environment, mak not .Pa /etc/src.conf . .It Va WITHOUT_DMAGENT -.\" from FreeBSD: head/tools/build/options/WITHOUT_DMAGENT 262335 2014-02-22 13:05:23Z bapt -Set to not build dma Mail Transport Agent +.\" from FreeBSD: head/tools/build/options/WITHOUT_DMAGENT 313169 2017-02-03 19:09:46Z wblock +Set to not build dma Mail Transport Agent. .It Va WITHOUT_DOCCOMPRESS -.\" from FreeBSD: head/tools/build/options/WITHOUT_DOCCOMPRESS 266752 2014-05-27 15:52:27Z gjb -Set to not to install compressed system documentation. +.\" from FreeBSD: head/tools/build/options/WITHOUT_DOCCOMPRESS 313169 2017-02-03 19:09:46Z wblock +Set to not install compressed system documentation. Only the uncompressed version will be installed. .It Va WITH_DTRACE_TESTS .\" from FreeBSD: head/tools/build/options/WITH_DTRACE_TESTS 286174 2015-08-02 00:37:33Z markj @@ -642,7 +648,7 @@ Set not to build and .Xr efivar 8 . .Pp -It is a default setting on +This is a default setting on mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITH_EFI .\" from FreeBSD: head/tools/build/options/WITH_EFI 311135 2017-01-02 20:07:56Z ngie @@ -651,7 +657,7 @@ Set to build and .Xr efivar 8 . .Pp -It is a default setting on +This is a default setting on amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64 and i386/i386. .It Va WITHOUT_ELFTOOLCHAIN_BOOTSTRAP .\" from FreeBSD: head/tools/build/options/WITHOUT_ELFTOOLCHAIN_BOOTSTRAP 295491 2016-02-11 00:14:00Z emaste @@ -722,13 +728,13 @@ Set to not build games. .\" from FreeBSD: head/tools/build/options/WITHOUT_GCC 264660 2014-04-18 17:03:58Z imp Set to not build and install gcc and g++ as part of the normal build process. .Pp -It is a default setting on +This is a default setting on amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64 and i386/i386. .It Va WITH_GCC .\" from FreeBSD: head/tools/build/options/WITH_GCC 255326 2013-09-06 20:49:48Z zeising Set to build and install gcc and g++. .Pp -It is a default setting on +This is a default setting on mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_GCC_BOOTSTRAP .\" from FreeBSD: head/tools/build/options/WITHOUT_GCC_BOOTSTRAP 273177 2014-10-16 18:28:11Z skreuzer @@ -737,13 +743,13 @@ You must enable either gcc or clang boot unless an alternative compiler is provided via XCC. .Pp -It is a default setting on +This is a default setting on amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64 and i386/i386. .It Va WITH_GCC_BOOTSTRAP .\" from FreeBSD: head/tools/build/options/WITH_GCC_BOOTSTRAP 264660 2014-04-18 17:03:58Z imp Set to build gcc and g++ as part of the bootstrap process. .Pp -It is a default setting on +This is a default setting on mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_GCOV .\" from FreeBSD: head/tools/build/options/WITHOUT_GCOV 156932 2006-03-21 07:50:50Z ru @@ -755,14 +761,14 @@ tool. Set to not build .Xr gdb 1 . .Pp -It is a default setting on +This is a default setting on arm64/aarch64. .It Va WITH_GDB .\" from FreeBSD: head/tools/build/options/WITH_GDB 295493 2016-02-11 00:30:51Z emaste Set to build .Xr gdb 1 . .Pp -It is a default setting on +This is a default setting on amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_GNU .\" from FreeBSD: head/tools/build/options/WITHOUT_GNU 174550 2007-12-12 16:43:17Z ru @@ -772,7 +778,7 @@ covered by the GNU Public License due to .Bf -symbolic The option has no effect yet. .Ef -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -783,14 +789,14 @@ When set, it also enforces the following Do not build the GNU C++ stack (g++, libstdc++). This is the default on platforms where clang is the system compiler. .Pp -It is a default setting on +This is a default setting on amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64 and i386/i386. .It Va WITH_GNUCXX .\" from FreeBSD: head/tools/build/options/WITH_GNUCXX 255321 2013-09-06 20:08:03Z theraven Build the GNU C++ stack (g++, libstdc++). This is the default on platforms where gcc is the system compiler. .Pp -It is a default setting on +This is a default setting on mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_GNU_DIFF .\" from FreeBSD: head/tools/build/options/WITHOUT_GNU_DIFF 307674 2016-10-20 14:48:57Z emaste @@ -815,9 +821,9 @@ Set to not build .Xr gpioctl 8 as part of the base system. .It Va WITHOUT_GPL_DTC -.\" from FreeBSD: head/tools/build/options/WITHOUT_GPL_DTC 264515 2014-04-15 20:41:55Z imp -Set to build the BSD licensed version of the device tree compiler, instead of the -GPL'd one from elinux.org. +.\" from FreeBSD: head/tools/build/options/WITHOUT_GPL_DTC 313169 2017-02-03 19:09:46Z wblock +Set to build the BSD licensed version of the device tree compiler rather +than the GPLed one from elinux.org. .It Va WITHOUT_GROFF .\" from FreeBSD: head/tools/build/options/WITHOUT_GROFF 218941 2011-02-22 08:13:49Z uqs Set to not build @@ -857,7 +863,7 @@ The option does not work for build targe .It Va WITHOUT_INET .\" from FreeBSD: head/tools/build/options/WITHOUT_INET 221266 2011-04-30 17:58:28Z bz Set to not build programs and libraries related to IPv4 networking. -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -867,7 +873,7 @@ When set, it also enforces the following .\" from FreeBSD: head/tools/build/options/WITHOUT_INET6 156932 2006-03-21 07:50:50Z ru Set to not build programs and libraries related to IPv6 networking. -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -884,22 +890,22 @@ Set to not build .\" from FreeBSD: head/tools/build/options/WITHOUT_INET_SUPPORT 221266 2011-04-30 17:58:28Z bz Set to build libraries, programs, and kernel modules without IPv4 support. .It Va WITHOUT_INSTALLLIB -.\" from FreeBSD: head/tools/build/options/WITHOUT_INSTALLLIB 297941 2016-04-13 21:01:58Z bdrewery -Set this if you do not want to install optional libraries. -For example when creating a +.\" from FreeBSD: head/tools/build/options/WITHOUT_INSTALLLIB 313172 2017-02-03 19:21:28Z wblock +Set this to not install optional libraries. +For example, when creating a .Xr nanobsd 8 image. .Bf -symbolic The option does not work for build targets. .Ef .It Va WITH_INSTALL_AS_USER -.\" from FreeBSD: head/tools/build/options/WITH_INSTALL_AS_USER 238021 2012-07-02 20:24:01Z marcel +.\" from FreeBSD: head/tools/build/options/WITH_INSTALL_AS_USER 313169 2017-02-03 19:09:46Z wblock Set to make install targets succeed for non-root users by installing files with owner and group attributes set to that of the user running the .Xr make 1 command. -The user still has to set the +The user still must set the .Va DESTDIR variable to point to a directory where the user has write permissions. .It Va WITHOUT_IPFILTER @@ -924,16 +930,16 @@ Set to not build and .Xr truss 1 . .It Va WITHOUT_KERBEROS -.\" from FreeBSD: head/tools/build/options/WITHOUT_KERBEROS 174549 2007-12-12 16:42:03Z ru -Set this if you do not want to build Kerberos 5 (KTH Heimdal). -When set, it also enforces the following options: +.\" from FreeBSD: head/tools/build/options/WITHOUT_KERBEROS 313169 2017-02-03 19:09:46Z wblock +Set this to not build Kerberos 5 (KTH Heimdal). +When set, it enforces these options: .Pp .Bl -item -compact .It .Va WITHOUT_KERBEROS_SUPPORT .El .Pp -When set, the following options are also in effect: +When set, these options are also in effect: .Pp .Bl -inset -compact .It Va WITHOUT_GSSAPI @@ -963,7 +969,7 @@ library as a part of the base system. .Bf -symbolic The option has no effect yet. .Ef -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -977,7 +983,7 @@ support. .It Va WITHOUT_LDNS .\" from FreeBSD: head/tools/build/options/WITHOUT_LDNS 255591 2013-09-15 13:11:13Z des Setting this variable will prevent the LDNS library from being built. -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -1011,7 +1017,7 @@ Set to not build the .Nm libpthread providing library, .Nm libthr . -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -1031,49 +1037,49 @@ library. .\" from FreeBSD: head/tools/build/options/WITHOUT_LLD 309124 2016-11-24 22:54:55Z dim Set to not build LLVM's lld linker. .Pp -It is a default setting on +This is a default setting on arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITH_LLD .\" from FreeBSD: head/tools/build/options/WITH_LLD 309124 2016-11-24 22:54:55Z dim Set to build LLVM's lld linker. .Pp -It is a default setting on +This is a default setting on amd64/amd64 and arm64/aarch64. .It Va WITHOUT_LLDB .\" from FreeBSD: head/tools/build/options/WITHOUT_LLDB 289275 2015-10-14 00:23:31Z emaste Set to not build the LLDB debugger. .Pp -It is a default setting on +This is a default setting on arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITH_LLDB .\" from FreeBSD: head/tools/build/options/WITH_LLDB 255722 2013-09-20 01:52:02Z emaste Set to build the LLDB debugger. .Pp -It is a default setting on +This is a default setting on amd64/amd64 and arm64/aarch64. .It Va WITHOUT_LLD_IS_LD .\" from FreeBSD: head/tools/build/options/WITHOUT_LLD_IS_LD 312855 2017-01-27 01:59:12Z emaste Set to use GNU binutils ld as the system linker, instead of LLVM's LLD. .Pp -It is a default setting on +This is a default setting on amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITH_LLD_IS_LD .\" from FreeBSD: head/tools/build/options/WITH_LLD_IS_LD 312855 2017-01-27 01:59:12Z emaste Set to use LLVM's LLD as the system linker, instead of GNU binutils ld. .Pp -It is a default setting on +This is a default setting on arm64/aarch64. .It Va WITHOUT_LLVM_LIBUNWIND .\" from FreeBSD: head/tools/build/options/WITHOUT_LLVM_LIBUNWIND 293450 2016-01-09 00:42:07Z emaste Set to use GCC's stack unwinder (instead of LLVM's libunwind). .Pp -It is a default setting on +This is a default setting on arm/arm, arm/armeb, arm/armv6, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITH_LLVM_LIBUNWIND .\" from FreeBSD: head/tools/build/options/WITH_LLVM_LIBUNWIND 293450 2016-01-09 00:42:07Z emaste Set to use LLVM's libunwind stack unwinder (instead of GCC's unwinder). .Pp -It is a default setting on +This is a default setting on amd64/amd64, arm64/aarch64 and i386/i386. .It Va WITHOUT_LOCALES .\" from FreeBSD: head/tools/build/options/WITHOUT_LOCALES 156932 2006-03-21 07:50:50Z ru @@ -1100,7 +1106,7 @@ Set to build some programs without optio .It Va WITHOUT_MAIL .\" from FreeBSD: head/tools/build/options/WITHOUT_MAIL 183242 2008-09-21 22:02:26Z sam Set to not build any mail support (MUA or MTA). -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -1123,7 +1129,7 @@ and related support files. .It Va WITHOUT_MAN .\" from FreeBSD: head/tools/build/options/WITHOUT_MAN 156932 2006-03-21 07:50:50Z ru Set to not build manual pages. -When set, the following options are also in effect: +When set, these options are also in effect: .Pp .Bl -inset -compact .It Va WITHOUT_MAN_UTILS @@ -1156,25 +1162,25 @@ Set to not build utilities for manual pa .Xr manctl 8 , and related support files. .It Va WITH_META_MODE -.\" from FreeBSD: head/tools/build/options/WITH_META_MODE 306145 2016-09-21 21:32:05Z bdrewery -Creates +.\" from FreeBSD: head/tools/build/options/WITH_META_MODE 313169 2017-02-03 19:09:46Z wblock +Create .Xr make 1 meta files when building, which can provide a reliable incremental build when using .Xr filemon 4 . -The meta file is created in the OBJDIR as +The meta file is created in OBJDIR as .Pa target.meta . -These meta files track the command ran, its output, and the current directory. +These meta files track the command that was executed, its output, and the +current directory. The .Xr filemon 4 module is required unless .Va NO_FILEMON is defined. -When the module is loaded, any files used by the commands executed will be -tracked as -dependencies for the target in its meta file. -The target will be considered out-of-date and rebuilt if any of the following -are true compared to the last build: +When the module is loaded, any files used by the commands executed are +tracked as dependencies for the target in its meta file. +The target is considered out-of-date and rebuilt if any of these +conditions are true compared to the last build: .Bl -bullet -compact .It The command to execute changes. @@ -1196,10 +1202,10 @@ Files read, written, executed or linked .El The meta files can also be useful for debugging. .Pp -The build will hide commands ran unless +The build hides commands that are executed unless .Va NO_SILENT is defined. -Errors will cause +Errors cause .Xr make 1 to show some of its environment for further debugging. .Pp @@ -1228,7 +1234,7 @@ utility. .\" from FreeBSD: head/tools/build/options/WITHOUT_NETGRAPH 183242 2008-09-21 22:02:26Z sam Set to not build applications to support .Xr netgraph 4 . -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -1285,7 +1291,7 @@ Set to not build OpenSSH. .It Va WITHOUT_OPENSSL .\" from FreeBSD: head/tools/build/options/WITHOUT_OPENSSL 156932 2006-03-21 07:50:50Z ru Set to not build OpenSSL. -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -1296,7 +1302,7 @@ When set, it also enforces the following .Va WITHOUT_OPENSSH .El .Pp -When set, the following options are also in effect: +When set, these options are also in effect: .Pp .Bl -inset -compact .It Va WITHOUT_GSSAPI @@ -1310,7 +1316,7 @@ Set to not build PAM library and modules .Bf -symbolic This option is deprecated and does nothing. .Ef -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -1330,7 +1336,7 @@ and related programs. .It Va WITHOUT_PF .\" from FreeBSD: head/tools/build/options/WITHOUT_PF 156932 2006-03-21 07:50:50Z ru Set to not build PF firewall package. -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -1426,7 +1432,7 @@ Set to enable threads in .It Va WITHOUT_SOURCELESS .\" from FreeBSD: head/tools/build/options/WITHOUT_SOURCELESS 230972 2012-02-04 00:54:43Z rmh Set to not build kernel modules that include sourceless code (either microcode or native code for host CPU). -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -1444,13 +1450,13 @@ Set to not build kernel modules that inc .\" from FreeBSD: head/tools/build/options/WITHOUT_SSP 180012 2008-06-25 21:33:28Z ru Set to not build world with propolice stack smashing protection. .Pp -It is a default setting on +This is a default setting on mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf and mips/mips64hf. .It Va WITH_SSP .\" from FreeBSD: head/tools/build/options/WITH_SSP 311136 2017-01-02 20:09:09Z ngie Set to build world with propolice stack smashing protection. .Pp -It is a default setting on +This is a default setting on amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITH_STAGING .\" from FreeBSD: head/tools/build/options/WITH_STAGING 290816 2015-11-14 03:24:48Z sjg @@ -1460,7 +1466,7 @@ This can be best thought of as auto-inst with some extra meta data to ensure dependencies can be tracked. Depends on .Va WITH_DIRDEPS_BUILD . -When set, the following options are also in effect: +When set, these options are also in effect: .Pp .Bl -inset -compact .It Va WITH_STAGING_MAN @@ -1478,8 +1484,8 @@ This must be set in the environment, mak not .Pa /etc/src.conf . .It Va WITH_STAGING_MAN -.\" from FreeBSD: head/tools/build/options/WITH_STAGING_MAN 284708 2015-06-22 20:21:57Z sjg -Enable staging of MAN pages to stage tree. +.\" from FreeBSD: head/tools/build/options/WITH_STAGING_MAN 313169 2017-02-03 19:09:46Z wblock +Enable staging of man pages to stage tree. .It Va WITH_STAGING_PROG .\" from FreeBSD: head/tools/build/options/WITH_STAGING_PROG 284708 2015-06-22 20:21:57Z sjg Enable staging of PROGs to stage tree. @@ -1560,7 +1566,7 @@ See .Xr tests 7 for more details. This also disables the build of all test-related dependencies, including ATF. -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -1575,7 +1581,7 @@ Set to disables the build of all test-re .\" from FreeBSD: head/tools/build/options/WITHOUT_TEXTPROC 183242 2008-09-21 22:02:26Z sam Set to not build programs used for text processing. -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -1596,7 +1602,7 @@ Set to not build or install Set to not install header or programs used for program development, compilers, debuggers etc. -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -1657,7 +1663,7 @@ Set to not build programs used for 802.1 .Xr wpa_supplicant 8 and .Xr hostapd 8 . -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It From owner-svn-src-all@freebsd.org Thu Mar 2 02:39:30 2017 Return-Path: Delivered-To: svn-src-all@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 23644CF4B85; Thu, 2 Mar 2017 02:39:30 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D8DED2FB; Thu, 2 Mar 2017 02:39:29 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v222dShM060240; Wed, 1 Mar 2017 18:39:28 -0800 (PST) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd-rwg@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v222dROG060239; Wed, 1 Mar 2017 18:39:27 -0800 (PST) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <201703020239.v222dROG060239@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314464 - head/usr.sbin/yppush In-Reply-To: To: Ngie Cooper Date: Wed, 1 Mar 2017 18:39:27 -0800 (PST) CC: Baptiste Daroussin , Alexey Dokuchaev , src-committers , Ian Lepore , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 02:39:30 -0000 [ Charset UTF-8 unsupported, converting... ] > On Wed, Mar 1, 2017 at 9:08 AM, Rodney W. Grimes > wrote: > ... > > At one point in history I can promise you that ALL symlinks in the release > > where shortest possible relative path. So any absolute links that entered > > the system got created by developers who where not aware that they should > > always use a relative link for anything landing in DESTDIR. This creates > > breakge on so many levels we should make a rapid correction to this > > regression. > > This is why things are that way currently: > > $ git blame usr.bin/chpass/Makefile| grep ypchfn > 780ae7713f72b (gjb 2016-01-28 01:15:57 +0000 29) SYMLINKS+= > ${BINDIR}/chpass ${BINDIR}/ypchfn Use of ${BINDIR} is almost always a mistake in SYMLINKS. > aca2488187113 (wosch 1997-09-13 12:21:25 +0000 35) MLINKS+= chpass.1 > ypchpass.1 chpass.1 ypchfn.1 chpass.1 ypchsh.1 > 5294f47313a2d (gjb 2016-01-28 02:56:30 +0000 39) .for i in chpass > chfn chsh ypchpass ypchfn ypchsh > $ git log 780ae7713f72b^..780ae7713f72b > commit 780ae7713f72b471859c0997295ac0c59695c7b4 > Author: gjb > Date: Thu Jan 28 01:15:57 2016 +0000 > > Ensure mtree(8) recognizes chpass(1) is schg. > > Convert hard links to symbolic links, and remove the > 'beforeinstall' and 'afterinstall' chflags(8) execution. > > Sponsored by: The FreeBSD Foundation > > Notes: > svn path=/projects/release-pkg/; revision=294966 > > BINDIR evaluates to /usr/sbin/, so /usr/sbin/chpass is symlinked to > /usr/sbin/ypchfn . But, there's no reason why the symlink needs to be > hardcoded, or even a symlink at all. Hardlinks would achieve the same > thing here IMHO, but gjb changed it in r294966 to be symlinks. The error is inclusion of ${BINDIR} in SYMLINKS. The BIGGER mistake uncovered here is now none of the aliases to chpass(1) are protected by schg(THis is a 10.2): ls -ilago /usr/bin/ | grep ^3842 3842 -r-sr-xr-x 6 root wheel schg 18316 Aug 12 2015 chfn 3842 -r-sr-xr-x 6 root wheel schg 18316 Aug 12 2015 chpass 3842 -r-sr-xr-x 6 root wheel schg 18316 Aug 12 2015 chsh 3842 -r-sr-xr-x 6 root wheel schg 18316 Aug 12 2015 ypchfn 3842 -r-sr-xr-x 6 root wheel schg 18316 Aug 12 2015 ypchpass 3842 -r-sr-xr-x 6 root wheel schg 18316 Aug 12 2015 ypchsh The reason for the commit seems to be an issue with mtree, so that is probably the more correct place to be tyring to fix this if it is confused by hardlinks and schg attributes. > The point that might be missed is that changing it from absolute paths > to relative paths or otherwise, might break other workflows.. I could > just as easily mount /lib, /usr/lib, /usr/sbin, etc as nullfs > mountpoints and have a working system on a system root where MACHINE > != TARGET, but this is all orthogonal to my changing > `${.CURDIR}/../../contrib` (e.g. `foo/usr.sbin/yppush/../../contrib`), > etc to ${SRCTOP}/contrib` (e.g. `foo/contrib`). Though you might make it work with lots of magic the expected historical behavior is that these things should not have absolute paths in them and many long standing work flows depend on that fact. Being able to move /usr/bin or /bin or any other part of the tree someplace and have it self contained and internally contained and operation is expected traditional behavior. > Thanks, > -Ngie > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Thu Mar 2 03:19:40 2017 Return-Path: Delivered-To: svn-src-all@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 88A23CEA6E0; Thu, 2 Mar 2017 03:19:40 +0000 (UTC) (envelope-from gonzo@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 57BA691C; Thu, 2 Mar 2017 03:19:40 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v223JdjL060847; Thu, 2 Mar 2017 03:19:39 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v223JdOV060845; Thu, 2 Mar 2017 03:19:39 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <201703020319.v223JdOV060845@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Thu, 2 Mar 2017 03:19:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314535 - in head/sys/modules: bytgpio intelspi X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 03:19:40 -0000 Author: gonzo Date: Thu Mar 2 03:19:39 2017 New Revision: 314535 URL: https://svnweb.freebsd.org/changeset/base/314535 Log: [intelspi][bytgio] Fix buildworld with MODULES_WITH_WORLD set Add opt_platform.h and opt_acpi.h to the dependencies so modules can be built as a part of buildworld when MODULES_WITH_WORLD is set Reported by: Andre Albsmeier (for 11-stable) MFC after: 1 day Modified: head/sys/modules/bytgpio/Makefile head/sys/modules/intelspi/Makefile Modified: head/sys/modules/bytgpio/Makefile ============================================================================== --- head/sys/modules/bytgpio/Makefile Thu Mar 2 02:10:59 2017 (r314534) +++ head/sys/modules/bytgpio/Makefile Thu Mar 2 03:19:39 2017 (r314535) @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../dev/gpio KMOD= bytgpio SRCS= bytgpio.c -SRCS+= acpi_if.h device_if.h bus_if.h gpio_if.h +SRCS+= acpi_if.h device_if.h bus_if.h gpio_if.h opt_acpi.h opt_platform.h .include Modified: head/sys/modules/intelspi/Makefile ============================================================================== --- head/sys/modules/intelspi/Makefile Thu Mar 2 02:10:59 2017 (r314534) +++ head/sys/modules/intelspi/Makefile Thu Mar 2 03:19:39 2017 (r314535) @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../dev/intel KMOD= intelspi SRCS= spi.c -SRCS+= acpi_if.h device_if.h bus_if.h spibus_if.h +SRCS+= acpi_if.h device_if.h bus_if.h opt_acpi.h spibus_if.h .include From owner-svn-src-all@freebsd.org Thu Mar 2 04:08:15 2017 Return-Path: Delivered-To: svn-src-all@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 E32C3CF44BF; Thu, 2 Mar 2017 04:08:15 +0000 (UTC) (envelope-from emaste@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 B2B57A9D; Thu, 2 Mar 2017 04:08:15 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2248EOo079830; Thu, 2 Mar 2017 04:08:14 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2248EWB079829; Thu, 2 Mar 2017 04:08:14 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201703020408.v2248EWB079829@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 2 Mar 2017 04:08:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314536 - head/usr.sbin/makefs/ffs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 04:08:16 -0000 Author: emaste Date: Thu Mar 2 04:08:14 2017 New Revision: 314536 URL: https://svnweb.freebsd.org/changeset/base/314536 Log: makefs: remove archaic __P prototypes from ufs_bswap.h This reduces differences with NetBSD Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/makefs/ffs/ufs_bswap.h Modified: head/usr.sbin/makefs/ffs/ufs_bswap.h ============================================================================== --- head/usr.sbin/makefs/ffs/ufs_bswap.h Thu Mar 2 03:19:39 2017 (r314535) +++ head/usr.sbin/makefs/ffs/ufs_bswap.h Thu Mar 2 04:08:14 2017 (r314536) @@ -55,10 +55,6 @@ #if !defined(_KERNEL) || defined(FFS_EI) /* inlines for access to swapped data */ -static __inline u_int16_t ufs_rw16 __P((u_int16_t, int)); -static __inline u_int32_t ufs_rw32 __P((u_int32_t, int)); -static __inline u_int64_t ufs_rw64 __P((u_int64_t, int)); - static __inline u_int16_t ufs_rw16(u_int16_t a, int ns) { From owner-svn-src-all@freebsd.org Thu Mar 2 04:11:20 2017 Return-Path: Delivered-To: svn-src-all@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 51FE5CF4704; Thu, 2 Mar 2017 04:11:20 +0000 (UTC) (envelope-from emaste@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 076B7E18; Thu, 2 Mar 2017 04:11:19 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v224BJIE080734; Thu, 2 Mar 2017 04:11:19 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v224BJxF080732; Thu, 2 Mar 2017 04:11:19 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201703020411.v224BJxF080732@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 2 Mar 2017 04:11:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314537 - head/usr.sbin/makefs/ffs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 04:11:20 -0000 Author: emaste Date: Thu Mar 2 04:11:18 2017 New Revision: 314537 URL: https://svnweb.freebsd.org/changeset/base/314537 Log: makefs: remove clause 3 & 4 from Manuel Bouyer license ffs_bswap.c 1.34 ufs_bswap.h 1.34 Obtained from: NetBSD Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/makefs/ffs/ffs_bswap.c head/usr.sbin/makefs/ffs/ufs_bswap.h Modified: head/usr.sbin/makefs/ffs/ffs_bswap.c ============================================================================== --- head/usr.sbin/makefs/ffs/ffs_bswap.c Thu Mar 2 04:08:14 2017 (r314536) +++ head/usr.sbin/makefs/ffs/ffs_bswap.c Thu Mar 2 04:11:18 2017 (r314537) @@ -11,11 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Manuel Bouyer. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES Modified: head/usr.sbin/makefs/ffs/ufs_bswap.h ============================================================================== --- head/usr.sbin/makefs/ffs/ufs_bswap.h Thu Mar 2 04:08:14 2017 (r314536) +++ head/usr.sbin/makefs/ffs/ufs_bswap.h Thu Mar 2 04:11:18 2017 (r314537) @@ -11,11 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Manuel Bouyer. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES From owner-svn-src-all@freebsd.org Thu Mar 2 04:15:28 2017 Return-Path: Delivered-To: svn-src-all@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 72673CF4AD2 for ; Thu, 2 Mar 2017 04:15:28 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from pmta2.delivery6.ore.mailhop.org (pmta2.delivery6.ore.mailhop.org [54.200.129.228]) (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 56E91179 for ; Thu, 2 Mar 2017 04:15:28 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-User: cabd85b4-fefe-11e6-b3c2-c9f38144898e X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 73.78.92.27 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [73.78.92.27]) by outbound2.ore.mailhop.org (Halon) with ESMTPSA id cabd85b4-fefe-11e6-b3c2-c9f38144898e; Thu, 02 Mar 2017 04:14:56 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id v224FPnp008092; Wed, 1 Mar 2017 21:15:25 -0700 (MST) (envelope-from ian@freebsd.org) Message-ID: <1488428125.60166.55.camel@freebsd.org> Subject: Re: svn commit: r314525 - in stable/11/sys: arm/arm arm/include conf From: Ian Lepore To: "Rodney W. Grimes" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Date: Wed, 01 Mar 2017 21:15:25 -0700 In-Reply-To: <201703020206.v2226QGL060130@pdx.rh.CN85.dnsmgr.net> References: <201703020206.v2226QGL060130@pdx.rh.CN85.dnsmgr.net> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.18.5.1 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 04:15:28 -0000 On Wed, 2017-03-01 at 18:06 -0800, Rodney W. Grimes wrote: > > > > Author: ian > > Date: Wed Mar  1 22:45:12 2017 > > New Revision: 314525 > > URL: https://svnweb.freebsd.org/changeset/base/314525 > ... > > > > > > > Modified: stable/11/sys/conf/files.arm > > =================================================================== > > =========== > > --- stable/11/sys/conf/files.arm Wed Mar  1 21:58:26 2017 > > (r314524) > > +++ stable/11/sys/conf/files.arm Wed Mar  1 22:45:12 2017 > > (r314525) > > @@ -53,7 +53,8 @@ arm/arm/gdb_machdep.c optional > > gdb > >  arm/arm/generic_timer.c optional generic_tim > > er > >  arm/arm/gic.c optional gic > >  arm/arm/hdmi_if.m optional hdmi > > -arm/arm/identcpu.c standard > > +arm/arm/identcpu-v4.c optional !armv6 > > +arm/arm/identcpu-v6.c optional armv6 > >  arm/arm/in_cksum.c optional inet | inet6 > >  arm/arm/in_cksum_arm.S optional inet | inet6 > >  arm/arm/intr.c optional !intrng > > _______________________________________________ > > svn-src-stable-11@freebsd.org mailing list > > https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11 > > To unsubscribe, send any mail to "svn-src-stable-11-unsubscribe@fre > > ebsd.org" > If we are adding armv4 as an optional supported cpu type (I didnt > think > we could run on anything less than an armv6, this patch clearly seems > to > make that false.) I think we should just do the above as > > > > > +arm/arm/identcpu-v4.c optional !armv6 | > > armv4 > > +arm/arm/identcpu-v6.c optional armv6 > As your above code would make the config for an armv6 machine be > expressed by the lack of a CPU token in the CONFIG file, which is > non intutive. > There is no such cpuarch as armv4. Arm v4/v5 support has been around since 2005-ish, and when v6/v7 support came along, it was differentiated in kernel config files using "optional [!]armv6".  That leverages a feature in config(8) that exports the 'cpuarch' argument of the machine keyword as an option keyword (for armv6/7 machines it's always "machine arm armv6"). In the old arm config files there is no cpuarch specified, it's always just "machine arm".  I think that implies that for armv4/5 that cpuarch keyword would default to 'arm' (same as the machine arch), and that would allow using 'optional arm' rather than 'optional !armv6'.  I would find that confusing because TARGET=arm TARGET_ARCH=armv6 makes me think "armv6 is arm too".  Also, this is in files.arm, so having lines that say "optional arm" would be confusing too -- everything in there is for arm (of some flavor). -- Ian From owner-svn-src-all@freebsd.org Thu Mar 2 04:23:55 2017 Return-Path: Delivered-To: svn-src-all@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 C70ECCF4FAB; Thu, 2 Mar 2017 04:23:55 +0000 (UTC) (envelope-from ian@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 9EC878FC; Thu, 2 Mar 2017 04:23:55 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v224Nswn087386; Thu, 2 Mar 2017 04:23:54 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v224Nsfj087379; Thu, 2 Mar 2017 04:23:54 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703020423.v224Nsfj087379@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Thu, 2 Mar 2017 04:23:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314538 - in stable/11: lib/libc/gen share/man/man4 sys/kern sys/sys X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 04:23:55 -0000 Author: ian Date: Thu Mar 2 04:23:53 2017 New Revision: 314538 URL: https://svnweb.freebsd.org/changeset/base/314538 Log: MFC r311954, r311996, r312077, r312080: Rework tty_drain() to poll the hardware for completion, and restore drain timeout handling to historical freebsd behavior. The primary reason for these changes is the need to have tty_drain() call ttydevsw_busy() at some reasonable sub-second rate, to poll hardware that doesn't signal an interrupt when the transmit shift register becomes empty (which includes virtually all USB serial hardware). Such hardware hangs in a ttyout wait, because it never gets an opportunity to trigger a wakeup from the sleep in tty_drain() by calling ttydisc_getc() again, after handing the last of the buffered data to the hardware. Restructure the tty_drain loop so that device-busy is checked one more time after tty_timedwait() returns an error only if the error is EWOULDBLOCK; other errors cause an immediate return. This fixes the case of the tty disappearing while in tty_drain(). Check tty_gone() after allocating IO buffers. The tty lock has to be dropped then reacquired due to using M_WAITOK, which opens a window in which the tty device can disappear. Check for this and return ENXIO back up the call chain so that callers can cope. Correct the comments about how much buffer is allocated. Modified: stable/11/lib/libc/gen/tcsendbreak.3 stable/11/share/man/man4/tty.4 stable/11/sys/kern/tty.c stable/11/sys/kern/tty_inq.c stable/11/sys/kern/tty_outq.c stable/11/sys/sys/tty.h stable/11/sys/sys/ttyqueue.h Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libc/gen/tcsendbreak.3 ============================================================================== --- stable/11/lib/libc/gen/tcsendbreak.3 Thu Mar 2 04:11:18 2017 (r314537) +++ stable/11/lib/libc/gen/tcsendbreak.3 Thu Mar 2 04:23:53 2017 (r314538) @@ -28,7 +28,7 @@ .\" @(#)tcsendbreak.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd June 4, 1993 +.Dd January 11, 2017 .Dt TCSENDBREAK 3 .Os .Sh NAME @@ -137,17 +137,44 @@ is not a terminal. A signal interrupted the .Fn tcdrain function. +.It Bq Er EWOULDBLOCK +The configured timeout expired before the +.Fn tcdrain +function could write all buffered output. .El .Sh SEE ALSO .Xr tcsetattr 3 , -.Xr termios 4 +.Xr termios 4 , +.Xr tty 4 , +.Xr comcontrol 8 .Sh STANDARDS The .Fn tcsendbreak , -.Fn tcdrain , .Fn tcflush and .Fn tcflow functions are expected to be compliant with the .St -p1003.1-88 specification. +.Pp +The +.Fn tcdrain +function is expected to be compliant with +.St -p1003.1-88 +when the drain wait value is set to zero with +.Xr comcontrol 8 , +or with +.Xr ioctl 2 +.Va TIOCSDRAINWAIT , +or with +.Xr sysctl 8 +.Va kern.tty_drainwait . +A non-zero drain wait value can result in +.Fn tcdrain +returning +.Va EWOULDBLOCK +without writing all output. +The default value for +.Va kern.tty_drainwait +is 300 seconds. + Modified: stable/11/share/man/man4/tty.4 ============================================================================== --- stable/11/share/man/man4/tty.4 Thu Mar 2 04:11:18 2017 (r314537) +++ stable/11/share/man/man4/tty.4 Thu Mar 2 04:23:53 2017 (r314538) @@ -28,7 +28,7 @@ .\" @(#)tty.4 8.3 (Berkeley) 4/19/94 .\" $FreeBSD$ .\" -.Dd December 26, 2009 +.Dd January 11, 2017 .Dt TTY 4 .Os .Sh NAME @@ -238,7 +238,16 @@ Start output on the terminal (like typin Make the terminal the controlling terminal for the process (the process must not currently have a controlling terminal). .It Dv TIOCDRAIN Fa void -Wait until all output is drained. +Wait until all output is drained, or until the drain wait timeout expires. +.It Dv TIOCGDRAINWAIT Fa int *timeout +Return the current drain wait timeout in seconds. +.It Dv TIOCSDRAINWAIT Fa int *timeout +Set the drain wait timeout in seconds. +A value of zero disables timeouts. +The default drain wait timeout is controlled by the tunable +.Xr sysctl 8 +OID +.Va kern.tty_drainwait . .It Dv TIOCEXCL Fa void Set exclusive use on the terminal. No further opens are permitted except by root. Modified: stable/11/sys/kern/tty.c ============================================================================== --- stable/11/sys/kern/tty.c Thu Mar 2 04:11:18 2017 (r314537) +++ stable/11/sys/kern/tty.c Thu Mar 2 04:23:53 2017 (r314538) @@ -95,64 +95,101 @@ static const char *dev_console_filename; #define TTY_CALLOUT(tp,d) (dev2unit(d) & TTYUNIT_CALLOUT) +static int tty_drainwait = 5 * 60; +SYSCTL_INT(_kern, OID_AUTO, tty_drainwait, CTLFLAG_RWTUN, + &tty_drainwait, 0, "Default output drain timeout in seconds"); + /* * Set TTY buffer sizes. */ #define TTYBUF_MAX 65536 -static void +/* + * Allocate buffer space if necessary, and set low watermarks, based on speed. + * Note that the ttyxxxq_setsize() functions may drop and then reacquire the tty + * lock during memory allocation. They will return ENXIO if the tty disappears + * while unlocked. + */ +static int tty_watermarks(struct tty *tp) { size_t bs = 0; + int error; - /* Provide an input buffer for 0.2 seconds of data. */ + /* Provide an input buffer for 2 seconds of data. */ if (tp->t_termios.c_cflag & CREAD) bs = MIN(tp->t_termios.c_ispeed / 5, TTYBUF_MAX); - ttyinq_setsize(&tp->t_inq, tp, bs); + error = ttyinq_setsize(&tp->t_inq, tp, bs); + if (error != 0) + return (error); /* Set low watermark at 10% (when 90% is available). */ tp->t_inlow = (ttyinq_getallocatedsize(&tp->t_inq) * 9) / 10; - /* Provide an output buffer for 0.2 seconds of data. */ + /* Provide an output buffer for 2 seconds of data. */ bs = MIN(tp->t_termios.c_ospeed / 5, TTYBUF_MAX); - ttyoutq_setsize(&tp->t_outq, tp, bs); + error = ttyoutq_setsize(&tp->t_outq, tp, bs); + if (error != 0) + return (error); /* Set low watermark at 10% (when 90% is available). */ tp->t_outlow = (ttyoutq_getallocatedsize(&tp->t_outq) * 9) / 10; + + return (0); } static int tty_drain(struct tty *tp, int leaving) { - size_t bytesused; + sbintime_t timeout_at; + size_t bytes; int error; if (ttyhook_hashook(tp, getc_inject)) /* buffer is inaccessible */ return (0); - while (ttyoutq_bytesused(&tp->t_outq) > 0 || ttydevsw_busy(tp)) { - ttydevsw_outwakeup(tp); - /* Could be handled synchronously. */ - bytesused = ttyoutq_bytesused(&tp->t_outq); - if (bytesused == 0 && !ttydevsw_busy(tp)) - return (0); - - /* Wait for data to be drained. */ - if (leaving) { - error = tty_timedwait(tp, &tp->t_outwait, hz); - if (error == EWOULDBLOCK && - ttyoutq_bytesused(&tp->t_outq) < bytesused) - error = 0; - } else - error = tty_wait(tp, &tp->t_outwait); + /* + * For close(), use the recent historic timeout of "1 second without + * making progress". For tcdrain(), use t_drainwait as the timeout, + * with zero meaning "no timeout" which gives POSIX behavior. + */ + if (leaving) + timeout_at = getsbinuptime() + SBT_1S; + else if (tp->t_drainwait != 0) + timeout_at = getsbinuptime() + SBT_1S * tp->t_drainwait; + else + timeout_at = 0; - if (error) + /* + * Poll the output buffer and the hardware for completion, at 10 Hz. + * Polling is required for devices which are not able to signal an + * interrupt when the transmitter becomes idle (most USB serial devs). + * The unusual structure of this loop ensures we check for busy one more + * time after tty_timedwait() returns EWOULDBLOCK, so that success has + * higher priority than timeout if the IO completed in the last 100mS. + */ + error = 0; + bytes = ttyoutq_bytesused(&tp->t_outq); + for (;;) { + if (ttyoutq_bytesused(&tp->t_outq) == 0 && !ttydevsw_busy(tp)) + return (0); + if (error != 0) + return (error); + ttydevsw_outwakeup(tp); + error = tty_timedwait(tp, &tp->t_outwait, hz / 10); + if (error != 0 && error != EWOULDBLOCK) return (error); + else if (timeout_at == 0 || getsbinuptime() < timeout_at) + error = 0; + else if (leaving && ttyoutq_bytesused(&tp->t_outq) < bytes) { + /* In close, making progress, grant an extra second. */ + error = 0; + timeout_at += SBT_1S; + bytes = ttyoutq_bytesused(&tp->t_outq); + } } - - return (0); } /* @@ -294,7 +331,9 @@ ttydev_open(struct cdev *dev, int oflags goto done; ttydisc_open(tp); - tty_watermarks(tp); /* XXXGL: drops lock */ + error = tty_watermarks(tp); + if (error != 0) + goto done; } /* Wait for Carrier Detect. */ @@ -1015,6 +1054,7 @@ tty_alloc_mutex(struct ttydevsw *tsw, vo tp->t_devsw = tsw; tp->t_devswsoftc = sc; tp->t_flags = tsw->tsw_flags; + tp->t_drainwait = tty_drainwait; tty_init_termios(tp); @@ -1602,7 +1642,9 @@ tty_generic_ioctl(struct tty *tp, u_long tp->t_termios.c_ospeed = t->c_ospeed; /* Baud rate has changed - update watermarks. */ - tty_watermarks(tp); + error = tty_watermarks(tp); + if (error) + return (error); } /* Copy new non-device driver parameters. */ @@ -1755,6 +1797,14 @@ tty_generic_ioctl(struct tty *tp, u_long case TIOCDRAIN: /* Drain TTY output. */ return tty_drain(tp, 0); + case TIOCGDRAINWAIT: + *(int *)data = tp->t_drainwait; + return (0); + case TIOCSDRAINWAIT: + error = priv_check(td, PRIV_TTY_DRAINWAIT); + if (error == 0) + tp->t_drainwait = *(int *)data; + return (error); case TIOCCONS: /* Set terminal as console TTY. */ if (*(int *)data) { Modified: stable/11/sys/kern/tty_inq.c ============================================================================== --- stable/11/sys/kern/tty_inq.c Thu Mar 2 04:11:18 2017 (r314537) +++ stable/11/sys/kern/tty_inq.c Thu Mar 2 04:23:53 2017 (r314538) @@ -112,7 +112,7 @@ static uma_zone_t ttyinq_zone; TTYINQ_INSERT_TAIL(ti, tib); \ } while (0) -void +int ttyinq_setsize(struct ttyinq *ti, struct tty *tp, size_t size) { struct ttyinq_block *tib; @@ -134,8 +134,14 @@ ttyinq_setsize(struct ttyinq *ti, struct tib = uma_zalloc(ttyinq_zone, M_WAITOK); tty_lock(tp); + if (tty_gone(tp)) { + uma_zfree(ttyinq_zone, tib); + return (ENXIO); + } + TTYINQ_INSERT_TAIL(ti, tib); } + return (0); } void Modified: stable/11/sys/kern/tty_outq.c ============================================================================== --- stable/11/sys/kern/tty_outq.c Thu Mar 2 04:11:18 2017 (r314537) +++ stable/11/sys/kern/tty_outq.c Thu Mar 2 04:23:53 2017 (r314538) @@ -89,7 +89,7 @@ ttyoutq_flush(struct ttyoutq *to) to->to_end = 0; } -void +int ttyoutq_setsize(struct ttyoutq *to, struct tty *tp, size_t size) { struct ttyoutq_block *tob; @@ -111,8 +111,14 @@ ttyoutq_setsize(struct ttyoutq *to, stru tob = uma_zalloc(ttyoutq_zone, M_WAITOK); tty_lock(tp); + if (tty_gone(tp)) { + uma_zfree(ttyoutq_zone, tob); + return (ENXIO); + } + TTYOUTQ_INSERT_TAIL(to, tob); } + return (0); } void Modified: stable/11/sys/sys/tty.h ============================================================================== --- stable/11/sys/sys/tty.h Thu Mar 2 04:11:18 2017 (r314537) +++ stable/11/sys/sys/tty.h Thu Mar 2 04:23:53 2017 (r314538) @@ -62,6 +62,7 @@ struct tty { struct mtx *t_mtx; /* TTY lock. */ struct mtx t_mtxobj; /* Per-TTY lock (when not borrowing). */ TAILQ_ENTRY(tty) t_list; /* (l) TTY list entry. */ + int t_drainwait; /* (t) TIOCDRAIN timeout seconds. */ unsigned int t_flags; /* (t) Terminal option flags. */ /* Keep flags in sync with db_show_tty and pstat(8). */ #define TF_NOPREFIX 0x00001 /* Don't prepend "tty" to device name. */ Modified: stable/11/sys/sys/ttyqueue.h ============================================================================== --- stable/11/sys/sys/ttyqueue.h Thu Mar 2 04:11:18 2017 (r314537) +++ stable/11/sys/sys/ttyqueue.h Thu Mar 2 04:23:53 2017 (r314538) @@ -69,7 +69,7 @@ struct ttyoutq { #ifdef _KERNEL /* Input queue handling routines. */ -void ttyinq_setsize(struct ttyinq *ti, struct tty *tp, size_t len); +int ttyinq_setsize(struct ttyinq *ti, struct tty *tp, size_t len); void ttyinq_free(struct ttyinq *ti); int ttyinq_read_uio(struct ttyinq *ti, struct tty *tp, struct uio *uio, size_t readlen, size_t flushlen); @@ -136,7 +136,7 @@ void ttyinq_line_iterate_from_reprintpos /* Output queue handling routines. */ void ttyoutq_flush(struct ttyoutq *to); -void ttyoutq_setsize(struct ttyoutq *to, struct tty *tp, size_t len); +int ttyoutq_setsize(struct ttyoutq *to, struct tty *tp, size_t len); void ttyoutq_free(struct ttyoutq *to); size_t ttyoutq_read(struct ttyoutq *to, void *buf, size_t len); int ttyoutq_read_uio(struct ttyoutq *to, struct tty *tp, struct uio *uio); From owner-svn-src-all@freebsd.org Thu Mar 2 04:42:35 2017 Return-Path: Delivered-To: svn-src-all@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 27581CF57CA; Thu, 2 Mar 2017 04:42:35 +0000 (UTC) (envelope-from ian@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 01C7E67D; Thu, 2 Mar 2017 04:42:34 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v224gYsN095039; Thu, 2 Mar 2017 04:42:34 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v224gXwG095036; Thu, 2 Mar 2017 04:42:33 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703020442.v224gXwG095036@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Thu, 2 Mar 2017 04:42:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314539 - stable/11/sys/dev/usb/serial X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 04:42:35 -0000 Author: ian Date: Thu Mar 2 04:42:33 2017 New Revision: 314539 URL: https://svnweb.freebsd.org/changeset/base/314539 Log: MFC r313287: Add tsw_busy support to usb_serial (ucom). The tty layer uses tsw_busy to poll for busy/idle status of the transmitter hardware during close() and tcdrain(). The ucom layer defines ULSR_TXRDY and ULSR_TSRE bits for the line status register; when both are set, the transmitter is idle. Not all chip drivers maintain those bits in the sc_lsr field, and if the bits never get set the transmitter will always appear busy, causing hangs in tcdrain(). These changes add a new sc_flag bit, UCOM_FLAG_LSRTXIDLE. When this flag is set, ucom_busy() uses the lsr bits to return busy vs. idle state, otherwise it always returns idle (which is effectively what happened before this change because tsw_busy wasn't implemented). For the uftdi chip driver, these changes stop masking out the tx idle bits when processing the status register (because now they're useful), and it calls ucom_use_lsr_txbits() to indicate the bits are maintained by the driver and can be used by ucom_busy(). Modified: stable/11/sys/dev/usb/serial/uftdi.c stable/11/sys/dev/usb/serial/usb_serial.c stable/11/sys/dev/usb/serial/usb_serial.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/usb/serial/uftdi.c ============================================================================== --- stable/11/sys/dev/usb/serial/uftdi.c Thu Mar 2 04:23:53 2017 (r314538) +++ stable/11/sys/dev/usb/serial/uftdi.c Thu Mar 2 04:42:33 2017 (r314539) @@ -1123,6 +1123,9 @@ uftdi_attach(device_t dev) FTDI_SIO_SET_DATA_PARITY_NONE | FTDI_SIO_SET_DATA_BITS(8)); + /* Indicate tx bits in sc_lsr can be used to determine busy vs idle. */ + ucom_use_lsr_txbits(&sc->sc_ucom); + error = ucom_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, &uftdi_callback, &sc->sc_mtx); if (error) { @@ -1279,16 +1282,20 @@ uftdi_read_callback(struct usb_xfer *xfe offset = 0; /* * Extract packet headers and payload bytes from the buffer. - * Feed payload bytes to ucom/tty layer; OR-accumulate header - * status bits which are transient and could toggle with each - * packet. After processing all packets in the buffer, process - * the accumulated transient MSR and LSR values along with the + * Feed payload bytes to ucom/tty layer; OR-accumulate the + * receiver-related header status bits which are transient and + * could toggle with each packet, but for transmitter-related + * bits keep only the ones from the last packet. + * + * After processing all packets in the buffer, process the + * accumulated transient MSR and LSR values along with the * non-transient bits from the last packet header. */ while (buflen >= UFTDI_IHDRSIZE) { usbd_copy_out(pc, offset, buf, UFTDI_IHDRSIZE); offset += UFTDI_IHDRSIZE; buflen -= UFTDI_IHDRSIZE; + lsr &= ~(ULSR_TXRDY | ULSR_TSRE); lsr |= FTDI_GET_LSR(buf); if (FTDI_GET_MSR(buf) & FTDI_SIO_RI_MASK) msr |= SER_RI; @@ -1311,8 +1318,7 @@ uftdi_read_callback(struct usb_xfer *xfe if (ftdi_msr & FTDI_SIO_RLSD_MASK) msr |= SER_DCD; - if ((sc->sc_msr != msr) || - ((sc->sc_lsr & FTDI_LSR_MASK) != (lsr & FTDI_LSR_MASK))) { + if (sc->sc_msr != msr || sc->sc_lsr != lsr) { DPRINTF("status change msr=0x%02x (0x%02x) " "lsr=0x%02x (0x%02x)\n", msr, sc->sc_msr, lsr, sc->sc_lsr); Modified: stable/11/sys/dev/usb/serial/usb_serial.c ============================================================================== --- stable/11/sys/dev/usb/serial/usb_serial.c Thu Mar 2 04:23:53 2017 (r314538) +++ stable/11/sys/dev/usb/serial/usb_serial.c Thu Mar 2 04:42:33 2017 (r314539) @@ -162,6 +162,7 @@ static tsw_param_t ucom_param; static tsw_outwakeup_t ucom_outwakeup; static tsw_inwakeup_t ucom_inwakeup; static tsw_free_t ucom_free; +static tsw_busy_t ucom_busy; static struct ttydevsw ucom_class = { .tsw_flags = TF_INITLOCK | TF_CALLOUT, @@ -173,6 +174,7 @@ static struct ttydevsw ucom_class = { .tsw_param = ucom_param, .tsw_modem = ucom_modem, .tsw_free = ucom_free, + .tsw_busy = ucom_busy, }; MODULE_DEPEND(ucom, usb, 1, 1, 1); @@ -1295,6 +1297,27 @@ ucom_outwakeup(struct tty *tp) ucom_start_transfers(sc); } +static bool +ucom_busy(struct tty *tp) +{ + struct ucom_softc *sc = tty_softc(tp); + const uint8_t txidle = ULSR_TXRDY | ULSR_TSRE; + + UCOM_MTX_ASSERT(sc, MA_OWNED); + + DPRINTFN(3, "sc = %p lsr 0x%02x\n", sc, sc->sc_lsr); + + /* + * If the driver maintains the txidle bits in LSR, we can use them to + * determine whether the transmitter is busy or idle. Otherwise we have + * to assume it is idle to avoid hanging forever on tcdrain(3). + */ + if (sc->sc_flag & UCOM_FLAG_LSRTXIDLE) + return ((sc->sc_lsr & txidle) != txidle); + else + return (false); +} + /*------------------------------------------------------------------------* * ucom_get_data * Modified: stable/11/sys/dev/usb/serial/usb_serial.h ============================================================================== --- stable/11/sys/dev/usb/serial/usb_serial.h Thu Mar 2 04:23:53 2017 (r314538) +++ stable/11/sys/dev/usb/serial/usb_serial.h Thu Mar 2 04:42:33 2017 (r314539) @@ -180,6 +180,7 @@ struct ucom_softc { #define UCOM_FLAG_WAIT_REFS 0x0100 /* set if we must wait for refs */ #define UCOM_FLAG_FREE_UNIT 0x0200 /* set if we must free the unit */ #define UCOM_FLAG_INWAKEUP 0x0400 /* set if we are in the tsw_inwakeup callback */ +#define UCOM_FLAG_LSRTXIDLE 0x0800 /* set if sc_lsr bits ULSR_TSRE+TXRDY work */ uint8_t sc_lsr; uint8_t sc_msr; uint8_t sc_mcr; @@ -218,4 +219,12 @@ void ucom_drain(struct ucom_super_softc void ucom_drain_all(void *); void ucom_ref(struct ucom_super_softc *); int ucom_unref(struct ucom_super_softc *); + +static inline void +ucom_use_lsr_txbits(struct ucom_softc *sc) +{ + + sc->sc_flag |= UCOM_FLAG_LSRTXIDLE; +} + #endif /* _USB_SERIAL_H_ */ From owner-svn-src-all@freebsd.org Thu Mar 2 04:55:55 2017 Return-Path: Delivered-To: svn-src-all@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 E8FFECF5CA8; Thu, 2 Mar 2017 04:55:55 +0000 (UTC) (envelope-from ian@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 B5675CCC; Thu, 2 Mar 2017 04:55:55 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v224tsHQ099009; Thu, 2 Mar 2017 04:55:54 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v224tstC099008; Thu, 2 Mar 2017 04:55:54 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703020455.v224tstC099008@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Thu, 2 Mar 2017 04:55:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314540 - stable/11/sys/arm/freescale/imx X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 04:55:56 -0000 Author: ian Date: Thu Mar 2 04:55:54 2017 New Revision: 314540 URL: https://svnweb.freebsd.org/changeset/base/314540 Log: MFC r312679: Handle imx6 erratum ERR004346... to reboot, clear the SRS bit twice within the same cycle of the 32khz clock. I've never actually noticed this error happening, but it's an easy fix. Modified: stable/11/sys/arm/freescale/imx/imx_machdep.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/freescale/imx/imx_machdep.c ============================================================================== --- stable/11/sys/arm/freescale/imx/imx_machdep.c Thu Mar 2 04:42:33 2017 (r314539) +++ stable/11/sys/arm/freescale/imx/imx_machdep.c Thu Mar 2 04:55:54 2017 (r314540) @@ -69,11 +69,18 @@ imx_wdog_cpu_reset(vm_offset_t wdcr_phys * Trigger an immediate reset by clearing the SRS bit in the watchdog * control register. The reset happens on the next cycle of the wdog * 32KHz clock, so hang out in a spin loop until the reset takes effect. + * + * Imx6 erratum ERR004346 says the SRS bit has to be cleared twice + * within the same cycle of the 32khz clock to reliably trigger the + * reset. Writing it 3 times in a row ensures at least 2 of the writes + * happen in the same 32k clock cycle. */ if ((pcr = devmap_ptov(wdcr_physaddr, sizeof(*pcr))) == NULL) { printf("cpu_reset() can't find its control register... locking up now."); } else { *pcr &= ~WDOG_CR_SRS; + *pcr &= ~WDOG_CR_SRS; + *pcr &= ~WDOG_CR_SRS; } for (;;) continue; From owner-svn-src-all@freebsd.org Thu Mar 2 05:04:47 2017 Return-Path: Delivered-To: svn-src-all@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 02DD7CF5F7A; Thu, 2 Mar 2017 05:04:46 +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 CC2F6196; Thu, 2 Mar 2017 05:04:46 +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 v2254jpm002964; Thu, 2 Mar 2017 05:04:45 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2254jFM002957; Thu, 2 Mar 2017 05:04:45 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703020504.v2254jFM002957@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Thu, 2 Mar 2017 05:04:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314541 - in head/usr.sbin/wpa: . hostapd hostapd_cli wpa_cli wpa_passphrase wpa_priv wpa_supplicant X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 05:04:47 -0000 Author: ngie Date: Thu Mar 2 05:04:45 2017 New Revision: 314541 URL: https://svnweb.freebsd.org/changeset/base/314541 Log: Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones This simplifies pathing in make/displayed output. MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/wpa/Makefile.inc head/usr.sbin/wpa/hostapd/Makefile head/usr.sbin/wpa/hostapd_cli/Makefile head/usr.sbin/wpa/wpa_cli/Makefile head/usr.sbin/wpa/wpa_passphrase/Makefile head/usr.sbin/wpa/wpa_priv/Makefile head/usr.sbin/wpa/wpa_supplicant/Makefile Modified: head/usr.sbin/wpa/Makefile.inc ============================================================================== --- head/usr.sbin/wpa/Makefile.inc Thu Mar 2 04:55:54 2017 (r314540) +++ head/usr.sbin/wpa/Makefile.inc Thu Mar 2 05:04:45 2017 (r314541) @@ -2,11 +2,11 @@ BINDIR?= /usr/sbin -WPA_DISTDIR?= ${.CURDIR}/../../../contrib/wpa/ +WPA_DISTDIR?= ${SRCTOP}/contrib/wpa/ WPA_SUPPLICANT_DISTDIR?=${WPA_DISTDIR}/wpa_supplicant HOSTAPD_DISTDIR?= ${WPA_DISTDIR}/hostapd -.PATH.c:${.CURDIR}/.. \ +.PATH.c:${.CURDIR:H} \ ${WPA_DISTDIR}/src/ap \ ${WPA_DISTDIR}/src/common \ ${WPA_DISTDIR}/src/crypto \ Modified: head/usr.sbin/wpa/hostapd/Makefile ============================================================================== --- head/usr.sbin/wpa/hostapd/Makefile Thu Mar 2 04:55:54 2017 (r314540) +++ head/usr.sbin/wpa/hostapd/Makefile Thu Mar 2 05:04:45 2017 (r314541) @@ -1,7 +1,7 @@ # $FreeBSD$ .include -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" .PATH.c:${HOSTAPD_DISTDIR} \ ${WPA_DISTDIR}/src/drivers @@ -117,6 +117,6 @@ SRCS+= eap_server_sake.c \ eap_sake_common.c .endif -.include "${.CURDIR}/../Makefile.crypto" +.include "../Makefile.crypto" .include Modified: head/usr.sbin/wpa/hostapd_cli/Makefile ============================================================================== --- head/usr.sbin/wpa/hostapd_cli/Makefile Thu Mar 2 04:55:54 2017 (r314540) +++ head/usr.sbin/wpa/hostapd_cli/Makefile Thu Mar 2 05:04:45 2017 (r314541) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" .PATH.c:${HOSTAPD_DISTDIR} Modified: head/usr.sbin/wpa/wpa_cli/Makefile ============================================================================== --- head/usr.sbin/wpa/wpa_cli/Makefile Thu Mar 2 04:55:54 2017 (r314540) +++ head/usr.sbin/wpa/wpa_cli/Makefile Thu Mar 2 05:04:45 2017 (r314541) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} Modified: head/usr.sbin/wpa/wpa_passphrase/Makefile ============================================================================== --- head/usr.sbin/wpa/wpa_passphrase/Makefile Thu Mar 2 04:55:54 2017 (r314540) +++ head/usr.sbin/wpa/wpa_passphrase/Makefile Thu Mar 2 05:04:45 2017 (r314541) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} Modified: head/usr.sbin/wpa/wpa_priv/Makefile ============================================================================== --- head/usr.sbin/wpa/wpa_priv/Makefile Thu Mar 2 04:55:54 2017 (r314540) +++ head/usr.sbin/wpa/wpa_priv/Makefile Thu Mar 2 05:04:45 2017 (r314541) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} \ ${WPA_DISTDIR}/src/drivers @@ -11,6 +11,6 @@ SRCS= drivers.c os_unix.c eloop.c common LIBADD= pcap -.include "${.CURDIR}/../Makefile.crypto" +.include "../Makefile.crypto" .include Modified: head/usr.sbin/wpa/wpa_supplicant/Makefile ============================================================================== --- head/usr.sbin/wpa/wpa_supplicant/Makefile Thu Mar 2 04:55:54 2017 (r314540) +++ head/usr.sbin/wpa/wpa_supplicant/Makefile Thu Mar 2 05:04:45 2017 (r314541) @@ -2,7 +2,7 @@ .include -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} \ ${WPA_DISTDIR}/src/drivers @@ -142,6 +142,6 @@ SRCS+= eap_sake.c \ eap_sake_common.c .endif -.include "${.CURDIR}/../Makefile.crypto" +.include "../Makefile.crypto" .include From owner-svn-src-all@freebsd.org Thu Mar 2 05:34:06 2017 Return-Path: Delivered-To: svn-src-all@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 EE95ECF4FCC; Thu, 2 Mar 2017 05:34:06 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail108.syd.optusnet.com.au (mail108.syd.optusnet.com.au [211.29.132.59]) by mx1.freebsd.org (Postfix) with ESMTP id A70F4667; Thu, 2 Mar 2017 05:34:06 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from besplex.bde.org (c122-106-153-191.carlnfd1.nsw.optusnet.com.au [122.106.153.191]) by mail108.syd.optusnet.com.au (Postfix) with ESMTPS id 5EE3C1AA325; Thu, 2 Mar 2017 16:27:52 +1100 (AEDT) Date: Thu, 2 Mar 2017 16:27:51 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Conrad Meyer cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r313006 - in head: sys/conf sys/libkern sys/libkern/x86 sys/sys tests/sys/kern In-Reply-To: Message-ID: <20170302162120.C8136@besplex.bde.org> References: <201701310326.v0V3QW30024375@repo.freebsd.org> <20170202184819.GP2092@kib.kiev.ua> <20170203062806.A2690@besplex.bde.org> <20170228121335.Q2733@besplex.bde.org> MIME-Version: 1.0 X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.2 cv=KeqiiUQD c=1 sm=1 tr=0 a=Tj3pCpwHnMupdyZSltBt7Q==:117 a=Tj3pCpwHnMupdyZSltBt7Q==:17 a=nlC_4_pT8q9DhB4Ho9EA:9 a=6I5d2MoRAAAA:8 a=XY2pfOvqv3c6mUzDEOgA:9 a=45ClL6m2LaAA:10 a=IjZwj45LgO3ly-622nXo:22 Content-Type: TEXT/PLAIN; charset=X-UNKNOWN; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 05:34:07 -0000 On Wed, 1 Mar 2017, Conrad Meyer wrote: > On my laptop (Intel(R) Core(TM) i5-3320M CPU =E2=80=94 Ivy Bridge) I stil= l see > a little worse performance with this patch. Please excuse the ugly > graphs, I don't have a better graphing tool set up at this time: > > https://people.freebsd.org/~cem/crc32/sse42_bde.png > https://people.freebsd.org/~cem/crc32/sse42_bde_log.png Try doubling the loop sizes. There shouldn't be any significant difference above size 3*LONG unless LONG is too small. Apparently it is too small for older CPUs. I now have a Sandybridge i5-2xxx laptop to test on, but don't have it set up for much yet. Bruce From owner-svn-src-all@freebsd.org Thu Mar 2 06:02:18 2017 Return-Path: Delivered-To: svn-src-all@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 C708CCF5A0F; Thu, 2 Mar 2017 06:02:18 +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 96AFA676; Thu, 2 Mar 2017 06:02:18 +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 v2262HXs025998; Thu, 2 Mar 2017 06:02:17 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2262HPX025997; Thu, 2 Mar 2017 06:02:17 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703020602.v2262HPX025997@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Thu, 2 Mar 2017 06:02:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314542 - head/share/man/man4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 06:02:18 -0000 Author: ngie Date: Thu Mar 2 06:02:17 2017 New Revision: 314542 URL: https://svnweb.freebsd.org/changeset/base/314542 Log: kern.cam.da.X.delete_method: add -width to .Bl macro call Now the section width is set appropriately per the BIO_DELETE parameter being described. Reported by: make manlint MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/share/man/man4/da.4 Modified: head/share/man/man4/da.4 ============================================================================== --- head/share/man/man4/da.4 Thu Mar 2 05:04:45 2017 (r314541) +++ head/share/man/man4/da.4 Thu Mar 2 06:02:17 2017 (r314542) @@ -156,7 +156,7 @@ Set to 1 to enable sorting, 0 to disable The default is sorting enabled for HDDs and disabled for SSDs. .It Va kern.cam.da. Ns Ar X Ns Va .delete_method This variable specifies method to handle BIO_DELETE requests: -.Bl -tag +.Bl -tag -width "ATA_TRIM" .It ATA_TRIM ATA TRIM via ATA COMMAND PASS THROUGH command, .It UNMAP From owner-svn-src-all@freebsd.org Thu Mar 2 06:03:22 2017 Return-Path: Delivered-To: svn-src-all@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 DB5A3CF5A85; Thu, 2 Mar 2017 06:03:22 +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 AB2BB858; Thu, 2 Mar 2017 06:03:22 +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 v2263LT6026078; Thu, 2 Mar 2017 06:03:21 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2263Lnb026077; Thu, 2 Mar 2017 06:03:21 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703020603.v2263Lnb026077@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Thu, 2 Mar 2017 06:03:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314543 - head/share/man/man4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 06:03:23 -0000 Author: ngie Date: Thu Mar 2 06:03:21 2017 New Revision: 314543 URL: https://svnweb.freebsd.org/changeset/base/314543 Log: Add missing section when referencing ctl(4) via .Xr macro MFC after: 1 week Reported by: make manlint Sponsored by: Dell EMC Isilon Modified: head/share/man/man4/cfumass.4 Modified: head/share/man/man4/cfumass.4 ============================================================================== --- head/share/man/man4/cfumass.4 Thu Mar 2 06:02:17 2017 (r314542) +++ head/share/man/man4/cfumass.4 Thu Mar 2 06:03:21 2017 (r314543) @@ -72,7 +72,7 @@ The USB OTG port must be working in USB This happens automatically upon connection to a USB host. .It There must be a -.Xr ctl +.Xr ctl 4 LUN configured for the .Pa cfumass port. From owner-svn-src-all@freebsd.org Thu Mar 2 06:22:06 2017 Return-Path: Delivered-To: svn-src-all@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 C6EA4CF505C; Thu, 2 Mar 2017 06:22:06 +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 96917276; Thu, 2 Mar 2017 06:22:06 +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 v226M52G033808; Thu, 2 Mar 2017 06:22:05 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v226M5Pe033807; Thu, 2 Mar 2017 06:22:05 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703020622.v226M5Pe033807@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Thu, 2 Mar 2017 06:22:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314544 - head/share/man/man4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 06:22:06 -0000 Author: ngie Date: Thu Mar 2 06:22:05 2017 New Revision: 314544 URL: https://svnweb.freebsd.org/changeset/base/314544 Log: Sort .Xr: ahci(4) comes before ahd(4) X-MFC with: r314110 Reported by: make manlint Sponsored by: Dell EMC Isilon Modified: head/share/man/man4/scsi.4 Modified: head/share/man/man4/scsi.4 ============================================================================== --- head/share/man/man4/scsi.4 Thu Mar 2 06:03:21 2017 (r314543) +++ head/share/man/man4/scsi.4 Thu Mar 2 06:22:05 2017 (r314544) @@ -256,8 +256,7 @@ There are currently seven debugging flag This flag enables general informational printfs for the device or devices in question. .It Dv CAM_DEBUG_TRACE -This flag enables function-level command flow tracing. -i.e.\& +This flag enables function-level command flow tracing i.e., kernel printfs will happen at the entrance and exit of various functions. .It Dv CAM_DEBUG_SUBTRACE This flag enables debugging output internal to various functions. @@ -316,8 +315,8 @@ for details. .Xr ada 4 , .Xr aha 4 , .Xr ahc 4 , -.Xr ahd 4 , .Xr ahci 4 , +.Xr ahd 4 , .Xr ata 4 , .Xr bt 4 , .Xr cd 4 , From owner-svn-src-all@freebsd.org Thu Mar 2 06:25:51 2017 Return-Path: Delivered-To: svn-src-all@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 F0DECCF514C; Thu, 2 Mar 2017 06:25:51 +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 BE0976B6; Thu, 2 Mar 2017 06:25:51 +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 v226PoeI034022; Thu, 2 Mar 2017 06:25:50 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v226Po0C034021; Thu, 2 Mar 2017 06:25:50 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703020625.v226Po0C034021@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Thu, 2 Mar 2017 06:25:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314545 - head/share/man/man4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 06:25:52 -0000 Author: ngie Date: Thu Mar 2 06:25:50 2017 New Revision: 314545 URL: https://svnweb.freebsd.org/changeset/base/314545 Log: Add missing section to .Xr macro calls for wpifw(4) The driver manpage for wpifw(4) is missing, but will be added soon. This fixes the other 2 .Xr calls lacking sections to match the 3rd, syntactically correct, reference in the SEE ALSO section. MFC after: 1 week Reported by: make manlint Sponsored by: Dell EMC Isilon Modified: head/share/man/man4/wpi.4 Modified: head/share/man/man4/wpi.4 ============================================================================== --- head/share/man/man4/wpi.4 Thu Mar 2 06:22:05 2017 (r314544) +++ head/share/man/man4/wpi.4 Thu Mar 2 06:25:50 2017 (r314545) @@ -85,7 +85,7 @@ driver offloads both encryption and decr hardware for the CCMP cipher. .Pp This driver requires the firmware built with the -.Nm wpifw +.Nm wpifw 4 module to work. .Pp The @@ -144,7 +144,7 @@ The driver failed to load the firmware i .Xr firmware 9 subsystem. Verify the -.Xr wpifw +.Xr wpifw 4 firmware module is installed. .It "wpi%d: %s: timeout waiting for adapter to initialize, error %d" The onboard microcontroller failed to initialize in time. From owner-svn-src-all@freebsd.org Thu Mar 2 06:50:07 2017 Return-Path: Delivered-To: svn-src-all@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 E0333CF57C2 for ; Thu, 2 Mar 2017 06:50:07 +0000 (UTC) (envelope-from ben.rubson@gmail.com) Received: from mail-wm0-x22e.google.com (mail-wm0-x22e.google.com [IPv6:2a00:1450:400c:c09::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7567C20A for ; Thu, 2 Mar 2017 06:50:07 +0000 (UTC) (envelope-from ben.rubson@gmail.com) Received: by mail-wm0-x22e.google.com with SMTP id i17so850804wmf.0 for ; Wed, 01 Mar 2017 22:50:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date :content-transfer-encoding:message-id:references:to; bh=zPyxPhrNwJBxVrXGXYR/TejGC80Fjn5ey9cqzdAOI0o=; b=AakYFT3SCVb3/9P15dW1qia1VFaxQK2n/54LcY16WGYElBz2V0fAxutN55JYP+gs6Q PwTNYamweEXbgB1105GIIqUOLhxqjozNiqT+YSihMBIvE4eWiUPPFvRLAgrgIYySXRrg s9JE8mSX4+eqi0Co0m4ZdVaON5RzodwEE1Hc+LKVOnPU2dpB1V07zcWHwGNdiyzBS6q5 ZB269cqhirgshu+QbpeH9aANRJUAlDucm0ePrdH8fRo/RWArpE22LvmCgkU7P4SBr28u oxQd6t8mzbNBy6/vwr7kBpba5i+Zhavini7sT/+3dfb3qXViJVZSqqF/aOuoHKq+TT04 xk2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date :content-transfer-encoding:message-id:references:to; bh=zPyxPhrNwJBxVrXGXYR/TejGC80Fjn5ey9cqzdAOI0o=; b=hG7BH7/OKfYY3Nq7nelOTJe2xqtqO1QuK8r4F8obiq0LzzkW+5DwoX4qrYy0/KOSsq fnyXRwHsZNArKOg9YUSxbQcFGYAXzaInTUVjp60NYyNNasAsOy+89VN0YBE7SvvZeUmX /Scy2XaCREy+lZ9KWPOq8QDo6AKQYbHymUVjfULRvFtydJVOJRd1qXYtDw7edAmaQMfJ zsN2HzRddutRzv4o9qiS3WIZd0uBVonnoQK4DCSq1Q8EX9VJFk55mi3uehIm+/35yOK6 zMpOEnWaS9pan9Tr460IjJ3oz/e6nSR1yitQdn6sTfuRcgFt/6tD0Q8Gdr1sx/fdDTKG KAHg== X-Gm-Message-State: AMke39nq9gWyvXYGYzQobpH/L8rULkbV6lwzmADtaStGaXTXxK3tmS9sfqZezcUXGPK9Nw== X-Received: by 10.28.100.196 with SMTP id y187mr6351912wmb.129.1488437404589; Wed, 01 Mar 2017 22:50:04 -0800 (PST) Received: from ben.home (LFbn-1-7159-4.w90-116.abo.wanadoo.fr. [90.116.90.4]) by smtp.gmail.com with ESMTPSA id z70sm9546572wrc.2.2017.03.01.22.50.03 for (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Mar 2017 22:50:03 -0800 (PST) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Subject: Re: svn commit: r313006 - in head: sys/conf sys/libkern sys/libkern/x86 sys/sys tests/sys/kern From: Ben RUBSON In-Reply-To: <20170302162120.C8136@besplex.bde.org> Date: Thu, 2 Mar 2017 07:50:03 +0100 Content-Transfer-Encoding: quoted-printable Message-Id: <988772E1-7521-4752-9DD7-E4DECA9AA558@gmail.com> References: <201701310326.v0V3QW30024375@repo.freebsd.org> <20170202184819.GP2092@kib.kiev.ua> <20170203062806.A2690@besplex.bde.org> <20170228121335.Q2733@besplex.bde.org> <20170302162120.C8136@besplex.bde.org> To: svn-src-all@freebsd.org X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 06:50:08 -0000 > On 02 Mar 2017, at 06:27, Bruce Evans wrote: >=20 > On Wed, 1 Mar 2017, Conrad Meyer wrote: >=20 >> On my laptop (Intel(R) Core(TM) i5-3320M CPU =E2=80=94 Ivy Bridge) I = still see >> a little worse performance with this patch. Please excuse the ugly >> graphs, I don't have a better graphing tool set up at this time: >>=20 >> https://people.freebsd.org/~cem/crc32/sse42_bde.png >> https://people.freebsd.org/~cem/crc32/sse42_bde_log.png >=20 > Try doubling the loop sizes. There shouldn't be any significant = difference > above size 3*LONG unless LONG is too small. Apparently it is too = small for > older CPUs. Many thx Bruce & Conrad for your work on this ! My two cents, big chunks speed sounds (really) important as it will = impact data digest enabled iSCSI throughput. If needed, I could help with some benchmarks on my servers : Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz Thank you ! From owner-svn-src-all@freebsd.org Thu Mar 2 06:56:17 2017 Return-Path: Delivered-To: svn-src-all@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 B5348CF5A20; Thu, 2 Mar 2017 06:56:17 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5290B86C; Thu, 2 Mar 2017 06:56:17 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-wm0-f46.google.com with SMTP id v186so127266106wmd.0; Wed, 01 Mar 2017 22:56:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc:content-transfer-encoding; bh=tNlKxbahByIWpo7qner9kFKWcQLc5WRU/6WgMV55RTU=; b=TP0Igy/ZmKdO7CA0D/XooroXhgHbd2JYi+xclQrFCrdnhbK51Ec+N2rCj5qu9d1DQc 1ctR1Tn+0tumEke5GBDiijSr370E1Lh7Z5/W+uVcEXQcEibEORTcs/JiTLQEwLT782Ss eJv0g0vvIxwwI0P/1HT7zFwA5vWJMSaKUTCdxTasg7D2d53BD1Y69QjXnjKNe855PM0V y5iqRvtSCkZBhlRRTk3qs6mHfRb+iw/+MGwlpRkF7cbP5slDZwWgQv1xEwWZs51DZT+5 itPvQcB4gosOZwi8wDrWQvDmawbBZzd73S+7EVLFdVkGp0BNDOdo1qUGajU1JZfL6FQN T5Gg== X-Gm-Message-State: AMke39nztfVUFr4RZH4l+0SwriSzSOT07/ADKo5AjseXUgxpYNWP3fXawJs+IDB1hBC4/A== X-Received: by 10.28.170.4 with SMTP id t4mr6575362wme.89.1488434073716; Wed, 01 Mar 2017 21:54:33 -0800 (PST) Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com. [74.125.82.49]) by smtp.gmail.com with ESMTPSA id 136sm9704732wms.32.2017.03.01.21.54.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Mar 2017 21:54:33 -0800 (PST) Received: by mail-wm0-f49.google.com with SMTP id v186so126480222wmd.0; Wed, 01 Mar 2017 21:54:32 -0800 (PST) X-Received: by 10.28.221.11 with SMTP id u11mr6269176wmg.75.1488434072834; Wed, 01 Mar 2017 21:54:32 -0800 (PST) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 10.80.152.82 with HTTP; Wed, 1 Mar 2017 21:54:32 -0800 (PST) In-Reply-To: <20170302162120.C8136@besplex.bde.org> References: <201701310326.v0V3QW30024375@repo.freebsd.org> <20170202184819.GP2092@kib.kiev.ua> <20170203062806.A2690@besplex.bde.org> <20170228121335.Q2733@besplex.bde.org> <20170302162120.C8136@besplex.bde.org> From: Conrad Meyer Date: Wed, 1 Mar 2017 21:54:32 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r313006 - in head: sys/conf sys/libkern sys/libkern/x86 sys/sys tests/sys/kern To: Bruce Evans Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 06:56:17 -0000 On Wed, Mar 1, 2017 at 9:27 PM, Bruce Evans wrote: > On Wed, 1 Mar 2017, Conrad Meyer wrote: > >> On my laptop (Intel(R) Core(TM) i5-3320M CPU =E2=80=94 Ivy Bridge) I sti= ll see >> a little worse performance with this patch. Please excuse the ugly >> graphs, I don't have a better graphing tool set up at this time: >> >> https://people.freebsd.org/~cem/crc32/sse42_bde.png >> https://people.freebsd.org/~cem/crc32/sse42_bde_log.png > > > Try doubling the loop sizes. There shouldn't be any significant differen= ce > above size 3*LONG unless LONG is too small. Apparently it is too small f= or > older CPUs. > > I now have a Sandybridge i5-2xxx laptop to test on, but don't have it set > up for much yet. > > Bruce Hi Bruce, Doubling the loop sizes seems to make it slightly worse, actually: https://people.freebsd.org/~cem/crc32/sse42_bde2.png https://people.freebsd.org/~cem/crc32/sse42_bde_log2.png I haven't made any attempt to inspect the generated assembly. This is Clang 3.9.1 with -O2. Best, Conrad From owner-svn-src-all@freebsd.org Thu Mar 2 06:57:14 2017 Return-Path: Delivered-To: svn-src-all@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 AAF40CF5A92; Thu, 2 Mar 2017 06:57:14 +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 858459B7; Thu, 2 Mar 2017 06:57:14 +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 v226vDch045642; Thu, 2 Mar 2017 06:57:13 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v226vDij045640; Thu, 2 Mar 2017 06:57:13 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703020657.v226vDij045640@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Thu, 2 Mar 2017 06:57:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314546 - head/share/man/man4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 06:57:14 -0000 Author: ngie Date: Thu Mar 2 06:57:13 2017 New Revision: 314546 URL: https://svnweb.freebsd.org/changeset/base/314546 Log: Wordsmith mlx4{en,ib}(4) - Replace the "following lines" with more terse phrases. - Use .Lk for the mellanox URL. - Reword the SUPPORT section so it's less wordy. The DESCRIPTION section suggestions are still outstanding; improving the section requires additional review to make sure the nuance/message is correct per the original intent. Bump .Dd for the change Submitted by: wblock Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D9241 Modified: head/share/man/man4/mlx4en.4 head/share/man/man4/mlx4ib.4 Modified: head/share/man/man4/mlx4en.4 ============================================================================== --- head/share/man/man4/mlx4en.4 Thu Mar 2 06:25:50 2017 (r314545) +++ head/share/man/man4/mlx4en.4 Thu Mar 2 06:57:13 2017 (r314546) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 18, 2017 +.Dd March 1, 2017 .Dt MLX4EN 4 .Os .Sh NAME @@ -32,8 +32,7 @@ .Nd "Mellanox ConnectX-3 10GbE/40GbE network adapter driver" .Sh SYNOPSIS To compile this driver into the kernel, -place the following lines in your -kernel configuration file: +place these lines in your kernel configuration file: .Bd -ragged -offset indent .Cd "options COMPAT_LINUXKPI" .Cd "device mlx4" @@ -41,13 +40,13 @@ kernel configuration file: .Ed .Pp To load the driver as a module at run-time, -run the following command as root: +run this command as root: .Bd -literal -offset indent kldload mlx4en .Ed .Pp To load the driver as a -module at boot time, place the following lines in +module at boot time, place this line in .Xr loader.conf 5 : .Bd -literal -offset indent mlx4en_load="YES" @@ -75,10 +74,10 @@ Mellanox ConnectX-3 (ETH) .Sh SUPPORT For general information and support, go to the Mellanox support website at: -.Pa http://www.mellanox.com/ . +.Lk http://www.mellanox.com/ . .Pp -If an issue is identified with this driver with a supported adapter, -email all the specific information related to the issue to +If an issue is identified with this driver and a supported network adapter, +please email the specific information to .Aq Mt freebsd-drivers@mellanox.com . .Sh SEE ALSO .Xr mlx4ib 4 , Modified: head/share/man/man4/mlx4ib.4 ============================================================================== --- head/share/man/man4/mlx4ib.4 Thu Mar 2 06:25:50 2017 (r314545) +++ head/share/man/man4/mlx4ib.4 Thu Mar 2 06:57:13 2017 (r314546) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 18, 2017 +.Dd March 1, 2017 .Dt MLX4IB 4 .Os .Sh NAME @@ -32,8 +32,7 @@ .Nd "Mellanox ConnectX-3 10GbE/40GbE network adapter driver" .Sh SYNOPSIS To compile this driver into the kernel, -place the following lines in your -kernel configuration file: +place these lines in your kernel configuration file: .Bd -ragged -offset indent .Cd "options COMPAT_LINUXKPI" .Cd "device mlx4" @@ -41,13 +40,13 @@ kernel configuration file: .Ed .Pp To load the driver as a module at run-time, -run the following command as root: +run this command as root: .Bd -literal -offset indent kldload mlx4ib .Ed .Pp To load the driver as a -module at boot time, place the following lines in +module at boot time, place this line in .Xr loader.conf 5 : .Bd -literal -offset indent mlx4ib_load="YES" @@ -75,10 +74,10 @@ Mellanox ConnectX-3 (IB) .Sh SUPPORT For general information and support, go to the Mellanox support website at: -.Pa http://www.mellanox.com/ . +.Lk http://www.mellanox.com/ . .Pp -If an issue is identified with this driver with a supported adapter, -email all the specific information related to the issue to +If an issue is identified with this driver and a supported network adapter, +please email the specific information to .Aq Mt freebsd-drivers@mellanox.com . .Sh SEE ALSO .Xr mlx4en 4 , From owner-svn-src-all@freebsd.org Thu Mar 2 07:25:51 2017 Return-Path: Delivered-To: svn-src-all@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 5B35BCF5198; Thu, 2 Mar 2017 07:25:51 +0000 (UTC) (envelope-from dexuan@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 35FA087C; Thu, 2 Mar 2017 07:25:51 +0000 (UTC) (envelope-from dexuan@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v227PowB057032; Thu, 2 Mar 2017 07:25:50 GMT (envelope-from dexuan@FreeBSD.org) Received: (from dexuan@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v227Pom1057031; Thu, 2 Mar 2017 07:25:50 GMT (envelope-from dexuan@FreeBSD.org) Message-Id: <201703020725.v227Pom1057031@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dexuan set sender to dexuan@FreeBSD.org using -f From: Dexuan Cui Date: Thu, 2 Mar 2017 07:25:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314547 - head/sys/boot/efi/loader X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 07:25:51 -0000 Author: dexuan Date: Thu Mar 2 07:25:50 2017 New Revision: 314547 URL: https://svnweb.freebsd.org/changeset/base/314547 Log: loader.efi: reduce the size of the staging area if necessary The loader assumes physical memory in [2MB, 2MB + EFI_STAGING_SIZE) is Conventional Memory, but actually it may not, e.g. in the case of Hyper-V Generation-2 VM (i.e. UEFI VM) running on Windows Server 2012 R2 host, there is a BootServiceData memory block at the address 47.449MB and the memory is not writable. Without the patch, the loader will crash in efi_copy_finish(): see PR 211746. The patch verifies the end of the staging area, and reduces its size if necessary. This way, the loader will not try to write into the BootServiceData memory any longer. Thank Marcel Moolenaar for helping me on this issue! The patch also allocates the staging area in the first 1GB memory. See the comment in the patch for this. PR: 211746 Reviewed by: marcel, kib, sephe Approved by: sephe (mentor) MFC after: 2 weeks Sponsored by: Microsoft Differential Revision: https://reviews.freebsd.org/D9686 Modified: head/sys/boot/efi/loader/copy.c Modified: head/sys/boot/efi/loader/copy.c ============================================================================== --- head/sys/boot/efi/loader/copy.c Thu Mar 2 06:57:13 2017 (r314546) +++ head/sys/boot/efi/loader/copy.c Thu Mar 2 07:25:50 2017 (r314547) @@ -39,12 +39,71 @@ __FBSDID("$FreeBSD$"); #include "loader_efi.h" +#if defined(__i386__) || defined(__amd64__) + +#define KERNEL_PHYSICAL_BASE (2*1024*1024) + +static void +efi_verify_staging_size(unsigned long *nr_pages) +{ + UINTN sz; + EFI_MEMORY_DESCRIPTOR *map, *p; + EFI_PHYSICAL_ADDRESS start, end; + UINTN key, dsz; + UINT32 dver; + EFI_STATUS status; + int i, ndesc; + unsigned long available_pages; + + sz = 0; + status = BS->GetMemoryMap(&sz, 0, &key, &dsz, &dver); + if (status != EFI_BUFFER_TOO_SMALL) { + printf("Can't determine memory map size\n"); + return; + } + + map = malloc(sz); + status = BS->GetMemoryMap(&sz, map, &key, &dsz, &dver); + if (EFI_ERROR(status)) { + printf("Can't read memory map\n"); + goto out; + } + + ndesc = sz / dsz; + + for (i = 0, p = map; i < ndesc; + i++, p = NextMemoryDescriptor(p, dsz)) { + start = p->PhysicalStart; + end = start + p->NumberOfPages * EFI_PAGE_SIZE; + + if (KERNEL_PHYSICAL_BASE < start || + KERNEL_PHYSICAL_BASE >= end) + continue; + + if (p->Type != EfiConventionalMemory) + continue; + + available_pages = p->NumberOfPages - + ((KERNEL_PHYSICAL_BASE - start) >> EFI_PAGE_SHIFT); + + if (*nr_pages > available_pages) { + printf("staging area size is reduced: %ld -> %ld!\n", + *nr_pages, available_pages); + *nr_pages = available_pages; + } + + break; + } + +out: + free(map); +} +#endif + #ifndef EFI_STAGING_SIZE #define EFI_STAGING_SIZE 64 #endif -#define STAGE_PAGES EFI_SIZE_TO_PAGES((EFI_STAGING_SIZE) * 1024 * 1024) - EFI_PHYSICAL_ADDRESS staging, staging_end; int stage_offset_set = 0; ssize_t stage_offset; @@ -54,14 +113,32 @@ efi_copy_init(void) { EFI_STATUS status; + unsigned long nr_pages; + + nr_pages = EFI_SIZE_TO_PAGES((EFI_STAGING_SIZE) * 1024 * 1024); + +#if defined(__i386__) || defined(__amd64__) + /* We'll decrease nr_pages, if it's too big. */ + efi_verify_staging_size(&nr_pages); + + /* + * The staging area must reside in the the first 1GB physical + * memory: see elf64_exec() in + * boot/efi/loader/arch/amd64/elf64_freebsd.c. + */ + staging = 1024*1024*1024; + status = BS->AllocatePages(AllocateMaxAddress, EfiLoaderData, + nr_pages, &staging); +#else status = BS->AllocatePages(AllocateAnyPages, EfiLoaderData, - STAGE_PAGES, &staging); + nr_pages, &staging); +#endif if (EFI_ERROR(status)) { printf("failed to allocate staging area: %lu\n", EFI_ERROR_CODE(status)); return (status); } - staging_end = staging + STAGE_PAGES * EFI_PAGE_SIZE; + staging_end = staging + nr_pages * EFI_PAGE_SIZE; #if defined(__aarch64__) || defined(__arm__) /* From owner-svn-src-all@freebsd.org Thu Mar 2 07:50:07 2017 Return-Path: Delivered-To: svn-src-all@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 E9EC8CF589F; Thu, 2 Mar 2017 07:50:07 +0000 (UTC) (envelope-from mav@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 B6C626BE; Thu, 2 Mar 2017 07:50:07 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v227o6Ps064981; Thu, 2 Mar 2017 07:50:06 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v227o6qr064980; Thu, 2 Mar 2017 07:50:06 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201703020750.v227o6qr064980@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Thu, 2 Mar 2017 07:50:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314548 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 07:50:08 -0000 Author: mav Date: Thu Mar 2 07:50:06 2017 New Revision: 314548 URL: https://svnweb.freebsd.org/changeset/base/314548 Log: Completely skip cache flushing for not supporting log devices. MFC after: 2 weeks Sponsored by: iXsystems, Inc. Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Thu Mar 2 07:25:50 2017 (r314547) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Thu Mar 2 07:50:06 2017 (r314548) @@ -838,7 +838,7 @@ zil_flush_vdevs(zilog_t *zilog) avl_tree_t *t = &zilog->zl_vdev_tree; void *cookie = NULL; zil_vdev_node_t *zv; - zio_t *zio; + zio_t *zio = NULL; ASSERT(zilog->zl_writer); @@ -851,12 +851,13 @@ zil_flush_vdevs(zilog_t *zilog) spa_config_enter(spa, SCL_STATE, FTAG, RW_READER); - zio = zio_root(spa, NULL, NULL, ZIO_FLAG_CANFAIL); - while ((zv = avl_destroy_nodes(t, &cookie)) != NULL) { vdev_t *vd = vdev_lookup_top(spa, zv->zv_vdev); - if (vd != NULL) + if (vd != NULL && !vd->vdev_nowritecache) { + if (zio == NULL) + zio = zio_root(spa, NULL, NULL, ZIO_FLAG_CANFAIL); zio_flush(zio, vd); + } kmem_free(zv, sizeof (*zv)); } @@ -864,7 +865,8 @@ zil_flush_vdevs(zilog_t *zilog) * Wait for all the flushes to complete. Not all devices actually * support the DKIOCFLUSHWRITECACHE ioctl, so it's OK if it fails. */ - (void) zio_wait(zio); + if (zio) + (void) zio_wait(zio); spa_config_exit(spa, SCL_STATE, FTAG); } From owner-svn-src-all@freebsd.org Thu Mar 2 07:55:49 2017 Return-Path: Delivered-To: svn-src-all@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 29B97CF5ACE; Thu, 2 Mar 2017 07:55:49 +0000 (UTC) (envelope-from mav@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 D3054BB1; Thu, 2 Mar 2017 07:55:48 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v227tlQR068661; Thu, 2 Mar 2017 07:55:47 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v227tlfT068660; Thu, 2 Mar 2017 07:55:47 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201703020755.v227tlfT068660@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Thu, 2 Mar 2017 07:55:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314549 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 07:55:49 -0000 Author: mav Date: Thu Mar 2 07:55:47 2017 New Revision: 314549 URL: https://svnweb.freebsd.org/changeset/base/314549 Log: Execute last ZIO of log commit synchronously. For short transactions overhead of context switch can be too large. Skipping it gives significant latency reduction. For large ones, including multiple ZIOs, latency is less critical, while throughput there may become limited by checksumming speed of single CPU core. To get best of both cases, execute last ZIO directly from calling thread context to save latency, while all others (if there are any) enqueue to taskqueues in traditional way. MFC after: 2 weeks Sponsored by: iXsystems, Inc. Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Thu Mar 2 07:50:06 2017 (r314548) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Thu Mar 2 07:55:47 2017 (r314549) @@ -959,7 +959,7 @@ uint64_t zil_block_buckets[] = { * Calls are serialized. */ static lwb_t * -zil_lwb_write_start(zilog_t *zilog, lwb_t *lwb) +zil_lwb_write_start(zilog_t *zilog, lwb_t *lwb, boolean_t last) { lwb_t *nlwb = NULL; zil_chain_t *zilc; @@ -1060,6 +1060,8 @@ zil_lwb_write_start(zilog_t *zilog, lwb_ */ bzero(lwb->lwb_buf + lwb->lwb_nused, wsz - lwb->lwb_nused); + if (last) + lwb->lwb_zio->io_pipeline &= ~ZIO_STAGE_ISSUE_ASYNC; zio_nowait(lwb->lwb_zio); /* Kick off the write for the old log block */ /* @@ -1103,7 +1105,7 @@ cont: if (reclen > lwb_sp || (reclen + dlen > lwb_sp && lwb_sp < ZIL_MAX_LOG_DATA / 8 && (dlen % ZIL_MAX_LOG_DATA == 0 || lwb_sp < reclen + dlen % ZIL_MAX_LOG_DATA))) { - lwb = zil_lwb_write_start(zilog, lwb); + lwb = zil_lwb_write_start(zilog, lwb, B_FALSE); if (lwb == NULL) return (NULL); zil_lwb_write_init(zilog, lwb); @@ -1560,7 +1562,7 @@ zil_commit_writer(zilog_t *zilog) /* write the last block out */ if (lwb != NULL && lwb->lwb_zio != NULL) - lwb = zil_lwb_write_start(zilog, lwb); + lwb = zil_lwb_write_start(zilog, lwb, B_TRUE); zilog->zl_cur_used = 0; From owner-svn-src-all@freebsd.org Thu Mar 2 09:10:41 2017 Return-Path: Delivered-To: svn-src-all@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 7FAC1CF56E8; Thu, 2 Mar 2017 09:10:41 +0000 (UTC) (envelope-from avg@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 2089C27A; Thu, 2 Mar 2017 09:10:41 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v229AeAa097217; Thu, 2 Mar 2017 09:10:40 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v229Aewu097214; Thu, 2 Mar 2017 09:10:40 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703020910.v229Aewu097214@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 2 Mar 2017 09:10:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314550 - stable/10/sys/crypto/sha2 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 09:10:41 -0000 Author: avg Date: Thu Mar 2 09:10:39 2017 New Revision: 314550 URL: https://svnweb.freebsd.org/changeset/base/314550 Log: Fix r314332 (MFC of r300903): do not use C99 Static array indices The proper conditional support for that feature has not been MFC-ed yet and GCC is quirky about it. See r314101. This is a direct commit. Reported by: gjb Modified: stable/10/sys/crypto/sha2/sha512c.c stable/10/sys/crypto/sha2/sha512t.h Modified: stable/10/sys/crypto/sha2/sha512c.c ============================================================================== --- stable/10/sys/crypto/sha2/sha512c.c Thu Mar 2 07:55:47 2017 (r314549) +++ stable/10/sys/crypto/sha2/sha512c.c Thu Mar 2 09:10:39 2017 (r314550) @@ -364,7 +364,7 @@ SHA512_224_Update(SHA512_CTX * ctx, cons } void -SHA512_224_Final(unsigned char digest[static SHA512_224_DIGEST_LENGTH], SHA512_CTX * ctx) +SHA512_224_Final(unsigned char digest[SHA512_224_DIGEST_LENGTH], SHA512_CTX * ctx) { /* Add padding */ @@ -403,7 +403,7 @@ SHA512_256_Update(SHA512_CTX * ctx, cons } void -SHA512_256_Final(unsigned char digest[static SHA512_256_DIGEST_LENGTH], SHA512_CTX * ctx) +SHA512_256_Final(unsigned char digest[SHA512_256_DIGEST_LENGTH], SHA512_CTX * ctx) { /* Add padding */ Modified: stable/10/sys/crypto/sha2/sha512t.h ============================================================================== --- stable/10/sys/crypto/sha2/sha512t.h Thu Mar 2 07:55:47 2017 (r314549) +++ stable/10/sys/crypto/sha2/sha512t.h Thu Mar 2 09:10:39 2017 (r314550) @@ -103,7 +103,7 @@ __BEGIN_DECLS void SHA512_224_Init(SHA512_CTX *); void SHA512_224_Update(SHA512_CTX *, const void *, size_t); -void SHA512_224_Final(unsigned char [static SHA512_224_DIGEST_LENGTH], SHA512_CTX *); +void SHA512_224_Final(unsigned char [SHA512_224_DIGEST_LENGTH], SHA512_CTX *); #ifndef _KERNEL char *SHA512_224_End(SHA512_CTX *, char *); char *SHA512_224_Data(const void *, unsigned int, char *); @@ -112,7 +112,7 @@ char *SHA512_224_FileChunk(const char #endif void SHA512_256_Init(SHA512_CTX *); void SHA512_256_Update(SHA512_CTX *, const void *, size_t); -void SHA512_256_Final(unsigned char [static SHA512_256_DIGEST_LENGTH], SHA512_CTX *); +void SHA512_256_Final(unsigned char [SHA512_256_DIGEST_LENGTH], SHA512_CTX *); #ifndef _KERNEL char *SHA512_256_End(SHA512_CTX *, char *); char *SHA512_256_Data(const void *, unsigned int, char *); From owner-svn-src-all@freebsd.org Thu Mar 2 10:43:43 2017 Return-Path: Delivered-To: svn-src-all@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 D69C6CF549C; Thu, 2 Mar 2017 10:43:43 +0000 (UTC) (envelope-from avg@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 97D0E1A5; Thu, 2 Mar 2017 10:43:43 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22Ahguh036481; Thu, 2 Mar 2017 10:43:42 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22Ahgde036480; Thu, 2 Mar 2017 10:43:42 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703021043.v22Ahgde036480@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 2 Mar 2017 10:43:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314551 - stable/11/sys/dev/chromebook_platform X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 10:43:43 -0000 Author: avg Date: Thu Mar 2 10:43:42 2017 New Revision: 314551 URL: https://svnweb.freebsd.org/changeset/base/314551 Log: MFC r314271: chromebook_platform: catch up with ig4iic -> ig4iic_pci in r310621 It was MFC-ed as r311809. Modified: stable/11/sys/dev/chromebook_platform/chromebook_platform.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/chromebook_platform/chromebook_platform.c ============================================================================== --- stable/11/sys/dev/chromebook_platform/chromebook_platform.c Thu Mar 2 09:10:39 2017 (r314550) +++ stable/11/sys/dev/chromebook_platform/chromebook_platform.c Thu Mar 2 10:43:42 2017 (r314551) @@ -69,7 +69,7 @@ chromebook_i2c_identify(driver_t *driver * See http://lxr.free-electrons.com/source/drivers/platform/chrome/chromeos_laptop.c */ controller = device_get_parent(bus); - if (strcmp(device_get_name(controller), "ig4iic") != 0) + if (strcmp(device_get_name(controller), "ig4iic_pci") != 0) return; for (i = 0; i < nitems(slaves); i++) { From owner-svn-src-all@freebsd.org Thu Mar 2 10:44:58 2017 Return-Path: Delivered-To: svn-src-all@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 5BE25CF5547; Thu, 2 Mar 2017 10:44:58 +0000 (UTC) (envelope-from avg@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 2B30F322; Thu, 2 Mar 2017 10:44:58 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22AivQ3036597; Thu, 2 Mar 2017 10:44:57 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22AivNB036596; Thu, 2 Mar 2017 10:44:57 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703021044.v22AivNB036596@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 2 Mar 2017 10:44:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314552 - stable/11/share/man/man4 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 10:44:58 -0000 Author: avg Date: Thu Mar 2 10:44:57 2017 New Revision: 314552 URL: https://svnweb.freebsd.org/changeset/base/314552 Log: MFC r314268: add chromebook_platform.4 to the list of manual pages Modified: stable/11/share/man/man4/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man4/Makefile ============================================================================== --- stable/11/share/man/man4/Makefile Thu Mar 2 10:43:42 2017 (r314551) +++ stable/11/share/man/man4/Makefile Thu Mar 2 10:44:57 2017 (r314552) @@ -103,6 +103,7 @@ MAN= aac.4 \ cdce.4 \ cfi.4 \ ch.4 \ + chromebook_platform.4 \ ciss.4 \ cloudabi.4 \ cm.4 \ From owner-svn-src-all@freebsd.org Thu Mar 2 11:02:01 2017 Return-Path: Delivered-To: svn-src-all@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 A7E86CF58BA; Thu, 2 Mar 2017 11:02:01 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [88.99.82.50]) (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 74176DC7; Thu, 2 Mar 2017 11:02:00 +0000 (UTC) (envelope-from hps@selasky.org) Received: from hps2016.home.selasky.org (unknown [62.141.129.119]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 4D5231FE025; Thu, 2 Mar 2017 12:01:35 +0100 (CET) Subject: Re: svn commit: r314502 - in head/sys: kern net sys To: Sean Bruno , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201703011837.v21IbaLj055498@repo.freebsd.org> From: Hans Petter Selasky Message-ID: Date: Thu, 2 Mar 2017 12:01:11 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <201703011837.v21IbaLj055498@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 11:02:01 -0000 On 03/01/17 19:37, Sean Bruno wrote: > TASKQGROUP_DECLARE(net); > +TASKQGROUP_DECLARE(softirq); Thank you! While at it: Should the TASKQGROUP_DECLARE(net); line be removed? Is it defined anywhere? --HPS From owner-svn-src-all@freebsd.org Thu Mar 2 12:20:24 2017 Return-Path: Delivered-To: svn-src-all@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 C28F6CF171B; Thu, 2 Mar 2017 12:20:24 +0000 (UTC) (envelope-from hselasky@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 79CC4D0D; Thu, 2 Mar 2017 12:20:24 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22CKNk9072751; Thu, 2 Mar 2017 12:20:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22CKNCS072749; Thu, 2 Mar 2017 12:20:23 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201703021220.v22CKNCS072749@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Thu, 2 Mar 2017 12:20:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314553 - in head/sys: kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 12:20:24 -0000 Author: hselasky Date: Thu Mar 2 12:20:23 2017 New Revision: 314553 URL: https://svnweb.freebsd.org/changeset/base/314553 Log: Implement taskqueue_poll_is_busy() for use by the LinuxKPI. Refer to comment above function for a detailed description. Discussed with: kib @ MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/kern/subr_taskqueue.c head/sys/sys/taskqueue.h Modified: head/sys/kern/subr_taskqueue.c ============================================================================== --- head/sys/kern/subr_taskqueue.c Thu Mar 2 10:44:57 2017 (r314552) +++ head/sys/kern/subr_taskqueue.c Thu Mar 2 12:20:23 2017 (r314553) @@ -487,6 +487,23 @@ task_is_running(struct taskqueue *queue, return (0); } +/* + * Only use this function in single threaded contexts. It returns + * non-zero if the given task is either pending or running. Else the + * task is idle and can be queued again or freed. + */ +int +taskqueue_poll_is_busy(struct taskqueue *queue, struct task *task) +{ + int retval; + + TQ_LOCK(queue); + retval = task->ta_pending > 0 || task_is_running(queue, task); + TQ_UNLOCK(queue); + + return (retval); +} + static int taskqueue_cancel_locked(struct taskqueue *queue, struct task *task, u_int *pendp) Modified: head/sys/sys/taskqueue.h ============================================================================== --- head/sys/sys/taskqueue.h Thu Mar 2 10:44:57 2017 (r314552) +++ head/sys/sys/taskqueue.h Thu Mar 2 12:20:23 2017 (r314553) @@ -79,6 +79,7 @@ int taskqueue_start_threads_cpuset(struc int taskqueue_enqueue(struct taskqueue *queue, struct task *task); int taskqueue_enqueue_timeout(struct taskqueue *queue, struct timeout_task *timeout_task, int ticks); +int taskqueue_poll_is_busy(struct taskqueue *queue, struct task *task); int taskqueue_cancel(struct taskqueue *queue, struct task *task, u_int *pendp); int taskqueue_cancel_timeout(struct taskqueue *queue, From owner-svn-src-all@freebsd.org Thu Mar 2 13:54:47 2017 Return-Path: Delivered-To: svn-src-all@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 9172ACF35FD; Thu, 2 Mar 2017 13:54:47 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail109.syd.optusnet.com.au (mail109.syd.optusnet.com.au [211.29.132.80]) by mx1.freebsd.org (Postfix) with ESMTP id 3FF8F3B5; Thu, 2 Mar 2017 13:54:46 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from besplex.bde.org (c122-106-153-191.carlnfd1.nsw.optusnet.com.au [122.106.153.191]) by mail109.syd.optusnet.com.au (Postfix) with ESMTPS id DB2BDF484E5; Thu, 2 Mar 2017 19:04:16 +1100 (AEDT) Date: Thu, 2 Mar 2017 19:04:15 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Conrad Meyer cc: Bruce Evans , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r313006 - in head: sys/conf sys/libkern sys/libkern/x86 sys/sys tests/sys/kern In-Reply-To: Message-ID: <20170302174554.G10162@besplex.bde.org> References: <201701310326.v0V3QW30024375@repo.freebsd.org> <20170202184819.GP2092@kib.kiev.ua> <20170203062806.A2690@besplex.bde.org> <20170228121335.Q2733@besplex.bde.org> <20170302162120.C8136@besplex.bde.org> MIME-Version: 1.0 X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.2 cv=VbSHBBh9 c=1 sm=1 tr=0 a=Tj3pCpwHnMupdyZSltBt7Q==:117 a=Tj3pCpwHnMupdyZSltBt7Q==:17 a=nlC_4_pT8q9DhB4Ho9EA:9 a=PO7r1zJSAAAA:8 a=6I5d2MoRAAAA:8 a=LZ_DMIrJToCFJiwsm8oA:9 a=-WiFUBAWiFWPKgGP:21 a=94Rbo9e6TSSljmMT:21 a=45ClL6m2LaAA:10 a=Oa0T6EYmKFNB-xRHvYM1:22 a=IjZwj45LgO3ly-622nXo:22 Content-Type: TEXT/PLAIN; charset=X-UNKNOWN; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 13:54:47 -0000 On Wed, 1 Mar 2017, Conrad Meyer wrote: > On Wed, Mar 1, 2017 at 9:27 PM, Bruce Evans wrote: >> On Wed, 1 Mar 2017, Conrad Meyer wrote: >> >>> On my laptop (Intel(R) Core(TM) i5-3320M CPU =E2=80=94 Ivy Bridge) I st= ill see >>> a little worse performance with this patch. Please excuse the ugly >>> graphs, I don't have a better graphing tool set up at this time: >>> >>> https://people.freebsd.org/~cem/crc32/sse42_bde.png >>> https://people.freebsd.org/~cem/crc32/sse42_bde_log.png >> >> Try doubling the loop sizes. There shouldn't be any significant differe= nce >> above size 3*LONG unless LONG is too small. Apparently it is too small = for >> older CPUs. >> >> I now have a Sandybridge i5-2xxx laptop to test on, but don't have it se= t >> up for much yet. > > Doubling the loop sizes seems to make it slightly worse, actually: > > https://people.freebsd.org/~cem/crc32/sse42_bde2.png > https://people.freebsd.org/~cem/crc32/sse42_bde_log2.png > > I haven't made any attempt to inspect the generated assembly. This is > Clang 3.9.1 with -O2. I tested on Sandybridge (i5=3D2540M) and get exactly the opposite results with clang-3.9-0. It is much slower with intrinsics. Much slower than gcc-4-2.1. Perhaps a bug in one of the test programs (mine is enclosed). Minimum types with low variance (+-10 msec_ for "./z2 size 10" (100G total) in seconds on idle system: buf_size: 512 3*512 4096 3*4096 -------------- ----- ----- ---- ------ =2E/z2-bde-clang 10.57 8.36 6.85 6.58 =2E/z2-bde-gcc 10.99 8.96 7.08 6.58 =2E/z2-cur-clang 17.23 11.19 6.97 6.75 Oops, that was with MISALIGN =3D 1. Also, I forgot to force aligment of bu= f, but checked it was at 0x...40 in all case. Now with proper alignment: buf size: 512 3*512 4096 3*4096 -------------- ----- ----- ---- ------ =2E/z2-bde-clang 8.96 6.56 6.62 6.42 =2E/z2-bde-gcc 8.81 6.51 6.63 6.30 =2E/z2-cur-clang 14.70 6.22 6.66 6.13 The number of iterations is adjusted so that buf_size * num_iter =3D 100G. This shows that clang-3.9.0 with intrinsics is doing lots of rearrangement which is very bad for the misaligned case and otherwise helps for the multiple-of-3 cases (when the SHORT loop is null), and otherwise is a small pessimization relative to no intrinsicts, but beats gcc, while gcc does almost none. (I mostly tested with gcc -O3 and it seemed equally good then.) The function doesn't use __predict_ugly(), and clang apparently uses this to optimized the alignment code at great cost to the main loops when the alignment code executes (perhaps it removes the alignment code?) clang also does poorly with buf_size 512 in the aligned case. Indeed, gcc is much better with -O3 (other flags -static [-msse4 for intrins]). clang does excessive optimizations by default, and -O3 makes no difference for it: buf size: 512 3*512 4096 3*4096 -------------- ----- ----- ---- ------ =2E/z2-bde-clangO3 8.96 6.56 6.62 6.42 =2E/z2-bde-gccO3 8.95 6.06 6.11 5.80 =2E/z2-cur-clangO3 14.70 6.22 6.66 6.13 So we seem to be mainly testing uninteresting compiler pessimizations. Eventually compilers will understand the code better and not rearrange it very much (except for the alignment part). I did a quick test with LONG =3D SHORT =3D 128 and gcc -O2. This was just slower, even for the ideal loop size of 4096*3 (up from 6.30 to 6.67 seconds). This change just removes the LONG loop after renaming the SHORT loop to LONG. gcc apparently thinks it understands this simpler version, and pessimizes it. While testing, I did notice a pessimization that is not the compiler's fault: when the crc32 instructions are optimized at the expense of the crc update at the end of the loop, the loop gets out of sync with the update and the wrong thing can stall. The code has subtleties to try to prevent this, by compilers don't really understand this. Compiler membars to control the ordering precisely were just pessimizations. X #include X #include X #include X #include X=20 X #define MISALIGN=091 X #define SIZE=09=09(1024 * 1024) X=20 X uint8_t buf[MISALIGN + SIZE]; X=20 X uint32_t sse42_crc32c(uint32_t, const unsigned char *, unsigned); X=20 X int X main(int argc, char **argv) X { X =09size_t size; X =09uint32_t crc; X =09int i, j, limit, repeat; X=20 X =09size =3D argc =3D=3D 1 ? SIZE : atoi(argv[1]); X =09limit =3D 10000000000L / size; X =09repeat =3D argc < 3 ? 10 : atoi(argv[2]); X =09for (i =3D 0; i < sizeof(buf); i++) X =09=09buf[i] =3D rand(); X =09crc =3D 0; X =09for (j =3D 0; j < repeat; j++) X =09=09for (i =3D 0; i < limit; i++) X =09=09=09crc =3D sse42_crc32c(crc, &buf[MISALIGN], size); X =09printf("%#x\n", sse42_crc32c(0, &buf[MISALIGN], size)); X =09return (crc =3D=3D 0 ? 0 : 1); X } Loops like this are not very representative of normal use, but I don't know a better way. Bruce From owner-svn-src-all@freebsd.org Thu Mar 2 14:50:03 2017 Return-Path: Delivered-To: svn-src-all@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 38465CF47F1; Thu, 2 Mar 2017 14:50:03 +0000 (UTC) (envelope-from des@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 07CA12AE; Thu, 2 Mar 2017 14:50:02 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22Eo2lG031736; Thu, 2 Mar 2017 14:50:02 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22Eo2l1031735; Thu, 2 Mar 2017 14:50:02 GMT (envelope-from des@FreeBSD.org) Message-Id: <201703021450.v22Eo2l1031735@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Thu, 2 Mar 2017 14:50:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314554 - head/sbin/md5 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 14:50:03 -0000 Author: des Date: Thu Mar 2 14:50:01 2017 New Revision: 314554 URL: https://svnweb.freebsd.org/changeset/base/314554 Log: Fix date. Reported by: delphij, mckay MFC with: r314528 Modified: head/sbin/md5/md5.1 Modified: head/sbin/md5/md5.1 ============================================================================== --- head/sbin/md5/md5.1 Thu Mar 2 12:20:23 2017 (r314553) +++ head/sbin/md5/md5.1 Thu Mar 2 14:50:01 2017 (r314554) @@ -91,7 +91,7 @@ and algorithms have been proven to be vulnerable to practical collision attacks and should not be relied upon to produce unique outputs, nor should they be used as part of a cryptographic signature scheme. -As of 2016-03-02, there is no publicly known method to +As of 2017-03-02, there is no publicly known method to .Em reverse either algorithm, i.e. to find an input that produces a specific output. From owner-svn-src-all@freebsd.org Thu Mar 2 16:14:16 2017 Return-Path: Delivered-To: svn-src-all@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 66CB6CF5BC4; Thu, 2 Mar 2017 16:14:16 +0000 (UTC) (envelope-from mav@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 284F0BA7; Thu, 2 Mar 2017 16:14:16 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22GEFGN068288; Thu, 2 Mar 2017 16:14:15 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22GEFZX068287; Thu, 2 Mar 2017 16:14:15 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201703021614.v22GEFZX068287@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Thu, 2 Mar 2017 16:14:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314555 - head/sys/dev/iscsi X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 16:14:16 -0000 Author: mav Date: Thu Mar 2 16:14:15 2017 New Revision: 314555 URL: https://svnweb.freebsd.org/changeset/base/314555 Log: Inline some trivial wrapper functions. MFC after: 2 weeks Modified: head/sys/dev/iscsi/icl_soft.c Modified: head/sys/dev/iscsi/icl_soft.c ============================================================================== --- head/sys/dev/iscsi/icl_soft.c Thu Mar 2 14:50:01 2017 (r314554) +++ head/sys/dev/iscsi/icl_soft.c Thu Mar 2 16:14:15 2017 (r314555) @@ -203,34 +203,9 @@ icl_conn_receive_buf(struct icl_conn *ic return (0); } -static struct icl_pdu * -icl_pdu_new_empty(struct icl_conn *ic, int flags) -{ - struct icl_pdu *ip; - -#ifdef DIAGNOSTIC - refcount_acquire(&ic->ic_outstanding_pdus); -#endif - ip = uma_zalloc(icl_pdu_zone, flags | M_ZERO); - if (ip == NULL) { - ICL_WARN("failed to allocate %zd bytes", sizeof(*ip)); -#ifdef DIAGNOSTIC - refcount_release(&ic->ic_outstanding_pdus); -#endif - return (NULL); - } - - ip->ip_conn = ic; - - return (ip); -} - static void -icl_pdu_free(struct icl_pdu *ip) +icl_soft_conn_pdu_free(struct icl_conn *ic, struct icl_pdu *ip) { - struct icl_conn *ic; - - ic = ip->ip_conn; m_freem(ip->ip_bhs_mbuf); m_freem(ip->ip_ahs_mbuf); @@ -241,13 +216,6 @@ icl_pdu_free(struct icl_pdu *ip) #endif } -void -icl_soft_conn_pdu_free(struct icl_conn *ic, struct icl_pdu *ip) -{ - - icl_pdu_free(ip); -} - /* * Allocate icl_pdu with empty BHS to fill up by the caller. */ @@ -256,15 +224,24 @@ icl_soft_conn_new_pdu(struct icl_conn *i { struct icl_pdu *ip; - ip = icl_pdu_new_empty(ic, flags); - if (ip == NULL) +#ifdef DIAGNOSTIC + refcount_acquire(&ic->ic_outstanding_pdus); +#endif + ip = uma_zalloc(icl_pdu_zone, flags | M_ZERO); + if (ip == NULL) { + ICL_WARN("failed to allocate %zd bytes", sizeof(*ip)); +#ifdef DIAGNOSTIC + refcount_release(&ic->ic_outstanding_pdus); +#endif return (NULL); + } + ip->ip_conn = ic; CTASSERT(sizeof(struct iscsi_bhs) <= MHLEN); ip->ip_bhs_mbuf = m_gethdr(flags, MT_DATA); if (ip->ip_bhs_mbuf == NULL) { ICL_WARN("failed to allocate BHS mbuf"); - icl_pdu_free(ip); + icl_soft_conn_pdu_free(ic, ip); return (NULL); } ip->ip_bhs = mtod(ip->ip_bhs_mbuf, struct iscsi_bhs *); @@ -769,7 +746,7 @@ icl_conn_receive_pdus(struct icl_conn *i ICL_WARN("received PDU with unsupported " "AHS; opcode 0x%x; dropping connection", response->ip_bhs->bhs_opcode); - icl_pdu_free(response); + icl_soft_conn_pdu_free(ic, response); icl_conn_fail(ic); return; } @@ -945,8 +922,8 @@ icl_conn_send_pdus(struct icl_conn *ic, if (error != 0) { ICL_DEBUG("failed to finalize PDU; " "dropping connection"); + icl_soft_conn_pdu_free(ic, request); icl_conn_fail(ic); - icl_pdu_free(request); return; } if (coalesce) { @@ -963,9 +940,9 @@ icl_conn_send_pdus(struct icl_conn *ic, if (error != 0) { ICL_DEBUG("failed to finalize PDU; " "dropping connection"); + icl_soft_conn_pdu_free(ic, request); + icl_soft_conn_pdu_free(ic, request2); icl_conn_fail(ic); - icl_pdu_free(request); - icl_pdu_free(request2); return; } m_cat(request->ip_bhs_mbuf, request2->ip_bhs_mbuf); @@ -973,7 +950,7 @@ icl_conn_send_pdus(struct icl_conn *ic, request->ip_bhs_mbuf->m_pkthdr.len += size2; size += size2; STAILQ_REMOVE_AFTER(queue, request, ip_next); - icl_pdu_free(request2); + icl_soft_conn_pdu_free(ic, request2); coalesced++; } #if 0 @@ -990,11 +967,11 @@ icl_conn_send_pdus(struct icl_conn *ic, if (error != 0) { ICL_DEBUG("failed to send PDU, error %d; " "dropping connection", error); + icl_soft_conn_pdu_free(ic, request); icl_conn_fail(ic); - icl_pdu_free(request); return; } - icl_pdu_free(request); + icl_soft_conn_pdu_free(ic, request); } } @@ -1088,8 +1065,8 @@ icl_soupcall_send(struct socket *so, voi } static int -icl_pdu_append_data(struct icl_pdu *request, const void *addr, size_t len, - int flags) +icl_soft_conn_pdu_append_data(struct icl_conn *ic, struct icl_pdu *request, + const void *addr, size_t len, int flags) { struct mbuf *mb, *newmb; size_t copylen, off = 0; @@ -1121,27 +1098,12 @@ icl_pdu_append_data(struct icl_pdu *requ return (0); } -int -icl_soft_conn_pdu_append_data(struct icl_conn *ic, struct icl_pdu *request, - const void *addr, size_t len, int flags) -{ - - return (icl_pdu_append_data(request, addr, len, flags)); -} - -static void -icl_pdu_get_data(struct icl_pdu *ip, size_t off, void *addr, size_t len) -{ - - m_copydata(ip->ip_data_mbuf, off, len, addr); -} - void icl_soft_conn_pdu_get_data(struct icl_conn *ic, struct icl_pdu *ip, size_t off, void *addr, size_t len) { - return (icl_pdu_get_data(ip, off, addr, len)); + m_copydata(ip->ip_data_mbuf, off, len, addr); } static void @@ -1155,7 +1117,7 @@ icl_pdu_queue(struct icl_pdu *ip) if (ic->ic_disconnecting || ic->ic_socket == NULL) { ICL_DEBUG("icl_pdu_queue on closed connection"); - icl_pdu_free(ip); + icl_soft_conn_pdu_free(ic, ip); return; } @@ -1433,7 +1395,7 @@ icl_soft_conn_close(struct icl_conn *ic) if (ic->ic_receive_pdu != NULL) { //ICL_DEBUG("freeing partially received PDU"); - icl_pdu_free(ic->ic_receive_pdu); + icl_soft_conn_pdu_free(ic, ic->ic_receive_pdu); ic->ic_receive_pdu = NULL; } @@ -1443,7 +1405,7 @@ icl_soft_conn_close(struct icl_conn *ic) while (!STAILQ_EMPTY(&ic->ic_to_send)) { pdu = STAILQ_FIRST(&ic->ic_to_send); STAILQ_REMOVE_HEAD(&ic->ic_to_send, ip_next); - icl_pdu_free(pdu); + icl_soft_conn_pdu_free(ic, pdu); } KASSERT(STAILQ_EMPTY(&ic->ic_to_send), From owner-svn-src-all@freebsd.org Thu Mar 2 17:05:53 2017 Return-Path: Delivered-To: svn-src-all@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 AF3C0CF5ABD; Thu, 2 Mar 2017 17:05:53 +0000 (UTC) (envelope-from brooks@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 89B4991C; Thu, 2 Mar 2017 17:05:53 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22H5q1K087913; Thu, 2 Mar 2017 17:05:52 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22H5q2j087908; Thu, 2 Mar 2017 17:05:52 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201703021705.v22H5q2j087908@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Thu, 2 Mar 2017 17:05:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314556 - in head/lib/libc: aarch64/string amd64/string arm/string i386/string mips/string sparc64/string X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 17:05:53 -0000 Author: brooks Date: Thu Mar 2 17:05:52 2017 New Revision: 314556 URL: https://svnweb.freebsd.org/changeset/base/314556 Log: Correct MDSRCS use in /string/Makefile.inc. - Remove .c files which duplicate entries in MISRCS. - Use the same, less merge conflict prone style in all cases. - Use MDSRCS for mips (.c and .S files both ended up in SRCS). - Remove pointless sparc64 Makefile.inc. - Remove uninformative foreign VCS ID entries. Reviewed by: emaste, imp, jhb MFC after: 1 week Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D9841 Deleted: head/lib/libc/sparc64/string/ Modified: head/lib/libc/aarch64/string/Makefile.inc head/lib/libc/amd64/string/Makefile.inc head/lib/libc/arm/string/Makefile.inc head/lib/libc/i386/string/Makefile.inc head/lib/libc/mips/string/Makefile.inc Modified: head/lib/libc/aarch64/string/Makefile.inc ============================================================================== --- head/lib/libc/aarch64/string/Makefile.inc Thu Mar 2 16:14:15 2017 (r314555) +++ head/lib/libc/aarch64/string/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) @@ -6,7 +6,8 @@ .PATH: ${SRCTOP}/contrib/cortex-strings/src/aarch64 -MDSRCS+=memchr.S \ +MDSRCS+= \ + memchr.S \ memcmp.S \ memcpy.S \ memmove.S \ Modified: head/lib/libc/amd64/string/Makefile.inc ============================================================================== --- head/lib/libc/amd64/string/Makefile.inc Thu Mar 2 16:14:15 2017 (r314555) +++ head/lib/libc/amd64/string/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) @@ -1,4 +1,13 @@ # $FreeBSD$ -MDSRCS+= bcmp.S bcopy.S bzero.S memcmp.S memcpy.S memmove.S memset.S \ - strcat.S strcmp.S stpcpy.S strcpy.c +MDSRCS+= \ + bcmp.S \ + bcopy.S \ + bzero.S \ + memcmp.S \ + memcpy.S \ + memmove.S \ + memset.S \ + strcat.S \ + strcmp.S \ + stpcpy.S Modified: head/lib/libc/arm/string/Makefile.inc ============================================================================== --- head/lib/libc/arm/string/Makefile.inc Thu Mar 2 16:14:15 2017 (r314555) +++ head/lib/libc/arm/string/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) @@ -1,6 +1,13 @@ -# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -MDSRCS+=bcmp.c bcopy.S bzero.S ffs.S memchr.c memcmp.S memcpy.S \ - memmove.S memset.S strcat.c strchr.c strcmp.S strcpy.c strlen.S \ - strncmp.S strrchr.c swab.c wcschr.c wcscmp.c wcslen.c wmemchr.c +MDSRCS+= \ + bcopy.S \ + bzero.S \ + ffs.S \ + memcmp.S \ + memcpy.S \ + memmove.S \ + memset.S \ + strcmp.S \ + strlen.S \ + strncmp.S Modified: head/lib/libc/i386/string/Makefile.inc ============================================================================== --- head/lib/libc/i386/string/Makefile.inc Thu Mar 2 16:14:15 2017 (r314555) +++ head/lib/libc/i386/string/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) @@ -1,6 +1,23 @@ -# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -MDSRCS+=bcmp.S bcopy.S bzero.S ffs.S memchr.S memcmp.S memcpy.S memmove.S \ - memset.S strcat.S strchr.S strcmp.S strcpy.S strncmp.S strrchr.S \ - swab.S wcschr.S wcscmp.S wcslen.S wmemchr.S +MDSRCS+= \ + bcmp.S \ + bcopy.S \ + bzero.S \ + ffs.S \ + memchr.S \ + memcmp.S \ + memcpy.S \ + memmove.S \ + memset.S \ + strcat.S \ + strchr.S \ + strcmp.S \ + strcpy.S \ + strncmp.S \ + strrchr.S \ + swab.S \ + wcschr.S \ + wcscmp.S \ + wcslen.S \ + wmemchr.S Modified: head/lib/libc/mips/string/Makefile.inc ============================================================================== --- head/lib/libc/mips/string/Makefile.inc Thu Mar 2 16:14:15 2017 (r314555) +++ head/lib/libc/mips/string/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) @@ -1,8 +1,13 @@ -# $NetBSD: Makefile.inc,v 1.2 2000/10/10 21:51:54 jeffs Exp $ # $FreeBSD$ -SRCS+= bcmp.S bcopy.S bzero.S ffs.S memchr.c memcmp.c memset.c \ - memcpy.S memmove.S \ - strcat.c strchr.S strcmp.S strcpy.c strcspn.c strlen.S \ - strncat.c strncmp.c strncpy.c strrchr.S strpbrk.c strsep.c \ - strspn.c strstr.c swab.c +MDSRCS+= \ + bcmp.S \ + bcopy.S \ + bzero.S \ + ffs.S \ + memcpy.S \ + memmove.S \ + strchr.S \ + strcmp.S \ + strlen.S \ + strrchr.S From owner-svn-src-all@freebsd.org Thu Mar 2 17:07:30 2017 Return-Path: Delivered-To: svn-src-all@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 9C41ACF5B97; Thu, 2 Mar 2017 17:07:30 +0000 (UTC) (envelope-from brooks@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 5CD5DAF7; Thu, 2 Mar 2017 17:07:30 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22H7TxB088024; Thu, 2 Mar 2017 17:07:29 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22H7SpX088014; Thu, 2 Mar 2017 17:07:28 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201703021707.v22H7SpX088014@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Thu, 2 Mar 2017 17:07:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314557 - in head/lib/libc: aarch64 amd64 arm i386 mips powerpc powerpc64 powerpcspe riscv sparc64 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 17:07:30 -0000 Author: brooks Date: Thu Mar 2 17:07:28 2017 New Revision: 314557 URL: https://svnweb.freebsd.org/changeset/base/314557 Log: Correct an misunderstanding of MDSRCS. MDSRCS it intended to allow assembly versions of funtions with C implementations listed in MISRCS. The selection of the correct machdep_ldis?.c for a given architecture does not follow this pattern and the file should be added to SRCS directly. Reviewed by: emaste, imp, jhb MFC after: 1 week Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D9841 Modified: head/lib/libc/aarch64/Makefile.inc head/lib/libc/amd64/Makefile.inc head/lib/libc/arm/Makefile.inc head/lib/libc/i386/Makefile.inc head/lib/libc/mips/Makefile.inc head/lib/libc/powerpc/Makefile.inc head/lib/libc/powerpc64/Makefile.inc head/lib/libc/powerpcspe/Makefile.inc head/lib/libc/riscv/Makefile.inc head/lib/libc/sparc64/Makefile.inc Modified: head/lib/libc/aarch64/Makefile.inc ============================================================================== --- head/lib/libc/aarch64/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) +++ head/lib/libc/aarch64/Makefile.inc Thu Mar 2 17:07:28 2017 (r314557) @@ -5,5 +5,5 @@ # Long double is quad precision GDTOASRCS+=strtorQ.c -MDSRCS+=machdep_ldisQ.c +SRCS+=machdep_ldisQ.c SYM_MAPS+=${LIBC_SRCTOP}/aarch64/Symbol.map Modified: head/lib/libc/amd64/Makefile.inc ============================================================================== --- head/lib/libc/amd64/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) +++ head/lib/libc/amd64/Makefile.inc Thu Mar 2 17:07:28 2017 (r314557) @@ -5,5 +5,5 @@ # Long double is 80 bits GDTOASRCS+=strtorx.c -MDSRCS+=machdep_ldisx.c +SRCS+=machdep_ldisx.c SYM_MAPS+=${LIBC_SRCTOP}/amd64/Symbol.map Modified: head/lib/libc/arm/Makefile.inc ============================================================================== --- head/lib/libc/arm/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) +++ head/lib/libc/arm/Makefile.inc Thu Mar 2 17:07:28 2017 (r314557) @@ -6,7 +6,7 @@ SOFTFLOAT_BITS=32 # Long double is just double precision. -MDSRCS+=machdep_ldisd.c +SRCS+=machdep_ldisd.c SYM_MAPS+=${LIBC_SRCTOP}/arm/Symbol.map .include "${LIBC_SRCTOP}/arm/aeabi/Makefile.inc" Modified: head/lib/libc/i386/Makefile.inc ============================================================================== --- head/lib/libc/i386/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) +++ head/lib/libc/i386/Makefile.inc Thu Mar 2 17:07:28 2017 (r314557) @@ -2,5 +2,5 @@ # Long double is 80 bits GDTOASRCS+=strtorx.c -MDSRCS+=machdep_ldisx.c +SRCS+=machdep_ldisx.c SYM_MAPS+=${LIBC_SRCTOP}/i386/Symbol.map Modified: head/lib/libc/mips/Makefile.inc ============================================================================== --- head/lib/libc/mips/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) +++ head/lib/libc/mips/Makefile.inc Thu Mar 2 17:07:28 2017 (r314557) @@ -5,5 +5,5 @@ CFLAGS+=-DSOFTFLOAT .endif -MDSRCS+= machdep_ldisd.c +SRCS+= machdep_ldisd.c SYM_MAPS+= ${LIBC_SRCTOP}/mips/Symbol.map Modified: head/lib/libc/powerpc/Makefile.inc ============================================================================== --- head/lib/libc/powerpc/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) +++ head/lib/libc/powerpc/Makefile.inc Thu Mar 2 17:07:28 2017 (r314557) @@ -3,5 +3,5 @@ SRCS+= trivial-vdso_tc.c # Long double is 64-bits -MDSRCS+=machdep_ldisd.c +SRCS+=machdep_ldisd.c SYM_MAPS+=${LIBC_SRCTOP}/powerpc/Symbol.map Modified: head/lib/libc/powerpc64/Makefile.inc ============================================================================== --- head/lib/libc/powerpc64/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) +++ head/lib/libc/powerpc64/Makefile.inc Thu Mar 2 17:07:28 2017 (r314557) @@ -3,5 +3,5 @@ SRCS+= trivial-vdso_tc.c # Long double is 64-bits -MDSRCS+=machdep_ldisd.c +SRCS+=machdep_ldisd.c SYM_MAPS+=${LIBC_SRCTOP}/powerpc64/Symbol.map Modified: head/lib/libc/powerpcspe/Makefile.inc ============================================================================== --- head/lib/libc/powerpcspe/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) +++ head/lib/libc/powerpcspe/Makefile.inc Thu Mar 2 17:07:28 2017 (r314557) @@ -4,5 +4,5 @@ CFLAGS+= -I${LIBC_SRCTOP}/powerpc SRCS+= trivial-vdso_tc.c # Long double is 64-bits -MDSRCS+=machdep_ldisd.c +SRCS+=machdep_ldisd.c SYM_MAPS+=${LIBC_SRCTOP}/powerpc/Symbol.map Modified: head/lib/libc/riscv/Makefile.inc ============================================================================== --- head/lib/libc/riscv/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) +++ head/lib/libc/riscv/Makefile.inc Thu Mar 2 17:07:28 2017 (r314557) @@ -9,5 +9,5 @@ CFLAGS+=-DSOFTFLOAT # Long double is quad precision GDTOASRCS+=strtorQ.c -MDSRCS+=machdep_ldisQ.c +SRCS+=machdep_ldisQ.c SYM_MAPS+=${LIBC_SRCTOP}/riscv/Symbol.map Modified: head/lib/libc/sparc64/Makefile.inc ============================================================================== --- head/lib/libc/sparc64/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) +++ head/lib/libc/sparc64/Makefile.inc Thu Mar 2 17:07:28 2017 (r314557) @@ -9,5 +9,5 @@ SRCS+= trivial-vdso_tc.c # Long double is quad precision GDTOASRCS+=strtorQ.c -MDSRCS+=machdep_ldisQ.c +SRCS+=machdep_ldisQ.c SYM_MAPS+=${LIBC_SRCTOP}/sparc64/Symbol.map From owner-svn-src-all@freebsd.org Thu Mar 2 17:08:38 2017 Return-Path: Delivered-To: svn-src-all@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 C5237CF5C14; Thu, 2 Mar 2017 17:08:38 +0000 (UTC) (envelope-from brooks@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 783B7C51; Thu, 2 Mar 2017 17:08:38 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22H8bfk088117; Thu, 2 Mar 2017 17:08:37 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22H8b9c088116; Thu, 2 Mar 2017 17:08:37 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201703021708.v22H8b9c088116@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Thu, 2 Mar 2017 17:08:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314558 - head/lib/libc/mips/gdtoa X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 17:08:38 -0000 Author: brooks Date: Thu Mar 2 17:08:37 2017 New Revision: 314558 URL: https://svnweb.freebsd.org/changeset/base/314558 Log: Garbage collect unused gdtoa related files on mips. Reviewed by: emase, imp, jhb MFC after: 1 week Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D9841 Deleted: head/lib/libc/mips/gdtoa/ From owner-svn-src-all@freebsd.org Thu Mar 2 17:09:15 2017 Return-Path: Delivered-To: svn-src-all@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 D06B4CF5C7C; Thu, 2 Mar 2017 17:09:15 +0000 (UTC) (envelope-from br@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 A0358DAC; Thu, 2 Mar 2017 17:09:15 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22H9Eab088188; Thu, 2 Mar 2017 17:09:14 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22H9Ek9088187; Thu, 2 Mar 2017 17:09:14 GMT (envelope-from br@FreeBSD.org) Message-Id: <201703021709.v22H9Ek9088187@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Thu, 2 Mar 2017 17:09:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314559 - head/sys/mips/nlm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 17:09:15 -0000 Author: br Date: Thu Mar 2 17:09:14 2017 New Revision: 314559 URL: https://svnweb.freebsd.org/changeset/base/314559 Log: Fix build: include machine/bus.h before uart.h Reported by: emaste Sponsored by: DARPA, AFRL Modified: head/sys/mips/nlm/xlp_pci.c Modified: head/sys/mips/nlm/xlp_pci.c ============================================================================== --- head/sys/mips/nlm/xlp_pci.c Thu Mar 2 17:08:37 2017 (r314558) +++ head/sys/mips/nlm/xlp_pci.c Thu Mar 2 17:09:14 2017 (r314559) @@ -40,6 +40,11 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include +#include +#include + #include #include #include @@ -56,11 +61,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include -#include -#include - #include #include #include From owner-svn-src-all@freebsd.org Thu Mar 2 17:09:35 2017 Return-Path: Delivered-To: svn-src-all@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 96F3BCF5CC5; Thu, 2 Mar 2017 17:09:35 +0000 (UTC) (envelope-from rb743@hermes.cam.ac.uk) Received: from ppsw-32.csi.cam.ac.uk (ppsw-32.csi.cam.ac.uk [131.111.8.132]) by mx1.freebsd.org (Postfix) with ESMTP id 5F4BAEE0; Thu, 2 Mar 2017 17:09:34 +0000 (UTC) (envelope-from rb743@hermes.cam.ac.uk) X-Cam-AntiVirus: no malware found X-Cam-ScannerInfo: http://help.uis.cam.ac.uk/email-scanner-virus Received: from sc1.bsdpad.com ([163.172.212.18]:33645) by ppsw-32.csi.cam.ac.uk (smtp.hermes.cam.ac.uk [131.111.8.156]:587) with esmtpsa (LOGIN:rb743) (TLSv1:ECDHE-RSA-AES256-SHA:256) id 1cjUEP-000AaK-1U (Exim 4.88) (return-path ); Thu, 02 Mar 2017 17:09:33 +0000 Date: Thu, 2 Mar 2017 17:07:05 +0000 From: Ruslan Bukin To: Ed Maste Cc: Ruslan Bukin , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r314362 - in head/sys: arm/at91 arm/cavium/cns11xx arm/nvidia arm/xscale/i8134x arm/xscale/ixp425 arm/xscale/pxa dev/uart mips/adm5120 mips/alchemy mips/atheros mips/atheros/ar531x mips... Message-ID: <20170302170705.GA34589@bsdpad.com> References: <201702272008.v1RK8g2C047240@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.6.1 (2016-04-27) Sender: "R. Bukin" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 17:09:35 -0000 On Wed, Mar 01, 2017 at 12:01:32PM -0500, Ed Maste wrote: > On 27 February 2017 at 15:08, Ruslan Bukin wrote: > > Author: br > > Date: Mon Feb 27 20:08:42 2017 > > New Revision: 314362 > > URL: https://svnweb.freebsd.org/changeset/base/314362 > > Tinderbox build is currently failing in mips XLP, XLP64, XLPN32 with: > > In file included from /scratch/tmp/emaste/freebsd/sys/mips/nlm/xlp_pci.c:51: > /scratch/tmp/emaste/freebsd/sys/dev/uart/uart.h: In function 'uart_getreg': > /scratch/tmp/emaste/freebsd/sys/dev/uart/uart.h:57: warning: implicit > declaration of function 'bus_space_read_4' > thanks! Fixed. Ruslan From owner-svn-src-all@freebsd.org Thu Mar 2 17:17:07 2017 Return-Path: Delivered-To: svn-src-all@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 AE506CF5FB0; Thu, 2 Mar 2017 17:17:07 +0000 (UTC) (envelope-from emaste@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 7AF13809; Thu, 2 Mar 2017 17:17:07 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22HH6PO092019; Thu, 2 Mar 2017 17:17:06 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22HH6Nv092018; Thu, 2 Mar 2017 17:17:06 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201703021717.v22HH6Nv092018@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 2 Mar 2017 17:17:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314560 - stable/10/contrib/tcpdump X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 17:17:07 -0000 Author: emaste Date: Thu Mar 2 17:17:06 2017 New Revision: 314560 URL: https://svnweb.freebsd.org/changeset/base/314560 Log: MFC r309649 (oshogbo): tcpdump: allow to use BIOCROTZBUF in capability mode The libpcap library can use a BIOCROTZBUF ioctl when net.bpf.zerocopy_enable sysctl is set. PR: 217490 Modified: stable/10/contrib/tcpdump/tcpdump.c Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/tcpdump/tcpdump.c ============================================================================== --- stable/10/contrib/tcpdump/tcpdump.c Thu Mar 2 17:09:14 2017 (r314559) +++ stable/10/contrib/tcpdump/tcpdump.c Thu Mar 2 17:17:06 2017 (r314560) @@ -1554,7 +1554,7 @@ main(int argc, char **argv) error("%s", pcap_geterr(pd)); #ifdef __FreeBSD__ if (RFileName == NULL && VFileName == NULL) { - static const unsigned long cmds[] = { BIOCGSTATS }; + static const unsigned long cmds[] = { BIOCGSTATS, BIOCROTZBUF }; /* * The various libpcap devices use a combination of From owner-svn-src-all@freebsd.org Thu Mar 2 17:32:00 2017 Return-Path: Delivered-To: svn-src-all@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 DA6A4CF552F; Thu, 2 Mar 2017 17:32:00 +0000 (UTC) (envelope-from gjb@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 AA393273; Thu, 2 Mar 2017 17:32:00 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22HVxFT096933; Thu, 2 Mar 2017 17:31:59 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22HVxAb096932; Thu, 2 Mar 2017 17:31:59 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201703021731.v22HVxAb096932@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 2 Mar 2017 17:31:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314561 - head/release/tools X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 17:32:01 -0000 Author: gjb Date: Thu Mar 2 17:31:59 2017 New Revision: 314561 URL: https://svnweb.freebsd.org/changeset/base/314561 Log: Increase the EC2 image size for 12-CURRENT. The recent snapshot builds of EC2 images for 12-CURRENT failed due to a full filesystem on the md(4) device during creation. Sponsored by: The FreeBSD Foundation Modified: head/release/tools/ec2.conf Modified: head/release/tools/ec2.conf ============================================================================== --- head/release/tools/ec2.conf Thu Mar 2 17:17:06 2017 (r314560) +++ head/release/tools/ec2.conf Thu Mar 2 17:31:59 2017 (r314561) @@ -11,12 +11,12 @@ export VM_EXTRA_PACKAGES="ec2-scripts fi # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="ec2_configinit ec2_fetchkey ec2_ephemeralswap ec2_loghostkey firstboot_freebsd_update firstboot_pkgs" -# Build with a 1.5 GB UFS partition; the growfs rc.d script will expand +# Build with a 2 GB UFS partition; the growfs rc.d script will expand # the partition to fill the root disk after the EC2 instance is launched. # Note that if this is set to G, we will end up with an GB disk # image since VMSIZE is the size of the UFS partition, not the disk which # it resides within. -export VMSIZE=1536M +export VMSIZE=2048M # No swap space; the ec2_ephemeralswap rc.d script will allocate swap # space on EC2 ephemeral disks. (If they exist -- the T2 low-cost instances From owner-svn-src-all@freebsd.org Thu Mar 2 17:35:14 2017 Return-Path: Delivered-To: svn-src-all@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 8C925CF5616; Thu, 2 Mar 2017 17:35:14 +0000 (UTC) (envelope-from kib@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 5C4BC7F9; Thu, 2 Mar 2017 17:35:14 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22HZDIi099988; Thu, 2 Mar 2017 17:35:13 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22HZDNg099987; Thu, 2 Mar 2017 17:35:13 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201703021735.v22HZDNg099987@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 2 Mar 2017 17:35:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314562 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 17:35:14 -0000 Author: kib Date: Thu Mar 2 17:35:13 2017 New Revision: 314562 URL: https://svnweb.freebsd.org/changeset/base/314562 Log: Style. Reviewed by: alc Sponsored by: The FreeBSD Foundation MFC after: 3 days Modified: head/sys/kern/imgact_elf.c Modified: head/sys/kern/imgact_elf.c ============================================================================== --- head/sys/kern/imgact_elf.c Thu Mar 2 17:31:59 2017 (r314561) +++ head/sys/kern/imgact_elf.c Thu Mar 2 17:35:13 2017 (r314562) @@ -413,9 +413,8 @@ __elfN(map_partial)(vm_map_t map, vm_obj error = copyout((caddr_t)sf_buf_kva(sf) + off, (caddr_t)start, end - start); vm_imgact_unmap_page(sf); - if (error) { + if (error != 0) return (KERN_FAILURE); - } } return (KERN_SUCCESS); From owner-svn-src-all@freebsd.org Thu Mar 2 18:07:20 2017 Return-Path: Delivered-To: svn-src-all@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 BA6B6CF47FE; Thu, 2 Mar 2017 18:07:20 +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 7B3F6F7F; Thu, 2 Mar 2017 18:07:20 +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 v22I7JcU016058; Thu, 2 Mar 2017 18:07:19 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22I7Jeg016057; Thu, 2 Mar 2017 18:07:19 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703021807.v22I7Jeg016057@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Thu, 2 Mar 2017 18:07:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314563 - head/usr.sbin/syslogd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 18:07:20 -0000 Author: ngie Date: Thu Mar 2 18:07:19 2017 New Revision: 314563 URL: https://svnweb.freebsd.org/changeset/base/314563 Log: Wordsmith syslogd(8) - Clarify -p/-S options by using appropriate subject-verb modifiers (verb and modifiers suggested that the subject should have been singular). - Simplify/correct -a description: -- Be more terse when describing IPv4 (the "usual dotted notation" isn't necessarily well understood by the reader). Being blunt and saying "IPv4 address" with an optional netmask is. -- prefixlen is the appropriate terminology for IPv6. -- mask/prefixlen is optional, not required (as noted later on in the section). -- split up IPv4/IPv6 use so to clarify both forms. -- Fix wordiness when describing the optional "service" specifier. - -T: Use "cannot" instead of "can't" [*]. Bump .Dd for the changes. MFC after: 1 month Reported by: igor [*] Reviewed by: hrs Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D9855 Modified: head/usr.sbin/syslogd/syslogd.8 Modified: head/usr.sbin/syslogd/syslogd.8 ============================================================================== --- head/usr.sbin/syslogd/syslogd.8 Thu Mar 2 17:35:13 2017 (r314562) +++ head/usr.sbin/syslogd/syslogd.8 Thu Mar 2 18:07:19 2017 (r314563) @@ -28,7 +28,7 @@ .\" @(#)syslogd.8 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd December 21, 2016 +.Dd March 2, 2017 .Dt SYSLOGD 8 .Os .Sh NAME @@ -102,21 +102,23 @@ options may be specified. The .Ar allowed_peer option may be any of the following: -.Bl -tag -width "ipaddr/masklen[:service]XX" +.Bl -tag -width "ipaddr[/prefixlen][:service]XX" .It Xo .Sm off .Ar ipaddr -.No / Ar masklen +.Op / Ar masklen +.Op \&: Ar service +.Pp +.Ar ipaddr +.Op / Ar prefixlen .Op \&: Ar service .Sm on .Xc Accept datagrams from +.Ar ipaddr , .Ar ipaddr -(in the usual dotted quad notation) with -.Ar masklen -bits being taken into account when doing the address comparison. -.Ar ipaddr -can be also IPv6 address by enclosing the address with +can be specified as an IPv4 address or as an IPv6 +address enclosed with .Ql \&[ and .Ql \&] . @@ -129,7 +131,7 @@ A .Ar service of .Ql \&* -allows packets being sent from any UDP port. +allows packets to be sent from any UDP port. The default .Ar service is @@ -265,7 +267,7 @@ the default is .Pa /var/run/log . When a single .Fl p -options are specified, +option is specified, the default pathname is replaced with the specified one. When two or more .Fl p @@ -282,7 +284,7 @@ the default is .Pa /var/run/logpriv . When a single .Fl S -options are specified, +option is specified, the default pathname is replaced with the specified one. When two or more .Fl S @@ -309,7 +311,7 @@ which also disables logging to remote ma .It Fl T Always use the local time and date for messages received from the network, instead of the timestamp field supplied in the message by the remote host. -This is useful if some of the originating hosts can't keep time properly +This is useful if some of the originating hosts cannot keep time properly or are unable to generate a correct timestamp. .It Fl u Unique priority logging. From owner-svn-src-all@freebsd.org Thu Mar 2 18:38:35 2017 Return-Path: Delivered-To: svn-src-all@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 76C4ACF6281; Thu, 2 Mar 2017 18:38:35 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg0-x243.google.com (mail-pg0-x243.google.com [IPv6:2607:f8b0:400e:c05::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47C6D949; Thu, 2 Mar 2017 18:38:35 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg0-x243.google.com with SMTP id 16so1623670pga.0; Thu, 02 Mar 2017 10:38:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=a2fxhycofAVahl4PZsatzA6U0LBjHGken7V1wZ0Peww=; b=cFSa9HG+C1JztdvyMqFZg3xn4tmu0+5hzqJUbzOx0rI2nVddoOi00hj3f94m9odocJ wVm8P6UcGCN5YtF+6LEZhcv5grHPxEsch/P7vYOODduXVRqFzWmTkrHA3kuv2bxIHDH+ 0PPfe7FDQrQMpPOHYILKcSbSySLZfGwp7sbzq3jn5LSA+JA+84uKILVE1/aICzuHb4tB mZMUkZx2rE5joE3Utz2BT7TXeNaOTsAzhBLoSDb+dfVsxoVUlFntm/MNysmlIDlKPX6f +DaUc8wifAyojPSlc7DCHtbD1vWqnyIA11jeAsCSm8wxcLSUHxbephq2QEewcb5qNgMb UimQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=a2fxhycofAVahl4PZsatzA6U0LBjHGken7V1wZ0Peww=; b=qQfGGJfn0+WT2rk4qL6P7lRoiEMOzfc2dNW25KuD3GW6A89m0O+3NikWt0LMThwASM 3RQ20FTyw+8bUQ818d/ceF0OkOXRpM6waEQGq8PDaIWHkKbGmli2yQEFmvPu/CEtxld+ sOc086t4D3ZnhEDVHi+VZVw1pBQqdKecWW8PMZXEIVQMrc7q6oRPcoUKWRMVXmD8lZcI ofkQsZpKdgbbIA9b0MiK7Y4iXPKxsX1Dzn3YlzD9oFlwaYvs07o77m+e7SWZpz415d94 6gXIFRlLwpgLUt5XwfVt2PphOeZNz0OV0MUFDrqk7tF9rtsAh8Frb+e2vbJYe5e2EipK IHSQ== X-Gm-Message-State: AMke39kuTJDWA7CQlUamQaTXHjzzK7DjgYp6BRVB1UBJtAXQXlHwAs2nLPX+QVYpDJDIkQ== X-Received: by 10.98.9.14 with SMTP id e14mr17151895pfd.117.1488479914359; Thu, 02 Mar 2017 10:38:34 -0800 (PST) Received: from ?IPv6:2607:fb90:a44c:4040:e19f:ea86:6488:91a6? ([2607:fb90:a44c:4040:e19f:ea86:6488:91a6]) by smtp.gmail.com with ESMTPSA id m20sm18580581pgd.67.2017.03.02.10.38.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Mar 2017 10:38:33 -0800 (PST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r314563 - head/usr.sbin/syslogd From: Ngie Cooper X-Mailer: iPhone Mail (14D27) In-Reply-To: <201703021807.v22I7Jeg016057@repo.freebsd.org> Date: Thu, 2 Mar 2017 10:38:32 -0800 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <3E8487D0-9BF5-47D4-9E77-A2F62224223E@gmail.com> References: <201703021807.v22I7Jeg016057@repo.freebsd.org> To: Ngie Cooper X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 18:38:35 -0000 > On Mar 2, 2017, at 10:07, Ngie Cooper wrote: >=20 > Author: ngie > Date: Thu Mar 2 18:07:19 2017 > New Revision: 314563 > URL: https://svnweb.freebsd.org/changeset/base/314563 >=20 > Log: > Wordsmith syslogd(8) >=20 > - Clarify -p/-S options by using appropriate subject-verb modifiers > (verb and modifiers suggested that the subject should have been > singular). > - Simplify/correct -a description: > -- Be more terse when describing IPv4 (the "usual dotted notation" > isn't necessarily well understood by the reader). Being blunt and > saying "IPv4 address" with an optional netmask is. > -- prefixlen is the appropriate terminology for IPv6. > -- mask/prefixlen is optional, not required (as noted later on in the > section). > -- split up IPv4/IPv6 use so to clarify both forms. > -- Fix wordiness when describing the optional "service" specifier. > - -T: Use "cannot" instead of "can't" [*]. >=20 > Bump .Dd for the changes. >=20 > MFC after: 1 month > Reported by: igor [*] > Reviewed by: hrs > Sponsored by: Dell EMC Isilon > Differential Revision: https://reviews.freebsd.org/D9855 >=20 > Modified: > head/usr.sbin/syslogd/syslogd.8 >=20 > Modified: head/usr.sbin/syslogd/syslogd.8 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/usr.sbin/syslogd/syslogd.8 Thu Mar 2 17:35:13 2017 (r31456= 2) > +++ head/usr.sbin/syslogd/syslogd.8 Thu Mar 2 18:07:19 2017 (r31456= 3) > @@ -28,7 +28,7 @@ > .\" @(#)syslogd.8 8.1 (Berkeley) 6/6/93 > .\" $FreeBSD$ > .\" > -.Dd December 21, 2016 > +.Dd March 2, 2017 > .Dt SYSLOGD 8 > .Os > .Sh NAME > @@ -102,21 +102,23 @@ options may be specified. > The > .Ar allowed_peer > option may be any of the following: > -.Bl -tag -width "ipaddr/masklen[:service]XX" > +.Bl -tag -width "ipaddr[/prefixlen][:service]XX" > .It Xo > .Sm off > .Ar ipaddr > -.No / Ar masklen > +.Op / Ar masklen > +.Op \&: Ar service > +.Pp > +.Ar ipaddr > +.Op / Ar prefixlen > .Op \&: Ar service > .Sm on > .Xc > Accept datagrams from > +.Ar ipaddr , > .Ar ipaddr > -(in the usual dotted quad notation) with > -.Ar masklen > -bits being taken into account when doing the address comparison. > -.Ar ipaddr > -can be also IPv6 address by enclosing the address with > +can be specified as an IPv4 address or as an IPv6 > +address enclosed with > .Ql \&[ > and > .Ql \&] . > @@ -129,7 +131,7 @@ A > .Ar service > of > .Ql \&* > -allows packets being sent from any UDP port. > +allows packets to be sent from any UDP port. Rereading my change, I think this part might be incorrect. I will go back an= d review the source code and correct if necessary. Thanks, -Ngie= From owner-svn-src-all@freebsd.org Thu Mar 2 18:46:20 2017 Return-Path: Delivered-To: svn-src-all@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 91926CF646E; Thu, 2 Mar 2017 18:46:20 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 50347E0B; Thu, 2 Mar 2017 18:46:20 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pf0-x243.google.com with SMTP id e66so1844448pfe.0; Thu, 02 Mar 2017 10:46:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=QjoW9JmD2BuKeu6p5Dcyt65k9veK5JfdyRsAS08Kx7k=; b=X0R8weZR+tykvu2GFzgIO7GNsachRYpRSJkMHUDwah+p7sFbaKal0QQb2jnumMONsM rQEbH8j+YHOYshb2gVx73APQpMnHT7dJOLnLqsHcqTSeMm4YFPabWRQkkXagvkjSNG7t 7maUIXk64SOBy0opJtbOCPfc/EoipuAw/AA7gefWEC5g2LTK73asv75CoyItIiatPO5P HBtZXxPNsLy1pSIIqfYiOlso+OHSC2TPARUvgHmLVCVwWRgbbdDYWeo84ZW4l4JIEeg+ S4gbkPRDsZqCyK3yFm7Sqvzpibng1JAqKmZ9CEfNrsAxqfTWqRbuXwJ3me72mSasEGZU LWwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=QjoW9JmD2BuKeu6p5Dcyt65k9veK5JfdyRsAS08Kx7k=; b=dGfxU+3BdrypARII3JxlRNAtD3BbMRt77qk1czKNhy57y5IdJ5Om2GuTqy2zetvx7W tcbB4HLbXMdBGLRMyiMi0x4uhyc9AiGtARI3AJ0at3DRg7/bpU23zyq0BBMRf1COTyfs LYHPiYHtRPSO9rv24TcmKjuJeb6JkcLudphQrWYzuXBoVcxfMZvEY+DJPRks4qPUk4R+ 6NWM9CQxgVloP64gZih7Xg1hT/qx2nytsUBWPvtLlvYH3bPtm0//KQOGJgXnfGQ/q7uc 2ZpVnX+EeyGwJd+AKZ+ju6EVUlbbp7fFOuz+xLna5MLd8CcSOEMzto3spRrwH8frCcMX GIRQ== X-Gm-Message-State: AMke39mHsRlYrWQsnpXdJOkgm7ABjjJanxadByjcv6bhqFIu6lCzoZCVUG1fepBgE9gsJQ== X-Received: by 10.84.225.146 with SMTP id u18mr21015980plj.157.1488480379696; Thu, 02 Mar 2017 10:46:19 -0800 (PST) Received: from ?IPv6:2607:fb90:a44c:4040:e19f:ea86:6488:91a6? ([2607:fb90:a44c:4040:e19f:ea86:6488:91a6]) by smtp.gmail.com with ESMTPSA id q64sm18625284pga.0.2017.03.02.10.46.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Mar 2017 10:46:19 -0800 (PST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r314563 - head/usr.sbin/syslogd From: Ngie Cooper X-Mailer: iPhone Mail (14D27) In-Reply-To: <3E8487D0-9BF5-47D4-9E77-A2F62224223E@gmail.com> Date: Thu, 2 Mar 2017 10:46:17 -0800 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <3C5C28CD-E2C1-4713-A8B5-7BF5ECF24D66@gmail.com> References: <201703021807.v22I7Jeg016057@repo.freebsd.org> <3E8487D0-9BF5-47D4-9E77-A2F62224223E@gmail.com> To: Ngie Cooper X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 18:46:20 -0000 > On Mar 2, 2017, at 10:38, Ngie Cooper wrote: ... > Rereading my change, I think this part might be incorrect. I will go back a= nd review the source code and correct if necessary. Yeah... saying "to be received" would be more accurate because it's specific= ally limiting UDP datagrams from peers specified with -a. > Thanks, > -Ngie From owner-svn-src-all@freebsd.org Thu Mar 2 20:49:48 2017 Return-Path: Delivered-To: svn-src-all@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 4D0A8CF648D; Thu, 2 Mar 2017 20:49:48 +0000 (UTC) (envelope-from dim@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 D14DAFF3; Thu, 2 Mar 2017 20:49:46 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22KnjT5078660; Thu, 2 Mar 2017 20:49:46 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22Kniwj078643; Thu, 2 Mar 2017 20:49:44 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201703022049.v22Kniwj078643@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 2 Mar 2017 20:49:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314564 - in head: . contrib/compiler-rt/include/sanitizer contrib/compiler-rt/include/xray contrib/compiler-rt/lib/asan contrib/compiler-rt/lib/builtins contrib/compiler-rt/lib/builtin... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 20:49:48 -0000 Author: dim Date: Thu Mar 2 20:49:40 2017 New Revision: 314564 URL: https://svnweb.freebsd.org/changeset/base/314564 Log: Upgrade our copies of clang, llvm, lld, lldb, compiler-rt and libc++ to 4.0.0 (branches/release_40 296509). The release will follow soon. Please note that from 3.5.0 onwards, clang, llvm and lldb require C++11 support to build; see UPDATING for more information. Also note that as of 4.0.0, lld should be able to link the base system on amd64 and aarch64. See the WITH_LLD_IS_LLD setting in src.conf(5). Though please be aware that this is work in progress. Release notes for llvm, clang and lld will be available here: Thanks to Ed Maste, Jan Beich, Antoine Brodin and Eric Fiselier for their help. Relnotes: yes Exp-run: antoine PR: 215969, 216008 MFC after: 1 month Added: head/contrib/compiler-rt/include/xray/ - copied from r314524, projects/clang400-import/contrib/compiler-rt/include/xray/ head/contrib/compiler-rt/lib/asan/asan_descriptions.cc - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/asan/asan_descriptions.cc head/contrib/compiler-rt/lib/asan/asan_descriptions.h - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/asan/asan_descriptions.h head/contrib/compiler-rt/lib/asan/asan_errors.cc - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/asan/asan_errors.cc head/contrib/compiler-rt/lib/asan/asan_errors.h - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/asan/asan_errors.h head/contrib/compiler-rt/lib/asan/asan_globals_win.cc - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/asan/asan_globals_win.cc head/contrib/compiler-rt/lib/asan/asan_globals_win.h - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/asan/asan_globals_win.h head/contrib/compiler-rt/lib/asan/weak_symbols.txt - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/asan/weak_symbols.txt head/contrib/compiler-rt/lib/builtins/floattitf.c - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/builtins/floattitf.c head/contrib/compiler-rt/lib/builtins/floatuntitf.c - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/builtins/floatuntitf.c head/contrib/compiler-rt/lib/builtins/mingw_fixfloat.c - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/builtins/mingw_fixfloat.c head/contrib/compiler-rt/lib/esan/esan_hashtable.h - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/esan/esan_hashtable.h head/contrib/compiler-rt/lib/sancov/ - copied from r314524, projects/clang400-import/contrib/compiler-rt/lib/sancov/ head/contrib/compiler-rt/lib/sanitizer_common/sancov_flags.cc - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/sanitizer_common/sancov_flags.cc head/contrib/compiler-rt/lib/sanitizer_common/sancov_flags.h - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/sanitizer_common/sancov_flags.h head/contrib/compiler-rt/lib/sanitizer_common/sancov_flags.inc - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/sanitizer_common/sancov_flags.inc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator_bytemap.h - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator_bytemap.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator_combined.h - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator_combined.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator_local_cache.h - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator_local_cache.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator_primary32.h - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator_primary32.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator_primary64.h - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator_primary64.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator_secondary.h - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator_secondary.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator_size_class_map.h - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator_size_class_map.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator_stats.h - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator_stats.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_coverage_libcdep_new.cc - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_coverage_libcdep_new.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_dbghelp.h - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_dbghelp.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_linux_mips64.S - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_linux_mips64.S head/contrib/compiler-rt/lib/sanitizer_common/symbolizer/ - copied from r314524, projects/clang400-import/contrib/compiler-rt/lib/sanitizer_common/symbolizer/ head/contrib/compiler-rt/lib/sanitizer_common/weak_symbols.txt - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/sanitizer_common/weak_symbols.txt head/contrib/compiler-rt/lib/scudo/scudo_allocator_secondary.h - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/scudo/scudo_allocator_secondary.h head/contrib/compiler-rt/lib/scudo/scudo_crc32.cpp - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/scudo/scudo_crc32.cpp head/contrib/compiler-rt/lib/scudo/scudo_crc32.h - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/scudo/scudo_crc32.h head/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl_mips64.S - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl_mips64.S head/contrib/compiler-rt/lib/ubsan/weak_symbols.txt - copied unchanged from r314524, projects/clang400-import/contrib/compiler-rt/lib/ubsan/weak_symbols.txt head/contrib/compiler-rt/lib/xray/ - copied from r314524, projects/clang400-import/contrib/compiler-rt/lib/xray/ head/contrib/libc++/include/__libcpp_version - copied unchanged from r314524, projects/clang400-import/contrib/libc++/include/__libcpp_version head/contrib/libc++/include/__string - copied unchanged from r314524, projects/clang400-import/contrib/libc++/include/__string head/contrib/libc++/include/any - copied unchanged from r314524, projects/clang400-import/contrib/libc++/include/any head/contrib/libc++/include/experimental/numeric - copied unchanged from r314524, projects/clang400-import/contrib/libc++/include/experimental/numeric head/contrib/libc++/include/limits.h - copied unchanged from r314524, projects/clang400-import/contrib/libc++/include/limits.h head/contrib/libc++/include/locale.h - copied unchanged from r314524, projects/clang400-import/contrib/libc++/include/locale.h head/contrib/libc++/include/optional - copied unchanged from r314524, projects/clang400-import/contrib/libc++/include/optional head/contrib/libc++/include/stdint.h - copied unchanged from r314524, projects/clang400-import/contrib/libc++/include/stdint.h head/contrib/libc++/include/string_view - copied unchanged from r314524, projects/clang400-import/contrib/libc++/include/string_view head/contrib/libc++/include/variant - copied unchanged from r314524, projects/clang400-import/contrib/libc++/include/variant head/contrib/libc++/src/variant.cpp - copied unchanged from r314524, projects/clang400-import/contrib/libc++/src/variant.cpp head/contrib/llvm/include/llvm/ADT/AllocatorList.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/ADT/AllocatorList.h head/contrib/llvm/include/llvm/ADT/CachedHashString.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/ADT/CachedHashString.h head/contrib/llvm/include/llvm/ADT/ScopeExit.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/ADT/ScopeExit.h head/contrib/llvm/include/llvm/ADT/ilist_base.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/ADT/ilist_base.h head/contrib/llvm/include/llvm/ADT/ilist_iterator.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/ADT/ilist_iterator.h head/contrib/llvm/include/llvm/ADT/ilist_node_base.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/ADT/ilist_node_base.h head/contrib/llvm/include/llvm/ADT/ilist_node_options.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/ADT/ilist_node_options.h head/contrib/llvm/include/llvm/ADT/simple_ilist.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/ADT/simple_ilist.h head/contrib/llvm/include/llvm/Analysis/LazyBranchProbabilityInfo.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Analysis/LazyBranchProbabilityInfo.h head/contrib/llvm/include/llvm/Analysis/LoopAnalysisManager.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Analysis/LoopAnalysisManager.h head/contrib/llvm/include/llvm/Bitcode/BitcodeReader.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Bitcode/BitcodeReader.h head/contrib/llvm/include/llvm/Bitcode/BitcodeWriter.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Bitcode/BitcodeWriter.h head/contrib/llvm/include/llvm/CodeGen/GlobalISel/InstructionSelect.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/CodeGen/GlobalISel/InstructionSelect.h head/contrib/llvm/include/llvm/CodeGen/GlobalISel/InstructionSelector.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/CodeGen/GlobalISel/InstructionSelector.h head/contrib/llvm/include/llvm/CodeGen/GlobalISel/Legalizer.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/CodeGen/GlobalISel/Legalizer.h head/contrib/llvm/include/llvm/CodeGen/GlobalISel/LegalizerHelper.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/CodeGen/GlobalISel/LegalizerHelper.h head/contrib/llvm/include/llvm/CodeGen/GlobalISel/LegalizerInfo.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/CodeGen/GlobalISel/LegalizerInfo.h head/contrib/llvm/include/llvm/CodeGen/GlobalISel/Utils.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/CodeGen/GlobalISel/Utils.h head/contrib/llvm/include/llvm/CodeGen/LowLevelType.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/CodeGen/LowLevelType.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/CVDebugRecord.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/CodeView/CVDebugRecord.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/CVTypeDumper.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/CodeView/CVTypeDumper.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/CodeViewRecordIO.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/CodeView/CodeViewRecordIO.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/SymbolDeserializer.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/CodeView/SymbolDeserializer.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/SymbolRecordMapping.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/CodeView/SymbolRecordMapping.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/SymbolSerializer.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/CodeView/SymbolSerializer.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/SymbolVisitorCallbackPipeline.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/CodeView/SymbolVisitorCallbackPipeline.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/SymbolVisitorCallbacks.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/CodeView/SymbolVisitorCallbacks.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeDatabase.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeDatabase.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeDatabaseVisitor.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeDatabaseVisitor.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeDeserializer.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeDeserializer.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeDumpVisitor.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeDumpVisitor.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeDumperBase.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeDumperBase.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeRecordMapping.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeRecordMapping.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeSerializer.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeSerializer.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeVisitorCallbackPipeline.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeVisitorCallbackPipeline.h head/contrib/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugPubTable.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugPubTable.h head/contrib/llvm/include/llvm/DebugInfo/DWARF/DWARFDie.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/DWARF/DWARFDie.h head/contrib/llvm/include/llvm/DebugInfo/DWARF/DWARFGdbIndex.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/DWARF/DWARFGdbIndex.h head/contrib/llvm/include/llvm/DebugInfo/MSF/ - copied from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/MSF/ head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/GlobalsStream.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/GlobalsStream.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/TpiHashing.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/TpiHashing.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/TpiStreamBuilder.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/TpiStreamBuilder.h head/contrib/llvm/include/llvm/Demangle/ - copied from r314524, projects/clang400-import/contrib/llvm/include/llvm/Demangle/ head/contrib/llvm/include/llvm/ExecutionEngine/JITSymbol.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/ExecutionEngine/JITSymbol.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/RPCSerialization.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/ExecutionEngine/Orc/RPCSerialization.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/RawByteChannel.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/ExecutionEngine/Orc/RawByteChannel.h head/contrib/llvm/include/llvm/IR/ModuleSummaryIndexYAML.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/IR/ModuleSummaryIndexYAML.h head/contrib/llvm/include/llvm/LTO/Caching.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/LTO/Caching.h head/contrib/llvm/include/llvm/LTO/Config.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/LTO/Config.h head/contrib/llvm/include/llvm/LTO/LTOBackend.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/LTO/LTOBackend.h head/contrib/llvm/include/llvm/MC/LaneBitmask.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/MC/LaneBitmask.h head/contrib/llvm/include/llvm/Object/Decompressor.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Object/Decompressor.h head/contrib/llvm/include/llvm/Object/ModuleSymbolTable.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Object/ModuleSymbolTable.h head/contrib/llvm/include/llvm/Object/Wasm.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Object/Wasm.h head/contrib/llvm/include/llvm/ObjectYAML/DWARFYAML.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/ObjectYAML/DWARFYAML.h head/contrib/llvm/include/llvm/Support/Chrono.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Support/Chrono.h head/contrib/llvm/include/llvm/Support/ELFRelocs/RISCV.def - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Support/ELFRelocs/RISCV.def head/contrib/llvm/include/llvm/Support/FormatAdapters.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Support/FormatAdapters.h head/contrib/llvm/include/llvm/Support/FormatCommon.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Support/FormatCommon.h head/contrib/llvm/include/llvm/Support/FormatProviders.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Support/FormatProviders.h head/contrib/llvm/include/llvm/Support/FormatVariadic.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Support/FormatVariadic.h head/contrib/llvm/include/llvm/Support/FormatVariadicDetails.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Support/FormatVariadicDetails.h head/contrib/llvm/include/llvm/Support/GlobPattern.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Support/GlobPattern.h head/contrib/llvm/include/llvm/Support/NativeFormatting.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Support/NativeFormatting.h head/contrib/llvm/include/llvm/Support/TarWriter.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Support/TarWriter.h head/contrib/llvm/include/llvm/Support/TrigramIndex.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Support/TrigramIndex.h head/contrib/llvm/include/llvm/Support/Wasm.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Support/Wasm.h head/contrib/llvm/include/llvm/Support/xxhash.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Support/xxhash.h head/contrib/llvm/include/llvm/Target/TargetGlobalISel.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Target/TargetGlobalISel.td head/contrib/llvm/include/llvm/Transforms/Coroutines.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/Coroutines.h head/contrib/llvm/include/llvm/Transforms/IPO/AlwaysInliner.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/IPO/AlwaysInliner.h head/contrib/llvm/include/llvm/Transforms/IPO/GlobalSplit.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/IPO/GlobalSplit.h head/contrib/llvm/include/llvm/Transforms/IPO/Inliner.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/IPO/Inliner.h head/contrib/llvm/include/llvm/Transforms/Scalar/GVNExpression.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/Scalar/GVNExpression.h head/contrib/llvm/include/llvm/Transforms/Scalar/IVUsersPrinter.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/Scalar/IVUsersPrinter.h head/contrib/llvm/include/llvm/Transforms/Scalar/LoopAccessAnalysisPrinter.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/Scalar/LoopAccessAnalysisPrinter.h head/contrib/llvm/include/llvm/Transforms/Scalar/LoopDataPrefetch.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/Scalar/LoopDataPrefetch.h head/contrib/llvm/include/llvm/Transforms/Scalar/LoopPassManager.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/Scalar/LoopPassManager.h head/contrib/llvm/include/llvm/Transforms/Scalar/LoopStrengthReduce.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/Scalar/LoopStrengthReduce.h head/contrib/llvm/include/llvm/Transforms/Scalar/LoopUnrollPass.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/Scalar/LoopUnrollPass.h head/contrib/llvm/include/llvm/Transforms/Scalar/LowerGuardIntrinsic.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/Scalar/LowerGuardIntrinsic.h head/contrib/llvm/include/llvm/Transforms/Scalar/NaryReassociate.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/Scalar/NaryReassociate.h head/contrib/llvm/include/llvm/Transforms/Scalar/NewGVN.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/Scalar/NewGVN.h head/contrib/llvm/include/llvm/Transforms/Scalar/SpeculativeExecution.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/Scalar/SpeculativeExecution.h head/contrib/llvm/include/llvm/Transforms/Utils/BreakCriticalEdges.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/Utils/BreakCriticalEdges.h head/contrib/llvm/include/llvm/Transforms/Utils/EscapeEnumerator.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/Utils/EscapeEnumerator.h head/contrib/llvm/include/llvm/Transforms/Utils/FunctionComparator.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/Utils/FunctionComparator.h head/contrib/llvm/include/llvm/Transforms/Utils/ImportedFunctionsInliningStatistics.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/Utils/ImportedFunctionsInliningStatistics.h head/contrib/llvm/include/llvm/Transforms/Utils/LibCallsShrinkWrap.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/Utils/LibCallsShrinkWrap.h head/contrib/llvm/include/llvm/Transforms/Utils/LowerInvoke.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/Utils/LowerInvoke.h head/contrib/llvm/include/llvm/Transforms/Utils/NameAnonGlobals.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/include/llvm/Transforms/Utils/NameAnonGlobals.h head/contrib/llvm/include/llvm/XRay/ - copied from r314524, projects/clang400-import/contrib/llvm/include/llvm/XRay/ head/contrib/llvm/lib/Analysis/LazyBranchProbabilityInfo.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Analysis/LazyBranchProbabilityInfo.cpp head/contrib/llvm/lib/Analysis/LoopAnalysisManager.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Analysis/LoopAnalysisManager.cpp head/contrib/llvm/lib/Bitcode/Reader/MetadataLoader.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Bitcode/Reader/MetadataLoader.cpp head/contrib/llvm/lib/Bitcode/Reader/MetadataLoader.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Bitcode/Reader/MetadataLoader.h head/contrib/llvm/lib/Bitcode/Reader/ValueList.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Bitcode/Reader/ValueList.cpp head/contrib/llvm/lib/Bitcode/Reader/ValueList.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Bitcode/Reader/ValueList.h head/contrib/llvm/lib/CodeGen/BranchRelaxation.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/CodeGen/BranchRelaxation.cpp head/contrib/llvm/lib/CodeGen/CountingFunctionInserter.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/CodeGen/CountingFunctionInserter.cpp head/contrib/llvm/lib/CodeGen/GlobalISel/CallLowering.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/CodeGen/GlobalISel/CallLowering.cpp head/contrib/llvm/lib/CodeGen/GlobalISel/InstructionSelect.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/CodeGen/GlobalISel/InstructionSelect.cpp head/contrib/llvm/lib/CodeGen/GlobalISel/InstructionSelector.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/CodeGen/GlobalISel/InstructionSelector.cpp head/contrib/llvm/lib/CodeGen/GlobalISel/Legalizer.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/CodeGen/GlobalISel/Legalizer.cpp head/contrib/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp head/contrib/llvm/lib/CodeGen/GlobalISel/LegalizerInfo.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/CodeGen/GlobalISel/LegalizerInfo.cpp head/contrib/llvm/lib/CodeGen/GlobalISel/Utils.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/CodeGen/GlobalISel/Utils.cpp head/contrib/llvm/lib/CodeGen/LowLevelType.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/CodeGen/LowLevelType.cpp head/contrib/llvm/lib/CodeGen/MachinePipeliner.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/CodeGen/MachinePipeliner.cpp head/contrib/llvm/lib/CodeGen/ResetMachineFunctionPass.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/CodeGen/ResetMachineFunctionPass.cpp head/contrib/llvm/lib/CodeGen/TargetSubtargetInfo.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/CodeGen/TargetSubtargetInfo.cpp head/contrib/llvm/lib/DebugInfo/CodeView/CVSymbolVisitor.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/DebugInfo/CodeView/CVSymbolVisitor.cpp head/contrib/llvm/lib/DebugInfo/CodeView/CVTypeDumper.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/DebugInfo/CodeView/CVTypeDumper.cpp head/contrib/llvm/lib/DebugInfo/CodeView/CodeViewRecordIO.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/DebugInfo/CodeView/CodeViewRecordIO.cpp head/contrib/llvm/lib/DebugInfo/CodeView/SymbolRecordMapping.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/DebugInfo/CodeView/SymbolRecordMapping.cpp head/contrib/llvm/lib/DebugInfo/CodeView/TypeDatabase.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/DebugInfo/CodeView/TypeDatabase.cpp head/contrib/llvm/lib/DebugInfo/CodeView/TypeDatabaseVisitor.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/DebugInfo/CodeView/TypeDatabaseVisitor.cpp head/contrib/llvm/lib/DebugInfo/CodeView/TypeDumpVisitor.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/DebugInfo/CodeView/TypeDumpVisitor.cpp head/contrib/llvm/lib/DebugInfo/CodeView/TypeRecordMapping.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/DebugInfo/CodeView/TypeRecordMapping.cpp head/contrib/llvm/lib/DebugInfo/CodeView/TypeSerializer.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/DebugInfo/CodeView/TypeSerializer.cpp head/contrib/llvm/lib/DebugInfo/DWARF/DWARFDebugPubTable.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/DebugInfo/DWARF/DWARFDebugPubTable.cpp head/contrib/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp head/contrib/llvm/lib/DebugInfo/DWARF/DWARFGdbIndex.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/DebugInfo/DWARF/DWARFGdbIndex.cpp head/contrib/llvm/lib/DebugInfo/MSF/ - copied from r314524, projects/clang400-import/contrib/llvm/lib/DebugInfo/MSF/ head/contrib/llvm/lib/DebugInfo/PDB/Raw/GSI.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/DebugInfo/PDB/Raw/GSI.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/GSI.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/DebugInfo/PDB/Raw/GSI.h head/contrib/llvm/lib/DebugInfo/PDB/Raw/GlobalsStream.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/DebugInfo/PDB/Raw/GlobalsStream.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/TpiHashing.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/DebugInfo/PDB/Raw/TpiHashing.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/TpiStreamBuilder.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/DebugInfo/PDB/Raw/TpiStreamBuilder.cpp head/contrib/llvm/lib/Demangle/ - copied from r314524, projects/clang400-import/contrib/llvm/lib/Demangle/ head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/JITSymbol.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/JITSymbol.cpp head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldELFMips.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldELFMips.cpp head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldELFMips.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldELFMips.h head/contrib/llvm/lib/LTO/Caching.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/LTO/Caching.cpp head/contrib/llvm/lib/LTO/LTOBackend.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/LTO/LTOBackend.cpp head/contrib/llvm/lib/Object/Decompressor.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Object/Decompressor.cpp head/contrib/llvm/lib/Object/ModuleSymbolTable.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Object/ModuleSymbolTable.cpp head/contrib/llvm/lib/Object/WasmObjectFile.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Object/WasmObjectFile.cpp head/contrib/llvm/lib/ObjectYAML/DWARFYAML.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/ObjectYAML/DWARFYAML.cpp head/contrib/llvm/lib/Support/Chrono.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Support/Chrono.cpp head/contrib/llvm/lib/Support/ConvertUTF.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Support/ConvertUTF.cpp head/contrib/llvm/lib/Support/FormatVariadic.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Support/FormatVariadic.cpp head/contrib/llvm/lib/Support/GlobPattern.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Support/GlobPattern.cpp head/contrib/llvm/lib/Support/NativeFormatting.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Support/NativeFormatting.cpp head/contrib/llvm/lib/Support/TarWriter.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Support/TarWriter.cpp head/contrib/llvm/lib/Support/TrigramIndex.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Support/TrigramIndex.cpp head/contrib/llvm/lib/Support/xxhash.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Support/xxhash.cpp head/contrib/llvm/lib/Target/AArch64/AArch64GenRegisterBankInfo.def - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AArch64/AArch64GenRegisterBankInfo.def head/contrib/llvm/lib/Target/AArch64/AArch64InstructionSelector.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AArch64/AArch64InstructionSelector.cpp head/contrib/llvm/lib/Target/AArch64/AArch64InstructionSelector.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AArch64/AArch64InstructionSelector.h head/contrib/llvm/lib/Target/AArch64/AArch64LegalizerInfo.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AArch64/AArch64LegalizerInfo.cpp head/contrib/llvm/lib/Target/AArch64/AArch64LegalizerInfo.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AArch64/AArch64LegalizerInfo.h head/contrib/llvm/lib/Target/AArch64/AArch64SchedFalkor.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AArch64/AArch64SchedFalkor.td head/contrib/llvm/lib/Target/AArch64/AArch64VectorByElementOpt.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AArch64/AArch64VectorByElementOpt.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPUPTNote.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AMDGPU/AMDGPUPTNote.h head/contrib/llvm/lib/Target/AMDGPU/AMDGPUUnifyMetadata.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AMDGPU/AMDGPUUnifyMetadata.cpp head/contrib/llvm/lib/Target/AMDGPU/BUFInstructions.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AMDGPU/BUFInstructions.td head/contrib/llvm/lib/Target/AMDGPU/DSInstructions.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AMDGPU/DSInstructions.td head/contrib/llvm/lib/Target/AMDGPU/FLATInstructions.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AMDGPU/FLATInstructions.td head/contrib/llvm/lib/Target/AMDGPU/GCNSchedStrategy.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AMDGPU/GCNSchedStrategy.cpp head/contrib/llvm/lib/Target/AMDGPU/GCNSchedStrategy.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AMDGPU/GCNSchedStrategy.h head/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPURuntimeMD.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPURuntimeMD.cpp head/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPURuntimeMD.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPURuntimeMD.h head/contrib/llvm/lib/Target/AMDGPU/MIMGInstructions.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AMDGPU/MIMGInstructions.td head/contrib/llvm/lib/Target/AMDGPU/SIInsertSkips.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AMDGPU/SIInsertSkips.cpp head/contrib/llvm/lib/Target/AMDGPU/SIOptimizeExecMasking.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AMDGPU/SIOptimizeExecMasking.cpp head/contrib/llvm/lib/Target/AMDGPU/SMInstructions.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AMDGPU/SMInstructions.td head/contrib/llvm/lib/Target/AMDGPU/SOPInstructions.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AMDGPU/SOPInstructions.td head/contrib/llvm/lib/Target/AMDGPU/VOP1Instructions.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AMDGPU/VOP1Instructions.td head/contrib/llvm/lib/Target/AMDGPU/VOP2Instructions.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AMDGPU/VOP2Instructions.td head/contrib/llvm/lib/Target/AMDGPU/VOP3Instructions.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AMDGPU/VOP3Instructions.td head/contrib/llvm/lib/Target/AMDGPU/VOPCInstructions.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AMDGPU/VOPCInstructions.td head/contrib/llvm/lib/Target/AMDGPU/VOPInstructions.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AMDGPU/VOPInstructions.td head/contrib/llvm/lib/Target/ARM/ARMBasicBlockInfo.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/ARM/ARMBasicBlockInfo.h head/contrib/llvm/lib/Target/ARM/ARMCallLowering.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/ARM/ARMCallLowering.cpp head/contrib/llvm/lib/Target/ARM/ARMCallLowering.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/ARM/ARMCallLowering.h head/contrib/llvm/lib/Target/ARM/ARMComputeBlockSize.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/ARM/ARMComputeBlockSize.cpp head/contrib/llvm/lib/Target/ARM/ARMInstructionSelector.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/ARM/ARMInstructionSelector.cpp head/contrib/llvm/lib/Target/ARM/ARMInstructionSelector.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/ARM/ARMInstructionSelector.h head/contrib/llvm/lib/Target/ARM/ARMLegalizerInfo.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/ARM/ARMLegalizerInfo.cpp head/contrib/llvm/lib/Target/ARM/ARMLegalizerInfo.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/ARM/ARMLegalizerInfo.h head/contrib/llvm/lib/Target/ARM/ARMRegisterBankInfo.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/ARM/ARMRegisterBankInfo.cpp head/contrib/llvm/lib/Target/ARM/ARMRegisterBankInfo.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/ARM/ARMRegisterBankInfo.h head/contrib/llvm/lib/Target/ARM/ARMScheduleR52.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/ARM/ARMScheduleR52.td head/contrib/llvm/lib/Target/AVR/AVRAsmPrinter.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/AVRAsmPrinter.cpp head/contrib/llvm/lib/Target/AVR/AVRDevices.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/AVRDevices.td head/contrib/llvm/lib/Target/AVR/AVRExpandPseudoInsts.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/AVRExpandPseudoInsts.cpp head/contrib/llvm/lib/Target/AVR/AVRFrameLowering.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/AVRFrameLowering.cpp head/contrib/llvm/lib/Target/AVR/AVRISelDAGToDAG.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/AVRISelDAGToDAG.cpp head/contrib/llvm/lib/Target/AVR/AVRISelLowering.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/AVRISelLowering.cpp head/contrib/llvm/lib/Target/AVR/AVRInstrumentFunctions.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/AVRInstrumentFunctions.cpp head/contrib/llvm/lib/Target/AVR/AVRMCInstLower.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/AVRMCInstLower.cpp head/contrib/llvm/lib/Target/AVR/AVRMCInstLower.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/AVRMCInstLower.h head/contrib/llvm/lib/Target/AVR/AVRRelaxMemOperations.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/AVRRelaxMemOperations.cpp head/contrib/llvm/lib/Target/AVR/AsmParser/ - copied from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/AsmParser/ head/contrib/llvm/lib/Target/AVR/Disassembler/ - copied from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/Disassembler/ head/contrib/llvm/lib/Target/AVR/InstPrinter/ - copied from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/InstPrinter/ head/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRAsmBackend.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRAsmBackend.cpp head/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRAsmBackend.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRAsmBackend.h head/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRELFObjectWriter.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRELFObjectWriter.cpp head/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRFixupKinds.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRFixupKinds.h head/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRMCCodeEmitter.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRMCCodeEmitter.cpp head/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRMCCodeEmitter.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRMCCodeEmitter.h head/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRMCExpr.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRMCExpr.cpp head/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRMCExpr.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRMCExpr.h head/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRMCTargetDesc.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRMCTargetDesc.cpp head/contrib/llvm/lib/Target/AVR/README.md - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/AVR/README.md head/contrib/llvm/lib/Target/BPF/Disassembler/ - copied from r314524, projects/clang400-import/contrib/llvm/lib/Target/BPF/Disassembler/ head/contrib/llvm/lib/Target/Hexagon/HexagonConstPropagation.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/Hexagon/HexagonConstPropagation.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonHazardRecognizer.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/Hexagon/HexagonHazardRecognizer.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonHazardRecognizer.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/Hexagon/HexagonHazardRecognizer.h head/contrib/llvm/lib/Target/Hexagon/HexagonPatterns.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/Hexagon/HexagonPatterns.td head/contrib/llvm/lib/Target/Hexagon/HexagonVectorPrint.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/Hexagon/HexagonVectorPrint.cpp head/contrib/llvm/lib/Target/Mips/MipsScheduleGeneric.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/Mips/MipsScheduleGeneric.td head/contrib/llvm/lib/Target/NVPTX/NVPTXLowerArgs.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/NVPTX/NVPTXLowerArgs.cpp head/contrib/llvm/lib/Target/PowerPC/P9InstrResources.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/PowerPC/P9InstrResources.td head/contrib/llvm/lib/Target/PowerPC/PPCScheduleP9.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/PowerPC/PPCScheduleP9.td head/contrib/llvm/lib/Target/RISCV/ - copied from r314524, projects/clang400-import/contrib/llvm/lib/Target/RISCV/ head/contrib/llvm/lib/Target/SystemZ/SystemZExpandPseudo.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/SystemZ/SystemZExpandPseudo.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZFeatures.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/SystemZ/SystemZFeatures.td head/contrib/llvm/lib/Target/SystemZ/SystemZHazardRecognizer.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/SystemZ/SystemZHazardRecognizer.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZHazardRecognizer.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/SystemZ/SystemZHazardRecognizer.h head/contrib/llvm/lib/Target/SystemZ/SystemZMachineScheduler.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/SystemZ/SystemZMachineScheduler.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZMachineScheduler.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/SystemZ/SystemZMachineScheduler.h head/contrib/llvm/lib/Target/SystemZ/SystemZSchedule.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/SystemZ/SystemZSchedule.td head/contrib/llvm/lib/Target/SystemZ/SystemZScheduleZ13.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/SystemZ/SystemZScheduleZ13.td head/contrib/llvm/lib/Target/SystemZ/SystemZScheduleZ196.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/SystemZ/SystemZScheduleZ196.td head/contrib/llvm/lib/Target/SystemZ/SystemZScheduleZEC12.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/SystemZ/SystemZScheduleZEC12.td head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyCallIndirectFixup.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/WebAssembly/WebAssemblyCallIndirectFixup.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyExplicitLocals.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/WebAssembly/WebAssemblyExplicitLocals.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyLowerEmscriptenEHSjLj.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/WebAssembly/WebAssemblyLowerEmscriptenEHSjLj.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyUtilities.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/WebAssembly/WebAssemblyUtilities.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyUtilities.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/WebAssembly/WebAssemblyUtilities.h head/contrib/llvm/lib/Target/X86/X86CallLowering.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/X86/X86CallLowering.cpp head/contrib/llvm/lib/Target/X86/X86CallLowering.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/X86/X86CallLowering.h head/contrib/llvm/lib/Target/X86/X86CallingConv.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/X86/X86CallingConv.cpp head/contrib/llvm/lib/Target/X86/X86EvexToVex.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/X86/X86EvexToVex.cpp head/contrib/llvm/lib/Target/X86/X86InstrFMA3Info.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/X86/X86InstrFMA3Info.cpp head/contrib/llvm/lib/Target/X86/X86InstrFMA3Info.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/X86/X86InstrFMA3Info.h head/contrib/llvm/lib/Target/X86/X86InstrTablesInfo.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/X86/X86InstrTablesInfo.h head/contrib/llvm/lib/Target/X86/X86InterleavedAccess.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Target/X86/X86InterleavedAccess.cpp head/contrib/llvm/lib/Transforms/Coroutines/ - copied from r314524, projects/clang400-import/contrib/llvm/lib/Transforms/Coroutines/ head/contrib/llvm/lib/Transforms/IPO/AlwaysInliner.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Transforms/IPO/AlwaysInliner.cpp head/contrib/llvm/lib/Transforms/IPO/GlobalSplit.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Transforms/IPO/GlobalSplit.cpp head/contrib/llvm/lib/Transforms/IPO/ThinLTOBitcodeWriter.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Transforms/IPO/ThinLTOBitcodeWriter.cpp head/contrib/llvm/lib/Transforms/Scalar/IVUsersPrinter.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Transforms/Scalar/IVUsersPrinter.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopAccessAnalysisPrinter.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Transforms/Scalar/LoopAccessAnalysisPrinter.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopPassManager.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Transforms/Scalar/LoopPassManager.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopSink.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Transforms/Scalar/LoopSink.cpp head/contrib/llvm/lib/Transforms/Scalar/NewGVN.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Transforms/Scalar/NewGVN.cpp head/contrib/llvm/lib/Transforms/Utils/EscapeEnumerator.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Transforms/Utils/EscapeEnumerator.cpp head/contrib/llvm/lib/Transforms/Utils/FunctionComparator.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Transforms/Utils/FunctionComparator.cpp head/contrib/llvm/lib/Transforms/Utils/ImportedFunctionsInliningStatistics.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Transforms/Utils/ImportedFunctionsInliningStatistics.cpp head/contrib/llvm/lib/Transforms/Utils/LibCallsShrinkWrap.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Transforms/Utils/LibCallsShrinkWrap.cpp head/contrib/llvm/lib/Transforms/Utils/LoopUnrollPeel.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Transforms/Utils/LoopUnrollPeel.cpp head/contrib/llvm/lib/Transforms/Utils/NameAnonGlobals.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Transforms/Utils/NameAnonGlobals.cpp head/contrib/llvm/lib/Transforms/Utils/StripGCRelocates.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Transforms/Utils/StripGCRelocates.cpp head/contrib/llvm/lib/Transforms/Utils/StripNonLineTableDebugInfo.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/lib/Transforms/Utils/StripNonLineTableDebugInfo.cpp head/contrib/llvm/lib/XRay/ - copied from r314524, projects/clang400-import/contrib/llvm/lib/XRay/ head/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/OSLog.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/OSLog.h head/contrib/llvm/tools/clang/include/clang/Analysis/CloneDetection.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/include/clang/Analysis/CloneDetection.h head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsX86_64.def - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsX86_64.def head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticDocs.td - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticDocs.td head/contrib/llvm/tools/clang/include/clang/Driver/Distro.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/include/clang/Driver/Distro.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Checkers/MPIFunctionClassifier.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Checkers/MPIFunctionClassifier.h head/contrib/llvm/tools/clang/include/clang/Tooling/Core/Diagnostic.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/include/clang/Tooling/Core/Diagnostic.h head/contrib/llvm/tools/clang/include/clang/Tooling/DiagnosticsYaml.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/include/clang/Tooling/DiagnosticsYaml.h head/contrib/llvm/tools/clang/lib/Analysis/CloneDetection.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/Analysis/CloneDetection.cpp head/contrib/llvm/tools/clang/lib/Analysis/OSLog.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/Analysis/OSLog.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGCoroutine.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/CodeGen/CGCoroutine.cpp head/contrib/llvm/tools/clang/lib/CodeGen/ConstantBuilder.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/CodeGen/ConstantBuilder.h head/contrib/llvm/tools/clang/lib/CodeGen/VarBypassDetector.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/CodeGen/VarBypassDetector.cpp head/contrib/llvm/tools/clang/lib/CodeGen/VarBypassDetector.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/CodeGen/VarBypassDetector.h head/contrib/llvm/tools/clang/lib/Driver/Distro.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/Driver/Distro.cpp head/contrib/llvm/tools/clang/lib/Format/Comments.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/Format/Comments.cpp head/contrib/llvm/tools/clang/lib/Format/Comments.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/Format/Comments.h head/contrib/llvm/tools/clang/lib/Headers/__clang_cuda_builtin_vars.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/Headers/__clang_cuda_builtin_vars.h head/contrib/llvm/tools/clang/lib/Headers/__clang_cuda_complex_builtins.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/Headers/__clang_cuda_complex_builtins.h head/contrib/llvm/tools/clang/lib/Headers/armintr.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/Headers/armintr.h head/contrib/llvm/tools/clang/lib/Headers/cuda_wrappers/ - copied from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/Headers/cuda_wrappers/ head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/AnalysisOrderChecker.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/AnalysisOrderChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/BlockInCriticalSectionChecker.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/BlockInCriticalSectionChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CXXSelfAssignmentChecker.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CXXSelfAssignmentChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CloneChecker.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CloneChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ConversionChecker.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ConversionChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/GTestChecker.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/GTestChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/IteratorPastEndChecker.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/IteratorPastEndChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/NumberObjectConversionChecker.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/NumberObjectConversionChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCPropertyChecker.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCPropertyChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/StdLibraryFunctionsChecker.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/StdLibraryFunctionsChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ValistChecker.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ValistChecker.cpp head/contrib/llvm/tools/clang/lib/Tooling/Core/Diagnostic.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/clang/lib/Tooling/Core/Diagnostic.cpp head/contrib/llvm/tools/lld/COFF/Memory.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lld/COFF/Memory.h head/contrib/llvm/tools/lld/COFF/PDB.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lld/COFF/PDB.h head/contrib/llvm/tools/lld/COFF/Strings.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lld/COFF/Strings.cpp head/contrib/llvm/tools/lld/COFF/Strings.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lld/COFF/Strings.h head/contrib/llvm/tools/lld/ELF/GdbIndex.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lld/ELF/GdbIndex.cpp head/contrib/llvm/tools/lld/ELF/GdbIndex.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lld/ELF/GdbIndex.h head/contrib/llvm/tools/lld/ELF/Memory.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lld/ELF/Memory.h head/contrib/llvm/tools/lld/ELF/Mips.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lld/ELF/Mips.cpp head/contrib/llvm/tools/lld/ELF/SyntheticSections.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lld/ELF/SyntheticSections.cpp head/contrib/llvm/tools/lld/ELF/SyntheticSections.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lld/ELF/SyntheticSections.h head/contrib/llvm/tools/lld/ELF/Threads.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lld/ELF/Threads.h head/contrib/llvm/tools/lld/include/lld/Core/Reproduce.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lld/include/lld/Core/Reproduce.h head/contrib/llvm/tools/lld/include/lld/Support/ - copied from r314524, projects/clang400-import/contrib/llvm/tools/lld/include/lld/Support/ head/contrib/llvm/tools/lld/lib/Core/Reproduce.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lld/lib/Core/Reproduce.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/DebugInfo.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/DebugInfo.h head/contrib/llvm/tools/lld/lib/Support/ - copied from r314524, projects/clang400-import/contrib/llvm/tools/lld/lib/Support/ head/contrib/llvm/tools/lldb/include/lldb/API/SBStructuredData.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/include/lldb/API/SBStructuredData.h head/contrib/llvm/tools/lldb/include/lldb/Host/PosixApi.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/include/lldb/Host/PosixApi.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/OCamlASTContext.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/include/lldb/Symbol/OCamlASTContext.h head/contrib/llvm/tools/lldb/include/lldb/Target/StructuredDataPlugin.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/include/lldb/Target/StructuredDataPlugin.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallOnFunctionExit.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallOnFunctionExit.h head/contrib/llvm/tools/lldb/include/lldb/Utility/SelectHelper.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/include/lldb/Utility/SelectHelper.h head/contrib/llvm/tools/lldb/include/lldb/Utility/Timeout.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/include/lldb/Utility/Timeout.h head/contrib/llvm/tools/lldb/source/API/SBStructuredData.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/API/SBStructuredData.cpp head/contrib/llvm/tools/lldb/source/API/liblldb-private.exports - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/API/liblldb-private.exports head/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/OCaml/ - copied from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/Language/OCaml/ head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.h head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptScriptGroup.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptScriptGroup.cpp head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptScriptGroup.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptScriptGroup.h head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptx86ABIFixups.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptx86ABIFixups.cpp head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptx86ABIFixups.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptx86ABIFixups.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Darwin/ - copied from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/Process/Darwin/ head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm64.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm64.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteClientBase.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteClientBase.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteClientBase.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteClientBase.h head/contrib/llvm/tools/lldb/source/Plugins/Process/minidump/ - copied from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/Process/minidump/ head/contrib/llvm/tools/lldb/source/Plugins/StructuredData/ - copied from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/StructuredData/ head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserOCaml.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserOCaml.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserOCaml.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserOCaml.h head/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/x86/x86AssemblyInspectionEngine.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/x86/x86AssemblyInspectionEngine.cpp head/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/x86/x86AssemblyInspectionEngine.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/x86/x86AssemblyInspectionEngine.h head/contrib/llvm/tools/lldb/source/Symbol/OCamlASTContext.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Symbol/OCamlASTContext.cpp head/contrib/llvm/tools/lldb/source/Target/StructuredDataPlugin.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Target/StructuredDataPlugin.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallOnFunctionExit.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallOnFunctionExit.cpp head/contrib/llvm/tools/lldb/source/Utility/SelectHelper.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/lldb/source/Utility/SelectHelper.cpp head/contrib/llvm/tools/lldb/tools/lldb-server/Darwin/ - copied from r314524, projects/clang400-import/contrib/llvm/tools/lldb/tools/lldb-server/Darwin/ head/contrib/llvm/tools/llvm-cov/CoverageExporterJson.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-cov/CoverageExporterJson.cpp head/contrib/llvm/tools/llvm-cxxfilt/ - copied from r314524, projects/clang400-import/contrib/llvm/tools/llvm-cxxfilt/ head/contrib/llvm/tools/llvm-lto2/ - copied from r314524, projects/clang400-import/contrib/llvm/tools/llvm-lto2/ head/contrib/llvm/tools/llvm-modextract/ - copied from r314524, projects/clang400-import/contrib/llvm/tools/llvm-modextract/ head/contrib/llvm/tools/llvm-objdump/WasmDump.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-objdump/WasmDump.cpp head/contrib/llvm/tools/llvm-pdbdump/PrettyBuiltinDumper.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/PrettyBuiltinDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/PrettyBuiltinDumper.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/PrettyBuiltinDumper.h head/contrib/llvm/tools/llvm-pdbdump/PrettyClassDefinitionDumper.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/PrettyClassDefinitionDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/PrettyClassDefinitionDumper.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/PrettyClassDefinitionDumper.h head/contrib/llvm/tools/llvm-pdbdump/PrettyCompilandDumper.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/PrettyCompilandDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/PrettyCompilandDumper.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/PrettyCompilandDumper.h head/contrib/llvm/tools/llvm-pdbdump/PrettyEnumDumper.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/PrettyEnumDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/PrettyEnumDumper.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/PrettyEnumDumper.h head/contrib/llvm/tools/llvm-pdbdump/PrettyExternalSymbolDumper.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/PrettyExternalSymbolDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/PrettyExternalSymbolDumper.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/PrettyExternalSymbolDumper.h head/contrib/llvm/tools/llvm-pdbdump/PrettyFunctionDumper.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/PrettyFunctionDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/PrettyFunctionDumper.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/PrettyFunctionDumper.h head/contrib/llvm/tools/llvm-pdbdump/PrettyTypeDumper.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/PrettyTypeDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/PrettyTypeDumper.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/PrettyTypeDumper.h head/contrib/llvm/tools/llvm-pdbdump/PrettyTypedefDumper.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/PrettyTypedefDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/PrettyTypedefDumper.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/PrettyTypedefDumper.h head/contrib/llvm/tools/llvm-pdbdump/PrettyVariableDumper.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/PrettyVariableDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/PrettyVariableDumper.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/PrettyVariableDumper.h head/contrib/llvm/tools/llvm-pdbdump/YamlSerializationContext.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/YamlSerializationContext.h head/contrib/llvm/tools/llvm-pdbdump/YamlSymbolDumper.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/YamlSymbolDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/YamlSymbolDumper.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/YamlSymbolDumper.h head/contrib/llvm/tools/llvm-pdbdump/YamlTypeDumper.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/YamlTypeDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/YamlTypeDumper.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/tools/llvm-pdbdump/YamlTypeDumper.h head/contrib/llvm/tools/llvm-xray/ - copied from r314524, projects/clang400-import/contrib/llvm/tools/llvm-xray/ head/contrib/llvm/utils/TableGen/GlobalISelEmitter.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/utils/TableGen/GlobalISelEmitter.cpp head/contrib/llvm/utils/TableGen/SubtargetFeatureInfo.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/utils/TableGen/SubtargetFeatureInfo.cpp head/contrib/llvm/utils/TableGen/SubtargetFeatureInfo.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/utils/TableGen/SubtargetFeatureInfo.h head/contrib/llvm/utils/TableGen/Types.cpp - copied unchanged from r314524, projects/clang400-import/contrib/llvm/utils/TableGen/Types.cpp head/contrib/llvm/utils/TableGen/Types.h - copied unchanged from r314524, projects/clang400-import/contrib/llvm/utils/TableGen/Types.h head/lib/clang/include/llvm/Config/abi-breaking.h - copied unchanged from r314524, projects/clang400-import/lib/clang/include/llvm/Config/abi-breaking.h head/usr.bin/clang/llvm-cxxfilt/ - copied from r314524, projects/clang400-import/usr.bin/clang/llvm-cxxfilt/ head/usr.bin/clang/llvm-lto2/ - copied from r314524, projects/clang400-import/usr.bin/clang/llvm-lto2/ head/usr.bin/clang/llvm-modextract/ - copied from r314524, projects/clang400-import/usr.bin/clang/llvm-modextract/ head/usr.bin/clang/llvm-xray/ - copied from r314524, projects/clang400-import/usr.bin/clang/llvm-xray/ Deleted: head/contrib/libc++/include/__undef___deallocate head/contrib/llvm/include/llvm/Analysis/LoopPassManager.h head/contrib/llvm/include/llvm/Bitcode/ReaderWriter.h head/contrib/llvm/include/llvm/CodeGen/MachineFunctionAnalysis.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/ByteStream.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/CodeViewOStream.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/FieldListRecordBuilder.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/ListRecordBuilder.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/MemoryTypeTableBuilder.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/MethodListRecordBuilder.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/StreamArray.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/StreamInterface.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/StreamReader.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/StreamRef.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/StreamWriter.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeDumper.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/DirectoryStreamData.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/IPDBFile.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/IPDBStreamData.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/IndexedStreamData.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/MappedBlockStream.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/MsfBuilder.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/MsfCommon.h head/contrib/llvm/include/llvm/ExecutionEngine/JITSymbolFlags.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/JITSymbol.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/LogicalDylib.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/RPCChannel.h head/contrib/llvm/include/llvm/Support/DataStream.h head/contrib/llvm/include/llvm/Support/MemoryObject.h head/contrib/llvm/include/llvm/Support/StreamingMemoryObject.h head/contrib/llvm/include/llvm/Support/TimeValue.h head/contrib/llvm/include/llvm/Target/TargetRecip.h head/contrib/llvm/include/llvm/Transforms/IPO/InlinerPass.h head/contrib/llvm/lib/Analysis/LoopPassManager.cpp head/contrib/llvm/lib/CodeGen/MachineFunctionAnalysis.cpp head/contrib/llvm/lib/DebugInfo/CodeView/ByteStream.cpp head/contrib/llvm/lib/DebugInfo/CodeView/FieldListRecordBuilder.cpp head/contrib/llvm/lib/DebugInfo/CodeView/ListRecordBuilder.cpp head/contrib/llvm/lib/DebugInfo/CodeView/MemoryTypeTableBuilder.cpp head/contrib/llvm/lib/DebugInfo/CodeView/MethodListRecordBuilder.cpp head/contrib/llvm/lib/DebugInfo/CodeView/StreamReader.cpp head/contrib/llvm/lib/DebugInfo/CodeView/StreamWriter.cpp head/contrib/llvm/lib/DebugInfo/CodeView/TypeDumper.cpp head/contrib/llvm/lib/DebugInfo/CodeView/TypeRecordBuilder.cpp head/contrib/llvm/lib/DebugInfo/CodeView/TypeTableBuilder.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/IndexedStreamData.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/MappedBlockStream.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/MsfBuilder.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/MsfCommon.cpp head/contrib/llvm/lib/ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.cpp head/contrib/llvm/lib/Support/ConvertUTF.c head/contrib/llvm/lib/Support/DataStream.cpp head/contrib/llvm/lib/Support/IntrusiveRefCntPtr.cpp head/contrib/llvm/lib/Support/MemoryObject.cpp head/contrib/llvm/lib/Support/StreamingMemoryObject.cpp head/contrib/llvm/lib/Support/TimeValue.cpp head/contrib/llvm/lib/Support/Unix/TimeValue.inc head/contrib/llvm/lib/Support/Windows/TimeValue.inc head/contrib/llvm/lib/Target/AArch64/AArch64BranchRelaxation.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonRDF.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonRDF.h head/contrib/llvm/lib/Target/Hexagon/HexagonSelectCCInfo.td head/contrib/llvm/lib/Target/NVPTX/NVPTXFavorNonGenericAddrSpaces.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXLowerKernelArgs.cpp head/contrib/llvm/lib/Target/TargetRecip.cpp head/contrib/llvm/lib/Target/TargetSubtargetInfo.cpp head/contrib/llvm/lib/Transforms/IPO/InlineAlways.cpp head/contrib/llvm/lib/Transforms/Utils/NameAnonFunctions.cpp head/contrib/llvm/tools/clang/lib/Headers/cuda_builtin_vars.h head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MPI-Checker/MPIFunctionClassifier.h head/contrib/llvm/tools/lld/ELF/SymbolListFile.cpp head/contrib/llvm/tools/lld/ELF/SymbolListFile.h head/contrib/llvm/tools/lldb/include/lldb/Core/ConnectionMachPort.h head/contrib/llvm/tools/lldb/include/lldb/Core/ConnectionSharedMemory.h head/contrib/llvm/tools/lldb/include/lldb/Core/CxaDemangle.h head/contrib/llvm/tools/lldb/include/lldb/Host/Condition.h head/contrib/llvm/tools/lldb/include/lldb/Host/Mutex.h head/contrib/llvm/tools/lldb/include/lldb/Host/TimeValue.h head/contrib/llvm/tools/lldb/source/Core/ConnectionMachPort.cpp head/contrib/llvm/tools/lldb/source/Core/ConnectionSharedMemory.cpp head/contrib/llvm/tools/lldb/source/Core/CxaDemangle.cpp head/contrib/llvm/tools/lldb/source/Host/common/Condition.cpp head/contrib/llvm/tools/lldb/source/Host/common/Mutex.cpp head/contrib/llvm/tools/lldb/source/Host/common/TimeValue.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_arm64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_arm64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_arm64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_arm64.h head/contrib/llvm/tools/lldb/source/Utility/KQueue.cpp head/contrib/llvm/tools/lldb/source/Utility/KQueue.h head/contrib/llvm/tools/lldb/source/Utility/TimeSpecTimeout.cpp head/contrib/llvm/tools/lldb/source/Utility/TimeSpecTimeout.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MIUtilParse.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MIUtilParse.h head/contrib/llvm/tools/llvm-pdbdump/BuiltinDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/BuiltinDumper.h head/contrib/llvm/tools/llvm-pdbdump/ClassDefinitionDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/ClassDefinitionDumper.h head/contrib/llvm/tools/llvm-pdbdump/CompilandDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/CompilandDumper.h head/contrib/llvm/tools/llvm-pdbdump/EnumDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/EnumDumper.h head/contrib/llvm/tools/llvm-pdbdump/ExternalSymbolDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/ExternalSymbolDumper.h head/contrib/llvm/tools/llvm-pdbdump/FunctionDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/FunctionDumper.h head/contrib/llvm/tools/llvm-pdbdump/TypeDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/TypeDumper.h head/contrib/llvm/tools/llvm-pdbdump/TypedefDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/TypedefDumper.h head/contrib/llvm/tools/llvm-pdbdump/VariableDumper.cpp head/contrib/llvm/tools/llvm-pdbdump/VariableDumper.h Modified: head/Makefile.inc1 head/ObsoleteFiles.inc head/UPDATING head/contrib/compiler-rt/include/sanitizer/common_interface_defs.h head/contrib/compiler-rt/include/sanitizer/coverage_interface.h head/contrib/compiler-rt/lib/asan/asan_activation.cc head/contrib/compiler-rt/lib/asan/asan_activation_flags.inc head/contrib/compiler-rt/lib/asan/asan_allocator.cc head/contrib/compiler-rt/lib/asan/asan_allocator.h head/contrib/compiler-rt/lib/asan/asan_debugging.cc head/contrib/compiler-rt/lib/asan/asan_fake_stack.cc head/contrib/compiler-rt/lib/asan/asan_fake_stack.h head/contrib/compiler-rt/lib/asan/asan_flags.cc head/contrib/compiler-rt/lib/asan/asan_flags.inc head/contrib/compiler-rt/lib/asan/asan_globals.cc head/contrib/compiler-rt/lib/asan/asan_interceptors.cc head/contrib/compiler-rt/lib/asan/asan_interface_internal.h head/contrib/compiler-rt/lib/asan/asan_internal.h head/contrib/compiler-rt/lib/asan/asan_mac.cc head/contrib/compiler-rt/lib/asan/asan_malloc_linux.cc head/contrib/compiler-rt/lib/asan/asan_malloc_win.cc head/contrib/compiler-rt/lib/asan/asan_mapping.h head/contrib/compiler-rt/lib/asan/asan_memory_profile.cc head/contrib/compiler-rt/lib/asan/asan_new_delete.cc head/contrib/compiler-rt/lib/asan/asan_poisoning.cc head/contrib/compiler-rt/lib/asan/asan_poisoning.h head/contrib/compiler-rt/lib/asan/asan_posix.cc head/contrib/compiler-rt/lib/asan/asan_report.cc head/contrib/compiler-rt/lib/asan/asan_report.h head/contrib/compiler-rt/lib/asan/asan_rtl.cc head/contrib/compiler-rt/lib/asan/asan_scariness_score.h head/contrib/compiler-rt/lib/asan/asan_thread.cc head/contrib/compiler-rt/lib/asan/asan_thread.h head/contrib/compiler-rt/lib/asan/asan_win.cc head/contrib/compiler-rt/lib/asan/asan_win_dll_thunk.cc head/contrib/compiler-rt/lib/asan/asan_win_dynamic_runtime_thunk.cc head/contrib/compiler-rt/lib/builtins/arm/adddf3vfp.S head/contrib/compiler-rt/lib/builtins/arm/addsf3vfp.S head/contrib/compiler-rt/lib/builtins/arm/aeabi_fcmp.S head/contrib/compiler-rt/lib/builtins/arm/aeabi_idivmod.S head/contrib/compiler-rt/lib/builtins/arm/aeabi_ldivmod.S head/contrib/compiler-rt/lib/builtins/arm/aeabi_uidivmod.S head/contrib/compiler-rt/lib/builtins/arm/aeabi_uldivmod.S head/contrib/compiler-rt/lib/builtins/arm/comparesf2.S head/contrib/compiler-rt/lib/builtins/arm/divdf3vfp.S head/contrib/compiler-rt/lib/builtins/arm/divsf3vfp.S head/contrib/compiler-rt/lib/builtins/arm/divsi3.S head/contrib/compiler-rt/lib/builtins/arm/eqdf2vfp.S head/contrib/compiler-rt/lib/builtins/arm/eqsf2vfp.S head/contrib/compiler-rt/lib/builtins/arm/extendsfdf2vfp.S head/contrib/compiler-rt/lib/builtins/arm/fixdfsivfp.S head/contrib/compiler-rt/lib/builtins/arm/fixsfsivfp.S head/contrib/compiler-rt/lib/builtins/arm/fixunsdfsivfp.S head/contrib/compiler-rt/lib/builtins/arm/fixunssfsivfp.S head/contrib/compiler-rt/lib/builtins/arm/floatsidfvfp.S head/contrib/compiler-rt/lib/builtins/arm/floatsisfvfp.S head/contrib/compiler-rt/lib/builtins/arm/floatunssidfvfp.S head/contrib/compiler-rt/lib/builtins/arm/floatunssisfvfp.S head/contrib/compiler-rt/lib/builtins/arm/gedf2vfp.S head/contrib/compiler-rt/lib/builtins/arm/gesf2vfp.S head/contrib/compiler-rt/lib/builtins/arm/gtdf2vfp.S head/contrib/compiler-rt/lib/builtins/arm/gtsf2vfp.S head/contrib/compiler-rt/lib/builtins/arm/ledf2vfp.S head/contrib/compiler-rt/lib/builtins/arm/lesf2vfp.S head/contrib/compiler-rt/lib/builtins/arm/ltdf2vfp.S head/contrib/compiler-rt/lib/builtins/arm/ltsf2vfp.S head/contrib/compiler-rt/lib/builtins/arm/muldf3vfp.S head/contrib/compiler-rt/lib/builtins/arm/mulsf3vfp.S head/contrib/compiler-rt/lib/builtins/arm/nedf2vfp.S head/contrib/compiler-rt/lib/builtins/arm/negdf2vfp.S head/contrib/compiler-rt/lib/builtins/arm/negsf2vfp.S head/contrib/compiler-rt/lib/builtins/arm/nesf2vfp.S head/contrib/compiler-rt/lib/builtins/arm/subdf3vfp.S head/contrib/compiler-rt/lib/builtins/arm/subsf3vfp.S head/contrib/compiler-rt/lib/builtins/arm/truncdfsf2vfp.S head/contrib/compiler-rt/lib/builtins/arm/udivsi3.S head/contrib/compiler-rt/lib/builtins/arm/unorddf2vfp.S head/contrib/compiler-rt/lib/builtins/arm/unordsf2vfp.S head/contrib/compiler-rt/lib/builtins/assembly.h head/contrib/compiler-rt/lib/builtins/atomic.c head/contrib/compiler-rt/lib/builtins/clear_cache.c head/contrib/compiler-rt/lib/builtins/int_lib.h head/contrib/compiler-rt/lib/cfi/cfi.cc head/contrib/compiler-rt/lib/dfsan/dfsan.cc head/contrib/compiler-rt/lib/dfsan/dfsan.h head/contrib/compiler-rt/lib/dfsan/dfsan_interceptors.cc head/contrib/compiler-rt/lib/dfsan/dfsan_platform.h head/contrib/compiler-rt/lib/dfsan/done_abilist.txt head/contrib/compiler-rt/lib/esan/cache_frag.cpp head/contrib/compiler-rt/lib/esan/esan.cpp head/contrib/compiler-rt/lib/esan/esan.h head/contrib/compiler-rt/lib/esan/esan_flags.cpp head/contrib/compiler-rt/lib/esan/esan_interceptors.cpp head/contrib/compiler-rt/lib/esan/esan_interface_internal.h head/contrib/compiler-rt/lib/esan/esan_linux.cpp head/contrib/compiler-rt/lib/esan/esan_shadow.h head/contrib/compiler-rt/lib/interception/interception.h head/contrib/compiler-rt/lib/interception/interception_win.cc head/contrib/compiler-rt/lib/lsan/lsan_allocator.cc head/contrib/compiler-rt/lib/lsan/lsan_common.cc head/contrib/compiler-rt/lib/lsan/lsan_common_linux.cc head/contrib/compiler-rt/lib/lsan/lsan_thread.cc head/contrib/compiler-rt/lib/msan/msan.h head/contrib/compiler-rt/lib/msan/msan_allocator.cc head/contrib/compiler-rt/lib/msan/msan_interceptors.cc head/contrib/compiler-rt/lib/msan/msan_interface_internal.h head/contrib/compiler-rt/lib/msan/msan_linux.cc head/contrib/compiler-rt/lib/profile/GCDAProfiling.c head/contrib/compiler-rt/lib/profile/InstrProfData.inc head/contrib/compiler-rt/lib/profile/InstrProfiling.c head/contrib/compiler-rt/lib/profile/InstrProfiling.h head/contrib/compiler-rt/lib/profile/InstrProfilingFile.c head/contrib/compiler-rt/lib/profile/InstrProfilingInternal.h head/contrib/compiler-rt/lib/profile/InstrProfilingPort.h head/contrib/compiler-rt/lib/profile/InstrProfilingRuntime.cc head/contrib/compiler-rt/lib/profile/InstrProfilingUtil.c head/contrib/compiler-rt/lib/profile/InstrProfilingUtil.h head/contrib/compiler-rt/lib/profile/InstrProfilingValue.c head/contrib/compiler-rt/lib/profile/WindowsMMap.c head/contrib/compiler-rt/lib/safestack/safestack.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_addrhashmap.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator_interface.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator_internal.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_atomic.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_common.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_common.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_format.inc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_common_libcdep.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_common_nolibc.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_coverage_libcdep.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_flags.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_flags.inc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_interface_internal.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_libc.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_libignore.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_libignore.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_linux.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_mac.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_malloc_mac.inc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_posix_libcdep.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_printf.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_procmaps.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_freebsd.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_linux.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_mac.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_quarantine.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_stackdepot.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_libcdep.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_internal.h head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_libcdep.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_mac.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_win.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_thread_registry.cc head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_win.cc head/contrib/compiler-rt/lib/scudo/scudo_allocator.cpp head/contrib/compiler-rt/lib/scudo/scudo_allocator.h head/contrib/compiler-rt/lib/scudo/scudo_flags.cpp head/contrib/compiler-rt/lib/scudo/scudo_flags.h head/contrib/compiler-rt/lib/scudo/scudo_interceptors.cpp head/contrib/compiler-rt/lib/scudo/scudo_new_delete.cpp head/contrib/compiler-rt/lib/scudo/scudo_termination.cpp head/contrib/compiler-rt/lib/scudo/scudo_utils.cpp head/contrib/compiler-rt/lib/scudo/scudo_utils.h head/contrib/compiler-rt/lib/stats/stats_client.cc head/contrib/compiler-rt/lib/tsan/go/tsan_go.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan.syms.extra head/contrib/compiler-rt/lib/tsan/rtl/tsan_clock.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_debugging.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_defs.h head/contrib/compiler-rt/lib/tsan/rtl/tsan_flags.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_flags.inc head/contrib/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_interceptors.h head/contrib/compiler-rt/lib/tsan/rtl/tsan_interceptors_mac.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_interface.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_interface.h head/contrib/compiler-rt/lib/tsan/rtl/tsan_interface_atomic.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_interface_inl.h head/contrib/compiler-rt/lib/tsan/rtl/tsan_interface_java.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_interface_java.h head/contrib/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_mman.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_mutexset.h head/contrib/compiler-rt/lib/tsan/rtl/tsan_platform.h head/contrib/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_platform_mac.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_platform_posix.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_platform_windows.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_report.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl.h head/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl_aarch64.S head/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl_mutex.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl_proc.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl_thread.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_suppressions.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_sync.cc head/contrib/compiler-rt/lib/tsan/rtl/tsan_sync.h head/contrib/compiler-rt/lib/tsan/rtl/tsan_trace.h head/contrib/compiler-rt/lib/ubsan/ubsan_diag.cc head/contrib/compiler-rt/lib/ubsan/ubsan_handlers.cc head/contrib/compiler-rt/lib/ubsan/ubsan_handlers.h head/contrib/compiler-rt/lib/ubsan/ubsan_init.cc head/contrib/compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cc head/contrib/libc++/CREDITS.TXT head/contrib/libc++/LICENSE.TXT head/contrib/libc++/include/__bit_reference head/contrib/libc++/include/__config head/contrib/libc++/include/__debug head/contrib/libc++/include/__functional_03 head/contrib/libc++/include/__functional_base head/contrib/libc++/include/__hash_table head/contrib/libc++/include/__locale head/contrib/libc++/include/__mutex_base head/contrib/libc++/include/__nullptr head/contrib/libc++/include/__refstring head/contrib/libc++/include/__sso_allocator head/contrib/libc++/include/__std_stream head/contrib/libc++/include/__threading_support head/contrib/libc++/include/__tree head/contrib/libc++/include/__tuple head/contrib/libc++/include/algorithm head/contrib/libc++/include/array head/contrib/libc++/include/atomic head/contrib/libc++/include/bitset head/contrib/libc++/include/chrono head/contrib/libc++/include/cmath head/contrib/libc++/include/codecvt head/contrib/libc++/include/complex head/contrib/libc++/include/cstdio head/contrib/libc++/include/cstdlib head/contrib/libc++/include/cwchar head/contrib/libc++/include/deque head/contrib/libc++/include/exception head/contrib/libc++/include/experimental/algorithm head/contrib/libc++/include/experimental/any head/contrib/libc++/include/experimental/dynarray head/contrib/libc++/include/experimental/filesystem head/contrib/libc++/include/experimental/iterator head/contrib/libc++/include/experimental/memory_resource head/contrib/libc++/include/experimental/optional head/contrib/libc++/include/experimental/propagate_const head/contrib/libc++/include/experimental/string_view head/contrib/libc++/include/experimental/type_traits head/contrib/libc++/include/experimental/utility head/contrib/libc++/include/ext/__hash head/contrib/libc++/include/ext/hash_map head/contrib/libc++/include/ext/hash_set head/contrib/libc++/include/forward_list head/contrib/libc++/include/fstream head/contrib/libc++/include/functional head/contrib/libc++/include/future head/contrib/libc++/include/initializer_list head/contrib/libc++/include/inttypes.h head/contrib/libc++/include/iomanip head/contrib/libc++/include/ios head/contrib/libc++/include/iosfwd head/contrib/libc++/include/istream head/contrib/libc++/include/iterator head/contrib/libc++/include/limits head/contrib/libc++/include/list head/contrib/libc++/include/locale head/contrib/libc++/include/map head/contrib/libc++/include/math.h head/contrib/libc++/include/memory head/contrib/libc++/include/module.modulemap head/contrib/libc++/include/mutex head/contrib/libc++/include/new head/contrib/libc++/include/numeric head/contrib/libc++/include/ostream head/contrib/libc++/include/queue head/contrib/libc++/include/random head/contrib/libc++/include/ratio head/contrib/libc++/include/regex head/contrib/libc++/include/scoped_allocator head/contrib/libc++/include/set head/contrib/libc++/include/sstream head/contrib/libc++/include/stack head/contrib/libc++/include/stdexcept head/contrib/libc++/include/streambuf head/contrib/libc++/include/string head/contrib/libc++/include/system_error head/contrib/libc++/include/thread head/contrib/libc++/include/tuple head/contrib/libc++/include/type_traits head/contrib/libc++/include/typeindex head/contrib/libc++/include/typeinfo head/contrib/libc++/include/unordered_map head/contrib/libc++/include/unordered_set head/contrib/libc++/include/utility head/contrib/libc++/include/valarray head/contrib/libc++/include/vector head/contrib/libc++/src/algorithm.cpp head/contrib/libc++/src/any.cpp head/contrib/libc++/src/chrono.cpp head/contrib/libc++/src/condition_variable.cpp head/contrib/libc++/src/debug.cpp head/contrib/libc++/src/exception.cpp head/contrib/libc++/src/experimental/filesystem/directory_iterator.cpp head/contrib/libc++/src/experimental/filesystem/operations.cpp head/contrib/libc++/src/experimental/filesystem/path.cpp head/contrib/libc++/src/experimental/memory_resource.cpp head/contrib/libc++/src/include/atomic_support.h head/contrib/libc++/src/include/config_elast.h head/contrib/libc++/src/ios.cpp head/contrib/libc++/src/iostream.cpp head/contrib/libc++/src/locale.cpp head/contrib/libc++/src/memory.cpp head/contrib/libc++/src/mutex.cpp head/contrib/libc++/src/new.cpp head/contrib/libc++/src/optional.cpp head/contrib/libc++/src/random.cpp head/contrib/libc++/src/stdexcept.cpp head/contrib/libc++/src/string.cpp head/contrib/libc++/src/strstream.cpp head/contrib/libc++/src/system_error.cpp head/contrib/libc++/src/thread.cpp head/contrib/libc++/src/typeinfo.cpp head/contrib/llvm/LICENSE.TXT head/contrib/llvm/include/llvm-c/Core.h head/contrib/llvm/include/llvm-c/Transforms/Scalar.h head/contrib/llvm/include/llvm-c/lto.h head/contrib/llvm/include/llvm/ADT/APFloat.h head/contrib/llvm/include/llvm/ADT/APInt.h head/contrib/llvm/include/llvm/ADT/APSInt.h head/contrib/llvm/include/llvm/ADT/ArrayRef.h head/contrib/llvm/include/llvm/ADT/BitVector.h head/contrib/llvm/include/llvm/ADT/DAGDeltaAlgorithm.h head/contrib/llvm/include/llvm/ADT/DenseMap.h head/contrib/llvm/include/llvm/ADT/DenseMapInfo.h head/contrib/llvm/include/llvm/ADT/DenseSet.h head/contrib/llvm/include/llvm/ADT/DepthFirstIterator.h head/contrib/llvm/include/llvm/ADT/EpochTracker.h head/contrib/llvm/include/llvm/ADT/EquivalenceClasses.h head/contrib/llvm/include/llvm/ADT/FoldingSet.h head/contrib/llvm/include/llvm/ADT/GraphTraits.h head/contrib/llvm/include/llvm/ADT/ImmutableList.h head/contrib/llvm/include/llvm/ADT/ImmutableMap.h head/contrib/llvm/include/llvm/ADT/ImmutableSet.h head/contrib/llvm/include/llvm/ADT/IntervalMap.h head/contrib/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h head/contrib/llvm/include/llvm/ADT/MapVector.h head/contrib/llvm/include/llvm/ADT/Optional.h head/contrib/llvm/include/llvm/ADT/PackedVector.h head/contrib/llvm/include/llvm/ADT/PointerSumType.h head/contrib/llvm/include/llvm/ADT/PointerUnion.h head/contrib/llvm/include/llvm/ADT/PostOrderIterator.h head/contrib/llvm/include/llvm/ADT/PriorityQueue.h head/contrib/llvm/include/llvm/ADT/PriorityWorklist.h head/contrib/llvm/include/llvm/ADT/SCCIterator.h head/contrib/llvm/include/llvm/ADT/STLExtras.h head/contrib/llvm/include/llvm/ADT/ScopedHashTable.h head/contrib/llvm/include/llvm/ADT/SetVector.h head/contrib/llvm/include/llvm/ADT/SmallPtrSet.h head/contrib/llvm/include/llvm/ADT/SmallSet.h head/contrib/llvm/include/llvm/ADT/SmallString.h head/contrib/llvm/include/llvm/ADT/SmallVector.h head/contrib/llvm/include/llvm/ADT/SparseBitVector.h head/contrib/llvm/include/llvm/ADT/SparseMultiSet.h head/contrib/llvm/include/llvm/ADT/SparseSet.h head/contrib/llvm/include/llvm/ADT/Statistic.h head/contrib/llvm/include/llvm/ADT/StringExtras.h head/contrib/llvm/include/llvm/ADT/StringMap.h head/contrib/llvm/include/llvm/ADT/StringRef.h head/contrib/llvm/include/llvm/ADT/StringSwitch.h head/contrib/llvm/include/llvm/ADT/TinyPtrVector.h head/contrib/llvm/include/llvm/ADT/Triple.h head/contrib/llvm/include/llvm/ADT/Twine.h head/contrib/llvm/include/llvm/ADT/ilist.h head/contrib/llvm/include/llvm/ADT/ilist_node.h head/contrib/llvm/include/llvm/ADT/iterator.h head/contrib/llvm/include/llvm/Analysis/AliasAnalysis.h head/contrib/llvm/include/llvm/Analysis/AliasAnalysisEvaluator.h head/contrib/llvm/include/llvm/Analysis/AliasSetTracker.h head/contrib/llvm/include/llvm/Analysis/AssumptionCache.h head/contrib/llvm/include/llvm/Analysis/BasicAliasAnalysis.h head/contrib/llvm/include/llvm/Analysis/BlockFrequencyInfo.h head/contrib/llvm/include/llvm/Analysis/BlockFrequencyInfoImpl.h head/contrib/llvm/include/llvm/Analysis/BranchProbabilityInfo.h head/contrib/llvm/include/llvm/Analysis/CFGPrinter.h head/contrib/llvm/include/llvm/Analysis/CFLAndersAliasAnalysis.h head/contrib/llvm/include/llvm/Analysis/CFLSteensAliasAnalysis.h head/contrib/llvm/include/llvm/Analysis/CGSCCPassManager.h head/contrib/llvm/include/llvm/Analysis/CallGraph.h head/contrib/llvm/include/llvm/Analysis/CallGraphSCCPass.h head/contrib/llvm/include/llvm/Analysis/CodeMetrics.h head/contrib/llvm/include/llvm/Analysis/ConstantFolding.h head/contrib/llvm/include/llvm/Analysis/DemandedBits.h head/contrib/llvm/include/llvm/Analysis/DependenceAnalysis.h head/contrib/llvm/include/llvm/Analysis/DominanceFrontier.h head/contrib/llvm/include/llvm/Analysis/EHPersonalities.h head/contrib/llvm/include/llvm/Analysis/GlobalsModRef.h head/contrib/llvm/include/llvm/Analysis/IVUsers.h head/contrib/llvm/include/llvm/Analysis/InlineCost.h head/contrib/llvm/include/llvm/Analysis/InstructionSimplify.h head/contrib/llvm/include/llvm/Analysis/Interval.h head/contrib/llvm/include/llvm/Analysis/IteratedDominanceFrontier.h head/contrib/llvm/include/llvm/Analysis/LazyBlockFrequencyInfo.h head/contrib/llvm/include/llvm/Analysis/LazyCallGraph.h head/contrib/llvm/include/llvm/Analysis/LazyValueInfo.h head/contrib/llvm/include/llvm/Analysis/Loads.h head/contrib/llvm/include/llvm/Analysis/LoopAccessAnalysis.h head/contrib/llvm/include/llvm/Analysis/LoopInfo.h head/contrib/llvm/include/llvm/Analysis/LoopInfoImpl.h head/contrib/llvm/include/llvm/Analysis/LoopIterator.h head/contrib/llvm/include/llvm/Analysis/LoopPass.h head/contrib/llvm/include/llvm/Analysis/MemoryBuiltins.h head/contrib/llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h head/contrib/llvm/include/llvm/Analysis/ModuleSummaryAnalysis.h head/contrib/llvm/include/llvm/Analysis/ObjCARCAliasAnalysis.h head/contrib/llvm/include/llvm/Analysis/OptimizationDiagnosticInfo.h head/contrib/llvm/include/llvm/Analysis/PostDominators.h head/contrib/llvm/include/llvm/Analysis/ProfileSummaryInfo.h head/contrib/llvm/include/llvm/Analysis/RegionInfo.h head/contrib/llvm/include/llvm/Analysis/RegionInfoImpl.h head/contrib/llvm/include/llvm/Analysis/RegionIterator.h head/contrib/llvm/include/llvm/Analysis/RegionPass.h head/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h head/contrib/llvm/include/llvm/Analysis/ScalarEvolutionAliasAnalysis.h head/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h head/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h head/contrib/llvm/include/llvm/Analysis/ScopedNoAliasAA.h head/contrib/llvm/include/llvm/Analysis/TargetFolder.h head/contrib/llvm/include/llvm/Analysis/TargetLibraryInfo.def head/contrib/llvm/include/llvm/Analysis/TargetLibraryInfo.h head/contrib/llvm/include/llvm/Analysis/TargetTransformInfo.h head/contrib/llvm/include/llvm/Analysis/TargetTransformInfoImpl.h head/contrib/llvm/include/llvm/Analysis/TypeBasedAliasAnalysis.h head/contrib/llvm/include/llvm/Analysis/ValueTracking.h head/contrib/llvm/include/llvm/Bitcode/BitCodes.h head/contrib/llvm/include/llvm/Bitcode/BitcodeWriterPass.h head/contrib/llvm/include/llvm/Bitcode/BitstreamReader.h head/contrib/llvm/include/llvm/Bitcode/BitstreamWriter.h head/contrib/llvm/include/llvm/Bitcode/LLVMBitCodes.h head/contrib/llvm/include/llvm/CodeGen/Analysis.h head/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h head/contrib/llvm/include/llvm/CodeGen/BasicTTIImpl.h head/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h head/contrib/llvm/include/llvm/CodeGen/CommandFlags.h head/contrib/llvm/include/llvm/CodeGen/DIE.h head/contrib/llvm/include/llvm/CodeGen/DIEValue.def head/contrib/llvm/include/llvm/CodeGen/FastISel.h head/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h head/contrib/llvm/include/llvm/CodeGen/GlobalISel/CallLowering.h head/contrib/llvm/include/llvm/CodeGen/GlobalISel/GISelAccessor.h head/contrib/llvm/include/llvm/CodeGen/GlobalISel/IRTranslator.h head/contrib/llvm/include/llvm/CodeGen/GlobalISel/MachineIRBuilder.h head/contrib/llvm/include/llvm/CodeGen/GlobalISel/RegBankSelect.h head/contrib/llvm/include/llvm/CodeGen/GlobalISel/RegisterBank.h head/contrib/llvm/include/llvm/CodeGen/GlobalISel/RegisterBankInfo.h head/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h head/contrib/llvm/include/llvm/CodeGen/LiveInterval.h head/contrib/llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h head/contrib/llvm/include/llvm/CodeGen/LivePhysRegs.h head/contrib/llvm/include/llvm/CodeGen/LiveVariables.h head/contrib/llvm/include/llvm/CodeGen/MIRYamlMapping.h head/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h head/contrib/llvm/include/llvm/CodeGen/MachineBlockFrequencyInfo.h head/contrib/llvm/include/llvm/CodeGen/MachineDominators.h head/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h head/contrib/llvm/include/llvm/CodeGen/MachineFunction.h head/contrib/llvm/include/llvm/CodeGen/MachineInstr.h head/contrib/llvm/include/llvm/CodeGen/MachineInstrBuilder.h head/contrib/llvm/include/llvm/CodeGen/MachineInstrBundle.h head/contrib/llvm/include/llvm/CodeGen/MachineInstrBundleIterator.h head/contrib/llvm/include/llvm/CodeGen/MachineLoopInfo.h head/contrib/llvm/include/llvm/CodeGen/MachineMemOperand.h head/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h head/contrib/llvm/include/llvm/CodeGen/MachineOperand.h head/contrib/llvm/include/llvm/CodeGen/MachinePassRegistry.h head/contrib/llvm/include/llvm/CodeGen/MachineRegionInfo.h head/contrib/llvm/include/llvm/CodeGen/MachineRegisterInfo.h head/contrib/llvm/include/llvm/CodeGen/MachineScheduler.h head/contrib/llvm/include/llvm/CodeGen/MachineValueType.h head/contrib/llvm/include/llvm/CodeGen/PBQP/Graph.h head/contrib/llvm/include/llvm/CodeGen/PBQP/Math.h head/contrib/llvm/include/llvm/CodeGen/PBQP/Solution.h head/contrib/llvm/include/llvm/CodeGen/Passes.h head/contrib/llvm/include/llvm/CodeGen/PseudoSourceValue.h head/contrib/llvm/include/llvm/CodeGen/RegAllocPBQP.h head/contrib/llvm/include/llvm/CodeGen/RegisterPressure.h head/contrib/llvm/include/llvm/CodeGen/RegisterScavenging.h head/contrib/llvm/include/llvm/CodeGen/RuntimeLibcalls.h head/contrib/llvm/include/llvm/CodeGen/ScheduleDAG.h head/contrib/llvm/include/llvm/CodeGen/ScheduleDAGInstrs.h head/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h head/contrib/llvm/include/llvm/CodeGen/SelectionDAGISel.h head/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h head/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h head/contrib/llvm/include/llvm/CodeGen/StackMaps.h head/contrib/llvm/include/llvm/CodeGen/TailDuplicator.h head/contrib/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h head/contrib/llvm/include/llvm/CodeGen/TargetPassConfig.h head/contrib/llvm/include/llvm/CodeGen/ValueTypes.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/CVRecord.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/CVSymbolVisitor.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/CVTypeVisitor.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/CodeView.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/CodeViewError.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/EnumTables.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/ModuleSubstream.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/ModuleSubstreamVisitor.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/RecordSerialization.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/SymbolDumpDelegate.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/SymbolDumper.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/SymbolRecord.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/SymbolVisitorDelegate.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeIndex.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeRecord.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeRecordBuilder.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeRecords.def head/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeTableBuilder.h head/contrib/llvm/include/llvm/DebugInfo/CodeView/TypeVisitorCallbacks.h head/contrib/llvm/include/llvm/DebugInfo/DIContext.h head/contrib/llvm/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h head/contrib/llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h head/contrib/llvm/include/llvm/DebugInfo/DWARF/DWARFContext.h head/contrib/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h head/contrib/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h head/contrib/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h head/contrib/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h head/contrib/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h head/contrib/llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h head/contrib/llvm/include/llvm/DebugInfo/DWARF/DWARFTypeUnit.h head/contrib/llvm/include/llvm/DebugInfo/DWARF/DWARFUnit.h head/contrib/llvm/include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h head/contrib/llvm/include/llvm/DebugInfo/PDB/DIA/DIAError.h head/contrib/llvm/include/llvm/DebugInfo/PDB/GenericError.h head/contrib/llvm/include/llvm/DebugInfo/PDB/IPDBEnumChildren.h head/contrib/llvm/include/llvm/DebugInfo/PDB/IPDBSession.h head/contrib/llvm/include/llvm/DebugInfo/PDB/PDBContext.h head/contrib/llvm/include/llvm/DebugInfo/PDB/PDBTypes.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/DbiStream.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/DbiStreamBuilder.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/ISectionContribVisitor.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/InfoStream.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/InfoStreamBuilder.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/ModInfo.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/ModStream.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/NameHashTable.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/NameMap.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/NameMapBuilder.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/PDBFile.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/PDBFileBuilder.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/PublicsStream.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/RawConstants.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/RawError.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/RawSession.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/RawTypes.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/SymbolStream.h head/contrib/llvm/include/llvm/DebugInfo/PDB/Raw/TpiStream.h head/contrib/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h head/contrib/llvm/include/llvm/ExecutionEngine/JITEventListener.h head/contrib/llvm/include/llvm/ExecutionEngine/ObjectCache.h head/contrib/llvm/include/llvm/ExecutionEngine/ObjectMemoryBuffer.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/ExecutionUtils.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/GlobalMappingLayer.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/IRCompileLayer.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/IRTransformLayer.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/LambdaResolver.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/NullResolver.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/ObjectTransformLayer.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/OrcABISupport.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/OrcError.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h head/contrib/llvm/include/llvm/ExecutionEngine/Orc/RPCUtils.h head/contrib/llvm/include/llvm/ExecutionEngine/RTDyldMemoryManager.h head/contrib/llvm/include/llvm/ExecutionEngine/RuntimeDyld.h head/contrib/llvm/include/llvm/ExecutionEngine/SectionMemoryManager.h head/contrib/llvm/include/llvm/IR/Attributes.h head/contrib/llvm/include/llvm/IR/AutoUpgrade.h head/contrib/llvm/include/llvm/IR/BasicBlock.h head/contrib/llvm/include/llvm/IR/CFG.h head/contrib/llvm/include/llvm/IR/CallSite.h head/contrib/llvm/include/llvm/IR/CallingConv.h head/contrib/llvm/include/llvm/IR/Comdat.h head/contrib/llvm/include/llvm/IR/Constant.h head/contrib/llvm/include/llvm/IR/ConstantFolder.h head/contrib/llvm/include/llvm/IR/ConstantRange.h head/contrib/llvm/include/llvm/IR/Constants.h head/contrib/llvm/include/llvm/IR/DIBuilder.h head/contrib/llvm/include/llvm/IR/DataLayout.h head/contrib/llvm/include/llvm/IR/DebugInfo.h head/contrib/llvm/include/llvm/IR/DebugInfoFlags.def head/contrib/llvm/include/llvm/IR/DebugInfoMetadata.h head/contrib/llvm/include/llvm/IR/DebugLoc.h head/contrib/llvm/include/llvm/IR/DerivedTypes.h head/contrib/llvm/include/llvm/IR/DiagnosticInfo.h head/contrib/llvm/include/llvm/IR/DiagnosticPrinter.h head/contrib/llvm/include/llvm/IR/Dominators.h head/contrib/llvm/include/llvm/IR/Function.h head/contrib/llvm/include/llvm/IR/GVMaterializer.h head/contrib/llvm/include/llvm/IR/GetElementPtrTypeIterator.h head/contrib/llvm/include/llvm/IR/GlobalAlias.h head/contrib/llvm/include/llvm/IR/GlobalIFunc.h head/contrib/llvm/include/llvm/IR/GlobalIndirectSymbol.h head/contrib/llvm/include/llvm/IR/GlobalObject.h head/contrib/llvm/include/llvm/IR/GlobalValue.h head/contrib/llvm/include/llvm/IR/GlobalVariable.h head/contrib/llvm/include/llvm/IR/IRBuilder.h head/contrib/llvm/include/llvm/IR/IRPrintingPasses.h head/contrib/llvm/include/llvm/IR/InlineAsm.h head/contrib/llvm/include/llvm/IR/InstIterator.h head/contrib/llvm/include/llvm/IR/InstrTypes.h head/contrib/llvm/include/llvm/IR/Instruction.h head/contrib/llvm/include/llvm/IR/Instructions.h head/contrib/llvm/include/llvm/IR/IntrinsicInst.h head/contrib/llvm/include/llvm/IR/Intrinsics.h head/contrib/llvm/include/llvm/IR/Intrinsics.td head/contrib/llvm/include/llvm/IR/IntrinsicsAArch64.td head/contrib/llvm/include/llvm/IR/IntrinsicsAMDGPU.td head/contrib/llvm/include/llvm/IR/IntrinsicsARM.td head/contrib/llvm/include/llvm/IR/IntrinsicsNVVM.td head/contrib/llvm/include/llvm/IR/IntrinsicsPowerPC.td head/contrib/llvm/include/llvm/IR/IntrinsicsSystemZ.td head/contrib/llvm/include/llvm/IR/IntrinsicsX86.td head/contrib/llvm/include/llvm/IR/LLVMContext.h head/contrib/llvm/include/llvm/IR/LegacyPassManagers.h head/contrib/llvm/include/llvm/IR/LegacyPassNameParser.h head/contrib/llvm/include/llvm/IR/MDBuilder.h head/contrib/llvm/include/llvm/IR/Mangler.h head/contrib/llvm/include/llvm/IR/Metadata.def head/contrib/llvm/include/llvm/IR/Metadata.h head/contrib/llvm/include/llvm/IR/Module.h head/contrib/llvm/include/llvm/IR/ModuleSummaryIndex.h head/contrib/llvm/include/llvm/IR/NoFolder.h head/contrib/llvm/include/llvm/IR/Operator.h head/contrib/llvm/include/llvm/IR/PassManager.h head/contrib/llvm/include/llvm/IR/PassManagerInternal.h head/contrib/llvm/include/llvm/IR/PatternMatch.h head/contrib/llvm/include/llvm/IR/Statepoint.h head/contrib/llvm/include/llvm/IR/SymbolTableListTraits.h head/contrib/llvm/include/llvm/IR/Type.h head/contrib/llvm/include/llvm/IR/Use.h head/contrib/llvm/include/llvm/IR/UseListOrder.h head/contrib/llvm/include/llvm/IR/User.h head/contrib/llvm/include/llvm/IR/Value.h head/contrib/llvm/include/llvm/IR/ValueHandle.h head/contrib/llvm/include/llvm/IR/ValueMap.h head/contrib/llvm/include/llvm/IR/Verifier.h head/contrib/llvm/include/llvm/InitializePasses.h head/contrib/llvm/include/llvm/LTO/LTO.h head/contrib/llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h head/contrib/llvm/include/llvm/LTO/legacy/LTOModule.h head/contrib/llvm/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h head/contrib/llvm/include/llvm/LinkAllIR.h head/contrib/llvm/include/llvm/LinkAllPasses.h head/contrib/llvm/include/llvm/Linker/IRMover.h head/contrib/llvm/include/llvm/MC/ConstantPools.h head/contrib/llvm/include/llvm/MC/MCAsmBackend.h head/contrib/llvm/include/llvm/MC/MCAsmInfo.h head/contrib/llvm/include/llvm/MC/MCAssembler.h head/contrib/llvm/include/llvm/MC/MCCodeView.h head/contrib/llvm/include/llvm/MC/MCContext.h head/contrib/llvm/include/llvm/MC/MCELFStreamer.h head/contrib/llvm/include/llvm/MC/MCExpr.h head/contrib/llvm/include/llvm/MC/MCFixup.h head/contrib/llvm/include/llvm/MC/MCFragment.h head/contrib/llvm/include/llvm/MC/MCInstPrinter.h head/contrib/llvm/include/llvm/MC/MCInstrDesc.h head/contrib/llvm/include/llvm/MC/MCInstrInfo.h head/contrib/llvm/include/llvm/MC/MCInstrItineraries.h head/contrib/llvm/include/llvm/MC/MCObjectFileInfo.h head/contrib/llvm/include/llvm/MC/MCObjectStreamer.h head/contrib/llvm/include/llvm/MC/MCParser/AsmLexer.h head/contrib/llvm/include/llvm/MC/MCParser/MCAsmLexer.h head/contrib/llvm/include/llvm/MC/MCParser/MCAsmParser.h head/contrib/llvm/include/llvm/MC/MCParser/MCAsmParserExtension.h head/contrib/llvm/include/llvm/MC/MCParser/MCTargetAsmParser.h head/contrib/llvm/include/llvm/MC/MCRegisterInfo.h head/contrib/llvm/include/llvm/MC/MCSection.h head/contrib/llvm/include/llvm/MC/MCSectionCOFF.h head/contrib/llvm/include/llvm/MC/MCStreamer.h head/contrib/llvm/include/llvm/MC/MCTargetOptions.h head/contrib/llvm/include/llvm/MC/MCTargetOptionsCommandFlags.h head/contrib/llvm/include/llvm/MC/MCWinCOFFStreamer.h head/contrib/llvm/include/llvm/MC/SectionKind.h head/contrib/llvm/include/llvm/MC/StringTableBuilder.h head/contrib/llvm/include/llvm/Object/Archive.h head/contrib/llvm/include/llvm/Object/ArchiveWriter.h head/contrib/llvm/include/llvm/Object/Binary.h head/contrib/llvm/include/llvm/Object/COFF.h head/contrib/llvm/include/llvm/Object/COFFImportFile.h head/contrib/llvm/include/llvm/Object/ELF.h head/contrib/llvm/include/llvm/Object/ELFObjectFile.h head/contrib/llvm/include/llvm/Object/ELFTypes.h head/contrib/llvm/include/llvm/Object/Error.h head/contrib/llvm/include/llvm/Object/IRObjectFile.h head/contrib/llvm/include/llvm/Object/MachO.h head/contrib/llvm/include/llvm/Object/MachOUniversal.h head/contrib/llvm/include/llvm/Object/ModuleSummaryIndexObjectFile.h head/contrib/llvm/include/llvm/Object/ObjectFile.h head/contrib/llvm/include/llvm/Object/RelocVisitor.h head/contrib/llvm/include/llvm/Object/StackMapParser.h head/contrib/llvm/include/llvm/Object/SymbolSize.h head/contrib/llvm/include/llvm/Object/SymbolicFile.h head/contrib/llvm/include/llvm/ObjectYAML/MachOYAML.h head/contrib/llvm/include/llvm/Option/ArgList.h head/contrib/llvm/include/llvm/Pass.h head/contrib/llvm/include/llvm/PassInfo.h head/contrib/llvm/include/llvm/PassSupport.h head/contrib/llvm/include/llvm/Passes/PassBuilder.h head/contrib/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h head/contrib/llvm/include/llvm/ProfileData/Coverage/CoverageMappingWriter.h head/contrib/llvm/include/llvm/ProfileData/InstrProf.h head/contrib/llvm/include/llvm/ProfileData/InstrProfData.inc head/contrib/llvm/include/llvm/ProfileData/InstrProfWriter.h head/contrib/llvm/include/llvm/ProfileData/ProfileCommon.h head/contrib/llvm/include/llvm/ProfileData/SampleProf.h head/contrib/llvm/include/llvm/Support/AArch64TargetParser.def head/contrib/llvm/include/llvm/Support/ARMBuildAttributes.h head/contrib/llvm/include/llvm/Support/ARMTargetParser.def head/contrib/llvm/include/llvm/Support/AlignOf.h head/contrib/llvm/include/llvm/Support/Allocator.h head/contrib/llvm/include/llvm/Support/ArrayRecycler.h head/contrib/llvm/include/llvm/Support/AtomicOrdering.h head/contrib/llvm/include/llvm/Support/COFF.h head/contrib/llvm/include/llvm/Support/CachePruning.h head/contrib/llvm/include/llvm/Support/Casting.h head/contrib/llvm/include/llvm/Support/CodeGen.h head/contrib/llvm/include/llvm/Support/CommandLine.h head/contrib/llvm/include/llvm/Support/Compiler.h head/contrib/llvm/include/llvm/Support/Compression.h head/contrib/llvm/include/llvm/Support/ConvertUTF.h head/contrib/llvm/include/llvm/Support/DataExtractor.h head/contrib/llvm/include/llvm/Support/Debug.h head/contrib/llvm/include/llvm/Support/Dwarf.def head/contrib/llvm/include/llvm/Support/Dwarf.h head/contrib/llvm/include/llvm/Support/ELF.h head/contrib/llvm/include/llvm/Support/ELFRelocs/AArch64.def head/contrib/llvm/include/llvm/Support/ELFRelocs/AMDGPU.def head/contrib/llvm/include/llvm/Support/ELFRelocs/BPF.def head/contrib/llvm/include/llvm/Support/ELFRelocs/SystemZ.def head/contrib/llvm/include/llvm/Support/Endian.h head/contrib/llvm/include/llvm/Support/Error.h head/contrib/llvm/include/llvm/Support/FileOutputBuffer.h head/contrib/llvm/include/llvm/Support/FileSystem.h head/contrib/llvm/include/llvm/Support/Format.h head/contrib/llvm/include/llvm/Support/GCOV.h head/contrib/llvm/include/llvm/Support/GenericDomTree.h head/contrib/llvm/include/llvm/Support/GenericDomTreeConstruction.h head/contrib/llvm/include/llvm/Support/GraphWriter.h head/contrib/llvm/include/llvm/Support/Host.h head/contrib/llvm/include/llvm/Support/MD5.h head/contrib/llvm/include/llvm/Support/MachO.def head/contrib/llvm/include/llvm/Support/MachO.h head/contrib/llvm/include/llvm/Support/ManagedStatic.h head/contrib/llvm/include/llvm/Support/MathExtras.h head/contrib/llvm/include/llvm/Support/MemoryBuffer.h head/contrib/llvm/include/llvm/Support/OnDiskHashTable.h head/contrib/llvm/include/llvm/Support/Options.h head/contrib/llvm/include/llvm/Support/Path.h head/contrib/llvm/include/llvm/Support/PointerLikeTypeTraits.h head/contrib/llvm/include/llvm/Support/PrettyStackTrace.h head/contrib/llvm/include/llvm/Support/Printable.h head/contrib/llvm/include/llvm/Support/Process.h head/contrib/llvm/include/llvm/Support/RWMutex.h head/contrib/llvm/include/llvm/Support/RandomNumberGenerator.h head/contrib/llvm/include/llvm/Support/Recycler.h head/contrib/llvm/include/llvm/Support/RecyclingAllocator.h head/contrib/llvm/include/llvm/Support/Regex.h head/contrib/llvm/include/llvm/Support/Registry.h head/contrib/llvm/include/llvm/Support/SHA1.h head/contrib/llvm/include/llvm/Support/SMLoc.h head/contrib/llvm/include/llvm/Support/SourceMgr.h head/contrib/llvm/include/llvm/Support/StringSaver.h head/contrib/llvm/include/llvm/Support/SwapByteOrder.h head/contrib/llvm/include/llvm/Support/TargetParser.h head/contrib/llvm/include/llvm/Support/TargetRegistry.h head/contrib/llvm/include/llvm/Support/Threading.h head/contrib/llvm/include/llvm/Support/Timer.h head/contrib/llvm/include/llvm/Support/TrailingObjects.h head/contrib/llvm/include/llvm/Support/UnicodeCharRanges.h head/contrib/llvm/include/llvm/Support/YAMLParser.h head/contrib/llvm/include/llvm/Support/YAMLTraits.h head/contrib/llvm/include/llvm/Support/raw_ostream.h head/contrib/llvm/include/llvm/TableGen/Record.h head/contrib/llvm/include/llvm/TableGen/SetTheory.h head/contrib/llvm/include/llvm/Target/CostTable.h head/contrib/llvm/include/llvm/Target/GenericOpcodes.td head/contrib/llvm/include/llvm/Target/Target.td head/contrib/llvm/include/llvm/Target/TargetCallingConv.h head/contrib/llvm/include/llvm/Target/TargetFrameLowering.h head/contrib/llvm/include/llvm/Target/TargetInstrInfo.h head/contrib/llvm/include/llvm/Target/TargetIntrinsicInfo.h head/contrib/llvm/include/llvm/Target/TargetItinerary.td head/contrib/llvm/include/llvm/Target/TargetLowering.h head/contrib/llvm/include/llvm/Target/TargetLoweringObjectFile.h head/contrib/llvm/include/llvm/Target/TargetMachine.h head/contrib/llvm/include/llvm/Target/TargetOpcodes.def head/contrib/llvm/include/llvm/Target/TargetOpcodes.h head/contrib/llvm/include/llvm/Target/TargetOptions.h head/contrib/llvm/include/llvm/Target/TargetRegisterInfo.h head/contrib/llvm/include/llvm/Target/TargetSelectionDAG.td head/contrib/llvm/include/llvm/Target/TargetSubtargetInfo.h head/contrib/llvm/include/llvm/Transforms/GCOVProfiler.h head/contrib/llvm/include/llvm/Transforms/IPO.h head/contrib/llvm/include/llvm/Transforms/IPO/CrossDSOCFI.h head/contrib/llvm/include/llvm/Transforms/IPO/FunctionAttrs.h head/contrib/llvm/include/llvm/Transforms/IPO/FunctionImport.h head/contrib/llvm/include/llvm/Transforms/IPO/GlobalOpt.h head/contrib/llvm/include/llvm/Transforms/IPO/InferFunctionAttrs.h head/contrib/llvm/include/llvm/Transforms/IPO/Internalize.h head/contrib/llvm/include/llvm/Transforms/IPO/LowerTypeTests.h head/contrib/llvm/include/llvm/Transforms/IPO/PartialInlining.h head/contrib/llvm/include/llvm/Transforms/IPO/PassManagerBuilder.h head/contrib/llvm/include/llvm/Transforms/IPO/SCCP.h head/contrib/llvm/include/llvm/Transforms/IPO/WholeProgramDevirt.h head/contrib/llvm/include/llvm/Transforms/InstCombine/InstCombine.h head/contrib/llvm/include/llvm/Transforms/InstCombine/InstCombineWorklist.h head/contrib/llvm/include/llvm/Transforms/InstrProfiling.h head/contrib/llvm/include/llvm/Transforms/Instrumentation.h head/contrib/llvm/include/llvm/Transforms/PGOInstrumentation.h head/contrib/llvm/include/llvm/Transforms/SampleProfile.h head/contrib/llvm/include/llvm/Transforms/Scalar.h head/contrib/llvm/include/llvm/Transforms/Scalar/DCE.h head/contrib/llvm/include/llvm/Transforms/Scalar/DeadStoreElimination.h head/contrib/llvm/include/llvm/Transforms/Scalar/EarlyCSE.h head/contrib/llvm/include/llvm/Transforms/Scalar/GVN.h head/contrib/llvm/include/llvm/Transforms/Scalar/GuardWidening.h head/contrib/llvm/include/llvm/Transforms/Scalar/IndVarSimplify.h head/contrib/llvm/include/llvm/Transforms/Scalar/JumpThreading.h head/contrib/llvm/include/llvm/Transforms/Scalar/LICM.h head/contrib/llvm/include/llvm/Transforms/Scalar/LoopDeletion.h head/contrib/llvm/include/llvm/Transforms/Scalar/LoopIdiomRecognize.h head/contrib/llvm/include/llvm/Transforms/Scalar/LoopInstSimplify.h head/contrib/llvm/include/llvm/Transforms/Scalar/LoopRotation.h head/contrib/llvm/include/llvm/Transforms/Scalar/LoopSimplifyCFG.h head/contrib/llvm/include/llvm/Transforms/Scalar/MergedLoadStoreMotion.h head/contrib/llvm/include/llvm/Transforms/Scalar/PartiallyInlineLibCalls.h head/contrib/llvm/include/llvm/Transforms/Scalar/Reassociate.h head/contrib/llvm/include/llvm/Transforms/Scalar/SCCP.h head/contrib/llvm/include/llvm/Transforms/Scalar/SROA.h head/contrib/llvm/include/llvm/Transforms/Scalar/SimplifyCFG.h head/contrib/llvm/include/llvm/Transforms/Scalar/Sink.h head/contrib/llvm/include/llvm/Transforms/Utils/ASanStackFrameLayout.h head/contrib/llvm/include/llvm/Transforms/Utils/AddDiscriminators.h head/contrib/llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h head/contrib/llvm/include/llvm/Transforms/Utils/Cloning.h head/contrib/llvm/include/llvm/Transforms/Utils/CmpInstAnalysis.h head/contrib/llvm/include/llvm/Transforms/Utils/CodeExtractor.h head/contrib/llvm/include/llvm/Transforms/Utils/FunctionImportUtils.h head/contrib/llvm/include/llvm/Transforms/Utils/LCSSA.h head/contrib/llvm/include/llvm/Transforms/Utils/Local.h head/contrib/llvm/include/llvm/Transforms/Utils/LoopSimplify.h head/contrib/llvm/include/llvm/Transforms/Utils/LoopUtils.h head/contrib/llvm/include/llvm/Transforms/Utils/Mem2Reg.h head/contrib/llvm/include/llvm/Transforms/Utils/MemorySSA.h head/contrib/llvm/include/llvm/Transforms/Utils/ModuleUtils.h head/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdaterImpl.h head/contrib/llvm/include/llvm/Transforms/Utils/SimplifyInstructions.h head/contrib/llvm/include/llvm/Transforms/Utils/SimplifyLibCalls.h head/contrib/llvm/include/llvm/Transforms/Utils/SymbolRewriter.h head/contrib/llvm/include/llvm/Transforms/Utils/UnrollLoop.h head/contrib/llvm/include/llvm/Transforms/Vectorize/LoopVectorize.h head/contrib/llvm/include/llvm/Transforms/Vectorize/SLPVectorizer.h head/contrib/llvm/include/llvm/module.modulemap head/contrib/llvm/include/llvm/module.modulemap.build head/contrib/llvm/lib/Analysis/AliasAnalysis.cpp head/contrib/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp head/contrib/llvm/lib/Analysis/AliasAnalysisSummary.cpp head/contrib/llvm/lib/Analysis/AliasAnalysisSummary.h head/contrib/llvm/lib/Analysis/AliasSetTracker.cpp head/contrib/llvm/lib/Analysis/Analysis.cpp head/contrib/llvm/lib/Analysis/AssumptionCache.cpp head/contrib/llvm/lib/Analysis/BasicAliasAnalysis.cpp head/contrib/llvm/lib/Analysis/BlockFrequencyInfo.cpp head/contrib/llvm/lib/Analysis/BlockFrequencyInfoImpl.cpp head/contrib/llvm/lib/Analysis/BranchProbabilityInfo.cpp head/contrib/llvm/lib/Analysis/CFGPrinter.cpp head/contrib/llvm/lib/Analysis/CFLAndersAliasAnalysis.cpp head/contrib/llvm/lib/Analysis/CFLGraph.h head/contrib/llvm/lib/Analysis/CFLSteensAliasAnalysis.cpp head/contrib/llvm/lib/Analysis/CGSCCPassManager.cpp head/contrib/llvm/lib/Analysis/CallGraph.cpp head/contrib/llvm/lib/Analysis/CallGraphSCCPass.cpp head/contrib/llvm/lib/Analysis/CodeMetrics.cpp head/contrib/llvm/lib/Analysis/ConstantFolding.cpp head/contrib/llvm/lib/Analysis/CostModel.cpp head/contrib/llvm/lib/Analysis/DemandedBits.cpp head/contrib/llvm/lib/Analysis/DependenceAnalysis.cpp head/contrib/llvm/lib/Analysis/DominanceFrontier.cpp head/contrib/llvm/lib/Analysis/EHPersonalities.cpp head/contrib/llvm/lib/Analysis/GlobalsModRef.cpp head/contrib/llvm/lib/Analysis/IVUsers.cpp head/contrib/llvm/lib/Analysis/InlineCost.cpp head/contrib/llvm/lib/Analysis/InstructionSimplify.cpp head/contrib/llvm/lib/Analysis/IteratedDominanceFrontier.cpp head/contrib/llvm/lib/Analysis/LazyBlockFrequencyInfo.cpp head/contrib/llvm/lib/Analysis/LazyCallGraph.cpp head/contrib/llvm/lib/Analysis/LazyValueInfo.cpp head/contrib/llvm/lib/Analysis/Lint.cpp head/contrib/llvm/lib/Analysis/Loads.cpp head/contrib/llvm/lib/Analysis/LoopAccessAnalysis.cpp head/contrib/llvm/lib/Analysis/LoopInfo.cpp head/contrib/llvm/lib/Analysis/LoopPass.cpp head/contrib/llvm/lib/Analysis/MemoryBuiltins.cpp head/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp head/contrib/llvm/lib/Analysis/ModuleDebugInfoPrinter.cpp head/contrib/llvm/lib/Analysis/ModuleSummaryAnalysis.cpp head/contrib/llvm/lib/Analysis/ObjCARCAliasAnalysis.cpp head/contrib/llvm/lib/Analysis/ObjCARCInstKind.cpp head/contrib/llvm/lib/Analysis/OptimizationDiagnosticInfo.cpp head/contrib/llvm/lib/Analysis/PHITransAddr.cpp head/contrib/llvm/lib/Analysis/PostDominators.cpp head/contrib/llvm/lib/Analysis/ProfileSummaryInfo.cpp head/contrib/llvm/lib/Analysis/RegionInfo.cpp head/contrib/llvm/lib/Analysis/RegionPass.cpp head/contrib/llvm/lib/Analysis/ScalarEvolution.cpp head/contrib/llvm/lib/Analysis/ScalarEvolutionAliasAnalysis.cpp head/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp head/contrib/llvm/lib/Analysis/ScopedNoAliasAA.cpp head/contrib/llvm/lib/Analysis/StratifiedSets.h head/contrib/llvm/lib/Analysis/TargetLibraryInfo.cpp head/contrib/llvm/lib/Analysis/TargetTransformInfo.cpp head/contrib/llvm/lib/Analysis/TypeBasedAliasAnalysis.cpp head/contrib/llvm/lib/Analysis/TypeMetadataUtils.cpp head/contrib/llvm/lib/Analysis/ValueTracking.cpp head/contrib/llvm/lib/Analysis/VectorUtils.cpp head/contrib/llvm/lib/AsmParser/LLLexer.cpp head/contrib/llvm/lib/AsmParser/LLParser.cpp head/contrib/llvm/lib/AsmParser/LLParser.h head/contrib/llvm/lib/AsmParser/LLToken.h head/contrib/llvm/lib/Bitcode/Reader/BitReader.cpp head/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp head/contrib/llvm/lib/Bitcode/Reader/BitstreamReader.cpp head/contrib/llvm/lib/Bitcode/Writer/BitWriter.cpp head/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp head/contrib/llvm/lib/Bitcode/Writer/BitcodeWriterPass.cpp head/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.cpp head/contrib/llvm/lib/CodeGen/AllocationOrder.cpp head/contrib/llvm/lib/CodeGen/AllocationOrder.h head/contrib/llvm/lib/CodeGen/Analysis.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/ARMException.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/AddressPool.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.h head/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/DIEHash.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/DbgValueHistoryCalculator.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.h head/contrib/llvm/lib/CodeGen/AsmPrinter/DebugLocEntry.h head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfAccelTable.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfAccelTable.h head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.h head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.h head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfFile.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfFile.h head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.h head/contrib/llvm/lib/CodeGen/AsmPrinter/EHStreamer.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/WinException.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/WinException.h head/contrib/llvm/lib/CodeGen/BranchFolding.cpp head/contrib/llvm/lib/CodeGen/BranchFolding.h head/contrib/llvm/lib/CodeGen/CallingConvLower.cpp head/contrib/llvm/lib/CodeGen/CodeGen.cpp head/contrib/llvm/lib/CodeGen/CodeGenPrepare.cpp head/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.cpp head/contrib/llvm/lib/CodeGen/DFAPacketizer.cpp head/contrib/llvm/lib/CodeGen/DeadMachineInstructionElim.cpp head/contrib/llvm/lib/CodeGen/DetectDeadLanes.cpp head/contrib/llvm/lib/CodeGen/DwarfEHPrepare.cpp head/contrib/llvm/lib/CodeGen/EarlyIfConversion.cpp head/contrib/llvm/lib/CodeGen/EdgeBundles.cpp head/contrib/llvm/lib/CodeGen/ExecutionDepsFix.cpp head/contrib/llvm/lib/CodeGen/FuncletLayout.cpp head/contrib/llvm/lib/CodeGen/GCMetadata.cpp head/contrib/llvm/lib/CodeGen/GCMetadataPrinter.cpp head/contrib/llvm/lib/CodeGen/GCRootLowering.cpp head/contrib/llvm/lib/CodeGen/GCStrategy.cpp head/contrib/llvm/lib/CodeGen/GlobalISel/GlobalISel.cpp head/contrib/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp head/contrib/llvm/lib/CodeGen/GlobalISel/MachineIRBuilder.cpp head/contrib/llvm/lib/CodeGen/GlobalISel/RegBankSelect.cpp head/contrib/llvm/lib/CodeGen/GlobalISel/RegisterBank.cpp head/contrib/llvm/lib/CodeGen/GlobalISel/RegisterBankInfo.cpp head/contrib/llvm/lib/CodeGen/GlobalMerge.cpp head/contrib/llvm/lib/CodeGen/IfConversion.cpp head/contrib/llvm/lib/CodeGen/ImplicitNullChecks.cpp head/contrib/llvm/lib/CodeGen/InlineSpiller.cpp head/contrib/llvm/lib/CodeGen/InterleavedAccessPass.cpp head/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp head/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp head/contrib/llvm/lib/CodeGen/LatencyPriorityQueue.cpp head/contrib/llvm/lib/CodeGen/LexicalScopes.cpp head/contrib/llvm/lib/CodeGen/LiveDebugValues.cpp head/contrib/llvm/lib/CodeGen/LiveDebugVariables.cpp head/contrib/llvm/lib/CodeGen/LiveInterval.cpp head/contrib/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp head/contrib/llvm/lib/CodeGen/LiveIntervalUnion.cpp head/contrib/llvm/lib/CodeGen/LivePhysRegs.cpp head/contrib/llvm/lib/CodeGen/LiveRangeCalc.cpp head/contrib/llvm/lib/CodeGen/LiveRangeCalc.h head/contrib/llvm/lib/CodeGen/LiveRangeEdit.cpp head/contrib/llvm/lib/CodeGen/LiveRegMatrix.cpp head/contrib/llvm/lib/CodeGen/LiveVariables.cpp head/contrib/llvm/lib/CodeGen/LocalStackSlotAllocation.cpp head/contrib/llvm/lib/CodeGen/MIRParser/MILexer.cpp head/contrib/llvm/lib/CodeGen/MIRParser/MILexer.h head/contrib/llvm/lib/CodeGen/MIRParser/MIParser.cpp head/contrib/llvm/lib/CodeGen/MIRParser/MIParser.h head/contrib/llvm/lib/CodeGen/MIRParser/MIRParser.cpp head/contrib/llvm/lib/CodeGen/MIRPrinter.cpp head/contrib/llvm/lib/CodeGen/MIRPrintingPass.cpp head/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp head/contrib/llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp head/contrib/llvm/lib/CodeGen/MachineBlockPlacement.cpp head/contrib/llvm/lib/CodeGen/MachineBranchProbabilityInfo.cpp head/contrib/llvm/lib/CodeGen/MachineCSE.cpp head/contrib/llvm/lib/CodeGen/MachineCombiner.cpp head/contrib/llvm/lib/CodeGen/MachineCopyPropagation.cpp head/contrib/llvm/lib/CodeGen/MachineFunction.cpp head/contrib/llvm/lib/CodeGen/MachineFunctionPass.cpp head/contrib/llvm/lib/CodeGen/MachineFunctionPrinterPass.cpp head/contrib/llvm/lib/CodeGen/MachineInstr.cpp head/contrib/llvm/lib/CodeGen/MachineInstrBundle.cpp head/contrib/llvm/lib/CodeGen/MachineLICM.cpp head/contrib/llvm/lib/CodeGen/MachineLoopInfo.cpp head/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp head/contrib/llvm/lib/CodeGen/MachineRegisterInfo.cpp head/contrib/llvm/lib/CodeGen/MachineSSAUpdater.cpp head/contrib/llvm/lib/CodeGen/MachineScheduler.cpp head/contrib/llvm/lib/CodeGen/MachineSink.cpp head/contrib/llvm/lib/CodeGen/MachineTraceMetrics.cpp head/contrib/llvm/lib/CodeGen/MachineVerifier.cpp head/contrib/llvm/lib/CodeGen/OptimizePHIs.cpp head/contrib/llvm/lib/CodeGen/PHIElimination.cpp head/contrib/llvm/lib/CodeGen/PHIEliminationUtils.cpp head/contrib/llvm/lib/CodeGen/ParallelCG.cpp head/contrib/llvm/lib/CodeGen/PatchableFunction.cpp head/contrib/llvm/lib/CodeGen/PeepholeOptimizer.cpp head/contrib/llvm/lib/CodeGen/PostRASchedulerList.cpp head/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp head/contrib/llvm/lib/CodeGen/RegAllocBase.cpp head/contrib/llvm/lib/CodeGen/RegAllocBase.h head/contrib/llvm/lib/CodeGen/RegAllocBasic.cpp head/contrib/llvm/lib/CodeGen/RegAllocFast.cpp head/contrib/llvm/lib/CodeGen/RegAllocGreedy.cpp head/contrib/llvm/lib/CodeGen/RegAllocPBQP.cpp head/contrib/llvm/lib/CodeGen/RegUsageInfoCollector.cpp head/contrib/llvm/lib/CodeGen/RegUsageInfoPropagate.cpp head/contrib/llvm/lib/CodeGen/RegisterCoalescer.cpp head/contrib/llvm/lib/CodeGen/RegisterPressure.cpp head/contrib/llvm/lib/CodeGen/RegisterScavenging.cpp head/contrib/llvm/lib/CodeGen/RegisterUsageInfo.cpp head/contrib/llvm/lib/CodeGen/RenameIndependentSubregs.cpp head/contrib/llvm/lib/CodeGen/SafeStack.cpp head/contrib/llvm/lib/CodeGen/SafeStackColoring.cpp head/contrib/llvm/lib/CodeGen/SafeStackLayout.cpp head/contrib/llvm/lib/CodeGen/ScheduleDAG.cpp head/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp head/contrib/llvm/lib/CodeGen/ScoreboardHazardRecognizer.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/ResourcePriorityQueue.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.h head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp head/contrib/llvm/lib/CodeGen/ShadowStackGCLowering.cpp head/contrib/llvm/lib/CodeGen/ShrinkWrap.cpp head/contrib/llvm/lib/CodeGen/SjLjEHPrepare.cpp head/contrib/llvm/lib/CodeGen/SplitKit.cpp head/contrib/llvm/lib/CodeGen/SplitKit.h head/contrib/llvm/lib/CodeGen/StackColoring.cpp head/contrib/llvm/lib/CodeGen/StackMapLivenessAnalysis.cpp head/contrib/llvm/lib/CodeGen/StackMaps.cpp head/contrib/llvm/lib/CodeGen/StackProtector.cpp head/contrib/llvm/lib/CodeGen/StackSlotColoring.cpp head/contrib/llvm/lib/CodeGen/TailDuplication.cpp head/contrib/llvm/lib/CodeGen/TailDuplicator.cpp head/contrib/llvm/lib/CodeGen/TargetFrameLoweringImpl.cpp head/contrib/llvm/lib/CodeGen/TargetInstrInfo.cpp head/contrib/llvm/lib/CodeGen/TargetLoweringBase.cpp head/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp head/contrib/llvm/lib/CodeGen/TargetOptionsImpl.cpp head/contrib/llvm/lib/CodeGen/TargetPassConfig.cpp head/contrib/llvm/lib/CodeGen/TargetRegisterInfo.cpp head/contrib/llvm/lib/CodeGen/TargetSchedule.cpp head/contrib/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp head/contrib/llvm/lib/CodeGen/UnreachableBlockElim.cpp head/contrib/llvm/lib/CodeGen/VirtRegMap.cpp head/contrib/llvm/lib/CodeGen/WinEHPrepare.cpp head/contrib/llvm/lib/CodeGen/XRayInstrumentation.cpp head/contrib/llvm/lib/DebugInfo/CodeView/CVTypeVisitor.cpp head/contrib/llvm/lib/DebugInfo/CodeView/CodeViewError.cpp head/contrib/llvm/lib/DebugInfo/CodeView/EnumTables.cpp head/contrib/llvm/lib/DebugInfo/CodeView/ModuleSubstream.cpp head/contrib/llvm/lib/DebugInfo/CodeView/ModuleSubstreamVisitor.cpp head/contrib/llvm/lib/DebugInfo/CodeView/RecordSerialization.cpp head/contrib/llvm/lib/DebugInfo/CodeView/SymbolDumper.cpp head/contrib/llvm/lib/DebugInfo/CodeView/TypeRecord.cpp head/contrib/llvm/lib/DebugInfo/CodeView/TypeStreamMerger.cpp head/contrib/llvm/lib/DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp head/contrib/llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp head/contrib/llvm/lib/DebugInfo/DWARF/DWARFCompileUnit.cpp head/contrib/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp head/contrib/llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp head/contrib/llvm/lib/DebugInfo/DWARF/DWARFDebugInfoEntry.cpp head/contrib/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp head/contrib/llvm/lib/DebugInfo/DWARF/DWARFDebugLoc.cpp head/contrib/llvm/lib/DebugInfo/DWARF/DWARFFormValue.cpp head/contrib/llvm/lib/DebugInfo/DWARF/DWARFTypeUnit.cpp head/contrib/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp head/contrib/llvm/lib/DebugInfo/PDB/DIA/DIAError.cpp head/contrib/llvm/lib/DebugInfo/PDB/DIA/DIASession.cpp head/contrib/llvm/lib/DebugInfo/PDB/GenericError.cpp head/contrib/llvm/lib/DebugInfo/PDB/IPDBSourceFile.cpp head/contrib/llvm/lib/DebugInfo/PDB/PDB.cpp head/contrib/llvm/lib/DebugInfo/PDB/PDBContext.cpp head/contrib/llvm/lib/DebugInfo/PDB/PDBInterfaceAnchors.cpp head/contrib/llvm/lib/DebugInfo/PDB/PDBSymDumper.cpp head/contrib/llvm/lib/DebugInfo/PDB/PDBSymbol.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/DbiStream.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/DbiStreamBuilder.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/Hash.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/InfoStream.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/InfoStreamBuilder.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/ModInfo.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/ModStream.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/NameHashTable.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/NameMap.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/NameMapBuilder.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/PDBFile.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/PDBFileBuilder.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/PublicsStream.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/RawError.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/RawSession.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/SymbolStream.cpp head/contrib/llvm/lib/DebugInfo/PDB/Raw/TpiStream.cpp head/contrib/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp head/contrib/llvm/lib/ExecutionEngine/ExecutionEngine.cpp head/contrib/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp head/contrib/llvm/lib/ExecutionEngine/GDBRegistrationListener.cpp head/contrib/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp head/contrib/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp head/contrib/llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp head/contrib/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h head/contrib/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp head/contrib/llvm/lib/ExecutionEngine/MCJIT/MCJIT.h head/contrib/llvm/lib/ExecutionEngine/OProfileJIT/OProfileJITEventListener.cpp head/contrib/llvm/lib/ExecutionEngine/Orc/IndirectionUtils.cpp head/contrib/llvm/lib/ExecutionEngine/Orc/NullResolver.cpp head/contrib/llvm/lib/ExecutionEngine/Orc/OrcCBindingsStack.h head/contrib/llvm/lib/ExecutionEngine/Orc/OrcError.cpp head/contrib/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.h head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.h head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldCOFFI386.h head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldCOFFThumb.h head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldCOFFX86_64.h head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOAArch64.h head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOARM.h head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOI386.h head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOX86_64.h head/contrib/llvm/lib/ExecutionEngine/SectionMemoryManager.cpp head/contrib/llvm/lib/ExecutionEngine/TargetSelect.cpp head/contrib/llvm/lib/IR/AsmWriter.cpp head/contrib/llvm/lib/IR/AttributeImpl.h head/contrib/llvm/lib/IR/AttributeSetNode.h head/contrib/llvm/lib/IR/Attributes.cpp head/contrib/llvm/lib/IR/AutoUpgrade.cpp head/contrib/llvm/lib/IR/BasicBlock.cpp head/contrib/llvm/lib/IR/ConstantFold.cpp head/contrib/llvm/lib/IR/ConstantFold.h head/contrib/llvm/lib/IR/ConstantRange.cpp head/contrib/llvm/lib/IR/Constants.cpp head/contrib/llvm/lib/IR/ConstantsContext.h head/contrib/llvm/lib/IR/Core.cpp head/contrib/llvm/lib/IR/DIBuilder.cpp head/contrib/llvm/lib/IR/DataLayout.cpp head/contrib/llvm/lib/IR/DebugInfo.cpp head/contrib/llvm/lib/IR/DebugInfoMetadata.cpp head/contrib/llvm/lib/IR/DiagnosticInfo.cpp head/contrib/llvm/lib/IR/Dominators.cpp head/contrib/llvm/lib/IR/Function.cpp head/contrib/llvm/lib/IR/GCOV.cpp head/contrib/llvm/lib/IR/Globals.cpp head/contrib/llvm/lib/IR/IRBuilder.cpp head/contrib/llvm/lib/IR/IRPrintingPasses.cpp head/contrib/llvm/lib/IR/InlineAsm.cpp head/contrib/llvm/lib/IR/Instruction.cpp head/contrib/llvm/lib/IR/Instructions.cpp head/contrib/llvm/lib/IR/IntrinsicInst.cpp head/contrib/llvm/lib/IR/LLVMContext.cpp head/contrib/llvm/lib/IR/LLVMContextImpl.cpp head/contrib/llvm/lib/IR/LLVMContextImpl.h head/contrib/llvm/lib/IR/LegacyPassManager.cpp head/contrib/llvm/lib/IR/MDBuilder.cpp head/contrib/llvm/lib/IR/Mangler.cpp head/contrib/llvm/lib/IR/Metadata.cpp head/contrib/llvm/lib/IR/Module.cpp head/contrib/llvm/lib/IR/ModuleSummaryIndex.cpp head/contrib/llvm/lib/IR/Operator.cpp head/contrib/llvm/lib/IR/Pass.cpp head/contrib/llvm/lib/IR/PassManager.cpp head/contrib/llvm/lib/IR/PassRegistry.cpp head/contrib/llvm/lib/IR/SymbolTableListTraitsImpl.h head/contrib/llvm/lib/IR/Type.cpp head/contrib/llvm/lib/IR/User.cpp head/contrib/llvm/lib/IR/Value.cpp head/contrib/llvm/lib/IR/ValueSymbolTable.cpp head/contrib/llvm/lib/IR/ValueTypes.cpp head/contrib/llvm/lib/IR/Verifier.cpp head/contrib/llvm/lib/IRReader/IRReader.cpp head/contrib/llvm/lib/LTO/LTO.cpp head/contrib/llvm/lib/LTO/LTOCodeGenerator.cpp head/contrib/llvm/lib/LTO/LTOModule.cpp head/contrib/llvm/lib/LTO/ThinLTOCodeGenerator.cpp head/contrib/llvm/lib/LTO/UpdateCompilerUsed.cpp head/contrib/llvm/lib/LibDriver/LibDriver.cpp head/contrib/llvm/lib/Linker/IRMover.cpp head/contrib/llvm/lib/Linker/LinkModules.cpp head/contrib/llvm/lib/MC/ConstantPools.cpp head/contrib/llvm/lib/MC/ELFObjectWriter.cpp head/contrib/llvm/lib/MC/MCAsmBackend.cpp head/contrib/llvm/lib/MC/MCAsmInfo.cpp head/contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp head/contrib/llvm/lib/MC/MCAsmStreamer.cpp head/contrib/llvm/lib/MC/MCAssembler.cpp head/contrib/llvm/lib/MC/MCCodeView.cpp head/contrib/llvm/lib/MC/MCContext.cpp head/contrib/llvm/lib/MC/MCDisassembler/Disassembler.cpp head/contrib/llvm/lib/MC/MCDwarf.cpp head/contrib/llvm/lib/MC/MCELFStreamer.cpp head/contrib/llvm/lib/MC/MCExpr.cpp head/contrib/llvm/lib/MC/MCFragment.cpp head/contrib/llvm/lib/MC/MCInst.cpp head/contrib/llvm/lib/MC/MCLabel.cpp head/contrib/llvm/lib/MC/MCMachOStreamer.cpp head/contrib/llvm/lib/MC/MCObjectFileInfo.cpp head/contrib/llvm/lib/MC/MCObjectStreamer.cpp head/contrib/llvm/lib/MC/MCParser/AsmLexer.cpp head/contrib/llvm/lib/MC/MCParser/AsmParser.cpp head/contrib/llvm/lib/MC/MCParser/COFFAsmParser.cpp head/contrib/llvm/lib/MC/MCParser/DarwinAsmParser.cpp head/contrib/llvm/lib/MC/MCParser/ELFAsmParser.cpp head/contrib/llvm/lib/MC/MCParser/MCAsmLexer.cpp head/contrib/llvm/lib/MC/MCParser/MCAsmParser.cpp head/contrib/llvm/lib/MC/MCRegisterInfo.cpp head/contrib/llvm/lib/MC/MCSection.cpp head/contrib/llvm/lib/MC/MCSectionCOFF.cpp head/contrib/llvm/lib/MC/MCSectionELF.cpp head/contrib/llvm/lib/MC/MCSectionMachO.cpp head/contrib/llvm/lib/MC/MCStreamer.cpp head/contrib/llvm/lib/MC/MCSymbol.cpp head/contrib/llvm/lib/MC/MCTargetOptions.cpp head/contrib/llvm/lib/MC/MCValue.cpp head/contrib/llvm/lib/MC/MachObjectWriter.cpp head/contrib/llvm/lib/MC/StringTableBuilder.cpp head/contrib/llvm/lib/MC/SubtargetFeature.cpp head/contrib/llvm/lib/MC/WinCOFFObjectWriter.cpp head/contrib/llvm/lib/MC/WinCOFFStreamer.cpp head/contrib/llvm/lib/Object/Archive.cpp head/contrib/llvm/lib/Object/ArchiveWriter.cpp head/contrib/llvm/lib/Object/Binary.cpp head/contrib/llvm/lib/Object/COFFObjectFile.cpp head/contrib/llvm/lib/Object/ELF.cpp head/contrib/llvm/lib/Object/Error.cpp head/contrib/llvm/lib/Object/IRObjectFile.cpp head/contrib/llvm/lib/Object/MachOObjectFile.cpp head/contrib/llvm/lib/Object/MachOUniversal.cpp head/contrib/llvm/lib/Object/ModuleSummaryIndexObjectFile.cpp head/contrib/llvm/lib/Object/ObjectFile.cpp head/contrib/llvm/lib/Object/RecordStreamer.cpp head/contrib/llvm/lib/Object/RecordStreamer.h head/contrib/llvm/lib/Object/SymbolSize.cpp head/contrib/llvm/lib/Object/SymbolicFile.cpp head/contrib/llvm/lib/ObjectYAML/ELFYAML.cpp head/contrib/llvm/lib/ObjectYAML/MachOYAML.cpp head/contrib/llvm/lib/ObjectYAML/ObjectYAML.cpp head/contrib/llvm/lib/Option/ArgList.cpp head/contrib/llvm/lib/Option/OptTable.cpp head/contrib/llvm/lib/Passes/PassBuilder.cpp head/contrib/llvm/lib/Passes/PassRegistry.def head/contrib/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp head/contrib/llvm/lib/ProfileData/Coverage/CoverageMappingReader.cpp head/contrib/llvm/lib/ProfileData/Coverage/CoverageMappingWriter.cpp head/contrib/llvm/lib/ProfileData/InstrProf.cpp head/contrib/llvm/lib/ProfileData/InstrProfReader.cpp head/contrib/llvm/lib/ProfileData/InstrProfWriter.cpp head/contrib/llvm/lib/ProfileData/ProfileSummaryBuilder.cpp head/contrib/llvm/lib/ProfileData/SampleProf.cpp head/contrib/llvm/lib/Support/APFloat.cpp head/contrib/llvm/lib/Support/APInt.cpp head/contrib/llvm/lib/Support/ARMBuildAttrs.cpp head/contrib/llvm/lib/Support/CachePruning.cpp head/contrib/llvm/lib/Support/CommandLine.cpp head/contrib/llvm/lib/Support/Compression.cpp head/contrib/llvm/lib/Support/Debug.cpp head/contrib/llvm/lib/Support/DeltaAlgorithm.cpp head/contrib/llvm/lib/Support/Dwarf.cpp head/contrib/llvm/lib/Support/DynamicLibrary.cpp head/contrib/llvm/lib/Support/Error.cpp head/contrib/llvm/lib/Support/FileOutputBuffer.cpp head/contrib/llvm/lib/Support/FileUtilities.cpp head/contrib/llvm/lib/Support/FoldingSet.cpp head/contrib/llvm/lib/Support/Host.cpp head/contrib/llvm/lib/Support/LockFileManager.cpp head/contrib/llvm/lib/Support/MD5.cpp head/contrib/llvm/lib/Support/MemoryBuffer.cpp head/contrib/llvm/lib/Support/Path.cpp head/contrib/llvm/lib/Support/PrettyStackTrace.cpp head/contrib/llvm/lib/Support/RandomNumberGenerator.cpp head/contrib/llvm/lib/Support/Regex.cpp head/contrib/llvm/lib/Support/SHA1.cpp head/contrib/llvm/lib/Support/ScaledNumber.cpp head/contrib/llvm/lib/Support/ScopedPrinter.cpp head/contrib/llvm/lib/Support/SmallPtrSet.cpp head/contrib/llvm/lib/Support/SourceMgr.cpp head/contrib/llvm/lib/Support/SpecialCaseList.cpp head/contrib/llvm/lib/Support/Statistic.cpp head/contrib/llvm/lib/Support/StringMap.cpp head/contrib/llvm/lib/Support/StringRef.cpp head/contrib/llvm/lib/Support/StringSaver.cpp head/contrib/llvm/lib/Support/TargetParser.cpp head/contrib/llvm/lib/Support/TargetRegistry.cpp head/contrib/llvm/lib/Support/Threading.cpp head/contrib/llvm/lib/Support/Timer.cpp head/contrib/llvm/lib/Support/Triple.cpp head/contrib/llvm/lib/Support/Twine.cpp head/contrib/llvm/lib/Support/Unix/Memory.inc head/contrib/llvm/lib/Support/Unix/Path.inc head/contrib/llvm/lib/Support/Unix/Process.inc head/contrib/llvm/lib/Support/Unix/Signals.inc head/contrib/llvm/lib/Support/Unix/Unix.h head/contrib/llvm/lib/Support/Windows/Path.inc head/contrib/llvm/lib/Support/Windows/Process.inc head/contrib/llvm/lib/Support/Windows/Signals.inc head/contrib/llvm/lib/Support/Windows/WindowsSupport.h head/contrib/llvm/lib/Support/YAMLParser.cpp head/contrib/llvm/lib/Support/YAMLTraits.cpp head/contrib/llvm/lib/Support/raw_ostream.cpp head/contrib/llvm/lib/TableGen/Main.cpp head/contrib/llvm/lib/TableGen/Record.cpp head/contrib/llvm/lib/TableGen/StringMatcher.cpp head/contrib/llvm/lib/TableGen/TGLexer.cpp head/contrib/llvm/lib/TableGen/TGLexer.h head/contrib/llvm/lib/TableGen/TGParser.cpp head/contrib/llvm/lib/TableGen/TGParser.h head/contrib/llvm/lib/Target/AArch64/AArch64.h head/contrib/llvm/lib/Target/AArch64/AArch64.td head/contrib/llvm/lib/Target/AArch64/AArch64A53Fix835769.cpp head/contrib/llvm/lib/Target/AArch64/AArch64A57FPLoadBalancing.cpp head/contrib/llvm/lib/Target/AArch64/AArch64AddressTypePromotion.cpp head/contrib/llvm/lib/Target/AArch64/AArch64AdvSIMDScalarPass.cpp head/contrib/llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp head/contrib/llvm/lib/Target/AArch64/AArch64CallLowering.cpp head/contrib/llvm/lib/Target/AArch64/AArch64CallLowering.h head/contrib/llvm/lib/Target/AArch64/AArch64CallingConvention.td head/contrib/llvm/lib/Target/AArch64/AArch64CleanupLocalDynamicTLSPass.cpp head/contrib/llvm/lib/Target/AArch64/AArch64CollectLOH.cpp head/contrib/llvm/lib/Target/AArch64/AArch64ConditionOptimizer.cpp head/contrib/llvm/lib/Target/AArch64/AArch64ConditionalCompares.cpp head/contrib/llvm/lib/Target/AArch64/AArch64DeadRegisterDefinitionsPass.cpp head/contrib/llvm/lib/Target/AArch64/AArch64ExpandPseudoInsts.cpp head/contrib/llvm/lib/Target/AArch64/AArch64FastISel.cpp head/contrib/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp head/contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp head/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp head/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.h head/contrib/llvm/lib/Target/AArch64/AArch64InstrAtomics.td head/contrib/llvm/lib/Target/AArch64/AArch64InstrFormats.td head/contrib/llvm/lib/Target/AArch64/AArch64InstrInfo.cpp head/contrib/llvm/lib/Target/AArch64/AArch64InstrInfo.h head/contrib/llvm/lib/Target/AArch64/AArch64InstrInfo.td head/contrib/llvm/lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp head/contrib/llvm/lib/Target/AArch64/AArch64MCInstLower.cpp head/contrib/llvm/lib/Target/AArch64/AArch64MachineFunctionInfo.h head/contrib/llvm/lib/Target/AArch64/AArch64PromoteConstant.cpp head/contrib/llvm/lib/Target/AArch64/AArch64RedundantCopyElimination.cpp head/contrib/llvm/lib/Target/AArch64/AArch64RegisterBankInfo.cpp head/contrib/llvm/lib/Target/AArch64/AArch64RegisterBankInfo.h head/contrib/llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp head/contrib/llvm/lib/Target/AArch64/AArch64RegisterInfo.h head/contrib/llvm/lib/Target/AArch64/AArch64RegisterInfo.td head/contrib/llvm/lib/Target/AArch64/AArch64SchedA57.td head/contrib/llvm/lib/Target/AArch64/AArch64SchedA57WriteRes.td head/contrib/llvm/lib/Target/AArch64/AArch64SchedM1.td head/contrib/llvm/lib/Target/AArch64/AArch64SchedVulcan.td head/contrib/llvm/lib/Target/AArch64/AArch64StorePairSuppress.cpp head/contrib/llvm/lib/Target/AArch64/AArch64Subtarget.cpp head/contrib/llvm/lib/Target/AArch64/AArch64Subtarget.h head/contrib/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp head/contrib/llvm/lib/Target/AArch64/AArch64TargetMachine.h head/contrib/llvm/lib/Target/AArch64/AArch64TargetObjectFile.cpp head/contrib/llvm/lib/Target/AArch64/AArch64TargetObjectFile.h head/contrib/llvm/lib/Target/AArch64/AArch64TargetTransformInfo.cpp head/contrib/llvm/lib/Target/AArch64/AArch64TargetTransformInfo.h head/contrib/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp head/contrib/llvm/lib/Target/AArch64/Disassembler/AArch64Disassembler.cpp head/contrib/llvm/lib/Target/AArch64/Disassembler/AArch64Disassembler.h head/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp head/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp head/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp head/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCCodeEmitter.cpp head/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.cpp head/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.h head/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp head/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp head/contrib/llvm/lib/Target/AArch64/TargetInfo/AArch64TargetInfo.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPU.h head/contrib/llvm/lib/Target/AMDGPU/AMDGPU.td head/contrib/llvm/lib/Target/AMDGPU/AMDGPUAlwaysInlinePass.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPUAnnotateKernelFeatures.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPUAnnotateUniformValues.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.h head/contrib/llvm/lib/Target/AMDGPU/AMDGPUCallLowering.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPUCallLowering.h head/contrib/llvm/lib/Target/AMDGPU/AMDGPUCodeGenPrepare.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPUFrameLowering.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPUFrameLowering.h head/contrib/llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.h head/contrib/llvm/lib/Target/AMDGPU/AMDGPUInstrInfo.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPUInstrInfo.h head/contrib/llvm/lib/Target/AMDGPU/AMDGPUInstrInfo.td head/contrib/llvm/lib/Target/AMDGPU/AMDGPUInstructions.td head/contrib/llvm/lib/Target/AMDGPU/AMDGPUIntrinsics.td head/contrib/llvm/lib/Target/AMDGPU/AMDGPUMCInstLower.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPUMCInstLower.h head/contrib/llvm/lib/Target/AMDGPU/AMDGPUMachineFunction.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPUMachineFunction.h head/contrib/llvm/lib/Target/AMDGPU/AMDGPUOpenCLImageTypeLoweringPass.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPURuntimeMetadata.h head/contrib/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h head/contrib/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.h head/contrib/llvm/lib/Target/AMDGPU/AMDGPUTargetObjectFile.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPUTargetObjectFile.h head/contrib/llvm/lib/Target/AMDGPU/AMDGPUTargetTransformInfo.cpp head/contrib/llvm/lib/Target/AMDGPU/AMDGPUTargetTransformInfo.h head/contrib/llvm/lib/Target/AMDGPU/AMDILCFGStructurizer.cpp head/contrib/llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp head/contrib/llvm/lib/Target/AMDGPU/CIInstructions.td head/contrib/llvm/lib/Target/AMDGPU/CaymanInstructions.td head/contrib/llvm/lib/Target/AMDGPU/Disassembler/AMDGPUDisassembler.cpp head/contrib/llvm/lib/Target/AMDGPU/Disassembler/AMDGPUDisassembler.h head/contrib/llvm/lib/Target/AMDGPU/EvergreenInstructions.td head/contrib/llvm/lib/Target/AMDGPU/GCNHazardRecognizer.cpp head/contrib/llvm/lib/Target/AMDGPU/GCNHazardRecognizer.h head/contrib/llvm/lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.cpp head/contrib/llvm/lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.h head/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp head/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUELFObjectWriter.cpp head/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCCodeEmitter.h head/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.cpp head/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h head/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp head/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.h head/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/R600MCCodeEmitter.cpp head/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/SIMCCodeEmitter.cpp head/contrib/llvm/lib/Target/AMDGPU/Processors.td head/contrib/llvm/lib/Target/AMDGPU/R600ClauseMergePass.cpp head/contrib/llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp head/contrib/llvm/lib/Target/AMDGPU/R600EmitClauseMarkers.cpp head/contrib/llvm/lib/Target/AMDGPU/R600ExpandSpecialInstrs.cpp head/contrib/llvm/lib/Target/AMDGPU/R600FrameLowering.cpp head/contrib/llvm/lib/Target/AMDGPU/R600FrameLowering.h head/contrib/llvm/lib/Target/AMDGPU/R600ISelLowering.cpp head/contrib/llvm/lib/Target/AMDGPU/R600InstrFormats.td head/contrib/llvm/lib/Target/AMDGPU/R600InstrInfo.cpp head/contrib/llvm/lib/Target/AMDGPU/R600InstrInfo.h head/contrib/llvm/lib/Target/AMDGPU/R600Instructions.td head/contrib/llvm/lib/Target/AMDGPU/R600MachineFunctionInfo.cpp head/contrib/llvm/lib/Target/AMDGPU/R600MachineFunctionInfo.h head/contrib/llvm/lib/Target/AMDGPU/R600MachineScheduler.h head/contrib/llvm/lib/Target/AMDGPU/R600OptimizeVectorRegisters.cpp head/contrib/llvm/lib/Target/AMDGPU/R600Packetizer.cpp head/contrib/llvm/lib/Target/AMDGPU/SIAnnotateControlFlow.cpp head/contrib/llvm/lib/Target/AMDGPU/SIDebuggerInsertNops.cpp head/contrib/llvm/lib/Target/AMDGPU/SIDefines.h head/contrib/llvm/lib/Target/AMDGPU/SIFixControlFlowLiveIntervals.cpp head/contrib/llvm/lib/Target/AMDGPU/SIFixSGPRCopies.cpp head/contrib/llvm/lib/Target/AMDGPU/SIFoldOperands.cpp head/contrib/llvm/lib/Target/AMDGPU/SIFrameLowering.cpp head/contrib/llvm/lib/Target/AMDGPU/SIFrameLowering.h head/contrib/llvm/lib/Target/AMDGPU/SIISelLowering.cpp head/contrib/llvm/lib/Target/AMDGPU/SIISelLowering.h head/contrib/llvm/lib/Target/AMDGPU/SIInsertWaits.cpp head/contrib/llvm/lib/Target/AMDGPU/SIInstrFormats.td head/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp head/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.h head/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.td head/contrib/llvm/lib/Target/AMDGPU/SIInstructions.td head/contrib/llvm/lib/Target/AMDGPU/SIIntrinsics.td head/contrib/llvm/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp head/contrib/llvm/lib/Target/AMDGPU/SILowerControlFlow.cpp head/contrib/llvm/lib/Target/AMDGPU/SILowerI1Copies.cpp head/contrib/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp head/contrib/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h head/contrib/llvm/lib/Target/AMDGPU/SIMachineScheduler.cpp head/contrib/llvm/lib/Target/AMDGPU/SIMachineScheduler.h head/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp head/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.h head/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.td head/contrib/llvm/lib/Target/AMDGPU/SISchedule.td head/contrib/llvm/lib/Target/AMDGPU/SIShrinkInstructions.cpp head/contrib/llvm/lib/Target/AMDGPU/SITypeRewriter.cpp head/contrib/llvm/lib/Target/AMDGPU/SIWholeQuadMode.cpp head/contrib/llvm/lib/Target/AMDGPU/TargetInfo/AMDGPUTargetInfo.cpp head/contrib/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp head/contrib/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.h head/contrib/llvm/lib/Target/AMDGPU/Utils/AMDKernelCodeTInfo.h head/contrib/llvm/lib/Target/AMDGPU/Utils/AMDKernelCodeTUtils.cpp head/contrib/llvm/lib/Target/AMDGPU/VIInstrFormats.td head/contrib/llvm/lib/Target/AMDGPU/VIInstructions.td head/contrib/llvm/lib/Target/ARM/A15SDOptimizer.cpp head/contrib/llvm/lib/Target/ARM/ARM.h head/contrib/llvm/lib/Target/ARM/ARM.td head/contrib/llvm/lib/Target/ARM/ARMAsmPrinter.cpp head/contrib/llvm/lib/Target/ARM/ARMAsmPrinter.h head/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp head/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.h head/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp head/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.h head/contrib/llvm/lib/Target/ARM/ARMCallingConv.td head/contrib/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp head/contrib/llvm/lib/Target/ARM/ARMConstantPoolValue.cpp head/contrib/llvm/lib/Target/ARM/ARMConstantPoolValue.h head/contrib/llvm/lib/Target/ARM/ARMExpandPseudoInsts.cpp head/contrib/llvm/lib/Target/ARM/ARMFastISel.cpp head/contrib/llvm/lib/Target/ARM/ARMFrameLowering.cpp head/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp head/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp head/contrib/llvm/lib/Target/ARM/ARMISelLowering.h head/contrib/llvm/lib/Target/ARM/ARMInstrFormats.td head/contrib/llvm/lib/Target/ARM/ARMInstrInfo.cpp head/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td head/contrib/llvm/lib/Target/ARM/ARMInstrNEON.td head/contrib/llvm/lib/Target/ARM/ARMInstrThumb.td head/contrib/llvm/lib/Target/ARM/ARMInstrThumb2.td head/contrib/llvm/lib/Target/ARM/ARMInstrVFP.td head/contrib/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp head/contrib/llvm/lib/Target/ARM/ARMMCInstLower.cpp head/contrib/llvm/lib/Target/ARM/ARMMachineFunctionInfo.cpp head/contrib/llvm/lib/Target/ARM/ARMMachineFunctionInfo.h head/contrib/llvm/lib/Target/ARM/ARMOptimizeBarriersPass.cpp head/contrib/llvm/lib/Target/ARM/ARMSchedule.td head/contrib/llvm/lib/Target/ARM/ARMSubtarget.cpp head/contrib/llvm/lib/Target/ARM/ARMSubtarget.h head/contrib/llvm/lib/Target/ARM/ARMTargetMachine.cpp head/contrib/llvm/lib/Target/ARM/ARMTargetObjectFile.cpp head/contrib/llvm/lib/Target/ARM/ARMTargetObjectFile.h head/contrib/llvm/lib/Target/ARM/ARMTargetTransformInfo.cpp head/contrib/llvm/lib/Target/ARM/ARMTargetTransformInfo.h head/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp head/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp head/contrib/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.h head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp head/contrib/llvm/lib/Target/ARM/MLxExpansionPass.cpp head/contrib/llvm/lib/Target/ARM/TargetInfo/ARMTargetInfo.cpp head/contrib/llvm/lib/Target/ARM/Thumb1FrameLowering.cpp head/contrib/llvm/lib/Target/ARM/Thumb1InstrInfo.cpp head/contrib/llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp head/contrib/llvm/lib/Target/ARM/Thumb2InstrInfo.cpp head/contrib/llvm/lib/Target/ARM/Thumb2SizeReduction.cpp head/contrib/llvm/lib/Target/ARM/ThumbRegisterInfo.cpp head/contrib/llvm/lib/Target/AVR/AVR.h head/contrib/llvm/lib/Target/AVR/AVR.td head/contrib/llvm/lib/Target/AVR/AVRCallingConv.td head/contrib/llvm/lib/Target/AVR/AVRISelLowering.h head/contrib/llvm/lib/Target/AVR/AVRInstrFormats.td head/contrib/llvm/lib/Target/AVR/AVRInstrInfo.cpp head/contrib/llvm/lib/Target/AVR/AVRInstrInfo.h head/contrib/llvm/lib/Target/AVR/AVRInstrInfo.td head/contrib/llvm/lib/Target/AVR/AVRRegisterInfo.cpp head/contrib/llvm/lib/Target/AVR/AVRRegisterInfo.h head/contrib/llvm/lib/Target/AVR/AVRTargetMachine.cpp head/contrib/llvm/lib/Target/AVR/AVRTargetObjectFile.cpp head/contrib/llvm/lib/Target/AVR/AVRTargetObjectFile.h head/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRMCTargetDesc.h head/contrib/llvm/lib/Target/AVR/TargetInfo/AVRTargetInfo.cpp head/contrib/llvm/lib/Target/BPF/BPF.td head/contrib/llvm/lib/Target/BPF/BPFAsmPrinter.cpp head/contrib/llvm/lib/Target/BPF/BPFISelDAGToDAG.cpp head/contrib/llvm/lib/Target/BPF/BPFInstrInfo.cpp head/contrib/llvm/lib/Target/BPF/BPFInstrInfo.h head/contrib/llvm/lib/Target/BPF/BPFInstrInfo.td head/contrib/llvm/lib/Target/BPF/BPFRegisterInfo.cpp head/contrib/llvm/lib/Target/BPF/BPFTargetMachine.cpp head/contrib/llvm/lib/Target/BPF/InstPrinter/BPFInstPrinter.cpp head/contrib/llvm/lib/Target/BPF/MCTargetDesc/BPFAsmBackend.cpp head/contrib/llvm/lib/Target/BPF/MCTargetDesc/BPFELFObjectWriter.cpp head/contrib/llvm/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h head/contrib/llvm/lib/Target/BPF/MCTargetDesc/BPFMCCodeEmitter.cpp head/contrib/llvm/lib/Target/BPF/MCTargetDesc/BPFMCTargetDesc.cpp head/contrib/llvm/lib/Target/BPF/MCTargetDesc/BPFMCTargetDesc.h head/contrib/llvm/lib/Target/BPF/TargetInfo/BPFTargetInfo.cpp head/contrib/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp head/contrib/llvm/lib/Target/Hexagon/BitTracker.cpp head/contrib/llvm/lib/Target/Hexagon/BitTracker.h head/contrib/llvm/lib/Target/Hexagon/Disassembler/HexagonDisassembler.cpp head/contrib/llvm/lib/Target/Hexagon/Hexagon.td head/contrib/llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonAsmPrinter.h head/contrib/llvm/lib/Target/Hexagon/HexagonBitSimplify.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonBitTracker.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonBitTracker.h head/contrib/llvm/lib/Target/Hexagon/HexagonBlockRanges.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonBlockRanges.h head/contrib/llvm/lib/Target/Hexagon/HexagonBranchRelaxation.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonCFGOptimizer.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonCommonGEP.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonCopyToCombine.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonEarlyIfConv.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonExpandCondsets.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonFixupHwLoops.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonFrameLowering.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonFrameLowering.h head/contrib/llvm/lib/Target/Hexagon/HexagonGenExtract.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonGenInsert.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonGenMux.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonGenPredicate.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonHardwareLoops.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonISelLowering.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonISelLowering.h head/contrib/llvm/lib/Target/Hexagon/HexagonInstrAlias.td head/contrib/llvm/lib/Target/Hexagon/HexagonInstrFormats.td head/contrib/llvm/lib/Target/Hexagon/HexagonInstrFormatsV4.td head/contrib/llvm/lib/Target/Hexagon/HexagonInstrFormatsV60.td head/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfo.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfo.h head/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfo.td head/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfoV3.td head/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfoV4.td head/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfoV5.td head/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfoV60.td head/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfoVector.td head/contrib/llvm/lib/Target/Hexagon/HexagonIntrinsics.td head/contrib/llvm/lib/Target/Hexagon/HexagonIntrinsicsDerived.td head/contrib/llvm/lib/Target/Hexagon/HexagonIntrinsicsV4.td head/contrib/llvm/lib/Target/Hexagon/HexagonIntrinsicsV60.td head/contrib/llvm/lib/Target/Hexagon/HexagonIsetDx.td head/contrib/llvm/lib/Target/Hexagon/HexagonMachineFunctionInfo.h head/contrib/llvm/lib/Target/Hexagon/HexagonMachineScheduler.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonMachineScheduler.h head/contrib/llvm/lib/Target/Hexagon/HexagonNewValueJump.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonOperands.td head/contrib/llvm/lib/Target/Hexagon/HexagonOptAddrMode.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonOptimizeSZextends.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonPeephole.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonRDFOpt.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonRegisterInfo.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonRegisterInfo.h head/contrib/llvm/lib/Target/Hexagon/HexagonRegisterInfo.td head/contrib/llvm/lib/Target/Hexagon/HexagonSelectionDAGInfo.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonSelectionDAGInfo.h head/contrib/llvm/lib/Target/Hexagon/HexagonSplitConst32AndConst64.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonSplitDouble.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonStoreWidening.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonSubtarget.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonSubtarget.h head/contrib/llvm/lib/Target/Hexagon/HexagonSystemInst.td head/contrib/llvm/lib/Target/Hexagon/HexagonTargetMachine.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonTargetObjectFile.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonTargetObjectFile.h head/contrib/llvm/lib/Target/Hexagon/HexagonTargetTransformInfo.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonTargetTransformInfo.h head/contrib/llvm/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp head/contrib/llvm/lib/Target/Hexagon/HexagonVLIWPacketizer.h head/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonAsmBackend.cpp head/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonBaseInfo.h head/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCAsmInfo.cpp head/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.cpp head/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.h head/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCompound.cpp head/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCDuplexInfo.cpp head/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCELFStreamer.cpp head/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCELFStreamer.h head/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCInstrInfo.cpp head/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCInstrInfo.h head/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp head/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.h head/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonShuffler.cpp head/contrib/llvm/lib/Target/Hexagon/RDFCopy.cpp head/contrib/llvm/lib/Target/Hexagon/RDFCopy.h head/contrib/llvm/lib/Target/Hexagon/RDFGraph.cpp head/contrib/llvm/lib/Target/Hexagon/RDFGraph.h head/contrib/llvm/lib/Target/Hexagon/RDFLiveness.cpp head/contrib/llvm/lib/Target/Hexagon/RDFLiveness.h head/contrib/llvm/lib/Target/Hexagon/TargetInfo/HexagonTargetInfo.cpp head/contrib/llvm/lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp head/contrib/llvm/lib/Target/Lanai/Disassembler/LanaiDisassembler.cpp head/contrib/llvm/lib/Target/Lanai/Disassembler/LanaiDisassembler.h head/contrib/llvm/lib/Target/Lanai/InstPrinter/LanaiInstPrinter.h head/contrib/llvm/lib/Target/Lanai/Lanai.h head/contrib/llvm/lib/Target/Lanai/LanaiAluCode.h head/contrib/llvm/lib/Target/Lanai/LanaiAsmPrinter.cpp head/contrib/llvm/lib/Target/Lanai/LanaiDelaySlotFiller.cpp head/contrib/llvm/lib/Target/Lanai/LanaiFrameLowering.cpp head/contrib/llvm/lib/Target/Lanai/LanaiISelDAGToDAG.cpp head/contrib/llvm/lib/Target/Lanai/LanaiISelLowering.cpp head/contrib/llvm/lib/Target/Lanai/LanaiISelLowering.h head/contrib/llvm/lib/Target/Lanai/LanaiInstrInfo.cpp head/contrib/llvm/lib/Target/Lanai/LanaiInstrInfo.h head/contrib/llvm/lib/Target/Lanai/LanaiInstrInfo.td head/contrib/llvm/lib/Target/Lanai/LanaiMCInstLower.cpp head/contrib/llvm/lib/Target/Lanai/LanaiMCInstLower.h head/contrib/llvm/lib/Target/Lanai/LanaiMemAluCombiner.cpp head/contrib/llvm/lib/Target/Lanai/LanaiRegisterInfo.cpp head/contrib/llvm/lib/Target/Lanai/LanaiRegisterInfo.h head/contrib/llvm/lib/Target/Lanai/LanaiTargetMachine.cpp head/contrib/llvm/lib/Target/Lanai/LanaiTargetObjectFile.cpp head/contrib/llvm/lib/Target/Lanai/LanaiTargetObjectFile.h head/contrib/llvm/lib/Target/Lanai/LanaiTargetTransformInfo.h head/contrib/llvm/lib/Target/Lanai/MCTargetDesc/LanaiAsmBackend.cpp head/contrib/llvm/lib/Target/Lanai/MCTargetDesc/LanaiELFObjectWriter.cpp head/contrib/llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCCodeEmitter.cpp head/contrib/llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCTargetDesc.cpp head/contrib/llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCTargetDesc.h head/contrib/llvm/lib/Target/Lanai/TargetInfo/LanaiTargetInfo.cpp head/contrib/llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCTargetDesc.cpp head/contrib/llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCTargetDesc.h head/contrib/llvm/lib/Target/MSP430/MSP430AsmPrinter.cpp head/contrib/llvm/lib/Target/MSP430/MSP430BranchSelector.cpp head/contrib/llvm/lib/Target/MSP430/MSP430FrameLowering.cpp head/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp head/contrib/llvm/lib/Target/MSP430/MSP430ISelLowering.cpp head/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.cpp head/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.h head/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.cpp head/contrib/llvm/lib/Target/MSP430/MSP430TargetMachine.cpp head/contrib/llvm/lib/Target/MSP430/TargetInfo/MSP430TargetInfo.cpp head/contrib/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp head/contrib/llvm/lib/Target/Mips/Disassembler/MipsDisassembler.cpp head/contrib/llvm/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsABIInfo.cpp head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsBaseInfo.h head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsFixupKinds.h head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCAsmInfo.cpp head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.h head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.h head/contrib/llvm/lib/Target/Mips/MicroMips32r6InstrInfo.td head/contrib/llvm/lib/Target/Mips/MicroMips64r6InstrFormats.td head/contrib/llvm/lib/Target/Mips/MicroMips64r6InstrInfo.td head/contrib/llvm/lib/Target/Mips/MicroMipsInstrFPU.td head/contrib/llvm/lib/Target/Mips/MicroMipsInstrFormats.td head/contrib/llvm/lib/Target/Mips/MicroMipsInstrInfo.td head/contrib/llvm/lib/Target/Mips/Mips.td head/contrib/llvm/lib/Target/Mips/Mips16FrameLowering.cpp head/contrib/llvm/lib/Target/Mips/Mips16HardFloat.cpp head/contrib/llvm/lib/Target/Mips/Mips16ISelDAGToDAG.cpp head/contrib/llvm/lib/Target/Mips/Mips16InstrInfo.cpp head/contrib/llvm/lib/Target/Mips/Mips16RegisterInfo.cpp head/contrib/llvm/lib/Target/Mips/Mips32r6InstrFormats.td head/contrib/llvm/lib/Target/Mips/Mips32r6InstrInfo.td head/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td head/contrib/llvm/lib/Target/Mips/Mips64r6InstrInfo.td head/contrib/llvm/lib/Target/Mips/MipsAsmPrinter.cpp head/contrib/llvm/lib/Target/Mips/MipsAsmPrinter.h head/contrib/llvm/lib/Target/Mips/MipsConstantIslandPass.cpp head/contrib/llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp head/contrib/llvm/lib/Target/Mips/MipsEVAInstrFormats.td head/contrib/llvm/lib/Target/Mips/MipsFastISel.cpp head/contrib/llvm/lib/Target/Mips/MipsFrameLowering.cpp head/contrib/llvm/lib/Target/Mips/MipsHazardSchedule.cpp head/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp head/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.h head/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp head/contrib/llvm/lib/Target/Mips/MipsISelLowering.h head/contrib/llvm/lib/Target/Mips/MipsInstrFPU.td head/contrib/llvm/lib/Target/Mips/MipsInstrFormats.td head/contrib/llvm/lib/Target/Mips/MipsInstrInfo.cpp head/contrib/llvm/lib/Target/Mips/MipsInstrInfo.h head/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td head/contrib/llvm/lib/Target/Mips/MipsLongBranch.cpp head/contrib/llvm/lib/Target/Mips/MipsMSAInstrInfo.td head/contrib/llvm/lib/Target/Mips/MipsMachineFunction.cpp head/contrib/llvm/lib/Target/Mips/MipsModuleISelDAGToDAG.cpp head/contrib/llvm/lib/Target/Mips/MipsOptimizePICCall.cpp head/contrib/llvm/lib/Target/Mips/MipsOs16.cpp head/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.cpp head/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.td head/contrib/llvm/lib/Target/Mips/MipsSEFrameLowering.cpp head/contrib/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp head/contrib/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.h head/contrib/llvm/lib/Target/Mips/MipsSEISelLowering.cpp head/contrib/llvm/lib/Target/Mips/MipsSEISelLowering.h head/contrib/llvm/lib/Target/Mips/MipsSEInstrInfo.cpp head/contrib/llvm/lib/Target/Mips/MipsSERegisterInfo.cpp head/contrib/llvm/lib/Target/Mips/MipsSchedule.td head/contrib/llvm/lib/Target/Mips/MipsScheduleP5600.td head/contrib/llvm/lib/Target/Mips/MipsTargetMachine.cpp head/contrib/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp head/contrib/llvm/lib/Target/Mips/MipsTargetObjectFile.h head/contrib/llvm/lib/Target/Mips/TargetInfo/MipsTargetInfo.cpp head/contrib/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXBaseInfo.h head/contrib/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXMCTargetDesc.cpp head/contrib/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXMCTargetDesc.h head/contrib/llvm/lib/Target/NVPTX/ManagedStringPool.h head/contrib/llvm/lib/Target/NVPTX/NVPTX.h head/contrib/llvm/lib/Target/NVPTX/NVPTX.td head/contrib/llvm/lib/Target/NVPTX/NVPTXAllocaHoisting.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h head/contrib/llvm/lib/Target/NVPTX/NVPTXFrameLowering.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.h head/contrib/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXISelLowering.h head/contrib/llvm/lib/Target/NVPTX/NVPTXInferAddressSpaces.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXInstrInfo.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXInstrInfo.h head/contrib/llvm/lib/Target/NVPTX/NVPTXInstrInfo.td head/contrib/llvm/lib/Target/NVPTX/NVPTXIntrinsics.td head/contrib/llvm/lib/Target/NVPTX/NVPTXLowerAggrCopies.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXLowerAlloca.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXMCExpr.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXPeephole.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXPrologEpilogPass.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXRegisterInfo.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXReplaceImageHandles.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXSection.h head/contrib/llvm/lib/Target/NVPTX/NVPTXSubtarget.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXSubtarget.h head/contrib/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXTargetObjectFile.h head/contrib/llvm/lib/Target/NVPTX/NVPTXTargetTransformInfo.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXTargetTransformInfo.h head/contrib/llvm/lib/Target/NVPTX/NVPTXUtilities.cpp head/contrib/llvm/lib/Target/NVPTX/NVPTXUtilities.h head/contrib/llvm/lib/Target/NVPTX/NVVMIntrRange.cpp head/contrib/llvm/lib/Target/NVPTX/NVVMReflect.cpp head/contrib/llvm/lib/Target/NVPTX/TargetInfo/NVPTXTargetInfo.cpp head/contrib/llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp head/contrib/llvm/lib/Target/PowerPC/Disassembler/PPCDisassembler.cpp head/contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp head/contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.h head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCCodeEmitter.cpp head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h head/contrib/llvm/lib/Target/PowerPC/PPC.td head/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp head/contrib/llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp head/contrib/llvm/lib/Target/PowerPC/PPCBranchSelector.cpp head/contrib/llvm/lib/Target/PowerPC/PPCCTRLoops.cpp head/contrib/llvm/lib/Target/PowerPC/PPCCallingConv.td head/contrib/llvm/lib/Target/PowerPC/PPCEarlyReturn.cpp head/contrib/llvm/lib/Target/PowerPC/PPCFastISel.cpp head/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp head/contrib/llvm/lib/Target/PowerPC/PPCHazardRecognizers.cpp head/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp head/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp head/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h head/contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td head/contrib/llvm/lib/Target/PowerPC/PPCInstrAltivec.td head/contrib/llvm/lib/Target/PowerPC/PPCInstrFormats.td head/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp head/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.h head/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td head/contrib/llvm/lib/Target/PowerPC/PPCInstrQPX.td head/contrib/llvm/lib/Target/PowerPC/PPCInstrVSX.td head/contrib/llvm/lib/Target/PowerPC/PPCLoopPreIncPrep.cpp head/contrib/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp head/contrib/llvm/lib/Target/PowerPC/PPCMIPeephole.cpp head/contrib/llvm/lib/Target/PowerPC/PPCQPXLoadSplat.cpp head/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp head/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.h head/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.td head/contrib/llvm/lib/Target/PowerPC/PPCSchedule.td head/contrib/llvm/lib/Target/PowerPC/PPCScheduleE500mc.td head/contrib/llvm/lib/Target/PowerPC/PPCScheduleE5500.td head/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.h head/contrib/llvm/lib/Target/PowerPC/PPCTLSDynamicCall.cpp head/contrib/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp head/contrib/llvm/lib/Target/PowerPC/PPCTargetObjectFile.cpp head/contrib/llvm/lib/Target/PowerPC/PPCTargetObjectFile.h head/contrib/llvm/lib/Target/PowerPC/PPCTargetTransformInfo.cpp head/contrib/llvm/lib/Target/PowerPC/PPCTargetTransformInfo.h head/contrib/llvm/lib/Target/PowerPC/PPCVSXCopy.cpp head/contrib/llvm/lib/Target/PowerPC/PPCVSXFMAMutate.cpp head/contrib/llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp head/contrib/llvm/lib/Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp head/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp head/contrib/llvm/lib/Target/Sparc/DelaySlotFiller.cpp head/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp head/contrib/llvm/lib/Target/Sparc/LeonFeatures.td head/contrib/llvm/lib/Target/Sparc/LeonPasses.cpp head/contrib/llvm/lib/Target/Sparc/LeonPasses.h head/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp head/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCCodeEmitter.cpp head/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCTargetDesc.cpp head/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCTargetDesc.h head/contrib/llvm/lib/Target/Sparc/Sparc.td head/contrib/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp head/contrib/llvm/lib/Target/Sparc/SparcFrameLowering.cpp head/contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp head/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp head/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.cpp head/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.h head/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.td head/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.td head/contrib/llvm/lib/Target/Sparc/SparcSubtarget.cpp head/contrib/llvm/lib/Target/Sparc/SparcSubtarget.h head/contrib/llvm/lib/Target/Sparc/SparcTargetMachine.cpp head/contrib/llvm/lib/Target/Sparc/SparcTargetObjectFile.cpp head/contrib/llvm/lib/Target/Sparc/SparcTargetObjectFile.h head/contrib/llvm/lib/Target/Sparc/TargetInfo/SparcTargetInfo.cpp head/contrib/llvm/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp head/contrib/llvm/lib/Target/SystemZ/Disassembler/SystemZDisassembler.cpp head/contrib/llvm/lib/Target/SystemZ/InstPrinter/SystemZInstPrinter.cpp head/contrib/llvm/lib/Target/SystemZ/InstPrinter/SystemZInstPrinter.h head/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmBackend.cpp head/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCCodeEmitter.cpp head/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCFixups.h head/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCObjectWriter.cpp head/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp head/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.h head/contrib/llvm/lib/Target/SystemZ/SystemZ.h head/contrib/llvm/lib/Target/SystemZ/SystemZ.td head/contrib/llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZAsmPrinter.h head/contrib/llvm/lib/Target/SystemZ/SystemZElimCompare.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZFrameLowering.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZISelLowering.h head/contrib/llvm/lib/Target/SystemZ/SystemZInstrBuilder.h head/contrib/llvm/lib/Target/SystemZ/SystemZInstrFP.td head/contrib/llvm/lib/Target/SystemZ/SystemZInstrFormats.td head/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.h head/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.td head/contrib/llvm/lib/Target/SystemZ/SystemZInstrVector.td head/contrib/llvm/lib/Target/SystemZ/SystemZLDCleanup.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZLongBranch.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZOperands.td head/contrib/llvm/lib/Target/SystemZ/SystemZOperators.td head/contrib/llvm/lib/Target/SystemZ/SystemZProcessors.td head/contrib/llvm/lib/Target/SystemZ/SystemZRegisterInfo.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZRegisterInfo.td head/contrib/llvm/lib/Target/SystemZ/SystemZShortenInst.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZSubtarget.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZSubtarget.h head/contrib/llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZTargetTransformInfo.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZTargetTransformInfo.h head/contrib/llvm/lib/Target/SystemZ/TargetInfo/SystemZTargetInfo.cpp head/contrib/llvm/lib/Target/TargetIntrinsicInfo.cpp head/contrib/llvm/lib/Target/TargetLoweringObjectFile.cpp head/contrib/llvm/lib/Target/TargetMachine.cpp head/contrib/llvm/lib/Target/TargetMachineC.cpp head/contrib/llvm/lib/Target/WebAssembly/Disassembler/WebAssemblyDisassembler.cpp head/contrib/llvm/lib/Target/WebAssembly/InstPrinter/WebAssemblyInstPrinter.cpp head/contrib/llvm/lib/Target/WebAssembly/InstPrinter/WebAssemblyInstPrinter.h head/contrib/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyAsmBackend.cpp head/contrib/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCCodeEmitter.cpp head/contrib/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCTargetDesc.cpp head/contrib/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCTargetDesc.h head/contrib/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyTargetStreamer.cpp head/contrib/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyTargetStreamer.h head/contrib/llvm/lib/Target/WebAssembly/README.txt head/contrib/llvm/lib/Target/WebAssembly/TargetInfo/WebAssemblyTargetInfo.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssembly.h head/contrib/llvm/lib/Target/WebAssembly/WebAssembly.td head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyArgumentMove.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyFixIrreducibleControlFlow.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyFrameLowering.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyFrameLowering.h head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyISelDAGToDAG.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyInstrCall.td head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyInstrControl.td head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyInstrConv.td head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyInstrFloat.td head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyInstrFormats.td head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyInstrInfo.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyInstrInfo.h head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyInstrInfo.td head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyInstrInteger.td head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyInstrMemory.td head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyInstrSIMD.td head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyLowerBrUnless.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyMachineFunctionInfo.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyMachineFunctionInfo.h head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyOptimizeLiveIntervals.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyOptimizeReturned.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyPeephole.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyPrepareForLiveIntervals.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyRegColoring.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyRegNumbering.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyRegisterInfo.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyRegisterInfo.td head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyReplacePhysRegs.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblySetP2AlignOperands.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyStoreResults.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyTargetTransformInfo.cpp head/contrib/llvm/lib/Target/WebAssembly/WebAssemblyTargetTransformInfo.h head/contrib/llvm/lib/Target/WebAssembly/known_gcc_test_failures.txt head/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp head/contrib/llvm/lib/Target/X86/AsmParser/X86Operand.h head/contrib/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp head/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp head/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h head/contrib/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp head/contrib/llvm/lib/Target/X86/InstPrinter/X86InstComments.cpp head/contrib/llvm/lib/Target/X86/InstPrinter/X86InstComments.h head/contrib/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86BaseInfo.h head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h head/contrib/llvm/lib/Target/X86/TargetInfo/X86TargetInfo.cpp head/contrib/llvm/lib/Target/X86/Utils/X86ShuffleDecode.cpp head/contrib/llvm/lib/Target/X86/Utils/X86ShuffleDecode.h head/contrib/llvm/lib/Target/X86/X86.h head/contrib/llvm/lib/Target/X86/X86.td head/contrib/llvm/lib/Target/X86/X86AsmPrinter.cpp head/contrib/llvm/lib/Target/X86/X86AsmPrinter.h head/contrib/llvm/lib/Target/X86/X86CallFrameOptimization.cpp head/contrib/llvm/lib/Target/X86/X86CallingConv.h head/contrib/llvm/lib/Target/X86/X86CallingConv.td head/contrib/llvm/lib/Target/X86/X86ExpandPseudo.cpp head/contrib/llvm/lib/Target/X86/X86FastISel.cpp head/contrib/llvm/lib/Target/X86/X86FixupBWInsts.cpp head/contrib/llvm/lib/Target/X86/X86FixupLEAs.cpp head/contrib/llvm/lib/Target/X86/X86FixupSetCC.cpp head/contrib/llvm/lib/Target/X86/X86FloatingPoint.cpp head/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp head/contrib/llvm/lib/Target/X86/X86FrameLowering.h head/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp head/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp head/contrib/llvm/lib/Target/X86/X86ISelLowering.h head/contrib/llvm/lib/Target/X86/X86InstrAVX512.td head/contrib/llvm/lib/Target/X86/X86InstrArithmetic.td head/contrib/llvm/lib/Target/X86/X86InstrBuilder.h head/contrib/llvm/lib/Target/X86/X86InstrCompiler.td head/contrib/llvm/lib/Target/X86/X86InstrControl.td head/contrib/llvm/lib/Target/X86/X86InstrFMA.td head/contrib/llvm/lib/Target/X86/X86InstrFPStack.td head/contrib/llvm/lib/Target/X86/X86InstrFormats.td head/contrib/llvm/lib/Target/X86/X86InstrFragmentsSIMD.td head/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp head/contrib/llvm/lib/Target/X86/X86InstrInfo.h head/contrib/llvm/lib/Target/X86/X86InstrInfo.td head/contrib/llvm/lib/Target/X86/X86InstrMMX.td head/contrib/llvm/lib/Target/X86/X86InstrSSE.td head/contrib/llvm/lib/Target/X86/X86InstrShiftRotate.td head/contrib/llvm/lib/Target/X86/X86InstrSystem.td head/contrib/llvm/lib/Target/X86/X86InstrXOP.td head/contrib/llvm/lib/Target/X86/X86IntrinsicsInfo.h head/contrib/llvm/lib/Target/X86/X86MCInstLower.cpp head/contrib/llvm/lib/Target/X86/X86OptimizeLEAs.cpp head/contrib/llvm/lib/Target/X86/X86PadShortFunction.cpp head/contrib/llvm/lib/Target/X86/X86RegisterInfo.cpp head/contrib/llvm/lib/Target/X86/X86RegisterInfo.h head/contrib/llvm/lib/Target/X86/X86RegisterInfo.td head/contrib/llvm/lib/Target/X86/X86SelectionDAGInfo.cpp head/contrib/llvm/lib/Target/X86/X86ShuffleDecodeConstantPool.cpp head/contrib/llvm/lib/Target/X86/X86ShuffleDecodeConstantPool.h head/contrib/llvm/lib/Target/X86/X86Subtarget.cpp head/contrib/llvm/lib/Target/X86/X86Subtarget.h head/contrib/llvm/lib/Target/X86/X86TargetMachine.cpp head/contrib/llvm/lib/Target/X86/X86TargetMachine.h head/contrib/llvm/lib/Target/X86/X86TargetObjectFile.cpp head/contrib/llvm/lib/Target/X86/X86TargetObjectFile.h head/contrib/llvm/lib/Target/X86/X86TargetTransformInfo.cpp head/contrib/llvm/lib/Target/X86/X86TargetTransformInfo.h head/contrib/llvm/lib/Target/X86/X86VZeroUpper.cpp head/contrib/llvm/lib/Target/X86/X86WinAllocaExpander.cpp head/contrib/llvm/lib/Target/X86/X86WinEHState.cpp head/contrib/llvm/lib/Target/XCore/Disassembler/XCoreDisassembler.cpp head/contrib/llvm/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp head/contrib/llvm/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.h head/contrib/llvm/lib/Target/XCore/TargetInfo/XCoreTargetInfo.cpp head/contrib/llvm/lib/Target/XCore/XCoreAsmPrinter.cpp head/contrib/llvm/lib/Target/XCore/XCoreFrameLowering.cpp head/contrib/llvm/lib/Target/XCore/XCoreFrameToArgsOffsetElim.cpp head/contrib/llvm/lib/Target/XCore/XCoreISelDAGToDAG.cpp head/contrib/llvm/lib/Target/XCore/XCoreISelLowering.cpp head/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.cpp head/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.h head/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.td head/contrib/llvm/lib/Target/XCore/XCoreMCInstLower.cpp head/contrib/llvm/lib/Target/XCore/XCoreMCInstLower.h head/contrib/llvm/lib/Target/XCore/XCoreMachineFunctionInfo.cpp head/contrib/llvm/lib/Target/XCore/XCoreRegisterInfo.cpp head/contrib/llvm/lib/Target/XCore/XCoreSelectionDAGInfo.cpp head/contrib/llvm/lib/Target/XCore/XCoreTargetMachine.cpp head/contrib/llvm/lib/Target/XCore/XCoreTargetObjectFile.cpp head/contrib/llvm/lib/Target/XCore/XCoreTargetObjectFile.h head/contrib/llvm/lib/Target/XCore/XCoreTargetTransformInfo.h head/contrib/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp head/contrib/llvm/lib/Transforms/IPO/CrossDSOCFI.cpp head/contrib/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp head/contrib/llvm/lib/Transforms/IPO/FunctionAttrs.cpp head/contrib/llvm/lib/Transforms/IPO/FunctionImport.cpp head/contrib/llvm/lib/Transforms/IPO/GlobalDCE.cpp head/contrib/llvm/lib/Transforms/IPO/GlobalOpt.cpp head/contrib/llvm/lib/Transforms/IPO/IPO.cpp head/contrib/llvm/lib/Transforms/IPO/InferFunctionAttrs.cpp head/contrib/llvm/lib/Transforms/IPO/InlineSimple.cpp head/contrib/llvm/lib/Transforms/IPO/Inliner.cpp head/contrib/llvm/lib/Transforms/IPO/Internalize.cpp head/contrib/llvm/lib/Transforms/IPO/LowerTypeTests.cpp head/contrib/llvm/lib/Transforms/IPO/MergeFunctions.cpp head/contrib/llvm/lib/Transforms/IPO/PartialInlining.cpp head/contrib/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp head/contrib/llvm/lib/Transforms/IPO/PruneEH.cpp head/contrib/llvm/lib/Transforms/IPO/SampleProfile.cpp head/contrib/llvm/lib/Transforms/IPO/StripSymbols.cpp head/contrib/llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineInternal.h head/contrib/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineShifts.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineVectorOps.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp head/contrib/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp head/contrib/llvm/lib/Transforms/Instrumentation/CFGMST.h head/contrib/llvm/lib/Transforms/Instrumentation/EfficiencySanitizer.cpp head/contrib/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp head/contrib/llvm/lib/Transforms/Instrumentation/IndirectCallPromotion.cpp head/contrib/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp head/contrib/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp head/contrib/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp head/contrib/llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp head/contrib/llvm/lib/Transforms/Instrumentation/ThreadSanitizer.cpp head/contrib/llvm/lib/Transforms/ObjCARC/ARCRuntimeEntryPoints.h head/contrib/llvm/lib/Transforms/ObjCARC/ObjCARCContract.cpp head/contrib/llvm/lib/Transforms/ObjCARC/ObjCARCOpts.cpp head/contrib/llvm/lib/Transforms/ObjCARC/PtrState.cpp head/contrib/llvm/lib/Transforms/Scalar/ADCE.cpp head/contrib/llvm/lib/Transforms/Scalar/AlignmentFromAssumptions.cpp head/contrib/llvm/lib/Transforms/Scalar/BDCE.cpp head/contrib/llvm/lib/Transforms/Scalar/ConstantHoisting.cpp head/contrib/llvm/lib/Transforms/Scalar/CorrelatedValuePropagation.cpp head/contrib/llvm/lib/Transforms/Scalar/DCE.cpp head/contrib/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp head/contrib/llvm/lib/Transforms/Scalar/EarlyCSE.cpp head/contrib/llvm/lib/Transforms/Scalar/Float2Int.cpp head/contrib/llvm/lib/Transforms/Scalar/GVN.cpp head/contrib/llvm/lib/Transforms/Scalar/GVNHoist.cpp head/contrib/llvm/lib/Transforms/Scalar/GuardWidening.cpp head/contrib/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp head/contrib/llvm/lib/Transforms/Scalar/InductiveRangeCheckElimination.cpp head/contrib/llvm/lib/Transforms/Scalar/JumpThreading.cpp head/contrib/llvm/lib/Transforms/Scalar/LICM.cpp head/contrib/llvm/lib/Transforms/Scalar/LoadCombine.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopDataPrefetch.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopDeletion.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopDistribute.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopIdiomRecognize.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopInstSimplify.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopInterchange.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopLoadElimination.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopRerollPass.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopRotation.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopSimplifyCFG.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopVersioningLICM.cpp head/contrib/llvm/lib/Transforms/Scalar/LowerExpectIntrinsic.cpp head/contrib/llvm/lib/Transforms/Scalar/LowerGuardIntrinsic.cpp head/contrib/llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp head/contrib/llvm/lib/Transforms/Scalar/MergedLoadStoreMotion.cpp head/contrib/llvm/lib/Transforms/Scalar/NaryReassociate.cpp head/contrib/llvm/lib/Transforms/Scalar/PartiallyInlineLibCalls.cpp head/contrib/llvm/lib/Transforms/Scalar/Reassociate.cpp head/contrib/llvm/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp head/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp head/contrib/llvm/lib/Transforms/Scalar/SROA.cpp head/contrib/llvm/lib/Transforms/Scalar/Scalar.cpp head/contrib/llvm/lib/Transforms/Scalar/Scalarizer.cpp head/contrib/llvm/lib/Transforms/Scalar/SeparateConstOffsetFromGEP.cpp head/contrib/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp head/contrib/llvm/lib/Transforms/Scalar/Sink.cpp head/contrib/llvm/lib/Transforms/Scalar/SpeculativeExecution.cpp head/contrib/llvm/lib/Transforms/Scalar/StraightLineStrengthReduce.cpp head/contrib/llvm/lib/Transforms/Scalar/StructurizeCFG.cpp head/contrib/llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp head/contrib/llvm/lib/Transforms/Utils/ASanStackFrameLayout.cpp head/contrib/llvm/lib/Transforms/Utils/AddDiscriminators.cpp head/contrib/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp head/contrib/llvm/lib/Transforms/Utils/BuildLibCalls.cpp head/contrib/llvm/lib/Transforms/Utils/BypassSlowDivision.cpp head/contrib/llvm/lib/Transforms/Utils/CloneModule.cpp head/contrib/llvm/lib/Transforms/Utils/CmpInstAnalysis.cpp head/contrib/llvm/lib/Transforms/Utils/CodeExtractor.cpp head/contrib/llvm/lib/Transforms/Utils/CtorUtils.cpp head/contrib/llvm/lib/Transforms/Utils/Evaluator.cpp head/contrib/llvm/lib/Transforms/Utils/FlattenCFG.cpp head/contrib/llvm/lib/Transforms/Utils/FunctionImportUtils.cpp head/contrib/llvm/lib/Transforms/Utils/GlobalStatus.cpp head/contrib/llvm/lib/Transforms/Utils/InlineFunction.cpp head/contrib/llvm/lib/Transforms/Utils/LCSSA.cpp head/contrib/llvm/lib/Transforms/Utils/Local.cpp head/contrib/llvm/lib/Transforms/Utils/LoopSimplify.cpp head/contrib/llvm/lib/Transforms/Utils/LoopUnroll.cpp head/contrib/llvm/lib/Transforms/Utils/LoopUnrollRuntime.cpp head/contrib/llvm/lib/Transforms/Utils/LoopUtils.cpp head/contrib/llvm/lib/Transforms/Utils/LoopVersioning.cpp head/contrib/llvm/lib/Transforms/Utils/LowerInvoke.cpp head/contrib/llvm/lib/Transforms/Utils/LowerSwitch.cpp head/contrib/llvm/lib/Transforms/Utils/Mem2Reg.cpp head/contrib/llvm/lib/Transforms/Utils/MemorySSA.cpp head/contrib/llvm/lib/Transforms/Utils/ModuleUtils.cpp head/contrib/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp head/contrib/llvm/lib/Transforms/Utils/SSAUpdater.cpp head/contrib/llvm/lib/Transforms/Utils/SimplifyCFG.cpp head/contrib/llvm/lib/Transforms/Utils/SimplifyInstructions.cpp head/contrib/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp head/contrib/llvm/lib/Transforms/Utils/SymbolRewriter.cpp head/contrib/llvm/lib/Transforms/Utils/Utils.cpp head/contrib/llvm/lib/Transforms/Utils/ValueMapper.cpp head/contrib/llvm/lib/Transforms/Vectorize/BBVectorize.cpp head/contrib/llvm/lib/Transforms/Vectorize/LoadStoreVectorizer.cpp head/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp head/contrib/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp head/contrib/llvm/tools/bugpoint/BugDriver.cpp head/contrib/llvm/tools/bugpoint/BugDriver.h head/contrib/llvm/tools/bugpoint/CrashDebugger.cpp head/contrib/llvm/tools/bugpoint/ExecutionDriver.cpp head/contrib/llvm/tools/bugpoint/ExtractFunction.cpp head/contrib/llvm/tools/bugpoint/FindBugs.cpp head/contrib/llvm/tools/bugpoint/ListReducer.h head/contrib/llvm/tools/bugpoint/Miscompilation.cpp head/contrib/llvm/tools/bugpoint/OptimizerDriver.cpp head/contrib/llvm/tools/bugpoint/ToolRunner.cpp head/contrib/llvm/tools/bugpoint/ToolRunner.h head/contrib/llvm/tools/bugpoint/bugpoint.cpp head/contrib/llvm/tools/clang/include/clang-c/Index.h head/contrib/llvm/tools/clang/include/clang/AST/APValue.h head/contrib/llvm/tools/clang/include/clang/AST/ASTConsumer.h head/contrib/llvm/tools/clang/include/clang/AST/ASTContext.h head/contrib/llvm/tools/clang/include/clang/AST/ASTImporter.h head/contrib/llvm/tools/clang/include/clang/AST/ASTMutationListener.h head/contrib/llvm/tools/clang/include/clang/AST/ASTTypeTraits.h head/contrib/llvm/tools/clang/include/clang/AST/ASTVector.h head/contrib/llvm/tools/clang/include/clang/AST/Attr.h head/contrib/llvm/tools/clang/include/clang/AST/AttrIterator.h head/contrib/llvm/tools/clang/include/clang/AST/CXXInheritance.h head/contrib/llvm/tools/clang/include/clang/AST/CanonicalType.h head/contrib/llvm/tools/clang/include/clang/AST/CommentLexer.h head/contrib/llvm/tools/clang/include/clang/AST/Decl.h head/contrib/llvm/tools/clang/include/clang/AST/DeclBase.h head/contrib/llvm/tools/clang/include/clang/AST/DeclCXX.h head/contrib/llvm/tools/clang/include/clang/AST/DeclFriend.h head/contrib/llvm/tools/clang/include/clang/AST/DeclGroup.h head/contrib/llvm/tools/clang/include/clang/AST/DeclObjC.h head/contrib/llvm/tools/clang/include/clang/AST/DeclOpenMP.h head/contrib/llvm/tools/clang/include/clang/AST/DeclTemplate.h head/contrib/llvm/tools/clang/include/clang/AST/Expr.h head/contrib/llvm/tools/clang/include/clang/AST/ExprCXX.h head/contrib/llvm/tools/clang/include/clang/AST/ExprObjC.h head/contrib/llvm/tools/clang/include/clang/AST/Mangle.h head/contrib/llvm/tools/clang/include/clang/AST/MangleNumberingContext.h head/contrib/llvm/tools/clang/include/clang/AST/OpenMPClause.h head/contrib/llvm/tools/clang/include/clang/AST/OperationKinds.def head/contrib/llvm/tools/clang/include/clang/AST/RecursiveASTVisitor.h head/contrib/llvm/tools/clang/include/clang/AST/Redeclarable.h head/contrib/llvm/tools/clang/include/clang/AST/Stmt.h head/contrib/llvm/tools/clang/include/clang/AST/StmtCXX.h head/contrib/llvm/tools/clang/include/clang/AST/StmtGraphTraits.h head/contrib/llvm/tools/clang/include/clang/AST/StmtOpenMP.h head/contrib/llvm/tools/clang/include/clang/AST/TemplateBase.h head/contrib/llvm/tools/clang/include/clang/AST/Type.h head/contrib/llvm/tools/clang/include/clang/AST/TypeLoc.h head/contrib/llvm/tools/clang/include/clang/AST/TypeNodes.def head/contrib/llvm/tools/clang/include/clang/AST/UnresolvedSet.h head/contrib/llvm/tools/clang/include/clang/AST/VTTBuilder.h head/contrib/llvm/tools/clang/include/clang/AST/VTableBuilder.h head/contrib/llvm/tools/clang/include/clang/ASTMatchers/ASTMatchFinder.h head/contrib/llvm/tools/clang/include/clang/ASTMatchers/ASTMatchers.h head/contrib/llvm/tools/clang/include/clang/ASTMatchers/ASTMatchersInternal.h head/contrib/llvm/tools/clang/include/clang/ASTMatchers/ASTMatchersMacros.h head/contrib/llvm/tools/clang/include/clang/ASTMatchers/Dynamic/Registry.h head/contrib/llvm/tools/clang/include/clang/ASTMatchers/Dynamic/VariantValue.h head/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/Consumed.h head/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/Dominators.h head/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/FormatString.h head/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/LiveVariables.h head/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/ThreadSafetyCommon.h head/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/ThreadSafetyUtil.h head/contrib/llvm/tools/clang/include/clang/Analysis/AnalysisContext.h head/contrib/llvm/tools/clang/include/clang/Analysis/CFG.h head/contrib/llvm/tools/clang/include/clang/Analysis/CallGraph.h head/contrib/llvm/tools/clang/include/clang/Analysis/ProgramPoint.h head/contrib/llvm/tools/clang/include/clang/Basic/Attr.td head/contrib/llvm/tools/clang/include/clang/Basic/AttrDocs.td head/contrib/llvm/tools/clang/include/clang/Basic/Attributes.h head/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def head/contrib/llvm/tools/clang/include/clang/Basic/Builtins.h head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsAMDGPU.def head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsARM.def head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsNVPTX.def head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsPPC.def head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsX86.def head/contrib/llvm/tools/clang/include/clang/Basic/DeclNodes.td head/contrib/llvm/tools/clang/include/clang/Basic/Diagnostic.h head/contrib/llvm/tools/clang/include/clang/Basic/Diagnostic.td head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticASTKinds.td head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticCommonKinds.td head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticDriverKinds.td head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticFrontendKinds.td head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticLexKinds.td head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticOptions.def head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticParseKinds.td head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSerializationKinds.td head/contrib/llvm/tools/clang/include/clang/Basic/FileManager.h head/contrib/llvm/tools/clang/include/clang/Basic/FileSystemStatCache.h head/contrib/llvm/tools/clang/include/clang/Basic/IdentifierTable.h head/contrib/llvm/tools/clang/include/clang/Basic/LLVM.h head/contrib/llvm/tools/clang/include/clang/Basic/LangOptions.def head/contrib/llvm/tools/clang/include/clang/Basic/LangOptions.h head/contrib/llvm/tools/clang/include/clang/Basic/Linkage.h head/contrib/llvm/tools/clang/include/clang/Basic/Module.h head/contrib/llvm/tools/clang/include/clang/Basic/ObjCRuntime.h head/contrib/llvm/tools/clang/include/clang/Basic/OpenCLExtensions.def head/contrib/llvm/tools/clang/include/clang/Basic/OpenCLImageTypes.def head/contrib/llvm/tools/clang/include/clang/Basic/OpenCLOptions.h head/contrib/llvm/tools/clang/include/clang/Basic/OpenMPKinds.def head/contrib/llvm/tools/clang/include/clang/Basic/OpenMPKinds.h head/contrib/llvm/tools/clang/include/clang/Basic/PlistSupport.h head/contrib/llvm/tools/clang/include/clang/Basic/SourceManager.h head/contrib/llvm/tools/clang/include/clang/Basic/SourceManagerInternals.h head/contrib/llvm/tools/clang/include/clang/Basic/Specifiers.h head/contrib/llvm/tools/clang/include/clang/Basic/StmtNodes.td head/contrib/llvm/tools/clang/include/clang/Basic/TargetBuiltins.h head/contrib/llvm/tools/clang/include/clang/Basic/TargetCXXABI.h head/contrib/llvm/tools/clang/include/clang/Basic/TargetInfo.h head/contrib/llvm/tools/clang/include/clang/Basic/TargetOptions.h head/contrib/llvm/tools/clang/include/clang/Basic/TokenKinds.def head/contrib/llvm/tools/clang/include/clang/Basic/Version.h head/contrib/llvm/tools/clang/include/clang/Basic/VirtualFileSystem.h head/contrib/llvm/tools/clang/include/clang/CodeGen/BackendUtil.h head/contrib/llvm/tools/clang/include/clang/CodeGen/CGFunctionInfo.h head/contrib/llvm/tools/clang/include/clang/CodeGen/ModuleBuilder.h head/contrib/llvm/tools/clang/include/clang/CodeGen/ObjectFilePCHContainerOperations.h head/contrib/llvm/tools/clang/include/clang/CodeGen/SwiftCallingConv.h head/contrib/llvm/tools/clang/include/clang/Driver/Action.h head/contrib/llvm/tools/clang/include/clang/Driver/CC1Options.td head/contrib/llvm/tools/clang/include/clang/Driver/CLCompatOptions.td head/contrib/llvm/tools/clang/include/clang/Driver/Compilation.h head/contrib/llvm/tools/clang/include/clang/Driver/Driver.h head/contrib/llvm/tools/clang/include/clang/Driver/Job.h head/contrib/llvm/tools/clang/include/clang/Driver/Multilib.h head/contrib/llvm/tools/clang/include/clang/Driver/Options.td head/contrib/llvm/tools/clang/include/clang/Driver/SanitizerArgs.h head/contrib/llvm/tools/clang/include/clang/Driver/Tool.h head/contrib/llvm/tools/clang/include/clang/Driver/ToolChain.h head/contrib/llvm/tools/clang/include/clang/Driver/Types.def head/contrib/llvm/tools/clang/include/clang/Driver/Types.h head/contrib/llvm/tools/clang/include/clang/Edit/Rewriters.h head/contrib/llvm/tools/clang/include/clang/Format/Format.h head/contrib/llvm/tools/clang/include/clang/Frontend/ASTUnit.h head/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.def head/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h head/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInstance.h head/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInvocation.h head/contrib/llvm/tools/clang/include/clang/Frontend/DiagnosticRenderer.h head/contrib/llvm/tools/clang/include/clang/Frontend/FrontendActions.h head/contrib/llvm/tools/clang/include/clang/Frontend/FrontendOptions.h head/contrib/llvm/tools/clang/include/clang/Frontend/FrontendPluginRegistry.h head/contrib/llvm/tools/clang/include/clang/Frontend/LangStandards.def head/contrib/llvm/tools/clang/include/clang/Frontend/PCHContainerOperations.h head/contrib/llvm/tools/clang/include/clang/Frontend/PreprocessorOutputOptions.h head/contrib/llvm/tools/clang/include/clang/Frontend/SerializedDiagnosticReader.h head/contrib/llvm/tools/clang/include/clang/Frontend/TextDiagnostic.h head/contrib/llvm/tools/clang/include/clang/Frontend/Utils.h head/contrib/llvm/tools/clang/include/clang/Index/CommentToXML.h head/contrib/llvm/tools/clang/include/clang/Index/IndexSymbol.h head/contrib/llvm/tools/clang/include/clang/Lex/DirectoryLookup.h head/contrib/llvm/tools/clang/include/clang/Lex/HeaderMap.h head/contrib/llvm/tools/clang/include/clang/Lex/HeaderSearch.h head/contrib/llvm/tools/clang/include/clang/Lex/HeaderSearchOptions.h head/contrib/llvm/tools/clang/include/clang/Lex/LiteralSupport.h head/contrib/llvm/tools/clang/include/clang/Lex/ModuleLoader.h head/contrib/llvm/tools/clang/include/clang/Lex/ModuleMap.h head/contrib/llvm/tools/clang/include/clang/Lex/PPCallbacks.h head/contrib/llvm/tools/clang/include/clang/Lex/PTHManager.h head/contrib/llvm/tools/clang/include/clang/Lex/PreprocessingRecord.h head/contrib/llvm/tools/clang/include/clang/Lex/Preprocessor.h head/contrib/llvm/tools/clang/include/clang/Lex/PreprocessorOptions.h head/contrib/llvm/tools/clang/include/clang/Parse/Parser.h head/contrib/llvm/tools/clang/include/clang/Rewrite/Core/HTMLRewrite.h head/contrib/llvm/tools/clang/include/clang/Sema/AttributeList.h head/contrib/llvm/tools/clang/include/clang/Sema/CodeCompleteConsumer.h head/contrib/llvm/tools/clang/include/clang/Sema/DeclSpec.h head/contrib/llvm/tools/clang/include/clang/Sema/DelayedDiagnostic.h head/contrib/llvm/tools/clang/include/clang/Sema/ExternalSemaSource.h head/contrib/llvm/tools/clang/include/clang/Sema/Initialization.h head/contrib/llvm/tools/clang/include/clang/Sema/MultiplexExternalSemaSource.h head/contrib/llvm/tools/clang/include/clang/Sema/Overload.h head/contrib/llvm/tools/clang/include/clang/Sema/Ownership.h head/contrib/llvm/tools/clang/include/clang/Sema/ScopeInfo.h head/contrib/llvm/tools/clang/include/clang/Sema/Sema.h head/contrib/llvm/tools/clang/include/clang/Sema/SemaInternal.h head/contrib/llvm/tools/clang/include/clang/Sema/Template.h head/contrib/llvm/tools/clang/include/clang/Sema/TemplateDeduction.h head/contrib/llvm/tools/clang/include/clang/Sema/TypoCorrection.h head/contrib/llvm/tools/clang/include/clang/Serialization/ASTBitCodes.h head/contrib/llvm/tools/clang/include/clang/Serialization/ASTReader.h head/contrib/llvm/tools/clang/include/clang/Serialization/ASTWriter.h head/contrib/llvm/tools/clang/include/clang/Serialization/Module.h head/contrib/llvm/tools/clang/include/clang/Serialization/ModuleFileExtension.h head/contrib/llvm/tools/clang/include/clang/Serialization/ModuleManager.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Checkers/Checkers.td head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Checkers/ObjCRetainCount.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Checkers/SValExplainer.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitor.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugType.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/Checker.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/CheckerManager.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/CheckerRegistry.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramStateTrait.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.def head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SubEngine.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SummaryManager.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Frontend/AnalysisConsumer.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Frontend/FrontendActions.h head/contrib/llvm/tools/clang/include/clang/Tooling/CompilationDatabase.h head/contrib/llvm/tools/clang/include/clang/Tooling/Core/Replacement.h head/contrib/llvm/tools/clang/include/clang/Tooling/FileMatchTrie.h head/contrib/llvm/tools/clang/include/clang/Tooling/JSONCompilationDatabase.h head/contrib/llvm/tools/clang/include/clang/Tooling/Refactoring.h head/contrib/llvm/tools/clang/include/clang/Tooling/ReplacementsYaml.h head/contrib/llvm/tools/clang/include/clang/Tooling/Tooling.h head/contrib/llvm/tools/clang/include/clang/module.modulemap head/contrib/llvm/tools/clang/lib/ARCMigrate/ARCMT.cpp head/contrib/llvm/tools/clang/lib/ARCMigrate/FileRemapper.cpp head/contrib/llvm/tools/clang/lib/ARCMigrate/Transforms.cpp head/contrib/llvm/tools/clang/lib/AST/APValue.cpp head/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp head/contrib/llvm/tools/clang/lib/AST/ASTDiagnostic.cpp head/contrib/llvm/tools/clang/lib/AST/ASTDumper.cpp head/contrib/llvm/tools/clang/lib/AST/ASTImporter.cpp head/contrib/llvm/tools/clang/lib/AST/ASTTypeTraits.cpp head/contrib/llvm/tools/clang/lib/AST/AttrImpl.cpp head/contrib/llvm/tools/clang/lib/AST/CXXABI.h head/contrib/llvm/tools/clang/lib/AST/CXXInheritance.cpp head/contrib/llvm/tools/clang/lib/AST/Comment.cpp head/contrib/llvm/tools/clang/lib/AST/CommentBriefParser.cpp head/contrib/llvm/tools/clang/lib/AST/CommentLexer.cpp head/contrib/llvm/tools/clang/lib/AST/CommentParser.cpp head/contrib/llvm/tools/clang/lib/AST/CommentSema.cpp head/contrib/llvm/tools/clang/lib/AST/Decl.cpp head/contrib/llvm/tools/clang/lib/AST/DeclBase.cpp head/contrib/llvm/tools/clang/lib/AST/DeclCXX.cpp head/contrib/llvm/tools/clang/lib/AST/DeclGroup.cpp head/contrib/llvm/tools/clang/lib/AST/DeclObjC.cpp head/contrib/llvm/tools/clang/lib/AST/DeclOpenMP.cpp head/contrib/llvm/tools/clang/lib/AST/DeclPrinter.cpp head/contrib/llvm/tools/clang/lib/AST/DeclTemplate.cpp head/contrib/llvm/tools/clang/lib/AST/DeclarationName.cpp head/contrib/llvm/tools/clang/lib/AST/Expr.cpp head/contrib/llvm/tools/clang/lib/AST/ExprCXX.cpp head/contrib/llvm/tools/clang/lib/AST/ExprClassification.cpp head/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp head/contrib/llvm/tools/clang/lib/AST/ExprObjC.cpp head/contrib/llvm/tools/clang/lib/AST/ItaniumCXXABI.cpp head/contrib/llvm/tools/clang/lib/AST/ItaniumMangle.cpp head/contrib/llvm/tools/clang/lib/AST/Mangle.cpp head/contrib/llvm/tools/clang/lib/AST/MicrosoftCXXABI.cpp head/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp head/contrib/llvm/tools/clang/lib/AST/NestedNameSpecifier.cpp head/contrib/llvm/tools/clang/lib/AST/OpenMPClause.cpp head/contrib/llvm/tools/clang/lib/AST/RawCommentList.cpp head/contrib/llvm/tools/clang/lib/AST/Stmt.cpp head/contrib/llvm/tools/clang/lib/AST/StmtCXX.cpp head/contrib/llvm/tools/clang/lib/AST/StmtObjC.cpp head/contrib/llvm/tools/clang/lib/AST/StmtOpenMP.cpp head/contrib/llvm/tools/clang/lib/AST/StmtPrinter.cpp head/contrib/llvm/tools/clang/lib/AST/StmtProfile.cpp head/contrib/llvm/tools/clang/lib/AST/TemplateBase.cpp head/contrib/llvm/tools/clang/lib/AST/Type.cpp head/contrib/llvm/tools/clang/lib/AST/TypeLoc.cpp head/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp head/contrib/llvm/tools/clang/lib/AST/VTableBuilder.cpp head/contrib/llvm/tools/clang/lib/ASTMatchers/ASTMatchFinder.cpp head/contrib/llvm/tools/clang/lib/ASTMatchers/ASTMatchersInternal.cpp head/contrib/llvm/tools/clang/lib/ASTMatchers/Dynamic/Marshallers.h head/contrib/llvm/tools/clang/lib/ASTMatchers/Dynamic/Parser.cpp head/contrib/llvm/tools/clang/lib/ASTMatchers/Dynamic/Registry.cpp head/contrib/llvm/tools/clang/lib/ASTMatchers/Dynamic/VariantValue.cpp head/contrib/llvm/tools/clang/lib/Analysis/AnalysisDeclContext.cpp head/contrib/llvm/tools/clang/lib/Analysis/BodyFarm.cpp head/contrib/llvm/tools/clang/lib/Analysis/CFG.cpp head/contrib/llvm/tools/clang/lib/Analysis/CallGraph.cpp head/contrib/llvm/tools/clang/lib/Analysis/Consumed.cpp head/contrib/llvm/tools/clang/lib/Analysis/FormatString.cpp head/contrib/llvm/tools/clang/lib/Analysis/FormatStringParsing.h head/contrib/llvm/tools/clang/lib/Analysis/LiveVariables.cpp head/contrib/llvm/tools/clang/lib/Analysis/PrintfFormatString.cpp head/contrib/llvm/tools/clang/lib/Analysis/ReachableCode.cpp head/contrib/llvm/tools/clang/lib/Analysis/ScanfFormatString.cpp head/contrib/llvm/tools/clang/lib/Analysis/ThreadSafety.cpp head/contrib/llvm/tools/clang/lib/Analysis/ThreadSafetyCommon.cpp head/contrib/llvm/tools/clang/lib/Analysis/UninitializedValues.cpp head/contrib/llvm/tools/clang/lib/Basic/Diagnostic.cpp head/contrib/llvm/tools/clang/lib/Basic/DiagnosticOptions.cpp head/contrib/llvm/tools/clang/lib/Basic/FileManager.cpp head/contrib/llvm/tools/clang/lib/Basic/FileSystemStatCache.cpp head/contrib/llvm/tools/clang/lib/Basic/IdentifierTable.cpp head/contrib/llvm/tools/clang/lib/Basic/LangOptions.cpp head/contrib/llvm/tools/clang/lib/Basic/Module.cpp head/contrib/llvm/tools/clang/lib/Basic/OpenMPKinds.cpp head/contrib/llvm/tools/clang/lib/Basic/SourceLocation.cpp head/contrib/llvm/tools/clang/lib/Basic/SourceManager.cpp head/contrib/llvm/tools/clang/lib/Basic/TargetInfo.cpp head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp head/contrib/llvm/tools/clang/lib/Basic/Version.cpp head/contrib/llvm/tools/clang/lib/Basic/VirtualFileSystem.cpp head/contrib/llvm/tools/clang/lib/CodeGen/ABIInfo.h head/contrib/llvm/tools/clang/lib/CodeGen/BackendUtil.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGAtomic.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.h head/contrib/llvm/tools/clang/lib/CodeGen/CGBuilder.h head/contrib/llvm/tools/clang/lib/CodeGen/CGBuiltin.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGCUDABuiltin.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGCUDANV.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGCUDARuntime.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGCXX.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.h head/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGCall.h head/contrib/llvm/tools/clang/lib/CodeGen/CGClass.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGCleanup.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGCleanup.h head/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.h head/contrib/llvm/tools/clang/lib/CodeGen/CGDecl.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGDeclCXX.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGException.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGExpr.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGExprCXX.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGExprComplex.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGExprConstant.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGExprScalar.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGLoopInfo.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGLoopInfo.h head/contrib/llvm/tools/clang/lib/CodeGen/CGObjC.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGObjCGNU.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGObjCMac.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGObjCRuntime.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGObjCRuntime.h head/contrib/llvm/tools/clang/lib/CodeGen/CGOpenCLRuntime.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGOpenCLRuntime.h head/contrib/llvm/tools/clang/lib/CodeGen/CGOpenMPRuntime.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGOpenMPRuntime.h head/contrib/llvm/tools/clang/lib/CodeGen/CGOpenMPRuntimeNVPTX.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGOpenMPRuntimeNVPTX.h head/contrib/llvm/tools/clang/lib/CodeGen/CGStmt.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGStmtOpenMP.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGVTT.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.h head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenAction.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.h head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.h head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenPGO.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenPGO.h head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypeCache.h head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.h head/contrib/llvm/tools/clang/lib/CodeGen/CoverageMappingGen.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CoverageMappingGen.h head/contrib/llvm/tools/clang/lib/CodeGen/EHScopeStack.h head/contrib/llvm/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp head/contrib/llvm/tools/clang/lib/CodeGen/MicrosoftCXXABI.cpp head/contrib/llvm/tools/clang/lib/CodeGen/ModuleBuilder.cpp head/contrib/llvm/tools/clang/lib/CodeGen/ObjectFilePCHContainerOperations.cpp head/contrib/llvm/tools/clang/lib/CodeGen/SanitizerMetadata.cpp head/contrib/llvm/tools/clang/lib/CodeGen/SwiftCallingConv.cpp head/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp head/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.h head/contrib/llvm/tools/clang/lib/Driver/Action.cpp head/contrib/llvm/tools/clang/lib/Driver/Compilation.cpp head/contrib/llvm/tools/clang/lib/Driver/CrossWindowsToolChain.cpp head/contrib/llvm/tools/clang/lib/Driver/Driver.cpp head/contrib/llvm/tools/clang/lib/Driver/Job.cpp head/contrib/llvm/tools/clang/lib/Driver/MSVCToolChain.cpp head/contrib/llvm/tools/clang/lib/Driver/MinGWToolChain.cpp head/contrib/llvm/tools/clang/lib/Driver/Multilib.cpp head/contrib/llvm/tools/clang/lib/Driver/SanitizerArgs.cpp head/contrib/llvm/tools/clang/lib/Driver/Tool.cpp head/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp head/contrib/llvm/tools/clang/lib/Driver/ToolChains.h head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp head/contrib/llvm/tools/clang/lib/Driver/Tools.h head/contrib/llvm/tools/clang/lib/Driver/Types.cpp head/contrib/llvm/tools/clang/lib/Edit/RewriteObjCFoundationAPI.cpp head/contrib/llvm/tools/clang/lib/Format/BreakableToken.cpp head/contrib/llvm/tools/clang/lib/Format/ContinuationIndenter.cpp head/contrib/llvm/tools/clang/lib/Format/Encoding.h head/contrib/llvm/tools/clang/lib/Format/Format.cpp head/contrib/llvm/tools/clang/lib/Format/FormatToken.cpp head/contrib/llvm/tools/clang/lib/Format/FormatToken.h head/contrib/llvm/tools/clang/lib/Format/FormatTokenLexer.cpp head/contrib/llvm/tools/clang/lib/Format/FormatTokenLexer.h head/contrib/llvm/tools/clang/lib/Format/SortJavaScriptImports.cpp head/contrib/llvm/tools/clang/lib/Format/TokenAnalyzer.cpp head/contrib/llvm/tools/clang/lib/Format/TokenAnalyzer.h head/contrib/llvm/tools/clang/lib/Format/TokenAnnotator.cpp head/contrib/llvm/tools/clang/lib/Format/TokenAnnotator.h head/contrib/llvm/tools/clang/lib/Format/UnwrappedLineFormatter.cpp head/contrib/llvm/tools/clang/lib/Format/UnwrappedLineFormatter.h head/contrib/llvm/tools/clang/lib/Format/UnwrappedLineParser.cpp head/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.cpp head/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.h head/contrib/llvm/tools/clang/lib/Frontend/ASTConsumers.cpp head/contrib/llvm/tools/clang/lib/Frontend/ASTUnit.cpp head/contrib/llvm/tools/clang/lib/Frontend/CacheTokens.cpp head/contrib/llvm/tools/clang/lib/Frontend/ChainedIncludesSource.cpp head/contrib/llvm/tools/clang/lib/Frontend/CompilerInstance.cpp head/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp head/contrib/llvm/tools/clang/lib/Frontend/CreateInvocationFromCommandLine.cpp head/contrib/llvm/tools/clang/lib/Frontend/DependencyFile.cpp head/contrib/llvm/tools/clang/lib/Frontend/DiagnosticRenderer.cpp head/contrib/llvm/tools/clang/lib/Frontend/FrontendAction.cpp head/contrib/llvm/tools/clang/lib/Frontend/FrontendActions.cpp head/contrib/llvm/tools/clang/lib/Frontend/FrontendOptions.cpp head/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp head/contrib/llvm/tools/clang/lib/Frontend/InitPreprocessor.cpp head/contrib/llvm/tools/clang/lib/Frontend/ModuleDependencyCollector.cpp head/contrib/llvm/tools/clang/lib/Frontend/MultiplexConsumer.cpp head/contrib/llvm/tools/clang/lib/Frontend/PCHContainerOperations.cpp head/contrib/llvm/tools/clang/lib/Frontend/PrintPreprocessedOutput.cpp head/contrib/llvm/tools/clang/lib/Frontend/Rewrite/FrontendActions.cpp head/contrib/llvm/tools/clang/lib/Frontend/Rewrite/HTMLPrint.cpp head/contrib/llvm/tools/clang/lib/Frontend/Rewrite/InclusionRewriter.cpp head/contrib/llvm/tools/clang/lib/Frontend/Rewrite/RewriteModernObjC.cpp head/contrib/llvm/tools/clang/lib/Frontend/Rewrite/RewriteObjC.cpp head/contrib/llvm/tools/clang/lib/Frontend/Rewrite/RewriteTest.cpp head/contrib/llvm/tools/clang/lib/Frontend/SerializedDiagnosticPrinter.cpp head/contrib/llvm/tools/clang/lib/Frontend/SerializedDiagnosticReader.cpp head/contrib/llvm/tools/clang/lib/Frontend/TestModuleFileExtension.cpp head/contrib/llvm/tools/clang/lib/Frontend/TextDiagnostic.cpp head/contrib/llvm/tools/clang/lib/Frontend/TextDiagnosticPrinter.cpp head/contrib/llvm/tools/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp head/contrib/llvm/tools/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp head/contrib/llvm/tools/clang/lib/Headers/__clang_cuda_cmath.h head/contrib/llvm/tools/clang/lib/Headers/__clang_cuda_intrinsics.h head/contrib/llvm/tools/clang/lib/Headers/__clang_cuda_math_forward_declares.h head/contrib/llvm/tools/clang/lib/Headers/__clang_cuda_runtime_wrapper.h head/contrib/llvm/tools/clang/lib/Headers/__wmmintrin_aes.h head/contrib/llvm/tools/clang/lib/Headers/__wmmintrin_pclmul.h head/contrib/llvm/tools/clang/lib/Headers/altivec.h head/contrib/llvm/tools/clang/lib/Headers/ammintrin.h head/contrib/llvm/tools/clang/lib/Headers/avx512bwintrin.h head/contrib/llvm/tools/clang/lib/Headers/avx512dqintrin.h head/contrib/llvm/tools/clang/lib/Headers/avx512fintrin.h head/contrib/llvm/tools/clang/lib/Headers/avx512vlbwintrin.h head/contrib/llvm/tools/clang/lib/Headers/avx512vldqintrin.h head/contrib/llvm/tools/clang/lib/Headers/avx512vlintrin.h head/contrib/llvm/tools/clang/lib/Headers/avxintrin.h head/contrib/llvm/tools/clang/lib/Headers/bmiintrin.h head/contrib/llvm/tools/clang/lib/Headers/emmintrin.h head/contrib/llvm/tools/clang/lib/Headers/f16cintrin.h head/contrib/llvm/tools/clang/lib/Headers/float.h head/contrib/llvm/tools/clang/lib/Headers/fxsrintrin.h head/contrib/llvm/tools/clang/lib/Headers/ia32intrin.h head/contrib/llvm/tools/clang/lib/Headers/immintrin.h head/contrib/llvm/tools/clang/lib/Headers/intrin.h head/contrib/llvm/tools/clang/lib/Headers/lzcntintrin.h head/contrib/llvm/tools/clang/lib/Headers/mmintrin.h head/contrib/llvm/tools/clang/lib/Headers/module.modulemap head/contrib/llvm/tools/clang/lib/Headers/opencl-c.h head/contrib/llvm/tools/clang/lib/Headers/pmmintrin.h head/contrib/llvm/tools/clang/lib/Headers/popcntintrin.h head/contrib/llvm/tools/clang/lib/Headers/stdatomic.h head/contrib/llvm/tools/clang/lib/Headers/tmmintrin.h head/contrib/llvm/tools/clang/lib/Headers/xmmintrin.h head/contrib/llvm/tools/clang/lib/Index/CommentToXML.cpp head/contrib/llvm/tools/clang/lib/Index/IndexBody.cpp head/contrib/llvm/tools/clang/lib/Index/IndexDecl.cpp head/contrib/llvm/tools/clang/lib/Index/IndexSymbol.cpp head/contrib/llvm/tools/clang/lib/Index/IndexTypeSourceInfo.cpp head/contrib/llvm/tools/clang/lib/Index/IndexingContext.cpp head/contrib/llvm/tools/clang/lib/Index/IndexingContext.h head/contrib/llvm/tools/clang/lib/Index/USRGeneration.cpp head/contrib/llvm/tools/clang/lib/Lex/HeaderMap.cpp head/contrib/llvm/tools/clang/lib/Lex/HeaderSearch.cpp head/contrib/llvm/tools/clang/lib/Lex/Lexer.cpp head/contrib/llvm/tools/clang/lib/Lex/LiteralSupport.cpp head/contrib/llvm/tools/clang/lib/Lex/MacroInfo.cpp head/contrib/llvm/tools/clang/lib/Lex/ModuleMap.cpp head/contrib/llvm/tools/clang/lib/Lex/PPCaching.cpp head/contrib/llvm/tools/clang/lib/Lex/PPDirectives.cpp head/contrib/llvm/tools/clang/lib/Lex/PPExpressions.cpp head/contrib/llvm/tools/clang/lib/Lex/PPLexerChange.cpp head/contrib/llvm/tools/clang/lib/Lex/PPMacroExpansion.cpp head/contrib/llvm/tools/clang/lib/Lex/PTHLexer.cpp head/contrib/llvm/tools/clang/lib/Lex/Pragma.cpp head/contrib/llvm/tools/clang/lib/Lex/PreprocessingRecord.cpp head/contrib/llvm/tools/clang/lib/Lex/Preprocessor.cpp head/contrib/llvm/tools/clang/lib/Lex/TokenConcatenation.cpp head/contrib/llvm/tools/clang/lib/Lex/TokenLexer.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseAST.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseCXXInlineMethods.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseDecl.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseExpr.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseExprCXX.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseInit.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseObjc.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseOpenMP.cpp head/contrib/llvm/tools/clang/lib/Parse/ParsePragma.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseStmtAsm.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseTemplate.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseTentative.cpp head/contrib/llvm/tools/clang/lib/Parse/Parser.cpp head/contrib/llvm/tools/clang/lib/Rewrite/HTMLRewrite.cpp head/contrib/llvm/tools/clang/lib/Sema/AnalysisBasedWarnings.cpp head/contrib/llvm/tools/clang/lib/Sema/AttributeList.cpp head/contrib/llvm/tools/clang/lib/Sema/CodeCompleteConsumer.cpp head/contrib/llvm/tools/clang/lib/Sema/DeclSpec.cpp head/contrib/llvm/tools/clang/lib/Sema/DelayedDiagnostic.cpp head/contrib/llvm/tools/clang/lib/Sema/JumpDiagnostics.cpp head/contrib/llvm/tools/clang/lib/Sema/MultiplexExternalSemaSource.cpp head/contrib/llvm/tools/clang/lib/Sema/ScopeInfo.cpp head/contrib/llvm/tools/clang/lib/Sema/Sema.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaAttr.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaCUDA.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaCXXScopeSpec.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaCast.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaCodeComplete.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaCoroutine.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaDeclObjC.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaExceptionSpec.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaExprCXX.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaExprMember.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaExprObjC.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaLambda.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaLookup.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaObjCProperty.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaOpenMP.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaOverload.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaPseudoObject.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaStmt.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaStmtAsm.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaStmtAttr.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateDeduction.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiate.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateVariadic.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp head/contrib/llvm/tools/clang/lib/Sema/TreeTransform.h head/contrib/llvm/tools/clang/lib/Sema/TypeLocBuilder.h head/contrib/llvm/tools/clang/lib/Serialization/ASTCommon.cpp head/contrib/llvm/tools/clang/lib/Serialization/ASTCommon.h head/contrib/llvm/tools/clang/lib/Serialization/ASTReader.cpp head/contrib/llvm/tools/clang/lib/Serialization/ASTReaderDecl.cpp head/contrib/llvm/tools/clang/lib/Serialization/ASTReaderInternals.h head/contrib/llvm/tools/clang/lib/Serialization/ASTReaderStmt.cpp head/contrib/llvm/tools/clang/lib/Serialization/ASTWriter.cpp head/contrib/llvm/tools/clang/lib/Serialization/ASTWriterDecl.cpp head/contrib/llvm/tools/clang/lib/Serialization/ASTWriterStmt.cpp head/contrib/llvm/tools/clang/lib/Serialization/GeneratePCH.cpp head/contrib/llvm/tools/clang/lib/Serialization/GlobalModuleIndex.cpp head/contrib/llvm/tools/clang/lib/Serialization/Module.cpp head/contrib/llvm/tools/clang/lib/Serialization/ModuleFileExtension.cpp head/contrib/llvm/tools/clang/lib/Serialization/ModuleManager.cpp head/contrib/llvm/tools/clang/lib/Serialization/MultiOnDiskHashTable.h head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ArrayBoundCheckerV2.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/BasicObjCFoundationChecks.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/BuiltinFunctionChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CStringChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CastSizeChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CastToStructChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CheckObjCDealloc.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CheckerDocumentation.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ChrootChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DynamicTypeChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DynamicTypePropagation.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ExprInspectionChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/LocalizationChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MPI-Checker/MPIBugReporter.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MPI-Checker/MPIBugReporter.h head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MPI-Checker/MPIChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MPI-Checker/MPIChecker.h head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MPI-Checker/MPIFunctionClassifier.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MPI-Checker/MPITypes.h head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MacOSXAPIChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/NullabilityChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCSuperDeallocChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/PaddingChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/PointerArithChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/StreamChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/TestAfterDivZeroChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UnixAPIChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UnreachableCodeChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/VirtualCallChecker.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/AnalyzerOptions.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BasicValueFactory.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BugReporter.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CallEvent.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CheckerManager.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CheckerRegistry.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CoreEngine.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExplodedGraph.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineC.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/IssueHash.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/MemRegion.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/PathDiagnostic.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ProgramState.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/RegionStore.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SValBuilder.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SVals.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SimpleConstraintManager.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SimpleConstraintManager.h head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SimpleSValBuilder.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/Store.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SymbolManager.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/CheckerRegistration.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/ModelInjector.cpp head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/ModelInjector.h head/contrib/llvm/tools/clang/lib/Tooling/ArgumentsAdjusters.cpp head/contrib/llvm/tools/clang/lib/Tooling/CompilationDatabase.cpp head/contrib/llvm/tools/clang/lib/Tooling/Core/Lookup.cpp head/contrib/llvm/tools/clang/lib/Tooling/Core/QualTypeNames.cpp head/contrib/llvm/tools/clang/lib/Tooling/Core/Replacement.cpp head/contrib/llvm/tools/clang/lib/Tooling/JSONCompilationDatabase.cpp head/contrib/llvm/tools/clang/lib/Tooling/Refactoring.cpp head/contrib/llvm/tools/clang/lib/Tooling/RefactoringCallbacks.cpp head/contrib/llvm/tools/clang/lib/Tooling/Tooling.cpp head/contrib/llvm/tools/clang/tools/clang-format/ClangFormat.cpp head/contrib/llvm/tools/clang/tools/driver/cc1_main.cpp head/contrib/llvm/tools/clang/tools/driver/cc1as_main.cpp head/contrib/llvm/tools/clang/tools/driver/driver.cpp head/contrib/llvm/tools/clang/utils/TableGen/ClangASTNodesEmitter.cpp head/contrib/llvm/tools/clang/utils/TableGen/ClangAttrEmitter.cpp head/contrib/llvm/tools/clang/utils/TableGen/ClangDiagnosticsEmitter.cpp head/contrib/llvm/tools/clang/utils/TableGen/NeonEmitter.cpp head/contrib/llvm/tools/clang/utils/TableGen/TableGen.cpp head/contrib/llvm/tools/clang/utils/TableGen/TableGenBackends.h head/contrib/llvm/tools/llc/llc.cpp head/contrib/llvm/tools/lld/CMakeLists.txt head/contrib/llvm/tools/lld/COFF/CMakeLists.txt head/contrib/llvm/tools/lld/COFF/Chunks.cpp head/contrib/llvm/tools/lld/COFF/Chunks.h head/contrib/llvm/tools/lld/COFF/Config.h head/contrib/llvm/tools/lld/COFF/DLL.cpp head/contrib/llvm/tools/lld/COFF/Driver.cpp head/contrib/llvm/tools/lld/COFF/Driver.h head/contrib/llvm/tools/lld/COFF/DriverUtils.cpp head/contrib/llvm/tools/lld/COFF/Error.cpp head/contrib/llvm/tools/lld/COFF/Error.h head/contrib/llvm/tools/lld/COFF/ICF.cpp head/contrib/llvm/tools/lld/COFF/InputFiles.cpp head/contrib/llvm/tools/lld/COFF/InputFiles.h head/contrib/llvm/tools/lld/COFF/Librarian.cpp head/contrib/llvm/tools/lld/COFF/MarkLive.cpp head/contrib/llvm/tools/lld/COFF/ModuleDef.cpp head/contrib/llvm/tools/lld/COFF/Options.td head/contrib/llvm/tools/lld/COFF/PDB.cpp head/contrib/llvm/tools/lld/COFF/SymbolTable.cpp head/contrib/llvm/tools/lld/COFF/SymbolTable.h head/contrib/llvm/tools/lld/COFF/Symbols.cpp head/contrib/llvm/tools/lld/COFF/Symbols.h head/contrib/llvm/tools/lld/COFF/Writer.cpp head/contrib/llvm/tools/lld/COFF/Writer.h head/contrib/llvm/tools/lld/ELF/CMakeLists.txt head/contrib/llvm/tools/lld/ELF/Config.h head/contrib/llvm/tools/lld/ELF/Driver.cpp head/contrib/llvm/tools/lld/ELF/Driver.h head/contrib/llvm/tools/lld/ELF/DriverUtils.cpp head/contrib/llvm/tools/lld/ELF/EhFrame.cpp head/contrib/llvm/tools/lld/ELF/EhFrame.h head/contrib/llvm/tools/lld/ELF/Error.cpp head/contrib/llvm/tools/lld/ELF/Error.h head/contrib/llvm/tools/lld/ELF/ICF.cpp head/contrib/llvm/tools/lld/ELF/InputFiles.cpp head/contrib/llvm/tools/lld/ELF/InputFiles.h head/contrib/llvm/tools/lld/ELF/InputSection.cpp head/contrib/llvm/tools/lld/ELF/InputSection.h head/contrib/llvm/tools/lld/ELF/LTO.cpp head/contrib/llvm/tools/lld/ELF/LTO.h head/contrib/llvm/tools/lld/ELF/LinkerScript.cpp head/contrib/llvm/tools/lld/ELF/LinkerScript.h head/contrib/llvm/tools/lld/ELF/MarkLive.cpp head/contrib/llvm/tools/lld/ELF/Options.td head/contrib/llvm/tools/lld/ELF/OutputSections.cpp head/contrib/llvm/tools/lld/ELF/OutputSections.h head/contrib/llvm/tools/lld/ELF/Relocations.cpp head/contrib/llvm/tools/lld/ELF/Relocations.h head/contrib/llvm/tools/lld/ELF/ScriptParser.cpp head/contrib/llvm/tools/lld/ELF/ScriptParser.h head/contrib/llvm/tools/lld/ELF/Strings.cpp head/contrib/llvm/tools/lld/ELF/Strings.h head/contrib/llvm/tools/lld/ELF/SymbolTable.cpp head/contrib/llvm/tools/lld/ELF/SymbolTable.h head/contrib/llvm/tools/lld/ELF/Symbols.cpp head/contrib/llvm/tools/lld/ELF/Symbols.h head/contrib/llvm/tools/lld/ELF/Target.cpp head/contrib/llvm/tools/lld/ELF/Target.h head/contrib/llvm/tools/lld/ELF/Thunks.cpp head/contrib/llvm/tools/lld/ELF/Writer.cpp head/contrib/llvm/tools/lld/ELF/Writer.h head/contrib/llvm/tools/lld/include/lld/Config/Version.h head/contrib/llvm/tools/lld/include/lld/Config/Version.inc.in head/contrib/llvm/tools/lld/include/lld/Core/Atom.h head/contrib/llvm/tools/lld/include/lld/Core/DefinedAtom.h head/contrib/llvm/tools/lld/include/lld/Core/LinkingContext.h head/contrib/llvm/tools/lld/include/lld/Core/Node.h head/contrib/llvm/tools/lld/include/lld/Core/Parallel.h head/contrib/llvm/tools/lld/include/lld/Core/Pass.h head/contrib/llvm/tools/lld/include/lld/Core/PassManager.h head/contrib/llvm/tools/lld/include/lld/Core/Reader.h head/contrib/llvm/tools/lld/include/lld/Core/Reference.h head/contrib/llvm/tools/lld/include/lld/Core/Simple.h head/contrib/llvm/tools/lld/include/lld/Core/SymbolTable.h head/contrib/llvm/tools/lld/include/lld/Driver/Driver.h head/contrib/llvm/tools/lld/include/lld/ReaderWriter/MachOLinkingContext.h head/contrib/llvm/tools/lld/lib/Config/CMakeLists.txt head/contrib/llvm/tools/lld/lib/Config/Version.cpp head/contrib/llvm/tools/lld/lib/Core/CMakeLists.txt head/contrib/llvm/tools/lld/lib/Core/DefinedAtom.cpp head/contrib/llvm/tools/lld/lib/Core/Error.cpp head/contrib/llvm/tools/lld/lib/Core/File.cpp head/contrib/llvm/tools/lld/lib/Core/LinkingContext.cpp head/contrib/llvm/tools/lld/lib/Core/Reader.cpp head/contrib/llvm/tools/lld/lib/Core/Resolver.cpp head/contrib/llvm/tools/lld/lib/Core/SymbolTable.cpp head/contrib/llvm/tools/lld/lib/Core/Writer.cpp head/contrib/llvm/tools/lld/lib/Driver/CMakeLists.txt head/contrib/llvm/tools/lld/lib/Driver/DarwinLdDriver.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/CMakeLists.txt head/contrib/llvm/tools/lld/lib/ReaderWriter/FileArchive.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/ArchHandler_arm.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/ArchHandler_arm64.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/ArchHandler_x86.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/ArchHandler_x86_64.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/CMakeLists.txt head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/CompactUnwindPass.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/File.h head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/GOTPass.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/LayoutPass.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/ObjCPass.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/ShimPass.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/StubsPass.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/TLVPass.cpp head/contrib/llvm/tools/lld/lib/ReaderWriter/YAML/CMakeLists.txt head/contrib/llvm/tools/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp head/contrib/llvm/tools/lld/tools/lld/CMakeLists.txt head/contrib/llvm/tools/lld/tools/lld/lld.cpp head/contrib/llvm/tools/lldb/include/lldb/API/LLDB.h head/contrib/llvm/tools/lldb/include/lldb/API/SBAddress.h head/contrib/llvm/tools/lldb/include/lldb/API/SBAttachInfo.h head/contrib/llvm/tools/lldb/include/lldb/API/SBBlock.h head/contrib/llvm/tools/lldb/include/lldb/API/SBBreakpoint.h head/contrib/llvm/tools/lldb/include/lldb/API/SBBreakpointLocation.h head/contrib/llvm/tools/lldb/include/lldb/API/SBBroadcaster.h head/contrib/llvm/tools/lldb/include/lldb/API/SBCommandInterpreter.h head/contrib/llvm/tools/lldb/include/lldb/API/SBCommandReturnObject.h head/contrib/llvm/tools/lldb/include/lldb/API/SBCommunication.h head/contrib/llvm/tools/lldb/include/lldb/API/SBCompileUnit.h head/contrib/llvm/tools/lldb/include/lldb/API/SBData.h head/contrib/llvm/tools/lldb/include/lldb/API/SBDebugger.h head/contrib/llvm/tools/lldb/include/lldb/API/SBDeclaration.h head/contrib/llvm/tools/lldb/include/lldb/API/SBDefines.h head/contrib/llvm/tools/lldb/include/lldb/API/SBError.h head/contrib/llvm/tools/lldb/include/lldb/API/SBEvent.h head/contrib/llvm/tools/lldb/include/lldb/API/SBExecutionContext.h head/contrib/llvm/tools/lldb/include/lldb/API/SBExpressionOptions.h head/contrib/llvm/tools/lldb/include/lldb/API/SBFileSpec.h head/contrib/llvm/tools/lldb/include/lldb/API/SBFileSpecList.h head/contrib/llvm/tools/lldb/include/lldb/API/SBFrame.h head/contrib/llvm/tools/lldb/include/lldb/API/SBFunction.h head/contrib/llvm/tools/lldb/include/lldb/API/SBHostOS.h head/contrib/llvm/tools/lldb/include/lldb/API/SBInstruction.h head/contrib/llvm/tools/lldb/include/lldb/API/SBInstructionList.h head/contrib/llvm/tools/lldb/include/lldb/API/SBLanguageRuntime.h head/contrib/llvm/tools/lldb/include/lldb/API/SBLaunchInfo.h head/contrib/llvm/tools/lldb/include/lldb/API/SBLineEntry.h head/contrib/llvm/tools/lldb/include/lldb/API/SBListener.h head/contrib/llvm/tools/lldb/include/lldb/API/SBMemoryRegionInfo.h head/contrib/llvm/tools/lldb/include/lldb/API/SBMemoryRegionInfoList.h head/contrib/llvm/tools/lldb/include/lldb/API/SBModule.h head/contrib/llvm/tools/lldb/include/lldb/API/SBModuleSpec.h head/contrib/llvm/tools/lldb/include/lldb/API/SBPlatform.h head/contrib/llvm/tools/lldb/include/lldb/API/SBProcess.h head/contrib/llvm/tools/lldb/include/lldb/API/SBQueue.h head/contrib/llvm/tools/lldb/include/lldb/API/SBQueueItem.h head/contrib/llvm/tools/lldb/include/lldb/API/SBSection.h head/contrib/llvm/tools/lldb/include/lldb/API/SBSourceManager.h head/contrib/llvm/tools/lldb/include/lldb/API/SBStream.h head/contrib/llvm/tools/lldb/include/lldb/API/SBStringList.h head/contrib/llvm/tools/lldb/include/lldb/API/SBSymbol.h head/contrib/llvm/tools/lldb/include/lldb/API/SBSymbolContext.h head/contrib/llvm/tools/lldb/include/lldb/API/SBSymbolContextList.h head/contrib/llvm/tools/lldb/include/lldb/API/SBTarget.h head/contrib/llvm/tools/lldb/include/lldb/API/SBThread.h head/contrib/llvm/tools/lldb/include/lldb/API/SBThreadCollection.h head/contrib/llvm/tools/lldb/include/lldb/API/SBThreadPlan.h head/contrib/llvm/tools/lldb/include/lldb/API/SBType.h head/contrib/llvm/tools/lldb/include/lldb/API/SBTypeCategory.h head/contrib/llvm/tools/lldb/include/lldb/API/SBTypeEnumMember.h head/contrib/llvm/tools/lldb/include/lldb/API/SBTypeFilter.h head/contrib/llvm/tools/lldb/include/lldb/API/SBTypeFormat.h head/contrib/llvm/tools/lldb/include/lldb/API/SBTypeNameSpecifier.h head/contrib/llvm/tools/lldb/include/lldb/API/SBTypeSummary.h head/contrib/llvm/tools/lldb/include/lldb/API/SBTypeSynthetic.h head/contrib/llvm/tools/lldb/include/lldb/API/SBUnixSignals.h head/contrib/llvm/tools/lldb/include/lldb/API/SBValue.h head/contrib/llvm/tools/lldb/include/lldb/API/SBValueList.h head/contrib/llvm/tools/lldb/include/lldb/API/SBVariablesOptions.h head/contrib/llvm/tools/lldb/include/lldb/API/SBWatchpoint.h head/contrib/llvm/tools/lldb/include/lldb/API/SystemInitializerFull.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/Breakpoint.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointID.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointIDList.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointList.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocation.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocationCollection.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocationList.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointOptions.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointResolver.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointResolverAddress.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointResolverFileLine.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointResolverFileRegex.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointResolverName.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointSite.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointSiteList.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/Stoppoint.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/StoppointCallbackContext.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/StoppointLocation.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/Watchpoint.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/WatchpointList.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/WatchpointOptions.h head/contrib/llvm/tools/lldb/include/lldb/Core/Address.h head/contrib/llvm/tools/lldb/include/lldb/Core/AddressRange.h head/contrib/llvm/tools/lldb/include/lldb/Core/AddressResolver.h head/contrib/llvm/tools/lldb/include/lldb/Core/AddressResolverFileLine.h head/contrib/llvm/tools/lldb/include/lldb/Core/AddressResolverName.h head/contrib/llvm/tools/lldb/include/lldb/Core/ArchSpec.h head/contrib/llvm/tools/lldb/include/lldb/Core/Baton.h head/contrib/llvm/tools/lldb/include/lldb/Core/Broadcaster.h head/contrib/llvm/tools/lldb/include/lldb/Core/ClangForward.h head/contrib/llvm/tools/lldb/include/lldb/Core/Communication.h head/contrib/llvm/tools/lldb/include/lldb/Core/Connection.h head/contrib/llvm/tools/lldb/include/lldb/Core/ConstString.h head/contrib/llvm/tools/lldb/include/lldb/Core/DataBuffer.h head/contrib/llvm/tools/lldb/include/lldb/Core/DataBufferHeap.h head/contrib/llvm/tools/lldb/include/lldb/Core/DataBufferMemoryMap.h head/contrib/llvm/tools/lldb/include/lldb/Core/DataEncoder.h head/contrib/llvm/tools/lldb/include/lldb/Core/DataExtractor.h head/contrib/llvm/tools/lldb/include/lldb/Core/Debugger.h head/contrib/llvm/tools/lldb/include/lldb/Core/Disassembler.h head/contrib/llvm/tools/lldb/include/lldb/Core/EmulateInstruction.h head/contrib/llvm/tools/lldb/include/lldb/Core/Error.h head/contrib/llvm/tools/lldb/include/lldb/Core/Event.h head/contrib/llvm/tools/lldb/include/lldb/Core/FastDemangle.h head/contrib/llvm/tools/lldb/include/lldb/Core/FileLineResolver.h head/contrib/llvm/tools/lldb/include/lldb/Core/FileSpecList.h head/contrib/llvm/tools/lldb/include/lldb/Core/Flags.h head/contrib/llvm/tools/lldb/include/lldb/Core/FormatEntity.h head/contrib/llvm/tools/lldb/include/lldb/Core/History.h head/contrib/llvm/tools/lldb/include/lldb/Core/IOHandler.h head/contrib/llvm/tools/lldb/include/lldb/Core/IOStreamMacros.h head/contrib/llvm/tools/lldb/include/lldb/Core/Listener.h head/contrib/llvm/tools/lldb/include/lldb/Core/LoadedModuleInfoList.h head/contrib/llvm/tools/lldb/include/lldb/Core/Log.h head/contrib/llvm/tools/lldb/include/lldb/Core/Logging.h head/contrib/llvm/tools/lldb/include/lldb/Core/Mangled.h head/contrib/llvm/tools/lldb/include/lldb/Core/MappedHash.h head/contrib/llvm/tools/lldb/include/lldb/Core/Module.h head/contrib/llvm/tools/lldb/include/lldb/Core/ModuleChild.h head/contrib/llvm/tools/lldb/include/lldb/Core/ModuleList.h head/contrib/llvm/tools/lldb/include/lldb/Core/ModuleSpec.h head/contrib/llvm/tools/lldb/include/lldb/Core/Opcode.h head/contrib/llvm/tools/lldb/include/lldb/Core/PluginInterface.h head/contrib/llvm/tools/lldb/include/lldb/Core/PluginManager.h head/contrib/llvm/tools/lldb/include/lldb/Core/RangeMap.h head/contrib/llvm/tools/lldb/include/lldb/Core/RegisterValue.h head/contrib/llvm/tools/lldb/include/lldb/Core/RegularExpression.h head/contrib/llvm/tools/lldb/include/lldb/Core/STLUtils.h head/contrib/llvm/tools/lldb/include/lldb/Core/Scalar.h head/contrib/llvm/tools/lldb/include/lldb/Core/SearchFilter.h head/contrib/llvm/tools/lldb/include/lldb/Core/Section.h head/contrib/llvm/tools/lldb/include/lldb/Core/SourceManager.h head/contrib/llvm/tools/lldb/include/lldb/Core/State.h head/contrib/llvm/tools/lldb/include/lldb/Core/Stream.h head/contrib/llvm/tools/lldb/include/lldb/Core/StreamAsynchronousIO.h head/contrib/llvm/tools/lldb/include/lldb/Core/StreamBuffer.h head/contrib/llvm/tools/lldb/include/lldb/Core/StreamCallback.h head/contrib/llvm/tools/lldb/include/lldb/Core/StreamFile.h head/contrib/llvm/tools/lldb/include/lldb/Core/StreamGDBRemote.h head/contrib/llvm/tools/lldb/include/lldb/Core/StreamString.h head/contrib/llvm/tools/lldb/include/lldb/Core/StreamTee.h head/contrib/llvm/tools/lldb/include/lldb/Core/StringList.h head/contrib/llvm/tools/lldb/include/lldb/Core/StructuredData.h head/contrib/llvm/tools/lldb/include/lldb/Core/ThreadSafeDenseMap.h head/contrib/llvm/tools/lldb/include/lldb/Core/ThreadSafeDenseSet.h head/contrib/llvm/tools/lldb/include/lldb/Core/ThreadSafeSTLMap.h head/contrib/llvm/tools/lldb/include/lldb/Core/ThreadSafeSTLVector.h head/contrib/llvm/tools/lldb/include/lldb/Core/ThreadSafeValue.h head/contrib/llvm/tools/lldb/include/lldb/Core/Timer.h head/contrib/llvm/tools/lldb/include/lldb/Core/UUID.h head/contrib/llvm/tools/lldb/include/lldb/Core/UniqueCStringMap.h head/contrib/llvm/tools/lldb/include/lldb/Core/UserID.h head/contrib/llvm/tools/lldb/include/lldb/Core/UserSettingsController.h head/contrib/llvm/tools/lldb/include/lldb/Core/VMRange.h head/contrib/llvm/tools/lldb/include/lldb/Core/Value.h head/contrib/llvm/tools/lldb/include/lldb/Core/ValueObject.h head/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectCast.h head/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectChild.h head/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectConstResult.h head/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectConstResultCast.h head/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectConstResultChild.h head/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectConstResultImpl.h head/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectDynamicValue.h head/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectList.h head/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectMemory.h head/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectRegister.h head/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h head/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectVariable.h head/contrib/llvm/tools/lldb/include/lldb/Core/dwarf.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/CXXFunctionPointer.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/DataVisualization.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/DumpValueObjectOptions.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatCache.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatClasses.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatManager.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormattersContainer.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormattersHelpers.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/LanguageCategory.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/StringPrinter.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeCategory.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeCategoryMap.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeFormat.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeSummary.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeSynthetic.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeValidator.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/ValueObjectPrinter.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/VectorIterator.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/VectorType.h head/contrib/llvm/tools/lldb/include/lldb/Expression/DWARFExpression.h head/contrib/llvm/tools/lldb/include/lldb/Expression/DiagnosticManager.h head/contrib/llvm/tools/lldb/include/lldb/Expression/Expression.h head/contrib/llvm/tools/lldb/include/lldb/Expression/ExpressionParser.h head/contrib/llvm/tools/lldb/include/lldb/Expression/ExpressionSourceCode.h head/contrib/llvm/tools/lldb/include/lldb/Expression/ExpressionTypeSystemHelper.h head/contrib/llvm/tools/lldb/include/lldb/Expression/ExpressionVariable.h head/contrib/llvm/tools/lldb/include/lldb/Expression/FunctionCaller.h head/contrib/llvm/tools/lldb/include/lldb/Expression/IRDynamicChecks.h head/contrib/llvm/tools/lldb/include/lldb/Expression/IRExecutionUnit.h head/contrib/llvm/tools/lldb/include/lldb/Expression/IRInterpreter.h head/contrib/llvm/tools/lldb/include/lldb/Expression/IRMemoryMap.h head/contrib/llvm/tools/lldb/include/lldb/Expression/LLVMUserExpression.h head/contrib/llvm/tools/lldb/include/lldb/Expression/Materializer.h head/contrib/llvm/tools/lldb/include/lldb/Expression/REPL.h head/contrib/llvm/tools/lldb/include/lldb/Expression/UserExpression.h head/contrib/llvm/tools/lldb/include/lldb/Expression/UtilityFunction.h head/contrib/llvm/tools/lldb/include/lldb/Host/Config.h head/contrib/llvm/tools/lldb/include/lldb/Host/Debug.h head/contrib/llvm/tools/lldb/include/lldb/Host/Editline.h head/contrib/llvm/tools/lldb/include/lldb/Host/Endian.h head/contrib/llvm/tools/lldb/include/lldb/Host/File.h head/contrib/llvm/tools/lldb/include/lldb/Host/FileCache.h head/contrib/llvm/tools/lldb/include/lldb/Host/FileSpec.h head/contrib/llvm/tools/lldb/include/lldb/Host/FileSystem.h head/contrib/llvm/tools/lldb/include/lldb/Host/Host.h head/contrib/llvm/tools/lldb/include/lldb/Host/HostGetOpt.h head/contrib/llvm/tools/lldb/include/lldb/Host/HostInfo.h head/contrib/llvm/tools/lldb/include/lldb/Host/HostInfoBase.h head/contrib/llvm/tools/lldb/include/lldb/Host/HostNativeProcess.h head/contrib/llvm/tools/lldb/include/lldb/Host/HostNativeProcessBase.h head/contrib/llvm/tools/lldb/include/lldb/Host/HostNativeThreadBase.h head/contrib/llvm/tools/lldb/include/lldb/Host/HostNativeThreadForward.h head/contrib/llvm/tools/lldb/include/lldb/Host/HostProcess.h head/contrib/llvm/tools/lldb/include/lldb/Host/HostThread.h head/contrib/llvm/tools/lldb/include/lldb/Host/IOObject.h head/contrib/llvm/tools/lldb/include/lldb/Host/LockFile.h head/contrib/llvm/tools/lldb/include/lldb/Host/LockFileBase.h head/contrib/llvm/tools/lldb/include/lldb/Host/MainLoop.h head/contrib/llvm/tools/lldb/include/lldb/Host/MainLoopBase.h head/contrib/llvm/tools/lldb/include/lldb/Host/MonitoringProcessLauncher.h head/contrib/llvm/tools/lldb/include/lldb/Host/OptionParser.h head/contrib/llvm/tools/lldb/include/lldb/Host/Pipe.h head/contrib/llvm/tools/lldb/include/lldb/Host/PipeBase.h head/contrib/llvm/tools/lldb/include/lldb/Host/Predicate.h head/contrib/llvm/tools/lldb/include/lldb/Host/ProcessLauncher.h head/contrib/llvm/tools/lldb/include/lldb/Host/ProcessRunLock.h head/contrib/llvm/tools/lldb/include/lldb/Host/Socket.h head/contrib/llvm/tools/lldb/include/lldb/Host/SocketAddress.h head/contrib/llvm/tools/lldb/include/lldb/Host/StringConvert.h head/contrib/llvm/tools/lldb/include/lldb/Host/Symbols.h head/contrib/llvm/tools/lldb/include/lldb/Host/Terminal.h head/contrib/llvm/tools/lldb/include/lldb/Host/ThisThread.h head/contrib/llvm/tools/lldb/include/lldb/Host/ThreadLauncher.h head/contrib/llvm/tools/lldb/include/lldb/Host/Time.h head/contrib/llvm/tools/lldb/include/lldb/Host/XML.h head/contrib/llvm/tools/lldb/include/lldb/Host/common/GetOptInc.h head/contrib/llvm/tools/lldb/include/lldb/Host/common/NativeBreakpoint.h head/contrib/llvm/tools/lldb/include/lldb/Host/common/NativeBreakpointList.h head/contrib/llvm/tools/lldb/include/lldb/Host/common/NativeProcessProtocol.h head/contrib/llvm/tools/lldb/include/lldb/Host/common/NativeRegisterContext.h head/contrib/llvm/tools/lldb/include/lldb/Host/common/NativeRegisterContextRegisterInfo.h head/contrib/llvm/tools/lldb/include/lldb/Host/common/NativeThreadProtocol.h head/contrib/llvm/tools/lldb/include/lldb/Host/common/NativeWatchpointList.h head/contrib/llvm/tools/lldb/include/lldb/Host/common/SoftwareBreakpoint.h head/contrib/llvm/tools/lldb/include/lldb/Host/common/TCPSocket.h head/contrib/llvm/tools/lldb/include/lldb/Host/common/UDPSocket.h head/contrib/llvm/tools/lldb/include/lldb/Host/freebsd/Config.h head/contrib/llvm/tools/lldb/include/lldb/Host/freebsd/HostInfoFreeBSD.h head/contrib/llvm/tools/lldb/include/lldb/Host/freebsd/HostThreadFreeBSD.h head/contrib/llvm/tools/lldb/include/lldb/Host/netbsd/HostInfoNetBSD.h head/contrib/llvm/tools/lldb/include/lldb/Host/netbsd/HostThreadNetBSD.h head/contrib/llvm/tools/lldb/include/lldb/Host/posix/ConnectionFileDescriptorPosix.h head/contrib/llvm/tools/lldb/include/lldb/Host/posix/DomainSocket.h head/contrib/llvm/tools/lldb/include/lldb/Host/posix/Fcntl.h head/contrib/llvm/tools/lldb/include/lldb/Host/posix/HostInfoPosix.h head/contrib/llvm/tools/lldb/include/lldb/Host/posix/HostProcessPosix.h head/contrib/llvm/tools/lldb/include/lldb/Host/posix/HostThreadPosix.h head/contrib/llvm/tools/lldb/include/lldb/Host/posix/LockFilePosix.h head/contrib/llvm/tools/lldb/include/lldb/Host/posix/MainLoopPosix.h head/contrib/llvm/tools/lldb/include/lldb/Host/posix/PipePosix.h head/contrib/llvm/tools/lldb/include/lldb/Host/posix/ProcessLauncherPosix.h head/contrib/llvm/tools/lldb/include/lldb/Initialization/SystemInitializer.h head/contrib/llvm/tools/lldb/include/lldb/Initialization/SystemInitializerCommon.h head/contrib/llvm/tools/lldb/include/lldb/Initialization/SystemLifetimeManager.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/Args.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/CommandAlias.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/CommandCompletions.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/CommandHistory.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/CommandInterpreter.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/CommandObject.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/CommandObjectMultiword.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/CommandObjectRegexCommand.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/CommandOptionValidators.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/CommandReturnObject.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionGroupArchitecture.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionGroupBoolean.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionGroupFile.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionGroupFormat.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionGroupOutputFile.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionGroupPlatform.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionGroupString.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionGroupUInt64.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionGroupUUID.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionGroupValueObjectDisplay.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionGroupVariable.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionGroupWatchpoint.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValue.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueArch.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueArgs.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueArray.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueBoolean.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueChar.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueDictionary.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueEnumeration.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueFileSpec.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueFileSpecList.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueFormat.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueFormatEntity.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueLanguage.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValuePathMappings.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueProperties.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueRegex.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueSInt64.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueString.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueUInt64.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueUUID.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValues.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/Options.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/Property.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/ScriptInterpreter.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/ArmUnwindInfo.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/Block.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangASTContext.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangASTImporter.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangExternalASTSourceCommon.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangUtil.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/CompactUnwindInfo.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/CompileUnit.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/CompilerDecl.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/CompilerDeclContext.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/CompilerType.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/DWARFCallFrameInfo.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/DebugMacros.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/DeclVendor.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/Declaration.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/FuncUnwinders.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/Function.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/GoASTContext.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/JavaASTContext.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/LineEntry.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/LineTable.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/ObjectContainer.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/ObjectFile.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/Symbol.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/SymbolContext.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/SymbolContextScope.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/SymbolFile.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/SymbolVendor.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/Symtab.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/TaggedASTType.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/Type.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/TypeList.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/TypeMap.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/TypeSystem.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/UnwindPlan.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/UnwindTable.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/Variable.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/VariableList.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/VerifyDecl.h head/contrib/llvm/tools/lldb/include/lldb/Target/ABI.h head/contrib/llvm/tools/lldb/include/lldb/Target/CPPLanguageRuntime.h head/contrib/llvm/tools/lldb/include/lldb/Target/DynamicLoader.h head/contrib/llvm/tools/lldb/include/lldb/Target/ExecutionContext.h head/contrib/llvm/tools/lldb/include/lldb/Target/ExecutionContextScope.h head/contrib/llvm/tools/lldb/include/lldb/Target/FileAction.h head/contrib/llvm/tools/lldb/include/lldb/Target/InstrumentationRuntime.h head/contrib/llvm/tools/lldb/include/lldb/Target/InstrumentationRuntimeStopInfo.h head/contrib/llvm/tools/lldb/include/lldb/Target/JITLoader.h head/contrib/llvm/tools/lldb/include/lldb/Target/JITLoaderList.h head/contrib/llvm/tools/lldb/include/lldb/Target/Language.h head/contrib/llvm/tools/lldb/include/lldb/Target/LanguageRuntime.h head/contrib/llvm/tools/lldb/include/lldb/Target/Memory.h head/contrib/llvm/tools/lldb/include/lldb/Target/MemoryHistory.h head/contrib/llvm/tools/lldb/include/lldb/Target/MemoryRegionInfo.h head/contrib/llvm/tools/lldb/include/lldb/Target/ObjCLanguageRuntime.h head/contrib/llvm/tools/lldb/include/lldb/Target/OperatingSystem.h head/contrib/llvm/tools/lldb/include/lldb/Target/PathMappingList.h head/contrib/llvm/tools/lldb/include/lldb/Target/Platform.h head/contrib/llvm/tools/lldb/include/lldb/Target/Process.h head/contrib/llvm/tools/lldb/include/lldb/Target/ProcessInfo.h head/contrib/llvm/tools/lldb/include/lldb/Target/ProcessLaunchInfo.h head/contrib/llvm/tools/lldb/include/lldb/Target/Queue.h head/contrib/llvm/tools/lldb/include/lldb/Target/QueueItem.h head/contrib/llvm/tools/lldb/include/lldb/Target/QueueList.h head/contrib/llvm/tools/lldb/include/lldb/Target/RegisterCheckpoint.h head/contrib/llvm/tools/lldb/include/lldb/Target/RegisterContext.h head/contrib/llvm/tools/lldb/include/lldb/Target/SectionLoadHistory.h head/contrib/llvm/tools/lldb/include/lldb/Target/SectionLoadList.h head/contrib/llvm/tools/lldb/include/lldb/Target/StackFrame.h head/contrib/llvm/tools/lldb/include/lldb/Target/StackFrameList.h head/contrib/llvm/tools/lldb/include/lldb/Target/StackID.h head/contrib/llvm/tools/lldb/include/lldb/Target/StopInfo.h head/contrib/llvm/tools/lldb/include/lldb/Target/SystemRuntime.h head/contrib/llvm/tools/lldb/include/lldb/Target/Target.h head/contrib/llvm/tools/lldb/include/lldb/Target/TargetList.h head/contrib/llvm/tools/lldb/include/lldb/Target/Thread.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadCollection.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadList.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlan.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanBase.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallFunction.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallFunctionUsingABI.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallUserExpression.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanPython.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanRunToAddress.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanShouldStopHere.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanStepInRange.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanStepInstruction.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanStepOut.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanStepOverBreakpoint.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanStepOverRange.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanStepRange.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanStepThrough.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanStepUntil.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanTracer.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadSpec.h head/contrib/llvm/tools/lldb/include/lldb/Target/UnixSignals.h head/contrib/llvm/tools/lldb/include/lldb/Target/Unwind.h head/contrib/llvm/tools/lldb/include/lldb/Target/UnwindAssembly.h head/contrib/llvm/tools/lldb/include/lldb/Utility/AnsiTerminal.h head/contrib/llvm/tools/lldb/include/lldb/Utility/CleanUp.h head/contrib/llvm/tools/lldb/include/lldb/Utility/ConvertEnum.h head/contrib/llvm/tools/lldb/include/lldb/Utility/Either.h head/contrib/llvm/tools/lldb/include/lldb/Utility/Iterable.h head/contrib/llvm/tools/lldb/include/lldb/Utility/JSON.h head/contrib/llvm/tools/lldb/include/lldb/Utility/LLDBAssert.h head/contrib/llvm/tools/lldb/include/lldb/Utility/NameMatches.h head/contrib/llvm/tools/lldb/include/lldb/Utility/PriorityPointerPair.h head/contrib/llvm/tools/lldb/include/lldb/Utility/ProcessStructReader.h head/contrib/llvm/tools/lldb/include/lldb/Utility/PseudoTerminal.h head/contrib/llvm/tools/lldb/include/lldb/Utility/Range.h head/contrib/llvm/tools/lldb/include/lldb/Utility/RegisterNumber.h head/contrib/llvm/tools/lldb/include/lldb/Utility/SafeMachO.h head/contrib/llvm/tools/lldb/include/lldb/Utility/SharedCluster.h head/contrib/llvm/tools/lldb/include/lldb/Utility/SharingPtr.h head/contrib/llvm/tools/lldb/include/lldb/Utility/StringExtractor.h head/contrib/llvm/tools/lldb/include/lldb/Utility/StringLexer.h head/contrib/llvm/tools/lldb/include/lldb/Utility/TaskPool.h head/contrib/llvm/tools/lldb/include/lldb/lldb-defines.h head/contrib/llvm/tools/lldb/include/lldb/lldb-enumerations.h head/contrib/llvm/tools/lldb/include/lldb/lldb-forward.h head/contrib/llvm/tools/lldb/include/lldb/lldb-private-defines.h head/contrib/llvm/tools/lldb/include/lldb/lldb-private-enumerations.h head/contrib/llvm/tools/lldb/include/lldb/lldb-private-forward.h head/contrib/llvm/tools/lldb/include/lldb/lldb-private-interfaces.h head/contrib/llvm/tools/lldb/include/lldb/lldb-private-types.h head/contrib/llvm/tools/lldb/include/lldb/lldb-private.h head/contrib/llvm/tools/lldb/include/lldb/lldb-public.h head/contrib/llvm/tools/lldb/include/lldb/lldb-types.h head/contrib/llvm/tools/lldb/include/lldb/lldb-versioning.h head/contrib/llvm/tools/lldb/source/API/SBAddress.cpp head/contrib/llvm/tools/lldb/source/API/SBAttachInfo.cpp head/contrib/llvm/tools/lldb/source/API/SBBlock.cpp head/contrib/llvm/tools/lldb/source/API/SBBreakpoint.cpp head/contrib/llvm/tools/lldb/source/API/SBBreakpointLocation.cpp head/contrib/llvm/tools/lldb/source/API/SBBroadcaster.cpp head/contrib/llvm/tools/lldb/source/API/SBCommandInterpreter.cpp head/contrib/llvm/tools/lldb/source/API/SBCommandReturnObject.cpp head/contrib/llvm/tools/lldb/source/API/SBCommunication.cpp head/contrib/llvm/tools/lldb/source/API/SBCompileUnit.cpp head/contrib/llvm/tools/lldb/source/API/SBData.cpp head/contrib/llvm/tools/lldb/source/API/SBDebugger.cpp head/contrib/llvm/tools/lldb/source/API/SBDeclaration.cpp head/contrib/llvm/tools/lldb/source/API/SBError.cpp head/contrib/llvm/tools/lldb/source/API/SBEvent.cpp head/contrib/llvm/tools/lldb/source/API/SBExecutionContext.cpp head/contrib/llvm/tools/lldb/source/API/SBExpressionOptions.cpp head/contrib/llvm/tools/lldb/source/API/SBFileSpec.cpp head/contrib/llvm/tools/lldb/source/API/SBFileSpecList.cpp head/contrib/llvm/tools/lldb/source/API/SBFrame.cpp head/contrib/llvm/tools/lldb/source/API/SBFunction.cpp head/contrib/llvm/tools/lldb/source/API/SBHostOS.cpp head/contrib/llvm/tools/lldb/source/API/SBInstruction.cpp head/contrib/llvm/tools/lldb/source/API/SBInstructionList.cpp head/contrib/llvm/tools/lldb/source/API/SBLanguageRuntime.cpp head/contrib/llvm/tools/lldb/source/API/SBLaunchInfo.cpp head/contrib/llvm/tools/lldb/source/API/SBLineEntry.cpp head/contrib/llvm/tools/lldb/source/API/SBListener.cpp head/contrib/llvm/tools/lldb/source/API/SBMemoryRegionInfo.cpp head/contrib/llvm/tools/lldb/source/API/SBMemoryRegionInfoList.cpp head/contrib/llvm/tools/lldb/source/API/SBModule.cpp head/contrib/llvm/tools/lldb/source/API/SBModuleSpec.cpp head/contrib/llvm/tools/lldb/source/API/SBPlatform.cpp head/contrib/llvm/tools/lldb/source/API/SBProcess.cpp head/contrib/llvm/tools/lldb/source/API/SBQueue.cpp head/contrib/llvm/tools/lldb/source/API/SBQueueItem.cpp head/contrib/llvm/tools/lldb/source/API/SBSection.cpp head/contrib/llvm/tools/lldb/source/API/SBSourceManager.cpp head/contrib/llvm/tools/lldb/source/API/SBStream.cpp head/contrib/llvm/tools/lldb/source/API/SBStringList.cpp head/contrib/llvm/tools/lldb/source/API/SBSymbol.cpp head/contrib/llvm/tools/lldb/source/API/SBSymbolContext.cpp head/contrib/llvm/tools/lldb/source/API/SBSymbolContextList.cpp head/contrib/llvm/tools/lldb/source/API/SBTarget.cpp head/contrib/llvm/tools/lldb/source/API/SBThread.cpp head/contrib/llvm/tools/lldb/source/API/SBThreadCollection.cpp head/contrib/llvm/tools/lldb/source/API/SBThreadPlan.cpp head/contrib/llvm/tools/lldb/source/API/SBType.cpp head/contrib/llvm/tools/lldb/source/API/SBTypeCategory.cpp head/contrib/llvm/tools/lldb/source/API/SBTypeEnumMember.cpp head/contrib/llvm/tools/lldb/source/API/SBTypeFilter.cpp head/contrib/llvm/tools/lldb/source/API/SBTypeFormat.cpp head/contrib/llvm/tools/lldb/source/API/SBTypeNameSpecifier.cpp head/contrib/llvm/tools/lldb/source/API/SBTypeSummary.cpp head/contrib/llvm/tools/lldb/source/API/SBTypeSynthetic.cpp head/contrib/llvm/tools/lldb/source/API/SBUnixSignals.cpp head/contrib/llvm/tools/lldb/source/API/SBValue.cpp head/contrib/llvm/tools/lldb/source/API/SBValueList.cpp head/contrib/llvm/tools/lldb/source/API/SBVariablesOptions.cpp head/contrib/llvm/tools/lldb/source/API/SBWatchpoint.cpp head/contrib/llvm/tools/lldb/source/API/SystemInitializerFull.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/Breakpoint.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointID.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointIDList.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointList.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocation.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocationCollection.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocationList.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointOptions.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolver.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverAddress.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverFileLine.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverFileRegex.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverName.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointSite.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointSiteList.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/Stoppoint.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/StoppointCallbackContext.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/StoppointLocation.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/Watchpoint.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/WatchpointList.cpp head/contrib/llvm/tools/lldb/source/Breakpoint/WatchpointOptions.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandCompletions.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectApropos.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectApropos.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectArgs.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectArgs.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectBreakpoint.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectBreakpoint.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectBreakpointCommand.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectBreakpointCommand.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectBugreport.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectBugreport.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectCommands.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectCommands.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectDisassemble.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectDisassemble.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectExpression.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectExpression.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectFrame.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectFrame.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectGUI.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectGUI.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectHelp.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectHelp.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectLanguage.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectLanguage.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectLog.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectLog.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectMemory.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectMemory.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectMultiword.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectPlatform.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectPlatform.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectPlugin.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectPlugin.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectProcess.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectProcess.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectQuit.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectQuit.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectRegister.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectRegister.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectSettings.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectSettings.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectSource.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectSource.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectSyntax.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectSyntax.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectTarget.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectTarget.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectThread.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectThread.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectType.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectType.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectVersion.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectVersion.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectWatchpoint.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectWatchpoint.h head/contrib/llvm/tools/lldb/source/Commands/CommandObjectWatchpointCommand.cpp head/contrib/llvm/tools/lldb/source/Commands/CommandObjectWatchpointCommand.h head/contrib/llvm/tools/lldb/source/Core/Address.cpp head/contrib/llvm/tools/lldb/source/Core/AddressRange.cpp head/contrib/llvm/tools/lldb/source/Core/AddressResolver.cpp head/contrib/llvm/tools/lldb/source/Core/AddressResolverFileLine.cpp head/contrib/llvm/tools/lldb/source/Core/AddressResolverName.cpp head/contrib/llvm/tools/lldb/source/Core/ArchSpec.cpp head/contrib/llvm/tools/lldb/source/Core/Baton.cpp head/contrib/llvm/tools/lldb/source/Core/Broadcaster.cpp head/contrib/llvm/tools/lldb/source/Core/Communication.cpp head/contrib/llvm/tools/lldb/source/Core/Connection.cpp head/contrib/llvm/tools/lldb/source/Core/ConstString.cpp head/contrib/llvm/tools/lldb/source/Core/DataBufferHeap.cpp head/contrib/llvm/tools/lldb/source/Core/DataBufferMemoryMap.cpp head/contrib/llvm/tools/lldb/source/Core/DataEncoder.cpp head/contrib/llvm/tools/lldb/source/Core/DataExtractor.cpp head/contrib/llvm/tools/lldb/source/Core/Debugger.cpp head/contrib/llvm/tools/lldb/source/Core/Disassembler.cpp head/contrib/llvm/tools/lldb/source/Core/DynamicLoader.cpp head/contrib/llvm/tools/lldb/source/Core/EmulateInstruction.cpp head/contrib/llvm/tools/lldb/source/Core/Error.cpp head/contrib/llvm/tools/lldb/source/Core/Event.cpp head/contrib/llvm/tools/lldb/source/Core/FastDemangle.cpp head/contrib/llvm/tools/lldb/source/Core/FileLineResolver.cpp head/contrib/llvm/tools/lldb/source/Core/FileSpecList.cpp head/contrib/llvm/tools/lldb/source/Core/FormatEntity.cpp head/contrib/llvm/tools/lldb/source/Core/History.cpp head/contrib/llvm/tools/lldb/source/Core/IOHandler.cpp head/contrib/llvm/tools/lldb/source/Core/Listener.cpp head/contrib/llvm/tools/lldb/source/Core/Log.cpp head/contrib/llvm/tools/lldb/source/Core/Logging.cpp head/contrib/llvm/tools/lldb/source/Core/Mangled.cpp head/contrib/llvm/tools/lldb/source/Core/Module.cpp head/contrib/llvm/tools/lldb/source/Core/ModuleChild.cpp head/contrib/llvm/tools/lldb/source/Core/ModuleList.cpp head/contrib/llvm/tools/lldb/source/Core/Opcode.cpp head/contrib/llvm/tools/lldb/source/Core/PluginManager.cpp head/contrib/llvm/tools/lldb/source/Core/RegisterValue.cpp head/contrib/llvm/tools/lldb/source/Core/RegularExpression.cpp head/contrib/llvm/tools/lldb/source/Core/Scalar.cpp head/contrib/llvm/tools/lldb/source/Core/SearchFilter.cpp head/contrib/llvm/tools/lldb/source/Core/Section.cpp head/contrib/llvm/tools/lldb/source/Core/SourceManager.cpp head/contrib/llvm/tools/lldb/source/Core/State.cpp head/contrib/llvm/tools/lldb/source/Core/Stream.cpp head/contrib/llvm/tools/lldb/source/Core/StreamAsynchronousIO.cpp head/contrib/llvm/tools/lldb/source/Core/StreamCallback.cpp head/contrib/llvm/tools/lldb/source/Core/StreamFile.cpp head/contrib/llvm/tools/lldb/source/Core/StreamGDBRemote.cpp head/contrib/llvm/tools/lldb/source/Core/StreamString.cpp head/contrib/llvm/tools/lldb/source/Core/StringList.cpp head/contrib/llvm/tools/lldb/source/Core/StructuredData.cpp head/contrib/llvm/tools/lldb/source/Core/Timer.cpp head/contrib/llvm/tools/lldb/source/Core/UUID.cpp head/contrib/llvm/tools/lldb/source/Core/UserID.cpp head/contrib/llvm/tools/lldb/source/Core/UserSettingsController.cpp head/contrib/llvm/tools/lldb/source/Core/VMRange.cpp head/contrib/llvm/tools/lldb/source/Core/Value.cpp head/contrib/llvm/tools/lldb/source/Core/ValueObject.cpp head/contrib/llvm/tools/lldb/source/Core/ValueObjectCast.cpp head/contrib/llvm/tools/lldb/source/Core/ValueObjectChild.cpp head/contrib/llvm/tools/lldb/source/Core/ValueObjectConstResult.cpp head/contrib/llvm/tools/lldb/source/Core/ValueObjectConstResultCast.cpp head/contrib/llvm/tools/lldb/source/Core/ValueObjectConstResultChild.cpp head/contrib/llvm/tools/lldb/source/Core/ValueObjectConstResultImpl.cpp head/contrib/llvm/tools/lldb/source/Core/ValueObjectDynamicValue.cpp head/contrib/llvm/tools/lldb/source/Core/ValueObjectList.cpp head/contrib/llvm/tools/lldb/source/Core/ValueObjectMemory.cpp head/contrib/llvm/tools/lldb/source/Core/ValueObjectRegister.cpp head/contrib/llvm/tools/lldb/source/Core/ValueObjectSyntheticFilter.cpp head/contrib/llvm/tools/lldb/source/Core/ValueObjectVariable.cpp head/contrib/llvm/tools/lldb/source/DataFormatters/CXXFunctionPointer.cpp head/contrib/llvm/tools/lldb/source/DataFormatters/DataVisualization.cpp head/contrib/llvm/tools/lldb/source/DataFormatters/DumpValueObjectOptions.cpp head/contrib/llvm/tools/lldb/source/DataFormatters/FormatCache.cpp head/contrib/llvm/tools/lldb/source/DataFormatters/FormatClasses.cpp head/contrib/llvm/tools/lldb/source/DataFormatters/FormatManager.cpp head/contrib/llvm/tools/lldb/source/DataFormatters/FormattersHelpers.cpp head/contrib/llvm/tools/lldb/source/DataFormatters/LanguageCategory.cpp head/contrib/llvm/tools/lldb/source/DataFormatters/StringPrinter.cpp head/contrib/llvm/tools/lldb/source/DataFormatters/TypeCategory.cpp head/contrib/llvm/tools/lldb/source/DataFormatters/TypeCategoryMap.cpp head/contrib/llvm/tools/lldb/source/DataFormatters/TypeFormat.cpp head/contrib/llvm/tools/lldb/source/DataFormatters/TypeSummary.cpp head/contrib/llvm/tools/lldb/source/DataFormatters/TypeSynthetic.cpp head/contrib/llvm/tools/lldb/source/DataFormatters/TypeValidator.cpp head/contrib/llvm/tools/lldb/source/DataFormatters/ValueObjectPrinter.cpp head/contrib/llvm/tools/lldb/source/DataFormatters/VectorType.cpp head/contrib/llvm/tools/lldb/source/Expression/DWARFExpression.cpp head/contrib/llvm/tools/lldb/source/Expression/DiagnosticManager.cpp head/contrib/llvm/tools/lldb/source/Expression/Expression.cpp head/contrib/llvm/tools/lldb/source/Expression/ExpressionSourceCode.cpp head/contrib/llvm/tools/lldb/source/Expression/ExpressionVariable.cpp head/contrib/llvm/tools/lldb/source/Expression/FunctionCaller.cpp head/contrib/llvm/tools/lldb/source/Expression/IRDynamicChecks.cpp head/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp head/contrib/llvm/tools/lldb/source/Expression/IRInterpreter.cpp head/contrib/llvm/tools/lldb/source/Expression/IRMemoryMap.cpp head/contrib/llvm/tools/lldb/source/Expression/LLVMUserExpression.cpp head/contrib/llvm/tools/lldb/source/Expression/Materializer.cpp head/contrib/llvm/tools/lldb/source/Expression/REPL.cpp head/contrib/llvm/tools/lldb/source/Expression/UserExpression.cpp head/contrib/llvm/tools/lldb/source/Expression/UtilityFunction.cpp head/contrib/llvm/tools/lldb/source/Host/common/Editline.cpp head/contrib/llvm/tools/lldb/source/Host/common/File.cpp head/contrib/llvm/tools/lldb/source/Host/common/FileCache.cpp head/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp head/contrib/llvm/tools/lldb/source/Host/common/FileSystem.cpp head/contrib/llvm/tools/lldb/source/Host/common/GetOptInc.cpp head/contrib/llvm/tools/lldb/source/Host/common/Host.cpp head/contrib/llvm/tools/lldb/source/Host/common/HostInfoBase.cpp head/contrib/llvm/tools/lldb/source/Host/common/HostNativeThreadBase.cpp head/contrib/llvm/tools/lldb/source/Host/common/HostProcess.cpp head/contrib/llvm/tools/lldb/source/Host/common/HostThread.cpp head/contrib/llvm/tools/lldb/source/Host/common/LockFileBase.cpp head/contrib/llvm/tools/lldb/source/Host/common/MonitoringProcessLauncher.cpp head/contrib/llvm/tools/lldb/source/Host/common/NativeBreakpoint.cpp head/contrib/llvm/tools/lldb/source/Host/common/NativeBreakpointList.cpp head/contrib/llvm/tools/lldb/source/Host/common/NativeProcessProtocol.cpp head/contrib/llvm/tools/lldb/source/Host/common/NativeRegisterContext.cpp head/contrib/llvm/tools/lldb/source/Host/common/NativeRegisterContextRegisterInfo.cpp head/contrib/llvm/tools/lldb/source/Host/common/NativeThreadProtocol.cpp head/contrib/llvm/tools/lldb/source/Host/common/NativeWatchpointList.cpp head/contrib/llvm/tools/lldb/source/Host/common/OptionParser.cpp head/contrib/llvm/tools/lldb/source/Host/common/PipeBase.cpp head/contrib/llvm/tools/lldb/source/Host/common/ProcessRunLock.cpp head/contrib/llvm/tools/lldb/source/Host/common/Socket.cpp head/contrib/llvm/tools/lldb/source/Host/common/SocketAddress.cpp head/contrib/llvm/tools/lldb/source/Host/common/SoftwareBreakpoint.cpp head/contrib/llvm/tools/lldb/source/Host/common/StringConvert.cpp head/contrib/llvm/tools/lldb/source/Host/common/Symbols.cpp head/contrib/llvm/tools/lldb/source/Host/common/TCPSocket.cpp head/contrib/llvm/tools/lldb/source/Host/common/Terminal.cpp head/contrib/llvm/tools/lldb/source/Host/common/ThisThread.cpp head/contrib/llvm/tools/lldb/source/Host/common/ThreadLauncher.cpp head/contrib/llvm/tools/lldb/source/Host/common/UDPSocket.cpp head/contrib/llvm/tools/lldb/source/Host/common/XML.cpp head/contrib/llvm/tools/lldb/source/Host/freebsd/Host.cpp head/contrib/llvm/tools/lldb/source/Host/freebsd/HostInfoFreeBSD.cpp head/contrib/llvm/tools/lldb/source/Host/freebsd/HostThreadFreeBSD.cpp head/contrib/llvm/tools/lldb/source/Host/freebsd/ThisThread.cpp head/contrib/llvm/tools/lldb/source/Host/netbsd/Host.cpp head/contrib/llvm/tools/lldb/source/Host/netbsd/HostInfoNetBSD.cpp head/contrib/llvm/tools/lldb/source/Host/netbsd/HostThreadNetBSD.cpp head/contrib/llvm/tools/lldb/source/Host/netbsd/ThisThread.cpp head/contrib/llvm/tools/lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp head/contrib/llvm/tools/lldb/source/Host/posix/DomainSocket.cpp head/contrib/llvm/tools/lldb/source/Host/posix/FileSystem.cpp head/contrib/llvm/tools/lldb/source/Host/posix/HostInfoPosix.cpp head/contrib/llvm/tools/lldb/source/Host/posix/HostProcessPosix.cpp head/contrib/llvm/tools/lldb/source/Host/posix/HostThreadPosix.cpp head/contrib/llvm/tools/lldb/source/Host/posix/LockFilePosix.cpp head/contrib/llvm/tools/lldb/source/Host/posix/MainLoopPosix.cpp head/contrib/llvm/tools/lldb/source/Host/posix/PipePosix.cpp head/contrib/llvm/tools/lldb/source/Host/posix/ProcessLauncherPosix.cpp head/contrib/llvm/tools/lldb/source/Initialization/SystemInitializer.cpp head/contrib/llvm/tools/lldb/source/Initialization/SystemInitializerCommon.cpp head/contrib/llvm/tools/lldb/source/Initialization/SystemLifetimeManager.cpp head/contrib/llvm/tools/lldb/source/Interpreter/Args.cpp head/contrib/llvm/tools/lldb/source/Interpreter/CommandAlias.cpp head/contrib/llvm/tools/lldb/source/Interpreter/CommandHistory.cpp head/contrib/llvm/tools/lldb/source/Interpreter/CommandInterpreter.cpp head/contrib/llvm/tools/lldb/source/Interpreter/CommandObject.cpp head/contrib/llvm/tools/lldb/source/Interpreter/CommandObjectRegexCommand.cpp head/contrib/llvm/tools/lldb/source/Interpreter/CommandObjectScript.cpp head/contrib/llvm/tools/lldb/source/Interpreter/CommandObjectScript.h head/contrib/llvm/tools/lldb/source/Interpreter/CommandOptionValidators.cpp head/contrib/llvm/tools/lldb/source/Interpreter/CommandReturnObject.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupArchitecture.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupBoolean.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupFile.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupFormat.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupOutputFile.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupPlatform.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupString.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupUInt64.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupUUID.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupValueObjectDisplay.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupVariable.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupWatchpoint.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValue.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValueArch.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValueArgs.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValueArray.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValueBoolean.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValueChar.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValueDictionary.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValueEnumeration.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValueFileSpec.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValueFileSpecLIst.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValueFormat.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValueFormatEntity.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValueLanguage.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValuePathMappings.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValueProperties.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValueRegex.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValueSInt64.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValueString.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValueUInt64.cpp head/contrib/llvm/tools/lldb/source/Interpreter/OptionValueUUID.cpp head/contrib/llvm/tools/lldb/source/Interpreter/Options.cpp head/contrib/llvm/tools/lldb/source/Interpreter/Property.cpp head/contrib/llvm/tools/lldb/source/Interpreter/ScriptInterpreter.cpp head/contrib/llvm/tools/lldb/source/Interpreter/embedded_interpreter.py head/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp head/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h head/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp head/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h head/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp head/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-arm/ABISysV_arm.cpp head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-arm/ABISysV_arm.h head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.cpp head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.h head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.cpp head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.h head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-i386/ABISysV_i386.cpp head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-i386/ABISysV_i386.h head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-mips/ABISysV_mips.cpp head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-mips/ABISysV_mips.h head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.cpp head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.h head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.cpp head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.h head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.cpp head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.h head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-s390x/ABISysV_s390x.cpp head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-s390x/ABISysV_s390x.h head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp head/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h head/contrib/llvm/tools/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp head/contrib/llvm/tools/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h head/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/DynamicLoaderHexagonDYLD.cpp head/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/DynamicLoaderHexagonDYLD.h head/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/HexagonDYLDRendezvous.cpp head/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/HexagonDYLDRendezvous.h head/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp head/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h head/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp head/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.h head/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp head/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h head/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp head/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.h head/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.cpp head/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ASTDumper.cpp head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ASTDumper.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ASTResultSynthesizer.cpp head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ASTResultSynthesizer.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ASTStructExtractor.cpp head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ASTStructExtractor.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangDiagnostic.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionHelper.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionVariable.cpp head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionVariable.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangFunctionCaller.cpp head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangFunctionCaller.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangPersistentVariables.cpp head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangPersistentVariables.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangUtilityFunction.cpp head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/ClangUtilityFunction.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Go/GoAST.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Go/GoLexer.cpp head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Go/GoLexer.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Go/GoParser.cpp head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Go/GoParser.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Go/GoUserExpression.cpp head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Go/GoUserExpression.h head/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Go/gen_go_ast.py head/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp head/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h head/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulationStateARM.cpp head/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulationStateARM.h head/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.h head/contrib/llvm/tools/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp head/contrib/llvm/tools/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.h head/contrib/llvm/tools/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h head/contrib/llvm/tools/lldb/source/Plugins/InstrumentationRuntime/AddressSanitizer/AddressSanitizerRuntime.cpp head/contrib/llvm/tools/lldb/source/Plugins/InstrumentationRuntime/AddressSanitizer/AddressSanitizerRuntime.h head/contrib/llvm/tools/lldb/source/Plugins/InstrumentationRuntime/ThreadSanitizer/ThreadSanitizerRuntime.cpp head/contrib/llvm/tools/lldb/source/Plugins/InstrumentationRuntime/ThreadSanitizer/ThreadSanitizerRuntime.h head/contrib/llvm/tools/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp head/contrib/llvm/tools/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.h head/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.h head/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h head/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/CxxStringTypes.h head/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h head/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.h head/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.h head/contrib/llvm/tools/lldb/source/Plugins/Language/Go/GoFormatterFunctions.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/Go/GoFormatterFunctions.h head/contrib/llvm/tools/lldb/source/Plugins/Language/Go/GoLanguage.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/Go/GoLanguage.h head/contrib/llvm/tools/lldb/source/Plugins/Language/Java/JavaFormatterFunctions.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/Java/JavaFormatterFunctions.h head/contrib/llvm/tools/lldb/source/Plugins/Language/Java/JavaLanguage.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/Java/JavaLanguage.h head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjC/CF.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjC/CF.h head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjC/Cocoa.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjC/Cocoa.h head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjC/CoreMedia.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjC/CoreMedia.h head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjC/NSArray.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjC/NSDictionary.h head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjC/NSError.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjC/NSException.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjC/NSSet.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjC/NSSet.h head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjC/NSString.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjC/NSString.h head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjC/ObjCLanguage.h head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.cpp head/contrib/llvm/tools/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/Go/GoLanguageRuntime.cpp head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/Go/GoLanguageRuntime.h head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/Java/JavaLanguageRuntime.cpp head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/Java/JavaLanguageRuntime.h head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCClassDescriptorV2.cpp head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCClassDescriptorV2.h head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.h head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.h head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.h head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp head/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h head/contrib/llvm/tools/lldb/source/Plugins/MemoryHistory/asan/MemoryHistoryASan.cpp head/contrib/llvm/tools/lldb/source/Plugins/MemoryHistory/asan/MemoryHistoryASan.h head/contrib/llvm/tools/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp head/contrib/llvm/tools/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h head/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ELFHeader.cpp head/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ELFHeader.h head/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp head/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h head/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/JIT/ObjectFileJIT.cpp head/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/JIT/ObjectFileJIT.h head/contrib/llvm/tools/lldb/source/Plugins/OperatingSystem/Go/OperatingSystemGo.cpp head/contrib/llvm/tools/lldb/source/Plugins/OperatingSystem/Go/OperatingSystemGo.h head/contrib/llvm/tools/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp head/contrib/llvm/tools/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h head/contrib/llvm/tools/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp head/contrib/llvm/tools/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h head/contrib/llvm/tools/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp head/contrib/llvm/tools/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.h head/contrib/llvm/tools/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp head/contrib/llvm/tools/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.h head/contrib/llvm/tools/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp head/contrib/llvm/tools/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.h head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/POSIXStopInfo.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/POSIXStopInfo.h head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.h head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIX.h head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm.h head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_mips64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_mips64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_powerpc.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_powerpc.h head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_x86.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_x86.h head/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/CrashReason.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/CrashReason.h head/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessMessage.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessMessage.h head/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIXLog.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIXLog.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/ARMDefines.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/ARMUtils.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/DynamicRegisterInfo.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/DynamicRegisterInfo.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/FreeBSDSignals.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/FreeBSDSignals.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/GDBRemoteSignals.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/GDBRemoteSignals.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/InstructionUtils.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/LinuxSignals.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/LinuxSignals.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/MipsLinuxSignals.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/MipsLinuxSignals.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/NetBSDSignals.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/NetBSDSignals.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDummy.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDummy.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_arm.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_arm.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_i386.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_i386.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_mips64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_mips64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_powerpc.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_powerpc.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_arm.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_arm.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_mips.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_mips.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_mips64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_mips64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_s390x.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_s390x.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextMach_arm.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextMach_arm.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextMach_i386.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextMach_i386.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextMach_x86_64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextMach_x86_64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextMemory.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextMemory.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextNetBSD_x86_64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextNetBSD_x86_64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_arm.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_arm.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_arm64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_arm64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_powerpc.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_powerpc.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_s390x.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_s390x.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_x86.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_x86.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextThreadMemory.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextThreadMemory.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContext_mips.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContext_powerpc.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContext_s390x.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContext_x86.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfoInterface.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfos_arm.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfos_i386.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfos_mips.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfos_mips64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfos_powerpc.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfos_s390x.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/StopInfoMachException.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/StopInfoMachException.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/ThreadMemory.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/ThreadMemory.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/UnwindLLDB.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/UnwindLLDB.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/UnwindMacOSXFrameBackchain.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/UnwindMacOSXFrameBackchain.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/lldb-arm-register-enums.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/lldb-arm64-register-enums.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/lldb-mips-freebsd-register-enums.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/lldb-mips-linux-register-enums.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/lldb-s390x-register-enums.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/lldb-x86-register-enums.h head/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ProcessElfCore.h head/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_arm.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_arm.h head/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_arm64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_arm64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_mips64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_mips64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_powerpc.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_powerpc.h head/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_s390x.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_s390x.h head/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_x86_64.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_x86_64.h head/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ThreadElfCore.h head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.h head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.h head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.h head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteLog.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ThreadGDBRemote.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ThreadGDBRemote.h head/contrib/llvm/tools/lldb/source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.cpp head/contrib/llvm/tools/lldb/source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.h head/contrib/llvm/tools/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp head/contrib/llvm/tools/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h head/contrib/llvm/tools/lldb/source/Plugins/ScriptInterpreter/Python/PythonExceptionState.cpp head/contrib/llvm/tools/lldb/source/Plugins/ScriptInterpreter/Python/PythonExceptionState.h head/contrib/llvm/tools/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp head/contrib/llvm/tools/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h head/contrib/llvm/tools/lldb/source/Plugins/ScriptInterpreter/Python/lldb-python.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DIERef.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DIERef.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParser.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserGo.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserGo.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserJava.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserJava.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFAbbreviationDeclaration.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFAbbreviationDeclaration.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFAttribute.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFAttribute.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDIECollection.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDIECollection.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAbbrev.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAbbrev.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfo.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfo.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfoEntry.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfoEntry.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacro.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacro.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDeclContext.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDeclContext.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/HashedNameToDIE.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/HashedNameToDIE.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/LogChannelDWARF.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/LogChannelDWARF.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/NameToDIE.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/NameToDIE.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/UniqueDWARFASTType.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/UniqueDWARFASTType.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/PDB/PDBASTParser.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/PDB/PDBASTParser.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h head/contrib/llvm/tools/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp head/contrib/llvm/tools/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.h head/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp head/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h head/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp head/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.h head/contrib/llvm/tools/lldb/source/Symbol/ArmUnwindInfo.cpp head/contrib/llvm/tools/lldb/source/Symbol/Block.cpp head/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp head/contrib/llvm/tools/lldb/source/Symbol/ClangASTImporter.cpp head/contrib/llvm/tools/lldb/source/Symbol/ClangExternalASTSourceCallbacks.cpp head/contrib/llvm/tools/lldb/source/Symbol/ClangExternalASTSourceCommon.cpp head/contrib/llvm/tools/lldb/source/Symbol/ClangUtil.cpp head/contrib/llvm/tools/lldb/source/Symbol/CompactUnwindInfo.cpp head/contrib/llvm/tools/lldb/source/Symbol/CompileUnit.cpp head/contrib/llvm/tools/lldb/source/Symbol/CompilerDecl.cpp head/contrib/llvm/tools/lldb/source/Symbol/CompilerDeclContext.cpp head/contrib/llvm/tools/lldb/source/Symbol/CompilerType.cpp head/contrib/llvm/tools/lldb/source/Symbol/DWARFCallFrameInfo.cpp head/contrib/llvm/tools/lldb/source/Symbol/DebugMacros.cpp head/contrib/llvm/tools/lldb/source/Symbol/Declaration.cpp head/contrib/llvm/tools/lldb/source/Symbol/FuncUnwinders.cpp head/contrib/llvm/tools/lldb/source/Symbol/Function.cpp head/contrib/llvm/tools/lldb/source/Symbol/GoASTContext.cpp head/contrib/llvm/tools/lldb/source/Symbol/JavaASTContext.cpp head/contrib/llvm/tools/lldb/source/Symbol/LineEntry.cpp head/contrib/llvm/tools/lldb/source/Symbol/LineTable.cpp head/contrib/llvm/tools/lldb/source/Symbol/ObjectFile.cpp head/contrib/llvm/tools/lldb/source/Symbol/Symbol.cpp head/contrib/llvm/tools/lldb/source/Symbol/SymbolContext.cpp head/contrib/llvm/tools/lldb/source/Symbol/SymbolFile.cpp head/contrib/llvm/tools/lldb/source/Symbol/SymbolVendor.cpp head/contrib/llvm/tools/lldb/source/Symbol/Symtab.cpp head/contrib/llvm/tools/lldb/source/Symbol/Type.cpp head/contrib/llvm/tools/lldb/source/Symbol/TypeList.cpp head/contrib/llvm/tools/lldb/source/Symbol/TypeMap.cpp head/contrib/llvm/tools/lldb/source/Symbol/TypeSystem.cpp head/contrib/llvm/tools/lldb/source/Symbol/UnwindPlan.cpp head/contrib/llvm/tools/lldb/source/Symbol/UnwindTable.cpp head/contrib/llvm/tools/lldb/source/Symbol/Variable.cpp head/contrib/llvm/tools/lldb/source/Symbol/VariableList.cpp head/contrib/llvm/tools/lldb/source/Symbol/VerifyDecl.cpp head/contrib/llvm/tools/lldb/source/Target/ABI.cpp head/contrib/llvm/tools/lldb/source/Target/CPPLanguageRuntime.cpp head/contrib/llvm/tools/lldb/source/Target/ExecutionContext.cpp head/contrib/llvm/tools/lldb/source/Target/FileAction.cpp head/contrib/llvm/tools/lldb/source/Target/InstrumentationRuntime.cpp head/contrib/llvm/tools/lldb/source/Target/InstrumentationRuntimeStopInfo.cpp head/contrib/llvm/tools/lldb/source/Target/JITLoader.cpp head/contrib/llvm/tools/lldb/source/Target/JITLoaderList.cpp head/contrib/llvm/tools/lldb/source/Target/Language.cpp head/contrib/llvm/tools/lldb/source/Target/LanguageRuntime.cpp head/contrib/llvm/tools/lldb/source/Target/Memory.cpp head/contrib/llvm/tools/lldb/source/Target/MemoryHistory.cpp head/contrib/llvm/tools/lldb/source/Target/ObjCLanguageRuntime.cpp head/contrib/llvm/tools/lldb/source/Target/OperatingSystem.cpp head/contrib/llvm/tools/lldb/source/Target/PathMappingList.cpp head/contrib/llvm/tools/lldb/source/Target/Platform.cpp head/contrib/llvm/tools/lldb/source/Target/Process.cpp head/contrib/llvm/tools/lldb/source/Target/ProcessInfo.cpp head/contrib/llvm/tools/lldb/source/Target/ProcessLaunchInfo.cpp head/contrib/llvm/tools/lldb/source/Target/Queue.cpp head/contrib/llvm/tools/lldb/source/Target/QueueItem.cpp head/contrib/llvm/tools/lldb/source/Target/QueueList.cpp head/contrib/llvm/tools/lldb/source/Target/RegisterContext.cpp head/contrib/llvm/tools/lldb/source/Target/SectionLoadHistory.cpp head/contrib/llvm/tools/lldb/source/Target/SectionLoadList.cpp head/contrib/llvm/tools/lldb/source/Target/StackFrame.cpp head/contrib/llvm/tools/lldb/source/Target/StackFrameList.cpp head/contrib/llvm/tools/lldb/source/Target/StackID.cpp head/contrib/llvm/tools/lldb/source/Target/StopInfo.cpp head/contrib/llvm/tools/lldb/source/Target/SystemRuntime.cpp head/contrib/llvm/tools/lldb/source/Target/Target.cpp head/contrib/llvm/tools/lldb/source/Target/TargetList.cpp head/contrib/llvm/tools/lldb/source/Target/Thread.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadCollection.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadList.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadPlan.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadPlanBase.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunctionUsingABI.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallUserExpression.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadPlanPython.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadPlanRunToAddress.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadPlanShouldStopHere.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepInRange.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepInstruction.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepOut.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepOverBreakpoint.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepOverRange.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepRange.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepThrough.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepUntil.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadPlanTracer.cpp head/contrib/llvm/tools/lldb/source/Target/ThreadSpec.cpp head/contrib/llvm/tools/lldb/source/Target/UnixSignals.cpp head/contrib/llvm/tools/lldb/source/Target/UnwindAssembly.cpp head/contrib/llvm/tools/lldb/source/Utility/ARM64_DWARF_Registers.cpp head/contrib/llvm/tools/lldb/source/Utility/ARM64_DWARF_Registers.h head/contrib/llvm/tools/lldb/source/Utility/ARM64_ehframe_Registers.h head/contrib/llvm/tools/lldb/source/Utility/ARM_DWARF_Registers.cpp head/contrib/llvm/tools/lldb/source/Utility/ARM_DWARF_Registers.h head/contrib/llvm/tools/lldb/source/Utility/ARM_ehframe_Registers.h head/contrib/llvm/tools/lldb/source/Utility/ConvertEnum.cpp head/contrib/llvm/tools/lldb/source/Utility/JSON.cpp head/contrib/llvm/tools/lldb/source/Utility/LLDBAssert.cpp head/contrib/llvm/tools/lldb/source/Utility/ModuleCache.cpp head/contrib/llvm/tools/lldb/source/Utility/ModuleCache.h head/contrib/llvm/tools/lldb/source/Utility/NameMatches.cpp head/contrib/llvm/tools/lldb/source/Utility/PseudoTerminal.cpp head/contrib/llvm/tools/lldb/source/Utility/Range.cpp head/contrib/llvm/tools/lldb/source/Utility/RegisterNumber.cpp head/contrib/llvm/tools/lldb/source/Utility/SharingPtr.cpp head/contrib/llvm/tools/lldb/source/Utility/StringExtractor.cpp head/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.cpp head/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.h head/contrib/llvm/tools/lldb/source/Utility/StringLexer.cpp head/contrib/llvm/tools/lldb/source/Utility/TaskPool.cpp head/contrib/llvm/tools/lldb/source/Utility/UriParser.cpp head/contrib/llvm/tools/lldb/source/Utility/UriParser.h head/contrib/llvm/tools/lldb/source/lldb.cpp head/contrib/llvm/tools/lldb/tools/argdumper/argdumper.cpp head/contrib/llvm/tools/lldb/tools/compact-unwind/compact-unwind-dumper.c head/contrib/llvm/tools/lldb/tools/driver/Driver.cpp head/contrib/llvm/tools/lldb/tools/driver/Driver.h head/contrib/llvm/tools/lldb/tools/driver/Platform.cpp head/contrib/llvm/tools/lldb/tools/driver/Platform.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgContext.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgContext.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgSet.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgSet.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValBase.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValBase.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValConsume.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValConsume.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValFile.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValFile.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValListBase.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValListBase.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValListOfN.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValListOfN.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValNumber.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValNumber.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValOptionLong.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValOptionLong.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValOptionShort.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValOptionShort.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValPrintValues.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValPrintValues.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValString.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValString.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValThreadGrp.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdArgValThreadGrp.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdBase.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdBase.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmd.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmd.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdBreak.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdBreak.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdData.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdData.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdEnviro.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdEnviro.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdExec.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdExec.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdFile.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdFile.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdGdbInfo.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdGdbInfo.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdGdbSet.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdGdbSet.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdGdbShow.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdGdbShow.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdGdbThread.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdGdbThread.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdMiscellanous.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdMiscellanous.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdStack.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdStack.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdSupportInfo.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdSupportInfo.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdSupportList.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdSupportList.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdSymbol.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdSymbol.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdTarget.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdTarget.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdThread.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdThread.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdTrace.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdTrace.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdVar.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCmdVar.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCommands.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdCommands.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdData.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdFactory.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdFactory.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdInterpreter.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdInterpreter.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdInvoker.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdInvoker.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdMgr.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdMgr.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdMgrSetCmdDeleteCallback.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmdMgrSetCmdDeleteCallback.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnBase.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnBase.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnConfig.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnLLDBBroadcaster.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnLLDBBroadcaster.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnLLDBDebugger.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnLLDBDebugger.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnLLDBProxySBValue.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnLLDBProxySBValue.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnLLDBUtilSBValue.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnLLDBUtilSBValue.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnLog.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnLog.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnLogMediumFile.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnMIOutOfBandRecord.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnMIOutOfBandRecord.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnMIResultRecord.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnMIResultRecord.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnMIValue.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnMIValue.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnMIValueConst.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnMIValueConst.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnMIValueList.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnMIValueList.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnMIValueResult.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnMIValueResult.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnMIValueTuple.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnMIValueTuple.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnResources.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnResources.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnStreamStderr.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnStreamStderr.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnStreamStdin.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnStreamStdin.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnStreamStdout.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnStreamStdout.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnThreadMgrStd.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MICmnThreadMgrStd.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MIDataTypes.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MIDriver.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MIDriver.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MIDriverBase.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MIDriverBase.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MIDriverMain.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MIDriverMgr.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MIDriverMgr.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MIUtilDateTimeStd.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MIUtilDateTimeStd.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MIUtilDebug.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MIUtilDebug.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MIUtilFileStd.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MIUtilFileStd.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MIUtilMapIdToVariant.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MIUtilMapIdToVariant.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MIUtilSingletonBase.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MIUtilSingletonHelper.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MIUtilString.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MIUtilString.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MIUtilThreadBaseStd.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MIUtilThreadBaseStd.h head/contrib/llvm/tools/lldb/tools/lldb-mi/MIUtilVariant.cpp head/contrib/llvm/tools/lldb/tools/lldb-mi/MIUtilVariant.h head/contrib/llvm/tools/lldb/tools/lldb-mi/Platform.h head/contrib/llvm/tools/lldb/tools/lldb-server/Acceptor.cpp head/contrib/llvm/tools/lldb/tools/lldb-server/Acceptor.h head/contrib/llvm/tools/lldb/tools/lldb-server/LLDBServerUtilities.cpp head/contrib/llvm/tools/lldb/tools/lldb-server/LLDBServerUtilities.h head/contrib/llvm/tools/lldb/tools/lldb-server/lldb-gdbserver.cpp head/contrib/llvm/tools/lldb/tools/lldb-server/lldb-platform.cpp head/contrib/llvm/tools/lldb/tools/lldb-server/lldb-server.cpp head/contrib/llvm/tools/lli/ChildTarget/ChildTarget.cpp head/contrib/llvm/tools/lli/OrcLazyJIT.cpp head/contrib/llvm/tools/lli/OrcLazyJIT.h head/contrib/llvm/tools/lli/RemoteJITUtils.h head/contrib/llvm/tools/lli/lli.cpp head/contrib/llvm/tools/llvm-ar/llvm-ar.cpp head/contrib/llvm/tools/llvm-as/llvm-as.cpp head/contrib/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp head/contrib/llvm/tools/llvm-cov/CodeCoverage.cpp head/contrib/llvm/tools/llvm-cov/CoverageReport.cpp head/contrib/llvm/tools/llvm-cov/CoverageReport.h head/contrib/llvm/tools/llvm-cov/CoverageSummaryInfo.cpp head/contrib/llvm/tools/llvm-cov/CoverageSummaryInfo.h head/contrib/llvm/tools/llvm-cov/CoverageViewOptions.h head/contrib/llvm/tools/llvm-cov/SourceCoverageView.cpp head/contrib/llvm/tools/llvm-cov/SourceCoverageView.h head/contrib/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp head/contrib/llvm/tools/llvm-cov/SourceCoverageViewHTML.h head/contrib/llvm/tools/llvm-cov/SourceCoverageViewText.cpp head/contrib/llvm/tools/llvm-cov/SourceCoverageViewText.h head/contrib/llvm/tools/llvm-cov/llvm-cov.cpp head/contrib/llvm/tools/llvm-cxxdump/Error.cpp head/contrib/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp head/contrib/llvm/tools/llvm-dis/llvm-dis.cpp head/contrib/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp head/contrib/llvm/tools/llvm-extract/llvm-extract.cpp head/contrib/llvm/tools/llvm-link/llvm-link.cpp head/contrib/llvm/tools/llvm-lto/llvm-lto.cpp head/contrib/llvm/tools/llvm-mc/Disassembler.cpp head/contrib/llvm/tools/llvm-mc/llvm-mc.cpp head/contrib/llvm/tools/llvm-nm/llvm-nm.cpp head/contrib/llvm/tools/llvm-objdump/COFFDump.cpp head/contrib/llvm/tools/llvm-objdump/ELFDump.cpp head/contrib/llvm/tools/llvm-objdump/MachODump.cpp head/contrib/llvm/tools/llvm-objdump/llvm-objdump.cpp head/contrib/llvm/tools/llvm-objdump/llvm-objdump.h head/contrib/llvm/tools/llvm-pdbdump/LLVMOutputStyle.cpp head/contrib/llvm/tools/llvm-pdbdump/LLVMOutputStyle.h head/contrib/llvm/tools/llvm-pdbdump/PdbYaml.cpp head/contrib/llvm/tools/llvm-pdbdump/PdbYaml.h head/contrib/llvm/tools/llvm-pdbdump/YAMLOutputStyle.cpp head/contrib/llvm/tools/llvm-pdbdump/YAMLOutputStyle.h head/contrib/llvm/tools/llvm-pdbdump/llvm-pdbdump.cpp head/contrib/llvm/tools/llvm-pdbdump/llvm-pdbdump.h head/contrib/llvm/tools/llvm-profdata/llvm-profdata.cpp head/contrib/llvm/tools/llvm-readobj/ARMEHABIPrinter.h head/contrib/llvm/tools/llvm-readobj/COFFDumper.cpp head/contrib/llvm/tools/llvm-readobj/ELFDumper.cpp head/contrib/llvm/tools/llvm-readobj/Error.cpp head/contrib/llvm/tools/llvm-readobj/MachODumper.cpp head/contrib/llvm/tools/llvm-readobj/ObjDumper.h head/contrib/llvm/tools/llvm-readobj/StackMapPrinter.h head/contrib/llvm/tools/llvm-readobj/llvm-readobj.cpp head/contrib/llvm/tools/llvm-readobj/llvm-readobj.h head/contrib/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp head/contrib/llvm/tools/llvm-stress/llvm-stress.cpp head/contrib/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp head/contrib/llvm/tools/opt/NewPMDriver.cpp head/contrib/llvm/tools/opt/NewPMDriver.h head/contrib/llvm/tools/opt/PassPrinters.cpp head/contrib/llvm/tools/opt/opt.cpp head/contrib/llvm/utils/TableGen/AsmMatcherEmitter.cpp head/contrib/llvm/utils/TableGen/AsmWriterEmitter.cpp head/contrib/llvm/utils/TableGen/Attributes.cpp head/contrib/llvm/utils/TableGen/CTagsEmitter.cpp head/contrib/llvm/utils/TableGen/CodeEmitterGen.cpp head/contrib/llvm/utils/TableGen/CodeGenDAGPatterns.cpp head/contrib/llvm/utils/TableGen/CodeGenDAGPatterns.h head/contrib/llvm/utils/TableGen/CodeGenInstruction.cpp head/contrib/llvm/utils/TableGen/CodeGenInstruction.h head/contrib/llvm/utils/TableGen/CodeGenIntrinsics.h head/contrib/llvm/utils/TableGen/CodeGenMapTable.cpp head/contrib/llvm/utils/TableGen/CodeGenRegisters.cpp head/contrib/llvm/utils/TableGen/CodeGenRegisters.h head/contrib/llvm/utils/TableGen/CodeGenSchedule.cpp head/contrib/llvm/utils/TableGen/CodeGenTarget.cpp head/contrib/llvm/utils/TableGen/CodeGenTarget.h head/contrib/llvm/utils/TableGen/DAGISelEmitter.cpp head/contrib/llvm/utils/TableGen/DAGISelMatcherGen.cpp head/contrib/llvm/utils/TableGen/DAGISelMatcherOpt.cpp head/contrib/llvm/utils/TableGen/DFAPacketizerEmitter.cpp head/contrib/llvm/utils/TableGen/DisassemblerEmitter.cpp head/contrib/llvm/utils/TableGen/FastISelEmitter.cpp head/contrib/llvm/utils/TableGen/FixedLenDecoderEmitter.cpp head/contrib/llvm/utils/TableGen/InstrInfoEmitter.cpp head/contrib/llvm/utils/TableGen/IntrinsicEmitter.cpp head/contrib/llvm/utils/TableGen/PseudoLoweringEmitter.cpp head/contrib/llvm/utils/TableGen/RegisterInfoEmitter.cpp head/contrib/llvm/utils/TableGen/SearchableTableEmitter.cpp head/contrib/llvm/utils/TableGen/SubtargetEmitter.cpp head/contrib/llvm/utils/TableGen/TableGen.cpp head/contrib/llvm/utils/TableGen/TableGenBackends.h head/contrib/llvm/utils/TableGen/X86RecognizableInstr.cpp head/contrib/llvm/utils/TableGen/X86RecognizableInstr.h head/contrib/tcpdump/getopt_long.h head/contrib/tcpdump/ipproto.h head/contrib/tcpdump/print-802_11.c head/contrib/tcpdump/print-sunrpc.c head/contrib/tcpdump/rpc_auth.h head/contrib/tcpdump/rpc_msg.h head/etc/mtree/BSD.debug.dist head/etc/mtree/BSD.usr.dist head/lib/clang/freebsd_cc_version.h head/lib/clang/headers/Makefile head/lib/clang/include/clang/Basic/Version.inc head/lib/clang/include/clang/Config/config.h head/lib/clang/include/lld/Config/Version.inc head/lib/clang/include/llvm/Config/config.h head/lib/clang/include/llvm/Config/llvm-config.h head/lib/clang/libclang/Makefile head/lib/clang/liblldb/Makefile head/lib/clang/libllvm/Makefile head/lib/clang/libllvmminimal/Makefile head/lib/clang/llvm.build.mk head/lib/libc++/Makefile head/lib/libc/gdtoa/Makefile.inc head/lib/libclang_rt/Makefile.inc head/lib/libclang_rt/asan/Makefile head/lib/libclang_rt/asan_dynamic/Makefile head/lib/libclang_rt/safestack/Makefile head/lib/libclang_rt/stats/Makefile head/lib/libclang_rt/ubsan_standalone/Makefile head/share/mk/bsd.sys.mk head/share/mk/src.opts.mk head/sys/conf/kern.mk head/sys/sys/param.h head/tools/build/mk/OptionalObsoleteFiles.inc head/usr.bin/clang/Makefile head/usr.bin/clang/lld/Makefile head/usr.bin/clang/llvm-cov/Makefile head/usr.bin/clang/llvm-objdump/Makefile head/usr.bin/clang/llvm-pdbdump/Makefile head/usr.bin/clang/llvm-tblgen/Makefile Directory Properties: head/ (props changed) head/cddl/ (props changed) head/cddl/contrib/opensolaris/ (props changed) head/contrib/binutils/ (props changed) head/contrib/byacc/ (props changed) head/contrib/compiler-rt/ (props changed) head/contrib/dma/ (props changed) head/contrib/elftoolchain/ (props changed) head/contrib/gcc/ (props changed) head/contrib/ipfilter/ (props changed) head/contrib/libarchive/ (props changed) head/contrib/libc++/ (props changed) head/contrib/libpcap/ (props changed) head/contrib/libucl/ (props changed) head/contrib/libxo/ (props changed) head/contrib/llvm/ (props changed) head/contrib/llvm/projects/libunwind/ (props changed) head/contrib/llvm/tools/clang/ (props changed) head/contrib/llvm/tools/lld/ (props changed) head/contrib/llvm/tools/lldb/ (props changed) head/contrib/mdocml/ (props changed) head/contrib/mtree/ (props changed) head/contrib/netbsd-tests/ (props changed) head/contrib/netcat/ (props changed) head/contrib/openbsm/ (props changed) head/contrib/openpam/ (props changed) head/contrib/openresolv/ (props changed) head/contrib/sendmail/ (props changed) head/contrib/tcpdump/ (props changed) head/contrib/tzcode/stdtime/ (props changed) head/contrib/xz/ (props changed) head/contrib/zlib/ (props changed) head/crypto/heimdal/ (props changed) head/crypto/openssh/ (props changed) head/crypto/openssl/ (props changed) head/gnu/lib/ (props changed) head/gnu/usr.bin/binutils/ (props changed) head/gnu/usr.bin/cc/cc_tools/ (props changed) head/gnu/usr.bin/gdb/ (props changed) head/lib/libc/locale/ascii.c (props changed) head/lib/libedit/ (props changed) head/lib/libedit/edit/readline/ (props changed) head/sys/cddl/contrib/opensolaris/ (props changed) head/sys/contrib/ck/ (props changed) head/sys/contrib/dev/acpica/ (props changed) head/sys/contrib/ipfilter/ (props changed) head/usr.sbin/bhyve/ps2mouse.c (props changed) head/usr.sbin/bhyve/rfb.c (props changed) Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Thu Mar 2 18:07:19 2017 (r314563) +++ head/Makefile.inc1 Thu Mar 2 20:49:40 2017 (r314564) @@ -513,7 +513,7 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - MK_GDB=no MK_TESTS=no MK_LLD_IS_LD=no + MK_GDB=no MK_TESTS=no # kernel-tools stage KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -1825,6 +1825,9 @@ _elftctools= lib/libelftc \ # cross-build on a FreeBSD 10 host: _elftctools+= usr.bin/addr2line .endif +.if ${MK_LLD_IS_LD} != "no" +_lld= usr.bin/clang/lld +.endif .elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no" # If cross-building with an external binutils we still need to build strip for # the target (for at least crunchide). @@ -1849,6 +1852,7 @@ cross-tools: .MAKE .PHONY ${LOCAL_XTOOL_DIRS} \ ${_clang_libs} \ ${_clang} \ + ${_lld} \ ${_binutils} \ ${_elftctools} \ ${_dtrace_tools} \ Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Thu Mar 2 18:07:19 2017 (r314563) +++ head/ObsoleteFiles.inc Thu Mar 2 20:49:40 2017 (r314564) @@ -38,6 +38,119 @@ # xargs -n1 | sort | uniq -d; # done +# 20170302: new libc++ import which bumps version from 3.9.1 to 4.0.0. +OLD_FILES+=usr/include/c++/v1/__undef___deallocate +OLD_FILES+=usr/include/c++/v1/tr1/__undef___deallocate +# 20170302: new clang import which bumps version from 3.9.1 to 4.0.0. +OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/allocator_interface.h +OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/asan_interface.h +OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/common_interface_defs.h +OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/coverage_interface.h +OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/dfsan_interface.h +OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/esan_interface.h +OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/linux_syscall_hooks.h +OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/lsan_interface.h +OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/msan_interface.h +OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/tsan_interface_atomic.h +OLD_DIRS+=usr/lib/clang/3.9.1/include/sanitizer +OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_cmath.h +OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_intrinsics.h +OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_math_forward_declares.h +OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_runtime_wrapper.h +OLD_FILES+=usr/lib/clang/3.9.1/include/__stddef_max_align_t.h +OLD_FILES+=usr/lib/clang/3.9.1/include/__wmmintrin_aes.h +OLD_FILES+=usr/lib/clang/3.9.1/include/__wmmintrin_pclmul.h +OLD_FILES+=usr/lib/clang/3.9.1/include/adxintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/altivec.h +OLD_FILES+=usr/lib/clang/3.9.1/include/ammintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/arm_acle.h +OLD_FILES+=usr/lib/clang/3.9.1/include/arm_neon.h +OLD_FILES+=usr/lib/clang/3.9.1/include/avx2intrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/avx512bwintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/avx512cdintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/avx512dqintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/avx512erintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/avx512fintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/avx512ifmaintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/avx512ifmavlintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/avx512pfintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vbmiintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vbmivlintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vlbwintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vlcdintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vldqintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vlintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/avxintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/bmi2intrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/bmiintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/clflushoptintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/cpuid.h +OLD_FILES+=usr/lib/clang/3.9.1/include/cuda_builtin_vars.h +OLD_FILES+=usr/lib/clang/3.9.1/include/emmintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/f16cintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/fma4intrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/fmaintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/fxsrintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/htmintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/htmxlintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/ia32intrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/immintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/lzcntintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/mm3dnow.h +OLD_FILES+=usr/lib/clang/3.9.1/include/mm_malloc.h +OLD_FILES+=usr/lib/clang/3.9.1/include/mmintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/module.modulemap +OLD_FILES+=usr/lib/clang/3.9.1/include/msa.h +OLD_FILES+=usr/lib/clang/3.9.1/include/mwaitxintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/nmmintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/opencl-c.h +OLD_FILES+=usr/lib/clang/3.9.1/include/pkuintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/pmmintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/popcntintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/prfchwintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/rdseedintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/rtmintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/s390intrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/shaintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/smmintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/tbmintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/tmmintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/vadefs.h +OLD_FILES+=usr/lib/clang/3.9.1/include/vecintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/wmmintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/x86intrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/xmmintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/xopintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/xsavecintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/xsaveintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/xsaveoptintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/xsavesintrin.h +OLD_FILES+=usr/lib/clang/3.9.1/include/xtestintrin.h +OLD_DIRS+=usr/lib/clang/3.9.1/include +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-i386.a +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-i386.so +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-preinit-i386.a +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-x86_64.a +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-x86_64.so +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan_cxx-i386.a +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.profile-arm.a +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.profile-i386.a +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.profile-x86_64.a +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.safestack-i386.a +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.safestack-x86_64.a +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats-i386.a +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats-x86_64.a +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats_client-i386.a +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats_client-x86_64.a +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a +OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a +OLD_DIRS+=usr/lib/clang/3.9.1/lib/freebsd +OLD_DIRS+=usr/lib/clang/3.9.1/lib +OLD_DIRS+=usr/lib/clang/3.9.1 # 20170226: SVR4 compatibility removed .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" OLD_FILES+=usr/share/man/man4/streams.4 Modified: head/UPDATING ============================================================================== --- head/UPDATING Thu Mar 2 18:07:19 2017 (r314563) +++ head/UPDATING Thu Mar 2 20:49:40 2017 (r314564) @@ -51,6 +51,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12 ****************************** SPECIAL WARNING: ****************************** +20170302: + Clang, llvm, lldb, compiler-rt and libc++ have been upgraded to 4.0.0. + Please see the 20141231 entry below for information about prerequisites + and upgrading, if you are not already using clang 3.5.0 or higher. + 20170221: The code that provides support for ZFS .zfs/ directory functionality has been reimplemented. It's not possible now to create a snapshot Modified: head/contrib/compiler-rt/include/sanitizer/common_interface_defs.h ============================================================================== --- head/contrib/compiler-rt/include/sanitizer/common_interface_defs.h Thu Mar 2 18:07:19 2017 (r314563) +++ head/contrib/compiler-rt/include/sanitizer/common_interface_defs.h Thu Mar 2 20:49:40 2017 (r314564) @@ -117,6 +117,16 @@ extern "C" { // Print the stack trace leading to this call. Useful for debugging user code. void __sanitizer_print_stack_trace(); + // Symbolizes the supplied 'pc' using the format string 'fmt'. + // Outputs at most 'out_buf_size' bytes into 'out_buf'. + // The format syntax is described in + // lib/sanitizer_common/sanitizer_stacktrace_printer.h. + void __sanitizer_symbolize_pc(void *pc, const char *fmt, char *out_buf, + size_t out_buf_size); + // Same as __sanitizer_symbolize_pc, but for data section (i.e. globals). + void __sanitizer_symbolize_global(void *data_ptr, const char *fmt, + char *out_buf, size_t out_buf_size); + // Sets the callback to be called right before death on error. // Passing 0 will unset the callback. void __sanitizer_set_death_callback(void (*callback)(void)); @@ -169,7 +179,16 @@ extern "C" { // use-after-return detection. void __sanitizer_start_switch_fiber(void **fake_stack_save, const void *bottom, size_t size); - void __sanitizer_finish_switch_fiber(void *fake_stack_save); + void __sanitizer_finish_switch_fiber(void *fake_stack_save, + const void **bottom_old, + size_t *size_old); + + // Get full module name and calculate pc offset within it. + // Returns 1 if pc belongs to some module, 0 if module was not found. + int __sanitizer_get_module_and_offset_for_pc(void *pc, char *module_path, + size_t module_path_len, + void **pc_offset); + #ifdef __cplusplus } // extern "C" #endif Modified: head/contrib/compiler-rt/include/sanitizer/coverage_interface.h ============================================================================== --- head/contrib/compiler-rt/include/sanitizer/coverage_interface.h Thu Mar 2 18:07:19 2017 (r314563) +++ head/contrib/compiler-rt/include/sanitizer/coverage_interface.h Thu Mar 2 20:49:40 2017 (r314564) @@ -23,6 +23,11 @@ extern "C" { void __sanitizer_cov_init(); // Record and dump coverage info. void __sanitizer_cov_dump(); + + // Dump collected coverage info. Sorts pcs by module into individual + // .sancov files. + void __sanitizer_dump_coverage(const uintptr_t *pcs, uintptr_t len); + // Open .sancov.packed in the coverage directory and return the file // descriptor. Returns -1 on failure, or if coverage dumping is disabled. // This is intended for use by sandboxing code. @@ -41,13 +46,6 @@ extern "C" { // Some of the entries in *data will be zero. uintptr_t __sanitizer_get_coverage_guards(uintptr_t **data); - // Set *data to the growing buffer with covered PCs and return the size - // of the buffer. The entries are never zero. - // When only unique pcs are collected, the size is equal to - // __sanitizer_get_total_unique_coverage. - // WARNING: EXPERIMENTAL API. - uintptr_t __sanitizer_get_coverage_pc_buffer(uintptr_t **data); - // The coverage instrumentation may optionally provide imprecise counters. // Rather than exposing the counter values to the user we instead map // the counters to a bitset. @@ -65,6 +63,7 @@ extern "C" { // __sanitizer_get_number_of_counters bytes long and 8-aligned. uintptr_t __sanitizer_update_counter_bitset_and_clear_counters(uint8_t *bitset); + #ifdef __cplusplus } // extern "C" #endif Modified: head/contrib/compiler-rt/lib/asan/asan_activation.cc ============================================================================== --- head/contrib/compiler-rt/lib/asan/asan_activation.cc Thu Mar 2 18:07:19 2017 (r314563) +++ head/contrib/compiler-rt/lib/asan/asan_activation.cc Thu Mar 2 20:49:40 2017 (r314564) @@ -77,13 +77,16 @@ static struct AsanDeactivatedFlags { void Print() { Report( - "quarantine_size_mb %d, max_redzone %d, poison_heap %d, " - "malloc_context_size %d, alloc_dealloc_mismatch %d, " - "allocator_may_return_null %d, coverage %d, coverage_dir %s\n", - allocator_options.quarantine_size_mb, allocator_options.max_redzone, - poison_heap, malloc_context_size, + "quarantine_size_mb %d, thread_local_quarantine_size_kb %d, " + "max_redzone %d, poison_heap %d, malloc_context_size %d, " + "alloc_dealloc_mismatch %d, allocator_may_return_null %d, coverage %d, " + "coverage_dir %s, allocator_release_to_os_interval_ms %d\n", + allocator_options.quarantine_size_mb, + allocator_options.thread_local_quarantine_size_kb, + allocator_options.max_redzone, poison_heap, malloc_context_size, allocator_options.alloc_dealloc_mismatch, - allocator_options.may_return_null, coverage, coverage_dir); + allocator_options.may_return_null, coverage, coverage_dir, + allocator_options.release_to_os_interval_ms); } } asan_deactivated_flags; @@ -107,6 +110,7 @@ void AsanDeactivate() { AllocatorOptions disabled = asan_deactivated_flags.allocator_options; disabled.quarantine_size_mb = 0; + disabled.thread_local_quarantine_size_kb = 0; disabled.min_redzone = 16; // Redzone must be at least 16 bytes long. disabled.max_redzone = 16; disabled.alloc_dealloc_mismatch = false; Modified: head/contrib/compiler-rt/lib/asan/asan_activation_flags.inc ============================================================================== --- head/contrib/compiler-rt/lib/asan/asan_activation_flags.inc Thu Mar 2 18:07:19 2017 (r314563) +++ head/contrib/compiler-rt/lib/asan/asan_activation_flags.inc Thu Mar 2 20:49:40 2017 (r314564) @@ -24,6 +24,7 @@ ASAN_ACTIVATION_FLAG(int, redzone) ASAN_ACTIVATION_FLAG(int, max_redzone) ASAN_ACTIVATION_FLAG(int, quarantine_size_mb) +ASAN_ACTIVATION_FLAG(int, thread_local_quarantine_size_kb) ASAN_ACTIVATION_FLAG(bool, alloc_dealloc_mismatch) ASAN_ACTIVATION_FLAG(bool, poison_heap) @@ -33,3 +34,4 @@ COMMON_ACTIVATION_FLAG(bool, coverage) COMMON_ACTIVATION_FLAG(const char *, coverage_dir) COMMON_ACTIVATION_FLAG(int, verbosity) COMMON_ACTIVATION_FLAG(bool, help) +COMMON_ACTIVATION_FLAG(s32, allocator_release_to_os_interval_ms) Modified: head/contrib/compiler-rt/lib/asan/asan_allocator.cc ============================================================================== --- head/contrib/compiler-rt/lib/asan/asan_allocator.cc Thu Mar 2 18:07:19 2017 (r314563) +++ head/contrib/compiler-rt/lib/asan/asan_allocator.cc Thu Mar 2 20:49:40 2017 (r314564) @@ -207,25 +207,27 @@ QuarantineCache *GetQuarantineCache(Asan void AllocatorOptions::SetFrom(const Flags *f, const CommonFlags *cf) { quarantine_size_mb = f->quarantine_size_mb; + thread_local_quarantine_size_kb = f->thread_local_quarantine_size_kb; min_redzone = f->redzone; max_redzone = f->max_redzone; may_return_null = cf->allocator_may_return_null; alloc_dealloc_mismatch = f->alloc_dealloc_mismatch; + release_to_os_interval_ms = cf->allocator_release_to_os_interval_ms; } void AllocatorOptions::CopyTo(Flags *f, CommonFlags *cf) { f->quarantine_size_mb = quarantine_size_mb; + f->thread_local_quarantine_size_kb = thread_local_quarantine_size_kb; f->redzone = min_redzone; f->max_redzone = max_redzone; cf->allocator_may_return_null = may_return_null; f->alloc_dealloc_mismatch = alloc_dealloc_mismatch; + cf->allocator_release_to_os_interval_ms = release_to_os_interval_ms; } struct Allocator { static const uptr kMaxAllowedMallocSize = FIRST_32_SECOND_64(3UL << 30, 1ULL << 40); - static const uptr kMaxThreadLocalQuarantine = - FIRST_32_SECOND_64(1 << 18, 1 << 20); AsanAllocator allocator; AsanQuarantine quarantine; @@ -254,7 +256,7 @@ struct Allocator { void SharedInitCode(const AllocatorOptions &options) { CheckOptions(options); quarantine.Init((uptr)options.quarantine_size_mb << 20, - kMaxThreadLocalQuarantine); + (uptr)options.thread_local_quarantine_size_kb << 10); atomic_store(&alloc_dealloc_mismatch, options.alloc_dealloc_mismatch, memory_order_release); atomic_store(&min_redzone, options.min_redzone, memory_order_release); @@ -262,22 +264,59 @@ struct Allocator { } void Initialize(const AllocatorOptions &options) { - allocator.Init(options.may_return_null); + allocator.Init(options.may_return_null, options.release_to_os_interval_ms); SharedInitCode(options); } + void RePoisonChunk(uptr chunk) { + // This could be a user-facing chunk (with redzones), or some internal + // housekeeping chunk, like TransferBatch. Start by assuming the former. + AsanChunk *ac = GetAsanChunk((void *)chunk); + uptr allocated_size = allocator.GetActuallyAllocatedSize((void *)ac); + uptr beg = ac->Beg(); + uptr end = ac->Beg() + ac->UsedSize(true); + uptr chunk_end = chunk + allocated_size; + if (chunk < beg && beg < end && end <= chunk_end && + ac->chunk_state == CHUNK_ALLOCATED) { + // Looks like a valid AsanChunk in use, poison redzones only. + PoisonShadow(chunk, beg - chunk, kAsanHeapLeftRedzoneMagic); + uptr end_aligned_down = RoundDownTo(end, SHADOW_GRANULARITY); + FastPoisonShadowPartialRightRedzone( + end_aligned_down, end - end_aligned_down, + chunk_end - end_aligned_down, kAsanHeapLeftRedzoneMagic); + } else { + // This is either not an AsanChunk or freed or quarantined AsanChunk. + // In either case, poison everything. + PoisonShadow(chunk, allocated_size, kAsanHeapLeftRedzoneMagic); + } + } + void ReInitialize(const AllocatorOptions &options) { allocator.SetMayReturnNull(options.may_return_null); + allocator.SetReleaseToOSIntervalMs(options.release_to_os_interval_ms); SharedInitCode(options); + + // Poison all existing allocation's redzones. + if (CanPoisonMemory()) { + allocator.ForceLock(); + allocator.ForEachChunk( + [](uptr chunk, void *alloc) { + ((Allocator *)alloc)->RePoisonChunk(chunk); + }, + this); + allocator.ForceUnlock(); + } } void GetOptions(AllocatorOptions *options) const { options->quarantine_size_mb = quarantine.GetSize() >> 20; + options->thread_local_quarantine_size_kb = quarantine.GetCacheSize() >> 10; options->min_redzone = atomic_load(&min_redzone, memory_order_acquire); options->max_redzone = atomic_load(&max_redzone, memory_order_acquire); options->may_return_null = allocator.MayReturnNull(); options->alloc_dealloc_mismatch = atomic_load(&alloc_dealloc_mismatch, memory_order_acquire); + options->release_to_os_interval_ms = allocator.ReleaseToOSIntervalMs(); } // -------------------- Helper methods. ------------------------- @@ -356,7 +395,7 @@ struct Allocator { if (size > kMaxAllowedMallocSize || needed_size > kMaxAllowedMallocSize) { Report("WARNING: AddressSanitizer failed to allocate 0x%zx bytes\n", (void*)size); - return allocator.ReturnNullOrDie(); + return allocator.ReturnNullOrDieOnBadRequest(); } AsanThread *t = GetCurrentThread(); @@ -373,8 +412,7 @@ struct Allocator { allocator.Allocate(cache, needed_size, 8, false, check_rss_limit); } - if (!allocated) - return allocator.ReturnNullOrDie(); + if (!allocated) return allocator.ReturnNullOrDieOnOOM(); if (*(u8 *)MEM_TO_SHADOW((uptr)allocated) == 0 && CanPoisonMemory()) { // Heap poisoning is enabled, but the allocator provides an unpoisoned @@ -530,7 +568,7 @@ struct Allocator { if (delete_size && flags()->new_delete_type_mismatch && delete_size != m->UsedSize()) { - ReportNewDeleteSizeMismatch(p, m->UsedSize(), delete_size, stack); + ReportNewDeleteSizeMismatch(p, delete_size, stack); } QuarantineChunk(m, ptr, stack, alloc_type); @@ -563,7 +601,7 @@ struct Allocator { void *Calloc(uptr nmemb, uptr size, BufferedStackTrace *stack) { if (CallocShouldReturnNullDueToOverflow(size, nmemb)) - return allocator.ReturnNullOrDie(); + return allocator.ReturnNullOrDieOnBadRequest(); void *ptr = Allocate(nmemb * size, 8, stack, FROM_MALLOC, false); // If the memory comes from the secondary allocator no need to clear it // as it comes directly from mmap. @@ -643,6 +681,7 @@ struct Allocator { void PrintStats() { allocator.PrintStats(); + quarantine.PrintStats(); } void ForceLock() { @@ -662,17 +701,23 @@ static AsanAllocator &get_allocator() { return instance.allocator; } -bool AsanChunkView::IsValid() { +bool AsanChunkView::IsValid() const { return chunk_ && chunk_->chunk_state != CHUNK_AVAILABLE; } -bool AsanChunkView::IsAllocated() { +bool AsanChunkView::IsAllocated() const { return chunk_ && chunk_->chunk_state == CHUNK_ALLOCATED; } -uptr AsanChunkView::Beg() { return chunk_->Beg(); } -uptr AsanChunkView::End() { return Beg() + UsedSize(); } -uptr AsanChunkView::UsedSize() { return chunk_->UsedSize(); } -uptr AsanChunkView::AllocTid() { return chunk_->alloc_tid; } -uptr AsanChunkView::FreeTid() { return chunk_->free_tid; } +bool AsanChunkView::IsQuarantined() const { + return chunk_ && chunk_->chunk_state == CHUNK_QUARANTINE; +} +uptr AsanChunkView::Beg() const { return chunk_->Beg(); } +uptr AsanChunkView::End() const { return Beg() + UsedSize(); } +uptr AsanChunkView::UsedSize() const { return chunk_->UsedSize(); } +uptr AsanChunkView::AllocTid() const { return chunk_->alloc_tid; } +uptr AsanChunkView::FreeTid() const { return chunk_->free_tid; } +AllocType AsanChunkView::GetAllocType() const { + return (AllocType)chunk_->alloc_type; +} static StackTrace GetStackTraceFromId(u32 id) { CHECK(id); @@ -681,14 +726,14 @@ static StackTrace GetStackTraceFromId(u3 return res; } -u32 AsanChunkView::GetAllocStackId() { return chunk_->alloc_context_id; } -u32 AsanChunkView::GetFreeStackId() { return chunk_->free_context_id; } +u32 AsanChunkView::GetAllocStackId() const { return chunk_->alloc_context_id; } +u32 AsanChunkView::GetFreeStackId() const { return chunk_->free_context_id; } -StackTrace AsanChunkView::GetAllocStack() { +StackTrace AsanChunkView::GetAllocStack() const { return GetStackTraceFromId(GetAllocStackId()); } -StackTrace AsanChunkView::GetFreeStack() { +StackTrace AsanChunkView::GetFreeStack() const { return GetStackTraceFromId(GetFreeStackId()); } @@ -707,6 +752,9 @@ void GetAllocatorOptions(AllocatorOption AsanChunkView FindHeapChunkByAddress(uptr addr) { return instance.FindHeapChunkByAddress(addr); } +AsanChunkView FindHeapChunkByAllocBeg(uptr addr) { + return AsanChunkView(instance.GetAsanChunk(reinterpret_cast(addr))); +} void AsanThreadLocalMallocStorage::CommitBack() { instance.CommitBack(this); Modified: head/contrib/compiler-rt/lib/asan/asan_allocator.h ============================================================================== --- head/contrib/compiler-rt/lib/asan/asan_allocator.h Thu Mar 2 18:07:19 2017 (r314563) +++ head/contrib/compiler-rt/lib/asan/asan_allocator.h Thu Mar 2 20:49:40 2017 (r314564) @@ -33,10 +33,12 @@ struct AsanChunk; struct AllocatorOptions { u32 quarantine_size_mb; + u32 thread_local_quarantine_size_kb; u16 min_redzone; u16 max_redzone; u8 may_return_null; u8 alloc_dealloc_mismatch; + s32 release_to_os_interval_ms; void SetFrom(const Flags *f, const CommonFlags *cf); void CopyTo(Flags *f, CommonFlags *cf); @@ -49,27 +51,29 @@ void GetAllocatorOptions(AllocatorOption class AsanChunkView { public: explicit AsanChunkView(AsanChunk *chunk) : chunk_(chunk) {} - bool IsValid(); // Checks if AsanChunkView points to a valid allocated - // or quarantined chunk. - bool IsAllocated(); // Checks if the memory is currently allocated. - uptr Beg(); // First byte of user memory. - uptr End(); // Last byte of user memory. - uptr UsedSize(); // Size requested by the user. - uptr AllocTid(); - uptr FreeTid(); + bool IsValid() const; // Checks if AsanChunkView points to a valid + // allocated or quarantined chunk. + bool IsAllocated() const; // Checks if the memory is currently allocated. + bool IsQuarantined() const; // Checks if the memory is currently quarantined. + uptr Beg() const; // First byte of user memory. + uptr End() const; // Last byte of user memory. + uptr UsedSize() const; // Size requested by the user. + uptr AllocTid() const; + uptr FreeTid() const; bool Eq(const AsanChunkView &c) const { return chunk_ == c.chunk_; } - u32 GetAllocStackId(); - u32 GetFreeStackId(); - StackTrace GetAllocStack(); - StackTrace GetFreeStack(); - bool AddrIsInside(uptr addr, uptr access_size, sptr *offset) { + u32 GetAllocStackId() const; + u32 GetFreeStackId() const; + StackTrace GetAllocStack() const; + StackTrace GetFreeStack() const; + AllocType GetAllocType() const; + bool AddrIsInside(uptr addr, uptr access_size, sptr *offset) const { if (addr >= Beg() && (addr + access_size) <= End()) { *offset = addr - Beg(); return true; } return false; } - bool AddrIsAtLeft(uptr addr, uptr access_size, sptr *offset) { + bool AddrIsAtLeft(uptr addr, uptr access_size, sptr *offset) const { (void)access_size; if (addr < Beg()) { *offset = Beg() - addr; @@ -77,7 +81,7 @@ class AsanChunkView { } return false; } - bool AddrIsAtRight(uptr addr, uptr access_size, sptr *offset) { + bool AddrIsAtRight(uptr addr, uptr access_size, sptr *offset) const { if (addr + access_size > End()) { *offset = addr - End(); return true; @@ -90,6 +94,7 @@ class AsanChunkView { }; AsanChunkView FindHeapChunkByAddress(uptr address); +AsanChunkView FindHeapChunkByAllocBeg(uptr address); // List of AsanChunks with total size. class AsanChunkFifoList: public IntrusiveList { @@ -117,18 +122,36 @@ struct AsanMapUnmapCallback { # if defined(__powerpc64__) const uptr kAllocatorSpace = 0xa0000000000ULL; const uptr kAllocatorSize = 0x20000000000ULL; // 2T. +typedef DefaultSizeClassMap SizeClassMap; +# elif defined(__aarch64__) && SANITIZER_ANDROID +const uptr kAllocatorSpace = 0x3000000000ULL; +const uptr kAllocatorSize = 0x2000000000ULL; // 128G. +typedef VeryCompactSizeClassMap SizeClassMap; # elif defined(__aarch64__) -// AArch64/SANITIZIER_CAN_USER_ALLOCATOR64 is only for 42-bit VMA +// AArch64/SANITIZER_CAN_USER_ALLOCATOR64 is only for 42-bit VMA // so no need to different values for different VMA. const uptr kAllocatorSpace = 0x10000000000ULL; const uptr kAllocatorSize = 0x10000000000ULL; // 3T. +typedef DefaultSizeClassMap SizeClassMap; +# elif SANITIZER_WINDOWS +const uptr kAllocatorSpace = ~(uptr)0; +const uptr kAllocatorSize = 0x8000000000ULL; // 500G +typedef DefaultSizeClassMap SizeClassMap; # else const uptr kAllocatorSpace = 0x600000000000ULL; const uptr kAllocatorSize = 0x40000000000ULL; // 4T. -# endif typedef DefaultSizeClassMap SizeClassMap; -typedef SizeClassAllocator64 PrimaryAllocator; +# endif +struct AP64 { // Allocator64 parameters. Deliberately using a short name. + static const uptr kSpaceBeg = kAllocatorSpace; + static const uptr kSpaceSize = kAllocatorSize; + static const uptr kMetadataSize = 0; + typedef __asan::SizeClassMap SizeClassMap; + typedef AsanMapUnmapCallback MapUnmapCallback; + static const uptr kFlags = 0; +}; + +typedef SizeClassAllocator64 PrimaryAllocator; #else // Fallback to SizeClassAllocator32. static const uptr kRegionSizeLog = 20; static const uptr kNumRegions = SANITIZER_MMAP_RANGE_SIZE >> kRegionSizeLog; Modified: head/contrib/compiler-rt/lib/asan/asan_debugging.cc ============================================================================== --- head/contrib/compiler-rt/lib/asan/asan_debugging.cc Thu Mar 2 18:07:19 2017 (r314563) +++ head/contrib/compiler-rt/lib/asan/asan_debugging.cc Thu Mar 2 20:49:40 2017 (r314564) @@ -14,74 +14,39 @@ //===----------------------------------------------------------------------===// #include "asan_allocator.h" +#include "asan_descriptions.h" #include "asan_flags.h" #include "asan_internal.h" #include "asan_mapping.h" #include "asan_report.h" #include "asan_thread.h" -namespace __asan { - -void GetInfoForStackVar(uptr addr, AddressDescription *descr, AsanThread *t) { - descr->name[0] = 0; - descr->region_address = 0; - descr->region_size = 0; - descr->region_kind = "stack"; +namespace { +using namespace __asan; - AsanThread::StackFrameAccess access; - if (!t->GetStackFrameAccessByAddr(addr, &access)) - return; +static void FindInfoForStackVar(uptr addr, const char *frame_descr, uptr offset, + char *name, uptr name_size, + uptr ®ion_address, uptr ®ion_size) { InternalMmapVector vars(16); - if (!ParseFrameDescription(access.frame_descr, &vars)) { + if (!ParseFrameDescription(frame_descr, &vars)) { return; } for (uptr i = 0; i < vars.size(); i++) { - if (access.offset <= vars[i].beg + vars[i].size) { - internal_strncat(descr->name, vars[i].name_pos, - Min(descr->name_size, vars[i].name_len)); - descr->region_address = addr - (access.offset - vars[i].beg); - descr->region_size = vars[i].size; + if (offset <= vars[i].beg + vars[i].size) { + // We use name_len + 1 because strlcpy will guarantee a \0 at the end, so + // if we're limiting the copy due to name_len, we add 1 to ensure we copy + // the whole name and then terminate with '\0'. + internal_strlcpy(name, vars[i].name_pos, + Min(name_size, vars[i].name_len + 1)); + region_address = addr - (offset - vars[i].beg); + region_size = vars[i].size; return; } } } -void GetInfoForHeapAddress(uptr addr, AddressDescription *descr) { - AsanChunkView chunk = FindHeapChunkByAddress(addr); - - descr->name[0] = 0; - descr->region_address = 0; - descr->region_size = 0; - - if (!chunk.IsValid()) { - descr->region_kind = "heap-invalid"; - return; - } - - descr->region_address = chunk.Beg(); - descr->region_size = chunk.UsedSize(); - descr->region_kind = "heap"; -} - -void AsanLocateAddress(uptr addr, AddressDescription *descr) { - if (DescribeAddressIfShadow(addr, descr, /* print */ false)) { - return; - } - if (GetInfoForAddressIfGlobal(addr, descr)) { - return; - } - asanThreadRegistry().Lock(); - AsanThread *thread = FindThreadByStackAddress(addr); - asanThreadRegistry().Unlock(); - if (thread) { - GetInfoForStackVar(addr, descr, thread); - return; - } - GetInfoForHeapAddress(addr, descr); -} - -static uptr AsanGetStack(uptr addr, uptr *trace, u32 size, u32 *thread_id, +uptr AsanGetStack(uptr addr, uptr *trace, u32 size, u32 *thread_id, bool alloc_stack) { AsanChunkView chunk = FindHeapChunkByAddress(addr); if (!chunk.IsValid()) return 0; @@ -108,18 +73,58 @@ static uptr AsanGetStack(uptr addr, uptr return 0; } -} // namespace __asan - -using namespace __asan; +} // namespace SANITIZER_INTERFACE_ATTRIBUTE const char *__asan_locate_address(uptr addr, char *name, uptr name_size, - uptr *region_address, uptr *region_size) { - AddressDescription descr = { name, name_size, 0, 0, nullptr }; - AsanLocateAddress(addr, &descr); - if (region_address) *region_address = descr.region_address; - if (region_size) *region_size = descr.region_size; - return descr.region_kind; + uptr *region_address_ptr, + uptr *region_size_ptr) { + AddressDescription descr(addr); + uptr region_address = 0; + uptr region_size = 0; + const char *region_kind = nullptr; + if (name && name_size > 0) name[0] = 0; + + if (auto shadow = descr.AsShadow()) { + // region_{address,size} are already 0 + switch (shadow->kind) { + case kShadowKindLow: + region_kind = "low shadow"; + break; + case kShadowKindGap: + region_kind = "shadow gap"; + break; + case kShadowKindHigh: + region_kind = "high shadow"; + break; + } + } else if (auto heap = descr.AsHeap()) { + region_kind = "heap"; + region_address = heap->chunk_access.chunk_begin; + region_size = heap->chunk_access.chunk_size; + } else if (auto stack = descr.AsStack()) { + region_kind = "stack"; + if (!stack->frame_descr) { + // region_{address,size} are already 0 + } else { + FindInfoForStackVar(addr, stack->frame_descr, stack->offset, name, + name_size, region_address, region_size); + } + } else if (auto global = descr.AsGlobal()) { + region_kind = "global"; + auto &g = global->globals[0]; + internal_strlcpy(name, g.name, name_size); + region_address = g.beg; + region_size = g.size; + } else { + // region_{address,size} are already 0 + region_kind = "heap-invalid"; + } + + CHECK(region_kind); + if (region_address_ptr) *region_address_ptr = region_address; + if (region_size_ptr) *region_size_ptr = region_size; + return region_kind; } SANITIZER_INTERFACE_ATTRIBUTE Copied: head/contrib/compiler-rt/lib/asan/asan_descriptions.cc (from r314524, projects/clang400-import/contrib/compiler-rt/lib/asan/asan_descriptions.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/compiler-rt/lib/asan/asan_descriptions.cc Thu Mar 2 20:49:40 2017 (r314564, copy of r314524, projects/clang400-import/contrib/compiler-rt/lib/asan/asan_descriptions.cc) @@ -0,0 +1,486 @@ +//===-- asan_descriptions.cc ------------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This file is a part of AddressSanitizer, an address sanity checker. +// +// ASan functions for getting information about an address and/or printing it. +//===----------------------------------------------------------------------===// + +#include "asan_descriptions.h" +#include "asan_mapping.h" +#include "asan_report.h" +#include "asan_stack.h" +#include "sanitizer_common/sanitizer_stackdepot.h" + +namespace __asan { + +// Return " (thread_name) " or an empty string if the name is empty. +const char *ThreadNameWithParenthesis(AsanThreadContext *t, char buff[], + uptr buff_len) { + const char *name = t->name; + if (name[0] == '\0') return ""; + buff[0] = 0; + internal_strncat(buff, " (", 3); + internal_strncat(buff, name, buff_len - 4); + internal_strncat(buff, ")", 2); + return buff; +} + +const char *ThreadNameWithParenthesis(u32 tid, char buff[], uptr buff_len) { + if (tid == kInvalidTid) return ""; + asanThreadRegistry().CheckLocked(); + AsanThreadContext *t = GetThreadContextByTidLocked(tid); + return ThreadNameWithParenthesis(t, buff, buff_len); +} + +void DescribeThread(AsanThreadContext *context) { + CHECK(context); + asanThreadRegistry().CheckLocked(); + // No need to announce the main thread. + if (context->tid == 0 || context->announced) { + return; + } + context->announced = true; + char tname[128]; + InternalScopedString str(1024); + str.append("Thread T%d%s", context->tid, + ThreadNameWithParenthesis(context->tid, tname, sizeof(tname))); + if (context->parent_tid == kInvalidTid) { + str.append(" created by unknown thread\n"); + Printf("%s", str.data()); + return; + } + str.append( + " created by T%d%s here:\n", context->parent_tid, + ThreadNameWithParenthesis(context->parent_tid, tname, sizeof(tname))); + Printf("%s", str.data()); + StackDepotGet(context->stack_id).Print(); + // Recursively described parent thread if needed. + if (flags()->print_full_thread_history) { + AsanThreadContext *parent_context = + GetThreadContextByTidLocked(context->parent_tid); + DescribeThread(parent_context); + } +} + +// Shadow descriptions +static bool GetShadowKind(uptr addr, ShadowKind *shadow_kind) { + CHECK(!AddrIsInMem(addr)); + if (AddrIsInShadowGap(addr)) { + *shadow_kind = kShadowKindGap; + } else if (AddrIsInHighShadow(addr)) { + *shadow_kind = kShadowKindHigh; + } else if (AddrIsInLowShadow(addr)) { + *shadow_kind = kShadowKindLow; + } else { + CHECK(0 && "Address is not in memory and not in shadow?"); + return false; + } + return true; +} + +bool DescribeAddressIfShadow(uptr addr) { + ShadowAddressDescription descr; + if (!GetShadowAddressInformation(addr, &descr)) return false; + descr.Print(); + return true; +} + +bool GetShadowAddressInformation(uptr addr, ShadowAddressDescription *descr) { + if (AddrIsInMem(addr)) return false; + ShadowKind shadow_kind; + if (!GetShadowKind(addr, &shadow_kind)) return false; + if (shadow_kind != kShadowKindGap) descr->shadow_byte = *(u8 *)addr; + descr->addr = addr; + descr->kind = shadow_kind; + return true; +} + +// Heap descriptions +static void GetAccessToHeapChunkInformation(ChunkAccess *descr, + AsanChunkView chunk, uptr addr, + uptr access_size) { + descr->bad_addr = addr; + if (chunk.AddrIsAtLeft(addr, access_size, &descr->offset)) { + descr->access_type = kAccessTypeLeft; + } else if (chunk.AddrIsAtRight(addr, access_size, &descr->offset)) { + descr->access_type = kAccessTypeRight; + if (descr->offset < 0) { + descr->bad_addr -= descr->offset; + descr->offset = 0; + } + } else if (chunk.AddrIsInside(addr, access_size, &descr->offset)) { + descr->access_type = kAccessTypeInside; + } else { + descr->access_type = kAccessTypeUnknown; + } + descr->chunk_begin = chunk.Beg(); + descr->chunk_size = chunk.UsedSize(); + descr->alloc_type = chunk.GetAllocType(); +} + +static void PrintHeapChunkAccess(uptr addr, const ChunkAccess &descr) { + Decorator d; + InternalScopedString str(4096); + str.append("%s", d.Location()); + switch (descr.access_type) { + case kAccessTypeLeft: + str.append("%p is located %zd bytes to the left of", + (void *)descr.bad_addr, descr.offset); + break; + case kAccessTypeRight: + str.append("%p is located %zd bytes to the right of", + (void *)descr.bad_addr, descr.offset); + break; + case kAccessTypeInside: + str.append("%p is located %zd bytes inside of", (void *)descr.bad_addr, + descr.offset); + break; + case kAccessTypeUnknown: + str.append( + "%p is located somewhere around (this is AddressSanitizer bug!)", + (void *)descr.bad_addr); + } + str.append(" %zu-byte region [%p,%p)\n", descr.chunk_size, + (void *)descr.chunk_begin, + (void *)(descr.chunk_begin + descr.chunk_size)); + str.append("%s", d.EndLocation()); + Printf("%s", str.data()); +} + +bool GetHeapAddressInformation(uptr addr, uptr access_size, + HeapAddressDescription *descr) { + AsanChunkView chunk = FindHeapChunkByAddress(addr); + if (!chunk.IsValid()) { + return false; + } + descr->addr = addr; + GetAccessToHeapChunkInformation(&descr->chunk_access, chunk, addr, + access_size); + CHECK_NE(chunk.AllocTid(), kInvalidTid); + descr->alloc_tid = chunk.AllocTid(); + descr->alloc_stack_id = chunk.GetAllocStackId(); + descr->free_tid = chunk.FreeTid(); + if (descr->free_tid != kInvalidTid) + descr->free_stack_id = chunk.GetFreeStackId(); + return true; +} + +static StackTrace GetStackTraceFromId(u32 id) { + CHECK(id); + StackTrace res = StackDepotGet(id); + CHECK(res.trace); + return res; +} + +bool DescribeAddressIfHeap(uptr addr, uptr access_size) { + HeapAddressDescription descr; + if (!GetHeapAddressInformation(addr, access_size, &descr)) { + Printf( + "AddressSanitizer can not describe address in more detail " + "(wild memory access suspected).\n"); + return false; + } + descr.Print(); + return true; +} + +// Stack descriptions +bool GetStackAddressInformation(uptr addr, uptr access_size, + StackAddressDescription *descr) { + AsanThread *t = FindThreadByStackAddress(addr); + if (!t) return false; + + descr->addr = addr; + descr->tid = t->tid(); + // Try to fetch precise stack frame for this access. + AsanThread::StackFrameAccess access; + if (!t->GetStackFrameAccessByAddr(addr, &access)) { + descr->frame_descr = nullptr; + return true; + } + + descr->offset = access.offset; + descr->access_size = access_size; + descr->frame_pc = access.frame_pc; + descr->frame_descr = access.frame_descr; + +#if SANITIZER_PPC64V1 + // On PowerPC64 ELFv1, the address of a function actually points to a + // three-doubleword data structure with the first field containing + // the address of the function's code. + descr->frame_pc = *reinterpret_cast(descr->frame_pc); +#endif + descr->frame_pc += 16; + + return true; +} + +static void PrintAccessAndVarIntersection(const StackVarDescr &var, uptr addr, + uptr access_size, uptr prev_var_end, *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Thu Mar 2 20:52:14 2017 Return-Path: Delivered-To: svn-src-all@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 256BACF66FC; Thu, 2 Mar 2017 20:52:14 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D686E842; Thu, 2 Mar 2017 20:52:13 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from [IPv6:2001:7b8:3a7::20ea:d25d:b0f5:a63f] (unknown [IPv6:2001:7b8:3a7:0:20ea:d25d:b0f5:a63f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id B0F2622C42; Thu, 2 Mar 2017 21:52:10 +0100 (CET) From: Dimitry Andric Content-Type: multipart/signed; boundary="Apple-Mail=_79B94ADA-A776-4522-9EAA-7CDAD55C6FC5"; protocol="application/pgp-signature"; micalg=pgp-sha1 Mime-Version: 1.0 (Mac OS X Mail 10.2 \(3259\)) Subject: Re: svn commit: r314564 - in head: . contrib/compiler-rt/include/sanitizer contrib/compiler-rt/include/xray contrib/compiler-rt/lib/asan contrib/compiler-rt/lib/builtins contrib/compiler-rt/lib/builtin... Date: Thu, 2 Mar 2017 21:52:02 +0100 References: <201703022049.v22Kniwj078643@repo.freebsd.org> To: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org In-Reply-To: <201703022049.v22Kniwj078643@repo.freebsd.org> Message-Id: <27D66D72-0E16-4E44-AACE-E5035F629C19@FreeBSD.org> X-Mailer: Apple Mail (2.3259) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 20:52:14 -0000 --Apple-Mail=_79B94ADA-A776-4522-9EAA-7CDAD55C6FC5 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On 2 Mar 2017, at 21:49, Dimitry Andric wrote: > > Author: dim > Date: Thu Mar 2 20:49:40 2017 > New Revision: 314564 > URL: https://svnweb.freebsd.org/changeset/base/314564 > > Log: > Upgrade our copies of clang, llvm, lld, lldb, compiler-rt and libc++ to > 4.0.0 (branches/release_40 296509). The release will follow soon. > > Please note that from 3.5.0 onwards, clang, llvm and lldb require C++11 > support to build; see UPDATING for more information. > > Also note that as of 4.0.0, lld should be able to link the base system > on amd64 and aarch64. See the WITH_LLD_IS_LLD setting in src.conf(5). Apologies for this typo, it should be WITH_LLD_IS_LD instead! -Dimitry --Apple-Mail=_79B94ADA-A776-4522-9EAA-7CDAD55C6FC5 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.30 iEYEARECAAYFAli4hfoACgkQsF6jCi4glqMtgwCgkFby2T8/ahNesgIaLxD76XI7 MUsAn3v3MpIAvMCVDW30dpZK4MR8FM+O =g0kD -----END PGP SIGNATURE----- --Apple-Mail=_79B94ADA-A776-4522-9EAA-7CDAD55C6FC5-- From owner-svn-src-all@freebsd.org Thu Mar 2 21:02:20 2017 Return-Path: Delivered-To: svn-src-all@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 2BFE3CF6AF5; Thu, 2 Mar 2017 21:02:20 +0000 (UTC) (envelope-from mm@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 D6847FC8; Thu, 2 Mar 2017 21:02:19 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22L2JN3086217; Thu, 2 Mar 2017 21:02:19 GMT (envelope-from mm@FreeBSD.org) Received: (from mm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22L2H4M086204; Thu, 2 Mar 2017 21:02:17 GMT (envelope-from mm@FreeBSD.org) Message-Id: <201703022102.v22L2H4M086204@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mm set sender to mm@FreeBSD.org using -f From: Martin Matuska Date: Thu, 2 Mar 2017 21:02:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314565 - in vendor/libarchive/dist: . build build/cmake cat/test cpio/test libarchive libarchive/test tar tar/test test_utils X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 21:02:20 -0000 Author: mm Date: Thu Mar 2 21:02:17 2017 New Revision: 314565 URL: https://svnweb.freebsd.org/changeset/base/314565 Log: Update vendor/libarchive to git d6b1bb9f7ea7bc153b7356e8e345c9e48005821a Release 3.3.1 Notable vendor changes: PR #501: improvements in ACL path handling PR #724: fix hang when reading malformed cpio files PR #864: fix out of bounds read with malformed GNU tar archives Test suite improvements New options to bsdtar that enable or disable reading and/or writing of: Access Control Lists (--acls, --no-acls) Extended file flags (--fflags, --no-fflags) Extended attributes (--xattrs, --no-xattrs) Added: vendor/libarchive/dist/test_utils/test_common.h (contents, props changed) vendor/libarchive/dist/test_utils/test_main.c - copied, changed from r314564, vendor/libarchive/dist/libarchive/test/main.c Deleted: vendor/libarchive/dist/cat/test/main.c vendor/libarchive/dist/cpio/test/main.c vendor/libarchive/dist/libarchive/test/main.c vendor/libarchive/dist/tar/test/main.c Modified: vendor/libarchive/dist/CMakeLists.txt vendor/libarchive/dist/Makefile.am vendor/libarchive/dist/NEWS vendor/libarchive/dist/build/autogen.sh vendor/libarchive/dist/build/cmake/config.h.in vendor/libarchive/dist/build/version vendor/libarchive/dist/cat/test/CMakeLists.txt vendor/libarchive/dist/cat/test/test.h vendor/libarchive/dist/cat/test/test_version.c vendor/libarchive/dist/configure.ac vendor/libarchive/dist/cpio/test/CMakeLists.txt vendor/libarchive/dist/cpio/test/test.h vendor/libarchive/dist/cpio/test/test_option_version.c vendor/libarchive/dist/libarchive/archive.h vendor/libarchive/dist/libarchive/archive_digest_private.h vendor/libarchive/dist/libarchive/archive_entry.c vendor/libarchive/dist/libarchive/archive_entry.h vendor/libarchive/dist/libarchive/archive_hmac.c vendor/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c vendor/libarchive/dist/libarchive/archive_read_disk_posix.c vendor/libarchive/dist/libarchive/archive_read_disk_private.h vendor/libarchive/dist/libarchive/archive_read_disk_windows.c vendor/libarchive/dist/libarchive/archive_read_support_format_tar.c vendor/libarchive/dist/libarchive/archive_read_support_format_warc.c vendor/libarchive/dist/libarchive/archive_write_disk_posix.c vendor/libarchive/dist/libarchive/archive_write_set_format_iso9660.c vendor/libarchive/dist/libarchive/test/CMakeLists.txt vendor/libarchive/dist/libarchive/test/test.h vendor/libarchive/dist/libarchive/test/test_acl_nfs4.c vendor/libarchive/dist/libarchive/test/test_acl_pax.c vendor/libarchive/dist/libarchive/test/test_acl_platform_posix1e.c vendor/libarchive/dist/libarchive/test/test_acl_posix1e.c vendor/libarchive/dist/libarchive/test/test_acl_text.c vendor/libarchive/dist/libarchive/test/test_archive_api_feature.c vendor/libarchive/dist/libarchive/test/test_compat_solaris_tar_acl.c vendor/libarchive/dist/libarchive/test/test_compat_star_acl.c vendor/libarchive/dist/libarchive/test/test_fuzz.c vendor/libarchive/dist/libarchive/test/test_read_disk.c vendor/libarchive/dist/libarchive/test/test_read_disk_directory_traversals.c vendor/libarchive/dist/tar/bsdtar.1 vendor/libarchive/dist/tar/bsdtar.c vendor/libarchive/dist/tar/bsdtar.h vendor/libarchive/dist/tar/cmdline.c vendor/libarchive/dist/tar/read.c vendor/libarchive/dist/tar/test/CMakeLists.txt vendor/libarchive/dist/tar/test/test.h vendor/libarchive/dist/tar/test/test_version.c vendor/libarchive/dist/tar/util.c vendor/libarchive/dist/tar/write.c Modified: vendor/libarchive/dist/CMakeLists.txt ============================================================================== --- vendor/libarchive/dist/CMakeLists.txt Thu Mar 2 20:49:40 2017 (r314564) +++ vendor/libarchive/dist/CMakeLists.txt Thu Mar 2 21:02:17 2017 (r314565) @@ -15,7 +15,7 @@ endif() # RelWithDebInfo : Release build with Debug Info # MinSizeRel : Release Min Size build IF(NOT CMAKE_BUILD_TYPE) - SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Type" FORCE) + SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build Type" FORCE) ENDIF(NOT CMAKE_BUILD_TYPE) # Set a value type to properly display CMAKE_BUILD_TYPE on GUI if the # value type is "UNINITIALIZED". @@ -44,13 +44,13 @@ SET(CMAKE_MACOSX_RPATH ON) # FILE(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/build/version _version) STRING(REGEX REPLACE - "^([0-9])[0-9][0-9][0-9][0-9][0-9][0-9][a-z]?$" "\\1" _major ${_version}) + "^([0-9])[0-9][0-9][0-9][0-9][0-9][0-9][a-z]*$" "\\1" _major ${_version}) STRING(REGEX REPLACE - "^[0-9]([0-9][0-9][0-9])[0-9][0-9][0-9][a-z]?$" "\\1" _minor ${_version}) + "^[0-9]([0-9][0-9][0-9])[0-9][0-9][0-9][a-z]*$" "\\1" _minor ${_version}) STRING(REGEX REPLACE - "^[0-9][0-9][0-9][0-9]([0-9][0-9][0-9])[a-z]?$" "\\1" _revision ${_version}) + "^[0-9][0-9][0-9][0-9]([0-9][0-9][0-9])[a-z]*$" "\\1" _revision ${_version}) STRING(REGEX REPLACE - "^[0-9][0-9][0-9][0-9][0-9][0-9][0-9]([a-z]?)$" "\\1" _quality ${_version}) + "^[0-9][0-9][0-9][0-9][0-9][0-9][0-9]([a-z]*)$" "\\1" _quality ${_version}) SET(_version_number ${_major}${_minor}${_revision}) STRING(REGEX REPLACE "[0]*([^0]*[0-9])$" "\\1" _trimmed_minor ${_minor}) STRING(REGEX REPLACE "[0]*([^0]*[0-9])$" "\\1" _trimmed_revision ${_revision}) @@ -462,6 +462,8 @@ ENDIF() IF(LIBLZMA_FOUND) SET(HAVE_LIBLZMA 1) SET(HAVE_LZMA_H 1) + SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR}) + SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES}) INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS}) LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES}) # Test if a macro is needed for the library. @@ -570,6 +572,11 @@ LA_CHECK_INCLUDE_FILE("limits.h" HAVE_LI LA_CHECK_INCLUDE_FILE("linux/types.h" HAVE_LINUX_TYPES_H) LA_CHECK_INCLUDE_FILE("linux/fiemap.h" HAVE_LINUX_FIEMAP_H) LA_CHECK_INCLUDE_FILE("linux/fs.h" HAVE_LINUX_FS_H) + +CHECK_C_SOURCE_COMPILES("#include +#include +int main(void) { return FS_IOC_GETFLAGS; }" HAVE_WORKING_FS_IOC_GETFLAGS) + LA_CHECK_INCLUDE_FILE("linux/magic.h" HAVE_LINUX_MAGIC_H) LA_CHECK_INCLUDE_FILE("locale.h" HAVE_LOCALE_H) LA_CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H) Modified: vendor/libarchive/dist/Makefile.am ============================================================================== --- vendor/libarchive/dist/Makefile.am Thu Mar 2 20:49:40 2017 (r314564) +++ vendor/libarchive/dist/Makefile.am Thu Mar 2 21:02:17 2017 (r314565) @@ -23,7 +23,7 @@ TESTS_ENVIRONMENT= $(libarchive_TESTS_EN DISTCHECK_CONFIGURE_FLAGS = --enable-bsdtar --enable-bsdcpio # The next line is commented out by default in shipping libarchive releases. # It is uncommented by default in trunk. -DEV_CFLAGS=-Werror -Wextra -Wunused -Wshadow -Wmissing-prototypes -Wcast-qual -g +# DEV_CFLAGS=-Werror -Wextra -Wunused -Wshadow -Wmissing-prototypes -Wcast-qual -g AM_CFLAGS=$(DEV_CFLAGS) PLATFORMCPPFLAGS = @PLATFORMCPPFLAGS@ AM_CPPFLAGS=$(PLATFORMCPPFLAGS) @@ -310,7 +310,9 @@ pkgconfig_DATA = build/pkgconfig/libarch # Sources needed by all test programs test_utils_SOURCES= \ test_utils/test_utils.c \ - test_utils/test_utils.h + test_utils/test_utils.h \ + test_utils/test_main.c \ + test_utils/test_common.h # # @@ -320,7 +322,6 @@ test_utils_SOURCES= \ libarchive_test_SOURCES= \ $(libarchive_la_SOURCES) \ $(test_utils_SOURCES) \ - libarchive/test/main.c \ libarchive/test/read_open_memory.c \ libarchive/test/test.h \ libarchive/test/test_acl_nfs4.c \ @@ -586,7 +587,13 @@ libarchive_test_SOURCES= \ libarchive/test/test_write_read_format_zip.c \ libarchive/test/test_zip_filename_encoding.c -libarchive_test_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_srcdir)/test_utils -I$(top_builddir)/libarchive/test -DLIBARCHIVE_STATIC $(PLATFORMCPPFLAGS) +libarchive_test_CPPFLAGS= \ + -I$(top_srcdir)/libarchive \ + -I$(top_srcdir)/libarchive/test \ + -I$(top_srcdir)/test_utils \ + -I$(top_builddir)/libarchive/test \ + -DLIBARCHIVE_STATIC $(PLATFORMCPPFLAGS) + libarchive_test_LDADD= $(LTLIBICONV) # The "list.h" file just lists all of the tests defined in all of the sources. @@ -918,7 +925,6 @@ endif bsdtar_test_SOURCES= \ $(test_utils_SOURCES) \ - tar/test/main.c \ tar/test/test.h \ tar/test/test_0.c \ tar/test/test_basic.c \ @@ -981,7 +987,8 @@ bsdtar_test_SOURCES= \ bsdtar_test_CPPFLAGS=\ -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe \ -I$(top_srcdir)/test_utils \ - -I$(top_srcdir)/tar -I$(top_builddir)/tar/test \ + -I$(top_srcdir)/tar -I$(top_srcdir)/tar/test \ + -I$(top_builddir)/tar/test \ $(PLATFORMCPPFLAGS) tar/test/list.h: Makefile @@ -1076,7 +1083,6 @@ endif bsdcpio_test_SOURCES= \ $(test_utils_SOURCES) \ cpio/cmdline.c \ - cpio/test/main.c \ cpio/test/test.h \ cpio/test/test_0.c \ cpio/test/test_basic.c \ @@ -1128,7 +1134,8 @@ bsdcpio_test_SOURCES= \ bsdcpio_test_CPPFLAGS= \ -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe \ -I$(top_srcdir)/test_utils \ - -I$(top_srcdir)/cpio -I$(top_builddir)/cpio/test \ + -I$(top_srcdir)/cpio -I$(top_srcdir)/cpio/test \ + -I$(top_builddir)/cpio/test \ $(PLATFORMCPPFLAGS) bsdcpio_test_LDADD=libarchive_fe.la @@ -1223,7 +1230,6 @@ endif bsdcat_test_SOURCES= \ $(test_utils_SOURCES) \ - cat/test/main.c \ cat/test/test.h \ cat/test/test_0.c \ cat/test/test_empty_gz.c \ @@ -1244,7 +1250,8 @@ bsdcat_test_SOURCES= \ bsdcat_test_CPPFLAGS= \ -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe \ -I$(top_srcdir)/test_utils \ - -I$(top_srcdir)/cat -I$(top_builddir)/cat/test \ + -I$(top_srcdir)/cat -I$(top_srcdir)/cat/test \ + -I$(top_builddir)/cat/test \ $(PLATFORMCPPFLAGS) bsdcat_test_LDADD=libarchive_fe.la Modified: vendor/libarchive/dist/NEWS ============================================================================== --- vendor/libarchive/dist/NEWS Thu Mar 2 20:49:40 2017 (r314564) +++ vendor/libarchive/dist/NEWS Thu Mar 2 21:02:17 2017 (r314565) @@ -1,3 +1,9 @@ +Feb 26, 2017: libarchive 3.3.1 released + Security & Feature release + +Feb 19, 2017: libarchive 3.3.0 released + Security & Feature release + Jan 29, 2017: Limited NFSv4 ACL support for Mac OS (Darwin) Jan 10, 2017: POSIX.1e and NFSv4 ACL support for Solaris and derivates @@ -5,6 +11,8 @@ Jan 10, 2017: POSIX.1e and NFSv4 ACL sup Dec 27, 2016: NFSv4 ACL read and write support for pax Deprecated functions: archive_entry_acl_text(), archive_entry_acl_text_w() +Nov, 2016: libarchive is now being tested by the OSS-Fuzz project + Oct 26, 2016: Remove liblzmadec support Oct 23, 2016: libarchive 3.2.2 released Modified: vendor/libarchive/dist/build/autogen.sh ============================================================================== --- vendor/libarchive/dist/build/autogen.sh Thu Mar 2 20:49:40 2017 (r314564) +++ vendor/libarchive/dist/build/autogen.sh Thu Mar 2 21:02:17 2017 (r314565) @@ -51,6 +51,7 @@ perl -p -i -e 's/(m4_define\(\[LIBARCHIV # Remove developer CFLAGS if a release build is being made if [ -n "${MAKE_LIBARCHIVE_RELEASE}" ]; then perl -p -i -e "s/^(DEV_CFLAGS.*)/# \$1/" Makefile.am + perl -p -i -e 's/CMAKE_BUILD_TYPE "[A-Za-z]*"/CMAKE_BUILD_TYPE "Release"/' CMakeLists.txt fi set -xe Modified: vendor/libarchive/dist/build/cmake/config.h.in ============================================================================== --- vendor/libarchive/dist/build/cmake/config.h.in Thu Mar 2 20:49:40 2017 (r314564) +++ vendor/libarchive/dist/build/cmake/config.h.in Thu Mar 2 21:02:17 2017 (r314565) @@ -1099,6 +1099,9 @@ typedef uint64_t uintmax_t; /* Define to 1 if you have a working EXT2_IOC_GETFLAGS */ #cmakedefine HAVE_WORKING_EXT2_IOC_GETFLAGS 1 +/* Define to 1 if you have a working FS_IOC_GETFLAGS */ +#cmakedefine HAVE_WORKING_FS_IOC_GETFLAGS 1 + /* Define to 1 if you have the header file. */ #cmakedefine HAVE_ZLIB_H 1 Modified: vendor/libarchive/dist/build/version ============================================================================== --- vendor/libarchive/dist/build/version Thu Mar 2 20:49:40 2017 (r314564) +++ vendor/libarchive/dist/build/version Thu Mar 2 21:02:17 2017 (r314565) @@ -1 +1 @@ -3002002 +3003001 Modified: vendor/libarchive/dist/cat/test/CMakeLists.txt ============================================================================== --- vendor/libarchive/dist/cat/test/CMakeLists.txt Thu Mar 2 20:49:40 2017 (r314564) +++ vendor/libarchive/dist/cat/test/CMakeLists.txt Thu Mar 2 21:02:17 2017 (r314565) @@ -6,7 +6,7 @@ IF(ENABLE_CAT AND ENABLE_TEST) SET(bsdcat_test_SOURCES ../../test_utils/test_utils.c - main.c + ../../test_utils/test_main.c test.h test_0.c test_empty_gz.c @@ -54,6 +54,7 @@ IF(ENABLE_CAT AND ENABLE_TEST) INCLUDE(${CMAKE_CURRENT_BINARY_DIR}/list.h) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/test_utils) + INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/cat/test) # Experimental new test handling ADD_CUSTOM_TARGET(run_bsdcat_test Modified: vendor/libarchive/dist/cat/test/test.h ============================================================================== --- vendor/libarchive/dist/cat/test/test.h Thu Mar 2 20:49:40 2017 (r314564) +++ vendor/libarchive/dist/cat/test/test.h Thu Mar 2 21:02:17 2017 (r314565) @@ -27,328 +27,14 @@ /* Every test program should #include "test.h" as the first thing. */ -/* - * The goal of this file (and the matching test.c) is to - * simplify the very repetitive test-*.c test programs. - */ -#if defined(HAVE_CONFIG_H) -/* Most POSIX platforms use the 'configure' script to build config.h */ -#include "config.h" -#elif defined(__FreeBSD__) -/* Building as part of FreeBSD system requires a pre-built config.h. */ -#include "config_freebsd.h" -#elif defined(_WIN32) && !defined(__CYGWIN__) -/* Win32 can't run the 'configure' script. */ -#include "config_windows.h" -#else -/* Warn if the library hasn't been (automatically or manually) configured. */ -#error Oops: No config.h and no pre-built configuration in test.h. -#endif +#define KNOWNREF "test_expand.Z.uu" +#define ENVBASE "BSDCAT" /* Prefix for environment variables. */ +#define PROGRAM "bsdcat" /* Name of program being tested. */ +#define PROGRAM_ALIAS "cat" /* Generic alias for program */ +#undef LIBRARY /* Not testing a library. */ +#undef EXTRA_DUMP /* How to dump extra data */ +#undef EXTRA_ERRNO /* How to dump errno */ +/* How to generate extra version info. */ +#define EXTRA_VERSION (systemf("%s --version", testprog) ? "" : "") -#include /* Windows requires this before sys/stat.h */ -#include - -#if HAVE_DIRENT_H -#include -#endif -#ifdef HAVE_DIRECT_H -#include -#define dirent direct -#endif -#include -#include -#ifdef HAVE_IO_H -#include -#endif -#ifdef HAVE_STDINT_H -#include -#endif -#include -#include -#include -#include -#include -#ifdef HAVE_UNISTD_H -#include -#endif -#include -#ifdef HAVE_WINDOWS_H -#include -#endif - -/* - * System-specific tweaks. We really want to minimize these - * as much as possible, since they make it harder to understand - * the mainline code. - */ - -/* Windows (including Visual Studio and MinGW but not Cygwin) */ -#if defined(_WIN32) && !defined(__CYGWIN__) -#if !defined(__BORLANDC__) -#undef chdir -#define chdir _chdir -#define strdup _strdup -#endif -#endif - -/* Visual Studio */ -#if defined(_MSC_VER) && _MSC_VER < 1900 -#define snprintf sprintf_s -#endif - -#if defined(__BORLANDC__) -#pragma warn -8068 /* Constant out of range in comparison. */ -#endif - -/* Haiku OS and QNX */ -#if defined(__HAIKU__) || defined(__QNXNTO__) -/* Haiku and QNX have typedefs in stdint.h (needed for int64_t) */ -#include -#endif - -/* Get a real definition for __FBSDID if we can */ -#if HAVE_SYS_CDEFS_H -#include -#endif - -/* If not, define it so as to avoid dangling semicolons. */ -#ifndef __FBSDID -#define __FBSDID(a) struct _undefined_hack -#endif - -#ifndef O_BINARY -#define O_BINARY 0 -#endif - -/* - * Redefine DEFINE_TEST for use in defining the test functions. - */ -#undef DEFINE_TEST -#define DEFINE_TEST(name) void name(void); void name(void) - -/* An implementation of the standard assert() macro */ -#define assert(e) assertion_assert(__FILE__, __LINE__, (e), #e, NULL) -/* chdir() and error if it fails */ -#define assertChdir(path) \ - assertion_chdir(__FILE__, __LINE__, path) -/* Assert two integers are the same. Reports value of each one if not. */ -#define assertEqualInt(v1,v2) \ - assertion_equal_int(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL) -/* Assert two strings are the same. Reports value of each one if not. */ -#define assertEqualString(v1,v2) \ - assertion_equal_string(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL, 0) -#define assertEqualUTF8String(v1,v2) \ - assertion_equal_string(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL, 1) -/* As above, but v1 and v2 are wchar_t * */ -#define assertEqualWString(v1,v2) \ - assertion_equal_wstring(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL) -/* As above, but raw blocks of bytes. */ -#define assertEqualMem(v1, v2, l) \ - assertion_equal_mem(__FILE__, __LINE__, (v1), #v1, (v2), #v2, (l), #l, NULL) -/* Assert that memory is full of a specified byte */ -#define assertMemoryFilledWith(v1, l, b) \ - assertion_memory_filled_with(__FILE__, __LINE__, (v1), #v1, (l), #l, (b), #b, NULL) -/* Assert two files are the same. */ -#define assertEqualFile(f1, f2) \ - assertion_equal_file(__FILE__, __LINE__, (f1), (f2)) -/* Assert that a file is empty. */ -#define assertEmptyFile(pathname) \ - assertion_empty_file(__FILE__, __LINE__, (pathname)) -/* Assert that a file is not empty. */ -#define assertNonEmptyFile(pathname) \ - assertion_non_empty_file(__FILE__, __LINE__, (pathname)) -#define assertFileAtime(pathname, sec, nsec) \ - assertion_file_atime(__FILE__, __LINE__, pathname, sec, nsec) -#define assertFileAtimeRecent(pathname) \ - assertion_file_atime_recent(__FILE__, __LINE__, pathname) -#define assertFileBirthtime(pathname, sec, nsec) \ - assertion_file_birthtime(__FILE__, __LINE__, pathname, sec, nsec) -#define assertFileBirthtimeRecent(pathname) \ - assertion_file_birthtime_recent(__FILE__, __LINE__, pathname) -/* Assert that a file exists; supports printf-style arguments. */ -#define assertFileExists(pathname) \ - assertion_file_exists(__FILE__, __LINE__, pathname) -/* Assert that a file exists. */ -#define assertFileNotExists(pathname) \ - assertion_file_not_exists(__FILE__, __LINE__, pathname) -/* Assert that file contents match a string. */ -#define assertFileContents(data, data_size, pathname) \ - assertion_file_contents(__FILE__, __LINE__, data, data_size, pathname) -/* Verify that a file does not contain invalid strings */ -#define assertFileContainsNoInvalidStrings(pathname, strings) \ - assertion_file_contains_no_invalid_strings(__FILE__, __LINE__, pathname, strings) -#define assertFileMtime(pathname, sec, nsec) \ - assertion_file_mtime(__FILE__, __LINE__, pathname, sec, nsec) -#define assertFileMtimeRecent(pathname) \ - assertion_file_mtime_recent(__FILE__, __LINE__, pathname) -#define assertFileNLinks(pathname, nlinks) \ - assertion_file_nlinks(__FILE__, __LINE__, pathname, nlinks) -#define assertFileSize(pathname, size) \ - assertion_file_size(__FILE__, __LINE__, pathname, size) -#define assertFileMode(pathname, mode) \ - assertion_file_mode(__FILE__, __LINE__, pathname, mode) -#define assertTextFileContents(text, pathname) \ - assertion_text_file_contents(__FILE__, __LINE__, text, pathname) -#define assertFileContainsLinesAnyOrder(pathname, lines) \ - assertion_file_contains_lines_any_order(__FILE__, __LINE__, pathname, lines) -#define assertIsDir(pathname, mode) \ - assertion_is_dir(__FILE__, __LINE__, pathname, mode) -#define assertIsHardlink(path1, path2) \ - assertion_is_hardlink(__FILE__, __LINE__, path1, path2) -#define assertIsNotHardlink(path1, path2) \ - assertion_is_not_hardlink(__FILE__, __LINE__, path1, path2) -#define assertIsReg(pathname, mode) \ - assertion_is_reg(__FILE__, __LINE__, pathname, mode) -#define assertIsSymlink(pathname, contents) \ - assertion_is_symlink(__FILE__, __LINE__, pathname, contents) -/* Create a directory, report error if it fails. */ -#define assertMakeDir(dirname, mode) \ - assertion_make_dir(__FILE__, __LINE__, dirname, mode) -#define assertMakeFile(path, mode, contents) \ - assertion_make_file(__FILE__, __LINE__, path, mode, -1, contents) -#define assertMakeBinFile(path, mode, csize, contents) \ - assertion_make_file(__FILE__, __LINE__, path, mode, csize, contents) -#define assertMakeHardlink(newfile, oldfile) \ - assertion_make_hardlink(__FILE__, __LINE__, newfile, oldfile) -#define assertMakeSymlink(newfile, linkto) \ - assertion_make_symlink(__FILE__, __LINE__, newfile, linkto) -#define assertNodump(path) \ - assertion_nodump(__FILE__, __LINE__, path) -#define assertUmask(mask) \ - assertion_umask(__FILE__, __LINE__, mask) -#define assertUtimes(pathname, atime, atime_nsec, mtime, mtime_nsec) \ - assertion_utimes(__FILE__, __LINE__, pathname, atime, atime_nsec, mtime, mtime_nsec) - -/* - * This would be simple with C99 variadic macros, but I don't want to - * require that. Instead, I insert a function call before each - * skipping() call to pass the file and line information down. Crude, - * but effective. - */ -#define skipping \ - skipping_setup(__FILE__, __LINE__);test_skipping - -/* Function declarations. These are defined in test_utility.c. */ -void failure(const char *fmt, ...); -int assertion_assert(const char *, int, int, const char *, void *); -int assertion_chdir(const char *, int, const char *); -int assertion_empty_file(const char *, int, const char *); -int assertion_equal_file(const char *, int, const char *, const char *); -int assertion_equal_int(const char *, int, long long, const char *, long long, const char *, void *); -int assertion_equal_mem(const char *, int, const void *, const char *, const void *, const char *, size_t, const char *, void *); -int assertion_memory_filled_with(const char *, int, const void *, const char *, size_t, const char *, char, const char *, void *); -int assertion_equal_string(const char *, int, const char *v1, const char *, const char *v2, const char *, void *, int); -int assertion_equal_wstring(const char *, int, const wchar_t *v1, const char *, const wchar_t *v2, const char *, void *); -int assertion_file_atime(const char *, int, const char *, long, long); -int assertion_file_atime_recent(const char *, int, const char *); -int assertion_file_birthtime(const char *, int, const char *, long, long); -int assertion_file_birthtime_recent(const char *, int, const char *); -int assertion_file_contains_lines_any_order(const char *, int, const char *, const char **); -int assertion_file_contains_no_invalid_strings(const char *, int, const char *, const char **); -int assertion_file_contents(const char *, int, const void *, int, const char *); -int assertion_file_exists(const char *, int, const char *); -int assertion_file_mode(const char *, int, const char *, int); -int assertion_file_mtime(const char *, int, const char *, long, long); -int assertion_file_mtime_recent(const char *, int, const char *); -int assertion_file_nlinks(const char *, int, const char *, int); -int assertion_file_not_exists(const char *, int, const char *); -int assertion_file_size(const char *, int, const char *, long); -int assertion_is_dir(const char *, int, const char *, int); -int assertion_is_hardlink(const char *, int, const char *, const char *); -int assertion_is_not_hardlink(const char *, int, const char *, const char *); -int assertion_is_reg(const char *, int, const char *, int); -int assertion_is_symlink(const char *, int, const char *, const char *); -int assertion_make_dir(const char *, int, const char *, int); -int assertion_make_file(const char *, int, const char *, int, int, const void *); -int assertion_make_hardlink(const char *, int, const char *newpath, const char *); -int assertion_make_symlink(const char *, int, const char *newpath, const char *); -int assertion_nodump(const char *, int, const char *); -int assertion_non_empty_file(const char *, int, const char *); -int assertion_text_file_contents(const char *, int, const char *buff, const char *f); -int assertion_umask(const char *, int, int); -int assertion_utimes(const char *, int, const char *, long, long, long, long ); - -void skipping_setup(const char *, int); -void test_skipping(const char *fmt, ...); - -/* Like sprintf, then system() */ -int systemf(const char * fmt, ...); - -/* Delay until time() returns a value after this. */ -void sleepUntilAfter(time_t); - -/* Return true if this platform can create symlinks. */ -int canSymlink(void); - -/* Return true if this platform can run the "bzip2" program. */ -int canBzip2(void); - -/* Return true if this platform can run the "grzip" program. */ -int canGrzip(void); - -/* Return true if this platform can run the "gzip" program. */ -int canGzip(void); - -/* Return true if this platform can run the specified command. */ -int canRunCommand(const char *); - -/* Return true if this platform can run the "lrzip" program. */ -int canLrzip(void); - -/* Return true if this platform can run the "lz4" program. */ -int canLz4(void); - -/* Return true if this platform can run the "lzip" program. */ -int canLzip(void); - -/* Return true if this platform can run the "lzma" program. */ -int canLzma(void); - -/* Return true if this platform can run the "lzop" program. */ -int canLzop(void); - -/* Return true if this platform can run the "xz" program. */ -int canXz(void); - -/* Return true if this filesystem can handle nodump flags. */ -int canNodump(void); - -/* Return true if the file has large i-node number(>0xffffffff). */ -int is_LargeInode(const char *); - -/* Suck file into string allocated via malloc(). Call free() when done. */ -/* Supports printf-style args: slurpfile(NULL, "%s/myfile", refdir); */ -char *slurpfile(size_t *, const char *fmt, ...); - -/* Dump block of bytes to a file. */ -void dumpfile(const char *filename, void *, size_t); - -/* Extracts named reference file to the current directory. */ -void extract_reference_file(const char *); -/* Copies named reference file to the current directory. */ -void copy_reference_file(const char *); - -/* Extracts a list of files to the current directory. - * List must be NULL terminated. - */ -void extract_reference_files(const char **); - -/* Subtract umask from mode */ -mode_t umasked(mode_t expected_mode); - -/* Path to working directory for current test */ -extern const char *testworkdir; - -/* - * Special interfaces for program test harness. - */ - -/* Pathname of exe to be tested. */ -extern const char *testprogfile; -/* Name of exe to use in printf-formatted command strings. */ -/* On Windows, this includes leading/trailing quotes. */ -extern const char *testprog; - -#ifdef USE_DMALLOC -#include -#endif +#include "test_common.h" Modified: vendor/libarchive/dist/cat/test/test_version.c ============================================================================== --- vendor/libarchive/dist/cat/test/test_version.c Thu Mar 2 20:49:40 2017 (r314564) +++ vendor/libarchive/dist/cat/test/test_version.c Thu Mar 2 21:02:17 2017 (r314565) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003-2007 Tim Kientzle + * Copyright (c) 2003-2017 Tim Kientzle * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,68 +30,5 @@ DEFINE_TEST(test_version) { - int r; - char *p, *q; - size_t s; - - - r = systemf("%s --version >version.stdout 2>version.stderr", testprog); - failure("Unable to run %s --version", testprog); - if (!assert(r == 0)) - return; - - /* --version should generate nothing to stdout. */ - assertEmptyFile("version.stderr"); - /* Verify format of version message. */ - q = p = slurpfile(&s, "version.stdout"); - /* Version message should start with name of program, then space. */ - assert(s > 6); - failure("Version must start with 'bsdcat': ``%s''", p); - if (!assertEqualMem(q, "bsdcat ", 7)) - return; - q += 7; s -= 7; - /* Version number is a series of digits and periods. */ - while (s > 0 && (*q == '.' || (*q >= '0' && *q <= '9'))) { - ++q; - --s; - } - /* Version number terminated by space. */ - failure("No space after bsdcat version: ``%s''", p); - assert(s > 1); - /* Skip a single trailing a,b,c, or d. */ - if (*q == 'a' || *q == 'b' || *q == 'c' || *q == 'd') - ++q; - failure("No space after bsdcat version: ``%s''", p); - assert(*q == ' '); - ++q; --s; - /* Separator. */ - failure("No `-' between bsdcat and libarchive versions: ``%s''", p); - assertEqualMem(q, "- ", 2); - q += 2; s -= 2; - /* libarchive name and version number */ - failure("Not long enough for libarchive version: ``%s''", p); - assert(s > 11); - failure("Libarchive version must start with `libarchive': ``%s''", p); - assertEqualMem(q, "libarchive ", 11); - q += 11; s -= 11; - /* Version number is a series of digits and periods. */ - while (s > 0 && (*q == '.' || (*q >= '0' && *q <= '9'))) { - ++q; - --s; - } - /* Skip a single trailing a,b,c, or d. */ - if (*q == 'a' || *q == 'b' || *q == 'c' || *q == 'd') - ++q; - /* Skip arbitrary third-party version numbers. */ - while (s > 0 && (*q == ' ' || *q == '-' || *q == '/' || *q == '.' || isalnum(*q))) { - ++q; - --s; - } - /* All terminated by end-of-line. */ - assert(s >= 1); - /* Skip an optional CR character (e.g., Windows) */ - failure("Version output must end with \\n or \\r\\n"); - if (*q == '\r') { ++q; --s; } - assertEqualMem(q, "\n", 1); - free(p); + assertVersion(testprog, "bsdcat"); } Modified: vendor/libarchive/dist/configure.ac ============================================================================== --- vendor/libarchive/dist/configure.ac Thu Mar 2 20:49:40 2017 (r314564) +++ vendor/libarchive/dist/configure.ac Thu Mar 2 21:02:17 2017 (r314565) @@ -4,8 +4,8 @@ dnl First, define all of the version num dnl In particular, this allows the version macro to be used in AC_INIT dnl These first two version numbers are updated automatically on each release. -m4_define([LIBARCHIVE_VERSION_S],[3.2.2]) -m4_define([LIBARCHIVE_VERSION_N],[3002002]) +m4_define([LIBARCHIVE_VERSION_S],[3.3.1]) +m4_define([LIBARCHIVE_VERSION_N],[3003001]) dnl bsdtar and bsdcpio versioning tracks libarchive m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S()) @@ -270,6 +270,19 @@ AS_VAR_IF([ac_cv_have_decl_EXT2_IOC_GETF AC_CHECK_HEADERS([inttypes.h io.h langinfo.h limits.h]) AC_CHECK_HEADERS([linux/fiemap.h linux/fs.h linux/magic.h linux/types.h]) + +AC_CACHE_CHECK([whether FS_IOC_GETFLAGS is usable], + [ac_cv_have_decl_FS_IOC_GETFLAGS], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@include +@%:@include ], + [int x = FS_IOC_GETFLAGS])], + [AS_VAR_SET([ac_cv_have_decl_FS_IOC_GETFLAGS], [yes])], + [AS_VAR_SET([ac_cv_have_decl_FS_IOC_GETFLAGS], [no])])]) + +AS_VAR_IF([ac_cv_have_decl_FS_IOC_GETFLAGS], [yes], + [AC_DEFINE_UNQUOTED([HAVE_WORKING_FS_IOC_GETFLAGS], [1], + [Define to 1 if you have a working FS_IOC_GETFLAGS])]) + AC_CHECK_HEADERS([locale.h paths.h poll.h pthread.h pwd.h]) AC_CHECK_HEADERS([readpassphrase.h signal.h spawn.h]) AC_CHECK_HEADERS([stdarg.h stdint.h stdlib.h string.h]) @@ -381,7 +394,7 @@ fi AC_ARG_WITH([lzo2], AS_HELP_STRING([--with-lzo2], [Build with LZO support from liblzo2])) -if test "x$with_lzo2" == "xyes"; then +if test "x$with_lzo2" = "xyes"; then AC_CHECK_HEADERS([lzo/lzoconf.h lzo/lzo1x.h]) AC_CHECK_LIB(lzo2,lzo1x_decompress_safe) fi Modified: vendor/libarchive/dist/cpio/test/CMakeLists.txt ============================================================================== --- vendor/libarchive/dist/cpio/test/CMakeLists.txt Thu Mar 2 20:49:40 2017 (r314564) +++ vendor/libarchive/dist/cpio/test/CMakeLists.txt Thu Mar 2 21:02:17 2017 (r314565) @@ -8,7 +8,7 @@ IF(ENABLE_CPIO AND ENABLE_TEST) ../cmdline.c ../../libarchive_fe/err.c ../../test_utils/test_utils.c - main.c + ../../test_utils/test_main.c test.h test_0.c test_basic.c @@ -87,6 +87,7 @@ IF(ENABLE_CPIO AND ENABLE_TEST) INCLUDE(${CMAKE_CURRENT_BINARY_DIR}/list.h) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/test_utils) + INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/cpio/test) # Experimental new test handling ADD_CUSTOM_TARGET(run_bsdcpio_test Modified: vendor/libarchive/dist/cpio/test/test.h ============================================================================== --- vendor/libarchive/dist/cpio/test/test.h Thu Mar 2 20:49:40 2017 (r314564) +++ vendor/libarchive/dist/cpio/test/test.h Thu Mar 2 21:02:17 2017 (r314565) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2006 Tim Kientzle + * Copyright (c) 2003-2017 Tim Kientzle * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,333 +22,19 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/usr.bin/cpio/test/test.h,v 1.2 2008/06/21 02:17:18 kientzle Exp $ + * $FreeBSD$ */ /* Every test program should #include "test.h" as the first thing. */ -/* - * The goal of this file (and the matching test.c) is to - * simplify the very repetitive test-*.c test programs. - */ -#if defined(HAVE_CONFIG_H) -/* Most POSIX platforms use the 'configure' script to build config.h */ -#include "config.h" -#elif defined(__FreeBSD__) -/* Building as part of FreeBSD system requires a pre-built config.h. */ -#include "config_freebsd.h" -#elif defined(_WIN32) && !defined(__CYGWIN__) -/* Win32 can't run the 'configure' script. */ -#include "config_windows.h" -#else -/* Warn if the library hasn't been (automatically or manually) configured. */ -#error Oops: No config.h and no pre-built configuration in test.h. -#endif - -#include /* Windows requires this before sys/stat.h */ -#include - -#if HAVE_DIRENT_H -#include -#endif -#ifdef HAVE_DIRECT_H -#include -#define dirent direct -#endif -#include -#include -#ifdef HAVE_IO_H -#include -#endif -#ifdef HAVE_STDINT_H -#include -#endif -#include -#include -#include -#include -#include -#ifdef HAVE_UNISTD_H -#include -#endif -#include -#ifdef HAVE_WINDOWS_H -#include -#endif - -/* - * System-specific tweaks. We really want to minimize these - * as much as possible, since they make it harder to understand - * the mainline code. - */ - -/* Windows (including Visual Studio and MinGW but not Cygwin) */ -#if defined(_WIN32) && !defined(__CYGWIN__) -#if !defined(__BORLANDC__) -#undef chdir -#define chdir _chdir -#define strdup _strdup -#endif -#endif - -/* Visual Studio */ -#if defined(_MSC_VER) && _MSC_VER < 1900 -#define snprintf sprintf_s -#endif - -#if defined(__BORLANDC__) -#pragma warn -8068 /* Constant out of range in comparison. */ -#endif - -/* Haiku OS and QNX */ -#if defined(__HAIKU__) || defined(__QNXNTO__) -/* Haiku and QNX have typedefs in stdint.h (needed for int64_t) */ -#include -#endif - -/* Get a real definition for __FBSDID if we can */ -#if HAVE_SYS_CDEFS_H -#include -#endif - -/* If not, define it so as to avoid dangling semicolons. */ -#ifndef __FBSDID -#define __FBSDID(a) struct _undefined_hack -#endif - -#ifndef O_BINARY -#define O_BINARY 0 -#endif - -/* - * Redefine DEFINE_TEST for use in defining the test functions. - */ -#undef DEFINE_TEST -#define DEFINE_TEST(name) void name(void); void name(void) - -/* An implementation of the standard assert() macro */ -#define assert(e) assertion_assert(__FILE__, __LINE__, (e), #e, NULL) -/* chdir() and error if it fails */ -#define assertChdir(path) \ - assertion_chdir(__FILE__, __LINE__, path) -/* Assert two integers are the same. Reports value of each one if not. */ -#define assertEqualInt(v1,v2) \ - assertion_equal_int(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL) -/* Assert two strings are the same. Reports value of each one if not. */ -#define assertEqualString(v1,v2) \ - assertion_equal_string(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL, 0) -#define assertEqualUTF8String(v1,v2) \ - assertion_equal_string(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL, 1) -/* As above, but v1 and v2 are wchar_t * */ -#define assertEqualWString(v1,v2) \ - assertion_equal_wstring(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL) -/* As above, but raw blocks of bytes. */ -#define assertEqualMem(v1, v2, l) \ - assertion_equal_mem(__FILE__, __LINE__, (v1), #v1, (v2), #v2, (l), #l, NULL) -/* Assert that memory is full of a specified byte */ -#define assertMemoryFilledWith(v1, l, b) \ - assertion_memory_filled_with(__FILE__, __LINE__, (v1), #v1, (l), #l, (b), #b, NULL) -/* Assert two files are the same. */ -#define assertEqualFile(f1, f2) \ - assertion_equal_file(__FILE__, __LINE__, (f1), (f2)) -/* Assert that a file is empty. */ -#define assertEmptyFile(pathname) \ - assertion_empty_file(__FILE__, __LINE__, (pathname)) -/* Assert that a file is not empty. */ -#define assertNonEmptyFile(pathname) \ - assertion_non_empty_file(__FILE__, __LINE__, (pathname)) -#define assertFileAtime(pathname, sec, nsec) \ - assertion_file_atime(__FILE__, __LINE__, pathname, sec, nsec) -#define assertFileAtimeRecent(pathname) \ - assertion_file_atime_recent(__FILE__, __LINE__, pathname) -#define assertFileBirthtime(pathname, sec, nsec) \ - assertion_file_birthtime(__FILE__, __LINE__, pathname, sec, nsec) -#define assertFileBirthtimeRecent(pathname) \ - assertion_file_birthtime_recent(__FILE__, __LINE__, pathname) -/* Assert that a file exists; supports printf-style arguments. */ -#define assertFileExists(pathname) \ - assertion_file_exists(__FILE__, __LINE__, pathname) -/* Assert that a file exists. */ -#define assertFileNotExists(pathname) \ - assertion_file_not_exists(__FILE__, __LINE__, pathname) -/* Assert that file contents match a string. */ -#define assertFileContents(data, data_size, pathname) \ - assertion_file_contents(__FILE__, __LINE__, data, data_size, pathname) -/* Verify that a file does not contain invalid strings */ -#define assertFileContainsNoInvalidStrings(pathname, strings) \ - assertion_file_contains_no_invalid_strings(__FILE__, __LINE__, pathname, strings) -#define assertFileMtime(pathname, sec, nsec) \ - assertion_file_mtime(__FILE__, __LINE__, pathname, sec, nsec) -#define assertFileMtimeRecent(pathname) \ - assertion_file_mtime_recent(__FILE__, __LINE__, pathname) -#define assertFileNLinks(pathname, nlinks) \ - assertion_file_nlinks(__FILE__, __LINE__, pathname, nlinks) -#define assertFileSize(pathname, size) \ - assertion_file_size(__FILE__, __LINE__, pathname, size) -#define assertFileMode(pathname, mode) \ - assertion_file_mode(__FILE__, __LINE__, pathname, mode) -#define assertTextFileContents(text, pathname) \ - assertion_text_file_contents(__FILE__, __LINE__, text, pathname) -#define assertFileContainsLinesAnyOrder(pathname, lines) \ - assertion_file_contains_lines_any_order(__FILE__, __LINE__, pathname, lines) -#define assertIsDir(pathname, mode) \ - assertion_is_dir(__FILE__, __LINE__, pathname, mode) -#define assertIsHardlink(path1, path2) \ - assertion_is_hardlink(__FILE__, __LINE__, path1, path2) -#define assertIsNotHardlink(path1, path2) \ - assertion_is_not_hardlink(__FILE__, __LINE__, path1, path2) -#define assertIsReg(pathname, mode) \ - assertion_is_reg(__FILE__, __LINE__, pathname, mode) -#define assertIsSymlink(pathname, contents) \ - assertion_is_symlink(__FILE__, __LINE__, pathname, contents) -/* Create a directory, report error if it fails. */ -#define assertMakeDir(dirname, mode) \ - assertion_make_dir(__FILE__, __LINE__, dirname, mode) -#define assertMakeFile(path, mode, contents) \ - assertion_make_file(__FILE__, __LINE__, path, mode, -1, contents) -#define assertMakeBinFile(path, mode, csize, contents) \ - assertion_make_file(__FILE__, __LINE__, path, mode, csize, contents) -#define assertMakeHardlink(newfile, oldfile) \ - assertion_make_hardlink(__FILE__, __LINE__, newfile, oldfile) -#define assertMakeSymlink(newfile, linkto) \ - assertion_make_symlink(__FILE__, __LINE__, newfile, linkto) -#define assertNodump(path) \ - assertion_nodump(__FILE__, __LINE__, path) -#define assertUmask(mask) \ - assertion_umask(__FILE__, __LINE__, mask) -#define assertUtimes(pathname, atime, atime_nsec, mtime, mtime_nsec) \ - assertion_utimes(__FILE__, __LINE__, pathname, atime, atime_nsec, mtime, mtime_nsec) - -/* - * This would be simple with C99 variadic macros, but I don't want to - * require that. Instead, I insert a function call before each - * skipping() call to pass the file and line information down. Crude, - * but effective. - */ -#define skipping \ - skipping_setup(__FILE__, __LINE__);test_skipping - -/* Function declarations. These are defined in test_utility.c. */ -void failure(const char *fmt, ...); -int assertion_assert(const char *, int, int, const char *, void *); -int assertion_chdir(const char *, int, const char *); -int assertion_empty_file(const char *, int, const char *); -int assertion_equal_file(const char *, int, const char *, const char *); -int assertion_equal_int(const char *, int, long long, const char *, long long, const char *, void *); -int assertion_equal_mem(const char *, int, const void *, const char *, const void *, const char *, size_t, const char *, void *); -int assertion_memory_filled_with(const char *, int, const void *, const char *, size_t, const char *, char, const char *, void *); -int assertion_equal_string(const char *, int, const char *v1, const char *, const char *v2, const char *, void *, int); -int assertion_equal_wstring(const char *, int, const wchar_t *v1, const char *, const wchar_t *v2, const char *, void *); -int assertion_file_atime(const char *, int, const char *, long, long); -int assertion_file_atime_recent(const char *, int, const char *); -int assertion_file_birthtime(const char *, int, const char *, long, long); -int assertion_file_birthtime_recent(const char *, int, const char *); -int assertion_file_contains_lines_any_order(const char *, int, const char *, const char **); -int assertion_file_contains_no_invalid_strings(const char *, int, const char *, const char **); -int assertion_file_contents(const char *, int, const void *, int, const char *); -int assertion_file_exists(const char *, int, const char *); -int assertion_file_mode(const char *, int, const char *, int); -int assertion_file_mtime(const char *, int, const char *, long, long); -int assertion_file_mtime_recent(const char *, int, const char *); -int assertion_file_nlinks(const char *, int, const char *, int); -int assertion_file_not_exists(const char *, int, const char *); -int assertion_file_size(const char *, int, const char *, long); -int assertion_is_dir(const char *, int, const char *, int); -int assertion_is_hardlink(const char *, int, const char *, const char *); -int assertion_is_not_hardlink(const char *, int, const char *, const char *); -int assertion_is_reg(const char *, int, const char *, int); -int assertion_is_symlink(const char *, int, const char *, const char *); -int assertion_make_dir(const char *, int, const char *, int); -int assertion_make_file(const char *, int, const char *, int, int, const void *); -int assertion_make_hardlink(const char *, int, const char *newpath, const char *); -int assertion_make_symlink(const char *, int, const char *newpath, const char *); -int assertion_nodump(const char *, int, const char *); -int assertion_non_empty_file(const char *, int, const char *); -int assertion_text_file_contents(const char *, int, const char *buff, const char *f); -int assertion_umask(const char *, int, int); -int assertion_utimes(const char *, int, const char *, long, long, long, long ); - -void skipping_setup(const char *, int); -void test_skipping(const char *fmt, ...); - -/* Like sprintf, then system() */ -int systemf(const char * fmt, ...); - -/* Delay until time() returns a value after this. */ -void sleepUntilAfter(time_t); - -/* Return true if this platform can create symlinks. */ -int canSymlink(void); - -/* Return true if this platform can run the "bzip2" program. */ -int canBzip2(void); - -/* Return true if this platform can run the "grzip" program. */ -int canGrzip(void); - -/* Return true if this platform can run the "gzip" program. */ -int canGzip(void); - -/* Return true if this platform can run the specified command. */ -int canRunCommand(const char *); - -/* Return true if this platform can run the "lrzip" program. */ -int canLrzip(void); - -/* Return true if this platform can run the "lz4" program. */ -int canLz4(void); - -/* Return true if this platform can run the "lzip" program. */ -int canLzip(void); - -/* Return true if this platform can run the "lzma" program. */ -int canLzma(void); - -/* Return true if this platform can run the "lzop" program. */ -int canLzop(void); - -/* Return true if this platform can run the "xz" program. */ -int canXz(void); - -/* Return true if this filesystem can handle nodump flags. */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Thu Mar 2 21:04:24 2017 Return-Path: Delivered-To: svn-src-all@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 B213FCF6BA6; Thu, 2 Mar 2017 21:04:24 +0000 (UTC) (envelope-from mm@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 66E2422C; Thu, 2 Mar 2017 21:04:24 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22L4Nf0086338; Thu, 2 Mar 2017 21:04:23 GMT (envelope-from mm@FreeBSD.org) Received: (from mm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22L4NGN086336; Thu, 2 Mar 2017 21:04:23 GMT (envelope-from mm@FreeBSD.org) Message-Id: <201703022104.v22L4NGN086336@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mm set sender to mm@FreeBSD.org using -f From: Martin Matuska Date: Thu, 2 Mar 2017 21:04:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314566 - in vendor/libarchive/3.3.1: . build build/cmake cat/test cpio/test libarchive libarchive/test tar tar/test test_utils X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 21:04:24 -0000 Author: mm Date: Thu Mar 2 21:04:23 2017 New Revision: 314566 URL: https://svnweb.freebsd.org/changeset/base/314566 Log: Tag libarchive 3.3.1 Added: vendor/libarchive/3.3.1/ - copied from r314563, vendor/libarchive/dist/ vendor/libarchive/3.3.1/test_utils/test_common.h - copied unchanged from r314565, vendor/libarchive/dist/test_utils/test_common.h vendor/libarchive/3.3.1/test_utils/test_main.c - copied unchanged from r314565, vendor/libarchive/dist/test_utils/test_main.c Replaced: vendor/libarchive/3.3.1/CMakeLists.txt - copied unchanged from r314565, vendor/libarchive/dist/CMakeLists.txt vendor/libarchive/3.3.1/Makefile.am - copied unchanged from r314565, vendor/libarchive/dist/Makefile.am vendor/libarchive/3.3.1/NEWS - copied unchanged from r314565, vendor/libarchive/dist/NEWS vendor/libarchive/3.3.1/build/autogen.sh - copied unchanged from r314565, vendor/libarchive/dist/build/autogen.sh vendor/libarchive/3.3.1/build/cmake/config.h.in - copied unchanged from r314565, vendor/libarchive/dist/build/cmake/config.h.in vendor/libarchive/3.3.1/build/version - copied unchanged from r314565, vendor/libarchive/dist/build/version vendor/libarchive/3.3.1/cat/test/CMakeLists.txt - copied unchanged from r314565, vendor/libarchive/dist/cat/test/CMakeLists.txt vendor/libarchive/3.3.1/cat/test/test.h - copied unchanged from r314565, vendor/libarchive/dist/cat/test/test.h vendor/libarchive/3.3.1/cat/test/test_version.c - copied unchanged from r314565, vendor/libarchive/dist/cat/test/test_version.c vendor/libarchive/3.3.1/configure.ac - copied unchanged from r314565, vendor/libarchive/dist/configure.ac vendor/libarchive/3.3.1/cpio/test/CMakeLists.txt - copied unchanged from r314565, vendor/libarchive/dist/cpio/test/CMakeLists.txt vendor/libarchive/3.3.1/cpio/test/test.h - copied unchanged from r314565, vendor/libarchive/dist/cpio/test/test.h vendor/libarchive/3.3.1/cpio/test/test_option_version.c - copied unchanged from r314565, vendor/libarchive/dist/cpio/test/test_option_version.c vendor/libarchive/3.3.1/libarchive/archive.h - copied unchanged from r314565, vendor/libarchive/dist/libarchive/archive.h vendor/libarchive/3.3.1/libarchive/archive_digest_private.h - copied unchanged from r314565, vendor/libarchive/dist/libarchive/archive_digest_private.h vendor/libarchive/3.3.1/libarchive/archive_entry.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/archive_entry.c vendor/libarchive/3.3.1/libarchive/archive_entry.h - copied unchanged from r314565, vendor/libarchive/dist/libarchive/archive_entry.h vendor/libarchive/3.3.1/libarchive/archive_hmac.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/archive_hmac.c vendor/libarchive/3.3.1/libarchive/archive_read_disk_entry_from_file.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c vendor/libarchive/3.3.1/libarchive/archive_read_disk_posix.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/archive_read_disk_posix.c vendor/libarchive/3.3.1/libarchive/archive_read_disk_private.h - copied unchanged from r314565, vendor/libarchive/dist/libarchive/archive_read_disk_private.h vendor/libarchive/3.3.1/libarchive/archive_read_disk_windows.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/archive_read_disk_windows.c vendor/libarchive/3.3.1/libarchive/archive_read_support_format_tar.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/archive_read_support_format_tar.c vendor/libarchive/3.3.1/libarchive/archive_read_support_format_warc.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/archive_read_support_format_warc.c vendor/libarchive/3.3.1/libarchive/archive_write_disk_posix.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/archive_write_disk_posix.c vendor/libarchive/3.3.1/libarchive/archive_write_set_format_iso9660.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/archive_write_set_format_iso9660.c vendor/libarchive/3.3.1/libarchive/test/CMakeLists.txt - copied unchanged from r314565, vendor/libarchive/dist/libarchive/test/CMakeLists.txt vendor/libarchive/3.3.1/libarchive/test/test.h - copied unchanged from r314565, vendor/libarchive/dist/libarchive/test/test.h vendor/libarchive/3.3.1/libarchive/test/test_acl_nfs4.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/test/test_acl_nfs4.c vendor/libarchive/3.3.1/libarchive/test/test_acl_pax.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/test/test_acl_pax.c vendor/libarchive/3.3.1/libarchive/test/test_acl_platform_posix1e.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/test/test_acl_platform_posix1e.c vendor/libarchive/3.3.1/libarchive/test/test_acl_posix1e.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/test/test_acl_posix1e.c vendor/libarchive/3.3.1/libarchive/test/test_acl_text.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/test/test_acl_text.c vendor/libarchive/3.3.1/libarchive/test/test_archive_api_feature.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/test/test_archive_api_feature.c vendor/libarchive/3.3.1/libarchive/test/test_compat_solaris_tar_acl.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/test/test_compat_solaris_tar_acl.c vendor/libarchive/3.3.1/libarchive/test/test_compat_star_acl.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/test/test_compat_star_acl.c vendor/libarchive/3.3.1/libarchive/test/test_fuzz.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/test/test_fuzz.c vendor/libarchive/3.3.1/libarchive/test/test_read_disk.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/test/test_read_disk.c vendor/libarchive/3.3.1/libarchive/test/test_read_disk_directory_traversals.c - copied unchanged from r314565, vendor/libarchive/dist/libarchive/test/test_read_disk_directory_traversals.c vendor/libarchive/3.3.1/tar/bsdtar.1 - copied unchanged from r314565, vendor/libarchive/dist/tar/bsdtar.1 vendor/libarchive/3.3.1/tar/bsdtar.c - copied unchanged from r314565, vendor/libarchive/dist/tar/bsdtar.c vendor/libarchive/3.3.1/tar/bsdtar.h - copied unchanged from r314565, vendor/libarchive/dist/tar/bsdtar.h vendor/libarchive/3.3.1/tar/cmdline.c - copied unchanged from r314565, vendor/libarchive/dist/tar/cmdline.c vendor/libarchive/3.3.1/tar/read.c - copied unchanged from r314565, vendor/libarchive/dist/tar/read.c vendor/libarchive/3.3.1/tar/test/CMakeLists.txt - copied unchanged from r314565, vendor/libarchive/dist/tar/test/CMakeLists.txt vendor/libarchive/3.3.1/tar/test/test.h - copied unchanged from r314565, vendor/libarchive/dist/tar/test/test.h vendor/libarchive/3.3.1/tar/test/test_version.c - copied unchanged from r314565, vendor/libarchive/dist/tar/test/test_version.c vendor/libarchive/3.3.1/tar/util.c - copied unchanged from r314565, vendor/libarchive/dist/tar/util.c vendor/libarchive/3.3.1/tar/write.c - copied unchanged from r314565, vendor/libarchive/dist/tar/write.c Deleted: vendor/libarchive/3.3.1/cat/test/main.c vendor/libarchive/3.3.1/cpio/test/main.c vendor/libarchive/3.3.1/libarchive/test/main.c vendor/libarchive/3.3.1/tar/test/main.c Copied: vendor/libarchive/3.3.1/CMakeLists.txt (from r314565, vendor/libarchive/dist/CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/libarchive/3.3.1/CMakeLists.txt Thu Mar 2 21:04:23 2017 (r314566, copy of r314565, vendor/libarchive/dist/CMakeLists.txt) @@ -0,0 +1,1726 @@ +# +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR) +# +PROJECT(libarchive C) +# +SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake") +if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${libarchive_BINARY_DIR}/bin) +endif() +# +# Set the Build type for make based generators. +# You can choose following types: +# Debug : Debug build +# Release : Release build +# RelWithDebInfo : Release build with Debug Info +# MinSizeRel : Release Min Size build +IF(NOT CMAKE_BUILD_TYPE) + SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build Type" FORCE) +ENDIF(NOT CMAKE_BUILD_TYPE) +# Set a value type to properly display CMAKE_BUILD_TYPE on GUI if the +# value type is "UNINITIALIZED". +GET_PROPERTY(cached_type CACHE CMAKE_BUILD_TYPE PROPERTY TYPE) +IF("${cached_type}" STREQUAL "UNINITIALIZED") + SET(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING "Build Type" FORCE) +ENDIF("${cached_type}" STREQUAL "UNINITIALIZED") +# Check the Build Type. +IF(NOT "${CMAKE_BUILD_TYPE}" + MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel)\$") + MESSAGE(FATAL_ERROR + "Unknown keyword for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}\n" + "Acceptable keywords: Debug,Release,RelWithDebInfo,MinSizeRel") +ENDIF(NOT "${CMAKE_BUILD_TYPE}" + MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel)\$") + +# On MacOS, prefer MacPorts libraries to system libraries. +# I haven't come up with a compelling argument for this to be conditional. +list(APPEND CMAKE_PREFIX_PATH /opt/local) +# Enable @rpath in the install name. +# detail in "cmake --help-policy CMP0042" +SET(CMAKE_MACOSX_RPATH ON) + +# +# Version - read from 'version' file. +# +FILE(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/build/version _version) +STRING(REGEX REPLACE + "^([0-9])[0-9][0-9][0-9][0-9][0-9][0-9][a-z]*$" "\\1" _major ${_version}) +STRING(REGEX REPLACE + "^[0-9]([0-9][0-9][0-9])[0-9][0-9][0-9][a-z]*$" "\\1" _minor ${_version}) +STRING(REGEX REPLACE + "^[0-9][0-9][0-9][0-9]([0-9][0-9][0-9])[a-z]*$" "\\1" _revision ${_version}) +STRING(REGEX REPLACE + "^[0-9][0-9][0-9][0-9][0-9][0-9][0-9]([a-z]*)$" "\\1" _quality ${_version}) +SET(_version_number ${_major}${_minor}${_revision}) +STRING(REGEX REPLACE "[0]*([^0]*[0-9])$" "\\1" _trimmed_minor ${_minor}) +STRING(REGEX REPLACE "[0]*([^0]*[0-9])$" "\\1" _trimmed_revision ${_revision}) +# +SET(VERSION "${_major}.${_trimmed_minor}.${_trimmed_revision}${_quality}") +SET(BSDCPIO_VERSION_STRING "${VERSION}") +SET(BSDTAR_VERSION_STRING "${VERSION}") +SET(BSDCAT_VERSION_STRING "${VERSION}") +SET(LIBARCHIVE_VERSION_NUMBER "${_version_number}") +SET(LIBARCHIVE_VERSION_STRING "${VERSION}") + +# INTERFACE_VERSION increments with every release +# libarchive 2.7 == interface version 9 = 2 + 7 +# libarchive 2.8 == interface version 10 = 2 + 8 +# libarchive 2.9 == interface version 11 = 2 + 9 +# libarchive 3.0 == interface version 12 +# libarchive 3.1 == interface version 13 +math(EXPR INTERFACE_VERSION "13 + ${_minor}") + +# Set SOVERSION == Interface version +# ?? Should there be more here ?? +SET(SOVERSION "${INTERFACE_VERSION}") + +# Enalbe CMAKE_PUSH_CHECK_STATE() and CMAKE_POP_CHECK_STATE() macros +# saving and restoring the state of the variables. +INCLUDE(CMakePushCheckState) + +# Initialize the state of the variables. This initialization is not +# necessary but this shows you what value the variables initially have. +SET(CMAKE_REQUIRED_DEFINITIONS) +SET(CMAKE_REQUIRED_INCLUDES) +SET(CMAKE_REQUIRED_LIBRARIES) +SET(CMAKE_REQUIRED_FLAGS) + +# Especially for early development, we want to be a little +# aggressive about diagnosing build problems; this can get +# relaxed somewhat in final shipping versions. +IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$") + SET(CMAKE_REQUIRED_FLAGS "-Wall -Wformat -Wformat-security") + ################################################################# + # Set compile flags for all build types. + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wformat -Wformat-security") + ################################################################# + # Set compile flags for debug build. + # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug" + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wmissing-prototypes") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wcast-qual") +ENDIF (CMAKE_C_COMPILER_ID MATCHES "^GNU$") +IF (CMAKE_C_COMPILER_ID MATCHES "^Clang$") + SET(CMAKE_REQUIRED_FLAGS "-Wall -Wformat -Wformat-security") + ################################################################# + # Set compile flags for all build types. + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wformat -Wformat-security") + ################################################################# + # Set compile flags for debug build. + # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug" + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wmissing-prototypes") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wcast-qual") +ENDIF (CMAKE_C_COMPILER_ID MATCHES "^Clang$") +IF (CMAKE_C_COMPILER_ID MATCHES "^XL$") + SET(CMAKE_C_COMPILER "xlc_r") + SET(CMAKE_REQUIRED_FLAGS "-qflag=e:e -qformat=sec") + ################################################################# + # Set compile flags for all build types. + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -qflag=e:e -qformat=sec") + ################################################################# + # Set compile flags for debug build. + # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug" + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qhalt=w") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qflag=w:w") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qinfo=pro:use") +ENDIF(CMAKE_C_COMPILER_ID MATCHES "^XL$") +IF (MSVC) + ################################################################# + # Set compile flags for debug build. + # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug" + # Enable level 4 C4061: The enumerate has no associated handler in a switch + # statement. + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4061") + # Enable level 4 C4254: A larger bit field was assigned to a smaller bit + # field. + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4254") + # Enable level 4 C4295: An array was initialized but the last character in + # the array is not a null; accessing the array may + # produce unexpected results. + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4295") + # Enable level 4 C4296: An unsigned variable was used in a comparison + # operation with zero. + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4296") + # Enable level 4 C4389: An operation involved signed and unsigned variables. + # This could result in a loss of data. + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4389") + # Enable level 4 C4505: The given function is local and not referenced in + # the body of the module; therefore, the function is + # dead code. + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4505") + # Enable level 4 C4514: The optimizer removed an inline function that is not + # called. + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4514") + # Enable level 4 C4702: Unreachable code. + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4702") + # Enable level 4 C4706: The test value in a conditional expression was the + # result of an assignment. + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4706") + # /WX option is the same as gcc's -Werror option. + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /WX") + # /Oi option enables built-in functions. + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Oi") + ################################################################# + # Set compile flags for release build. + SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Oi") +ENDIF (MSVC) + +# Enable CTest/CDash support +include(CTest) + +OPTION(ENABLE_NETTLE "Enable use of Nettle" ON) +OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON) +OPTION(ENABLE_LZO "Enable the use of the system LZO library if found" OFF) +OPTION(ENABLE_LZMA "Enable the use of the system LZMA library if found" ON) + +OPTION(ENABLE_ZLIB "Enable the use of the system ZLIB library if found" ON) +OPTION(ENABLE_BZip2 "Enable the use of the system BZip2 library if found" ON) +OPTION(ENABLE_LIBXML2 "Enable the use of the system libxml2 library if found" ON) +OPTION(ENABLE_EXPAT "Enable the use of the system EXPAT library if found" ON) +OPTION(ENABLE_PCREPOSIX "Enable the use of the system PCREPOSIX library if found" ON) +OPTION(ENABLE_LibGCC "Enable the use of the system LibGCC library if found" ON) +# CNG is used for encrypt/decrypt Zip archives on Windows. +OPTION(ENABLE_CNG "Enable the use of CNG(Crypto Next Generation)" ON) + +OPTION(ENABLE_TAR "Enable tar building" ON) +OPTION(ENABLE_TAR_SHARED "Enable dynamic build of tar" FALSE) +OPTION(ENABLE_CPIO "Enable cpio building" ON) +OPTION(ENABLE_CPIO_SHARED "Enable dynamic build of cpio" FALSE) +OPTION(ENABLE_CAT "Enable cat building" ON) +OPTION(ENABLE_CAT_SHARED "Enable dynamic build of cat" FALSE) +OPTION(ENABLE_XATTR "Enable extended attribute support" ON) +OPTION(ENABLE_ACL "Enable ACL support" ON) +OPTION(ENABLE_ICONV "Enable iconv support" ON) +OPTION(ENABLE_TEST "Enable unit and regression tests" ON) +OPTION(ENABLE_COVERAGE "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)" FALSE) +OPTION(ENABLE_INSTALL "Enable installing of libraries" ON) + +SET(POSIX_REGEX_LIB "AUTO" CACHE STRING "Choose what library should provide POSIX regular expression support") +SET(ENABLE_SAFESEH "AUTO" CACHE STRING "Enable use of /SAFESEH linker flag (MSVC only)") +SET(WINDOWS_VERSION "WIN7" CACHE STRING "Set Windows version to use (Windows only)") + +IF(ENABLE_COVERAGE) + include(LibarchiveCodeCoverage) +ENDIF(ENABLE_COVERAGE) + +IF(ENABLE_TEST) + ENABLE_TESTING() +ENDIF(ENABLE_TEST) + +IF(WIN32) + IF(WINDOWS_VERSION STREQUAL "WIN8") + SET(NTDDI_VERSION 0x06020000) + SET(_WIN32_WINNT 0x0602) + SET(WINVER 0x0602) + ELSEIF(WINDOWS_VERSION STREQUAL "WIN7") + SET(NTDDI_VERSION 0x06010000) + SET(_WIN32_WINNT 0x0601) + SET(WINVER 0x0601) + ELSEIF(WINDOWS_VERSION STREQUAL "WS08") + SET(NTDDI_VERSION 0x06000100) + SET(_WIN32_WINNT 0x0600) + SET(WINVER 0x0600) + ELSEIF(WINDOWS_VERSION STREQUAL "VISTA") + SET(NTDDI_VERSION 0x06000000) + SET(_WIN32_WINNT 0x0600) + SET(WINVER 0x0600) + ELSEIF(WINDOWS_VERSION STREQUAL "WS03") + SET(NTDDI_VERSION 0x05020000) + SET(_WIN32_WINNT 0x0502) + SET(WINVER 0x0502) + ELSEIF(WINDOWS_VERSION STREQUAL "WINXP") + SET(NTDDI_VERSION 0x05010000) + SET(_WIN32_WINNT 0x0501) + SET(WINVER 0x0501) + ELSE(WINDOWS_VERSION STREQUAL "WIN8") + # Default to Windows Server 2003 API if we don't recognize the specifier + SET(NTDDI_VERSION 0x05020000) + SET(_WIN32_WINNT 0x0502) + SET(WINVER 0x0502) + ENDIF(WINDOWS_VERSION STREQUAL "WIN8") +ENDIF(WIN32) + +IF(MSVC) + IF(ENABLE_SAFESEH STREQUAL "YES") + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH") + SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH") + SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH") + SET(ENV{LDFLAGS} "$ENV{LDFLAGS} /SAFESEH") + ELSEIF(ENABLE_SAFESEH STREQUAL "NO") + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO") + SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO") + SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO") + SET(ENV{LDFLAGS} "$ENV{LDFLAGS} /SAFESEH:NO") + ENDIF(ENABLE_SAFESEH STREQUAL "YES") +ENDIF(MSVC) + +IF("${CMAKE_C_PLATFORM_ID}" MATCHES "^(HP-UX)$") + ADD_DEFINITIONS(-D_XOPEN_SOURCE=500) # Ask wchar.h for mbstate_t +ENDIF() + +# +INCLUDE(CheckCSourceCompiles) +INCLUDE(CheckCSourceRuns) +INCLUDE(CheckFileOffsetBits) +INCLUDE(CheckFuncs) +INCLUDE(CheckHeaderDirent) +INCLUDE(CheckIncludeFile) +INCLUDE(CheckIncludeFiles) +INCLUDE(CheckLibraryExists) +INCLUDE(CheckStructHasMember) +INCLUDE(CheckSymbolExists) +INCLUDE(CheckTypeExists) +INCLUDE(CheckTypeSize) + +# +# Generate list.h +# +MACRO (GENERATE_LIST_H _listfile _cmlist __list_sources) + SET(_argv ${ARGV}) + # Remove _listfile and _cmlist from _argv + LIST(REMOVE_AT _argv 0 1) + IF (NOT EXISTS "${_listfile}" OR + ${_cmlist} IS_NEWER_THAN "${_listfile}") + + MESSAGE(STATUS "Generating ${_listfile}") + FILE(WRITE ${_listfile} "") + FOREACH (testfile ${_argv}) + IF (testfile MATCHES "^test_[^/]+[.]c$") + FILE(STRINGS ${testfile} testvar REGEX "^DEFINE_TEST") + FOREACH (deftest ${testvar}) + FILE(APPEND ${_listfile} "${deftest}\n") + ENDFOREACH (deftest) + ENDIF (testfile MATCHES "^test_[^/]+[.]c$") + ENDFOREACH (testfile) + + ENDIF (NOT EXISTS "${_listfile}" OR + ${_cmlist} IS_NEWER_THAN "${_listfile}") +ENDMACRO (GENERATE_LIST_H) +# +# Generate installation rules for man pages. +# +MACRO (INSTALL_MAN __mans) + FOREACH (_man ${ARGV}) + STRING(REGEX REPLACE "^.+[.]([1-9])" "\\1" _mansect ${_man}) + INSTALL(FILES ${_man} DESTINATION "share/man/man${_mansect}") + ENDFOREACH (_man) +ENDMACRO (INSTALL_MAN __mans) +# +# Find out what macro is needed to use libraries on Windows. +# +MACRO (TRY_MACRO_FOR_LIBRARY INCLUDES LIBRARIES + TRY_TYPE SAMPLE_SOURCE MACRO_LIST) + IF(WIN32 AND NOT CYGWIN) + CMAKE_PUSH_CHECK_STATE() # Save the state of the variables + SET(CMAKE_REQUIRED_INCLUDES ${INCLUDES}) + SET(CMAKE_REQUIRED_LIBRARIES ${LIBRARIES}) + FOREACH(VAR ${MACRO_LIST}) + # Clear ${VAR} from CACHE If the libraries which ${VAR} was + # checked with are changed. + SET(VAR_WITH_LIB "${VAR}_WITH_LIB") + GET_PROPERTY(PREV_VAR_WITH_LIB VARIABLE PROPERTY ${VAR_WITH_LIB}) + IF(NOT "${PREV_VAR_WITH_LIB}" STREQUAL "${LIBRARIES}") + UNSET(${VAR} CACHE) + ENDIF(NOT "${PREV_VAR_WITH_LIB}" STREQUAL "${LIBRARIES}") + # Check if the library can be used with the macro. + IF("${TRY_TYPE}" MATCHES "COMPILES") + CHECK_C_SOURCE_COMPILES("${SAMPLE_SOURCE}" ${VAR}) + ELSEIF("${TRY_TYPE}" MATCHES "RUNS") + CHECK_C_SOURCE_RUNS("${SAMPLE_SOURCE}" ${VAR}) + ELSE("${TRY_TYPE}" MATCHES "COMPILES") + MESSAGE(FATAL_ERROR "UNKNOWN KEYWORD \"${TRY_TYPE}\" FOR TRY_TYPE") + ENDIF("${TRY_TYPE}" MATCHES "COMPILES") + # Save the libraries which ${VAR} is checked with. + SET(${VAR_WITH_LIB} "${LIBRARIES}" CACHE INTERNAL + "Macro ${VAR} is checked with") + ENDFOREACH(VAR) + CMAKE_POP_CHECK_STATE() # Restore the state of the variables + ENDIF(WIN32 AND NOT CYGWIN) +ENDMACRO (TRY_MACRO_FOR_LIBRARY) +# +# Check compress/decompress libraries +# +IF(WIN32 AND NOT CMAKE_CL_64 AND NOT CYGWIN) + # GnuWin32 is only for Win32, not Win64. + SET(__GNUWIN32PATH "C:/Program Files/GnuWin32") +ENDIF(WIN32 AND NOT CMAKE_CL_64 AND NOT CYGWIN) +IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}") + # You have to add a path availabel DLL file into PATH environment variable. + # Maybe DLL path is "C:/Program Files/GnuWin32/bin". + # The zlib and the bzip2 Setup program have installed programs and DLLs into + # "C:/Program Files/GnuWin32" by default. + # This is convenience setting for Windows. + SET(CMAKE_PREFIX_PATH ${__GNUWIN32PATH} $(CMAKE_PREFIX_PATH)) + # + # If you didn't use Setup program or installed into nonstandard path, + # cmake cannot find out your zlib or bzip2 libraries and include files, + # you should execute cmake with -DCMAKE_PREFIX_PATH option. + # e.g. + # cmake -DCMAKE_PREFIX_PATH= + # + # If compiling error occurred in zconf.h, You may need patch to zconf.h. + #--- zconf.h.orig 2005-07-21 00:40:26.000000000 + #+++ zconf.h 2009-01-19 11:39:10.093750000 + #@@ -286,7 +286,7 @@ + # + # #if 1 /* HAVE_UNISTD_H -- this line is updated by ./configure */ + # # include /* for off_t */ + #-# include /* for SEEK_* and off_t */ + #+# include /* for SEEK_* and off_t */ + # # ifdef VMS + # # include /* for off_t */ + # # endif +ENDIF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}") + +SET(ADDITIONAL_LIBS "") +# +# Find ZLIB +# +IF(ENABLE_ZLIB) + FIND_PACKAGE(ZLIB) +ELSE() + SET(ZLIB_FOUND FALSE) # Override cached value +ENDIF() +IF(ZLIB_FOUND) + SET(HAVE_LIBZ 1) + SET(HAVE_ZLIB_H 1) + INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES}) + IF(WIN32 AND NOT CYGWIN) + # + # Test if ZLIB_WINAPI macro is needed to use. + # + TRY_MACRO_FOR_LIBRARY( + "${ZLIB_INCLUDE_DIR}" "${ZLIB_LIBRARIES}" + RUNS + "#include \nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }" + ZLIB_WINAPI) + IF(ZLIB_WINAPI) + ADD_DEFINITIONS(-DZLIB_WINAPI) + ELSE(ZLIB_WINAPI) + # Test if a macro is needed for the library. + TRY_MACRO_FOR_LIBRARY( + "${ZLIB_INCLUDE_DIR}" "${ZLIB_LIBRARIES}" + COMPILES + "#include \nint main() {return zlibVersion()?1:0; }" + "ZLIB_DLL;WITHOUT_ZLIB_DLL") + IF(ZLIB_DLL) + ADD_DEFINITIONS(-DZLIB_DLL) + ENDIF(ZLIB_DLL) + ENDIF(ZLIB_WINAPI) + ENDIF(WIN32 AND NOT CYGWIN) +ENDIF(ZLIB_FOUND) +MARK_AS_ADVANCED(CLEAR ZLIB_INCLUDE_DIR) +MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY) +# +# Find BZip2 +# +IF(ENABLE_BZip2) + FIND_PACKAGE(BZip2) +ELSE() + SET(BZIP2_FOUND FALSE) # Override cached value +ENDIF() +IF(BZIP2_FOUND) + SET(HAVE_LIBBZ2 1) + SET(HAVE_BZLIB_H 1) + INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${BZIP2_LIBRARIES}) + # Test if a macro is needed for the library. + TRY_MACRO_FOR_LIBRARY( + "${BZIP2_INCLUDE_DIR}" "${BZIP2_LIBRARIES}" + COMPILES + "#include \nint main() {return BZ2_bzlibVersion()?1:0; }" + "USE_BZIP2_DLL;USE_BZIP2_STATIC") + IF(USE_BZIP2_DLL) + ADD_DEFINITIONS(-DUSE_BZIP2_DLL) + ELSEIF(USE_BZIP2_STATIC) + ADD_DEFINITIONS(-DUSE_BZIP2_STATIC) + ENDIF(USE_BZIP2_DLL) +ENDIF(BZIP2_FOUND) +MARK_AS_ADVANCED(CLEAR BZIP2_INCLUDE_DIR) +MARK_AS_ADVANCED(CLEAR BZIP2_LIBRARIES) + + +# +# Find LZMA +# +IF(ENABLE_LZMA) + FIND_PACKAGE(LibLZMA) +ELSE() + SET(LIBZMA_FOUND FALSE) # Override cached value +ENDIF() + +IF(LIBLZMA_FOUND) + SET(HAVE_LIBLZMA 1) + SET(HAVE_LZMA_H 1) + SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR}) + SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES}) + INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS}) + LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES}) + # Test if a macro is needed for the library. + TRY_MACRO_FOR_LIBRARY( + "${LIBLZMA_INCLUDE_DIRS}" "${LIBLZMA_LIBRARIES}" + COMPILES + "#include \nint main() {return (int)lzma_version_number(); }" + "WITHOUT_LZMA_API_STATIC;LZMA_API_STATIC") + IF(NOT WITHOUT_LZMA_API_STATIC AND LZMA_API_STATIC) + ADD_DEFINITIONS(-DLZMA_API_STATIC) + ENDIF(NOT WITHOUT_LZMA_API_STATIC AND LZMA_API_STATIC) +ELSE(LIBLZMA_FOUND) +# LZMA not found and will not be used. +ENDIF(LIBLZMA_FOUND) +# +# Find LZO2 +# +IF(ENABLE_LZO) + IF (LZO2_INCLUDE_DIR) + # Already in cache, be silent + SET(LZO2_FIND_QUIETLY TRUE) + ENDIF (LZO2_INCLUDE_DIR) + + FIND_PATH(LZO2_INCLUDE_DIR lzo/lzoconf.h) + FIND_LIBRARY(LZO2_LIBRARY NAMES lzo2 liblzo2) + INCLUDE(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZO2 DEFAULT_MSG LZO2_LIBRARY LZO2_INCLUDE_DIR) +ELSE(ENABLE_LZO) + SET(LIBZMA_FOUND FALSE) # Override cached value +ENDIF(ENABLE_LZO) +IF(LZO2_FOUND) + SET(HAVE_LIBLZO2 1) + SET(HAVE_LZO_LZOCONF_H 1) + SET(HAVE_LZO_LZO1X_H 1) + INCLUDE_DIRECTORIES(${LZO2_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${LZO2_LIBRARY}) + # + # TODO: test for static library. + # +ENDIF(LZO2_FOUND) +MARK_AS_ADVANCED(CLEAR LZO2_INCLUDE_DIR) +MARK_AS_ADVANCED(CLEAR LZO2_LIBRARY) +# +# Find LZ4 +# +IF (LZ4_INCLUDE_DIR) + # Already in cache, be silent + SET(LZ4_FIND_QUIETLY TRUE) +ENDIF (LZ4_INCLUDE_DIR) + +FIND_PATH(LZ4_INCLUDE_DIR lz4.h) +FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4) +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR) +IF(LZ4_FOUND) + SET(HAVE_LIBLZ4 1) + SET(HAVE_LZ4_H 1) + CMAKE_PUSH_CHECK_STATE() # Save the state of the variables + SET(CMAKE_REQUIRED_INCLUDES ${LZ4_INCLUDE_DIR}) + CHECK_INCLUDE_FILES("lz4hc.h" HAVE_LZ4HC_H) + CMAKE_POP_CHECK_STATE() # Restore the state of the variables + INCLUDE_DIRECTORIES(${LZ4_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${LZ4_LIBRARY}) + # + # TODO: test for static library. + # +ENDIF(LZ4_FOUND) +MARK_AS_ADVANCED(CLEAR LZ4_INCLUDE_DIR) +MARK_AS_ADVANCED(CLEAR LZ4_LIBRARY) + +# +# Check headers +# +CHECK_HEADER_DIRENT() + +SET(INCLUDES "") +MACRO (LA_CHECK_INCLUDE_FILE header var) + CHECK_INCLUDE_FILES("${INCLUDES};${header}" ${var}) + IF (${var}) + SET(INCLUDES ${INCLUDES} ${header}) + ENDIF (${var}) +ENDMACRO (LA_CHECK_INCLUDE_FILE) + +# Some FreeBSD headers assume sys/types.h was already included. +LA_CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H) + +# Alphabetize the rest unless there's a compelling reason +LA_CHECK_INCLUDE_FILE("acl/libacl.h" HAVE_ACL_LIBACL_H) +LA_CHECK_INCLUDE_FILE("ctype.h" HAVE_CTYPE_H) +LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) +LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H) +LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) +LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H) +LA_CHECK_INCLUDE_FILE("ext2fs/ext2_fs.h" HAVE_EXT2FS_EXT2_FS_H) + +CHECK_C_SOURCE_COMPILES("#include +#include +int main(void) { return EXT2_IOC_GETFLAGS; }" HAVE_WORKING_EXT2_IOC_GETFLAGS) + +LA_CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H) +LA_CHECK_INCLUDE_FILE("grp.h" HAVE_GRP_H) +LA_CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H) +LA_CHECK_INCLUDE_FILE("io.h" HAVE_IO_H) +LA_CHECK_INCLUDE_FILE("langinfo.h" HAVE_LANGINFO_H) +LA_CHECK_INCLUDE_FILE("limits.h" HAVE_LIMITS_H) +LA_CHECK_INCLUDE_FILE("linux/types.h" HAVE_LINUX_TYPES_H) +LA_CHECK_INCLUDE_FILE("linux/fiemap.h" HAVE_LINUX_FIEMAP_H) +LA_CHECK_INCLUDE_FILE("linux/fs.h" HAVE_LINUX_FS_H) + +CHECK_C_SOURCE_COMPILES("#include +#include +int main(void) { return FS_IOC_GETFLAGS; }" HAVE_WORKING_FS_IOC_GETFLAGS) + +LA_CHECK_INCLUDE_FILE("linux/magic.h" HAVE_LINUX_MAGIC_H) +LA_CHECK_INCLUDE_FILE("locale.h" HAVE_LOCALE_H) +LA_CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H) +LA_CHECK_INCLUDE_FILE("paths.h" HAVE_PATHS_H) +LA_CHECK_INCLUDE_FILE("poll.h" HAVE_POLL_H) +LA_CHECK_INCLUDE_FILE("process.h" HAVE_PROCESS_H) +LA_CHECK_INCLUDE_FILE("pthread.h" HAVE_PTHREAD_H) +LA_CHECK_INCLUDE_FILE("pwd.h" HAVE_PWD_H) +LA_CHECK_INCLUDE_FILE("readpassphrase.h" HAVE_READPASSPHRASE_H) +LA_CHECK_INCLUDE_FILE("regex.h" HAVE_REGEX_H) +LA_CHECK_INCLUDE_FILE("signal.h" HAVE_SIGNAL_H) +LA_CHECK_INCLUDE_FILE("spawn.h" HAVE_SPAWN_H) +LA_CHECK_INCLUDE_FILE("stdarg.h" HAVE_STDARG_H) +LA_CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H) +LA_CHECK_INCLUDE_FILE("stdlib.h" HAVE_STDLIB_H) +LA_CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H) +LA_CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H) +LA_CHECK_INCLUDE_FILE("sys/acl.h" HAVE_SYS_ACL_H) +LA_CHECK_INCLUDE_FILE("sys/cdefs.h" HAVE_SYS_CDEFS_H) +LA_CHECK_INCLUDE_FILE("sys/ioctl.h" HAVE_SYS_IOCTL_H) +LA_CHECK_INCLUDE_FILE("sys/mkdev.h" HAVE_SYS_MKDEV_H) +LA_CHECK_INCLUDE_FILE("sys/mount.h" HAVE_SYS_MOUNT_H) +LA_CHECK_INCLUDE_FILE("sys/param.h" HAVE_SYS_PARAM_H) +LA_CHECK_INCLUDE_FILE("sys/poll.h" HAVE_SYS_POLL_H) +LA_CHECK_INCLUDE_FILE("sys/select.h" HAVE_SYS_SELECT_H) +LA_CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H) +LA_CHECK_INCLUDE_FILE("sys/statfs.h" HAVE_SYS_STATFS_H) +LA_CHECK_INCLUDE_FILE("sys/statvfs.h" HAVE_SYS_STATVFS_H) +LA_CHECK_INCLUDE_FILE("sys/time.h" HAVE_SYS_TIME_H) +LA_CHECK_INCLUDE_FILE("sys/utime.h" HAVE_SYS_UTIME_H) +LA_CHECK_INCLUDE_FILE("sys/utsname.h" HAVE_SYS_UTSNAME_H) +LA_CHECK_INCLUDE_FILE("sys/vfs.h" HAVE_SYS_VFS_H) +LA_CHECK_INCLUDE_FILE("sys/wait.h" HAVE_SYS_WAIT_H) +LA_CHECK_INCLUDE_FILE("time.h" HAVE_TIME_H) +LA_CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H) +LA_CHECK_INCLUDE_FILE("utime.h" HAVE_UTIME_H) +LA_CHECK_INCLUDE_FILE("wchar.h" HAVE_WCHAR_H) +LA_CHECK_INCLUDE_FILE("wctype.h" HAVE_WCTYPE_H) +LA_CHECK_INCLUDE_FILE("windows.h" HAVE_WINDOWS_H) +IF(ENABLE_CNG) + LA_CHECK_INCLUDE_FILE("Bcrypt.h" HAVE_BCRYPT_H) +ELSE(ENABLE_CNG) + UNSET(HAVE_BCRYPT_H CACHE) +ENDIF(ENABLE_CNG) +# Following files need windows.h, so we should test it after windows.h test. +LA_CHECK_INCLUDE_FILE("wincrypt.h" HAVE_WINCRYPT_H) +LA_CHECK_INCLUDE_FILE("winioctl.h" HAVE_WINIOCTL_H) + +# +# Check whether use of __EXTENSIONS__ is safe. +# We need some macro such as _GNU_SOURCE to use extension functions. +# +SET(_INCLUDE_FILES) +FOREACH (it ${_HEADER}) + SET(_INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n") +ENDFOREACH (it) + +CHECK_C_SOURCE_COMPILES( + "#define __EXTENSIONS__ 1 + ${_INCLUDE_FILES} + int main() { return 0;}" + SAFE_TO_DEFINE_EXTENSIONS) + +# +# Find Nettle +# +IF(ENABLE_NETTLE) + FIND_PACKAGE(Nettle) + IF(NETTLE_FOUND) + SET(HAVE_LIBNETTLE 1) + LIST(APPEND ADDITIONAL_LIBS ${NETTLE_LIBRARIES}) + INCLUDE_DIRECTORIES(${NETTLE_INCLUDE_DIR}) + + LIST(APPEND CMAKE_REQUIRED_INCLUDES ${NETTLE_INCLUDE_DIR}) + LA_CHECK_INCLUDE_FILE("nettle/aes.h" HAVE_NETTLE_AES_H) + LA_CHECK_INCLUDE_FILE("nettle/hmac.h" HAVE_NETTLE_HMAC_H) + LA_CHECK_INCLUDE_FILE("nettle/md5.h" HAVE_NETTLE_MD5_H) + LA_CHECK_INCLUDE_FILE("nettle/pbkdf2.h" HAVE_NETTLE_PBKDF2_H) + LA_CHECK_INCLUDE_FILE("nettle/ripemd160.h" HAVE_NETTLE_RIPEMD160_H) + LA_CHECK_INCLUDE_FILE("nettle/sha.h" HAVE_NETTLE_SHA_H) + + ENDIF(NETTLE_FOUND) + MARK_AS_ADVANCED(CLEAR NETTLE_INCLUDE_DIR) + MARK_AS_ADVANCED(CLEAR NETTLE_LIBRARIES) +ENDIF(ENABLE_NETTLE) + +# +# Find OpenSSL +# (Except on Mac, where OpenSSL is deprecated.) +# +IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") + FIND_PACKAGE(OpenSSL) + IF(OPENSSL_FOUND) + SET(HAVE_LIBCRYPTO 1) + INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_CRYPTO_LIBRARY}) + ENDIF(OPENSSL_FOUND) +ELSE() + SET(OPENSSL_FOUND FALSE) # Override cached value +ENDIF() + +# FreeBSD libmd +IF(NOT OPENSSL_FOUND) + CHECK_LIBRARY_EXISTS(md "MD5Init" "" LIBMD_FOUND) + IF(LIBMD_FOUND) + CMAKE_PUSH_CHECK_STATE() # Save the state of the variables + SET(CMAKE_REQUIRED_LIBRARIES "md") + FIND_LIBRARY(LIBMD_LIBRARY NAMES md) + LIST(APPEND ADDITIONAL_LIBS ${LIBMD_LIBRARY}) + CMAKE_POP_CHECK_STATE() # Restore the state of the variables + ENDIF(LIBMD_FOUND) +ENDIF(NOT OPENSSL_FOUND) + +# +# How to prove that CRYPTO functions, which have several names on various +# platforms, just see if archive_digest.c can compile and link against +# required libraries. +# +MACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTATION) + FOREACH(ALGORITHM ${ALGORITHMS}) + IF(NOT ARCHIVE_CRYPTO_${ALGORITHM}) + STRING(TOLOWER "${ALGORITHM}" lower_algorithm) + STRING(TOUPPER "${ALGORITHM}" algorithm) + IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND NOT OPENSSL_FOUND) + SET(ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION} FALSE) + ELSEIF("${IMPLEMENTATION}" MATCHES "^NETTLE$" AND NOT NETTLE_FOUND) + SET(ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION} FALSE) + ENDIF("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND NOT OPENSSL_FOUND) + + IF(NOT DEFINED ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}) + # Probe the local implementation for whether this + # crypto implementation is available on this platform. + SET(TRY_CRYPTO_REQUIRED_INCLUDES + "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/libarchive;${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp") + SET(TRY_CRYPTO_REQUIRED_LIBS) + IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) + SET(TRY_CRYPTO_REQUIRED_INCLUDES + "${TRY_CRYPTO_REQUIRED_INCLUDES};${OPENSSL_INCLUDE_DIR}") + SET(TRY_CRYPTO_REQUIRED_LIBS + "-DLINK_LIBRARIES:STRING=${OPENSSL_LIBRARIES}") + ELSEIF("${IMPLEMENTATION}" MATCHES "^NETTLE$" AND NETTLE_FOUND) + SET(TRY_CRYPTO_REQUIRED_INCLUDES + "${TRY_CRYPTO_REQUIRED_INCLUDES};${NETTLE_INCLUDE_DIR}") + SET(TRY_CRYPTO_REQUIRED_LIBS + "-DLINK_LIBRARIES:STRING=${NETTLE_LIBRARY}") + ELSEIF("${IMPLEMENTATION}" MATCHES "^LIBMD$" AND LIBMD_FOUND) + SET(TRY_CRYPTO_REQUIRED_LIBS + "-DLINK_LIBRARIES:STRING=${LIBMD_LIBRARY}") + ENDIF("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) + + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h) + FILE(READ "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h" + CONFDEFS_H) + FILE(READ "${CMAKE_CURRENT_SOURCE_DIR}/libarchive/archive_digest.c" + ARCHIVE_CRYPTO_C) + + SET(SOURCE "${CONFDEFS_H} + +#define ARCHIVE_${algorithm}_COMPILE_TEST +#define ARCHIVE_CRYPTO_${algorithm}_${IMPLEMENTATION} +#define PLATFORM_CONFIG_H \"check_crypto_md.h\" + +${ARCHIVE_CRYPTO_C} + +int +main(int argc, char **argv) +{ + archive_${lower_algorithm}_ctx ctx; + archive_${lower_algorithm}_init(&ctx); + archive_${lower_algorithm}_update(&ctx, *argv, argc); + archive_${lower_algorithm}_final(&ctx, NULL); + return 0; +} +") + + FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_crypto_md.h" "") + FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_crypto_md.c" "${SOURCE}") + MESSAGE(STATUS "Checking support for ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}") + + TRY_COMPILE(ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION} + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_crypto_md.c + CMAKE_FLAGS + "${TRY_CRYPTO_REQUIRED_LIBS}" + "${TRY_CRYPTO_REQUIRED_INCLUDES}" + OUTPUT_VARIABLE OUTPUT) + + # Inform user whether or not we found it; if not, log why we didn't. + IF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}) + MESSAGE(STATUS "Checking support for ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION} -- found") + SET(ARCHIVE_CRYPTO_${ALGORITHM} 1) + ELSE (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}) + MESSAGE(STATUS "Checking support for ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION} -- not found") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Checking support for ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION} failed with the following output:\n" + "${OUTPUT}\n" + "Source file was:\n${SOURCE}\n") + ENDIF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}) + ENDIF(NOT DEFINED ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}) + + # Add appropriate libs/includes depending on whether the implementation + # was found on this platform. + IF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}) + IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) + INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES}) + LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS) + ENDIF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) + ENDIF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}) + ENDIF(NOT ARCHIVE_CRYPTO_${ALGORITHM}) + ENDFOREACH(ALGORITHM ${ALGORITHMS}) +ENDMACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTATION) + +# +# CRYPTO functions on Windows is defined at archive_windows.c, thus we do not +# need the test what the functions can be mapped to archive_{crypto name}_init, +# archive_{crypto name}_update and archive_{crypto name}_final. +# The functions on Windows use CALG_{crypto name} macro to create a crypt object +# and then we need to know what CALG_{crypto name} macros is available to show +# ARCHIVE_CRYPTO_{crypto name}_WIN macros because Windows 2000 and earlier version +# of Windows XP do not support SHA256, SHA384 and SHA512. +# +MACRO(CHECK_CRYPTO_WIN CRYPTO_LIST) + IF(WIN32 AND NOT CYGWIN) + FOREACH(CRYPTO ${CRYPTO_LIST}) + IF(NOT ARCHIVE_CRYPTO_${CRYPTO}) + IF(NOT DEFINED ARCHIVE_CRYPTO_${CRYPTO}_WIN) + STRING(TOUPPER "${CRYPTO}" crypto) + SET(ALGID "") + IF ("${CRYPTO}" MATCHES "^MD5$") + SET(ALGID "CALG_MD5") + ENDIF ("${CRYPTO}" MATCHES "^MD5$") + IF ("${CRYPTO}" MATCHES "^SHA1$") + SET(ALGID "CALG_SHA1") + ENDIF ("${CRYPTO}" MATCHES "^SHA1$") + IF ("${CRYPTO}" MATCHES "^SHA256$") + SET(ALGID "CALG_SHA_256") + ENDIF ("${CRYPTO}" MATCHES "^SHA256$") + IF ("${CRYPTO}" MATCHES "^SHA384$") + SET(ALGID "CALG_SHA_384") + ENDIF ("${CRYPTO}" MATCHES "^SHA384$") + IF ("${CRYPTO}" MATCHES "^SHA512$") + SET(ALGID "CALG_SHA_512") + ENDIF ("${CRYPTO}" MATCHES "^SHA512$") + + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h) + FILE(READ "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h" + CONFDEFS_H) + + SET(SOURCE "${CONFDEFS_H} + +#define ${crypto}_COMPILE_TEST +#include +#include + +int +main(int argc, char **argv) +{ + return ${ALGID}; +} +") + SET(SOURCE_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_crypto_win.c") + + FILE(WRITE "${SOURCE_FILE}" "${SOURCE}") + MESSAGE(STATUS "Checking support for ARCHIVE_CRYPTO_${CRYPTO}_WIN") + + TRY_COMPILE(ARCHIVE_CRYPTO_${CRYPTO}_WIN + ${CMAKE_BINARY_DIR} + ${SOURCE_FILE} + CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/libarchive" + OUTPUT_VARIABLE OUTPUT) + + IF (ARCHIVE_CRYPTO_${CRYPTO}_WIN) + MESSAGE(STATUS + "Checking support for ARCHIVE_CRYPTO_${CRYPTO}_WIN -- found") + SET(ARCHIVE_CRYPTO_${CRYPTO} 1) + ELSE (ARCHIVE_CRYPTO_${CRYPTO}_WIN) + MESSAGE(STATUS + "Checking support for ARCHIVE_CRYPTO_${CRYPTO}_WIN -- not found") + FILE(APPEND + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Checking support for ARCHIVE_CRYPTO_${CRYPTO}_WIN failed with the following output:\n" + "${OUTPUT}\n" + "Source file was:\n${SOURCE}\n") + ENDIF (ARCHIVE_CRYPTO_${CRYPTO}_WIN) + + ENDIF(NOT DEFINED ARCHIVE_CRYPTO_${CRYPTO}_WIN) + ENDIF(NOT ARCHIVE_CRYPTO_${CRYPTO}) + ENDFOREACH(CRYPTO) + ENDIF(WIN32 AND NOT CYGWIN) +ENDMACRO(CHECK_CRYPTO_WIN CRYPTO_LIST) + +# +# Find iconv +# POSIX defines the second arg as const char ** +# and requires it to be in libc. But we can accept +# a non-const argument here and can support iconv() +# being in libiconv. +# +MACRO(CHECK_ICONV LIB TRY_ICONV_CONST) + IF(NOT HAVE_ICONV) + CMAKE_PUSH_CHECK_STATE() # Save the state of the variables + IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR + CMAKE_C_COMPILER_ID MATCHES "^Clang$") + # + # During checking iconv proto type, we should use -Werror to avoid the + # success of iconv detection with a warnig which success is a miss + # detection. So this needs for all build mode(even it's a release mode). + # + SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror") + ENDIF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR + CMAKE_C_COMPILER_ID MATCHES "^Clang$") + IF (CMAKE_C_COMPILER_ID MATCHES "^XL$") + SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -qhalt=w -qflag=w:w") + ENDIF (CMAKE_C_COMPILER_ID MATCHES "^XL$") + IF (MSVC) + # NOTE: /WX option is the same as gcc's -Werror option. + SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} /WX") + ENDIF (MSVC) + # + CHECK_C_SOURCE_COMPILES( + "#include + #include + int main() { + ${TRY_ICONV_CONST} char *ccp; + iconv_t cd = iconv_open(\"\", \"\"); + iconv(cd, &ccp, (size_t *)0, (char **)0, (size_t *)0); + iconv_close(cd); + return 0; + }" + HAVE_ICONV_${LIB}_${TRY_ICONV_CONST}) + IF(HAVE_ICONV_${LIB}_${TRY_ICONV_CONST}) + SET(HAVE_ICONV true) + SET(ICONV_CONST ${TRY_ICONV_CONST}) + ENDIF(HAVE_ICONV_${LIB}_${TRY_ICONV_CONST}) + CMAKE_POP_CHECK_STATE() # Restore the state of the variables + ENDIF(NOT HAVE_ICONV) +ENDMACRO(CHECK_ICONV TRY_ICONV_CONST) + +IF(ENABLE_ICONV) + CMAKE_PUSH_CHECK_STATE() # Save the state of the variables + FIND_PATH(ICONV_INCLUDE_DIR iconv.h) + IF(ICONV_INCLUDE_DIR) + #SET(INCLUDES ${INCLUDES} "iconv.h") + SET(HAVE_ICONV_H 1) + INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR}) + SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) + CHECK_ICONV("libc" "const") + CHECK_ICONV("libc" "") + + # If iconv isn't in libc and we have a libiconv, try that. + FIND_LIBRARY(LIBICONV_PATH NAMES iconv libiconv) + IF(NOT HAVE_ICONV AND LIBICONV_PATH) + LIST(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBICONV_PATH}) + # Test if a macro is needed for the library. + TRY_MACRO_FOR_LIBRARY( + "${ICONV_INCLUDE_DIR}" "${LIBICONV_PATH}" + COMPILES + "#include \nint main() {return iconv_close((iconv_t)0);}" + "WITHOUT_LIBICONV_STATIC;LIBICONV_STATIC") + IF(NOT WITHOUT_LIBICONV_STATIC AND LIBICONV_STATIC) + ADD_DEFINITIONS(-DLIBICONV_STATIC) + ENDIF(NOT WITHOUT_LIBICONV_STATIC AND LIBICONV_STATIC) + # + # Set up CMAKE_REQUIRED_* for CHECK_ICONV + # + SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) + SET(CMAKE_REQUIRED_LIBRARIES ${LIBICONV_PATH}) + IF(LIBICONV_STATIC) + # LIBICONV_STATIC is necessary for the success of CHECK_ICONV + # on Windows. + SET(CMAKE_REQUIRED_DEFINITIONS "-DLIBICONV_STATIC") + ELSE(LIBICONV_STATIC) + SET(CMAKE_REQUIRED_DEFINITIONS) + ENDIF(LIBICONV_STATIC) + CHECK_ICONV("libiconv" "const") + CHECK_ICONV("libiconv" "") + IF (HAVE_ICONV) + LIST(APPEND ADDITIONAL_LIBS ${LIBICONV_PATH}) + ENDIF(HAVE_ICONV) + ENDIF(NOT HAVE_ICONV AND LIBICONV_PATH) + ENDIF(ICONV_INCLUDE_DIR) + # + # Find locale_charset() for libiconv. + # + IF(LIBICONV_PATH) + SET(CMAKE_REQUIRED_DEFINITIONS) + SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) + SET(CMAKE_REQUIRED_LIBRARIES) + CHECK_INCLUDE_FILES("localcharset.h" HAVE_LOCALCHARSET_H) + FIND_LIBRARY(LIBCHARSET_PATH NAMES charset libcharset) + IF(LIBCHARSET_PATH) + SET(CMAKE_REQUIRED_LIBRARIES ${LIBCHARSET_PATH}) + IF(WIN32 AND NOT CYGWIN) + # Test if a macro is needed for the library. + TRY_MACRO_FOR_LIBRARY( + "${ICONV_INCLUDE_DIR}" "${LIBCHARSET_PATH}" + COMPILES + "#include \nint main() {return locale_charset()?1:0;}" + "WITHOUT_LIBCHARSET_STATIC;LIBCHARSET_STATIC") + IF(NOT WITHOUT_LIBCHARSET_STATIC AND LIBCHARSET_STATIC) + ADD_DEFINITIONS(-DLIBCHARSET_STATIC) + ENDIF(NOT WITHOUT_LIBCHARSET_STATIC AND LIBCHARSET_STATIC) + IF(WITHOUT_LIBCHARSET_STATIC OR LIBCHARSET_STATIC) + SET(HAVE_LOCALE_CHARSET ON CACHE INTERNAL + "Have function locale_charset") + ENDIF(WITHOUT_LIBCHARSET_STATIC OR LIBCHARSET_STATIC) + ELSE(WIN32 AND NOT CYGWIN) + CHECK_FUNCTION_EXISTS_GLIBC(locale_charset HAVE_LOCALE_CHARSET) + ENDIF(WIN32 AND NOT CYGWIN) + IF(HAVE_LOCALE_CHARSET) + LIST(APPEND ADDITIONAL_LIBS ${LIBCHARSET_PATH}) + ENDIF(HAVE_LOCALE_CHARSET) + ENDIF(LIBCHARSET_PATH) + ENDIF(LIBICONV_PATH) + CMAKE_POP_CHECK_STATE() # Restore the state of the variables *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Thu Mar 2 21:13:29 2017 Return-Path: Delivered-To: svn-src-all@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 0CD8DCF6E69; Thu, 2 Mar 2017 21:13:29 +0000 (UTC) (envelope-from mm@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 C8E6DACB; Thu, 2 Mar 2017 21:13:28 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22LDSFE090367; Thu, 2 Mar 2017 21:13:28 GMT (envelope-from mm@FreeBSD.org) Received: (from mm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22LDQVI090348; Thu, 2 Mar 2017 21:13:26 GMT (envelope-from mm@FreeBSD.org) Message-Id: <201703022113.v22LDQVI090348@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mm set sender to mm@FreeBSD.org using -f From: Martin Matuska Date: Thu, 2 Mar 2017 21:13:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314567 - in vendor/libarchive/dist: . build build/cmake cat/test cpio cpio/test libarchive libarchive/test tar tar/test test_utils X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 21:13:29 -0000 Author: mm Date: Thu Mar 2 21:13:25 2017 New Revision: 314567 URL: https://svnweb.freebsd.org/changeset/base/314567 Log: Update vendor/libarchive to git a15c7f7b496ba4cefbcaf6f8ac637db4f3009a58 Documentation, style, test suite changes and typo fixes. New bsdtar tests for --acls and --fflags options. Added: vendor/libarchive/dist/tar/test/test_option_acls.c (contents, props changed) vendor/libarchive/dist/tar/test/test_option_fflags.c (contents, props changed) Modified: vendor/libarchive/dist/CMakeLists.txt vendor/libarchive/dist/Makefile.am vendor/libarchive/dist/build/cmake/config.h.in vendor/libarchive/dist/build/version vendor/libarchive/dist/cat/test/CMakeLists.txt vendor/libarchive/dist/configure.ac vendor/libarchive/dist/cpio/cpio.c vendor/libarchive/dist/cpio/test/CMakeLists.txt vendor/libarchive/dist/libarchive/archive.h vendor/libarchive/dist/libarchive/archive_check_magic.c vendor/libarchive/dist/libarchive/archive_entry.c vendor/libarchive/dist/libarchive/archive_entry.h vendor/libarchive/dist/libarchive/archive_entry_acl.3 vendor/libarchive/dist/libarchive/archive_entry_paths.3 vendor/libarchive/dist/libarchive/archive_entry_perms.3 vendor/libarchive/dist/libarchive/archive_platform.h vendor/libarchive/dist/libarchive/archive_read_disk.3 vendor/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c vendor/libarchive/dist/libarchive/archive_read_format.3 vendor/libarchive/dist/libarchive/archive_read_open.3 vendor/libarchive/dist/libarchive/archive_read_support_format_warc.c vendor/libarchive/dist/libarchive/archive_write_data.3 vendor/libarchive/dist/libarchive/archive_write_disk.3 vendor/libarchive/dist/libarchive/archive_write_disk_acl.c vendor/libarchive/dist/libarchive/archive_write_disk_posix.c vendor/libarchive/dist/libarchive/archive_write_finish_entry.3 vendor/libarchive/dist/libarchive/archive_write_format.3 vendor/libarchive/dist/libarchive/test/test_acl_platform_nfs4.c vendor/libarchive/dist/libarchive/test/test_acl_platform_posix1e.c vendor/libarchive/dist/libarchive/test/test_read_disk_directory_traversals.c vendor/libarchive/dist/tar/bsdtar.1 vendor/libarchive/dist/tar/bsdtar.c vendor/libarchive/dist/tar/bsdtar.h vendor/libarchive/dist/tar/test/CMakeLists.txt vendor/libarchive/dist/tar/test/test_option_nodump.c vendor/libarchive/dist/test_utils/test_common.h vendor/libarchive/dist/test_utils/test_main.c Modified: vendor/libarchive/dist/CMakeLists.txt ============================================================================== --- vendor/libarchive/dist/CMakeLists.txt Thu Mar 2 21:04:23 2017 (r314566) +++ vendor/libarchive/dist/CMakeLists.txt Thu Mar 2 21:13:25 2017 (r314567) @@ -15,7 +15,7 @@ endif() # RelWithDebInfo : Release build with Debug Info # MinSizeRel : Release Min Size build IF(NOT CMAKE_BUILD_TYPE) - SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build Type" FORCE) + SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Type" FORCE) ENDIF(NOT CMAKE_BUILD_TYPE) # Set a value type to properly display CMAKE_BUILD_TYPE on GUI if the # value type is "UNINITIALIZED". @@ -579,6 +579,7 @@ int main(void) { return FS_IOC_GETFLAGS; LA_CHECK_INCLUDE_FILE("linux/magic.h" HAVE_LINUX_MAGIC_H) LA_CHECK_INCLUDE_FILE("locale.h" HAVE_LOCALE_H) +LA_CHECK_INCLUDE_FILE("membership.h" HAVE_MEMBERSHIP_H) LA_CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H) LA_CHECK_INCLUDE_FILE("paths.h" HAVE_PATHS_H) LA_CHECK_INCLUDE_FILE("poll.h" HAVE_POLL_H) @@ -1618,29 +1619,29 @@ IF(ENABLE_ACL) CHECK_FUNCTION_EXISTS(acl_get_link_np HAVE_ACL_GET_LINK_NP) CHECK_FUNCTION_EXISTS(acl_is_trivial_np HAVE_ACL_IS_TRIVIAL_NP) CHECK_FUNCTION_EXISTS(acl_set_link_np HAVE_ACL_SET_LINK_NP) - CHECK_SYMBOL_EXISTS(ACL_TYPE_NFS4 "${INCLUDES}" HAVE_ACL_TYPE_NFS4) + CHECK_SYMBOL_EXISTS(ACL_TYPE_NFS4 "${INCLUDES}" HAVE_DECL_ACL_TYPE_NFS4) # MacOS has an acl.h that isn't POSIX. It can be detected by # checking for ACL_USER - CHECK_SYMBOL_EXISTS(ACL_USER "${INCLUDES}" HAVE_ACL_USER) + CHECK_SYMBOL_EXISTS(ACL_USER "${INCLUDES}" HAVE_DECL_ACL_USER) CHECK_C_SOURCE_COMPILES("#include #include -int main(void) { return ACL_TYPE_EXTENDED; }" HAVE_ACL_TYPE_EXTENDED) +int main(void) { return ACL_TYPE_EXTENDED; }" HAVE_DECL_ACL_TYPE_EXTENDED) + CHECK_C_SOURCE_COMPILES("#include +#include +int main(void) { return ACL_SYNCHRONIZE; }" HAVE_DECL_ACL_SYNCHRONIZE) # Solaris and derivates ACLs - CHECK_LIBRARY_EXISTS(sec "acl_get" "" HAVE_LIBSEC) - IF(HAVE_LIBSEC) - SET(CMAKE_REQUIRED_LIBRARIES "sec") - FIND_LIBRARY(SEC_LIBRARY NAMES sec) - LIST(APPEND ADDITIONAL_LIBS ${SEC_LIBRARY}) - ENDIF(HAVE_LIBSEC) - # CHECK_TYPE_EXISTS(aclent_t "${INCLUDES}" HAVE_ACLENT_T) CHECK_TYPE_EXISTS(ace_t "${INCLUDES}" HAVE_ACE_T) - CHECK_FUNCTION_EXISTS(acl_get HAVE_FACL_GET) - CHECK_FUNCTION_EXISTS(facl_get HAVE_FACL_GET) - CHECK_FUNCTION_EXISTS(acl_set HAVE_FACL_SET) - CHECK_FUNCTION_EXISTS(facl_set HAVE_FACL_SET) + CHECK_FUNCTION_EXISTS(acl HAVE_ACL) + CHECK_FUNCTION_EXISTS(facl HAVE_FACL) + CHECK_SYMBOL_EXISTS(GETACL "${INCLUDES}" HAVE_DECL_GETACL) + CHECK_SYMBOL_EXISTS(GETACLCNT "${INCLUDES}" HAVE_DECL_GETACLCNT) + CHECK_SYMBOL_EXISTS(SETACL "${INCLUDES}" HAVE_DECL_SETACL) + CHECK_SYMBOL_EXISTS(ACE_GETACL "${INCLUDES}" HAVE_DECL_ACE_GETACL) + CHECK_SYMBOL_EXISTS(ACE_GETACLCNT "${INCLUDES}" HAVE_DECL_ACE_GETACLCNT) + CHECK_SYMBOL_EXISTS(ACE_SETACL "${INCLUDES}" HAVE_DECL_ACE_SETACL) ELSE(ENABLE_ACL) # If someone runs cmake, then disables ACL support, we need # to forcibly override the cached values for these. @@ -1655,15 +1656,20 @@ ELSE(ENABLE_ACL) SET(HAVE_ACL_SET_FD FALSE) SET(HAVE_ACL_SET_FD_NP FALSE) SET(HAVE_ACL_SET_FILE FALSE) - SET(HAVE_ACL_TYPE_NFS4 FALSE) - SET(HAVE_ACL_USER FALSE) SET(HAVE_ACL_TYPE_EXTENDED FALSE) - SET(HAVE_ACL_GET FALSE) SET(HAVE_ACLENT_T FALSE) SET(HAVE_ACE_T FALSE) - SET(HAVE_FACL_GET FALSE) - SET(HAVE_ACL_SET FALSE) - SET(HAVE_FACL_SET FALSE) + SET(HAVE_DECL_ACL_TYPE_NFS4 FALSE) + SET(HAVE_DECL_ACL_USER FALSE) + SET(HAVE_DECL_ACL_SYNCHRONIZE FALSE) + SET(HAVE_DECL_GETACL FALSE) + SET(HAVE_DECL_GETACLCNT FALSE) + SET(HAVE_DECL_SETACL FALSE) + SET(HAVE_DECL_ACE_GETACL FALSE) + SET(HAVE_DECL_ACE_GETACLCNT FALSE) + SET(HAVE_DECL_ACE_SETACL FALSE) + SET(HAVE_ACL FALSE) + SET(HAVE_FACL FALSE) ENDIF(ENABLE_ACL) # Modified: vendor/libarchive/dist/Makefile.am ============================================================================== --- vendor/libarchive/dist/Makefile.am Thu Mar 2 21:04:23 2017 (r314566) +++ vendor/libarchive/dist/Makefile.am Thu Mar 2 21:13:25 2017 (r314567) @@ -23,7 +23,7 @@ TESTS_ENVIRONMENT= $(libarchive_TESTS_EN DISTCHECK_CONFIGURE_FLAGS = --enable-bsdtar --enable-bsdcpio # The next line is commented out by default in shipping libarchive releases. # It is uncommented by default in trunk. -# DEV_CFLAGS=-Werror -Wextra -Wunused -Wshadow -Wmissing-prototypes -Wcast-qual -g +DEV_CFLAGS=-Werror -Wextra -Wunused -Wshadow -Wmissing-prototypes -Wcast-qual -g AM_CFLAGS=$(DEV_CFLAGS) PLATFORMCPPFLAGS = @PLATFORMCPPFLAGS@ AM_CPPFLAGS=$(PLATFORMCPPFLAGS) @@ -951,10 +951,12 @@ bsdtar_test_SOURCES= \ tar/test/test_option_T_upper.c \ tar/test/test_option_U_upper.c \ tar/test/test_option_X_upper.c \ + tar/test/test_option_acls.c \ tar/test/test_option_a.c \ tar/test/test_option_b.c \ tar/test/test_option_b64encode.c \ tar/test/test_option_exclude.c \ + tar/test/test_option_fflags.c \ tar/test/test_option_gid_gname.c \ tar/test/test_option_grzip.c \ tar/test/test_option_j.c \ Modified: vendor/libarchive/dist/build/cmake/config.h.in ============================================================================== --- vendor/libarchive/dist/build/cmake/config.h.in Thu Mar 2 21:04:23 2017 (r314566) +++ vendor/libarchive/dist/build/cmake/config.h.in Thu Mar 2 21:13:25 2017 (r314567) @@ -326,15 +326,6 @@ typedef uint64_t uintmax_t; /* Define to 1 if you have the `acl_set_file' function. */ #cmakedefine HAVE_ACL_SET_FILE 1 -/* True for FreeBSD with NFSv4 ACL support */ -#cmakedefine HAVE_ACL_TYPE_NFS4 1 - -/* True for MacOS ACL support */ -#cmakedefine HAVE_ACL_TYPE_EXTENDED 1 - -/* True for systems with POSIX ACL support */ -#cmakedefine HAVE_ACL_USER 1 - /* Define to 1 if you have the `arc4random_buf' function. */ #cmakedefine HAVE_ARC4RANDOM_BUF 1 @@ -371,6 +362,34 @@ typedef uint64_t uintmax_t; /* Define to 1 if you have the `cygwin_conv_path' function. */ #cmakedefine HAVE_CYGWIN_CONV_PATH 1 +/* Define to 1 if you have the declaration of `ACE_GETACL', and to 0 if you + don't. */ +#cmakedefine HAVE_DECL_ACE_GETACL 1 + +/* Define to 1 if you have the declaration of `ACE_GETACLCNT', and to 0 if you + don't. */ +#cmakedefine HAVE_DECL_ACE_GETACLCNT 1 + +/* Define to 1 if you have the declaration of `ACE_SETACL', and to 0 if you + don't. */ +#cmakedefine HAVE_DECL_ACE_SETACL 1 + +/* Define to 1 if you have the declaration of `ACL_SYNCHRONIZE', and to 0 if + you don't. */ +#cmakedefine HAVE_DECL_ACL_SYNCHRONIZE 1 + +/* Define to 1 if you have the declaration of `ACL_TYPE_EXTENDED', and to 0 if + you don't. */ +#cmakedefine HAVE_DECL_ACL_TYPE_EXTENDED 1 + +/* Define to 1 if you have the declaration of `ACL_TYPE_NFS4', and to 0 if you + don't. */ +#cmakedefine HAVE_DECL_ACL_TYPE_NFS4 1 + +/* Define to 1 if you have the declaration of `ACL_USER', and to 0 if you + don't. */ +#cmakedefine HAVE_DECL_ACL_USER 1 + /* Define to 1 if you have the declaration of `INT32_MAX', and to 0 if you don't. */ #cmakedefine HAVE_DECL_INT32_MAX 1 @@ -395,6 +414,10 @@ typedef uint64_t uintmax_t; don't. */ #cmakedefine HAVE_DECL_INTMAX_MIN 1 +/* Define to 1 if you have the declaration of `SETACL', and to 0 if you don't. + */ +#cmakedefine HAVE_DECL_SETACL 1 + /* Define to 1 if you have the declaration of `SIZE_MAX', and to 0 if you don't. */ #cmakedefine HAVE_DECL_SIZE_MAX 1 @@ -468,6 +491,14 @@ typedef uint64_t uintmax_t; /* Define to 1 if EXTATTR_NAMESPACE_USER is defined in sys/extattr.h. */ #cmakedefine HAVE_DECL_EXTATTR_NAMESPACE_USER 1 +/* Define to 1 if you have the declaration of `GETACL', and to 0 if you don't. + */ +#cmakedefine HAVE_DECL_GETACL 1 + +/* Define to 1 if you have the declaration of `GETACLCNT', and to 0 if you + don't. */ +#cmakedefine HAVE_DECL_GETACLCNT 1 + /* Define to 1 if you have the `fchdir' function. */ #cmakedefine HAVE_FCHDIR 1 @@ -742,6 +773,9 @@ typedef uint64_t uintmax_t; /* Define to 1 if you have the `mbrtowc' function. */ #cmakedefine HAVE_MBRTOWC 1 +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_MEMBERSHIP_H 1 + /* Define to 1 if you have the `memmove' function. */ #cmakedefine HAVE_MEMMOVE 1 Modified: vendor/libarchive/dist/build/version ============================================================================== --- vendor/libarchive/dist/build/version Thu Mar 2 21:04:23 2017 (r314566) +++ vendor/libarchive/dist/build/version Thu Mar 2 21:13:25 2017 (r314567) @@ -1 +1 @@ -3003001 +3003002dev Modified: vendor/libarchive/dist/cat/test/CMakeLists.txt ============================================================================== --- vendor/libarchive/dist/cat/test/CMakeLists.txt Thu Mar 2 21:04:23 2017 (r314566) +++ vendor/libarchive/dist/cat/test/CMakeLists.txt Thu Mar 2 21:13:25 2017 (r314567) @@ -29,6 +29,11 @@ IF(ENABLE_CAT AND ENABLE_TEST) # Register target # ADD_EXECUTABLE(bsdcat_test ${bsdcat_test_SOURCES}) + IF(ENABLE_ACL) + IF(HAVE_LIBACL) + TARGET_LINK_LIBRARIES(bsdcat_test ${ACL_LIBRARY}) + ENDIF(HAVE_LIBACL) + ENDIF(ENABLE_ACL) SET_PROPERTY(TARGET bsdcat_test PROPERTY COMPILE_DEFINITIONS LIST_H) # Modified: vendor/libarchive/dist/configure.ac ============================================================================== --- vendor/libarchive/dist/configure.ac Thu Mar 2 21:04:23 2017 (r314566) +++ vendor/libarchive/dist/configure.ac Thu Mar 2 21:13:25 2017 (r314567) @@ -4,8 +4,8 @@ dnl First, define all of the version num dnl In particular, this allows the version macro to be used in AC_INIT dnl These first two version numbers are updated automatically on each release. -m4_define([LIBARCHIVE_VERSION_S],[3.3.1]) -m4_define([LIBARCHIVE_VERSION_N],[3003001]) +m4_define([LIBARCHIVE_VERSION_S],[3.3.2dev]) +m4_define([LIBARCHIVE_VERSION_N],[3003002]) dnl bsdtar and bsdcpio versioning tracks libarchive m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S()) @@ -699,6 +699,7 @@ AC_ARG_ENABLE([acl], if test "x$enable_acl" != "xno"; then AC_CHECK_HEADERS([acl/libacl.h]) AC_CHECK_HEADERS([sys/acl.h]) + AC_CHECK_HEADERS([membership.h]) AC_CHECK_LIB([acl],[acl_get_file]) AC_CHECK_FUNCS([acl_create_entry acl_get_fd_np]) AC_CHECK_FUNCS([acl_init acl_set_fd acl_set_fd_np acl_set_file]) @@ -737,31 +738,23 @@ if test "x$enable_acl" != "xno"; then #endif ]) - # Check for ACL_TYPE_NFS4 - AC_CHECK_DECL([ACL_TYPE_NFS4], - [AC_DEFINE(HAVE_ACL_TYPE_NFS4, 1, [True for FreeBSD with NFSv4 ACL support])], - [], - [#include ]) - - # MacOS has an acl.h that isn't POSIX. It can be detected by - # checking for ACL_USER - AC_CHECK_DECL([ACL_USER], - [AC_DEFINE(HAVE_ACL_USER, 1, [True for systems with POSIX ACL support])], - [], - [#include ]) + # FreeBSD and POSIX + # MacOS has no ACL_USER in acl.h + AC_CHECK_DECLS([ACL_TYPE_NFS4, ACL_USER], + [], [], + [#include + #include ]) - # MacOS has ACL_TYPE_EXTENDED instead - AC_CHECK_DECL([ACL_TYPE_EXTENDED], - [AC_DEFINE(HAVE_ACL_TYPE_EXTENDED, 1, [True for MacOS ACL support])], - [], + # FreeBSD and MacOS ACL support + AC_CHECK_DECLS([ACL_TYPE_EXTENDED, ACL_SYNCHRONIZE], [], [], [#include #include ]) # Solaris and derivates ACLs - AC_CHECK_LIB([sec], [acl_get]) AC_CHECK_TYPES([aclent_t], [], [], [[#include ]]) AC_CHECK_TYPES([ace_t], [], [], [[#include ]]) - AC_CHECK_FUNCS(acl_get facl_get acl_set facl_set) + AC_CHECK_FUNCS(acl facl) + AC_CHECK_DECLS([GETACL, SETACL, GETACLCNT, ACE_GETACL, ACE_SETACL, ACE_GETACLCNT], [], [], [#include ]) fi # Additional requirements Modified: vendor/libarchive/dist/cpio/cpio.c ============================================================================== --- vendor/libarchive/dist/cpio/cpio.c Thu Mar 2 21:04:23 2017 (r314566) +++ vendor/libarchive/dist/cpio/cpio.c Thu Mar 2 21:13:25 2017 (r314567) @@ -108,22 +108,22 @@ static int entry_to_archive(struct cpio static int file_to_archive(struct cpio *, const char *); static void free_cache(struct name_cache *cache); static void list_item_verbose(struct cpio *, struct archive_entry *); -static void long_help(void); +static void long_help(void) __LA_DEAD; static const char *lookup_gname(struct cpio *, gid_t gid); static int lookup_gname_helper(struct cpio *, const char **name, id_t gid); static const char *lookup_uname(struct cpio *, uid_t uid); static int lookup_uname_helper(struct cpio *, const char **name, id_t uid); -static void mode_in(struct cpio *); -static void mode_list(struct cpio *); +static void mode_in(struct cpio *) __LA_DEAD; +static void mode_list(struct cpio *) __LA_DEAD; static void mode_out(struct cpio *); static void mode_pass(struct cpio *, const char *); static const char *remove_leading_slash(const char *); static int restore_time(struct cpio *, struct archive_entry *, const char *, int fd); -static void usage(void); -static void version(void); +static void usage(void) __LA_DEAD; +static void version(void) __LA_DEAD; static const char * passphrase_callback(struct archive *, void *); static void passphrase_free(char *); Modified: vendor/libarchive/dist/cpio/test/CMakeLists.txt ============================================================================== --- vendor/libarchive/dist/cpio/test/CMakeLists.txt Thu Mar 2 21:04:23 2017 (r314566) +++ vendor/libarchive/dist/cpio/test/CMakeLists.txt Thu Mar 2 21:13:25 2017 (r314567) @@ -62,6 +62,11 @@ IF(ENABLE_CPIO AND ENABLE_TEST) # Register target # ADD_EXECUTABLE(bsdcpio_test ${bsdcpio_test_SOURCES}) + IF(ENABLE_ACL) + IF(HAVE_LIBACL) + TARGET_LINK_LIBRARIES(bsdcpio_test ${ACL_LIBRARY}) + ENDIF(HAVE_LIBACL) + ENDIF(ENABLE_ACL) SET_PROPERTY(TARGET bsdcpio_test PROPERTY COMPILE_DEFINITIONS LIST_H) # Modified: vendor/libarchive/dist/libarchive/archive.h ============================================================================== --- vendor/libarchive/dist/libarchive/archive.h Thu Mar 2 21:04:23 2017 (r314566) +++ vendor/libarchive/dist/libarchive/archive.h Thu Mar 2 21:13:25 2017 (r314567) @@ -36,7 +36,7 @@ * assert that ARCHIVE_VERSION_NUMBER >= 2012108. */ /* Note: Compiler will complain if this does not match archive_entry.h! */ -#define ARCHIVE_VERSION_NUMBER 3003001 +#define ARCHIVE_VERSION_NUMBER 3003002 #include #include /* for wchar_t */ @@ -155,7 +155,7 @@ __LA_DECL int archive_version_number(vo /* * Textual name/version of the library, useful for version displays. */ -#define ARCHIVE_VERSION_ONLY_STRING "3.3.1" +#define ARCHIVE_VERSION_ONLY_STRING "3.3.2dev" #define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING __LA_DECL const char * archive_version_string(void); Modified: vendor/libarchive/dist/libarchive/archive_check_magic.c ============================================================================== --- vendor/libarchive/dist/libarchive/archive_check_magic.c Thu Mar 2 21:04:23 2017 (r314566) +++ vendor/libarchive/dist/libarchive/archive_check_magic.c Thu Mar 2 21:13:25 2017 (r314567) @@ -62,7 +62,7 @@ errmsg(const char *m) } } -static void +static __LA_DEAD void diediedie(void) { #if defined(_WIN32) && !defined(__CYGWIN__) && defined(_DEBUG) Modified: vendor/libarchive/dist/libarchive/archive_entry.c ============================================================================== --- vendor/libarchive/dist/libarchive/archive_entry.c Thu Mar 2 21:04:23 2017 (r314566) +++ vendor/libarchive/dist/libarchive/archive_entry.c Thu Mar 2 21:13:25 2017 (r314567) @@ -401,7 +401,7 @@ archive_entry_fflags_text(struct archive return (NULL); } -int64_t +la_int64_t archive_entry_gid(struct archive_entry *entry) { return (entry->ae_stat.aest_gid); @@ -502,7 +502,7 @@ _archive_entry_hardlink_l(struct archive return (archive_mstring_get_mbs_l(&entry->ae_hardlink, p, len, sc)); } -int64_t +la_int64_t archive_entry_ino(struct archive_entry *entry) { return (entry->ae_stat.aest_ino); @@ -514,7 +514,7 @@ archive_entry_ino_is_set(struct archive_ return (entry->ae_set & AE_SET_INO); } -int64_t +la_int64_t archive_entry_ino64(struct archive_entry *entry) { return (entry->ae_stat.aest_ino); @@ -627,7 +627,7 @@ archive_entry_rdevminor(struct archive_e return minor(entry->ae_stat.aest_rdev); } -int64_t +la_int64_t archive_entry_size(struct archive_entry *entry) { return (entry->ae_stat.aest_size); @@ -715,7 +715,7 @@ _archive_entry_symlink_l(struct archive_ return (archive_mstring_get_mbs_l( &entry->ae_symlink, p, len, sc)); } -int64_t +la_int64_t archive_entry_uid(struct archive_entry *entry) { return (entry->ae_stat.aest_uid); @@ -819,7 +819,7 @@ archive_entry_copy_fflags_text_w(struct } void -archive_entry_set_gid(struct archive_entry *entry, int64_t g) +archive_entry_set_gid(struct archive_entry *entry, la_int64_t g) { entry->stat_valid = 0; entry->ae_stat.aest_gid = g; @@ -868,7 +868,7 @@ _archive_entry_copy_gname_l(struct archi } void -archive_entry_set_ino(struct archive_entry *entry, int64_t ino) +archive_entry_set_ino(struct archive_entry *entry, la_int64_t ino) { entry->stat_valid = 0; entry->ae_set |= AE_SET_INO; @@ -876,7 +876,7 @@ archive_entry_set_ino(struct archive_ent } void -archive_entry_set_ino64(struct archive_entry *entry, int64_t ino) +archive_entry_set_ino64(struct archive_entry *entry, la_int64_t ino) { entry->stat_valid = 0; entry->ae_set |= AE_SET_INO; @@ -1209,7 +1209,7 @@ archive_entry_set_rdevminor(struct archi } void -archive_entry_set_size(struct archive_entry *entry, int64_t s) +archive_entry_set_size(struct archive_entry *entry, la_int64_t s) { entry->stat_valid = 0; entry->ae_stat.aest_size = s; @@ -1306,7 +1306,7 @@ _archive_entry_copy_symlink_l(struct arc } void -archive_entry_set_uid(struct archive_entry *entry, int64_t u) +archive_entry_set_uid(struct archive_entry *entry, la_int64_t u) { entry->stat_valid = 0; entry->ae_stat.aest_uid = u; Modified: vendor/libarchive/dist/libarchive/archive_entry.h ============================================================================== --- vendor/libarchive/dist/libarchive/archive_entry.h Thu Mar 2 21:04:23 2017 (r314566) +++ vendor/libarchive/dist/libarchive/archive_entry.h Thu Mar 2 21:13:25 2017 (r314567) @@ -30,7 +30,7 @@ #define ARCHIVE_ENTRY_H_INCLUDED /* Note: Compiler will complain if this does not match archive.h! */ -#define ARCHIVE_VERSION_NUMBER 3003001 +#define ARCHIVE_VERSION_NUMBER 3003002 /* * Note: archive_entry.h is for use outside of libarchive; the Modified: vendor/libarchive/dist/libarchive/archive_entry_acl.3 ============================================================================== --- vendor/libarchive/dist/libarchive/archive_entry_acl.3 Thu Mar 2 21:04:23 2017 (r314566) +++ vendor/libarchive/dist/libarchive/archive_entry_acl.3 Thu Mar 2 21:13:25 2017 (r314567) @@ -32,7 +32,7 @@ .Nm archive_entry_acl_clear , .Nm archive_entry_acl_count , .Nm archive_entry_acl_from_text , -.Nm archive_entry_acl_from_text_w, +.Nm archive_entry_acl_from_text_w , .Nm archive_entry_acl_next , .Nm archive_entry_acl_next_w , .Nm archive_entry_acl_reset , Modified: vendor/libarchive/dist/libarchive/archive_entry_paths.3 ============================================================================== --- vendor/libarchive/dist/libarchive/archive_entry_paths.3 Thu Mar 2 21:04:23 2017 (r314566) +++ vendor/libarchive/dist/libarchive/archive_entry_paths.3 Thu Mar 2 21:13:25 2017 (r314567) @@ -31,25 +31,25 @@ .Nm archive_entry_set_hardlink , .Nm archive_entry_copy_hardlink , .Nm archive_entry_copy_hardlink_w , -.Nm archve_entry_update_hardlink_utf8 , +.Nm archive_entry_update_hardlink_utf8 , .Nm archive_entry_set_link , .Nm archive_entry_copy_link , .Nm archive_entry_copy_link_w , -.Nm archve_entry_update_link_utf8 , +.Nm archive_entry_update_link_utf8 , .Nm archive_entry_pathname , .Nm archive_entry_pathname_w , .Nm archive_entry_set_pathname , .Nm archive_entry_copy_pathname , .Nm archive_entry_copy_pathname_w , -.Nm archve_entry_update_pathname_utf8 , +.Nm archive_entry_update_pathname_utf8 , .Nm archive_entry_sourcepath , .Nm archive_entry_copy_sourcepath , -.Nm archive_entry_symlink, -.Nm archive_entry_symlink_w, +.Nm archive_entry_symlink , +.Nm archive_entry_symlink_w , .Nm archive_entry_set_symlink , .Nm archive_entry_copy_symlink , .Nm archive_entry_copy_symlink_w , -.Nm archve_entry_update_symlink_utf8 +.Nm archive_entry_update_symlink_utf8 .Nd functions for manipulating path names in archive entry descriptions .Sh LIBRARY Streaming Archive Library (libarchive, -larchive) Modified: vendor/libarchive/dist/libarchive/archive_entry_perms.3 ============================================================================== --- vendor/libarchive/dist/libarchive/archive_entry_perms.3 Thu Mar 2 21:04:23 2017 (r314566) +++ vendor/libarchive/dist/libarchive/archive_entry_perms.3 Thu Mar 2 21:13:25 2017 (r314567) @@ -34,8 +34,8 @@ .Nm archive_entry_perm , .Nm archive_entry_set_perm , .Nm archive_entry_strmode , -.Nm archive_entry_uname -.Nm archive_entry_uname_w +.Nm archive_entry_uname , +.Nm archive_entry_uname_w , .Nm archive_entry_set_uname , .Nm archive_entry_copy_uname , .Nm archive_entry_copy_uname_w , Modified: vendor/libarchive/dist/libarchive/archive_platform.h ============================================================================== --- vendor/libarchive/dist/libarchive/archive_platform.h Thu Mar 2 21:04:23 2017 (r314566) +++ vendor/libarchive/dist/libarchive/archive_platform.h Thu Mar 2 21:13:25 2017 (r314567) @@ -148,23 +148,31 @@ * POSIX.1e draft functions used in archive_read_extract.c. */ #if HAVE_SYS_ACL_H && HAVE_ACL_CREATE_ENTRY && HAVE_ACL_INIT && HAVE_ACL_SET_FILE -#if HAVE_ACL_USER +#if HAVE_DECL_ACL_USER #define HAVE_POSIX_ACL 1 -#elif HAVE_ACL_TYPE_EXTENDED +#elif HAVE_DECL_ACL_TYPE_EXTENDED && HAVE_MEMBERSHIP_H #define HAVE_DARWIN_ACL 1 #endif +#if HAVE_DECL_ACL_TYPE_NFS4 +#define HAVE_FREEBSD_NFS4_ACL 1 +#endif #endif /* - * If this platform has , acl_get(), facl_get(), acl_set(), + * If this platform has , acl(), facl() and ACLENT_T * facl_set() and types aclent_t and ace_t it uses Solaris-style ACL functions */ -#if HAVE_SYS_ACL_H && HAVE_ACL_GET && HAVE_FACL_GET && HAVE_ACL_SET && HAVE_FACL_SET && HAVE_ACLENT_T && HAVE_ACE_T +#if HAVE_SYS_ACL_H && HAVE_ACL && HAVE_FACL && HAVE_ACLENT_T && \ + HAVE_DECL_GETACL && HAVE_DECL_GETACLCNT && HAVE_DECL_SETACL #define HAVE_SUN_ACL 1 +#if HAVE_ACE_T && HAVE_DECL_ACE_GETACL && HAVE_DECL_ACE_GETACLCNT && \ + HAVE_DECL_ACE_SETACL +#define HAVE_SUN_NFS4_ACL 1 +#endif #endif /* Define if platform supports NFSv4 ACLs */ -#if (HAVE_POSIX_ACL && HAVE_ACL_TYPE_NFS4) || HAVE_SUN_ACL || HAVE_DARWIN_ACL +#if HAVE_FREEBSD_NFS4_ACL || HAVE_SUN_NFS4_ACL || HAVE_DARWIN_ACL #define HAVE_NFS4_ACL 1 #endif Modified: vendor/libarchive/dist/libarchive/archive_read_disk.3 ============================================================================== --- vendor/libarchive/dist/libarchive/archive_read_disk.3 Thu Mar 2 21:04:23 2017 (r314566) +++ vendor/libarchive/dist/libarchive/archive_read_disk.3 Thu Mar 2 21:13:25 2017 (r314567) @@ -37,10 +37,7 @@ .Nm archive_read_disk_uname , .Nm archive_read_disk_set_uname_lookup , .Nm archive_read_disk_set_gname_lookup , -.Nm archive_read_disk_set_standard_lookup , -.Nm archive_read_close , -.Nm archive_read_finish , -.Nm archive_read_free +.Nm archive_read_disk_set_standard_lookup .Nd functions for reading objects from disk .Sh LIBRARY Streaming Archive Library (libarchive, -larchive) @@ -81,12 +78,6 @@ Streaming Archive Library (libarchive, - .Fa "int fd" .Fa "const struct stat *" .Fc -.Ft int -.Fn archive_read_close "struct archive *" -.Ft int -.Fn archive_read_finish "struct archive *" -.Ft int -.Fn archive_read_free "struct archive *" .Sh DESCRIPTION These functions provide an API for reading information about objects on disk. @@ -181,17 +172,6 @@ using the currently registered lookup fu This affects the file ownership fields and ACL values in the .Tn struct archive_entry object. -.It Fn archive_read_close -Does nothing for -.Tn archive_read_disk -handles. -.It Fn archive_read_finish -This is a deprecated synonym for -.Fn archive_read_free . -.It Fn archive_read_free -Invokes -.Fn archive_read_close -if it was not invoked manually, then releases all resources. .El More information about the .Va struct archive Modified: vendor/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c ============================================================================== --- vendor/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c Thu Mar 2 21:04:23 2017 (r314566) +++ vendor/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c Thu Mar 2 21:13:25 2017 (r314567) @@ -124,11 +124,9 @@ __FBSDID("$FreeBSD: head/lib/libarchive/ #endif /* NFSv4 platform ACL type */ -#if HAVE_SUN_ACL -#define ARCHIVE_PLATFORM_ACL_TYPE_NFS4 ACE_T -#elif HAVE_DARWIN_ACL +#if HAVE_DARWIN_ACL #define ARCHIVE_PLATFORM_ACL_TYPE_NFS4 ACL_TYPE_EXTENDED -#elif HAVE_ACL_TYPE_NFS4 +#elif HAVE_FREEBSD_NFS4_ACL #define ARCHIVE_PLATFORM_ACL_TYPE_NFS4 ACL_TYPE_NFS4 #endif @@ -435,14 +433,71 @@ static void add_trivial_nfs4_acl(struct #if HAVE_SUN_ACL static int -sun_acl_is_trivial(acl_t *, mode_t, int *trivialp); +sun_acl_is_trivial(void *, int, mode_t, int, int, int *); + +static void * +sunacl_get(int cmd, int *aclcnt, int fd, const char *path) +{ + int cnt, cntcmd; + size_t size; + void *aclp; + + if (cmd == GETACL) { + cntcmd = GETACLCNT; + size = sizeof(aclent_t); + } +#if HAVE_SUN_NFS4_ACL + else if (cmd == ACE_GETACL) { + cntcmd = ACE_GETACLCNT; + size = sizeof(ace_t); + } #endif + else { + errno = EINVAL; + *aclcnt = -1; + return (NULL); + } + + aclp = NULL; + cnt = -2; + + while (cnt == -2 || (cnt == -1 && errno == ENOSPC)) { + if (path != NULL) + cnt = acl(path, cntcmd, 0, NULL); + else + cnt = facl(fd, cntcmd, 0, NULL); + + if (cnt > 0) { + if (aclp == NULL) + aclp = malloc(cnt * size); + else + aclp = realloc(NULL, cnt * size); + if (aclp != NULL) { + if (path != NULL) + cnt = acl(path, cmd, cnt, aclp); + else + cnt = facl(fd, cmd, cnt, aclp); + } + } else { + if (aclp != NULL) { + free(aclp); + aclp = NULL; + } + break; + } + } + + *aclcnt = cnt; + return (aclp); +} +#endif /* HAVE_SUN_ACL */ #if HAVE_POSIX_ACL || HAVE_NFS4_ACL static int translate_acl(struct archive_read_disk *a, struct archive_entry *entry, #if HAVE_SUN_ACL - acl_t *acl, + void *aclp, + int aclcnt, #else acl_t acl, #endif @@ -454,7 +509,8 @@ setup_acls(struct archive_read_disk *a, { const char *accpath; #if HAVE_SUN_ACL - acl_t *acl; + void *aclp; + int aclcnt; #else acl_t acl; #endif @@ -491,14 +547,17 @@ setup_acls(struct archive_read_disk *a, archive_entry_acl_clear(entry); +#if HAVE_SUN_ACL + aclp = NULL; +#else acl = NULL; +#endif #if HAVE_NFS4_ACL /* Try NFSv4 ACL first. */ if (*fd >= 0) #if HAVE_SUN_ACL - /* Solaris reads both POSIX.1e and NFSv4 ACL here */ - facl_get(*fd, 0, &acl); + aclp = sunacl_get(ACE_GETACL, &aclcnt, *fd, NULL); #elif HAVE_ACL_GET_FD_NP acl = acl_get_fd_np(*fd, ARCHIVE_PLATFORM_ACL_TYPE_NFS4); #else @@ -512,47 +571,62 @@ setup_acls(struct archive_read_disk *a, && (archive_entry_filetype(entry) == AE_IFLNK)) /* We can't get the ACL of a symlink, so we assume it can't have one. */ +#if HAVE_SUN_ACL + aclp = NULL; +#else acl = NULL; #endif +#endif /* !HAVE_ACL_GET_LINK_NP */ else #if HAVE_SUN_ACL /* Solaris reads both POSIX.1e and NFSv4 ACLs here */ - acl_get(accpath, 0, &acl); + aclp = sunacl_get(ACE_GETACL, &aclcnt, 0, accpath); #else acl = acl_get_file(accpath, ARCHIVE_PLATFORM_ACL_TYPE_NFS4); #endif -#if HAVE_ACL_IS_TRIVIAL_NP || HAVE_SUN_ACL /* Ignore "trivial" ACLs that just mirror the file mode. */ - if (acl != NULL) { #if HAVE_SUN_ACL - if (sun_acl_is_trivial(acl, archive_entry_mode(entry), - &r) == 0 && r == 1) + if (aclp != NULL && sun_acl_is_trivial(aclp, aclcnt, + archive_entry_mode(entry), 1, S_ISDIR(archive_entry_mode(entry)), + &r) == 0 && r == 1) { + free(aclp); + aclp = NULL; + return (ARCHIVE_OK); + } #elif HAVE_ACL_IS_TRIVIAL_NP - if (acl_is_trivial_np(acl, &r) == 0 && r == 1) -#endif - { - acl_free(acl); - acl = NULL; - /* - * Simultaneous NFSv4 and POSIX.1e ACLs for the same - * entry are not allowed, so we should return here - */ - return (ARCHIVE_OK); - } + if (acl != NULL && acl_is_trivial_np(acl, &r) == 0 && r == 1) { + acl_free(acl); + acl = NULL; + return (ARCHIVE_OK); } -#endif /* HAVE_ACL_IS_TRIVIAL_NP || HAVE_SUN_ACL */ - if (acl != NULL) { - r = translate_acl(a, entry, acl, ARCHIVE_ENTRY_ACL_TYPE_NFS4); +#endif + +#if HAVE_SUN_ACL + if (aclp != NULL) +#else + if (acl != NULL) +#endif + { + r = translate_acl(a, entry, +#if HAVE_SUN_ACL + aclp, aclcnt, +#else + acl, +#endif + ARCHIVE_ENTRY_ACL_TYPE_NFS4); +#if HAVE_SUN_ACL + free(aclp); + aclp = NULL; +#else acl_free(acl); + acl = NULL; +#endif + if (r != ARCHIVE_OK) { archive_set_error(&a->archive, errno, - "Couldn't translate " -#if !HAVE_SUN_ACL - "NFSv4 " -#endif - "ACLs"); + "Couldn't translate NFSv4 ACLs"); } #if HAVE_DARWIN_ACL /* @@ -569,12 +643,16 @@ setup_acls(struct archive_read_disk *a, } #endif /* HAVE_NFS4_ACL */ -#if HAVE_POSIX_ACL - /* This code path is skipped on MacOS and Solaris */ +#if HAVE_POSIX_ACL || HAVE_SUN_ACL + /* This code path is skipped on MacOS */ /* Retrieve access ACL from file. */ if (*fd >= 0) +#if HAVE_SUN_ACL + aclp = sunacl_get(GETACL, &aclcnt, *fd, NULL); +#else acl = acl_get_fd(*fd); +#endif #if HAVE_ACL_GET_LINK_NP else if (!a->follow_symlinks) acl = acl_get_link_np(accpath, ACL_TYPE_ACCESS); @@ -583,25 +661,56 @@ setup_acls(struct archive_read_disk *a, && (archive_entry_filetype(entry) == AE_IFLNK)) /* We can't get the ACL of a symlink, so we assume it can't have one. */ +#if HAVE_SUN_ACL + aclp = NULL; +#else acl = NULL; #endif +#endif /* !HAVE_ACL_GET_LINK_NP */ else +#if HAVE_SUN_ACL + aclp = sunacl_get(GETACL, &aclcnt, 0, accpath); +#else acl = acl_get_file(accpath, ACL_TYPE_ACCESS); +#endif + -#if HAVE_ACL_IS_TRIVIAL_NP /* Ignore "trivial" ACLs that just mirror the file mode. */ - if (acl != NULL && acl_is_trivial_np(acl, &r) == 0) { - if (r) { - acl_free(acl); - acl = NULL; - } +#if HAVE_SUN_ACL + if (aclp != NULL && sun_acl_is_trivial(aclp, aclcnt, + archive_entry_mode(entry), 0, S_ISDIR(archive_entry_mode(entry)), + &r) == 0 && r == 1) { + free(aclp); + aclp = NULL; + } +#elif HAVE_ACL_IS_TRIVIAL_NP + if (acl != NULL && acl_is_trivial_np(acl, &r) == 0 && r == 1) { + acl_free(acl); + acl = NULL; } #endif - if (acl != NULL) { - r = translate_acl(a, entry, acl, ARCHIVE_ENTRY_ACL_TYPE_ACCESS); +#if HAVE_SUN_ACL + if (aclp != NULL) +#else + if (acl != NULL) +#endif + { + r = translate_acl(a, entry, +#if HAVE_SUN_ACL + aclp, aclcnt, +#else + acl, +#endif + ARCHIVE_ENTRY_ACL_TYPE_ACCESS); +#if HAVE_SUN_ACL + free(aclp); + aclp = NULL; +#else acl_free(acl); acl = NULL; +#endif + if (r != ARCHIVE_OK) { archive_set_error(&a->archive, errno, "Couldn't translate access ACLs"); @@ -609,6 +718,7 @@ setup_acls(struct archive_read_disk *a, } } +#if !HAVE_SUN_ACL /* Only directories can have default ACLs. */ if (S_ISDIR(archive_entry_mode(entry))) { #if HAVE_ACL_GET_FD_NP @@ -628,7 +738,8 @@ setup_acls(struct archive_read_disk *a, } } } -#endif /* HAVE_POSIX_ACL */ +#endif /* !HAVE_SUN_ACL */ +#endif /* HAVE_POSIX_ACL || HAVE_SUN_ACL */ return (ARCHIVE_OK); } @@ -674,12 +785,14 @@ static const struct { {ARCHIVE_ENTRY_ACL_READ_ACL, ACL_READ_SECURITY}, {ARCHIVE_ENTRY_ACL_WRITE_ACL, ACL_WRITE_SECURITY}, {ARCHIVE_ENTRY_ACL_WRITE_OWNER, ACL_CHANGE_OWNER}, +#if HAVE_DECL_ACL_SYNCHRONIZE {ARCHIVE_ENTRY_ACL_SYNCHRONIZE, ACL_SYNCHRONIZE} +#endif #else /* POSIX.1e ACL permissions */ {ARCHIVE_ENTRY_ACL_EXECUTE, ACL_EXECUTE}, {ARCHIVE_ENTRY_ACL_WRITE, ACL_WRITE}, {ARCHIVE_ENTRY_ACL_READ, ACL_READ}, -#if HAVE_ACL_TYPE_NFS4 /* FreeBSD NFSv4 ACL permissions */ +#if HAVE_FREEBSD_NFS4_ACL /* FreeBSD NFSv4 ACL permissions */ {ARCHIVE_ENTRY_ACL_READ_DATA, ACL_READ_DATA}, {ARCHIVE_ENTRY_ACL_LIST_DIRECTORY, ACL_LIST_DIRECTORY}, {ARCHIVE_ENTRY_ACL_WRITE_DATA, ACL_WRITE_DATA}, @@ -708,14 +821,16 @@ static const struct { const int archive_inherit; const int platform_inherit; } acl_inherit_map[] = { -#if HAVE_SUN_ACL /* Solaris ACL inheritance flags */ +#if HAVE_SUN_NFS4_ACL /* Solaris ACL inheritance flags */ {ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT, ACE_FILE_INHERIT_ACE}, {ARCHIVE_ENTRY_ACL_ENTRY_DIRECTORY_INHERIT, ACE_DIRECTORY_INHERIT_ACE}, {ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT, ACE_NO_PROPAGATE_INHERIT_ACE}, {ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACE_INHERIT_ONLY_ACE}, {ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS, ACE_SUCCESSFUL_ACCESS_ACE_FLAG}, {ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS, ACE_FAILED_ACCESS_ACE_FLAG}, +#ifdef ACE_INHERITED_ACE {ARCHIVE_ENTRY_ACL_ENTRY_INHERITED, ACE_INHERITED_ACE} +#endif #elif HAVE_DARWIN_ACL /* MacOS NFSv4 inheritance flags */ {ARCHIVE_ENTRY_ACL_ENTRY_INHERITED, ACL_ENTRY_INHERITED}, {ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT, ACL_ENTRY_FILE_INHERIT}, @@ -730,7 +845,7 @@ static const struct { {ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS, ACL_ENTRY_SUCCESSFUL_ACCESS}, {ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS, ACL_ENTRY_FAILED_ACCESS}, {ARCHIVE_ENTRY_ACL_ENTRY_INHERITED, ACL_ENTRY_INHERITED} -#endif /* !HAVE_SUN_ACL && !HAVE_DARWIN_ACL */ +#endif /* !HAVE_SUN_NFS4_ACL && !HAVE_DARWIN_ACL */ }; #endif /* HAVE_NFS4_ACL */ @@ -873,9 +988,11 @@ add_trivial_nfs4_acl(struct archive_entr * This is a FreeBSD acl_is_trivial_np() implementation for Solaris */ static int -sun_acl_is_trivial(acl_t *acl, mode_t mode, int *trivialp) +sun_acl_is_trivial(void *aclp, int aclcnt, mode_t mode, int is_nfs4, + int is_dir, int *trivialp) { int i, p; +#if HAVE_SUN_NFS4_ACL const uint32_t rperm = ACE_READ_DATA; const uint32_t wperm = ACE_WRITE_DATA | ACE_APPEND_DATA; const uint32_t eperm = ACE_EXECUTE; @@ -886,30 +1003,25 @@ sun_acl_is_trivial(acl_t *acl, mode_t mo ace_t *ace; ace_t tace[6]; +#endif - if (acl == NULL || trivialp == NULL) + if (aclp == NULL || trivialp == NULL) return (-1); *trivialp = 0; - /* ACL_IS_TRIVIAL flag must be set for both POSIX.1e and NFSv4 ACLs */ - if ((acl->acl_flags & ACL_IS_TRIVIAL) == 0) - return (0); - /* * POSIX.1e ACLs marked with ACL_IS_TRIVIAL are compatible with * FreeBSD acl_is_trivial_np(). On Solaris they have 4 entries, * including mask. */ - if (acl->acl_type == ACLENT_T) { - if (acl->acl_cnt == 4) + if (!is_nfs4) { + if (aclcnt == 4) *trivialp = 1; return (0); } - if (acl->acl_type != ACE_T || acl->acl_entry_size != sizeof(ace_t)) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Thu Mar 2 22:17:54 2017 Return-Path: Delivered-To: svn-src-all@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 7D760CF6367; Thu, 2 Mar 2017 22:17:54 +0000 (UTC) (envelope-from emaste@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 55943122F; Thu, 2 Mar 2017 22:17:54 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22MHrtx014534; Thu, 2 Mar 2017 22:17:53 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22MHrpX014533; Thu, 2 Mar 2017 22:17:53 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201703022217.v22MHrpX014533@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 2 Mar 2017 22:17:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314568 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 22:17:54 -0000 Author: emaste Date: Thu Mar 2 22:17:53 2017 New Revision: 314568 URL: https://svnweb.freebsd.org/changeset/base/314568 Log: kern_sig.c: ANSIfy and remove archaic register keyword Sponsored by: The FreeBSD Foundation Modified: head/sys/kern/kern_sig.c Modified: head/sys/kern/kern_sig.c ============================================================================== --- head/sys/kern/kern_sig.c Thu Mar 2 21:13:25 2017 (r314567) +++ head/sys/kern/kern_sig.c Thu Mar 2 22:17:53 2017 (r314568) @@ -822,12 +822,10 @@ struct sigaction_args { }; #endif int -sys_sigaction(td, uap) - struct thread *td; - register struct sigaction_args *uap; +sys_sigaction(struct thread *td, struct sigaction_args *uap) { struct sigaction act, oact; - register struct sigaction *actp, *oactp; + struct sigaction *actp, *oactp; int error; actp = (uap->act != NULL) ? &act : NULL; @@ -852,12 +850,10 @@ struct freebsd4_sigaction_args { }; #endif int -freebsd4_sigaction(td, uap) - struct thread *td; - register struct freebsd4_sigaction_args *uap; +freebsd4_sigaction(struct thread *td, struct freebsd4_sigaction_args *uap) { struct sigaction act, oact; - register struct sigaction *actp, *oactp; + struct sigaction *actp, *oactp; int error; @@ -884,13 +880,11 @@ struct osigaction_args { }; #endif int -osigaction(td, uap) - struct thread *td; - register struct osigaction_args *uap; +osigaction(struct thread *td, struct osigaction_args *uap) { struct osigaction sa; struct sigaction nsa, osa; - register struct sigaction *nsap, *osap; + struct sigaction *nsap, *osap; int error; if (uap->signum <= 0 || uap->signum >= ONSIG) @@ -920,9 +914,7 @@ osigaction(td, uap) #if !defined(__i386__) /* Avoid replicating the same stub everywhere */ int -osigreturn(td, uap) - struct thread *td; - struct osigreturn_args *uap; +osigreturn(struct thread *td, struct osigreturn_args *uap) { return (nosys(td, (struct nosys_args *)uap)); @@ -935,8 +927,7 @@ osigreturn(td, uap) * set to ignore signals that are ignored by default. */ void -siginit(p) - struct proc *p; +siginit(struct proc *p) { register int i; struct sigacts *ps; @@ -1109,9 +1100,7 @@ struct sigprocmask_args { }; #endif int -sys_sigprocmask(td, uap) - register struct thread *td; - struct sigprocmask_args *uap; +sys_sigprocmask(struct thread *td, struct sigprocmask_args *uap) { sigset_t set, oset; sigset_t *setp, *osetp; @@ -1139,9 +1128,7 @@ struct osigprocmask_args { }; #endif int -osigprocmask(td, uap) - register struct thread *td; - struct osigprocmask_args *uap; +osigprocmask(struct thread *td, struct osigprocmask_args *uap) { sigset_t set, oset; int error; @@ -1359,9 +1346,7 @@ struct sigpending_args { }; #endif int -sys_sigpending(td, uap) - struct thread *td; - struct sigpending_args *uap; +sys_sigpending(struct thread *td, struct sigpending_args *uap) { struct proc *p = td->td_proc; sigset_t pending; @@ -1380,9 +1365,7 @@ struct osigpending_args { }; #endif int -osigpending(td, uap) - struct thread *td; - struct osigpending_args *uap; +osigpending(struct thread *td, struct osigpending_args *uap) { struct proc *p = td->td_proc; sigset_t pending; @@ -1409,13 +1392,11 @@ struct osigvec_args { #endif /* ARGSUSED */ int -osigvec(td, uap) - struct thread *td; - register struct osigvec_args *uap; +osigvec(struct thread *td, struct osigvec_args *uap) { struct sigvec vec; struct sigaction nsa, osa; - register struct sigaction *nsap, *osap; + struct sigaction *nsap, *osap; int error; if (uap->signum <= 0 || uap->signum >= ONSIG) @@ -1449,9 +1430,7 @@ struct osigblock_args { }; #endif int -osigblock(td, uap) - register struct thread *td; - struct osigblock_args *uap; +osigblock(struct thread *td, struct osigblock_args *uap) { sigset_t set, oset; @@ -1467,9 +1446,7 @@ struct osigsetmask_args { }; #endif int -osigsetmask(td, uap) - struct thread *td; - struct osigsetmask_args *uap; +osigsetmask(struct thread *td, struct osigsetmask_args *uap) { sigset_t set, oset; @@ -1491,9 +1468,7 @@ struct sigsuspend_args { #endif /* ARGSUSED */ int -sys_sigsuspend(td, uap) - struct thread *td; - struct sigsuspend_args *uap; +sys_sigsuspend(struct thread *td, struct sigsuspend_args *uap) { sigset_t mask; int error; @@ -1559,9 +1534,7 @@ struct osigsuspend_args { #endif /* ARGSUSED */ int -osigsuspend(td, uap) - struct thread *td; - struct osigsuspend_args *uap; +osigsuspend(struct thread *td, struct osigsuspend_args *uap) { sigset_t mask; @@ -1579,9 +1552,7 @@ struct osigstack_args { #endif /* ARGSUSED */ int -osigstack(td, uap) - struct thread *td; - register struct osigstack_args *uap; +osigstack(struct thread *td, struct osigstack_args *uap) { struct sigstack nss, oss; int error = 0; @@ -1614,9 +1585,7 @@ struct sigaltstack_args { #endif /* ARGSUSED */ int -sys_sigaltstack(td, uap) - struct thread *td; - register struct sigaltstack_args *uap; +sys_sigaltstack(struct thread *td, struct sigaltstack_args *uap) { stack_t ss, oss; int error; @@ -1799,9 +1768,7 @@ sys_kill(struct thread *td, struct kill_ } int -sys_pdkill(td, uap) - struct thread *td; - struct pdkill_args *uap; +sys_pdkill(struct thread *td, struct pdkill_args *uap) { struct proc *p; cap_rights_t rights; @@ -2986,7 +2953,7 @@ postsig(sig) register int sig; { struct thread *td = curthread; - register struct proc *p = td->td_proc; + struct proc *p = td->td_proc; struct sigacts *ps; sig_t action; ksiginfo_t ksi; @@ -3059,9 +3026,7 @@ postsig(sig) * Kill the current process for stated reason. */ void -killproc(p, why) - struct proc *p; - char *why; +killproc(struct proc *p, char *why) { PROC_LOCK_ASSERT(p, MA_OWNED); @@ -3082,9 +3047,7 @@ killproc(p, why) * does not return. */ void -sigexit(td, sig) - struct thread *td; - int sig; +sigexit(struct thread *td, int sig) { struct proc *p = td->td_proc; @@ -3573,9 +3536,7 @@ struct nosys_args { #endif /* ARGSUSED */ int -nosys(td, args) - struct thread *td; - struct nosys_args *args; +nosys(struct thread *td, struct nosys_args *args) { struct proc *p = td->td_proc; @@ -3590,9 +3551,7 @@ nosys(td, args) * credentials rather than those of the current process. */ void -pgsigio(sigiop, sig, checkctty) - struct sigio **sigiop; - int sig, checkctty; +pgsigio(struct sigio **sigiop, int sig, int checkctty) { ksiginfo_t ksi; struct sigio *sigio; From owner-svn-src-all@freebsd.org Thu Mar 2 22:43:00 2017 Return-Path: Delivered-To: svn-src-all@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 EFD96CF697E; Thu, 2 Mar 2017 22:43:00 +0000 (UTC) (envelope-from gonzo@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 B92211E9E; Thu, 2 Mar 2017 22:43:00 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22MgxOE026124; Thu, 2 Mar 2017 22:42:59 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22MgxIP026122; Thu, 2 Mar 2017 22:42:59 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <201703022242.v22MgxIP026122@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Thu, 2 Mar 2017 22:42:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314569 - in stable/11/sys/modules: bytgpio intelspi X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 22:43:01 -0000 Author: gonzo Date: Thu Mar 2 22:42:59 2017 New Revision: 314569 URL: https://svnweb.freebsd.org/changeset/base/314569 Log: MFC r314535: [intelspi][bytgio] Fix buildworld with MODULES_WITH_WORLD set Add opt_platform.h and opt_acpi.h to the dependencies so modules can be built as a part of buildworld when MODULES_WITH_WORLD is set Reported by: Andre Albsmeier (for 11-stable) Modified: stable/11/sys/modules/bytgpio/Makefile stable/11/sys/modules/intelspi/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/modules/bytgpio/Makefile ============================================================================== --- stable/11/sys/modules/bytgpio/Makefile Thu Mar 2 22:17:53 2017 (r314568) +++ stable/11/sys/modules/bytgpio/Makefile Thu Mar 2 22:42:59 2017 (r314569) @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../dev/gpio KMOD= bytgpio SRCS= bytgpio.c -SRCS+= acpi_if.h device_if.h bus_if.h gpio_if.h +SRCS+= acpi_if.h device_if.h bus_if.h gpio_if.h opt_acpi.h opt_platform.h .include Modified: stable/11/sys/modules/intelspi/Makefile ============================================================================== --- stable/11/sys/modules/intelspi/Makefile Thu Mar 2 22:17:53 2017 (r314568) +++ stable/11/sys/modules/intelspi/Makefile Thu Mar 2 22:42:59 2017 (r314569) @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../dev/intel KMOD= intelspi SRCS= spi.c -SRCS+= acpi_if.h device_if.h bus_if.h spibus_if.h +SRCS+= acpi_if.h device_if.h bus_if.h opt_acpi.h spibus_if.h .include From owner-svn-src-all@freebsd.org Thu Mar 2 22:46:05 2017 Return-Path: Delivered-To: svn-src-all@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 4D2C6CF6A94; Thu, 2 Mar 2017 22:46:05 +0000 (UTC) (envelope-from mm@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 0EE5D10A6; Thu, 2 Mar 2017 22:46:04 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22Mk4Cn026338; Thu, 2 Mar 2017 22:46:04 GMT (envelope-from mm@FreeBSD.org) Received: (from mm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22Mk4Qv026337; Thu, 2 Mar 2017 22:46:04 GMT (envelope-from mm@FreeBSD.org) Message-Id: <201703022246.v22Mk4Qv026337@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mm set sender to mm@FreeBSD.org using -f From: Martin Matuska Date: Thu, 2 Mar 2017 22:46:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314570 - vendor/libarchive/dist/tar/test X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 22:46:05 -0000 Author: mm Date: Thu Mar 2 22:46:03 2017 New Revision: 314570 URL: https://svnweb.freebsd.org/changeset/base/314570 Log: Update vendor/libarchive to git f4b9b3fe89b4acfef5e3a2283d3bc542315ddb57 Fixes for test_options_fflags tar test Modified: vendor/libarchive/dist/tar/test/test_option_fflags.c Modified: vendor/libarchive/dist/tar/test/test_option_fflags.c ============================================================================== --- vendor/libarchive/dist/tar/test/test_option_fflags.c Thu Mar 2 22:42:59 2017 (r314569) +++ vendor/libarchive/dist/tar/test/test_option_fflags.c Thu Mar 2 22:46:03 2017 (r314570) @@ -25,6 +25,31 @@ #include "test.h" __FBSDID("$FreeBSD$"); +static void +clear_fflags(const char *pathname) +{ +#if defined(HAVE_STRUCT_STAT_ST_FLAGS) + chflags(pathname, 0); +#elif (defined(FS_IOC_GETFLAGS) && defined(HAVE_WORKING_FS_IOC_GETFLAGS)) || \ + (defined(EXT2_IOC_GETFLAGS) && defined(HAVE_WORKING_EXT2_IOC_GETFLAGS)) + int fd; + + fd = open(pathname, O_RDONLY | O_NONBLOCK); + if (fd < 0) + return; + ioctl(fd, +#ifdef FS_IOC_GETFLAGS + FS_IOC_GETFLAGS, +#else + EXT2_IOC_GETFLAGS, +#endif + 0); +#else + (void)pathname; /* UNUSED */ +#endif + return; +} + DEFINE_TEST(test_option_fflags) { int r; @@ -40,6 +65,9 @@ DEFINE_TEST(test_option_fflags) /* Set nodump flag on the file */ assertSetNodump("f"); + /* FreeBSD ZFS workaround: ZFS sets uarch on all touched files and dirs */ + chmod("f", 0644); + /* Archive it with fflags */ r = systemf("%s -c --fflags -f fflags.tar f >fflags.out 2>fflags.err", testprog); assertEqualInt(r, 0); @@ -50,24 +78,28 @@ DEFINE_TEST(test_option_fflags) /* Extract fflags with fflags */ assertMakeDir("fflags_fflags", 0755); + clear_fflags("fflags_fflags"); r = systemf("%s -x -C fflags_fflags --no-same-permissions --fflags -f fflags.tar >fflags_fflags.out 2>fflags_fflags.err", testprog); assertEqualInt(r, 0); assertEqualFflags("f", "fflags_fflags/f"); /* Extract fflags without fflags */ assertMakeDir("fflags_nofflags", 0755); + clear_fflags("fflags_nofflags"); r = systemf("%s -x -C fflags_nofflags -p --no-fflags -f fflags.tar >fflags_nofflags.out 2>fflags_nofflags.err", testprog); assertEqualInt(r, 0); assertUnequalFflags("f", "fflags_nofflags/f"); /* Extract nofflags with fflags */ assertMakeDir("nofflags_fflags", 0755); + clear_fflags("nofflags_fflags"); r = systemf("%s -x -C nofflags_fflags --no-same-permissions --fflags -f nofflags.tar >nofflags_fflags.out 2>nofflags_fflags.err", testprog); assertEqualInt(r, 0); assertUnequalFflags("f", "nofflags_fflags/f"); /* Extract nofflags with nofflags */ assertMakeDir("nofflags_nofflags", 0755); + clear_fflags("nofflags_nofflags"); r = systemf("%s -x -C nofflags_nofflags -p --no-fflags -f nofflags.tar >nofflags_nofflags.out 2>nofflags_nofflags.err", testprog); assertEqualInt(r, 0); assertUnequalFflags("f", "nofflags_nofflags/f"); From owner-svn-src-all@freebsd.org Thu Mar 2 22:59:38 2017 Return-Path: Delivered-To: svn-src-all@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 2858CCF6E81; Thu, 2 Mar 2017 22:59:38 +0000 (UTC) (envelope-from mm@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 D2CB3179B; Thu, 2 Mar 2017 22:59:37 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22Mxb3W030813; Thu, 2 Mar 2017 22:59:37 GMT (envelope-from mm@FreeBSD.org) Received: (from mm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22MxaEB030802; Thu, 2 Mar 2017 22:59:36 GMT (envelope-from mm@FreeBSD.org) Message-Id: <201703022259.v22MxaEB030802@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mm set sender to mm@FreeBSD.org using -f From: Martin Matuska Date: Thu, 2 Mar 2017 22:59:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314571 - in head: contrib/libarchive contrib/libarchive/cat/test contrib/libarchive/cpio contrib/libarchive/cpio/test contrib/libarchive/libarchive contrib/libarchive/libarchive/test c... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 22:59:38 -0000 Author: mm Date: Thu Mar 2 22:59:35 2017 New Revision: 314571 URL: https://svnweb.freebsd.org/changeset/base/314571 Log: MFV r314565,314567,314570: Update libarchive to version 3.3.1 (and sync with latest vendor dist) Notable vendor changes: PR #501: improvements in ACL path handling PR #724: fix hang when reading malformed cpio files PR #864: fix out of bounds read with malformed GNU tar archives Documentation, style, test suite improvements and typo fixes. New options to bsdtar that enable or disable reading and/or writing of: Access Control Lists (--acls, --no-acls) Extended file flags (--fflags, --no-fflags) Extended attributes (--xattrs, --no-xattrs) Mac OS X metadata (Mac OS X only) (--mac-metadata, --no-mac-metadata) MFC after: 2 weeks Added: head/contrib/libarchive/tar/test/test_option_acls.c - copied unchanged from r314567, vendor/libarchive/dist/tar/test/test_option_acls.c head/contrib/libarchive/tar/test/test_option_fflags.c - copied, changed from r314567, vendor/libarchive/dist/tar/test/test_option_fflags.c head/contrib/libarchive/test_utils/test_common.h - copied, changed from r314565, vendor/libarchive/dist/test_utils/test_common.h head/contrib/libarchive/test_utils/test_main.c - copied, changed from r314565, vendor/libarchive/dist/test_utils/test_main.c Deleted: head/contrib/libarchive/cat/test/main.c head/contrib/libarchive/cpio/test/main.c head/contrib/libarchive/tar/test/main.c Modified: head/contrib/libarchive/NEWS head/contrib/libarchive/cat/test/test.h head/contrib/libarchive/cat/test/test_version.c head/contrib/libarchive/cpio/cpio.c head/contrib/libarchive/cpio/test/test.h head/contrib/libarchive/cpio/test/test_option_version.c head/contrib/libarchive/libarchive/archive.h head/contrib/libarchive/libarchive/archive_check_magic.c head/contrib/libarchive/libarchive/archive_digest_private.h head/contrib/libarchive/libarchive/archive_entry.c head/contrib/libarchive/libarchive/archive_entry.h head/contrib/libarchive/libarchive/archive_entry_acl.3 head/contrib/libarchive/libarchive/archive_entry_paths.3 head/contrib/libarchive/libarchive/archive_entry_perms.3 head/contrib/libarchive/libarchive/archive_hmac.c head/contrib/libarchive/libarchive/archive_platform.h head/contrib/libarchive/libarchive/archive_read_disk.3 head/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c head/contrib/libarchive/libarchive/archive_read_disk_posix.c head/contrib/libarchive/libarchive/archive_read_disk_private.h head/contrib/libarchive/libarchive/archive_read_format.3 head/contrib/libarchive/libarchive/archive_read_open.3 head/contrib/libarchive/libarchive/archive_read_support_format_tar.c head/contrib/libarchive/libarchive/archive_read_support_format_warc.c head/contrib/libarchive/libarchive/archive_write_data.3 head/contrib/libarchive/libarchive/archive_write_disk.3 head/contrib/libarchive/libarchive/archive_write_disk_acl.c head/contrib/libarchive/libarchive/archive_write_disk_posix.c head/contrib/libarchive/libarchive/archive_write_finish_entry.3 head/contrib/libarchive/libarchive/archive_write_format.3 head/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c head/contrib/libarchive/libarchive/test/test.h head/contrib/libarchive/libarchive/test/test_acl_nfs4.c head/contrib/libarchive/libarchive/test/test_acl_pax.c head/contrib/libarchive/libarchive/test/test_acl_platform_nfs4.c head/contrib/libarchive/libarchive/test/test_acl_platform_posix1e.c head/contrib/libarchive/libarchive/test/test_acl_posix1e.c head/contrib/libarchive/libarchive/test/test_acl_text.c head/contrib/libarchive/libarchive/test/test_archive_api_feature.c head/contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.c head/contrib/libarchive/libarchive/test/test_compat_star_acl.c head/contrib/libarchive/libarchive/test/test_fuzz.c head/contrib/libarchive/libarchive/test/test_read_disk.c head/contrib/libarchive/libarchive/test/test_read_disk_directory_traversals.c head/contrib/libarchive/tar/bsdtar.1 head/contrib/libarchive/tar/bsdtar.c head/contrib/libarchive/tar/bsdtar.h head/contrib/libarchive/tar/cmdline.c head/contrib/libarchive/tar/read.c head/contrib/libarchive/tar/test/test.h head/contrib/libarchive/tar/test/test_option_nodump.c head/contrib/libarchive/tar/test/test_version.c head/contrib/libarchive/tar/util.c head/contrib/libarchive/tar/write.c head/lib/libarchive/config_freebsd.h head/lib/libarchive/tests/Makefile head/usr.bin/bsdcat/Makefile head/usr.bin/bsdcat/tests/Makefile head/usr.bin/cpio/Makefile head/usr.bin/cpio/tests/Makefile head/usr.bin/tar/Makefile head/usr.bin/tar/tests/Makefile Directory Properties: head/contrib/libarchive/ (props changed) Modified: head/contrib/libarchive/NEWS ============================================================================== --- head/contrib/libarchive/NEWS Thu Mar 2 22:46:03 2017 (r314570) +++ head/contrib/libarchive/NEWS Thu Mar 2 22:59:35 2017 (r314571) @@ -1,3 +1,9 @@ +Feb 26, 2017: libarchive 3.3.1 released + Security & Feature release + +Feb 19, 2017: libarchive 3.3.0 released + Security & Feature release + Jan 29, 2017: Limited NFSv4 ACL support for Mac OS (Darwin) Jan 10, 2017: POSIX.1e and NFSv4 ACL support for Solaris and derivates @@ -5,6 +11,8 @@ Jan 10, 2017: POSIX.1e and NFSv4 ACL sup Dec 27, 2016: NFSv4 ACL read and write support for pax Deprecated functions: archive_entry_acl_text(), archive_entry_acl_text_w() +Nov, 2016: libarchive is now being tested by the OSS-Fuzz project + Oct 26, 2016: Remove liblzmadec support Oct 23, 2016: libarchive 3.2.2 released Modified: head/contrib/libarchive/cat/test/test.h ============================================================================== --- head/contrib/libarchive/cat/test/test.h Thu Mar 2 22:46:03 2017 (r314570) +++ head/contrib/libarchive/cat/test/test.h Thu Mar 2 22:59:35 2017 (r314571) @@ -27,328 +27,14 @@ /* Every test program should #include "test.h" as the first thing. */ -/* - * The goal of this file (and the matching test.c) is to - * simplify the very repetitive test-*.c test programs. - */ -#if defined(HAVE_CONFIG_H) -/* Most POSIX platforms use the 'configure' script to build config.h */ -#include "config.h" -#elif defined(__FreeBSD__) -/* Building as part of FreeBSD system requires a pre-built config.h. */ -#include "config_freebsd.h" -#elif defined(_WIN32) && !defined(__CYGWIN__) -/* Win32 can't run the 'configure' script. */ -#include "config_windows.h" -#else -/* Warn if the library hasn't been (automatically or manually) configured. */ -#error Oops: No config.h and no pre-built configuration in test.h. -#endif +#define KNOWNREF "test_expand.Z.uu" +#define ENVBASE "BSDCAT" /* Prefix for environment variables. */ +#define PROGRAM "bsdcat" /* Name of program being tested. */ +#define PROGRAM_ALIAS "cat" /* Generic alias for program */ +#undef LIBRARY /* Not testing a library. */ +#undef EXTRA_DUMP /* How to dump extra data */ +#undef EXTRA_ERRNO /* How to dump errno */ +/* How to generate extra version info. */ +#define EXTRA_VERSION (systemf("%s --version", testprog) ? "" : "") -#include /* Windows requires this before sys/stat.h */ -#include - -#if HAVE_DIRENT_H -#include -#endif -#ifdef HAVE_DIRECT_H -#include -#define dirent direct -#endif -#include -#include -#ifdef HAVE_IO_H -#include -#endif -#ifdef HAVE_STDINT_H -#include -#endif -#include -#include -#include -#include -#include -#ifdef HAVE_UNISTD_H -#include -#endif -#include -#ifdef HAVE_WINDOWS_H -#include -#endif - -/* - * System-specific tweaks. We really want to minimize these - * as much as possible, since they make it harder to understand - * the mainline code. - */ - -/* Windows (including Visual Studio and MinGW but not Cygwin) */ -#if defined(_WIN32) && !defined(__CYGWIN__) -#if !defined(__BORLANDC__) -#undef chdir -#define chdir _chdir -#define strdup _strdup -#endif -#endif - -/* Visual Studio */ -#if defined(_MSC_VER) && _MSC_VER < 1900 -#define snprintf sprintf_s -#endif - -#if defined(__BORLANDC__) -#pragma warn -8068 /* Constant out of range in comparison. */ -#endif - -/* Haiku OS and QNX */ -#if defined(__HAIKU__) || defined(__QNXNTO__) -/* Haiku and QNX have typedefs in stdint.h (needed for int64_t) */ -#include -#endif - -/* Get a real definition for __FBSDID if we can */ -#if HAVE_SYS_CDEFS_H -#include -#endif - -/* If not, define it so as to avoid dangling semicolons. */ -#ifndef __FBSDID -#define __FBSDID(a) struct _undefined_hack -#endif - -#ifndef O_BINARY -#define O_BINARY 0 -#endif - -/* - * Redefine DEFINE_TEST for use in defining the test functions. - */ -#undef DEFINE_TEST -#define DEFINE_TEST(name) void name(void); void name(void) - -/* An implementation of the standard assert() macro */ -#define assert(e) assertion_assert(__FILE__, __LINE__, (e), #e, NULL) -/* chdir() and error if it fails */ -#define assertChdir(path) \ - assertion_chdir(__FILE__, __LINE__, path) -/* Assert two integers are the same. Reports value of each one if not. */ -#define assertEqualInt(v1,v2) \ - assertion_equal_int(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL) -/* Assert two strings are the same. Reports value of each one if not. */ -#define assertEqualString(v1,v2) \ - assertion_equal_string(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL, 0) -#define assertEqualUTF8String(v1,v2) \ - assertion_equal_string(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL, 1) -/* As above, but v1 and v2 are wchar_t * */ -#define assertEqualWString(v1,v2) \ - assertion_equal_wstring(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL) -/* As above, but raw blocks of bytes. */ -#define assertEqualMem(v1, v2, l) \ - assertion_equal_mem(__FILE__, __LINE__, (v1), #v1, (v2), #v2, (l), #l, NULL) -/* Assert that memory is full of a specified byte */ -#define assertMemoryFilledWith(v1, l, b) \ - assertion_memory_filled_with(__FILE__, __LINE__, (v1), #v1, (l), #l, (b), #b, NULL) -/* Assert two files are the same. */ -#define assertEqualFile(f1, f2) \ - assertion_equal_file(__FILE__, __LINE__, (f1), (f2)) -/* Assert that a file is empty. */ -#define assertEmptyFile(pathname) \ - assertion_empty_file(__FILE__, __LINE__, (pathname)) -/* Assert that a file is not empty. */ -#define assertNonEmptyFile(pathname) \ - assertion_non_empty_file(__FILE__, __LINE__, (pathname)) -#define assertFileAtime(pathname, sec, nsec) \ - assertion_file_atime(__FILE__, __LINE__, pathname, sec, nsec) -#define assertFileAtimeRecent(pathname) \ - assertion_file_atime_recent(__FILE__, __LINE__, pathname) -#define assertFileBirthtime(pathname, sec, nsec) \ - assertion_file_birthtime(__FILE__, __LINE__, pathname, sec, nsec) -#define assertFileBirthtimeRecent(pathname) \ - assertion_file_birthtime_recent(__FILE__, __LINE__, pathname) -/* Assert that a file exists; supports printf-style arguments. */ -#define assertFileExists(pathname) \ - assertion_file_exists(__FILE__, __LINE__, pathname) -/* Assert that a file exists. */ -#define assertFileNotExists(pathname) \ - assertion_file_not_exists(__FILE__, __LINE__, pathname) -/* Assert that file contents match a string. */ -#define assertFileContents(data, data_size, pathname) \ - assertion_file_contents(__FILE__, __LINE__, data, data_size, pathname) -/* Verify that a file does not contain invalid strings */ -#define assertFileContainsNoInvalidStrings(pathname, strings) \ - assertion_file_contains_no_invalid_strings(__FILE__, __LINE__, pathname, strings) -#define assertFileMtime(pathname, sec, nsec) \ - assertion_file_mtime(__FILE__, __LINE__, pathname, sec, nsec) -#define assertFileMtimeRecent(pathname) \ - assertion_file_mtime_recent(__FILE__, __LINE__, pathname) -#define assertFileNLinks(pathname, nlinks) \ - assertion_file_nlinks(__FILE__, __LINE__, pathname, nlinks) -#define assertFileSize(pathname, size) \ - assertion_file_size(__FILE__, __LINE__, pathname, size) -#define assertFileMode(pathname, mode) \ - assertion_file_mode(__FILE__, __LINE__, pathname, mode) -#define assertTextFileContents(text, pathname) \ - assertion_text_file_contents(__FILE__, __LINE__, text, pathname) -#define assertFileContainsLinesAnyOrder(pathname, lines) \ - assertion_file_contains_lines_any_order(__FILE__, __LINE__, pathname, lines) -#define assertIsDir(pathname, mode) \ - assertion_is_dir(__FILE__, __LINE__, pathname, mode) -#define assertIsHardlink(path1, path2) \ - assertion_is_hardlink(__FILE__, __LINE__, path1, path2) -#define assertIsNotHardlink(path1, path2) \ - assertion_is_not_hardlink(__FILE__, __LINE__, path1, path2) -#define assertIsReg(pathname, mode) \ - assertion_is_reg(__FILE__, __LINE__, pathname, mode) -#define assertIsSymlink(pathname, contents) \ - assertion_is_symlink(__FILE__, __LINE__, pathname, contents) -/* Create a directory, report error if it fails. */ -#define assertMakeDir(dirname, mode) \ - assertion_make_dir(__FILE__, __LINE__, dirname, mode) -#define assertMakeFile(path, mode, contents) \ - assertion_make_file(__FILE__, __LINE__, path, mode, -1, contents) -#define assertMakeBinFile(path, mode, csize, contents) \ - assertion_make_file(__FILE__, __LINE__, path, mode, csize, contents) -#define assertMakeHardlink(newfile, oldfile) \ - assertion_make_hardlink(__FILE__, __LINE__, newfile, oldfile) -#define assertMakeSymlink(newfile, linkto) \ - assertion_make_symlink(__FILE__, __LINE__, newfile, linkto) -#define assertNodump(path) \ - assertion_nodump(__FILE__, __LINE__, path) -#define assertUmask(mask) \ - assertion_umask(__FILE__, __LINE__, mask) -#define assertUtimes(pathname, atime, atime_nsec, mtime, mtime_nsec) \ - assertion_utimes(__FILE__, __LINE__, pathname, atime, atime_nsec, mtime, mtime_nsec) - -/* - * This would be simple with C99 variadic macros, but I don't want to - * require that. Instead, I insert a function call before each - * skipping() call to pass the file and line information down. Crude, - * but effective. - */ -#define skipping \ - skipping_setup(__FILE__, __LINE__);test_skipping - -/* Function declarations. These are defined in test_utility.c. */ -void failure(const char *fmt, ...); -int assertion_assert(const char *, int, int, const char *, void *); -int assertion_chdir(const char *, int, const char *); -int assertion_empty_file(const char *, int, const char *); -int assertion_equal_file(const char *, int, const char *, const char *); -int assertion_equal_int(const char *, int, long long, const char *, long long, const char *, void *); -int assertion_equal_mem(const char *, int, const void *, const char *, const void *, const char *, size_t, const char *, void *); -int assertion_memory_filled_with(const char *, int, const void *, const char *, size_t, const char *, char, const char *, void *); -int assertion_equal_string(const char *, int, const char *v1, const char *, const char *v2, const char *, void *, int); -int assertion_equal_wstring(const char *, int, const wchar_t *v1, const char *, const wchar_t *v2, const char *, void *); -int assertion_file_atime(const char *, int, const char *, long, long); -int assertion_file_atime_recent(const char *, int, const char *); -int assertion_file_birthtime(const char *, int, const char *, long, long); -int assertion_file_birthtime_recent(const char *, int, const char *); -int assertion_file_contains_lines_any_order(const char *, int, const char *, const char **); -int assertion_file_contains_no_invalid_strings(const char *, int, const char *, const char **); -int assertion_file_contents(const char *, int, const void *, int, const char *); -int assertion_file_exists(const char *, int, const char *); -int assertion_file_mode(const char *, int, const char *, int); -int assertion_file_mtime(const char *, int, const char *, long, long); -int assertion_file_mtime_recent(const char *, int, const char *); -int assertion_file_nlinks(const char *, int, const char *, int); -int assertion_file_not_exists(const char *, int, const char *); -int assertion_file_size(const char *, int, const char *, long); -int assertion_is_dir(const char *, int, const char *, int); -int assertion_is_hardlink(const char *, int, const char *, const char *); -int assertion_is_not_hardlink(const char *, int, const char *, const char *); -int assertion_is_reg(const char *, int, const char *, int); -int assertion_is_symlink(const char *, int, const char *, const char *); -int assertion_make_dir(const char *, int, const char *, int); -int assertion_make_file(const char *, int, const char *, int, int, const void *); -int assertion_make_hardlink(const char *, int, const char *newpath, const char *); -int assertion_make_symlink(const char *, int, const char *newpath, const char *); -int assertion_nodump(const char *, int, const char *); -int assertion_non_empty_file(const char *, int, const char *); -int assertion_text_file_contents(const char *, int, const char *buff, const char *f); -int assertion_umask(const char *, int, int); -int assertion_utimes(const char *, int, const char *, long, long, long, long ); - -void skipping_setup(const char *, int); -void test_skipping(const char *fmt, ...); - -/* Like sprintf, then system() */ -int systemf(const char * fmt, ...); - -/* Delay until time() returns a value after this. */ -void sleepUntilAfter(time_t); - -/* Return true if this platform can create symlinks. */ -int canSymlink(void); - -/* Return true if this platform can run the "bzip2" program. */ -int canBzip2(void); - -/* Return true if this platform can run the "grzip" program. */ -int canGrzip(void); - -/* Return true if this platform can run the "gzip" program. */ -int canGzip(void); - -/* Return true if this platform can run the specified command. */ -int canRunCommand(const char *); - -/* Return true if this platform can run the "lrzip" program. */ -int canLrzip(void); - -/* Return true if this platform can run the "lz4" program. */ -int canLz4(void); - -/* Return true if this platform can run the "lzip" program. */ -int canLzip(void); - -/* Return true if this platform can run the "lzma" program. */ -int canLzma(void); - -/* Return true if this platform can run the "lzop" program. */ -int canLzop(void); - -/* Return true if this platform can run the "xz" program. */ -int canXz(void); - -/* Return true if this filesystem can handle nodump flags. */ -int canNodump(void); - -/* Return true if the file has large i-node number(>0xffffffff). */ -int is_LargeInode(const char *); - -/* Suck file into string allocated via malloc(). Call free() when done. */ -/* Supports printf-style args: slurpfile(NULL, "%s/myfile", refdir); */ -char *slurpfile(size_t *, const char *fmt, ...); - -/* Dump block of bytes to a file. */ -void dumpfile(const char *filename, void *, size_t); - -/* Extracts named reference file to the current directory. */ -void extract_reference_file(const char *); -/* Copies named reference file to the current directory. */ -void copy_reference_file(const char *); - -/* Extracts a list of files to the current directory. - * List must be NULL terminated. - */ -void extract_reference_files(const char **); - -/* Subtract umask from mode */ -mode_t umasked(mode_t expected_mode); - -/* Path to working directory for current test */ -extern const char *testworkdir; - -/* - * Special interfaces for program test harness. - */ - -/* Pathname of exe to be tested. */ -extern const char *testprogfile; -/* Name of exe to use in printf-formatted command strings. */ -/* On Windows, this includes leading/trailing quotes. */ -extern const char *testprog; - -#ifdef USE_DMALLOC -#include -#endif +#include "test_common.h" Modified: head/contrib/libarchive/cat/test/test_version.c ============================================================================== --- head/contrib/libarchive/cat/test/test_version.c Thu Mar 2 22:46:03 2017 (r314570) +++ head/contrib/libarchive/cat/test/test_version.c Thu Mar 2 22:59:35 2017 (r314571) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003-2007 Tim Kientzle + * Copyright (c) 2003-2017 Tim Kientzle * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,68 +30,5 @@ DEFINE_TEST(test_version) { - int r; - char *p, *q; - size_t s; - - - r = systemf("%s --version >version.stdout 2>version.stderr", testprog); - failure("Unable to run %s --version", testprog); - if (!assert(r == 0)) - return; - - /* --version should generate nothing to stdout. */ - assertEmptyFile("version.stderr"); - /* Verify format of version message. */ - q = p = slurpfile(&s, "version.stdout"); - /* Version message should start with name of program, then space. */ - assert(s > 6); - failure("Version must start with 'bsdcat': ``%s''", p); - if (!assertEqualMem(q, "bsdcat ", 7)) - return; - q += 7; s -= 7; - /* Version number is a series of digits and periods. */ - while (s > 0 && (*q == '.' || (*q >= '0' && *q <= '9'))) { - ++q; - --s; - } - /* Version number terminated by space. */ - failure("No space after bsdcat version: ``%s''", p); - assert(s > 1); - /* Skip a single trailing a,b,c, or d. */ - if (*q == 'a' || *q == 'b' || *q == 'c' || *q == 'd') - ++q; - failure("No space after bsdcat version: ``%s''", p); - assert(*q == ' '); - ++q; --s; - /* Separator. */ - failure("No `-' between bsdcat and libarchive versions: ``%s''", p); - assertEqualMem(q, "- ", 2); - q += 2; s -= 2; - /* libarchive name and version number */ - failure("Not long enough for libarchive version: ``%s''", p); - assert(s > 11); - failure("Libarchive version must start with `libarchive': ``%s''", p); - assertEqualMem(q, "libarchive ", 11); - q += 11; s -= 11; - /* Version number is a series of digits and periods. */ - while (s > 0 && (*q == '.' || (*q >= '0' && *q <= '9'))) { - ++q; - --s; - } - /* Skip a single trailing a,b,c, or d. */ - if (*q == 'a' || *q == 'b' || *q == 'c' || *q == 'd') - ++q; - /* Skip arbitrary third-party version numbers. */ - while (s > 0 && (*q == ' ' || *q == '-' || *q == '/' || *q == '.' || isalnum(*q))) { - ++q; - --s; - } - /* All terminated by end-of-line. */ - assert(s >= 1); - /* Skip an optional CR character (e.g., Windows) */ - failure("Version output must end with \\n or \\r\\n"); - if (*q == '\r') { ++q; --s; } - assertEqualMem(q, "\n", 1); - free(p); + assertVersion(testprog, "bsdcat"); } Modified: head/contrib/libarchive/cpio/cpio.c ============================================================================== --- head/contrib/libarchive/cpio/cpio.c Thu Mar 2 22:46:03 2017 (r314570) +++ head/contrib/libarchive/cpio/cpio.c Thu Mar 2 22:59:35 2017 (r314571) @@ -108,22 +108,22 @@ static int entry_to_archive(struct cpio static int file_to_archive(struct cpio *, const char *); static void free_cache(struct name_cache *cache); static void list_item_verbose(struct cpio *, struct archive_entry *); -static void long_help(void); +static void long_help(void) __LA_DEAD; static const char *lookup_gname(struct cpio *, gid_t gid); static int lookup_gname_helper(struct cpio *, const char **name, id_t gid); static const char *lookup_uname(struct cpio *, uid_t uid); static int lookup_uname_helper(struct cpio *, const char **name, id_t uid); -static void mode_in(struct cpio *); -static void mode_list(struct cpio *); +static void mode_in(struct cpio *) __LA_DEAD; +static void mode_list(struct cpio *) __LA_DEAD; static void mode_out(struct cpio *); static void mode_pass(struct cpio *, const char *); static const char *remove_leading_slash(const char *); static int restore_time(struct cpio *, struct archive_entry *, const char *, int fd); -static void usage(void); -static void version(void); +static void usage(void) __LA_DEAD; +static void version(void) __LA_DEAD; static const char * passphrase_callback(struct archive *, void *); static void passphrase_free(char *); Modified: head/contrib/libarchive/cpio/test/test.h ============================================================================== --- head/contrib/libarchive/cpio/test/test.h Thu Mar 2 22:46:03 2017 (r314570) +++ head/contrib/libarchive/cpio/test/test.h Thu Mar 2 22:59:35 2017 (r314571) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2006 Tim Kientzle + * Copyright (c) 2003-2017 Tim Kientzle * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,328 +27,14 @@ /* Every test program should #include "test.h" as the first thing. */ -/* - * The goal of this file (and the matching test.c) is to - * simplify the very repetitive test-*.c test programs. - */ -#if defined(HAVE_CONFIG_H) -/* Most POSIX platforms use the 'configure' script to build config.h */ -#include "config.h" -#elif defined(__FreeBSD__) -/* Building as part of FreeBSD system requires a pre-built config.h. */ -#include "config_freebsd.h" -#elif defined(_WIN32) && !defined(__CYGWIN__) -/* Win32 can't run the 'configure' script. */ -#include "config_windows.h" -#else -/* Warn if the library hasn't been (automatically or manually) configured. */ -#error Oops: No config.h and no pre-built configuration in test.h. -#endif - -#include /* Windows requires this before sys/stat.h */ -#include - -#if HAVE_DIRENT_H -#include -#endif -#ifdef HAVE_DIRECT_H -#include -#define dirent direct -#endif -#include -#include -#ifdef HAVE_IO_H -#include -#endif -#ifdef HAVE_STDINT_H -#include -#endif -#include -#include -#include -#include -#include -#ifdef HAVE_UNISTD_H -#include -#endif -#include -#ifdef HAVE_WINDOWS_H -#include -#endif - -/* - * System-specific tweaks. We really want to minimize these - * as much as possible, since they make it harder to understand - * the mainline code. - */ - -/* Windows (including Visual Studio and MinGW but not Cygwin) */ -#if defined(_WIN32) && !defined(__CYGWIN__) -#if !defined(__BORLANDC__) -#undef chdir -#define chdir _chdir -#define strdup _strdup -#endif -#endif - -/* Visual Studio */ -#if defined(_MSC_VER) && _MSC_VER < 1900 -#define snprintf sprintf_s -#endif - -#if defined(__BORLANDC__) -#pragma warn -8068 /* Constant out of range in comparison. */ -#endif - -/* Haiku OS and QNX */ -#if defined(__HAIKU__) || defined(__QNXNTO__) -/* Haiku and QNX have typedefs in stdint.h (needed for int64_t) */ -#include -#endif - -/* Get a real definition for __FBSDID if we can */ -#if HAVE_SYS_CDEFS_H -#include -#endif - -/* If not, define it so as to avoid dangling semicolons. */ -#ifndef __FBSDID -#define __FBSDID(a) struct _undefined_hack -#endif - -#ifndef O_BINARY -#define O_BINARY 0 -#endif - -/* - * Redefine DEFINE_TEST for use in defining the test functions. - */ -#undef DEFINE_TEST -#define DEFINE_TEST(name) void name(void); void name(void) - -/* An implementation of the standard assert() macro */ -#define assert(e) assertion_assert(__FILE__, __LINE__, (e), #e, NULL) -/* chdir() and error if it fails */ -#define assertChdir(path) \ - assertion_chdir(__FILE__, __LINE__, path) -/* Assert two integers are the same. Reports value of each one if not. */ -#define assertEqualInt(v1,v2) \ - assertion_equal_int(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL) -/* Assert two strings are the same. Reports value of each one if not. */ -#define assertEqualString(v1,v2) \ - assertion_equal_string(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL, 0) -#define assertEqualUTF8String(v1,v2) \ - assertion_equal_string(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL, 1) -/* As above, but v1 and v2 are wchar_t * */ -#define assertEqualWString(v1,v2) \ - assertion_equal_wstring(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL) -/* As above, but raw blocks of bytes. */ -#define assertEqualMem(v1, v2, l) \ - assertion_equal_mem(__FILE__, __LINE__, (v1), #v1, (v2), #v2, (l), #l, NULL) -/* Assert that memory is full of a specified byte */ -#define assertMemoryFilledWith(v1, l, b) \ - assertion_memory_filled_with(__FILE__, __LINE__, (v1), #v1, (l), #l, (b), #b, NULL) -/* Assert two files are the same. */ -#define assertEqualFile(f1, f2) \ - assertion_equal_file(__FILE__, __LINE__, (f1), (f2)) -/* Assert that a file is empty. */ -#define assertEmptyFile(pathname) \ - assertion_empty_file(__FILE__, __LINE__, (pathname)) -/* Assert that a file is not empty. */ -#define assertNonEmptyFile(pathname) \ - assertion_non_empty_file(__FILE__, __LINE__, (pathname)) -#define assertFileAtime(pathname, sec, nsec) \ - assertion_file_atime(__FILE__, __LINE__, pathname, sec, nsec) -#define assertFileAtimeRecent(pathname) \ - assertion_file_atime_recent(__FILE__, __LINE__, pathname) -#define assertFileBirthtime(pathname, sec, nsec) \ - assertion_file_birthtime(__FILE__, __LINE__, pathname, sec, nsec) -#define assertFileBirthtimeRecent(pathname) \ - assertion_file_birthtime_recent(__FILE__, __LINE__, pathname) -/* Assert that a file exists; supports printf-style arguments. */ -#define assertFileExists(pathname) \ - assertion_file_exists(__FILE__, __LINE__, pathname) -/* Assert that a file exists. */ -#define assertFileNotExists(pathname) \ - assertion_file_not_exists(__FILE__, __LINE__, pathname) -/* Assert that file contents match a string. */ -#define assertFileContents(data, data_size, pathname) \ - assertion_file_contents(__FILE__, __LINE__, data, data_size, pathname) -/* Verify that a file does not contain invalid strings */ -#define assertFileContainsNoInvalidStrings(pathname, strings) \ - assertion_file_contains_no_invalid_strings(__FILE__, __LINE__, pathname, strings) -#define assertFileMtime(pathname, sec, nsec) \ - assertion_file_mtime(__FILE__, __LINE__, pathname, sec, nsec) -#define assertFileMtimeRecent(pathname) \ - assertion_file_mtime_recent(__FILE__, __LINE__, pathname) -#define assertFileNLinks(pathname, nlinks) \ - assertion_file_nlinks(__FILE__, __LINE__, pathname, nlinks) -#define assertFileSize(pathname, size) \ - assertion_file_size(__FILE__, __LINE__, pathname, size) -#define assertFileMode(pathname, mode) \ - assertion_file_mode(__FILE__, __LINE__, pathname, mode) -#define assertTextFileContents(text, pathname) \ - assertion_text_file_contents(__FILE__, __LINE__, text, pathname) -#define assertFileContainsLinesAnyOrder(pathname, lines) \ - assertion_file_contains_lines_any_order(__FILE__, __LINE__, pathname, lines) -#define assertIsDir(pathname, mode) \ - assertion_is_dir(__FILE__, __LINE__, pathname, mode) -#define assertIsHardlink(path1, path2) \ - assertion_is_hardlink(__FILE__, __LINE__, path1, path2) -#define assertIsNotHardlink(path1, path2) \ - assertion_is_not_hardlink(__FILE__, __LINE__, path1, path2) -#define assertIsReg(pathname, mode) \ - assertion_is_reg(__FILE__, __LINE__, pathname, mode) -#define assertIsSymlink(pathname, contents) \ - assertion_is_symlink(__FILE__, __LINE__, pathname, contents) -/* Create a directory, report error if it fails. */ -#define assertMakeDir(dirname, mode) \ - assertion_make_dir(__FILE__, __LINE__, dirname, mode) -#define assertMakeFile(path, mode, contents) \ - assertion_make_file(__FILE__, __LINE__, path, mode, -1, contents) -#define assertMakeBinFile(path, mode, csize, contents) \ - assertion_make_file(__FILE__, __LINE__, path, mode, csize, contents) -#define assertMakeHardlink(newfile, oldfile) \ - assertion_make_hardlink(__FILE__, __LINE__, newfile, oldfile) -#define assertMakeSymlink(newfile, linkto) \ - assertion_make_symlink(__FILE__, __LINE__, newfile, linkto) -#define assertNodump(path) \ - assertion_nodump(__FILE__, __LINE__, path) -#define assertUmask(mask) \ - assertion_umask(__FILE__, __LINE__, mask) -#define assertUtimes(pathname, atime, atime_nsec, mtime, mtime_nsec) \ - assertion_utimes(__FILE__, __LINE__, pathname, atime, atime_nsec, mtime, mtime_nsec) - -/* - * This would be simple with C99 variadic macros, but I don't want to - * require that. Instead, I insert a function call before each - * skipping() call to pass the file and line information down. Crude, - * but effective. - */ -#define skipping \ - skipping_setup(__FILE__, __LINE__);test_skipping - -/* Function declarations. These are defined in test_utility.c. */ -void failure(const char *fmt, ...); -int assertion_assert(const char *, int, int, const char *, void *); -int assertion_chdir(const char *, int, const char *); -int assertion_empty_file(const char *, int, const char *); -int assertion_equal_file(const char *, int, const char *, const char *); -int assertion_equal_int(const char *, int, long long, const char *, long long, const char *, void *); -int assertion_equal_mem(const char *, int, const void *, const char *, const void *, const char *, size_t, const char *, void *); -int assertion_memory_filled_with(const char *, int, const void *, const char *, size_t, const char *, char, const char *, void *); -int assertion_equal_string(const char *, int, const char *v1, const char *, const char *v2, const char *, void *, int); -int assertion_equal_wstring(const char *, int, const wchar_t *v1, const char *, const wchar_t *v2, const char *, void *); -int assertion_file_atime(const char *, int, const char *, long, long); -int assertion_file_atime_recent(const char *, int, const char *); -int assertion_file_birthtime(const char *, int, const char *, long, long); -int assertion_file_birthtime_recent(const char *, int, const char *); -int assertion_file_contains_lines_any_order(const char *, int, const char *, const char **); -int assertion_file_contains_no_invalid_strings(const char *, int, const char *, const char **); -int assertion_file_contents(const char *, int, const void *, int, const char *); -int assertion_file_exists(const char *, int, const char *); -int assertion_file_mode(const char *, int, const char *, int); -int assertion_file_mtime(const char *, int, const char *, long, long); -int assertion_file_mtime_recent(const char *, int, const char *); -int assertion_file_nlinks(const char *, int, const char *, int); -int assertion_file_not_exists(const char *, int, const char *); -int assertion_file_size(const char *, int, const char *, long); -int assertion_is_dir(const char *, int, const char *, int); -int assertion_is_hardlink(const char *, int, const char *, const char *); -int assertion_is_not_hardlink(const char *, int, const char *, const char *); -int assertion_is_reg(const char *, int, const char *, int); -int assertion_is_symlink(const char *, int, const char *, const char *); -int assertion_make_dir(const char *, int, const char *, int); -int assertion_make_file(const char *, int, const char *, int, int, const void *); -int assertion_make_hardlink(const char *, int, const char *newpath, const char *); -int assertion_make_symlink(const char *, int, const char *newpath, const char *); -int assertion_nodump(const char *, int, const char *); -int assertion_non_empty_file(const char *, int, const char *); -int assertion_text_file_contents(const char *, int, const char *buff, const char *f); -int assertion_umask(const char *, int, int); -int assertion_utimes(const char *, int, const char *, long, long, long, long ); - -void skipping_setup(const char *, int); -void test_skipping(const char *fmt, ...); - -/* Like sprintf, then system() */ -int systemf(const char * fmt, ...); - -/* Delay until time() returns a value after this. */ -void sleepUntilAfter(time_t); - -/* Return true if this platform can create symlinks. */ -int canSymlink(void); - -/* Return true if this platform can run the "bzip2" program. */ -int canBzip2(void); - -/* Return true if this platform can run the "grzip" program. */ -int canGrzip(void); - -/* Return true if this platform can run the "gzip" program. */ -int canGzip(void); - -/* Return true if this platform can run the specified command. */ -int canRunCommand(const char *); - -/* Return true if this platform can run the "lrzip" program. */ -int canLrzip(void); - -/* Return true if this platform can run the "lz4" program. */ -int canLz4(void); - -/* Return true if this platform can run the "lzip" program. */ -int canLzip(void); - -/* Return true if this platform can run the "lzma" program. */ -int canLzma(void); - -/* Return true if this platform can run the "lzop" program. */ -int canLzop(void); - -/* Return true if this platform can run the "xz" program. */ -int canXz(void); - -/* Return true if this filesystem can handle nodump flags. */ -int canNodump(void); - -/* Return true if the file has large i-node number(>0xffffffff). */ -int is_LargeInode(const char *); - -/* Suck file into string allocated via malloc(). Call free() when done. */ -/* Supports printf-style args: slurpfile(NULL, "%s/myfile", refdir); */ -char *slurpfile(size_t *, const char *fmt, ...); - -/* Dump block of bytes to a file. */ -void dumpfile(const char *filename, void *, size_t); - -/* Extracts named reference file to the current directory. */ -void extract_reference_file(const char *); -/* Copies named reference file to the current directory. */ -void copy_reference_file(const char *); - -/* Extracts a list of files to the current directory. - * List must be NULL terminated. - */ -void extract_reference_files(const char **); - -/* Subtract umask from mode */ -mode_t umasked(mode_t expected_mode); - -/* Path to working directory for current test */ -extern const char *testworkdir; - -/* - * Special interfaces for program test harness. - */ - -/* Pathname of exe to be tested. */ -extern const char *testprogfile; -/* Name of exe to use in printf-formatted command strings. */ -/* On Windows, this includes leading/trailing quotes. */ -extern const char *testprog; +#define KNOWNREF "test_option_f.cpio.uu" +#define ENVBASE "BSDCPIO" /* Prefix for environment variables. */ +#define PROGRAM "bsdcpio" /* Name of program being tested. */ +#define PROGRAM_ALIAS "cpio" /* Generic alias for program */ +#undef LIBRARY /* Not testing a library. */ +#undef EXTRA_DUMP /* How to dump extra data */ +#undef EXTRA_ERRNO /* How to dump errno */ +/* How to generate extra version info. */ +#define EXTRA_VERSION (systemf("%s --version", testprog) ? "" : "") -#ifdef USE_DMALLOC -#include -#endif +#include "test_common.h" Modified: head/contrib/libarchive/cpio/test/test_option_version.c ============================================================================== --- head/contrib/libarchive/cpio/test/test_option_version.c Thu Mar 2 22:46:03 2017 (r314570) +++ head/contrib/libarchive/cpio/test/test_option_version.c Thu Mar 2 22:59:35 2017 (r314571) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003-2007 Tim Kientzle + * Copyright (c) 2003-2017 Tim Kientzle * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,92 +23,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); - -/* - * Test that --version option works and generates reasonable output. - */ - -static void -verify(const char *p, size_t s) -{ - const char *q = p; - - /* Version message should start with name of program, then space. */ - failure("version message too short:", p); - if (!assert(s > 6)) - return; - failure("Version message should begin with 'bsdcpio': %s", p); - if (!assertEqualMem(q, "bsdcpio ", 8)) - /* If we're not testing bsdcpio, don't keep going. */ - return; - q += 8; s -= 8; - /* Version number is a series of digits and periods. */ - while (s > 0 && (*q == '.' || (*q >= '0' && *q <= '9'))) { - ++q; - --s; - } - /* Version number terminated by space. */ - failure("Version: %s", p); - assert(s > 1); - /* Skip a single trailing a,b,c, or d. */ - if (*q == 'a' || *q == 'b' || *q == 'c' || *q == 'd') - ++q; - failure("Version: %s", p); - assert(*q == ' '); - ++q; --s; - /* Separator. */ - failure("Version: %s", p); - assertEqualMem(q, "- ", 2); - q += 2; s -= 2; - /* libarchive name and version number */ - assert(s > 11); - failure("Version: %s", p); - assertEqualMem(q, "libarchive ", 11); - q += 11; s -= 11; - /* Version number is a series of digits and periods. */ - while (s > 0 && (*q == '.' || (*q >= '0' && *q <= '9'))) { - ++q; - --s; - } - /* Skip a single trailing a,b,c, or d. */ - if (*q == 'a' || *q == 'b' || *q == 'c' || *q == 'd') - ++q; - /* Skip arbitrary third-party version numbers. */ - while (s > 0 && (*q == ' ' || *q == '-' || *q == '/' || *q == '.' || isalnum(*q))) { - ++q; - --s; - } - /* All terminated by end-of-line: \r, \r\n, or \n */ - assert(s >= 1); - failure("Version: %s", p); - if (*q == '\x0d') { - if (q[1] != '\0') - assertEqualMem(q, "\x0d\x0a", 2); - } else - assertEqualMem(q, "\x0a", 1); -} - DEFINE_TEST(test_option_version) { - int r; - char *p; - size_t s; - - r = systemf("%s --version >version.stdout 2>version.stderr", testprog); - if (r != 0) - r = systemf("%s -W version >version.stdout 2>version.stderr", - testprog); - failure("Unable to run either %s --version or %s -W version", - testprog, testprog); - if (!assert(r == 0)) - return; - - /* --version should generate nothing to stderr. */ - assertEmptyFile("version.stderr"); - /* Verify format of version message. */ - p = slurpfile(&s, "version.stdout"); - verify(p, s); - free(p); + assertVersion(testprog, "bsdcpio"); } Modified: head/contrib/libarchive/libarchive/archive.h ============================================================================== --- head/contrib/libarchive/libarchive/archive.h Thu Mar 2 22:46:03 2017 (r314570) +++ head/contrib/libarchive/libarchive/archive.h Thu Mar 2 22:59:35 2017 (r314571) @@ -36,7 +36,7 @@ * assert that ARCHIVE_VERSION_NUMBER >= 2012108. */ /* Note: Compiler will complain if this does not match archive_entry.h! */ -#define ARCHIVE_VERSION_NUMBER 3002002 +#define ARCHIVE_VERSION_NUMBER 3003001 #include #include /* for wchar_t */ @@ -155,7 +155,7 @@ __LA_DECL int archive_version_number(vo /* * Textual name/version of the library, useful for version displays. */ -#define ARCHIVE_VERSION_ONLY_STRING "3.2.2" +#define ARCHIVE_VERSION_ONLY_STRING "3.3.1" #define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING __LA_DECL const char * archive_version_string(void); @@ -1001,6 +1001,10 @@ __LA_DECL int archive_read_disk_set_ati #define ARCHIVE_READDISK_NO_TRAVERSE_MOUNTS (0x0008) /* Default: Xattrs are read from disk. */ #define ARCHIVE_READDISK_NO_XATTR (0x0010) +/* Default: ACLs are read from disk. */ +#define ARCHIVE_READDISK_NO_ACL (0x0020) +/* Default: File flags are read from disk. */ +#define ARCHIVE_READDISK_NO_FFLAGS (0x0040) __LA_DECL int archive_read_disk_set_behavior(struct archive *, int flags); Modified: head/contrib/libarchive/libarchive/archive_check_magic.c ============================================================================== --- head/contrib/libarchive/libarchive/archive_check_magic.c Thu Mar 2 22:46:03 2017 (r314570) +++ head/contrib/libarchive/libarchive/archive_check_magic.c Thu Mar 2 22:59:35 2017 (r314571) @@ -62,7 +62,7 @@ errmsg(const char *m) } } -static void +static __LA_DEAD void diediedie(void) { #if defined(_WIN32) && !defined(__CYGWIN__) && defined(_DEBUG) Modified: head/contrib/libarchive/libarchive/archive_digest_private.h ============================================================================== --- head/contrib/libarchive/libarchive/archive_digest_private.h Thu Mar 2 22:46:03 2017 (r314570) +++ head/contrib/libarchive/libarchive/archive_digest_private.h Thu Mar 2 22:59:35 2017 (r314571) @@ -143,6 +143,7 @@ defined(ARCHIVE_CRYPTO_SHA256_WIN) ||\ defined(ARCHIVE_CRYPTO_SHA384_WIN) ||\ defined(ARCHIVE_CRYPTO_SHA512_WIN) +#include #include typedef struct { int valid; Modified: head/contrib/libarchive/libarchive/archive_entry.c ============================================================================== --- head/contrib/libarchive/libarchive/archive_entry.c Thu Mar 2 22:46:03 2017 (r314570) +++ head/contrib/libarchive/libarchive/archive_entry.c Thu Mar 2 22:59:35 2017 (r314571) @@ -401,7 +401,7 @@ archive_entry_fflags_text(struct archive return (NULL); } -int64_t +la_int64_t archive_entry_gid(struct archive_entry *entry) { return (entry->ae_stat.aest_gid); @@ -502,7 +502,7 @@ _archive_entry_hardlink_l(struct archive return (archive_mstring_get_mbs_l(&entry->ae_hardlink, p, len, sc)); } -int64_t +la_int64_t archive_entry_ino(struct archive_entry *entry) { return (entry->ae_stat.aest_ino); @@ -514,7 +514,7 @@ archive_entry_ino_is_set(struct archive_ return (entry->ae_set & AE_SET_INO); } -int64_t +la_int64_t *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Thu Mar 2 23:23:29 2017 Return-Path: Delivered-To: svn-src-all@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 91D8BCF5C2C; Thu, 2 Mar 2017 23:23:29 +0000 (UTC) (envelope-from mm@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 611111C95; Thu, 2 Mar 2017 23:23:29 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22NNSZZ042410; Thu, 2 Mar 2017 23:23:28 GMT (envelope-from mm@FreeBSD.org) Received: (from mm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22NNSCp042409; Thu, 2 Mar 2017 23:23:28 GMT (envelope-from mm@FreeBSD.org) Message-Id: <201703022323.v22NNSCp042409@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mm set sender to mm@FreeBSD.org using -f From: Martin Matuska Date: Thu, 2 Mar 2017 23:23:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314572 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 23:23:29 -0000 Author: mm Date: Thu Mar 2 23:23:28 2017 New Revision: 314572 URL: https://svnweb.freebsd.org/changeset/base/314572 Log: Fix null pointer dereference in zfs_freebsd_setacl(). Prevents unprivileged users from panicking the kernel by calling __acl_delete_*() on files or directories inside a ZFS mount. MFC after: 3 days Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Thu Mar 2 22:59:35 2017 (r314571) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Thu Mar 2 23:23:28 2017 (r314572) @@ -5871,6 +5871,9 @@ zfs_freebsd_setacl(ap) if (ap->a_type != ACL_TYPE_NFS4) return (EINVAL); + if (ap->a_aclp == NULL) + return (EINVAL); + if (ap->a_aclp->acl_cnt < 1 || ap->a_aclp->acl_cnt > MAX_ACL_ENTRIES) return (EINVAL); From owner-svn-src-all@freebsd.org Fri Mar 3 00:39:31 2017 Return-Path: Delivered-To: svn-src-all@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 30222CF50C5; Fri, 3 Mar 2017 00:39:31 +0000 (UTC) (envelope-from emaste@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 081841AFD; Fri, 3 Mar 2017 00:39:30 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v230dU2U070798; Fri, 3 Mar 2017 00:39:30 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v230dTug070794; Fri, 3 Mar 2017 00:39:29 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201703030039.v230dTug070794@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 3 Mar 2017 00:39:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314573 - in stable/11: contrib/binutils/gas/config contrib/gcc/config/mips gnu/usr.bin/cc/cc_tools X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 00:39:31 -0000 Author: emaste Date: Fri Mar 3 00:39:29 2017 New Revision: 314573 URL: https://svnweb.freebsd.org/changeset/base/314573 Log: MFC r312899: add octeon+ as an alias for octeon in GCC & binutils r208737 added support for the "mips64r2" architecture and "octeon" CPU, and the saa/saad instructions. Upstream binutils also added the "octeon+" CPU, and the saa/saad instructions are only available in octeon+, not octeon. Since our base system tool chain already accepts saa/saad with -march=octeon, just allow octeon+ as an alias. This allows the use of octeon+ in kernel config files, for use with both external tool chain and in-tree GCC/binutils. Also includes GCC FBSD_CC_VER bump (r313041 in HEAD) PR: 216516 Sponsored by: The FreeBSD Foundation Modified: stable/11/contrib/binutils/gas/config/tc-mips.c stable/11/contrib/gcc/config/mips/mips.c stable/11/contrib/gcc/config/mips/mips.h stable/11/gnu/usr.bin/cc/cc_tools/freebsd-native.h Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/binutils/gas/config/tc-mips.c ============================================================================== --- stable/11/contrib/binutils/gas/config/tc-mips.c Thu Mar 2 23:23:28 2017 (r314572) +++ stable/11/contrib/binutils/gas/config/tc-mips.c Fri Mar 3 00:39:29 2017 (r314573) @@ -15156,6 +15156,7 @@ static const struct mips_cpu_info mips_c /* Cavium Networks Octeon CPU core */ { "octeon", 0, ISA_MIPS64R2, CPU_OCTEON }, + { "octeon+", 0, ISA_MIPS64R2, CPU_OCTEON }, /* End marker */ { NULL, 0, 0, 0 } Modified: stable/11/contrib/gcc/config/mips/mips.c ============================================================================== --- stable/11/contrib/gcc/config/mips/mips.c Thu Mar 2 23:23:28 2017 (r314572) +++ stable/11/contrib/gcc/config/mips/mips.c Fri Mar 3 00:39:29 2017 (r314573) @@ -765,6 +765,7 @@ const struct mips_cpu_info mips_cpu_info /* MIPS64R2 */ { "octeon", PROCESSOR_OCTEON, 65 }, + { "octeon+", PROCESSOR_OCTEON, 65 }, /* End marker */ { 0, 0, 0 } Modified: stable/11/contrib/gcc/config/mips/mips.h ============================================================================== --- stable/11/contrib/gcc/config/mips/mips.h Thu Mar 2 23:23:28 2017 (r314572) +++ stable/11/contrib/gcc/config/mips/mips.h Fri Mar 3 00:39:29 2017 (r314573) @@ -285,7 +285,10 @@ extern const struct mips_rtx_cost_data * \ macro = concat ((PREFIX), "_", (INFO)->name, NULL); \ for (p = macro; *p != 0; p++) \ - *p = TOUPPER (*p); \ + if (*p == '+') \ + *p = 'P'; \ + else \ + *p = TOUPPER (*p); \ \ builtin_define (macro); \ builtin_define_with_value ((PREFIX), (INFO)->name, 1); \ Modified: stable/11/gnu/usr.bin/cc/cc_tools/freebsd-native.h ============================================================================== --- stable/11/gnu/usr.bin/cc/cc_tools/freebsd-native.h Thu Mar 2 23:23:28 2017 (r314572) +++ stable/11/gnu/usr.bin/cc/cc_tools/freebsd-native.h Fri Mar 3 00:39:29 2017 (r314573) @@ -8,7 +8,7 @@ /* Fake out gcc/config/freebsd.h. */ #define FBSD_MAJOR 11 -#define FBSD_CC_VER 1100002 /* form like __FreeBSD_version */ +#define FBSD_CC_VER 1100003 /* form like __FreeBSD_version */ #undef SYSTEM_INCLUDE_DIR /* We don't need one for now. */ #undef TOOL_INCLUDE_DIR /* We don't need one for now. */ From owner-svn-src-all@freebsd.org Fri Mar 3 00:47:44 2017 Return-Path: Delivered-To: svn-src-all@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 116E1CF5314; Fri, 3 Mar 2017 00:47:44 +0000 (UTC) (envelope-from avos@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 C50001F50; Fri, 3 Mar 2017 00:47:43 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v230lgKP074667; Fri, 3 Mar 2017 00:47:42 GMT (envelope-from avos@FreeBSD.org) Received: (from avos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v230lgQY074666; Fri, 3 Mar 2017 00:47:42 GMT (envelope-from avos@FreeBSD.org) Message-Id: <201703030047.v230lgQY074666@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avos set sender to avos@FreeBSD.org using -f From: Andriy Voskoboinyk Date: Fri, 3 Mar 2017 00:47:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314574 - stable/11/sys/dev/iwn X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 00:47:44 -0000 Author: avos Date: Fri Mar 3 00:47:42 2017 New Revision: 314574 URL: https://svnweb.freebsd.org/changeset/base/314574 Log: MFC r314287: iwn: stop all watchdogs on device shutdown. Tested with Intel 6205, STA mode. Modified: stable/11/sys/dev/iwn/if_iwn.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/iwn/if_iwn.c ============================================================================== --- stable/11/sys/dev/iwn/if_iwn.c Fri Mar 3 00:39:29 2017 (r314573) +++ stable/11/sys/dev/iwn/if_iwn.c Fri Mar 3 00:47:42 2017 (r314574) @@ -8828,6 +8828,7 @@ iwn_stop_locked(struct iwn_softc *sc) sc->sc_is_scanning = 0; sc->sc_tx_timer = 0; callout_stop(&sc->watchdog_to); + callout_stop(&sc->scan_timeout); callout_stop(&sc->calib_to); sc->sc_flags &= ~IWN_FLAG_RUNNING; From owner-svn-src-all@freebsd.org Fri Mar 3 01:06:29 2017 Return-Path: Delivered-To: svn-src-all@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 6606ECF5CD9; Fri, 3 Mar 2017 01:06:29 +0000 (UTC) (envelope-from avos@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 409AB1C38; Fri, 3 Mar 2017 01:06:29 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2316Slk082667; Fri, 3 Mar 2017 01:06:28 GMT (envelope-from avos@FreeBSD.org) Received: (from avos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2316RPn082661; Fri, 3 Mar 2017 01:06:27 GMT (envelope-from avos@FreeBSD.org) Message-Id: <201703030106.v2316RPn082661@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avos set sender to avos@FreeBSD.org using -f From: Andriy Voskoboinyk Date: Fri, 3 Mar 2017 01:06:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314575 - head/sys/net80211 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 01:06:29 -0000 Author: avos Date: Fri Mar 3 01:06:27 2017 New Revision: 314575 URL: https://svnweb.freebsd.org/changeset/base/314575 Log: net80211: fix ieee80211_htrateset setup, return EINVAL for an unsupported ucast/mcast/mgmt HT rate. - Init global ieee80211_htrateset only once; neither ic_htcaps nor ic_txstream is changed when device is attached; - Move global ieee80211_htrateset structure to ieee80211com; there was a possible data race when more than 1 wireless device is used simultaneously; - Discard unsupported rates in ieee80211_ioctl_settxparams(); otherwise, an unsupported value may break connectivity (actually, 'ifconfig wlan0 ucastrate 8' for RTL8188EU results in immediate disconnect + infinite 'device timeout's after it). Tested with: - Intel 6205, STA mode. - RTL8821AU, STA mode. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D9871 Modified: head/sys/net80211/ieee80211.c head/sys/net80211/ieee80211_ht.c head/sys/net80211/ieee80211_ht.h head/sys/net80211/ieee80211_ioctl.c head/sys/net80211/ieee80211_var.h Modified: head/sys/net80211/ieee80211.c ============================================================================== --- head/sys/net80211/ieee80211.c Fri Mar 3 00:47:42 2017 (r314574) +++ head/sys/net80211/ieee80211.c Fri Mar 3 01:06:27 2017 (r314575) @@ -242,6 +242,8 @@ ieee80211_chan_init(struct ieee80211com if (ic->ic_txstream == 0) ic->ic_txstream = 2; + ieee80211_init_suphtrates(ic); + /* * Set auto mode to reset active channel state and any desired channel. */ @@ -1905,6 +1907,14 @@ ieee80211_get_suprates(struct ieee80211c return &ic->ic_sup_rates[ieee80211_chan2mode(c)]; } +/* XXX inline or eliminate? */ +const struct ieee80211_htrateset * +ieee80211_get_suphtrates(struct ieee80211com *ic, + const struct ieee80211_channel *c) +{ + return &ic->ic_sup_htrates; +} + void ieee80211_announce(struct ieee80211com *ic) { Modified: head/sys/net80211/ieee80211_ht.c ============================================================================== --- head/sys/net80211/ieee80211_ht.c Fri Mar 3 00:47:42 2017 (r314574) +++ head/sys/net80211/ieee80211_ht.c Fri Mar 3 01:06:27 2017 (r314575) @@ -421,19 +421,17 @@ ieee80211_ht_announce(struct ieee80211co ht_announce(ic, IEEE80211_MODE_11NG); } -static struct ieee80211_htrateset htrateset; - -const struct ieee80211_htrateset * -ieee80211_get_suphtrates(struct ieee80211com *ic, - const struct ieee80211_channel *c) +void +ieee80211_init_suphtrates(struct ieee80211com *ic) { #define ADDRATE(x) do { \ - htrateset.rs_rates[htrateset.rs_nrates] = x; \ - htrateset.rs_nrates++; \ + htrateset->rs_rates[htrateset->rs_nrates] = x; \ + htrateset->rs_nrates++; \ } while (0) + struct ieee80211_htrateset *htrateset = &ic->ic_sup_htrates; int i; - memset(&htrateset, 0, sizeof(struct ieee80211_htrateset)); + memset(htrateset, 0, sizeof(struct ieee80211_htrateset)); for (i = 0; i < ic->ic_txstream * 8; i++) ADDRATE(i); if ((ic->ic_htcaps & IEEE80211_HTCAP_CHWIDTH40) && @@ -453,7 +451,6 @@ ieee80211_get_suphtrates(struct ieee8021 ADDRATE(i); } } - return &htrateset; #undef ADDRATE } Modified: head/sys/net80211/ieee80211_ht.h ============================================================================== --- head/sys/net80211/ieee80211_ht.h Fri Mar 3 00:47:42 2017 (r314574) +++ head/sys/net80211/ieee80211_ht.h Fri Mar 3 01:06:27 2017 (r314575) @@ -177,8 +177,7 @@ struct ieee80211_mcs_rates { uint16_t ht40_rate_400ns; }; extern const struct ieee80211_mcs_rates ieee80211_htrates[]; -const struct ieee80211_htrateset *ieee80211_get_suphtrates( - struct ieee80211com *, const struct ieee80211_channel *); +void ieee80211_init_suphtrates(struct ieee80211com *); struct ieee80211_node; int ieee80211_setup_htrates(struct ieee80211_node *, Modified: head/sys/net80211/ieee80211_ioctl.c ============================================================================== --- head/sys/net80211/ieee80211_ioctl.c Fri Mar 3 00:47:42 2017 (r314574) +++ head/sys/net80211/ieee80211_ioctl.c Fri Mar 3 01:06:27 2017 (r314575) @@ -2226,13 +2226,19 @@ checkrate(const struct ieee80211_rateset } static int -checkmcs(int mcs) +checkmcs(const struct ieee80211_htrateset *rs, int mcs) { + int rate_val = IEEE80211_RV(mcs); + int i; + if (mcs == IEEE80211_FIXED_RATE_NONE) return 1; if ((mcs & IEEE80211_RATE_MCS) == 0) /* MCS always have 0x80 set */ return 0; - return (mcs & 0x7f) <= 31; /* XXX could search ht rate set */ + for (i = 0; i < rs->rs_nrates; i++) + if (IEEE80211_RV(rs->rs_rates[i]) == rate_val) + return 1; + return 0; } static int @@ -2242,6 +2248,7 @@ ieee80211_ioctl_settxparams(struct ieee8 struct ieee80211com *ic = vap->iv_ic; struct ieee80211_txparams_req parms; /* XXX stack use? */ struct ieee80211_txparam *src, *dst; + const struct ieee80211_htrateset *rs_ht; const struct ieee80211_rateset *rs; int error, mode, changed, is11n, nmodes; @@ -2260,23 +2267,24 @@ ieee80211_ioctl_settxparams(struct ieee8 src = &parms.params[mode]; dst = &vap->iv_txparms[mode]; rs = &ic->ic_sup_rates[mode]; /* NB: 11n maps to legacy */ + rs_ht = &ic->ic_sup_htrates; is11n = (mode == IEEE80211_MODE_11NA || mode == IEEE80211_MODE_11NG); if (src->ucastrate != dst->ucastrate) { if (!checkrate(rs, src->ucastrate) && - (!is11n || !checkmcs(src->ucastrate))) + (!is11n || !checkmcs(rs_ht, src->ucastrate))) return EINVAL; changed++; } if (src->mcastrate != dst->mcastrate) { if (!checkrate(rs, src->mcastrate) && - (!is11n || !checkmcs(src->mcastrate))) + (!is11n || !checkmcs(rs_ht, src->mcastrate))) return EINVAL; changed++; } if (src->mgmtrate != dst->mgmtrate) { if (!checkrate(rs, src->mgmtrate) && - (!is11n || !checkmcs(src->mgmtrate))) + (!is11n || !checkmcs(rs_ht, src->mgmtrate))) return EINVAL; changed++; } Modified: head/sys/net80211/ieee80211_var.h ============================================================================== --- head/sys/net80211/ieee80211_var.h Fri Mar 3 00:47:42 2017 (r314574) +++ head/sys/net80211/ieee80211_var.h Fri Mar 3 01:06:27 2017 (r314575) @@ -175,6 +175,7 @@ struct ieee80211com { uint16_t ic_holdover; /* PM hold over duration */ uint16_t ic_txpowlimit; /* global tx power limit */ struct ieee80211_rateset ic_sup_rates[IEEE80211_MODE_MAX]; + struct ieee80211_htrateset ic_sup_htrates; /* * Channel state: @@ -692,6 +693,8 @@ int ieee80211_vap_attach(struct ieee8021 void ieee80211_vap_detach(struct ieee80211vap *); const struct ieee80211_rateset *ieee80211_get_suprates(struct ieee80211com *ic, const struct ieee80211_channel *); +const struct ieee80211_htrateset *ieee80211_get_suphtrates( + struct ieee80211com *, const struct ieee80211_channel *); void ieee80211_announce(struct ieee80211com *); void ieee80211_announce_channels(struct ieee80211com *); void ieee80211_drain(struct ieee80211com *); From owner-svn-src-all@freebsd.org Fri Mar 3 01:50:12 2017 Return-Path: Delivered-To: svn-src-all@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 3645ECF6E2D; Fri, 3 Mar 2017 01:50:12 +0000 (UTC) (envelope-from des@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 EB50818C4; Fri, 3 Mar 2017 01:50:11 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v231oBcR099512; Fri, 3 Mar 2017 01:50:11 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v231oAh4099506; Fri, 3 Mar 2017 01:50:10 GMT (envelope-from des@FreeBSD.org) Message-Id: <201703030150.v231oAh4099506@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Fri, 3 Mar 2017 01:50:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314576 - head/crypto/openssh X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 01:50:12 -0000 Author: des Date: Fri Mar 3 01:50:10 2017 New Revision: 314576 URL: https://svnweb.freebsd.org/changeset/base/314576 Log: Forgot to bump the version addendum date. Modified: head/crypto/openssh/ssh_config head/crypto/openssh/ssh_config.5 head/crypto/openssh/sshd_config head/crypto/openssh/sshd_config.5 head/crypto/openssh/version.h Modified: head/crypto/openssh/ssh_config ============================================================================== --- head/crypto/openssh/ssh_config Fri Mar 3 01:06:27 2017 (r314575) +++ head/crypto/openssh/ssh_config Fri Mar 3 01:50:10 2017 (r314576) @@ -50,4 +50,4 @@ # ProxyCommand ssh -q -W %h:%p gateway.example.com # RekeyLimit 1G 1h # VerifyHostKeyDNS yes -# VersionAddendum FreeBSD-20161230 +# VersionAddendum FreeBSD-20170302 Modified: head/crypto/openssh/ssh_config.5 ============================================================================== --- head/crypto/openssh/ssh_config.5 Fri Mar 3 01:06:27 2017 (r314575) +++ head/crypto/openssh/ssh_config.5 Fri Mar 3 01:50:10 2017 (r314576) @@ -1800,7 +1800,7 @@ See also VERIFYING HOST KEYS in Specifies a string to append to the regular version string to identify OS- or site-specific modifications. The default is -.Dq FreeBSD-20161230 . +.Dq FreeBSD-20170302 . The value .Dq none may be used to disable this. Modified: head/crypto/openssh/sshd_config ============================================================================== --- head/crypto/openssh/sshd_config Fri Mar 3 01:06:27 2017 (r314575) +++ head/crypto/openssh/sshd_config Fri Mar 3 01:50:10 2017 (r314576) @@ -120,7 +120,7 @@ #PermitTunnel no #ChrootDirectory none #UseBlacklist no -#VersionAddendum FreeBSD-20161230 +#VersionAddendum FreeBSD-20170302 # no default banner path #Banner none Modified: head/crypto/openssh/sshd_config.5 ============================================================================== --- head/crypto/openssh/sshd_config.5 Fri Mar 3 01:06:27 2017 (r314575) +++ head/crypto/openssh/sshd_config.5 Fri Mar 3 01:50:10 2017 (r314576) @@ -1646,7 +1646,7 @@ The default is Optionally specifies additional text to append to the SSH protocol banner sent by the server upon connection. The default is -.Dq FreeBSD-20161230 . +.Dq FreeBSD-20170302 . The value .Dq none may be used to disable this. Modified: head/crypto/openssh/version.h ============================================================================== --- head/crypto/openssh/version.h Fri Mar 3 01:06:27 2017 (r314575) +++ head/crypto/openssh/version.h Fri Mar 3 01:50:10 2017 (r314576) @@ -6,7 +6,7 @@ #define SSH_PORTABLE "p1" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE -#define SSH_VERSION_FREEBSD "FreeBSD-20161230" +#define SSH_VERSION_FREEBSD "FreeBSD-20170302" #ifdef WITH_OPENSSL #define OPENSSL_VERSION SSLeay_version(SSLEAY_VERSION) From owner-svn-src-all@freebsd.org Fri Mar 3 01:56:56 2017 Return-Path: Delivered-To: svn-src-all@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 D0426CF50D9; Fri, 3 Mar 2017 01:56:56 +0000 (UTC) (envelope-from sjg@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 A6D3B1EC6; Fri, 3 Mar 2017 01:56:56 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v231utRq003765; Fri, 3 Mar 2017 01:56:55 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v231utup003760; Fri, 3 Mar 2017 01:56:55 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201703030156.v231utup003760@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Fri, 3 Mar 2017 01:56:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314577 - in head: tools/build/cross-build/mkimg usr.bin/mkimg X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 01:56:56 -0000 Author: sjg Date: Fri Mar 3 01:56:55 2017 New Revision: 314577 URL: https://svnweb.freebsd.org/changeset/base/314577 Log: Allow building mkimg as cross-tool For linux the mmap offset must also be page aligned, and we need to disable macros like __FBSDID() Change the linux osdep_uuidgen() to use more portable gettimeofday(). Reviewed by: marcel Added: head/tools/build/cross-build/mkimg/ head/tools/build/cross-build/mkimg/Makefile (contents, props changed) head/tools/build/cross-build/mkimg/Makefile.depend (contents, props changed) Modified: head/usr.bin/mkimg/Makefile head/usr.bin/mkimg/image.c head/usr.bin/mkimg/mkimg.h head/usr.bin/mkimg/uuid.c Added: head/tools/build/cross-build/mkimg/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/cross-build/mkimg/Makefile Fri Mar 3 01:56:55 2017 (r314577) @@ -0,0 +1,27 @@ +# $FreeBSD$ + +# allow building mkimg as a host tool. + +MKIMG_SRC = ${SRCTOP}/usr.bin/mkimg +.PATH: ${MKIMG_SRC} + +.if ${.MAKE.OS} == "Linux" +WARNS= 0 + +CFLAGS+= \ + -D"__FBSDID(x)=" \ + -D_XOPEN_SOURCE -D_GNU_SOURCE + +.PATH: ${SRCTOP}/lib/libutil +SRCS+= expand_number.c + +.endif + +MK_STAGING=no +MK_TESTS= no + +.include <${MKIMG_SRC}/Makefile> + +.if ${.MAKE.OS} == "Linux" +LDADD+= -lbsd +.endif Added: head/tools/build/cross-build/mkimg/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/cross-build/mkimg/Makefile.depend Fri Mar 3 01:56:55 2017 (r314577) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Modified: head/usr.bin/mkimg/Makefile ============================================================================== --- head/usr.bin/mkimg/Makefile Fri Mar 3 01:50:10 2017 (r314576) +++ head/usr.bin/mkimg/Makefile Fri Mar 3 01:56:55 2017 (r314577) @@ -3,7 +3,7 @@ .include PROG= mkimg -SRCS= format.c image.c mkimg.c scheme.c uuid.c +SRCS+= format.c image.c mkimg.c scheme.c uuid.c MAN= mkimg.1 MKIMG_VERSION=20161016 Modified: head/usr.bin/mkimg/image.c ============================================================================== --- head/usr.bin/mkimg/image.c Fri Mar 3 01:50:10 2017 (r314576) +++ head/usr.bin/mkimg/image.c Fri Mar 3 01:56:55 2017 (r314577) @@ -304,12 +304,20 @@ image_chunk_copyin(lba_t blk, void *buf, */ static void * -image_file_map(int fd, off_t ofs, size_t sz) +image_file_map(int fd, off_t ofs, size_t sz, off_t *iofp) { void *ptr; size_t unit; int flags, prot; + off_t x; + /* On Linux anyway ofs must also be page aligned */ + if ((x = (ofs % image_swap_pgsz)) != 0) { + ofs -= x; + sz += x; + *iofp = x; + } else + *iofp = 0; unit = (secsz > image_swap_pgsz) ? secsz : image_swap_pgsz; assert((unit & (unit - 1)) == 0); @@ -347,6 +355,7 @@ image_copyin_stream(lba_t blk, int fd, u size_t iosz; ssize_t rdsz; int error; + off_t iof; /* * This makes sure we're doing I/O in multiples of the page @@ -361,12 +370,12 @@ image_copyin_stream(lba_t blk, int fd, u swofs = image_swap_alloc(iosz); if (swofs == -1LL) return (errno); - buffer = image_file_map(image_swap_fd, swofs, iosz); + buffer = image_file_map(image_swap_fd, swofs, iosz, &iof); if (buffer == NULL) return (errno); - rdsz = read(fd, buffer, iosz); + rdsz = read(fd, &buffer[iof], iosz); if (rdsz > 0) - error = image_chunk_copyin(blk, buffer, rdsz, swofs, + error = image_chunk_copyin(blk, &buffer[iof], rdsz, swofs, image_swap_fd); else if (rdsz < 0) error = errno; @@ -389,8 +398,9 @@ image_copyin_stream(lba_t blk, int fd, u static int image_copyin_mapped(lba_t blk, int fd, uint64_t *sizep) { - off_t cur, data, end, hole, pos; - void *buf; + off_t cur, data, end, hole, pos, iof; + void *mp; + char *buf; uint64_t bytesize; size_t iosz, sz; int error; @@ -450,11 +460,12 @@ image_copyin_mapped(lba_t blk, int fd, u sz = (pos - data > (off_t)iosz) ? iosz : (size_t)(pos - data); - buf = image_file_map(fd, data, sz); - if (buf != NULL) { + buf = mp = image_file_map(fd, data, sz, &iof); + if (mp != NULL) { + buf += iof; error = image_chunk_copyin(blk, buf, sz, data, fd); - image_file_unmap(buf, sz); + image_file_unmap(mp, sz); } else error = errno; @@ -564,19 +575,22 @@ image_copyout_zeroes(int fd, size_t coun static int image_copyout_file(int fd, size_t size, int ifd, off_t iofs) { - void *buf; + void *mp; + char *buf; size_t iosz, sz; int error; + off_t iof; iosz = secsz * image_swap_pgsz; while (size > 0) { sz = (size > iosz) ? iosz : size; - buf = image_file_map(ifd, iofs, sz); + buf = mp = image_file_map(ifd, iofs, sz, &iof); if (buf == NULL) return (errno); + buf += iof; error = image_copyout_memory(fd, sz, buf); - image_file_unmap(buf, sz); + image_file_unmap(mp, sz); if (error) return (error); size -= sz; Modified: head/usr.bin/mkimg/mkimg.h ============================================================================== --- head/usr.bin/mkimg/mkimg.h Fri Mar 3 01:50:10 2017 (r314576) +++ head/usr.bin/mkimg/mkimg.h Fri Mar 3 01:56:55 2017 (r314577) @@ -104,4 +104,10 @@ typedef struct mkimg_uuid mkimg_uuid_t; void mkimg_uuid(mkimg_uuid_t *); void mkimg_uuid_enc(void *, const mkimg_uuid_t *); +#ifdef __linux__ +# if !defined(__unused) +# define __unused __attribute__ ((__unused__)) +# endif +#endif + #endif /* _MKIMG_MKIMG_H_ */ Modified: head/usr.bin/mkimg/uuid.c ============================================================================== --- head/usr.bin/mkimg/uuid.c Fri Mar 3 01:50:10 2017 (r314576) +++ head/usr.bin/mkimg/uuid.c Fri Mar 3 01:56:55 2017 (r314577) @@ -66,16 +66,16 @@ osdep_uuidgen(mkimg_uuid_t *uuid) static void osdep_uuidgen(mkimg_uuid_t *uuid) { - struct timespec tp; + struct timeval tv; uint64_t time = 0x01B21DD213814000LL; u_int i; uint16_t seq; - if (clock_gettime(CLOCK_REALTIME, &tp) == -1) + if (gettimeofday(&tv, NULL) == -1) abort(); - time += (uint64_t)tp.tv_sec * 10000000LL; - time += tp.tv_nsec / 100; + time += (uint64_t)tv.tv_sec * 10000000LL; + time += tv.tv_usec * 10; uuid->time_low = (uint32_t)time; uuid->time_mid = (uint16_t)(time >> 32); From owner-svn-src-all@freebsd.org Fri Mar 3 02:41:47 2017 Return-Path: Delivered-To: svn-src-all@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 29706CF5F04; Fri, 3 Mar 2017 02:41:47 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-qk0-x22a.google.com (mail-qk0-x22a.google.com [IPv6:2607:f8b0:400d:c09::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DCDEE1A0C; Fri, 3 Mar 2017 02:41:46 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-qk0-x22a.google.com with SMTP id 1so36897783qkl.3; Thu, 02 Mar 2017 18:41:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=0IV8HIWxJKJcBNqa179mRKmRZg/ePuxT4oz5yKpBF6Y=; b=lIUm+9d3QIHpt34si9R+OQX0DnCE80RjDt8RaYzrXa/A3vx249DqUGvWwsxnMP1bY0 o0XJossa1v4InIqgRTPU2o41NiUmguUC1BKlnQIss7rdN01NvSLkd1w0C9JsN8Gpv+9C Yb657FFp3TZU6Xrc4+y7x+1ILuuQaP69q6NwLekMLEEAD9k04QsKRBN8LDfWU3qg30Nx 1U9v+0tu8OD7Im1lyVLCcXGnp0rjvlheeTO3zMlurBK2g0bnaW+LEhGH4LCUtj89CaJt nOVgZTQx4ka8XFPfCPl1RdSoEP6LwfS6kZC2IwLr5KJoUt6lOz3pgSZChs2X/gYc3Pc3 kd2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=0IV8HIWxJKJcBNqa179mRKmRZg/ePuxT4oz5yKpBF6Y=; b=ce3EVZWtGhUfFX6ps46/ev1gKdPIctsBI/Cl4L4hEuwkcgHQTfGLSk3PZYPm72sjv3 v3c2OArkrAmXlpKg40eAcvv4Tv97Bu88D5RO/ssAK4xoa1gYv8yVNdxNN0+S163gQULn CHjwlC5dN4MN9uhBqRt9dzce/aI70+wzTXG3pVXIJvz+fhiSjTulDQwDfVTzu9/AZxr/ LP15Qgux2k5s9T1S5z3sxY6+8ohbQW6+FelucvdT2e1VXSByJrk+KYLZw+OF5xvxSqAz 0sG5PDXAiGJPCi08tnRJUiWP9IDe/025fDmWoIjkHkQBWso+XQwvEIYv7AUxO/72G9Xu n48Q== X-Gm-Message-State: AMke39nTw7q7Ib4LeUTdeAN8e0mCnJnf/9Kll82GZ7DBLpaIZdBid7DE1FLaCjqWP/OgqyapWS9MAlYwo1Lshg== X-Received: by 10.200.3.74 with SMTP id w10mr477297qtg.73.1488508905849; Thu, 02 Mar 2017 18:41:45 -0800 (PST) MIME-Version: 1.0 Received: by 10.140.104.200 with HTTP; Thu, 2 Mar 2017 18:41:45 -0800 (PST) In-Reply-To: <201703020011.v220BWQ0086961@repo.freebsd.org> References: <201703020011.v220BWQ0086961@repo.freebsd.org> From: Ngie Cooper Date: Thu, 2 Mar 2017 18:41:45 -0800 Message-ID: Subject: Re: svn commit: r314527 - in head: crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat crypto/ope... To: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 02:41:47 -0000 On Wed, Mar 1, 2017 at 4:11 PM, Dag-Erling Sm=C3=B8rgrav = wrote: > Author: des > Date: Thu Mar 2 00:11:32 2017 > New Revision: 314527 > URL: https://svnweb.freebsd.org/changeset/base/314527 > > Log: > Upgrade to OpenSSH 7.3p1. Hi DES, I'm not sure if you saw this commit last month, but it conditionalized libwrap support (which is unfortunately broken again): commit 078b533dd4a9d30e34427fab86a493af72b3a300 Author: ngie Date: Sat Jan 7 08:08:35 2017 +0000 Conditionalize building libwrap support into sshd Only build libwrap support into sshd if MK_TCP_WRAPPERS !=3D no This will unbreak the build if libwrap has been removed from the system MFC after: 2 weeks PR: 210141 Submitted by: kpect@protonmail.com Differential Revision: D9049 Notes: svn path=3D/head/; revision=3D311585 This change fixes the build again when MK_TCP_WRAPPERS =3D=3D no: $ git diff /usr/src/secure/usr.sbin/sshd/../../../crypto/openssh/config.h diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h index 729edba7c3b7..63418ab07eb9 100644 --- a/crypto/openssh/config.h +++ b/crypto/openssh/config.h @@ -1438,7 +1438,7 @@ /* #undef LASTLOG_WRITE_PUTUTXLINE */ /* Define if you want TCP Wrappers support */ -#define LIBWRAP 1 +/* #undef LIBWRAP */ /* Define to whatever link() returns for "not supported" if it doesn't ret= urn EOPNOTSUPP. */ Thanks, -Ngie From owner-svn-src-all@freebsd.org Fri Mar 3 02:55:32 2017 Return-Path: Delivered-To: svn-src-all@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 78FF4CF6241; Fri, 3 Mar 2017 02:55:32 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 3F2261145; Fri, 3 Mar 2017 02:55:32 +0000 (UTC) (envelope-from des@des.no) Received: from desk.des.no (smtp.des.no [194.63.250.102]) by smtp.des.no (Postfix) with ESMTP id A043C97A5; Fri, 3 Mar 2017 02:55:25 +0000 (UTC) Received: by desk.des.no (Postfix, from userid 1001) id 6FAB74720; Fri, 3 Mar 2017 03:55:25 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Ngie Cooper Cc: "src-committers\@freebsd.org" , "svn-src-all\@freebsd.org" , "svn-src-head\@freebsd.org" Subject: Re: svn commit: r314527 - in head: crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat crypto/ope... References: <201703020011.v220BWQ0086961@repo.freebsd.org> Date: Fri, 03 Mar 2017 03:55:25 +0100 In-Reply-To: (Ngie Cooper's message of "Thu, 2 Mar 2017 18:41:45 -0800") Message-ID: <86k28783xe.fsf@desk.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 02:55:32 -0000 Ngie Cooper writes: > I'm not sure if you saw this commit last month, but it conditionalized > libwrap support (which is unfortunately broken again): No, I didn't see it, did you see this? % grep ssh /usr/src/MAINTAINERS=20 openssh des Pre-commit review requested. Anyway, I'll fix it in 7.4. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-svn-src-all@freebsd.org Fri Mar 3 03:07:11 2017 Return-Path: Delivered-To: svn-src-all@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 A0D53CF6729; Fri, 3 Mar 2017 03:07:11 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-qk0-x235.google.com (mail-qk0-x235.google.com [IPv6:2607:f8b0:400d:c09::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5A8251DB6; Fri, 3 Mar 2017 03:07:11 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-qk0-x235.google.com with SMTP id 1so37542900qkl.3; Thu, 02 Mar 2017 19:07:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=nPUyuSXY6tc/Uf/Q3YrA01y4v3IkTkMCORtBRC4LgOc=; b=rfRTzaEKCmTqD4GNIWLbQvjIlnMcjWIAo6TkkSeYEJ3t46uRfQsBAUYVo4vJJpJLN6 iYihN68Cy/H6KmyKC474pHlm9+RJ+W8zrpc6DdO+M6K2gbSUcKCRAqgxyQx63/A8kbdp HDzOgTlCXJLsq4fGdLgMR1A92JBOfyJ9HQ/XRnuVZx6aiVop0ipJNeeEKto0sdKRIM9T JNrxX/tQQ5hU6iql+XnhSLpE2gD8EsrAcHx/cx8fGDaDtYFyy5KI9zIHIPlGbmi2t7Bd qKHsmxWmZBO9ffQHfLH2K9bWFyvlIIdOHTfgnnTNHm6Dp0A7SqhUFaocrFNZHlRPlnIZ Xf1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=nPUyuSXY6tc/Uf/Q3YrA01y4v3IkTkMCORtBRC4LgOc=; b=STxijhyydAMp3+tvCjmjElk8mba1QJfYYhCRZ2ROtnz8rogmS6RGPaNgXTOnB75CXo 7q8HzaP0Ldo/ki/C4cJvanRu2ZMFN/4nqL7GrSyU8vN0yuooqgy0wRI8gbBcoL0Bcyfx JNIn6ELRXxtZEGGzaRAqW0nXCMWsxunx+Cof0rpUSokGSBkupN55NZi7LNtwk+MZpdrj t87DI07MvXj1yrzyCEdkgrFfKF2csujsibebsJ7+jSryX8Bt2XIio1yHYwqmUf9tmy8v QWijYAEOcZeFolonKp1VmnT4YUfl2Zv/SgquYxSPy+dptoLKfHtYEaX4Suc1lQDR6wa1 dOJA== X-Gm-Message-State: AMke39k+JXdUyQyEO+R/GMW786AyQ8RW01wz63C9s51OYXykCCvWC3SKecFJqLnGnllYm1yAhnwVTgBtsxTdtQ== X-Received: by 10.200.1.14 with SMTP id e14mr540051qtg.244.1488510430540; Thu, 02 Mar 2017 19:07:10 -0800 (PST) MIME-Version: 1.0 Received: by 10.140.104.200 with HTTP; Thu, 2 Mar 2017 19:07:10 -0800 (PST) In-Reply-To: <86k28783xe.fsf@desk.des.no> References: <201703020011.v220BWQ0086961@repo.freebsd.org> <86k28783xe.fsf@desk.des.no> From: Ngie Cooper Date: Thu, 2 Mar 2017 19:07:10 -0800 Message-ID: Subject: Re: svn commit: r314527 - in head: crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat crypto/ope... To: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 03:07:11 -0000 On Thu, Mar 2, 2017 at 6:55 PM, Dag-Erling Sm=C3=B8rgrav wrote= : > Ngie Cooper writes: >> I'm not sure if you saw this commit last month, but it conditionalized >> libwrap support (which is unfortunately broken again): > > No, I didn't see it, did you see this? > > % grep ssh /usr/src/MAINTAINERS > openssh des Pre-commit review requested. > > Anyway, I'll fix it in 7.4. Hi, Yes, I included you on the CR because I wanted to make sure that you were aware of the change. Looking at the CR though, I didn't wait long enough for a reply, so the proverbial egg's on my face for being impatient. Thanks, -Ngie From owner-svn-src-all@freebsd.org Fri Mar 3 03:07:55 2017 Return-Path: Delivered-To: svn-src-all@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 D167ECF6788; Fri, 3 Mar 2017 03:07:55 +0000 (UTC) (envelope-from np@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 ABED41F17; Fri, 3 Mar 2017 03:07:55 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2337scw032588; Fri, 3 Mar 2017 03:07:54 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2337sTR032584; Fri, 3 Mar 2017 03:07:54 GMT (envelope-from np@FreeBSD.org) Message-Id: <201703030307.v2337sTR032584@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Fri, 3 Mar 2017 03:07:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314578 - head/sys/dev/cxgbe/iw_cxgbe X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 03:07:55 -0000 Author: np Date: Fri Mar 3 03:07:54 2017 New Revision: 314578 URL: https://svnweb.freebsd.org/changeset/base/314578 Log: cxgbe/iw_cxgbe: Implement sq/rq drain operation. ULPs can set a qp's state to ERROR and then post a work request on the sq and/or rq. When the reply for that work request comes back it is guaranteed that all previous work requests posted on that queue have been drained. Obtained from: Chelsio Communications MFC after: 3 days Sponsored by: Chelsio Communications Modified: head/sys/dev/cxgbe/iw_cxgbe/cq.c head/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h head/sys/dev/cxgbe/iw_cxgbe/qp.c head/sys/dev/cxgbe/iw_cxgbe/t4.h Modified: head/sys/dev/cxgbe/iw_cxgbe/cq.c ============================================================================== --- head/sys/dev/cxgbe/iw_cxgbe/cq.c Fri Mar 3 01:56:55 2017 (r314577) +++ head/sys/dev/cxgbe/iw_cxgbe/cq.c Fri Mar 3 03:07:54 2017 (r314578) @@ -450,6 +450,15 @@ static int poll_cq(struct t4_wq *wq, str } /* + * Special cqe for drain WR completions... + */ + if (CQE_OPCODE(hw_cqe) == C4IW_DRAIN_OPCODE) { + *cookie = CQE_DRAIN_COOKIE(hw_cqe); + *cqe = *hw_cqe; + goto skip_cqe; + } + + /* * Gotta tweak READ completions: * 1) the cqe doesn't contain the sq_wptr from the wr. * 2) opcode not reflected from the wr. @@ -665,6 +674,9 @@ static int c4iw_poll_cq_one(struct c4iw_ case FW_RI_FAST_REGISTER: wc->opcode = IB_WC_FAST_REG_MR; break; + case C4IW_DRAIN_OPCODE: + wc->opcode = IB_WC_SEND; + break; default: printf("Unexpected opcode %d " "in the CQE received for QPID = 0x%0x\n", Modified: head/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h ============================================================================== --- head/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h Fri Mar 3 01:56:55 2017 (r314577) +++ head/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h Fri Mar 3 03:07:54 2017 (r314578) @@ -559,6 +559,8 @@ static inline int to_ib_qp_state(int c4i return IB_QPS_ERR; } +#define C4IW_DRAIN_OPCODE FW_RI_SGE_EC_CR_RETURN + static inline u32 c4iw_ib_to_tpt_access(int a) { return (a & IB_ACCESS_REMOTE_WRITE ? FW_RI_MEM_ACCESS_REM_WRITE : 0) | Modified: head/sys/dev/cxgbe/iw_cxgbe/qp.c ============================================================================== --- head/sys/dev/cxgbe/iw_cxgbe/qp.c Fri Mar 3 01:56:55 2017 (r314577) +++ head/sys/dev/cxgbe/iw_cxgbe/qp.c Fri Mar 3 03:07:54 2017 (r314578) @@ -577,6 +577,66 @@ void c4iw_qp_rem_ref(struct ib_qp *qp) wake_up(&(to_c4iw_qp(qp)->wait)); } +static void complete_sq_drain_wr(struct c4iw_qp *qhp, struct ib_send_wr *wr) +{ + struct t4_cqe cqe = {}; + struct c4iw_cq *schp; + unsigned long flag; + struct t4_cq *cq; + + schp = to_c4iw_cq(qhp->ibqp.send_cq); + cq = &schp->cq; + + PDBG("%s drain sq id %u\n", __func__, qhp->wq.sq.qid); + cqe.u.drain_cookie = wr->wr_id; + cqe.header = cpu_to_be32(V_CQE_STATUS(T4_ERR_SWFLUSH) | + V_CQE_OPCODE(C4IW_DRAIN_OPCODE) | + V_CQE_TYPE(1) | + V_CQE_SWCQE(1) | + V_CQE_QPID(qhp->wq.sq.qid)); + + spin_lock_irqsave(&schp->lock, flag); + cqe.bits_type_ts = cpu_to_be64(V_CQE_GENBIT((u64)cq->gen)); + cq->sw_queue[cq->sw_pidx] = cqe; + t4_swcq_produce(cq); + spin_unlock_irqrestore(&schp->lock, flag); + + spin_lock_irqsave(&schp->comp_handler_lock, flag); + (*schp->ibcq.comp_handler)(&schp->ibcq, + schp->ibcq.cq_context); + spin_unlock_irqrestore(&schp->comp_handler_lock, flag); +} + +static void complete_rq_drain_wr(struct c4iw_qp *qhp, struct ib_recv_wr *wr) +{ + struct t4_cqe cqe = {}; + struct c4iw_cq *rchp; + unsigned long flag; + struct t4_cq *cq; + + rchp = to_c4iw_cq(qhp->ibqp.recv_cq); + cq = &rchp->cq; + + PDBG("%s drain rq id %u\n", __func__, qhp->wq.sq.qid); + cqe.u.drain_cookie = wr->wr_id; + cqe.header = cpu_to_be32(V_CQE_STATUS(T4_ERR_SWFLUSH) | + V_CQE_OPCODE(C4IW_DRAIN_OPCODE) | + V_CQE_TYPE(0) | + V_CQE_SWCQE(1) | + V_CQE_QPID(qhp->wq.sq.qid)); + + spin_lock_irqsave(&rchp->lock, flag); + cqe.bits_type_ts = cpu_to_be64(V_CQE_GENBIT((u64)cq->gen)); + cq->sw_queue[cq->sw_pidx] = cqe; + t4_swcq_produce(cq); + spin_unlock_irqrestore(&rchp->lock, flag); + + spin_lock_irqsave(&rchp->comp_handler_lock, flag); + (*rchp->ibcq.comp_handler)(&rchp->ibcq, + rchp->ibcq.cq_context); + spin_unlock_irqrestore(&rchp->comp_handler_lock, flag); +} + int c4iw_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, struct ib_send_wr **bad_wr) { @@ -595,7 +655,8 @@ int c4iw_post_send(struct ib_qp *ibqp, s spin_lock_irqsave(&qhp->lock, flag); if (t4_wq_in_error(&qhp->wq)) { spin_unlock_irqrestore(&qhp->lock, flag); - return -EINVAL; + complete_sq_drain_wr(qhp, wr); + return err; } num_wrs = t4_sq_avail(&qhp->wq); if (num_wrs == 0) { @@ -708,7 +769,8 @@ int c4iw_post_receive(struct ib_qp *ibqp spin_lock_irqsave(&qhp->lock, flag); if (t4_wq_in_error(&qhp->wq)) { spin_unlock_irqrestore(&qhp->lock, flag); - return -EINVAL; + complete_rq_drain_wr(qhp, wr); + return err; } num_wrs = t4_rq_avail(&qhp->wq); if (num_wrs == 0) { @@ -1303,7 +1365,12 @@ int c4iw_modify_qp(struct c4iw_dev *rhp, } break; case C4IW_QP_STATE_CLOSING: - if (!internal) { + + /* + * Allow kernel users to move to ERROR for qp draining. + */ + if (!internal && (qhp->ibqp.uobject || attrs->next_state != + C4IW_QP_STATE_ERROR)) { ret = -EINVAL; goto out; } Modified: head/sys/dev/cxgbe/iw_cxgbe/t4.h ============================================================================== --- head/sys/dev/cxgbe/iw_cxgbe/t4.h Fri Mar 3 01:56:55 2017 (r314577) +++ head/sys/dev/cxgbe/iw_cxgbe/t4.h Fri Mar 3 03:07:54 2017 (r314578) @@ -203,6 +203,7 @@ struct t4_cqe { __be32 wrid_hi; __be32 wrid_low; } gen; + u64 drain_cookie; } u; __be64 reserved; __be64 bits_type_ts; @@ -261,6 +262,7 @@ struct t4_cqe { /* generic accessor macros */ #define CQE_WRID_HI(x) ((x)->u.gen.wrid_hi) #define CQE_WRID_LOW(x) ((x)->u.gen.wrid_low) +#define CQE_DRAIN_COOKIE(x) (x)->u.drain_cookie; /* macros for flit 3 of the cqe */ #define S_CQE_GENBIT 63 From owner-svn-src-all@freebsd.org Fri Mar 3 03:12:00 2017 Return-Path: Delivered-To: svn-src-all@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 2D77BCF69B1; Fri, 3 Mar 2017 03:12:00 +0000 (UTC) (envelope-from np@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 0584713DC; Fri, 3 Mar 2017 03:11:59 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v233Bxnl036292; Fri, 3 Mar 2017 03:11:59 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v233BwJS036284; Fri, 3 Mar 2017 03:11:58 GMT (envelope-from np@FreeBSD.org) Message-Id: <201703030311.v233BwJS036284@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Fri, 3 Mar 2017 03:11:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314579 - in head: share/mk targets/pseudo/userland tools/build/options tools/tools/cxgbetool usr.sbin usr.sbin/cxgbetool X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 03:12:00 -0000 Author: np Date: Fri Mar 3 03:11:58 2017 New Revision: 314579 URL: https://svnweb.freebsd.org/changeset/base/314579 Log: Add cxgbetool(8) to the base system. Move cxgbetool from tools/tools to usr.sbin. Compile and install it on platforms where cxgbe(4) is built by default. Knobs (WITH_CXGBETOOL and WITHOUT_CXGBETOOL) have been added so that the user can override the default setting. Reviewed by: ngie@, gnn@, bdrewery@ MFC after: 1 month Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D9854 Added: head/tools/build/options/WITHOUT_CXGBETOOL (contents, props changed) head/tools/build/options/WITH_CXGBETOOL (contents, props changed) head/usr.sbin/cxgbetool/ - copied from r314578, head/tools/tools/cxgbetool/ head/usr.sbin/cxgbetool/Makefile.depend (contents, props changed) Deleted: head/tools/tools/cxgbetool/ Modified: head/share/mk/src.opts.mk head/targets/pseudo/userland/Makefile.depend head/usr.sbin/Makefile head/usr.sbin/cxgbetool/Makefile Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Fri Mar 3 03:07:54 2017 (r314578) +++ head/share/mk/src.opts.mk Fri Mar 3 03:11:58 2017 (r314579) @@ -275,6 +275,13 @@ BROKEN_OPTIONS+=SSP BROKEN_OPTIONS+=EFI .endif +.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386" || \ + ${__T} == "powerpc64" || ${__T} == "sparc64" +__DEFAULT_YES_OPTIONS+=CXGBETOOL +.else +__DEFAULT_NO_OPTIONS+=CXGBETOOL +.endif + .include # Modified: head/targets/pseudo/userland/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/Makefile.depend Fri Mar 3 03:07:54 2017 (r314578) +++ head/targets/pseudo/userland/Makefile.depend Fri Mar 3 03:11:58 2017 (r314579) @@ -895,6 +895,10 @@ DIRDEPS+= \ usr.sbin/blacklistd .endif +.if ${MK_CXGBETOOL} != "no" +DIRDEPS+= usr.sbin/cxgbetool +.endif + .if ${MK_GPL_DTC} != "yes" DIRDEPS+= usr.bin/dtc .endif Added: head/tools/build/options/WITHOUT_CXGBETOOL ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_CXGBETOOL Fri Mar 3 03:11:58 2017 (r314579) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build +.Xr cxgbetool 8 Added: head/tools/build/options/WITH_CXGBETOOL ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_CXGBETOOL Fri Mar 3 03:11:58 2017 (r314579) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to build +.Xr cxgbetool 8 Modified: head/usr.sbin/Makefile ============================================================================== --- head/usr.sbin/Makefile Fri Mar 3 03:07:54 2017 (r314578) +++ head/usr.sbin/Makefile Fri Mar 3 03:11:58 2017 (r314579) @@ -123,6 +123,7 @@ SUBDIR.${MK_BOOTPARAMD}+= bootparamd SUBDIR.${MK_BSDINSTALL}+= bsdinstall SUBDIR.${MK_BSNMP}+= bsnmpd SUBDIR.${MK_CTM}+= ctm +SUBDIR.${MK_CXGBETOOL}+= cxgbetool SUBDIR.${MK_DIALOG}+= bsdconfig SUBDIR.${MK_EFI}+= efivar SUBDIR.${MK_FLOPPY}+= fdcontrol Modified: head/usr.sbin/cxgbetool/Makefile ============================================================================== --- head/tools/tools/cxgbetool/Makefile Fri Mar 3 03:07:54 2017 (r314578) +++ head/usr.sbin/cxgbetool/Makefile Fri Mar 3 03:11:58 2017 (r314579) @@ -1,9 +1,8 @@ # $FreeBSD$ PROG= cxgbetool -SRCS= cxgbetool.c MAN= cxgbetool.8 -CFLAGS+= -I${.CURDIR}/../../../sys/dev/cxgbe -I${.CURDIR}/../../../sys -I. -BINDIR?= /usr/sbin +CFLAGS+= -I${SRCTOP}/sys/dev/cxgbe -I${SRCTOP}/sys -I. +WARNS?= 2 .include Added: head/usr.sbin/cxgbetool/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/cxgbetool/Makefile.depend Fri Mar 3 03:11:58 2017 (r314579) @@ -0,0 +1,19 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + include \ + include/arpa \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif From owner-svn-src-all@freebsd.org Fri Mar 3 03:14:06 2017 Return-Path: Delivered-To: svn-src-all@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 28574CF6A63; Fri, 3 Mar 2017 03:14:06 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id E1F23162E; Fri, 3 Mar 2017 03:14:05 +0000 (UTC) (envelope-from des@des.no) Received: from desk.des.no (smtp.des.no [194.63.250.102]) by smtp.des.no (Postfix) with ESMTP id C6304985E; Fri, 3 Mar 2017 03:14:04 +0000 (UTC) Received: by desk.des.no (Postfix, from userid 1001) id 96D334724; Fri, 3 Mar 2017 04:14:04 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Ngie Cooper Cc: "src-committers\@freebsd.org" , "svn-src-all\@freebsd.org" , "svn-src-head\@freebsd.org" Subject: Re: svn commit: r314527 - in head: crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat crypto/ope... References: <201703020011.v220BWQ0086961@repo.freebsd.org> <86k28783xe.fsf@desk.des.no> Date: Fri, 03 Mar 2017 04:14:04 +0100 In-Reply-To: (Ngie Cooper's message of "Thu, 2 Mar 2017 19:07:10 -0800") Message-ID: <86fuiv832b.fsf@desk.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 03:14:06 -0000 Ngie Cooper writes: > Yes, I included you on the CR [...] CR? DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-svn-src-all@freebsd.org Fri Mar 3 04:22:37 2017 Return-Path: Delivered-To: svn-src-all@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 5917ACF4E16; Fri, 3 Mar 2017 04:22:37 +0000 (UTC) (envelope-from allanjude@freebsd.org) Received: from mx1.scaleengine.net (mx1.scaleengine.net [209.51.186.6]) (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 E359917E0; Fri, 3 Mar 2017 04:22:36 +0000 (UTC) (envelope-from allanjude@freebsd.org) Received: from [10.1.1.2] (unknown [10.1.1.2]) (Authenticated sender: allanjude.freebsd@scaleengine.com) by mx1.scaleengine.net (Postfix) with ESMTPSA id 41D97138AC; Fri, 3 Mar 2017 04:22:29 +0000 (UTC) Subject: Re: svn commit: r314527 - in head: crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat crypto/ope... To: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= , Ngie Cooper References: <201703020011.v220BWQ0086961@repo.freebsd.org> <86k28783xe.fsf@desk.des.no> <86fuiv832b.fsf@desk.des.no> Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" From: Allan Jude Message-ID: <59d9780e-6ec3-4e5d-0c9e-77e3639205f6@freebsd.org> Date: Thu, 2 Mar 2017 23:22:20 -0500 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <86fuiv832b.fsf@desk.des.no> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="qRSP8QT2eT9u2vnaMoAmWVOnR4lMHJQGC" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 04:22:37 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --qRSP8QT2eT9u2vnaMoAmWVOnR4lMHJQGC Content-Type: multipart/mixed; boundary="DsDe1WAeQerUFj0xN6rBSD7NiqnDx9nXQ"; protected-headers="v1" From: Allan Jude To: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= , Ngie Cooper Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-ID: <59d9780e-6ec3-4e5d-0c9e-77e3639205f6@freebsd.org> Subject: Re: svn commit: r314527 - in head: crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat crypto/ope... References: <201703020011.v220BWQ0086961@repo.freebsd.org> <86k28783xe.fsf@desk.des.no> <86fuiv832b.fsf@desk.des.no> In-Reply-To: <86fuiv832b.fsf@desk.des.no> --DsDe1WAeQerUFj0xN6rBSD7NiqnDx9nXQ Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2017-03-02 22:14, Dag-Erling Sm=C3=B8rgrav wrote: > Ngie Cooper writes: >> Yes, I included you on the CR [...] >=20 > CR? >=20 > DES >=20 Code Review (Phabricator) --=20 Allan Jude --DsDe1WAeQerUFj0xN6rBSD7NiqnDx9nXQ-- --qRSP8QT2eT9u2vnaMoAmWVOnR4lMHJQGC Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (MingW32) iQIcBAEBAgAGBQJYuO+EAAoJEBmVNT4SmAt+yNoQANj5KrcI4YlwbjqtNMYs+Wm7 oZ3GE4tGj4qXEAChJhsLnPSnQGs1962vmF75NeY6CizVkdQUMRxCKml5jbiQqtPB +Jt69ARas26Dvpqe6w9brkOxew03+TkGUa0Xfd4nxW8wQc6qX8GH8zxFi+MIqeUu pqG2yq04zVAv6819L5muhnyd3dN1WsBFh2FgUSC8jOzmNuOHV+7kj9pwJpy1mO6p /LBy00tJUcMQfDtdq2WvhvLdn0blPDgfqsXiO5eHze4cqnKOFRcxduCOToiMHiXA yE/CP4TmtOh6o3BD2pdxn4QkO78fauEAL+8olOv839VXo4qKtLg6c67hnW+evaFo K1kkmt8tKcFXajPz5MzuQIMI3FfgDtCCtD5nZ0i0t4dRRhDaZJEpUA6LzLR1a3yA tMXbOiSJX1s4lL6ioeX1d6wwbVAauKPpjb7HtbnmL3T+NLOKe5lio83h8CaHI3G2 wPjDA/ZbXCjr8X/BmaVdF3EpRtNk/s+VODTdfZxTvu9GUxKFXWZs8h8+hwuBj86U h6ijQamqmi70M9+7txjIhDjL+w3fWrpcDckrrQDl9v3iXfWMkyr97rM1D03fWGXr y/Px7C1T3GNg6SV5o8lQ9NdoF5z1T38owwfIMVHxcc3fSEA5FJJYCsYsSTmmRGrR xps8Amm6qpWPcw/8gs16 =C8yA -----END PGP SIGNATURE----- --qRSP8QT2eT9u2vnaMoAmWVOnR4lMHJQGC-- From owner-svn-src-all@freebsd.org Fri Mar 3 05:04:11 2017 Return-Path: Delivered-To: svn-src-all@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 A0952CF6E67; Fri, 3 Mar 2017 05:04:11 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 68BE51A0D; Fri, 3 Mar 2017 05:04:11 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pf0-x243.google.com with SMTP id x66so8746841pfb.1; Thu, 02 Mar 2017 21:04:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:mime-version:from:in-reply-to:date:cc:message-id:references :to; bh=5Rq4pf077iIwC0e3IUNcOusdHPaw4c2ibH6tvQftma0=; b=YOTQUm0hzhSLL2j6fU+i/7KmgpGaf2BzGockCnmO4JWZmdV/yz7b8zyRMGrIS0qxwS cwFJlQTtmC1D1EVZ1F6uqM4zxsux2UwXLNDEt+QbS6rypvr9iF3gOKU5XpUs2oEoLuuP zT9PTLKZhqX1e+4gNe2tDRDW/08JEjOIBCinUMQ5nyO8Gr7VQhDmDKL/qSBPqlDfDjTG nmjlQmXZzvgonA3TjBoLrS6uTYq8iBMuGAFfBcQiCwwBVFECrbWF9/vTqLeiX7Z7h1St M3LEzRdWlSpW2dl6sIRtt7eFw7qX2mx6nvDPVgUzpQA16KSz17zEx1/7uJWJ3oGsCEkT 5X4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:mime-version:from:in-reply-to:date:cc :message-id:references:to; bh=5Rq4pf077iIwC0e3IUNcOusdHPaw4c2ibH6tvQftma0=; b=KDi/OBqTE8EGxRQ1/GlHFjHpcMem6JwJ9fqGIb7FB05nWNX3uZduBdX9xlYDC8ToVe Pp8KdoEY71ULVQsoV0UfYzZewyn58Dkpe092fHFr5H6KTHx+e2F9G7GoQO3Mh/yabGJb USL1LYXbasT+R3JkFipcLsY27TkYMAm3IBx3g73XRHhuZl32mwqwgeKhBFOzjgzqYoTY V+AmpP/8nyKEvhuFotc0vyZz9vWiRsMncX3L3Y6ImF0L625GM08vkFVwDHYf0IFqmtJd 48lP5RsPiUtJ3j5qul7fHNE5YcqD7NRyYlIT1GSybP6OiFqiIIo96mWcizf3BFdKnpu9 jn0Q== X-Gm-Message-State: AMke39ly8+sxiabyhJbL++uP2So5cZ69gDsI6lyWokE1es3axo1qdWBnBv7tl8pyud2aXQ== X-Received: by 10.98.69.139 with SMTP id n11mr1134428pfi.65.1488517450756; Thu, 02 Mar 2017 21:04:10 -0800 (PST) Received: from pinklady.local (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id g85sm20116746pfd.89.2017.03.02.21.04.09 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 Mar 2017 21:04:09 -0800 (PST) Subject: Re: svn commit: r314527 - in head: crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat crypto/ope... Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Content-Type: multipart/signed; boundary="Apple-Mail=_67BE8F73-57ED-451E-ACF0-D5DE0DD822AC"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail From: "Ngie Cooper (yaneurabeya)" In-Reply-To: <59d9780e-6ec3-4e5d-0c9e-77e3639205f6@freebsd.org> Date: Thu, 2 Mar 2017 21:04:08 -0800 Cc: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-Id: <8FE7A2E0-BB9C-4C48-82D9-B7027CA50358@gmail.com> References: <201703020011.v220BWQ0086961@repo.freebsd.org> <86k28783xe.fsf@desk.des.no> <86fuiv832b.fsf@desk.des.no> <59d9780e-6ec3-4e5d-0c9e-77e3639205f6@freebsd.org> To: Allan Jude X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 05:04:11 -0000 --Apple-Mail=_67BE8F73-57ED-451E-ACF0-D5DE0DD822AC Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Mar 2, 2017, at 20:22, Allan Jude wrote: >=20 > On 2017-03-02 22:14, Dag-Erling Sm=C3=B8rgrav wrote: >> Ngie Cooper writes: >>> Yes, I included you on the CR [...] >>=20 >> CR? >>=20 >> DES >>=20 >=20 > Code Review (Phabricator) Yup =E2=80=94 that=E2=80=99s what I meant. Thanks Allan :)! -Ngie --Apple-Mail=_67BE8F73-57ED-451E-ACF0-D5DE0DD822AC Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJYuPlIAAoJEPWDqSZpMIYVOP4P/2dIEOlq7qngOGlFagAf6b1H VBF7WA4jN3NVzq8IGLbvfnGOaheC6cwq8Sr3z6KV7FJKF9B0o3Nbi0y6rhl4SSlu 236q4R6LYM6W2dg6eMVzUYXuHG4yNCwyLfUABxAWivTTVoIybredlZ3e7e9CZQNP Qg+x/rKVQ8tAi4DjyQ/VXUOyYUT3aidsbGYy2HIQfOuW5eeeVrFvUAncUBoefXVD lcDYbtEVrs2TrH1alvdZUb3hyDImRu9Q+8cW2OGeUxZ5D9PjbxNGgqhhsUmIPkSz fDGAJRJQpGcPGEXkgFV5eNkw11Cvh7YDGvu2Y0H6ao/VNUDBGr9+/OAFpda4CtMw x8BTeP1FAsl1fpcQshNlvqYJyy8O2GvLcUlXLhrauD8Yf9mFCAGyz10w0fo4sXJV YNTaMG+VNQbhxaNNpYQ0fIDWN5d+QvnPO0NrZ8gct/huqniWvif8xpuLHC7rejb8 9ZiBdxTT5bzixwdSCYQKwvu4F/ARhcNi5dVC6sbd2cawRjKpGDYL4N6u9YVU86UN TwyWPTzm9wv2s8UlKyXpKSyICwteIf1y1zoJ+myQoVnLuib2XIa85bP+pu5rmsUy ACBqwH31NhE1bxy4XxE2xRas8gZxn5PIUqLb1T/r3edJosmOYe32O8eJDWNGN68G VjcKWo33j9U+Pkd8dcgt =WjxV -----END PGP SIGNATURE----- --Apple-Mail=_67BE8F73-57ED-451E-ACF0-D5DE0DD822AC-- From owner-svn-src-all@freebsd.org Fri Mar 3 06:02:28 2017 Return-Path: Delivered-To: svn-src-all@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 67FB9CF6F11; Fri, 3 Mar 2017 06:02:28 +0000 (UTC) (envelope-from mav@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 34C69168E; Fri, 3 Mar 2017 06:02:28 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2362RSe005892; Fri, 3 Mar 2017 06:02:27 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2362RUg005891; Fri, 3 Mar 2017 06:02:27 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201703030602.v2362RUg005891@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 3 Mar 2017 06:02:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314580 - stable/11/sys/dev/iscsi X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 06:02:28 -0000 Author: mav Date: Fri Mar 3 06:02:27 2017 New Revision: 314580 URL: https://svnweb.freebsd.org/changeset/base/314580 Log: MFC r313851: Fix tight loop spinning on postponed requests. Modified: stable/11/sys/dev/iscsi/iscsi.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/iscsi/iscsi.c ============================================================================== --- stable/11/sys/dev/iscsi/iscsi.c Fri Mar 3 03:11:58 2017 (r314579) +++ stable/11/sys/dev/iscsi/iscsi.c Fri Mar 3 06:02:27 2017 (r314580) @@ -475,15 +475,14 @@ iscsi_maintenance_thread_terminate(struc static void iscsi_maintenance_thread(void *arg) { - struct iscsi_session *is; - - is = arg; + struct iscsi_session *is = arg; + ISCSI_SESSION_LOCK(is); for (;;) { - ISCSI_SESSION_LOCK(is); if (is->is_reconnecting == false && is->is_terminating == false && - STAILQ_EMPTY(&is->is_postponed)) + (STAILQ_EMPTY(&is->is_postponed) || + ISCSI_SNGT(is->is_cmdsn, is->is_maxcmdsn))) cv_wait(&is->is_maintenance_cv, &is->is_lock); /* Terminate supersedes reconnect. */ @@ -497,12 +496,13 @@ iscsi_maintenance_thread(void *arg) if (is->is_reconnecting) { ISCSI_SESSION_UNLOCK(is); iscsi_maintenance_thread_reconnect(is); + ISCSI_SESSION_LOCK(is); continue; } iscsi_session_send_postponed(is); - ISCSI_SESSION_UNLOCK(is); } + ISCSI_SESSION_UNLOCK(is); } static void From owner-svn-src-all@freebsd.org Fri Mar 3 06:03:02 2017 Return-Path: Delivered-To: svn-src-all@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 7E12ACF6F73; Fri, 3 Mar 2017 06:03:02 +0000 (UTC) (envelope-from mav@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 4AD3417E1; Fri, 3 Mar 2017 06:03:02 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23631xW005971; Fri, 3 Mar 2017 06:03:01 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23631Vq005970; Fri, 3 Mar 2017 06:03:01 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201703030603.v23631Vq005970@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 3 Mar 2017 06:03:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314581 - stable/10/sys/dev/iscsi X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 06:03:02 -0000 Author: mav Date: Fri Mar 3 06:03:01 2017 New Revision: 314581 URL: https://svnweb.freebsd.org/changeset/base/314581 Log: MFC r313851: Fix tight loop spinning on postponed requests. Modified: stable/10/sys/dev/iscsi/iscsi.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/iscsi/iscsi.c ============================================================================== --- stable/10/sys/dev/iscsi/iscsi.c Fri Mar 3 06:02:27 2017 (r314580) +++ stable/10/sys/dev/iscsi/iscsi.c Fri Mar 3 06:03:01 2017 (r314581) @@ -470,15 +470,14 @@ iscsi_maintenance_thread_terminate(struc static void iscsi_maintenance_thread(void *arg) { - struct iscsi_session *is; - - is = arg; + struct iscsi_session *is = arg; + ISCSI_SESSION_LOCK(is); for (;;) { - ISCSI_SESSION_LOCK(is); if (is->is_reconnecting == false && is->is_terminating == false && - STAILQ_EMPTY(&is->is_postponed)) + (STAILQ_EMPTY(&is->is_postponed) || + ISCSI_SNGT(is->is_cmdsn, is->is_maxcmdsn))) cv_wait(&is->is_maintenance_cv, &is->is_lock); /* Terminate supersedes reconnect. */ @@ -492,12 +491,13 @@ iscsi_maintenance_thread(void *arg) if (is->is_reconnecting) { ISCSI_SESSION_UNLOCK(is); iscsi_maintenance_thread_reconnect(is); + ISCSI_SESSION_LOCK(is); continue; } iscsi_session_send_postponed(is); - ISCSI_SESSION_UNLOCK(is); } + ISCSI_SESSION_UNLOCK(is); } static void From owner-svn-src-all@freebsd.org Fri Mar 3 06:04:04 2017 Return-Path: Delivered-To: svn-src-all@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 83E43CF6FDF; Fri, 3 Mar 2017 06:04:04 +0000 (UTC) (envelope-from mav@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 36BEE1939; Fri, 3 Mar 2017 06:04:04 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23643Z5006060; Fri, 3 Mar 2017 06:04:03 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23643Yi006059; Fri, 3 Mar 2017 06:04:03 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201703030604.v23643Yi006059@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 3 Mar 2017 06:04:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314582 - stable/11/sys/dev/iscsi X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 06:04:04 -0000 Author: mav Date: Fri Mar 3 06:04:03 2017 New Revision: 314582 URL: https://svnweb.freebsd.org/changeset/base/314582 Log: MFC r313852: Freeze CAM SIM when request is postponed due to MaxCmdSN. This allows to avoid resource allocation (especially offload) for requests that can not be executed at this time any way. Modified: stable/11/sys/dev/iscsi/iscsi.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/iscsi/iscsi.c ============================================================================== --- stable/11/sys/dev/iscsi/iscsi.c Fri Mar 3 06:03:01 2017 (r314581) +++ stable/11/sys/dev/iscsi/iscsi.c Fri Mar 3 06:04:03 2017 (r314582) @@ -231,14 +231,16 @@ iscsi_session_send_postponed(struct iscs ISCSI_SESSION_LOCK_ASSERT(is); - while (!STAILQ_EMPTY(&is->is_postponed)) { - request = STAILQ_FIRST(&is->is_postponed); + if (STAILQ_EMPTY(&is->is_postponed)) + return; + while ((request = STAILQ_FIRST(&is->is_postponed)) != NULL) { postpone = iscsi_pdu_prepare(request); if (postpone) - break; + return; STAILQ_REMOVE_HEAD(&is->is_postponed, ip_next); icl_pdu_queue(request); } + xpt_release_simq(is->is_sim, 1); } static void @@ -252,6 +254,8 @@ iscsi_pdu_queue_locked(struct icl_pdu *r iscsi_session_send_postponed(is); postpone = iscsi_pdu_prepare(request); if (postpone) { + if (STAILQ_EMPTY(&is->is_postponed)) + xpt_freeze_simq(is->is_sim, 1); STAILQ_INSERT_TAIL(&is->is_postponed, request, ip_next); return; } @@ -339,8 +343,9 @@ iscsi_session_cleanup(struct iscsi_sessi /* * Remove postponed PDUs. */ - while (!STAILQ_EMPTY(&is->is_postponed)) { - pdu = STAILQ_FIRST(&is->is_postponed); + if (!STAILQ_EMPTY(&is->is_postponed)) + xpt_release_simq(is->is_sim, 1); + while ((pdu = STAILQ_FIRST(&is->is_postponed)) != NULL) { STAILQ_REMOVE_HEAD(&is->is_postponed, ip_next); icl_pdu_free(pdu); } From owner-svn-src-all@freebsd.org Fri Mar 3 06:04:43 2017 Return-Path: Delivered-To: svn-src-all@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 7C51ACF406A; Fri, 3 Mar 2017 06:04:43 +0000 (UTC) (envelope-from mav@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 2E8641A99; Fri, 3 Mar 2017 06:04:43 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2364g49006137; Fri, 3 Mar 2017 06:04:42 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2364gXp006136; Fri, 3 Mar 2017 06:04:42 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201703030604.v2364gXp006136@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 3 Mar 2017 06:04:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314583 - stable/10/sys/dev/iscsi X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 06:04:43 -0000 Author: mav Date: Fri Mar 3 06:04:42 2017 New Revision: 314583 URL: https://svnweb.freebsd.org/changeset/base/314583 Log: MFC r313852: Freeze CAM SIM when request is postponed due to MaxCmdSN. This allows to avoid resource allocation (especially offload) for requests that can not be executed at this time any way. Modified: stable/10/sys/dev/iscsi/iscsi.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/iscsi/iscsi.c ============================================================================== --- stable/10/sys/dev/iscsi/iscsi.c Fri Mar 3 06:04:03 2017 (r314582) +++ stable/10/sys/dev/iscsi/iscsi.c Fri Mar 3 06:04:42 2017 (r314583) @@ -233,14 +233,16 @@ iscsi_session_send_postponed(struct iscs ISCSI_SESSION_LOCK_ASSERT(is); - while (!STAILQ_EMPTY(&is->is_postponed)) { - request = STAILQ_FIRST(&is->is_postponed); + if (STAILQ_EMPTY(&is->is_postponed)) + return; + while ((request = STAILQ_FIRST(&is->is_postponed)) != NULL) { postpone = iscsi_pdu_prepare(request); if (postpone) - break; + return; STAILQ_REMOVE_HEAD(&is->is_postponed, ip_next); icl_pdu_queue(request); } + xpt_release_simq(is->is_sim, 1); } static void @@ -254,6 +256,8 @@ iscsi_pdu_queue_locked(struct icl_pdu *r iscsi_session_send_postponed(is); postpone = iscsi_pdu_prepare(request); if (postpone) { + if (STAILQ_EMPTY(&is->is_postponed)) + xpt_freeze_simq(is->is_sim, 1); STAILQ_INSERT_TAIL(&is->is_postponed, request, ip_next); return; } @@ -339,8 +343,9 @@ iscsi_session_cleanup(struct iscsi_sessi /* * Remove postponed PDUs. */ - while (!STAILQ_EMPTY(&is->is_postponed)) { - pdu = STAILQ_FIRST(&is->is_postponed); + if (!STAILQ_EMPTY(&is->is_postponed)) + xpt_release_simq(is->is_sim, 1); + while ((pdu = STAILQ_FIRST(&is->is_postponed)) != NULL) { STAILQ_REMOVE_HEAD(&is->is_postponed, ip_next); icl_pdu_free(pdu); } From owner-svn-src-all@freebsd.org Fri Mar 3 06:06:28 2017 Return-Path: Delivered-To: svn-src-all@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 C8D66CF40FE; Fri, 3 Mar 2017 06:06:28 +0000 (UTC) (envelope-from mav@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 A0D401DAC; Fri, 3 Mar 2017 06:06:28 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2366Rlh006265; Fri, 3 Mar 2017 06:06:27 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2366Rkm006263; Fri, 3 Mar 2017 06:06:27 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201703030606.v2366Rkm006263@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 3 Mar 2017 06:06:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314584 - in stable/11: share/man/man4 sys/cam/ctl X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 06:06:28 -0000 Author: mav Date: Fri Mar 3 06:06:27 2017 New Revision: 314584 URL: https://svnweb.freebsd.org/changeset/base/314584 Log: MFC r313854, r313963: Change the way MaxCmdSN is used. Before this change MaxCmdSN was reported as CmdSN + delta, that made it limit number of requests in transmission from the initiator to target, that was pretty useless. After this change MaxCmdSN limits number of requests queued to CTL, i.e. maximal queue depth for the initiator. The default limit is 256 outstanding requests per initiator at a time. This code uses existing cs_outstanding_ctl_pdus counter to track queue depth. It's semantics doen't perfectly match, but close enough to not add another counter. Just don't set the maxtags below 2. Modified: stable/11/share/man/man4/ctl.4 stable/11/sys/cam/ctl/ctl_frontend_iscsi.c Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man4/ctl.4 ============================================================================== --- stable/11/share/man/man4/ctl.4 Fri Mar 3 06:04:42 2017 (r314583) +++ stable/11/share/man/man4/ctl.4 Fri Mar 3 06:06:27 2017 (r314584) @@ -24,7 +24,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd September 27, 2015 +.Dd January 19, 2017 .Dt CTL 4 .Os .Sh NAME @@ -158,10 +158,9 @@ Verbosity level for log messages from th Set to 0 to disable logging or 1 to warn about potential problems. Larger values enable debugging output. Defaults to 1. -.It Va kern.cam.ctl.iscsi.maxcmdsn_delta -The number of outstanding commands to advertise to the iSCSI initiator. -Technically, it is the difference between ExpCmdSN and MaxCmdSN fields -in the iSCSI PDU. +.It Va kern.cam.ctl.iscsi.maxtags +The number of outstanding commands to advertise to each iSCSI initiator. +Current implementation is not very accurate, so do not set this below 2. Defaults to 256. .It Va kern.cam.ctl.iscsi.ping_timeout The number of seconds to wait for the iSCSI initiator to respond to a NOP-In Modified: stable/11/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- stable/11/sys/cam/ctl/ctl_frontend_iscsi.c Fri Mar 3 06:04:42 2017 (r314583) +++ stable/11/sys/cam/ctl/ctl_frontend_iscsi.c Fri Mar 3 06:06:27 2017 (r314584) @@ -95,10 +95,9 @@ SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO static int login_timeout = 60; SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO, login_timeout, CTLFLAG_RWTUN, &login_timeout, 60, "Time to wait for ctld(8) to finish Login Phase, in seconds"); -static int maxcmdsn_delta = 256; -SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO, maxcmdsn_delta, CTLFLAG_RWTUN, - &maxcmdsn_delta, 256, "Number of commands the initiator can send " - "without confirmation"); +static int maxtags = 256; +SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO, maxtags, CTLFLAG_RWTUN, + &maxtags, 0, "Max number of requests queued by initiator"); #define CFISCSI_DEBUG(X, ...) \ do { \ @@ -244,7 +243,7 @@ cfiscsi_pdu_update_cmdsn(const struct ic * outside of this range. */ if (ISCSI_SNLT(cmdsn, cs->cs_cmdsn) || - ISCSI_SNGT(cmdsn, cs->cs_cmdsn + maxcmdsn_delta)) { + ISCSI_SNGT(cmdsn, cs->cs_cmdsn - 1 + maxtags)) { CFISCSI_SESSION_UNLOCK(cs); CFISCSI_SESSION_WARN(cs, "received PDU with CmdSN %u, " "while expected %u", cmdsn, cs->cs_cmdsn); @@ -399,7 +398,8 @@ cfiscsi_pdu_prepare(struct icl_pdu *resp (bhssr->bhssr_flags & BHSDI_FLAGS_S)) bhssr->bhssr_statsn = htonl(cs->cs_statsn); bhssr->bhssr_expcmdsn = htonl(cs->cs_cmdsn); - bhssr->bhssr_maxcmdsn = htonl(cs->cs_cmdsn + maxcmdsn_delta); + bhssr->bhssr_maxcmdsn = htonl(cs->cs_cmdsn - 1 + + imax(0, maxtags - cs->cs_outstanding_ctl_pdus)); if (advance_statsn) cs->cs_statsn++; From owner-svn-src-all@freebsd.org Fri Mar 3 06:14:01 2017 Return-Path: Delivered-To: svn-src-all@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 291F6CF4398; Fri, 3 Mar 2017 06:14:01 +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 EA6F31384; Fri, 3 Mar 2017 06:14:00 +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 v236E0FB010256; Fri, 3 Mar 2017 06:14:00 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v236DxDl010255; Fri, 3 Mar 2017 06:13:59 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703030613.v236DxDl010255@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Fri, 3 Mar 2017 06:13:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314585 - head/usr.sbin/syslogd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 06:14:01 -0000 Author: ngie Date: Fri Mar 3 06:13:59 2017 New Revision: 314585 URL: https://svnweb.freebsd.org/changeset/base/314585 Log: Correct verb change for service => `*` after r314563 `*` means that packets will be received from a remote peer on any port. Since the point of interest is the syslogd instance (not the remote peer), the appropriate verb is "received", not "sent". MFC after: 1 month X-MFC with: r314563 Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/syslogd/syslogd.8 Modified: head/usr.sbin/syslogd/syslogd.8 ============================================================================== --- head/usr.sbin/syslogd/syslogd.8 Fri Mar 3 06:06:27 2017 (r314584) +++ head/usr.sbin/syslogd/syslogd.8 Fri Mar 3 06:13:59 2017 (r314585) @@ -131,7 +131,7 @@ A .Ar service of .Ql \&* -allows packets to be sent from any UDP port. +allows packets to be received from any UDP port. The default .Ar service is From owner-svn-src-all@freebsd.org Fri Mar 3 06:18:48 2017 Return-Path: Delivered-To: svn-src-all@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 DD3D1CF4525; Fri, 3 Mar 2017 06:18:48 +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 9DF1816A0; Fri, 3 Mar 2017 06:18:48 +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 v236Il7c010581; Fri, 3 Mar 2017 06:18:47 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v236Il5v010580; Fri, 3 Mar 2017 06:18:47 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703030618.v236Il5v010580@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Fri, 3 Mar 2017 06:18:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314586 - head/share/man/man4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 06:18:49 -0000 Author: ngie Date: Fri Mar 3 06:18:47 2017 New Revision: 314586 URL: https://svnweb.freebsd.org/changeset/base/314586 Log: Clean up netmap(4) slightly - Add missing sections for .Xr references. - Replace .br with .Pp (the former macro is deprecated). - Use the .Sx (section reference) macro when referring to LIBRARIES, not the .Xr (cross-reference) macro. - Add commas after "e.g." and "i.e." [*]. Bump .Dd for the change Approved by: luigi MFC after: 1 week Reported by: igor [*], make manlint Sponsored by: Dell EMC Isilon Differential Revision: D9859 Modified: head/share/man/man4/netmap.4 Modified: head/share/man/man4/netmap.4 ============================================================================== --- head/share/man/man4/netmap.4 Fri Mar 3 06:13:59 2017 (r314585) +++ head/share/man/man4/netmap.4 Fri Mar 3 06:18:47 2017 (r314586) @@ -27,16 +27,15 @@ .\" .\" $FreeBSD$ .\" -.Dd December 14, 2015 +.Dd March 2, 2017 .Dt NETMAP 4 .Os .Sh NAME .Nm netmap .Nd a framework for fast packet I/O -.br .Nm VALE .Nd a fast VirtuAl Local Ethernet using the netmap API -.br +.Pp .Nm netmap pipes .Nd a shared memory packet transport channel .Sh SYNOPSIS @@ -61,7 +60,7 @@ implementing a very fast and modular in- a shared memory packet transport channel; .It Nm netmap monitors a mechanism similar to -.Xr bpf +.Xr bpf 4 to capture traffic .El .Pp @@ -85,7 +84,7 @@ NICs without native .Nm support can still use the API in emulated mode, which uses unmodified device drivers and is 3-5 times faster than -.Xr bpf +.Xr bpf 4 or raw sockets. .Pp Userspace clients can dynamically switch NICs into @@ -175,8 +174,9 @@ ports (including and .Nm netmap pipe ports). -Simpler, higher level functions are described in section -.Xr LIBRARIES . +Simpler, higher level functions are described in the +.Sx LIBRARIES +section. .Pp Ports and rings are created and controlled through a file descriptor, created by opening a special device @@ -191,14 +191,14 @@ argument. .Va arg.nr_name specifies the netmap port name, as follows: .Bl -tag -width XXXX -.It Dv OS network interface name (e.g. 'em0', 'eth1', ... ) +.It Dv OS network interface name (e.g., 'em0', 'eth1', ... ) the data path of the NIC is disconnected from the host stack, and the file descriptor is bound to the NIC (one or all queues), or to the host stack; .It Dv valeSSS:PPP the file descriptor is bound to port PPP of VALE switch SSS. Switch instances and ports are dynamically created if necessary. -.br +.Pp Both SSS and PPP have the form [0-9a-zA-Z_]+ , the string cannot exceed IFNAMSIZ characters, and PPP cannot be the name of any existing OS network interface. @@ -340,14 +340,14 @@ should not be assumed to be a power of t .Pp .Va head is the first slot available to userspace; -.br +.Pp .Va cur is the wakeup point: select/poll will unblock when .Va tail passes .Va cur ; -.br +.Pp .Va tail is the first slot reserved to the kernel. .Pp @@ -419,7 +419,7 @@ Below is an example of the evolution of .Fn select and .Fn poll -will block if there is no space in the ring, i.e. +will block if there is no space in the ring, i.e., .Dl ring->cur == ring->tail and return when new slots have become available. .Pp @@ -453,7 +453,7 @@ slots up to are returned to the kernel for further receives, and .Va tail may advance to report new incoming packets. -.br +.Pp Below is an example of the evolution of an RX ring: .Bd -literal after the syscall, there are some (h)eld and some (R)eceived slots @@ -510,7 +510,7 @@ packet must not be used in the learning indicates that the packet's payload is in a user-supplied buffer whose user virtual address is in the 'ptr' field of the slot. The size can reach 65535 bytes. -.br +.Pp This is only supported on the transmit ring of .Nm VALE ports, and it helps reducing data copies in the interconnection @@ -592,8 +592,8 @@ indicate the size of transmit and receiv indicate the number of transmit and receive rings. Both ring number and sizes may be configured at runtime -using interface-specific functions (e.g. -.Xr ethtool +using interface-specific functions (e.g., +.Xr ethtool 8 ). .El .It Dv NIOCREGIF @@ -611,7 +611,7 @@ The recommended way to bind a file descr to use function .Va nm_open(..) (see -.Xr LIBRARIES ) +.Sx LIBRARIES ) which parses names to access specific port types and enable features. In the following we document the main features. @@ -761,7 +761,7 @@ The following functions are available: .Bl -tag -width XXXXX .It Va struct nm_desc * nm_open(const char *ifname, const struct nmreq *req, uint64_t flags, const struct nm_desc *arg) similar to -.Xr pcap_open , +.Xr pcap_open 3pcap , binds a file descriptor to a port. .Bl -tag -width XX .It Va ifname @@ -774,7 +774,7 @@ The nm_flags and nm_ringid values are ov ifname and flags, and other fields can be overridden through the other two arguments. .It Va arg -points to a struct nm_desc containing arguments (e.g. from a previously +points to a struct nm_desc containing arguments (e.g., from a previously open file descriptor) that should override the defaults. The fields are used as described below .It Va flags @@ -830,10 +830,11 @@ mode but still significantly higher than Note that for slow devices (such as 1 Gbit/s and slower NICs, or several 10 Gbit/s NICs whose hardware is unable to sustain line rate), emulated and native mode will likely have similar or same throughput. -.br +.Pp When emulation is in use, packet sniffer programs such as tcpdump -could see received packets before they are diverted by netmap. This behaviour -is not intentional, being just an artifact of the implementation of emulation. +could see received packets before they are diverted by netmap. +This behaviour is not intentional, being just an artifact of the implementation +of emulation. Note that in case the netmap application subsequently moves packets received from the emulated adapter onto the host RX ring, the sniffer will intercept those packets again, since the packets are injected to the host stack as they @@ -854,11 +855,11 @@ and module parameters on Linux .Bl -tag -width indent .It Va dev.netmap.admode: 0 Controls the use of native or emulated adapter mode. -.br +.Pp 0 uses the best available option; -.br +.Pp 1 forces native mode and fails if not available; -.br +.Pp 2 forces emulated hence never fails. .It Va dev.netmap.generic_ringsize: 1024 Ring size used for emulated netmap mode @@ -939,7 +940,7 @@ directory in .Fx distributions. .Pp -.Xr pkt-gen +.Xr pkt-gen 8 is a general purpose traffic source/sink. .Pp As an example @@ -950,11 +951,11 @@ is a traffic sink. Both print traffic statistics, to help monitor how the system performs. .Pp -.Xr pkt-gen +.Xr pkt-gen 8 has many options can be uses to set packet sizes, addresses, rates, and use multiple send/receive threads and cores. .Pp -.Xr bridge +.Xr bridge 4 is another test program which interconnects two .Nm ports. @@ -1046,7 +1047,7 @@ to replenish the receive ring: .Ed .Ss ACCESSING THE HOST STACK The host stack is for all practical purposes just a regular ring pair, -which you can access with the netmap API (e.g. with +which you can access with the netmap API (e.g., with .Dl nm_open("netmap:eth0^", ... ) ; All packets that the host would send to an interface in .Nm @@ -1056,11 +1057,11 @@ TX ring are send up to the host stack. A simple way to test the performance of a .Nm VALE switch is to attach a sender and a receiver to it, -e.g. running the following in two different terminals: +e.g., running the following in two different terminals: .Dl pkt-gen -i vale1:a -f rx # receiver .Dl pkt-gen -i vale1:b -f tx # sender The same example can be used to test netmap pipes, by simply -changing port names, e.g. +changing port names, e.g., .Dl pkt-gen -i vale2:x{3 -f rx # receiver on the master side .Dl pkt-gen -i vale2:x}3 -f tx # sender on the slave side .Pp @@ -1128,7 +1129,7 @@ multiqueue, schedulers, packet filters. Multiple transmit and receive rings are supported natively and can be configured with ordinary OS tools, such as -.Xr ethtool +.Xr ethtool 8 or device-specific sysctl variables. The same goes for Receive Packet Steering (RPS) From owner-svn-src-all@freebsd.org Fri Mar 3 06:31:48 2017 Return-Path: Delivered-To: svn-src-all@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 63ED0CF4A85; Fri, 3 Mar 2017 06:31:48 +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 336C41369; Fri, 3 Mar 2017 06:31:48 +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 v236Vlje018503; Fri, 3 Mar 2017 06:31:47 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v236VlIk018501; Fri, 3 Mar 2017 06:31:47 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703030631.v236VlIk018501@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Fri, 3 Mar 2017 06:31:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314587 - in head: lib/libutil share/man/man9 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 06:31:48 -0000 Author: ngie Date: Fri Mar 3 06:31:47 2017 New Revision: 314587 URL: https://svnweb.freebsd.org/changeset/base/314587 Log: Correct MLINKS for sbuf_hexdump(9) sbuf_hexdump(9) should be linked to sbuf(9), not hexdump(3). Another review will be posted to deduplicate the sbuf_hexdump reference in in hexdump(3) or at the very least make the information less duplicative. MFC after: 1 week X-MFC with: r313437 Sponsored by: Dell EMC Isilon Modified: head/lib/libutil/Makefile head/share/man/man9/Makefile Modified: head/lib/libutil/Makefile ============================================================================== --- head/lib/libutil/Makefile Fri Mar 3 06:18:47 2017 (r314586) +++ head/lib/libutil/Makefile Fri Mar 3 06:31:47 2017 (r314587) @@ -35,7 +35,6 @@ MAN+= expand_number.3 flopen.3 fparseln. property.3 pty.3 quotafile.3 realhostname.3 realhostname_sa.3 \ _secure_path.3 trimdomain.3 uucplock.3 pw_util.3 MAN+= login.conf.5 -MLINKS+=hexdump.3 sbuf_hexdump.9 MLINKS+=kld.3 kld_isloaded.3 kld.3 kld_load.3 MLINKS+=login_auth.3 auth_cat.3 login_auth.3 auth_checknologin.3 MLINKS+=login_cap.3 login_close.3 login_cap.3 login_getcapbool.3 \ Modified: head/share/man/man9/Makefile ============================================================================== --- head/share/man/man9/Makefile Fri Mar 3 06:18:47 2017 (r314586) +++ head/share/man/man9/Makefile Fri Mar 3 06:31:47 2017 (r314587) @@ -1517,6 +1517,7 @@ MLINKS+=sbuf.9 sbuf_bcat.9 \ sbuf.9 sbuf_done.9 \ sbuf.9 sbuf_error.9 \ sbuf.9 sbuf_finish.9 \ + sbuf.9 sbuf_hexdump.9 \ sbuf.9 sbuf_len.9 \ sbuf.9 sbuf_new.9 \ sbuf.9 sbuf_new_auto.9 \ From owner-svn-src-all@freebsd.org Fri Mar 3 06:52:47 2017 Return-Path: Delivered-To: svn-src-all@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 0399BCF4FFE; Fri, 3 Mar 2017 06:52:47 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mail.allbsd.org (gatekeeper.allbsd.org [IPv6:2001:2f0:104:e001::32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.allbsd.org", Issuer "RapidSSL SHA256 CA - G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 61F28123F; Fri, 3 Mar 2017 06:52:46 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mail-d.allbsd.org (p2027-ipbf1605funabasi.chiba.ocn.ne.jp [123.225.191.27]) (authenticated bits=56) by mail.allbsd.org (8.15.2/8.15.2) with ESMTPSA id v236qMc9082619 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) (Client CN "/OU=GT07882699/OU=See+20www.rapidssl.com/resources/cps+20+28c+2915/OU=Domain+20Control+20Validated+20-+20RapidSSL+28R+29/CN=*.allbsd.org", Issuer "/C=US/O=GeoTrust+20Inc./CN=RapidSSL+20SHA256+20CA+20-+20G3"); Fri, 3 Mar 2017 15:52:42 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from alph.allbsd.org (alph.allbsd.org [192.168.0.10]) by mail-d.allbsd.org (8.15.2/8.15.2) with ESMTPS id v236p6iP075784 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 3 Mar 2017 15:51:06 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from localhost (localhost [IPv6:::1]) (authenticated bits=0) by alph.allbsd.org (8.15.2/8.15.2) with ESMTPA id v236p5Wh075781; Fri, 3 Mar 2017 15:51:06 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Fri, 03 Mar 2017 15:49:55 +0900 (JST) Message-Id: <20170303.154955.607107599855581369.hrs@allbsd.org> To: ngie@FreeBSD.org Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314585 - head/usr.sbin/syslogd From: Hiroki Sato In-Reply-To: <201703030613.v236DxDl010255@repo.freebsd.org> References: <201703030613.v236DxDl010255@repo.freebsd.org> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="--Security_Multipart(Fri_Mar__3_15_49_55_2017_040)--" Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.99 at gatekeeper.allbsd.org X-Virus-Status: Clean X-Greylist: Sender DNS name whitelisted, not delayed by milter-greylist-4.4.3 (mail.allbsd.org [133.31.130.32]); Fri, 03 Mar 2017 15:52:43 +0900 (JST) X-Spam-Status: No, score=-99.9 required=13.0 tests=CONTENT_TYPE_PRESENT, QENCPTR1,USER_IN_WHITELIST autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on gatekeeper.allbsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 06:52:47 -0000 ----Security_Multipart(Fri_Mar__3_15_49_55_2017_040)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Ngie Cooper wrote in <201703030613.v236DxDl010255@repo.freebsd.org>: ng> Author: ngie ng> Date: Fri Mar 3 06:13:59 2017 ng> New Revision: 314585 ng> URL: https://svnweb.freebsd.org/changeset/base/314585 ng> ng> Log: ng> Correct verb change for service => `*` after r314563 ng> ng> `*` means that packets will be received from a remote peer on any port. ng> Since the point of interest is the syslogd instance (not the remote peer), ng> the appropriate verb is "received", not "sent". ng> ng> MFC after: 1 month ng> X-MFC with: r314563 ng> Sponsored by: Dell EMC Isilon ng> ng> Modified: ng> head/usr.sbin/syslogd/syslogd.8 ng> ng> Modified: head/usr.sbin/syslogd/syslogd.8 ng> ============================================================================== ng> --- head/usr.sbin/syslogd/syslogd.8 Fri Mar 3 06:06:27 2017 (r314584) ng> +++ head/usr.sbin/syslogd/syslogd.8 Fri Mar 3 06:13:59 2017 (r314585) ng> @@ -131,7 +131,7 @@ A ng> .Ar service ng> of ng> .Ql \&* ng> -allows packets to be sent from any UDP port. ng> +allows packets to be received from any UDP port. ng> The default ng> .Ar service It is incorrect that syslogd receives a UDP packet on any local port when a "*" is specified. This address validation is done by using the source port number in a received UDP packet, so the point of interest is the remote peer. How about "...accepts UDP packets sent with any source port" or something? -- Hiroki ----Security_Multipart(Fri_Mar__3_15_49_55_2017_040)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAli5EhMACgkQTyzT2CeTzy2dEQCfcCsCP+Z5JMF4RG2RzINgZ4ku 5ykAnR9GlOpj4ZyupUJzAjFstSCk6wyT =zhSm -----END PGP SIGNATURE----- ----Security_Multipart(Fri_Mar__3_15_49_55_2017_040)---- From owner-svn-src-all@freebsd.org Fri Mar 3 07:13:13 2017 Return-Path: Delivered-To: svn-src-all@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 3591ECF55B5; Fri, 3 Mar 2017 07:13:13 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg0-x241.google.com (mail-pg0-x241.google.com [IPv6:2607:f8b0:400e:c05::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 024141D67; Fri, 3 Mar 2017 07:13:13 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg0-x241.google.com with SMTP id 1so11837055pgz.2; Thu, 02 Mar 2017 23:13:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:mime-version:from:in-reply-to:date:cc:message-id:references :to; bh=2LgbChgfvLjY11wamgY4+m8E0kKvHqXEX2RWA6AQ3Es=; b=ht/UKu7gpu5s1wTaU56v1Y+m+okEf3Gblqb6YqhjJ1FXGPvXO1qY+WgTuFKXgltAeN jReXIeqnI3I57zlYB6fAml7UtOyHba4FFQElnVO7xllDKUgkWl6vhpZYb71kQd86TRZa FatMEupOrJhSmQG01e6lM+kpjoBcIh+8rpZR0F212NngXUFSrZYeXoKJZJOhXAyclpVa gmACPIwYdmJ1Tx1hrXjV7z4vRKJ+2L2NCq44gPR7+4hfqyoiSMamVKS+nEDP+Ih3HpUo 6gGzY+E7JWNJjlEmZIEGehKsLPKnO7DGRnjf5Kd/Na7b3u3r1gK3vLFIKgB+6HqR74Ay p7RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:mime-version:from:in-reply-to:date:cc :message-id:references:to; bh=2LgbChgfvLjY11wamgY4+m8E0kKvHqXEX2RWA6AQ3Es=; b=ETwgxH3wlib/ZWou8A0FQO4bXXw6QJzIxA4PYnSPUgFxu5FyjXPXRA+on4e87U3vQM H1FLkfF5FPDZGs1b+edwTS9F0lz8Teg286x0S+IgOzdg7YXiddDQgbnwroGPAWicn1/2 0Gxp7SSVmbh6Q7nBuCMW7b8zW/i62fa4WxOPCXdnLaH+rP3Ua7peTCIvVo+y50KJ4uS/ tylXO71Ldzx3x+aJO5ZmfGIrm7Xhf/3KuMemckC4FQjtHfWoFEN6fWl5Ea4GkefuC/z4 EOk1oBhul0SwSYCBAhKDZAOlmC8PFP+16z8sM4Cr4OEjkjjCEanh9WdmreFbOHoRsWlc nJAA== X-Gm-Message-State: AMke39l68qjYRa/pO9XqoTReuRNJVZ8/5ixfqZECNs1SaEtvIC9xFucGutYycbyf6C3qAw== X-Received: by 10.99.123.1 with SMTP id w1mr1672211pgc.118.1488525192336; Thu, 02 Mar 2017 23:13:12 -0800 (PST) Received: from pinklady.local (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id a8sm21077364pfa.30.2017.03.02.23.13.11 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 Mar 2017 23:13:11 -0800 (PST) Subject: Re: svn commit: r314585 - head/usr.sbin/syslogd Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Content-Type: multipart/signed; boundary="Apple-Mail=_E394ADAB-34C5-4BE7-B007-4DD014C74EBF"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail From: "Ngie Cooper (yaneurabeya)" In-Reply-To: <20170303.154955.607107599855581369.hrs@allbsd.org> Date: Thu, 2 Mar 2017 23:13:09 -0800 Cc: Ngie Cooper , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: <3B6DBB8E-B9AF-46DF-BDEA-9D51DF132BA6@gmail.com> References: <201703030613.v236DxDl010255@repo.freebsd.org> <20170303.154955.607107599855581369.hrs@allbsd.org> To: Hiroki Sato X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 07:13:13 -0000 --Apple-Mail=_E394ADAB-34C5-4BE7-B007-4DD014C74EBF Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Mar 2, 2017, at 22:49, Hiroki Sato wrote: >=20 > Ngie Cooper wrote > in <201703030613.v236DxDl010255@repo.freebsd.org>: >=20 > ng> Author: ngie > ng> Date: Fri Mar 3 06:13:59 2017 > ng> New Revision: 314585 > ng> URL: https://svnweb.freebsd.org/changeset/base/314585 > ng> > ng> Log: > ng> Correct verb change for service =3D> `*` after r314563 > ng> > ng> `*` means that packets will be received from a remote peer on = any port. > ng> Since the point of interest is the syslogd instance (not the = remote peer), > ng> the appropriate verb is "received", not "sent". > ng> > ng> MFC after: 1 month > ng> X-MFC with: r314563 > ng> Sponsored by: Dell EMC Isilon > ng> > ng> Modified: > ng> head/usr.sbin/syslogd/syslogd.8 > ng> > ng> Modified: head/usr.sbin/syslogd/syslogd.8 > ng> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > ng> --- head/usr.sbin/syslogd/syslogd.8 Fri Mar 3 06:06:27 2017 = (r314584) > ng> +++ head/usr.sbin/syslogd/syslogd.8 Fri Mar 3 06:13:59 2017 = (r314585) > ng> @@ -131,7 +131,7 @@ A > ng> .Ar service > ng> of > ng> .Ql \&* > ng> -allows packets to be sent from any UDP port. > ng> +allows packets to be received from any UDP port. > ng> The default > ng> .Ar service >=20 > It is incorrect that syslogd receives a UDP packet on any local port > when a "*" is specified. This address validation is done by using > the source port number in a received UDP packet, so the point of > interest is the remote peer. >=20 > How about "...accepts UDP packets sent with any source port" or > something? Yeah, that=E2=80=99s more accurate. -Ngie --Apple-Mail=_E394ADAB-34C5-4BE7-B007-4DD014C74EBF Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJYuReGAAoJEPWDqSZpMIYV5rsQAJslk3s86qm8sPrgD2vmk2oX qEOnRvFMlgfgCfDKQw/ddvjU8eqBO3ykDBhQy5IT3/41HcXbAdluEZpOgCLxPJFB gHgILOi1Z2SeMKib/IdvkYvziieqFHF8HNAZ05H0spuH1bF9I3lt18RjMxURtmzX 8SFJf85tq5MiGJwqXRQKYbENAWckCeblztAiwGWVVHzYS8iuOXjM3PYYZPq7RVJO 3lSdRGrdvWV1w1to78c24VSdaTa/dBEClGXuA0VIJHskI7qtKB2Xs45A4Q/BiW5u G85PTL4myYwMvbDxF8n8zN79nswT5g1dwB/Cq1EyW5rtD9WODrwedQG8IjUal7lo mruOtXhjdZtb8tKV6iMYdq9Ps1wUEtFppDAdyk/ASYqsd+vg5GGRQ/8UpvMUpjsa nNKC8SbwSsvjfNJ47p45yr3U5TPf/lSBDeuMnEGQq88jgY/gMDtwz+3uNfFpLpt/ tI7RopxJO68hgXqtfpzV1nmcbLGOfX7FgQijgSP5SU4f74kXKT4JomW3SbQke/Y4 zcG/UEuCilzXvbOkWl/R8q/g/y5hNnKq3PgsDQiNDRqh71KNKEabG+MJ2lWvG7yL pZknkNaYd8KUB/5J9m6pS12LPFYcGwGCj5OLVqGHvvRzCc7n1fXbt7ooZiTi4SV/ lZd4VrMybrMgn5bfA/qw =2ztg -----END PGP SIGNATURE----- --Apple-Mail=_E394ADAB-34C5-4BE7-B007-4DD014C74EBF-- From owner-svn-src-all@freebsd.org Fri Mar 3 07:15:24 2017 Return-Path: Delivered-To: svn-src-all@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 387ABCF567F; Fri, 3 Mar 2017 07:15:24 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg0-x22b.google.com (mail-pg0-x22b.google.com [IPv6:2607:f8b0:400e:c05::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 02B4E1ED6; Fri, 3 Mar 2017 07:15:24 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg0-x22b.google.com with SMTP id s67so41102858pgb.3; Thu, 02 Mar 2017 23:15:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:mime-version:from:in-reply-to:date:cc:message-id:references :to; bh=2eq+1Q6VkNfXRMbrljDOG33Lat9Y3VtIvoImCjss0h8=; b=LoAwdUBJYtts+AhVw0o25UB05NdfNUdhO3ddU2KbTMRIamxVUAIZpaLzYhJTCRZN8O IBGpcVEopP0RTcHsklZ+K44yM/9O30v3/D9HfntDdOXDHRQ60ZQ+s/vOG1lAB2XoGZ2z IB6F1V27hcBu0KpHEbk7c2dFIvBxwWsoKBuPQJFG22ABDlYPAd/mVSrmqDSTZmmT6qxn Qx6cCP2PPS3gv0G5ZOaKhBv+xXQAgpGxxqhUPUpSh5ZjOr0dMCN2L9VbZYNNr8fS40+I SzOi8DlxTv2ZkuLv5Y4+s+WJ0l1rO/oc8s/0kQDQHY9tWGhJOATHHVK9VJ80HUVgIv0l sTkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:mime-version:from:in-reply-to:date:cc :message-id:references:to; bh=2eq+1Q6VkNfXRMbrljDOG33Lat9Y3VtIvoImCjss0h8=; b=S56CRzamQ4zYzj0S6Zaf/ZuwBmdQArn5R71yYGrWzyYrwFJrQudvOe438MuYyGnIZA r7+qxqDfaOIBappD6fWdlDUVw0xCdAtZ7oS7lA7etNvKIMZxnMTcByvERAVvG4+rWBW/ HOY2J/Qk8oLJFo04SgzwC3+iWGcRlBAWoIf6UC1fjW0/j0VdpP1Zrgq3KIuJLvl8tCnz faep5vJbiWMVkRGFhpaFL6Ns4JMCB+WSLronaKjkEoIvjcGPRLXb8LNz157kqvw4BieF skb+ExjO9oe5E+SbQUA+5MjcPl0EiirriO4bSENWAJuYftGvLaD0s9veA41E4kMVnxw0 FpUA== X-Gm-Message-State: AMke39nWjQElEkrmFgqXrthKHRHjoWDbZrODjF3iAaVKp9B2hemclqE6rIlNGnog8aad8Q== X-Received: by 10.99.115.12 with SMTP id o12mr1613772pgc.165.1488525323415; Thu, 02 Mar 2017 23:15:23 -0800 (PST) Received: from pinklady.local (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id 2sm2351093pfx.76.2017.03.02.23.15.22 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 Mar 2017 23:15:22 -0800 (PST) Subject: Re: svn commit: r314585 - head/usr.sbin/syslogd Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Content-Type: multipart/signed; boundary="Apple-Mail=_B9742E12-4BFE-4171-AE3A-C170003BB903"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail From: "Ngie Cooper (yaneurabeya)" In-Reply-To: <3B6DBB8E-B9AF-46DF-BDEA-9D51DF132BA6@gmail.com> Date: Thu, 2 Mar 2017 23:15:21 -0800 Cc: Ngie Cooper , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: <1A3F6606-822C-4C80-ADFA-48378F0F29EE@gmail.com> References: <201703030613.v236DxDl010255@repo.freebsd.org> <20170303.154955.607107599855581369.hrs@allbsd.org> <3B6DBB8E-B9AF-46DF-BDEA-9D51DF132BA6@gmail.com> To: Hiroki Sato X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 07:15:24 -0000 --Apple-Mail=_B9742E12-4BFE-4171-AE3A-C170003BB903 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Mar 2, 2017, at 23:13, Ngie Cooper (yaneurabeya) = wrote: >=20 >>=20 >> On Mar 2, 2017, at 22:49, Hiroki Sato wrote: >>=20 >> Ngie Cooper wrote >> in <201703030613.v236DxDl010255@repo.freebsd.org>: >>=20 >> ng> Author: ngie >> ng> Date: Fri Mar 3 06:13:59 2017 >> ng> New Revision: 314585 >> ng> URL: https://svnweb.freebsd.org/changeset/base/314585 >> ng> >> ng> Log: >> ng> Correct verb change for service =3D> `*` after r314563 >> ng> >> ng> `*` means that packets will be received from a remote peer on = any port. >> ng> Since the point of interest is the syslogd instance (not the = remote peer), >> ng> the appropriate verb is "received", not "sent". >> ng> >> ng> MFC after: 1 month >> ng> X-MFC with: r314563 >> ng> Sponsored by: Dell EMC Isilon >> ng> >> ng> Modified: >> ng> head/usr.sbin/syslogd/syslogd.8 >> ng> >> ng> Modified: head/usr.sbin/syslogd/syslogd.8 >> ng> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> ng> --- head/usr.sbin/syslogd/syslogd.8 Fri Mar 3 06:06:27 2017 = (r314584) >> ng> +++ head/usr.sbin/syslogd/syslogd.8 Fri Mar 3 06:13:59 2017 = (r314585) >> ng> @@ -131,7 +131,7 @@ A >> ng> .Ar service >> ng> of >> ng> .Ql \&* >> ng> -allows packets to be sent from any UDP port. >> ng> +allows packets to be received from any UDP port. >> ng> The default >> ng> .Ar service >>=20 >> It is incorrect that syslogd receives a UDP packet on any local port >> when a "*" is specified. This address validation is done by using >> the source port number in a received UDP packet, so the point of >> interest is the remote peer. >>=20 >> How about "...accepts UDP packets sent with any source port" or >> something? >=20 > Yeah, that=E2=80=99s more accurate. How about this? -Ngie $ svn diff usr.sbin/syslogd/syslogd.8 Index: usr.sbin/syslogd/syslogd.8 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- usr.sbin/syslogd/syslogd.8 (revision 314585) +++ usr.sbin/syslogd/syslogd.8 (working copy) @@ -131,7 +131,7 @@ .Ar service of .Ql \&* -allows packets to be received from any UDP port. +allows UDP packets to be sent with any source port. The default .Ar service is --Apple-Mail=_B9742E12-4BFE-4171-AE3A-C170003BB903 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJYuRgKAAoJEPWDqSZpMIYVmAoQAJGtg1OrJ8PlolGpH8TqPcbE QA3MB2uSO9azBwmpWH6Sthb1tHNodCIO4e8S/mW4g69DPuqeKm7U0CgrXIUEExWZ LWmGzMMIElRckLhNk9sOuTMbjxr+/E01X2Oh0mPJA+7M5Czaj2dra3BBSrNl/uWJ JIG7iphnddPHp26txiUaL1gAOneB8SuhzLO7dJbrfZFSEvGHpZ8XsTdH7zD1Y3hc NI2N3+LxEsVbstPPhulRGe7DU2wxMphmiYJ53/mVQ4HTou2E6OWjL++RcaH2Ddlp j1sDR10plceXxn8fVOjYiwyniX/rSRctM97iaWL0gVEnUOi3pnxOm/Rjo0gKcrwN isv0yFbKEmLBAknBK+NQsZEzsXDYCUUSGUxInEBRYLLS8Am+ks+SWnYYfCLgLqsW p6ZJEGPPuFCiUPTzngnKx16XulgUVgbVKSkmRoNgClrb75Jq28+DodYUCvc32zW1 BZ1W1RVUGMQfBebGlO9U7Cq4iYRGs7rgwqtBQd4uP/VW7LCi7iwpdq7mNg67I5kd 1l9bysTLkTH7R8VginWqCc5rmibygP1xKNPHYLGvnVnm5D1f1FxsqKgAUVhvAvZh CyzBu1uquNSdBTW8Mazp/WJ/fadqTuz083WesLtuYC/BT6Vt8GoIGEp0M4Gnv6yt e9w2ws4kgJK99CrDf+Hw =8eSm -----END PGP SIGNATURE----- --Apple-Mail=_B9742E12-4BFE-4171-AE3A-C170003BB903-- From owner-svn-src-all@freebsd.org Fri Mar 3 08:02:37 2017 Return-Path: Delivered-To: svn-src-all@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 79DB6CF63E9; Fri, 3 Mar 2017 08:02:37 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mail.allbsd.org (gatekeeper.allbsd.org [IPv6:2001:2f0:104:e001::32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.allbsd.org", Issuer "RapidSSL SHA256 CA - G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 09D0118C5; Fri, 3 Mar 2017 08:02:36 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mail-d.allbsd.org (p2027-ipbf1605funabasi.chiba.ocn.ne.jp [123.225.191.27]) (authenticated bits=56) by mail.allbsd.org (8.15.2/8.15.2) with ESMTPSA id v2382C6q046385 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) (Client CN "/OU=GT07882699/OU=See+20www.rapidssl.com/resources/cps+20+28c+2915/OU=Domain+20Control+20Validated+20-+20RapidSSL+28R+29/CN=*.allbsd.org", Issuer "/C=US/O=GeoTrust+20Inc./CN=RapidSSL+20SHA256+20CA+20-+20G3"); Fri, 3 Mar 2017 17:02:31 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from alph.allbsd.org (alph.allbsd.org [192.168.0.10]) by mail-d.allbsd.org (8.15.2/8.15.2) with ESMTPS id v2380uQP076450 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 3 Mar 2017 17:00:56 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from localhost (localhost [IPv6:::1]) (authenticated bits=0) by alph.allbsd.org (8.15.2/8.15.2) with ESMTPA id v2380sxb076447; Fri, 3 Mar 2017 17:00:55 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Fri, 03 Mar 2017 16:57:18 +0900 (JST) Message-Id: <20170303.165718.447567964094984094.hrs@allbsd.org> To: yaneurabeya@gmail.com Cc: ngie@FreeBSD.org, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314585 - head/usr.sbin/syslogd From: Hiroki Sato In-Reply-To: <1A3F6606-822C-4C80-ADFA-48378F0F29EE@gmail.com> References: <20170303.154955.607107599855581369.hrs@allbsd.org> <3B6DBB8E-B9AF-46DF-BDEA-9D51DF132BA6@gmail.com> <1A3F6606-822C-4C80-ADFA-48378F0F29EE@gmail.com> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="--Security_Multipart(Fri_Mar__3_16_57_18_2017_329)--" Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.99 at gatekeeper.allbsd.org X-Virus-Status: Clean X-Greylist: Sender DNS name whitelisted, not delayed by milter-greylist-4.4.3 (mail.allbsd.org [133.31.130.32]); Fri, 03 Mar 2017 17:02:33 +0900 (JST) X-Spam-Status: No, score=-99.9 required=13.0 tests=CONTENT_TYPE_PRESENT, QENCPTR1,USER_IN_WHITELIST autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on gatekeeper.allbsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 08:02:37 -0000 ----Security_Multipart(Fri_Mar__3_16_57_18_2017_329)-- Content-Type: Text/Plain; charset=iso-8859-7 Content-Transfer-Encoding: base64 Ik5naWUgQ29vcGVyICh5YW5ldXJhYmV5YSkiIDx5YW5ldXJhYmV5YUBnbWFpbC5jb20+IHdyb3Rl DQogIGluIDwxQTNGNjYwNi04MjJDLTRDODAtQURGQS00ODM3OEYwRjI5RUVAZ21haWwuY29tPjoN Cg0KeWE+ID4+IEhvdyBhYm91dCAiLi4uYWNjZXB0cyBVRFAgcGFja2V0cyBzZW50IHdpdGggYW55 IHNvdXJjZSBwb3J0IiBvcg0KeWE+ID4+IHNvbWV0aGluZz8NCnlhPiA+IA0KeWE+ID4gWWVhaCwg dGhhdKJzIG1vcmUgYWNjdXJhdGUuDQp5YT4gDQp5YT4gSG93IGFib3V0IHRoaXM/DQp5YT4gLU5n aWUNCnlhPiANCnlhPiAkIHN2biBkaWZmIHVzci5zYmluL3N5c2xvZ2Qvc3lzbG9nZC44DQp5YT4g SW5kZXg6IHVzci5zYmluL3N5c2xvZ2Qvc3lzbG9nZC44DQp5YT4gPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KeWE+IC0t LSB1c3Iuc2Jpbi9zeXNsb2dkL3N5c2xvZ2QuOCAgKHJldmlzaW9uIDMxNDU4NSkNCnlhPiArKysg dXNyLnNiaW4vc3lzbG9nZC9zeXNsb2dkLjggICh3b3JraW5nIGNvcHkpDQp5YT4gQEAgLTEzMSw3 ICsxMzEsNyBAQA0KeWE+ICAuQXIgc2VydmljZQ0KeWE+ICBvZg0KeWE+ICAuUWwgXCYqDQp5YT4g LWFsbG93cyBwYWNrZXRzIHRvIGJlIHJlY2VpdmVkIGZyb20gYW55IFVEUCBwb3J0Lg0KeWE+ICth bGxvd3MgVURQIHBhY2tldHMgdG8gYmUgc2VudCB3aXRoIGFueSBzb3VyY2UgcG9ydC4NCnlhPiAg VGhlIGRlZmF1bHQNCnlhPiAgLkFyIHNlcnZpY2UNCnlhPiAgaXMNCg0KIExvb2tzIGdvb2QgdG8g bWUgdGhvdWdoIHByb2JhYmx5IEkgYW0gbm90IHRoZSBiZXN0IHBlcnNvbiB3aG8gY2FuDQoganVk Z2UgYW4gRW5nbGlzaCBleHByZXNzaW9uIGFzIGdvb2Qgb3IgYmFkLi4uDQoNCi0tIEhpcm9raQ0K ----Security_Multipart(Fri_Mar__3_16_57_18_2017_329)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAli5Id4ACgkQTyzT2CeTzy1mDACgiZE8gKIveLO5nnkRYermnWlQ VtsAoL2E5pCP3QnFYa3Avx4L3ciMs5E1 =sYf+ -----END PGP SIGNATURE----- ----Security_Multipart(Fri_Mar__3_16_57_18_2017_329)---- From owner-svn-src-all@freebsd.org Fri Mar 3 08:13:47 2017 Return-Path: Delivered-To: svn-src-all@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 22B33CF67DA; Fri, 3 Mar 2017 08:13:47 +0000 (UTC) (envelope-from matthew@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 DDE261EB7; Fri, 3 Mar 2017 08:13:46 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v238Dkf9060102; Fri, 3 Mar 2017 08:13:46 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v238DjaX060099; Fri, 3 Mar 2017 08:13:45 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201703030813.v238DjaX060099@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Fri, 3 Mar 2017 08:13:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org Subject: svn commit: r314588 - svnadmin/conf X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 08:13:47 -0000 Author: matthew (ports committer) Date: Fri Mar 3 08:13:45 2017 New Revision: 314588 URL: https://svnweb.freebsd.org/changeset/base/314588 Log: Restore rgrimes commit bit. Welcome back! Rod will be mentored by grehan since it has been some time since he was last active. Approved by: core Modified: svnadmin/conf/access svnadmin/conf/mentors Modified: svnadmin/conf/access ============================================================================== --- svnadmin/conf/access Fri Mar 3 06:31:47 2017 (r314587) +++ svnadmin/conf/access Fri Mar 3 08:13:45 2017 (r314588) @@ -170,6 +170,7 @@ pstef qingli ray remko +rgrimes rmacklem roberto rodrigc Modified: svnadmin/conf/mentors ============================================================================== --- svnadmin/conf/mentors Fri Mar 3 06:31:47 2017 (r314587) +++ svnadmin/conf/mentors Fri Mar 3 08:13:45 2017 (r314588) @@ -27,6 +27,7 @@ mahrens mckusick peterj jhb Co-mentor: grog phil theraven Co-mentor: sjg pstef pfg +rgrimes grehan slm ken Co-mentor: scottl, ambrisko stevek sjg tsoome allanjude Co-mentor: imp From owner-svn-src-all@freebsd.org Fri Mar 3 08:48:02 2017 Return-Path: Delivered-To: svn-src-all@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 243F5CF6FD8; Fri, 3 Mar 2017 08:48:02 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id DED501FE5; Fri, 3 Mar 2017 08:48:01 +0000 (UTC) (envelope-from des@des.no) Received: from desk.des.no (smtp.des.no [194.63.250.102]) by smtp.des.no (Postfix) with ESMTP id B87B180AB; Fri, 3 Mar 2017 08:47:59 +0000 (UTC) Received: by desk.des.no (Postfix, from userid 1001) id 7A2B24752; Fri, 3 Mar 2017 09:47:59 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: "Ngie Cooper \(yaneurabeya\)" Cc: Allan Jude , "src-committers\@freebsd.org" , "svn-src-all\@freebsd.org" , "svn-src-head\@freebsd.org" Subject: Re: svn commit: r314527 - in head: crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat crypto/ope... References: <201703020011.v220BWQ0086961@repo.freebsd.org> <86k28783xe.fsf@desk.des.no> <86fuiv832b.fsf@desk.des.no> <59d9780e-6ec3-4e5d-0c9e-77e3639205f6@freebsd.org> <8FE7A2E0-BB9C-4C48-82D9-B7027CA50358@gmail.com> Date: Fri, 03 Mar 2017 09:47:59 +0100 In-Reply-To: <8FE7A2E0-BB9C-4C48-82D9-B7027CA50358@gmail.com> (Ngie Cooper's message of "Thu, 2 Mar 2017 21:04:08 -0800") Message-ID: <86bmti9268.fsf@desk.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 08:48:02 -0000 "Ngie Cooper (yaneurabeya)" writes: > Allan Jude writes: > > Dag-Erling Sm=C3=B8rgrav writes: > > > Ngie Cooper writes: > > > > Yes, I included you on the CR [...] > > > CR? > > Code Review (Phabricator) > Yup =E2=80=94 that=E2=80=99s what I meant. I don't use Phabricator, and I don't consider it a legitimate attempt to contact me about a patch. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-svn-src-all@freebsd.org Fri Mar 3 10:02:58 2017 Return-Path: Delivered-To: svn-src-all@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 01507CF5D52; Fri, 3 Mar 2017 10:02:58 +0000 (UTC) (envelope-from kib@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 C4D9F1048; Fri, 3 Mar 2017 10:02:57 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23A2usL004955; Fri, 3 Mar 2017 10:02:56 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23A2uFr004954; Fri, 3 Mar 2017 10:02:56 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201703031002.v23A2uFr004954@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 3 Mar 2017 10:02:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314589 - stable/11/sys/vm X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 10:02:58 -0000 Author: kib Date: Fri Mar 3 10:02:56 2017 New Revision: 314589 URL: https://svnweb.freebsd.org/changeset/base/314589 Log: MFC r314195: Properly handle possible underflow in vm_fault_prefault(). Modified: stable/11/sys/vm/vm_fault.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/vm/vm_fault.c ============================================================================== --- stable/11/sys/vm/vm_fault.c Fri Mar 3 08:13:45 2017 (r314588) +++ stable/11/sys/vm/vm_fault.c Fri Mar 3 10:02:56 2017 (r314589) @@ -1372,11 +1372,12 @@ vm_fault_prefault(const struct faultstat entry = fs->entry; - starta = addra - backward * PAGE_SIZE; - if (starta < entry->start) { + if (addra < backward * PAGE_SIZE) { starta = entry->start; - } else if (starta > addra) { - starta = 0; + } else { + starta = addra - backward * PAGE_SIZE; + if (starta < entry->start) + starta = entry->start; } /* From owner-svn-src-all@freebsd.org Fri Mar 3 10:17:17 2017 Return-Path: Delivered-To: svn-src-all@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 9CC57CF6103; Fri, 3 Mar 2017 10:17:17 +0000 (UTC) (envelope-from kib@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 651FD17AB; Fri, 3 Mar 2017 10:17:17 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23AHGnw009505; Fri, 3 Mar 2017 10:17:16 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23AHGn2009504; Fri, 3 Mar 2017 10:17:16 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201703031017.v23AHGn2009504@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 3 Mar 2017 10:17:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314590 - stable/10/sys/vm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 10:17:17 -0000 Author: kib Date: Fri Mar 3 10:17:16 2017 New Revision: 314590 URL: https://svnweb.freebsd.org/changeset/base/314590 Log: MFC r314195: Properly handle possible underflow in vm_fault_prefault(). Modified: stable/10/sys/vm/vm_fault.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/vm/vm_fault.c ============================================================================== --- stable/10/sys/vm/vm_fault.c Fri Mar 3 10:02:56 2017 (r314589) +++ stable/10/sys/vm/vm_fault.c Fri Mar 3 10:17:16 2017 (r314590) @@ -1140,11 +1140,12 @@ vm_fault_prefault(const struct faultstat } entry = fs->entry; - starta = addra - backward * PAGE_SIZE; - if (starta < entry->start) { + if (addra < backward * PAGE_SIZE) { starta = entry->start; - } else if (starta > addra) { - starta = 0; + } else { + starta = addra - backward * PAGE_SIZE; + if (starta < entry->start) + starta = entry->start; } /* From owner-svn-src-all@freebsd.org Fri Mar 3 10:30:32 2017 Return-Path: Delivered-To: svn-src-all@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 979D5CF69BB; Fri, 3 Mar 2017 10:30:32 +0000 (UTC) (envelope-from kib@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 59D8A1C36; Fri, 3 Mar 2017 10:30:32 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23AUVkW015904; Fri, 3 Mar 2017 10:30:31 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23AUVvs015379; Fri, 3 Mar 2017 10:30:31 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201703031030.v23AUVvs015379@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 3 Mar 2017 10:30:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314591 - in stable/11/sys: amd64/amd64 conf i386/i386 modules/mem x86/x86 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 10:30:32 -0000 Author: kib Date: Fri Mar 3 10:30:30 2017 New Revision: 314591 URL: https://svnweb.freebsd.org/changeset/base/314591 Log: MFC r313898, r313902, r313903, r313934, r314087, r314252: Merge i386 and amd64 mtrr drivers. Added: stable/11/sys/x86/x86/x86_mem.c - copied, changed from r313898, head/sys/x86/x86/x86_mem.c Deleted: stable/11/sys/amd64/amd64/amd64_mem.c stable/11/sys/i386/i386/i686_mem.c Modified: stable/11/sys/conf/files.amd64 stable/11/sys/conf/files.i386 stable/11/sys/modules/mem/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/conf/files.amd64 ============================================================================== --- stable/11/sys/conf/files.amd64 Fri Mar 3 10:17:16 2017 (r314590) +++ stable/11/sys/conf/files.amd64 Fri Mar 3 10:30:30 2017 (r314591) @@ -125,7 +125,6 @@ acpi_wakedata.h optional acpi \ no-obj no-implicit-rule before-depend \ clean "acpi_wakedata.h" # -amd64/amd64/amd64_mem.c optional mem #amd64/amd64/apic_vector.S standard amd64/amd64/atomic.c standard amd64/amd64/bios.c standard @@ -651,6 +650,7 @@ x86/x86/io_apic.c standard x86/x86/legacy.c standard x86/x86/local_apic.c standard x86/x86/mca.c standard +x86/x86/x86_mem.c optional mem x86/x86/mptable.c optional mptable x86/x86/mptable_pci.c optional mptable pci x86/x86/mp_x86.c optional smp Modified: stable/11/sys/conf/files.i386 ============================================================================== --- stable/11/sys/conf/files.i386 Fri Mar 3 10:17:16 2017 (r314590) +++ stable/11/sys/conf/files.i386 Fri Mar 3 10:30:30 2017 (r314591) @@ -486,7 +486,6 @@ i386/i386/elf_machdep.c standard i386/i386/exception.s standard i386/i386/gdb_machdep.c optional gdb i386/i386/geode.c optional cpu_geode -i386/i386/i686_mem.c optional mem i386/i386/in_cksum.c optional inet | inet6 i386/i386/initcpu.c standard i386/i386/io.c optional io @@ -625,6 +624,7 @@ x86/x86/io_apic.c optional apic x86/x86/legacy.c standard x86/x86/local_apic.c optional apic x86/x86/mca.c standard +x86/x86/x86_mem.c optional mem x86/x86/mptable.c optional apic x86/x86/mptable_pci.c optional apic pci x86/x86/mp_x86.c optional smp Modified: stable/11/sys/modules/mem/Makefile ============================================================================== --- stable/11/sys/modules/mem/Makefile Fri Mar 3 10:17:16 2017 (r314590) +++ stable/11/sys/modules/mem/Makefile Fri Mar 3 10:30:30 2017 (r314591) @@ -3,14 +3,17 @@ .PATH: ${.CURDIR}/../../dev/mem .PATH: ${.CURDIR}/../../${MACHINE}/${MACHINE} .PATH: ${.CURDIR}/../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH} +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +.PATH: ${.CURDIR}/../../x86/x86 +.endif KMOD= mem SRCS= mem.c memdev.c memutil.c .if ${MACHINE_CPUARCH} == "i386" -SRCS+= i686_mem.c k6_mem.c +SRCS+= x86_mem.c k6_mem.c .endif .if ${MACHINE_CPUARCH} == "amd64" -SRCS+= amd64_mem.c +SRCS+= x86_mem.c .endif SRCS+= bus_if.h device_if.h Copied and modified: stable/11/sys/x86/x86/x86_mem.c (from r313898, head/sys/x86/x86/x86_mem.c) ============================================================================== --- head/sys/x86/x86/x86_mem.c Fri Feb 17 21:08:32 2017 (r313898, copy source) +++ stable/11/sys/x86/x86/x86_mem.c Fri Mar 3 10:30:30 2017 (r314591) @@ -260,7 +260,7 @@ x86_mrfetch(struct mem_range_softc *sc) /* Compute the range from the mask. Ick. */ mrd->mr_len = (~(msrv & mtrr_physmask) & - (mtrr_physmask | 0xfffL)) + 1; + (mtrr_physmask | 0xfff)) + 1; if (!mrvalid(mrd->mr_base, mrd->mr_len)) mrd->mr_flags |= MDF_BOGUS; @@ -303,19 +303,13 @@ x86_mrt2mtrr(int flags, int oldval) * Update running CPU(s) MTRRs to match the ranges in the descriptor * list. * - * XXX Must be called with interrupts enabled. + * Must be called with interrupts enabled. */ static void x86_mrstore(struct mem_range_softc *sc) { -#ifdef SMP smp_rendezvous(NULL, x86_mrstoreone, NULL, sc); -#else - disable_intr(); /* disable interrupts */ - x86_mrstoreone(sc); - enable_intr(); -#endif } /* @@ -644,7 +638,8 @@ x86_mrinit(struct mem_range_softc *sc) * Determine the size of the PhysMask and PhysBase fields in * the variable range MTRRs. */ - mtrr_physmask = ((1UL << cpu_maxphyaddr) - 1) & ~0xfffUL; + mtrr_physmask = (((uint64_t)1 << cpu_maxphyaddr) - 1) & + ~(uint64_t)0xfff; /* If fixed MTRRs supported and enabled. */ if ((mtrrcap & MTRR_CAP_FIXED) && (mtrrdef & MTRR_DEF_FIXED_ENABLE)) { @@ -710,19 +705,13 @@ x86_mrAPinit(struct mem_range_softc *sc) * Re-initialise running CPU(s) MTRRs to match the ranges in the descriptor * list. * - * XXX Must be called with interrupts enabled. + * Must be called with interrupts enabled. */ static void x86_mrreinit(struct mem_range_softc *sc) { -#ifdef SMP - smp_rendezvous(NULL, (void *)x86_mrAPinit, NULL, sc); -#else - disable_intr(); /* disable interrupts */ - x86_mrAPinit(sc); - enable_intr(); -#endif + smp_rendezvous(NULL, (void (*)(void *))x86_mrAPinit, NULL, sc); } static void @@ -733,16 +722,6 @@ x86_mem_drvinit(void *unused) return; if (!(cpu_feature & CPUID_MTRR)) return; - if ((cpu_id & 0xf00) != 0x600 && (cpu_id & 0xf00) != 0xf00) - return; - switch (cpu_vendor_id) { - case CPU_VENDOR_INTEL: - case CPU_VENDOR_AMD: - case CPU_VENDOR_CENTAUR: - break; - default: - return; - } mem_range_softc.mr_op = &x86_mrops; x86_mrinit(&mem_range_softc); } From owner-svn-src-all@freebsd.org Fri Mar 3 11:06:24 2017 Return-Path: Delivered-To: svn-src-all@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 8C11CCF5368; Fri, 3 Mar 2017 11:06:24 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5FC281F0A; Fri, 3 Mar 2017 11:06:24 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1033) id AC2502F94; Fri, 3 Mar 2017 11:06:23 +0000 (UTC) Date: Fri, 3 Mar 2017 11:06:23 +0000 From: Alexey Dokuchaev To: "Rodney W. Grimes" Cc: Warner Losh , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , src-committers , Warner Losh Subject: Re: svn commit: r314473 - head Message-ID: <20170303110623.GA35929@FreeBSD.org> References: <201703011629.v21GTwdA057152@pdx.rh.CN85.dnsmgr.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201703011629.v21GTwdA057152@pdx.rh.CN85.dnsmgr.net> User-Agent: Mutt/1.7.1 (2016-10-04) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 11:06:24 -0000 On Wed, Mar 01, 2017 at 08:29:57AM -0800, Rodney W. Grimes wrote: > ... > There are 21 directors in /usr/src, 20 of them documented in README, > 18 of them documented in hier(7). > > I'll rectifiy this if and when I get my commit bit. Looks like you've just been punished. Congratulations! ;-) ./danfe From owner-svn-src-all@freebsd.org Fri Mar 3 11:21:15 2017 Return-Path: Delivered-To: svn-src-all@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 42E27CF58B9; Fri, 3 Mar 2017 11:21:15 +0000 (UTC) (envelope-from mav@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 EE5D11584; Fri, 3 Mar 2017 11:21:14 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23BLEfF036903; Fri, 3 Mar 2017 11:21:14 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23BLEj0036902; Fri, 3 Mar 2017 11:21:14 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201703031121.v23BLEj0036902@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 3 Mar 2017 11:21:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314592 - head/usr.bin/ctlstat X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 11:21:15 -0000 Author: mav Date: Fri Mar 3 11:21:13 2017 New Revision: 314592 URL: https://svnweb.freebsd.org/changeset/base/314592 Log: Fix JSON output. MFC after: 1 week Modified: head/usr.bin/ctlstat/ctlstat.c Modified: head/usr.bin/ctlstat/ctlstat.c ============================================================================== --- head/usr.bin/ctlstat/ctlstat.c Fri Mar 3 10:30:30 2017 (r314591) +++ head/usr.bin/ctlstat/ctlstat.c Fri Mar 3 11:21:13 2017 (r314592) @@ -312,8 +312,8 @@ compute_stats(struct ctl_io_stats *cur_s * conducive to programming, however. */ -#define PRINT_BINTIME(prefix, bt) \ - printf("%s %jd.%06ju\n", prefix, (intmax_t)(bt).sec, \ +#define PRINT_BINTIME(bt) \ + printf("%jd.%06ju", (intmax_t)(bt).sec, \ (uintmax_t)(((bt).frac >> 32) * 1000000 >> 32)) static const char *iotypes[] = {"NO IO", "READ", "WRITE"}; @@ -335,15 +335,15 @@ ctlstat_dump(struct ctlstat_context *ctx stats[i].operations[iotype]); printf(" dmas %ju\n", (uintmax_t) stats[i].dmas[iotype]); - PRINT_BINTIME(" io time", stats[i].time[iotype]); - PRINT_BINTIME(" dma time", stats[i].dma_time[iotype]); + printf(" io time "); + PRINT_BINTIME(stats[i].time[iotype]); + printf("\n dma time "); + PRINT_BINTIME(stats[i].dma_time[iotype]); + printf("\n"); } } } -#define JSON_BINTIME(prefix, bt) \ - printf("\"%s\":%jd.%06ju,", prefix, (intmax_t)(bt).sec, \ - (uintmax_t)(((bt).frac >> 32) * 1000000 >> 32)) static void ctlstat_json(struct ctlstat_context *ctx) { int iotype, i; @@ -357,14 +357,17 @@ ctlstat_json(struct ctlstat_context *ctx stats[i].item); for (iotype = 0; iotype < CTL_STATS_NUM_TYPES; iotype++) { printf("{\"type\":\"%s\",", iotypes[iotype]); - printf("\"bytes\":%ju,", (uintmax_t)stats[ - i].bytes[iotype]); - printf("\"operations\":%ju,", (uintmax_t)stats[ - i].operations[iotype]); - printf("\"dmas\":%ju}", (uintmax_t) + printf("\"bytes\":%ju,", (uintmax_t) + stats[i].bytes[iotype]); + printf("\"operations\":%ju,", (uintmax_t) + stats[i].operations[iotype]); + printf("\"dmas\":%ju,", (uintmax_t) stats[i].dmas[iotype]); - JSON_BINTIME("io time", stats[i].time[iotype]); - JSON_BINTIME("dma time", stats[i].dma_time[iotype]); + printf("\"io time\":"); + PRINT_BINTIME(stats[i].time[iotype]); + printf(",\"dma time\":"); + PRINT_BINTIME(stats[i].dma_time[iotype]); + printf("}"); if (iotype < (CTL_STATS_NUM_TYPES - 1)) printf(","); /* continue io array */ } From owner-svn-src-all@freebsd.org Fri Mar 3 12:03:52 2017 Return-Path: Delivered-To: svn-src-all@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 77430CF7BC8; Fri, 3 Mar 2017 12:03:52 +0000 (UTC) (envelope-from avg@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 29F6E1141; Fri, 3 Mar 2017 12:03:52 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23C3pn0055826; Fri, 3 Mar 2017 12:03:51 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23C3pYD055824; Fri, 3 Mar 2017 12:03:51 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703031203.v23C3pYD055824@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Fri, 3 Mar 2017 12:03:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314593 - in stable/10/sys/dev/drm2: . radeon X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 12:03:52 -0000 Author: avg Date: Fri Mar 3 12:03:50 2017 New Revision: 314593 URL: https://svnweb.freebsd.org/changeset/base/314593 Log: MFC r288112,r302571: remove unused and redundant declarations and code r288112 Hide an unused in FreeBSD function behind #ifdef linux to get rid of the compile time warning. r302571 Remove redundant declaration for radeon_pm_acpi_event_handler(..) to fix -Wredundant-decls warning This allows the code to be compiled with the base gcc. Modified: stable/10/sys/dev/drm2/drm_lock.c stable/10/sys/dev/drm2/radeon/radeon_acpi.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/drm2/drm_lock.c ============================================================================== --- stable/10/sys/dev/drm2/drm_lock.c Fri Mar 3 11:21:13 2017 (r314592) +++ stable/10/sys/dev/drm2/drm_lock.c Fri Mar 3 12:03:50 2017 (r314593) @@ -38,7 +38,9 @@ __FBSDID("$FreeBSD$"); #include +#if defined(__linux__) static int drm_notifier(void *priv); +#endif static int drm_lock_take(struct drm_lock_data *lock_data, unsigned int context); @@ -284,6 +286,7 @@ int drm_lock_free(struct drm_lock_data * return 0; } +#if defined(__linux__) /** * If we get here, it means that the process has called DRM_IOCTL_LOCK * without calling DRM_IOCTL_UNLOCK. @@ -314,6 +317,7 @@ static int drm_notifier(void *priv) } while (prev != old); return 0; } +#endif /** * This function returns immediately and takes the hw lock Modified: stable/10/sys/dev/drm2/radeon/radeon_acpi.c ============================================================================== --- stable/10/sys/dev/drm2/radeon/radeon_acpi.c Fri Mar 3 11:21:13 2017 (r314592) +++ stable/10/sys/dev/drm2/radeon/radeon_acpi.c Fri Mar 3 12:03:50 2017 (r314593) @@ -32,8 +32,6 @@ __FBSDID("$FreeBSD$"); #define ACPI_AC_CLASS "ac_adapter" -extern void radeon_pm_acpi_event_handler(struct radeon_device *rdev); - struct atif_verify_interface { u16 size; /* structure size in bytes (includes size field) */ u16 version; /* version */ From owner-svn-src-all@freebsd.org Fri Mar 3 12:06:34 2017 Return-Path: Delivered-To: svn-src-all@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 9308CCF7CC6; Fri, 3 Mar 2017 12:06:34 +0000 (UTC) (envelope-from avg@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 5F98A12E8; Fri, 3 Mar 2017 12:06:34 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23C6XkS055973; Fri, 3 Mar 2017 12:06:33 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23C6XTF055972; Fri, 3 Mar 2017 12:06:33 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703031206.v23C6XTF055972@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Fri, 3 Mar 2017 12:06:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314594 - stable/10/sys/modules/mlx5 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 12:06:34 -0000 Author: avg Date: Fri Mar 3 12:06:33 2017 New Revision: 314594 URL: https://svnweb.freebsd.org/changeset/base/314594 Log: mlx5 module: remove include path that doesn't exist in this branch This is a direct commit. It allows the module to be compiled with the base gcc. Modified: stable/10/sys/modules/mlx5/Makefile Modified: stable/10/sys/modules/mlx5/Makefile ============================================================================== --- stable/10/sys/modules/mlx5/Makefile Fri Mar 3 12:03:50 2017 (r314593) +++ stable/10/sys/modules/mlx5/Makefile Fri Mar 3 12:06:33 2017 (r314594) @@ -30,7 +30,6 @@ device_if.h bus_if.h vnode_if.h pci_if.h SRCS+= linux_compat.c linux_radix.c linux_idr.c CFLAGS+= -I${.CURDIR}/../../ofed/include -CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include .include From owner-svn-src-all@freebsd.org Fri Mar 3 12:29:29 2017 Return-Path: Delivered-To: svn-src-all@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 554E9CF3933; Fri, 3 Mar 2017 12:29:29 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 1FEA412C4; Fri, 3 Mar 2017 12:29:28 +0000 (UTC) (envelope-from des@des.no) Received: from desk.des.no (smtp.des.no [194.63.250.102]) by smtp.des.no (Postfix) with ESMTP id 406D78500; Fri, 3 Mar 2017 12:29:27 +0000 (UTC) Received: by desk.des.no (Postfix, from userid 1001) id EDD024771; Fri, 3 Mar 2017 13:29:26 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: "Bjoern A. Zeeb" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r308996 - head/lib/libfetch References: <201611221330.uAMDU7fg052989@repo.freebsd.org> <77B1B45A-D837-4853-B1E9-958D3B0DD519@lists.zabbadoz.net> Date: Fri, 03 Mar 2017 13:29:26 +0100 In-Reply-To: <77B1B45A-D837-4853-B1E9-958D3B0DD519@lists.zabbadoz.net> (Bjoern A. Zeeb's message of "Tue, 28 Feb 2017 18:03:24 +0000") Message-ID: <867f468rx5.fsf@desk.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 12:29:29 -0000 "Bjoern A. Zeeb" writes: > Dag-Erling Sm=C3=B8rgrav writes: >> + /* split address if necessary */ >> + err =3D EAI_SYSTEM; >> + if ((sep =3D strchr(addr, ':')) !=3D NULL) { >> + len =3D snprintf(hbuf, sizeof(hbuf), >> + "%.*s", (int)(sep - addr), addr); > I believe this code is what broke > fetch http://[::1]:6666/ > just to give an example; and the printf traces will not reveal this > but =E2=80=9Caddr=E2=80=9D at this point has no more addr:port in it give= n the > function arguments, right? I think you're right, I'll look into it. It means replacing strchr() with a loop. Is there a ticket for this bug, and if not, could you please open one? DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-svn-src-all@freebsd.org Fri Mar 3 12:30:19 2017 Return-Path: Delivered-To: svn-src-all@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 D8548CF39DA; Fri, 3 Mar 2017 12:30:19 +0000 (UTC) (envelope-from garga@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 969531497; Fri, 3 Mar 2017 12:30:19 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23CUIsN064541; Fri, 3 Mar 2017 12:30:18 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23CUI7u064540; Fri, 3 Mar 2017 12:30:18 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201703031230.v23CUI7u064540@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Fri, 3 Mar 2017 12:30:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314595 - stable/11/usr.bin/sockstat X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 12:30:20 -0000 Author: garga (ports committer) Date: Fri Mar 3 12:30:18 2017 New Revision: 314595 URL: https://svnweb.freebsd.org/changeset/base/314595 Log: MFC r314039: Fix style(9) Reviewed by: ngie, tuexen, vangyzen, allanjude Approved by: allanjude MFC after: 1 week Sponsored by: Rubicon Communications (Netgate) Differential Revision: https://reviews.freebsd.org/D9588 Modified: stable/11/usr.bin/sockstat/sockstat.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/sockstat/sockstat.c ============================================================================== --- stable/11/usr.bin/sockstat/sockstat.c Fri Mar 3 12:06:33 2017 (r314594) +++ stable/11/usr.bin/sockstat/sockstat.c Fri Mar 3 12:30:18 2017 (r314595) @@ -88,9 +88,9 @@ static size_t numprotos; /* allocated s static int *ports; -#define INT_BIT (sizeof(int)*CHAR_BIT) -#define SET_PORT(p) do { ports[p / INT_BIT] |= 1 << (p % INT_BIT); } while (0) -#define CHK_PORT(p) (ports[p / INT_BIT] & (1 << (p % INT_BIT))) +#define INT_BIT (sizeof(int)*CHAR_BIT) +#define SET_PORT(p) do { ports[p / INT_BIT] |= 1 << (p % INT_BIT); } while (0) +#define CHK_PORT(p) (ports[p / INT_BIT] & (1 << (p % INT_BIT))) struct addr { struct sockaddr_storage address; @@ -111,7 +111,7 @@ struct sock { struct sock *next; }; -#define HASHSIZE 1009 +#define HASHSIZE 1009 static struct sock *sockhash[HASHSIZE]; static struct xfile *xfiles; @@ -131,7 +131,6 @@ xprintf(const char *fmt, ...) return (len); } - static int get_proto_type(const char *proto) { @@ -147,7 +146,6 @@ get_proto_type(const char *proto) return (pent->p_proto); } - static void init_protos(int num) { @@ -167,7 +165,6 @@ init_protos(int num) numprotos = proto_count; } - static int parse_protos(char *protospec) { @@ -190,7 +187,6 @@ parse_protos(char *protospec) return (proto_index); } - static void parse_ports(const char *portspec) { @@ -359,27 +355,27 @@ gather_sctp(void) err(1, "malloc()"); switch (xladdr->address.sa.sa_family) { case AF_INET: -#define __IN_IS_ADDR_LOOPBACK(pina) \ +#define __IN_IS_ADDR_LOOPBACK(pina) \ ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) - if (!__IN_IS_ADDR_LOOPBACK(&xladdr->address.sin.sin_addr)) + if (!__IN_IS_ADDR_LOOPBACK( + &xladdr->address.sin.sin_addr)) local_all_loopback = 0; -#undef __IN_IS_ADDR_LOOPBACK - sockaddr(&laddr->address, - AF_INET, - &xladdr->address.sin.sin_addr, - htons(xinpcb->local_port)); +#undef __IN_IS_ADDR_LOOPBACK + sockaddr(&laddr->address, AF_INET, + &xladdr->address.sin.sin_addr, + htons(xinpcb->local_port)); break; case AF_INET6: - if (!IN6_IS_ADDR_LOOPBACK(&xladdr->address.sin6.sin6_addr)) + if (!IN6_IS_ADDR_LOOPBACK( + &xladdr->address.sin6.sin6_addr)) local_all_loopback = 0; - sockaddr(&laddr->address, - AF_INET6, - &xladdr->address.sin6.sin6_addr, - htons(xinpcb->local_port)); + sockaddr(&laddr->address, AF_INET6, + &xladdr->address.sin6.sin6_addr, + htons(xinpcb->local_port)); break; default: errx(1, "address family %d not supported", - xladdr->address.sa.sa_family); + xladdr->address.sa.sa_family); } laddr->next = NULL; if (prev_laddr == NULL) @@ -389,33 +385,38 @@ gather_sctp(void) prev_laddr = laddr; } if (sock->laddr == NULL) { - if ((sock->laddr = calloc(1, sizeof(struct addr))) == NULL) + if ((sock->laddr = + calloc(1, sizeof(struct addr))) == NULL) err(1, "malloc()"); sock->laddr->address.ss_family = sock->family; if (sock->family == AF_INET) - sock->laddr->address.ss_len = sizeof(struct sockaddr_in); + sock->laddr->address.ss_len = + sizeof(struct sockaddr_in); else - sock->laddr->address.ss_len = sizeof(struct sockaddr_in6); + sock->laddr->address.ss_len = + sizeof(struct sockaddr_in6); local_all_loopback = 0; } if ((sock->faddr = calloc(1, sizeof(struct addr))) == NULL) err(1, "malloc()"); sock->faddr->address.ss_family = sock->family; if (sock->family == AF_INET) - sock->faddr->address.ss_len = sizeof(struct sockaddr_in); + sock->faddr->address.ss_len = + sizeof(struct sockaddr_in); else - sock->faddr->address.ss_len = sizeof(struct sockaddr_in6); + sock->faddr->address.ss_len = + sizeof(struct sockaddr_in6); no_stcb = 1; while (offset < len) { xstcb = (struct xsctp_tcb *)(void *)(buf + offset); offset += sizeof(struct xsctp_tcb); if (no_stcb) { - if (opt_l && - (sock->vflag & vflag) && + if (opt_l && (sock->vflag & vflag) && (!opt_L || !local_all_loopback) && ((xinpcb->flags & SCTP_PCB_FLAGS_UDPTYPE) || (xstcb->last == 1))) { - hash = (int)((uintptr_t)sock->socket % HASHSIZE); + hash = (int)((uintptr_t)sock->socket % + HASHSIZE); sock->next = sockhash[hash]; sockhash[hash] = sock; } else { @@ -448,37 +449,40 @@ gather_sctp(void) prev_laddr = NULL; local_all_loopback = 1; while (offset < len) { - xladdr = (struct xsctp_laddr *)(void *)(buf + offset); + xladdr = (struct xsctp_laddr *)(void *)(buf + + offset); offset += sizeof(struct xsctp_laddr); if (xladdr->last == 1) break; if (!opt_c) continue; - if ((laddr = calloc(1, sizeof(struct addr))) == NULL) + laddr = calloc(1, sizeof(struct addr)); + if (laddr == NULL) err(1, "malloc()"); switch (xladdr->address.sa.sa_family) { case AF_INET: -#define __IN_IS_ADDR_LOOPBACK(pina) \ +#define __IN_IS_ADDR_LOOPBACK(pina) \ ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) - if (!__IN_IS_ADDR_LOOPBACK(&xladdr->address.sin.sin_addr)) + if (!__IN_IS_ADDR_LOOPBACK( + &xladdr->address.sin.sin_addr)) local_all_loopback = 0; -#undef __IN_IS_ADDR_LOOPBACK - sockaddr(&laddr->address, - AF_INET, - &xladdr->address.sin.sin_addr, - htons(xstcb->local_port)); +#undef __IN_IS_ADDR_LOOPBACK + sockaddr(&laddr->address, AF_INET, + &xladdr->address.sin.sin_addr, + htons(xstcb->local_port)); break; case AF_INET6: - if (!IN6_IS_ADDR_LOOPBACK(&xladdr->address.sin6.sin6_addr)) + if (!IN6_IS_ADDR_LOOPBACK( + &xladdr->address.sin6.sin6_addr)) local_all_loopback = 0; - sockaddr(&laddr->address, - AF_INET6, - &xladdr->address.sin6.sin6_addr, - htons(xstcb->local_port)); + sockaddr(&laddr->address, AF_INET6, + &xladdr->address.sin6.sin6_addr, + htons(xstcb->local_port)); break; default: - errx(1, "address family %d not supported", - xladdr->address.sa.sa_family); + errx(1, + "address family %d not supported", + xladdr->address.sa.sa_family); } laddr->next = NULL; if (prev_laddr == NULL) @@ -490,37 +494,40 @@ gather_sctp(void) prev_faddr = NULL; foreign_all_loopback = 1; while (offset < len) { - xraddr = (struct xsctp_raddr *)(void *)(buf + offset); + xraddr = (struct xsctp_raddr *)(void *)(buf + + offset); offset += sizeof(struct xsctp_raddr); if (xraddr->last == 1) break; if (!opt_c) continue; - if ((faddr = calloc(1, sizeof(struct addr))) == NULL) + faddr = calloc(1, sizeof(struct addr)); + if (faddr == NULL) err(1, "malloc()"); switch (xraddr->address.sa.sa_family) { case AF_INET: -#define __IN_IS_ADDR_LOOPBACK(pina) \ +#define __IN_IS_ADDR_LOOPBACK(pina) \ ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) - if (!__IN_IS_ADDR_LOOPBACK(&xraddr->address.sin.sin_addr)) + if (!__IN_IS_ADDR_LOOPBACK( + &xraddr->address.sin.sin_addr)) foreign_all_loopback = 0; -#undef __IN_IS_ADDR_LOOPBACK - sockaddr(&faddr->address, - AF_INET, - &xraddr->address.sin.sin_addr, - htons(xstcb->remote_port)); +#undef __IN_IS_ADDR_LOOPBACK + sockaddr(&faddr->address, AF_INET, + &xraddr->address.sin.sin_addr, + htons(xstcb->remote_port)); break; case AF_INET6: - if (!IN6_IS_ADDR_LOOPBACK(&xraddr->address.sin6.sin6_addr)) + if (!IN6_IS_ADDR_LOOPBACK( + &xraddr->address.sin6.sin6_addr)) foreign_all_loopback = 0; - sockaddr(&faddr->address, - AF_INET6, - &xraddr->address.sin6.sin6_addr, - htons(xstcb->remote_port)); + sockaddr(&faddr->address, AF_INET6, + &xraddr->address.sin6.sin6_addr, + htons(xstcb->remote_port)); break; default: - errx(1, "address family %d not supported", - xraddr->address.sa.sa_family); + errx(1, + "address family %d not supported", + xraddr->address.sa.sa_family); } faddr->next = NULL; if (prev_faddr == NULL) @@ -532,8 +539,10 @@ gather_sctp(void) if (opt_c) { if ((sock->vflag & vflag) && (!opt_L || - !(local_all_loopback || foreign_all_loopback))) { - hash = (int)((uintptr_t)sock->socket % HASHSIZE); + !(local_all_loopback || + foreign_all_loopback))) { + hash = (int)((uintptr_t)sock->socket % + HASHSIZE); sock->next = sockhash[hash]; sockhash[hash] = sock; } else { @@ -646,13 +655,13 @@ gather_inet(int proto) if ((inp->inp_fport == 0 && !opt_l) || (inp->inp_fport != 0 && !opt_c)) continue; -#define __IN_IS_ADDR_LOOPBACK(pina) \ +#define __IN_IS_ADDR_LOOPBACK(pina) \ ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) if (opt_L && (__IN_IS_ADDR_LOOPBACK(&inp->inp_faddr) || __IN_IS_ADDR_LOOPBACK(&inp->inp_laddr))) continue; -#undef __IN_IS_ADDR_LOOPBACK +#undef __IN_IS_ADDR_LOOPBACK } else if (inp->inp_vflag & INP_IPV6) { if ((inp->inp_fport == 0 && !opt_l) || (inp->inp_fport != 0 && !opt_c)) @@ -1003,7 +1012,7 @@ displaysock(struct sock *s, int pos) case AF_UNIX: if ((laddr == NULL) || (faddr == NULL)) errx(1, "laddr = %p or faddr = %p is NULL", - (void *)laddr, (void *)faddr); + (void *)laddr, (void *)faddr); /* server */ if (laddr->address.ss_len > 0) { pos += printaddr(&laddr->address); @@ -1018,15 +1027,14 @@ displaysock(struct sock *s, int pos) pos += xprintf("-> "); for (hash = 0; hash < HASHSIZE; ++hash) { for (s_tmp = sockhash[hash]; - s_tmp != NULL; - s_tmp = s_tmp->next) + s_tmp != NULL; + s_tmp = s_tmp->next) if (s_tmp->pcb == p) break; if (s_tmp != NULL) break; } - if (s_tmp == NULL || - s_tmp->laddr == NULL || + if (s_tmp == NULL || s_tmp->laddr == NULL || s_tmp->laddr->address.ss_len == 0) pos += xprintf("??"); else @@ -1144,7 +1152,6 @@ static int set_default_protos(void) return (pindex); } - static void usage(void) { From owner-svn-src-all@freebsd.org Fri Mar 3 12:51:17 2017 Return-Path: Delivered-To: svn-src-all@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 98E75CF56E9; Fri, 3 Mar 2017 12:51:17 +0000 (UTC) (envelope-from bapt@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 661621345; Fri, 3 Mar 2017 12:51:17 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23CpGVs074561; Fri, 3 Mar 2017 12:51:16 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23CpGWM074560; Fri, 3 Mar 2017 12:51:16 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201703031251.v23CpGWM074560@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 3 Mar 2017 12:51:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314596 - head/lib/libfetch X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 12:51:17 -0000 Author: bapt Date: Fri Mar 3 12:51:16 2017 New Revision: 314596 URL: https://svnweb.freebsd.org/changeset/base/314596 Log: Properly initialize netrcfd in fetchParseURL This fixes ftp with fetch(1) which was broken after r313974 Submitted by: dim Reported by: olivier Pointyhat to: bapt Modified: head/lib/libfetch/fetch.c Modified: head/lib/libfetch/fetch.c ============================================================================== --- head/lib/libfetch/fetch.c Fri Mar 3 12:30:18 2017 (r314595) +++ head/lib/libfetch/fetch.c Fri Mar 3 12:51:16 2017 (r314596) @@ -350,6 +350,7 @@ fetchParseURL(const char *URL) fetch_syserr(); return (NULL); } + u->netrcfd = -2; /* scheme name */ if ((p = strstr(URL, ":/"))) { From owner-svn-src-all@freebsd.org Fri Mar 3 13:32:02 2017 Return-Path: Delivered-To: svn-src-all@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 AB443CF6186; Fri, 3 Mar 2017 13:32:02 +0000 (UTC) (envelope-from des@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 5D39816D5; Fri, 3 Mar 2017 13:32:02 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23DW1qw089930; Fri, 3 Mar 2017 13:32:01 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23DW1ii089929; Fri, 3 Mar 2017 13:32:01 GMT (envelope-from des@FreeBSD.org) Message-Id: <201703031332.v23DW1ii089929@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Fri, 3 Mar 2017 13:32:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314597 - stable/10/tools/build/mk X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 13:32:02 -0000 Author: des Date: Fri Mar 3 13:32:01 2017 New Revision: 314597 URL: https://svnweb.freebsd.org/changeset/base/314597 Log: MFH (r278120): add missing ssh-related files PR: 193980 Submitted by: mcdouga9@egr.msu.edu Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/10/ (props changed) Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Fri Mar 3 12:51:16 2017 (r314596) +++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Fri Mar 3 13:32:01 2017 (r314597) @@ -4044,18 +4044,28 @@ OLD_FILES+=usr/share/man/man8/ntptime.8. .endif .if ${MK_OPENSSH} == no +OLD_FILES+=etc/rc.d/sshd +OLD_FILES+=etc/ssh/moduli +OLD_FILES+=etc/ssh/ssh_config +OLD_FILES+=etc/ssh/sshd_config +OLD_FILES+=usr/bin/scp OLD_FILES+=usr/bin/sftp +OLD_FILES+=usr/bin/slogin OLD_FILES+=usr/bin/ssh OLD_FILES+=usr/bin/ssh-add OLD_FILES+=usr/bin/ssh-agent OLD_FILES+=usr/bin/ssh-copy-id OLD_FILES+=usr/bin/ssh-keygen OLD_FILES+=usr/bin/ssh-keyscan +OLD_FILES+=usr/lib/pam_ssh.so +OLD_LIBS+=usr/lib/pam_ssh.so.5 OLD_FILES+=usr/lib/private/libssh.a OLD_FILES+=usr/lib/private/libssh.so OLD_LIBS+=usr/lib/private/libssh.so.5 OLD_FILES+=usr/lib/private/libssh_p.a .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" +OLD_FILES+=usr/lib32/pam_ssh.so +OLD_LIBS+=usr/lib32/pam_ssh.so.5 OLD_FILES+=usr/lib32/private/libssh.a OLD_FILES+=usr/lib32/private/libssh.so OLD_LIBS+=usr/lib32/private/libssh.so.5 @@ -4065,6 +4075,22 @@ OLD_FILES+=usr/libexec/sftp-server OLD_FILES+=usr/libexec/ssh-keysign OLD_FILES+=usr/libexec/ssh-pkcs11-helper OLD_FILES+=usr/sbin/sshd +OLD_FILES+=usr/share/man/man1/scp.1.gz +OLD_FILES+=usr/share/man/man1/sftp.1.gz +OLD_FILES+=usr/share/man/man1/slogin.1.gz +OLD_FILES+=usr/share/man/man1/ssh-add.1.gz +OLD_FILES+=usr/share/man/man1/ssh-agent.1.gz +OLD_FILES+=usr/share/man/man1/ssh-copy-id.1.gz +OLD_FILES+=usr/share/man/man1/ssh-keygen.1.gz +OLD_FILES+=usr/share/man/man1/ssh-keyscan.1.gz +OLD_FILES+=usr/share/man/man1/ssh.1.gz +OLD_FILES+=usr/share/man/man5/ssh_config.5.gz +OLD_FILES+=usr/share/man/man5/sshd_config.5.gz +OLD_FILES+=usr/share/man/man8/pam_ssh.8.gz +OLD_FILES+=usr/share/man/man8/sftp-server.8.gz +OLD_FILES+=usr/share/man/man8/ssh-keysign.8.gz +OLD_FILES+=usr/share/man/man8/ssh-pkcs11-helper.8.gz +OLD_FILES+=usr/share/man/man8/sshd.8.gz .endif .if ${MK_OPENSSL} == no From owner-svn-src-all@freebsd.org Fri Mar 3 13:56:53 2017 Return-Path: Delivered-To: svn-src-all@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 D0F86CF6BC0; Fri, 3 Mar 2017 13:56:53 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A76BD1772; Fri, 3 Mar 2017 13:56:52 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v23Duo0c069894; Fri, 3 Mar 2017 05:56:50 -0800 (PST) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd-rwg@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v23Duoiu069893; Fri, 3 Mar 2017 05:56:50 -0800 (PST) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <201703031356.v23Duoiu069893@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314585 - head/usr.sbin/syslogd In-Reply-To: <20170303.165718.447567964094984094.hrs@allbsd.org> To: Hiroki Sato Date: Fri, 3 Mar 2017 05:56:50 -0800 (PST) CC: yaneurabeya@gmail.com, svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, ngie@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 13:56:53 -0000 -- Start of PGP signed section. [ Charset ISO-8859-7 unsupported, converting... ] > "Ngie Cooper (yaneurabeya)" wrote > in <1A3F6606-822C-4C80-ADFA-48378F0F29EE@gmail.com>: > > ya> >> How about "...accepts UDP packets sent with any source port" or I actually think this right here is the clearest one of all the ones I have seen attempted. Oh, remove the s from accepts. > ya> >> something? > ya> > > ya> > Yeah, that?s more accurate. > ya> > ya> How about this? > ya> -Ngie > ya> > ya> $ svn diff usr.sbin/syslogd/syslogd.8 > ya> Index: usr.sbin/syslogd/syslogd.8 > ya> =================================================================== > ya> --- usr.sbin/syslogd/syslogd.8 (revision 314585) > ya> +++ usr.sbin/syslogd/syslogd.8 (working copy) > ya> @@ -131,7 +131,7 @@ > ya> .Ar service > ya> of > ya> .Ql \&* > ya> -allows packets to be received from any UDP port. > ya> +allows UDP packets to be sent with any source port. > ya> The default > ya> .Ar service > ya> is > > Looks good to me though probably I am not the best person who can > judge an English expression as good or bad... > > -- Hiroki > -- End of PGP section, PGP failed! -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Fri Mar 3 14:06:23 2017 Return-Path: Delivered-To: svn-src-all@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 60A92CF6DF9; Fri, 3 Mar 2017 14:06:23 +0000 (UTC) (envelope-from des@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 24FDB1D37; Fri, 3 Mar 2017 14:06:23 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23E6MDk004529; Fri, 3 Mar 2017 14:06:22 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23E6MQv004528; Fri, 3 Mar 2017 14:06:22 GMT (envelope-from des@FreeBSD.org) Message-Id: <201703031406.v23E6MQv004528@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Fri, 3 Mar 2017 14:06:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314598 - head/lib/libpam/modules/pam_krb5 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 14:06:23 -0000 Author: des Date: Fri Mar 3 14:06:22 2017 New Revision: 314598 URL: https://svnweb.freebsd.org/changeset/base/314598 Log: Load default options before requesting a ticket. PR: 213909 Reported by: basarevych@gmail.com MFC after: 1 week Modified: head/lib/libpam/modules/pam_krb5/pam_krb5.c Modified: head/lib/libpam/modules/pam_krb5/pam_krb5.c ============================================================================== --- head/lib/libpam/modules/pam_krb5/pam_krb5.c Fri Mar 3 13:32:01 2017 (r314597) +++ head/lib/libpam/modules/pam_krb5/pam_krb5.c Fri Mar 3 14:06:22 2017 (r314598) @@ -239,6 +239,8 @@ pam_sm_authenticate(pam_handle_t *pamh, retval = PAM_SERVICE_ERR; goto cleanup2; } + krb5_get_init_creds_opt_set_default_flags(pam_context, + service, NULL, opts); if (openpam_get_option(pamh, PAM_OPT_FORWARDABLE)) krb5_get_init_creds_opt_set_forwardable(opts, 1); From owner-svn-src-all@freebsd.org Fri Mar 3 14:17:09 2017 Return-Path: Delivered-To: svn-src-all@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 657DFCF5212; Fri, 3 Mar 2017 14:17:09 +0000 (UTC) (envelope-from br@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 1E7BE13BD; Fri, 3 Mar 2017 14:17:09 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23EH8G7008686; Fri, 3 Mar 2017 14:17:08 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23EH741008683; Fri, 3 Mar 2017 14:17:07 GMT (envelope-from br@FreeBSD.org) Message-Id: <201703031417.v23EH741008683@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Fri, 3 Mar 2017 14:17:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314599 - head/sys/gnu/dts/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 14:17:09 -0000 Author: br Date: Fri Mar 3 14:17:07 2017 New Revision: 314599 URL: https://svnweb.freebsd.org/changeset/base/314599 Log: Import latest vendor DTS files for Intel Arria 10. Modified: head/sys/gnu/dts/arm/socfpga_arria10.dtsi head/sys/gnu/dts/arm/socfpga_arria10_socdk.dtsi head/sys/gnu/dts/arm/socfpga_arria10_socdk_sdmmc.dts Modified: head/sys/gnu/dts/arm/socfpga_arria10.dtsi ============================================================================== --- head/sys/gnu/dts/arm/socfpga_arria10.dtsi Fri Mar 3 14:06:22 2017 (r314598) +++ head/sys/gnu/dts/arm/socfpga_arria10.dtsi Fri Mar 3 14:17:07 2017 (r314599) @@ -22,11 +22,6 @@ #address-cells = <1>; #size-cells = <1>; - aliases { - serial0 = &uart0; - serial1 = &uart1; - }; - cpus { #address-cells = <1>; #size-cells = <0>; @@ -88,6 +83,14 @@ }; }; + base_fpga_region { + #address-cells = <0x1>; + #size-cells = <0x1>; + + compatible = "fpga-region"; + fpga-mgr = <&fpga_mgr>; + }; + clkmgr@ffd04000 { compatible = "altr,clk-mgr"; reg = <0xffd04000 0x1000>; @@ -405,6 +408,12 @@ }; }; + socfpga_axi_setup: stmmac-axi-config { + snps,wr_osr_lmt = <0xf>; + snps,rd_osr_lmt = <0xf>; + snps,blen = <0 0 0 0 16 0 0>; + }; + gmac0: ethernet@ff800000 { compatible = "altr,socfpga-stmmac", "snps,dwmac-3.72a", "snps,dwmac"; altr,sysmgr-syscon = <&sysmgr 0x44 0>; @@ -421,6 +430,7 @@ clock-names = "stmmaceth"; resets = <&rst EMAC0_RESET>; reset-names = "stmmaceth"; + snps,axi-config = <&socfpga_axi_setup>; status = "disabled"; }; @@ -440,6 +450,7 @@ clock-names = "stmmaceth"; resets = <&rst EMAC1_RESET>; reset-names = "stmmaceth"; + snps,axi-config = <&socfpga_axi_setup>; status = "disabled"; }; @@ -457,6 +468,7 @@ rx-fifo-depth = <16384>; clocks = <&l4_mp_clk>; clock-names = "stmmaceth"; + snps,axi-config = <&socfpga_axi_setup>; status = "disabled"; }; @@ -517,6 +529,15 @@ }; }; + fpga_mgr: fpga-mgr@ffd03000 { + compatible = "altr,socfpga-a10-fpga-mgr"; + reg = <0xffd03000 0x100 + 0xffcfe400 0x20>; + clocks = <&l4_mp_clk>; + resets = <&rst FPGAMGR_RESET>; + reset-names = "fpgamgr"; + }; + i2c0: i2c@ffc02200 { #address-cells = <1>; #size-cells = <0>; @@ -567,15 +588,24 @@ status = "disabled"; }; - sdr: sdr@ffc25000 { - compatible = "syscon"; - reg = <0xffcfb100 0x80>; + spi1: spi@ffda5000 { + compatible = "snps,dw-apb-ssi"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xffda5000 0x100>; + interrupts = <0 102 4>; + num-chipselect = <4>; + bus-num = <0>; + /*32bit_access;*/ + tx-dma-channel = <&pdma 16>; + rx-dma-channel = <&pdma 17>; + clocks = <&spi_m_clk>; + status = "disabled"; }; - sdramedac { - compatible = "altr,sdram-edac-a10"; - altr,sdr-syscon = <&sdr>; - interrupts = <0 2 4>, <0 0 4>; + sdr: sdr@ffc25000 { + compatible = "altr,sdr-ctl", "syscon"; + reg = <0xffcfb100 0x80>; }; L2: l2-cache@fffff000 { @@ -584,6 +614,9 @@ interrupts = <0 18 IRQ_TYPE_LEVEL_HIGH>; cache-unified; cache-level = <2>; + prefetch-data = <1>; + prefetch-instr = <1>; + arm,shared-override; }; mmc: dwmmc0@ff808000 { @@ -598,6 +631,19 @@ status = "disabled"; }; + nand: nand@ffb90000 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "denali,denali-nand-dt", "altr,socfpga-denali-nand"; + reg = <0xffb90000 0x72000>, + <0xffb80000 0x10000>; + reg-names = "nand_data", "denali_reg"; + interrupts = <0 99 4>; + dma-mask = <0xffffffff>; + clocks = <&nand_clk>; + status = "disabled"; + }; + ocram: sram@ffe00000 { compatible = "mmio-sram"; reg = <0xffe00000 0x40000>; @@ -610,17 +656,76 @@ #size-cells = <1>; interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>, <0 0 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + #interrupt-cells = <2>; ranges; + sdramedac { + compatible = "altr,sdram-edac-a10"; + altr,sdr-syscon = <&sdr>; + interrupts = <17 IRQ_TYPE_LEVEL_HIGH>, + <49 IRQ_TYPE_LEVEL_HIGH>; + }; + l2-ecc@ffd06010 { compatible = "altr,socfpga-a10-l2-ecc"; reg = <0xffd06010 0x4>; + interrupts = <0 IRQ_TYPE_LEVEL_HIGH>, + <32 IRQ_TYPE_LEVEL_HIGH>; }; ocram-ecc@ff8c3000 { compatible = "altr,socfpga-a10-ocram-ecc"; reg = <0xff8c3000 0x400>; + interrupts = <1 IRQ_TYPE_LEVEL_HIGH>, + <33 IRQ_TYPE_LEVEL_HIGH>; + }; + + emac0-rx-ecc@ff8c0800 { + compatible = "altr,socfpga-eth-mac-ecc"; + reg = <0xff8c0800 0x400>; + altr,ecc-parent = <&gmac0>; + interrupts = <4 IRQ_TYPE_LEVEL_HIGH>, + <36 IRQ_TYPE_LEVEL_HIGH>; + }; + + emac0-tx-ecc@ff8c0c00 { + compatible = "altr,socfpga-eth-mac-ecc"; + reg = <0xff8c0c00 0x400>; + altr,ecc-parent = <&gmac0>; + interrupts = <5 IRQ_TYPE_LEVEL_HIGH>, + <37 IRQ_TYPE_LEVEL_HIGH>; }; + + dma-ecc@ff8c8000 { + compatible = "altr,socfpga-dma-ecc"; + reg = <0xff8c8000 0x400>; + altr,ecc-parent = <&pdma>; + interrupts = <10 IRQ_TYPE_LEVEL_HIGH>, + <42 IRQ_TYPE_LEVEL_HIGH>; + }; + + usb0-ecc@ff8c8800 { + compatible = "altr,socfpga-usb-ecc"; + reg = <0xff8c8800 0x400>; + altr,ecc-parent = <&usb0>; + interrupts = <2 IRQ_TYPE_LEVEL_HIGH>, + <34 IRQ_TYPE_LEVEL_HIGH>; + }; + }; + + qspi: spi@ff809000 { + compatible = "cdns,qspi-nor"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xff809000 0x100>, + <0xffa00000 0x100000>; + interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>; + cdns,fifo-depth = <128>; + cdns,fifo-width = <4>; + cdns,trigger-address = <0x00000000>; + clocks = <&qspi_clk>; + status = "disabled"; }; rst: rstmgr@ffd05000 { Modified: head/sys/gnu/dts/arm/socfpga_arria10_socdk.dtsi ============================================================================== --- head/sys/gnu/dts/arm/socfpga_arria10_socdk.dtsi Fri Mar 3 14:06:22 2017 (r314598) +++ head/sys/gnu/dts/arm/socfpga_arria10_socdk.dtsi Fri Mar 3 14:17:07 2017 (r314599) @@ -20,9 +20,14 @@ model = "Altera SOCFPGA Arria 10"; compatible = "altr,socfpga-arria10", "altr,socfpga"; + aliases { + ethernet0 = &gmac0; + serial0 = &uart1; + }; + chosen { bootargs = "earlyprintk"; - stdout-path = "serial1:115200n8"; + stdout-path = "serial0:115200n8"; }; memory { @@ -31,6 +36,30 @@ reg = <0x0 0x40000000>; /* 1GB */ }; + a10leds { + compatible = "gpio-leds"; + + a10sr_led0 { + label = "a10sr-led0"; + gpios = <&a10sr_gpio 0 1>; + }; + + a10sr_led1 { + label = "a10sr-led1"; + gpios = <&a10sr_gpio 1 1>; + }; + + a10sr_led2 { + label = "a10sr-led2"; + gpios = <&a10sr_gpio 2 1>; + }; + + a10sr_led3 { + label = "a10sr-led3"; + gpios = <&a10sr_gpio 3 1>; + }; + }; + soc { clkmgr@ffd04000 { clocks { @@ -70,6 +99,31 @@ status = "okay"; }; +&gpio1 { + status = "okay"; +}; + +&spi1 { + status = "okay"; + + resource-manager@0 { + compatible = "altr,a10sr"; + reg = <0>; + spi-max-frequency = <100000>; + /* low-level active IRQ at GPIO1_5 */ + interrupt-parent = <&portb>; + interrupts = <5 IRQ_TYPE_LEVEL_LOW>; + interrupt-controller; + #interrupt-cells = <2>; + + a10sr_gpio: gpio-controller { + compatible = "altr,a10sr-gpio"; + gpio-controller; + #gpio-cells = <2>; + }; + }; +}; + &i2c1 { speed-mode = <0>; status = "okay"; @@ -91,6 +145,11 @@ compatible = "dallas,ds1339"; reg = <0x68>; }; + + ltc@5c { + compatible = "ltc2977"; + reg = <0x5c>; + }; }; &uart1 { @@ -100,3 +159,7 @@ &usb0 { status = "okay"; }; + +&watchdog1 { + status = "okay"; +}; Modified: head/sys/gnu/dts/arm/socfpga_arria10_socdk_sdmmc.dts ============================================================================== --- head/sys/gnu/dts/arm/socfpga_arria10_socdk_sdmmc.dts Fri Mar 3 14:06:22 2017 (r314598) +++ head/sys/gnu/dts/arm/socfpga_arria10_socdk_sdmmc.dts Fri Mar 3 14:17:07 2017 (r314599) @@ -25,3 +25,15 @@ broken-cd; bus-width = <4>; }; + +&eccmgr { + sdmmca-ecc@ff8c2c00 { + compatible = "altr,socfpga-sdmmc-ecc"; + reg = <0xff8c2c00 0x400>; + altr,ecc-parent = <&mmc>; + interrupts = <15 IRQ_TYPE_LEVEL_HIGH>, + <47 IRQ_TYPE_LEVEL_HIGH>, + <16 IRQ_TYPE_LEVEL_HIGH>, + <48 IRQ_TYPE_LEVEL_HIGH>; + }; +}; From owner-svn-src-all@freebsd.org Fri Mar 3 14:19:13 2017 Return-Path: Delivered-To: svn-src-all@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 A33E7CF535B; Fri, 3 Mar 2017 14:19:13 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [IPv6:2a01:4f8:c17:6c4b::2]) (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 6F07E1646; Fri, 3 Mar 2017 14:19:13 +0000 (UTC) (envelope-from hps@selasky.org) Received: from hps2016.home.selasky.org (unknown [62.141.129.119]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 0785D1FE025; Fri, 3 Mar 2017 15:18:45 +0100 (CET) Subject: Re: svn commit: r314594 - stable/10/sys/modules/mlx5 To: Andriy Gapon , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org References: <201703031206.v23C6XTF055972@repo.freebsd.org> From: Hans Petter Selasky Message-ID: Date: Fri, 3 Mar 2017 15:18:24 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <201703031206.v23C6XTF055972@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 14:19:13 -0000 On 03/03/17 13:06, Andriy Gapon wrote: > Author: avg > Date: Fri Mar 3 12:06:33 2017 > New Revision: 314594 > URL: https://svnweb.freebsd.org/changeset/base/314594 > > Log: > mlx5 module: remove include path that doesn't exist in this branch > > This is a direct commit. > It allows the module to be compiled with the base gcc. > > Modified: > stable/10/sys/modules/mlx5/Makefile > > Modified: stable/10/sys/modules/mlx5/Makefile > ============================================================================== > --- stable/10/sys/modules/mlx5/Makefile Fri Mar 3 12:03:50 2017 (r314593) > +++ stable/10/sys/modules/mlx5/Makefile Fri Mar 3 12:06:33 2017 (r314594) > @@ -30,7 +30,6 @@ device_if.h bus_if.h vnode_if.h pci_if.h > SRCS+= linux_compat.c linux_radix.c linux_idr.c > > CFLAGS+= -I${.CURDIR}/../../ofed/include > -CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include > > .include > Hi, Which version of GCC is this? Do you want me to check for this kind of errors before committing or are you fine cleaning up every now and then? Currently the mlx4/mlx5 code is only tested with the in-base compiler. --HPS From owner-svn-src-all@freebsd.org Fri Mar 3 14:19:38 2017 Return-Path: Delivered-To: svn-src-all@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 C55E5CF53E4; Fri, 3 Mar 2017 14:19:38 +0000 (UTC) (envelope-from br@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 A0037178E; Fri, 3 Mar 2017 14:19:38 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23EJbFF008803; Fri, 3 Mar 2017 14:19:37 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23EJbCR008801; Fri, 3 Mar 2017 14:19:37 GMT (envelope-from br@FreeBSD.org) Message-Id: <201703031419.v23EJbCR008801@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Fri, 3 Mar 2017 14:19:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314600 - head/sys/arm/altera/socfpga X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 14:19:38 -0000 Author: br Date: Fri Mar 3 14:19:37 2017 New Revision: 314600 URL: https://svnweb.freebsd.org/changeset/base/314600 Log: Add FPGA manager driver for Intel Arria 10. With this driver we able to program FPGA core from FreeBSD system running on ARM core. Sponsored by: DARPA, AFRL Added: head/sys/arm/altera/socfpga/socfpga_a10_manager.c (contents, props changed) Modified: head/sys/arm/altera/socfpga/files.socfpga Modified: head/sys/arm/altera/socfpga/files.socfpga ============================================================================== --- head/sys/arm/altera/socfpga/files.socfpga Fri Mar 3 14:17:07 2017 (r314599) +++ head/sys/arm/altera/socfpga/files.socfpga Fri Mar 3 14:19:37 2017 (r314600) @@ -11,6 +11,9 @@ arm/altera/socfpga/socfpga_gpio.c optio dev/mmc/host/dwmmc.c optional dwmmc +# Arria 10 +arm/altera/socfpga/socfpga_a10_manager.c standard + # BERI specific dev/beri/beri_ring.c optional beri_ring dev/beri/beri_mem.c optional beri_mem Added: head/sys/arm/altera/socfpga/socfpga_a10_manager.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/altera/socfpga/socfpga_a10_manager.c Fri Mar 3 14:19:37 2017 (r314600) @@ -0,0 +1,444 @@ +/*- + * Copyright (c) 2017 Ruslan Bukin + * All rights reserved. + * + * This software was developed by SRI International and the University of + * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237 + * ("CTSRD"), as part of the DARPA CRASH research programme. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * Intel Arria 10 FPGA Manager. + * Chapter 4, Arria 10 Hard Processor System Technical Reference Manual. + * Chapter A, FPGA Reconfiguration. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +#include + +#define FPGAMGR_DCLKCNT 0x8 /* DCLK Count Register */ +#define FPGAMGR_DCLKSTAT 0xC /* DCLK Status Register */ +#define FPGAMGR_GPO 0x10 /* General-Purpose Output Register */ +#define FPGAMGR_GPI 0x14 /* General-Purpose Input Register */ +#define FPGAMGR_MISCI 0x18 /* Miscellaneous Input Register */ +#define IMGCFG_CTRL_00 0x70 +#define S2F_CONDONE_OE (1 << 24) +#define S2F_NSTATUS_OE (1 << 16) +#define CTRL_00_NCONFIG (1 << 8) +#define CTRL_00_NENABLE_CONDONE (1 << 2) +#define CTRL_00_NENABLE_NSTATUS (1 << 1) +#define CTRL_00_NENABLE_NCONFIG (1 << 0) +#define IMGCFG_CTRL_01 0x74 +#define CTRL_01_S2F_NCE (1 << 24) +#define CTRL_01_S2F_PR_REQUEST (1 << 16) +#define CTRL_01_S2F_NENABLE_CONFIG (1 << 0) +#define IMGCFG_CTRL_02 0x78 +#define CTRL_02_CDRATIO_S 16 +#define CTRL_02_CDRATIO_M (0x3 << CTRL_02_CDRATIO_S) +#define CTRL_02_CFGWIDTH_16 (0 << 24) +#define CTRL_02_CFGWIDTH_32 (1 << 24) +#define CTRL_02_EN_CFG_DATA (1 << 8) +#define CTRL_02_EN_CFG_CTRL (1 << 0) +#define IMGCFG_STAT 0x80 +#define F2S_PR_ERROR (1 << 11) +#define F2S_PR_DONE (1 << 10) +#define F2S_PR_READY (1 << 9) +#define F2S_MSEL_S 16 +#define F2S_MSEL_M (0x7 << F2S_MSEL_S) +#define MSEL_PASSIVE_FAST 0 +#define MSEL_PASSIVE_SLOW 1 +#define F2S_NCONFIG_PIN (1 << 12) +#define F2S_CONDONE_OE (1 << 7) +#define F2S_NSTATUS_PIN (1 << 4) +#define F2S_CONDONE_PIN (1 << 6) +#define F2S_USERMODE (1 << 2) + +struct fpgamgr_a10_softc { + struct resource *res[2]; + bus_space_tag_t bst_data; + bus_space_handle_t bsh_data; + struct cdev *mgr_cdev; + device_t dev; +}; + +static struct resource_spec fpgamgr_a10_spec[] = { + { SYS_RES_MEMORY, 0, RF_ACTIVE }, + { SYS_RES_MEMORY, 1, RF_ACTIVE }, + { -1, 0 } +}; + +static int +fpga_wait_dclk_pulses(struct fpgamgr_a10_softc *sc, int npulses) +{ + int tout; + + /* Clear done bit, if any */ + if (READ4(sc, FPGAMGR_DCLKSTAT) != 0) + WRITE4(sc, FPGAMGR_DCLKSTAT, 0x1); + + /* Request DCLK pulses */ + WRITE4(sc, FPGAMGR_DCLKCNT, npulses); + + /* Wait finish */ + tout = 1000; + while (tout > 0) { + if (READ4(sc, FPGAMGR_DCLKSTAT) == 1) { + WRITE4(sc, FPGAMGR_DCLKSTAT, 0x1); + break; + } + tout--; + DELAY(10); + } + if (tout == 0) { + device_printf(sc->dev, + "Error: dclkpulses wait timeout\n"); + return (1); + } + + return (0); +} + + +static int +fpga_open(struct cdev *dev, int flags __unused, + int fmt __unused, struct thread *td __unused) +{ + struct fpgamgr_a10_softc *sc; + int tout; + int msel; + int reg; + + sc = dev->si_drv1; + + /* Step 1 */ + reg = READ4(sc, IMGCFG_STAT); + if ((reg & F2S_USERMODE) == 0) { + device_printf(sc->dev, "Error: invalid mode\n"); + return (ENXIO); + }; + + /* Step 2 */ + reg = READ4(sc, IMGCFG_STAT); + msel = (reg & F2S_MSEL_M) >> F2S_MSEL_S; + if ((msel != MSEL_PASSIVE_FAST) && \ + (msel != MSEL_PASSIVE_SLOW)) { + device_printf(sc->dev, + "Error: invalid msel %d\n", msel); + return (ENXIO); + }; + + /* + * Step 3. + * TODO: add support for compressed, encrypted images. + */ + reg = READ4(sc, IMGCFG_CTRL_02); + reg &= ~(CTRL_02_CDRATIO_M); + WRITE4(sc, IMGCFG_CTRL_02, reg); + + reg = READ4(sc, IMGCFG_CTRL_02); + reg &= ~CTRL_02_CFGWIDTH_32; + WRITE4(sc, IMGCFG_CTRL_02, reg); + + /* Step 4. a */ + reg = READ4(sc, IMGCFG_CTRL_01); + reg &= ~CTRL_01_S2F_PR_REQUEST; + WRITE4(sc, IMGCFG_CTRL_01, reg); + + reg = READ4(sc, IMGCFG_CTRL_00); + reg |= CTRL_00_NCONFIG; + WRITE4(sc, IMGCFG_CTRL_00, reg); + + /* b */ + reg = READ4(sc, IMGCFG_CTRL_01); + reg &= ~CTRL_01_S2F_NCE; + WRITE4(sc, IMGCFG_CTRL_01, reg); + + /* c */ + reg = READ4(sc, IMGCFG_CTRL_02); + reg |= CTRL_02_EN_CFG_CTRL; + WRITE4(sc, IMGCFG_CTRL_02, reg); + + /* d */ + reg = READ4(sc, IMGCFG_CTRL_00); + reg &= ~S2F_CONDONE_OE; + reg &= ~S2F_NSTATUS_OE; + reg |= CTRL_00_NCONFIG; + reg |= CTRL_00_NENABLE_NSTATUS; + reg |= CTRL_00_NENABLE_CONDONE; + reg &= ~CTRL_00_NENABLE_NCONFIG; + WRITE4(sc, IMGCFG_CTRL_00, reg); + + /* Step 5 */ + reg = READ4(sc, IMGCFG_CTRL_01); + reg &= ~CTRL_01_S2F_NENABLE_CONFIG; + WRITE4(sc, IMGCFG_CTRL_01, reg); + + /* Step 6 */ + fpga_wait_dclk_pulses(sc, 0x100); + + /* Step 7. a */ + reg = READ4(sc, IMGCFG_CTRL_01); + reg |= CTRL_01_S2F_PR_REQUEST; + WRITE4(sc, IMGCFG_CTRL_01, reg); + + /* b, c */ + fpga_wait_dclk_pulses(sc, 0x7ff); + + /* Step 8 */ + tout = 10; + while (tout--) { + reg = READ4(sc, IMGCFG_STAT); + if (reg & F2S_PR_ERROR) { + device_printf(sc->dev, + "Error: PR failed on open.\n"); + return (ENXIO); + } + if (reg & F2S_PR_READY) { + break; + } + } + if (tout == 0) { + device_printf(sc->dev, + "Error: Timeout waiting PR ready bit.\n"); + return (ENXIO); + } + + return (0); +} + +static int +fpga_close(struct cdev *dev, int flags __unused, + int fmt __unused, struct thread *td __unused) +{ + struct fpgamgr_a10_softc *sc; + int tout; + int reg; + + sc = dev->si_drv1; + + /* Step 10 */ + tout = 10; + while (tout--) { + reg = READ4(sc, IMGCFG_STAT); + if (reg & F2S_PR_ERROR) { + device_printf(sc->dev, + "Error: PR failed.\n"); + return (ENXIO); + } + if (reg & F2S_PR_DONE) { + break; + } + } + + /* Step 11 */ + reg = READ4(sc, IMGCFG_CTRL_01); + reg &= ~CTRL_01_S2F_PR_REQUEST; + WRITE4(sc, IMGCFG_CTRL_01, reg); + + /* Step 12, 13 */ + fpga_wait_dclk_pulses(sc, 0x100); + + /* Step 14 */ + reg = READ4(sc, IMGCFG_CTRL_02); + reg &= ~CTRL_02_EN_CFG_CTRL; + WRITE4(sc, IMGCFG_CTRL_02, reg); + + /* Step 15 */ + reg = READ4(sc, IMGCFG_CTRL_01); + reg |= CTRL_01_S2F_NCE; + WRITE4(sc, IMGCFG_CTRL_01, reg); + + /* Step 16 */ + reg = READ4(sc, IMGCFG_CTRL_01); + reg |= CTRL_01_S2F_NENABLE_CONFIG; + WRITE4(sc, IMGCFG_CTRL_01, reg); + + /* Step 17 */ + reg = READ4(sc, IMGCFG_STAT); + if ((reg & F2S_USERMODE) == 0) { + device_printf(sc->dev, + "Error: invalid mode\n"); + return (ENXIO); + }; + + if ((reg & F2S_CONDONE_PIN) == 0) { + device_printf(sc->dev, + "Error: configuration not done\n"); + return (ENXIO); + }; + + if ((reg & F2S_NSTATUS_PIN) == 0) { + device_printf(sc->dev, + "Error: nstatus pin\n"); + return (ENXIO); + }; + + return (0); +} + +static int +fpga_write(struct cdev *dev, struct uio *uio, int ioflag) +{ + struct fpgamgr_a10_softc *sc; + uint32_t buffer; + + sc = dev->si_drv1; + + /* + * Step 9. + * Device supports 4-byte writes only. + */ + + while (uio->uio_resid >= 4) { + uiomove(&buffer, 4, uio); + bus_space_write_4(sc->bst_data, sc->bsh_data, + 0x0, buffer); + } + + switch (uio->uio_resid) { + case 3: + uiomove(&buffer, 3, uio); + buffer &= 0xffffff; + bus_space_write_4(sc->bst_data, sc->bsh_data, + 0x0, buffer); + break; + case 2: + uiomove(&buffer, 2, uio); + buffer &= 0xffff; + bus_space_write_4(sc->bst_data, sc->bsh_data, + 0x0, buffer); + break; + case 1: + uiomove(&buffer, 1, uio); + buffer &= 0xff; + bus_space_write_4(sc->bst_data, sc->bsh_data, + 0x0, buffer); + break; + default: + break; + }; + + return (0); +} + +static int +fpga_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, + struct thread *td) +{ + + return (0); +} + +static struct cdevsw fpga_cdevsw = { + .d_version = D_VERSION, + .d_open = fpga_open, + .d_close = fpga_close, + .d_write = fpga_write, + .d_ioctl = fpga_ioctl, + .d_name = "FPGA Manager", +}; + +static int +fpgamgr_a10_probe(device_t dev) +{ + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + if (!ofw_bus_is_compatible(dev, "altr,socfpga-a10-fpga-mgr")) + return (ENXIO); + + device_set_desc(dev, "Arria 10 FPGA Manager"); + + return (BUS_PROBE_DEFAULT); +} + +static int +fpgamgr_a10_attach(device_t dev) +{ + struct fpgamgr_a10_softc *sc; + + sc = device_get_softc(dev); + sc->dev = dev; + + if (bus_alloc_resources(dev, fpgamgr_a10_spec, sc->res)) { + device_printf(dev, "Could not allocate resources.\n"); + return (ENXIO); + } + + /* Memory interface */ + sc->bst_data = rman_get_bustag(sc->res[1]); + sc->bsh_data = rman_get_bushandle(sc->res[1]); + + sc->mgr_cdev = make_dev(&fpga_cdevsw, 0, UID_ROOT, GID_WHEEL, + 0600, "fpga%d", device_get_unit(sc->dev)); + + if (sc->mgr_cdev == NULL) { + device_printf(dev, "Failed to create character device.\n"); + return (ENXIO); + } + + sc->mgr_cdev->si_drv1 = sc; + + return (0); +} + +static device_method_t fpgamgr_a10_methods[] = { + DEVMETHOD(device_probe, fpgamgr_a10_probe), + DEVMETHOD(device_attach, fpgamgr_a10_attach), + { 0, 0 } +}; + +static driver_t fpgamgr_a10_driver = { + "fpgamgr_a10", + fpgamgr_a10_methods, + sizeof(struct fpgamgr_a10_softc), +}; + +static devclass_t fpgamgr_a10_devclass; + +DRIVER_MODULE(fpgamgr_a10, simplebus, fpgamgr_a10_driver, + fpgamgr_a10_devclass, 0, 0); From owner-svn-src-all@freebsd.org Fri Mar 3 14:25:56 2017 Return-Path: Delivered-To: svn-src-all@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 B0897CF5675; Fri, 3 Mar 2017 14:25:56 +0000 (UTC) (envelope-from des@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 800891CE3; Fri, 3 Mar 2017 14:25:56 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23EPtoo012786; Fri, 3 Mar 2017 14:25:55 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23EPtYG012785; Fri, 3 Mar 2017 14:25:55 GMT (envelope-from des@FreeBSD.org) Message-Id: <201703031425.v23EPtYG012785@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Fri, 3 Mar 2017 14:25:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314601 - head/crypto/openssh X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 14:25:56 -0000 Author: des Date: Fri Mar 3 14:25:55 2017 New Revision: 314601 URL: https://svnweb.freebsd.org/changeset/base/314601 Log: Re-apply part of r311585 which was inadvertantly reverted in the upgrade to 7.3p1. The other part (which adds -DLIBWRAP to sshd's CFLAGS) is still in place. Reported by: ngie Modified: head/crypto/openssh/config.h Modified: head/crypto/openssh/config.h ============================================================================== --- head/crypto/openssh/config.h Fri Mar 3 14:19:37 2017 (r314600) +++ head/crypto/openssh/config.h Fri Mar 3 14:25:55 2017 (r314601) @@ -1438,7 +1438,7 @@ /* #undef LASTLOG_WRITE_PUTUTXLINE */ /* Define if you want TCP Wrappers support */ -#define LIBWRAP 1 +/* #undef LIBWRAP */ /* Define to whatever link() returns for "not supported" if it doesn't return EOPNOTSUPP. */ From owner-svn-src-all@freebsd.org Fri Mar 3 14:35:21 2017 Return-Path: Delivered-To: svn-src-all@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 4BA3FCF5A4C; Fri, 3 Mar 2017 14:35:21 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citapm.icyb.net.ua (citapm.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id EB54C12B5; Fri, 3 Mar 2017 14:35:19 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citapm.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id QAA26957; Fri, 03 Mar 2017 16:35:18 +0200 (EET) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1cjoIf-0009rN-RL; Fri, 03 Mar 2017 16:35:17 +0200 Subject: Re: svn commit: r314594 - stable/10/sys/modules/mlx5 To: Hans Petter Selasky , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-stable@FreeBSD.org, svn-src-stable-10@FreeBSD.org References: <201703031206.v23C6XTF055972@repo.freebsd.org> From: Andriy Gapon Message-ID: <915cdd8f-0f12-0bb1-9c8d-e4813e275141@FreeBSD.org> Date: Fri, 3 Mar 2017 16:34:22 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 14:35:21 -0000 On 03/03/2017 16:18, Hans Petter Selasky wrote: > On 03/03/17 13:06, Andriy Gapon wrote: >> Author: avg >> Date: Fri Mar 3 12:06:33 2017 >> New Revision: 314594 >> URL: https://svnweb.freebsd.org/changeset/base/314594 >> >> Log: >> mlx5 module: remove include path that doesn't exist in this branch >> >> This is a direct commit. >> It allows the module to be compiled with the base gcc. >> >> Modified: >> stable/10/sys/modules/mlx5/Makefile >> >> Modified: stable/10/sys/modules/mlx5/Makefile >> ============================================================================== >> --- stable/10/sys/modules/mlx5/Makefile Fri Mar 3 12:03:50 2017 (r314593) >> +++ stable/10/sys/modules/mlx5/Makefile Fri Mar 3 12:06:33 2017 (r314594) >> @@ -30,7 +30,6 @@ device_if.h bus_if.h vnode_if.h pci_if.h >> SRCS+= linux_compat.c linux_radix.c linux_idr.c >> >> CFLAGS+= -I${.CURDIR}/../../ofed/include >> -CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include >> >> .include >> > > Hi, > > Which version of GCC is this? gcc version 4.2.1 20070831 patched [FreeBSD] That is, the compiler that you get when clang is disabled. > Do you want me to check for this kind of errors before committing or are you > fine cleaning up every now and then? Currently the mlx4/mlx5 code is only tested > with the in-base compiler. Checking with a non-default compiler is probably too much a burden for anyone who doesn't use it regularly. -- Andriy Gapon From owner-svn-src-all@freebsd.org Fri Mar 3 15:47:51 2017 Return-Path: Delivered-To: svn-src-all@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 D1113CF64B4; Fri, 3 Mar 2017 15:47:51 +0000 (UTC) (envelope-from np@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 9E2D416CE; Fri, 3 Mar 2017 15:47:51 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23Flo3O045811; Fri, 3 Mar 2017 15:47:50 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23FloM0045810; Fri, 3 Mar 2017 15:47:50 GMT (envelope-from np@FreeBSD.org) Message-Id: <201703031547.v23FloM0045810@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Fri, 3 Mar 2017 15:47:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314602 - head/share/man/man5 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 15:47:51 -0000 Author: np Date: Fri Mar 3 15:47:50 2017 New Revision: 314602 URL: https://svnweb.freebsd.org/changeset/base/314602 Log: Regen src.conf.5 after r314579. Sponsored by: Chelsio Communications Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Fri Mar 3 14:25:55 2017 (r314601) +++ head/share/man/man5/src.conf.5 Fri Mar 3 15:47:50 2017 (r314602) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 313173 2017-02-03 20:17:54Z wblock .\" $FreeBSD$ -.Dd March 1, 2017 +.Dd March 3, 2017 .Dt SRC.CONF 5 .Os .Sh NAME @@ -472,6 +472,20 @@ and related utilities. .It Va WITHOUT_CUSE .\" from FreeBSD: head/tools/build/options/WITHOUT_CUSE 270171 2014-08-19 15:40:26Z hselasky Set to not build CUSE-related programs and libraries. +.It Va WITHOUT_CXGBETOOL +.\" from FreeBSD: head/tools/build/options/WITHOUT_CXGBETOOL 314579 2017-03-03 03:11:58Z np +Set to not build +.Xr cxgbetool 8 +.Pp +This is a default setting on +arm/arm, arm/armeb, arm/armv6, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc and powerpc/powerpcspe. +.It Va WITH_CXGBETOOL +.\" from FreeBSD: head/tools/build/options/WITH_CXGBETOOL 314579 2017-03-03 03:11:58Z np +Set to build +.Xr cxgbetool 8 +.Pp +This is a default setting on +amd64/amd64, arm64/aarch64, i386/i386, powerpc/powerpc64 and sparc64/sparc64. .It Va WITHOUT_CXX .\" from FreeBSD: head/tools/build/options/WITHOUT_CXX 281053 2015-04-03 23:55:04Z bdrewery Set to not build From owner-svn-src-all@freebsd.org Fri Mar 3 16:07:47 2017 Return-Path: Delivered-To: svn-src-all@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 61EC2CF6D24; Fri, 3 Mar 2017 16:07:47 +0000 (UTC) (envelope-from emaste@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 3BFF813A3; Fri, 3 Mar 2017 16:07:47 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23G7kKw056078; Fri, 3 Mar 2017 16:07:46 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23G7ksi056077; Fri, 3 Mar 2017 16:07:46 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201703031607.v23G7ksi056077@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 3 Mar 2017 16:07:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314603 - head/share/man/man5 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 16:07:47 -0000 Author: emaste Date: Fri Mar 3 16:07:46 2017 New Revision: 314603 URL: https://svnweb.freebsd.org/changeset/base/314603 Log: regen src.conf.5 for clang-4.0.0 merge Note that makeman's use of 'make showconfig' interacts poorly with the COMPILER_FEATURES test in share/mk/src.opts.mk, because it tests the host compiler, not the bootstrap compiler that will actually be used to build world. This causes it to report that Clang is enabled by default on MIPS and PowerPC. For example: % make TARGET_ARCH=mips64 showconfig | grep CLANG MK_CLANG = yes MK_CLANG_BOOTSTRAP = no MK_CLANG_EXTRAS = no MK_CLANG_FULL = yes MK_CLANG_IS_CC = no I am committing this version anyway to avoid extraneous diffs in src.conf.5 after every other WITH_/WITHOUT_FOO change. In addition, we intend to switch to a C++11 compiler for all archs for 12.0 (either by fixing Clang for those archs, or by requiring an external toolchain), and then src.conf.5 will be correct. Sponsored by: The FreeBSD Foundation Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Fri Mar 3 15:47:50 2017 (r314602) +++ head/share/man/man5/src.conf.5 Fri Mar 3 16:07:46 2017 (r314603) @@ -338,7 +338,7 @@ When set, it enforces these options: Set to not build the Clang C/C++ compiler during the regular phase of the build. .Pp This is a default setting on -mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf and sparc64/sparc64. +sparc64/sparc64. When set, it enforces these options: .Pp .Bl -item -compact @@ -352,7 +352,7 @@ When set, it enforces these options: Set to build the Clang C/C++ compiler during the normal phase of the build. .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe. .It Va WITHOUT_CLANG_BOOTSTRAP .\" from FreeBSD: head/tools/build/options/WITHOUT_CLANG_BOOTSTRAP 313169 2017-02-03 19:09:46Z wblock Set to not build the Clang C/C++ compiler during the bootstrap phase of @@ -377,14 +377,14 @@ Set to avoid building the ARCMigrate, Re the Clang C/C++ compiler. .Pp This is a default setting on -mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf and sparc64/sparc64. +sparc64/sparc64. .It Va WITH_CLANG_FULL .\" from FreeBSD: head/tools/build/options/WITH_CLANG_FULL 246259 2013-02-02 22:28:29Z dim Set to build the ARCMigrate, Rewriter and StaticAnalyzer components of the Clang C/C++ compiler. .Pp This is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe. .It Va WITHOUT_CLANG_IS_CC .\" from FreeBSD: head/tools/build/options/WITHOUT_CLANG_IS_CC 242629 2012-11-05 21:53:23Z brooks Set to install the GCC compiler as @@ -1052,13 +1052,19 @@ library. Set to not build LLVM's lld linker. .Pp This is a default setting on -arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. +mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. +When set, it enforces these options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_LLD_IS_LD +.El .It Va WITH_LLD .\" from FreeBSD: head/tools/build/options/WITH_LLD 309124 2016-11-24 22:54:55Z dim Set to build LLVM's lld linker. .Pp This is a default setting on -amd64/amd64 and arm64/aarch64. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64 and i386/i386. .It Va WITHOUT_LLDB .\" from FreeBSD: head/tools/build/options/WITHOUT_LLDB 289275 2015-10-14 00:23:31Z emaste Set to not build the LLDB debugger. @@ -1083,6 +1089,14 @@ Set to use LLVM's LLD as the system link .Pp This is a default setting on arm64/aarch64. +When set, these options are also in effect: +.Pp +.Bl -inset -compact +.It Va WITHOUT_SYSTEM_COMPILER +(unless +.Va WITH_SYSTEM_COMPILER +is set explicitly) +.El .It Va WITHOUT_LLVM_LIBUNWIND .\" from FreeBSD: head/tools/build/options/WITHOUT_LLVM_LIBUNWIND 293450 2016-01-09 00:42:07Z emaste Set to use GCC's stack unwinder (instead of LLVM's libunwind). @@ -1548,6 +1562,25 @@ The and .Va WITHOUT_GCC options control those. +.Pp +This is a default setting on +arm64/aarch64. +.It Va WITH_SYSTEM_COMPILER +.\" from FreeBSD: head/tools/build/options/WITH_SYSTEM_COMPILER 300354 2016-05-21 01:32:23Z bdrewery +Set to opportunistically skip building a cross-compiler during the +bootstrap phase of the build. +If the currently installed compiler matches the planned bootstrap compiler +type and revision, then it will not be built. +This does not prevent a compiler from being built for installation though, +only for building one for the build itself. +The +.Va WITHOUT_CLANG +and +.Va WITHOUT_GCC +options control those. +.Pp +This is a default setting on +amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_TALK .\" from FreeBSD: head/tools/build/options/WITHOUT_TALK 277676 2015-01-25 04:37:44Z ngie Set to not build or install From owner-svn-src-all@freebsd.org Fri Mar 3 16:28:05 2017 Return-Path: Delivered-To: svn-src-all@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 499E0CF653E; Fri, 3 Mar 2017 16:28:05 +0000 (UTC) (envelope-from hselasky@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 0E52F1487; Fri, 3 Mar 2017 16:28:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23GS4GG064555; Fri, 3 Mar 2017 16:28:04 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23GS3Sj064551; Fri, 3 Mar 2017 16:28:03 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201703031628.v23GS3Sj064551@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 3 Mar 2017 16:28:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314604 - in head/sys/compat/linuxkpi/common: include/linux src X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 16:28:05 -0000 Author: hselasky Date: Fri Mar 3 16:28:03 2017 New Revision: 314604 URL: https://svnweb.freebsd.org/changeset/base/314604 Log: Update the LinuxKPI RCU and SRCU wrappers for the concurrency kit, CK. - Optimise the RCU implementation to not allocate and free ck_epoch_records during runtime. Instead allocate two sets of ck_epoch_records per CPU for general purpose use. The first set is only used for reader locks and the second set is only used for synchronization and barriers and is protected with a regular mutex to prevent simultaneous issues. - Move the task structure away from the rcu_head structure and into the per-CPU structures. This allows the size of the rcu_head structure to be reduced down to the size of two pointers. - Fix a bug where the linux_rcu_barrier() function only waited for one per-CPU epoch record to be completed instead of all. - Use a critical section or a mutex to protect ck_epoch_begin() and ck_epoch_end() depending on RCU or SRCU type. All the ck_epoch_xxx() functions, except ck_epoch_register(), ck_epoch_unregister() and ck_epoch_recycle() are not re-entrant and needs a critical section or a mutex to operate in the LinuxKPI, after inspecting the CK implementation of the above mentioned functions. The simultaneous issues arise from per-CPU epoch records being shared between multiple threads depending on the amount of taskswitching and how many threads are involved with the RCU and SRCU operations. - Properly free all epoch records by using safe list traversal at LinuxKPI module unload. It turns out the ck_epoch_recycle() always have the records on an internal list and use a flag in the epoch record to track allocated and free entries. This would lead to use after free during module unload. - Remove redundant synchronize_rcu() call from the linux_compat_uninit() function. Let the linux_rcu_runtime_uninit() function do the final rcu_barrier() instead. MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/include/linux/srcu.h head/sys/compat/linuxkpi/common/include/linux/types.h head/sys/compat/linuxkpi/common/src/linux_compat.c head/sys/compat/linuxkpi/common/src/linux_rcu.c Modified: head/sys/compat/linuxkpi/common/include/linux/srcu.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/srcu.h Fri Mar 3 16:07:46 2017 (r314603) +++ head/sys/compat/linuxkpi/common/include/linux/srcu.h Fri Mar 3 16:28:03 2017 (r314604) @@ -29,9 +29,9 @@ #ifndef _LINUX_SRCU_H_ #define _LINUX_SRCU_H_ -struct ck_epoch_record; +struct srcu_epoch_record; struct srcu_struct { - struct ck_epoch_record *ss_epoch_record; + struct srcu_epoch_record *ss_epoch_record; }; #define srcu_dereference(ptr,srcu) ((__typeof(*(ptr)) *)(ptr)) @@ -41,6 +41,7 @@ struct srcu_struct { extern int srcu_read_lock(struct srcu_struct *); extern void srcu_read_unlock(struct srcu_struct *, int index); extern void synchronize_srcu(struct srcu_struct *); +extern void srcu_barrier(struct srcu_struct *); extern int init_srcu_struct(struct srcu_struct *); extern void cleanup_srcu_struct(struct srcu_struct *); extern void srcu_barrier(struct srcu_struct *); Modified: head/sys/compat/linuxkpi/common/include/linux/types.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/types.h Fri Mar 3 16:07:46 2017 (r314603) +++ head/sys/compat/linuxkpi/common/include/linux/types.h Fri Mar 3 16:28:03 2017 (r314604) @@ -2,7 +2,7 @@ * Copyright (c) 2010 Isilon Systems, Inc. * Copyright (c) 2010 iX Systems, Inc. * Copyright (c) 2010 Panasas, Inc. - * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd. + * Copyright (c) 2013-2017 Mellanox Technologies, Ltd. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -65,7 +65,7 @@ typedef u64 phys_addr_t; unsigned long n[howmany(bits, sizeof(long) * 8)] struct rcu_head { - void *raw[8]; + void *raw[2]; } __aligned(sizeof(void *)); typedef void (*rcu_callback_t)(struct rcu_head *head); Modified: head/sys/compat/linuxkpi/common/src/linux_compat.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_compat.c Fri Mar 3 16:07:46 2017 (r314603) +++ head/sys/compat/linuxkpi/common/src/linux_compat.c Fri Mar 3 16:28:03 2017 (r314604) @@ -69,7 +69,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -1503,8 +1502,6 @@ linux_compat_uninit(void *arg) linux_kobject_kfree_name(&linux_class_root); linux_kobject_kfree_name(&linux_root_device.kobj); linux_kobject_kfree_name(&linux_class_misc.kobj); - - synchronize_rcu(); } SYSUNINIT(linux_compat, SI_SUB_DRIVERS, SI_ORDER_SECOND, linux_compat_uninit, NULL); Modified: head/sys/compat/linuxkpi/common/src/linux_rcu.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_rcu.c Fri Mar 3 16:07:46 2017 (r314603) +++ head/sys/compat/linuxkpi/common/src/linux_rcu.c Fri Mar 3 16:28:03 2017 (r314604) @@ -46,11 +46,24 @@ __FBSDID("$FreeBSD$"); #include #include +struct callback_head; +struct writer_epoch_record { + ck_epoch_record_t epoch_record; + struct mtx head_lock; + struct mtx sync_lock; + struct task task; + STAILQ_HEAD(, callback_head) head; +} __aligned(CACHE_LINE_SIZE); + struct callback_head { - ck_epoch_entry_t epoch_entry; + STAILQ_ENTRY(callback_head) entry; rcu_callback_t func; - ck_epoch_record_t *epoch_record; - struct task task; +}; + +struct srcu_epoch_record { + ck_epoch_record_t epoch_record; + struct mtx read_lock; + struct mtx sync_lock; }; /* @@ -61,33 +74,55 @@ struct callback_head { */ CTASSERT(sizeof(struct rcu_head) >= sizeof(struct callback_head)); +/* + * Verify that "epoch_record" is at beginning of "struct + * writer_epoch_record": + */ +CTASSERT(offsetof(struct writer_epoch_record, epoch_record) == 0); + +/* + * Verify that "epoch_record" is at beginning of "struct + * srcu_epoch_record": + */ +CTASSERT(offsetof(struct srcu_epoch_record, epoch_record) == 0); + static ck_epoch_t linux_epoch; -static MALLOC_DEFINE(M_LRCU, "lrcu", "Linux RCU"); -static DPCPU_DEFINE(ck_epoch_record_t *, epoch_record); +static MALLOC_DEFINE(M_LRCU, "lrcu", "Linux RCU"); +static DPCPU_DEFINE(ck_epoch_record_t *, linux_reader_epoch_record); +static DPCPU_DEFINE(struct writer_epoch_record *, linux_writer_epoch_record); + +static void linux_rcu_cleaner_func(void *, int); static void linux_rcu_runtime_init(void *arg __unused) { - ck_epoch_record_t **pcpu_record; - ck_epoch_record_t *record; int i; ck_epoch_init(&linux_epoch); + /* setup reader records */ CPU_FOREACH(i) { + ck_epoch_record_t *record; + record = malloc(sizeof(*record), M_LRCU, M_WAITOK | M_ZERO); ck_epoch_register(&linux_epoch, record); - pcpu_record = DPCPU_ID_PTR(i, epoch_record); - *pcpu_record = record; + + DPCPU_ID_SET(i, linux_reader_epoch_record, record); } - /* - * Populate the epoch with 5 * ncpus # of records - */ - for (i = 0; i < 5 * mp_ncpus; i++) { + /* setup writer records */ + CPU_FOREACH(i) { + struct writer_epoch_record *record; + record = malloc(sizeof(*record), M_LRCU, M_WAITOK | M_ZERO); - ck_epoch_register(&linux_epoch, record); - ck_epoch_unregister(record); + + ck_epoch_register(&linux_epoch, &record->epoch_record); + mtx_init(&record->head_lock, "LRCU-HEAD", NULL, MTX_DEF); + mtx_init(&record->sync_lock, "LRCU-SYNC", NULL, MTX_DEF); + TASK_INIT(&record->task, 0, linux_rcu_cleaner_func, record); + STAILQ_INIT(&record->head); + + DPCPU_ID_SET(i, linux_writer_epoch_record, record); } } SYSINIT(linux_rcu_runtime, SI_SUB_LOCK, SI_ORDER_SECOND, linux_rcu_runtime_init, NULL); @@ -95,66 +130,99 @@ SYSINIT(linux_rcu_runtime, SI_SUB_LOCK, static void linux_rcu_runtime_uninit(void *arg __unused) { - ck_epoch_record_t **pcpu_record; - ck_epoch_record_t *record; + ck_stack_entry_t *cursor; + ck_stack_entry_t *next; int i; - while ((record = ck_epoch_recycle(&linux_epoch)) != NULL) - free(record, M_LRCU); + /* make sure all callbacks have been called */ + linux_rcu_barrier(); + /* destroy all writer record mutexes */ CPU_FOREACH(i) { - pcpu_record = DPCPU_ID_PTR(i, epoch_record); - record = *pcpu_record; - *pcpu_record = NULL; + struct writer_epoch_record *record; + + record = DPCPU_ID_GET(i, linux_writer_epoch_record); + + mtx_destroy(&record->head_lock); + mtx_destroy(&record->sync_lock); + } + + /* free all registered reader and writer records */ + CK_STACK_FOREACH_SAFE(&linux_epoch.records, cursor, next) { + ck_epoch_record_t *record; + + record = container_of(cursor, + struct ck_epoch_record, record_next); free(record, M_LRCU); } } SYSUNINIT(linux_rcu_runtime, SI_SUB_LOCK, SI_ORDER_SECOND, linux_rcu_runtime_uninit, NULL); -static ck_epoch_record_t * -linux_rcu_get_record(int canblock) +static inline struct srcu_epoch_record * +linux_srcu_get_record(void) { - ck_epoch_record_t *record; + struct srcu_epoch_record *record; - if (__predict_true((record = ck_epoch_recycle(&linux_epoch)) != NULL)) - return (record); - if ((record = malloc(sizeof(*record), M_LRCU, M_NOWAIT | M_ZERO)) != NULL) { - ck_epoch_register(&linux_epoch, record); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, + "linux_srcu_get_record() might sleep"); + + /* + * NOTE: The only records that are unregistered and can be + * recycled are srcu_epoch_records. + */ + record = (struct srcu_epoch_record *)ck_epoch_recycle(&linux_epoch); + if (__predict_true(record != NULL)) return (record); - } else if (!canblock) - return (NULL); record = malloc(sizeof(*record), M_LRCU, M_WAITOK | M_ZERO); - ck_epoch_register(&linux_epoch, record); + mtx_init(&record->read_lock, "SRCU-READ", NULL, MTX_DEF | MTX_NOWITNESS); + mtx_init(&record->sync_lock, "SRCU-SYNC", NULL, MTX_DEF | MTX_NOWITNESS); + ck_epoch_register(&linux_epoch, &record->epoch_record); + return (record); } +static inline void +linux_rcu_synchronize_sub(struct writer_epoch_record *record) +{ + + /* protect access to epoch_record */ + mtx_lock(&record->sync_lock); + ck_epoch_synchronize(&record->epoch_record); + mtx_unlock(&record->sync_lock); +} + static void -linux_rcu_destroy_object(ck_epoch_entry_t *e) +linux_rcu_cleaner_func(void *context, int pending __unused) { + struct writer_epoch_record *record; struct callback_head *rcu; - uintptr_t offset; + STAILQ_HEAD(, callback_head) head; - rcu = container_of(e, struct callback_head, epoch_entry); + record = context; - offset = (uintptr_t)rcu->func; + /* move current callbacks into own queue */ + mtx_lock(&record->head_lock); + STAILQ_INIT(&head); + STAILQ_CONCAT(&head, &record->head); + mtx_unlock(&record->head_lock); - MPASS(rcu->task.ta_pending == 0); + /* synchronize */ + linux_rcu_synchronize_sub(record); - if (offset < LINUX_KFREE_RCU_OFFSET_MAX) - kfree((char *)rcu - offset); - else - rcu->func((struct rcu_head *)rcu); -} + /* dispatch all callbacks, if any */ + while ((rcu = STAILQ_FIRST(&head)) != NULL) { + uintptr_t offset; -static void -linux_rcu_cleaner_func(void *context, int pending __unused) -{ - struct callback_head *rcu = context; - ck_epoch_record_t *record = rcu->epoch_record; + STAILQ_REMOVE_HEAD(&head, entry); - ck_epoch_barrier(record); - ck_epoch_unregister(record); + offset = (uintptr_t)rcu->func; + + if (offset < LINUX_KFREE_RCU_OFFSET_MAX) + kfree((char *)rcu - offset); + else + rcu->func((struct rcu_head *)rcu); + } } void @@ -162,11 +230,21 @@ linux_rcu_read_lock(void) { ck_epoch_record_t *record; + /* + * Pin thread to current CPU so that the unlock code gets the + * same per-CPU reader epoch record: + */ sched_pin(); - record = DPCPU_GET(epoch_record); - MPASS(record != NULL); + record = DPCPU_GET(linux_reader_epoch_record); + + /* + * Use a critical section to prevent recursion inside + * ck_epoch_begin(). Else this function supports recursion. + */ + critical_enter(); ck_epoch_begin(record, NULL); + critical_exit(); } void @@ -174,57 +252,63 @@ linux_rcu_read_unlock(void) { ck_epoch_record_t *record; - record = DPCPU_GET(epoch_record); + record = DPCPU_GET(linux_reader_epoch_record); + + /* + * Use a critical section to prevent recursion inside + * ck_epoch_end(). Else this function supports recursion. + */ + critical_enter(); ck_epoch_end(record, NULL); + critical_exit(); + sched_unpin(); } void linux_synchronize_rcu(void) { - ck_epoch_record_t *record; - - sched_pin(); - record = DPCPU_GET(epoch_record); - MPASS(record != NULL); - ck_epoch_synchronize(record); - sched_unpin(); + linux_rcu_synchronize_sub(DPCPU_GET(linux_writer_epoch_record)); } void linux_rcu_barrier(void) { - ck_epoch_record_t *record; + int i; - record = linux_rcu_get_record(0); - ck_epoch_barrier(record); - ck_epoch_unregister(record); + CPU_FOREACH(i) { + struct writer_epoch_record *record; + + record = DPCPU_ID_GET(i, linux_writer_epoch_record); + + linux_rcu_synchronize_sub(record); + + /* wait for callbacks to complete */ + taskqueue_drain(taskqueue_fast, &record->task); + } } void linux_call_rcu(struct rcu_head *context, rcu_callback_t func) { - struct callback_head *ptr = (struct callback_head *)context; - ck_epoch_record_t *record; + struct callback_head *rcu = (struct callback_head *)context; + struct writer_epoch_record *record; - record = linux_rcu_get_record(0); + record = DPCPU_GET(linux_writer_epoch_record); - sched_pin(); - MPASS(record != NULL); - ptr->func = func; - ptr->epoch_record = record; - ck_epoch_call(record, &ptr->epoch_entry, linux_rcu_destroy_object); - TASK_INIT(&ptr->task, 0, linux_rcu_cleaner_func, ptr); - taskqueue_enqueue(taskqueue_fast, &ptr->task); - sched_unpin(); + mtx_lock(&record->head_lock); + rcu->func = func; + STAILQ_INSERT_TAIL(&record->head, rcu, entry); + taskqueue_enqueue(taskqueue_fast, &record->task); + mtx_unlock(&record->head_lock); } int init_srcu_struct(struct srcu_struct *srcu) { - ck_epoch_record_t *record; + struct srcu_epoch_record *record; - record = linux_rcu_get_record(0); + record = linux_srcu_get_record(); srcu->ss_epoch_record = record; return (0); } @@ -232,28 +316,60 @@ init_srcu_struct(struct srcu_struct *src void cleanup_srcu_struct(struct srcu_struct *srcu) { - ck_epoch_record_t *record; + struct srcu_epoch_record *record; record = srcu->ss_epoch_record; srcu->ss_epoch_record = NULL; - ck_epoch_unregister(record); + + ck_epoch_unregister(&record->epoch_record); } int srcu_read_lock(struct srcu_struct *srcu) { - ck_epoch_begin(srcu->ss_epoch_record, NULL); + struct srcu_epoch_record *record; + + record = srcu->ss_epoch_record; + + mtx_lock(&record->read_lock); + ck_epoch_begin(&record->epoch_record, NULL); + mtx_unlock(&record->read_lock); + return (0); } void srcu_read_unlock(struct srcu_struct *srcu, int key __unused) { - ck_epoch_end(srcu->ss_epoch_record, NULL); + struct srcu_epoch_record *record; + + record = srcu->ss_epoch_record; + + mtx_lock(&record->read_lock); + ck_epoch_end(&record->epoch_record, NULL); + mtx_unlock(&record->read_lock); } void synchronize_srcu(struct srcu_struct *srcu) { - ck_epoch_synchronize(srcu->ss_epoch_record); + struct srcu_epoch_record *record; + + record = srcu->ss_epoch_record; + + mtx_lock(&record->sync_lock); + ck_epoch_synchronize(&record->epoch_record); + mtx_unlock(&record->sync_lock); +} + +void +srcu_barrier(struct srcu_struct *srcu) +{ + struct srcu_epoch_record *record; + + record = srcu->ss_epoch_record; + + mtx_lock(&record->sync_lock); + ck_epoch_barrier(&record->epoch_record); + mtx_unlock(&record->sync_lock); } From owner-svn-src-all@freebsd.org Fri Mar 3 17:30:13 2017 Return-Path: Delivered-To: svn-src-all@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 DBDE5CF7BD5; Fri, 3 Mar 2017 17:30:13 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-it0-x242.google.com (mail-it0-x242.google.com [IPv6:2607:f8b0:4001:c0b::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9140012F0; Fri, 3 Mar 2017 17:30:13 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-it0-x242.google.com with SMTP id r141so3033805ita.1; Fri, 03 Mar 2017 09:30:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-transfer-encoding; bh=SrVWiLs3eCmxcqP6fsVp96bCYkDmg6SN+iB5Awmmx/A=; b=O1NJH/uVak4/Lsxm8vVe1qUqgYNd+OgubQDXuBNkZbpz6sArRcelGr8ZqYNjGSpldr KkZy+SEahW2erD2kc9aVCbIeh3u2mMPxvc88obEoOj9Zd5aBwGEVhZeyp9GAFbCjfeN3 dPyW5Cz00nzn1a6FOoJnrNL34cWjJmfRjoHuN8/Dc2Ox7yQ5t/yrfEdqVdThXeIcwTnn ab/fuOAKiIrKb78HOMBH81FqseWaPTWVSa0ooSssOmu1mDYf5QlAw0oB8fyh7jqFrma5 BxRDAy9VhITGjx85Uvu3a8MmF9IkBLC8yiHnrlPpKW256mRBYm0aRvKnGRF/pcB6ON/M DmgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-transfer-encoding; bh=SrVWiLs3eCmxcqP6fsVp96bCYkDmg6SN+iB5Awmmx/A=; b=GODOyfYhQ7NLP9TpZBmcQ8c8QnulkEfM1l++hfdNrBVGJLvWtQehGUPk+XV3kdxZx/ OWEnZr+OOxq7fJVXmIObYHqrmMv5yxqfD033THDoo/929rxZ85gBdsQJnsOenaqxm5h7 rVRolgbZpB4swTxLHg++PnEtu7XNX3neFeFdHYJI7VxKs9Kpz8xvD+DlX7NC3UodKlrU B+U6d8TzWRlj5+kMh2sn6IfDMRpr2TYE7R8u9Uk0fZoUfoasZPyc26k8YKAcK8NmrJig jRnWaQ2CtO5Y1dOf3wR/hvZlh6ZdH80q6MtmzZd/q6/fKl4zSBppgi8SjPZBZ7cceep6 uZLg== X-Gm-Message-State: AMke39kbSC7alJrN1to5BEAx1YCnxa2GbsX2PLjWIwDJgDfG8jeb3EF2AFkZXXJErri2zyI09cow1QDW6tDMLw== X-Received: by 10.36.44.4 with SMTP id i4mr4303212iti.105.1488562213091; Fri, 03 Mar 2017 09:30:13 -0800 (PST) MIME-Version: 1.0 Sender: carpeddiem@gmail.com Received: by 10.107.39.195 with HTTP; Fri, 3 Mar 2017 09:29:52 -0800 (PST) In-Reply-To: <86bmti9268.fsf@desk.des.no> References: <201703020011.v220BWQ0086961@repo.freebsd.org> <86k28783xe.fsf@desk.des.no> <86fuiv832b.fsf@desk.des.no> <59d9780e-6ec3-4e5d-0c9e-77e3639205f6@freebsd.org> <8FE7A2E0-BB9C-4C48-82D9-B7027CA50358@gmail.com> <86bmti9268.fsf@desk.des.no> From: Ed Maste Date: Fri, 3 Mar 2017 12:29:52 -0500 X-Google-Sender-Auth: 4KynvLch6Vmliwy6Ut_AOBRduZo Message-ID: Subject: Re: svn commit: r314527 - in head: crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat crypto/ope... To: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 17:30:14 -0000 On 3 March 2017 at 03:47, Dag-Erling Sm=C3=B8rgrav wrote: > > I don't use Phabricator, and I don't consider it a legitimate attempt to > contact me about a patch. There's no requirement to use Phabricator, so that's absolutely fine. However, it's completely reasonable for developers to assume that, if one has a Phabricator account then adding them is a reasonable notification of a proposed patch. If you don't want to use Phabricator, I'd ask that you consider removing your account. From owner-svn-src-all@freebsd.org Fri Mar 3 17:53:24 2017 Return-Path: Delivered-To: svn-src-all@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 0D0F6CF64ED; Fri, 3 Mar 2017 17:53:24 +0000 (UTC) (envelope-from np@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 C5E6A1760; Fri, 3 Mar 2017 17:53:23 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23HrMV5001118; Fri, 3 Mar 2017 17:53:22 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23HrMUo001114; Fri, 3 Mar 2017 17:53:22 GMT (envelope-from np@FreeBSD.org) Message-Id: <201703031753.v23HrMUo001114@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Fri, 3 Mar 2017 17:53:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314605 - in stable/11/sys: dev/cxgbe/iw_cxgbe ofed/drivers/infiniband/core X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 17:53:24 -0000 Author: np Date: Fri Mar 3 17:53:22 2017 New Revision: 314605 URL: https://svnweb.freebsd.org/changeset/base/314605 Log: MFC r314400: cxgbe/iw_cxgbe: fix various double-close panics with iWARP sockets. Sockets representing the TCP endpoints for iWARP connections are allocated by the ibcore module. Before this revision they were closed either by the ibcore module or the iw_cxgbe hardware driver depending on the state transitions during connection teardown. This is error prone and there were cases where both iw_cxgbe and ibcore closed the socket leading to double-free panics. The fix is to let ibcore close the sockets it creates and never do it in the driver. - Use sodisconnect instead of soclose (preceded by solinger = 0) in the driver to tear down an RDMA connection abruptly. This does what's intended without releasing the socket's fd reference. - Close the socket in ibcore when the iWARP iw_cm_id is destroyed. This works for all kinds of sockets: clients that initiate connections, listeners, and sockets accepted off of listeners. Sponsored by: Chelsio Communications Modified: stable/11/sys/dev/cxgbe/iw_cxgbe/cm.c stable/11/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h stable/11/sys/ofed/drivers/infiniband/core/cma.c stable/11/sys/ofed/drivers/infiniband/core/iwcm.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/cxgbe/iw_cxgbe/cm.c ============================================================================== --- stable/11/sys/dev/cxgbe/iw_cxgbe/cm.c Fri Mar 3 16:28:03 2017 (r314604) +++ stable/11/sys/dev/cxgbe/iw_cxgbe/cm.c Fri Mar 3 17:53:22 2017 (r314605) @@ -92,9 +92,7 @@ static void *alloc_ep(int size, gfp_t fl void __free_ep(struct c4iw_ep_common *epc); static int find_route(__be32 local_ip, __be32 peer_ip, __be16 local_port, __be16 peer_port, u8 tos, struct nhop4_extended *pnh4); -static int close_socket(struct c4iw_ep_common *epc, int close); -static int shutdown_socket(struct c4iw_ep_common *epc); -static void abort_socket(struct c4iw_ep *ep); +static void close_socket(struct socket *so); static int send_mpa_req(struct c4iw_ep *ep); static int send_mpa_reject(struct c4iw_ep *ep, const void *pdata, u8 plen); static int send_mpa_reply(struct c4iw_ep *ep, const void *pdata, u8 plen); @@ -111,7 +109,8 @@ static void process_peer_close(struct c4 static void process_conn_error(struct c4iw_ep *ep); static void process_close_complete(struct c4iw_ep *ep); static void ep_timeout(unsigned long arg); -static void init_sock(struct c4iw_ep_common *epc); +static void init_iwarp_socket(struct socket *so, void *arg); +static void uninit_iwarp_socket(struct socket *so); static void process_data(struct c4iw_ep *ep); static void process_connected(struct c4iw_ep *ep); static int c4iw_so_upcall(struct socket *so, void *arg, int waitflag); @@ -319,87 +318,12 @@ find_route(__be32 local_ip, __be32 peer_ return err; } -static int -close_socket(struct c4iw_ep_common *epc, int close) -{ - struct socket *so = epc->so; - int rc; - - CTR5(KTR_IW_CXGBE, "%s:csoB so %p, ep %p, state %s, tid %d", __func__, - so, epc, states[epc->state], - ((struct c4iw_ep *)epc)->hwtid); - mutex_lock(&epc->so_mutex); - if ((so == NULL) || (so->so_count == 0)) { - mutex_unlock(&epc->so_mutex); - CTR5(KTR_IW_CXGBE, "%s:cso1 so %p, ep %p, state %s, tid %d", - __func__, so, epc, states[epc->state], - ((struct c4iw_ep *)epc)->hwtid); - return -EINVAL; - } - - SOCK_LOCK(so); - soupcall_clear(so, SO_RCV); - SOCK_UNLOCK(so); - - if (close) - rc = soclose(so); - else - rc = soshutdown(so, SHUT_WR | SHUT_RD); - epc->so = NULL; - - mutex_unlock(&epc->so_mutex); - return (rc); -} - -static int -shutdown_socket(struct c4iw_ep_common *epc) -{ - - struct socket *so = epc->so; - int rc; - - CTR5(KTR_IW_CXGBE, "%s:ssoB so %p, ep %p, state %s, tid %d", __func__, - epc->so, epc, states[epc->state], - ((struct c4iw_ep *)epc)->hwtid); - mutex_lock(&epc->so_mutex); - if ((so == NULL) || (so->so_count == 0)) { - mutex_unlock(&epc->so_mutex); - CTR5(KTR_IW_CXGBE, "%s:sso1 so %p, ep %p, state %s, tid %d", - __func__, epc->so, epc, states[epc->state], - ((struct c4iw_ep *)epc)->hwtid); - return -EINVAL; - } - rc = soshutdown(so, SHUT_WR); - mutex_unlock(&epc->so_mutex); - return rc; -} - static void -abort_socket(struct c4iw_ep *ep) +close_socket(struct socket *so) { - struct sockopt sopt; - int rc; - struct linger l; - - CTR5(KTR_IW_CXGBE, "%s ep %p so %p state %s tid %d", __func__, ep, - ep->com.so, states[ep->com.state], ep->hwtid); - mutex_lock(&ep->com.so_mutex); - l.l_onoff = 1; - l.l_linger = 0; - /* linger_time of 0 forces RST to be sent */ - sopt.sopt_dir = SOPT_SET; - sopt.sopt_level = SOL_SOCKET; - sopt.sopt_name = SO_LINGER; - sopt.sopt_val = (caddr_t)&l; - sopt.sopt_valsize = sizeof l; - sopt.sopt_td = NULL; - rc = sosetopt(ep->com.so, &sopt); - if (rc) { - log(LOG_ERR, "%s: can't set linger to 0, no RST! err %d\n", - __func__, rc); - } - mutex_unlock(&ep->com.so_mutex); + uninit_iwarp_socket(so); + sodisconnect(so); } static void @@ -429,7 +353,7 @@ process_peer_close(struct c4iw_ep *ep) disconnect = 0; STOP_EP_TIMER(ep); - close_socket(&ep->com, 0); + close_socket(ep->com.so); deref_cm_id(&ep->com); release = 1; break; @@ -486,7 +410,7 @@ process_peer_close(struct c4iw_ep *ep) c4iw_modify_qp(ep->com.qp->rhp, ep->com.qp, C4IW_QP_ATTR_NEXT_STATE, &attrs, 1); } - close_socket(&ep->com, 0); + close_socket(ep->com.so); close_complete_upcall(ep, 0); __state_set(&ep->com, DEAD); release = 1; @@ -595,14 +519,7 @@ process_conn_error(struct c4iw_ep *ep) } if (state != ABORTING) { - if (ep->parent_ep) { - CTR2(KTR_IW_CXGBE, "%s:pce1 %p", __func__, ep); - close_socket(&ep->com, 1); - } else { - CTR2(KTR_IW_CXGBE, "%s:pce2 %p", __func__, ep); - close_socket(&ep->com, 0); - } - + close_socket(ep->com.so); __state_set(&ep->com, DEAD); c4iw_put_ep(&ep->com); } @@ -648,16 +565,7 @@ process_close_complete(struct c4iw_ep *e &attrs, 1); } - if (ep->parent_ep) { - - CTR2(KTR_IW_CXGBE, "%s:pcc3 %p", __func__, ep); - close_socket(&ep->com, 1); - } - else { - - CTR2(KTR_IW_CXGBE, "%s:pcc4 %p", __func__, ep); - close_socket(&ep->com, 0); - } + close_socket(ep->com.so); close_complete_upcall(ep, 0); __state_set(&ep->com, DEAD); release = 1; @@ -688,23 +596,15 @@ process_close_complete(struct c4iw_ep *e } static void -init_sock(struct c4iw_ep_common *epc) +init_iwarp_socket(struct socket *so, void *arg) { int rc; struct sockopt sopt; - struct socket *so = epc->so; int on = 1; - mutex_lock(&epc->so_mutex); - if ((so == NULL) || (so->so_count == 0)) { - mutex_unlock(&epc->so_mutex); - CTR5(KTR_IW_CXGBE, "%s:iso1 so %p, ep %p, state %s, tid %d", - __func__, so, epc, states[epc->state], - ((struct c4iw_ep *)epc)->hwtid); - return; - } + /* Note that SOCK_LOCK(so) is same as SOCKBUF_LOCK(&so->so_rcv) */ SOCK_LOCK(so); - soupcall_set(so, SO_RCV, c4iw_so_upcall, epc); + soupcall_set(so, SO_RCV, c4iw_so_upcall, arg); so->so_state |= SS_NBIO; SOCK_UNLOCK(so); sopt.sopt_dir = SOPT_SET; @@ -718,7 +618,15 @@ init_sock(struct c4iw_ep_common *epc) log(LOG_ERR, "%s: can't set TCP_NODELAY on so %p (%d)\n", __func__, so, rc); } - mutex_unlock(&epc->so_mutex); +} + +static void +uninit_iwarp_socket(struct socket *so) +{ + + SOCKBUF_LOCK(&so->so_rcv); + soupcall_clear(so, SO_RCV); + SOCKBUF_UNLOCK(&so->so_rcv); } static void @@ -759,18 +667,18 @@ process_data(struct c4iw_ep *ep) static void process_connected(struct c4iw_ep *ep) { + struct socket *so = ep->com.so; - if ((ep->com.so->so_state & SS_ISCONNECTED) && !ep->com.so->so_error) { + if ((so->so_state & SS_ISCONNECTED) && !so->so_error) { if (send_mpa_req(ep)) goto err; - } - else { - connect_reply_upcall(ep, -ep->com.so->so_error); + } else { + connect_reply_upcall(ep, -so->so_error); goto err; } return; err: - close_socket(&ep->com, 0); + close_socket(so); state_set(&ep->com, DEAD); c4iw_put_ep(&ep->com); return; @@ -785,23 +693,9 @@ process_newconn(struct iw_cm_id *parent_ struct c4iw_ep *parent_ep = parent_cm_id->provider_data; int ret = 0; - if (!child_so) { - CTR4(KTR_IW_CXGBE, - "%s: parent so %p, parent ep %p, child so %p, invalid so", - __func__, parent_ep->com.so, parent_ep, child_so); - log(LOG_ERR, "%s: invalid child socket\n", __func__); - return; - } - child_ep = alloc_ep(sizeof(*child_ep), M_NOWAIT); - if (!child_ep) { - CTR3(KTR_IW_CXGBE, "%s: parent so %p, parent ep %p, ENOMEM", - __func__, parent_ep->com.so, parent_ep); - log(LOG_ERR, "%s: failed to allocate ep entry\n", __func__); - return; - } - SOCKBUF_LOCK(&child_so->so_rcv); - soupcall_set(child_so, SO_RCV, c4iw_so_upcall, child_ep); - SOCKBUF_UNLOCK(&child_so->so_rcv); + MPASS(child_so != NULL); + + child_ep = alloc_ep(sizeof(*child_ep), M_WAITOK); CTR5(KTR_IW_CXGBE, "%s: parent so %p, parent ep %p, child so %p, child ep %p", @@ -821,6 +715,7 @@ process_newconn(struct iw_cm_id *parent_ free(local, M_SONAME); free(remote, M_SONAME); + init_iwarp_socket(child_so, &child_ep->com); c4iw_get_ep(&parent_ep->com); init_timer(&child_ep->timer); state_set(&child_ep->com, MPA_REQ_WAIT); @@ -1038,7 +933,6 @@ alloc_ep(int size, gfp_t gfp) kref_init(&epc->kref); mutex_init(&epc->mutex); - mutex_init(&epc->so_mutex); c4iw_init_wr_wait(&epc->wr_wait); return (epc); @@ -1359,30 +1253,47 @@ static void close_complete_upcall(struct CTR2(KTR_IW_CXGBE, "%s:ccuE %p", __func__, ep); } -static int send_abort(struct c4iw_ep *ep) +static int +send_abort(struct c4iw_ep *ep) { - int err; + struct socket *so = ep->com.so; + struct sockopt sopt; + int rc; + struct linger l; - CTR2(KTR_IW_CXGBE, "%s:abB %p", __func__, ep); - abort_socket(ep); + CTR5(KTR_IW_CXGBE, "%s ep %p so %p state %s tid %d", __func__, ep, so, + states[ep->com.state], ep->hwtid); - /* - * Since socket options were set as l_onoff=1 and l_linger=0 in in - * abort_socket, invoking soclose here sends a RST (reset) to the peer. - */ - err = close_socket(&ep->com, 1); + l.l_onoff = 1; + l.l_linger = 0; + + /* linger_time of 0 forces RST to be sent */ + sopt.sopt_dir = SOPT_SET; + sopt.sopt_level = SOL_SOCKET; + sopt.sopt_name = SO_LINGER; + sopt.sopt_val = (caddr_t)&l; + sopt.sopt_valsize = sizeof l; + sopt.sopt_td = NULL; + rc = sosetopt(so, &sopt); + if (rc != 0) { + log(LOG_ERR, "%s: sosetopt(%p, linger = 0) failed with %d.\n", + __func__, so, rc); + } + + uninit_iwarp_socket(so); + sodisconnect(so); set_bit(ABORT_CONN, &ep->com.history); - CTR2(KTR_IW_CXGBE, "%s:abE %p", __func__, ep); /* - * TBD: iw_cgbe driver should receive ABORT reply for every ABORT + * TBD: iw_cxgbe driver should receive ABORT reply for every ABORT * request it has sent. But the current TOE driver is not propagating * this ABORT reply event (via do_abort_rpl) to iw_cxgbe. So as a work- * around de-refer 'ep' (which was refered before sending ABORT request) * here instead of doing it in abort_rpl() handler of iw_cxgbe driver. */ c4iw_put_ep(&ep->com); - return err; + + return (0); } static void peer_close_upcall(struct c4iw_ep *ep) @@ -2213,7 +2124,6 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct c4iw_dev *dev = to_c4iw_dev(cm_id->device); struct c4iw_ep *ep = NULL; struct nhop4_extended nh4; - struct toedev *tdev; CTR2(KTR_IW_CXGBE, "%s:ccB %p", __func__, cm_id); @@ -2266,8 +2176,6 @@ int c4iw_connect(struct iw_cm_id *cm_id, ep->com.thread = curthread; ep->com.so = cm_id->so; - init_sock(&ep->com); - /* find a route */ err = find_route( cm_id->local_addr.sin_addr.s_addr, @@ -2283,22 +2191,11 @@ int c4iw_connect(struct iw_cm_id *cm_id, goto fail2; } - if (!(nh4.nh_ifp->if_capenable & IFCAP_TOE)) { - - CTR2(KTR_IW_CXGBE, "%s:cc8 %p", __func__, ep); - printf("%s - interface not TOE capable.\n", __func__); - close_socket(&ep->com, 0); + if (!(nh4.nh_ifp->if_capenable & IFCAP_TOE) || + TOEDEV(nh4.nh_ifp) == NULL) { err = -ENOPROTOOPT; goto fail3; } - tdev = TOEDEV(nh4.nh_ifp); - - if (tdev == NULL) { - - CTR2(KTR_IW_CXGBE, "%s:cc9 %p", __func__, ep); - printf("%s - No toedev for interface.\n", __func__); - goto fail3; - } fib4_free_nh_ext(RT_DEFAULT_FIB, &nh4); state_set(&ep->com, CONNECTING); @@ -2309,19 +2206,18 @@ int c4iw_connect(struct iw_cm_id *cm_id, ep->com.thread); if (!err) { - CTR2(KTR_IW_CXGBE, "%s:cca %p", __func__, ep); + init_iwarp_socket(cm_id->so, &ep->com); goto out; } else { - close_socket(&ep->com, 0); goto fail2; } fail3: - CTR2(KTR_IW_CXGBE, "%s:ccb %p", __func__, ep); fib4_free_nh_ext(RT_DEFAULT_FIB, &nh4); fail2: deref_cm_id(&ep->com); c4iw_put_ep(&ep->com); + ep = NULL; /* CTR shouldn't display already-freed ep. */ out: CTR2(KTR_IW_CXGBE, "%s:ccE %p", __func__, ep); return err; @@ -2465,7 +2361,7 @@ int c4iw_ep_disconnect(struct c4iw_ep *e if (!ep->parent_ep) __state_set(&ep->com, MORIBUND); - ret = shutdown_socket(&ep->com); + ret = sodisconnect(ep->com.so); } if (ret) { Modified: stable/11/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h ============================================================================== --- stable/11/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h Fri Mar 3 16:28:03 2017 (r314604) +++ stable/11/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h Fri Mar 3 17:53:22 2017 (r314605) @@ -754,7 +754,6 @@ struct c4iw_ep_common { int rpl_done; struct thread *thread; struct socket *so; - struct mutex so_mutex; }; struct c4iw_listen_ep { Modified: stable/11/sys/ofed/drivers/infiniband/core/cma.c ============================================================================== --- stable/11/sys/ofed/drivers/infiniband/core/cma.c Fri Mar 3 16:28:03 2017 (r314604) +++ stable/11/sys/ofed/drivers/infiniband/core/cma.c Fri Mar 3 17:53:22 2017 (r314605) @@ -1049,8 +1049,6 @@ static void cma_release_port(struct rdma kfree(bind_list); } mutex_unlock(&lock); - if (id_priv->sock) - sock_release(id_priv->sock); } static void cma_leave_mc_groups(struct rdma_id_private *id_priv) Modified: stable/11/sys/ofed/drivers/infiniband/core/iwcm.c ============================================================================== --- stable/11/sys/ofed/drivers/infiniband/core/iwcm.c Fri Mar 3 16:28:03 2017 (r314604) +++ stable/11/sys/ofed/drivers/infiniband/core/iwcm.c Fri Mar 3 17:53:22 2017 (r314605) @@ -528,24 +528,15 @@ iw_init_sock(struct iw_cm_id *cm_id) } static int -iw_close_socket(struct iw_cm_id *cm_id, int close) +iw_uninit_socket(struct iw_cm_id *cm_id) { struct socket *so = cm_id->so; - int rc; - SOCK_LOCK(so); soupcall_clear(so, SO_RCV); SOCK_UNLOCK(so); - if (close) - rc = soclose(so); - else - rc = soshutdown(so, SHUT_WR | SHUT_RD); - - cm_id->so = NULL; - - return rc; + return (0); } static int @@ -554,18 +545,17 @@ iw_create_listen(struct iw_cm_id *cm_id, int rc; iw_init_sock(cm_id); - rc = solisten(cm_id->so, backlog, curthread); + rc = -solisten(cm_id->so, backlog, curthread); if (rc != 0) - iw_close_socket(cm_id, 0); - return rc; + iw_uninit_socket(cm_id); + return (rc); } static int iw_destroy_listen(struct iw_cm_id *cm_id) { - int rc; - rc = iw_close_socket(cm_id, 0); - return rc; + + return (iw_uninit_socket(cm_id)); } @@ -663,6 +653,9 @@ void iw_destroy_cm_id(struct iw_cm_id *c wait_for_completion(&cm_id_priv->destroy_comp); + if (cm_id->so) + sock_release(cm_id->so); + free_cm_id(cm_id_priv); } EXPORT_SYMBOL(iw_destroy_cm_id); From owner-svn-src-all@freebsd.org Fri Mar 3 17:57:19 2017 Return-Path: Delivered-To: svn-src-all@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 36971CF685A; Fri, 3 Mar 2017 17:57:19 +0000 (UTC) (envelope-from np@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 F33D21BE9; Fri, 3 Mar 2017 17:57:18 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23HvI4e001318; Fri, 3 Mar 2017 17:57:18 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23HvHWf001313; Fri, 3 Mar 2017 17:57:17 GMT (envelope-from np@FreeBSD.org) Message-Id: <201703031757.v23HvHWf001313@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Fri, 3 Mar 2017 17:57:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314606 - in stable/10/sys: dev/cxgbe/iw_cxgbe ofed/drivers/infiniband/core X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 17:57:19 -0000 Author: np Date: Fri Mar 3 17:57:17 2017 New Revision: 314606 URL: https://svnweb.freebsd.org/changeset/base/314606 Log: MFC r314400: cxgbe/iw_cxgbe: fix various double-close panics with iWARP sockets. Sockets representing the TCP endpoints for iWARP connections are allocated by the ibcore module. Before this revision they were closed either by the ibcore module or the iw_cxgbe hardware driver depending on the state transitions during connection teardown. This is error prone and there were cases where both iw_cxgbe and ibcore closed the socket leading to double-free panics. The fix is to let ibcore close the sockets it creates and never do it in the driver. - Use sodisconnect instead of soclose (preceded by solinger = 0) in the driver to tear down an RDMA connection abruptly. This does what's intended without releasing the socket's fd reference. - Close the socket in ibcore when the iWARP iw_cm_id is destroyed. This works for all kinds of sockets: clients that initiate connections, listeners, and sockets accepted off of listeners. Sponsored by: Chelsio Communications Modified: stable/10/sys/dev/cxgbe/iw_cxgbe/cm.c stable/10/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h stable/10/sys/ofed/drivers/infiniband/core/cma.c stable/10/sys/ofed/drivers/infiniband/core/iwcm.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/cxgbe/iw_cxgbe/cm.c ============================================================================== --- stable/10/sys/dev/cxgbe/iw_cxgbe/cm.c Fri Mar 3 17:53:22 2017 (r314605) +++ stable/10/sys/dev/cxgbe/iw_cxgbe/cm.c Fri Mar 3 17:57:17 2017 (r314606) @@ -90,9 +90,7 @@ static void *alloc_ep(int size, gfp_t fl void __free_ep(struct c4iw_ep_common *epc); static struct rtentry * find_route(__be32 local_ip, __be32 peer_ip, __be16 local_port, __be16 peer_port, u8 tos); -static int close_socket(struct c4iw_ep_common *epc, int close); -static int shutdown_socket(struct c4iw_ep_common *epc); -static void abort_socket(struct c4iw_ep *ep); +static void close_socket(struct socket *so); static int send_mpa_req(struct c4iw_ep *ep); static int send_mpa_reject(struct c4iw_ep *ep, const void *pdata, u8 plen); static int send_mpa_reply(struct c4iw_ep *ep, const void *pdata, u8 plen); @@ -109,7 +107,8 @@ static void process_peer_close(struct c4 static void process_conn_error(struct c4iw_ep *ep); static void process_close_complete(struct c4iw_ep *ep); static void ep_timeout(unsigned long arg); -static void init_sock(struct c4iw_ep_common *epc); +static void init_iwarp_socket(struct socket *so, void *arg); +static void uninit_iwarp_socket(struct socket *so); static void process_data(struct c4iw_ep *ep); static void process_connected(struct c4iw_ep *ep); static int c4iw_so_upcall(struct socket *so, void *arg, int waitflag); @@ -319,87 +318,12 @@ find_route(__be32 local_ip, __be32 peer_ return iproute.ro_rt; } -static int -close_socket(struct c4iw_ep_common *epc, int close) -{ - struct socket *so = epc->so; - int rc; - - CTR5(KTR_IW_CXGBE, "%s:csoB so %p, ep %p, state %s, tid %d", __func__, - so, epc, states[epc->state], - ((struct c4iw_ep *)epc)->hwtid); - mutex_lock(&epc->so_mutex); - if ((so == NULL) || (so->so_count == 0)) { - mutex_unlock(&epc->so_mutex); - CTR5(KTR_IW_CXGBE, "%s:cso1 so %p, ep %p, state %s, tid %d", - __func__, so, epc, states[epc->state], - ((struct c4iw_ep *)epc)->hwtid); - return -EINVAL; - } - - SOCK_LOCK(so); - soupcall_clear(so, SO_RCV); - SOCK_UNLOCK(so); - - if (close) - rc = soclose(so); - else - rc = soshutdown(so, SHUT_WR | SHUT_RD); - epc->so = NULL; - - mutex_unlock(&epc->so_mutex); - return (rc); -} - -static int -shutdown_socket(struct c4iw_ep_common *epc) -{ - - struct socket *so = epc->so; - int rc; - - CTR5(KTR_IW_CXGBE, "%s:ssoB so %p, ep %p, state %s, tid %d", __func__, - epc->so, epc, states[epc->state], - ((struct c4iw_ep *)epc)->hwtid); - mutex_lock(&epc->so_mutex); - if ((so == NULL) || (so->so_count == 0)) { - mutex_unlock(&epc->so_mutex); - CTR5(KTR_IW_CXGBE, "%s:sso1 so %p, ep %p, state %s, tid %d", - __func__, epc->so, epc, states[epc->state], - ((struct c4iw_ep *)epc)->hwtid); - return -EINVAL; - } - rc = soshutdown(so, SHUT_WR); - mutex_unlock(&epc->so_mutex); - return rc; -} - static void -abort_socket(struct c4iw_ep *ep) +close_socket(struct socket *so) { - struct sockopt sopt; - int rc; - struct linger l; - - CTR5(KTR_IW_CXGBE, "%s ep %p so %p state %s tid %d", __func__, ep, - ep->com.so, states[ep->com.state], ep->hwtid); - mutex_lock(&ep->com.so_mutex); - l.l_onoff = 1; - l.l_linger = 0; - /* linger_time of 0 forces RST to be sent */ - sopt.sopt_dir = SOPT_SET; - sopt.sopt_level = SOL_SOCKET; - sopt.sopt_name = SO_LINGER; - sopt.sopt_val = (caddr_t)&l; - sopt.sopt_valsize = sizeof l; - sopt.sopt_td = NULL; - rc = sosetopt(ep->com.so, &sopt); - if (rc) { - log(LOG_ERR, "%s: can't set linger to 0, no RST! err %d\n", - __func__, rc); - } - mutex_unlock(&ep->com.so_mutex); + uninit_iwarp_socket(so); + sodisconnect(so); } static void @@ -429,7 +353,7 @@ process_peer_close(struct c4iw_ep *ep) disconnect = 0; STOP_EP_TIMER(ep); - close_socket(&ep->com, 0); + close_socket(ep->com.so); deref_cm_id(&ep->com); release = 1; break; @@ -486,7 +410,7 @@ process_peer_close(struct c4iw_ep *ep) c4iw_modify_qp(ep->com.qp->rhp, ep->com.qp, C4IW_QP_ATTR_NEXT_STATE, &attrs, 1); } - close_socket(&ep->com, 0); + close_socket(ep->com.so); close_complete_upcall(ep, 0); __state_set(&ep->com, DEAD); release = 1; @@ -595,14 +519,7 @@ process_conn_error(struct c4iw_ep *ep) } if (state != ABORTING) { - if (ep->parent_ep) { - CTR2(KTR_IW_CXGBE, "%s:pce1 %p", __func__, ep); - close_socket(&ep->com, 1); - } else { - CTR2(KTR_IW_CXGBE, "%s:pce2 %p", __func__, ep); - close_socket(&ep->com, 0); - } - + close_socket(ep->com.so); __state_set(&ep->com, DEAD); c4iw_put_ep(&ep->com); } @@ -648,16 +565,7 @@ process_close_complete(struct c4iw_ep *e &attrs, 1); } - if (ep->parent_ep) { - - CTR2(KTR_IW_CXGBE, "%s:pcc3 %p", __func__, ep); - close_socket(&ep->com, 1); - } - else { - - CTR2(KTR_IW_CXGBE, "%s:pcc4 %p", __func__, ep); - close_socket(&ep->com, 0); - } + close_socket(ep->com.so); close_complete_upcall(ep, 0); __state_set(&ep->com, DEAD); release = 1; @@ -688,23 +596,15 @@ process_close_complete(struct c4iw_ep *e } static void -init_sock(struct c4iw_ep_common *epc) +init_iwarp_socket(struct socket *so, void *arg) { int rc; struct sockopt sopt; - struct socket *so = epc->so; int on = 1; - mutex_lock(&epc->so_mutex); - if ((so == NULL) || (so->so_count == 0)) { - mutex_unlock(&epc->so_mutex); - CTR5(KTR_IW_CXGBE, "%s:iso1 so %p, ep %p, state %s, tid %d", - __func__, so, epc, states[epc->state], - ((struct c4iw_ep *)epc)->hwtid); - return; - } + /* Note that SOCK_LOCK(so) is same as SOCKBUF_LOCK(&so->so_rcv) */ SOCK_LOCK(so); - soupcall_set(so, SO_RCV, c4iw_so_upcall, epc); + soupcall_set(so, SO_RCV, c4iw_so_upcall, arg); so->so_state |= SS_NBIO; SOCK_UNLOCK(so); sopt.sopt_dir = SOPT_SET; @@ -718,7 +618,15 @@ init_sock(struct c4iw_ep_common *epc) log(LOG_ERR, "%s: can't set TCP_NODELAY on so %p (%d)\n", __func__, so, rc); } - mutex_unlock(&epc->so_mutex); +} + +static void +uninit_iwarp_socket(struct socket *so) +{ + + SOCKBUF_LOCK(&so->so_rcv); + soupcall_clear(so, SO_RCV); + SOCKBUF_UNLOCK(&so->so_rcv); } static void @@ -759,18 +667,18 @@ process_data(struct c4iw_ep *ep) static void process_connected(struct c4iw_ep *ep) { + struct socket *so = ep->com.so; - if ((ep->com.so->so_state & SS_ISCONNECTED) && !ep->com.so->so_error) { + if ((so->so_state & SS_ISCONNECTED) && !so->so_error) { if (send_mpa_req(ep)) goto err; - } - else { - connect_reply_upcall(ep, -ep->com.so->so_error); + } else { + connect_reply_upcall(ep, -so->so_error); goto err; } return; err: - close_socket(&ep->com, 0); + close_socket(so); state_set(&ep->com, DEAD); c4iw_put_ep(&ep->com); return; @@ -785,23 +693,9 @@ process_newconn(struct iw_cm_id *parent_ struct c4iw_ep *parent_ep = parent_cm_id->provider_data; int ret = 0; - if (!child_so) { - CTR4(KTR_IW_CXGBE, - "%s: parent so %p, parent ep %p, child so %p, invalid so", - __func__, parent_ep->com.so, parent_ep, child_so); - log(LOG_ERR, "%s: invalid child socket\n", __func__); - return; - } - child_ep = alloc_ep(sizeof(*child_ep), M_NOWAIT); - if (!child_ep) { - CTR3(KTR_IW_CXGBE, "%s: parent so %p, parent ep %p, ENOMEM", - __func__, parent_ep->com.so, parent_ep); - log(LOG_ERR, "%s: failed to allocate ep entry\n", __func__); - return; - } - SOCKBUF_LOCK(&child_so->so_rcv); - soupcall_set(child_so, SO_RCV, c4iw_so_upcall, child_ep); - SOCKBUF_UNLOCK(&child_so->so_rcv); + MPASS(child_so != NULL); + + child_ep = alloc_ep(sizeof(*child_ep), M_WAITOK); CTR5(KTR_IW_CXGBE, "%s: parent so %p, parent ep %p, child so %p, child ep %p", @@ -821,6 +715,7 @@ process_newconn(struct iw_cm_id *parent_ free(local, M_SONAME); free(remote, M_SONAME); + init_iwarp_socket(child_so, &child_ep->com); c4iw_get_ep(&parent_ep->com); init_timer(&child_ep->timer); state_set(&child_ep->com, MPA_REQ_WAIT); @@ -1052,7 +947,6 @@ alloc_ep(int size, gfp_t gfp) kref_init(&epc->kref); mutex_init(&epc->mutex); - mutex_init(&epc->so_mutex); c4iw_init_wr_wait(&epc->wr_wait); return (epc); @@ -1373,30 +1267,47 @@ static void close_complete_upcall(struct CTR2(KTR_IW_CXGBE, "%s:ccuE %p", __func__, ep); } -static int send_abort(struct c4iw_ep *ep) +static int +send_abort(struct c4iw_ep *ep) { - int err; + struct socket *so = ep->com.so; + struct sockopt sopt; + int rc; + struct linger l; - CTR2(KTR_IW_CXGBE, "%s:abB %p", __func__, ep); - abort_socket(ep); + CTR5(KTR_IW_CXGBE, "%s ep %p so %p state %s tid %d", __func__, ep, so, + states[ep->com.state], ep->hwtid); - /* - * Since socket options were set as l_onoff=1 and l_linger=0 in in - * abort_socket, invoking soclose here sends a RST (reset) to the peer. - */ - err = close_socket(&ep->com, 1); + l.l_onoff = 1; + l.l_linger = 0; + + /* linger_time of 0 forces RST to be sent */ + sopt.sopt_dir = SOPT_SET; + sopt.sopt_level = SOL_SOCKET; + sopt.sopt_name = SO_LINGER; + sopt.sopt_val = (caddr_t)&l; + sopt.sopt_valsize = sizeof l; + sopt.sopt_td = NULL; + rc = sosetopt(so, &sopt); + if (rc != 0) { + log(LOG_ERR, "%s: sosetopt(%p, linger = 0) failed with %d.\n", + __func__, so, rc); + } + + uninit_iwarp_socket(so); + sodisconnect(so); set_bit(ABORT_CONN, &ep->com.history); - CTR2(KTR_IW_CXGBE, "%s:abE %p", __func__, ep); /* - * TBD: iw_cgbe driver should receive ABORT reply for every ABORT + * TBD: iw_cxgbe driver should receive ABORT reply for every ABORT * request it has sent. But the current TOE driver is not propagating * this ABORT reply event (via do_abort_rpl) to iw_cxgbe. So as a work- * around de-refer 'ep' (which was refered before sending ABORT request) * here instead of doing it in abort_rpl() handler of iw_cxgbe driver. */ c4iw_put_ep(&ep->com); - return err; + + return (0); } static void peer_close_upcall(struct c4iw_ep *ep) @@ -2227,7 +2138,6 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct c4iw_dev *dev = to_c4iw_dev(cm_id->device); struct c4iw_ep *ep = NULL; struct rtentry *rt; - struct toedev *tdev; CTR2(KTR_IW_CXGBE, "%s:ccB %p", __func__, cm_id); @@ -2280,8 +2190,6 @@ int c4iw_connect(struct iw_cm_id *cm_id, ep->com.thread = curthread; ep->com.so = cm_id->so; - init_sock(&ep->com); - /* find a route */ rt = find_route( cm_id->local_addr.sin_addr.s_addr, @@ -2297,22 +2205,11 @@ int c4iw_connect(struct iw_cm_id *cm_id, goto fail2; } - if (!(rt->rt_ifp->if_capenable & IFCAP_TOE)) { - - CTR2(KTR_IW_CXGBE, "%s:cc8 %p", __func__, ep); - printf("%s - interface not TOE capable.\n", __func__); - close_socket(&ep->com, 0); + if (!(rt->rt_ifp->if_capenable & IFCAP_TOE) || + TOEDEV(rt->rt_ifp) == NULL) { err = -ENOPROTOOPT; goto fail3; } - tdev = TOEDEV(rt->rt_ifp); - - if (tdev == NULL) { - - CTR2(KTR_IW_CXGBE, "%s:cc9 %p", __func__, ep); - printf("%s - No toedev for interface.\n", __func__); - goto fail3; - } RTFREE(rt); state_set(&ep->com, CONNECTING); @@ -2323,19 +2220,18 @@ int c4iw_connect(struct iw_cm_id *cm_id, ep->com.thread); if (!err) { - CTR2(KTR_IW_CXGBE, "%s:cca %p", __func__, ep); + init_iwarp_socket(cm_id->so, &ep->com); goto out; } else { - close_socket(&ep->com, 0); goto fail2; } fail3: - CTR2(KTR_IW_CXGBE, "%s:ccb %p", __func__, ep); RTFREE(rt); fail2: deref_cm_id(&ep->com); c4iw_put_ep(&ep->com); + ep = NULL; /* CTR shouldn't display already-freed ep. */ out: CTR2(KTR_IW_CXGBE, "%s:ccE %p", __func__, ep); return err; @@ -2479,7 +2375,7 @@ int c4iw_ep_disconnect(struct c4iw_ep *e if (!ep->parent_ep) __state_set(&ep->com, MORIBUND); - ret = shutdown_socket(&ep->com); + ret = sodisconnect(ep->com.so); } if (ret) { Modified: stable/10/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h ============================================================================== --- stable/10/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h Fri Mar 3 17:53:22 2017 (r314605) +++ stable/10/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h Fri Mar 3 17:57:17 2017 (r314606) @@ -754,7 +754,6 @@ struct c4iw_ep_common { int rpl_done; struct thread *thread; struct socket *so; - struct mutex so_mutex; }; struct c4iw_listen_ep { Modified: stable/10/sys/ofed/drivers/infiniband/core/cma.c ============================================================================== --- stable/10/sys/ofed/drivers/infiniband/core/cma.c Fri Mar 3 17:53:22 2017 (r314605) +++ stable/10/sys/ofed/drivers/infiniband/core/cma.c Fri Mar 3 17:57:17 2017 (r314606) @@ -962,8 +962,6 @@ static void cma_release_port(struct rdma kfree(bind_list); } mutex_unlock(&lock); - if (id_priv->sock) - sock_release(id_priv->sock); } static void cma_leave_mc_groups(struct rdma_id_private *id_priv) Modified: stable/10/sys/ofed/drivers/infiniband/core/iwcm.c ============================================================================== --- stable/10/sys/ofed/drivers/infiniband/core/iwcm.c Fri Mar 3 17:53:22 2017 (r314605) +++ stable/10/sys/ofed/drivers/infiniband/core/iwcm.c Fri Mar 3 17:57:17 2017 (r314606) @@ -525,24 +525,15 @@ iw_init_sock(struct iw_cm_id *cm_id) } static int -iw_close_socket(struct iw_cm_id *cm_id, int close) +iw_uninit_socket(struct iw_cm_id *cm_id) { struct socket *so = cm_id->so; - int rc; - SOCK_LOCK(so); soupcall_clear(so, SO_RCV); SOCK_UNLOCK(so); - if (close) - rc = soclose(so); - else - rc = soshutdown(so, SHUT_WR | SHUT_RD); - - cm_id->so = NULL; - - return rc; + return (0); } static int @@ -551,18 +542,17 @@ iw_create_listen(struct iw_cm_id *cm_id, int rc; iw_init_sock(cm_id); - rc = solisten(cm_id->so, backlog, curthread); + rc = -solisten(cm_id->so, backlog, curthread); if (rc != 0) - iw_close_socket(cm_id, 0); - return rc; + iw_uninit_socket(cm_id); + return (rc); } static int iw_destroy_listen(struct iw_cm_id *cm_id) { - int rc; - rc = iw_close_socket(cm_id, 0); - return rc; + + return (iw_uninit_socket(cm_id)); } @@ -660,6 +650,9 @@ void iw_destroy_cm_id(struct iw_cm_id *c wait_for_completion(&cm_id_priv->destroy_comp); + if (cm_id->so) + sock_release(cm_id->so); + free_cm_id(cm_id_priv); } EXPORT_SYMBOL(iw_destroy_cm_id); From owner-svn-src-all@freebsd.org Fri Mar 3 18:23:31 2017 Return-Path: Delivered-To: svn-src-all@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 DD3CECF717E; Fri, 3 Mar 2017 18:23:31 +0000 (UTC) (envelope-from rpokala@mac.com) Received: from mr11p00im-asmtp001.me.com (mr11p00im-asmtp001.me.com [17.110.69.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B56971DEC; Fri, 3 Mar 2017 18:23:31 +0000 (UTC) (envelope-from rpokala@mac.com) Received: from process-dkim-sign-daemon.mr11p00im-asmtp001.me.com by mr11p00im-asmtp001.me.com (Oracle Communications Messaging Server 7.0.5.38.0 64bit (built Feb 26 2016)) id <0OM900K001B63B00@mr11p00im-asmtp001.me.com>; Fri, 03 Mar 2017 17:23:13 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mac.com; s=4d515a; t=1488561793; bh=6kdPGTIbTZ22YfHKgxHr3AfVznLg+mZtdY319FL00J0=; h=Date:Subject:From:To:Message-id:MIME-version:Content-type; b=u/hwn3ZKNyTcVQ+LRXBCUGrMduhwzJGP5Gtm8eeHvBL7DLajdfEBSZWMRrP8J9y0X E4yG6xquBiSi0kQbBAMaNHd3LfNxcmb2DWZFfjV7zqb5UEOUgnAIlkRk5hkX/bezJ2 Bx8WbkcrhXMjoCjqgtmocve0W5uZ+j4LIUPdJjcHkZH0isvnIbOtf55KcrBkubS446 FYvaJZ5j+pyvDfTHHVkH3hB9GUICFs0yrXg8d1v+yGyz/F5eykUBvExBatdsFkUsAo ZsxQ5gZ43Bl2aTeDbutDGRIRtNpdemMz7bDkJzf+vJfMguGeLFMlpuhkX2lSXwo+T+ 4wF4WXNNLp5kg== Received: from icloud.com ([127.0.0.1]) by mr11p00im-asmtp001.me.com (Oracle Communications Messaging Server 7.0.5.38.0 64bit (built Feb 26 2016)) with ESMTPSA id <0OM90075N1MM9100@mr11p00im-asmtp001.me.com>; Fri, 03 Mar 2017 17:23:12 +0000 (GMT) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-03-03_12:,, signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 clxscore=1034 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1701120000 definitions=main-1703030157 User-Agent: Microsoft-MacOutlook/f.1f.0.170216 Date: Fri, 03 Mar 2017 09:23:10 -0800 Subject: Re: svn commit: r314527 - in head: crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat crypto/ope... From: Ravi Pokala Sender: "Pokala, Ravi" To: Dag-Erling =?UTF-8?B?U23DuHJncmF2?= , "Ngie Cooper (yaneurabeya)" Cc: Allan Jude , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-id: <4081F71A-4C13-45B4-BC66-B8DA170AD303@panasas.com> Thread-topic: svn commit: r314527 - in head: crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat crypto/ope... References: <201703020011.v220BWQ0086961@repo.freebsd.org> <86k28783xe.fsf@desk.des.no> <86fuiv832b.fsf@desk.des.no> <59d9780e-6ec3-4e5d-0c9e-77e3639205f6@freebsd.org> <8FE7A2E0-BB9C-4C48-82D9-B7027CA50358@gmail.com> <86bmti9268.fsf@desk.des.no> In-reply-to: <86bmti9268.fsf@desk.des.no> MIME-version: 1.0 Content-type: text/plain; charset=UTF-8 Content-transfer-encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 18:23:32 -0000 -----Original Message----- > From: on behalf of Dag-Erling Sm=C3=B8rgra= v > Date: 2017-03-03, Friday at 00:47 > To: "Ngie Cooper (yaneurabeya)" > Cc: Allan Jude , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" > Subject: Re: svn commit: r314527 - in head: crypto/openssh crypto/openssh= /contrib crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/= openssh/contrib/suse crypto/openssh/openbsd-compat crypto/ope... >=20 > "Ngie Cooper (yaneurabeya)" writes: >> Allan Jude writes: >>> Dag-Erling Sm=C3=B8rgrav writes: >>>> Ngie Cooper writes: >>>>> Yes, I included you on the CR [...] >>>> CR? >>> Code Review (Phabricator) >> Yup =E2=80=94 that=E2=80=99s what I meant. >=20 > I don't use Phabricator, and I don't consider it a legitimate attempt to > contact me about a patch. >=20 > DES > --=20 > Dag-Erling Sm=C3=B8rgrav - des@des.no In that case, please update MAINTAINERS with that info. i.e. Pre-commit review requested; email, not Phabricator. Or something along those lines. Thanks, Ravi (rpokala@) From owner-svn-src-all@freebsd.org Fri Mar 3 18:34:22 2017 Return-Path: Delivered-To: svn-src-all@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 180B2CF74C8; Fri, 3 Mar 2017 18:34:22 +0000 (UTC) (envelope-from jkim@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 BF97A15E9; Fri, 3 Mar 2017 18:34:21 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23IYK0V017548; Fri, 3 Mar 2017 18:34:20 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23IYKhR017547; Fri, 3 Mar 2017 18:34:20 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201703031834.v23IYKhR017547@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Fri, 3 Mar 2017 18:34:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org Subject: svn commit: r314607 - svnadmin/conf X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 18:34:22 -0000 Author: jkim Date: Fri Mar 3 18:34:20 2017 New Revision: 314607 URL: https://svnweb.freebsd.org/changeset/base/314607 Log: Add myself for upcoming ACPICA import. Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf ============================================================================== --- svnadmin/conf/sizelimit.conf Fri Mar 3 17:57:17 2017 (r314606) +++ svnadmin/conf/sizelimit.conf Fri Mar 3 18:34:20 2017 (r314607) @@ -22,6 +22,7 @@ dim imp jb jeff +jkim mm np obrien From owner-svn-src-all@freebsd.org Fri Mar 3 18:34:55 2017 Return-Path: Delivered-To: svn-src-all@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 60701CF751F; Fri, 3 Mar 2017 18:34:55 +0000 (UTC) (envelope-from jkim@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 DEFA5171D; Fri, 3 Mar 2017 18:34:54 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23IYss4017621; Fri, 3 Mar 2017 18:34:54 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23IYr7N017612; Fri, 3 Mar 2017 18:34:53 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201703031834.v23IYr7N017612@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Fri, 3 Mar 2017 18:34:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314608 - in vendor-sys/acpica/dist: . generate/unix source/common source/compiler source/components/debugger source/components/disassembler source/components/dispatcher source/componen... X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 18:34:55 -0000 Author: jkim Date: Fri Mar 3 18:34:52 2017 New Revision: 314608 URL: https://svnweb.freebsd.org/changeset/base/314608 Log: Import ACPICA 20170303. Modified: vendor-sys/acpica/dist/changes.txt vendor-sys/acpica/dist/generate/unix/Makefile.config vendor-sys/acpica/dist/source/common/acfileio.c vendor-sys/acpica/dist/source/common/acgetline.c vendor-sys/acpica/dist/source/common/adfile.c vendor-sys/acpica/dist/source/common/adisasm.c vendor-sys/acpica/dist/source/common/adwalk.c vendor-sys/acpica/dist/source/common/ahids.c vendor-sys/acpica/dist/source/common/ahpredef.c vendor-sys/acpica/dist/source/common/ahtable.c vendor-sys/acpica/dist/source/common/ahuuids.c vendor-sys/acpica/dist/source/common/cmfsize.c vendor-sys/acpica/dist/source/common/dmextern.c vendor-sys/acpica/dist/source/common/dmrestag.c vendor-sys/acpica/dist/source/common/dmtable.c vendor-sys/acpica/dist/source/common/dmtables.c vendor-sys/acpica/dist/source/common/dmtbdump.c vendor-sys/acpica/dist/source/common/dmtbinfo.c vendor-sys/acpica/dist/source/common/getopt.c vendor-sys/acpica/dist/source/compiler/aslanalyze.c vendor-sys/acpica/dist/source/compiler/aslascii.c vendor-sys/acpica/dist/source/compiler/aslbtypes.c vendor-sys/acpica/dist/source/compiler/aslcodegen.c vendor-sys/acpica/dist/source/compiler/aslcompile.c vendor-sys/acpica/dist/source/compiler/aslcompiler.h vendor-sys/acpica/dist/source/compiler/aslcompiler.l vendor-sys/acpica/dist/source/compiler/aslcstyle.y vendor-sys/acpica/dist/source/compiler/asldebug.c vendor-sys/acpica/dist/source/compiler/asldefine.h vendor-sys/acpica/dist/source/compiler/aslerror.c vendor-sys/acpica/dist/source/compiler/aslexternal.c vendor-sys/acpica/dist/source/compiler/aslfileio.c vendor-sys/acpica/dist/source/compiler/aslfiles.c vendor-sys/acpica/dist/source/compiler/aslfold.c vendor-sys/acpica/dist/source/compiler/aslglobal.h vendor-sys/acpica/dist/source/compiler/aslhelp.c vendor-sys/acpica/dist/source/compiler/aslhelpers.y vendor-sys/acpica/dist/source/compiler/aslhex.c vendor-sys/acpica/dist/source/compiler/aslkeywords.y vendor-sys/acpica/dist/source/compiler/asllength.c vendor-sys/acpica/dist/source/compiler/asllisting.c vendor-sys/acpica/dist/source/compiler/asllistsup.c vendor-sys/acpica/dist/source/compiler/aslload.c vendor-sys/acpica/dist/source/compiler/asllookup.c vendor-sys/acpica/dist/source/compiler/aslmain.c vendor-sys/acpica/dist/source/compiler/aslmap.c vendor-sys/acpica/dist/source/compiler/aslmapenter.c vendor-sys/acpica/dist/source/compiler/aslmapoutput.c vendor-sys/acpica/dist/source/compiler/aslmaputils.c vendor-sys/acpica/dist/source/compiler/aslmessages.c vendor-sys/acpica/dist/source/compiler/aslmessages.h vendor-sys/acpica/dist/source/compiler/aslmethod.c vendor-sys/acpica/dist/source/compiler/aslnamesp.c vendor-sys/acpica/dist/source/compiler/asloffset.c vendor-sys/acpica/dist/source/compiler/aslopcodes.c vendor-sys/acpica/dist/source/compiler/asloperands.c vendor-sys/acpica/dist/source/compiler/aslopt.c vendor-sys/acpica/dist/source/compiler/asloptions.c vendor-sys/acpica/dist/source/compiler/aslparser.y vendor-sys/acpica/dist/source/compiler/aslpld.c vendor-sys/acpica/dist/source/compiler/aslpredef.c vendor-sys/acpica/dist/source/compiler/aslprepkg.c vendor-sys/acpica/dist/source/compiler/aslprimaries.y vendor-sys/acpica/dist/source/compiler/aslprintf.c vendor-sys/acpica/dist/source/compiler/aslprune.c vendor-sys/acpica/dist/source/compiler/aslresource.c vendor-sys/acpica/dist/source/compiler/aslresources.y vendor-sys/acpica/dist/source/compiler/aslrestype1.c vendor-sys/acpica/dist/source/compiler/aslrestype1i.c vendor-sys/acpica/dist/source/compiler/aslrestype2.c vendor-sys/acpica/dist/source/compiler/aslrestype2d.c vendor-sys/acpica/dist/source/compiler/aslrestype2e.c vendor-sys/acpica/dist/source/compiler/aslrestype2q.c vendor-sys/acpica/dist/source/compiler/aslrestype2s.c vendor-sys/acpica/dist/source/compiler/aslrestype2w.c vendor-sys/acpica/dist/source/compiler/aslrules.y vendor-sys/acpica/dist/source/compiler/aslstartup.c vendor-sys/acpica/dist/source/compiler/aslstubs.c vendor-sys/acpica/dist/source/compiler/aslsupport.l vendor-sys/acpica/dist/source/compiler/aslsupport.y vendor-sys/acpica/dist/source/compiler/asltokens.y vendor-sys/acpica/dist/source/compiler/asltransform.c vendor-sys/acpica/dist/source/compiler/asltree.c vendor-sys/acpica/dist/source/compiler/asltypes.h vendor-sys/acpica/dist/source/compiler/asltypes.y vendor-sys/acpica/dist/source/compiler/aslutils.c vendor-sys/acpica/dist/source/compiler/asluuid.c vendor-sys/acpica/dist/source/compiler/aslwalks.c vendor-sys/acpica/dist/source/compiler/aslxref.c vendor-sys/acpica/dist/source/compiler/aslxrefout.c vendor-sys/acpica/dist/source/compiler/cvcompiler.c vendor-sys/acpica/dist/source/compiler/cvdisasm.c vendor-sys/acpica/dist/source/compiler/cvparser.c vendor-sys/acpica/dist/source/compiler/dtcompile.c vendor-sys/acpica/dist/source/compiler/dtcompiler.h vendor-sys/acpica/dist/source/compiler/dtexpress.c vendor-sys/acpica/dist/source/compiler/dtfield.c vendor-sys/acpica/dist/source/compiler/dtio.c vendor-sys/acpica/dist/source/compiler/dtparser.l vendor-sys/acpica/dist/source/compiler/dtparser.y vendor-sys/acpica/dist/source/compiler/dtsubtable.c vendor-sys/acpica/dist/source/compiler/dttable.c vendor-sys/acpica/dist/source/compiler/dttable1.c vendor-sys/acpica/dist/source/compiler/dttable2.c vendor-sys/acpica/dist/source/compiler/dttemplate.c vendor-sys/acpica/dist/source/compiler/dttemplate.h vendor-sys/acpica/dist/source/compiler/dtutils.c vendor-sys/acpica/dist/source/compiler/preprocess.h vendor-sys/acpica/dist/source/compiler/prexpress.c vendor-sys/acpica/dist/source/compiler/prmacros.c vendor-sys/acpica/dist/source/compiler/prparser.l vendor-sys/acpica/dist/source/compiler/prparser.y vendor-sys/acpica/dist/source/compiler/prscan.c vendor-sys/acpica/dist/source/compiler/prutils.c vendor-sys/acpica/dist/source/components/debugger/dbcmds.c vendor-sys/acpica/dist/source/components/debugger/dbconvert.c vendor-sys/acpica/dist/source/components/debugger/dbdisply.c vendor-sys/acpica/dist/source/components/debugger/dbexec.c vendor-sys/acpica/dist/source/components/debugger/dbfileio.c vendor-sys/acpica/dist/source/components/debugger/dbhistry.c vendor-sys/acpica/dist/source/components/debugger/dbinput.c vendor-sys/acpica/dist/source/components/debugger/dbmethod.c vendor-sys/acpica/dist/source/components/debugger/dbnames.c vendor-sys/acpica/dist/source/components/debugger/dbobject.c vendor-sys/acpica/dist/source/components/debugger/dbstats.c vendor-sys/acpica/dist/source/components/debugger/dbtest.c vendor-sys/acpica/dist/source/components/debugger/dbutils.c vendor-sys/acpica/dist/source/components/debugger/dbxface.c vendor-sys/acpica/dist/source/components/disassembler/dmbuffer.c vendor-sys/acpica/dist/source/components/disassembler/dmcstyle.c vendor-sys/acpica/dist/source/components/disassembler/dmdeferred.c vendor-sys/acpica/dist/source/components/disassembler/dmnames.c vendor-sys/acpica/dist/source/components/disassembler/dmopcode.c vendor-sys/acpica/dist/source/components/disassembler/dmresrc.c vendor-sys/acpica/dist/source/components/disassembler/dmresrcl.c vendor-sys/acpica/dist/source/components/disassembler/dmresrcl2.c vendor-sys/acpica/dist/source/components/disassembler/dmresrcs.c vendor-sys/acpica/dist/source/components/disassembler/dmutils.c vendor-sys/acpica/dist/source/components/disassembler/dmwalk.c vendor-sys/acpica/dist/source/components/dispatcher/dsargs.c vendor-sys/acpica/dist/source/components/dispatcher/dscontrol.c vendor-sys/acpica/dist/source/components/dispatcher/dsdebug.c vendor-sys/acpica/dist/source/components/dispatcher/dsfield.c vendor-sys/acpica/dist/source/components/dispatcher/dsinit.c vendor-sys/acpica/dist/source/components/dispatcher/dsmethod.c vendor-sys/acpica/dist/source/components/dispatcher/dsmthdat.c vendor-sys/acpica/dist/source/components/dispatcher/dsobject.c vendor-sys/acpica/dist/source/components/dispatcher/dsopcode.c vendor-sys/acpica/dist/source/components/dispatcher/dsutils.c vendor-sys/acpica/dist/source/components/dispatcher/dswexec.c vendor-sys/acpica/dist/source/components/dispatcher/dswload.c vendor-sys/acpica/dist/source/components/dispatcher/dswload2.c vendor-sys/acpica/dist/source/components/dispatcher/dswscope.c vendor-sys/acpica/dist/source/components/dispatcher/dswstate.c vendor-sys/acpica/dist/source/components/events/evevent.c vendor-sys/acpica/dist/source/components/events/evglock.c vendor-sys/acpica/dist/source/components/events/evgpe.c vendor-sys/acpica/dist/source/components/events/evgpeblk.c vendor-sys/acpica/dist/source/components/events/evgpeinit.c vendor-sys/acpica/dist/source/components/events/evgpeutil.c vendor-sys/acpica/dist/source/components/events/evhandler.c vendor-sys/acpica/dist/source/components/events/evmisc.c vendor-sys/acpica/dist/source/components/events/evregion.c vendor-sys/acpica/dist/source/components/events/evrgnini.c vendor-sys/acpica/dist/source/components/events/evsci.c vendor-sys/acpica/dist/source/components/events/evxface.c vendor-sys/acpica/dist/source/components/events/evxfevnt.c vendor-sys/acpica/dist/source/components/events/evxfgpe.c vendor-sys/acpica/dist/source/components/events/evxfregn.c vendor-sys/acpica/dist/source/components/executer/exconcat.c vendor-sys/acpica/dist/source/components/executer/exconfig.c vendor-sys/acpica/dist/source/components/executer/exconvrt.c vendor-sys/acpica/dist/source/components/executer/excreate.c vendor-sys/acpica/dist/source/components/executer/exdebug.c vendor-sys/acpica/dist/source/components/executer/exdump.c vendor-sys/acpica/dist/source/components/executer/exfield.c vendor-sys/acpica/dist/source/components/executer/exfldio.c vendor-sys/acpica/dist/source/components/executer/exmisc.c vendor-sys/acpica/dist/source/components/executer/exmutex.c vendor-sys/acpica/dist/source/components/executer/exnames.c vendor-sys/acpica/dist/source/components/executer/exoparg1.c vendor-sys/acpica/dist/source/components/executer/exoparg2.c vendor-sys/acpica/dist/source/components/executer/exoparg3.c vendor-sys/acpica/dist/source/components/executer/exoparg6.c vendor-sys/acpica/dist/source/components/executer/exprep.c vendor-sys/acpica/dist/source/components/executer/exregion.c vendor-sys/acpica/dist/source/components/executer/exresnte.c vendor-sys/acpica/dist/source/components/executer/exresolv.c vendor-sys/acpica/dist/source/components/executer/exresop.c vendor-sys/acpica/dist/source/components/executer/exstore.c vendor-sys/acpica/dist/source/components/executer/exstoren.c vendor-sys/acpica/dist/source/components/executer/exstorob.c vendor-sys/acpica/dist/source/components/executer/exsystem.c vendor-sys/acpica/dist/source/components/executer/extrace.c vendor-sys/acpica/dist/source/components/executer/exutils.c vendor-sys/acpica/dist/source/components/hardware/hwacpi.c vendor-sys/acpica/dist/source/components/hardware/hwesleep.c vendor-sys/acpica/dist/source/components/hardware/hwgpe.c vendor-sys/acpica/dist/source/components/hardware/hwpci.c vendor-sys/acpica/dist/source/components/hardware/hwregs.c vendor-sys/acpica/dist/source/components/hardware/hwsleep.c vendor-sys/acpica/dist/source/components/hardware/hwtimer.c vendor-sys/acpica/dist/source/components/hardware/hwvalid.c vendor-sys/acpica/dist/source/components/hardware/hwxface.c vendor-sys/acpica/dist/source/components/hardware/hwxfsleep.c vendor-sys/acpica/dist/source/components/namespace/nsaccess.c vendor-sys/acpica/dist/source/components/namespace/nsalloc.c vendor-sys/acpica/dist/source/components/namespace/nsarguments.c vendor-sys/acpica/dist/source/components/namespace/nsconvert.c vendor-sys/acpica/dist/source/components/namespace/nsdump.c vendor-sys/acpica/dist/source/components/namespace/nsdumpdv.c vendor-sys/acpica/dist/source/components/namespace/nseval.c vendor-sys/acpica/dist/source/components/namespace/nsinit.c vendor-sys/acpica/dist/source/components/namespace/nsload.c vendor-sys/acpica/dist/source/components/namespace/nsnames.c vendor-sys/acpica/dist/source/components/namespace/nsobject.c vendor-sys/acpica/dist/source/components/namespace/nsparse.c vendor-sys/acpica/dist/source/components/namespace/nspredef.c vendor-sys/acpica/dist/source/components/namespace/nsprepkg.c vendor-sys/acpica/dist/source/components/namespace/nsrepair.c vendor-sys/acpica/dist/source/components/namespace/nsrepair2.c vendor-sys/acpica/dist/source/components/namespace/nssearch.c vendor-sys/acpica/dist/source/components/namespace/nsutils.c vendor-sys/acpica/dist/source/components/namespace/nswalk.c vendor-sys/acpica/dist/source/components/namespace/nsxfeval.c vendor-sys/acpica/dist/source/components/namespace/nsxfname.c vendor-sys/acpica/dist/source/components/namespace/nsxfobj.c vendor-sys/acpica/dist/source/components/parser/psargs.c vendor-sys/acpica/dist/source/components/parser/psloop.c vendor-sys/acpica/dist/source/components/parser/psobject.c vendor-sys/acpica/dist/source/components/parser/psopcode.c vendor-sys/acpica/dist/source/components/parser/psopinfo.c vendor-sys/acpica/dist/source/components/parser/psparse.c vendor-sys/acpica/dist/source/components/parser/psscope.c vendor-sys/acpica/dist/source/components/parser/pstree.c vendor-sys/acpica/dist/source/components/parser/psutils.c vendor-sys/acpica/dist/source/components/parser/pswalk.c vendor-sys/acpica/dist/source/components/parser/psxface.c vendor-sys/acpica/dist/source/components/resources/rsaddr.c vendor-sys/acpica/dist/source/components/resources/rscalc.c vendor-sys/acpica/dist/source/components/resources/rscreate.c vendor-sys/acpica/dist/source/components/resources/rsdump.c vendor-sys/acpica/dist/source/components/resources/rsdumpinfo.c vendor-sys/acpica/dist/source/components/resources/rsinfo.c vendor-sys/acpica/dist/source/components/resources/rsio.c vendor-sys/acpica/dist/source/components/resources/rsirq.c vendor-sys/acpica/dist/source/components/resources/rslist.c vendor-sys/acpica/dist/source/components/resources/rsmemory.c vendor-sys/acpica/dist/source/components/resources/rsmisc.c vendor-sys/acpica/dist/source/components/resources/rsserial.c vendor-sys/acpica/dist/source/components/resources/rsutils.c vendor-sys/acpica/dist/source/components/resources/rsxface.c vendor-sys/acpica/dist/source/components/tables/tbdata.c vendor-sys/acpica/dist/source/components/tables/tbfadt.c vendor-sys/acpica/dist/source/components/tables/tbfind.c vendor-sys/acpica/dist/source/components/tables/tbinstal.c vendor-sys/acpica/dist/source/components/tables/tbprint.c vendor-sys/acpica/dist/source/components/tables/tbutils.c vendor-sys/acpica/dist/source/components/tables/tbxface.c vendor-sys/acpica/dist/source/components/tables/tbxfload.c vendor-sys/acpica/dist/source/components/tables/tbxfroot.c vendor-sys/acpica/dist/source/components/utilities/utaddress.c vendor-sys/acpica/dist/source/components/utilities/utalloc.c vendor-sys/acpica/dist/source/components/utilities/utascii.c vendor-sys/acpica/dist/source/components/utilities/utbuffer.c vendor-sys/acpica/dist/source/components/utilities/utcache.c vendor-sys/acpica/dist/source/components/utilities/utclib.c vendor-sys/acpica/dist/source/components/utilities/utcopy.c vendor-sys/acpica/dist/source/components/utilities/utdebug.c vendor-sys/acpica/dist/source/components/utilities/utdecode.c vendor-sys/acpica/dist/source/components/utilities/utdelete.c vendor-sys/acpica/dist/source/components/utilities/uterror.c vendor-sys/acpica/dist/source/components/utilities/uteval.c vendor-sys/acpica/dist/source/components/utilities/utexcep.c vendor-sys/acpica/dist/source/components/utilities/utglobal.c vendor-sys/acpica/dist/source/components/utilities/uthex.c vendor-sys/acpica/dist/source/components/utilities/utids.c vendor-sys/acpica/dist/source/components/utilities/utinit.c vendor-sys/acpica/dist/source/components/utilities/utlock.c vendor-sys/acpica/dist/source/components/utilities/utmath.c vendor-sys/acpica/dist/source/components/utilities/utmisc.c vendor-sys/acpica/dist/source/components/utilities/utmutex.c vendor-sys/acpica/dist/source/components/utilities/utnonansi.c vendor-sys/acpica/dist/source/components/utilities/utobject.c vendor-sys/acpica/dist/source/components/utilities/utosi.c vendor-sys/acpica/dist/source/components/utilities/utownerid.c vendor-sys/acpica/dist/source/components/utilities/utpredef.c vendor-sys/acpica/dist/source/components/utilities/utprint.c vendor-sys/acpica/dist/source/components/utilities/utresrc.c vendor-sys/acpica/dist/source/components/utilities/utstate.c vendor-sys/acpica/dist/source/components/utilities/utstring.c vendor-sys/acpica/dist/source/components/utilities/utstrtoul64.c vendor-sys/acpica/dist/source/components/utilities/uttrack.c vendor-sys/acpica/dist/source/components/utilities/utuuid.c vendor-sys/acpica/dist/source/components/utilities/utxface.c vendor-sys/acpica/dist/source/components/utilities/utxferror.c vendor-sys/acpica/dist/source/components/utilities/utxfinit.c vendor-sys/acpica/dist/source/components/utilities/utxfmutex.c vendor-sys/acpica/dist/source/include/acapps.h vendor-sys/acpica/dist/source/include/acbuffer.h vendor-sys/acpica/dist/source/include/acclib.h vendor-sys/acpica/dist/source/include/accommon.h vendor-sys/acpica/dist/source/include/acconfig.h vendor-sys/acpica/dist/source/include/acconvert.h vendor-sys/acpica/dist/source/include/acdebug.h vendor-sys/acpica/dist/source/include/acdisasm.h vendor-sys/acpica/dist/source/include/acdispat.h vendor-sys/acpica/dist/source/include/acevents.h vendor-sys/acpica/dist/source/include/acexcep.h vendor-sys/acpica/dist/source/include/acglobal.h vendor-sys/acpica/dist/source/include/achware.h vendor-sys/acpica/dist/source/include/acinterp.h vendor-sys/acpica/dist/source/include/aclocal.h vendor-sys/acpica/dist/source/include/acmacros.h vendor-sys/acpica/dist/source/include/acnames.h vendor-sys/acpica/dist/source/include/acnamesp.h vendor-sys/acpica/dist/source/include/acobject.h vendor-sys/acpica/dist/source/include/acopcode.h vendor-sys/acpica/dist/source/include/acoutput.h vendor-sys/acpica/dist/source/include/acparser.h vendor-sys/acpica/dist/source/include/acpi.h vendor-sys/acpica/dist/source/include/acpiosxf.h vendor-sys/acpica/dist/source/include/acpixf.h vendor-sys/acpica/dist/source/include/acpredef.h vendor-sys/acpica/dist/source/include/acresrc.h vendor-sys/acpica/dist/source/include/acrestyp.h vendor-sys/acpica/dist/source/include/acstruct.h vendor-sys/acpica/dist/source/include/actables.h vendor-sys/acpica/dist/source/include/actbl.h vendor-sys/acpica/dist/source/include/actbl1.h vendor-sys/acpica/dist/source/include/actbl2.h vendor-sys/acpica/dist/source/include/actbl3.h vendor-sys/acpica/dist/source/include/actypes.h vendor-sys/acpica/dist/source/include/acutils.h vendor-sys/acpica/dist/source/include/acuuid.h vendor-sys/acpica/dist/source/include/amlcode.h vendor-sys/acpica/dist/source/include/amlresrc.h vendor-sys/acpica/dist/source/include/platform/accygwin.h vendor-sys/acpica/dist/source/include/platform/acdragonfly.h vendor-sys/acpica/dist/source/include/platform/acdragonflyex.h vendor-sys/acpica/dist/source/include/platform/acefi.h vendor-sys/acpica/dist/source/include/platform/acefiex.h vendor-sys/acpica/dist/source/include/platform/acenv.h vendor-sys/acpica/dist/source/include/platform/acenvex.h vendor-sys/acpica/dist/source/include/platform/acfreebsd.h vendor-sys/acpica/dist/source/include/platform/acgcc.h vendor-sys/acpica/dist/source/include/platform/acgccex.h vendor-sys/acpica/dist/source/include/platform/achaiku.h vendor-sys/acpica/dist/source/include/platform/acintel.h vendor-sys/acpica/dist/source/include/platform/aclinux.h vendor-sys/acpica/dist/source/include/platform/aclinuxex.h vendor-sys/acpica/dist/source/include/platform/acmacosx.h vendor-sys/acpica/dist/source/include/platform/acmsvc.h vendor-sys/acpica/dist/source/include/platform/acmsvcex.h vendor-sys/acpica/dist/source/include/platform/acnetbsd.h vendor-sys/acpica/dist/source/include/platform/acos2.h vendor-sys/acpica/dist/source/include/platform/acqnx.h vendor-sys/acpica/dist/source/include/platform/acwin.h vendor-sys/acpica/dist/source/include/platform/acwin64.h vendor-sys/acpica/dist/source/os_specific/service_layers/osbsdtbl.c vendor-sys/acpica/dist/source/os_specific/service_layers/osgendbg.c vendor-sys/acpica/dist/source/os_specific/service_layers/oslinuxtbl.c vendor-sys/acpica/dist/source/os_specific/service_layers/osunixdir.c vendor-sys/acpica/dist/source/os_specific/service_layers/osunixmap.c vendor-sys/acpica/dist/source/os_specific/service_layers/osunixxf.c vendor-sys/acpica/dist/source/os_specific/service_layers/oswindir.c vendor-sys/acpica/dist/source/os_specific/service_layers/oswintbl.c vendor-sys/acpica/dist/source/os_specific/service_layers/oswinxf.c vendor-sys/acpica/dist/source/tools/acpibin/abcompare.c vendor-sys/acpica/dist/source/tools/acpibin/abmain.c vendor-sys/acpica/dist/source/tools/acpibin/acpibin.h vendor-sys/acpica/dist/source/tools/acpidump/acpidump.h vendor-sys/acpica/dist/source/tools/acpidump/apdump.c vendor-sys/acpica/dist/source/tools/acpidump/apfiles.c vendor-sys/acpica/dist/source/tools/acpidump/apmain.c vendor-sys/acpica/dist/source/tools/acpiexec/aecommon.h vendor-sys/acpica/dist/source/tools/acpiexec/aeexec.c vendor-sys/acpica/dist/source/tools/acpiexec/aehandlers.c vendor-sys/acpica/dist/source/tools/acpiexec/aeinitfile.c vendor-sys/acpica/dist/source/tools/acpiexec/aemain.c vendor-sys/acpica/dist/source/tools/acpiexec/aeregion.c vendor-sys/acpica/dist/source/tools/acpiexec/aetables.c vendor-sys/acpica/dist/source/tools/acpiexec/aetables.h vendor-sys/acpica/dist/source/tools/acpihelp/acpihelp.h vendor-sys/acpica/dist/source/tools/acpihelp/ahaml.c vendor-sys/acpica/dist/source/tools/acpihelp/ahamlops.c vendor-sys/acpica/dist/source/tools/acpihelp/ahasl.c vendor-sys/acpica/dist/source/tools/acpihelp/ahaslkey.c vendor-sys/acpica/dist/source/tools/acpihelp/ahaslops.c vendor-sys/acpica/dist/source/tools/acpihelp/ahdecode.c vendor-sys/acpica/dist/source/tools/acpihelp/ahgrammar.c vendor-sys/acpica/dist/source/tools/acpihelp/ahmain.c vendor-sys/acpica/dist/source/tools/acpinames/acpinames.h vendor-sys/acpica/dist/source/tools/acpinames/anmain.c vendor-sys/acpica/dist/source/tools/acpinames/anstubs.c vendor-sys/acpica/dist/source/tools/acpinames/antables.c vendor-sys/acpica/dist/source/tools/acpisrc/acpisrc.h vendor-sys/acpica/dist/source/tools/acpisrc/ascase.c vendor-sys/acpica/dist/source/tools/acpisrc/asconvrt.c vendor-sys/acpica/dist/source/tools/acpisrc/asfile.c vendor-sys/acpica/dist/source/tools/acpisrc/asmain.c vendor-sys/acpica/dist/source/tools/acpisrc/asremove.c vendor-sys/acpica/dist/source/tools/acpisrc/astable.c vendor-sys/acpica/dist/source/tools/acpisrc/asutils.c vendor-sys/acpica/dist/source/tools/acpixtract/acpixtract.c vendor-sys/acpica/dist/source/tools/acpixtract/acpixtract.h vendor-sys/acpica/dist/source/tools/acpixtract/axmain.c vendor-sys/acpica/dist/source/tools/acpixtract/axutils.c vendor-sys/acpica/dist/source/tools/efihello/efihello.c vendor-sys/acpica/dist/source/tools/examples/examples.c vendor-sys/acpica/dist/source/tools/examples/examples.h vendor-sys/acpica/dist/source/tools/examples/exstubs.c vendor-sys/acpica/dist/source/tools/examples/extables.c Modified: vendor-sys/acpica/dist/changes.txt ============================================================================== --- vendor-sys/acpica/dist/changes.txt Fri Mar 3 18:34:20 2017 (r314607) +++ vendor-sys/acpica/dist/changes.txt Fri Mar 3 18:34:52 2017 (r314608) @@ -1,4 +1,44 @@ ---------------------------------------- +03 March 2017. Summary of changes for version 20170303: + + +0) ACPICA licensing: + +The licensing information at the start of each source code module has +been updated. In addition to the Intel license, the dual GPLv2/BSD +license has been added for completeness. Now, a single version of the +source code should be suitable for all ACPICA customers. This is the +major change for this release since it affects all source code modules. + + +1) ACPICA kernel-resident subsystem: + +Fixed two issues with the common asltypes.h header that could cause +problems in some environments: (Kim Jung-uk) + Removed typedef for YY_BUFFER_STATE ? + Fixes an error with earlier versions of Flex. + Removed use of FILE typedef (which is only defined in stdio.h) + + +2) iASL Compiler/Disassembler and Tools: + +Disassembler: fixed a regression introduced in 20170224. A fix for a +memory leak related to resource descriptor tags (names) could fault when +the disassembler was generated with 64-bit compilers. + +The ASLTS test suite has been updated to implement a new testing +architecture. During generation of the suite from ASL source, both the +ASL and ASL+ compilers are now validated, as well as the disassembler +itself (Erik Schmauss). The architecture executes as follows: + + For every ASL source module: + Compile (legacy ASL compilation) + Disassemble the resulting AML to ASL+ source code + Compile the new ASL+ module + Perform a binary compare on the legacy AML and the new ASL+ AML + The ASLTS suite then executes normally using the AML binaries. + +---------------------------------------- 24 February 2017. Summary of changes for version 20170224: Modified: vendor-sys/acpica/dist/generate/unix/Makefile.config ============================================================================== --- vendor-sys/acpica/dist/generate/unix/Makefile.config Fri Mar 3 18:34:20 2017 (r314607) +++ vendor-sys/acpica/dist/generate/unix/Makefile.config Fri Mar 3 18:34:52 2017 (r314608) @@ -148,6 +148,15 @@ ACPICA_HEADERS = \ OPT_CFLAGS ?= $(CWARNINGFLAGS) # +# Common compiler flags +# The _GNU_SOURCE symbol is required for many hosts. +# +ifeq ($(M32),TRUE) +CFLAGS +=-m32 +LDFLAGS +=-m32 +endif + +# # Optionally disable optimizations. Optimization causes problems on # some compilers such as gcc 4.4 # Modified: vendor-sys/acpica/dist/source/common/acfileio.c ============================================================================== --- vendor-sys/acpica/dist/source/common/acfileio.c Fri Mar 3 18:34:20 2017 (r314607) +++ vendor-sys/acpica/dist/source/common/acfileio.c Fri Mar 3 18:34:52 2017 (r314608) @@ -4,10 +4,118 @@ * *****************************************************************************/ -/* - * Copyright (C) 2000 - 2017, Intel Corp. +/****************************************************************************** + * + * 1. Copyright Notice + * + * Some or all of this work - Copyright (c) 1999 - 2017, Intel Corp. * All rights reserved. * + * 2. License + * + * 2.1. This is your license from Intel Corp. under its intellectual property + * rights. You may have additional license terms from the party that provided + * you this software, covering your right to use that party's intellectual + * property rights. + * + * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a + * copy of the source code appearing in this file ("Covered Code") an + * irrevocable, perpetual, worldwide license under Intel's copyrights in the + * base code distributed originally by Intel ("Original Intel Code") to copy, + * make derivatives, distribute, use and display any portion of the Covered + * Code in any form, with the right to sublicense such rights; and + * + * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent + * license (with the right to sublicense), under only those claims of Intel + * patents that are infringed by the Original Intel Code, to make, use, sell, + * offer to sell, and import the Covered Code and derivative works thereof + * solely to the minimum extent necessary to exercise the above copyright + * license, and in no event shall the patent license extend to any additions + * to or modifications of the Original Intel Code. No other license or right + * is granted directly or by implication, estoppel or otherwise; + * + * The above copyright and patent license is granted only if the following + * conditions are met: + * + * 3. Conditions + * + * 3.1. Redistribution of Source with Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification with rights to further distribute source must include + * the above Copyright Notice, the above License, this list of Conditions, + * and the following Disclaimer and Export Compliance provision. In addition, + * Licensee must cause all Covered Code to which Licensee contributes to + * contain a file documenting the changes Licensee made to create that Covered + * Code and the date of any change. Licensee must include in that file the + * documentation of any changes made by any predecessor Licensee. Licensee + * must include a prominent statement that the modification is derived, + * directly or indirectly, from Original Intel Code. + * + * 3.2. Redistribution of Source with no Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification without rights to further distribute source must + * include the following Disclaimer and Export Compliance provision in the + * documentation and/or other materials provided with distribution. In + * addition, Licensee may not authorize further sublicense of source of any + * portion of the Covered Code, and must include terms to the effect that the + * license from Licensee to its licensee is limited to the intellectual + * property embodied in the software Licensee provides to its licensee, and + * not to intellectual property embodied in modifications its licensee may + * make. + * + * 3.3. Redistribution of Executable. Redistribution in executable form of any + * substantial portion of the Covered Code or modification must reproduce the + * above Copyright Notice, and the following Disclaimer and Export Compliance + * provision in the documentation and/or other materials provided with the + * distribution. + * + * 3.4. Intel retains all right, title, and interest in and to the Original + * Intel Code. + * + * 3.5. Neither the name Intel nor any other trademark owned or controlled by + * Intel shall be used in advertising or otherwise to promote the sale, use or + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED + * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE + * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, + * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY + * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY + * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A + * PARTICULAR PURPOSE. + * + * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES + * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR + * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, + * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY + * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL + * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS + * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY + * LIMITED REMEDY. + * + * 4.3. Licensee shall not export, either directly or indirectly, any of this + * software or system incorporating such software without first obtaining any + * required license or other approval from the U. S. Department of Commerce or + * any other agency or department of the United States Government. In the + * event Licensee exports any such software from the United States or + * re-exports any such software from a foreign destination, Licensee shall + * ensure that the distribution and export/re-export of the software is in + * compliance with all laws, regulations, orders, or other restrictions of the + * U.S. Export Administration Regulations. Licensee agrees that neither it nor + * any of its subsidiaries will export/re-export any technical data, process, + * software, or service, directly or indirectly, to any country for which the + * United States government or any agency thereof requires an export license, + * other governmental approval, or letter of assurance, without first obtaining + * such license, approval or letter. + * + ***************************************************************************** + * + * Alternatively, you may choose to be licensed under the terms of the + * following license: + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -23,23 +131,23 @@ * of any contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * - * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGES. - */ + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Alternatively, you may choose to be licensed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + *****************************************************************************/ #include "acpi.h" #include "accommon.h" Modified: vendor-sys/acpica/dist/source/common/acgetline.c ============================================================================== --- vendor-sys/acpica/dist/source/common/acgetline.c Fri Mar 3 18:34:20 2017 (r314607) +++ vendor-sys/acpica/dist/source/common/acgetline.c Fri Mar 3 18:34:52 2017 (r314608) @@ -4,10 +4,118 @@ * *****************************************************************************/ -/* - * Copyright (C) 2000 - 2017, Intel Corp. +/****************************************************************************** + * + * 1. Copyright Notice + * + * Some or all of this work - Copyright (c) 1999 - 2017, Intel Corp. * All rights reserved. * + * 2. License + * + * 2.1. This is your license from Intel Corp. under its intellectual property + * rights. You may have additional license terms from the party that provided + * you this software, covering your right to use that party's intellectual + * property rights. + * + * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a + * copy of the source code appearing in this file ("Covered Code") an + * irrevocable, perpetual, worldwide license under Intel's copyrights in the + * base code distributed originally by Intel ("Original Intel Code") to copy, + * make derivatives, distribute, use and display any portion of the Covered + * Code in any form, with the right to sublicense such rights; and + * + * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent + * license (with the right to sublicense), under only those claims of Intel + * patents that are infringed by the Original Intel Code, to make, use, sell, + * offer to sell, and import the Covered Code and derivative works thereof + * solely to the minimum extent necessary to exercise the above copyright + * license, and in no event shall the patent license extend to any additions + * to or modifications of the Original Intel Code. No other license or right + * is granted directly or by implication, estoppel or otherwise; + * + * The above copyright and patent license is granted only if the following + * conditions are met: + * + * 3. Conditions + * + * 3.1. Redistribution of Source with Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification with rights to further distribute source must include + * the above Copyright Notice, the above License, this list of Conditions, + * and the following Disclaimer and Export Compliance provision. In addition, + * Licensee must cause all Covered Code to which Licensee contributes to + * contain a file documenting the changes Licensee made to create that Covered + * Code and the date of any change. Licensee must include in that file the + * documentation of any changes made by any predecessor Licensee. Licensee + * must include a prominent statement that the modification is derived, + * directly or indirectly, from Original Intel Code. + * + * 3.2. Redistribution of Source with no Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification without rights to further distribute source must + * include the following Disclaimer and Export Compliance provision in the + * documentation and/or other materials provided with distribution. In + * addition, Licensee may not authorize further sublicense of source of any + * portion of the Covered Code, and must include terms to the effect that the + * license from Licensee to its licensee is limited to the intellectual + * property embodied in the software Licensee provides to its licensee, and + * not to intellectual property embodied in modifications its licensee may + * make. + * + * 3.3. Redistribution of Executable. Redistribution in executable form of any + * substantial portion of the Covered Code or modification must reproduce the + * above Copyright Notice, and the following Disclaimer and Export Compliance + * provision in the documentation and/or other materials provided with the + * distribution. + * + * 3.4. Intel retains all right, title, and interest in and to the Original + * Intel Code. + * + * 3.5. Neither the name Intel nor any other trademark owned or controlled by + * Intel shall be used in advertising or otherwise to promote the sale, use or + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED + * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE + * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, + * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY + * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY + * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A + * PARTICULAR PURPOSE. + * + * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES + * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR + * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, + * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY + * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL + * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS + * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY + * LIMITED REMEDY. + * + * 4.3. Licensee shall not export, either directly or indirectly, any of this + * software or system incorporating such software without first obtaining any + * required license or other approval from the U. S. Department of Commerce or + * any other agency or department of the United States Government. In the + * event Licensee exports any such software from the United States or + * re-exports any such software from a foreign destination, Licensee shall + * ensure that the distribution and export/re-export of the software is in + * compliance with all laws, regulations, orders, or other restrictions of the + * U.S. Export Administration Regulations. Licensee agrees that neither it nor + * any of its subsidiaries will export/re-export any technical data, process, + * software, or service, directly or indirectly, to any country for which the + * United States government or any agency thereof requires an export license, + * other governmental approval, or letter of assurance, without first obtaining + * such license, approval or letter. + * + ***************************************************************************** + * + * Alternatively, you may choose to be licensed under the terms of the + * following license: + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -23,23 +131,23 @@ * of any contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * - * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGES. - */ + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Alternatively, you may choose to be licensed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + *****************************************************************************/ #include "acpi.h" #include "accommon.h" Modified: vendor-sys/acpica/dist/source/common/adfile.c ============================================================================== --- vendor-sys/acpica/dist/source/common/adfile.c Fri Mar 3 18:34:20 2017 (r314607) +++ vendor-sys/acpica/dist/source/common/adfile.c Fri Mar 3 18:34:52 2017 (r314608) @@ -4,10 +4,118 @@ * *****************************************************************************/ -/* - * Copyright (C) 2000 - 2017, Intel Corp. +/****************************************************************************** + * + * 1. Copyright Notice + * + * Some or all of this work - Copyright (c) 1999 - 2017, Intel Corp. * All rights reserved. * + * 2. License + * + * 2.1. This is your license from Intel Corp. under its intellectual property + * rights. You may have additional license terms from the party that provided + * you this software, covering your right to use that party's intellectual + * property rights. + * + * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a + * copy of the source code appearing in this file ("Covered Code") an + * irrevocable, perpetual, worldwide license under Intel's copyrights in the + * base code distributed originally by Intel ("Original Intel Code") to copy, + * make derivatives, distribute, use and display any portion of the Covered + * Code in any form, with the right to sublicense such rights; and + * + * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent + * license (with the right to sublicense), under only those claims of Intel + * patents that are infringed by the Original Intel Code, to make, use, sell, + * offer to sell, and import the Covered Code and derivative works thereof + * solely to the minimum extent necessary to exercise the above copyright + * license, and in no event shall the patent license extend to any additions + * to or modifications of the Original Intel Code. No other license or right + * is granted directly or by implication, estoppel or otherwise; + * + * The above copyright and patent license is granted only if the following + * conditions are met: + * + * 3. Conditions + * + * 3.1. Redistribution of Source with Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification with rights to further distribute source must include + * the above Copyright Notice, the above License, this list of Conditions, + * and the following Disclaimer and Export Compliance provision. In addition, + * Licensee must cause all Covered Code to which Licensee contributes to + * contain a file documenting the changes Licensee made to create that Covered + * Code and the date of any change. Licensee must include in that file the + * documentation of any changes made by any predecessor Licensee. Licensee + * must include a prominent statement that the modification is derived, + * directly or indirectly, from Original Intel Code. + * + * 3.2. Redistribution of Source with no Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification without rights to further distribute source must + * include the following Disclaimer and Export Compliance provision in the + * documentation and/or other materials provided with distribution. In + * addition, Licensee may not authorize further sublicense of source of any + * portion of the Covered Code, and must include terms to the effect that the + * license from Licensee to its licensee is limited to the intellectual + * property embodied in the software Licensee provides to its licensee, and + * not to intellectual property embodied in modifications its licensee may + * make. + * + * 3.3. Redistribution of Executable. Redistribution in executable form of any + * substantial portion of the Covered Code or modification must reproduce the + * above Copyright Notice, and the following Disclaimer and Export Compliance + * provision in the documentation and/or other materials provided with the + * distribution. + * + * 3.4. Intel retains all right, title, and interest in and to the Original + * Intel Code. + * + * 3.5. Neither the name Intel nor any other trademark owned or controlled by + * Intel shall be used in advertising or otherwise to promote the sale, use or + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED + * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE + * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, + * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY + * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY + * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A + * PARTICULAR PURPOSE. + * + * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES + * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR + * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, + * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY + * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL + * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS + * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY + * LIMITED REMEDY. + * + * 4.3. Licensee shall not export, either directly or indirectly, any of this + * software or system incorporating such software without first obtaining any + * required license or other approval from the U. S. Department of Commerce or + * any other agency or department of the United States Government. In the + * event Licensee exports any such software from the United States or + * re-exports any such software from a foreign destination, Licensee shall + * ensure that the distribution and export/re-export of the software is in + * compliance with all laws, regulations, orders, or other restrictions of the + * U.S. Export Administration Regulations. Licensee agrees that neither it nor + * any of its subsidiaries will export/re-export any technical data, process, + * software, or service, directly or indirectly, to any country for which the + * United States government or any agency thereof requires an export license, + * other governmental approval, or letter of assurance, without first obtaining + * such license, approval or letter. + * + ***************************************************************************** + * + * Alternatively, you may choose to be licensed under the terms of the + * following license: + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -23,23 +131,23 @@ * of any contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * - * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGES. - */ + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Alternatively, you may choose to be licensed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + *****************************************************************************/ #include "aslcompiler.h" #include "acpi.h" Modified: vendor-sys/acpica/dist/source/common/adisasm.c ============================================================================== --- vendor-sys/acpica/dist/source/common/adisasm.c Fri Mar 3 18:34:20 2017 (r314607) +++ vendor-sys/acpica/dist/source/common/adisasm.c Fri Mar 3 18:34:52 2017 (r314608) @@ -4,10 +4,118 @@ * *****************************************************************************/ -/* - * Copyright (C) 2000 - 2017, Intel Corp. +/****************************************************************************** + * + * 1. Copyright Notice + * + * Some or all of this work - Copyright (c) 1999 - 2017, Intel Corp. * All rights reserved. * + * 2. License + * + * 2.1. This is your license from Intel Corp. under its intellectual property + * rights. You may have additional license terms from the party that provided + * you this software, covering your right to use that party's intellectual + * property rights. + * + * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a + * copy of the source code appearing in this file ("Covered Code") an + * irrevocable, perpetual, worldwide license under Intel's copyrights in the + * base code distributed originally by Intel ("Original Intel Code") to copy, + * make derivatives, distribute, use and display any portion of the Covered + * Code in any form, with the right to sublicense such rights; and + * + * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent + * license (with the right to sublicense), under only those claims of Intel + * patents that are infringed by the Original Intel Code, to make, use, sell, + * offer to sell, and import the Covered Code and derivative works thereof + * solely to the minimum extent necessary to exercise the above copyright + * license, and in no event shall the patent license extend to any additions + * to or modifications of the Original Intel Code. No other license or right + * is granted directly or by implication, estoppel or otherwise; + * + * The above copyright and patent license is granted only if the following + * conditions are met: + * + * 3. Conditions + * + * 3.1. Redistribution of Source with Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification with rights to further distribute source must include + * the above Copyright Notice, the above License, this list of Conditions, + * and the following Disclaimer and Export Compliance provision. In addition, + * Licensee must cause all Covered Code to which Licensee contributes to + * contain a file documenting the changes Licensee made to create that Covered + * Code and the date of any change. Licensee must include in that file the + * documentation of any changes made by any predecessor Licensee. Licensee + * must include a prominent statement that the modification is derived, + * directly or indirectly, from Original Intel Code. + * + * 3.2. Redistribution of Source with no Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification without rights to further distribute source must + * include the following Disclaimer and Export Compliance provision in the + * documentation and/or other materials provided with distribution. In + * addition, Licensee may not authorize further sublicense of source of any + * portion of the Covered Code, and must include terms to the effect that the + * license from Licensee to its licensee is limited to the intellectual + * property embodied in the software Licensee provides to its licensee, and + * not to intellectual property embodied in modifications its licensee may + * make. + * + * 3.3. Redistribution of Executable. Redistribution in executable form of any + * substantial portion of the Covered Code or modification must reproduce the + * above Copyright Notice, and the following Disclaimer and Export Compliance + * provision in the documentation and/or other materials provided with the + * distribution. + * + * 3.4. Intel retains all right, title, and interest in and to the Original + * Intel Code. + * + * 3.5. Neither the name Intel nor any other trademark owned or controlled by + * Intel shall be used in advertising or otherwise to promote the sale, use or + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED + * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE + * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, + * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY + * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY + * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A + * PARTICULAR PURPOSE. + * + * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES + * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR + * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, + * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY + * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL + * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS + * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY + * LIMITED REMEDY. + * + * 4.3. Licensee shall not export, either directly or indirectly, any of this + * software or system incorporating such software without first obtaining any + * required license or other approval from the U. S. Department of Commerce or + * any other agency or department of the United States Government. In the + * event Licensee exports any such software from the United States or + * re-exports any such software from a foreign destination, Licensee shall + * ensure that the distribution and export/re-export of the software is in + * compliance with all laws, regulations, orders, or other restrictions of the + * U.S. Export Administration Regulations. Licensee agrees that neither it nor + * any of its subsidiaries will export/re-export any technical data, process, + * software, or service, directly or indirectly, to any country for which the + * United States government or any agency thereof requires an export license, + * other governmental approval, or letter of assurance, without first obtaining + * such license, approval or letter. + * + ***************************************************************************** + * + * Alternatively, you may choose to be licensed under the terms of the + * following license: + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -23,23 +131,23 @@ * of any contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * - * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGES. - */ + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Alternatively, you may choose to be licensed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + *****************************************************************************/ #include "aslcompiler.h" #include "amlcode.h" @@ -122,24 +230,36 @@ AdInitialize ( Status = AcpiOsInitialize (); if (ACPI_FAILURE (Status)) { + fprintf (stderr, "Could not initialize ACPICA subsystem: %s\n", + AcpiFormatException (Status)); + return (Status); } Status = AcpiUtInitGlobals (); if (ACPI_FAILURE (Status)) { + fprintf (stderr, "Could not initialize ACPICA globals: %s\n", + AcpiFormatException (Status)); + return (Status); } Status = AcpiUtMutexInitialize (); if (ACPI_FAILURE (Status)) { + fprintf (stderr, "Could not initialize ACPICA mutex objects: %s\n", + AcpiFormatException (Status)); + return (Status); } Status = AcpiNsRootInitialize (); if (ACPI_FAILURE (Status)) { + fprintf (stderr, "Could not initialize ACPICA namespace: %s\n", + AcpiFormatException (Status)); + return (Status); } @@ -149,7 +269,7 @@ AdInitialize ( AcpiGbl_RootTableList.CurrentTableCount = 0; AcpiGbl_RootTableList.Tables = LocalTables; - return (Status); + return (AE_OK); } Modified: vendor-sys/acpica/dist/source/common/adwalk.c ============================================================================== --- vendor-sys/acpica/dist/source/common/adwalk.c Fri Mar 3 18:34:20 2017 (r314607) +++ vendor-sys/acpica/dist/source/common/adwalk.c Fri Mar 3 18:34:52 2017 (r314608) @@ -4,10 +4,118 @@ * *****************************************************************************/ -/* - * Copyright (C) 2000 - 2017, Intel Corp. +/****************************************************************************** + * + * 1. Copyright Notice + * + * Some or all of this work - Copyright (c) 1999 - 2017, Intel Corp. * All rights reserved. * + * 2. License + * + * 2.1. This is your license from Intel Corp. under its intellectual property + * rights. You may have additional license terms from the party that provided + * you this software, covering your right to use that party's intellectual + * property rights. + * + * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a + * copy of the source code appearing in this file ("Covered Code") an + * irrevocable, perpetual, worldwide license under Intel's copyrights in the + * base code distributed originally by Intel ("Original Intel Code") to copy, + * make derivatives, distribute, use and display any portion of the Covered + * Code in any form, with the right to sublicense such rights; and + * + * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent + * license (with the right to sublicense), under only those claims of Intel + * patents that are infringed by the Original Intel Code, to make, use, sell, + * offer to sell, and import the Covered Code and derivative works thereof + * solely to the minimum extent necessary to exercise the above copyright + * license, and in no event shall the patent license extend to any additions + * to or modifications of the Original Intel Code. No other license or right + * is granted directly or by implication, estoppel or otherwise; + * + * The above copyright and patent license is granted only if the following + * conditions are met: + * + * 3. Conditions + * + * 3.1. Redistribution of Source with Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification with rights to further distribute source must include + * the above Copyright Notice, the above License, this list of Conditions, + * and the following Disclaimer and Export Compliance provision. In addition, + * Licensee must cause all Covered Code to which Licensee contributes to + * contain a file documenting the changes Licensee made to create that Covered + * Code and the date of any change. Licensee must include in that file the + * documentation of any changes made by any predecessor Licensee. Licensee + * must include a prominent statement that the modification is derived, + * directly or indirectly, from Original Intel Code. + * + * 3.2. Redistribution of Source with no Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification without rights to further distribute source must + * include the following Disclaimer and Export Compliance provision in the + * documentation and/or other materials provided with distribution. In + * addition, Licensee may not authorize further sublicense of source of any + * portion of the Covered Code, and must include terms to the effect that the + * license from Licensee to its licensee is limited to the intellectual + * property embodied in the software Licensee provides to its licensee, and + * not to intellectual property embodied in modifications its licensee may + * make. + * + * 3.3. Redistribution of Executable. Redistribution in executable form of any + * substantial portion of the Covered Code or modification must reproduce the + * above Copyright Notice, and the following Disclaimer and Export Compliance + * provision in the documentation and/or other materials provided with the + * distribution. + * + * 3.4. Intel retains all right, title, and interest in and to the Original + * Intel Code. + * + * 3.5. Neither the name Intel nor any other trademark owned or controlled by + * Intel shall be used in advertising or otherwise to promote the sale, use or + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED + * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE + * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, + * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY + * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY + * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A + * PARTICULAR PURPOSE. + * + * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES + * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR + * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, + * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY + * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL + * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS + * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY + * LIMITED REMEDY. + * + * 4.3. Licensee shall not export, either directly or indirectly, any of this + * software or system incorporating such software without first obtaining any + * required license or other approval from the U. S. Department of Commerce or + * any other agency or department of the United States Government. In the + * event Licensee exports any such software from the United States or + * re-exports any such software from a foreign destination, Licensee shall + * ensure that the distribution and export/re-export of the software is in + * compliance with all laws, regulations, orders, or other restrictions of the + * U.S. Export Administration Regulations. Licensee agrees that neither it nor + * any of its subsidiaries will export/re-export any technical data, process, + * software, or service, directly or indirectly, to any country for which the + * United States government or any agency thereof requires an export license, + * other governmental approval, or letter of assurance, without first obtaining + * such license, approval or letter. + * + ***************************************************************************** + * + * Alternatively, you may choose to be licensed under the terms of the + * following license: + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -23,23 +131,23 @@ * of any contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * - * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGES. - */ + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Alternatively, you may choose to be licensed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + *****************************************************************************/ #include "acpi.h" #include "accommon.h" Modified: vendor-sys/acpica/dist/source/common/ahids.c ============================================================================== --- vendor-sys/acpica/dist/source/common/ahids.c Fri Mar 3 18:34:20 2017 (r314607) +++ vendor-sys/acpica/dist/source/common/ahids.c Fri Mar 3 18:34:52 2017 (r314608) @@ -4,10 +4,118 @@ * *****************************************************************************/ -/* - * Copyright (C) 2000 - 2017, Intel Corp. +/****************************************************************************** + * + * 1. Copyright Notice + * + * Some or all of this work - Copyright (c) 1999 - 2017, Intel Corp. * All rights reserved. * + * 2. License + * + * 2.1. This is your license from Intel Corp. under its intellectual property + * rights. You may have additional license terms from the party that provided + * you this software, covering your right to use that party's intellectual + * property rights. + * + * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a + * copy of the source code appearing in this file ("Covered Code") an + * irrevocable, perpetual, worldwide license under Intel's copyrights in the + * base code distributed originally by Intel ("Original Intel Code") to copy, + * make derivatives, distribute, use and display any portion of the Covered + * Code in any form, with the right to sublicense such rights; and + * + * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent + * license (with the right to sublicense), under only those claims of Intel + * patents that are infringed by the Original Intel Code, to make, use, sell, + * offer to sell, and import the Covered Code and derivative works thereof + * solely to the minimum extent necessary to exercise the above copyright + * license, and in no event shall the patent license extend to any additions + * to or modifications of the Original Intel Code. No other license or right + * is granted directly or by implication, estoppel or otherwise; + * + * The above copyright and patent license is granted only if the following + * conditions are met: + * + * 3. Conditions + * + * 3.1. Redistribution of Source with Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification with rights to further distribute source must include + * the above Copyright Notice, the above License, this list of Conditions, + * and the following Disclaimer and Export Compliance provision. In addition, + * Licensee must cause all Covered Code to which Licensee contributes to + * contain a file documenting the changes Licensee made to create that Covered + * Code and the date of any change. Licensee must include in that file the + * documentation of any changes made by any predecessor Licensee. Licensee + * must include a prominent statement that the modification is derived, + * directly or indirectly, from Original Intel Code. + * + * 3.2. Redistribution of Source with no Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification without rights to further distribute source must + * include the following Disclaimer and Export Compliance provision in the + * documentation and/or other materials provided with distribution. In + * addition, Licensee may not authorize further sublicense of source of any + * portion of the Covered Code, and must include terms to the effect that the + * license from Licensee to its licensee is limited to the intellectual + * property embodied in the software Licensee provides to its licensee, and + * not to intellectual property embodied in modifications its licensee may + * make. + * + * 3.3. Redistribution of Executable. Redistribution in executable form of any + * substantial portion of the Covered Code or modification must reproduce the + * above Copyright Notice, and the following Disclaimer and Export Compliance + * provision in the documentation and/or other materials provided with the + * distribution. + * + * 3.4. Intel retains all right, title, and interest in and to the Original + * Intel Code. + * + * 3.5. Neither the name Intel nor any other trademark owned or controlled by + * Intel shall be used in advertising or otherwise to promote the sale, use or + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Fri Mar 3 18:36:19 2017 Return-Path: Delivered-To: svn-src-all@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 3F839CF75AF; Fri, 3 Mar 2017 18:36:19 +0000 (UTC) (envelope-from jkim@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 EB2D518B8; Fri, 3 Mar 2017 18:36:18 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23IaIdJ017722; Fri, 3 Mar 2017 18:36:18 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23IaIx3017721; Fri, 3 Mar 2017 18:36:18 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201703031836.v23IaIx3017721@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Fri, 3 Mar 2017 18:36:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314609 - vendor-sys/acpica/20170303 X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 18:36:19 -0000 Author: jkim Date: Fri Mar 3 18:36:17 2017 New Revision: 314609 URL: https://svnweb.freebsd.org/changeset/base/314609 Log: Tag ACPICA 20170303. Added: vendor-sys/acpica/20170303/ - copied from r314608, vendor-sys/acpica/dist/ From owner-svn-src-all@freebsd.org Fri Mar 3 18:44:21 2017 Return-Path: Delivered-To: svn-src-all@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 8D23CCF78AE; Fri, 3 Mar 2017 18:44:21 +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 679C01EAA; Fri, 3 Mar 2017 18:44:21 +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 v23IiKUt021654; Fri, 3 Mar 2017 18:44:20 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23IiKmf021653; Fri, 3 Mar 2017 18:44:20 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703031844.v23IiKmf021653@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Fri, 3 Mar 2017 18:44:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314610 - head/share/man/man4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 18:44:21 -0000 Author: ngie Date: Fri Mar 3 18:44:20 2017 New Revision: 314610 URL: https://svnweb.freebsd.org/changeset/base/314610 Log: Clean up ddb(4) slightly - Delete empty Li macro uses [1]. This removes some spaces between the optional command/subcommand arguments. - Attempt to clarify "show lock" subcommand by being more terse/direct. This addresses an issue with a contraction [2]. MFC after: 1 week Reported by: make manlint [1], igor [2] Reviewed by: wblock Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D9858 Modified: head/share/man/man4/ddb.4 Modified: head/share/man/man4/ddb.4 ============================================================================== --- head/share/man/man4/ddb.4 Fri Mar 3 18:36:17 2017 (r314609) +++ head/share/man/man4/ddb.4 Fri Mar 3 18:44:20 2017 (r314610) @@ -60,7 +60,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 13, 2016 +.Dd March 3, 2017 .Dt DDB 4 .Os .Sh NAME @@ -146,7 +146,7 @@ to be the same as .Pp The general command syntax is: .Ar command Ns Op Li / Ns Ar modifier -.Oo Ar addr Oc Ns Op Li , Ns Ar count +.Oo Ar addr Oc Ns Op , Ns Ar count .Pp A blank line repeats the previous command from the address .Va next @@ -213,11 +213,11 @@ current line. .Bl -tag -width indent -compact .It Xo .Ic examine Ns Op Li / Ns Cm AISabcdghilmorsuxz ... -.Oo Ar addr Oc Ns Op Li , Ns Ar count +.Oo Ar addr Oc Ns Op , Ns Ar count .Xc .It Xo .Ic x Ns Op Li / Ns Cm AISabcdghilmorsuxz ... -.Oo Ar addr Oc Ns Op Li , Ns Ar count +.Oo Ar addr Oc Ns Op , Ns Ar count .Xc Display the addressed locations according to the formats in the modifier. Multiple modifier formats display multiple locations. @@ -343,8 +343,8 @@ Set the named variable or register with .Ar expr . Valid variable names are described below. .Pp -.It Ic break Ns Oo Li / Ns Cm u Oc Oo Ar addr Oc Ns Op Li , Ns Ar count -.It Ic b Ns Oo Li / Ns Cm u Oc Oo Ar addr Oc Ns Op Li , Ns Ar count +.It Ic break Ns Oo Li / Ns Cm u Oc Oo Ar addr Oc Ns Op , Ns Ar count +.It Ic b Ns Oo Li / Ns Cm u Oc Oo Ar addr Oc Ns Op , Ns Ar count Set a break point at .Ar addr . If @@ -394,7 +394,7 @@ command, or by omitting to get the default address of .Va dot . .Pp -.It Ic watch Oo Ar addr Oc Ns Op Li , Ns Ar size +.It Ic watch Oo Ar addr Oc Ns Op , Ns Ar size Set a watchpoint for a region. Execution stops when an attempt to modify the region occurs. The @@ -408,7 +408,7 @@ Attempts to watch wired kernel memory may cause unrecoverable error in some systems such as i386. Watchpoints on user addresses work best. .Pp -.It Ic hwatch Oo Ar addr Oc Ns Op Li , Ns Ar size +.It Ic hwatch Oo Ar addr Oc Ns Op , Ns Ar size Set a hardware watchpoint for a region if supported by the architecture. Execution stops when an attempt to modify the region occurs. @@ -424,11 +424,11 @@ Use for setting watchpoints on kernel address locations only, and avoid its use on user mode address spaces. .Pp -.It Ic dhwatch Oo Ar addr Oc Ns Op Li , Ns Ar size +.It Ic dhwatch Oo Ar addr Oc Ns Op , Ns Ar size Delete specified hardware watchpoint. .Pp -.It Ic step Ns Oo Li / Ns Cm p Oc Ns Op Li , Ns Ar count -.It Ic s Ns Oo Li / Ns Cm p Oc Ns Op Li , Ns Ar count +.It Ic step Ns Oo Li / Ns Cm p Oc Ns Op , Ns Ar count +.It Ic s Ns Oo Li / Ns Cm p Oc Ns Op , Ns Ar count Single step .Ar count times. @@ -478,22 +478,22 @@ Otherwise, only print when the matching .It Xo .Ic trace Ns Op Li / Ns Cm u .Op Ar pid | tid Ns -.Op Li , Ns Ar count +.Op , Ns Ar count .Xc .It Xo .Ic t Ns Op Li / Ns Cm u .Op Ar pid | tid Ns -.Op Li , Ns Ar count +.Op , Ns Ar count .Xc .It Xo .Ic where Ns Op Li / Ns Cm u .Op Ar pid | tid Ns -.Op Li , Ns Ar count +.Op , Ns Ar count .Xc .It Xo .Ic bt Ns Op Li / Ns Cm u .Op Ar pid | tid Ns -.Op Li , Ns Ar count +.Op , Ns Ar count .Xc Stack trace. The @@ -518,7 +518,7 @@ only if the machine dependent code suppo .Ar addr .Ar value .Op Ar mask Ns -.Op Li , Ns Ar count +.Op , Ns Ar count .Xc Search memory for .Ar value . @@ -768,12 +768,12 @@ Possible types include Name of the lock. .It Ic flags: Flags passed to the lock initialization function. -For exact possibilities see manual pages of possible lock types. +.Em flags +values are lock class specific. .It Ic state: Current state of a lock. -As well as -.Ic flags -it's lock-specific. +.Em state +values are lock class specific. .It Ic owner: Lock owner. .El From owner-svn-src-all@freebsd.org Fri Mar 3 18:46:52 2017 Return-Path: Delivered-To: svn-src-all@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 45C83CF7978; Fri, 3 Mar 2017 18:46:52 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 09ED510C5; Fri, 3 Mar 2017 18:46:51 +0000 (UTC) (envelope-from des@des.no) Received: from desk.des.no (smtp.des.no [194.63.250.102]) by smtp.des.no (Postfix) with ESMTP id BF47C901A; Fri, 3 Mar 2017 18:46:49 +0000 (UTC) Received: by desk.des.no (Postfix, from userid 1001) id 8202F47A0; Fri, 3 Mar 2017 19:46:49 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Ed Maste Cc: "src-committers\@freebsd.org" , "svn-src-all\@freebsd.org" , "svn-src-head\@freebsd.org" Subject: Re: svn commit: r314527 - in head: crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat crypto/ope... References: <201703020011.v220BWQ0086961@repo.freebsd.org> <86k28783xe.fsf@desk.des.no> <86fuiv832b.fsf@desk.des.no> <59d9780e-6ec3-4e5d-0c9e-77e3639205f6@freebsd.org> <8FE7A2E0-BB9C-4C48-82D9-B7027CA50358@gmail.com> <86bmti9268.fsf@desk.des.no> Date: Fri, 03 Mar 2017 19:46:49 +0100 In-Reply-To: (Ed Maste's message of "Fri, 3 Mar 2017 12:29:52 -0500") Message-ID: <8637eu8ag6.fsf@desk.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 18:46:52 -0000 Ed Maste writes: > If you don't want to use Phabricator, I'd ask that you consider > removing your account. I didn't realize that was an option. And I wonder what will happen to existing diffs that I have commented on or approved if I do... DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-svn-src-all@freebsd.org Fri Mar 3 18:56:18 2017 Return-Path: Delivered-To: svn-src-all@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 4CDC8CF7CCC; Fri, 3 Mar 2017 18:56:18 +0000 (UTC) (envelope-from jkim@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 E46F81AEB; Fri, 3 Mar 2017 18:56:17 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23IuHqZ026131; Fri, 3 Mar 2017 18:56:17 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23IuG7I026123; Fri, 3 Mar 2017 18:56:16 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201703031856.v23IuG7I026123@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Fri, 3 Mar 2017 18:56:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314611 - in head: sys/contrib/dev/acpica sys/contrib/dev/acpica/common sys/contrib/dev/acpica/compiler sys/contrib/dev/acpica/components/debugger sys/contrib/dev/acpica/components/disa... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 18:56:18 -0000 Author: jkim Date: Fri Mar 3 18:56:15 2017 New Revision: 314611 URL: https://svnweb.freebsd.org/changeset/base/314611 Log: Merge ACPICA 20170303. Added: head/sys/contrib/dev/acpica/compiler/cvcompiler.c - copied, changed from r314405, vendor-sys/acpica/dist/source/compiler/cvcompiler.c head/sys/contrib/dev/acpica/compiler/cvdisasm.c - copied, changed from r314405, vendor-sys/acpica/dist/source/compiler/cvdisasm.c head/sys/contrib/dev/acpica/compiler/cvparser.c - copied, changed from r314405, vendor-sys/acpica/dist/source/compiler/cvparser.c head/sys/contrib/dev/acpica/include/acconvert.h - copied, changed from r314405, vendor-sys/acpica/dist/source/include/acconvert.h Modified: head/sys/contrib/dev/acpica/acpica_prep.sh head/sys/contrib/dev/acpica/changes.txt head/sys/contrib/dev/acpica/common/acfileio.c head/sys/contrib/dev/acpica/common/acgetline.c head/sys/contrib/dev/acpica/common/adfile.c head/sys/contrib/dev/acpica/common/adisasm.c head/sys/contrib/dev/acpica/common/adwalk.c head/sys/contrib/dev/acpica/common/ahids.c head/sys/contrib/dev/acpica/common/ahpredef.c head/sys/contrib/dev/acpica/common/ahtable.c head/sys/contrib/dev/acpica/common/ahuuids.c head/sys/contrib/dev/acpica/common/cmfsize.c head/sys/contrib/dev/acpica/common/dmextern.c head/sys/contrib/dev/acpica/common/dmrestag.c head/sys/contrib/dev/acpica/common/dmtable.c head/sys/contrib/dev/acpica/common/dmtables.c head/sys/contrib/dev/acpica/common/dmtbdump.c head/sys/contrib/dev/acpica/common/dmtbinfo.c head/sys/contrib/dev/acpica/common/getopt.c head/sys/contrib/dev/acpica/compiler/aslanalyze.c head/sys/contrib/dev/acpica/compiler/aslascii.c head/sys/contrib/dev/acpica/compiler/aslbtypes.c head/sys/contrib/dev/acpica/compiler/aslcodegen.c head/sys/contrib/dev/acpica/compiler/aslcompile.c head/sys/contrib/dev/acpica/compiler/aslcompiler.h head/sys/contrib/dev/acpica/compiler/aslcompiler.l head/sys/contrib/dev/acpica/compiler/aslcstyle.y head/sys/contrib/dev/acpica/compiler/asldebug.c head/sys/contrib/dev/acpica/compiler/asldefine.h head/sys/contrib/dev/acpica/compiler/aslerror.c head/sys/contrib/dev/acpica/compiler/aslexternal.c head/sys/contrib/dev/acpica/compiler/aslfileio.c head/sys/contrib/dev/acpica/compiler/aslfiles.c head/sys/contrib/dev/acpica/compiler/aslfold.c head/sys/contrib/dev/acpica/compiler/aslglobal.h head/sys/contrib/dev/acpica/compiler/aslhelp.c head/sys/contrib/dev/acpica/compiler/aslhelpers.y head/sys/contrib/dev/acpica/compiler/aslhex.c head/sys/contrib/dev/acpica/compiler/aslkeywords.y head/sys/contrib/dev/acpica/compiler/asllength.c head/sys/contrib/dev/acpica/compiler/asllisting.c head/sys/contrib/dev/acpica/compiler/asllistsup.c head/sys/contrib/dev/acpica/compiler/aslload.c head/sys/contrib/dev/acpica/compiler/asllookup.c head/sys/contrib/dev/acpica/compiler/aslmain.c head/sys/contrib/dev/acpica/compiler/aslmap.c head/sys/contrib/dev/acpica/compiler/aslmapenter.c head/sys/contrib/dev/acpica/compiler/aslmapoutput.c head/sys/contrib/dev/acpica/compiler/aslmaputils.c head/sys/contrib/dev/acpica/compiler/aslmessages.c head/sys/contrib/dev/acpica/compiler/aslmessages.h head/sys/contrib/dev/acpica/compiler/aslmethod.c head/sys/contrib/dev/acpica/compiler/aslnamesp.c head/sys/contrib/dev/acpica/compiler/asloffset.c head/sys/contrib/dev/acpica/compiler/aslopcodes.c head/sys/contrib/dev/acpica/compiler/asloperands.c head/sys/contrib/dev/acpica/compiler/aslopt.c head/sys/contrib/dev/acpica/compiler/asloptions.c head/sys/contrib/dev/acpica/compiler/aslparser.y head/sys/contrib/dev/acpica/compiler/aslpld.c head/sys/contrib/dev/acpica/compiler/aslpredef.c head/sys/contrib/dev/acpica/compiler/aslprepkg.c head/sys/contrib/dev/acpica/compiler/aslprimaries.y head/sys/contrib/dev/acpica/compiler/aslprintf.c head/sys/contrib/dev/acpica/compiler/aslprune.c head/sys/contrib/dev/acpica/compiler/aslresource.c head/sys/contrib/dev/acpica/compiler/aslresources.y head/sys/contrib/dev/acpica/compiler/aslrestype1.c head/sys/contrib/dev/acpica/compiler/aslrestype1i.c head/sys/contrib/dev/acpica/compiler/aslrestype2.c head/sys/contrib/dev/acpica/compiler/aslrestype2d.c head/sys/contrib/dev/acpica/compiler/aslrestype2e.c head/sys/contrib/dev/acpica/compiler/aslrestype2q.c head/sys/contrib/dev/acpica/compiler/aslrestype2s.c head/sys/contrib/dev/acpica/compiler/aslrestype2w.c head/sys/contrib/dev/acpica/compiler/aslrules.y head/sys/contrib/dev/acpica/compiler/aslstartup.c head/sys/contrib/dev/acpica/compiler/aslstubs.c head/sys/contrib/dev/acpica/compiler/aslsupport.l head/sys/contrib/dev/acpica/compiler/aslsupport.y head/sys/contrib/dev/acpica/compiler/asltokens.y head/sys/contrib/dev/acpica/compiler/asltransform.c head/sys/contrib/dev/acpica/compiler/asltree.c head/sys/contrib/dev/acpica/compiler/asltypes.h head/sys/contrib/dev/acpica/compiler/asltypes.y head/sys/contrib/dev/acpica/compiler/aslutils.c head/sys/contrib/dev/acpica/compiler/asluuid.c head/sys/contrib/dev/acpica/compiler/aslwalks.c head/sys/contrib/dev/acpica/compiler/aslxref.c head/sys/contrib/dev/acpica/compiler/aslxrefout.c head/sys/contrib/dev/acpica/compiler/dtcompile.c head/sys/contrib/dev/acpica/compiler/dtcompiler.h head/sys/contrib/dev/acpica/compiler/dtexpress.c head/sys/contrib/dev/acpica/compiler/dtfield.c head/sys/contrib/dev/acpica/compiler/dtio.c head/sys/contrib/dev/acpica/compiler/dtparser.l head/sys/contrib/dev/acpica/compiler/dtparser.y head/sys/contrib/dev/acpica/compiler/dtsubtable.c head/sys/contrib/dev/acpica/compiler/dttable.c head/sys/contrib/dev/acpica/compiler/dttable1.c head/sys/contrib/dev/acpica/compiler/dttable2.c head/sys/contrib/dev/acpica/compiler/dttemplate.c head/sys/contrib/dev/acpica/compiler/dttemplate.h head/sys/contrib/dev/acpica/compiler/dtutils.c head/sys/contrib/dev/acpica/compiler/preprocess.h head/sys/contrib/dev/acpica/compiler/prexpress.c head/sys/contrib/dev/acpica/compiler/prmacros.c head/sys/contrib/dev/acpica/compiler/prparser.l head/sys/contrib/dev/acpica/compiler/prparser.y head/sys/contrib/dev/acpica/compiler/prscan.c head/sys/contrib/dev/acpica/compiler/prutils.c head/sys/contrib/dev/acpica/components/debugger/dbcmds.c head/sys/contrib/dev/acpica/components/debugger/dbconvert.c head/sys/contrib/dev/acpica/components/debugger/dbdisply.c head/sys/contrib/dev/acpica/components/debugger/dbexec.c head/sys/contrib/dev/acpica/components/debugger/dbfileio.c head/sys/contrib/dev/acpica/components/debugger/dbhistry.c head/sys/contrib/dev/acpica/components/debugger/dbinput.c head/sys/contrib/dev/acpica/components/debugger/dbmethod.c head/sys/contrib/dev/acpica/components/debugger/dbnames.c head/sys/contrib/dev/acpica/components/debugger/dbobject.c head/sys/contrib/dev/acpica/components/debugger/dbstats.c head/sys/contrib/dev/acpica/components/debugger/dbtest.c head/sys/contrib/dev/acpica/components/debugger/dbutils.c head/sys/contrib/dev/acpica/components/debugger/dbxface.c head/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c head/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c head/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c head/sys/contrib/dev/acpica/components/disassembler/dmnames.c head/sys/contrib/dev/acpica/components/disassembler/dmopcode.c head/sys/contrib/dev/acpica/components/disassembler/dmresrc.c head/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c head/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c head/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c head/sys/contrib/dev/acpica/components/disassembler/dmutils.c head/sys/contrib/dev/acpica/components/disassembler/dmwalk.c head/sys/contrib/dev/acpica/components/dispatcher/dsargs.c head/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c head/sys/contrib/dev/acpica/components/dispatcher/dsdebug.c head/sys/contrib/dev/acpica/components/dispatcher/dsfield.c head/sys/contrib/dev/acpica/components/dispatcher/dsinit.c head/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c head/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c head/sys/contrib/dev/acpica/components/dispatcher/dsobject.c head/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c head/sys/contrib/dev/acpica/components/dispatcher/dsutils.c head/sys/contrib/dev/acpica/components/dispatcher/dswexec.c head/sys/contrib/dev/acpica/components/dispatcher/dswload.c head/sys/contrib/dev/acpica/components/dispatcher/dswload2.c head/sys/contrib/dev/acpica/components/dispatcher/dswscope.c head/sys/contrib/dev/acpica/components/dispatcher/dswstate.c head/sys/contrib/dev/acpica/components/events/evevent.c head/sys/contrib/dev/acpica/components/events/evglock.c head/sys/contrib/dev/acpica/components/events/evgpe.c head/sys/contrib/dev/acpica/components/events/evgpeblk.c head/sys/contrib/dev/acpica/components/events/evgpeinit.c head/sys/contrib/dev/acpica/components/events/evgpeutil.c head/sys/contrib/dev/acpica/components/events/evhandler.c head/sys/contrib/dev/acpica/components/events/evmisc.c head/sys/contrib/dev/acpica/components/events/evregion.c head/sys/contrib/dev/acpica/components/events/evrgnini.c head/sys/contrib/dev/acpica/components/events/evsci.c head/sys/contrib/dev/acpica/components/events/evxface.c head/sys/contrib/dev/acpica/components/events/evxfevnt.c head/sys/contrib/dev/acpica/components/events/evxfgpe.c head/sys/contrib/dev/acpica/components/events/evxfregn.c head/sys/contrib/dev/acpica/components/executer/exconcat.c head/sys/contrib/dev/acpica/components/executer/exconfig.c head/sys/contrib/dev/acpica/components/executer/exconvrt.c head/sys/contrib/dev/acpica/components/executer/excreate.c head/sys/contrib/dev/acpica/components/executer/exdebug.c head/sys/contrib/dev/acpica/components/executer/exdump.c head/sys/contrib/dev/acpica/components/executer/exfield.c head/sys/contrib/dev/acpica/components/executer/exfldio.c head/sys/contrib/dev/acpica/components/executer/exmisc.c head/sys/contrib/dev/acpica/components/executer/exmutex.c head/sys/contrib/dev/acpica/components/executer/exnames.c head/sys/contrib/dev/acpica/components/executer/exoparg1.c head/sys/contrib/dev/acpica/components/executer/exoparg2.c head/sys/contrib/dev/acpica/components/executer/exoparg3.c head/sys/contrib/dev/acpica/components/executer/exoparg6.c head/sys/contrib/dev/acpica/components/executer/exprep.c head/sys/contrib/dev/acpica/components/executer/exregion.c head/sys/contrib/dev/acpica/components/executer/exresnte.c head/sys/contrib/dev/acpica/components/executer/exresolv.c head/sys/contrib/dev/acpica/components/executer/exresop.c head/sys/contrib/dev/acpica/components/executer/exstore.c head/sys/contrib/dev/acpica/components/executer/exstoren.c head/sys/contrib/dev/acpica/components/executer/exstorob.c head/sys/contrib/dev/acpica/components/executer/exsystem.c head/sys/contrib/dev/acpica/components/executer/extrace.c head/sys/contrib/dev/acpica/components/executer/exutils.c head/sys/contrib/dev/acpica/components/hardware/hwacpi.c head/sys/contrib/dev/acpica/components/hardware/hwesleep.c head/sys/contrib/dev/acpica/components/hardware/hwgpe.c head/sys/contrib/dev/acpica/components/hardware/hwpci.c head/sys/contrib/dev/acpica/components/hardware/hwregs.c head/sys/contrib/dev/acpica/components/hardware/hwsleep.c head/sys/contrib/dev/acpica/components/hardware/hwtimer.c head/sys/contrib/dev/acpica/components/hardware/hwvalid.c head/sys/contrib/dev/acpica/components/hardware/hwxface.c head/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c head/sys/contrib/dev/acpica/components/namespace/nsaccess.c head/sys/contrib/dev/acpica/components/namespace/nsalloc.c head/sys/contrib/dev/acpica/components/namespace/nsarguments.c head/sys/contrib/dev/acpica/components/namespace/nsconvert.c head/sys/contrib/dev/acpica/components/namespace/nsdump.c head/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c head/sys/contrib/dev/acpica/components/namespace/nseval.c head/sys/contrib/dev/acpica/components/namespace/nsinit.c head/sys/contrib/dev/acpica/components/namespace/nsload.c head/sys/contrib/dev/acpica/components/namespace/nsnames.c head/sys/contrib/dev/acpica/components/namespace/nsobject.c head/sys/contrib/dev/acpica/components/namespace/nsparse.c head/sys/contrib/dev/acpica/components/namespace/nspredef.c head/sys/contrib/dev/acpica/components/namespace/nsprepkg.c head/sys/contrib/dev/acpica/components/namespace/nsrepair.c head/sys/contrib/dev/acpica/components/namespace/nsrepair2.c head/sys/contrib/dev/acpica/components/namespace/nssearch.c head/sys/contrib/dev/acpica/components/namespace/nsutils.c head/sys/contrib/dev/acpica/components/namespace/nswalk.c head/sys/contrib/dev/acpica/components/namespace/nsxfeval.c head/sys/contrib/dev/acpica/components/namespace/nsxfname.c head/sys/contrib/dev/acpica/components/namespace/nsxfobj.c head/sys/contrib/dev/acpica/components/parser/psargs.c head/sys/contrib/dev/acpica/components/parser/psloop.c head/sys/contrib/dev/acpica/components/parser/psobject.c head/sys/contrib/dev/acpica/components/parser/psopcode.c head/sys/contrib/dev/acpica/components/parser/psopinfo.c head/sys/contrib/dev/acpica/components/parser/psparse.c head/sys/contrib/dev/acpica/components/parser/psscope.c head/sys/contrib/dev/acpica/components/parser/pstree.c head/sys/contrib/dev/acpica/components/parser/psutils.c head/sys/contrib/dev/acpica/components/parser/pswalk.c head/sys/contrib/dev/acpica/components/parser/psxface.c head/sys/contrib/dev/acpica/components/resources/rsaddr.c head/sys/contrib/dev/acpica/components/resources/rscalc.c head/sys/contrib/dev/acpica/components/resources/rscreate.c head/sys/contrib/dev/acpica/components/resources/rsdump.c head/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c head/sys/contrib/dev/acpica/components/resources/rsinfo.c head/sys/contrib/dev/acpica/components/resources/rsio.c head/sys/contrib/dev/acpica/components/resources/rsirq.c head/sys/contrib/dev/acpica/components/resources/rslist.c head/sys/contrib/dev/acpica/components/resources/rsmemory.c head/sys/contrib/dev/acpica/components/resources/rsmisc.c head/sys/contrib/dev/acpica/components/resources/rsserial.c head/sys/contrib/dev/acpica/components/resources/rsutils.c head/sys/contrib/dev/acpica/components/resources/rsxface.c head/sys/contrib/dev/acpica/components/tables/tbdata.c head/sys/contrib/dev/acpica/components/tables/tbfadt.c head/sys/contrib/dev/acpica/components/tables/tbfind.c head/sys/contrib/dev/acpica/components/tables/tbinstal.c head/sys/contrib/dev/acpica/components/tables/tbprint.c head/sys/contrib/dev/acpica/components/tables/tbutils.c head/sys/contrib/dev/acpica/components/tables/tbxface.c head/sys/contrib/dev/acpica/components/tables/tbxfload.c head/sys/contrib/dev/acpica/components/tables/tbxfroot.c head/sys/contrib/dev/acpica/components/utilities/utaddress.c head/sys/contrib/dev/acpica/components/utilities/utalloc.c head/sys/contrib/dev/acpica/components/utilities/utascii.c head/sys/contrib/dev/acpica/components/utilities/utbuffer.c head/sys/contrib/dev/acpica/components/utilities/utcache.c head/sys/contrib/dev/acpica/components/utilities/utcopy.c head/sys/contrib/dev/acpica/components/utilities/utdebug.c head/sys/contrib/dev/acpica/components/utilities/utdecode.c head/sys/contrib/dev/acpica/components/utilities/utdelete.c head/sys/contrib/dev/acpica/components/utilities/uterror.c head/sys/contrib/dev/acpica/components/utilities/uteval.c head/sys/contrib/dev/acpica/components/utilities/utexcep.c head/sys/contrib/dev/acpica/components/utilities/utglobal.c head/sys/contrib/dev/acpica/components/utilities/uthex.c head/sys/contrib/dev/acpica/components/utilities/utids.c head/sys/contrib/dev/acpica/components/utilities/utinit.c head/sys/contrib/dev/acpica/components/utilities/utlock.c head/sys/contrib/dev/acpica/components/utilities/utmath.c head/sys/contrib/dev/acpica/components/utilities/utmisc.c head/sys/contrib/dev/acpica/components/utilities/utmutex.c head/sys/contrib/dev/acpica/components/utilities/utnonansi.c head/sys/contrib/dev/acpica/components/utilities/utobject.c head/sys/contrib/dev/acpica/components/utilities/utosi.c head/sys/contrib/dev/acpica/components/utilities/utownerid.c head/sys/contrib/dev/acpica/components/utilities/utpredef.c head/sys/contrib/dev/acpica/components/utilities/utresrc.c head/sys/contrib/dev/acpica/components/utilities/utstate.c head/sys/contrib/dev/acpica/components/utilities/utstring.c head/sys/contrib/dev/acpica/components/utilities/utstrtoul64.c head/sys/contrib/dev/acpica/components/utilities/uttrack.c head/sys/contrib/dev/acpica/components/utilities/utuuid.c head/sys/contrib/dev/acpica/components/utilities/utxface.c head/sys/contrib/dev/acpica/components/utilities/utxferror.c head/sys/contrib/dev/acpica/components/utilities/utxfinit.c head/sys/contrib/dev/acpica/components/utilities/utxfmutex.c head/sys/contrib/dev/acpica/include/acapps.h head/sys/contrib/dev/acpica/include/acbuffer.h head/sys/contrib/dev/acpica/include/acclib.h head/sys/contrib/dev/acpica/include/accommon.h head/sys/contrib/dev/acpica/include/acconfig.h head/sys/contrib/dev/acpica/include/acdebug.h head/sys/contrib/dev/acpica/include/acdisasm.h head/sys/contrib/dev/acpica/include/acdispat.h head/sys/contrib/dev/acpica/include/acevents.h head/sys/contrib/dev/acpica/include/acexcep.h head/sys/contrib/dev/acpica/include/acglobal.h head/sys/contrib/dev/acpica/include/achware.h head/sys/contrib/dev/acpica/include/acinterp.h head/sys/contrib/dev/acpica/include/aclocal.h head/sys/contrib/dev/acpica/include/acmacros.h head/sys/contrib/dev/acpica/include/acnames.h head/sys/contrib/dev/acpica/include/acnamesp.h head/sys/contrib/dev/acpica/include/acobject.h head/sys/contrib/dev/acpica/include/acopcode.h head/sys/contrib/dev/acpica/include/acoutput.h head/sys/contrib/dev/acpica/include/acparser.h head/sys/contrib/dev/acpica/include/acpi.h head/sys/contrib/dev/acpica/include/acpiosxf.h head/sys/contrib/dev/acpica/include/acpixf.h head/sys/contrib/dev/acpica/include/acpredef.h head/sys/contrib/dev/acpica/include/acresrc.h head/sys/contrib/dev/acpica/include/acrestyp.h head/sys/contrib/dev/acpica/include/acstruct.h head/sys/contrib/dev/acpica/include/actables.h head/sys/contrib/dev/acpica/include/actbl.h head/sys/contrib/dev/acpica/include/actbl1.h head/sys/contrib/dev/acpica/include/actbl2.h head/sys/contrib/dev/acpica/include/actbl3.h head/sys/contrib/dev/acpica/include/actypes.h head/sys/contrib/dev/acpica/include/acutils.h head/sys/contrib/dev/acpica/include/acuuid.h head/sys/contrib/dev/acpica/include/amlcode.h head/sys/contrib/dev/acpica/include/amlresrc.h head/sys/contrib/dev/acpica/include/platform/acenv.h head/sys/contrib/dev/acpica/include/platform/acenvex.h head/sys/contrib/dev/acpica/include/platform/acfreebsd.h head/sys/contrib/dev/acpica/include/platform/acgcc.h head/sys/contrib/dev/acpica/include/platform/acgccex.h head/sys/contrib/dev/acpica/os_specific/service_layers/osgendbg.c head/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c head/usr.sbin/acpi/iasl/Makefile Directory Properties: head/sys/contrib/dev/acpica/ (props changed) Modified: head/sys/contrib/dev/acpica/acpica_prep.sh ============================================================================== --- head/sys/contrib/dev/acpica/acpica_prep.sh Fri Mar 3 18:44:20 2017 (r314610) +++ head/sys/contrib/dev/acpica/acpica_prep.sh Fri Mar 3 18:56:15 2017 (r314611) @@ -27,13 +27,14 @@ stripfiles="Makefile README accygwin.h a # include files to canonify src_headers="acapps.h acbuffer.h acclib.h accommon.h acconfig.h \ - acdebug.h acdisasm.h acdispat.h acevents.h acexcep.h acglobal.h \ - achware.h acinterp.h aclocal.h acmacros.h acnames.h acnamesp.h \ - acobject.h acopcode.h acoutput.h acparser.h acpi.h acpiosxf.h \ - acpixf.h acpredef.h acresrc.h acrestyp.h acstruct.h actables.h \ - actbl.h actbl1.h actbl2.h actbl3.h actypes.h acutils.h acuuid.h \ - amlcode.h amlresrc.h platform/acenv.h platform/acenvex.h \ - platform/acfreebsd.h platform/acgcc.h" + acconvert.h acdebug.h acdisasm.h acdispat.h acevents.h \ + acexcep.h acglobal.h achware.h acinterp.h aclocal.h acmacros.h \ + acnames.h acnamesp.h acobject.h acopcode.h acoutput.h \ + acparser.h acpi.h acpiosxf.h acpixf.h acpredef.h acresrc.h \ + acrestyp.h acstruct.h actables.h actbl.h actbl1.h actbl2.h \ + actbl3.h actypes.h acutils.h acuuid.h amlcode.h amlresrc.h \ + platform/acenv.h platform/acenvex.h platform/acfreebsd.h \ + platform/acgcc.h" comp_headers="aslcompiler.h asldefine.h aslglobal.h aslmessages.h \ aslsupport.l asltypes.h dtcompiler.h dttemplate.h preprocess.h" platform_headers="acfreebsd.h acgcc.h" Modified: head/sys/contrib/dev/acpica/changes.txt ============================================================================== --- head/sys/contrib/dev/acpica/changes.txt Fri Mar 3 18:44:20 2017 (r314610) +++ head/sys/contrib/dev/acpica/changes.txt Fri Mar 3 18:56:15 2017 (r314611) @@ -1,7 +1,108 @@ ---------------------------------------- +03 March 2017. Summary of changes for version 20170303: + + +0) ACPICA licensing: + +The licensing information at the start of each source code module has +been updated. In addition to the Intel license, the dual GPLv2/BSD +license has been added for completeness. Now, a single version of the +source code should be suitable for all ACPICA customers. This is the +major change for this release since it affects all source code modules. + + +1) ACPICA kernel-resident subsystem: + +Fixed two issues with the common asltypes.h header that could cause +problems in some environments: (Kim Jung-uk) + Removed typedef for YY_BUFFER_STATE ? + Fixes an error with earlier versions of Flex. + Removed use of FILE typedef (which is only defined in stdio.h) + + +2) iASL Compiler/Disassembler and Tools: + +Disassembler: fixed a regression introduced in 20170224. A fix for a +memory leak related to resource descriptor tags (names) could fault when +the disassembler was generated with 64-bit compilers. + +The ASLTS test suite has been updated to implement a new testing +architecture. During generation of the suite from ASL source, both the +ASL and ASL+ compilers are now validated, as well as the disassembler +itself (Erik Schmauss). The architecture executes as follows: + + For every ASL source module: + Compile (legacy ASL compilation) + Disassemble the resulting AML to ASL+ source code + Compile the new ASL+ module + Perform a binary compare on the legacy AML and the new ASL+ AML + The ASLTS suite then executes normally using the AML binaries. + +---------------------------------------- +24 February 2017. Summary of changes for version 20170224: + + +1) ACPICA kernel-resident subsystem: + +Interpreter: Fixed two issues with the control method return value auto- +repair feature, where an attempt to double-delete an internal object +could result in an ACPICA warning (for _CID repair and others). No fault +occurs, however, because the attempted deletion (actually a release to an +internal cache) is detected and ignored via object poisoning. + +Debugger: Fixed an AML interpreter mutex issue during the single stepping +of control methods. If certain debugger commands are executed during +stepping, a mutex aquire/release error could occur. Lv Zheng. + +Fixed some issues generating ACPICA with the Intel C compiler by +restoring the original behavior and compiler-specific include file in +acenv.h. Lv Zheng. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. + + Current Release: + Non-Debug Version: 141.7K Code, 58.5K Data, 200.2K Total + Debug Version: 207.5K Code, 82.7K Data, 290.2K Total + Previous Release: + Non-Debug Version: 137.4K Code, 52.6K Data, 190.0K Total + Debug Version: 201.5K Code, 82.2K Data, 283.7K Total + + +2) iASL Compiler/Disassembler and Tools: + +iASL/Disassembler: A preliminary version of a new ASL-to-ASL+ conversion +tool has been designed, implemented, and included in this release. The +key feature of this utility is that the original comments within the +input ASL file are preserved during the conversion process, and included +within the converted ASL+ file -- thus creating a transparent conversion +of existing ASL files to ASL+ (ASL 2.0). Erik Schmauss. + + Usage: iasl -ca // Output is a .dsl file with +converted code + +iASL/Disassembler: Improved the detection and correct disassembly of +Switch/Case operators. This feature detects sequences of if/elseif/else +operators that originated from ASL Switch/Case/Default operators and +emits the original operators. David Box. + +iASL: Improved the IORT ACPI table support in the following areas. Lv +Zheng: + Clear MappingOffset if the MappingCount is zero. + Fix the disassembly of the SMMU GSU interrupt offset. + Update the template file for the IORT table. + +Disassembler: Enhanced the detection and disassembly of resource +template/descriptor within a Buffer object. An EndTag descriptor is now +required to have a zero second byte, since all known ASL compilers emit +this. This helps eliminate incorrect decisions when a buffer is +disassembled (false positives on resource templates). + +---------------------------------------- 19 January 2017. Summary of changes for version 20170119: -This release is available at https://acpica.org/downloads 1) General ACPICA software: Modified: head/sys/contrib/dev/acpica/common/acfileio.c ============================================================================== --- head/sys/contrib/dev/acpica/common/acfileio.c Fri Mar 3 18:44:20 2017 (r314610) +++ head/sys/contrib/dev/acpica/common/acfileio.c Fri Mar 3 18:56:15 2017 (r314611) @@ -4,10 +4,118 @@ * *****************************************************************************/ -/* - * Copyright (C) 2000 - 2017, Intel Corp. +/****************************************************************************** + * + * 1. Copyright Notice + * + * Some or all of this work - Copyright (c) 1999 - 2017, Intel Corp. * All rights reserved. * + * 2. License + * + * 2.1. This is your license from Intel Corp. under its intellectual property + * rights. You may have additional license terms from the party that provided + * you this software, covering your right to use that party's intellectual + * property rights. + * + * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a + * copy of the source code appearing in this file ("Covered Code") an + * irrevocable, perpetual, worldwide license under Intel's copyrights in the + * base code distributed originally by Intel ("Original Intel Code") to copy, + * make derivatives, distribute, use and display any portion of the Covered + * Code in any form, with the right to sublicense such rights; and + * + * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent + * license (with the right to sublicense), under only those claims of Intel + * patents that are infringed by the Original Intel Code, to make, use, sell, + * offer to sell, and import the Covered Code and derivative works thereof + * solely to the minimum extent necessary to exercise the above copyright + * license, and in no event shall the patent license extend to any additions + * to or modifications of the Original Intel Code. No other license or right + * is granted directly or by implication, estoppel or otherwise; + * + * The above copyright and patent license is granted only if the following + * conditions are met: + * + * 3. Conditions + * + * 3.1. Redistribution of Source with Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification with rights to further distribute source must include + * the above Copyright Notice, the above License, this list of Conditions, + * and the following Disclaimer and Export Compliance provision. In addition, + * Licensee must cause all Covered Code to which Licensee contributes to + * contain a file documenting the changes Licensee made to create that Covered + * Code and the date of any change. Licensee must include in that file the + * documentation of any changes made by any predecessor Licensee. Licensee + * must include a prominent statement that the modification is derived, + * directly or indirectly, from Original Intel Code. + * + * 3.2. Redistribution of Source with no Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification without rights to further distribute source must + * include the following Disclaimer and Export Compliance provision in the + * documentation and/or other materials provided with distribution. In + * addition, Licensee may not authorize further sublicense of source of any + * portion of the Covered Code, and must include terms to the effect that the + * license from Licensee to its licensee is limited to the intellectual + * property embodied in the software Licensee provides to its licensee, and + * not to intellectual property embodied in modifications its licensee may + * make. + * + * 3.3. Redistribution of Executable. Redistribution in executable form of any + * substantial portion of the Covered Code or modification must reproduce the + * above Copyright Notice, and the following Disclaimer and Export Compliance + * provision in the documentation and/or other materials provided with the + * distribution. + * + * 3.4. Intel retains all right, title, and interest in and to the Original + * Intel Code. + * + * 3.5. Neither the name Intel nor any other trademark owned or controlled by + * Intel shall be used in advertising or otherwise to promote the sale, use or + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED + * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE + * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, + * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY + * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY + * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A + * PARTICULAR PURPOSE. + * + * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES + * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR + * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, + * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY + * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL + * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS + * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY + * LIMITED REMEDY. + * + * 4.3. Licensee shall not export, either directly or indirectly, any of this + * software or system incorporating such software without first obtaining any + * required license or other approval from the U. S. Department of Commerce or + * any other agency or department of the United States Government. In the + * event Licensee exports any such software from the United States or + * re-exports any such software from a foreign destination, Licensee shall + * ensure that the distribution and export/re-export of the software is in + * compliance with all laws, regulations, orders, or other restrictions of the + * U.S. Export Administration Regulations. Licensee agrees that neither it nor + * any of its subsidiaries will export/re-export any technical data, process, + * software, or service, directly or indirectly, to any country for which the + * United States government or any agency thereof requires an export license, + * other governmental approval, or letter of assurance, without first obtaining + * such license, approval or letter. + * + ***************************************************************************** + * + * Alternatively, you may choose to be licensed under the terms of the + * following license: + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -23,23 +131,23 @@ * of any contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * - * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGES. - */ + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Alternatively, you may choose to be licensed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + *****************************************************************************/ #include #include Modified: head/sys/contrib/dev/acpica/common/acgetline.c ============================================================================== --- head/sys/contrib/dev/acpica/common/acgetline.c Fri Mar 3 18:44:20 2017 (r314610) +++ head/sys/contrib/dev/acpica/common/acgetline.c Fri Mar 3 18:56:15 2017 (r314611) @@ -4,10 +4,118 @@ * *****************************************************************************/ -/* - * Copyright (C) 2000 - 2017, Intel Corp. +/****************************************************************************** + * + * 1. Copyright Notice + * + * Some or all of this work - Copyright (c) 1999 - 2017, Intel Corp. * All rights reserved. * + * 2. License + * + * 2.1. This is your license from Intel Corp. under its intellectual property + * rights. You may have additional license terms from the party that provided + * you this software, covering your right to use that party's intellectual + * property rights. + * + * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a + * copy of the source code appearing in this file ("Covered Code") an + * irrevocable, perpetual, worldwide license under Intel's copyrights in the + * base code distributed originally by Intel ("Original Intel Code") to copy, + * make derivatives, distribute, use and display any portion of the Covered + * Code in any form, with the right to sublicense such rights; and + * + * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent + * license (with the right to sublicense), under only those claims of Intel + * patents that are infringed by the Original Intel Code, to make, use, sell, + * offer to sell, and import the Covered Code and derivative works thereof + * solely to the minimum extent necessary to exercise the above copyright + * license, and in no event shall the patent license extend to any additions + * to or modifications of the Original Intel Code. No other license or right + * is granted directly or by implication, estoppel or otherwise; + * + * The above copyright and patent license is granted only if the following + * conditions are met: + * + * 3. Conditions + * + * 3.1. Redistribution of Source with Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification with rights to further distribute source must include + * the above Copyright Notice, the above License, this list of Conditions, + * and the following Disclaimer and Export Compliance provision. In addition, + * Licensee must cause all Covered Code to which Licensee contributes to + * contain a file documenting the changes Licensee made to create that Covered + * Code and the date of any change. Licensee must include in that file the + * documentation of any changes made by any predecessor Licensee. Licensee + * must include a prominent statement that the modification is derived, + * directly or indirectly, from Original Intel Code. + * + * 3.2. Redistribution of Source with no Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification without rights to further distribute source must + * include the following Disclaimer and Export Compliance provision in the + * documentation and/or other materials provided with distribution. In + * addition, Licensee may not authorize further sublicense of source of any + * portion of the Covered Code, and must include terms to the effect that the + * license from Licensee to its licensee is limited to the intellectual + * property embodied in the software Licensee provides to its licensee, and + * not to intellectual property embodied in modifications its licensee may + * make. + * + * 3.3. Redistribution of Executable. Redistribution in executable form of any + * substantial portion of the Covered Code or modification must reproduce the + * above Copyright Notice, and the following Disclaimer and Export Compliance + * provision in the documentation and/or other materials provided with the + * distribution. + * + * 3.4. Intel retains all right, title, and interest in and to the Original + * Intel Code. + * + * 3.5. Neither the name Intel nor any other trademark owned or controlled by + * Intel shall be used in advertising or otherwise to promote the sale, use or + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED + * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE + * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, + * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY + * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY + * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A + * PARTICULAR PURPOSE. + * + * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES + * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR + * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, + * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY + * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL + * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS + * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY + * LIMITED REMEDY. + * + * 4.3. Licensee shall not export, either directly or indirectly, any of this + * software or system incorporating such software without first obtaining any + * required license or other approval from the U. S. Department of Commerce or + * any other agency or department of the United States Government. In the + * event Licensee exports any such software from the United States or + * re-exports any such software from a foreign destination, Licensee shall + * ensure that the distribution and export/re-export of the software is in + * compliance with all laws, regulations, orders, or other restrictions of the + * U.S. Export Administration Regulations. Licensee agrees that neither it nor + * any of its subsidiaries will export/re-export any technical data, process, + * software, or service, directly or indirectly, to any country for which the + * United States government or any agency thereof requires an export license, + * other governmental approval, or letter of assurance, without first obtaining + * such license, approval or letter. + * + ***************************************************************************** + * + * Alternatively, you may choose to be licensed under the terms of the + * following license: + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -23,23 +131,23 @@ * of any contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * - * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGES. - */ + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Alternatively, you may choose to be licensed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + *****************************************************************************/ #include #include Modified: head/sys/contrib/dev/acpica/common/adfile.c ============================================================================== --- head/sys/contrib/dev/acpica/common/adfile.c Fri Mar 3 18:44:20 2017 (r314610) +++ head/sys/contrib/dev/acpica/common/adfile.c Fri Mar 3 18:56:15 2017 (r314611) @@ -4,10 +4,118 @@ * *****************************************************************************/ -/* - * Copyright (C) 2000 - 2017, Intel Corp. +/****************************************************************************** + * + * 1. Copyright Notice + * + * Some or all of this work - Copyright (c) 1999 - 2017, Intel Corp. * All rights reserved. * + * 2. License + * + * 2.1. This is your license from Intel Corp. under its intellectual property + * rights. You may have additional license terms from the party that provided + * you this software, covering your right to use that party's intellectual + * property rights. + * + * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a + * copy of the source code appearing in this file ("Covered Code") an + * irrevocable, perpetual, worldwide license under Intel's copyrights in the + * base code distributed originally by Intel ("Original Intel Code") to copy, + * make derivatives, distribute, use and display any portion of the Covered + * Code in any form, with the right to sublicense such rights; and + * + * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent + * license (with the right to sublicense), under only those claims of Intel + * patents that are infringed by the Original Intel Code, to make, use, sell, + * offer to sell, and import the Covered Code and derivative works thereof + * solely to the minimum extent necessary to exercise the above copyright + * license, and in no event shall the patent license extend to any additions + * to or modifications of the Original Intel Code. No other license or right + * is granted directly or by implication, estoppel or otherwise; + * + * The above copyright and patent license is granted only if the following + * conditions are met: + * + * 3. Conditions + * + * 3.1. Redistribution of Source with Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification with rights to further distribute source must include + * the above Copyright Notice, the above License, this list of Conditions, + * and the following Disclaimer and Export Compliance provision. In addition, + * Licensee must cause all Covered Code to which Licensee contributes to + * contain a file documenting the changes Licensee made to create that Covered + * Code and the date of any change. Licensee must include in that file the + * documentation of any changes made by any predecessor Licensee. Licensee + * must include a prominent statement that the modification is derived, + * directly or indirectly, from Original Intel Code. + * + * 3.2. Redistribution of Source with no Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification without rights to further distribute source must + * include the following Disclaimer and Export Compliance provision in the + * documentation and/or other materials provided with distribution. In + * addition, Licensee may not authorize further sublicense of source of any + * portion of the Covered Code, and must include terms to the effect that the + * license from Licensee to its licensee is limited to the intellectual + * property embodied in the software Licensee provides to its licensee, and + * not to intellectual property embodied in modifications its licensee may + * make. + * + * 3.3. Redistribution of Executable. Redistribution in executable form of any + * substantial portion of the Covered Code or modification must reproduce the + * above Copyright Notice, and the following Disclaimer and Export Compliance + * provision in the documentation and/or other materials provided with the + * distribution. + * + * 3.4. Intel retains all right, title, and interest in and to the Original + * Intel Code. + * + * 3.5. Neither the name Intel nor any other trademark owned or controlled by + * Intel shall be used in advertising or otherwise to promote the sale, use or + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED + * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE + * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, + * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY + * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY + * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A + * PARTICULAR PURPOSE. + * + * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES + * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR + * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, + * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY + * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL + * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS + * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY + * LIMITED REMEDY. + * + * 4.3. Licensee shall not export, either directly or indirectly, any of this + * software or system incorporating such software without first obtaining any + * required license or other approval from the U. S. Department of Commerce or + * any other agency or department of the United States Government. In the + * event Licensee exports any such software from the United States or + * re-exports any such software from a foreign destination, Licensee shall + * ensure that the distribution and export/re-export of the software is in + * compliance with all laws, regulations, orders, or other restrictions of the + * U.S. Export Administration Regulations. Licensee agrees that neither it nor + * any of its subsidiaries will export/re-export any technical data, process, + * software, or service, directly or indirectly, to any country for which the + * United States government or any agency thereof requires an export license, + * other governmental approval, or letter of assurance, without first obtaining + * such license, approval or letter. + * + ***************************************************************************** + * + * Alternatively, you may choose to be licensed under the terms of the + * following license: + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -23,23 +131,23 @@ * of any contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * - * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGES. - */ + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Alternatively, you may choose to be licensed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + *****************************************************************************/ #include #include Modified: head/sys/contrib/dev/acpica/common/adisasm.c ============================================================================== --- head/sys/contrib/dev/acpica/common/adisasm.c Fri Mar 3 18:44:20 2017 (r314610) +++ head/sys/contrib/dev/acpica/common/adisasm.c Fri Mar 3 18:56:15 2017 (r314611) @@ -4,10 +4,118 @@ * *****************************************************************************/ -/* - * Copyright (C) 2000 - 2017, Intel Corp. +/****************************************************************************** + * + * 1. Copyright Notice + * + * Some or all of this work - Copyright (c) 1999 - 2017, Intel Corp. * All rights reserved. * + * 2. License + * + * 2.1. This is your license from Intel Corp. under its intellectual property + * rights. You may have additional license terms from the party that provided + * you this software, covering your right to use that party's intellectual + * property rights. + * + * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a + * copy of the source code appearing in this file ("Covered Code") an + * irrevocable, perpetual, worldwide license under Intel's copyrights in the + * base code distributed originally by Intel ("Original Intel Code") to copy, + * make derivatives, distribute, use and display any portion of the Covered + * Code in any form, with the right to sublicense such rights; and + * + * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent + * license (with the right to sublicense), under only those claims of Intel + * patents that are infringed by the Original Intel Code, to make, use, sell, + * offer to sell, and import the Covered Code and derivative works thereof + * solely to the minimum extent necessary to exercise the above copyright + * license, and in no event shall the patent license extend to any additions + * to or modifications of the Original Intel Code. No other license or right + * is granted directly or by implication, estoppel or otherwise; + * + * The above copyright and patent license is granted only if the following + * conditions are met: + * + * 3. Conditions + * + * 3.1. Redistribution of Source with Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification with rights to further distribute source must include + * the above Copyright Notice, the above License, this list of Conditions, + * and the following Disclaimer and Export Compliance provision. In addition, + * Licensee must cause all Covered Code to which Licensee contributes to + * contain a file documenting the changes Licensee made to create that Covered + * Code and the date of any change. Licensee must include in that file the + * documentation of any changes made by any predecessor Licensee. Licensee + * must include a prominent statement that the modification is derived, + * directly or indirectly, from Original Intel Code. + * + * 3.2. Redistribution of Source with no Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification without rights to further distribute source must + * include the following Disclaimer and Export Compliance provision in the + * documentation and/or other materials provided with distribution. In + * addition, Licensee may not authorize further sublicense of source of any + * portion of the Covered Code, and must include terms to the effect that the + * license from Licensee to its licensee is limited to the intellectual + * property embodied in the software Licensee provides to its licensee, and + * not to intellectual property embodied in modifications its licensee may + * make. + * + * 3.3. Redistribution of Executable. Redistribution in executable form of any + * substantial portion of the Covered Code or modification must reproduce the + * above Copyright Notice, and the following Disclaimer and Export Compliance + * provision in the documentation and/or other materials provided with the + * distribution. + * + * 3.4. Intel retains all right, title, and interest in and to the Original + * Intel Code. + * + * 3.5. Neither the name Intel nor any other trademark owned or controlled by + * Intel shall be used in advertising or otherwise to promote the sale, use or + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED + * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE + * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, + * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY + * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY + * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A + * PARTICULAR PURPOSE. + * + * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES + * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR + * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, + * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY + * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL + * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS + * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY + * LIMITED REMEDY. + * + * 4.3. Licensee shall not export, either directly or indirectly, any of this + * software or system incorporating such software without first obtaining any + * required license or other approval from the U. S. Department of Commerce or + * any other agency or department of the United States Government. In the + * event Licensee exports any such software from the United States or + * re-exports any such software from a foreign destination, Licensee shall + * ensure that the distribution and export/re-export of the software is in + * compliance with all laws, regulations, orders, or other restrictions of the + * U.S. Export Administration Regulations. Licensee agrees that neither it nor + * any of its subsidiaries will export/re-export any technical data, process, + * software, or service, directly or indirectly, to any country for which the + * United States government or any agency thereof requires an export license, + * other governmental approval, or letter of assurance, without first obtaining + * such license, approval or letter. + * + ***************************************************************************** + * + * Alternatively, you may choose to be licensed under the terms of the + * following license: + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -23,23 +131,23 @@ * of any contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * - * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGES. - */ + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Alternatively, you may choose to be licensed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + *****************************************************************************/ #include #include @@ -122,24 +230,36 @@ AdInitialize ( Status = AcpiOsInitialize (); if (ACPI_FAILURE (Status)) { + fprintf (stderr, "Could not initialize ACPICA subsystem: %s\n", + AcpiFormatException (Status)); + return (Status); } Status = AcpiUtInitGlobals (); if (ACPI_FAILURE (Status)) { + fprintf (stderr, "Could not initialize ACPICA globals: %s\n", + AcpiFormatException (Status)); + return (Status); } Status = AcpiUtMutexInitialize (); if (ACPI_FAILURE (Status)) { + fprintf (stderr, "Could not initialize ACPICA mutex objects: %s\n", + AcpiFormatException (Status)); + return (Status); } Status = AcpiNsRootInitialize (); if (ACPI_FAILURE (Status)) { + fprintf (stderr, "Could not initialize ACPICA namespace: %s\n", + AcpiFormatException (Status)); + return (Status); } @@ -149,7 +269,7 @@ AdInitialize ( AcpiGbl_RootTableList.CurrentTableCount = 0; AcpiGbl_RootTableList.Tables = LocalTables; - return (Status); + return (AE_OK); } @@ -326,6 +446,21 @@ AdDisassembleOneTable ( ACPI_OWNER_ID OwnerId; +#ifdef ACPI_ASL_COMPILER + + /* + * For ASL-/ASL+ converter: replace the temporary "XXXX" + * table signature with the original. This "XXXX" makes + * it harder for the AML interpreter to run the badaml + * (.xxx) file produced from the converter in case if + * it fails to get deleted. + */ + if (Gbl_CaptureComments) + { + strncpy (Table->Signature, AcpiGbl_TableSig, 4); + } +#endif + /* ForceAmlDisassembly means to assume the table contains valid AML */ if (!AcpiGbl_ForceAmlDisassembly && !AcpiUtIsAmlTable (Table)) @@ -475,6 +610,7 @@ AdReparseOneTable ( ACPI_OWNER_ID OwnerId) { ACPI_STATUS Status; + ACPI_COMMENT_ADDR_NODE *AddrListHead; fprintf (stderr, @@ -508,6 +644,15 @@ AdReparseOneTable ( AcpiDmAddExternalsToNamespace (); + /* For -ca option: clear the list of comment addresses. */ + + while (AcpiGbl_CommentAddrListHead) + { + AddrListHead= AcpiGbl_CommentAddrListHead; + AcpiGbl_CommentAddrListHead = AcpiGbl_CommentAddrListHead->Next; + AcpiOsFree(AddrListHead); + } + /* Parse the table again. No need to reload it, however */ Status = AdParseTable (Table, NULL, FALSE, FALSE); Modified: head/sys/contrib/dev/acpica/common/adwalk.c ============================================================================== --- head/sys/contrib/dev/acpica/common/adwalk.c Fri Mar 3 18:44:20 2017 (r314610) +++ head/sys/contrib/dev/acpica/common/adwalk.c Fri Mar 3 18:56:15 2017 (r314611) @@ -4,10 +4,118 @@ * *****************************************************************************/ -/* - * Copyright (C) 2000 - 2017, Intel Corp. +/****************************************************************************** + * + * 1. Copyright Notice + * + * Some or all of this work - Copyright (c) 1999 - 2017, Intel Corp. * All rights reserved. * + * 2. License + * + * 2.1. This is your license from Intel Corp. under its intellectual property + * rights. You may have additional license terms from the party that provided + * you this software, covering your right to use that party's intellectual + * property rights. + * + * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a + * copy of the source code appearing in this file ("Covered Code") an + * irrevocable, perpetual, worldwide license under Intel's copyrights in the + * base code distributed originally by Intel ("Original Intel Code") to copy, + * make derivatives, distribute, use and display any portion of the Covered + * Code in any form, with the right to sublicense such rights; and + * + * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent + * license (with the right to sublicense), under only those claims of Intel + * patents that are infringed by the Original Intel Code, to make, use, sell, + * offer to sell, and import the Covered Code and derivative works thereof + * solely to the minimum extent necessary to exercise the above copyright + * license, and in no event shall the patent license extend to any additions + * to or modifications of the Original Intel Code. No other license or right + * is granted directly or by implication, estoppel or otherwise; + * + * The above copyright and patent license is granted only if the following + * conditions are met: + * + * 3. Conditions + * + * 3.1. Redistribution of Source with Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification with rights to further distribute source must include + * the above Copyright Notice, the above License, this list of Conditions, + * and the following Disclaimer and Export Compliance provision. In addition, + * Licensee must cause all Covered Code to which Licensee contributes to + * contain a file documenting the changes Licensee made to create that Covered + * Code and the date of any change. Licensee must include in that file the + * documentation of any changes made by any predecessor Licensee. Licensee + * must include a prominent statement that the modification is derived, + * directly or indirectly, from Original Intel Code. + * + * 3.2. Redistribution of Source with no Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification without rights to further distribute source must + * include the following Disclaimer and Export Compliance provision in the + * documentation and/or other materials provided with distribution. In + * addition, Licensee may not authorize further sublicense of source of any + * portion of the Covered Code, and must include terms to the effect that the + * license from Licensee to its licensee is limited to the intellectual + * property embodied in the software Licensee provides to its licensee, and + * not to intellectual property embodied in modifications its licensee may + * make. + * + * 3.3. Redistribution of Executable. Redistribution in executable form of any + * substantial portion of the Covered Code or modification must reproduce the + * above Copyright Notice, and the following Disclaimer and Export Compliance + * provision in the documentation and/or other materials provided with the + * distribution. + * + * 3.4. Intel retains all right, title, and interest in and to the Original + * Intel Code. + * + * 3.5. Neither the name Intel nor any other trademark owned or controlled by + * Intel shall be used in advertising or otherwise to promote the sale, use or + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED + * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE + * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, + * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY + * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY + * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A + * PARTICULAR PURPOSE. + * + * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES + * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR + * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, + * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY + * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL + * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS + * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY + * LIMITED REMEDY. + * + * 4.3. Licensee shall not export, either directly or indirectly, any of this + * software or system incorporating such software without first obtaining any + * required license or other approval from the U. S. Department of Commerce or + * any other agency or department of the United States Government. In the + * event Licensee exports any such software from the United States or + * re-exports any such software from a foreign destination, Licensee shall + * ensure that the distribution and export/re-export of the software is in + * compliance with all laws, regulations, orders, or other restrictions of the + * U.S. Export Administration Regulations. Licensee agrees that neither it nor + * any of its subsidiaries will export/re-export any technical data, process, + * software, or service, directly or indirectly, to any country for which the + * United States government or any agency thereof requires an export license, + * other governmental approval, or letter of assurance, without first obtaining + * such license, approval or letter. + * + ***************************************************************************** + * + * Alternatively, you may choose to be licensed under the terms of the + * following license: + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -23,23 +131,23 @@ * of any contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Fri Mar 3 19:03:46 2017 Return-Path: Delivered-To: svn-src-all@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 62450CF7F70; Fri, 3 Mar 2017 19:03:46 +0000 (UTC) (envelope-from jkim@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 2F68813B0; Fri, 3 Mar 2017 19:03:46 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23J3jDV030179; Fri, 3 Mar 2017 19:03:45 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23J3jGC030178; Fri, 3 Mar 2017 19:03:45 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201703031903.v23J3jGC030178@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Fri, 3 Mar 2017 19:03:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org Subject: svn commit: r314612 - svnadmin/conf X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 19:03:46 -0000 Author: jkim Date: Fri Mar 3 19:03:44 2017 New Revision: 314612 URL: https://svnweb.freebsd.org/changeset/base/314612 Log: Remove myself. ACPICA 20170303 has been imported and merged. Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf ============================================================================== --- svnadmin/conf/sizelimit.conf Fri Mar 3 18:56:15 2017 (r314611) +++ svnadmin/conf/sizelimit.conf Fri Mar 3 19:03:44 2017 (r314612) @@ -22,7 +22,6 @@ dim imp jb jeff -jkim mm np obrien From owner-svn-src-all@freebsd.org Fri Mar 3 20:15:25 2017 Return-Path: Delivered-To: svn-src-all@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 649A9CF7E4B; Fri, 3 Mar 2017 20:15:25 +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 243A7171B; Fri, 3 Mar 2017 20:15:25 +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 v23KFOpD058937; Fri, 3 Mar 2017 20:15:24 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23KFNjK058926; Fri, 3 Mar 2017 20:15:23 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703032015.v23KFNjK058926@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Fri, 3 Mar 2017 20:15:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314613 - in head: etc/mtree usr.bin/indent usr.bin/indent/tests X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 20:15:25 -0000 Author: ngie Date: Fri Mar 3 20:15:22 2017 New Revision: 314613 URL: https://svnweb.freebsd.org/changeset/base/314613 Log: Integrate indent tests added in r313544 into ATF/Kyua and the FreeBSD test suite This change does the following: - Introduces symmetry in the test inputs/outputs by adding the exit code to the files. This simplified the test driver notably by requiring less filename/test name manipulation. - Adds a test driver for the testcases added in r313544, patterned after bin/sh/tests/functional_test.sh . The driver calls indent as noted in r313544, with an exception: The $FreeBSD$ RCS keyword's expansion is reindented with indent, which means that the output differs from the expected output. Thus, all lines with $FreeBSD$ in them are deleted on the fly, both in the input file and the output file. The test inputs/outputs are copied to the kyua sandbox before the test is run as the pathing in some of the files relies on pathing normalized to the current directory (copying the files is the easiest way to resolve the issue). Approved by: pstef (maintainer) Reviewed by: pstef X-MFC with: r313544 Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D9682 Added: head/usr.bin/indent/tests/Makefile (contents, props changed) head/usr.bin/indent/tests/elsecomment.0.pro - copied unchanged from r314612, head/usr.bin/indent/tests/elsecomment.pro head/usr.bin/indent/tests/functional_test.sh (contents, props changed) head/usr.bin/indent/tests/label.0.pro - copied unchanged from r314612, head/usr.bin/indent/tests/label.pro head/usr.bin/indent/tests/nsac.0.pro - copied unchanged from r314612, head/usr.bin/indent/tests/nsac.pro head/usr.bin/indent/tests/sac.0.pro - copied unchanged from r314612, head/usr.bin/indent/tests/sac.pro head/usr.bin/indent/tests/surplusbad.0.pro - copied unchanged from r314612, head/usr.bin/indent/tests/surplusbad.pro head/usr.bin/indent/tests/types_from_file.0.list - copied unchanged from r314612, head/usr.bin/indent/tests/types_from_file.list head/usr.bin/indent/tests/types_from_file.0.pro - copied, changed from r314612, head/usr.bin/indent/tests/types_from_file.pro Deleted: head/usr.bin/indent/tests/elsecomment.pro head/usr.bin/indent/tests/label.pro head/usr.bin/indent/tests/nsac.pro head/usr.bin/indent/tests/sac.pro head/usr.bin/indent/tests/surplusbad.pro head/usr.bin/indent/tests/types_from_file.list head/usr.bin/indent/tests/types_from_file.pro Modified: head/etc/mtree/BSD.tests.dist head/usr.bin/indent/Makefile Modified: head/etc/mtree/BSD.tests.dist ============================================================================== --- head/etc/mtree/BSD.tests.dist Fri Mar 3 19:03:44 2017 (r314612) +++ head/etc/mtree/BSD.tests.dist Fri Mar 3 20:15:22 2017 (r314613) @@ -620,6 +620,8 @@ .. ident .. + indent + .. join .. jot Modified: head/usr.bin/indent/Makefile ============================================================================== --- head/usr.bin/indent/Makefile Fri Mar 3 19:03:44 2017 (r314612) +++ head/usr.bin/indent/Makefile Fri Mar 3 20:15:22 2017 (r314613) @@ -1,9 +1,15 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +.include + PROG= indent SRCS= indent.c io.c lexi.c parse.c pr_comment.c args.c NO_WMISSING_VARIABLE_DECLARATIONS= +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include Added: head/usr.bin/indent/tests/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/indent/tests/Makefile Fri Mar 3 20:15:22 2017 (r314613) @@ -0,0 +1,43 @@ +# $FreeBSD$ + +PACKAGE= tests + +${PACKAGE}FILES+= comments.0 +${PACKAGE}FILES+= comments.0.stdout +${PACKAGE}FILES+= declarations.0 +${PACKAGE}FILES+= declarations.0.stdout +${PACKAGE}FILES+= elsecomment.0 +${PACKAGE}FILES+= elsecomment.0.stdout +${PACKAGE}FILES+= elsecomment.0.pro +${PACKAGE}FILES+= float.0 +${PACKAGE}FILES+= float.0.stdout +${PACKAGE}FILES+= label.0 +${PACKAGE}FILES+= label.0.stdout +${PACKAGE}FILES+= label.0.pro +${PACKAGE}FILES+= list_head.0 +${PACKAGE}FILES+= list_head.0.stdout +${PACKAGE}FILES+= nsac.0 +${PACKAGE}FILES+= nsac.0.stdout +${PACKAGE}FILES+= nsac.0.pro +${PACKAGE}FILES+= offsetof.0 +${PACKAGE}FILES+= offsetof.0.stdout +${PACKAGE}FILES+= sac.0 +${PACKAGE}FILES+= sac.0.stdout +${PACKAGE}FILES+= sac.0.pro +${PACKAGE}FILES+= struct.0 +${PACKAGE}FILES+= struct.0.stdout +${PACKAGE}FILES+= surplusbad.0 +${PACKAGE}FILES+= surplusbad.0.stdout +${PACKAGE}FILES+= surplusbad.0.pro +${PACKAGE}FILES+= types_from_file.0 +${PACKAGE}FILES+= types_from_file.0.stdout +${PACKAGE}FILES+= types_from_file.0.list +${PACKAGE}FILES+= types_from_file.0.pro +${PACKAGE}FILES+= wchar.0 +${PACKAGE}FILES+= wchar.0.stdout + +ATF_TESTS_SH+= functional_test + +BINDIR= ${TESTSDIR} + +.include Copied: head/usr.bin/indent/tests/elsecomment.0.pro (from r314612, head/usr.bin/indent/tests/elsecomment.pro) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/indent/tests/elsecomment.0.pro Fri Mar 3 20:15:22 2017 (r314613, copy of r314612, head/usr.bin/indent/tests/elsecomment.pro) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +-bl Added: head/usr.bin/indent/tests/functional_test.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/indent/tests/functional_test.sh Fri Mar 3 20:15:22 2017 (r314613) @@ -0,0 +1,90 @@ +# +# Copyright 2016 Dell EMC +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# $FreeBSD$ + +SRCDIR=$(atf_get_srcdir) + +check() +{ + local tc=${1}; shift + + local indent=$(atf_config_get usr.bin.indent.test_indent /usr/bin/indent) + + # All of the files need to be in the ATF sandbox in order for the tests + # to pass. + atf_check cp ${SRCDIR}/${tc}* . + + # Remove $FreeBSD$ RCS expansions because they get re-indented, which + # changes the output + local out_file="${tc}.stdout" + if [ -f "${out_file}" ]; then + parsed_file=output_file.parsed + + atf_check -o save:$parsed_file sed -e '/\$FreeBSD.*\$/d' \ + ${tc}.stdout + out_flag="-o file:$parsed_file" + fi + local profile_file="${tc}.pro" + if [ -f "${profile_file}" ]; then + profile_flag="-P${profile_file}" + else + # Make sure we don't implicitly use ~/.indent.pro from the test + # host, for determinism purposes. + profile_flag="-npro" + fi + sed -e '/\$FreeBSD.*\$/d' ${tc} > input_file.parsed + atf_check -s exit:${tc##*.} ${out_flag} ${indent} ${profile_flag} < input_file.parsed +} + +add_testcase() +{ + local tc=${1} + local tc_escaped word + + case "${tc%.*}" in + *-*) + local IFS="-" + for word in ${tc%.*}; do + tc_escaped="${tc_escaped:+${tc_escaped}_}${word}" + done + ;; + *) + tc_escaped=${tc%.*} + ;; + esac + + atf_test_case ${tc_escaped} + eval "${tc_escaped}_body() { check ${tc}; }" + atf_add_test_case ${tc_escaped} +} + +atf_init_test_cases() +{ + for path in $(find -Es "${SRCDIR}" -regex '.*\.[0-9]+$'); do + add_testcase ${path##*/} + done +} Copied: head/usr.bin/indent/tests/label.0.pro (from r314612, head/usr.bin/indent/tests/label.pro) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/indent/tests/label.0.pro Fri Mar 3 20:15:22 2017 (r314613, copy of r314612, head/usr.bin/indent/tests/label.pro) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +-nut Copied: head/usr.bin/indent/tests/nsac.0.pro (from r314612, head/usr.bin/indent/tests/nsac.pro) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/indent/tests/nsac.0.pro Fri Mar 3 20:15:22 2017 (r314613, copy of r314612, head/usr.bin/indent/tests/nsac.pro) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +-nsac Copied: head/usr.bin/indent/tests/sac.0.pro (from r314612, head/usr.bin/indent/tests/sac.pro) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/indent/tests/sac.0.pro Fri Mar 3 20:15:22 2017 (r314613, copy of r314612, head/usr.bin/indent/tests/sac.pro) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +-sac Copied: head/usr.bin/indent/tests/surplusbad.0.pro (from r314612, head/usr.bin/indent/tests/surplusbad.pro) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/indent/tests/surplusbad.0.pro Fri Mar 3 20:15:22 2017 (r314613, copy of r314612, head/usr.bin/indent/tests/surplusbad.pro) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +-bad Copied: head/usr.bin/indent/tests/types_from_file.0.list (from r314612, head/usr.bin/indent/tests/types_from_file.list) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/indent/tests/types_from_file.0.list Fri Mar 3 20:15:22 2017 (r314613, copy of r314612, head/usr.bin/indent/tests/types_from_file.list) @@ -0,0 +1,2 @@ +b +a \ No newline at end of file Copied and modified: head/usr.bin/indent/tests/types_from_file.0.pro (from r314612, head/usr.bin/indent/tests/types_from_file.pro) ============================================================================== --- head/usr.bin/indent/tests/types_from_file.pro Fri Mar 3 19:03:44 2017 (r314612, copy source) +++ head/usr.bin/indent/tests/types_from_file.0.pro Fri Mar 3 20:15:22 2017 (r314613) @@ -1,2 +1,2 @@ /* $FreeBSD$ */ --Utypes_from_file.list +-Utypes_from_file.0.list From owner-svn-src-all@freebsd.org Fri Mar 3 20:22:43 2017 Return-Path: Delivered-To: svn-src-all@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 D668FCF712B; Fri, 3 Mar 2017 20:22:43 +0000 (UTC) (envelope-from ae@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 8BFA91C94; Fri, 3 Mar 2017 20:22:43 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23KMgfO062958; Fri, 3 Mar 2017 20:22:42 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23KMg7h062957; Fri, 3 Mar 2017 20:22:42 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201703032022.v23KMg7h062957@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Fri, 3 Mar 2017 20:22:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314614 - head/sys/netpfil/ipfw X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 20:22:43 -0000 Author: ae Date: Fri Mar 3 20:22:42 2017 New Revision: 314614 URL: https://svnweb.freebsd.org/changeset/base/314614 Log: Fix matching table entry value. Use real table value instead of its index in valuestate array. When opcode has size equal to ipfw_insn_u32, this means that it should additionally match value specified in d[0] with table entry value. ipfw_table_lookup() returns table value index, use TARG_VAL() macro to convert it to its value. The actual 32-bit value stored in the tag field of table_value structure, where all unspecified u32 values are kept. PR: 217262 Reviewed by: melifaro MFC after: 1 week Sponsored by: Yandex LLC Modified: head/sys/netpfil/ipfw/ip_fw2.c Modified: head/sys/netpfil/ipfw/ip_fw2.c ============================================================================== --- head/sys/netpfil/ipfw/ip_fw2.c Fri Mar 3 20:15:22 2017 (r314613) +++ head/sys/netpfil/ipfw/ip_fw2.c Fri Mar 3 20:22:42 2017 (r314614) @@ -1511,8 +1511,8 @@ do { \ if (!match) break; if (cmdlen == F_INSN_SIZE(ipfw_insn_u32)) - match = - ((ipfw_insn_u32 *)cmd)->d[0] == v; + match = ((ipfw_insn_u32 *)cmd)->d[0] == + TARG_VAL(chain, v, tag); else tablearg = v; } else if (is_ipv6) { @@ -1524,7 +1524,8 @@ do { \ sizeof(struct in6_addr), pkey, &v); if (cmdlen == F_INSN_SIZE(ipfw_insn_u32)) - match = ((ipfw_insn_u32 *)cmd)->d[0] == v; + match = ((ipfw_insn_u32 *)cmd)->d[0] == + TARG_VAL(chain, v, tag); if (match) tablearg = v; } @@ -1536,7 +1537,8 @@ do { \ match = ipfw_lookup_table_extended(chain, cmd->arg1, 0, &args->f_id, &v); if (cmdlen == F_INSN_SIZE(ipfw_insn_u32)) - match = ((ipfw_insn_u32 *)cmd)->d[0] == v; + match = ((ipfw_insn_u32 *)cmd)->d[0] == + TARG_VAL(chain, v, tag); if (match) tablearg = v; } From owner-svn-src-all@freebsd.org Fri Mar 3 20:22:49 2017 Return-Path: Delivered-To: svn-src-all@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 05120CF714C; Fri, 3 Mar 2017 20:22:49 +0000 (UTC) (envelope-from imp@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 A94841CBE; Fri, 3 Mar 2017 20:22:48 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23KMlvO063022; Fri, 3 Mar 2017 20:22:47 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23KMlgN063020; Fri, 3 Mar 2017 20:22:47 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201703032022.v23KMlgN063020@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 3 Mar 2017 20:22:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314615 - head/lib/libefivar X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 20:22:49 -0000 Author: imp Date: Fri Mar 3 20:22:47 2017 New Revision: 314615 URL: https://svnweb.freebsd.org/changeset/base/314615 Log: Move uuid_table definition to efivar.h. Create new function efi_known_guid() to return list of guids. Sponsored by: Netflix Modified: head/lib/libefivar/efivar.c head/lib/libefivar/efivar.h Modified: head/lib/libefivar/efivar.c ============================================================================== --- head/lib/libefivar/efivar.c Fri Mar 3 20:22:42 2017 (r314614) +++ head/lib/libefivar/efivar.c Fri Mar 3 20:22:47 2017 (r314615) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include "efivar.h" #include "libefivar_int.h" static int efi_fd = -2; @@ -44,12 +45,7 @@ static int efi_fd = -2; const efi_guid_t efi_guid_empty = Z; -static struct uuid_table -{ - const char *uuid_str; - const char *name; - efi_guid_t guid; -} guid_tbl [] = +static struct uuid_table guid_tbl [] = { { "00000000-0000-0000-0000-000000000000", "zero", Z }, { "093e0fae-a6c4-4f50-9f1b-d41e2b89c19a", "sha512", Z }, @@ -103,6 +99,14 @@ efi_guid_tbl_compile(void) } } +int +efi_known_guid(struct uuid_table **tbl) +{ + + *tbl = guid_tbl; + return (nitems(guid_tbl)); +} + static int efi_open_dev(void) { Modified: head/lib/libefivar/efivar.h ============================================================================== --- head/lib/libefivar/efivar.h Fri Mar 3 20:22:42 2017 (r314614) +++ head/lib/libefivar/efivar.h Fri Mar 3 20:22:47 2017 (r314615) @@ -83,6 +83,16 @@ int efi_set_variable(efi_guid_t guid, co int efi_str_to_guid(const char *s, efi_guid_t *guid); int efi_variables_supported(void); +/* FreeBSD extensions */ +struct uuid_table +{ + const char *uuid_str; + const char *name; + efi_guid_t guid; +}; + +int efi_known_guid(struct uuid_table **); + extern const efi_guid_t efi_guid_empty; /* Stubs that are expected, but aren't really used */ From owner-svn-src-all@freebsd.org Fri Mar 3 20:22:57 2017 Return-Path: Delivered-To: svn-src-all@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 CAAEDCF7190; Fri, 3 Mar 2017 20:22:57 +0000 (UTC) (envelope-from imp@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 983531DB0; Fri, 3 Mar 2017 20:22:57 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23KMuKh063082; Fri, 3 Mar 2017 20:22:56 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23KMu6E063081; Fri, 3 Mar 2017 20:22:56 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201703032022.v23KMu6E063081@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 3 Mar 2017 20:22:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314616 - head/lib/libefivar X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 20:22:57 -0000 Author: imp Date: Fri Mar 3 20:22:56 2017 New Revision: 314616 URL: https://svnweb.freebsd.org/changeset/base/314616 Log: Only compile the known uuid table once. Sponsored by: Netflix Modified: head/lib/libefivar/efivar.c Modified: head/lib/libefivar/efivar.c ============================================================================== --- head/lib/libefivar/efivar.c Fri Mar 3 20:22:47 2017 (r314615) +++ head/lib/libefivar/efivar.c Fri Mar 3 20:22:56 2017 (r314616) @@ -88,7 +88,10 @@ efi_guid_tbl_compile(void) { size_t i; uint32_t status; + static int done = 0; + if (done) + return; for (i = 0; i < nitems(guid_tbl); i++) { uuid_from_string(guid_tbl[i].uuid_str, &guid_tbl[i].guid, &status); @@ -97,6 +100,7 @@ efi_guid_tbl_compile(void) fprintf(stderr, "Can't convert %s to a uuid for %s: %d\n", guid_tbl[i].uuid_str, guid_tbl[i].name, (int)status); } + done = 1; } int From owner-svn-src-all@freebsd.org Fri Mar 3 20:23:02 2017 Return-Path: Delivered-To: svn-src-all@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 4D01ECF71BC; Fri, 3 Mar 2017 20:23:02 +0000 (UTC) (envelope-from imp@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 1B1221E23; Fri, 3 Mar 2017 20:23:02 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23KN17I063138; Fri, 3 Mar 2017 20:23:01 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23KN1Ms063137; Fri, 3 Mar 2017 20:23:01 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201703032023.v23KN1Ms063137@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 3 Mar 2017 20:23:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314617 - head/usr.sbin/efivar X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 20:23:02 -0000 Author: imp Date: Fri Mar 3 20:23:01 2017 New Revision: 314617 URL: https://svnweb.freebsd.org/changeset/base/314617 Log: Print just the variables when we're not printing the values. Sponsored by: Netflix Modified: head/usr.sbin/efivar/efivar.c Modified: head/usr.sbin/efivar/efivar.c ============================================================================== --- head/usr.sbin/efivar/efivar.c Fri Mar 3 20:22:56 2017 (r314616) +++ head/usr.sbin/efivar/efivar.c Fri Mar 3 20:23:01 2017 (r314617) @@ -219,6 +219,8 @@ print_var(efi_guid_t *guid, char *name) bindump(data, datalen); else hexdump(data, datalen); + } else { + printf("%s-%s", gname, name); } free(gname); if (!Nflag) From owner-svn-src-all@freebsd.org Fri Mar 3 20:23:06 2017 Return-Path: Delivered-To: svn-src-all@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 E1318CF71FB; Fri, 3 Mar 2017 20:23:06 +0000 (UTC) (envelope-from imp@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 AE8161EC9; Fri, 3 Mar 2017 20:23:06 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23KN5SK063191; Fri, 3 Mar 2017 20:23:05 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23KN54Y063190; Fri, 3 Mar 2017 20:23:05 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201703032023.v23KN54Y063190@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 3 Mar 2017 20:23:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314618 - head/usr.sbin/efivar X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 20:23:07 -0000 Author: imp Date: Fri Mar 3 20:23:05 2017 New Revision: 314618 URL: https://svnweb.freebsd.org/changeset/base/314618 Log: Actually implement efivar -L Sponsored by: Netflix Modified: head/usr.sbin/efivar/efivar.c Modified: head/usr.sbin/efivar/efivar.c ============================================================================== --- head/usr.sbin/efivar/efivar.c Fri Mar 3 20:23:01 2017 (r314617) +++ head/usr.sbin/efivar/efivar.c Fri Mar 3 20:23:05 2017 (r314618) @@ -252,6 +252,17 @@ print_variables(void) } static void +print_known_guid(void) +{ + struct uuid_table *tbl; + int i, n; + + n = efi_known_guid(&tbl); + for (i = 0; i < n; i++) + printf("%s %s\n", tbl[i].uuid_str, tbl[i].name); +} + +static void parse_args(int argc, char **argv) { int ch, i; @@ -333,6 +344,8 @@ parse_args(int argc, char **argv) delete_variable(varname); else if (wflag) write_variable(varname, NULL); + else if (Lflag) + print_known_guid(); else if (varname) { pflag++; print_variable(varname); From owner-svn-src-all@freebsd.org Fri Mar 3 20:23:11 2017 Return-Path: Delivered-To: svn-src-all@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 9710FCF7248; Fri, 3 Mar 2017 20:23:11 +0000 (UTC) (envelope-from imp@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 598DD1F36; Fri, 3 Mar 2017 20:23:11 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23KNAmp063246; Fri, 3 Mar 2017 20:23:10 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23KNABN063244; Fri, 3 Mar 2017 20:23:10 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201703032023.v23KNABN063244@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 3 Mar 2017 20:23:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314619 - head/usr.sbin/efivar X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 20:23:11 -0000 Author: imp Date: Fri Mar 3 20:23:10 2017 New Revision: 314619 URL: https://svnweb.freebsd.org/changeset/base/314619 Log: Implement --guid/-g to print the known GUIDs as human readable. The list of known GUIDs can be found with --list-guids. Sponsored by: Netflix Modified: head/usr.sbin/efivar/efivar.8 head/usr.sbin/efivar/efivar.c Modified: head/usr.sbin/efivar/efivar.8 ============================================================================== --- head/usr.sbin/efivar/efivar.8 Fri Mar 3 20:23:05 2017 (r314618) +++ head/usr.sbin/efivar/efivar.8 Fri Mar 3 20:23:10 2017 (r314619) @@ -41,6 +41,7 @@ .Op Fl -binary .Op Fl -delete .Op Fl -fromfile Ar file +.Op Fl -guid .Op Fl -hex .Op Fl -list-guids .Op Fl -list @@ -116,6 +117,10 @@ flags. No .Ar value may be specified. +.It Fl g Fl -guid +flag is specified, guids are converted to names if they are known (and +show up in +.Fl -list-guids ). .It Fl H Fl -hex List variable data as a hex dump. .It Fl L Fl -list-guids @@ -151,6 +156,7 @@ Set the specified to .Ar value . This is not yet implemented. +If the .Sh COMPATIBILITY The .Nm Modified: head/usr.sbin/efivar/efivar.c ============================================================================== --- head/usr.sbin/efivar/efivar.c Fri Mar 3 20:23:05 2017 (r314618) +++ head/usr.sbin/efivar/efivar.c Fri Mar 3 20:23:10 2017 (r314619) @@ -46,6 +46,7 @@ static struct option longopts[] = { { "binary", no_argument, NULL, 'b' }, { "delete", no_argument, NULL, 'D' }, { "fromfile", required_argument, NULL, 'f' }, + { "guid", no_argument, NULL, 'g' }, { "hex", no_argument, NULL, 'H' }, { "list-guids", no_argument, NULL, 'L' }, { "list", no_argument, NULL, 'l' }, @@ -59,7 +60,7 @@ static struct option longopts[] = { }; -static int aflag, Aflag, bflag, dflag, Dflag, Hflag, Nflag, +static int aflag, Aflag, bflag, dflag, Dflag, gflag, Hflag, Nflag, lflag, Lflag, Rflag, wflag, pflag; static char *varname; static u_long attrib = EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS; @@ -196,6 +197,20 @@ bindump(uint8_t *data, size_t datalen) } static void +pretty_guid(efi_guid_t *guid, char **gname) +{ + char *pretty = NULL; + + if (gflag) + efi_guid_to_name(guid, &pretty); + + if (pretty == NULL) + efi_guid_to_str(guid, gname); + else + *gname = pretty; +} + +static void print_var(efi_guid_t *guid, char *name) { uint32_t att; @@ -204,7 +219,7 @@ print_var(efi_guid_t *guid, char *name) char *gname; int rv; - efi_guid_to_str(guid, &gname); + pretty_guid(guid, &gname); if (pflag) { rv = efi_get_variable(*guid, name, &data, &datalen, &att); @@ -267,7 +282,7 @@ parse_args(int argc, char **argv) { int ch, i; - while ((ch = getopt_long(argc, argv, "aAbdDf:HlLNn:pRt:w", + while ((ch = getopt_long(argc, argv, "aAbdDf:gHlLNn:pRt:w", longopts, NULL)) != -1) { switch (ch) { case 'a': @@ -285,6 +300,9 @@ parse_args(int argc, char **argv) case 'D': Dflag++; break; + case 'g': + gflag++; + break; case 'H': Hflag++; break; From owner-svn-src-all@freebsd.org Fri Mar 3 20:23:16 2017 Return-Path: Delivered-To: svn-src-all@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 00446CF729D; Fri, 3 Mar 2017 20:23:16 +0000 (UTC) (envelope-from imp@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 C02D01FE2; Fri, 3 Mar 2017 20:23:15 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23KNEd8063297; Fri, 3 Mar 2017 20:23:14 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23KNEaj063296; Fri, 3 Mar 2017 20:23:14 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201703032023.v23KNEaj063296@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 3 Mar 2017 20:23:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314620 - head/usr.sbin/efivar X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 20:23:16 -0000 Author: imp Date: Fri Mar 3 20:23:14 2017 New Revision: 314620 URL: https://svnweb.freebsd.org/changeset/base/314620 Log: Implement -d / --device-path to print the ascii representation of a variable that contains a UEFI device path. Sponsored by: Netflix Modified: head/usr.sbin/efivar/efivar.c Modified: head/usr.sbin/efivar/efivar.c ============================================================================== --- head/usr.sbin/efivar/efivar.c Fri Mar 3 20:23:10 2017 (r314619) +++ head/usr.sbin/efivar/efivar.c Fri Mar 3 20:23:14 2017 (r314620) @@ -45,6 +45,8 @@ static struct option longopts[] = { { "attributes", required_argument, NULL, 't' }, { "binary", no_argument, NULL, 'b' }, { "delete", no_argument, NULL, 'D' }, + { "device", no_argument, NULL, 'd' }, + { "device-path", no_argument, NULL, 'd' }, { "fromfile", required_argument, NULL, 'f' }, { "guid", no_argument, NULL, 'g' }, { "hex", no_argument, NULL, 'H' }, @@ -197,6 +199,13 @@ bindump(uint8_t *data, size_t datalen) } static void +devpath_dump(uint8_t *data, size_t datalen) +{ + + fprintf(stderr, "junk %p %zu\n", data, datalen); +} + +static void pretty_guid(efi_guid_t *guid, char **gname) { char *pretty = NULL; @@ -232,6 +241,8 @@ print_var(efi_guid_t *guid, char *name) asciidump(data, datalen); else if (bflag) bindump(data, datalen); + else if (dflag) + devpath_dump(data, datalen); else hexdump(data, datalen); } else { From owner-svn-src-all@freebsd.org Fri Mar 3 20:23:20 2017 Return-Path: Delivered-To: svn-src-all@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 59155CF72DD; Fri, 3 Mar 2017 20:23:20 +0000 (UTC) (envelope-from imp@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 1A2D51093; Fri, 3 Mar 2017 20:23:20 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23KNJNv063351; Fri, 3 Mar 2017 20:23:19 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23KNJHQ063350; Fri, 3 Mar 2017 20:23:19 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201703032023.v23KNJHQ063350@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 3 Mar 2017 20:23:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314621 - head/usr.sbin/efivar X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 20:23:20 -0000 Author: imp Date: Fri Mar 3 20:23:18 2017 New Revision: 314621 URL: https://svnweb.freebsd.org/changeset/base/314621 Log: If the guid specified can't be decoded as a GUID, try looking it up in the known guid to name table. Sponsored by: Netflix Modified: head/usr.sbin/efivar/efivar.c Modified: head/usr.sbin/efivar/efivar.c ============================================================================== --- head/usr.sbin/efivar/efivar.c Fri Mar 3 20:23:14 2017 (r314620) +++ head/usr.sbin/efivar/efivar.c Fri Mar 3 20:23:18 2017 (r314621) @@ -87,7 +87,7 @@ breakdown_name(char *name, efi_guid_t *g errx(1, "Invalid name: %s", name); *vname = cp + 1; *cp = '\0'; - if (efi_str_to_guid(name, guid) < 0) + if (efi_name_to_guid(name, guid) < 0) errx(1, "Invalid guid %s", name); } From owner-svn-src-all@freebsd.org Fri Mar 3 20:23:24 2017 Return-Path: Delivered-To: svn-src-all@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 D8622CF736A; Fri, 3 Mar 2017 20:23:24 +0000 (UTC) (envelope-from imp@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 A47EF113E; Fri, 3 Mar 2017 20:23:24 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23KNN1F063452; Fri, 3 Mar 2017 20:23:23 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23KNNm6063451; Fri, 3 Mar 2017 20:23:23 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201703032023.v23KNNm6063451@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 3 Mar 2017 20:23:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314623 - head/lib/libefivar X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 20:23:25 -0000 Author: imp Date: Fri Mar 3 20:23:23 2017 New Revision: 314623 URL: https://svnweb.freebsd.org/changeset/base/314623 Log: Make sure guid table is compiled before we use it. Sponsored by: Netflix Modified: head/lib/libefivar/efivar.c Modified: head/lib/libefivar/efivar.c ============================================================================== --- head/lib/libefivar/efivar.c Fri Mar 3 20:23:21 2017 (r314622) +++ head/lib/libefivar/efivar.c Fri Mar 3 20:23:23 2017 (r314623) @@ -301,6 +301,7 @@ efi_guid_to_name(efi_guid_t *guid, char size_t i; uint32_t status; + efi_guid_tbl_compile(); for (i = 0; i < nitems(guid_tbl); i++) { if (uuid_equal(guid, &guid_tbl[i].guid, &status)) { *name = strdup(guid_tbl[i].name); @@ -337,6 +338,7 @@ efi_name_to_guid(const char *name, efi_g { size_t i; + efi_guid_tbl_compile(); for (i = 0; i < nitems(guid_tbl); i++) { if (strcmp(name, guid_tbl[i].name) == 0) { *guid = guid_tbl[i].guid; From owner-svn-src-all@freebsd.org Fri Mar 3 20:23:23 2017 Return-Path: Delivered-To: svn-src-all@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 00654CF7327; Fri, 3 Mar 2017 20:23:23 +0000 (UTC) (envelope-from des@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 A7BA610E5; Fri, 3 Mar 2017 20:23:22 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23KNLpJ063406; Fri, 3 Mar 2017 20:23:21 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23KNLuA063405; Fri, 3 Mar 2017 20:23:21 GMT (envelope-from des@FreeBSD.org) Message-Id: <201703032023.v23KNLuA063405@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Fri, 3 Mar 2017 20:23:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314622 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 20:23:23 -0000 Author: des Date: Fri Mar 3 20:23:21 2017 New Revision: 314622 URL: https://svnweb.freebsd.org/changeset/base/314622 Log: As suggested by several people, note that I prefer to communicate by email. Modified: head/MAINTAINERS Modified: head/MAINTAINERS ============================================================================== --- head/MAINTAINERS Fri Mar 3 20:23:18 2017 (r314621) +++ head/MAINTAINERS Fri Mar 3 20:23:21 2017 (r314622) @@ -49,17 +49,17 @@ dev/usb/wlan adrian Pre-commit review re code, please have patches reviewed by secteam. etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. etc/sendmail gshapiro Pre-commit review requested. Keep in sync with -STABLE. -fetch des Pre-commit review requested. +fetch des Pre-commit review requested, email only. geli pjd Pre-commit review requested (both sys/geom/eli/ and sbin/geom/class/eli/). isci(4) jimharris Pre-commit review requested. iwm(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org iwn(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org kqueue jmg Pre-commit review requested. Documentation Required. libdpv dteske Pre-commit review requested. Keep in sync with dpv(1). -libfetch des Pre-commit review requested. +libfetch des Pre-commit review requested, email only. libfigpar dteske Pre-commit review requested. -libpam des Pre-commit review requested. -linprocfs des Pre-commit review requested. +libpam des Pre-commit review requested, email only. +linprocfs des Pre-commit review requested, email only. lpr gad Pre-commit review requested, particularly for lpd/recvjob.c and lpd/printjob.c. nanobsd imp Pre-commit phabricator review requested. @@ -70,13 +70,13 @@ nvd(4) jimharris Pre-commit review requ nvme(4) jimharris Pre-commit review requested. nvmecontrol(8) jimharris Pre-commit review requested. opencrypto jmg Pre-commit review requested. Documentation Required. -openssh des Pre-commit review requested. +openssh des Pre-commit review requested, email only. openssl benl,jkim Pre-commit review requested. otus(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org pci bus imp,jhb Pre-commit review requested. pmcstudy(8) rrs Pre-commit review requested. -procfs des Pre-commit review requested. -pseudofs des Pre-commit review requested. +procfs des Pre-commit review requested, email only. +pseudofs des Pre-commit review requested, email only. release/release.sh gjb,re Pre-commit review and regression tests requested. sctp rrs,tuexen Pre-commit review requested (changes need to be backported to github). From owner-svn-src-all@freebsd.org Fri Mar 3 20:51:58 2017 Return-Path: Delivered-To: svn-src-all@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 93EADCF7B8B; Fri, 3 Mar 2017 20:51:58 +0000 (UTC) (envelope-from markj@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 6C1811DE6; Fri, 3 Mar 2017 20:51:58 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23Kpv4R073637; Fri, 3 Mar 2017 20:51:57 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23KpvIW073635; Fri, 3 Mar 2017 20:51:57 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201703032051.v23KpvIW073635@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 3 Mar 2017 20:51:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314624 - in head/sys/cam: . scsi X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 20:51:58 -0000 Author: markj Date: Fri Mar 3 20:51:57 2017 New Revision: 314624 URL: https://svnweb.freebsd.org/changeset/base/314624 Log: Reject userland CCBs that have CAM_UNLOCKED set. CAM_UNLOCKED is internal flag and cannot correctly be set by userland. Return EINVAL from CAMIOCOMMAND and CAMIOQUEUE if it is set. Also fix leaks in some of the error paths for CAMIOQUEUE. PR: 215356 Reviewed by: ken, mav MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D9869 Modified: head/sys/cam/cam_xpt.c head/sys/cam/scsi/scsi_pass.c Modified: head/sys/cam/cam_xpt.c ============================================================================== --- head/sys/cam/cam_xpt.c Fri Mar 3 20:23:23 2017 (r314623) +++ head/sys/cam/cam_xpt.c Fri Mar 3 20:51:57 2017 (r314624) @@ -435,6 +435,9 @@ xptdoioctl(struct cdev *dev, u_long cmd, inccb->csio.bio = NULL; #endif + if (inccb->ccb_h.flags & CAM_UNLOCKED) + return (EINVAL); + bus = xpt_find_bus(inccb->ccb_h.path_id); if (bus == NULL) return (EINVAL); Modified: head/sys/cam/scsi/scsi_pass.c ============================================================================== --- head/sys/cam/scsi/scsi_pass.c Fri Mar 3 20:23:23 2017 (r314623) +++ head/sys/cam/scsi/scsi_pass.c Fri Mar 3 20:51:57 2017 (r314624) @@ -1782,6 +1782,11 @@ passdoioctl(struct cdev *dev, u_long cmd inccb->csio.bio = NULL; #endif + if (inccb->ccb_h.flags & CAM_UNLOCKED) { + error = EINVAL; + break; + } + /* * Some CCB types, like scan bus and scan lun can only go * through the transport layer device. @@ -1875,24 +1880,27 @@ passdoioctl(struct cdev *dev, u_long cmd xpt_print(periph->path, "Copy of user CCB %p to " "kernel address %p failed with error %d\n", *user_ccb, ccb, error); - uma_zfree(softc->pass_zone, io_req); - cam_periph_lock(periph); - break; + goto camioqueue_error; } #if defined(BUF_TRACKING) || defined(FULL_BUF_TRACKING) if (ccb->ccb_h.func_code == XPT_SCSI_IO) ccb->csio.bio = NULL; #endif + if (ccb->ccb_h.flags & CAM_UNLOCKED) { + error = EINVAL; + goto camioqueue_error; + } + if (ccb->ccb_h.flags & CAM_CDB_POINTER) { if (ccb->csio.cdb_len > IOCDBLEN) { error = EINVAL; - break; + goto camioqueue_error; } error = copyin(ccb->csio.cdb_io.cdb_ptr, ccb->csio.cdb_io.cdb_bytes, ccb->csio.cdb_len); - if (error) - break; + if (error != 0) + goto camioqueue_error; ccb->ccb_h.flags &= ~CAM_CDB_POINTER; } @@ -1904,10 +1912,8 @@ passdoioctl(struct cdev *dev, u_long cmd xpt_print(periph->path, "CCB function code %#x is " "restricted to the XPT device\n", ccb->ccb_h.func_code); - uma_zfree(softc->pass_zone, io_req); - cam_periph_lock(periph); error = ENODEV; - break; + goto camioqueue_error; } /* @@ -1953,11 +1959,8 @@ passdoioctl(struct cdev *dev, u_long cmd || (fc == XPT_SMP_IO) || (fc == XPT_DEV_MATCH) || (fc == XPT_DEV_ADVINFO)) { error = passmemsetup(periph, io_req); - if (error != 0) { - uma_zfree(softc->pass_zone, io_req); - cam_periph_lock(periph); - break; - } + if (error != 0) + goto camioqueue_error; } else io_req->mapinfo.num_bufs_used = 0; @@ -2002,6 +2005,11 @@ passdoioctl(struct cdev *dev, u_long cmd TAILQ_INSERT_TAIL(&softc->done_queue, io_req, links); } break; + +camioqueue_error: + uma_zfree(softc->pass_zone, io_req); + cam_periph_lock(periph); + break; } case CAMIOGET: { From owner-svn-src-all@freebsd.org Fri Mar 3 20:57:41 2017 Return-Path: Delivered-To: svn-src-all@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 B466ACF7D4E; Fri, 3 Mar 2017 20:57:41 +0000 (UTC) (envelope-from markj@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 83EA7100A; Fri, 3 Mar 2017 20:57:41 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23Kveux075974; Fri, 3 Mar 2017 20:57:40 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23KveoK075973; Fri, 3 Mar 2017 20:57:40 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201703032057.v23KveoK075973@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 3 Mar 2017 20:57:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314625 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 20:57:41 -0000 Author: markj Date: Fri Mar 3 20:57:40 2017 New Revision: 314625 URL: https://svnweb.freebsd.org/changeset/base/314625 Log: Fix a ticks comparison in sched_pctcpu_update(). We may fail to reset the %CPU tracking window if a thread does not run for over half of the ticks rollover period, resulting in a bogus %CPU value for the thread until ticks fully rolls over. Handle this by comparing the unsigned difference ticks - ts_ltick with SCHED_TICK_TARG instead. Reviewed by: cem, jeff MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/sys/kern/sched_ule.c Modified: head/sys/kern/sched_ule.c ============================================================================== --- head/sys/kern/sched_ule.c Fri Mar 3 20:51:57 2017 (r314624) +++ head/sys/kern/sched_ule.c Fri Mar 3 20:57:40 2017 (r314625) @@ -1662,7 +1662,11 @@ sched_pctcpu_update(struct td_sched *ts, { int t = ticks; - if (t - ts->ts_ltick >= SCHED_TICK_TARG) { + /* + * The signed difference may be negative if the thread hasn't run for + * over half of the ticks rollover period. + */ + if ((u_int)(t - ts->ts_ltick) >= SCHED_TICK_TARG) { ts->ts_ticks = 0; ts->ts_ftick = t - SCHED_TICK_TARG; } else if (t - ts->ts_ftick >= SCHED_TICK_MAX) { From owner-svn-src-all@freebsd.org Fri Mar 3 21:03:30 2017 Return-Path: Delivered-To: svn-src-all@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 0C807CF7F57; Fri, 3 Mar 2017 21:03:30 +0000 (UTC) (envelope-from vangyzen@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 C031F159D; Fri, 3 Mar 2017 21:03:29 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23L3SAw080027; Fri, 3 Mar 2017 21:03:28 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23L3SMW080026; Fri, 3 Mar 2017 21:03:28 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <201703032103.v23L3SMW080026@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen Date: Fri, 3 Mar 2017 21:03:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314626 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 21:03:30 -0000 Author: vangyzen Date: Fri Mar 3 21:03:28 2017 New Revision: 314626 URL: https://svnweb.freebsd.org/changeset/base/314626 Log: Fix grammar in some comments in subr_sleepqueue.c While I'm here, remove trailing whitespace. Reviewed by: kib, mostly, as part of a larger review MFC after: 3 days Modified: head/sys/kern/subr_sleepqueue.c Modified: head/sys/kern/subr_sleepqueue.c ============================================================================== --- head/sys/kern/subr_sleepqueue.c Fri Mar 3 20:57:40 2017 (r314625) +++ head/sys/kern/subr_sleepqueue.c Fri Mar 3 21:03:28 2017 (r314626) @@ -26,7 +26,7 @@ /* * Implementation of sleep queues used to hold queue of threads blocked on - * a wait channel. Sleep queues different from turnstiles in that wait + * a wait channel. Sleep queues are different from turnstiles in that wait * channels are not owned by anyone, so there is no priority propagation. * Sleep queues can also provide a timeout and can also be interrupted by * signals. That said, there are several similarities between the turnstile @@ -36,7 +36,7 @@ * a linked list of queues. An individual queue is located by using a hash * to pick a chain, locking the chain, and then walking the chain searching * for the queue. This means that a wait channel object does not need to - * embed it's queue head just as locks do not embed their turnstile queue + * embed its queue head just as locks do not embed their turnstile queue * head. Threads also carry around a sleep queue that they lend to the * wait channel when blocking. Just as in turnstiles, the queue includes * a free list of the sleep queues of other threads blocked on the same @@ -98,7 +98,7 @@ __FBSDID("$FreeBSD$"); #define SC_LOOKUP(wc) &sleepq_chains[SC_HASH(wc)] #define NR_SLEEPQS 2 /* - * There two different lists of sleep queues. Both lists are connected + * There are two different lists of sleep queues. Both lists are connected * via the sq_hash entries. The first list is the sleep queue chain list * that a sleep queue is on when it is attached to a wait channel. The * second list is the free list hung off of a sleep queue that is attached @@ -183,7 +183,7 @@ init_sleepqueue_profiling(void) for (i = 0; i < SC_TABLESIZE; i++) { snprintf(chain_name, sizeof(chain_name), "%u", i); - chain_oid = SYSCTL_ADD_NODE(NULL, + chain_oid = SYSCTL_ADD_NODE(NULL, SYSCTL_STATIC_CHILDREN(_debug_sleepq_chains), OID_AUTO, chain_name, CTLFLAG_RD, NULL, "sleepq chain stats"); SYSCTL_ADD_UINT(NULL, SYSCTL_CHILDREN(chain_oid), OID_AUTO, @@ -218,7 +218,7 @@ init_sleepqueues(void) #else NULL, NULL, sleepq_init, NULL, UMA_ALIGN_CACHE, 0); #endif - + thread0.td_sleepqueue = sleepq_alloc(); } @@ -545,7 +545,7 @@ sleepq_switch(void *wchan, int pri) mtx_assert(&sc->sc_lock, MA_OWNED); THREAD_LOCK_ASSERT(td, MA_OWNED); - /* + /* * If we have a sleep queue, then we've already been woken up, so * just return. */ @@ -572,7 +572,7 @@ sleepq_switch(void *wchan, int pri) #endif } mtx_unlock_spin(&sc->sc_lock); - return; + return; } #ifdef SLEEPQUEUE_PROFILING if (prof_enabled) From owner-svn-src-all@freebsd.org Fri Mar 3 21:32:29 2017 Return-Path: Delivered-To: svn-src-all@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 3FB75CF77C2; Fri, 3 Mar 2017 21:32:29 +0000 (UTC) (envelope-from cy@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 05A1E1528; Fri, 3 Mar 2017 21:32:28 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23LWSkH092062; Fri, 3 Mar 2017 21:32:28 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23LWSlK092061; Fri, 3 Mar 2017 21:32:28 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201703032132.v23LWSlK092061@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Fri, 3 Mar 2017 21:32:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314627 - head/contrib/ipfilter/lib X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 21:32:29 -0000 Author: cy Date: Fri Mar 3 21:32:27 2017 New Revision: 314627 URL: https://svnweb.freebsd.org/changeset/base/314627 Log: Fix leak (free str before returning when ctx's calloc fails). Submitted by: trix_juniper.net (Tom Rix) Discovered by: clang's static analyzer MFC after: 4 days Relnotes: ngie Differential Revision: D9877 Modified: head/contrib/ipfilter/lib/save_v2trap.c Modified: head/contrib/ipfilter/lib/save_v2trap.c ============================================================================== --- head/contrib/ipfilter/lib/save_v2trap.c Fri Mar 3 21:03:28 2017 (r314626) +++ head/contrib/ipfilter/lib/save_v2trap.c Fri Mar 3 21:32:27 2017 (r314627) @@ -124,8 +124,10 @@ snmpv2_parse(char **strings) str = strdup(*strings); ctx = calloc(1, sizeof(*ctx)); - if (ctx == NULL) + if (ctx == NULL) { + free(str); return NULL; + } ctx->fd = -1; From owner-svn-src-all@freebsd.org Fri Mar 3 21:35:11 2017 Return-Path: Delivered-To: svn-src-all@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 3B51BCF79ED; Fri, 3 Mar 2017 21:35:11 +0000 (UTC) (envelope-from bdrewery@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 0A7861954; Fri, 3 Mar 2017 21:35:10 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23LZA0G092348; Fri, 3 Mar 2017 21:35:10 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23LZA7u092347; Fri, 3 Mar 2017 21:35:10 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201703032135.v23LZA7u092347@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 3 Mar 2017 21:35:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314628 - stable/11 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 21:35:11 -0000 Author: bdrewery Date: Fri Mar 3 21:35:09 2017 New Revision: 314628 URL: https://svnweb.freebsd.org/changeset/base/314628 Log: MFC r313184: Remove LOCAL_LIB_DIRS warning added in r275839. Modified: stable/11/Makefile.inc1 Directory Properties: stable/11/ (props changed) Modified: stable/11/Makefile.inc1 ============================================================================== --- stable/11/Makefile.inc1 Fri Mar 3 21:32:27 2017 (r314627) +++ stable/11/Makefile.inc1 Fri Mar 3 21:35:09 2017 (r314628) @@ -245,8 +245,6 @@ _REDUNDANT_LIB_DIRS+= ${LOCAL_LIB_DIR .for _DIR in ${LOCAL_LIB_DIRS} .if empty(_REDUNDANT_LIB_DIRS:M${_DIR}) && exists(${.CURDIR}/${_DIR}/Makefile) SUBDIR+= ${_DIR} -.else -.warning ${_DIR} not added to SUBDIR list. See UPDATING 20141121. .endif .endfor From owner-svn-src-all@freebsd.org Fri Mar 3 21:37:34 2017 Return-Path: Delivered-To: svn-src-all@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 BF54BCF7AA5; Fri, 3 Mar 2017 21:37:34 +0000 (UTC) (envelope-from bdrewery@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 8E75F1AE1; Fri, 3 Mar 2017 21:37:34 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23LbX9j092478; Fri, 3 Mar 2017 21:37:33 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23LbX6u092477; Fri, 3 Mar 2017 21:37:33 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201703032137.v23LbX6u092477@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 3 Mar 2017 21:37:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314629 - stable/11 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 21:37:34 -0000 Author: bdrewery Date: Fri Mar 3 21:37:33 2017 New Revision: 314629 URL: https://svnweb.freebsd.org/changeset/base/314629 Log: MFC r313163: native-xtools: Add missing readelf. Modified: stable/11/Makefile.inc1 Directory Properties: stable/11/ (props changed) Modified: stable/11/Makefile.inc1 ============================================================================== --- stable/11/Makefile.inc1 Fri Mar 3 21:35:09 2017 (r314628) +++ stable/11/Makefile.inc1 Fri Mar 3 21:37:33 2017 (r314629) @@ -1918,6 +1918,7 @@ native-xtools: .PHONY usr.bin/mktemp \ usr.bin/mt \ usr.bin/patch \ + usr.bin/readelf \ usr.bin/sed \ usr.bin/sort \ usr.bin/tar \ From owner-svn-src-all@freebsd.org Fri Mar 3 21:38:36 2017 Return-Path: Delivered-To: svn-src-all@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 3052BCF7B38; Fri, 3 Mar 2017 21:38:36 +0000 (UTC) (envelope-from bdrewery@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 F3AC21D1B; Fri, 3 Mar 2017 21:38:35 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23LcZ6p092680; Fri, 3 Mar 2017 21:38:35 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23LcZaZ092679; Fri, 3 Mar 2017 21:38:35 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201703032138.v23LcZaZ092679@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 3 Mar 2017 21:38:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314630 - stable/11 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 21:38:36 -0000 Author: bdrewery Date: Fri Mar 3 21:38:34 2017 New Revision: 314630 URL: https://svnweb.freebsd.org/changeset/base/314630 Log: MFC r313904: META_MODE+xdev: Don't rebuild build-tools during normal build. Modified: stable/11/Makefile.inc1 Directory Properties: stable/11/ (props changed) Modified: stable/11/Makefile.inc1 ============================================================================== --- stable/11/Makefile.inc1 Fri Mar 3 21:37:33 2017 (r314629) +++ stable/11/Makefile.inc1 Fri Mar 3 21:38:34 2017 (r314630) @@ -2471,6 +2471,10 @@ CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CDTMP= ${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN} CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN} +.if ${MK_META_MODE} != "no" +# Don't rebuild build-tools targets during normal build. +CD2MAKE+= BUILD_TOOLS_META=.NOMETA_CMP +.endif XDDESTDIR=${DESTDIR}/${XDTP} .if !defined(OSREL) OSREL!= uname -r | sed -e 's/[-(].*//' From owner-svn-src-all@freebsd.org Fri Mar 3 21:39:38 2017 Return-Path: Delivered-To: svn-src-all@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 0574FCF7BBD; Fri, 3 Mar 2017 21:39:38 +0000 (UTC) (envelope-from bdrewery@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 C89C51E53; Fri, 3 Mar 2017 21:39:37 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23LdaH3092770; Fri, 3 Mar 2017 21:39:36 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23Ldae3092769; Fri, 3 Mar 2017 21:39:36 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201703032139.v23Ldae3092769@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 3 Mar 2017 21:39:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314631 - stable/11/usr.bin/timeout X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 21:39:38 -0000 Author: bdrewery Date: Fri Mar 3 21:39:36 2017 New Revision: 314631 URL: https://svnweb.freebsd.org/changeset/base/314631 Log: MFC r314001: Make it more clear that -k sends SIGKILL, not the -s signal. Modified: stable/11/usr.bin/timeout/timeout.1 Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/timeout/timeout.1 ============================================================================== --- stable/11/usr.bin/timeout/timeout.1 Fri Mar 3 21:38:34 2017 (r314630) +++ stable/11/usr.bin/timeout/timeout.1 Fri Mar 3 21:39:36 2017 (r314631) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 17, 2017 +.Dd February 20, 2017 .Dt TIMEOUT 1 .Os .Sh NAME @@ -68,7 +68,9 @@ By default, .Ar SIGTERM . is sent. .It Fl k Ar time , Fl -kill-after Ar time -Send a second kill signal if +Send a +.Ar SIGKILL +signal if .Ar command is still running after .Ar time From owner-svn-src-all@freebsd.org Fri Mar 3 21:41:19 2017 Return-Path: Delivered-To: svn-src-all@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 117B9CF7CAE; Fri, 3 Mar 2017 21:41:19 +0000 (UTC) (envelope-from bdrewery@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 D08E6105C; Fri, 3 Mar 2017 21:41:18 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23LfH0b093639; Fri, 3 Mar 2017 21:41:17 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23LfHij093638; Fri, 3 Mar 2017 21:41:17 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201703032141.v23LfHij093638@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 3 Mar 2017 21:41:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314632 - stable/10/usr.bin/timeout X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 21:41:19 -0000 Author: bdrewery Date: Fri Mar 3 21:41:17 2017 New Revision: 314632 URL: https://svnweb.freebsd.org/changeset/base/314632 Log: MFC r313867,r313869,r313870,r314001: r313867: Add history and Authors section in the manpage r313869: Also add vsevolod@ in the authors r313870: Use full name for the month r314001: Make it more clear that -k sends SIGKILL, not the -s signal. Modified: stable/10/usr.bin/timeout/timeout.1 Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.bin/timeout/timeout.1 ============================================================================== --- stable/10/usr.bin/timeout/timeout.1 Fri Mar 3 21:39:36 2017 (r314631) +++ stable/10/usr.bin/timeout/timeout.1 Fri Mar 3 21:41:17 2017 (r314632) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd Oct 28, 2014 +.Dd February 20, 2017 .Dt TIMEOUT 1 .Os .Sh NAME @@ -68,7 +68,9 @@ By default, .Ar SIGTERM . is sent. .It Fl k Ar time , Fl -kill-after Ar time -Send a second kill signal if +Send a +.Ar SIGKILL +signal if .Ar command is still running after .Ar time @@ -127,3 +129,12 @@ the exit status return is 125. .Sh SEE ALSO .Xr kill 1 , .Xr signal 3 +.Sh HISTORY +The +.Nm +command first appeared in +.Fx 10.3 . +.Sh AUTHORS +.An Baptiste Daroussin Aq Mt bapt@FreeBSD.org +and +.An Vsevolod Stakhov Aq Mt vsevolod@FreeBSD.org From owner-svn-src-all@freebsd.org Fri Mar 3 21:41:27 2017 Return-Path: Delivered-To: svn-src-all@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 B9949CF7D4B; Fri, 3 Mar 2017 21:41:27 +0000 (UTC) (envelope-from bdrewery@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 829241101; Fri, 3 Mar 2017 21:41:27 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23LfQfZ093689; Fri, 3 Mar 2017 21:41:26 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23LfQub093688; Fri, 3 Mar 2017 21:41:26 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201703032141.v23LfQub093688@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 3 Mar 2017 21:41:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314633 - stable/11 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 21:41:27 -0000 Author: bdrewery Date: Fri Mar 3 21:41:26 2017 New Revision: 314633 URL: https://svnweb.freebsd.org/changeset/base/314633 Log: MFC r313905: xdev: Build yacc which is needed for recent libpcap updates. Modified: stable/11/Makefile.inc1 Directory Properties: stable/11/ (props changed) Modified: stable/11/Makefile.inc1 ============================================================================== --- stable/11/Makefile.inc1 Fri Mar 3 21:41:17 2017 (r314632) +++ stable/11/Makefile.inc1 Fri Mar 3 21:41:26 2017 (r314633) @@ -2494,7 +2494,8 @@ _xb-worldtmp: .PHONY _xb-bootstrap-tools: .PHONY .for _tool in \ ${_clang_tblgen} \ - ${_gperf} + ${_gperf} \ + ${_yacc} ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ${CDMAKE} DIRPRFX=${_tool}/ obj; \ From owner-svn-src-all@freebsd.org Fri Mar 3 21:43:05 2017 Return-Path: Delivered-To: svn-src-all@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 01853CF7199; Fri, 3 Mar 2017 21:43:05 +0000 (UTC) (envelope-from bdrewery@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 B40531657; Fri, 3 Mar 2017 21:43:04 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23Lh3OY096983; Fri, 3 Mar 2017 21:43:03 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23Lh3fS096979; Fri, 3 Mar 2017 21:43:03 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201703032143.v23Lh3fS096979@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 3 Mar 2017 21:43:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314634 - in stable/11: contrib/libc-vis contrib/netbsd-tests/lib/libc/locale lib/libc/tests/nss X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 21:43:05 -0000 Author: bdrewery Date: Fri Mar 3 21:43:03 2017 New Revision: 314634 URL: https://svnweb.freebsd.org/changeset/base/314634 Log: MFC r309626,r309627,r309659: r309626: strvis(3): Avoid internal state of multibyte functions being tainted. r309627: Remove unneeded hack fixed by r309626. r309659: Support spaces in group names. Modified: stable/11/contrib/libc-vis/vis.c stable/11/contrib/netbsd-tests/lib/libc/locale/t_mbtowc.c stable/11/lib/libc/tests/nss/getgr_test.c Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/libc-vis/vis.c ============================================================================== --- stable/11/contrib/libc-vis/vis.c Fri Mar 3 21:41:26 2017 (r314633) +++ stable/11/contrib/libc-vis/vis.c Fri Mar 3 21:43:03 2017 (r314634) @@ -353,12 +353,14 @@ makeextralist(int flags, const char *src wchar_t *dst, *d; size_t len; const wchar_t *s; + mbstate_t mbstate; + bzero(&mbstate, sizeof(mbstate)); len = strlen(src); if ((dst = calloc(len + MAXEXTRAS, sizeof(*dst))) == NULL) return NULL; - if ((flags & VIS_NOLOCALE) || mbstowcs(dst, src, len) == (size_t)-1) { + if ((flags & VIS_NOLOCALE) || mbsrtowcs(dst, &src, len, &mbstate) == (size_t)-1) { size_t i; for (i = 0; i < len; i++) dst[i] = (wchar_t)(u_char)src[i]; @@ -400,6 +402,7 @@ istrsenvisx(char **mbdstp, size_t *dlen, int clen = 0, cerr, error = -1, i, shft; char *mbdst, *mdst; ssize_t mbslength, maxolen; + mbstate_t mbstate; _DIAGASSERT(mbdstp != NULL); _DIAGASSERT(mbsrc != NULL || mblength == 0); @@ -456,10 +459,11 @@ istrsenvisx(char **mbdstp, size_t *dlen, */ if (mbslength == 1) mbslength++; + bzero(&mbstate, sizeof(mbstate)); while (mbslength > 0) { /* Convert one multibyte character to wchar_t. */ if (!cerr) - clen = mbtowc(src, mbsrc, MB_LEN_MAX); + clen = mbrtowc(src, mbsrc, MB_LEN_MAX, &mbstate); if (cerr || clen < 0) { /* Conversion error, process as a byte instead. */ *src = (wint_t)(u_char)*mbsrc; @@ -530,9 +534,10 @@ istrsenvisx(char **mbdstp, size_t *dlen, len = wcslen(start); maxolen = dlen ? *dlen : (wcslen(start) * MB_LEN_MAX + 1); olen = 0; + bzero(&mbstate, sizeof(mbstate)); for (dst = start; len > 0; len--) { if (!cerr) - clen = wctomb(mbdst, *dst); + clen = wcrtomb(mbdst, *dst, &mbstate); if (cerr || clen < 0) { /* * Conversion error, process as a byte(s) instead. Modified: stable/11/contrib/netbsd-tests/lib/libc/locale/t_mbtowc.c ============================================================================== --- stable/11/contrib/netbsd-tests/lib/libc/locale/t_mbtowc.c Fri Mar 3 21:41:26 2017 (r314633) +++ stable/11/contrib/netbsd-tests/lib/libc/locale/t_mbtowc.c Fri Mar 3 21:43:03 2017 (r314634) @@ -137,16 +137,10 @@ ATF_TC_BODY(mbtowc, tc) h_mbtowc("ja_JP.ISO2022-JP", "\033$B", "\033$B$\"\033(B"); h_mbtowc("ja_JP.SJIS", "\202", "\202\240"); h_mbtowc("ja_JP.eucJP", "\244", "\244\242"); -#ifndef __FreeBSD__ /* Moved last as it fails */ h_mbtowc("zh_CN.GB18030", "\241", "\241\241"); -#endif h_mbtowc("zh_TW.Big5", "\241", "\241@"); h_mbtowc("zh_TW.eucTW", "\241", "\241\241"); -#ifdef __FreeBSD__ - atf_tc_expect_fail("zh_CN.GB18030"); - h_mbtowc("zh_CN.GB18030", "\241", "\241\241"); -#endif } ATF_TP_ADD_TCS(tp) Modified: stable/11/lib/libc/tests/nss/getgr_test.c ============================================================================== --- stable/11/lib/libc/tests/nss/getgr_test.c Fri Mar 3 21:41:26 2017 (r314633) +++ stable/11/lib/libc/tests/nss/getgr_test.c Fri Mar 3 21:43:03 2017 (r314634) @@ -176,7 +176,7 @@ sdump_group(struct group *grp, char *buf char **cp; int written; - written = snprintf(buffer, buflen, "%s %s %d", + written = snprintf(buffer, buflen, "%s:%s:%d:", grp->gr_name, grp->gr_passwd, grp->gr_gid); buffer += written; if (written > buflen) @@ -186,7 +186,8 @@ sdump_group(struct group *grp, char *buf if (grp->gr_mem != NULL) { if (*(grp->gr_mem) != '\0') { for (cp = grp->gr_mem; *cp; ++cp) { - written = snprintf(buffer, buflen, " %s",*cp); + written = snprintf(buffer, buflen, "%s%s", + cp == grp->gr_mem ? "" : ",", *cp); buffer += written; if (written > buflen) return; @@ -196,9 +197,9 @@ sdump_group(struct group *grp, char *buf return; } } else - snprintf(buffer, buflen, " nomem"); + snprintf(buffer, buflen, "nomem"); } else - snprintf(buffer, buflen, " (null)"); + snprintf(buffer, buflen, "(null)"); } static int @@ -206,6 +207,7 @@ group_read_snapshot_func(struct group *g { StringList *sl; char *s, *ps, *ts; + const char *sep; int i; printf("1 line read from snapshot:\n%s\n", line); @@ -213,8 +215,9 @@ group_read_snapshot_func(struct group *g i = 0; sl = NULL; ps = line; + sep = ":"; memset(grp, 0, sizeof(struct group)); - while ((s = strsep(&ps, " ")) != NULL) { + while ((s = strsep(&ps, sep)) != NULL) { switch (i) { case 0: grp->gr_name = strdup(s); @@ -235,6 +238,8 @@ group_read_snapshot_func(struct group *g grp->gr_passwd = NULL; return (-1); } + /* Change to parsing groups. */ + sep = ","; break; default: From owner-svn-src-all@freebsd.org Fri Mar 3 21:46:31 2017 Return-Path: Delivered-To: svn-src-all@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 635F9CF73BB; Fri, 3 Mar 2017 21:46:31 +0000 (UTC) (envelope-from bdrewery@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 327B01914; Fri, 3 Mar 2017 21:46:31 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23LkUWs097188; Fri, 3 Mar 2017 21:46:30 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23LkUJl097187; Fri, 3 Mar 2017 21:46:30 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201703032146.v23LkUJl097187@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 3 Mar 2017 21:46:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314635 - stable/11 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 21:46:31 -0000 Author: bdrewery Date: Fri Mar 3 21:46:30 2017 New Revision: 314635 URL: https://svnweb.freebsd.org/changeset/base/314635 Log: MFC r313907: xdev: Fix after libc++ update in r300873. Modified: stable/11/Makefile.inc1 Directory Properties: stable/11/ (props changed) Modified: stable/11/Makefile.inc1 ============================================================================== --- stable/11/Makefile.inc1 Fri Mar 3 21:43:03 2017 (r314634) +++ stable/11/Makefile.inc1 Fri Mar 3 21:46:30 2017 (r314635) @@ -2461,10 +2461,25 @@ CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREF INSTALL="sh ${.CURDIR}/tools/install.sh" CDENV= ${CDBENV} \ TOOLS_PREFIX=${XDTP} -CD2CFLAGS=-isystem ${XDDESTDIR}/usr/include -L${XDDESTDIR}/usr/lib \ - --sysroot=${XDDESTDIR}/ -B${XDDESTDIR}/usr/libexec \ - -B${XDDESTDIR}/usr/bin -B${XDDESTDIR}/usr/lib -CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CXX="${CXX} ${CD2CFLAGS}" \ + +.if ${WANT_COMPILER_TYPE} == gcc || \ + (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc) +# GCC requires -isystem and -L when using a cross-compiler. --sysroot +# won't set header path and -L is used to ensure the base library path +# is added before the port PREFIX library path. +CD2CFLAGS+= -isystem ${XDDESTDIR}/usr/include -L${XDDESTDIR}/usr/lib +# GCC requires -B to find /usr/lib/crti.o when using a cross-compiler +# combined with --sysroot. +CD2CFLAGS+= -B${XDDESTDIR}/usr/lib +# Force using libc++ for external GCC. +# XXX: This should be checking MK_GNUCXX == no +.if ${X_COMPILER_VERSION} >= 40800 +CD2CXXFLAGS+= -isystem ${XDDESTDIR}/usr/include/c++/v1 -std=c++11 \ + -nostdinc++ +.endif +.endif +CD2CFLAGS+= --sysroot=${XDDESTDIR}/ +CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CXX="${CXX} ${CD2CXXFLAGS} ${CD2CFLAGS}" \ CPP="${CPP} ${CD2CFLAGS}" \ MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} From owner-svn-src-all@freebsd.org Fri Mar 3 22:42:44 2017 Return-Path: Delivered-To: svn-src-all@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 DD1B4CF6841; Fri, 3 Mar 2017 22:42:44 +0000 (UTC) (envelope-from avg@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 9A5571C4A; Fri, 3 Mar 2017 22:42:44 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23Mghdv020836; Fri, 3 Mar 2017 22:42:43 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23Mghiv020834; Fri, 3 Mar 2017 22:42:43 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703032242.v23Mghiv020834@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Fri, 3 Mar 2017 22:42:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314636 - in head/sys/x86: include x86 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 22:42:45 -0000 Author: avg Date: Fri Mar 3 22:42:43 2017 New Revision: 314636 URL: https://svnweb.freebsd.org/changeset/base/314636 Log: MCA: add AMD Error Thresholding support Currently the feature is implemented only for a subset of errors reported via Bank 4. The subset includes only DRAM-related errors. The new code builds upon and reuses the Intel CMC (Correctable MCE Counters) support code. However, the AMD feature is quite different and, unfortunately, much less regular. For references please see AMD BKDGs for models 10h - 16h. Specifically, see MSR0000_0413 NB Machine Check Misc (Thresholding) Register (MC4_MISC0). http://developer.amd.com/resources/developer-guides-manuals/ Reviewed by: jhb MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D9613 Modified: head/sys/x86/include/specialreg.h head/sys/x86/x86/mca.c Modified: head/sys/x86/include/specialreg.h ============================================================================== --- head/sys/x86/include/specialreg.h Fri Mar 3 21:46:30 2017 (r314635) +++ head/sys/x86/include/specialreg.h Fri Mar 3 22:42:43 2017 (r314636) @@ -704,6 +704,22 @@ #define MC_MISC_ADDRESS_MODE 0x00000000000001c0 /* If MCG_CAP_SER_P */ #define MC_CTL2_THRESHOLD 0x0000000000007fff #define MC_CTL2_CMCI_EN 0x0000000040000000 +#define MC_AMDNB_BANK 4 +#define MC_MISC_AMDNB_VAL 0x8000000000000000 /* Counter presence valid */ +#define MC_MISC_AMDNB_CNTP 0x4000000000000000 /* Counter present */ +#define MC_MISC_AMDNB_LOCK 0x2000000000000000 /* Register locked */ +#define MC_MISC_AMDNB_LVT_MASK 0x00f0000000000000 /* Extended LVT offset */ +#define MC_MISC_AMDNB_LVT_SHIFT 52 +#define MC_MISC_AMDNB_CNTEN 0x0008000000000000 /* Counter enabled */ +#define MC_MISC_AMDNB_INT_MASK 0x0006000000000000 /* Interrupt type */ +#define MC_MISC_AMDNB_INT_LVT 0x0002000000000000 /* Interrupt via Extended LVT */ +#define MC_MISC_AMDNB_INT_SMI 0x0004000000000000 /* SMI */ +#define MC_MISC_AMDNB_OVERFLOW 0x0001000000000000 /* Counter overflow */ +#define MC_MISC_AMDNB_CNT_MASK 0x00000fff00000000 /* Counter value */ +#define MC_MISC_AMDNB_CNT_SHIFT 32 +#define MC_MISC_AMDNB_CNT_MAX 0xfff +#define MC_MISC_AMDNB_PTR_MASK 0x00000000ff000000 /* Pointer to additional registers */ +#define MC_MISC_AMDNB_PTR_SHIFT 24 /* * The following four 3-byte registers control the non-cacheable regions. Modified: head/sys/x86/x86/mca.c ============================================================================== --- head/sys/x86/x86/mca.c Fri Mar 3 21:46:30 2017 (r314635) +++ head/sys/x86/x86/mca.c Fri Mar 3 22:42:43 2017 (r314636) @@ -75,6 +75,11 @@ struct cmc_state { int max_threshold; time_t last_intr; }; + +struct amd_et_state { + int cur_threshold; + time_t last_intr; +}; #endif struct mca_internal { @@ -118,8 +123,11 @@ static struct task mca_refill_task, mca_ static struct mtx mca_lock; #ifdef DEV_APIC -static struct cmc_state **cmc_state; /* Indexed by cpuid, bank */ +static struct cmc_state **cmc_state; /* Indexed by cpuid, bank. */ +static struct amd_et_state *amd_et_state; /* Indexed by cpuid. */ static int cmc_throttle = 60; /* Time in seconds to throttle CMCI. */ + +static int amd_elvt = -1; #endif static int @@ -521,19 +529,15 @@ mca_record_entry(enum scan_mode mode, co * cmc_throttle seconds or the periodic scan. If a periodic scan * finds that the threshold is too high, it is lowered. */ -static void -cmci_update(enum scan_mode mode, int bank, int valid, struct mca_record *rec) +static int +update_threshold(enum scan_mode mode, int valid, int last_intr, int count, + int cur_threshold, int max_threshold) { - struct cmc_state *cc; - uint64_t ctl; u_int delta; - int count, limit; + int limit; - /* Fetch the current limit for this bank. */ - cc = &cmc_state[PCPU_GET(cpuid)][bank]; - ctl = rdmsr(MSR_MC_CTL2(bank)); - count = (rec->mr_status & MC_STATUS_COR_COUNT) >> 38; - delta = (u_int)(time_uptime - cc->last_intr); + delta = (u_int)(time_uptime - last_intr); + limit = cur_threshold; /* * If an interrupt was received less than cmc_throttle seconds @@ -542,16 +546,11 @@ cmci_update(enum scan_mode mode, int ban * double the threshold up to the max. */ if (mode == CMCI && valid) { - limit = ctl & MC_CTL2_THRESHOLD; if (delta < cmc_throttle && count >= limit && - limit < cc->max_threshold) { - limit = min(limit << 1, cc->max_threshold); - ctl &= ~MC_CTL2_THRESHOLD; - ctl |= limit; - wrmsr(MSR_MC_CTL2(bank), ctl); + limit < max_threshold) { + limit = min(limit << 1, max_threshold); } - cc->last_intr = time_uptime; - return; + return (limit); } /* @@ -559,31 +558,81 @@ cmci_update(enum scan_mode mode, int ban * should be lowered. */ if (mode != POLLED) - return; + return (limit); /* If a CMCI occured recently, do nothing for now. */ if (delta < cmc_throttle) - return; + return (limit); /* * Compute a new limit based on the average rate of events per * cmc_throttle seconds since the last interrupt. */ if (valid) { - count = (rec->mr_status & MC_STATUS_COR_COUNT) >> 38; limit = count * cmc_throttle / delta; if (limit <= 0) limit = 1; - else if (limit > cc->max_threshold) - limit = cc->max_threshold; - } else + else if (limit > max_threshold) + limit = max_threshold; + } else { limit = 1; - if ((ctl & MC_CTL2_THRESHOLD) != limit) { + } + return (limit); +} + +static void +cmci_update(enum scan_mode mode, int bank, int valid, struct mca_record *rec) +{ + struct cmc_state *cc; + uint64_t ctl; + int cur_threshold, new_threshold; + int count; + + /* Fetch the current limit for this bank. */ + cc = &cmc_state[PCPU_GET(cpuid)][bank]; + ctl = rdmsr(MSR_MC_CTL2(bank)); + count = (rec->mr_status & MC_STATUS_COR_COUNT) >> 38; + cur_threshold = ctl & MC_CTL2_THRESHOLD; + + new_threshold = update_threshold(mode, valid, cc->last_intr, count, + cur_threshold, cc->max_threshold); + + if (mode == CMCI && valid) + cc->last_intr = time_uptime; + if (new_threshold != cur_threshold) { ctl &= ~MC_CTL2_THRESHOLD; - ctl |= limit; + ctl |= new_threshold; wrmsr(MSR_MC_CTL2(bank), ctl); } } + +static void +amd_thresholding_update(enum scan_mode mode, int bank, int valid) +{ + struct amd_et_state *cc; + uint64_t misc; + int new_threshold; + int count; + + KASSERT(bank == MC_AMDNB_BANK, + ("%s: unexpected bank %d", __func__, bank)); + cc = &amd_et_state[PCPU_GET(cpuid)]; + misc = rdmsr(MSR_MC_MISC(bank)); + count = (misc & MC_MISC_AMDNB_CNT_MASK) >> MC_MISC_AMDNB_CNT_SHIFT; + count = count - (MC_MISC_AMDNB_CNT_MAX - cc->cur_threshold); + + new_threshold = update_threshold(mode, valid, cc->last_intr, count, + cc->cur_threshold, MC_MISC_AMDNB_CNT_MAX); + + cc->cur_threshold = new_threshold; + misc &= ~MC_MISC_AMDNB_CNT_MASK; + misc |= (uint64_t)(MC_MISC_AMDNB_CNT_MAX - cc->cur_threshold) + << MC_MISC_AMDNB_CNT_SHIFT; + misc &= ~MC_MISC_AMDNB_OVERFLOW; + wrmsr(MSR_MC_MISC(bank), misc); + if (mode == CMCI && valid) + cc->last_intr = time_uptime; +} #endif /* @@ -638,8 +687,12 @@ mca_scan(enum scan_mode mode) * If this is a bank this CPU monitors via CMCI, * update the threshold. */ - if (PCPU_GET(cmci_mask) & 1 << i) - cmci_update(mode, i, valid, &rec); + if (PCPU_GET(cmci_mask) & 1 << i) { + if (cmc_state != NULL) + cmci_update(mode, i, valid, &rec); + else + amd_thresholding_update(mode, i, valid); + } #endif } if (mode == POLLED) @@ -751,6 +804,18 @@ cmci_setup(void) &cmc_throttle, 0, sysctl_positive_int, "I", "Interval in seconds to throttle corrected MC interrupts"); } + +static void +amd_thresholding_setup(void) +{ + + amd_et_state = malloc((mp_maxid + 1) * sizeof(struct amd_et_state *), + M_MCA, M_WAITOK | M_ZERO); + SYSCTL_ADD_PROC(NULL, SYSCTL_STATIC_CHILDREN(_hw_mca), OID_AUTO, + "cmc_throttle", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, + &cmc_throttle, 0, sysctl_positive_int, "I", + "Interval in seconds to throttle corrected MC interrupts"); +} #endif static void @@ -789,6 +854,9 @@ mca_setup(uint64_t mcg_cap) #ifdef DEV_APIC if (mcg_cap & MCG_CAP_CMCI_P) cmci_setup(); + else if (cpu_vendor_id == CPU_VENDOR_AMD && + CPUID_TO_FAMILY(cpu_id) >= 0x10 && CPUID_TO_FAMILY(cpu_id) <= 16) + amd_thresholding_setup(); #endif } @@ -863,6 +931,82 @@ cmci_resume(int i) ctl |= MC_CTL2_CMCI_EN | 1; wrmsr(MSR_MC_CTL2(i), ctl); } + +static void +amd_thresholding_start(struct amd_et_state *cc) +{ + uint64_t misc; + + KASSERT(amd_elvt >= 0, ("ELVT offset is not set")); + misc = rdmsr(MSR_MC_MISC(MC_AMDNB_BANK)); + misc &= ~MC_MISC_AMDNB_INT_MASK; + misc |= MC_MISC_AMDNB_INT_LVT; + misc &= ~MC_MISC_AMDNB_LVT_MASK; + misc |= (uint64_t)amd_elvt << MC_MISC_AMDNB_LVT_SHIFT; + misc &= ~MC_MISC_AMDNB_CNT_MASK; + misc |= (uint64_t)(MC_MISC_AMDNB_CNT_MAX - cc->cur_threshold) + << MC_MISC_AMDNB_CNT_SHIFT; + misc &= ~MC_MISC_AMDNB_OVERFLOW; + misc |= MC_MISC_AMDNB_CNTEN; + + wrmsr(MSR_MC_MISC(MC_AMDNB_BANK), misc); +} + +static void +amd_thresholding_init(void) +{ + struct amd_et_state *cc; + uint64_t misc; + + /* The counter must be valid and present. */ + misc = rdmsr(MSR_MC_MISC(MC_AMDNB_BANK)); + if ((misc & (MC_MISC_AMDNB_VAL | MC_MISC_AMDNB_CNTP)) != + (MC_MISC_AMDNB_VAL | MC_MISC_AMDNB_CNTP)) + return; + + /* The register should not be locked. */ + if ((misc & MC_MISC_AMDNB_LOCK) != 0) + return; + + /* + * If counter is enabled then either the firmware or another CPU + * has already claimed it. + */ + if ((misc & MC_MISC_AMDNB_CNTEN) != 0) + return; + + /* + * Configure an Extended Interrupt LVT register for reporting + * counter overflows if that feature is supported and the first + * extended register is available. + */ + amd_elvt = lapic_enable_mca_elvt(); + if (amd_elvt < 0) + return; + + /* Re-use Intel CMC support infrastructure. */ + cc = &amd_et_state[PCPU_GET(cpuid)]; + cc->cur_threshold = 1; + amd_thresholding_start(cc); + + /* Mark the NB bank as monitored. */ + PCPU_SET(cmci_mask, PCPU_GET(cmci_mask) | 1 << MC_AMDNB_BANK); +} + +static void +amd_thresholding_resume(void) +{ + struct amd_et_state *cc; + + /* Nothing to do if this CPU doesn't monitor the NB bank. */ + if ((PCPU_GET(cmci_mask) & 1 << MC_AMDNB_BANK) == 0) + return; + + cc = &amd_et_state[PCPU_GET(cpuid)]; + cc->last_intr = 0; + cc->cur_threshold = 1; + amd_thresholding_start(cc); +} #endif /* @@ -940,8 +1084,28 @@ _mca_init(int boot) } #ifdef DEV_APIC - if (PCPU_GET(cmci_mask) != 0 && boot) + /* + * AMD Processors from families 10h - 16h provide support + * for Machine Check Error Thresholding. + * The processors support counters of MC errors and they + * can be configured to generate an interrupt when a counter + * overflows. + * The counters are all associated with Bank 4 and each + * of them covers a group of errors reported via that bank. + * At the moment only the DRAM Error Threshold Group is + * supported. + */ + if (cpu_vendor_id == CPU_VENDOR_AMD && + CPUID_TO_FAMILY(cpu_id) >= 0x10 && + CPUID_TO_FAMILY(cpu_id) <= 0x16 && + (mcg_cap & MCG_CAP_COUNT) >= 4) { + if (boot) + amd_thresholding_init(); + else + amd_thresholding_resume(); + } else if (PCPU_GET(cmci_mask) != 0 && boot) { lapic_enable_cmc(); + } #endif } From owner-svn-src-all@freebsd.org Fri Mar 3 22:46:22 2017 Return-Path: Delivered-To: svn-src-all@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 A90D1CF6980; Fri, 3 Mar 2017 22:46:22 +0000 (UTC) (envelope-from jilles@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 5ED121EE5; Fri, 3 Mar 2017 22:46:22 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23MkLqr021021; Fri, 3 Mar 2017 22:46:21 GMT (envelope-from jilles@FreeBSD.org) Received: (from jilles@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23MkLOG021018; Fri, 3 Mar 2017 22:46:21 GMT (envelope-from jilles@FreeBSD.org) Message-Id: <201703032246.v23MkLOG021018@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jilles set sender to jilles@FreeBSD.org using -f From: Jilles Tjoelker Date: Fri, 3 Mar 2017 22:46:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314637 - head/bin/sh/tests/expansion X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 22:46:22 -0000 Author: jilles Date: Fri Mar 3 22:46:20 2017 New Revision: 314637 URL: https://svnweb.freebsd.org/changeset/base/314637 Log: sh: Add some already working tests that exercise new code paths. Added: head/bin/sh/tests/expansion/cmdsubst18.0 (contents, props changed) head/bin/sh/tests/expansion/cmdsubst19.0 (contents, props changed) head/bin/sh/tests/expansion/cmdsubst20.0 (contents, props changed) Modified: head/bin/sh/tests/expansion/Makefile Modified: head/bin/sh/tests/expansion/Makefile ============================================================================== --- head/bin/sh/tests/expansion/Makefile Fri Mar 3 22:42:43 2017 (r314636) +++ head/bin/sh/tests/expansion/Makefile Fri Mar 3 22:46:20 2017 (r314637) @@ -39,6 +39,9 @@ ${PACKAGE}FILES+= cmdsubst14.0 ${PACKAGE}FILES+= cmdsubst15.0 ${PACKAGE}FILES+= cmdsubst16.0 ${PACKAGE}FILES+= cmdsubst17.0 +${PACKAGE}FILES+= cmdsubst18.0 +${PACKAGE}FILES+= cmdsubst19.0 +${PACKAGE}FILES+= cmdsubst20.0 ${PACKAGE}FILES+= export1.0 ${PACKAGE}FILES+= export2.0 ${PACKAGE}FILES+= export3.0 Added: head/bin/sh/tests/expansion/cmdsubst18.0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/bin/sh/tests/expansion/cmdsubst18.0 Fri Mar 3 22:46:20 2017 (r314637) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +x=X +unset n +r=${x+$(echo a)}${x-$(echo b)}${n+$(echo c)}${n-$(echo d)}$(echo e) +[ "$r" = aXde ] Added: head/bin/sh/tests/expansion/cmdsubst19.0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/bin/sh/tests/expansion/cmdsubst19.0 Fri Mar 3 22:46:20 2017 (r314637) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +b=200 c=30 d=5 x=4 +r=$(echo a)$(($(echo b) + ${x+$(echo c)} + ${x-$(echo d)}))$(echo e) +[ "$r" = a234e ] Added: head/bin/sh/tests/expansion/cmdsubst20.0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/bin/sh/tests/expansion/cmdsubst20.0 Fri Mar 3 22:46:20 2017 (r314637) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +set -T +trapped='' +trap "trapped=x$trapped" USR1 +[ "x$(kill -USR1 $$)y" = xy ] && [ "$trapped" = x ] From owner-svn-src-all@freebsd.org Fri Mar 3 22:51:06 2017 Return-Path: Delivered-To: svn-src-all@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 47503CF6A1C; Fri, 3 Mar 2017 22:51:06 +0000 (UTC) (envelope-from avg@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 21CF9110F; Fri, 3 Mar 2017 22:51:06 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23Mp5AO021259; Fri, 3 Mar 2017 22:51:05 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23Mp5s2021256; Fri, 3 Mar 2017 22:51:05 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703032251.v23Mp5s2021256@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Fri, 3 Mar 2017 22:51:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314638 - in head/sys: dev/amd_ecc_inject modules modules/amd_ecc_inject X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 22:51:06 -0000 Author: avg Date: Fri Mar 3 22:51:04 2017 New Revision: 314638 URL: https://svnweb.freebsd.org/changeset/base/314638 Log: add a module that provides support for DRAM ECC error injection on AMD CPUs I imagine that the module would be useful only to a very limited number of developers, so that's my excuse for not writing any documentation. On a more serious note, please see DRAM Error Injection section of BKDGs for families 10h - 16h. E.g. section 2.13.3.1 of BKDG for AMD Family 15h Models 00h-0Fh Processors. Many thanks to kib for his suggestions and comments. Discussed with: kib MFC after: 3 weeks Differential Revision: https://reviews.freebsd.org/D9824 Added: head/sys/dev/amd_ecc_inject/ head/sys/dev/amd_ecc_inject/ecc_inject.c (contents, props changed) head/sys/modules/amd_ecc_inject/ head/sys/modules/amd_ecc_inject/Makefile (contents, props changed) Modified: head/sys/modules/Makefile Added: head/sys/dev/amd_ecc_inject/ecc_inject.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dev/amd_ecc_inject/ecc_inject.c Fri Mar 3 22:51:04 2017 (r314638) @@ -0,0 +1,243 @@ +/*- + * Copyright (c) 2017 Andriy Gapon + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include +#include + + +/* + * See BKDG for AMD Family 15h Models 00h-0Fh Processors + * (publication 42301 Rev 3.08 - March 12, 2012): + * - 2.13.3.1 DRAM Error Injection + * - D18F3xB8 NB Array Address + * - D18F3xBC NB Array Data Port + * - D18F3xBC_x8 DRAM ECC + */ +#define NB_MCA_CFG 0x44 +#define DRAM_ECC_EN (1 << 22) +#define NB_MCA_EXTCFG 0x180 +#define ECC_SYMB_SZ (1 << 25) +#define NB_ARRAY_ADDR 0xb8 +#define DRAM_ECC_SEL (0x8 << 28) +#define QUADRANT_SHIFT 1 +#define QUADRANT_MASK 0x3 +#define NB_ARRAY_PORT 0xbc +#define INJ_WORD_SHIFT 20 +#define INJ_WORD_MASK 0x1ff +#define DRAM_ERR_EN (1 << 18) +#define DRAM_WR_REQ (1 << 17) +#define DRAM_RD_REQ (1 << 16) +#define INJ_VECTOR_MASK 0xffff + +static void ecc_ei_inject(int); + +static device_t nbdev; +static int delay_ms = 0; +static int quadrant = 0; /* 0 - 3 */ +static int word_mask = 0x001; /* 9 bits: 8 + 1 for ECC */ +static int bit_mask = 0x0001; /* 16 bits */ + +static int +sysctl_int_with_max(SYSCTL_HANDLER_ARGS) +{ + u_int value; + int error; + + value = *(u_int *)arg1; + error = sysctl_handle_int(oidp, &value, 0, req); + if (error || req->newptr == NULL) + return (error); + if (value > arg2) + return (EINVAL); + *(u_int *)arg1 = value; + return (0); +} + +static int +sysctl_nonzero_int_with_max(SYSCTL_HANDLER_ARGS) +{ + u_int value; + int error; + + value = *(u_int *)arg1; + error = sysctl_int_with_max(oidp, &value, arg2, req); + if (error || req->newptr == NULL) + return (error); + if (value == 0) + return (EINVAL); + *(u_int *)arg1 = value; + return (0); +} + +static int +sysctl_proc_inject(SYSCTL_HANDLER_ARGS) +{ + int error; + int i; + + i = 0; + error = sysctl_handle_int(oidp, &i, 0, req); + if (error) + return (error); + if (i != 0) + ecc_ei_inject(i); + return (0); +} + +static SYSCTL_NODE(_hw, OID_AUTO, error_injection, CTLFLAG_RD, NULL, + "Hardware error injection"); +static SYSCTL_NODE(_hw_error_injection, OID_AUTO, dram_ecc, CTLFLAG_RD, NULL, + "DRAM ECC error injection"); +SYSCTL_UINT(_hw_error_injection_dram_ecc, OID_AUTO, delay, + CTLTYPE_UINT | CTLFLAG_RW, &delay_ms, 0, + "Delay in milliseconds between error injections"); +SYSCTL_PROC(_hw_error_injection_dram_ecc, OID_AUTO, quadrant, + CTLTYPE_UINT | CTLFLAG_RW, &quadrant, QUADRANT_MASK, + sysctl_int_with_max, "IU", + "Index of 16-byte quadrant within 64-byte line where errors " + "should be injected"); +SYSCTL_PROC(_hw_error_injection_dram_ecc, OID_AUTO, word_mask, + CTLTYPE_UINT | CTLFLAG_RW, &word_mask, INJ_WORD_MASK, + sysctl_nonzero_int_with_max, "IU", + "9-bit mask of words where errors should be injected (8 data + 1 ECC)"); +SYSCTL_PROC(_hw_error_injection_dram_ecc, OID_AUTO, bit_mask, + CTLTYPE_UINT | CTLFLAG_RW, &bit_mask, INJ_VECTOR_MASK, + sysctl_nonzero_int_with_max, "IU", + "16-bit mask of bits within each selected word where errors " + "should be injected"); +SYSCTL_PROC(_hw_error_injection_dram_ecc, OID_AUTO, inject, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, 0, sysctl_proc_inject, "I", + "Inject a number of errors according to configured parameters"); + +static void +ecc_ei_inject_one(void *arg, size_t size) +{ + volatile uint64_t *memory = arg; + uint32_t val; + int i; + + val = DRAM_ECC_SEL | (quadrant << QUADRANT_SHIFT); + pci_write_config(nbdev, NB_ARRAY_ADDR, val, 4); + + val = (word_mask << INJ_WORD_SHIFT) | DRAM_WR_REQ | bit_mask; + pci_write_config(nbdev, NB_ARRAY_PORT, val, 4); + + for (i = 0; i < size / sizeof(uint64_t); i++) { + memory[i] = 0; + val = pci_read_config(nbdev, NB_ARRAY_PORT, 4); + if ((val & DRAM_WR_REQ) == 0) + break; + } + for (i = 0; i < size / sizeof(uint64_t); i++) + memory[0] = memory[i]; +} + +static void +ecc_ei_inject(int count) +{ + vm_offset_t memory; + int injected; + + KASSERT((quadrant & ~QUADRANT_MASK) == 0, + ("quadrant value is outside of range: %u", quadrant)); + KASSERT(word_mask != 0 && (word_mask & ~INJ_WORD_MASK) == 0, + ("word mask value is outside of range: 0x%x", word_mask)); + KASSERT(bit_mask != 0 && (bit_mask & ~INJ_VECTOR_MASK) == 0, + ("bit mask value is outside of range: 0x%x", bit_mask)); + + memory = kmem_alloc_attr(kernel_arena, PAGE_SIZE, M_WAITOK, 0, ~0, + VM_MEMATTR_UNCACHEABLE); + + for (injected = 0; injected < count; injected++) { + ecc_ei_inject_one((void*)memory, PAGE_SIZE); + if (delay_ms != 0 && injected != count - 1) + pause_sbt("ecc_ei_inject", delay_ms * SBT_1MS, 0, 0); + } + + kmem_free(kernel_arena, memory, PAGE_SIZE); +} + +static int +ecc_ei_load(void) +{ + uint32_t val; + + if (cpu_vendor_id != CPU_VENDOR_AMD || CPUID_TO_FAMILY(cpu_id) < 0x10) { + printf("DRAM ECC error injection is not supported\n"); + return (ENXIO); + } + nbdev = pci_find_bsf(0, 24, 3); + if (nbdev == NULL) { + printf("Couldn't find NB PCI device\n"); + return (ENXIO); + } + val = pci_read_config(nbdev, NB_MCA_CFG, 4); + if ((val & DRAM_ECC_EN) == 0) { + printf("DRAM ECC is not supported or disabled\n"); + return (ENXIO); + } + printf("DRAM ECC error injection support loaded\n"); + return (0); +} + +static int +tsc_modevent(module_t mod __unused, int type, void *data __unused) +{ + int error; + + error = 0; + switch (type) { + case MOD_LOAD: + error = ecc_ei_load(); + break; + case MOD_UNLOAD: + case MOD_SHUTDOWN: + break; + default: + return (EOPNOTSUPP); + } + return (0); +} + +DEV_MODULE(tsc, tsc_modevent, NULL); Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Fri Mar 3 22:46:20 2017 (r314637) +++ head/sys/modules/Makefile Fri Mar 3 22:51:04 2017 (r314638) @@ -33,6 +33,7 @@ SUBDIR= \ alc \ ale \ alq \ + ${_amd_ecc_inject} \ ${_amdsbwd} \ ${_amdtemp} \ amr \ @@ -610,6 +611,7 @@ _acpi= acpi .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) _aesni= aesni .endif +_amd_ecc_inject=amd_ecc_inject _amdsbwd= amdsbwd _amdtemp= amdtemp _arcmsr= arcmsr Added: head/sys/modules/amd_ecc_inject/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/modules/amd_ecc_inject/Makefile Fri Mar 3 22:51:04 2017 (r314638) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../dev/amd_ecc_inject + +KMOD= amd_ecc_inject +SRCS= ecc_inject.c bus_if.h device_if.h pci_if.h + +.include From owner-svn-src-all@freebsd.org Fri Mar 3 23:08:44 2017 Return-Path: Delivered-To: svn-src-all@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 BB2D6CF7167; Fri, 3 Mar 2017 23:08:44 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citapm.icyb.net.ua (citapm.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 9F0401C5C; Fri, 3 Mar 2017 23:08:43 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citapm.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id BAA28002; Sat, 04 Mar 2017 01:08:35 +0200 (EET) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1cjwJP-000AIg-Ol; Sat, 04 Mar 2017 01:08:35 +0200 Subject: Re: svn commit: r314636 - in head/sys/x86: include x86 To: src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org References: <201703032242.v23Mghiv020834@repo.freebsd.org> From: Andriy Gapon Message-ID: <3129f8b1-3552-022b-66d7-88600950b8c0@FreeBSD.org> Date: Sat, 4 Mar 2017 01:07:59 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <201703032242.v23Mghiv020834@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 23:08:44 -0000 On 04/03/2017 00:42, Andriy Gapon wrote: > Author: avg > Date: Fri Mar 3 22:42:43 2017 > New Revision: 314636 > URL: https://svnweb.freebsd.org/changeset/base/314636 > > Log: > MCA: add AMD Error Thresholding support > > Currently the feature is implemented only for a subset of errors > reported via Bank 4. The subset includes only DRAM-related errors. > > The new code builds upon and reuses the Intel CMC (Correctable MCE > Counters) support code. However, the AMD feature is quite different > and, unfortunately, much less regular. > > For references please see AMD BKDGs for models 10h - 16h. > Specifically, see MSR0000_0413 NB Machine Check Misc (Thresholding) > Register (MC4_MISC0). > http://developer.amd.com/resources/developer-guides-manuals/ > AMD processors from the new family 17h (Ryzen) are said to implement somehting called Scalable MCA which is different from both Error Thresholding and Intel CMC. That's not supported, because no technical documentation is released at the moment. -- Andriy Gapon From owner-svn-src-all@freebsd.org Fri Mar 3 23:12:07 2017 Return-Path: Delivered-To: svn-src-all@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 DA9C7CF73D4; Fri, 3 Mar 2017 23:12:07 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A67761007; Fri, 3 Mar 2017 23:12:07 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pf0-x243.google.com with SMTP id 67so6647516pfg.2; Fri, 03 Mar 2017 15:12:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:mime-version:from:in-reply-to:date:cc:message-id:references :to; bh=8ECjgtaYIeuRkqoTVc+PWof43jrwfsTGAgBSqZOtFlU=; b=qwfwrtoH1JcmoSETwpF/HQvh1Py0a7gjtK+96DgSbUVY4cbcj2e+x/WDfJmCGDrEWT fD/XJi+2s38al3NGqy5o1cw3lGuAnH/9IWGXxJEnFk16VLfzm0j+3N9XKanZ0DAIph6O 3+oVA/Jm5PT0BPS1O2vwQTOGqHT9ngEQ2xrx0+sE0id0aqYwJWrdaCqQGkq/b1Mv3o8G BBzKN5qg1caFvILIRRqIMUtK6Wbu5n8fKnGnNVmLVf1OMXV8jPVtTvIwBl+4xxtBnsYc aoJp2xHhLg8NZedJC9VmdoMWJvtxMlQ4jHb5vg8pLfZjuHcKz2G6shBVIPJWAEDhOTIe GHGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:mime-version:from:in-reply-to:date:cc :message-id:references:to; bh=8ECjgtaYIeuRkqoTVc+PWof43jrwfsTGAgBSqZOtFlU=; b=G+8xtxAMzA+xCJTN+3MzVa0yaSOLU1eVaa8Mnt+1Usw+o0ZHSmUYIC5rGmE7mT0Y+5 2EC7NbNSY23R6NsttzkjFs+TJBet1rCmXnA9B4Je1ziQCoYfe/r+zcED6yfmkRBCbEyp 2EjvmN6/gSZ5VrT1vBCTfm/e+LYiupKP2qTXamzwhTYqkSeBAHC1c+6yeOJD3076b0CY CH+64Y9C1P1Aca5MnX06Lg8HYevsZ+8PcprPcwJW1Ew/bV8zFgb+3EYAhio6uKf7NrdU WeQck8Z63L/MTmWTGhj4WVmwSno6ZTmPn6zT71Lsgueif6kbg8t09Rs2aLmkk75MDwOd PCvw== X-Gm-Message-State: AMke39lhm5r0TiVr4jOH2/UQciFAgUUO+G4aH+YNKFAUJXWfek8Ak0OHP9jClxwYyLa14g== X-Received: by 10.99.146.70 with SMTP id s6mr6086808pgn.109.1488582727253; Fri, 03 Mar 2017 15:12:07 -0800 (PST) Received: from pinklady.local (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id f78sm25332376pfe.116.2017.03.03.15.12.06 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Mar 2017 15:12:06 -0800 (PST) Subject: Re: svn commit: r314585 - head/usr.sbin/syslogd Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Content-Type: multipart/signed; boundary="Apple-Mail=_5496975B-DE8A-4E92-97ED-C0F7C2CC93FF"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail From: "Ngie Cooper (yaneurabeya)" In-Reply-To: <201703031356.v23Duoiu069893@pdx.rh.CN85.dnsmgr.net> Date: Fri, 3 Mar 2017 15:12:04 -0800 Cc: Hiroki Sato , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , ngie@freebsd.org Message-Id: References: <201703031356.v23Duoiu069893@pdx.rh.CN85.dnsmgr.net> To: "Rodney W. Grimes" X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 23:12:08 -0000 --Apple-Mail=_5496975B-DE8A-4E92-97ED-C0F7C2CC93FF Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Mar 3, 2017, at 05:56, Rodney W. Grimes = wrote: >=20 > -- Start of PGP signed section. > [ Charset ISO-8859-7 unsupported, converting... ] >> "Ngie Cooper (yaneurabeya)" wrote >> in <1A3F6606-822C-4C80-ADFA-48378F0F29EE@gmail.com>: >>=20 >> ya> >> How about "...accepts UDP packets sent with any source port" = or >=20 > I actually think this right here is the clearest one of all the ones > I have seen attempted. Oh, remove the s from accepts. How about this instead (it incorporates hrs=E2=80=99s suggestion and = your=E2=80=99s)? Thanks, -Ngie $ svn diff syslogd.8 Index: syslogd.8 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- syslogd.8 (revision 314626) +++ syslogd.8 (working copy) @@ -131,7 +131,7 @@ .Ar service of .Ql \&* -allows packets to be received from any UDP port. +accept UDP packets from any source port. The default .Ar service is --Apple-Mail=_5496975B-DE8A-4E92-97ED-C0F7C2CC93FF Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJYufhFAAoJEPWDqSZpMIYVE48QAIZUo7wtlvoLTLmyxeEKoT5F WQ/lNBy2C7gsiOsDRolxUfp1nPDtsvUq7EX1fSM6tBB2s+y29mr+gCb2FDQ8iX1x SkXKjKsGlgpW9Hx5H2JBVHYvqKdSRjXF6tuSw8TvMTyWSMF2SdQ1NNYfVYlLCIun svY04/0phG0Kbc7iu1OlIXa+YfRrM4qgB7dZg9PtshEbjBd2OwWRMo1QNo+Mefk7 7vaxyrAgY62bYcFZSyCU7Y3a+uOAk9tzljwJgLumRYMvLVzdI3Cd9UCMRgJVhodI 3UJ3VKrGMVMF6lOu9f7/cU2ATWnWKgnFT/wi0V3eBWA0AHLhdbCq+joiAmxcEUn3 QrJTAt6aPNh3g7/2PPSnN6rQ39oygBCG9ZwWBYbGRqZiGOY0a/tXVRadXS3AYoGm AfzjbMSigQdAggWygeQ6eC9AFy0VZ+xohKyq2IEx6YEo4653+I5OcTC7qGpEo68/ 0+ClYYCu3xpttXGEXRxlYjhKf8d7rxHwKXTcCzLvGXiiWs021GwbSmvaFjpYun5D C//u4kIEprt17Jukhpnp5unL/rCbA6+6eMNBUxRIScsIiiALEdOqARfxbpAa4Hnj dmHGJr8SCnnSZ4taXmJ8uvVdlIgEWq+Qf2gy0n0EEOkeh8Oj5AT95rnlb0NzntVq mZA801ji2jxASs20o30z =X0Ou -----END PGP SIGNATURE----- --Apple-Mail=_5496975B-DE8A-4E92-97ED-C0F7C2CC93FF-- From owner-svn-src-all@freebsd.org Fri Mar 3 23:14:27 2017 Return-Path: Delivered-To: svn-src-all@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 DAA86CF746E; Fri, 3 Mar 2017 23:14:27 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg0-x241.google.com (mail-pg0-x241.google.com [IPv6:2607:f8b0:400e:c05::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9F5E911E2; Fri, 3 Mar 2017 23:14:27 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg0-x241.google.com with SMTP id 77so1196409pgc.0; Fri, 03 Mar 2017 15:14:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:mime-version:from:in-reply-to:date:cc:message-id:references :to; bh=D/WtF7LjjQCzh/8fOz0veG6xxyXSf+0m5eyKVXXqskA=; b=Ngxtn6XmG5HGRZxP8KqkeW4hJinK8I5R7MS9BsW1UG74ZE7eLjM620v67KkRaPVv7Y GHKEsvKRsE2OjBTo8NK3HhHkbbJGUxdjgU7T01m44xFBUcXqQR/64qrp+1Ue8tG9dnuT O8m/oMSWwm5HEAa10gI9pC0wYDfWPXsNFDBZz89z7XxozjNtUL/LAL9kDpytr5CrH8Q/ AaKdZyaaQ2JjBZrce/Z3nqlBqKSfX93XaIphq2KUTJDhv1xH/6AsBNvWl3z3urt59CYO xupbDL7V6Mk32To4YU53zpNrajWVGeWF2u5PLoQy9EsF+dh79MLOA1wtYbaeivJDhBGs 4rRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:mime-version:from:in-reply-to:date:cc :message-id:references:to; bh=D/WtF7LjjQCzh/8fOz0veG6xxyXSf+0m5eyKVXXqskA=; b=hslIDLFZUBticZW7HoWSEHDuMYHOxgHf2hqj0/dix189TJ1vXy7ZDuHexBoPzcY9IO zUKa+b8XI7ahMG6AxozNr6cDMbsuqqt08qDJxkmdnwsrkGd0V6Ohjxnn0XedEK6W3Ov+ rIaicrLcvGRcxq/dtbOGERsBDf2iNowNJxJmrvTrwc1/juJCuR0UnyOB6IrPP+96b8RX b1dd5Lh2MS0lpgMLVlqD7SHwvaUhYcRVIJr2PG4KyDlZBIyyj2HYtS6GbNKjkheXxj0G G4E61dqj9p+EikCVPrIwCeQakDjy85Q+1vvZDg2RQiKRUnJKozFETNG8jpKcLiilUdBI 8iuA== X-Gm-Message-State: AMke39ms4gHYdonn0mKf8Fg2M9IzV5//qozbSyoDmTwhXm7c4qjDTv210dUTRXUxiqQCoA== X-Received: by 10.84.172.193 with SMTP id n59mr7691623plb.63.1488582867285; Fri, 03 Mar 2017 15:14:27 -0800 (PST) Received: from pinklady.local (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id q7sm25301361pfb.98.2017.03.03.15.14.26 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Mar 2017 15:14:26 -0800 (PST) Subject: Re: svn commit: r314585 - head/usr.sbin/syslogd Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Content-Type: multipart/signed; boundary="Apple-Mail=_B1181B74-4C11-4631-B7ED-F736275311F7"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail From: "Ngie Cooper (yaneurabeya)" In-Reply-To: Date: Fri, 3 Mar 2017 15:14:25 -0800 Cc: Hiroki Sato , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , ngie@freebsd.org Message-Id: <9EDDFC3F-80F2-4864-9DF5-BF9F81A9DB4A@gmail.com> References: <201703031356.v23Duoiu069893@pdx.rh.CN85.dnsmgr.net> To: "Rodney W. Grimes" X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 23:14:28 -0000 --Apple-Mail=_B1181B74-4C11-4631-B7ED-F736275311F7 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Mar 3, 2017, at 15:12, Ngie Cooper (yaneurabeya) = wrote: >=20 >=20 >> On Mar 3, 2017, at 05:56, Rodney W. Grimes = wrote: >>=20 >> -- Start of PGP signed section. >> [ Charset ISO-8859-7 unsupported, converting... ] >>> "Ngie Cooper (yaneurabeya)" wrote >>> in <1A3F6606-822C-4C80-ADFA-48378F0F29EE@gmail.com>: >>>=20 >>> ya> >> How about "...accepts UDP packets sent with any source port" = or >>=20 >> I actually think this right here is the clearest one of all the ones >> I have seen attempted. Oh, remove the s from accepts. >=20 > How about this instead (it incorporates hrs=E2=80=99s suggestion and = your=E2=80=99s)? > Thanks, > -Ngie >=20 > $ svn diff syslogd.8 > Index: syslogd.8 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- syslogd.8 (revision 314626) > +++ syslogd.8 (working copy) > @@ -131,7 +131,7 @@ > .Ar service > of > .Ql \&* > -allows packets to be received from any UDP port. > +accept UDP packets from any source port. > The default > .Ar service > is Actually, accepts is better. Although it isn=E2=80=99t clear by itself, = the sentence fragment is describing the -a option, which is singular, = not plural. Here=E2=80=99s the sentence in full context: source packet must belong = to. A service of `*' accepts UDP packets from any source = port. Thanks, -Ngie --Apple-Mail=_B1181B74-4C11-4631-B7ED-F736275311F7 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJYufjRAAoJEPWDqSZpMIYV9LQQAMbIoVm1LOGW7e5wIlc5fzfm olXms/PZQRv1V3xZ0Bp1h7tuVhasGx1jL/JjqIWWBgGzpWpeA6rhqQ1/+caYfAOJ U5DnizupUtQ1oAdDqaeagSJGU+oV4CIXplHdy8FydoCtJTIJHSPMQAbfR4cLzftv tHIFSC823zxMgNNzoNjObPXWwt95JRguC4VCxQw4r8g2K8LVS4A/WBa+hJSlTvz9 R70TrS6k0V+ebuz5yDsjlZn/plxs3ru27EiG4tYkaVLByx9bnxRds/ykYqA2CAXb YsesWv0utM5XYO8Yferiz+w9sG8LzH0aGTVcVcaBt4DGxNIhmObD7Qdu7lkZktH9 hZJnklZqeI/GvjaKHQbPXOhjcxIqHOef6JuZ7BPk84HERQy+3ZBxotLrM7PCyxrE RUUSEVsyEGWwtyNflcgKp7U1hL4VhURBWOgECBUzDiGrLkyrqrzpKGH+JAJ2mpaC mwZp8f6Tbq5OMdvVsB3iEgWqSEYJaiZUk8pJqVL7mckouybdkHZi/Utql0CTHmxx S8wiSW9n/4blM3n/o26T4CSK5alpuD7HtIu7GpXRv7G0+47Lftg76rg6jDPmlEkC imCP4ETxkVSVltc0afyvpJD8iyLbAfngzfY+E7xu1DRv301adDtBDShmKkFgPd0k uieVqHUw+TklGaPITlLI =lb73 -----END PGP SIGNATURE----- --Apple-Mail=_B1181B74-4C11-4631-B7ED-F736275311F7-- From owner-svn-src-all@freebsd.org Fri Mar 3 23:15:37 2017 Return-Path: Delivered-To: svn-src-all@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 2DCBACF753E; Fri, 3 Mar 2017 23:15:37 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg0-x244.google.com (mail-pg0-x244.google.com [IPv6:2607:f8b0:400e:c05::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ED7FB1365; Fri, 3 Mar 2017 23:15:36 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg0-x244.google.com with SMTP id 187so243423pgb.2; Fri, 03 Mar 2017 15:15:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:mime-version:from:in-reply-to:date:cc:message-id:references :to; bh=tPwJ0C/cDoPGp+d5RLaa1D5ombrrSlZXw4rOJcRKbYI=; b=d92iUxzkTH+hDjFta4ih8eRVMKWAKThrUsFs7Tm65JKZH3Dwk+b8bJQiX+JLALRFnm PQwg9aZmP5PQyV3/ZzqbxCpccadZKvBM52efty51NOre6ilpe3z0p34A99LIMTyjAWcM dn65uptQ7uB0+zJHI7mpi4Gdk+AQn5rw3GjPslOKBiguKaTGFrRnBA/al1APeqe9YSgd nY+7QSVieVvcNkn9LTw4ynpmYvq/pHw1S3XNJNOkRImTXOjJIhf6Iyou4bKl31vBbpit GMPPXLi8vQg5SdWLMe6N4ufJYhsC5LpjPpNTMNil2iGO7yOh5r1PnXYCNN7v5l8u5JWx LKvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:mime-version:from:in-reply-to:date:cc :message-id:references:to; bh=tPwJ0C/cDoPGp+d5RLaa1D5ombrrSlZXw4rOJcRKbYI=; b=JW24MKR8WFgElgeKRwcc+3Q/3ZKBgPhSUoxcfVxHGG9cWnLRXM5Tm/YmrNVK2gyJpr I+fEqJPYCnDXJjRZC0MvMOaqUu59llhdM+j3zQAIWQxXJ2z9A/eaWahiAtUayjpBg0Tf juznA6CRq+9h0FSPNROFbLIhANezl5IsK+Te+Xsnl76qeDD2XqLZ37x3lCQjwZSexIRp LVHIXqebjayx/W+fJG1bQSfN/GuSkj+cWemsNbrLI8ZJOB6UrbhW6GlnZooh50yFrf5W DYls+a/CWXCFP9FgrCRoplJwhq7R2E+I2lVsgsGyLK2WBitJvdRKNm7HuLoE4cnfWZSM vJXQ== X-Gm-Message-State: AMke39nHCoOTnI/gMB7jJr4scB81q7rfHBB2CgHkZ+RPxB1W71QdTqll9gN87MOwkyvmAA== X-Received: by 10.99.152.65 with SMTP id l1mr6449920pgo.28.1488582936563; Fri, 03 Mar 2017 15:15:36 -0800 (PST) Received: from pinklady.local (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id b195sm25327495pfb.106.2017.03.03.15.15.35 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Mar 2017 15:15:35 -0800 (PST) Subject: Re: svn commit: r314585 - head/usr.sbin/syslogd Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Content-Type: multipart/signed; boundary="Apple-Mail=_78F305C8-675E-45F2-AE1A-B470E1934EAF"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail From: "Ngie Cooper (yaneurabeya)" In-Reply-To: <9EDDFC3F-80F2-4864-9DF5-BF9F81A9DB4A@gmail.com> Date: Fri, 3 Mar 2017 15:15:34 -0800 Cc: Hiroki Sato , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , ngie@freebsd.org Message-Id: References: <201703031356.v23Duoiu069893@pdx.rh.CN85.dnsmgr.net> <9EDDFC3F-80F2-4864-9DF5-BF9F81A9DB4A@gmail.com> To: "Rodney W. Grimes" X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 23:15:37 -0000 --Apple-Mail=_78F305C8-675E-45F2-AE1A-B470E1934EAF Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Mar 3, 2017, at 15:14, Ngie Cooper (yaneurabeya) = wrote: =E2=80=A6 > Actually, accepts is better. Although it isn=E2=80=99t clear by = itself, the sentence fragment is describing the -a option, which is = singular, not plural. Here=E2=80=99s the sentence in full context: >=20 > source packet must belong = to. A > service of `*' accepts UDP > packets from any source = port. Correction: it=E2=80=99s describing `service`, which is still singular. -Ngie --Apple-Mail=_78F305C8-675E-45F2-AE1A-B470E1934EAF Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJYufkWAAoJEPWDqSZpMIYVSl8P/RKS7lzdsWMBfXHLjvYUII3g t15Gc3ku3e6IPZSHdbrE6i0TfeuQCMiQFxBL3rZJZchjGzYs6YlWv2K0BhSOZ0oL wXfRE6hTQnqpcIjwPSC3z+FDVQV6Whe5Y7ziK+FLwTOu1eXgAXKS2JyFWgGBkBVE 3qDyPIclzQ5gt0F7VQsDrQqDkvrKqH02bMn7CrkCxTkixH18H622jwWL2yrc6I2/ yndYu8COhFSuKOTQhZEMfAbOABKeP1jxYQw+9wTqg+0MNYQ70DRDPXlIO7sr4ErT HmFWxQwXwQ3DOj2TQmVfpedy9KSeu6GvLvJ2vYPMe/IjKxz/bLStbVbn7/dFB/8A 8hIcXu7/2tgPLo+DFS8HNPaq5xVjwOzWJptSrFjkWxJvC2rWqocUi5fJtJHYe72D 6VgMbbJWBJbwQugQRmHMIFfTAjFcsJLL0l39b7pcDoYED+/xsIQQpnFLPSJ0xHay UHxQS2PhfT9VbZBMVEjeBtdpqxEBrUv2+Txw30Z5gVButw3qO3CbhsmC+yArQMyI bq2QqASLz3srnzRUzSVw/UtrrTwunVO7VyFu0okfyQiqUwYPpJbdJNJa93dnV4gI Bs7Rfq/3XmfjzX9JtqLB5530EoS0+ksev3Fn5xfLn5JJexjo+UpTT3MWISuGQR+M s/k4z80WEsVxhIgC72qn =AeBr -----END PGP SIGNATURE----- --Apple-Mail=_78F305C8-675E-45F2-AE1A-B470E1934EAF-- From owner-svn-src-all@freebsd.org Sat Mar 4 00:31:45 2017 Return-Path: Delivered-To: svn-src-all@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 BA30BCF5A4A; Sat, 4 Mar 2017 00:31:45 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mail.blih.net (mail.blih.net [212.83.177.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.blih.net", Issuer "mail.blih.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id B86D31BDE; Sat, 4 Mar 2017 00:31:44 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mail.blih.net (mail.blih.net [212.83.177.182]) by mail.blih.net (OpenSMTPD) with ESMTP id 3eec2122; Sat, 4 Mar 2017 01:31:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=bidouilliste.com; h=date :from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=mail; bh=UPKBSF0GXbqPG6q0uu00rAoW5QY=; b=Er2q+7qSv8i0VYUVpXKGnQJNXUfm ckTxKn5Kwa/VH0G1k1mQwaB7vOSxCpkYcFA/pCtUJc/RXKYbN95cuEBhDgAbRink MVZ+MwZtUjb4GuboiFprHhLdsEikikJKYhFmFiJ4EQsNFAaWng7v6qn9qVN4LkLX gDZESVljlE1sbO8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=bidouilliste.com; h=date :from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; q=dns; s= mail; b=oJ6O2nJ9jUC2ZgbUXvcRwAeCCavcBwZ2Oj6bkN5Q1RMuB9fccz5VPFgV xNBg4BdjnnfYVSwG9BLNaIPdwYpeSvPkSU6ot3hyQiXPY6TYB85+mLHqlGzGCS1u ORqnpa3pDKVH1kZASeEleHkfcSYnGbge6sw/uvpX2OV8BbUhub0= Received: from knuckles.blih.net (om126204172073.6.openmobile.ne.jp [126.204.172.73]) by mail.blih.net (OpenSMTPD) with ESMTPSA id 045f352c TLS version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Sat, 4 Mar 2017 01:31:40 +0100 (CET) Date: Sat, 4 Mar 2017 01:31:35 +0100 From: Emmanuel Vadot To: Ruslan Bukin Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314599 - head/sys/gnu/dts/arm Message-Id: <20170304013135.0fbf4ccdeefa06c2f0bc1977@bidouilliste.com> In-Reply-To: <201703031417.v23EH741008683@repo.freebsd.org> References: <201703031417.v23EH741008683@repo.freebsd.org> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.29; amd64-portbld-freebsd12.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 00:31:45 -0000 Hi Ruslan, Could you revert please ? GNU DTS are from vendor import and I plan to update to linux 4.10 soon (like this week), and this will complicate merge. Thanks, On Fri, 3 Mar 2017 14:17:07 +0000 (UTC) Ruslan Bukin wrote: > Author: br > Date: Fri Mar 3 14:17:07 2017 > New Revision: 314599 > URL: https://svnweb.freebsd.org/changeset/base/314599 > > Log: > Import latest vendor DTS files for Intel Arria 10. > > Modified: > head/sys/gnu/dts/arm/socfpga_arria10.dtsi > head/sys/gnu/dts/arm/socfpga_arria10_socdk.dtsi > head/sys/gnu/dts/arm/socfpga_arria10_socdk_sdmmc.dts > > Modified: head/sys/gnu/dts/arm/socfpga_arria10.dtsi > ============================================================================== > --- head/sys/gnu/dts/arm/socfpga_arria10.dtsi Fri Mar 3 14:06:22 2017 (r314598) > +++ head/sys/gnu/dts/arm/socfpga_arria10.dtsi Fri Mar 3 14:17:07 2017 (r314599) > @@ -22,11 +22,6 @@ > #address-cells = <1>; > #size-cells = <1>; > > - aliases { > - serial0 = &uart0; > - serial1 = &uart1; > - }; > - > cpus { > #address-cells = <1>; > #size-cells = <0>; > @@ -88,6 +83,14 @@ > }; > }; > > + base_fpga_region { > + #address-cells = <0x1>; > + #size-cells = <0x1>; > + > + compatible = "fpga-region"; > + fpga-mgr = <&fpga_mgr>; > + }; > + > clkmgr@ffd04000 { > compatible = "altr,clk-mgr"; > reg = <0xffd04000 0x1000>; > @@ -405,6 +408,12 @@ > }; > }; > > + socfpga_axi_setup: stmmac-axi-config { > + snps,wr_osr_lmt = <0xf>; > + snps,rd_osr_lmt = <0xf>; > + snps,blen = <0 0 0 0 16 0 0>; > + }; > + > gmac0: ethernet@ff800000 { > compatible = "altr,socfpga-stmmac", "snps,dwmac-3.72a", "snps,dwmac"; > altr,sysmgr-syscon = <&sysmgr 0x44 0>; > @@ -421,6 +430,7 @@ > clock-names = "stmmaceth"; > resets = <&rst EMAC0_RESET>; > reset-names = "stmmaceth"; > + snps,axi-config = <&socfpga_axi_setup>; > status = "disabled"; > }; > > @@ -440,6 +450,7 @@ > clock-names = "stmmaceth"; > resets = <&rst EMAC1_RESET>; > reset-names = "stmmaceth"; > + snps,axi-config = <&socfpga_axi_setup>; > status = "disabled"; > }; > > @@ -457,6 +468,7 @@ > rx-fifo-depth = <16384>; > clocks = <&l4_mp_clk>; > clock-names = "stmmaceth"; > + snps,axi-config = <&socfpga_axi_setup>; > status = "disabled"; > }; > > @@ -517,6 +529,15 @@ > }; > }; > > + fpga_mgr: fpga-mgr@ffd03000 { > + compatible = "altr,socfpga-a10-fpga-mgr"; > + reg = <0xffd03000 0x100 > + 0xffcfe400 0x20>; > + clocks = <&l4_mp_clk>; > + resets = <&rst FPGAMGR_RESET>; > + reset-names = "fpgamgr"; > + }; > + > i2c0: i2c@ffc02200 { > #address-cells = <1>; > #size-cells = <0>; > @@ -567,15 +588,24 @@ > status = "disabled"; > }; > > - sdr: sdr@ffc25000 { > - compatible = "syscon"; > - reg = <0xffcfb100 0x80>; > + spi1: spi@ffda5000 { > + compatible = "snps,dw-apb-ssi"; > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0xffda5000 0x100>; > + interrupts = <0 102 4>; > + num-chipselect = <4>; > + bus-num = <0>; > + /*32bit_access;*/ > + tx-dma-channel = <&pdma 16>; > + rx-dma-channel = <&pdma 17>; > + clocks = <&spi_m_clk>; > + status = "disabled"; > }; > > - sdramedac { > - compatible = "altr,sdram-edac-a10"; > - altr,sdr-syscon = <&sdr>; > - interrupts = <0 2 4>, <0 0 4>; > + sdr: sdr@ffc25000 { > + compatible = "altr,sdr-ctl", "syscon"; > + reg = <0xffcfb100 0x80>; > }; > > L2: l2-cache@fffff000 { > @@ -584,6 +614,9 @@ > interrupts = <0 18 IRQ_TYPE_LEVEL_HIGH>; > cache-unified; > cache-level = <2>; > + prefetch-data = <1>; > + prefetch-instr = <1>; > + arm,shared-override; > }; > > mmc: dwmmc0@ff808000 { > @@ -598,6 +631,19 @@ > status = "disabled"; > }; > > + nand: nand@ffb90000 { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "denali,denali-nand-dt", "altr,socfpga-denali-nand"; > + reg = <0xffb90000 0x72000>, > + <0xffb80000 0x10000>; > + reg-names = "nand_data", "denali_reg"; > + interrupts = <0 99 4>; > + dma-mask = <0xffffffff>; > + clocks = <&nand_clk>; > + status = "disabled"; > + }; > + > ocram: sram@ffe00000 { > compatible = "mmio-sram"; > reg = <0xffe00000 0x40000>; > @@ -610,17 +656,76 @@ > #size-cells = <1>; > interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>, > <0 0 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-controller; > + #interrupt-cells = <2>; > ranges; > > + sdramedac { > + compatible = "altr,sdram-edac-a10"; > + altr,sdr-syscon = <&sdr>; > + interrupts = <17 IRQ_TYPE_LEVEL_HIGH>, > + <49 IRQ_TYPE_LEVEL_HIGH>; > + }; > + > l2-ecc@ffd06010 { > compatible = "altr,socfpga-a10-l2-ecc"; > reg = <0xffd06010 0x4>; > + interrupts = <0 IRQ_TYPE_LEVEL_HIGH>, > + <32 IRQ_TYPE_LEVEL_HIGH>; > }; > > ocram-ecc@ff8c3000 { > compatible = "altr,socfpga-a10-ocram-ecc"; > reg = <0xff8c3000 0x400>; > + interrupts = <1 IRQ_TYPE_LEVEL_HIGH>, > + <33 IRQ_TYPE_LEVEL_HIGH>; > + }; > + > + emac0-rx-ecc@ff8c0800 { > + compatible = "altr,socfpga-eth-mac-ecc"; > + reg = <0xff8c0800 0x400>; > + altr,ecc-parent = <&gmac0>; > + interrupts = <4 IRQ_TYPE_LEVEL_HIGH>, > + <36 IRQ_TYPE_LEVEL_HIGH>; > + }; > + > + emac0-tx-ecc@ff8c0c00 { > + compatible = "altr,socfpga-eth-mac-ecc"; > + reg = <0xff8c0c00 0x400>; > + altr,ecc-parent = <&gmac0>; > + interrupts = <5 IRQ_TYPE_LEVEL_HIGH>, > + <37 IRQ_TYPE_LEVEL_HIGH>; > }; > + > + dma-ecc@ff8c8000 { > + compatible = "altr,socfpga-dma-ecc"; > + reg = <0xff8c8000 0x400>; > + altr,ecc-parent = <&pdma>; > + interrupts = <10 IRQ_TYPE_LEVEL_HIGH>, > + <42 IRQ_TYPE_LEVEL_HIGH>; > + }; > + > + usb0-ecc@ff8c8800 { > + compatible = "altr,socfpga-usb-ecc"; > + reg = <0xff8c8800 0x400>; > + altr,ecc-parent = <&usb0>; > + interrupts = <2 IRQ_TYPE_LEVEL_HIGH>, > + <34 IRQ_TYPE_LEVEL_HIGH>; > + }; > + }; > + > + qspi: spi@ff809000 { > + compatible = "cdns,qspi-nor"; > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0xff809000 0x100>, > + <0xffa00000 0x100000>; > + interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>; > + cdns,fifo-depth = <128>; > + cdns,fifo-width = <4>; > + cdns,trigger-address = <0x00000000>; > + clocks = <&qspi_clk>; > + status = "disabled"; > }; > > rst: rstmgr@ffd05000 { > > Modified: head/sys/gnu/dts/arm/socfpga_arria10_socdk.dtsi > ============================================================================== > --- head/sys/gnu/dts/arm/socfpga_arria10_socdk.dtsi Fri Mar 3 14:06:22 2017 (r314598) > +++ head/sys/gnu/dts/arm/socfpga_arria10_socdk.dtsi Fri Mar 3 14:17:07 2017 (r314599) > @@ -20,9 +20,14 @@ > model = "Altera SOCFPGA Arria 10"; > compatible = "altr,socfpga-arria10", "altr,socfpga"; > > + aliases { > + ethernet0 = &gmac0; > + serial0 = &uart1; > + }; > + > chosen { > bootargs = "earlyprintk"; > - stdout-path = "serial1:115200n8"; > + stdout-path = "serial0:115200n8"; > }; > > memory { > @@ -31,6 +36,30 @@ > reg = <0x0 0x40000000>; /* 1GB */ > }; > > + a10leds { > + compatible = "gpio-leds"; > + > + a10sr_led0 { > + label = "a10sr-led0"; > + gpios = <&a10sr_gpio 0 1>; > + }; > + > + a10sr_led1 { > + label = "a10sr-led1"; > + gpios = <&a10sr_gpio 1 1>; > + }; > + > + a10sr_led2 { > + label = "a10sr-led2"; > + gpios = <&a10sr_gpio 2 1>; > + }; > + > + a10sr_led3 { > + label = "a10sr-led3"; > + gpios = <&a10sr_gpio 3 1>; > + }; > + }; > + > soc { > clkmgr@ffd04000 { > clocks { > @@ -70,6 +99,31 @@ > status = "okay"; > }; > > +&gpio1 { > + status = "okay"; > +}; > + > +&spi1 { > + status = "okay"; > + > + resource-manager@0 { > + compatible = "altr,a10sr"; > + reg = <0>; > + spi-max-frequency = <100000>; > + /* low-level active IRQ at GPIO1_5 */ > + interrupt-parent = <&portb>; > + interrupts = <5 IRQ_TYPE_LEVEL_LOW>; > + interrupt-controller; > + #interrupt-cells = <2>; > + > + a10sr_gpio: gpio-controller { > + compatible = "altr,a10sr-gpio"; > + gpio-controller; > + #gpio-cells = <2>; > + }; > + }; > +}; > + > &i2c1 { > speed-mode = <0>; > status = "okay"; > @@ -91,6 +145,11 @@ > compatible = "dallas,ds1339"; > reg = <0x68>; > }; > + > + ltc@5c { > + compatible = "ltc2977"; > + reg = <0x5c>; > + }; > }; > > &uart1 { > @@ -100,3 +159,7 @@ > &usb0 { > status = "okay"; > }; > + > +&watchdog1 { > + status = "okay"; > +}; > > Modified: head/sys/gnu/dts/arm/socfpga_arria10_socdk_sdmmc.dts > ============================================================================== > --- head/sys/gnu/dts/arm/socfpga_arria10_socdk_sdmmc.dts Fri Mar 3 14:06:22 2017 (r314598) > +++ head/sys/gnu/dts/arm/socfpga_arria10_socdk_sdmmc.dts Fri Mar 3 14:17:07 2017 (r314599) > @@ -25,3 +25,15 @@ > broken-cd; > bus-width = <4>; > }; > + > +&eccmgr { > + sdmmca-ecc@ff8c2c00 { > + compatible = "altr,socfpga-sdmmc-ecc"; > + reg = <0xff8c2c00 0x400>; > + altr,ecc-parent = <&mmc>; > + interrupts = <15 IRQ_TYPE_LEVEL_HIGH>, > + <47 IRQ_TYPE_LEVEL_HIGH>, > + <16 IRQ_TYPE_LEVEL_HIGH>, > + <48 IRQ_TYPE_LEVEL_HIGH>; > + }; > +}; -- Emmanuel Vadot From owner-svn-src-all@freebsd.org Sat Mar 4 00:33:43 2017 Return-Path: Delivered-To: svn-src-all@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 046D2CF5AF5; Sat, 4 Mar 2017 00:33:43 +0000 (UTC) (envelope-from kib@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 C7C471DC9; Sat, 4 Mar 2017 00:33:42 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v240XfgJ065873; Sat, 4 Mar 2017 00:33:41 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v240XfKn065872; Sat, 4 Mar 2017 00:33:41 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201703040033.v240XfKn065872@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 4 Mar 2017 00:33:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314639 - stable/11/sys/sys X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 00:33:43 -0000 Author: kib Date: Sat Mar 4 00:33:41 2017 New Revision: 314639 URL: https://svnweb.freebsd.org/changeset/base/314639 Log: MFC r314490: Add some explanation for SV_TIMEKEEP flag. Modified: stable/11/sys/sys/sysent.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/sys/sysent.h ============================================================================== --- stable/11/sys/sys/sysent.h Fri Mar 3 22:51:04 2017 (r314638) +++ stable/11/sys/sys/sysent.h Sat Mar 4 00:33:41 2017 (r314639) @@ -138,7 +138,7 @@ struct sysentvec { #define SV_AOUT 0x008000 /* a.out executable. */ #define SV_SHP 0x010000 /* Shared page. */ #define SV_CAPSICUM 0x020000 /* Force cap_enter() on startup. */ -#define SV_TIMEKEEP 0x040000 +#define SV_TIMEKEEP 0x040000 /* Shared page timehands. */ #define SV_ABI_MASK 0xff #define SV_ABI_ERRNO(p, e) ((p)->p_sysent->sv_errsize <= 0 ? e : \ From owner-svn-src-all@freebsd.org Sat Mar 4 00:57:47 2017 Return-Path: Delivered-To: svn-src-all@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 31C43CF5F2F; Sat, 4 Mar 2017 00:57:47 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E187A15BE; Sat, 4 Mar 2017 00:57:45 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v240viLP073584; Fri, 3 Mar 2017 16:57:44 -0800 (PST) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd-rwg@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v240vi0H073583; Fri, 3 Mar 2017 16:57:44 -0800 (PST) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <201703040057.v240vi0H073583@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314585 - head/usr.sbin/syslogd In-Reply-To: To: "Ngie Cooper (yaneurabeya)" Date: Fri, 3 Mar 2017 16:57:44 -0800 (PST) CC: Hiroki Sato , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , ngie@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 00:57:47 -0000 -- Start of PGP signed section. [ Charset UTF-8 unsupported, converting... ] > > > On Mar 3, 2017, at 05:56, Rodney W. Grimes wrote: > > > > -- Start of PGP signed section. > > [ Charset ISO-8859-7 unsupported, converting... ] > >> "Ngie Cooper (yaneurabeya)" wrote > >> in <1A3F6606-822C-4C80-ADFA-48378F0F29EE@gmail.com>: > >> > >> ya> >> How about "...accepts UDP packets sent with any source port" or > > > > I actually think this right here is the clearest one of all the ones > > I have seen attempted. Oh, remove the s from accepts. > > How about this instead (it incorporates hrs?s suggestion and your?s)? > Thanks, > -Ngie > > $ svn diff syslogd.8 > Index: syslogd.8 > =================================================================== > --- syslogd.8 (revision 314626) > +++ syslogd.8 (working copy) > @@ -131,7 +131,7 @@ > .Ar service > of > .Ql \&* > -allows packets to be received from any UDP port. > +accept UDP packets from any source port. > The default > .Ar service > is > -- End of PGP section, PGP failed! I think that is probably as clear as you can get on this in one line. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Sat Mar 4 00:58:50 2017 Return-Path: Delivered-To: svn-src-all@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 B9BB2CF5FD6; Sat, 4 Mar 2017 00:58:50 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6E296170C; Sat, 4 Mar 2017 00:58:50 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v240wnAr073598; Fri, 3 Mar 2017 16:58:49 -0800 (PST) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd-rwg@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v240wnug073597; Fri, 3 Mar 2017 16:58:49 -0800 (PST) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <201703040058.v240wnug073597@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314585 - head/usr.sbin/syslogd In-Reply-To: <9EDDFC3F-80F2-4864-9DF5-BF9F81A9DB4A@gmail.com> To: "Ngie Cooper (yaneurabeya)" Date: Fri, 3 Mar 2017 16:58:49 -0800 (PST) CC: Hiroki Sato , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , ngie@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 00:58:50 -0000 -- Start of PGP signed section. [ Charset UTF-8 unsupported, converting... ] > > > On Mar 3, 2017, at 15:12, Ngie Cooper (yaneurabeya) wrote: > > > > > >> On Mar 3, 2017, at 05:56, Rodney W. Grimes wrote: > >> > >> -- Start of PGP signed section. > >> [ Charset ISO-8859-7 unsupported, converting... ] > >>> "Ngie Cooper (yaneurabeya)" wrote > >>> in <1A3F6606-822C-4C80-ADFA-48378F0F29EE@gmail.com>: > >>> > >>> ya> >> How about "...accepts UDP packets sent with any source port" or > >> > >> I actually think this right here is the clearest one of all the ones > >> I have seen attempted. Oh, remove the s from accepts. > > > > How about this instead (it incorporates hrs?s suggestion and your?s)? > > Thanks, > > -Ngie > > > > $ svn diff syslogd.8 > > Index: syslogd.8 > > =================================================================== > > --- syslogd.8 (revision 314626) > > +++ syslogd.8 (working copy) > > @@ -131,7 +131,7 @@ > > .Ar service > > of > > .Ql \&* > > -allows packets to be received from any UDP port. > > +accept UDP packets from any source port. > > The default > > .Ar service > > is > > Actually, accepts is better. Although it isn?t clear by itself, the sentence fragment is describing the -a option, which is singular, not plural. Here?s the sentence in full context: > > source packet must belong to. A > service of `*' accepts UDP > packets from any source port. > Oh, yes, it shoud be accepts given the additional context. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Sat Mar 4 01:10:36 2017 Return-Path: Delivered-To: svn-src-all@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 603F6CF670A; Sat, 4 Mar 2017 01:10:36 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2425B1FEE; Sat, 4 Mar 2017 01:10:35 +0000 (UTC) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v241AY4E073651; Fri, 3 Mar 2017 17:10:34 -0800 (PST) (envelope-from freebsd-rwg@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd-rwg@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v241AYnh073650; Fri, 3 Mar 2017 17:10:34 -0800 (PST) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <201703040110.v241AYnh073650@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314585 - head/usr.sbin/syslogd In-Reply-To: To: "Ngie Cooper (yaneurabeya)" Date: Fri, 3 Mar 2017 17:10:34 -0800 (PST) CC: Hiroki Sato , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , ngie@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 01:10:36 -0000 [ Charset UTF-8 unsupported, converting... ] > > > On Mar 3, 2017, at 15:14, Ngie Cooper (yaneurabeya) wrote: > > ? > > > Actually, accepts is better. Although it isn?t clear by itself, the sentence fragment is describing the -a option, which is singular, not plural. Here?s the sentence in full context: > > > > source packet must belong to. A > > service of `*' accepts UDP > > packets from any source port. > > Correction: it?s describing `service`, which is still singular. > -Ngie Tongue in cheek: Now my head hurts!!! I let this stir around in my grey space for a minute and went wait, adding (s) to accept does not make it plurar. This is one of those really screwed up situations that is just a mess. So I had to google. AmE would like us to use just accept in this specific case. BrE would rather see accepts. It has to do with some thing they call present subjunctive. If you want to make your head hurt too google up "accept or accepts" -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Sat Mar 4 02:23:19 2017 Return-Path: Delivered-To: svn-src-all@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 A9808CF8BF7 for ; Sat, 4 Mar 2017 02:23:19 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound1b.ore.mailhop.org (outbound1b.ore.mailhop.org [54.200.247.200]) (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 8BD4E13B6 for ; Sat, 4 Mar 2017 02:23:19 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-User: 94b8b753-0081-11e7-ba57-8bc134ee460a X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 73.78.92.27 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [73.78.92.27]) by outbound1.ore.mailhop.org (Halon) with ESMTPSA id 94b8b753-0081-11e7-ba57-8bc134ee460a; Sat, 04 Mar 2017 02:23:41 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id v242NB8s002447; Fri, 3 Mar 2017 19:23:11 -0700 (MST) (envelope-from ian@freebsd.org) Message-ID: <1488594191.69705.13.camel@freebsd.org> Subject: Re: svn commit: r314585 - head/usr.sbin/syslogd From: Ian Lepore To: "Rodney W. Grimes" , "Ngie Cooper (yaneurabeya)" Cc: Hiroki Sato , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , ngie@freebsd.org Date: Fri, 03 Mar 2017 19:23:11 -0700 In-Reply-To: <201703040110.v241AYnh073650@pdx.rh.CN85.dnsmgr.net> References: <201703040110.v241AYnh073650@pdx.rh.CN85.dnsmgr.net> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.18.5.1 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 02:23:19 -0000 On Fri, 2017-03-03 at 17:10 -0800, Rodney W. Grimes wrote: > [ Charset UTF-8 unsupported, converting... ] > > > > > > > > > > On Mar 3, 2017, at 15:14, Ngie Cooper (yaneurabeya) > > gmail.com> wrote: > > ? > > > > > > > > Actually, accepts is better. Although it isn?t clear by itself, > > > the sentence fragment is describing the -a option, which is > > > singular, not plural. Here?s the sentence in full context: > > > > > >                                             source packet must > > > belong to.  A > > >                                             service of `*' > > > accepts UDP > > >                                             packets from any > > > source port. > > Correction: it?s describing `service`, which is still singular. > > -Ngie > Tongue in cheek:  Now my head hurts!!!   I let this stir around in my > grey > space for a minute and went wait, adding (s) to accept does not make > it > plurar.  This is one of those really screwed up situations that is > just > a mess.  So I had to google.  AmE would like us to use just accept in > this specific case.  BrE would rather see accepts.  It has to do with > some thing they call present subjunctive.  If you want to make your > head hurt too google up "accept or accepts" > The verb (accepts) in this case does not occur in a subjunctive clause, the sentence is a simple indicative statement, so any rules about how to conjugate the verb for a subjunctive don't apply here.  -- Ian From owner-svn-src-all@freebsd.org Sat Mar 4 04:06:34 2017 Return-Path: Delivered-To: svn-src-all@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 DFFD4CF8DD1; Sat, 4 Mar 2017 04:06:34 +0000 (UTC) (envelope-from bde@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 A0CCC1D70; Sat, 4 Mar 2017 04:06:34 +0000 (UTC) (envelope-from bde@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2446XDU050862; Sat, 4 Mar 2017 04:06:33 GMT (envelope-from bde@FreeBSD.org) Received: (from bde@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2446X0j050861; Sat, 4 Mar 2017 04:06:33 GMT (envelope-from bde@FreeBSD.org) Message-Id: <201703040406.v2446X0j050861@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bde set sender to bde@FreeBSD.org using -f From: Bruce Evans Date: Sat, 4 Mar 2017 04:06:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314640 - head/usr.bin/ruptime X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 04:06:35 -0000 Author: bde Date: Sat Mar 4 04:06:33 2017 New Revision: 314640 URL: https://svnweb.freebsd.org/changeset/base/314640 Log: Fix formatting. ruptime output on FreeBSD cluster machines annoyed me by usually being double-spaced due to auto-wrap at column 80. r212771 increased width of the hostname field from 12 to 25. This was supposed to allow for 80-column output with all 3 load averages taking 5 characters each, but it actually gave width exactly 80 and thus worse than useless auto-wrap in that case. 3 wide load average fields are unusual, but later expansion of another field gave the auto-wrap with just 2 wide load average fields. Change to dynamic field widths for all fields except the uptime. This also fixes the formatting of high (above 9999) user counts and not very high (above 9.99) load averages. The formatting for numbers now breaks at 99999.99, but scientific notation should be used starting well below that. The field width for the uptime remains hard-coded to work consistently for uptimes less than 10000 days, but this gives too much space for small uptimes. Punctuation between fields could be improved in many ways, for example by removing it. Modified: head/usr.bin/ruptime/ruptime.c Modified: head/usr.bin/ruptime/ruptime.c ============================================================================== --- head/usr.bin/ruptime/ruptime.c Sat Mar 4 00:33:41 2017 (r314639) +++ head/usr.bin/ruptime/ruptime.c Sat Mar 4 04:06:33 2017 (r314640) @@ -69,6 +69,7 @@ static DIR *dirp; static int hscmp(const void *, const void *); static char *interval(time_t, const char *); +static int iwidth(int); static int lcmp(const void *, const void *); static void ruptime(const char *, int, int (*)(const void *, const void *)); static int tcmp(const void *, const void *); @@ -143,6 +144,21 @@ interval(time_t tval, const char *updown return (resbuf); } +/* Width to print a small nonnegative integer. */ +static int +iwidth(int w) +{ + if (w < 10) + return (1); + if (w < 100) + return (2); + if (w < 1000) + return (3); + if (w < 10000) + return (4); + return (5); +} + #define HS(a) ((const struct hs *)(a)) /* Alphabetical comparison. */ @@ -176,14 +192,17 @@ ruptime(const char *host, int aflg, int struct whod *wd; struct whoent *we; struct dirent *dp; - const char *hostname; - int fd, i, maxloadav; + int fd, hostnamewidth, i, loadavwidth[3], userswidth, w; size_t hspace; ssize_t cc; rewinddir(dirp); hsp = NULL; - maxloadav = -1; + hostnamewidth = 0; + loadavwidth[0] = 4; + loadavwidth[1] = 4; + loadavwidth[2] = 4; + userswidth = 1; (void)time(&now); for (nhosts = hspace = 0; (dp = readdir(dirp)) != NULL;) { if (dp->d_ino == 0 || strncmp(dp->d_name, "whod.", 5) != 0) @@ -206,22 +225,25 @@ ruptime(const char *host, int aflg, int if (cc < (ssize_t)WHDRSIZE) continue; - if (host != NULL) { - hostname = wd->wd_hostname; - if (strcasecmp(hostname, host) != 0) - continue; - } + if (host != NULL && strcasecmp(wd->wd_hostname, host) != 0) + continue; if (LEFTEARTH(wd->wd_recvtime)) continue; - for (i = 0; i < 2; i++) - if (wd->wd_loadav[i] > maxloadav) - maxloadav = wd->wd_loadav[i]; + if (hostnamewidth < (int)strlen(wd->wd_hostname)) + hostnamewidth = (int)strlen(wd->wd_hostname); + for (i = 0; i < 3; i++) { + w = iwidth(wd->wd_loadav[i] / 100) + 3; + if (loadavwidth[i] < w) + loadavwidth[i] = w; + } for (hsp->hs_nusers = 0, we = &wd->wd_we[0]; (char *)(we + 1) <= (char *)wd + cc; we++) if (aflg || we->we_idle < 3600) ++hsp->hs_nusers; + if (userswidth < iwidth(hsp->hs_nusers)) + userswidth = iwidth(hsp->hs_nusers); ++hsp; ++nhosts; } @@ -233,27 +255,28 @@ ruptime(const char *host, int aflg, int } qsort(hs, nhosts, sizeof(hs[0]), cmp); + w = userswidth + loadavwidth[0] + loadavwidth[1] + loadavwidth[2]; + if (hostnamewidth + w > 41) + hostnamewidth = 41 - w; /* limit to 79 cols */ for (i = 0; i < (int)nhosts; i++) { hsp = &hs[i]; wd = &hsp->hs_wd; if (ISDOWN(hsp)) { - (void)printf("%-25.25s%s\n", wd->wd_hostname, + (void)printf("%-*.*s%s\n", + hostnamewidth, hostnamewidth, wd->wd_hostname, interval(now - hsp->hs_wd.wd_recvtime, "down")); continue; } (void)printf( - "%-25.25s%s, %4d user%s load %*.2f, %*.2f, %*.2f\n", - wd->wd_hostname, + "%-*.*s %s, %*d user%s load %*.2f, %*.2f, %*.2f\n", + hostnamewidth, hostnamewidth, wd->wd_hostname, interval((time_t)wd->wd_sendtime - (time_t)wd->wd_boottime, " up"), - hsp->hs_nusers, + userswidth, hsp->hs_nusers, hsp->hs_nusers == 1 ? ", " : "s,", - maxloadav >= 1000 ? 5 : 4, - wd->wd_loadav[0] / 100.0, - maxloadav >= 1000 ? 5 : 4, - wd->wd_loadav[1] / 100.0, - maxloadav >= 1000 ? 5 : 4, - wd->wd_loadav[2] / 100.0); + loadavwidth[0], wd->wd_loadav[0] / 100.0, + loadavwidth[1], wd->wd_loadav[1] / 100.0, + loadavwidth[2], wd->wd_loadav[2] / 100.0); } free(hs); hs = NULL; From owner-svn-src-all@freebsd.org Sat Mar 4 04:37:53 2017 Return-Path: Delivered-To: svn-src-all@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 82BC5CF8C5E; Sat, 4 Mar 2017 04:37:53 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 4D3F61FC3; Sat, 4 Mar 2017 04:37:53 +0000 (UTC) (envelope-from des@des.no) Received: from desk.des.no (smtp.des.no [194.63.250.102]) by smtp.des.no (Postfix) with ESMTP id 0414D9185; Sat, 4 Mar 2017 04:37:52 +0000 (UTC) Received: by desk.des.no (Postfix, from userid 1001) id BE4B6480E; Sat, 4 Mar 2017 05:37:51 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: "Rodney W. Grimes" Cc: "Ngie Cooper \(yaneurabeya\)" , Ngie Cooper , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314464 - head/usr.sbin/yppush References: <201703010553.v215rfIj054071@pdx.rh.CN85.dnsmgr.net> Date: Sat, 04 Mar 2017 05:37:51 +0100 In-Reply-To: <201703010553.v215rfIj054071@pdx.rh.CN85.dnsmgr.net> (Rodney W. Grimes's message of "Tue, 28 Feb 2017 21:53:41 -0800 (PST)") Message-ID: <86pohx7j34.fsf@desk.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 04:37:53 -0000 "Rodney W. Grimes" writes: > It makes the logfiles of make output now src tree possition dependent, > but I am probalby the only person in the universe that has ever run a > diff on the output of make world. tinderbox (or, to be precise, tbmaster) contains a ton of code to normalize paths in buildworld / buildkernel output :) DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-svn-src-all@freebsd.org Sat Mar 4 06:19:14 2017 Return-Path: Delivered-To: svn-src-all@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 36256CF8C1F; Sat, 4 Mar 2017 06:19:14 +0000 (UTC) (envelope-from bde@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 EA0DB1A52; Sat, 4 Mar 2017 06:19:13 +0000 (UTC) (envelope-from bde@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v246JD2n003875; Sat, 4 Mar 2017 06:19:13 GMT (envelope-from bde@FreeBSD.org) Received: (from bde@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v246JCYp003872; Sat, 4 Mar 2017 06:19:12 GMT (envelope-from bde@FreeBSD.org) Message-Id: <201703040619.v246JCYp003872@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bde set sender to bde@FreeBSD.org using -f From: Bruce Evans Date: Sat, 4 Mar 2017 06:19:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314641 - head/sys/dev/syscons X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 06:19:14 -0000 Author: bde Date: Sat Mar 4 06:19:12 2017 New Revision: 314641 URL: https://svnweb.freebsd.org/changeset/base/314641 Log: Colorize syscons kernel console output according to a table indexed by the CPU number. This was originally for debugging near-deadlock conditions where multiple CPUs either deadlock or scramble each other's output trying to report the problem, but I found it interesting and sometimes useful for ordinary kernel messages. Ordinary kernel messages shouldn't be interleaved, but if they are then the colorization makes them readable even if the interleaving is for every character (provided the CPU printing each message doesn't change). The default colors are 8-15 starting at 15 (bright white on black) for CPU 0 and repeating every 8 CPUs. This works best with 8 CPUs. Non-bright colors and nonzero background colors need special configuration to avoid unreadable and ugly combinations so are not configured by default. The next bright color after 15 is 8 (bright black = dark gray) is not very readable but is the only other color used with 2 CPUs. After that the next bright color is 9 (bright blue) which is not much brighter than bright black, but is used with 3+ CPUs. Other bright colors are brighter. Colorization is configured by default so that it gets tested. It can only be turned off by configuring SC_KERNEL_CONS_ATTR to anything other than FG_WHITE. After booting, all colors can be changed using the syscons.kattr sysctl. This is a SYSCTL_OPAQUE, and no utility is provided to change it (sysctl only displays it). The default colors work in all VGA modes that I could test. In 2-color graphics modes, all 8 bright colors are displayed as bright white, so the colorization has no effect, but anything with a nonzero background gives white on white unless the foreground is zero. I don't have an mono or VGA grayscale hardware to test on. Support for mono mode seems to have never worked right in syscons (I think bright white gives white underline with either bold or bright), but VGA grayscale should work better than 2-color graphics. Modified: head/sys/dev/syscons/scterm-teken.c head/sys/dev/syscons/syscons.c head/sys/dev/syscons/syscons.h Modified: head/sys/dev/syscons/scterm-teken.c ============================================================================== --- head/sys/dev/syscons/scterm-teken.c Sat Mar 4 04:06:33 2017 (r314640) +++ head/sys/dev/syscons/scterm-teken.c Sat Mar 4 06:19:12 2017 (r314641) @@ -176,7 +176,7 @@ scteken_puts(scr_stat *scp, u_char *buf, if (kernel) { /* Use special colors for kernel messages. */ backup = *teken_get_curattr(&ts->ts_teken); - scteken_revattr(SC_KERNEL_CONS_ATTR, &kattr); + scteken_revattr(sc_kattr(), &kattr); teken_set_curattr(&ts->ts_teken, &kattr); teken_input(&ts->ts_teken, buf, len); teken_set_curattr(&ts->ts_teken, &backup); Modified: head/sys/dev/syscons/syscons.c ============================================================================== --- head/sys/dev/syscons/syscons.c Sat Mar 4 04:06:33 2017 (r314640) +++ head/sys/dev/syscons/syscons.c Sat Mar 4 06:19:12 2017 (r314641) @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -100,6 +101,8 @@ static default_attr user_default = { SC_NORM_REV_ATTR, }; +static u_char sc_kattrtab[MAXCPU]; + static int sc_console_unit = -1; static int sc_saver_keyb_only = 1; static scr_stat *sc_console; @@ -141,6 +144,8 @@ static int sc_no_suspend_vtswitch = 0; static int sc_susp_scr; static SYSCTL_NODE(_hw, OID_AUTO, syscons, CTLFLAG_RD, 0, "syscons"); +SYSCTL_OPAQUE(_hw_syscons, OID_AUTO, kattr, CTLFLAG_RW, + &sc_kattrtab, sizeof(sc_kattrtab), "CU", "kernel console attributes"); static SYSCTL_NODE(_hw_syscons, OID_AUTO, saver, CTLFLAG_RD, 0, "saver"); SYSCTL_INT(_hw_syscons_saver, OID_AUTO, keybonly, CTLFLAG_RW, &sc_saver_keyb_only, 0, "screen saver interrupted by input only"); @@ -2994,8 +2999,16 @@ scinit(int unit, int flags) int i; /* one time initialization */ - if (init_done == COLD) + if (init_done == COLD) { sc_get_bios_values(&bios_value); + for (i = 0; i < nitems(sc_kattrtab); i++) { +#if SC_KERNEL_CONS_ATTR == FG_WHITE + sc_kattrtab[i] = 8 + (i + FG_WHITE) % 8U; +#else + sc_kattrtab[i] = SC_KERNEL_CONS_ATTR; +#endif + } + } init_done = WARM; /* @@ -4008,6 +4021,12 @@ sc_bell(scr_stat *scp, int pitch, int du } } +int +sc_kattr(void) +{ + return (sc_kattrtab[PCPU_GET(cpuid) % nitems(sc_kattrtab)]); +} + static void blink_screen(void *arg) { Modified: head/sys/dev/syscons/syscons.h ============================================================================== --- head/sys/dev/syscons/syscons.h Sat Mar 4 04:06:33 2017 (r314640) +++ head/sys/dev/syscons/syscons.h Sat Mar 4 06:19:12 2017 (r314641) @@ -581,6 +581,7 @@ void sc_paste(scr_stat *scp, const u_ch void sc_respond(scr_stat *scp, const u_char *p, int count, int wakeup); void sc_bell(scr_stat *scp, int pitch, int duration); +int sc_kattr(void); /* schistory.c */ #ifndef SC_NO_HISTORY From owner-svn-src-all@freebsd.org Sat Mar 4 06:19:42 2017 Return-Path: Delivered-To: svn-src-all@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 7DB02CF8C7B; Sat, 4 Mar 2017 06:19:42 +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 4679C1BD9; Sat, 4 Mar 2017 06:19:42 +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 v246JfBV003933; Sat, 4 Mar 2017 06:19:41 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v246Jfx6003932; Sat, 4 Mar 2017 06:19:41 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703040619.v246Jfx6003932@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 4 Mar 2017 06:19:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314642 - head/usr.sbin/syslogd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 06:19:42 -0000 Author: ngie Date: Sat Mar 4 06:19:41 2017 New Revision: 314642 URL: https://svnweb.freebsd.org/changeset/base/314642 Log: Correct nuance of -a :service -> "*" in r314563, r314585 My attempt to correct the sender/receiver behavior was incorrect. The source port of the sender for forwarded datagrams is filtered with -a, and my change in r314585 didn't clarify that point at all. Wording is based on suggestion by hrs. MFC after: 28 days X-MFC with: r314563, r314585 Reported by: hrs In collaboration with: hrs, rgrimes Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/syslogd/syslogd.8 Modified: head/usr.sbin/syslogd/syslogd.8 ============================================================================== --- head/usr.sbin/syslogd/syslogd.8 Sat Mar 4 06:19:12 2017 (r314641) +++ head/usr.sbin/syslogd/syslogd.8 Sat Mar 4 06:19:41 2017 (r314642) @@ -28,7 +28,7 @@ .\" @(#)syslogd.8 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd March 2, 2017 +.Dd March 3, 2017 .Dt SYSLOGD 8 .Os .Sh NAME @@ -131,7 +131,7 @@ A .Ar service of .Ql \&* -allows packets to be received from any UDP port. +accepts UDP packets from any source port. The default .Ar service is From owner-svn-src-all@freebsd.org Sat Mar 4 06:54:06 2017 Return-Path: Delivered-To: svn-src-all@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 D71B4CF85D8; Sat, 4 Mar 2017 06:54:06 +0000 (UTC) (envelope-from dchagin@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 A41851B1E; Sat, 4 Mar 2017 06:54:06 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v246s5up019860; Sat, 4 Mar 2017 06:54:05 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v246s58K019859; Sat, 4 Mar 2017 06:54:05 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201703040654.v246s58K019859@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sat, 4 Mar 2017 06:54:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314643 - head/sys/compat/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 06:54:06 -0000 Author: dchagin Date: Sat Mar 4 06:54:05 2017 New Revision: 314643 URL: https://svnweb.freebsd.org/changeset/base/314643 Log: Hide Linux socketcall constants under corresponding #ifdef since they are used only in i386 Linuxulator. MFC after: 1 week Modified: head/sys/compat/linux/linux_socket.h Modified: head/sys/compat/linux/linux_socket.h ============================================================================== --- head/sys/compat/linux/linux_socket.h Sat Mar 4 06:19:41 2017 (r314642) +++ head/sys/compat/linux/linux_socket.h Sat Mar 4 06:54:05 2017 (r314643) @@ -141,7 +141,6 @@ struct l_ucred { }; #if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) - struct linux_accept_args { register_t s; register_t addr; @@ -150,12 +149,7 @@ struct linux_accept_args { int linux_accept(struct thread *td, struct linux_accept_args *args); -#endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ - - - /* Operations for socketcall */ - #define LINUX_SOCKET 1 #define LINUX_BIND 2 #define LINUX_CONNECT 3 @@ -176,6 +170,7 @@ int linux_accept(struct thread *td, stru #define LINUX_ACCEPT4 18 #define LINUX_RECVMMSG 19 #define LINUX_SENDMMSG 20 +#endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ /* Socket options */ #define LINUX_IP_TOS 1 From owner-svn-src-all@freebsd.org Sat Mar 4 08:28:35 2017 Return-Path: Delivered-To: svn-src-all@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 2CCDFCF8A4E; Sat, 4 Mar 2017 08:28:35 +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 EDE921B37; Sat, 4 Mar 2017 08:28:34 +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 v248SYtF056715; Sat, 4 Mar 2017 08:28:34 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v248SYeB056714; Sat, 4 Mar 2017 08:28:34 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703040828.v248SYeB056714@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 4 Mar 2017 08:28:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314644 - head/sys/modules/geom/geom_uzip X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 08:28:35 -0000 Author: ngie Date: Sat Mar 4 08:28:33 2017 New Revision: 314644 URL: https://svnweb.freebsd.org/changeset/base/314644 Log: Fix "make depend" with geom_uzip.ko: add opt_geom.h to SRCS MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/sys/modules/geom/geom_uzip/Makefile Modified: head/sys/modules/geom/geom_uzip/Makefile ============================================================================== --- head/sys/modules/geom/geom_uzip/Makefile Sat Mar 4 06:54:05 2017 (r314643) +++ head/sys/modules/geom/geom_uzip/Makefile Sat Mar 4 08:28:33 2017 (r314644) @@ -18,5 +18,6 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/x SRCS+= xz_crc32.c xz_dec_bcj.c xz_dec_lzma2.c xz_dec_stream.c \ xz_malloc.c SRCS+= xz.h xz_config.h xz_lzma2.h xz_malloc.h xz_private.h xz_stream.h +SRCS+= opt_geom.h .include From owner-svn-src-all@freebsd.org Sat Mar 4 08:46:58 2017 Return-Path: Delivered-To: svn-src-all@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 AC7A4CF8E0D; Sat, 4 Mar 2017 08:46:58 +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 7BC441249; Sat, 4 Mar 2017 08:46:58 +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 v248kv8J064677; Sat, 4 Mar 2017 08:46:57 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v248kv7V064676; Sat, 4 Mar 2017 08:46:57 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703040846.v248kv7V064676@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 4 Mar 2017 08:46:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314645 - head/sys/modules/nvme X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 08:46:58 -0000 Author: ngie Date: Sat Mar 4 08:46:57 2017 New Revision: 314645 URL: https://svnweb.freebsd.org/changeset/base/314645 Log: Fix "make depend" with nvme.ko: add opt_cam.h to SRCS MFC after: 1 week X-MFC with: r301778 Sponsored by: Dell EMC Isilon Modified: head/sys/modules/nvme/Makefile Modified: head/sys/modules/nvme/Makefile ============================================================================== --- head/sys/modules/nvme/Makefile Sat Mar 4 08:28:33 2017 (r314644) +++ head/sys/modules/nvme/Makefile Sat Mar 4 08:46:57 2017 (r314645) @@ -16,6 +16,7 @@ SRCS = nvme.c \ \ bus_if.h \ device_if.h \ + opt_cam.h \ pci_if.h .include From owner-svn-src-all@freebsd.org Sat Mar 4 08:47:32 2017 Return-Path: Delivered-To: svn-src-all@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 61825CF8E74; Sat, 4 Mar 2017 08:47:32 +0000 (UTC) (envelope-from bde@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 3C2901389; Sat, 4 Mar 2017 08:47:32 +0000 (UTC) (envelope-from bde@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v248lV5o064745; Sat, 4 Mar 2017 08:47:31 GMT (envelope-from bde@FreeBSD.org) Received: (from bde@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v248lVZS064744; Sat, 4 Mar 2017 08:47:31 GMT (envelope-from bde@FreeBSD.org) Message-Id: <201703040847.v248lVZS064744@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bde set sender to bde@FreeBSD.org using -f From: Bruce Evans Date: Sat, 4 Mar 2017 08:47:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314646 - head/sys/dev/syscons X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 08:47:32 -0000 Author: bde Date: Sat Mar 4 08:47:31 2017 New Revision: 314646 URL: https://svnweb.freebsd.org/changeset/base/314646 Log: Implement ec_putc() (emergency kernel [syscons] console putc()) and use it in emergency in sc_cnputc(). Locking fixes in sc_cnputc() previously turned off normal output in near-deadlock conditions and added deferred output which might never be completed. Emergency output goes to the frame buffer using sufficiently atomic non-blocking writes if the console is in text mode (in graphics mode, nothing is done, modulo races setting the graphics mode bit). Screen updates overwrite the emergency output if the emergency condition clears enough to reach them. ec_putc() also works for "early" console output in normal x86 text mode as soon as this mode is initialized (if ever). This uses a hard-coded x86 frame buffer address before cninit() and a hopefully MI address after cninit(). But non-x86 is more likely to not support text mode, when ec_putc() will be null. ec_putc() has no dependencies of syscons before cninit(), and only has them later to track syscons' mode changes. This commit doesn't attach ec_putc() for early use. To test emergency use, put a breakpoint in central syscons output code like sc_puts() and do some user output. The system used to race or deadlock in ddb output soon after entry to ddb. The locking fixes deferred the output until after leaving ddb, so ddb was unusable and you had to try typing c[ontinue] blindly until it exited, or better use a serial console in parallel. Now the output goes to a window in the middle 2/3 of the screen. Scrolling is circular and there is no cursor, but otherwise ec_putc() provides full dumb terminal functionality and very fast output that hides artificates from dumb overwrites. Modified: head/sys/dev/syscons/syscons.c Modified: head/sys/dev/syscons/syscons.c ============================================================================== --- head/sys/dev/syscons/syscons.c Sat Mar 4 08:46:57 2017 (r314645) +++ head/sys/dev/syscons/syscons.c Sat Mar 4 08:47:31 2017 (r314646) @@ -266,6 +266,65 @@ static struct cdevsw consolectl_devsw = .d_name = "consolectl", }; +/* ec -- emergency console. */ + +static u_int ec_scroffset; + +/* + * Fake enough of main_console for ec_putc() to work very early on x86 if + * the kernel starts in normal color text mode. On non-x86, scribbling + * to the x86 normal color text frame buffer's addresses is unsafe, so + * set (likely non-fake) graphics mode to get a null initial ec_putc(). + */ +static scr_stat fake_main_console = { + .scr.vtb_buffer = 0xb8000, + .xsize = 80, + .ysize = 25, +#if !defined(__amd64__) && !defined(__i386__) + .status = GRAPHICS_MODE, +#endif +}; + +#define main_console (sc_console == NULL ? fake_main_console : main_console) + +static void +ec_putc(int c) +{ + u_short *scrptr; + u_int ind; + int attr, column, mysize, width, xsize, yborder, ysize; + + if (main_console.status & GRAPHICS_MODE || + c < 0 || c > 0xff || c == '\a') + return; + xsize = main_console.xsize; + ysize = main_console.ysize; + yborder = ysize / 5; + scrptr = (u_short *)main_console.scr.vtb_buffer + xsize * yborder; + mysize = xsize * (ysize - 2 * yborder); + do { + ind = ec_scroffset; + column = ind % xsize; + width = (c == '\b' ? -1 : c == '\t' ? (column + 8) & ~7 : + c == '\r' ? -column : c == '\n' ? xsize - column : 1); + if (width == 0 || (width < 0 && ind < -width)) + return; + } while (atomic_cmpset_rel_int(&ec_scroffset, ind, ind + width) == 0); + if (c == '\b' || c == '\r') + return; + if (c == '\n') + ind += xsize; /* XXX clearing from new pos is not atomic */ + + attr = sc_kattr(); + if (c == '\t' || c == '\n') + c = ' '; + do + scrptr[ind++ % mysize] = (attr << 8) | c; + while (--width != 0); +} + +#undef main_console + int sc_probe_unit(int unit, int flags) { @@ -1861,10 +1920,13 @@ sc_cnputc(struct consdev *cd, int c) sc_cnputc_log[head % sizeof(sc_cnputc_log)] = c; /* - * If we couldn't open, return to defer output. + * If we couldn't open, do special reentrant output and return to defer + * normal output. */ - if (!st.scr_opened) + if (!st.scr_opened) { + ec_putc(c); return; + } #ifndef SC_NO_HISTORY if (scp == scp->sc->cur_scp && scp->status & SLKED) { From owner-svn-src-all@freebsd.org Sat Mar 4 08:57:41 2017 Return-Path: Delivered-To: svn-src-all@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 34391CF813A; Sat, 4 Mar 2017 08:57:41 +0000 (UTC) (envelope-from dchagin@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 0346618A2; Sat, 4 Mar 2017 08:57:40 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v248veYa069141; Sat, 4 Mar 2017 08:57:40 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v248veDr069140; Sat, 4 Mar 2017 08:57:40 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201703040857.v248veDr069140@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sat, 4 Mar 2017 08:57:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314647 - head/sys/compat/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 08:57:41 -0000 Author: dchagin Date: Sat Mar 4 08:57:39 2017 New Revision: 314647 URL: https://svnweb.freebsd.org/changeset/base/314647 Log: Remove attribute __packed from some IPC struct definition since Linuxulator is x86 only. The only notable differences in algnment for an LP64 64-bit system when compared to a 32-bit system is an eight or large byte types alignment. MFC after: 1 month Modified: head/sys/compat/linux/linux_ipc.c Modified: head/sys/compat/linux/linux_ipc.c ============================================================================== --- head/sys/compat/linux/linux_ipc.c Sat Mar 4 08:47:31 2017 (r314646) +++ head/sys/compat/linux/linux_ipc.c Sat Mar 4 08:57:39 2017 (r314647) @@ -130,7 +130,6 @@ linux_to_bsd_ipc_perm(struct l_ipc_perm bpp->seq = lpp->seq; } - static void bsd_to_linux_ipc_perm(struct ipc_perm *bpp, struct l_ipc_perm *lpp) { @@ -158,11 +157,7 @@ struct l_msqid_ds { l_ushort msg_qbytes; /* max number of bytes on queue */ l_pid_t msg_lspid; /* pid of last msgsnd */ l_pid_t msg_lrpid; /* last receive pid */ -} -#if defined(__amd64__) && defined(COMPAT_LINUX32) -__packed -#endif -; +}; struct l_semid_ds { struct l_ipc_perm sem_perm; @@ -173,11 +168,7 @@ struct l_semid_ds { l_uintptr_t sem_pending_last; l_uintptr_t undo; l_ushort sem_nsems; -} -#if defined(__amd64__) && defined(COMPAT_LINUX32) -__packed -#endif -; +}; struct l_shmid_ds { struct l_ipc_perm shm_perm; From owner-svn-src-all@freebsd.org Sat Mar 4 08:59:23 2017 Return-Path: Delivered-To: svn-src-all@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 3C28ACF820C; Sat, 4 Mar 2017 08:59:23 +0000 (UTC) (envelope-from dchagin@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 16E751A0C; Sat, 4 Mar 2017 08:59:23 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v248xMHf069281; Sat, 4 Mar 2017 08:59:22 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v248xMd9069280; Sat, 4 Mar 2017 08:59:22 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201703040859.v248xMd9069280@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sat, 4 Mar 2017 08:59:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314648 - head/sys/compat/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 08:59:23 -0000 Author: dchagin Date: Sat Mar 4 08:59:21 2017 New Revision: 314648 URL: https://svnweb.freebsd.org/changeset/base/314648 Log: Style(9). MFC after: 1 month Modified: head/sys/compat/linux/linux_ipc.c Modified: head/sys/compat/linux/linux_ipc.c ============================================================================== --- head/sys/compat/linux/linux_ipc.c Sat Mar 4 08:57:39 2017 (r314647) +++ head/sys/compat/linux/linux_ipc.c Sat Mar 4 08:59:21 2017 (r314648) @@ -531,7 +531,7 @@ linux_semctl(struct thread *td, struct l cmd = IPC_SET; error = linux_semid_pullup(args->cmd & LINUX_IPC_64, &linux_semid, PTRIN(args->arg.buf)); - if (error) + if (error != 0) return (error); linux_to_bsd_semid_ds(&linux_semid, &semid); semun.buf = &semid; @@ -546,7 +546,7 @@ linux_semctl(struct thread *td, struct l semun.buf = &semid; error = kern_semctl(td, args->semid, args->semnum, cmd, &semun, &rval); - if (error) + if (error != 0) return (error); bsd_to_linux_semid_ds(&semid, &linux_semid); error = linux_semid_pushdown(args->cmd & LINUX_IPC_64, @@ -573,7 +573,7 @@ linux_semctl(struct thread *td, struct l */ error = copyout(&linux_seminfo, PTRIN(args->arg.buf), sizeof(linux_seminfo)); - if (error) + if (error != 0) return (error); td->td_retval[0] = seminfo.semmni; return (0); /* No need for __semctl call */ @@ -690,7 +690,7 @@ linux_msgctl(struct thread *td, struct l case LINUX_IPC_SET: error = linux_msqid_pullup(args->cmd & LINUX_IPC_64, &linux_msqid, PTRIN(args->buf)); - if (error) + if (error != 0) return (error); linux_to_bsd_msqid_ds(&linux_msqid, &bsd_msqid); break; @@ -788,7 +788,7 @@ linux_shmctl(struct thread *td, struct l /* Perform shmctl wanting removed segments lookup */ error = kern_shmctl(td, args->shmid, IPC_INFO, (void *)&bsd_shminfo, NULL); - if (error) + if (error != 0) return (error); bsd_to_linux_shminfo(&bsd_shminfo, &linux_shminfo); @@ -803,7 +803,7 @@ linux_shmctl(struct thread *td, struct l /* Perform shmctl wanting removed segments lookup */ error = kern_shmctl(td, args->shmid, SHM_INFO, (void *)&bsd_shm_info, NULL); - if (error) + if (error != 0) return (error); bsd_to_linux_shm_info(&bsd_shm_info, &linux_shm_info); @@ -816,9 +816,9 @@ linux_shmctl(struct thread *td, struct l /* Perform shmctl wanting removed segments lookup */ error = kern_shmctl(td, args->shmid, IPC_STAT, (void *)&bsd_shmid, NULL); - if (error) + if (error != 0) return (error); - + bsd_to_linux_shmid_ds(&bsd_shmid, &linux_shmid); return (linux_shmid_pushdown(args->cmd & LINUX_IPC_64, @@ -828,9 +828,9 @@ linux_shmctl(struct thread *td, struct l /* Perform shmctl wanting removed segments lookup */ error = kern_shmctl(td, args->shmid, IPC_STAT, (void *)&bsd_shmid, NULL); - if (error) + if (error != 0) return (error); - + bsd_to_linux_shmid_ds(&bsd_shmid, &linux_shmid); return (linux_shmid_pushdown(args->cmd & LINUX_IPC_64, @@ -839,7 +839,7 @@ linux_shmctl(struct thread *td, struct l case LINUX_IPC_SET: error = linux_shmid_pullup(args->cmd & LINUX_IPC_64, &linux_shmid, PTRIN(args->buf)); - if (error) + if (error != 0) return (error); linux_to_bsd_shmid_ds(&linux_shmid, &bsd_shmid); @@ -856,7 +856,7 @@ linux_shmctl(struct thread *td, struct l else { error = linux_shmid_pullup(args->cmd & LINUX_IPC_64, &linux_shmid, PTRIN(args->buf)); - if (error) + if (error != 0) return (error); linux_to_bsd_shmid_ds(&linux_shmid, &bsd_shmid); buf = (void *)&bsd_shmid; From owner-svn-src-all@freebsd.org Sat Mar 4 09:16:53 2017 Return-Path: Delivered-To: svn-src-all@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 4F364CF896D; Sat, 4 Mar 2017 09:16:53 +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 0606412BD; Sat, 4 Mar 2017 09:16:52 +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 v249GqpK077376; Sat, 4 Mar 2017 09:16:52 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v249GpYC077373; Sat, 4 Mar 2017 09:16:51 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703040916.v249GpYC077373@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 4 Mar 2017 09:16:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314649 - head/lib/msun/tests X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 09:16:53 -0000 Author: ngie Date: Sat Mar 4 09:16:51 2017 New Revision: 314649 URL: https://svnweb.freebsd.org/changeset/base/314649 Log: Convert lib/msun/ctrig_test from TAP to ATF This is being done as a precursor for work needed to annontate failing testcases with clang 4.0+. MFC after: 1 week PR: 217528 Sponsored by: Dell EMC Isilon Modified: head/lib/msun/tests/Makefile head/lib/msun/tests/ctrig_test.c Modified: head/lib/msun/tests/Makefile ============================================================================== --- head/lib/msun/tests/Makefile Sat Mar 4 08:59:21 2017 (r314648) +++ head/lib/msun/tests/Makefile Sat Mar 4 09:16:51 2017 (r314649) @@ -51,7 +51,7 @@ TAP_TESTS_C+= conj_test # https://llvm.org/bugs/show_bug.cgi?id=26081 TAP_TESTS_C+= csqrt_test .endif -TAP_TESTS_C+= ctrig_test +ATF_TESTS_C+= ctrig_test TAP_TESTS_C+= exponential_test TAP_TESTS_C+= fenv_test TAP_TESTS_C+= fma_test Modified: head/lib/msun/tests/ctrig_test.c ============================================================================== --- head/lib/msun/tests/ctrig_test.c Sat Mar 4 08:59:21 2017 (r314648) +++ head/lib/msun/tests/ctrig_test.c Sat Mar 4 09:16:51 2017 (r314649) @@ -31,13 +31,14 @@ #include __FBSDID("$FreeBSD$"); -#include #include #include #include #include #include +#include + #include "test-utils.h" #pragma STDC FENV_ACCESS ON @@ -60,9 +61,9 @@ __FBSDID("$FreeBSD$"); volatile long double complex _d = z; \ debug(" testing %s(%Lg + %Lg I) == %Lg + %Lg I\n", #func, \ creall(_d), cimagl(_d), creall(result), cimagl(result)); \ - assert(feclearexcept(FE_ALL_EXCEPT) == 0); \ - assert(cfpequal_cs((func)(_d), (result), (checksign))); \ - assert(((void)(func), fetestexcept(exceptmask) == (excepts))); \ + ATF_CHECK(feclearexcept(FE_ALL_EXCEPT) == 0); \ + ATF_CHECK(cfpequal_cs((func)(_d), (result), (checksign))); \ + ATF_CHECK(((void)(func), fetestexcept(exceptmask) == (excepts))); \ } while (0) /* @@ -74,7 +75,7 @@ __FBSDID("$FreeBSD$"); volatile long double complex _d = z; \ debug(" testing %s(%Lg + %Lg I) ~= %Lg + %Lg I\n", #func, \ creall(_d), cimagl(_d), creall(result), cimagl(result)); \ - assert(cfpequal_tol((func)(_d), (result), (tol), FPE_ABS_ZERO)); \ + ATF_CHECK(cfpequal_tol((func)(_d), (result), (tol), FPE_ABS_ZERO)); \ } while (0) /* These wrappers apply the identities f(conj(z)) = conj(f(z)). */ @@ -127,9 +128,12 @@ __FBSDID("$FreeBSD$"); } while (0) -/* Tests for 0 */ -void -test_zero(void) +ATF_TC(test_zero_input); +ATF_TC_HEAD(test_zero_input, tc) +{ + atf_tc_set_md_var(tc, "descr", "test 0 input"); +} +ATF_TC_BODY(test_zero_input, tc) { long double complex zero = CMPLXL(0.0, 0.0); @@ -142,11 +146,12 @@ test_zero(void) testall_odd(ctan, zero, zero, ALL_STD_EXCEPT, 0, CS_BOTH); } -/* - * Tests for NaN inputs. - */ -void -test_nan() +ATF_TC(test_nan_inputs); +ATF_TC_HEAD(test_nan_inputs, tc) +{ + atf_tc_set_md_var(tc, "descr", "test NaN inputs"); +} +ATF_TC_BODY(test_nan_inputs, tc) { long double complex nan_nan = CMPLXL(NAN, NAN); long double complex z; @@ -222,8 +227,12 @@ test_nan() testall_odd(ctan, z, nan_nan, OPT_INVALID, 0, 0); } -void -test_inf(void) +ATF_TC(test_inf_inputs); +ATF_TC_HEAD(test_inf_inputs, tc) +{ + atf_tc_set_md_var(tc, "descr", "test infinity inputs"); +} +ATF_TC_BODY(test_inf_inputs, tc) { static const long double finites[] = { 0, M_PI / 4, 3 * M_PI / 4, 5 * M_PI / 4, @@ -287,9 +296,12 @@ test_inf(void) testall_odd(ctan, z, CMPLXL(NAN, NAN), OPT_INEXACT, FE_INVALID, 0); } -/* Tests along the real and imaginary axes. */ -void -test_axes(void) +ATF_TC(test_axes); +ATF_TC_HEAD(test_axes, tc) +{ + atf_tc_set_md_var(tc, "descr", "test along the real/imaginary axes"); +} +ATF_TC_BODY(test_axes, tc) { static const long double nums[] = { M_PI / 4, M_PI / 2, 3 * M_PI / 4, @@ -347,8 +359,12 @@ test_axes(void) } } -void -test_small(void) +ATF_TC(test_small_inputs); +ATF_TC_HEAD(test_small_inputs, tc) +{ + atf_tc_set_md_var(tc, "descr", "test underflow inputs"); +} +ATF_TC_BODY(test_small_inputs, tc) { /* * z = 0.5 + i Pi/4 @@ -409,12 +425,20 @@ test_small(void) } } -/* Test inputs that might cause overflow in a sloppy implementation. */ -void -test_large(void) +ATF_TC(test_large_inputs); +ATF_TC_HEAD(test_large_inputs, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test inputs that might cause overflow in a sloppy implementation"); +} +ATF_TC_BODY(test_large_inputs, tc) { long double complex z; +#ifdef __i386__ + atf_tc_expect_fail("test fails on i386 - bug 205446"); +#endif + /* tanh() uses a threshold around x=22, so check both sides. */ z = CMPLXL(21, 0.78539816339744830961566084581987572L); testall_odd_tol(ctanh, z, @@ -452,33 +476,15 @@ test_large(void) FE_OVERFLOW, CS_BOTH); } -int -main(int argc, char *argv[]) +ATF_TP_ADD_TCS(tp) { - printf("1..6\n"); - - test_zero(); - printf("ok 1 - ctrig zero\n"); - - test_nan(); - printf("ok 2 - ctrig nan\n"); - - test_inf(); - printf("ok 3 - ctrig inf\n"); - - test_axes(); - printf("ok 4 - ctrig axes\n"); - - test_small(); - printf("ok 5 - ctrig small\n"); - -#if defined(__i386__) - printf("ok 6 # SKIP ctrig large # fails on i386 because of bug 205446\n"); -#else - test_large(); - printf("ok 6 - ctrig large\n"); -#endif + ATF_TP_ADD_TC(tp, test_zero_input); + ATF_TP_ADD_TC(tp, test_nan_inputs); + ATF_TP_ADD_TC(tp, test_inf_inputs); + ATF_TP_ADD_TC(tp, test_axes); + ATF_TP_ADD_TC(tp, test_small_inputs); + ATF_TP_ADD_TC(tp, test_large_inputs); - return (0); + return (atf_no_error()); } From owner-svn-src-all@freebsd.org Sat Mar 4 10:07:49 2017 Return-Path: Delivered-To: svn-src-all@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 350C0CF740B; Sat, 4 Mar 2017 10:07:49 +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 EA0B11509; Sat, 4 Mar 2017 10:07:48 +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 v24A7mp8098004; Sat, 4 Mar 2017 10:07:48 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24A7kae097986; Sat, 4 Mar 2017 10:07:46 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703041007.v24A7kae097986@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 4 Mar 2017 10:07:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314650 - head/lib/msun/tests X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 10:07:49 -0000 Author: ngie Date: Sat Mar 4 10:07:46 2017 New Revision: 314650 URL: https://svnweb.freebsd.org/changeset/base/314650 Log: Fix warnings in lib/msun/tests/... to help pave way for WARNS?= 6. - Staticize variables. - Use nitems liberally. Wherever nitems is used, use unsigned integers - Remove unused variables (argc, argv, etc) This fixes most issues -- some issues remain in logarithm_test though. MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/lib/msun/tests/cexp_test.c head/lib/msun/tests/conj_test.c head/lib/msun/tests/csqrt_test.c head/lib/msun/tests/ctrig_test.c head/lib/msun/tests/exponential_test.c head/lib/msun/tests/fenv_test.c head/lib/msun/tests/fma_test.c head/lib/msun/tests/fmaxmin_test.c head/lib/msun/tests/invctrig_test.c head/lib/msun/tests/invtrig_test.c head/lib/msun/tests/logarithm_test.c head/lib/msun/tests/lrint_test.c head/lib/msun/tests/nan_test.c head/lib/msun/tests/nearbyint_test.c head/lib/msun/tests/next_test.c head/lib/msun/tests/rem_test.c head/lib/msun/tests/test-utils.h head/lib/msun/tests/trig_test.c Modified: head/lib/msun/tests/cexp_test.c ============================================================================== --- head/lib/msun/tests/cexp_test.c Sat Mar 4 09:16:51 2017 (r314649) +++ head/lib/msun/tests/cexp_test.c Sat Mar 4 10:07:46 2017 (r314650) @@ -94,7 +94,7 @@ static const float finites[] = /* Tests for 0 */ -void +static void test_zero(void) { @@ -109,10 +109,10 @@ test_zero(void) * Tests for NaN. The signs of the results are indeterminate unless the * imaginary part is 0. */ -void -test_nan() +static void +test_nan(void) { - int i; + unsigned i; /* cexp(x + NaNi) = NaN + NaNi and optionally raises invalid */ /* cexp(NaN + yi) = NaN + NaNi and optionally raises invalid (|y|>0) */ @@ -142,10 +142,10 @@ test_nan() ALL_STD_EXCEPT, 0, 0); } -void +static void test_inf(void) { - int i; + unsigned i; /* cexp(x + inf i) = NaN + NaNi and raises invalid */ for (i = 0; i < nitems(finites); i++) { @@ -184,10 +184,10 @@ test_inf(void) ALL_STD_EXCEPT, 0, 1); } -void +static void test_reals(void) { - int i; + unsigned i; for (i = 0; i < nitems(finites); i++) { /* XXX could check exceptions more meticulously */ @@ -207,10 +207,10 @@ test_reals(void) } } -void +static void test_imaginaries(void) { - int i; + unsigned i; for (i = 0; i < nitems(finites); i++) { printf("# Run %d..\n", i); @@ -229,7 +229,7 @@ test_imaginaries(void) } } -void +static void test_small(void) { static const double tests[] = { @@ -242,7 +242,7 @@ test_small(void) }; double a, b; double x, y; - int i; + unsigned i; for (i = 0; i < nitems(tests); i += 4) { printf("# Run %d..\n", i); @@ -260,7 +260,7 @@ test_small(void) } /* Test inputs with a real part r that would overflow exp(r). */ -void +static void test_large(void) { @@ -288,7 +288,7 @@ test_large(void) } int -main(int argc, char *argv[]) +main(void) { printf("1..7\n"); Modified: head/lib/msun/tests/conj_test.c ============================================================================== --- head/lib/msun/tests/conj_test.c Sat Mar 4 09:16:51 2017 (r314649) +++ head/lib/msun/tests/conj_test.c Sat Mar 4 10:07:46 2017 (r314650) @@ -71,7 +71,7 @@ static const double tests[] = { }; int -main(int argc, char *argv[]) +main(void) { static const int ntests = sizeof(tests) / sizeof(tests[0]) / 2; complex float in; @@ -90,7 +90,7 @@ main(int argc, char *argv[]) assert(fpequal(libcreall(in), __real__ in)); assert(fpequal(libcimagf(in), __imag__ in)); assert(fpequal(libcimag(in), __imag__ in)); - assert(fpequal(libcimagl(in), __imag__ in)); + assert(fpequal(libcimagl(in), __imag__ in)); feclearexcept(FE_ALL_EXCEPT); if (!cfpequal(libconjf(in), expected)) { Modified: head/lib/msun/tests/csqrt_test.c ============================================================================== --- head/lib/msun/tests/csqrt_test.c Sat Mar 4 09:16:51 2017 (r314649) +++ head/lib/msun/tests/csqrt_test.c Sat Mar 4 10:07:46 2017 (r314650) @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); * The latter two convert to float or double, respectively, and test csqrtf() * and csqrt() with the same arguments. */ -long double complex (*t_csqrt)(long double complex); +static long double complex (*t_csqrt)(long double complex); static long double complex _csqrtf(long double complex d) @@ -82,7 +82,7 @@ assert_equal(long double complex d1, lon * exceptions.) */ static void -test_finite() +test_finite(void) { static const double tests[] = { /* csqrt(a + bI) = x + yI */ @@ -125,7 +125,7 @@ test_finite() double a, b; double x, y; - int i, j; + unsigned i, j; for (i = 0; i < nitems(tests); i += 4) { for (j = 0; j < nitems(mults); j++) { @@ -143,7 +143,7 @@ test_finite() * Test the handling of +/- 0. */ static void -test_zeros() +test_zeros(void) { assert_equal(t_csqrt(CMPLXL(0.0, 0.0)), CMPLXL(0.0, 0.0)); @@ -156,7 +156,7 @@ test_zeros() * Test the handling of infinities when the other argument is not NaN. */ static void -test_infinities() +test_infinities(void) { static const double vals[] = { 0.0, @@ -167,7 +167,7 @@ test_infinities() -INFINITY, }; - int i; + unsigned i; for (i = 0; i < nitems(vals); i++) { if (isfinite(vals[i])) { @@ -187,7 +187,7 @@ test_infinities() * Test the handling of NaNs. */ static void -test_nans() +test_nans(void) { assert(creall(t_csqrt(CMPLXL(INFINITY, NAN))) == INFINITY); @@ -232,7 +232,7 @@ test_overflow(int maxexp) } int -main(int argc, char *argv[]) +main(void) { printf("1..15\n"); Modified: head/lib/msun/tests/ctrig_test.c ============================================================================== --- head/lib/msun/tests/ctrig_test.c Sat Mar 4 09:16:51 2017 (r314649) +++ head/lib/msun/tests/ctrig_test.c Sat Mar 4 10:07:46 2017 (r314650) @@ -31,6 +31,7 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include #include @@ -238,7 +239,7 @@ ATF_TC_BODY(test_inf_inputs, tc) 0, M_PI / 4, 3 * M_PI / 4, 5 * M_PI / 4, }; long double complex z, c, s; - int i; + unsigned i; /* * IN CSINH CCOSH CTANH @@ -260,7 +261,7 @@ ATF_TC_BODY(test_inf_inputs, tc) testall_odd(ctan, z, CMPLXL(0, 1), ALL_STD_EXCEPT, 0, CS_REAL); /* XXX We allow spurious inexact exceptions here (hard to avoid). */ - for (i = 0; i < sizeof(finites) / sizeof(finites[0]); i++) { + for (i = 0; i < nitems(finites); i++) { z = CMPLXL(INFINITY, finites[i]); c = INFINITY * cosl(finites[i]); s = finites[i] == 0 ? finites[i] : INFINITY * sinl(finites[i]); @@ -308,9 +309,9 @@ ATF_TC_BODY(test_axes, tc) 5 * M_PI / 4, 3 * M_PI / 2, 7 * M_PI / 4, }; long double complex z; - int i; + unsigned i; - for (i = 0; i < sizeof(nums) / sizeof(nums[0]); i++) { + for (i = 0; i < nitems(nums); i++) { /* Real axis */ z = CMPLXL(nums[i], 0.0); test_odd_tol(csinh, z, CMPLXL(sinh(nums[i]), 0), DBL_ULP()); @@ -412,9 +413,9 @@ ATF_TC_BODY(test_small_inputs, tc) -0.26580222883407969212086273981988897L } }; long double complex z; - int i; + unsigned i; - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { + for (i = 0; i < nitems(tests); i++) { z = CMPLXL(tests[i].a, tests[i].b); testall_odd_tol(csinh, z, CMPLXL(tests[i].sinh_a, tests[i].sinh_b), 1.1); Modified: head/lib/msun/tests/exponential_test.c ============================================================================== --- head/lib/msun/tests/exponential_test.c Sat Mar 4 09:16:51 2017 (r314649) +++ head/lib/msun/tests/exponential_test.c Sat Mar 4 10:07:46 2017 (r314650) @@ -89,7 +89,7 @@ __FBSDID("$FreeBSD$"); test(expm1f, x, result, exceptmask, excepts); \ } while (0) -void +static void run_generic_tests(void) { @@ -122,10 +122,10 @@ run_generic_tests(void) testall1(-50000.0, -1.0, ALL_STD_EXCEPT, FE_INEXACT); } -void +static void run_exp2_tests(void) { - int i; + unsigned i; /* * We should insist that exp2() return exactly the correct @@ -148,7 +148,7 @@ run_exp2_tests(void) } int -main(int argc, char *argv[]) +main(void) { printf("1..3\n"); Modified: head/lib/msun/tests/fenv_test.c ============================================================================== --- head/lib/msun/tests/fenv_test.c Sat Mar 4 09:16:51 2017 (r314649) +++ head/lib/msun/tests/fenv_test.c Sat Mar 4 10:07:46 2017 (r314650) @@ -64,56 +64,15 @@ static const int std_excepts[] = { /* init_exceptsets() initializes this to the power set of std_excepts[] */ static int std_except_sets[1 << NEXCEPTS]; -static void init_exceptsets(void); - -static void test_dfl_env(void); -static void test_fegsetenv(void); -static void test_fegsetexceptflag(void); -static void test_masking(void); -static void test_fegsetround(void); -static void test_feholdupdate(void); -static void test_feraiseexcept(void); -static void test_fetestclearexcept(void); - -static int getround(void); -static void raiseexcept(int excepts); -static void trap_handler(int sig); - #pragma STDC FENV_ACCESS ON -int -main(int argc, char *argv[]) -{ - - printf("1..8\n"); - init_exceptsets(); - test_dfl_env(); - printf("ok 1 - fenv\n"); - test_fetestclearexcept(); - printf("ok 2 - fenv\n"); - test_fegsetexceptflag(); - printf("ok 3 - fenv\n"); - test_feraiseexcept(); - printf("ok 4 - fenv\n"); - test_fegsetround(); - printf("ok 5 - fenv\n"); - test_fegsetenv(); - printf("ok 6 - fenv\n"); - test_masking(); - printf("ok 7 - fenv\n"); - test_feholdupdate(); - printf("ok 8 - fenv\n"); - - return (0); -} - /* * Initialize std_except_sets[] to the power set of std_excepts[] */ -void +static void init_exceptsets(void) { - int i, j, sr; + unsigned i, j, sr; for (i = 0; i < 1 << NEXCEPTS; i++) { for (sr = i, j = 0; sr != 0; sr >>= 1, j++) @@ -122,6 +81,90 @@ init_exceptsets(void) } /* + * Raise a floating-point exception without relying on the standard + * library routines, which we are trying to test. + * + * XXX We can't raise an {over,under}flow without also raising an + * inexact exception. + */ +static void +raiseexcept(int excepts) +{ + volatile double d; + + /* + * With a compiler that supports the FENV_ACCESS pragma + * properly, simple expressions like '0.0 / 0.0' should + * be sufficient to generate traps. Unfortunately, we + * need to bring a volatile variable into the equation + * to prevent incorrect optimizations. + */ + if (excepts & FE_INVALID) { + d = 0.0; + d = 0.0 / d; + } + if (excepts & FE_DIVBYZERO) { + d = 0.0; + d = 1.0 / d; + } + if (excepts & FE_OVERFLOW) { + d = DBL_MAX; + d *= 2.0; + } + if (excepts & FE_UNDERFLOW) { + d = DBL_MIN; + d /= DBL_MAX; + } + if (excepts & FE_INEXACT) { + d = DBL_MIN; + d += 1.0; + } + + /* + * On the x86 (and some other architectures?) the FPU and + * integer units are decoupled. We need to execute an FWAIT + * or a floating-point instruction to get synchronous exceptions. + */ + d = 1.0; + d += 1.0; +} + +/* + * Determine the current rounding mode without relying on the fenv + * routines. This function may raise an inexact exception. + */ +static int +getround(void) +{ + volatile double d; + + /* + * This test works just as well with 0.0 - 0.0, except on ia64 + * where 0.0 - 0.0 gives the wrong sign when rounding downwards. + */ + d = 1.0; + d -= 1.0; + if (copysign(1.0, d) < 0.0) + return (FE_DOWNWARD); + + d = 1.0; + if (d + (DBL_EPSILON * 3.0 / 4.0) == 1.0) + return (FE_TOWARDZERO); + if (d + (DBL_EPSILON * 1.0 / 4.0) > 1.0) + return (FE_UPWARD); + + return (FE_TONEAREST); +} + +static void +trap_handler(int sig) +{ + + assert(sig == SIGFPE); + _exit(0); +} + +/* * This tests checks the default FP environment, so it must be first. * The memcmp() test below may be too much to ask for, since there * could be multiple machine-specific default environments. @@ -347,7 +390,8 @@ static void test_masking(void) { struct sigaction act; - int except, i, pass, raise, status; + int except, pass, raise, status; + unsigned i; assert((fegetexcept() & ALL_STD_EXCEPT) == 0); assert((feenableexcept(FE_INVALID|FE_OVERFLOW) & ALL_STD_EXCEPT) == 0); @@ -427,7 +471,8 @@ test_feholdupdate(void) fenv_t env; struct sigaction act; - int except, i, pass, status, raise; + int except, pass, status, raise; + unsigned i; sigemptyset(&act.sa_mask); act.sa_flags = 0; @@ -452,7 +497,7 @@ test_feholdupdate(void) * We don't want to cause a fatal exception in * the child until the second pass, so we can * check other properties of feupdateenv(). - */ + */ if (pass == 1) assert((feenableexcept(except) & ALL_STD_EXCEPT) == 0); @@ -491,86 +536,28 @@ test_feholdupdate(void) assert(fetestexcept(FE_ALL_EXCEPT) == 0); } -/* - * Raise a floating-point exception without relying on the standard - * library routines, which we are trying to test. - * - * XXX We can't raise an {over,under}flow without also raising an - * inexact exception. - */ -static void -raiseexcept(int excepts) -{ - volatile double d; - - /* - * With a compiler that supports the FENV_ACCESS pragma - * properly, simple expressions like '0.0 / 0.0' should - * be sufficient to generate traps. Unfortunately, we - * need to bring a volatile variable into the equation - * to prevent incorrect optimizations. - */ - if (excepts & FE_INVALID) { - d = 0.0; - d = 0.0 / d; - } - if (excepts & FE_DIVBYZERO) { - d = 0.0; - d = 1.0 / d; - } - if (excepts & FE_OVERFLOW) { - d = DBL_MAX; - d *= 2.0; - } - if (excepts & FE_UNDERFLOW) { - d = DBL_MIN; - d /= DBL_MAX; - } - if (excepts & FE_INEXACT) { - d = DBL_MIN; - d += 1.0; - } - - /* - * On the x86 (and some other architectures?) the FPU and - * integer units are decoupled. We need to execute an FWAIT - * or a floating-point instruction to get synchronous exceptions. - */ - d = 1.0; - d += 1.0; -} - -/* - * Determine the current rounding mode without relying on the fenv - * routines. This function may raise an inexact exception. - */ -static int -getround(void) +int +main(void) { - volatile double d; - /* - * This test works just as well with 0.0 - 0.0, except on ia64 - * where 0.0 - 0.0 gives the wrong sign when rounding downwards. - */ - d = 1.0; - d -= 1.0; - if (copysign(1.0, d) < 0.0) - return (FE_DOWNWARD); - - d = 1.0; - if (d + (DBL_EPSILON * 3.0 / 4.0) == 1.0) - return (FE_TOWARDZERO); - if (d + (DBL_EPSILON * 1.0 / 4.0) > 1.0) - return (FE_UPWARD); - - return (FE_TONEAREST); -} - -static void -trap_handler(int sig) -{ + printf("1..8\n"); + init_exceptsets(); + test_dfl_env(); + printf("ok 1 - fenv\n"); + test_fetestclearexcept(); + printf("ok 2 - fenv\n"); + test_fegsetexceptflag(); + printf("ok 3 - fenv\n"); + test_feraiseexcept(); + printf("ok 4 - fenv\n"); + test_fegsetround(); + printf("ok 5 - fenv\n"); + test_fegsetenv(); + printf("ok 6 - fenv\n"); + test_masking(); + printf("ok 7 - fenv\n"); + test_feholdupdate(); + printf("ok 8 - fenv\n"); - assert(sig == SIGFPE); - _exit(0); + return (0); } Modified: head/lib/msun/tests/fma_test.c ============================================================================== --- head/lib/msun/tests/fma_test.c Sat Mar 4 09:16:51 2017 (r314649) +++ head/lib/msun/tests/fma_test.c Sat Mar 4 10:07:46 2017 (r314650) @@ -84,7 +84,7 @@ __FBSDID("$FreeBSD$"); * This is needed because clang constant-folds fma in ways that are incorrect * in rounding modes other than FE_TONEAREST. */ -volatile double one = 1.0; +static volatile double one = 1.0; static void test_zeroes(void) @@ -472,10 +472,10 @@ test_double_rounding(void) } int -main(int argc, char *argv[]) +main(void) { int rmodes[] = { FE_TONEAREST, FE_UPWARD, FE_DOWNWARD, FE_TOWARDZERO }; - int i, j; + unsigned i, j; #if defined(__i386__) printf("1..0 # SKIP all testcases fail on i386\n"); Modified: head/lib/msun/tests/fmaxmin_test.c ============================================================================== --- head/lib/msun/tests/fmaxmin_test.c Sat Mar 4 09:16:51 2017 (r314649) +++ head/lib/msun/tests/fmaxmin_test.c Sat Mar 4 10:07:46 2017 (r314650) @@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$"); } \ } while (0) -int +static int testall_r(long double big, long double small) { int ok; @@ -86,14 +86,14 @@ testall_r(long double big, long double s return (ok); } -const char *comment = NULL; +static const char *comment = NULL; /* * Test all the functions: fmaxf, fmax, fmaxl, fminf, fmin, and fminl, * in all rounding modes and with the arguments in different orders. * The input 'big' must be >= 'small'. */ -void +static void testall(int testnum, long double big, long double small) { static const int rmodes[] = { @@ -122,7 +122,7 @@ testall(int testnum, long double big, lo #endif int -main(int argc, char *argv[]) +main(void) { printf("1..12\n"); Modified: head/lib/msun/tests/invctrig_test.c ============================================================================== --- head/lib/msun/tests/invctrig_test.c Sat Mar 4 09:16:51 2017 (r314649) +++ head/lib/msun/tests/invctrig_test.c Sat Mar 4 10:07:46 2017 (r314650) @@ -31,6 +31,7 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include #include @@ -123,7 +124,7 @@ c3pi = 9.4247779607693797153879301498385 /* Tests for 0 */ -void +static void test_zero(void) { long double complex zero = CMPLXL(0.0, 0.0); @@ -143,8 +144,8 @@ test_zero(void) /* * Tests for NaN inputs. */ -void -test_nan() +static void +test_nan(void) { long double complex nan_nan = CMPLXL(NAN, NAN); long double complex z; @@ -154,7 +155,7 @@ test_nan() * NaN,NaN NaN,NaN NaN,NaN NaN,NaN NaN,NaN * finite,NaN NaN,NaN* NaN,NaN* NaN,NaN* NaN,NaN* * NaN,finite NaN,NaN* NaN,NaN* NaN,NaN* NaN,NaN* - * NaN,Inf Inf,NaN NaN,-Inf ?Inf,NaN ?0,pi/2 + * NaN,Inf Inf,NaN NaN,-Inf ?Inf,NaN ?0,pi/2 * +-Inf,NaN Inf,NaN NaN,?Inf +-Inf,NaN +-0,NaN * +-0,NaN NaN,NaN* pi/2,NaN NaN,NaN* +-0,NaN * NaN,0 NaN,NaN* NaN,NaN* NaN,0 NaN,NaN* @@ -222,7 +223,7 @@ test_nan() testall(catan, z, CMPLXL(NAN, 0.0), ALL_STD_EXCEPT, 0, 0); } -void +static void test_inf(void) { long double complex z; @@ -269,16 +270,16 @@ test_inf(void) } /* Tests along the real and imaginary axes. */ -void +static void test_axes(void) { static const long double nums[] = { -2, -1, -0.5, 0.5, 1, 2 }; long double complex z; - int i; + unsigned i; - for (i = 0; i < sizeof(nums) / sizeof(nums[0]); i++) { + for (i = 0; i < nitems(nums); i++) { /* Real axis */ z = CMPLXL(nums[i], 0.0); if (fabsl(nums[i]) <= 1) { @@ -306,7 +307,7 @@ test_axes(void) } } -void +static void test_small(void) { /* @@ -332,7 +333,7 @@ test_small(void) } /* Test inputs that might cause overflow in a sloppy implementation. */ -void +static void test_large(void) { @@ -340,7 +341,7 @@ test_large(void) } int -main(int argc, char *argv[]) +main(void) { printf("1..6\n"); Modified: head/lib/msun/tests/invtrig_test.c ============================================================================== --- head/lib/msun/tests/invtrig_test.c Sat Mar 4 09:16:51 2017 (r314649) +++ head/lib/msun/tests/invtrig_test.c Sat Mar 4 10:07:46 2017 (r314650) @@ -110,11 +110,10 @@ __FBSDID("$FreeBSD$"); #define testall2(prefix, y, x, result, excepts) \ testall2_tol(prefix, (y), (x), (result), 0, (excepts)) -long double +static long double pi = 3.14159265358979323846264338327950280e+00L, pio3 = 1.04719755119659774615421446109316766e+00L, c3pi = 9.42477796076937971538793014983850839e+00L, -c5pi = 1.57079632679489661923132169163975140e+01L, c7pi = 2.19911485751285526692385036829565196e+01L, c5pio3 = 5.23598775598298873077107230546583851e+00L, sqrt2m1 = 4.14213562373095048801688724209698081e-01L; @@ -444,7 +443,7 @@ test_inverse(void) } int -main(int argc, char *argv[]) +main(void) { #if defined(__i386__) Modified: head/lib/msun/tests/logarithm_test.c ============================================================================== --- head/lib/msun/tests/logarithm_test.c Sat Mar 4 09:16:51 2017 (r314649) +++ head/lib/msun/tests/logarithm_test.c Sat Mar 4 10:07:46 2017 (r314650) @@ -31,6 +31,7 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include #include @@ -98,7 +99,7 @@ __FBSDID("$FreeBSD$"); test(log1pl, x, result, exceptmask, excepts); \ } while (0) -void +static void run_generic_tests(void) { @@ -127,10 +128,10 @@ run_generic_tests(void) testall1(-1.0, -INFINITY, ALL_STD_EXCEPT & ~FE_INEXACT, FE_DIVBYZERO); } -void +static void run_log2_tests(void) { - int i; + unsigned i; /* * We should insist that log2() return exactly the correct @@ -154,7 +155,7 @@ run_log2_tests(void) } } -void +static void run_roundingmode_tests(void) { @@ -188,7 +189,7 @@ run_roundingmode_tests(void) fesetround(FE_TONEAREST); } -void +static void run_accuracy_tests(void) { static const struct { @@ -219,9 +220,9 @@ run_accuracy_tests(void) 7.229787154734166181706169344438271459e1L, 3.139856666636059855894123306947856631e1L }, }; - int i; + unsigned i; - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { + for (i = 0; i < nitems(tests); i++) { test_tol(log2, tests[i].x, tests[i].log2x, DBL_ULP()); test_tol(log2f, tests[i].x, tests[i].log2x, FLT_ULP()); test_tol(log2l, tests[i].x, tests[i].log2x, LDBL_ULP()); @@ -242,7 +243,7 @@ run_accuracy_tests(void) } } -void +static void run_log1p_accuracy_tests(void) { @@ -262,7 +263,7 @@ run_log1p_accuracy_tests(void) } int -main(int argc, char *argv[]) +main(void) { printf("1..5\n"); Modified: head/lib/msun/tests/lrint_test.c ============================================================================== --- head/lib/msun/tests/lrint_test.c Sat Mar 4 09:16:51 2017 (r314649) +++ head/lib/msun/tests/lrint_test.c Sat Mar 4 10:07:46 2017 (r314650) @@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$"); #pragma STDC FENV_ACCESS ON -void +static void run_tests(void) { @@ -132,7 +132,7 @@ run_tests(void) } int -main(int argc, char *argv[]) +main(void) { printf("1..1\n"); Modified: head/lib/msun/tests/nan_test.c ============================================================================== --- head/lib/msun/tests/nan_test.c Sat Mar 4 09:16:51 2017 (r314649) +++ head/lib/msun/tests/nan_test.c Sat Mar 4 10:07:46 2017 (r314650) @@ -32,6 +32,7 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include #include @@ -41,7 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include -void +static void testnan(const char *nan_format) { char nan_str[128]; @@ -49,10 +50,10 @@ testnan(const char *nan_format) long double ald[4]; double ad[4]; float af[4]; - int i; + unsigned i; snprintf(nan_str, sizeof(nan_str), "nan(%s)", nan_format); - for (i = 0; i < 4; i++) { + for (i = 0; i < nitems(ad); i++) { /* * x86 has an 80-bit long double stored in 96 bits, * so we need to initialize the memory for the memcmp() @@ -61,7 +62,6 @@ testnan(const char *nan_format) bzero(&af[i], sizeof(float)); bzero(&ad[i], sizeof(double)); bzero(&ald[i], sizeof(long double)); - } af[0] = nanf(nan_format); @@ -105,7 +105,7 @@ testnan(const char *nan_format) } int -main(int argc, char *argv[]) +main(void) { printf("1..1\n"); Modified: head/lib/msun/tests/nearbyint_test.c ============================================================================== --- head/lib/msun/tests/nearbyint_test.c Sat Mar 4 09:16:51 2017 (r314649) +++ head/lib/msun/tests/nearbyint_test.c Sat Mar 4 10:07:46 2017 (r314650) @@ -35,6 +35,7 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include #include @@ -49,9 +50,9 @@ static const int rmodes[] = { }; /* Make sure we're testing the library, not some broken compiler built-ins. */ -double (*libnearbyint)(double) = nearbyint; -float (*libnearbyintf)(float) = nearbyintf; -long double (*libnearbyintl)(long double) = nearbyintl; +static double (*libnearbyint)(double) = nearbyint; +static float (*libnearbyintf)(float) = nearbyintf; +static long double (*libnearbyintl)(long double) = nearbyintl; #define nearbyintf libnearbyintf #define nearbyint libnearbyint #define nearbyintl libnearbyintl @@ -69,8 +70,6 @@ static const struct { { NAN, { NAN, NAN, NAN }}, }; -static const int ntests = sizeof(tests) / sizeof(tests[0]); - /* Get the appropriate result for the current rounding mode. */ static float get_output(int testindex, int rmodeindex, int negative) @@ -93,7 +92,7 @@ static void test_nearby(int testindex) { float in, out; - int i; + unsigned i; for (i = 0; i < sizeof(rmodes) / sizeof(rmodes[0]); i++) { fesetround(rmodes[i]); @@ -124,7 +123,7 @@ test_modf(int testindex) float ipartf, ipart_expected; double ipart; long double ipartl; - int i; + unsigned i; for (i = 0; i < sizeof(rmodes) / sizeof(rmodes[0]); i++) { fesetround(rmodes[i]); @@ -161,13 +160,13 @@ test_modf(int testindex) } int -main(int argc, char *argv[]) +main(void) { - int i; + unsigned i; - printf("1..%d\n", ntests * 2); + printf("1..%zu\n", (size_t)(nitems(tests) * 2)); testnum = 1; - for (i = 0; i < ntests; i++) { + for (i = 0; i < nitems(tests); i++) { test_nearby(i); test_modf(i); } Modified: head/lib/msun/tests/next_test.c ============================================================================== --- head/lib/msun/tests/next_test.c Sat Mar 4 09:16:51 2017 (r314649) +++ head/lib/msun/tests/next_test.c Sat Mar 4 10:07:46 2017 (r314650) @@ -73,7 +73,7 @@ static double idd(double); static float idf(float); int -main(int argc, char *argv[]) +main(void) { static const int ex_under = FE_UNDERFLOW | FE_INEXACT; /* shorthand */ static const int ex_over = FE_OVERFLOW | FE_INEXACT; Modified: head/lib/msun/tests/rem_test.c ============================================================================== --- head/lib/msun/tests/rem_test.c Sat Mar 4 09:16:51 2017 (r314649) +++ head/lib/msun/tests/rem_test.c Sat Mar 4 10:07:46 2017 (r314650) @@ -52,7 +52,7 @@ static void testf(float, float, float, i } while (0) int -main(int argc, char *argv[]) +main(void) { printf("1..3\n"); Modified: head/lib/msun/tests/test-utils.h ============================================================================== --- head/lib/msun/tests/test-utils.h Sat Mar 4 09:16:51 2017 (r314649) +++ head/lib/msun/tests/test-utils.h Sat Mar 4 10:07:46 2017 (r314650) @@ -88,6 +88,13 @@ CMPLXL(long double x, long double y) } #endif +static int fpequal(long double, long double) __used; +static int cfpequal(long double complex, long double complex) __used; +static int cfpequal_cs(long double complex, long double complex, + int) __used; +static int cfpequal_tol(long double complex, long double complex, + long double, unsigned int) __used; + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Sat Mar 4 10:10:28 2017 Return-Path: Delivered-To: svn-src-all@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 C79C6CF751B; Sat, 4 Mar 2017 10:10:28 +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 6BB8416C0; Sat, 4 Mar 2017 10:10:28 +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 v24AARJ2098260; Sat, 4 Mar 2017 10:10:27 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24AAIkb098167; Sat, 4 Mar 2017 10:10:18 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703041010.v24AAIkb098167@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 4 Mar 2017 10:10:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314651 - in head/sys/modules: . 3dfx 3dfx_linux aac aac/aac_linux aacraid aacraid/aacraid_linux accf_data accf_dns accf_http acl_nfs4 acl_posix1e acpi/acpi_asus acpi/acpi_asus_wmi acpi... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 10:10:28 -0000 Author: ngie Date: Sat Mar 4 10:10:17 2017 New Revision: 314651 URL: https://svnweb.freebsd.org/changeset/base/314651 Log: sys/modules: normalize .CURDIR-relative paths to SRCTOP This simplifies make output/logic Tested with: `cd sys/modules; make ALL_MODULES=` on amd64 MFC after: 1 month Sponsored by: Dell EMC Isilon Modified: head/sys/modules/3dfx/Makefile head/sys/modules/3dfx_linux/Makefile head/sys/modules/Makefile head/sys/modules/aac/Makefile head/sys/modules/aac/aac_linux/Makefile head/sys/modules/aacraid/Makefile head/sys/modules/aacraid/aacraid_linux/Makefile head/sys/modules/accf_data/Makefile head/sys/modules/accf_dns/Makefile head/sys/modules/accf_http/Makefile head/sys/modules/acl_nfs4/Makefile head/sys/modules/acl_posix1e/Makefile head/sys/modules/acpi/acpi_asus/Makefile head/sys/modules/acpi/acpi_asus_wmi/Makefile head/sys/modules/acpi/acpi_dock/Makefile head/sys/modules/acpi/acpi_fujitsu/Makefile head/sys/modules/acpi/acpi_hp/Makefile head/sys/modules/acpi/acpi_ibm/Makefile head/sys/modules/acpi/acpi_panasonic/Makefile head/sys/modules/acpi/acpi_rapidstart/Makefile head/sys/modules/acpi/acpi_sony/Makefile head/sys/modules/acpi/acpi_toshiba/Makefile head/sys/modules/acpi/acpi_video/Makefile head/sys/modules/acpi/acpi_wmi/Makefile head/sys/modules/acpi/aibs/Makefile head/sys/modules/ae/Makefile head/sys/modules/aesni/Makefile head/sys/modules/age/Makefile head/sys/modules/agp/Makefile head/sys/modules/aha/Makefile head/sys/modules/ahci/Makefile head/sys/modules/aic/Makefile head/sys/modules/aic7xxx/ahc/Makefile head/sys/modules/aic7xxx/ahc/ahc_isa/Makefile head/sys/modules/aic7xxx/ahc/ahc_pci/Makefile head/sys/modules/aic7xxx/ahd/Makefile head/sys/modules/aic7xxx/aicasm/Makefile head/sys/modules/alc/Makefile head/sys/modules/ale/Makefile head/sys/modules/alq/Makefile head/sys/modules/am335x_dmtpps/Makefile head/sys/modules/amd_ecc_inject/Makefile head/sys/modules/amdsbwd/Makefile head/sys/modules/amdtemp/Makefile head/sys/modules/amr/Makefile head/sys/modules/amr/amr_cam/Makefile head/sys/modules/amr/amr_linux/Makefile head/sys/modules/an/Makefile head/sys/modules/aout/Makefile head/sys/modules/apm/Makefile head/sys/modules/ar71xx/ar71xx_ehci/Makefile head/sys/modules/ar71xx/ar71xx_ohci/Makefile head/sys/modules/arcmsr/Makefile head/sys/modules/arcnet/Makefile head/sys/modules/armv8crypto/Makefile head/sys/modules/asmc/Makefile head/sys/modules/ata/atacard/Makefile head/sys/modules/ata/atacore/Makefile head/sys/modules/ata/ataisa/Makefile head/sys/modules/ata/atapci/Makefile head/sys/modules/ata/atapci/chipsets/ataacard/Makefile head/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile head/sys/modules/ata/atapci/chipsets/ataamd/Makefile head/sys/modules/ata/atapci/chipsets/ataati/Makefile head/sys/modules/ata/atapci/chipsets/atacenatek/Makefile head/sys/modules/ata/atapci/chipsets/atacypress/Makefile head/sys/modules/ata/atapci/chipsets/atacyrix/Makefile head/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile head/sys/modules/ata/atapci/chipsets/ataintel/Makefile head/sys/modules/ata/atapci/chipsets/ataite/Makefile head/sys/modules/ata/atapci/chipsets/atajmicron/Makefile head/sys/modules/ata/atapci/chipsets/atamarvell/Makefile head/sys/modules/ata/atapci/chipsets/atamicron/Makefile head/sys/modules/ata/atapci/chipsets/atanational/Makefile head/sys/modules/ata/atapci/chipsets/atanetcell/Makefile head/sys/modules/ata/atapci/chipsets/atanvidia/Makefile head/sys/modules/ata/atapci/chipsets/atapromise/Makefile head/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile head/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile head/sys/modules/ata/atapci/chipsets/atasis/Makefile head/sys/modules/ata/atapci/chipsets/atavia/Makefile head/sys/modules/ath_ahb/Makefile head/sys/modules/ath_pci/Makefile head/sys/modules/autofs/Makefile head/sys/modules/auxio/Makefile head/sys/modules/bce/Makefile head/sys/modules/bfe/Makefile head/sys/modules/bge/Makefile head/sys/modules/bhnd/Makefile head/sys/modules/bhnd/bcma/Makefile head/sys/modules/bhnd/bcma_bhndb/Makefile head/sys/modules/bhnd/bhndb/Makefile head/sys/modules/bhnd/bhndb_pci/Makefile head/sys/modules/bhnd/cores/bhnd_pci/Makefile head/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile head/sys/modules/bhnd/cores/bhnd_pcib/Makefile head/sys/modules/bhnd/siba/Makefile head/sys/modules/bhnd/siba_bhndb/Makefile head/sys/modules/bios/smapi/Makefile head/sys/modules/bios/smbios/Makefile head/sys/modules/bios/vpd/Makefile head/sys/modules/bktr/bktr/Makefile head/sys/modules/bktr/bktr_mem/Makefile head/sys/modules/bm/Makefile head/sys/modules/bnxt/Makefile head/sys/modules/bridgestp/Makefile head/sys/modules/bwi/Makefile head/sys/modules/bwn/Makefile head/sys/modules/bwn_pci/Makefile head/sys/modules/bxe/Makefile head/sys/modules/bytgpio/Makefile head/sys/modules/cam/Makefile head/sys/modules/cardbus/Makefile head/sys/modules/carp/Makefile head/sys/modules/cas/Makefile head/sys/modules/cbb/Makefile head/sys/modules/cc/cc_cdg/Makefile head/sys/modules/cc/cc_chd/Makefile head/sys/modules/cc/cc_cubic/Makefile head/sys/modules/cc/cc_dctcp/Makefile head/sys/modules/cc/cc_hd/Makefile head/sys/modules/cc/cc_htcp/Makefile head/sys/modules/cc/cc_vegas/Makefile head/sys/modules/cd9660/Makefile head/sys/modules/cd9660_iconv/Makefile head/sys/modules/ce/Makefile head/sys/modules/cfi/Makefile head/sys/modules/chromebook_platform/Makefile head/sys/modules/ciss/Makefile head/sys/modules/cloudabi/Makefile head/sys/modules/cloudabi32/Makefile head/sys/modules/cloudabi64/Makefile head/sys/modules/cm/Makefile head/sys/modules/cmx/Makefile head/sys/modules/coff/Makefile head/sys/modules/coretemp/Makefile head/sys/modules/cp/Makefile head/sys/modules/cpsw/Makefile head/sys/modules/cpuctl/Makefile head/sys/modules/cpufreq/Makefile head/sys/modules/crypto/Makefile head/sys/modules/cryptodev/Makefile head/sys/modules/cs/Makefile head/sys/modules/ctau/Makefile head/sys/modules/ctl/Makefile head/sys/modules/cuse/Makefile head/sys/modules/cx/Makefile head/sys/modules/cxgb/Makefile head/sys/modules/cxgb/cxgb/Makefile head/sys/modules/cxgb/cxgb_t3fw/Makefile head/sys/modules/cxgb/iw_cxgb/Makefile head/sys/modules/cxgb/tom/Makefile head/sys/modules/cxgbe/Makefile head/sys/modules/cxgbe/cxgbei/Makefile head/sys/modules/cxgbe/if_cc/Makefile head/sys/modules/cxgbe/if_ccv/Makefile head/sys/modules/cxgbe/if_cxgbe/Makefile head/sys/modules/cxgbe/if_cxgbev/Makefile head/sys/modules/cxgbe/if_cxl/Makefile head/sys/modules/cxgbe/if_cxlv/Makefile head/sys/modules/cxgbe/iw_cxgbe/Makefile head/sys/modules/cxgbe/t4_firmware/Makefile head/sys/modules/cxgbe/t5_firmware/Makefile head/sys/modules/cxgbe/t6_firmware/Makefile head/sys/modules/cxgbe/tom/Makefile head/sys/modules/dc/Makefile head/sys/modules/dcons/Makefile head/sys/modules/dcons_crom/Makefile head/sys/modules/de/Makefile head/sys/modules/dpms/Makefile head/sys/modules/dpt/Makefile head/sys/modules/drm/Makefile head/sys/modules/drm/drm/Makefile head/sys/modules/drm/i915/Makefile head/sys/modules/drm/mach64/Makefile head/sys/modules/drm/mga/Makefile head/sys/modules/drm/r128/Makefile head/sys/modules/drm/radeon/Makefile head/sys/modules/drm/savage/Makefile head/sys/modules/drm/sis/Makefile head/sys/modules/drm/tdfx/Makefile head/sys/modules/drm/via/Makefile head/sys/modules/drm2/Makefile head/sys/modules/drm2/drm2/Makefile head/sys/modules/drm2/i915kms/Makefile head/sys/modules/drm2/radeonkms/Makefile head/sys/modules/drm2/radeonkmsfw/Makefile.inc head/sys/modules/dtrace/dtmalloc/Makefile head/sys/modules/dtrace/dtnfscl/Makefile head/sys/modules/dtrace/dtrace/Makefile head/sys/modules/dtrace/dtrace_test/Makefile head/sys/modules/dtrace/dtraceall/Makefile head/sys/modules/dtrace/fasttrap/Makefile head/sys/modules/dtrace/fbt/Makefile head/sys/modules/dtrace/profile/Makefile head/sys/modules/dtrace/prototype/Makefile head/sys/modules/dtrace/sdt/Makefile head/sys/modules/dtrace/systrace/Makefile head/sys/modules/dtrace/systrace_freebsd32/Makefile head/sys/modules/dtrace/systrace_linux/Makefile head/sys/modules/dtrace/systrace_linux32/Makefile head/sys/modules/dummynet/Makefile head/sys/modules/ed/Makefile head/sys/modules/efirt/Makefile head/sys/modules/elink/Makefile head/sys/modules/em/Makefile head/sys/modules/en/Makefile head/sys/modules/ep/Makefile head/sys/modules/epic/Makefile head/sys/modules/esp/Makefile head/sys/modules/et/Makefile head/sys/modules/evdev/Makefile head/sys/modules/ex/Makefile head/sys/modules/exca/Makefile head/sys/modules/ext2fs/Makefile head/sys/modules/fatm/Makefile head/sys/modules/fdc/Makefile head/sys/modules/fdescfs/Makefile head/sys/modules/fe/Makefile head/sys/modules/filemon/Makefile head/sys/modules/firewire/firewire/Makefile head/sys/modules/firewire/fwe/Makefile head/sys/modules/firewire/fwip/Makefile head/sys/modules/firewire/sbp/Makefile head/sys/modules/firewire/sbp_targ/Makefile head/sys/modules/firmware/Makefile head/sys/modules/fuse/Makefile head/sys/modules/fxp/Makefile head/sys/modules/gem/Makefile head/sys/modules/geom/Makefile head/sys/modules/geom/geom_bde/Makefile head/sys/modules/geom/geom_bsd/Makefile head/sys/modules/geom/geom_cache/Makefile head/sys/modules/geom/geom_ccd/Makefile head/sys/modules/geom/geom_concat/Makefile head/sys/modules/geom/geom_eli/Makefile head/sys/modules/geom/geom_flashmap/Makefile head/sys/modules/geom/geom_fox/Makefile head/sys/modules/geom/geom_gate/Makefile head/sys/modules/geom/geom_journal/Makefile head/sys/modules/geom/geom_label/Makefile head/sys/modules/geom/geom_linux_lvm/Makefile head/sys/modules/geom/geom_map/Makefile head/sys/modules/geom/geom_mbr/Makefile head/sys/modules/geom/geom_mirror/Makefile head/sys/modules/geom/geom_mountver/Makefile head/sys/modules/geom/geom_multipath/Makefile head/sys/modules/geom/geom_nop/Makefile head/sys/modules/geom/geom_part/geom_part_apm/Makefile head/sys/modules/geom/geom_part/geom_part_bsd/Makefile head/sys/modules/geom/geom_part/geom_part_bsd64/Makefile head/sys/modules/geom/geom_part/geom_part_ebr/Makefile head/sys/modules/geom/geom_part/geom_part_gpt/Makefile head/sys/modules/geom/geom_part/geom_part_ldm/Makefile head/sys/modules/geom/geom_part/geom_part_mbr/Makefile head/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile head/sys/modules/geom/geom_raid/Makefile head/sys/modules/geom/geom_raid3/Makefile head/sys/modules/geom/geom_sched/Makefile.inc head/sys/modules/geom/geom_shsec/Makefile head/sys/modules/geom/geom_stripe/Makefile head/sys/modules/geom/geom_sunlabel/Makefile head/sys/modules/geom/geom_uzip/Makefile head/sys/modules/geom/geom_vinum/Makefile head/sys/modules/geom/geom_virstor/Makefile head/sys/modules/geom/geom_vol_ffs/Makefile head/sys/modules/geom/geom_zero/Makefile head/sys/modules/glxiic/Makefile head/sys/modules/glxsb/Makefile head/sys/modules/gpio/gpiobus/Makefile head/sys/modules/gpio/gpioiic/Makefile head/sys/modules/gpio/gpiokeys/Makefile head/sys/modules/gpio/gpioled/Makefile head/sys/modules/gpio/gpiopps/Makefile head/sys/modules/gpio/gpiospi/Makefile head/sys/modules/hatm/Makefile head/sys/modules/hifn/Makefile head/sys/modules/hme/Makefile head/sys/modules/hpt27xx/Makefile head/sys/modules/hptiop/Makefile head/sys/modules/hptmv/Makefile head/sys/modules/hptnr/Makefile head/sys/modules/hptrr/Makefile head/sys/modules/hwpmc/Makefile head/sys/modules/hwpmc_mips24k/Makefile head/sys/modules/hwpmc_mips74k/Makefile head/sys/modules/hyperv/netvsc/Makefile head/sys/modules/hyperv/pcib/Makefile head/sys/modules/hyperv/storvsc/Makefile head/sys/modules/hyperv/utilities/Makefile head/sys/modules/hyperv/vmbus/Makefile head/sys/modules/i2c/controllers/alpm/Makefile head/sys/modules/i2c/controllers/amdpm/Makefile head/sys/modules/i2c/controllers/amdsmb/Makefile head/sys/modules/i2c/controllers/ichiic/Makefile head/sys/modules/i2c/controllers/ichsmb/Makefile head/sys/modules/i2c/controllers/intpm/Makefile head/sys/modules/i2c/controllers/ismt/Makefile head/sys/modules/i2c/controllers/lpbb/Makefile head/sys/modules/i2c/controllers/nfsmb/Makefile head/sys/modules/i2c/controllers/pcf/Makefile head/sys/modules/i2c/controllers/viapm/Makefile head/sys/modules/i2c/cyapa/Makefile head/sys/modules/i2c/if_ic/Makefile head/sys/modules/i2c/iic/Makefile head/sys/modules/i2c/iicbb/Makefile head/sys/modules/i2c/iicbus/Makefile head/sys/modules/i2c/iicsmb/Makefile head/sys/modules/i2c/isl/Makefile head/sys/modules/i2c/jedec_ts/Makefile head/sys/modules/i2c/smb/Makefile head/sys/modules/i2c/smbus/Makefile head/sys/modules/ibcore/Makefile head/sys/modules/ibcs2/Makefile head/sys/modules/ichwd/Makefile head/sys/modules/ida/Makefile head/sys/modules/if_bridge/Makefile head/sys/modules/if_disc/Makefile head/sys/modules/if_edsc/Makefile head/sys/modules/if_enc/Makefile head/sys/modules/if_epair/Makefile head/sys/modules/if_gif/Makefile head/sys/modules/if_gre/Makefile head/sys/modules/if_lagg/Makefile head/sys/modules/if_me/Makefile head/sys/modules/if_ndis/Makefile head/sys/modules/if_stf/Makefile head/sys/modules/if_tap/Makefile head/sys/modules/if_tun/Makefile head/sys/modules/if_vlan/Makefile head/sys/modules/if_vxlan/Makefile head/sys/modules/iir/Makefile head/sys/modules/imgact_binmisc/Makefile head/sys/modules/intelspi/Makefile head/sys/modules/io/Makefile head/sys/modules/ioat/Makefile head/sys/modules/ip6_mroute_mod/Makefile head/sys/modules/ip_mroute_mod/Makefile head/sys/modules/ipdivert/Makefile head/sys/modules/ipfilter/Makefile head/sys/modules/ipfw/Makefile head/sys/modules/ipfw_nat/Makefile head/sys/modules/ipfw_nat64/Makefile head/sys/modules/ipfw_nptv6/Makefile head/sys/modules/ipmi/Makefile head/sys/modules/ipmi/ipmi_linux/Makefile head/sys/modules/ipoib/Makefile head/sys/modules/ips/Makefile head/sys/modules/ipsec/Makefile head/sys/modules/ipw/Makefile head/sys/modules/ipwfw/ipw_bss/Makefile head/sys/modules/ipwfw/ipw_ibss/Makefile head/sys/modules/ipwfw/ipw_monitor/Makefile head/sys/modules/isci/Makefile head/sys/modules/iscsi/Makefile head/sys/modules/iscsi_initiator/Makefile head/sys/modules/iser/Makefile head/sys/modules/isp/Makefile head/sys/modules/ispfw/isp_1000/Makefile head/sys/modules/ispfw/isp_1040/Makefile head/sys/modules/ispfw/isp_1080/Makefile head/sys/modules/ispfw/isp_12160/Makefile head/sys/modules/ispfw/isp_2100/Makefile head/sys/modules/ispfw/isp_2200/Makefile head/sys/modules/ispfw/isp_2300/Makefile head/sys/modules/ispfw/isp_2322/Makefile head/sys/modules/ispfw/isp_2400/Makefile head/sys/modules/ispfw/isp_2500/Makefile head/sys/modules/ispfw/ispfw/Makefile head/sys/modules/iwi/Makefile head/sys/modules/iwifw/iwi_bss/Makefile head/sys/modules/iwifw/iwi_ibss/Makefile head/sys/modules/iwifw/iwi_monitor/Makefile head/sys/modules/iwm/Makefile head/sys/modules/iwmfw/Makefile.inc head/sys/modules/iwn/Makefile head/sys/modules/iwnfw/Makefile.inc head/sys/modules/ix/Makefile head/sys/modules/ixgb/Makefile head/sys/modules/ixl/Makefile head/sys/modules/ixlv/Makefile head/sys/modules/ixv/Makefile head/sys/modules/jme/Makefile head/sys/modules/joy/Makefile head/sys/modules/kbdmux/Makefile head/sys/modules/kgssapi/Makefile head/sys/modules/kgssapi_krb5/Makefile head/sys/modules/khelp/h_ertt/Makefile head/sys/modules/krpc/Makefile head/sys/modules/ksyms/Makefile head/sys/modules/le/Makefile head/sys/modules/lge/Makefile head/sys/modules/libalias/libalias/Makefile head/sys/modules/libalias/modules/Makefile.inc head/sys/modules/libiconv/Makefile head/sys/modules/libmbpool/Makefile head/sys/modules/libmchain/Makefile head/sys/modules/linprocfs/Makefile head/sys/modules/linsysfs/Makefile head/sys/modules/linux/Makefile head/sys/modules/linux64/Makefile head/sys/modules/linux_common/Makefile head/sys/modules/linuxkpi/Makefile head/sys/modules/lmc/Makefile head/sys/modules/lpt/Makefile head/sys/modules/mac_biba/Makefile head/sys/modules/mac_bsdextended/Makefile head/sys/modules/mac_ifoff/Makefile head/sys/modules/mac_lomac/Makefile head/sys/modules/mac_mls/Makefile head/sys/modules/mac_none/Makefile head/sys/modules/mac_partition/Makefile head/sys/modules/mac_portacl/Makefile head/sys/modules/mac_seeotheruids/Makefile head/sys/modules/mac_stub/Makefile head/sys/modules/mac_test/Makefile head/sys/modules/malo/Makefile head/sys/modules/md/Makefile head/sys/modules/mdio/Makefile head/sys/modules/mem/Makefile head/sys/modules/mfi/Makefile head/sys/modules/mfi/mfi_linux/Makefile head/sys/modules/mfi/mfip/Makefile head/sys/modules/mii/Makefile head/sys/modules/mlx/Makefile head/sys/modules/mlx4/Makefile head/sys/modules/mlx4en/Makefile head/sys/modules/mlx4ib/Makefile head/sys/modules/mlx5/Makefile head/sys/modules/mlx5en/Makefile head/sys/modules/mly/Makefile head/sys/modules/mmc/Makefile head/sys/modules/mmcsd/Makefile head/sys/modules/mpr/Makefile head/sys/modules/mps/Makefile head/sys/modules/mpt/Makefile head/sys/modules/mqueue/Makefile head/sys/modules/mrsas/Makefile head/sys/modules/mrsas/mrsas_linux/Makefile head/sys/modules/msdosfs/Makefile head/sys/modules/msdosfs_iconv/Makefile head/sys/modules/mse/Makefile head/sys/modules/msk/Makefile head/sys/modules/mthca/Makefile head/sys/modules/mvs/Makefile head/sys/modules/mwl/Makefile head/sys/modules/mwlfw/Makefile head/sys/modules/mxge/mxge/Makefile head/sys/modules/mxge/mxge_eth_z8e/Makefile head/sys/modules/mxge/mxge_ethp_z8e/Makefile head/sys/modules/mxge/mxge_rss_eth_z8e/Makefile head/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile head/sys/modules/my/Makefile head/sys/modules/nand/Makefile head/sys/modules/nandfs/Makefile head/sys/modules/nandsim/Makefile head/sys/modules/ncr/Makefile head/sys/modules/nctgpio/Makefile head/sys/modules/ncv/Makefile head/sys/modules/ndis/Makefile head/sys/modules/netfpga10g/nf10bmac/Makefile head/sys/modules/netgraph/Makefile head/sys/modules/netgraph/Makefile.inc head/sys/modules/netgraph/atm/atm/Makefile head/sys/modules/netgraph/atm/atmbase/Makefile head/sys/modules/netgraph/atm/ccatm/Makefile head/sys/modules/netgraph/atm/sscfu/Makefile head/sys/modules/netgraph/atm/sscop/Makefile head/sys/modules/netgraph/atm/uni/Makefile head/sys/modules/netgraph/bluetooth/bluetooth/Makefile head/sys/modules/netgraph/bluetooth/bt3c/Makefile head/sys/modules/netgraph/bluetooth/h4/Makefile head/sys/modules/netgraph/bluetooth/hci/Makefile head/sys/modules/netgraph/bluetooth/l2cap/Makefile head/sys/modules/netgraph/bluetooth/socket/Makefile head/sys/modules/netgraph/bluetooth/ubt/Makefile head/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile head/sys/modules/netgraph/bpf/Makefile head/sys/modules/netgraph/mppc/Makefile head/sys/modules/netgraph/netflow/Makefile head/sys/modules/netgraph/vjc/Makefile head/sys/modules/netmap/Makefile head/sys/modules/nfe/Makefile head/sys/modules/nfscl/Makefile head/sys/modules/nfscommon/Makefile head/sys/modules/nfsd/Makefile head/sys/modules/nfslock/Makefile head/sys/modules/nfslockd/Makefile head/sys/modules/nfssvc/Makefile head/sys/modules/nge/Makefile head/sys/modules/nmdm/Makefile head/sys/modules/nsp/Makefile head/sys/modules/ntb/if_ntb/Makefile head/sys/modules/ntb/ntb/Makefile head/sys/modules/ntb/ntb_hw/Makefile head/sys/modules/ntb/ntb_transport/Makefile head/sys/modules/nullfs/Makefile head/sys/modules/nvd/Makefile head/sys/modules/nvme/Makefile head/sys/modules/nvram/Makefile head/sys/modules/nxge/Makefile head/sys/modules/oce/Makefile head/sys/modules/opensolaris/Makefile head/sys/modules/otus/Makefile head/sys/modules/otusfw/otusfw_init/Makefile head/sys/modules/otusfw/otusfw_main/Makefile head/sys/modules/ow/Makefile head/sys/modules/ow/ow/Makefile head/sys/modules/ow/ow_temp/Makefile head/sys/modules/ow/owc/Makefile head/sys/modules/padlock/Makefile head/sys/modules/padlock_rng/Makefile head/sys/modules/patm/Makefile head/sys/modules/pccard/Makefile head/sys/modules/pcfclock/Makefile head/sys/modules/pcn/Makefile head/sys/modules/pf/Makefile head/sys/modules/pflog/Makefile head/sys/modules/pfsync/Makefile head/sys/modules/plip/Makefile head/sys/modules/pms/Makefile head/sys/modules/powermac_nvram/Makefile head/sys/modules/ppbus/Makefile head/sys/modules/ppc/Makefile head/sys/modules/ppi/Makefile head/sys/modules/pps/Makefile head/sys/modules/procfs/Makefile head/sys/modules/proto/Makefile head/sys/modules/pseudofs/Makefile head/sys/modules/pst/Makefile head/sys/modules/pty/Makefile head/sys/modules/puc/Makefile head/sys/modules/qlxgb/Makefile head/sys/modules/qlxgbe/Makefile head/sys/modules/qlxge/Makefile head/sys/modules/ral/Makefile head/sys/modules/ralfw/Makefile.inc head/sys/modules/random_fortuna/Makefile head/sys/modules/random_other/Makefile head/sys/modules/random_yarrow/Makefile head/sys/modules/rc/Makefile head/sys/modules/rc4/Makefile head/sys/modules/rccgpio/Makefile head/sys/modules/rdma/krping/Makefile head/sys/modules/rdrand_rng/Makefile head/sys/modules/re/Makefile head/sys/modules/rl/Makefile head/sys/modules/rndtest/Makefile head/sys/modules/rp/Makefile head/sys/modules/rpi_ft5406/Makefile head/sys/modules/rtwn/Makefile head/sys/modules/rtwn_pci/Makefile head/sys/modules/rtwn_usb/Makefile head/sys/modules/rtwnfw/Makefile.inc head/sys/modules/s3/Makefile head/sys/modules/safe/Makefile head/sys/modules/sbni/Makefile head/sys/modules/scc/Makefile head/sys/modules/scsi_low/Makefile head/sys/modules/sdhci/Makefile head/sys/modules/sdhci_acpi/Makefile head/sys/modules/sdhci_pci/Makefile head/sys/modules/sem/Makefile head/sys/modules/send/Makefile head/sys/modules/sf/Makefile head/sys/modules/sfxge/Makefile head/sys/modules/sge/Makefile head/sys/modules/siba_bwn/Makefile head/sys/modules/siftr/Makefile head/sys/modules/siis/Makefile head/sys/modules/sio/Makefile head/sys/modules/sis/Makefile head/sys/modules/sk/Makefile head/sys/modules/smbfs/Makefile head/sys/modules/sn/Makefile head/sys/modules/snp/Makefile head/sys/modules/sound/driver/Makefile head/sys/modules/sound/driver/ad1816/Makefile head/sys/modules/sound/driver/ai2s/Makefile head/sys/modules/sound/driver/als4000/Makefile head/sys/modules/sound/driver/atiixp/Makefile head/sys/modules/sound/driver/audiocs/Makefile head/sys/modules/sound/driver/cmi/Makefile head/sys/modules/sound/driver/cs4281/Makefile head/sys/modules/sound/driver/csa/Makefile head/sys/modules/sound/driver/davbus/Makefile head/sys/modules/sound/driver/driver/Makefile head/sys/modules/sound/driver/ds1/Makefile head/sys/modules/sound/driver/emu10k1/Makefile head/sys/modules/sound/driver/emu10kx/Makefile head/sys/modules/sound/driver/envy24/Makefile head/sys/modules/sound/driver/envy24ht/Makefile head/sys/modules/sound/driver/es137x/Makefile head/sys/modules/sound/driver/ess/Makefile head/sys/modules/sound/driver/fm801/Makefile head/sys/modules/sound/driver/hda/Makefile head/sys/modules/sound/driver/hdspe/Makefile head/sys/modules/sound/driver/ich/Makefile head/sys/modules/sound/driver/maestro/Makefile head/sys/modules/sound/driver/maestro3/Makefile head/sys/modules/sound/driver/mss/Makefile head/sys/modules/sound/driver/neomagic/Makefile head/sys/modules/sound/driver/sb16/Makefile head/sys/modules/sound/driver/sb8/Makefile head/sys/modules/sound/driver/sbc/Makefile head/sys/modules/sound/driver/solo/Makefile head/sys/modules/sound/driver/spicds/Makefile head/sys/modules/sound/driver/t4dwave/Makefile head/sys/modules/sound/driver/uaudio/Makefile head/sys/modules/sound/driver/via8233/Makefile head/sys/modules/sound/driver/via82c686/Makefile head/sys/modules/sound/driver/vibes/Makefile head/sys/modules/sound/sound/Makefile head/sys/modules/speaker/Makefile head/sys/modules/splash/bmp/Makefile head/sys/modules/splash/pcx/Makefile head/sys/modules/splash/txt/Makefile head/sys/modules/sppp/Makefile head/sys/modules/ste/Makefile head/sys/modules/stg/Makefile head/sys/modules/stge/Makefile head/sys/modules/sym/Makefile head/sys/modules/syscons/apm/Makefile head/sys/modules/syscons/beastie/Makefile head/sys/modules/syscons/blank/Makefile head/sys/modules/syscons/daemon/Makefile head/sys/modules/syscons/dragon/Makefile head/sys/modules/syscons/fade/Makefile head/sys/modules/syscons/fire/Makefile head/sys/modules/syscons/green/Makefile head/sys/modules/syscons/logo/Makefile head/sys/modules/syscons/plasma/Makefile head/sys/modules/syscons/rain/Makefile head/sys/modules/syscons/snake/Makefile head/sys/modules/syscons/star/Makefile head/sys/modules/syscons/warp/Makefile head/sys/modules/sysvipc/sysvmsg/Makefile head/sys/modules/sysvipc/sysvsem/Makefile head/sys/modules/sysvipc/sysvshm/Makefile head/sys/modules/tcp/fastpath/Makefile head/sys/modules/tcp/tcpmd5/Makefile head/sys/modules/tests/callout_test/Makefile head/sys/modules/tests/framework/Makefile head/sys/modules/ti/Makefile head/sys/modules/tl/Makefile head/sys/modules/tmpfs/Makefile head/sys/modules/toecore/Makefile head/sys/modules/tpm/Makefile head/sys/modules/trm/Makefile head/sys/modules/tsec/Makefile head/sys/modules/twa/Makefile head/sys/modules/twe/Makefile head/sys/modules/tws/Makefile head/sys/modules/tx/Makefile head/sys/modules/txp/Makefile head/sys/modules/uart/Makefile head/sys/modules/ubsec/Makefile head/sys/modules/ubser/Makefile head/sys/modules/uchcom/Makefile head/sys/modules/ucycom/Makefile head/sys/modules/udf/Makefile head/sys/modules/udf_iconv/Makefile head/sys/modules/ufs/Makefile head/sys/modules/uinput/Makefile head/sys/modules/unionfs/Makefile head/sys/modules/usb/Makefile head/sys/modules/usb/at91dci/Makefile head/sys/modules/usb/atmegadci/Makefile head/sys/modules/usb/atp/Makefile head/sys/modules/usb/aue/Makefile head/sys/modules/usb/avr32dci/Makefile head/sys/modules/usb/axe/Makefile head/sys/modules/usb/axge/Makefile head/sys/modules/usb/cdce/Makefile head/sys/modules/usb/cfumass/Makefile head/sys/modules/usb/cue/Makefile head/sys/modules/usb/dwc_otg/Makefile head/sys/modules/usb/ehci/Makefile head/sys/modules/usb/g_audio/Makefile head/sys/modules/usb/g_keyboard/Makefile head/sys/modules/usb/g_modem/Makefile head/sys/modules/usb/g_mouse/Makefile head/sys/modules/usb/ipheth/Makefile head/sys/modules/usb/kue/Makefile head/sys/modules/usb/mos/Makefile head/sys/modules/usb/musb/Makefile head/sys/modules/usb/ohci/Makefile head/sys/modules/usb/quirk/Makefile head/sys/modules/usb/rsu/Makefile head/sys/modules/usb/rsufw/Makefile.inc head/sys/modules/usb/rue/Makefile head/sys/modules/usb/rum/Makefile head/sys/modules/usb/run/Makefile head/sys/modules/usb/runfw/Makefile head/sys/modules/usb/saf1761otg/Makefile head/sys/modules/usb/smsc/Makefile head/sys/modules/usb/template/Makefile head/sys/modules/usb/u3g/Makefile head/sys/modules/usb/uark/Makefile head/sys/modules/usb/uath/Makefile head/sys/modules/usb/ubsa/Makefile head/sys/modules/usb/ubser/Makefile head/sys/modules/usb/uchcom/Makefile head/sys/modules/usb/ucom/Makefile head/sys/modules/usb/ucycom/Makefile head/sys/modules/usb/udav/Makefile head/sys/modules/usb/udbp/Makefile head/sys/modules/usb/udl/Makefile head/sys/modules/usb/uep/Makefile head/sys/modules/usb/uether/Makefile head/sys/modules/usb/ufm/Makefile head/sys/modules/usb/ufoma/Makefile head/sys/modules/usb/uftdi/Makefile head/sys/modules/usb/ugensa/Makefile head/sys/modules/usb/ugold/Makefile head/sys/modules/usb/uhci/Makefile head/sys/modules/usb/uhid/Makefile head/sys/modules/usb/uhso/Makefile head/sys/modules/usb/uipaq/Makefile head/sys/modules/usb/ukbd/Makefile head/sys/modules/usb/uled/Makefile head/sys/modules/usb/ulpt/Makefile head/sys/modules/usb/umass/Makefile head/sys/modules/usb/umcs/Makefile head/sys/modules/usb/umct/Makefile head/sys/modules/usb/umodem/Makefile head/sys/modules/usb/umoscom/Makefile head/sys/modules/usb/ums/Makefile head/sys/modules/usb/upgt/Makefile head/sys/modules/usb/uplcom/Makefile head/sys/modules/usb/ural/Makefile head/sys/modules/usb/ure/Makefile head/sys/modules/usb/urio/Makefile head/sys/modules/usb/urndis/Makefile head/sys/modules/usb/urtw/Makefile head/sys/modules/usb/usb/Makefile head/sys/modules/usb/usfs/Makefile head/sys/modules/usb/usie/Makefile head/sys/modules/usb/uslcom/Makefile head/sys/modules/usb/uss820dci/Makefile head/sys/modules/usb/uvisor/Makefile head/sys/modules/usb/uvscom/Makefile head/sys/modules/usb/wsp/Makefile head/sys/modules/usb/xhci/Makefile head/sys/modules/usb/zyd/Makefile head/sys/modules/utopia/Makefile head/sys/modules/vesa/Makefile head/sys/modules/vge/Makefile head/sys/modules/viawd/Makefile head/sys/modules/videomode/Makefile head/sys/modules/virtio/balloon/Makefile head/sys/modules/virtio/block/Makefile head/sys/modules/virtio/console/Makefile head/sys/modules/virtio/network/Makefile head/sys/modules/virtio/pci/Makefile head/sys/modules/virtio/random/Makefile head/sys/modules/virtio/scsi/Makefile head/sys/modules/virtio/virtio/Makefile head/sys/modules/vkbd/Makefile head/sys/modules/vmm/Makefile head/sys/modules/vmware/vmxnet3/Makefile head/sys/modules/vnic/Makefile head/sys/modules/vnic/mrmlbus/Makefile head/sys/modules/vnic/thunder_bgx/Makefile head/sys/modules/vnic/thunder_mdio/Makefile head/sys/modules/vnic/vnicpf/Makefile head/sys/modules/vnic/vnicvf/Makefile head/sys/modules/vpo/Makefile head/sys/modules/vr/Makefile head/sys/modules/vte/Makefile head/sys/modules/vx/Makefile head/sys/modules/vxge/Makefile head/sys/modules/wb/Makefile head/sys/modules/wbwd/Makefile head/sys/modules/wi/Makefile head/sys/modules/wlan/Makefile head/sys/modules/wlan_acl/Makefile head/sys/modules/wlan_amrr/Makefile head/sys/modules/wlan_ccmp/Makefile head/sys/modules/wlan_rssadapt/Makefile head/sys/modules/wlan_tkip/Makefile head/sys/modules/wlan_wep/Makefile head/sys/modules/wlan_xauth/Makefile head/sys/modules/wpi/Makefile head/sys/modules/wpifw/Makefile head/sys/modules/wtap/Makefile head/sys/modules/x86bios/Makefile head/sys/modules/xe/Makefile head/sys/modules/xl/Makefile head/sys/modules/zfs/Makefile head/sys/modules/zlib/Makefile Modified: head/sys/modules/3dfx/Makefile ============================================================================== --- head/sys/modules/3dfx/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/3dfx/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,11 +1,10 @@ # $FreeBSD$ -.PATH: $(.CURDIR)/../../dev/tdfx +.PATH: ${SRCTOP}/sys/dev/tdfx KMOD= 3dfx SRCS= bus_if.h pci_if.h device_if.h tdfx_pci.h tdfx_io.h\ tdfx_vars.h tdfx_pci.c -INCSRC= ../../sys # Uncomment this for debugging messages #CFLAGS+= -DDEBUG Modified: head/sys/modules/3dfx_linux/Makefile ============================================================================== --- head/sys/modules/3dfx_linux/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/3dfx_linux/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/tdfx +.PATH: ${SRCTOP}/sys/dev/tdfx KMOD= 3dfx_linux SRCS= tdfx_linux.c Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" SUBDIR_PARALLEL= @@ -423,7 +423,7 @@ SUBDIR+= opensolaris .endif .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) -.if exists(${.CURDIR}/../opencrypto) +.if exists(${SRCTOP}/sys/opencrypto) _crypto= crypto _cryptodev= cryptodev _random_fortuna=random_fortuna Modified: head/sys/modules/aac/Makefile ============================================================================== --- head/sys/modules/aac/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/aac/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/aac +.PATH: ${SRCTOP}/sys/dev/aac .if ${MACHINE_CPUARCH} == "i386" SUBDIR= aac_linux Modified: head/sys/modules/aac/aac_linux/Makefile ============================================================================== --- head/sys/modules/aac/aac_linux/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/aac/aac_linux/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/aac +.PATH: ${SRCTOP}/sys/dev/aac KMOD= aac_linux SRCS= aac_linux.c Modified: head/sys/modules/aacraid/Makefile ============================================================================== --- head/sys/modules/aacraid/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/aacraid/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/aacraid +.PATH: ${SRCTOP}/sys/dev/aacraid .if ${MACHINE_CPUARCH} == "i386" SUBDIR= aacraid_linux Modified: head/sys/modules/aacraid/aacraid_linux/Makefile ============================================================================== --- head/sys/modules/aacraid/aacraid_linux/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/aacraid/aacraid_linux/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/aacraid +.PATH: ${SRCTOP}/sys/dev/aacraid KMOD= aacraid_linux SRCS= aacraid_linux.c Modified: head/sys/modules/accf_data/Makefile ============================================================================== --- head/sys/modules/accf_data/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/accf_data/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netinet +.PATH: ${SRCTOP}/sys/netinet KMOD= accf_data SRCS= accf_data.c Modified: head/sys/modules/accf_dns/Makefile ============================================================================== --- head/sys/modules/accf_dns/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/accf_dns/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netinet +.PATH: ${SRCTOP}/sys/netinet KMOD= accf_dns SRCS= accf_dns.c Modified: head/sys/modules/accf_http/Makefile ============================================================================== --- head/sys/modules/accf_http/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/accf_http/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netinet +.PATH: ${SRCTOP}/sys/netinet KMOD= accf_http SRCS= accf_http.c Modified: head/sys/modules/acl_nfs4/Makefile ============================================================================== --- head/sys/modules/acl_nfs4/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/acl_nfs4/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../kern +.PATH: ${SRCTOP}/sys/kern KMOD= acl_nfs4 SRCS= vnode_if.h subr_acl_nfs4.c Modified: head/sys/modules/acl_posix1e/Makefile ============================================================================== --- head/sys/modules/acl_posix1e/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/acl_posix1e/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../kern +.PATH: ${SRCTOP}/sys/kern KMOD= acl_posix1e SRCS= vnode_if.h subr_acl_posix1e.c Modified: head/sys/modules/acpi/acpi_asus/Makefile ============================================================================== --- head/sys/modules/acpi/acpi_asus/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/acpi/acpi_asus/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_asus SRCS= acpi_asus.c opt_acpi.h acpi_if.h bus_if.h device_if.h Modified: head/sys/modules/acpi/acpi_asus_wmi/Makefile ============================================================================== --- head/sys/modules/acpi/acpi_asus_wmi/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/acpi/acpi_asus_wmi/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,9 +1,9 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_asus_wmi -CFLAGS+=-I${.CURDIR}/../../../dev/acpi_support +CFLAGS+=-I${SRCTOP}/sys/dev/acpi_support SRCS= acpi_asus_wmi.c opt_acpi.h acpi_if.h acpi_wmi_if.h device_if.h bus_if.h .include Modified: head/sys/modules/acpi/acpi_dock/Makefile ============================================================================== --- head/sys/modules/acpi/acpi_dock/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/acpi/acpi_dock/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpica +.PATH: ${SRCTOP}/sys/dev/acpica KMOD= acpi_dock SRCS= acpi_dock.c opt_acpi.h device_if.h bus_if.h acpi_if.h SRCS+= opt_ddb.h Modified: head/sys/modules/acpi/acpi_fujitsu/Makefile ============================================================================== --- head/sys/modules/acpi/acpi_fujitsu/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/acpi/acpi_fujitsu/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,9 +1,9 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_fujitsu -CFLAGS+=-I${.CURDIR}/../../../dev/acpi_support +CFLAGS+=-I${SRCTOP}/sys/dev/acpi_support SRCS= acpi_fujitsu.c opt_acpi.h acpi_if.h device_if.h bus_if.h .include Modified: head/sys/modules/acpi/acpi_hp/Makefile ============================================================================== --- head/sys/modules/acpi/acpi_hp/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/acpi/acpi_hp/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,9 +1,9 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_hp -CFLAGS+=-I${.CURDIR}/../../../dev/acpi_support +CFLAGS+=-I${SRCTOP}/sys/dev/acpi_support SRCS= acpi_hp.c opt_acpi.h acpi_if.h acpi_wmi_if.h device_if.h bus_if.h .include Modified: head/sys/modules/acpi/acpi_ibm/Makefile ============================================================================== --- head/sys/modules/acpi/acpi_ibm/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/acpi/acpi_ibm/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_ibm SRCS= acpi_ibm.c opt_acpi.h device_if.h bus_if.h acpi_if.h SRCS+= opt_ddb.h Modified: head/sys/modules/acpi/acpi_panasonic/Makefile ============================================================================== --- head/sys/modules/acpi/acpi_panasonic/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/acpi/acpi_panasonic/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_panasonic SRCS= acpi_panasonic.c opt_acpi.h acpi_if.h bus_if.h device_if.h Modified: head/sys/modules/acpi/acpi_rapidstart/Makefile ============================================================================== --- head/sys/modules/acpi/acpi_rapidstart/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/acpi/acpi_rapidstart/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_rapidstart SRCS= acpi_rapidstart.c opt_acpi.h device_if.h bus_if.h acpi_if.h Modified: head/sys/modules/acpi/acpi_sony/Makefile ============================================================================== --- head/sys/modules/acpi/acpi_sony/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/acpi/acpi_sony/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_sony SRCS= acpi_sony.c opt_acpi.h device_if.h bus_if.h acpi_if.h Modified: head/sys/modules/acpi/acpi_toshiba/Makefile ============================================================================== --- head/sys/modules/acpi/acpi_toshiba/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/acpi/acpi_toshiba/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_toshiba SRCS= acpi_toshiba.c opt_acpi.h acpi_if.h bus_if.h device_if.h Modified: head/sys/modules/acpi/acpi_video/Makefile ============================================================================== --- head/sys/modules/acpi/acpi_video/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/acpi/acpi_video/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpica +.PATH: ${SRCTOP}/sys/dev/acpica KMOD= acpi_video SRCS= acpi_video.c Modified: head/sys/modules/acpi/acpi_wmi/Makefile ============================================================================== --- head/sys/modules/acpi/acpi_wmi/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/acpi/acpi_wmi/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,9 +1,9 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_wmi -CFLAGS+=-I${.CURDIR}/../../../dev/acpi_support +CFLAGS+=-I${SRCTOP}/sys/dev/acpi_support SRCS= acpi_wmi.c opt_acpi.h acpi_if.h acpi_wmi_if.h device_if.h bus_if.h .include Modified: head/sys/modules/acpi/aibs/Makefile ============================================================================== --- head/sys/modules/acpi/aibs/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/acpi/aibs/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= aibs SRCS= atk0110.c Modified: head/sys/modules/ae/Makefile ============================================================================== --- head/sys/modules/ae/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ae/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ae +.PATH: ${SRCTOP}/sys/dev/ae KMOD= if_ae SRCS= if_ae.c device_if.h bus_if.h pci_if.h miibus_if.h Modified: head/sys/modules/aesni/Makefile ============================================================================== --- head/sys/modules/aesni/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/aesni/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../crypto/aesni +.PATH: ${SRCTOP}/sys/crypto/aesni KMOD= aesni SRCS= aesni.c Modified: head/sys/modules/age/Makefile ============================================================================== --- head/sys/modules/age/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/age/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/age +.PATH: ${SRCTOP}/sys/dev/age KMOD= if_age SRCS= if_age.c device_if.h bus_if.h pci_if.h miibus_if.h Modified: head/sys/modules/agp/Makefile ============================================================================== --- head/sys/modules/agp/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/agp/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/agp +.PATH: ${SRCTOP}/sys/dev/agp KMOD= agp SRCS= agp.c agp_if.c Modified: head/sys/modules/aha/Makefile ============================================================================== --- head/sys/modules/aha/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/aha/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/aha +.PATH: ${SRCTOP}/sys/dev/aha KMOD= aha SRCS= aha.c aha_isa.c ahareg.h opt_cam.h device_if.h bus_if.h \ Modified: head/sys/modules/ahci/Makefile ============================================================================== --- head/sys/modules/ahci/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ahci/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ahci +.PATH: ${SRCTOP}/sys/dev/ahci KMOD= ahci SRCS= ahci.c ahci_pci.c ahciem.c ahci.h device_if.h bus_if.h pci_if.h opt_cam.h Modified: head/sys/modules/aic/Makefile ============================================================================== --- head/sys/modules/aic/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/aic/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/aic +.PATH: ${SRCTOP}/sys/dev/aic KMOD= aic SRCS= aic.c aic_isa.c aic_pccard.c Modified: head/sys/modules/aic7xxx/ahc/Makefile ============================================================================== --- head/sys/modules/aic7xxx/ahc/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/aic7xxx/ahc/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,7 +1,7 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" .PATH: ${SYSDIR}/dev/aic7xxx Modified: head/sys/modules/aic7xxx/ahc/ahc_isa/Makefile ============================================================================== --- head/sys/modules/aic7xxx/ahc/ahc_isa/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/aic7xxx/ahc/ahc_isa/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,13 +1,13 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/aic7xxx +.PATH: ${SRCTOP}/sys/dev/aic7xxx KMOD= ahc_isa SRCS= ahc_isa.c SRCS+= device_if.h bus_if.h pci_if.h isa_if.h SRCS+= opt_scsi.h opt_cam.h opt_aic7xxx.h -CFLAGS+= -I${.CURDIR}/../../../../dev/aic7xxx -I.. +CFLAGS+= -I${SRCTOP}/sys/dev/aic7xxx -I.. .include Modified: head/sys/modules/aic7xxx/ahc/ahc_pci/Makefile ============================================================================== --- head/sys/modules/aic7xxx/ahc/ahc_pci/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/aic7xxx/ahc/ahc_pci/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,14 +1,14 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/aic7xxx +.PATH: ${SRCTOP}/sys/dev/aic7xxx KMOD= ahc_pci SRCS= ahc_pci.c aic7xxx_pci.c SRCS+= device_if.h bus_if.h pci_if.h SRCS+= opt_scsi.h opt_cam.h opt_aic7xxx.h -CFLAGS+= -I${.CURDIR}/../../../../dev/aic7xxx -I.. +CFLAGS+= -I${SRCTOP}/sys/dev/aic7xxx -I.. .include Modified: head/sys/modules/aic7xxx/ahd/Makefile ============================================================================== --- head/sys/modules/aic7xxx/ahd/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/aic7xxx/ahd/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/aic7xxx +.PATH: ${SRCTOP}/sys/dev/aic7xxx KMOD= ahd GENSRCS= aic79xx_seq.h aic79xx_reg.h @@ -17,14 +17,14 @@ BEFORE_DEPEND= ${GENSRCS} .if make(ahdfirmware) ahdfirmware: ${GENSRCS} ${GENSRCS}: \ - ${.CURDIR}/../../../dev/aic7xxx/aic79xx.{reg,seq} \ - ${.CURDIR}/../../../cam/scsi/scsi_message.h - aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi \ - -I${.CURDIR}/../../../dev/aic7xxx \ + ${SRCTOP}/sys/dev/aic7xxx/aic79xx.{reg,seq} \ + ${SRCTOP}/sys/cam/scsi/scsi_message.h + aicasm ${INCLUDES} -I${SRCTOP}/sys/cam/scsi \ + -I${SRCTOP}/sys/dev/aic7xxx \ -o aic79xx_seq.h -r aic79xx_reg.h \ ${REG_PRINT_OPT} \ - -i ${.CURDIR}/../../../dev/aic7xxx/aic79xx_osm.h \ - ${.CURDIR}/../../../dev/aic7xxx/aic79xx.seq + -i ${SRCTOP}/sys/dev/aic7xxx/aic79xx_osm.h \ + ${SRCTOP}/sys/dev/aic7xxx/aic79xx.seq .else ${GENSRCS}: .NOMETA @echo "Error: ${.TARGET} is missing. Run 'make ahdfirmware'." Modified: head/sys/modules/aic7xxx/aicasm/Makefile ============================================================================== --- head/sys/modules/aic7xxx/aicasm/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/aic7xxx/aicasm/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,9 +1,9 @@ # $FreeBSD$ -MAKESRCPATH= ${.CURDIR}/../../../dev/aic7xxx/aicasm +MAKESRCPATH= ${SRCTOP}/sys/dev/aic7xxx/aicasm install: -.include "${.CURDIR}/../../../dev/aic7xxx/aicasm/Makefile" +.include "${SRCTOP}/sys/dev/aic7xxx/aicasm/Makefile" build-tools: ${PROG} Modified: head/sys/modules/alc/Makefile ============================================================================== --- head/sys/modules/alc/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/alc/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/alc +.PATH: ${SRCTOP}/sys/dev/alc KMOD= if_alc SRCS= if_alc.c device_if.h bus_if.h pci_if.h miibus_if.h Modified: head/sys/modules/ale/Makefile ============================================================================== --- head/sys/modules/ale/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ale/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ale +.PATH: ${SRCTOP}/sys/dev/ale KMOD= if_ale SRCS= if_ale.c device_if.h bus_if.h pci_if.h miibus_if.h Modified: head/sys/modules/alq/Makefile ============================================================================== --- head/sys/modules/alq/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/alq/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../kern +.PATH: ${SRCTOP}/sys/kern KMOD= alq SRCS= opt_mac.h vnode_if.h kern_alq.c Modified: head/sys/modules/am335x_dmtpps/Makefile ============================================================================== --- head/sys/modules/am335x_dmtpps/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/am335x_dmtpps/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../arm/ti/am335x +.PATH: ${SRCTOP}/sys/arm/ti/am335x KMOD= am335x_dmtpps SRCS= am335x_dmtpps.c Modified: head/sys/modules/amd_ecc_inject/Makefile ============================================================================== --- head/sys/modules/amd_ecc_inject/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/amd_ecc_inject/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/amd_ecc_inject +.PATH: ${SRCTOP}/sys/dev/amd_ecc_inject KMOD= amd_ecc_inject SRCS= ecc_inject.c bus_if.h device_if.h pci_if.h Modified: head/sys/modules/amdsbwd/Makefile ============================================================================== --- head/sys/modules/amdsbwd/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/amdsbwd/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/amdsbwd +.PATH: ${SRCTOP}/sys/dev/amdsbwd KMOD = amdsbwd SRCS = amdsbwd.c SRCS += device_if.h bus_if.h pci_if.h isa_if.h Modified: head/sys/modules/amdtemp/Makefile ============================================================================== --- head/sys/modules/amdtemp/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/amdtemp/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/amdtemp +.PATH: ${SRCTOP}/sys/dev/amdtemp KMOD= amdtemp SRCS= amdtemp.c bus_if.h device_if.h pci_if.h Modified: head/sys/modules/amr/Makefile ============================================================================== --- head/sys/modules/amr/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/amr/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/amr +.PATH: ${SRCTOP}/sys/dev/amr SUBDIR= amr_cam .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" Modified: head/sys/modules/amr/amr_cam/Makefile ============================================================================== --- head/sys/modules/amr/amr_cam/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/amr/amr_cam/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/amr +.PATH: ${SRCTOP}/sys/dev/amr KMOD= amr_cam SRCS= amr_cam.c device_if.h bus_if.h Modified: head/sys/modules/amr/amr_linux/Makefile ============================================================================== --- head/sys/modules/amr/amr_linux/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/amr/amr_linux/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/amr +.PATH: ${SRCTOP}/sys/dev/amr KMOD= amr_linux SRCS= amr_linux.c device_if.h bus_if.h Modified: head/sys/modules/an/Makefile ============================================================================== --- head/sys/modules/an/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/an/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/an +.PATH: ${SRCTOP}/sys/dev/an KMOD= if_an SRCS= if_an.c if_an_pccard.c if_an_pci.c if_an_isa.c Modified: head/sys/modules/aout/Makefile ============================================================================== --- head/sys/modules/aout/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/aout/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../kern +.PATH: ${SRCTOP}/sys/kern KMOD= aout SRCS= imgact_aout.c \ Modified: head/sys/modules/apm/Makefile ============================================================================== --- head/sys/modules/apm/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/apm/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../i386/bios +.PATH: ${SRCTOP}/sys/i386/bios KMOD= apm SRCS= apm.c apm.h Modified: head/sys/modules/ar71xx/ar71xx_ehci/Makefile ============================================================================== --- head/sys/modules/ar71xx/ar71xx_ehci/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ar71xx/ar71xx_ehci/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -29,15 +29,15 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../../mips/atheros/ +.PATH: ${SRCTOP}/sys/mips/atheros/ KMOD= ar71xx_ehci SRCS= ar71xx_ehci.c SRCS+= device_if.h bus_if.h usb_if.h opt_usb.h opt_bus.h -.PATH: ${.CURDIR}/../../../dev/usb/controller/ +.PATH: ${SRCTOP}/sys/dev/usb/controller/ SRCS+= ehci.c -CFLAGS+= -I. -I${.CURDIR}/../../../mips/atheros +CFLAGS+= -I. -I${SRCTOP}/sys/mips/atheros .include Modified: head/sys/modules/ar71xx/ar71xx_ohci/Makefile ============================================================================== --- head/sys/modules/ar71xx/ar71xx_ohci/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ar71xx/ar71xx_ohci/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -29,15 +29,15 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../../mips/atheros/ +.PATH: ${SRCTOP}/sys/mips/atheros/ KMOD= ar71xx_ohci SRCS= ar71xx_ohci.c SRCS+= device_if.h bus_if.h usb_if.h opt_usb.h opt_bus.h -CFLAGS+= -I. -I${.CURDIR}/../../../mips/atheros +CFLAGS+= -I. -I${SRCTOP}/sys/mips/atheros -.PATH: ${.CURDIR}/../../../dev/usb/controller/ +.PATH: ${SRCTOP}/sys/dev/usb/controller/ SRCS+= ohci.c .include Modified: head/sys/modules/arcmsr/Makefile ============================================================================== --- head/sys/modules/arcmsr/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/arcmsr/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/arcmsr +.PATH: ${SRCTOP}/sys/dev/arcmsr KMOD= arcmsr SRCS= arcmsr.c Modified: head/sys/modules/arcnet/Makefile ============================================================================== --- head/sys/modules/arcnet/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/arcnet/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net +.PATH: ${SRCTOP}/sys/net KMOD= arcnet SRCS= if_arcsubr.c Modified: head/sys/modules/armv8crypto/Makefile ============================================================================== --- head/sys/modules/armv8crypto/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/armv8crypto/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../crypto/armv8 +.PATH: ${SRCTOP}/sys/crypto/armv8 KMOD= armv8crypto SRCS= armv8_crypto.c Modified: head/sys/modules/asmc/Makefile ============================================================================== --- head/sys/modules/asmc/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/asmc/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/asmc +.PATH: ${SRCTOP}/sys/dev/asmc KMOD= asmc SRCS= asmc.c opt_acpi.h opt_intr_filter.h acpi_if.h bus_if.h device_if.h Modified: head/sys/modules/ata/atacard/Makefile ============================================================================== --- head/sys/modules/ata/atacard/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atacard/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ata +.PATH: ${SRCTOP}/sys/dev/ata KMOD= atacard SRCS= ata-card.c Modified: head/sys/modules/ata/atacore/Makefile ============================================================================== --- head/sys/modules/ata/atacore/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atacore/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ata +.PATH: ${SRCTOP}/sys/dev/ata KMOD= ata SRCS= ata-all.c ata_if.c ata-lowlevel.c Modified: head/sys/modules/ata/ataisa/Makefile ============================================================================== --- head/sys/modules/ata/ataisa/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/ataisa/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ata +.PATH: ${SRCTOP}/sys/dev/ata KMOD= ataisa SRCS= ata-isa.c Modified: head/sys/modules/ata/atapci/Makefile ============================================================================== --- head/sys/modules/ata/atapci/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -2,7 +2,7 @@ SUBDIR += chipsets -.PATH: ${.CURDIR}/../../../dev/ata +.PATH: ${SRCTOP}/sys/dev/ata KMOD= atapci SRCS= ata-pci.c ata-dma.c ata-sata.c Modified: head/sys/modules/ata/atapci/chipsets/ataacard/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/ataacard/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/ataacard/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataacard SRCS= ata-acard.c Modified: head/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataacerlabs SRCS= ata-acerlabs.c Modified: head/sys/modules/ata/atapci/chipsets/ataamd/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/ataamd/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/ataamd/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataamd SRCS= ata-amd.c Modified: head/sys/modules/ata/atapci/chipsets/ataati/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/ataati/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/ataati/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataati SRCS= ata-ati.c Modified: head/sys/modules/ata/atapci/chipsets/atacenatek/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/atacenatek/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/atacenatek/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atacenatek SRCS= ata-cenatek.c Modified: head/sys/modules/ata/atapci/chipsets/atacypress/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/atacypress/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/atacypress/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atacypress SRCS= ata-cypress.c Modified: head/sys/modules/ata/atapci/chipsets/atacyrix/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/atacyrix/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/atacyrix/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atacyrix SRCS= ata-cyrix.c Modified: head/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atahighpoint SRCS= ata-highpoint.c Modified: head/sys/modules/ata/atapci/chipsets/ataintel/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/ataintel/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/ataintel/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataintel SRCS= ata-intel.c Modified: head/sys/modules/ata/atapci/chipsets/ataite/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/ataite/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/ataite/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataite SRCS= ata-ite.c Modified: head/sys/modules/ata/atapci/chipsets/atajmicron/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/atajmicron/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/atajmicron/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atajmicron SRCS= ata-jmicron.c Modified: head/sys/modules/ata/atapci/chipsets/atamarvell/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/atamarvell/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/atamarvell/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atamarvell SRCS= ata-marvell.c Modified: head/sys/modules/ata/atapci/chipsets/atamicron/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/atamicron/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/atamicron/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atamicron SRCS= ata-micron.c Modified: head/sys/modules/ata/atapci/chipsets/atanational/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/atanational/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/atanational/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atanational SRCS= ata-national.c Modified: head/sys/modules/ata/atapci/chipsets/atanetcell/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/atanetcell/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/atanetcell/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atanetcell SRCS= ata-netcell.c Modified: head/sys/modules/ata/atapci/chipsets/atanvidia/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/atanvidia/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/atanvidia/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atanvidia SRCS= ata-nvidia.c Modified: head/sys/modules/ata/atapci/chipsets/atapromise/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/atapromise/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/atapromise/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atapromise SRCS= ata-promise.c Modified: head/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataserverworks SRCS= ata-serverworks.c Modified: head/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atasiliconimage SRCS= ata-siliconimage.c Modified: head/sys/modules/ata/atapci/chipsets/atasis/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/atasis/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/atasis/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atasis SRCS= ata-sis.c Modified: head/sys/modules/ata/atapci/chipsets/atavia/Makefile ============================================================================== --- head/sys/modules/ata/atapci/chipsets/atavia/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ata/atapci/chipsets/atavia/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atavia SRCS= ata-via.c Modified: head/sys/modules/ath_ahb/Makefile ============================================================================== --- head/sys/modules/ath_ahb/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ath_ahb/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -29,13 +29,13 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../dev/ath -.PATH: ${.CURDIR}/../../dev/ath/ath_hal +.PATH: ${SRCTOP}/sys/dev/ath +.PATH: ${SRCTOP}/sys/dev/ath/ath_hal KMOD= if_ath_ahb SRCS= if_ath_ahb.c SRCS+= device_if.h bus_if.h opt_wlan.h opt_ath.h opt_ah.h -CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal +CFLAGS+= -I. -I${SRCTOP}/sys/dev/ath -I${SRCTOP}/sys/dev/ath/ath_hal .include Modified: head/sys/modules/ath_pci/Makefile ============================================================================== --- head/sys/modules/ath_pci/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/ath_pci/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -29,13 +29,13 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../dev/ath -.PATH: ${.CURDIR}/../../dev/ath/ath_hal +.PATH: ${SRCTOP}/sys/dev/ath +.PATH: ${SRCTOP}/sys/dev/ath/ath_hal KMOD= if_ath_pci SRCS= if_ath_pci.c SRCS+= device_if.h bus_if.h pci_if.h opt_wlan.h opt_ath.h opt_ah.h -CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal +CFLAGS+= -I. -I${SRCTOP}/sys/dev/ath -I${SRCTOP}/sys/dev/ath/ath_hal .include Modified: head/sys/modules/autofs/Makefile ============================================================================== --- head/sys/modules/autofs/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/autofs/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/autofs +.PATH: ${SRCTOP}/sys/fs/autofs KMOD= autofs SRCS= vnode_if.h \ Modified: head/sys/modules/auxio/Makefile ============================================================================== --- head/sys/modules/auxio/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/auxio/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/auxio +.PATH: ${SRCTOP}/sys/dev/auxio KMOD= auxio Modified: head/sys/modules/bce/Makefile ============================================================================== --- head/sys/modules/bce/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/bce/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,5 +1,5 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/bce +.PATH: ${SRCTOP}/sys/dev/bce KMOD= if_bce SRCS= opt_bce.h if_bce.c miibus_if.h miidevs.h device_if.h bus_if.h pci_if.h Modified: head/sys/modules/bfe/Makefile ============================================================================== --- head/sys/modules/bfe/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/bfe/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/bfe +.PATH: ${SRCTOP}/sys/dev/bfe KMOD= if_bfe SRCS= if_bfe.c miibus_if.h miidevs.h device_if.h bus_if.h pci_if.h Modified: head/sys/modules/bge/Makefile ============================================================================== --- head/sys/modules/bge/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/bge/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/bge +.PATH: ${SRCTOP}/sys/dev/bge KMOD= if_bge SRCS= if_bge.c miibus_if.h miidevs.h device_if.h bus_if.h pci_if.h Modified: head/sys/modules/bhnd/Makefile ============================================================================== --- head/sys/modules/bhnd/Makefile Sat Mar 4 10:07:46 2017 (r314650) +++ head/sys/modules/bhnd/Makefile Sat Mar 4 10:10:17 2017 (r314651) @@ -1,10 +1,10 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/bhnd *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Sat Mar 4 11:26:44 2017 Return-Path: Delivered-To: svn-src-all@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 CAA62CF974D; Sat, 4 Mar 2017 11:26:44 +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 95C45165B; Sat, 4 Mar 2017 11:26:44 +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 v24BQhtw030613; Sat, 4 Mar 2017 11:26:43 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24BQfJK030586; Sat, 4 Mar 2017 11:26:41 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703041126.v24BQfJK030586@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 4 Mar 2017 11:26:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314652 - in head/share: colldef ctypedef doc/atf doc/legal/intel_ipw doc/legal/intel_iwi doc/legal/intel_iwn doc/legal/intel_wpi doc/legal/realtek doc/llvm doc/llvm/clang doc/smm/08.se... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 11:26:44 -0000 Author: ngie Date: Sat Mar 4 11:26:40 2017 New Revision: 314652 URL: https://svnweb.freebsd.org/changeset/base/314652 Log: share: normalize paths using SRCTOP-relative paths or :H when possible This simplifies make logic/output MFC after: 1 month Sponsored by: Dell EMC Isilon Modified: head/share/colldef/Makefile head/share/ctypedef/Makefile head/share/doc/atf/Makefile head/share/doc/legal/intel_ipw/Makefile head/share/doc/legal/intel_iwi/Makefile head/share/doc/legal/intel_iwn/Makefile head/share/doc/legal/intel_wpi/Makefile head/share/doc/legal/realtek/Makefile head/share/doc/llvm/Makefile head/share/doc/llvm/clang/Makefile head/share/doc/smm/08.sendmailop/Makefile head/share/doc/usd/19.memacros/Makefile head/share/doc/usd/20.meref/Makefile head/share/examples/Makefile head/share/examples/ipfilter/Makefile head/share/examples/smbfs/Makefile head/share/examples/smbfs/print/Makefile head/share/i18n/csmapper/Makefile.inc head/share/i18n/csmapper/Makefile.part head/share/i18n/esdb/Makefile.inc head/share/i18n/esdb/Makefile.part head/share/man/man1/Makefile head/share/man/man4/Makefile head/share/man/man7/Makefile head/share/sendmail/Makefile head/share/zoneinfo/Makefile Modified: head/share/colldef/Makefile ============================================================================== --- head/share/colldef/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/colldef/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -5,7 +5,7 @@ LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_COLLATE .SUFFIXES: .src .LC_COLLATE -MAPLOC= ${.CURDIR}/../../tools/tools/locale/etc/final-maps +MAPLOC= ${SRCTOP}/tools/tools/locale/etc/final-maps .src.LC_COLLATE: localedef -D -U -i ${.IMPSRC} \ Modified: head/share/ctypedef/Makefile ============================================================================== --- head/share/ctypedef/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/ctypedef/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -5,7 +5,7 @@ LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_CTYPE .SUFFIXES: .src .LC_CTYPE -MAPLOC= ${.CURDIR}/../../tools/tools/locale/etc/final-maps +MAPLOC= ${SRCTOP}/tools/tools/locale/etc/final-maps .src.LC_CTYPE: localedef -D -U -c -w ${MAPLOC}/widths.txt \ Modified: head/share/doc/atf/Makefile ============================================================================== --- head/share/doc/atf/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/doc/atf/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -25,9 +25,8 @@ # # $FreeBSD$ -ATF= ${.CURDIR}/../../../contrib/atf -.PATH: ${ATF} -.PATH: ${ATF}/doc +ATF= ${SRCTOP}/contrib/atf +.PATH: ${ATF} ${ATF}/doc FILESGROUPS= TOP Modified: head/share/doc/legal/intel_ipw/Makefile ============================================================================== --- head/share/doc/legal/intel_ipw/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/doc/legal/intel_ipw/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -1,6 +1,6 @@ # $FreeBSD$ -FILES= ${.CURDIR}/../../../../sys/contrib/dev/ipw/LICENSE +FILES= ${SRCTOP}/sys/contrib/dev/ipw/LICENSE FILESDIR= ${SHAREDIR}/doc/legal FILESNAME= intel_ipw.LICENSE Modified: head/share/doc/legal/intel_iwi/Makefile ============================================================================== --- head/share/doc/legal/intel_iwi/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/doc/legal/intel_iwi/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -1,6 +1,6 @@ # $FreeBSD$ -FILES= ${.CURDIR}/../../../../sys/contrib/dev/iwi/LICENSE +FILES= ${SRCTOP}/sys/contrib/dev/iwi/LICENSE FILESDIR= ${SHAREDIR}/doc/legal FILESNAME= intel_iwi.LICENSE Modified: head/share/doc/legal/intel_iwn/Makefile ============================================================================== --- head/share/doc/legal/intel_iwn/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/doc/legal/intel_iwn/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -1,6 +1,6 @@ # $FreeBSD$ -FILES= ${.CURDIR}/../../../../sys/contrib/dev/iwn/LICENSE +FILES= ${SRCTOP}/sys/contrib/dev/iwn/LICENSE FILESDIR= ${SHAREDIR}/doc/legal FILESNAME= intel_iwn.LICENSE Modified: head/share/doc/legal/intel_wpi/Makefile ============================================================================== --- head/share/doc/legal/intel_wpi/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/doc/legal/intel_wpi/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -1,6 +1,6 @@ # $FreeBSD$ -FILES= ${.CURDIR}/../../../../sys/contrib/dev/wpi/LICENSE +FILES= ${SRCTOP}/sys/contrib/dev/wpi/LICENSE FILESDIR= ${SHAREDIR}/doc/legal FILESNAME= intel_wpi.LICENSE Modified: head/share/doc/legal/realtek/Makefile ============================================================================== --- head/share/doc/legal/realtek/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/doc/legal/realtek/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -1,6 +1,6 @@ # $FreeBSD$ -FILES= ${.CURDIR}/../../../../sys/contrib/dev/rtwn/LICENSE +FILES= ${SRCTOP}/sys/contrib/dev/rtwn/LICENSE FILESDIR= ${SHAREDIR}/doc/legal FILESNAME= realtek.LICENSE Modified: head/share/doc/llvm/Makefile ============================================================================== --- head/share/doc/llvm/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/doc/llvm/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -2,7 +2,7 @@ SUBDIR= clang -SRCDIR= ${.CURDIR}/../../../contrib/llvm +SRCDIR= ${SRCTOP}/contrib/llvm .PATH: ${SRCDIR} ${SRCDIR}/lib/Support Modified: head/share/doc/llvm/clang/Makefile ============================================================================== --- head/share/doc/llvm/clang/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/doc/llvm/clang/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -1,6 +1,6 @@ # $FreeBSD$ -SRCDIR= ${.CURDIR}/../../../../contrib/llvm/tools/clang +SRCDIR= ${SRCTOP}/contrib/llvm/tools/clang .PATH: ${SRCDIR} Modified: head/share/doc/smm/08.sendmailop/Makefile ============================================================================== --- head/share/doc/smm/08.sendmailop/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/doc/smm/08.sendmailop/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -6,6 +6,6 @@ SRCS= op.me MACROS= -me USE_PIC= USE_EQN= -SRCDIR= ${.CURDIR}/../../../../contrib/sendmail/doc/op +SRCDIR= ${SRCTOP}/contrib/sendmail/doc/op .include Modified: head/share/doc/usd/19.memacros/Makefile ============================================================================== --- head/share/doc/usd/19.memacros/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/doc/usd/19.memacros/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -4,7 +4,7 @@ VOLUME= usd/19.memacros SRCS= meintro.me-sed MACROS= -me -GROFFDIR= ${.CURDIR}/../../../../contrib/groff +GROFFDIR= ${SRCTOP}/contrib/groff SRCDIR= ${GROFFDIR}/doc version=`cat ${GROFFDIR}/VERSION` Modified: head/share/doc/usd/20.meref/Makefile ============================================================================== --- head/share/doc/usd/20.meref/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/doc/usd/20.meref/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -4,7 +4,7 @@ VOLUME= usd/20.meref SRCS= meref.me-sed MACROS= -me -GROFFDIR= ${.CURDIR}/../../../../contrib/groff +GROFFDIR= ${SRCTOP}/contrib/groff SRCDIR= ${GROFFDIR}/doc version=`cat ${GROFFDIR}/VERSION` Modified: head/share/examples/Makefile ============================================================================== --- head/share/examples/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/examples/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -241,7 +241,7 @@ copies: fi .endfor mtree -deU ${MTREE_FOLLOWS_SYMLINKS} \ - -f ${.CURDIR}/../../etc/mtree/BSD.usr.dist -p ${DESTDIR}/usr + -f ${SRCTOP}/etc/mtree/BSD.usr.dist -p ${DESTDIR}/usr .for file in ${XFILES} ${INSTALL} -T package=${PACKAGE_${file}:Uexamples} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \ ${.CURDIR}/${file} ${DESTDIR}${BINDIR}/${file} @@ -255,7 +255,7 @@ symlinks: etc-examples: .if ${SHARED} != "symlinks" - ${_+_}(cd ${.CURDIR}/../../etc; ${MAKE} etc-examples) + ${_+_}(cd ${SRCTOP}/etc; ${MAKE} etc-examples) .endif .if ${SHARED} != "symlinks" Modified: head/share/examples/ipfilter/Makefile ============================================================================== --- head/share/examples/ipfilter/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/examples/ipfilter/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -4,9 +4,9 @@ PACKAGE=examples FILES= README # dist sample files -.PATH: ${.CURDIR}/../../../contrib/ipfilter/rules \ - ${.CURDIR}/../../../contrib/ipfilter \ - ${.CURDIR}/../../../contrib/ipfilter/man +.PATH: ${SRCTOP}/contrib/ipfilter/rules \ + ${SRCTOP}/contrib/ipfilter \ + ${SRCTOP}/contrib/ipfilter/man FILES+= BASIC.NAT BASIC_1.FW BASIC_2.FW \ example.1 example.2 example.3 example.4 example.5 \ example.6 example.7 example.8 example.9 example.10 \ Modified: head/share/examples/smbfs/Makefile ============================================================================== --- head/share/examples/smbfs/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/examples/smbfs/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -4,7 +4,7 @@ PACKAGE=examples FILESDIR= ${SHAREDIR}/examples/smbfs FILES= dot.nsmbrc -.PATH: ${.CURDIR}/../../../contrib/smbfs/examples +.PATH: ${SRCTOP}/contrib/smbfs/examples SUBDIR= print Modified: head/share/examples/smbfs/print/Makefile ============================================================================== --- head/share/examples/smbfs/print/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/examples/smbfs/print/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -4,6 +4,6 @@ PACKAGE=examples FILESDIR= ${SHAREDIR}/examples/smbfs/print FILES= lj6l ljspool printcap.sample tolj -.PATH: ${.CURDIR}/../../../../contrib/smbfs/examples/print +.PATH: ${SRCTOP}/contrib/smbfs/examples/print .include Modified: head/share/i18n/csmapper/Makefile.inc ============================================================================== --- head/share/i18n/csmapper/Makefile.inc Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/i18n/csmapper/Makefile.inc Sat Mar 4 11:26:40 2017 (r314652) @@ -6,4 +6,4 @@ CSMAPPERDIR?= /usr/share/i18n/csmapper .if ${MK_STAGING} == "yes" MKCSMAPPER= ${STAGE_HOST_OBJTOP}/usr/bin/mkcsmapper_static .endif -MKCSMAPPER?= ${.OBJDIR}/../../../usr.bin/mkcsmapper_static/mkcsmapper_static +MKCSMAPPER?= ${.OBJDIR:H:H:H}/usr.bin/mkcsmapper_static/mkcsmapper_static Modified: head/share/i18n/csmapper/Makefile.part ============================================================================== --- head/share/i18n/csmapper/Makefile.part Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/i18n/csmapper/Makefile.part Sat Mar 4 11:26:40 2017 (r314652) @@ -1,7 +1,7 @@ # $FreeBSD$ # $NetBSD: Makefile,v 1.13 2007/03/13 16:34:37 tnozaki Exp $ -MKCSMAPPER?= ${.OBJDIR}/../../../../usr.bin/mkcsmapper_static/mkcsmapper_static +MKCSMAPPER?= ${.OBJDIR:H:H:H:H}/usr.bin/mkcsmapper_static/mkcsmapper_static ESUBDIR?= ${CODE} PARTFILE?= ${.CURDIR}/${CODE}.part @@ -14,7 +14,7 @@ RTABLENAME?= UCS%${CODE}-%%PART%% ENCID?= ${CODE}%%PART%% ENCEXT?= .mps MAPPER?= mapper_std -REVSYMBOL?= +REVSYMBOL?= FILESDIR= ${CSMAPPERDIR}/${ESUBDIR} .SUFFIXES: .src .646 .mps Modified: head/share/i18n/esdb/Makefile.inc ============================================================================== --- head/share/i18n/esdb/Makefile.inc Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/i18n/esdb/Makefile.inc Sat Mar 4 11:26:40 2017 (r314652) @@ -8,4 +8,4 @@ ESDBDIR?= /usr/share/i18n/esdb .if ${MK_STAGING} == "yes" MKESDB= ${STAGE_HOST_OBJTOP}/usr/bin/mkesdb_static .endif -MKESDB?= ${.OBJDIR}/../../../usr.bin/mkesdb_static/mkesdb_static +MKESDB?= ${.OBJDIR:H:H:H}/usr.bin/mkesdb_static/mkesdb_static Modified: head/share/i18n/esdb/Makefile.part ============================================================================== --- head/share/i18n/esdb/Makefile.part Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/i18n/esdb/Makefile.part Sat Mar 4 11:26:40 2017 (r314652) @@ -1,7 +1,7 @@ # $FreeBSD$ # $NetBSD: Makefile.part,v 1.6 2008/10/25 22:35:36 apb Exp $ -MKESDB?= ${.OBJDIR}/../../../../usr.bin/mkesdb_static/mkesdb_static +MKESDB?= ${.OBJDIR:H:H:H:H}/usr.bin/mkesdb_static/mkesdb_static PARTFILE?= ${.CURDIR}/${CODE}.part ALIASFILE?= ${.CURDIR}/${CODE}.alias @@ -16,7 +16,7 @@ CODESETS?= ${PART:C/^/${CODE}${SEP}/} EPREFIX?= ${CODE}${SEP} .else CODESETS?= ${PART} -EPREFIX?= +EPREFIX?= .endif ESUBDIR?= ${CODE} ESDB?= ${CODESETS:C/$/.esdb/:S/:/@/} Modified: head/share/man/man1/Makefile ============================================================================== --- head/share/man/man1/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/man/man1/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -8,7 +8,7 @@ MAN= builtin.1 intro.1 PACKAGE=runtime-manuals .if ${MK_TESTS} != "no" -ATF= ${.CURDIR}/../../../contrib/atf +ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/doc MAN+= atf-test-program.1 .endif Modified: head/share/man/man4/Makefile ============================================================================== --- head/share/man/man4/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/man/man4/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -896,7 +896,7 @@ MAN+= mlx4ib.4 .endif .if ${MK_TESTS} != "no" -ATF= ${.CURDIR}/../../../contrib/atf +ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/doc _atf_test_case.4= atf-test-case.4 .endif Modified: head/share/man/man7/Makefile ============================================================================== --- head/share/man/man7/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/man/man7/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -43,7 +43,7 @@ MLINKS+= c99.7 c89.7 MLINKS+= c99.7 c90.7 .if ${MK_TESTS} != "no" -ATF= ${.CURDIR}/../../../contrib/atf +ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/doc MAN+= atf.7 Modified: head/share/sendmail/Makefile ============================================================================== --- head/share/sendmail/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/sendmail/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -4,7 +4,7 @@ PACKAGE= sendmail FILESGROUPS+= SM -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR= ${SRCTOP}/contrib/sendmail CFDIR= cf CFPACKAGE= sendmail CFDIRS!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type d -print) Modified: head/share/zoneinfo/Makefile ============================================================================== --- head/share/zoneinfo/Makefile Sat Mar 4 10:10:17 2017 (r314651) +++ head/share/zoneinfo/Makefile Sat Mar 4 11:26:40 2017 (r314652) @@ -30,7 +30,7 @@ CLEANFILES+= yearistype CLEANDIRS+= builddir -CONTRIBDIR= ${.CURDIR}/../../contrib/tzdata/ +CONTRIBDIR= ${SRCTOP}/contrib/tzdata/ .PATH: ${CONTRIBDIR} .if defined(LEAPSECONDS) From owner-svn-src-all@freebsd.org Sat Mar 4 11:28:06 2017 Return-Path: Delivered-To: svn-src-all@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 003C3CF97B3; Sat, 4 Mar 2017 11:28:06 +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 CC44C17B5; Sat, 4 Mar 2017 11:28:05 +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 v24BS4G3030730; Sat, 4 Mar 2017 11:28:04 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24BS3Ae030719; Sat, 4 Mar 2017 11:28:03 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703041128.v24BS3Ae030719@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 4 Mar 2017 11:28:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314653 - in head/libexec: atrun dma ftpd hyperv mail.local smrsh talkd tcpd telnetd tftp-proxy ypxfr X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 11:28:06 -0000 Author: ngie Date: Sat Mar 4 11:28:03 2017 New Revision: 314653 URL: https://svnweb.freebsd.org/changeset/base/314653 Log: libexec: normalize paths using SRCTOP-relative paths or :H when possible This simplifies make logic/output MFC after: 1 month Sponsored by: Dell EMC Isilon Modified: head/libexec/atrun/Makefile head/libexec/dma/Makefile.inc head/libexec/ftpd/Makefile head/libexec/hyperv/Makefile head/libexec/mail.local/Makefile head/libexec/smrsh/Makefile head/libexec/talkd/Makefile head/libexec/tcpd/Makefile head/libexec/telnetd/Makefile head/libexec/tftp-proxy/Makefile head/libexec/ypxfr/Makefile Modified: head/libexec/atrun/Makefile ============================================================================== --- head/libexec/atrun/Makefile Sat Mar 4 11:26:40 2017 (r314652) +++ head/libexec/atrun/Makefile Sat Mar 4 11:28:03 2017 (r314653) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=at -MAINSRC=${.CURDIR}/../../usr.bin/at +MAINSRC=${SRCTOP}/usr.bin/at .include "${MAINSRC}/Makefile.inc" Modified: head/libexec/dma/Makefile.inc ============================================================================== --- head/libexec/dma/Makefile.inc Sat Mar 4 11:26:40 2017 (r314652) +++ head/libexec/dma/Makefile.inc Sat Mar 4 11:28:03 2017 (r314653) @@ -1,7 +1,7 @@ # $FreeBSD$ -.sinclude "${.CURDIR}/../../Makefile.inc" -DMA_SOURCES= ${.CURDIR}/../../../contrib/dma +.sinclude "${.CURDIR:H:H}/Makefile.inc" +DMA_SOURCES= ${SRCTOP}/contrib/dma .PATH: ${DMA_SOURCES} CFLAGS+= -I${DMA_SOURCES} \ Modified: head/libexec/ftpd/Makefile ============================================================================== --- head/libexec/ftpd/Makefile Sat Mar 4 11:26:40 2017 (r314652) +++ head/libexec/ftpd/Makefile Sat Mar 4 11:28:03 2017 (r314653) @@ -18,10 +18,9 @@ LIBADD= crypt xo util # XXX Kluge! Conversation mechanism needs to be fixed. LIBADD+= opie md -LSDIR= ../../bin/ls -.PATH: ${.CURDIR}/${LSDIR} +.PATH: ${SRCTOP}/bin/ls SRCS+= ls.c cmp.c print.c util.c -CFLAGS+=-Dmain=ls_main -I${.CURDIR}/${LSDIR} +CFLAGS+=-Dmain=ls_main -I${SRCTOP}/bin/ls LIBADD+= m .if ${MK_BLACKLIST_SUPPORT} != "no" Modified: head/libexec/hyperv/Makefile ============================================================================== --- head/libexec/hyperv/Makefile Sat Mar 4 11:26:40 2017 (r314652) +++ head/libexec/hyperv/Makefile Sat Mar 4 11:28:03 2017 (r314653) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/hyperv/tools/scripts +.PATH: ${SRCTOP}/contrib/hyperv/tools/scripts BINDIR= ${LIBEXECDIR}/hyperv Modified: head/libexec/mail.local/Makefile ============================================================================== --- head/libexec/mail.local/Makefile Sat Mar 4 11:26:40 2017 (r314652) +++ head/libexec/mail.local/Makefile Sat Mar 4 11:28:03 2017 (r314653) @@ -2,7 +2,7 @@ # $FreeBSD$ PACKAGE=sendmail -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/mail.local PROG= mail.local Modified: head/libexec/smrsh/Makefile ============================================================================== --- head/libexec/smrsh/Makefile Sat Mar 4 11:26:40 2017 (r314652) +++ head/libexec/smrsh/Makefile Sat Mar 4 11:28:03 2017 (r314653) @@ -2,7 +2,7 @@ # $FreeBSD$ PACKAGE=sendmail -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/smrsh PROG= smrsh Modified: head/libexec/talkd/Makefile ============================================================================== --- head/libexec/talkd/Makefile Sat Mar 4 11:26:40 2017 (r314652) +++ head/libexec/talkd/Makefile Sat Mar 4 11:28:03 2017 (r314653) @@ -3,8 +3,8 @@ PROG= ntalkd SRCS= talkd.c announce.c process.c table.c print.c ttymsg.c -.PATH: ${.CURDIR}/../../usr.bin/wall +.PATH: ${SRCTOP}/usr.bin/wall MAN= talkd.8 -CFLAGS+=-I${.CURDIR}/../../usr.bin/wall +CFLAGS+=-I${SRCTOP}/usr.bin/wall .include Modified: head/libexec/tcpd/Makefile ============================================================================== --- head/libexec/tcpd/Makefile Sat Mar 4 11:26:40 2017 (r314652) +++ head/libexec/tcpd/Makefile Sat Mar 4 11:28:03 2017 (r314653) @@ -2,7 +2,7 @@ .include -.PATH: ${.CURDIR}/../../contrib/tcp_wrappers +.PATH: ${SRCTOP}/contrib/tcp_wrappers PROG= tcpd MAN= tcpd.8 Modified: head/libexec/telnetd/Makefile ============================================================================== --- head/libexec/telnetd/Makefile Sat Mar 4 11:26:40 2017 (r314652) +++ head/libexec/telnetd/Makefile Sat Mar 4 11:28:03 2017 (r314653) @@ -5,7 +5,7 @@ .include -TELNETDIR= ${.CURDIR}/../../contrib/telnet +TELNETDIR= ${SRCTOP}/contrib/telnet .PATH: ${TELNETDIR}/telnetd PROG= telnetd @@ -27,7 +27,7 @@ CFLAGS+= -DINET6 CFLAGS+= -I${TELNETDIR} CFLAGS+= -I${TELNETDIR}/telnet -LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a +LIBTELNET= ${OBJTOP}/lib/libtelnet/libtelnet.a LIBADD= telnet util ncursesw Modified: head/libexec/tftp-proxy/Makefile ============================================================================== --- head/libexec/tftp-proxy/Makefile Sat Mar 4 11:26:40 2017 (r314652) +++ head/libexec/tftp-proxy/Makefile Sat Mar 4 11:28:03 2017 (r314653) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/pf/tftp-proxy +.PATH: ${SRCTOP}/contrib/pf/tftp-proxy PROG= tftp-proxy SRCS= tftp-proxy.c filter.c Modified: head/libexec/ypxfr/Makefile ============================================================================== --- head/libexec/ypxfr/Makefile Sat Mar 4 11:26:40 2017 (r314652) +++ head/libexec/ypxfr/Makefile Sat Mar 4 11:28:03 2017 (r314653) @@ -7,7 +7,7 @@ SRCS= yp_dblookup.c yp_dbwrite.c yp_erro ${GENSRCS} GENSRCS=yp.h yp_clnt.c ypxfr_clnt.c -.PATH: ${.CURDIR}/../../usr.sbin/ypserv +.PATH: ${SRCTOP}/usr.sbin/ypserv MAN= ypxfr.8 @@ -20,7 +20,7 @@ LIBADD= rpcsvc CLEANFILES= ${GENSRCS} -RPCDIR= ${.CURDIR}/../../include/rpcsvc +RPCDIR= ${SRCTOP}/include/rpcsvc RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C ypxfr_clnt.c: ${RPCDIR}/yp.x From owner-svn-src-all@freebsd.org Sat Mar 4 11:30:08 2017 Return-Path: Delivered-To: svn-src-all@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 5726DCF9860; Sat, 4 Mar 2017 11:30:08 +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 083D31A21; Sat, 4 Mar 2017 11:30:07 +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 v24BU7Jl031001; Sat, 4 Mar 2017 11:30:07 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24BU4La030976; Sat, 4 Mar 2017 11:30:04 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703041130.v24BU4La030976@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 4 Mar 2017 11:30:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314654 - in head/cddl: lib/drti lib/libavl lib/libctf lib/libdtrace lib/libnvpair lib/libumem lib/libuutil lib/libzfs lib/libzfs_core lib/libzpool sbin/zfs sbin/zpool usr.bin/ctfconver... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 11:30:08 -0000 Author: ngie Date: Sat Mar 4 11:30:04 2017 New Revision: 314654 URL: https://svnweb.freebsd.org/changeset/base/314654 Log: cddl: normalize paths using SRCTOP-relative paths or :H when possible This simplifies make logic/output While here, remove bogus CFLAGS which look for headers in cddl/lib/libumem. There aren't any source files there (just Makefiles) MFC after: 1 month Sponsored by: Dell EMC Isilon Modified: head/cddl/lib/drti/Makefile head/cddl/lib/libavl/Makefile head/cddl/lib/libctf/Makefile head/cddl/lib/libdtrace/Makefile head/cddl/lib/libnvpair/Makefile head/cddl/lib/libumem/Makefile head/cddl/lib/libuutil/Makefile head/cddl/lib/libzfs/Makefile head/cddl/lib/libzfs_core/Makefile head/cddl/lib/libzpool/Makefile head/cddl/sbin/zfs/Makefile head/cddl/sbin/zpool/Makefile head/cddl/usr.bin/ctfconvert/Makefile head/cddl/usr.bin/ctfdump/Makefile head/cddl/usr.bin/ctfmerge/Makefile head/cddl/usr.bin/zinject/Makefile head/cddl/usr.bin/zlook/Makefile head/cddl/usr.bin/zstreamdump/Makefile head/cddl/usr.bin/ztest/Makefile head/cddl/usr.sbin/dtrace/Makefile head/cddl/usr.sbin/lockstat/Makefile head/cddl/usr.sbin/plockstat/Makefile head/cddl/usr.sbin/zdb/Makefile head/cddl/usr.sbin/zhack/Makefile Modified: head/cddl/lib/drti/Makefile ============================================================================== --- head/cddl/lib/drti/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/lib/drti/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common SRCS= drti.c FILES= ${SRCS:R:S/$/.o/g} @@ -12,8 +12,8 @@ CLEANFILES= ${FILES} # These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. .undef LIBRARIES_ONLY -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ + -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ Modified: head/cddl/lib/libavl/Makefile ============================================================================== --- head/cddl/lib/libavl/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/lib/libavl/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,11 +1,11 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/avl LIB= avl SRCS= avl.c WARNS?= 3 -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common .include Modified: head/cddl/lib/libctf/Makefile ============================================================================== --- head/cddl/lib/libctf/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/lib/libctf/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,8 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/common/ctf -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libctf/common -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/ctf +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/common/ctf +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/ctf LIB= ctf SRCS= ctf_create.c \ @@ -21,8 +21,8 @@ MAN= ctf.5 WARNS?= 2 CFLAGS+= -DCTF_OLD_VERSIONS -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ + -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/common/ctf \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ Modified: head/cddl/lib/libdtrace/Makefile ============================================================================== --- head/cddl/lib/libdtrace/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/lib/libdtrace/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libgen/common +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libgen/common LIB= dtrace SRCS= dt_aggregate.c \ @@ -64,9 +64,9 @@ FILESMODE= ${NOBINMODE} WARNS?= 1 CFLAGS+= -I${.OBJDIR} -I${.CURDIR} \ - -I${.CURDIR}/../../../sys/cddl/dev/dtrace/${MACHINE_ARCH} \ - -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ + -I${SRCTOP}/sys/cddl/dev/dtrace/${MACHINE_ARCH} \ + -I${SRCTOP}/sys/cddl/compat/opensolaris \ + -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ @@ -76,33 +76,33 @@ CFLAGS+= -I${.OBJDIR} -I${.CURDIR} \ .if ${MACHINE_CPUARCH} == "aarch64" CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/aarch64 -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/aarch64 -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/aarch64 +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/aarch64 +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/aarch64 .elif ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/dev/dtrace/x86 +CFLAGS+= -I${SRCTOP}/sys/cddl/dev/dtrace/x86 CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel -DDIS_MEM -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/i386 -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/${MACHINE_ARCH} -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/x86 +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/i386 +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/${MACHINE_ARCH} +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/x86 .elif ${MACHINE_CPUARCH} == "arm" CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/arm -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/arm -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/arm +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/arm +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/arm .elif ${MACHINE_CPUARCH} == "mips" CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/mips -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/mips -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/mips +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/mips +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/mips .elif ${MACHINE_CPUARCH} == "powerpc" CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/powerpc -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/powerpc -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/powerpc +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/powerpc +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/powerpc .elif ${MACHINE_CPUARCH} == "riscv" CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/riscv -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/riscv -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/riscv +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/riscv +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/riscv .elif ${MACHINE_CPUARCH} == "sparc64" CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/sparc +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/sparc .else # temporary hack CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel Modified: head/cddl/lib/libnvpair/Makefile ============================================================================== --- head/cddl/lib/libnvpair/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/lib/libnvpair/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/nvpair +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/nvpair LIB= nvpair @@ -13,18 +13,18 @@ SRCS= libnvpair.c \ opensolaris_nvpair_alloc_fixed.c WARNS?= 1 -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../../sys -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem # This library uses macros to define fprintf behavior for several object types # The compiler will see the non-string literal arguments to the fprintf calls and -# omit warnings for them. Quiesce these warnings in contrib code: +# omit warnings for them. Quiesce these warnings in contrib code: # # cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c:743:12: warning: format # string is not a string literal (potentially insecure) [-Wformat-security] Modified: head/cddl/lib/libumem/Makefile ============================================================================== --- head/cddl/lib/libumem/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/lib/libumem/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,10 +1,10 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem +.PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem LIB= umem SRCS= umem.c WARNS?= 3 -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem .include Modified: head/cddl/lib/libuutil/Makefile ============================================================================== --- head/cddl/lib/libuutil/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/lib/libuutil/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/avl LIB= uutil SRCS= avl.c \ @@ -17,10 +17,10 @@ SRCS= avl.c \ WARNS?= 1 CFLAGS+= -DNATIVE_BUILD -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head .include Modified: head/cddl/lib/libzfs/Makefile ============================================================================== --- head/cddl/lib/libzfs/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/lib/libzfs/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,9 +1,9 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/misc -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common +.PATH: ${SRCTOP}/cddl/compat/opensolaris/misc +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common LIB= zfs LIBADD= md pthread umem util uutil m avl bsdxml geom nvpair z zfs_core @@ -39,20 +39,19 @@ SRCS+= libzfs_changelist.c \ WARNS?= 0 CSTD= c99 CFLAGS+= -DZFS_NO_ACL -CFLAGS+= -I${.CURDIR}/../../../sbin/mount -CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common +CFLAGS+= -I${SRCTOP}/sbin/mount +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common .include Modified: head/cddl/lib/libzfs_core/Makefile ============================================================================== --- head/cddl/lib/libzfs_core/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/lib/libzfs_core/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,10 +1,10 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/misc -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common +.PATH: ${SRCTOP}/cddl/compat/opensolaris/misc +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common LIB= zfs_core LIBADD= nvpair @@ -18,20 +18,19 @@ SRCS+= libzfs_compat.c WARNS?= 0 CSTD= c99 CFLAGS+= -DZFS_NO_ACL -CFLAGS+= -I${.CURDIR}/../../../sbin/mount -CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${SRCTOP}/sbin/mount +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common .include Modified: head/cddl/lib/libzpool/Makefile ============================================================================== --- head/cddl/lib/libzpool/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/lib/libzpool/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,28 +1,28 @@ # $FreeBSD$ -.include "${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/Makefile.files" +.include "${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/Makefile.files" # ZFS_COMMON_SRCS -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs # ZFS_SHARED_SRCS -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs # KERNEL_SRCS -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common # LIST_SRCS -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/os +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/os # ATOMIC_SRCS -.if exists(${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S) -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} +.if exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S) +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} ATOMIC_SRCS= opensolaris_atomic.S .if ${MACHINE_ARCH} != "sparc64" ACFLAGS+= -Wa,--noexecstack .endif .else -.PATH: ${.CURDIR}/../../../sys/cddl/compat/opensolaris/kern +.PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern ATOMIC_SRCS= opensolaris_atomic.c .endif # UNICODE_SRCS -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/unicode +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/unicode LIB= zpool @@ -37,24 +37,23 @@ SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_S ${UNICODE_SRCS} WARNS?= 0 -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head -CFLAGS+= -I${.CURDIR}/../../lib/libumem -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair # XXX: pthread doesn't have mutex_owned() equivalent, so we need to look # into libthr private structures. That's sooo evil, but it's only for # ZFS debugging tools needs. CFLAGS+= -DWANTS_MUTEX_OWNED -CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread -CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys -CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include +CFLAGS+= -I${SRCTOP}/lib/libpthread/thread +CFLAGS+= -I${SRCTOP}/lib/libpthread/sys +CFLAGS+= -I${SRCTOP}/lib/libthr/arch/${MACHINE_CPUARCH}/include LIBADD= md pthread z nvpair avl umem Modified: head/cddl/sbin/zfs/Makefile ============================================================================== --- head/cddl/sbin/zfs/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/sbin/zfs/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,26 +1,26 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zfs +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zfs PROG= zfs MAN= zfs.8 SRCS= zfs_main.c zfs_iter.c WARNS?= 0 -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libumem/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs LIBADD= jail nvpair uutil zfs_core zfs Modified: head/cddl/sbin/zpool/Makefile ============================================================================== --- head/cddl/sbin/zpool/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/sbin/zpool/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,8 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zpool -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zpool +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/stat/common +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs PROG= zpool MAN= zpool.8 zpool-features.7 @@ -10,22 +10,22 @@ SRCS= zpool_main.c zpool_vdev.c zpool_it SRCS+= timestamp.c WARNS?= 0 -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libumem/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/cmd/stat/common LIBADD= geom nvpair uutil zfs Modified: head/cddl/usr.bin/ctfconvert/Makefile ============================================================================== --- head/cddl/usr.bin/ctfconvert/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/usr.bin/ctfconvert/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt PROG= ctfconvert SRCS= alist.c \ @@ -25,8 +25,8 @@ SRCS= alist.c \ traverse.c \ util.c -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ + -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_SYS_DISTDIR} \ -I${OPENSOLARIS_USR_DISTDIR}/head \ Modified: head/cddl/usr.bin/ctfdump/Makefile ============================================================================== --- head/cddl/usr.bin/ctfdump/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/usr.bin/ctfdump/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/dump +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/dump PROG= ctfdump SRCS= dump.c \ @@ -12,8 +12,8 @@ CFLAGS+= -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_SYS_DISTDIR} \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/cmd/mdb/tools/common \ - -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ + -I${SRCTOP}/sys/cddl/compat/opensolaris \ + -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common Modified: head/cddl/usr.bin/ctfmerge/Makefile ============================================================================== --- head/cddl/usr.bin/ctfmerge/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/usr.bin/ctfmerge/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt PROG= ctfmerge SRCS= alist.c \ @@ -24,8 +24,8 @@ SRCS= alist.c \ WARNS?= 1 -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ + -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_SYS_DISTDIR} \ -I${OPENSOLARIS_USR_DISTDIR}/head \ Modified: head/cddl/usr.bin/zinject/Makefile ============================================================================== --- head/cddl/usr.bin/zinject/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/usr.bin/zinject/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,25 +1,24 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zinject +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zinject PROG= zinject SRCS= zinject.c translate.c MAN= WARNS?= 0 -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzfs/common -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzfs_core/common -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs/ -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head -CFLAGS+= -I${.CURDIR}/../../lib/libumem +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs/ +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head LIBADD= geom m nvpair umem uutil zfs_core zfs zpool Modified: head/cddl/usr.bin/zlook/Makefile ============================================================================== --- head/cddl/usr.bin/zlook/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/usr.bin/zlook/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,25 +1,12 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zlook +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zlook PROG= zlook MAN= WARNS?= 0 -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris -#CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include -#CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem -#CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzfs/common -#CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common -#CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair -#CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -#CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common -#CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head -#CFLAGS+= -I${.CURDIR}/../../lib/libumem -# -#DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ -# ${LIBZFS} ${LIBZPOOL} -#LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common .include Modified: head/cddl/usr.bin/zstreamdump/Makefile ============================================================================== --- head/cddl/usr.bin/zstreamdump/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/usr.bin/zstreamdump/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,22 +1,21 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/zstreamdump +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zstreamdump PROG= zstreamdump MAN= zstreamdump.1 WARNS?= 0 -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head -CFLAGS+= -I${.CURDIR}/../../lib/libumem +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head LIBADD= m nvpair umem zpool pthread z avl Modified: head/cddl/usr.bin/ztest/Makefile ============================================================================== --- head/cddl/usr.bin/ztest/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/usr.bin/ztest/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,22 +1,21 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/ztest +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/ztest PROG= ztest MAN= WARNS?= 0 -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head -CFLAGS+= -I${.CURDIR}/../../lib/libumem +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head LIBADD= geom m nvpair umem zpool pthread avl zfs_core zfs uutil Modified: head/cddl/usr.sbin/dtrace/Makefile ============================================================================== --- head/cddl/usr.sbin/dtrace/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/usr.sbin/dtrace/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -2,7 +2,7 @@ .include -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/dtrace +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/dtrace PROG= dtrace SRCS= dtrace.c @@ -10,8 +10,8 @@ BINDIR?= /usr/sbin WARNS?= 1 -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ + -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \ Modified: head/cddl/usr.sbin/lockstat/Makefile ============================================================================== --- head/cddl/usr.sbin/lockstat/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/usr.sbin/lockstat/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/lockstat +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/lockstat PROG= lockstat SRCS= lockstat.c sym.c @@ -8,14 +8,14 @@ BINDIR?= /usr/sbin WARNS?= 1 -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ + -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ -I${OPENSOLARIS_SYS_DISTDIR}/compat \ - -I${.CURDIR}/../../../sys + -I${SRCTOP}/sys CFLAGS+= -DNEED_ERRLOC -g Modified: head/cddl/usr.sbin/plockstat/Makefile ============================================================================== --- head/cddl/usr.sbin/plockstat/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/usr.sbin/plockstat/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,22 +1,22 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/plockstat +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/plockstat PROG= plockstat -SRCS= plockstat.c +SRCS= plockstat.c BINDIR?= /usr/sbin WARNS?= 1 -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ + -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ -I${OPENSOLARIS_SYS_DISTDIR}/compat \ - -I${.CURDIR}/../../../cddl/lib/libdtrace \ - -I${.CURDIR}/../../../sys + -I${SRCTOP}/cddl/lib/libdtrace \ + -I${SRCTOP}/sys LIBADD= dtrace proc Modified: head/cddl/usr.sbin/zdb/Makefile ============================================================================== --- head/cddl/usr.sbin/zdb/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/usr.sbin/zdb/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zdb +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zdb PROG= zdb MAN= zdb.8 @@ -9,20 +9,19 @@ SRCS= zdb.c zdb_il.c WARNS?= 0 CSTD= c99 -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head -CFLAGS+= -I${.CURDIR}/../../lib/libumem +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head LIBADD= nvpair umem uutil zfs zpool Modified: head/cddl/usr.sbin/zhack/Makefile ============================================================================== --- head/cddl/usr.sbin/zhack/Makefile Sat Mar 4 11:28:03 2017 (r314653) +++ head/cddl/usr.sbin/zhack/Makefile Sat Mar 4 11:30:04 2017 (r314654) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zhack +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zhack PROG= zhack MAN= @@ -8,20 +8,19 @@ MAN= WARNS?= 0 CSTD= c99 -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head -CFLAGS+= -I${.CURDIR}/../../lib/libumem +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head LIBADD= nvpair zfs zpool From owner-svn-src-all@freebsd.org Sat Mar 4 11:31:10 2017 Return-Path: Delivered-To: svn-src-all@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 90F7ECF98D4; Sat, 4 Mar 2017 11:31:10 +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 481221C2D; Sat, 4 Mar 2017 11:31:10 +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 v24BV9D7031750; Sat, 4 Mar 2017 11:31:09 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24BV8Hd031744; Sat, 4 Mar 2017 11:31:08 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703041131.v24BV8Hd031744@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 4 Mar 2017 11:31:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314655 - in head/bin: csh df freebsd-version rmail sh X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 11:31:10 -0000 Author: ngie Date: Sat Mar 4 11:31:08 2017 New Revision: 314655 URL: https://svnweb.freebsd.org/changeset/base/314655 Log: bin: normalize paths using SRCTOP-relative paths or :H when possible This simplifies make logic/output MFC after: 1 month Sponsored by: Dell EMC Isilon Modified: head/bin/csh/Makefile head/bin/df/Makefile head/bin/freebsd-version/Makefile head/bin/rmail/Makefile head/bin/sh/Makefile Modified: head/bin/csh/Makefile ============================================================================== --- head/bin/csh/Makefile Sat Mar 4 11:30:04 2017 (r314654) +++ head/bin/csh/Makefile Sat Mar 4 11:31:08 2017 (r314655) @@ -9,7 +9,7 @@ .include PACKAGE=runtime -TCSHDIR= ${.CURDIR}/../../contrib/tcsh +TCSHDIR= ${SRCTOP}/contrib/tcsh .PATH: ${TCSHDIR} PROG= csh Modified: head/bin/df/Makefile ============================================================================== --- head/bin/df/Makefile Sat Mar 4 11:30:04 2017 (r314654) +++ head/bin/df/Makefile Sat Mar 4 11:31:08 2017 (r314655) @@ -2,7 +2,7 @@ # $FreeBSD$ PACKAGE=runtime -MOUNT= ${.CURDIR}/../../sbin/mount +MOUNT= ${SRCTOP}/sbin/mount .PATH: ${MOUNT} PROG= df Modified: head/bin/freebsd-version/Makefile ============================================================================== --- head/bin/freebsd-version/Makefile Sat Mar 4 11:30:04 2017 (r314654) +++ head/bin/freebsd-version/Makefile Sat Mar 4 11:31:08 2017 (r314655) @@ -4,7 +4,7 @@ PACKAGE=runtime SCRIPTS = freebsd-version MAN = freebsd-version.1 CLEANFILES = freebsd-version freebsd-version.sh -NEWVERS = ${.CURDIR}/../../sys/conf/newvers.sh +NEWVERS = ${SRCTOP}/sys/conf/newvers.sh freebsd-version.sh: ${.CURDIR}/freebsd-version.sh.in ${NEWVERS} eval $$(egrep '^(TYPE|REVISION|BRANCH)=' ${NEWVERS}) ; \ Modified: head/bin/rmail/Makefile ============================================================================== --- head/bin/rmail/Makefile Sat Mar 4 11:30:04 2017 (r314654) +++ head/bin/rmail/Makefile Sat Mar 4 11:31:08 2017 (r314655) @@ -2,7 +2,7 @@ # $FreeBSD$ PACKAGE=sendmail -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/rmail # Not much point this being static. It calls a shared sendmail... Modified: head/bin/sh/Makefile ============================================================================== --- head/bin/sh/Makefile Sat Mar 4 11:30:04 2017 (r314654) +++ head/bin/sh/Makefile Sat Mar 4 11:31:08 2017 (r314655) @@ -28,9 +28,9 @@ WARNS?= 2 WFORMAT=0 .PATH: ${.CURDIR}/bltin \ - ${.CURDIR}/../kill \ - ${.CURDIR}/../test \ - ${.CURDIR}/../../usr.bin/printf + ${.CURDIR:H}/kill \ + ${.CURDIR:H}/test \ + ${SRCTOP}/usr.bin/printf CLEANFILES+= mknodes mknodes.o \ mksyntax mksyntax.o From owner-svn-src-all@freebsd.org Sat Mar 4 11:33:09 2017 Return-Path: Delivered-To: svn-src-all@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 0E373CF9BCF; Sat, 4 Mar 2017 11:33:09 +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 9FDE41048; Sat, 4 Mar 2017 11:33:08 +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 v24BX7Pb034866; Sat, 4 Mar 2017 11:33:07 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24BX1KA034805; Sat, 4 Mar 2017 11:33:01 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703041133.v24BX1KA034805@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 4 Mar 2017 11:33:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314656 - in head/sbin: atm/atmconfig bsdlabel decryptcore dhclient/tests etherswitchcfg fdisk ffsinfo fsck_ffs fsck_msdosfs fsdb gbde geom/class geom/class/cache geom/class/concat geom... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 11:33:09 -0000 Author: ngie Date: Sat Mar 4 11:33:01 2017 New Revision: 314656 URL: https://svnweb.freebsd.org/changeset/base/314656 Log: sbin: normalize paths using SRCTOP-relative paths or :H when possible This simplifies make logic/output MFC after: 1 month Sponsored by: Dell EMC Isilon Modified: head/sbin/atm/atmconfig/Makefile head/sbin/bsdlabel/Makefile head/sbin/decryptcore/Makefile head/sbin/dhclient/tests/Makefile head/sbin/etherswitchcfg/Makefile head/sbin/fdisk/Makefile head/sbin/ffsinfo/Makefile head/sbin/fsck_ffs/Makefile head/sbin/fsck_msdosfs/Makefile head/sbin/fsdb/Makefile head/sbin/gbde/Makefile head/sbin/geom/class/Makefile.inc head/sbin/geom/class/cache/Makefile head/sbin/geom/class/concat/Makefile head/sbin/geom/class/eli/Makefile head/sbin/geom/class/journal/Makefile head/sbin/geom/class/label/Makefile head/sbin/geom/class/mirror/Makefile head/sbin/geom/class/mountver/Makefile head/sbin/geom/class/multipath/Makefile head/sbin/geom/class/nop/Makefile head/sbin/geom/class/part/Makefile head/sbin/geom/class/raid/Makefile head/sbin/geom/class/raid3/Makefile head/sbin/geom/class/sched/Makefile head/sbin/geom/class/shsec/Makefile head/sbin/geom/class/stripe/Makefile head/sbin/geom/class/virstor/Makefile head/sbin/geom/core/Makefile head/sbin/ggate/ggatec/Makefile head/sbin/ggate/ggated/Makefile head/sbin/ggate/ggatel/Makefile head/sbin/growfs/Makefile head/sbin/gvinum/Makefile head/sbin/hastctl/Makefile head/sbin/init/Makefile head/sbin/ipf/Makefile.inc head/sbin/ipf/ipf/Makefile head/sbin/ipf/ipftest/Makefile head/sbin/ipf/ipresend/Makefile head/sbin/iscontrol/Makefile head/sbin/ldconfig/Makefile head/sbin/mksnap_ffs/Makefile head/sbin/mount_cd9660/Makefile head/sbin/mount_fusefs/Makefile head/sbin/mount_msdosfs/Makefile head/sbin/mount_nfs/Makefile head/sbin/mount_nullfs/Makefile head/sbin/mount_udf/Makefile head/sbin/mount_unionfs/Makefile head/sbin/newfs/Makefile head/sbin/nvmecontrol/Makefile head/sbin/pfctl/Makefile head/sbin/pflogd/Makefile head/sbin/quotacheck/Makefile head/sbin/resolvconf/Makefile head/sbin/restore/Makefile head/sbin/rtsol/Makefile head/sbin/setkey/Makefile head/sbin/sunlabel/Makefile head/sbin/umount/Makefile Modified: head/sbin/atm/atmconfig/Makefile ============================================================================== --- head/sbin/atm/atmconfig/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/atm/atmconfig/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -34,8 +34,8 @@ WARNS?= 3 FILES= atmconfig.help atmconfig_device.help FILESDIR= ${SHAREDIR}/doc/atm -SNMP_ATM_DEF= ${.CURDIR}/../../../contrib/ngatm/snmp_atm/atm_tree.def \ - ${.CURDIR}/../../../usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def +SNMP_ATM_DEF= ${SRCTOP}/contrib/ngatm/snmp_atm/atm_tree.def \ + ${SRCTOP}/usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def oid.h: atm_oid.list ${SNMP_ATM_DEF} cat ${SNMP_ATM_DEF} | gensnmptree -e `tail -n +2 ${.CURDIR}/atm_oid.list` \ Modified: head/sbin/bsdlabel/Makefile ============================================================================== --- head/sbin/bsdlabel/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/bsdlabel/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,7 +1,7 @@ # @(#)Makefile 8.2 (Berkeley) 3/17/94 # $FreeBSD$ -.PATH: ${.CURDIR}/../../sys/geom +.PATH: ${SRCTOP}/sys/geom PACKAGE=runtime PROG= bsdlabel Modified: head/sbin/decryptcore/Makefile ============================================================================== --- head/sbin/decryptcore/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/decryptcore/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -6,7 +6,7 @@ LIBADD= crypto pjdlog MAN= decryptcore.8 -CFLAGS+=-I${.CURDIR}/../../lib/libpjdlog +CFLAGS+=-I${SRCTOP}/lib/libpjdlog WARNS?= 6 Modified: head/sbin/dhclient/tests/Makefile ============================================================================== --- head/sbin/dhclient/tests/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/dhclient/tests/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -5,7 +5,7 @@ PLAIN_TESTS_C= option-domain-search_test SRCS.option-domain-search_test= alloc.c convert.c hash.c options.c \ tables.c fake.c option-domain-search.c -CFLAGS.option-domain-search_test+= -I${.CURDIR}/.. +CFLAGS.option-domain-search_test+= -I${.CURDIR:H} LIBADD.option-domain-search_test= util WARNS?= 2 Modified: head/sbin/etherswitchcfg/Makefile ============================================================================== --- head/sbin/etherswitchcfg/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/etherswitchcfg/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -5,6 +5,6 @@ PACKAGE=runtime PROG= etherswitchcfg MAN= etherswitchcfg.8 SRCS= etherswitchcfg.c ifmedia.c -CFLAGS+= -I${.CURDIR}/../../sys +CFLAGS+= -I${SRCTOP}/sys .include Modified: head/sbin/fdisk/Makefile ============================================================================== --- head/sbin/fdisk/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/fdisk/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -6,7 +6,7 @@ SRCS= fdisk.c geom_mbr_enc.c WARNS?= 4 MAN= fdisk.8 -.PATH: ${.CURDIR}/../../sys/geom +.PATH: ${SRCTOP}/sys/geom LIBADD= geom Modified: head/sbin/ffsinfo/Makefile ============================================================================== --- head/sbin/ffsinfo/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/ffsinfo/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -4,7 +4,7 @@ # $FreeBSD$ # -GROWFS= ${.CURDIR}/../growfs +GROWFS= ${.CURDIR:H}/growfs .PATH: ${GROWFS} PACKAGE=runtime Modified: head/sbin/fsck_ffs/Makefile ============================================================================== --- head/sbin/fsck_ffs/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/fsck_ffs/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -12,8 +12,8 @@ SRCS= dir.c ea.c fsutil.c inode.c main.c globs.c LIBADD= ufs WARNS?= 2 -CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../mount +CFLAGS+= -I${.CURDIR} -I${.CURDIR:H}/mount -.PATH: ${.CURDIR}/../../sys/ufs/ffs ${.CURDIR}/../mount +.PATH: ${SRCTOP}/sys/ufs/ffs ${.CURDIR:H}/mount .include Modified: head/sbin/fsck_msdosfs/Makefile ============================================================================== --- head/sbin/fsck_msdosfs/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/fsck_msdosfs/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,7 +1,7 @@ # $NetBSD: Makefile,v 1.6 1997/05/08 21:11:11 gwr Exp $ # $FreeBSD$ -FSCK= ${.CURDIR}/../fsck +FSCK= ${.CURDIR:H}/fsck .PATH: ${FSCK} PACKAGE=runtime Modified: head/sbin/fsdb/Makefile ============================================================================== --- head/sbin/fsdb/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/fsdb/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -8,9 +8,9 @@ MAN= fsdb.8 SRCS= fsdb.c fsdbutil.c \ dir.c ea.c fsutil.c inode.c pass1.c pass1b.c pass2.c pass3.c pass4.c \ pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c globs.c -CFLAGS+= -I${.CURDIR}/../fsck_ffs +CFLAGS+= -I${.CURDIR:H}/fsck_ffs WARNS?= 2 LIBADD= edit -.PATH: ${.CURDIR}/../fsck_ffs ${.CURDIR}/../../sys/ufs/ffs +.PATH: ${.CURDIR:H}/fsck_ffs ${SRCTOP}/sys/ufs/ffs .include Modified: head/sbin/gbde/Makefile ============================================================================== --- head/sbin/gbde/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/gbde/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -13,10 +13,10 @@ SRCS+= g_bde_lock.c NO_WCAST_ALIGN= NO_WMISSING_VARIABLE_DECLARATIONS= -CFLAGS+= -I${.CURDIR}/../../sys -.PATH: ${.CURDIR}/../../sys/geom/bde \ - ${.CURDIR}/../../sys/crypto/rijndael \ - ${.CURDIR}/../../sys/crypto/sha2 +CFLAGS+= -I${SRCTOP}/sys +.PATH: ${SRCTOP}/sys/geom/bde \ + ${SRCTOP}/sys/crypto/rijndael \ + ${SRCTOP}/sys/crypto/sha2 CLEANFILES+= template.c Modified: head/sbin/geom/class/Makefile.inc ============================================================================== --- head/sbin/geom/class/Makefile.inc Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/geom/class/Makefile.inc Sat Mar 4 11:33:01 2017 (r314656) @@ -8,6 +8,6 @@ SRCS+= geom_${GEOM_CLASS}.c subr.c NO_WMISSING_VARIABLE_DECLARATIONS= -CFLAGS+= -I${.CURDIR}/../.. +CFLAGS+= -I${.CURDIR:H:H} .include "../Makefile.inc" Modified: head/sbin/geom/class/cache/Makefile ============================================================================== --- head/sbin/geom/class/cache/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/geom/class/cache/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= cache Modified: head/sbin/geom/class/concat/Makefile ============================================================================== --- head/sbin/geom/class/concat/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/geom/class/concat/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= concat Modified: head/sbin/geom/class/eli/Makefile ============================================================================== --- head/sbin/geom/class/eli/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/geom/class/eli/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/eli ${.CURDIR}/../../../../sys/crypto/sha2 +.PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/eli ${SRCTOP}/sys/crypto/sha2 GEOM_CLASS= eli SRCS= g_eli_crypto.c @@ -15,6 +15,6 @@ LIBADD= md crypto WARNS?= 3 -CFLAGS+=-I${.CURDIR}/../../../../sys +CFLAGS+=-I${SRCTOP}/sys .include Modified: head/sbin/geom/class/journal/Makefile ============================================================================== --- head/sbin/geom/class/journal/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/geom/class/journal/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,13 +1,13 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= journal SRCS+= geom_journal_ufs.c LIBADD= ufs md -CFLAGS+=-I${.CURDIR}/../../../../sys +CFLAGS+=-I${SRCTOP}/sys .include Modified: head/sbin/geom/class/label/Makefile ============================================================================== --- head/sbin/geom/class/label/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/geom/class/label/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= label Modified: head/sbin/geom/class/mirror/Makefile ============================================================================== --- head/sbin/geom/class/mirror/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/geom/class/mirror/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= mirror Modified: head/sbin/geom/class/mountver/Makefile ============================================================================== --- head/sbin/geom/class/mountver/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/geom/class/mountver/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= mountver Modified: head/sbin/geom/class/multipath/Makefile ============================================================================== --- head/sbin/geom/class/multipath/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/geom/class/multipath/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,10 +1,10 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= multipath -CFLAGS+= -I${.CURDIR}/../../../../sys +CFLAGS+= -I${SRCTOP}/sys .include Modified: head/sbin/geom/class/nop/Makefile ============================================================================== --- head/sbin/geom/class/nop/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/geom/class/nop/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= nop Modified: head/sbin/geom/class/part/Makefile ============================================================================== --- head/sbin/geom/class/part/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/geom/class/part/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= part Modified: head/sbin/geom/class/raid/Makefile ============================================================================== --- head/sbin/geom/class/raid/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/geom/class/raid/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= raid Modified: head/sbin/geom/class/raid3/Makefile ============================================================================== --- head/sbin/geom/class/raid3/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/geom/class/raid3/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= raid3 Modified: head/sbin/geom/class/sched/Makefile ============================================================================== --- head/sbin/geom/class/sched/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/geom/class/sched/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -2,7 +2,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= sched Modified: head/sbin/geom/class/shsec/Makefile ============================================================================== --- head/sbin/geom/class/shsec/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/geom/class/shsec/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= shsec Modified: head/sbin/geom/class/stripe/Makefile ============================================================================== --- head/sbin/geom/class/stripe/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/geom/class/stripe/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= stripe Modified: head/sbin/geom/class/virstor/Makefile ============================================================================== --- head/sbin/geom/class/virstor/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/geom/class/virstor/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/virstor +.PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/virstor GEOM_CLASS= virstor Modified: head/sbin/geom/core/Makefile ============================================================================== --- head/sbin/geom/core/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/geom/core/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../misc +.PATH: ${.CURDIR:H}/misc PACKAGE=runtime PROG= geom @@ -10,7 +10,7 @@ SRCS= geom.c subr.c NO_SHARED=NO CFLAGS+= -DGEOM_CLASS_DIR=\"${GEOM_CLASS_DIR}\" -CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/.. +CFLAGS+= -I${SRCTOP}/sys -I${.CURDIR} -I${.CURDIR:H} LIBADD= geom util Modified: head/sbin/ggate/ggatec/Makefile ============================================================================== --- head/sbin/ggate/ggatec/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/ggate/ggatec/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../shared +.PATH: ${.CURDIR:H}/shared PROG= ggatec MAN= ggatec.8 @@ -8,7 +8,7 @@ SRCS= ggatec.c ggate.c CFLAGS+= -DMAX_SEND_SIZE=32768 CFLAGS+= -DLIBGEOM -CFLAGS+= -I${.CURDIR}/../shared +CFLAGS+= -I${.CURDIR:H}/shared LIBADD= geom util pthread Modified: head/sbin/ggate/ggated/Makefile ============================================================================== --- head/sbin/ggate/ggated/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/ggate/ggated/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../shared +.PATH: ${.CURDIR:H}/shared PROG= ggated MAN= ggated.8 @@ -8,6 +8,6 @@ SRCS= ggated.c ggate.c LIBADD= pthread util -CFLAGS+= -I${.CURDIR}/../shared +CFLAGS+= -I${.CURDIR:H}/shared .include Modified: head/sbin/ggate/ggatel/Makefile ============================================================================== --- head/sbin/ggate/ggatel/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/ggate/ggatel/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,13 +1,13 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../shared +.PATH: ${.CURDIR:H}/shared PROG= ggatel MAN= ggatel.8 SRCS= ggatel.c ggate.c CFLAGS+= -DLIBGEOM -CFLAGS+= -I${.CURDIR}/../shared +CFLAGS+= -I${.CURDIR:H}/shared LIBADD= geom util Modified: head/sbin/growfs/Makefile ============================================================================== --- head/sbin/growfs/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/growfs/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -6,19 +6,19 @@ .include -.PATH: ${.CURDIR}/../mount +.PATH: ${.CURDIR:H}/mount PACKAGE=runtime PROG= growfs SRCS= growfs.c getmntopts.c MAN= growfs.8 -CFLAGS+=-I${.CURDIR}/../mount +CFLAGS+=-I${.CURDIR:H}/mount .if defined(GFSDBG) SRCS+= debug.c CFLAGS+= -DFS_DEBUG NO_WCAST_ALIGN= yes -.endif +.endif LIBADD= util Modified: head/sbin/gvinum/Makefile ============================================================================== --- head/sbin/gvinum/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/gvinum/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -6,10 +6,10 @@ SRCS= gvinum.c gvinum.h geom_vinum_share MAN= gvinum.8 WARNS?= 2 -CFLAGS+= -I${.CURDIR}/../../sys -I${DESTDIR}/${INCLUDEDIR}/edit +CFLAGS+= -I${SRCTOP}/sys -I${DESTDIR}/${INCLUDEDIR}/edit LIBADD= edit geom -.PATH: ${.CURDIR}/../../sys/geom/vinum +.PATH: ${SRCTOP}/sys/geom/vinum .include Modified: head/sbin/hastctl/Makefile ============================================================================== --- head/sbin/hastctl/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/hastctl/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -3,7 +3,7 @@ .include PACKAGE=hast -.PATH: ${.CURDIR}/../hastd +.PATH: ${.CURDIR:H}/hastd PROG= hastctl SRCS= activemap.c @@ -23,7 +23,7 @@ MAN= hastctl.8 NO_WFORMAT= NO_WCAST_ALIGN= NO_WMISSING_VARIABLE_DECLARATIONS= -CFLAGS+=-I${.CURDIR}/../hastd +CFLAGS+=-I${.CURDIR:H}/hastd CFLAGS+=-DHAVE_CAPSICUM CFLAGS+=-DINET .if ${MK_INET6_SUPPORT} != "no" Modified: head/sbin/init/Makefile ============================================================================== --- head/sbin/init/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/init/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -11,7 +11,7 @@ CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CA LIBADD= util crypt # Needed for getmntopts.c -MOUNT= ${.CURDIR}/../../sbin/mount +MOUNT= ${SRCTOP}/sbin/mount CFLAGS+=-I${MOUNT} .PATH: ${MOUNT} Modified: head/sbin/ipf/Makefile.inc ============================================================================== --- head/sbin/ipf/Makefile.inc Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/ipf/Makefile.inc Sat Mar 4 11:33:01 2017 (r314656) @@ -6,10 +6,10 @@ WARNS?= 2 NO_WFORMAT= NO_WARRAY_BOUNDS= -CFLAGS+= -I${.CURDIR}/../../../contrib/ipfilter -CFLAGS+= -I${.CURDIR}/../../../contrib/ipfilter/tools -CFLAGS+= -I${.CURDIR}/../../../sys -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/ipfilter +CFLAGS+= -I${SRCTOP}/contrib/ipfilter +CFLAGS+= -I${SRCTOP}/contrib/ipfilter/tools +CFLAGS+= -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/sys/contrib/ipfilter CFLAGS+= -DSTATETOP -D__UIO_EXPOSE .if ${MK_INET6_SUPPORT} != "no" @@ -24,9 +24,9 @@ LIBADD+= ipf CLEANFILES+= y.tab.c y.tab.h -.PATH: ${.CURDIR}/../../../contrib/ipfilter \ - ${.CURDIR}/../../../contrib/ipfilter/lib \ - ${.CURDIR}/../../../contrib/ipfilter/tools \ - ${.CURDIR}/../../../contrib/ipfilter/man +.PATH: ${SRCTOP}/contrib/ipfilter \ + ${SRCTOP}/contrib/ipfilter/lib \ + ${SRCTOP}/contrib/ipfilter/tools \ + ${SRCTOP}/contrib/ipfilter/man .include "../Makefile.inc" Modified: head/sbin/ipf/ipf/Makefile ============================================================================== --- head/sbin/ipf/ipf/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/ipf/ipf/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -31,7 +31,7 @@ ipf_l.h: lexer.h ${.ALLSRC} > ${.TARGET} .if defined(RESCUE) -LIBIPF_SRCS!= cd ${.CURDIR}/../libipf && ${MAKE} -V SRCS +LIBIPF_SRCS!= cd ${.CURDIR:H}/libipf && ${MAKE} -V SRCS SRCS+= ${LIBIPF_SRCS} .else LIBADD+= pcap Modified: head/sbin/ipf/ipftest/Makefile ============================================================================== --- head/sbin/ipf/ipftest/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/ipf/ipftest/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -20,11 +20,11 @@ CFLAGS+= -DIPFILTER_LOG -DIPFILTER_COMPI # XXX CFLAGS+= -DIPFILTER_SCAN -.PATH: ${.CURDIR}/../../../sys/contrib/ipfilter/netinet +.PATH: ${SRCTOP}/sys/contrib/ipfilter/netinet GENHDRS= ipnat_l.h ipnat_y.h ippool_l.h ippool_y.h ipf_l.h ipf_y.h -CLEANFILES+= ${GENHDRS} +CLEANFILES+= ${GENHDRS} CLEANFILES+= ipf_y.c ipf_l.c CLEANFILES+= ipf.tab.c ipf.tab.h CLEANFILES+= ipnat_y.c ipnat_l.c Modified: head/sbin/ipf/ipresend/Makefile ============================================================================== --- head/sbin/ipf/ipresend/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/ipf/ipresend/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -5,6 +5,6 @@ PROG= ipresend SRCS= ipresend.c ip.c resend.c sbpf.c sock.c 44arp.c MAN= ipresend.1 -.PATH: ${.CURDIR}/../../../contrib/ipfilter/ipsend +.PATH: ${SRCTOP}/contrib/ipfilter/ipsend .include Modified: head/sbin/iscontrol/Makefile ============================================================================== --- head/sbin/iscontrol/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/iscontrol/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -4,7 +4,7 @@ PACKAGE=iscsi_legacy SRCS= iscontrol.c pdu.c fsm.c config.c login.c auth_subr.c misc.c PROG= iscontrol LIBADD= cam md -S= ${.CURDIR}/../../sys +S= ${SRCTOP}/sys WARNS?= 3 CFLAGS+= -I$S Modified: head/sbin/ldconfig/Makefile ============================================================================== --- head/sbin/ldconfig/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/ldconfig/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -3,7 +3,7 @@ PACKAGE=runtime PROG= ldconfig SRCS= elfhints.c ldconfig.c shlib.c support.c -LDDIR?= ${.CURDIR}/../../libexec/rtld-aout +LDDIR?= ${SRCTOP}/libexec/rtld-aout CFLAGS+=-I${LDDIR} -DFREEBSD_AOUT MAN= ldconfig.8 Modified: head/sbin/mksnap_ffs/Makefile ============================================================================== --- head/sbin/mksnap_ffs/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/mksnap_ffs/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../mount +.PATH: ${.CURDIR:H}/mount PACKAGE=runtime PROG= mksnap_ffs @@ -8,7 +8,7 @@ SRCS= mksnap_ffs.c getmntopts.c MAN= mksnap_ffs.8 WARNS?= 2 -CFLAGS+=-I${.CURDIR}/../mount +CFLAGS+=-I${.CURDIR:H}/mount .if defined(NOSUID) BINMODE=554 Modified: head/sbin/mount_cd9660/Makefile ============================================================================== --- head/sbin/mount_cd9660/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/mount_cd9660/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -7,7 +7,7 @@ SRCS= mount_cd9660.c getmntopts.c MAN= mount_cd9660.8 LIBADD= kiconv -MOUNT= ${.CURDIR}/../mount +MOUNT= ${.CURDIR:H}/mount CFLAGS+= -I${MOUNT} # Needs to be dynamically linked for optional dlopen() access to Modified: head/sbin/mount_fusefs/Makefile ============================================================================== --- head/sbin/mount_fusefs/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/mount_fusefs/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -25,7 +25,7 @@ PROG= mount_fusefs SRCS= mount_fusefs.c getmntopts.c MAN8= mount_fusefs.8 -MOUNT= ${.CURDIR}/../mount +MOUNT= ${.CURDIR:H}/mount CFLAGS+= -I${MOUNT} .PATH: ${MOUNT} Modified: head/sbin/mount_msdosfs/Makefile ============================================================================== --- head/sbin/mount_msdosfs/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/mount_msdosfs/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -8,7 +8,7 @@ SRCS= mount_msdosfs.c getmntopts.c MAN= mount_msdosfs.8 LIBADD= kiconv -MOUNT= ${.CURDIR}/../mount +MOUNT= ${.CURDIR:H}/mount CFLAGS+= -I${MOUNT} # Needs to be dynamically linked for optional dlopen() access to Modified: head/sbin/mount_nfs/Makefile ============================================================================== --- head/sbin/mount_nfs/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/mount_nfs/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -7,8 +7,8 @@ PROG= mount_nfs SRCS= mount_nfs.c getmntopts.c mounttab.c MAN= mount_nfs.8 -MOUNT= ${.CURDIR}/../mount -UMNTALL= ${.CURDIR}/../../usr.sbin/rpc.umntall +MOUNT= ${.CURDIR:H}/mount +UMNTALL= ${SRCTOP}/usr.sbin/rpc.umntall CFLAGS+= -DNFS -I${MOUNT} -I${UMNTALL} .PATH: ${MOUNT} ${UMNTALL} Modified: head/sbin/mount_nullfs/Makefile ============================================================================== --- head/sbin/mount_nullfs/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/mount_nullfs/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -6,7 +6,7 @@ PROG= mount_nullfs SRCS= mount_nullfs.c getmntopts.c MAN= mount_nullfs.8 -MOUNT= ${.CURDIR}/../mount +MOUNT= ${.CURDIR:H}/mount CFLAGS+=-I${MOUNT} .PATH: ${MOUNT} Modified: head/sbin/mount_udf/Makefile ============================================================================== --- head/sbin/mount_udf/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/mount_udf/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -6,8 +6,8 @@ SRCS= mount_udf.c getmntopts.c MAN= mount_udf.8 LIBADD= kiconv -MOUNT= ${.CURDIR}/../mount -CFLAGS+= -I${MOUNT} -I${.CURDIR}/../../sys +MOUNT= ${.CURDIR:H}/mount +CFLAGS+= -I${MOUNT} -I${SRCTOP}/sys .PATH: ${MOUNT} # Needs to be dynamically linked for optional dlopen() access to Modified: head/sbin/mount_unionfs/Makefile ============================================================================== --- head/sbin/mount_unionfs/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/mount_unionfs/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -6,7 +6,7 @@ PROG= mount_unionfs SRCS= mount_unionfs.c getmntopts.c MAN= mount_unionfs.8 -MOUNT= ${.CURDIR}/../mount +MOUNT= ${.CURDIR:H}/mount CFLAGS+=-I${MOUNT} .PATH: ${MOUNT} Modified: head/sbin/newfs/Makefile ============================================================================== --- head/sbin/newfs/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/newfs/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,7 +1,7 @@ # @(#)Makefile 8.2 (Berkeley) 3/27/94 # $FreeBSD$ -.PATH: ${.CURDIR}/../../sys/geom +.PATH: ${SRCTOP}/sys/geom PROG= newfs LIBADD= ufs util @@ -13,7 +13,7 @@ MAN= newfs.8 .include test: ${PROG} - sh ${.CURDIR}/runtest01.sh + sh ${.CURDIR}/runtest01.sh sh ${.CURDIR}/runtest00.sh | tee _.test diff --ignore-matching-lines=FreeBSD _.test ${.CURDIR}/ref.test echo All Tests Passed Modified: head/sbin/nvmecontrol/Makefile ============================================================================== --- head/sbin/nvmecontrol/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/nvmecontrol/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -6,6 +6,6 @@ SRCS= nvmecontrol.c devlist.c firmware.c perftest.c reset.c nvme_util.c power.c wdc.c MAN= nvmecontrol.8 -.PATH: ${.CURDIR}/../../sys/dev/nvme +.PATH: ${SRCTOP}/sys/dev/nvme .include Modified: head/sbin/pfctl/Makefile ============================================================================== --- head/sbin/pfctl/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/pfctl/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -3,7 +3,7 @@ .include # pf_ruleset.c is shared between kernel and pfctl -.PATH: ${.CURDIR}/../../sys/netpfil/pf +.PATH: ${SRCTOP}/sys/netpfil/pf PACKAGE=pf PROG= pfctl Modified: head/sbin/pflogd/Makefile ============================================================================== --- head/sbin/pflogd/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/pflogd/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,14 +1,14 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/pf/pflogd +.PATH: ${SRCTOP}/contrib/pf/pflogd PACKAGE=pf PROG= pflogd SRCS= pflogd.c pidfile.c privsep.c privsep_fdpass.c MAN= pflogd.8 -CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h -CFLAGS+=-I${.CURDIR}/../../contrib/libpcap +CFLAGS+=-include ${SRCTOP}/lib/libpcap/config.h +CFLAGS+=-I${SRCTOP}/contrib/libpcap LIBADD= pcap Modified: head/sbin/quotacheck/Makefile ============================================================================== --- head/sbin/quotacheck/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/quotacheck/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -8,6 +8,6 @@ WARNS?= 2 MAN= quotacheck.8 LIBADD= util -.PATH: ${.CURDIR}/../fsck ${.CURDIR}/../fsck_ffs +.PATH: ${.CURDIR:H}/fsck ${.CURDIR:H}/fsck_ffs .include Modified: head/sbin/resolvconf/Makefile ============================================================================== --- head/sbin/resolvconf/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/resolvconf/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -DIST= ${.CURDIR}/../../contrib/openresolv +DIST= ${SRCTOP}/contrib/openresolv .PATH: ${DIST} SCRIPTS= resolvconf Modified: head/sbin/restore/Makefile ============================================================================== --- head/sbin/restore/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/restore/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../dump +.PATH: ${.CURDIR:H}/dump PACKAGE=runtime PROG= restore Modified: head/sbin/rtsol/Makefile ============================================================================== --- head/sbin/rtsol/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/rtsol/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -14,7 +14,7 @@ # # $FreeBSD$ -.PATH: ${.CURDIR}/../../usr.sbin/rtsold +.PATH: ${SRCTOP}/usr.sbin/rtsold PACKAGE=runtime PROG= rtsol Modified: head/sbin/setkey/Makefile ============================================================================== --- head/sbin/setkey/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/setkey/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -35,7 +35,7 @@ MAN= setkey.8 SRCS= setkey.c parse.y token.l WARNS?= 1 -CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libipsec +CFLAGS+= -I${.CURDIR} -I${SRCTOP}/lib/libipsec YFLAGS= -d LIBADD= l y @@ -44,9 +44,9 @@ CLEANFILES= y.tab.c y.tab.h key_test.o k # libpfkey # ipsec_strerror.c is for avoiding shlib reference to non-exported function. -.PATH: ${.CURDIR}/../../lib/libipsec ${.CURDIR}/../../sys/netipsec +.PATH: ${SRCTOP}/lib/libipsec ${SRCTOP}/sys/netipsec SRCS+= pfkey.c pfkey_dump.c key_debug.c ipsec_strerror.c -CFLAGS+= -I${.CURDIR}/../../lib/libipsec -I${.CURDIR}/../../sys/netipsec +CFLAGS+= -I${SRCTOP}/lib/libipsec -I${SRCTOP}/sys/netipsec SRCS+= y.tab.h y.tab.h: parse.y Modified: head/sbin/sunlabel/Makefile ============================================================================== --- head/sbin/sunlabel/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/sunlabel/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../sys/geom +.PATH: ${SRCTOP}/sys/geom PROG= sunlabel SRCS= sunlabel.c geom_sunlabel_enc.c Modified: head/sbin/umount/Makefile ============================================================================== --- head/sbin/umount/Makefile Sat Mar 4 11:31:08 2017 (r314655) +++ head/sbin/umount/Makefile Sat Mar 4 11:33:01 2017 (r314656) @@ -7,8 +7,8 @@ PROG= umount SRCS= umount.c vfslist.c mounttab.c MAN= umount.8 -MOUNT= ${.CURDIR}/../mount -UMNTALL= ${.CURDIR}/../../usr.sbin/rpc.umntall +MOUNT= ${.CURDIR:H}/mount +UMNTALL= ${SRCTOP}/usr.sbin/rpc.umntall CFLAGS+= -I${MOUNT} -I${UMNTALL} .PATH: ${MOUNT} ${UMNTALL} From owner-svn-src-all@freebsd.org Sat Mar 4 11:34:40 2017 Return-Path: Delivered-To: svn-src-all@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 29420CF9CBD; Sat, 4 Mar 2017 11:34:40 +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 CFB2A126C; Sat, 4 Mar 2017 11:34:39 +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 v24BYcak035106; Sat, 4 Mar 2017 11:34:38 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24BYbv5035092; Sat, 4 Mar 2017 11:34:37 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703041134.v24BYbv5035092@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 4 Mar 2017 11:34:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314657 - in head/kerberos5: . lib/libgssapi_krb5 lib/libgssapi_ntlm lib/libgssapi_spnego lib/libhdb lib/libkafs5 lib/libkrb5 libexec/hprop libexec/kpasswdd tools/asn1_compile tools/slc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 11:34:40 -0000 Author: ngie Date: Sat Mar 4 11:34:36 2017 New Revision: 314657 URL: https://svnweb.freebsd.org/changeset/base/314657 Log: kerberos5: normalize paths using SRCTOP-relative paths or :H when possible This simplifies make logic/output MFC after: 1 month Sponsored by: Dell EMC Isilon Modified: head/kerberos5/Makefile head/kerberos5/Makefile.inc head/kerberos5/lib/libgssapi_krb5/Makefile head/kerberos5/lib/libgssapi_ntlm/Makefile head/kerberos5/lib/libgssapi_spnego/Makefile head/kerberos5/lib/libhdb/Makefile head/kerberos5/lib/libkafs5/Makefile head/kerberos5/lib/libkrb5/Makefile head/kerberos5/libexec/hprop/Makefile head/kerberos5/libexec/kpasswdd/Makefile head/kerberos5/tools/asn1_compile/Makefile head/kerberos5/tools/slc/Makefile Modified: head/kerberos5/Makefile ============================================================================== --- head/kerberos5/Makefile Sat Mar 4 11:33:01 2017 (r314656) +++ head/kerberos5/Makefile Sat Mar 4 11:34:36 2017 (r314657) @@ -11,7 +11,7 @@ KPROGS= lib/libpam \ # This target is used to rebuild these programs WITH Kerberos. kerberize: .for entry in ${KPROGS} - cd ${.CURDIR}/../${entry}; \ + cd ${.CURDIR:H}/${entry}; \ ${MAKE} cleandir; \ ${MAKE} obj; \ ${MAKE} all; \ @@ -21,7 +21,7 @@ kerberize: # This target is used to rebuild these programs WITHOUT Kerberos. dekerberize: .for entry in ${KPROGS} - cd ${.CURDIR}/../${entry}; \ + cd ${.CURDIR:H}/${entry}; \ ${MAKE} MK_KERBEROS=no cleandir; \ ${MAKE} MK_KERBEROS=no obj; \ ${MAKE} MK_KERBEROS=no all; \ Modified: head/kerberos5/Makefile.inc ============================================================================== --- head/kerberos5/Makefile.inc Sat Mar 4 11:33:01 2017 (r314656) +++ head/kerberos5/Makefile.inc Sat Mar 4 11:34:36 2017 (r314657) @@ -4,9 +4,9 @@ NO_LINT= -KRB5DIR= ${.CURDIR}/../../../crypto/heimdal +KRB5DIR= ${SRCTOP}/crypto/heimdal -CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../../include +CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR:H:H}/include .if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT) OPENLDAPBASE?= /usr/local Modified: head/kerberos5/lib/libgssapi_krb5/Makefile ============================================================================== --- head/kerberos5/lib/libgssapi_krb5/Makefile Sat Mar 4 11:33:01 2017 (r314656) +++ head/kerberos5/lib/libgssapi_krb5/Makefile Sat Mar 4 11:34:36 2017 (r314657) @@ -82,4 +82,4 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I. .include -.PATH: ${KRB5DIR}/lib/gssapi/krb5 ${.CURDIR}/../../../lib/libgssapi +.PATH: ${KRB5DIR}/lib/gssapi/krb5 ${SRCTOP}/lib/libgssapi Modified: head/kerberos5/lib/libgssapi_ntlm/Makefile ============================================================================== --- head/kerberos5/lib/libgssapi_ntlm/Makefile Sat Mar 4 11:33:01 2017 (r314656) +++ head/kerberos5/lib/libgssapi_ntlm/Makefile Sat Mar 4 11:34:36 2017 (r314657) @@ -45,4 +45,4 @@ CFLAGS+=-I${KRB5DIR}/lib/ntlm .include -.PATH: ${KRB5DIR}/lib/gssapi/ntlm ${.CURDIR}/../../../lib/libgssapi ${.CURDIR}/../libgssapi_krb5 +.PATH: ${KRB5DIR}/lib/gssapi/ntlm ${SRCTOP}/lib/libgssapi ${.CURDIR:H}/libgssapi_krb5 Modified: head/kerberos5/lib/libgssapi_spnego/Makefile ============================================================================== --- head/kerberos5/lib/libgssapi_spnego/Makefile Sat Mar 4 11:33:01 2017 (r314656) +++ head/kerberos5/lib/libgssapi_spnego/Makefile Sat Mar 4 11:34:36 2017 (r314657) @@ -31,7 +31,7 @@ CFLAGS+=-I${KRB5DIR}/lib/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/spnego CFLAGS+=-I${KRB5DIR}/lib/asn1 -CFLAGS+=-I${.CURDIR}/../../../lib/libgssapi +CFLAGS+=-I${SRCTOP}/lib/libgssapi CFLAGS+=-I${KRB5DIR}/lib/roken -I. CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} \ @@ -45,7 +45,7 @@ ${GEN}: spnego.asn1 spnego.opt .SUFFIXES: .h .c .x .hx -.x.c: +.x.c: ${CP} ${.IMPSRC} ${.TARGET} .hx.h: @@ -55,4 +55,4 @@ ${GEN}: spnego.asn1 spnego.opt .SUFFIXES: .h .c .x .hx -.PATH: ${KRB5DIR}/lib/gssapi/spnego ${.CURDIR}/../../../lib/libgssapi ${.CURDIR}/../libgssapi_krb5 +.PATH: ${KRB5DIR}/lib/gssapi/spnego ${SRCTOP}/lib/libgssapi ${.CURDIR:H}/libgssapi_krb5 Modified: head/kerberos5/lib/libhdb/Makefile ============================================================================== --- head/kerberos5/lib/libhdb/Makefile Sat Mar 4 11:33:01 2017 (r314656) +++ head/kerberos5/lib/libhdb/Makefile Sat Mar 4 11:34:36 2017 (r314657) @@ -57,7 +57,7 @@ SRCS= common.c \ ${GEN:S/.x$/.c/:S/.hx$/.h/} CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken -I${.CURDIR}/../../../contrib/sqlite3/ \ + -I${KRB5DIR}/lib/roken -I${SRCTOP}/contrib/sqlite3/ \ -I${KRB5DIR}/lib/krb5 \ -I. ${LDAPCFLAGS} CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\"" Modified: head/kerberos5/lib/libkafs5/Makefile ============================================================================== --- head/kerberos5/lib/libkafs5/Makefile Sat Mar 4 11:33:01 2017 (r314656) +++ head/kerberos5/lib/libkafs5/Makefile Sat Mar 4 11:34:36 2017 (r314657) @@ -26,7 +26,7 @@ SRCS= afssys.c afskrb5.c common.c krb5_e CFLAGS+= -I${KRB5DIR}/lib/kafs \ -I${KRB5DIR}/lib/krb5 \ - -I${.OBJDIR}/../libkrb5/ \ + -I${.OBJDIR:H}/libkrb5/ \ -I${KRB5DIR}/lib/roken CLEANFILES= kafs5.3 Modified: head/kerberos5/lib/libkrb5/Makefile ============================================================================== --- head/kerberos5/lib/libkrb5/Makefile Sat Mar 4 11:33:01 2017 (r314656) +++ head/kerberos5/lib/libkrb5/Makefile Sat Mar 4 11:34:36 2017 (r314657) @@ -625,4 +625,4 @@ CFLAGS+= -I${KRB5DIR}/lib/krb5 \ .include -.PATH: ${KRB5DIR}/lib/krb5 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/include ${.CURDIR}/../../include ${KRB5DIR}/doc/doxyout/krb5/man/man3/ +.PATH: ${KRB5DIR}/lib/krb5 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/include ${SRCTOP}/kerberos5/include ${KRB5DIR}/doc/doxyout/krb5/man/man3/ Modified: head/kerberos5/libexec/hprop/Makefile ============================================================================== --- head/kerberos5/libexec/hprop/Makefile Sat Mar 4 11:33:01 2017 (r314656) +++ head/kerberos5/libexec/hprop/Makefile Sat Mar 4 11:34:36 2017 (r314657) @@ -9,7 +9,7 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1 CFLAGS+=-I${KRB5DIR}/lib/hx509 CFLAGS+=-I${KRB5DIR}/lib/ntlm CFLAGS+=-I${KRB5DIR}/kdc -CFLAGS+=-I${.OBJDIR}/../../lib/libkrb5 +CFLAGS+=-I${.OBJDIR:H:H}/lib/libkrb5 LIBADD= hdb krb5 roken vers DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} Modified: head/kerberos5/libexec/kpasswdd/Makefile ============================================================================== --- head/kerberos5/libexec/kpasswdd/Makefile Sat Mar 4 11:33:01 2017 (r314656) +++ head/kerberos5/libexec/kpasswdd/Makefile Sat Mar 4 11:34:36 2017 (r314657) @@ -2,7 +2,7 @@ PROG= kpasswdd MAN= kpasswdd.8 -CFLAGS+=-I${KRB5DIR}/lib/roken -I../../lib/libhdb ${LDAPCFLAGS} +CFLAGS+=-I${KRB5DIR}/lib/roken -I${.CURDIR:H:H}/lib/libhdb ${LDAPCFLAGS} LIBADD= kadm5srv hdb krb5 roken vers asn1 DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} Modified: head/kerberos5/tools/asn1_compile/Makefile ============================================================================== --- head/kerberos5/tools/asn1_compile/Makefile Sat Mar 4 11:33:01 2017 (r314656) +++ head/kerberos5/tools/asn1_compile/Makefile Sat Mar 4 11:34:36 2017 (r314657) @@ -2,7 +2,7 @@ PROG= asn1_compile MAN= -LIBROKEN_A= ${.OBJDIR}/../../lib/libroken/libroken.a +LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a LIBADD= vers LDADD= ${LIBROKEN_A} DPADD= ${LIBROKEN_A} Modified: head/kerberos5/tools/slc/Makefile ============================================================================== --- head/kerberos5/tools/slc/Makefile Sat Mar 4 11:33:01 2017 (r314656) +++ head/kerberos5/tools/slc/Makefile Sat Mar 4 11:34:36 2017 (r314657) @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= slc -LIBROKEN_A= ${.OBJDIR}/../../lib/libroken/libroken.a +LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a LIBADD= vers LDADD= ${LIBROKEN_A} DPADD= ${LIBROKEN_A} @@ -18,7 +18,7 @@ CLEANFILES= roken.h slc-gram.c slc-lex.c roken.h: ${MAKE_ROKEN} > ${.TARGET} -# ${.OBJDIR}/../make-roken/make-roken > ${.TARGET} +# ${.OBJDIR:H}/make-roken/make-roken > ${.TARGET} .include From owner-svn-src-all@freebsd.org Sat Mar 4 11:35:32 2017 Return-Path: Delivered-To: svn-src-all@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 8A889CF9D5C; Sat, 4 Mar 2017 11:35:32 +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 652A314E7; Sat, 4 Mar 2017 11:35:32 +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 v24BZVTA035200; Sat, 4 Mar 2017 11:35:31 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24BZUhH035194; Sat, 4 Mar 2017 11:35:30 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703041135.v24BZUhH035194@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 4 Mar 2017 11:35:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314658 - in head/secure: . lib lib/libcrypto lib/libcrypto/engines lib/libssh X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 11:35:32 -0000 Author: ngie Date: Sat Mar 4 11:35:30 2017 New Revision: 314658 URL: https://svnweb.freebsd.org/changeset/base/314658 Log: crypto: normalize paths using SRCTOP-relative paths or :H when possible This simplifies make logic/output MFC after: 1 month Sponsored by: Dell EMC Isilon Modified: head/secure/Makefile head/secure/Makefile.inc head/secure/lib/Makefile.inc head/secure/lib/libcrypto/Makefile.inc head/secure/lib/libcrypto/engines/Makefile.inc head/secure/lib/libssh/Makefile Modified: head/secure/Makefile ============================================================================== --- head/secure/Makefile Sat Mar 4 11:34:36 2017 (r314657) +++ head/secure/Makefile Sat Mar 4 11:35:30 2017 (r314658) @@ -21,7 +21,7 @@ SPROGS+=usr.sbin/sendmail # This target is used to rebuild these programs with crypto. secure: .MAKE .PHONY .for entry in ${SPROGS} - cd ${.CURDIR}/../${entry}; \ + cd ${.CURDIR:H}/${entry}; \ ${MAKE} cleandir; \ ${MAKE} obj; \ ${MAKE} all; \ @@ -31,7 +31,7 @@ secure: .MAKE .PHONY # This target is used to rebuild these programs without crypto. insecure: .MAKE .PHONY .for entry in ${SPROGS} - cd ${.CURDIR}/../${entry}; \ + cd ${.CURDIR:H}/${entry}; \ ${MAKE} MK_CRYPT=no cleandir; \ ${MAKE} MK_CRYPT=no obj; \ ${MAKE} MK_CRYPT=no all; \ Modified: head/secure/Makefile.inc ============================================================================== --- head/secure/Makefile.inc Sat Mar 4 11:34:36 2017 (r314657) +++ head/secure/Makefile.inc Sat Mar 4 11:35:30 2017 (r314658) @@ -2,14 +2,14 @@ .include -.if exists(${.CURDIR}/../../lib/libcrypt/obj) -CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt/obj +.if exists(${.CURDIR:H:H}/lib/libcrypt/obj) +CRYPTOBJDIR= ${.CURDIR:H:H}/lib/libcrypt/obj .else -CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt +CRYPTOBJDIR= ${.CURDIR:H:H}/lib/libcrypt .endif .if ${MK_OPENSSH} != "no" -SSHDIR= ${.CURDIR}/../../../crypto/openssh +SSHDIR= ${SRCTOP}/crypto/openssh .endif WARNS?= 0 Modified: head/secure/lib/Makefile.inc ============================================================================== --- head/secure/lib/Makefile.inc Sat Mar 4 11:34:36 2017 (r314657) +++ head/secure/lib/Makefile.inc Sat Mar 4 11:35:30 2017 (r314658) @@ -1,6 +1,6 @@ # $FreeBSD$ .include "../Makefile.inc" -.if exists(${.CURDIR}/../../../lib/Makefile.inc) -.include "${.CURDIR}/../../../lib/Makefile.inc" +.if exists(${.CURDIR:H:H:H}/lib/Makefile.inc) +.include "${.CURDIR:H:H:H}/lib/Makefile.inc" .endif Modified: head/secure/lib/libcrypto/Makefile.inc ============================================================================== --- head/secure/lib/libcrypto/Makefile.inc Sat Mar 4 11:34:36 2017 (r314657) +++ head/secure/lib/libcrypto/Makefile.inc Sat Mar 4 11:35:30 2017 (r314658) @@ -6,7 +6,7 @@ OPENSSL_VER= 1.0.2k OPENSSL_DATE= 2017-01-26 -LCRYPTO_SRC= ${.CURDIR}/../../../crypto/openssl +LCRYPTO_SRC= ${SRCTOP}/crypto/openssl LCRYPTO_DOC= ${LCRYPTO_SRC}/doc CFLAGS+= -I${LCRYPTO_SRC} Modified: head/secure/lib/libcrypto/engines/Makefile.inc ============================================================================== --- head/secure/lib/libcrypto/engines/Makefile.inc Sat Mar 4 11:34:36 2017 (r314657) +++ head/secure/lib/libcrypto/engines/Makefile.inc Sat Mar 4 11:35:30 2017 (r314658) @@ -1,6 +1,6 @@ # $FreeBSD$ -LCRYPTO_SRC= ${.CURDIR}/../../../../../crypto/openssl +LCRYPTO_SRC= ${SRCTOP}/crypto/openssl .PATH: ${LCRYPTO_SRC}/engines ${LCRYPTO_SRC}/engines/ccgost SHLIBDIR?= /usr/lib/engines Modified: head/secure/lib/libssh/Makefile ============================================================================== --- head/secure/lib/libssh/Makefile Sat Mar 4 11:34:36 2017 (r314657) +++ head/secure/lib/libssh/Makefile Sat Mar 4 11:35:30 2017 (r314658) @@ -37,7 +37,7 @@ SRCS+= bcrypt_pbkdf.c blowfish.c bsd-mis .if ${MK_LDNS} == "no" SRCS+= getrrsetbyname.c .else -LDNSDIR= ${.CURDIR}/../../../contrib/ldns +LDNSDIR= ${SRCTOP}/contrib/ldns CFLAGS+= -DHAVE_LDNS=1 -I${LDNSDIR} SRCS+= getrrsetbyname-ldns.c LIBADD+= ldns From owner-svn-src-all@freebsd.org Sat Mar 4 11:38:11 2017 Return-Path: Delivered-To: svn-src-all@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 A7138CF9DC1; Sat, 4 Mar 2017 11:38:11 +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 6B2131690; Sat, 4 Mar 2017 11:38:11 +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 v24BcAYj035412; Sat, 4 Mar 2017 11:38:10 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24Bc3Zb035343; Sat, 4 Mar 2017 11:38:03 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703041138.v24Bc3Zb035343@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 4 Mar 2017 11:38:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314659 - in head/usr.sbin: acpi amd amd/amd amd/libamu ancontrol audit auditd auditdistd auditreduce authpf autofs bhyvectl bhyveload bluetooth bluetooth/bthidcontrol bluetooth/rfcomm_... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 11:38:11 -0000 Author: ngie Date: Sat Mar 4 11:38:03 2017 New Revision: 314659 URL: https://svnweb.freebsd.org/changeset/base/314659 Log: usr.sbin: normalize paths using SRCTOP-relative paths or :H when possible This simplifies make logic/output MFC after: 1 month Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/acpi/Makefile.inc head/usr.sbin/amd/Makefile.inc head/usr.sbin/amd/amd/Makefile head/usr.sbin/amd/libamu/Makefile head/usr.sbin/ancontrol/Makefile head/usr.sbin/audit/Makefile head/usr.sbin/auditd/Makefile head/usr.sbin/auditdistd/Makefile head/usr.sbin/auditreduce/Makefile head/usr.sbin/authpf/Makefile head/usr.sbin/autofs/Makefile head/usr.sbin/bhyvectl/Makefile head/usr.sbin/bhyveload/Makefile head/usr.sbin/bluetooth/Makefile.inc head/usr.sbin/bluetooth/bthidcontrol/Makefile head/usr.sbin/bluetooth/rfcomm_pppd/Makefile head/usr.sbin/bsnmpd/bsnmpd/Makefile head/usr.sbin/bsnmpd/gensnmptree/Makefile head/usr.sbin/bsnmpd/tools/Makefile.inc head/usr.sbin/camdd/Makefile head/usr.sbin/ckdist/Makefile head/usr.sbin/cron/crontab/Makefile head/usr.sbin/cron/lib/Makefile head/usr.sbin/ctladm/Makefile head/usr.sbin/ctld/Makefile head/usr.sbin/ctm/Makefile.inc head/usr.sbin/ctm/ctm/Makefile head/usr.sbin/ctm/ctm_dequeue/Makefile head/usr.sbin/ctm/ctm_smail/Makefile head/usr.sbin/dconschat/Makefile head/usr.sbin/editmap/Makefile head/usr.sbin/eeprom/Makefile head/usr.sbin/fdcontrol/Makefile head/usr.sbin/fdformat/Makefile head/usr.sbin/fmtree/Makefile head/usr.sbin/fstyp/Makefile head/usr.sbin/ftp-proxy/Makefile head/usr.sbin/fwcontrol/Makefile head/usr.sbin/gpioctl/Makefile head/usr.sbin/gssd/Makefile head/usr.sbin/hyperv/tools/kvp/Makefile head/usr.sbin/hyperv/tools/vss/Makefile head/usr.sbin/iovctl/Makefile head/usr.sbin/ipfwpcap/Makefile head/usr.sbin/iscsid/Makefile head/usr.sbin/mailstats/Makefile head/usr.sbin/mailwrapper/Makefile head/usr.sbin/makemap/Makefile head/usr.sbin/mlxcontrol/Makefile head/usr.sbin/mount_smbfs/Makefile head/usr.sbin/mountd/Makefile head/usr.sbin/mpsutil/Makefile head/usr.sbin/ndiscvt/Makefile head/usr.sbin/ndp/Makefile head/usr.sbin/nmtree/Makefile head/usr.sbin/pkg/Makefile head/usr.sbin/pnpinfo/Makefile head/usr.sbin/praliases/Makefile head/usr.sbin/praudit/Makefile head/usr.sbin/pwd_mkdb/Makefile head/usr.sbin/rip6query/Makefile head/usr.sbin/rpcbind/tests/Makefile head/usr.sbin/rtadvctl/Makefile head/usr.sbin/sa/Makefile head/usr.sbin/sendmail/Makefile head/usr.sbin/tcpdump/tcpdump/Makefile head/usr.sbin/timed/timedc/Makefile Modified: head/usr.sbin/acpi/Makefile.inc ============================================================================== --- head/usr.sbin/acpi/Makefile.inc Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/acpi/Makefile.inc Sat Mar 4 11:38:03 2017 (r314659) @@ -1,13 +1,13 @@ # $Id: Makefile.inc,v 1.1 2000/07/14 18:16:22 iwasaki Exp $ # $FreeBSD$ -ACPICA_DIR= ${.CURDIR}/../../../sys/contrib/dev/acpica -CFLAGS+= -I${.CURDIR}/../../../sys +ACPICA_DIR= ${SRCTOP}/sys/contrib/dev/acpica +CFLAGS+= -I${SRCTOP}/sys PACKAGE= acpi -.if exists(${.CURDIR}/../../Makefile.inc) -.include "${.CURDIR}/../../Makefile.inc" +.if exists(${.CURDIR:H:H}/Makefile.inc) +.include "${.CURDIR:H:H}/Makefile.inc" .endif .PATH: ${ACPICA_DIR} \ Modified: head/usr.sbin/amd/Makefile.inc ============================================================================== --- head/usr.sbin/amd/Makefile.inc Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/amd/Makefile.inc Sat Mar 4 11:38:03 2017 (r314659) @@ -13,13 +13,13 @@ PACKAGE= amd -CFLAGS+= -I. -I${.CURDIR} -CFLAGS+= -I${.CURDIR}/../include -.if exists(${.OBJDIR}/../include) -CFLAGS+= -I${.OBJDIR}/../include +CFLAGS+= -I. -I${.CURDIR} +CFLAGS+= -I${.CURDIR:H}/include +.if exists(${.OBJDIR:H}/include) +CFLAGS+= -I${.OBJDIR:H}/include .endif -CFLAGS+= -I${.CURDIR}/../../../contrib/amd/include -CFLAGS+= -I${.CURDIR}/../../../contrib/amd +CFLAGS+= -I${SRCTOP}/contrib/amd/include +CFLAGS+= -I${SRCTOP}/contrib/amd CFLAGS+= -DHAVE_CONFIG_H .if ${MK_NIS} == "no" CFLAGS+= -DHAVE_LOCALCONFIG_H @@ -37,6 +37,6 @@ NFS_PROT_X= ${SRCTOP}/include/rpcsvc/nfs WARNS?= 1 -.if exists(${.CURDIR}/../../Makefile.inc) -.include "${.CURDIR}/../../Makefile.inc" +.if exists(${.CURDIR:H:H}/Makefile.inc) +.include "${.CURDIR:H:H}/Makefile.inc" .endif Modified: head/usr.sbin/amd/amd/Makefile ============================================================================== --- head/usr.sbin/amd/amd/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/amd/amd/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -28,7 +28,7 @@ SRCS+= srvr_amfs_auto.c srvr_nfs.c sun_m CFLAGS+= -I${SRCTOP}/contrib/amd/amd \ -I${SRCTOP}/contrib/amd/include \ - -I${.OBJDIR}/../../../include/rpcsvc + -I${OBJTOP}/include/rpcsvc LIBADD= amu @@ -62,7 +62,7 @@ SRCS+= mount_xdr.c CLEANFILES+= mount_xdr.c mount_xdr.c: ${MOUNT_X} - ${RPCCOM} -c -DWANT_NFS3 ${MOUNT_X} -o ${.TARGET} + ${RPCCOM} -c -DWANT_NFS3 ${.ALLSRC} -o ${.TARGET} .if ${MK_HESIOD} != "no" SRCS+= info_hesiod.c Modified: head/usr.sbin/amd/libamu/Makefile ============================================================================== --- head/usr.sbin/amd/libamu/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/amd/libamu/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -23,10 +23,10 @@ SRCS+= nfs_prot_x.c xdr_func_%undef.c CLEANFILES+= nfs_prot_x.c xdr_func_%undef.c CFLAGS+= -I${SRCTOP}/contrib/amd/libamu \ - -I${.OBJDIR}/../../../include/rpcsvc + -I${OBJTOP}/include/rpcsvc nfs_prot_x.c: ${NFS_PROT_X} - ${RPCCOM} -c -C -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET} + ${RPCCOM} -c -C -DWANT_NFS3 ${.ALLSRC} -o ${.TARGET} XDRDEFS!= grep 'ifndef.*HAVE_XDR' ${SRCTOP}/contrib/amd/libamu/xdr_func.c | awk '{print "-D"$$2}' Modified: head/usr.sbin/ancontrol/Makefile ============================================================================== --- head/usr.sbin/ancontrol/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/ancontrol/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -4,7 +4,7 @@ PROG= ancontrol MAN= ancontrol.8 WARNS?= 3 -CFLAGS+= -DANCACHE -I${.CURDIR}/../../sys +CFLAGS+= -DANCACHE -I${SRCTOP}/sys LIBADD= md Modified: head/usr.sbin/audit/Makefile ============================================================================== --- head/usr.sbin/audit/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/audit/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -2,7 +2,7 @@ # $FreeBSD$ # -OPENBSMDIR=${.CURDIR}/../../contrib/openbsm +OPENBSMDIR=${SRCTOP}/contrib/openbsm .PATH: ${OPENBSMDIR}/bin/audit CFLAGS+= -I${OPENBSMDIR} Modified: head/usr.sbin/auditd/Makefile ============================================================================== --- head/usr.sbin/auditd/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/auditd/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -2,7 +2,7 @@ # $FreeBSD$ # -OPENBSMDIR=${.CURDIR}/../../contrib/openbsm +OPENBSMDIR=${SRCTOP}/contrib/openbsm .PATH: ${OPENBSMDIR}/bin/auditd CFLAGS+= -I${OPENBSMDIR} Modified: head/usr.sbin/auditdistd/Makefile ============================================================================== --- head/usr.sbin/auditdistd/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/auditdistd/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -2,7 +2,7 @@ # $FreeBSD$ # -OPENBSMDIR=${.CURDIR}/../../contrib/openbsm +OPENBSMDIR=${SRCTOP}/contrib/openbsm .PATH: ${OPENBSMDIR}/bin/auditdistd # Addition of auditdistd because otherwise generated parse.c can't find Modified: head/usr.sbin/auditreduce/Makefile ============================================================================== --- head/usr.sbin/auditreduce/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/auditreduce/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -2,7 +2,7 @@ # $FreeBSD$ # -OPENBSMDIR=${.CURDIR}/../../contrib/openbsm +OPENBSMDIR=${SRCTOP}/contrib/openbsm .PATH: ${OPENBSMDIR}/bin/auditreduce CFLAGS+= -I${OPENBSMDIR} Modified: head/usr.sbin/authpf/Makefile ============================================================================== --- head/usr.sbin/authpf/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/authpf/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/pf/authpf +.PATH: ${SRCTOP}/contrib/pf/authpf PROG= authpf MAN= authpf.8 Modified: head/usr.sbin/autofs/Makefile ============================================================================== --- head/usr.sbin/autofs/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/autofs/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -13,14 +13,14 @@ SRCS+= popen.c SRCS+= token.l CFLAGS+=-I${.CURDIR} -CFLAGS+=-I${.CURDIR}/../../sys/fs/autofs +CFLAGS+=-I${SRCTOP}/sys/fs/autofs MAN= automount.8 automountd.8 autounmountd.8 auto_master.5 LIBADD= util # Needed for getmntopts.c -MOUNT= ${.CURDIR}/../../sbin/mount +MOUNT= ${SRCTOP}/sbin/mount CFLAGS+=-I${MOUNT} WARNS= 6 Modified: head/usr.sbin/bhyvectl/Makefile ============================================================================== --- head/usr.sbin/bhyvectl/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/bhyvectl/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -12,6 +12,6 @@ LIBADD= vmmapi util WARNS?= 3 -CFLAGS+= -I${.CURDIR}/../../sys/amd64/vmm +CFLAGS+= -I${SRCTOP}/sys/amd64/vmm .include Modified: head/usr.sbin/bhyveload/Makefile ============================================================================== --- head/usr.sbin/bhyveload/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/bhyveload/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -9,6 +9,6 @@ LIBADD= vmmapi WARNS?= 3 -CFLAGS+=-I${.CURDIR}/../../sys/boot/userboot +CFLAGS+=-I${SRCTOP}/sys/boot/userboot .include Modified: head/usr.sbin/bluetooth/Makefile.inc ============================================================================== --- head/usr.sbin/bluetooth/Makefile.inc Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/bluetooth/Makefile.inc Sat Mar 4 11:38:03 2017 (r314659) @@ -1,4 +1,3 @@ # $FreeBSD$ -.include "${.CURDIR}/../../Makefile.inc" - +.include "${.CURDIR:H:H}/Makefile.inc" Modified: head/usr.sbin/bluetooth/bthidcontrol/Makefile ============================================================================== --- head/usr.sbin/bluetooth/bthidcontrol/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/bluetooth/bthidcontrol/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,13 +1,13 @@ # $Id: Makefile,v 1.2 2004/02/13 21:44:41 max Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../bthidd +.PATH: ${.CURDIR:H}/bthidd PROG= bthidcontrol MAN= bthidcontrol.8 SRCS= bthidcontrol.c hid.c lexer.l parser.y sdp.c WARNS?= 1 -CFLAGS+= -DBTHIDCONTROL=1 -I${.CURDIR}/../bthidd +CFLAGS+= -DBTHIDCONTROL=1 -I${.CURDIR:H}/bthidd LIBADD+= bluetooth sdp usbhid Modified: head/usr.sbin/bluetooth/rfcomm_pppd/Makefile ============================================================================== --- head/usr.sbin/bluetooth/rfcomm_pppd/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/bluetooth/rfcomm_pppd/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,7 +1,7 @@ # $Id: Makefile,v 1.7 2003/09/07 18:32:11 max Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../usr.bin/bluetooth/rfcomm_sppd +.PATH: ${SRCTOP}/usr.bin/bluetooth/rfcomm_sppd PROG= rfcomm_pppd MAN= rfcomm_pppd.8 Modified: head/usr.sbin/bsnmpd/bsnmpd/Makefile ============================================================================== --- head/usr.sbin/bsnmpd/bsnmpd/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/bsnmpd/bsnmpd/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -4,7 +4,7 @@ .include -CONTRIB=${.CURDIR}/../../../contrib/bsnmp +CONTRIB=${SRCTOP}/contrib/bsnmp .PATH: ${CONTRIB}/snmpd PROG= bsnmpd Modified: head/usr.sbin/bsnmpd/gensnmptree/Makefile ============================================================================== --- head/usr.sbin/bsnmpd/gensnmptree/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/bsnmpd/gensnmptree/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -2,7 +2,7 @@ # # Author: Harti Brandt -CONTRIB=${.CURDIR}/../../../contrib/bsnmp +CONTRIB=${SRCTOP}/contrib/bsnmp .PATH: ${CONTRIB}/gensnmptree PROG= gensnmptree Modified: head/usr.sbin/bsnmpd/tools/Makefile.inc ============================================================================== --- head/usr.sbin/bsnmpd/tools/Makefile.inc Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/bsnmpd/tools/Makefile.inc Sat Mar 4 11:38:03 2017 (r314659) @@ -6,10 +6,10 @@ PACKAGE= bsnmp CFLAGS+= -I. -I${.CURDIR} -.if exists(${.OBJDIR}/../libbsnmptools) -LIBBSNMPTOOLSDIR= ${.OBJDIR}/../libbsnmptools +.if exists(${.OBJDIR:H}/libbsnmptools) +LIBBSNMPTOOLSDIR= ${.OBJDIR:H}/libbsnmptools .else -LIBBSNMPTOOLSDIR= ${.CURDIR}/../libbsnmptools +LIBBSNMPTOOLSDIR= ${.CURDIR:H}/libbsnmptools .endif LIBBSNMPTOOLS= ${LIBBSNMPTOOLSDIR}/libbsnmptools.a Modified: head/usr.sbin/camdd/Makefile ============================================================================== --- head/usr.sbin/camdd/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/camdd/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -2,7 +2,7 @@ PROG= camdd SRCS= camdd.c -SDIR= ${.CURDIR}/../../sys +SDIR= ${SRCTOP}/sys LIBADD= cam mt util pthread NO_WTHREAD_SAFETY= 1 MAN= camdd.8 Modified: head/usr.sbin/ckdist/Makefile ============================================================================== --- head/usr.sbin/ckdist/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/ckdist/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../usr.bin/cksum +.PATH: ${SRCTOP}/usr.bin/cksum PROG= ckdist SRCS= ckdist.c crc.c Modified: head/usr.sbin/cron/crontab/Makefile ============================================================================== --- head/usr.sbin/cron/crontab/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/cron/crontab/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -10,7 +10,7 @@ PRECIOUSPROG= WARNS?= 3 -CFLAGS+= -I${.CURDIR}/../cron +CFLAGS+= -I${.CURDIR:H}/cron LIBADD= cron md util Modified: head/usr.sbin/cron/lib/Makefile ============================================================================== --- head/usr.sbin/cron/lib/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/cron/lib/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -6,7 +6,7 @@ SRCS= entry.c env.c misc.c WARNS?= 3 -CFLAGS+= -I${.CURDIR}/../cron +CFLAGS+= -I${.CURDIR:H}/cron CFLAGS+= -DLOGIN_CAP -DPAM .include Modified: head/usr.sbin/ctladm/Makefile ============================================================================== --- head/usr.sbin/ctladm/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/ctladm/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -2,8 +2,8 @@ PROG= ctladm SRCS= ctladm.c util.c ctl_util.c ctl_scsi_all.c -.PATH: ${.CURDIR}/../../sys/cam/ctl -SDIR= ${.CURDIR}/../../sys +.PATH: ${SRCTOP}/sys/cam/ctl +SDIR= ${SRCTOP}/sys CFLAGS+= -I${SDIR} # This is necessary because of these warnings: # warning: cast increases required alignment of target type Modified: head/usr.sbin/ctld/Makefile ============================================================================== --- head/usr.sbin/ctld/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/ctld/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,15 +1,15 @@ # $FreeBSD$ -CFLAGS+=-I${.CURDIR}/../../contrib/libucl/include -.PATH: ${.CURDIR}/../../contrib/libucl/include +CFLAGS+=-I${SRCTOP}/contrib/libucl/include +.PATH: ${SRCTOP}/contrib/libucl/include PROG= ctld SRCS= chap.c ctld.c discovery.c isns.c kernel.c keys.c log.c SRCS+= login.c parse.y pdu.c token.l y.tab.h uclparse.c CFLAGS+= -I${.CURDIR} -CFLAGS+= -I${.CURDIR}/../../sys -CFLAGS+= -I${.CURDIR}/../../sys/cam/ctl -CFLAGS+= -I${.CURDIR}/../../sys/dev/iscsi +CFLAGS+= -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/sys/cam/ctl +CFLAGS+= -I${SRCTOP}/sys/dev/iscsi #CFLAGS+= -DICL_KERNEL_PROXY MAN= ctld.8 ctl.conf.5 Modified: head/usr.sbin/ctm/Makefile.inc ============================================================================== --- head/usr.sbin/ctm/Makefile.inc Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/ctm/Makefile.inc Sat Mar 4 11:38:03 2017 (r314659) @@ -1,5 +1,5 @@ # $FreeBSD$ -.if exists(${.CURDIR}/../../Makefile.inc) -.include "${.CURDIR}/../../Makefile.inc" +.if exists(${.CURDIR:H:H}/Makefile.inc) +.include "${.CURDIR:H:H}/Makefile.inc" .endif Modified: head/usr.sbin/ctm/ctm/Makefile ============================================================================== --- head/usr.sbin/ctm/ctm/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/ctm/ctm/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -18,7 +18,7 @@ LIBADD= md WARNS?= 2 -.if exists(${.CURDIR}/../../Makefile.inc) -.include "${.CURDIR}/../../Makefile.inc" +.if exists(${.CURDIR:H:H}/Makefile.inc) +.include "${.CURDIR:H:H}/Makefile.inc" .endif .include Modified: head/usr.sbin/ctm/ctm_dequeue/Makefile ============================================================================== --- head/usr.sbin/ctm/ctm_dequeue/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/ctm/ctm_dequeue/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,12 +1,12 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../ctm_rmail +.PATH: ${.CURDIR:H}/ctm_rmail PROG= ctm_dequeue MAN= SRCS= ctm_dequeue.c error.c -CFLAGS+= -I${.CURDIR}/../ctm_rmail +CFLAGS+= -I${.CURDIR:H}/ctm_rmail WARNS?= 1 Modified: head/usr.sbin/ctm/ctm_smail/Makefile ============================================================================== --- head/usr.sbin/ctm/ctm_smail/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/ctm/ctm_smail/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,12 +1,12 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../ctm_rmail +.PATH: ${.CURDIR:H}/ctm_rmail PROG= ctm_smail MAN= SRCS= ctm_smail.c error.c -CFLAGS+= -I${.CURDIR}/../ctm_rmail +CFLAGS+= -I${.CURDIR:H}/ctm_rmail WARNS?= 2 Modified: head/usr.sbin/dconschat/Makefile ============================================================================== --- head/usr.sbin/dconschat/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/dconschat/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -3,7 +3,7 @@ PROG= dconschat MAN= dconschat.8 -CFLAGS+= -I${.CURDIR}/../../sys +CFLAGS+= -I${SRCTOP}/sys LIBADD= kvm Modified: head/usr.sbin/editmap/Makefile ============================================================================== --- head/usr.sbin/editmap/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/editmap/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,6 +1,6 @@ # $FreeBSD$ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/editmap PROG= editmap Modified: head/usr.sbin/eeprom/Makefile ============================================================================== --- head/usr.sbin/eeprom/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/eeprom/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,11 +1,11 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../ofwdump +.PATH: ${.CURDIR:H}/ofwdump PROG= eeprom MAN= eeprom.8 MANSUBDIR= /sparc64 SRCS= eeprom.c ofw_options.c ofw_util.c -CFLAGS+= -I${.CURDIR}/../ofwdump +CFLAGS+= -I${.CURDIR:H}/ofwdump .include Modified: head/usr.sbin/fdcontrol/Makefile ============================================================================== --- head/usr.sbin/fdcontrol/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/fdcontrol/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,10 +1,10 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../fdread +.PATH: ${.CURDIR:H}/fdread PROG= fdcontrol SRCS= fdcontrol.c fdutil.c -CFLAGS+= -I${.CURDIR}/../fdread +CFLAGS+= -I${.CURDIR:H}/fdread MAN= fdcontrol.8 .include Modified: head/usr.sbin/fdformat/Makefile ============================================================================== --- head/usr.sbin/fdformat/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/fdformat/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,10 +1,10 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../fdread +.PATH: ${.CURDIR:H}/fdread PROG= fdformat SRCS= fdformat.c fdutil.c -CFLAGS+= -I${.CURDIR}/../fdread +CFLAGS+= -I${.CURDIR:H}/fdread .include Modified: head/usr.sbin/fmtree/Makefile ============================================================================== --- head/usr.sbin/fmtree/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/fmtree/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -3,7 +3,7 @@ .include -.PATH: ${.CURDIR}/../../usr.bin/cksum +.PATH: ${SRCTOP}/usr.bin/cksum PROG= fmtree MAN= fmtree.8 Modified: head/usr.sbin/fstyp/Makefile ============================================================================== --- head/usr.sbin/fstyp/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/fstyp/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -20,7 +20,7 @@ WARNS?= 2 SUBDIR+= tests .endif -CFLAGS+=-I${.CURDIR}/../../sys +CFLAGS+=-I${SRCTOP}/sys .if ${MK_ZFS} != "no" IGNORE_PRAGMA= YES Modified: head/usr.sbin/ftp-proxy/Makefile ============================================================================== --- head/usr.sbin/ftp-proxy/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/ftp-proxy/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,13 +1,13 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/pf/ftp-proxy +.PATH: ${SRCTOP}/contrib/pf/ftp-proxy PROG= ftp-proxy MAN= ftp-proxy.8 SRCS= ftp-proxy.c filter.c -CFLAGS+=-I${.CURDIR}/../../contrib/pf/libevent +CFLAGS+=-I${SRCTOP}/contrib/pf/libevent LIBADD= event Modified: head/usr.sbin/fwcontrol/Makefile ============================================================================== --- head/usr.sbin/fwcontrol/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/fwcontrol/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -5,9 +5,9 @@ SRCS= fwcontrol.c fwcrom.c fwdv.c fwmpeg MAN= fwcontrol.8 WARNS?= 3 -.PATH: ${.CURDIR}/../../sys/dev/firewire +.PATH: ${SRCTOP}/sys/dev/firewire -SDIR= ${.CURDIR}/../../sys +SDIR= ${SRCTOP}/sys CFLAGS+=-I${.CURDIR} -I${SDIR} .include Modified: head/usr.sbin/gpioctl/Makefile ============================================================================== --- head/usr.sbin/gpioctl/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/gpioctl/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -3,7 +3,7 @@ PROG= gpioctl MAN= gpioctl.8 -CFLAGS+= -I${.CURDIR}/../../lib/libgpio +CFLAGS+= -I${SRCTOP}/lib/libgpio LIBADD= gpio Modified: head/usr.sbin/gssd/Makefile ============================================================================== --- head/usr.sbin/gssd/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/gssd/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -18,7 +18,7 @@ CFLAGS+= -DWITHOUT_KERBEROS CLEANFILES= gssd_svc.c gssd_xdr.c gssd.h -RPCSRC= ${.CURDIR}/../../sys/kgssapi/gssd.x +RPCSRC= ${SRCTOP}/sys/kgssapi/gssd.x RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C -M gssd_svc.c: ${RPCSRC} gssd.h @@ -30,6 +30,6 @@ gssd_xdr.c: ${RPCSRC} gssd.h gssd.h: ${RPCSRC} ${RPCGEN} -h -o ${.TARGET} ${RPCSRC} -.PATH: ${.CURDIR}/../../sys/kgssapi +.PATH: ${SRCTOP}/sys/kgssapi .include Modified: head/usr.sbin/hyperv/tools/kvp/Makefile ============================================================================== --- head/usr.sbin/hyperv/tools/kvp/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/hyperv/tools/kvp/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -2,12 +2,12 @@ .include -HV_KVP_DAEMON_DISTDIR?= ${.CURDIR}/../../../../contrib/hyperv/tools -.PATH: ${HV_KVP_DAEMON_DISTDIR} +HV_KVP_DAEMON_DISTDIR?= ${SRCTOP}/contrib/hyperv/tools +.PATH: ${HV_KVP_DAEMON_DISTDIR} PROG= hv_kvp_daemon -MAN= hv_kvp_daemon.8 +MAN= hv_kvp_daemon.8 -CFLAGS+= -I${.CURDIR}/../../../../sys/dev/hyperv/utilities +CFLAGS+= -I${SRCTOP}/sys/dev/hyperv/utilities .include Modified: head/usr.sbin/hyperv/tools/vss/Makefile ============================================================================== --- head/usr.sbin/hyperv/tools/vss/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/hyperv/tools/vss/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -3,12 +3,12 @@ DIRDEPS = lib/libc .include -HV_VSS_DAEMON_DISTDIR?= ${.CURDIR}/../../../../contrib/hyperv/tools -.PATH: ${HV_VSS_DAEMON_DISTDIR} +HV_VSS_DAEMON_DISTDIR?= ${SRCTOP}/contrib/hyperv/tools +.PATH: ${HV_VSS_DAEMON_DISTDIR} PROG= hv_vss_daemon -MAN= hv_vss_daemon.8 +MAN= hv_vss_daemon.8 -CFLAGS+= -I${.CURDIR}/../../../../sys/dev/hyperv/utilities +CFLAGS+= -I${SRCTOP}/sys/dev/hyperv/utilities .include Modified: head/usr.sbin/iovctl/Makefile ============================================================================== --- head/usr.sbin/iovctl/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/iovctl/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -4,7 +4,7 @@ PROG= iovctl SRCS= iovctl.c parse.c validate.c LIBADD= nv ucl m -CFLAGS+=-I${.CURDIR}/../../contrib/libucl/include +CFLAGS+=-I${SRCTOP}/contrib/libucl/include WARNS?=6 Modified: head/usr.sbin/ipfwpcap/Makefile ============================================================================== --- head/usr.sbin/ipfwpcap/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/ipfwpcap/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -7,7 +7,7 @@ PROG= ipfwpcap LIBADD= pcap -CFLAGS+=-I${.CURDIR}/../../contrib/libpcap +CFLAGS+=-I${SRCTOP}/contrib/libpcap MAN= ipfwpcap.8 Modified: head/usr.sbin/iscsid/Makefile ============================================================================== --- head/usr.sbin/iscsid/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/iscsid/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -4,8 +4,8 @@ PACKAGE= iscsi PROG= iscsid SRCS= chap.c discovery.c iscsid.c keys.c log.c login.c pdu.c CFLAGS+= -I${.CURDIR} -CFLAGS+= -I${.CURDIR}/../../sys/cam -CFLAGS+= -I${.CURDIR}/../../sys/dev/iscsi +CFLAGS+= -I${SRCTOP}/sys/cam +CFLAGS+= -I${SRCTOP}/sys/dev/iscsi CFLAGS+= -DICL_KERNEL_PROXY MAN= iscsid.8 Modified: head/usr.sbin/mailstats/Makefile ============================================================================== --- head/usr.sbin/mailstats/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/mailstats/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,7 +1,7 @@ # @(#)Makefile 8.2 (Berkeley) 9/21/96 # $FreeBSD$ -SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR= ${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/mailstats PROG= mailstats Modified: head/usr.sbin/mailwrapper/Makefile ============================================================================== --- head/usr.sbin/mailwrapper/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/mailwrapper/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -27,7 +27,7 @@ SYMLINKS+= ${BINDIR}/mailwrapper /bin/rm .if ${MK_MAILWRAPPER} != "no" .if !exists(${DESTDIR}/etc/mail/mailer.conf) -FILES= ${.CURDIR}/../../etc/mail/mailer.conf +FILES= ${SRCTOP}/etc/mail/mailer.conf FILESDIR= /etc/mail FILESMODE= 644 .endif Modified: head/usr.sbin/makemap/Makefile ============================================================================== --- head/usr.sbin/makemap/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/makemap/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,7 +1,7 @@ # @(#)Makefile 8.4 (Berkeley) 6/10/97 # $FreeBSD$ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/makemap PROG= makemap Modified: head/usr.sbin/mlxcontrol/Makefile ============================================================================== --- head/usr.sbin/mlxcontrol/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/mlxcontrol/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -4,7 +4,7 @@ PROG= mlxcontrol MAN= mlxcontrol.8 SRCS= command.c config.c interface.c util.c -CFLAGS+= -I${.CURDIR}/../../sys +CFLAGS+= -I${SRCTOP}/sys WARNS?= 2 Modified: head/usr.sbin/mount_smbfs/Makefile ============================================================================== --- head/usr.sbin/mount_smbfs/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/mount_smbfs/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -4,8 +4,8 @@ PROG= mount_smbfs SRCS= mount_smbfs.c getmntopts.c MAN= mount_smbfs.8 -MOUNTDIR= ${.CURDIR}/../../sbin/mount -CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs +MOUNTDIR= ${SRCTOP}/sbin/mount +CONTRIBDIR= ${SRCTOP}/contrib/smbfs CFLAGS+= -DSMBFS -I${MOUNTDIR} -I${CONTRIBDIR}/include LIBADD= smb Modified: head/usr.sbin/mountd/Makefile ============================================================================== --- head/usr.sbin/mountd/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/mountd/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -5,7 +5,7 @@ PROG= mountd SRCS= mountd.c getmntopts.c MAN= exports.5 netgroup.5 mountd.8 -MOUNT= ${.CURDIR}/../../sbin/mount +MOUNT= ${SRCTOP}/sbin/mount CFLAGS+= -I${MOUNT} WARNS?= 2 Modified: head/usr.sbin/mpsutil/Makefile ============================================================================== --- head/usr.sbin/mpsutil/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/mpsutil/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -10,7 +10,7 @@ WARNS?= 3 LINKS= ${BINDIR}/mpsutil ${BINDIR}/mprutil MLINKS= mpsutil.8 mprutil.8 -CFLAGS+= -I${.CURDIR}/../../sys -I. -DUSE_MPT_IOCTLS +CFLAGS+= -I${SRCTOP}/sys -I. -DUSE_MPT_IOCTLS # Avoid dirdep dependency on libutil CFLAGS+= -I${SRCTOP}/lib/libutil Modified: head/usr.sbin/ndiscvt/Makefile ============================================================================== --- head/usr.sbin/ndiscvt/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/ndiscvt/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../sys/compat/ndis +.PATH: ${SRCTOP}/sys/compat/ndis PROG= ndiscvt SRCS= ndiscvt.c @@ -17,7 +17,7 @@ LIBADD= l YFLAGS+=-v -CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../sys +CFLAGS+=-I. -I${.CURDIR} -I${SRCTOP}/sys CLEANFILES= y.output Modified: head/usr.sbin/ndp/Makefile ============================================================================== --- head/usr.sbin/ndp/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/ndp/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -13,13 +13,13 @@ # A PARTICULAR PURPOSE. # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/tcpdump +.PATH: ${SRCTOP}/contrib/tcpdump PROG= ndp MAN= ndp.8 SRCS= ndp.c gmt2local.c -CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../../contrib/tcpdump +CFLAGS+= -I. -I${.CURDIR} -I${SRCTOP}/contrib/tcpdump CFLAGS+= -D_U_="" WARNS?= 1 Modified: head/usr.sbin/nmtree/Makefile ============================================================================== --- head/usr.sbin/nmtree/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/nmtree/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -2,18 +2,18 @@ .include -.PATH: ${.CURDIR}/../../contrib/mtree +.PATH: ${SRCTOP}/contrib/mtree PROG= mtree MAN= mtree.5 mtree.8 SRCS= compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \ only.c spec.c specspec.c verify.c -CFLAGS+= -I${.CURDIR}/../../contrib/mknod -.PATH: ${.CURDIR}/../../contrib/mknod +CFLAGS+= -I${SRCTOP}/contrib/mknod +.PATH: ${SRCTOP}/contrib/mknod SRCS+= pack_dev.c -CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd +CFLAGS+= -I${SRCTOP}/lib/libnetbsd LIBADD= netbsd md util LINKS= ${BINDIR}/mtree ${BINDIR}/nmtree Modified: head/usr.sbin/pkg/Makefile ============================================================================== --- head/usr.sbin/pkg/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/pkg/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -4,8 +4,8 @@ PROG= pkg SRCS= pkg.c dns_utils.c config.c MAN= pkg.7 -CFLAGS+=-I${.CURDIR}/../../contrib/libucl/include -.PATH: ${.CURDIR}/../../contrib/libucl/include +CFLAGS+=-I${SRCTOP}/contrib/libucl/include +.PATH: ${SRCTOP}/contrib/libucl/include LIBADD= archive fetch ucl sbuf crypto ssl .include Modified: head/usr.sbin/pnpinfo/Makefile ============================================================================== --- head/usr.sbin/pnpinfo/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/pnpinfo/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,11 +1,11 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/pnpinfo +.PATH: ${SRCTOP}/contrib/pnpinfo PROG= pnpinfo MAN= pnpinfo.8 -CFLAGS+= -I${.CURDIR}/../../sys +CFLAGS+= -I${SRCTOP}/sys WARNS?= 2 Modified: head/usr.sbin/praliases/Makefile ============================================================================== --- head/usr.sbin/praliases/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/praliases/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,7 +1,7 @@ # @(#)Makefile 8.2 (Berkeley) 9/21/96 # $FreeBSD$ -SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR= ${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/praliases PROG= praliases Modified: head/usr.sbin/praudit/Makefile ============================================================================== --- head/usr.sbin/praudit/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/praudit/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -2,7 +2,7 @@ # $FreeBSD$ # -OPENBSMDIR=${.CURDIR}/../../contrib/openbsm +OPENBSMDIR=${SRCTOP}/contrib/openbsm .PATH: ${OPENBSMDIR}/bin/praudit PROG= praudit Modified: head/usr.sbin/pwd_mkdb/Makefile ============================================================================== --- head/usr.sbin/pwd_mkdb/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/pwd_mkdb/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,12 +1,12 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../../lib/libc/gen # for pw_scan.c +.PATH: ${SRCTOP}/lib/libc/gen # for pw_scan.c PROG= pwd_mkdb MAN= pwd_mkdb.8 SRCS= pw_scan.c pwd_mkdb.c -CFLAGS+= -I${.CURDIR}/../../lib/libc/gen # for pw_scan.h +CFLAGS+= -I${SRCTOP}/lib/libc/gen # for pw_scan.h .include Modified: head/usr.sbin/rip6query/Makefile ============================================================================== --- head/usr.sbin/rip6query/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/rip6query/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -4,6 +4,6 @@ PROG= rip6query MAN= rip6query.8 -CFLAGS+= -I${.CURDIR}/../route6d +CFLAGS+= -I${.CURDIR:H}/route6d .include Modified: head/usr.sbin/rpcbind/tests/Makefile ============================================================================== --- head/usr.sbin/rpcbind/tests/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/rpcbind/tests/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -5,7 +5,7 @@ .PATH: ${.CURDIR}/.. ATF_TESTS_C= addrmerge_test -CFLAGS+= -I${.CURDIR}/.. -Wno-cast-qual +CFLAGS+= -I${.CURDIR:H} -Wno-cast-qual SRCS.addrmerge_test= addrmerge_test.c util.c .if ${MK_INET6_SUPPORT} != "no" Modified: head/usr.sbin/rtadvctl/Makefile ============================================================================== --- head/usr.sbin/rtadvctl/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/rtadvctl/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,13 +1,13 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../rtadvd +.PATH: ${.CURDIR:H}/rtadvd PROG= rtadvctl MAN= rtadvctl.8 SRCS= rtadvctl.c control.c control_client.c if.c timer_subr.c -CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../rtadvd +CFLAGS+= -I${.CURDIR} -I${.CURDIR:H}/rtadvd WARNS?= 1 .include Modified: head/usr.sbin/sa/Makefile ============================================================================== --- head/usr.sbin/sa/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/sa/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -2,7 +2,7 @@ .include -.PATH: ${.CURDIR}/../../usr.bin/lastcomm +.PATH: ${SRCTOP}/usr.bin/lastcomm PROG= sa MAN= sa.8 Modified: head/usr.sbin/sendmail/Makefile ============================================================================== --- head/usr.sbin/sendmail/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/sendmail/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -4,14 +4,14 @@ .include PACKAGE=sendmail -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR=${SRCTOP}/contrib/sendmail SMDIR= ${SENDMAIL_DIR}/src .PATH: ${SMDIR} BINDIR= ${LIBEXECDIR}/sendmail PROG= sendmail -MAN= mailq.1 newaliases.1 aliases.5 sendmail.8 +MAN= mailq.1 newaliases.1 aliases.5 sendmail.8 MLINKS+=sendmail.8 hoststat.8 MLINKS+=sendmail.8 purgestat.8 SRCS= alias.c arpadate.c bf.c collect.c conf.c control.c \ Modified: head/usr.sbin/tcpdump/tcpdump/Makefile ============================================================================== --- head/usr.sbin/tcpdump/tcpdump/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/tcpdump/tcpdump/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -2,7 +2,7 @@ .include -TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump +TCPDUMP_DISTDIR?= ${SRCTOP}/contrib/tcpdump .PATH: ${TCPDUMP_DISTDIR} PROG= tcpdump Modified: head/usr.sbin/timed/timedc/Makefile ============================================================================== --- head/usr.sbin/timed/timedc/Makefile Sat Mar 4 11:35:30 2017 (r314658) +++ head/usr.sbin/timed/timedc/Makefile Sat Mar 4 11:38:03 2017 (r314659) @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../timed +.PATH: ${.CURDIR:H}/timed PROG= timedc MAN= timedc.8 From owner-svn-src-all@freebsd.org Sat Mar 4 11:45:19 2017 Return-Path: Delivered-To: svn-src-all@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 EF7EACF9F98; Sat, 4 Mar 2017 11:45:19 +0000 (UTC) (envelope-from matthew@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 BF1A21BF7; Sat, 4 Mar 2017 11:45:19 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24BjIpK039437; Sat, 4 Mar 2017 11:45:18 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24BjIgY039436; Sat, 4 Mar 2017 11:45:18 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201703041145.v24BjIgY039436@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Sat, 4 Mar 2017 11:45:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org Subject: svn commit: r314660 - svnadmin/conf X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 11:45:20 -0000 Author: matthew (ports committer) Date: Sat Mar 4 11:45:18 2017 New Revision: 314660 URL: https://svnweb.freebsd.org/changeset/base/314660 Log: Restore edavis commit bit at his request. Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access ============================================================================== --- svnadmin/conf/access Sat Mar 4 11:38:03 2017 (r314659) +++ svnadmin/conf/access Sat Mar 4 11:45:18 2017 (r314660) @@ -67,6 +67,7 @@ dumbbell dwmalone dwmalone=freebsd-committers@maths.tcd.ie eadler ed +edavis emaste emax eri From owner-svn-src-all@freebsd.org Sat Mar 4 12:04:20 2017 Return-Path: Delivered-To: svn-src-all@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 5AF5ACF7F84; Sat, 4 Mar 2017 12:04:20 +0000 (UTC) (envelope-from avg@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 230A71A12; Sat, 4 Mar 2017 12:04:20 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24C4Jfk047539; Sat, 4 Mar 2017 12:04:19 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24C4J6b047538; Sat, 4 Mar 2017 12:04:19 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703041204.v24C4J6b047538@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Sat, 4 Mar 2017 12:04:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314661 - stable/11/sys/x86/x86 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 12:04:20 -0000 Author: avg Date: Sat Mar 4 12:04:19 2017 New Revision: 314661 URL: https://svnweb.freebsd.org/changeset/base/314661 Log: MFC r314357: edge-triggered interrupt mode is set by clearing APIC_LVT_TM Modified: stable/11/sys/x86/x86/local_apic.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/x86/x86/local_apic.c ============================================================================== --- stable/11/sys/x86/x86/local_apic.c Sat Mar 4 11:45:18 2017 (r314660) +++ stable/11/sys/x86/x86/local_apic.c Sat Mar 4 12:04:19 2017 (r314661) @@ -398,7 +398,7 @@ lvt_mode(struct lapic *la, u_int pin, ui if (!lvt->lvt_edgetrigger && bootverbose) { printf("lapic%u: Forcing LINT%u to edge trigger\n", la->la_id, pin); - value |= APIC_LVT_TM; + value &= ~APIC_LVT_TM; } /* Use a vector of 0. */ break; From owner-svn-src-all@freebsd.org Sat Mar 4 12:04:26 2017 Return-Path: Delivered-To: svn-src-all@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 77E0CCF7FCB; Sat, 4 Mar 2017 12:04:26 +0000 (UTC) (envelope-from avg@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 40B931A51; Sat, 4 Mar 2017 12:04:26 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24C4Pbp047591; Sat, 4 Mar 2017 12:04:25 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24C4PPk047590; Sat, 4 Mar 2017 12:04:25 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703041204.v24C4PPk047590@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Sat, 4 Mar 2017 12:04:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314662 - stable/10/sys/x86/x86 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 12:04:26 -0000 Author: avg Date: Sat Mar 4 12:04:24 2017 New Revision: 314662 URL: https://svnweb.freebsd.org/changeset/base/314662 Log: MFC r314357: edge-triggered interrupt mode is set by clearing APIC_LVT_TM Modified: stable/10/sys/x86/x86/local_apic.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/x86/x86/local_apic.c ============================================================================== --- stable/10/sys/x86/x86/local_apic.c Sat Mar 4 12:04:19 2017 (r314661) +++ stable/10/sys/x86/x86/local_apic.c Sat Mar 4 12:04:24 2017 (r314662) @@ -206,7 +206,7 @@ lvt_mode(struct lapic *la, u_int pin, ui if (!lvt->lvt_edgetrigger) { printf("lapic%u: Forcing LINT%u to edge trigger\n", la->la_id, pin); - value |= APIC_LVT_TM; + value &= ~APIC_LVT_TM; } /* Use a vector of 0. */ break; From owner-svn-src-all@freebsd.org Sat Mar 4 12:05:48 2017 Return-Path: Delivered-To: svn-src-all@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 2E8F7CF80DA; Sat, 4 Mar 2017 12:05:48 +0000 (UTC) (envelope-from avg@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 DE2871CDD; Sat, 4 Mar 2017 12:05:47 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24C5kPS047724; Sat, 4 Mar 2017 12:05:46 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24C5kGa047719; Sat, 4 Mar 2017 12:05:46 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703041205.v24C5kGa047719@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Sat, 4 Mar 2017 12:05:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314663 - stable/11/sys/vm X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 12:05:48 -0000 Author: avg Date: Sat Mar 4 12:05:46 2017 New Revision: 314663 URL: https://svnweb.freebsd.org/changeset/base/314663 Log: MFC r314272: call vm_lowmem hook in uma_reclaim_worker Modified: stable/11/sys/vm/uma_core.c stable/11/sys/vm/vm_kern.c stable/11/sys/vm/vm_pageout.c stable/11/sys/vm/vm_pageout.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/vm/uma_core.c ============================================================================== --- stable/11/sys/vm/uma_core.c Sat Mar 4 12:04:24 2017 (r314662) +++ stable/11/sys/vm/uma_core.c Sat Mar 4 12:05:46 2017 (r314663) @@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -3199,6 +3200,9 @@ uma_reclaim_worker(void *arg __unused) "umarcl", 0); if (uma_reclaim_needed) { uma_reclaim_needed = 0; + sx_xunlock(&uma_drain_lock); + EVENTHANDLER_INVOKE(vm_lowmem, VM_LOW_KMEM); + sx_xlock(&uma_drain_lock); uma_reclaim_locked(true); } } Modified: stable/11/sys/vm/vm_kern.c ============================================================================== --- stable/11/sys/vm/vm_kern.c Sat Mar 4 12:04:24 2017 (r314662) +++ stable/11/sys/vm/vm_kern.c Sat Mar 4 12:05:46 2017 (r314663) @@ -549,11 +549,13 @@ debug_vm_lowmem(SYSCTL_HANDLER_ARGS) error = sysctl_handle_int(oidp, &i, 0, req); if (error) return (error); - if (i) - EVENTHANDLER_INVOKE(vm_lowmem, 0); + if ((i & ~(VM_LOW_KMEM | VM_LOW_PAGES)) != 0) + return (EINVAL); + if (i != 0) + EVENTHANDLER_INVOKE(vm_lowmem, i); return (0); } SYSCTL_PROC(_debug, OID_AUTO, vm_lowmem, CTLTYPE_INT | CTLFLAG_RW, 0, 0, - debug_vm_lowmem, "I", "set to trigger vm_lowmem event"); + debug_vm_lowmem, "I", "set to trigger vm_lowmem event with given flags"); #endif Modified: stable/11/sys/vm/vm_pageout.c ============================================================================== --- stable/11/sys/vm/vm_pageout.c Sat Mar 4 12:04:24 2017 (r314662) +++ stable/11/sys/vm/vm_pageout.c Sat Mar 4 12:05:46 2017 (r314663) @@ -871,7 +871,7 @@ vm_pageout_scan(struct vm_domain *vmd, i * Decrease registered cache sizes. */ SDT_PROBE0(vm, , , vm__lowmem_scan); - EVENTHANDLER_INVOKE(vm_lowmem, 0); + EVENTHANDLER_INVOKE(vm_lowmem, VM_LOW_PAGES); /* * We do this explicitly after the caches have been * drained above. Modified: stable/11/sys/vm/vm_pageout.h ============================================================================== --- stable/11/sys/vm/vm_pageout.h Sat Mar 4 12:04:24 2017 (r314662) +++ stable/11/sys/vm/vm_pageout.h Sat Mar 4 12:05:46 2017 (r314663) @@ -87,6 +87,12 @@ extern bool vm_pages_needed; #define VM_OOM_SWAPZ 2 /* + * vm_lowmem flags. + */ +#define VM_LOW_KMEM 0x01 +#define VM_LOW_PAGES 0x02 + +/* * Exported routines. */ From owner-svn-src-all@freebsd.org Sat Mar 4 12:05:52 2017 Return-Path: Delivered-To: svn-src-all@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 0B940CF8115; Sat, 4 Mar 2017 12:05:52 +0000 (UTC) (envelope-from avg@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 BF9BE1CF0; Sat, 4 Mar 2017 12:05:51 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24C5owc047777; Sat, 4 Mar 2017 12:05:50 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24C5oqx047773; Sat, 4 Mar 2017 12:05:50 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703041205.v24C5oqx047773@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Sat, 4 Mar 2017 12:05:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314664 - stable/10/sys/vm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 12:05:52 -0000 Author: avg Date: Sat Mar 4 12:05:50 2017 New Revision: 314664 URL: https://svnweb.freebsd.org/changeset/base/314664 Log: MFC r314272: call vm_lowmem hook in uma_reclaim_worker Modified: stable/10/sys/vm/uma_core.c stable/10/sys/vm/vm_kern.c stable/10/sys/vm/vm_pageout.c stable/10/sys/vm/vm_pageout.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/vm/uma_core.c ============================================================================== --- stable/10/sys/vm/uma_core.c Sat Mar 4 12:05:46 2017 (r314663) +++ stable/10/sys/vm/uma_core.c Sat Mar 4 12:05:50 2017 (r314664) @@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -3244,6 +3245,9 @@ uma_reclaim_worker(void *arg __unused) "umarcl", 0); if (uma_reclaim_needed) { uma_reclaim_needed = 0; + sx_xunlock(&uma_drain_lock); + EVENTHANDLER_INVOKE(vm_lowmem, VM_LOW_KMEM); + sx_xlock(&uma_drain_lock); uma_reclaim_locked(true); } } Modified: stable/10/sys/vm/vm_kern.c ============================================================================== --- stable/10/sys/vm/vm_kern.c Sat Mar 4 12:05:46 2017 (r314663) +++ stable/10/sys/vm/vm_kern.c Sat Mar 4 12:05:50 2017 (r314664) @@ -542,11 +542,13 @@ debug_vm_lowmem(SYSCTL_HANDLER_ARGS) error = sysctl_handle_int(oidp, &i, 0, req); if (error) return (error); - if (i) - EVENTHANDLER_INVOKE(vm_lowmem, 0); + if ((i & ~(VM_LOW_KMEM | VM_LOW_PAGES)) != 0) + return (EINVAL); + if (i != 0) + EVENTHANDLER_INVOKE(vm_lowmem, i); return (0); } SYSCTL_PROC(_debug, OID_AUTO, vm_lowmem, CTLTYPE_INT | CTLFLAG_RW, 0, 0, - debug_vm_lowmem, "I", "set to trigger vm_lowmem event"); + debug_vm_lowmem, "I", "set to trigger vm_lowmem event with given flags"); #endif Modified: stable/10/sys/vm/vm_pageout.c ============================================================================== --- stable/10/sys/vm/vm_pageout.c Sat Mar 4 12:05:46 2017 (r314663) +++ stable/10/sys/vm/vm_pageout.c Sat Mar 4 12:05:50 2017 (r314664) @@ -962,7 +962,7 @@ vm_pageout_scan(struct vm_domain *vmd, i * Decrease registered cache sizes. */ SDT_PROBE0(vm, , , vm__lowmem_scan); - EVENTHANDLER_INVOKE(vm_lowmem, 0); + EVENTHANDLER_INVOKE(vm_lowmem, VM_LOW_PAGES); /* * We do this explicitly after the caches have been * drained above. Modified: stable/10/sys/vm/vm_pageout.h ============================================================================== --- stable/10/sys/vm/vm_pageout.h Sat Mar 4 12:05:46 2017 (r314663) +++ stable/10/sys/vm/vm_pageout.h Sat Mar 4 12:05:50 2017 (r314664) @@ -87,6 +87,12 @@ extern int vm_pageout_page_count; #define VM_OOM_SWAPZ 2 /* + * vm_lowmem flags. + */ +#define VM_LOW_KMEM 0x01 +#define VM_LOW_PAGES 0x02 + +/* * Exported routines. */ From owner-svn-src-all@freebsd.org Sat Mar 4 12:42:53 2017 Return-Path: Delivered-To: svn-src-all@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 EAD79CF8F2A; Sat, 4 Mar 2017 12:42:53 +0000 (UTC) (envelope-from avg@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 C2C4B1016; Sat, 4 Mar 2017 12:42:53 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24Cgqk3064357; Sat, 4 Mar 2017 12:42:52 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24CgqOj064354; Sat, 4 Mar 2017 12:42:52 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703041242.v24CgqOj064354@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Sat, 4 Mar 2017 12:42:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314665 - in stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 12:42:54 -0000 Author: avg Date: Sat Mar 4 12:42:52 2017 New Revision: 314665 URL: https://svnweb.freebsd.org/changeset/base/314665 Log: MFC r314273: zfs: call spa_deadman on a taskqueue thread Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Sat Mar 4 12:05:50 2017 (r314664) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Sat Mar 4 12:42:52 2017 (r314665) @@ -173,10 +173,6 @@ uint_t zio_taskq_basedc = 80; /* base boolean_t spa_create_process = B_TRUE; /* no process ==> no sysdc */ extern int zfs_sync_pass_deferred_free; -#ifndef illumos -extern void spa_deadman(void *arg); -#endif - /* * This (illegal) pool name is used when temporarily importing a spa_t in order * to get the vdev stats associated with the imported devices. @@ -6880,8 +6876,8 @@ spa_sync(spa_t *spa, uint64_t txg) spa->spa_sync_starttime + spa->spa_deadman_synctime)); #else /* !illumos */ #ifdef _KERNEL - callout_reset(&spa->spa_deadman_cycid, - hz * spa->spa_deadman_synctime / NANOSEC, spa_deadman, spa); + callout_schedule(&spa->spa_deadman_cycid, + hz * spa->spa_deadman_synctime / NANOSEC); #endif #endif /* illumos */ Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c Sat Mar 4 12:05:50 2017 (r314664) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c Sat Mar 4 12:42:52 2017 (r314665) @@ -597,8 +597,8 @@ spa_lookup(const char *name) * If the zfs_deadman_enabled flag is set then it inspects all vdev queues * looking for potentially hung I/Os. */ -void -spa_deadman(void *arg) +static void +spa_deadman(void *arg, int pending) { spa_t *spa = arg; @@ -627,6 +627,16 @@ spa_deadman(void *arg) #endif } +#if defined(__FreeBSD__) && defined(_KERNEL) +static void +spa_deadman_timeout(void *arg) +{ + spa_t *spa = arg; + + taskqueue_enqueue(taskqueue_thread, &spa->spa_deadman_task); +} +#endif + /* * Create an uninitialized spa_t with the given name. Requires * spa_namespace_lock. The caller must ensure that the spa_t doesn't already @@ -698,7 +708,23 @@ spa_add(const char *name, nvlist_t *conf mutex_exit(&cpu_lock); #else /* !illumos */ #ifdef _KERNEL + /* + * callout(9) does not provide a way to initialize a callout with + * a function and an argument, so we use callout_reset() to schedule + * the callout in the very distant future. Even if that event ever + * fires, it should be okayas we won't have any active zio-s. + * But normally spa_sync() will reschedule the callout with a proper + * timeout. + * callout(9) does not allow the callback function to sleep but + * vdev_deadman() needs to acquire vq_lock and illumos mutexes are + * emulated using sx(9). For this reason spa_deadman_timeout() + * will schedule spa_deadman() as task on a taskqueue that allows + * sleeping. + */ + TASK_INIT(&spa->spa_deadman_task, 0, spa_deadman, spa); callout_init(&spa->spa_deadman_cycid, 1); + callout_reset_sbt(&spa->spa_deadman_cycid, SBT_MAX, 0, + spa_deadman_timeout, spa, 0); #endif #endif refcount_create(&spa->spa_refcount); @@ -811,6 +837,7 @@ spa_remove(spa_t *spa) #else /* !illumos */ #ifdef _KERNEL callout_drain(&spa->spa_deadman_cycid); + taskqueue_drain(taskqueue_thread, &spa->spa_deadman_task); #endif #endif Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h Sat Mar 4 12:05:50 2017 (r314664) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h Sat Mar 4 12:42:52 2017 (r314665) @@ -267,6 +267,7 @@ struct spa { #else /* !illumos */ #ifdef _KERNEL struct callout spa_deadman_cycid; /* callout id */ + struct task spa_deadman_task; #endif #endif /* illumos */ uint64_t spa_deadman_calls; /* number of deadman calls */ From owner-svn-src-all@freebsd.org Sat Mar 4 12:51:58 2017 Return-Path: Delivered-To: svn-src-all@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 D0AF5CF9164; Sat, 4 Mar 2017 12:51:58 +0000 (UTC) (envelope-from avg@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 A03FF1525; Sat, 4 Mar 2017 12:51:58 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24CpvLc068350; Sat, 4 Mar 2017 12:51:57 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24Cpv6D068349; Sat, 4 Mar 2017 12:51:57 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703041251.v24Cpv6D068349@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Sat, 4 Mar 2017 12:51:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314666 - head/sys/dev/ioat X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 12:51:58 -0000 Author: avg Date: Sat Mar 4 12:51:57 2017 New Revision: 314666 URL: https://svnweb.freebsd.org/changeset/base/314666 Log: ioat: don't specify inline for function with variable argument list Modern GCC and Clang simply ignore the qualifier, while the old base GCC produces a warning (treated as an error in the kernel build). Approved by: cem MFC after: 5 days Modified: head/sys/dev/ioat/ioat_test.c Modified: head/sys/dev/ioat/ioat_test.c ============================================================================== --- head/sys/dev/ioat/ioat_test.c Sat Mar 4 12:42:52 2017 (r314665) +++ head/sys/dev/ioat/ioat_test.c Sat Mar 4 12:51:57 2017 (r314666) @@ -79,7 +79,7 @@ static int g_thread_index = 1; static struct cdev *g_ioat_cdev = NULL; #define ioat_test_log(v, ...) _ioat_test_log((v), "ioat_test: " __VA_ARGS__) -static inline void _ioat_test_log(int verbosity, const char *fmt, ...); +static void _ioat_test_log(int verbosity, const char *fmt, ...); static void ioat_test_transaction_destroy(struct test_transaction *tx) @@ -579,7 +579,7 @@ ioat_test_detach(void) mtx_unlock(&Giant); } -static inline void +static void _ioat_test_log(int verbosity, const char *fmt, ...) { va_list argp; From owner-svn-src-all@freebsd.org Sat Mar 4 13:01:37 2017 Return-Path: Delivered-To: svn-src-all@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 37AFACF935C; Sat, 4 Mar 2017 13:01:37 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citapm.icyb.net.ua (citapm.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 1B2D11A3C; Sat, 4 Mar 2017 13:01:35 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citapm.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id PAA01048; Sat, 04 Mar 2017 15:01:33 +0200 (EET) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1ck9JV-000Bsl-Bt; Sat, 04 Mar 2017 15:01:33 +0200 Subject: Re: svn commit: r314666 - head/sys/dev/ioat To: src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org References: <201703041251.v24Cpv6D068349@repo.freebsd.org> From: Andriy Gapon Message-ID: <07435c71-c634-fd88-7281-d9e0a8e7eecf@FreeBSD.org> Date: Sat, 4 Mar 2017 15:00:37 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <201703041251.v24Cpv6D068349@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 13:01:37 -0000 On 04/03/2017 14:51, Andriy Gapon wrote: > Author: avg > Date: Sat Mar 4 12:51:57 2017 > New Revision: 314666 > URL: https://svnweb.freebsd.org/changeset/base/314666 > > Log: > ioat: don't specify inline for function with variable argument list > > Modern GCC and Clang simply ignore the qualifier, while the old base GCC > produces a warning (treated as an error in the kernel build). Just in case, here is the exact error that I see: ioat_test.c:593: warning: function '_ioat_test_log' can never be inlined because it uses variable argument lists [-Winline] > Approved by: cem > MFC after: 5 days > > Modified: > head/sys/dev/ioat/ioat_test.c > > Modified: head/sys/dev/ioat/ioat_test.c > ============================================================================== > --- head/sys/dev/ioat/ioat_test.c Sat Mar 4 12:42:52 2017 (r314665) > +++ head/sys/dev/ioat/ioat_test.c Sat Mar 4 12:51:57 2017 (r314666) > @@ -79,7 +79,7 @@ static int g_thread_index = 1; > static struct cdev *g_ioat_cdev = NULL; > > #define ioat_test_log(v, ...) _ioat_test_log((v), "ioat_test: " __VA_ARGS__) > -static inline void _ioat_test_log(int verbosity, const char *fmt, ...); > +static void _ioat_test_log(int verbosity, const char *fmt, ...); > > static void > ioat_test_transaction_destroy(struct test_transaction *tx) > @@ -579,7 +579,7 @@ ioat_test_detach(void) > mtx_unlock(&Giant); > } > > -static inline void > +static void > _ioat_test_log(int verbosity, const char *fmt, ...) > { > va_list argp; > -- Andriy Gapon From owner-svn-src-all@freebsd.org Sat Mar 4 13:03:40 2017 Return-Path: Delivered-To: svn-src-all@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 362AFCF959D; Sat, 4 Mar 2017 13:03:40 +0000 (UTC) (envelope-from avg@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 C7F831D6F; Sat, 4 Mar 2017 13:03:39 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24D3c3S072801; Sat, 4 Mar 2017 13:03:38 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24D3Vfi072728; Sat, 4 Mar 2017 13:03:31 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703041303.v24D3Vfi072728@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Sat, 4 Mar 2017 13:03:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314667 - in stable/10/sys: amd64/amd64 cddl/contrib/opensolaris/uts/common/dtrace cddl/contrib/opensolaris/uts/common/fs/zfs cddl/dev/profile compat/ndis contrib/ipfilter/netinet dev/a... X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 13:03:40 -0000 Author: avg Date: Sat Mar 4 13:03:31 2017 New Revision: 314667 URL: https://svnweb.freebsd.org/changeset/base/314667 Log: MFC r283291: don't use CALLOUT_MPSAFE with callout_init() The main purpose of this MFC is to reduce conflicts for other merges. Parts of the original change have already "trickled down" via individual MFCs. Modified: stable/10/sys/amd64/amd64/mp_watchdog.c stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c stable/10/sys/cddl/dev/profile/profile.c stable/10/sys/compat/ndis/subr_ntoskrnl.c stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c stable/10/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c stable/10/sys/dev/ath/if_ath.c stable/10/sys/dev/ce/if_ce.c stable/10/sys/dev/cp/if_cp.c stable/10/sys/dev/ctau/if_ct.c stable/10/sys/dev/cx/if_cx.c stable/10/sys/dev/cxgb/cxgb_main.c stable/10/sys/dev/cxgb/cxgb_sge.c stable/10/sys/dev/dcons/dcons_os.c stable/10/sys/dev/drm2/drm_irq.c stable/10/sys/dev/drm2/i915/intel_display.c stable/10/sys/dev/glxsb/glxsb.c stable/10/sys/dev/gxemul/cons/gxemul_cons.c stable/10/sys/dev/hifn/hifn7751.c stable/10/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c stable/10/sys/dev/if_ndis/if_ndis.c stable/10/sys/dev/isci/isci_io_request.c stable/10/sys/dev/mfi/mfi.c stable/10/sys/dev/mwl/if_mwl.c stable/10/sys/dev/nand/nandsim_chip.c stable/10/sys/dev/ntb/ntb_hw/ntb_hw.c stable/10/sys/dev/nxge/if_nxge.c stable/10/sys/dev/oce/oce_if.c stable/10/sys/dev/patm/if_patm_attach.c stable/10/sys/dev/rndtest/rndtest.c stable/10/sys/dev/safe/safe.c stable/10/sys/dev/sound/midi/mpu401.c stable/10/sys/dev/sound/pci/atiixp.c stable/10/sys/dev/sound/pci/es137x.c stable/10/sys/dev/sound/pci/hda/hdaa.c stable/10/sys/dev/sound/pci/hda/hdac.c stable/10/sys/dev/sound/pci/via8233.c stable/10/sys/dev/twa/tw_osl_freebsd.c stable/10/sys/dev/tws/tws.c stable/10/sys/dev/ubsec/ubsec.c stable/10/sys/dev/virtio/random/virtio_random.c stable/10/sys/dev/xen/netfront/netfront.c stable/10/sys/fs/nfs/nfs_commonport.c stable/10/sys/gdb/gdb_cons.c stable/10/sys/geom/gate/g_gate.c stable/10/sys/geom/journal/g_journal.c stable/10/sys/geom/mirror/g_mirror.c stable/10/sys/geom/raid3/g_raid3.c stable/10/sys/geom/sched/gs_rr.c stable/10/sys/i386/i386/mp_watchdog.c stable/10/sys/kern/init_main.c stable/10/sys/kern/kern_synch.c stable/10/sys/kern/kern_thread.c stable/10/sys/kern/subr_vmem.c stable/10/sys/kern/uipc_domain.c stable/10/sys/mips/cavium/octe/ethernet.c stable/10/sys/mips/cavium/octeon_rnd.c stable/10/sys/mips/nlm/dev/net/xlpge.c stable/10/sys/mips/rmi/dev/xlr/rge.c stable/10/sys/net/if_spppsubr.c stable/10/sys/net80211/ieee80211_ht.c stable/10/sys/net80211/ieee80211_hwmp.c stable/10/sys/net80211/ieee80211_mesh.c stable/10/sys/net80211/ieee80211_node.c stable/10/sys/net80211/ieee80211_proto.c stable/10/sys/netgraph/netflow/ng_netflow.c stable/10/sys/netgraph/netgraph.h stable/10/sys/netinet/in_pcb.c stable/10/sys/netinet/ip_mroute.c stable/10/sys/netinet/tcp_hostcache.c stable/10/sys/netinet/tcp_subr.c stable/10/sys/netinet6/in6_rmx.c stable/10/sys/netpfil/ipfw/ip_dummynet.c stable/10/sys/netpfil/ipfw/ip_fw_dynamic.c stable/10/sys/netpfil/pf/if_pfsync.c stable/10/sys/ofed/include/linux/timer.h stable/10/sys/ofed/include/linux/workqueue.h stable/10/sys/powerpc/mambo/mambo_console.c stable/10/sys/powerpc/pseries/phyp_console.c stable/10/sys/sys/callout.h stable/10/sys/vm/uma_core.c stable/10/sys/x86/x86/mca.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/amd64/amd64/mp_watchdog.c ============================================================================== --- stable/10/sys/amd64/amd64/mp_watchdog.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/amd64/amd64/mp_watchdog.c Sat Mar 4 13:03:31 2017 (r314667) @@ -86,7 +86,7 @@ static void watchdog_init(void *arg) { - callout_init(&watchdog_callout, CALLOUT_MPSAFE); + callout_init(&watchdog_callout, 1); if (watchdog_cpu != -1) watchdog_change(watchdog_cpu); } Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Sat Mar 4 13:03:31 2017 (r314667) @@ -14284,8 +14284,8 @@ dtrace_state_create(struct cdev *dev) state->dts_cleaner = CYCLIC_NONE; state->dts_deadman = CYCLIC_NONE; #else - callout_init(&state->dts_cleaner, CALLOUT_MPSAFE); - callout_init(&state->dts_deadman, CALLOUT_MPSAFE); + callout_init(&state->dts_cleaner, 1); + callout_init(&state->dts_deadman, 1); #endif state->dts_vstate.dtvs_state = state; Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c Sat Mar 4 13:03:31 2017 (r314667) @@ -698,7 +698,7 @@ spa_add(const char *name, nvlist_t *conf mutex_exit(&cpu_lock); #else /* !illumos */ #ifdef _KERNEL - callout_init(&spa->spa_deadman_cycid, CALLOUT_MPSAFE); + callout_init(&spa->spa_deadman_cycid, 1); #endif #endif refcount_create(&spa->spa_refcount); Modified: stable/10/sys/cddl/dev/profile/profile.c ============================================================================== --- stable/10/sys/cddl/dev/profile/profile.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/cddl/dev/profile/profile.c Sat Mar 4 13:03:31 2017 (r314667) @@ -330,7 +330,7 @@ profile_create(hrtime_t interval, char * prof->prof_cyclic = CYCLIC_NONE; #else prof->prof_interval = nsec_to_sbt(interval); - callout_init(&prof->prof_cyclic, CALLOUT_MPSAFE); + callout_init(&prof->prof_cyclic, 1); #endif prof->prof_kind = kind; prof->prof_id = dtrace_probe_create(profile_id, @@ -578,7 +578,7 @@ profile_enable_omni(profile_probe_t *pro pcpu->profc_probe = prof; pcpu->profc_expected = sbinuptime() + prof->prof_interval; pcpu->profc_interval = prof->prof_interval; - callout_init(&pcpu->profc_cyclic, CALLOUT_MPSAFE); + callout_init(&pcpu->profc_cyclic, 1); callout_reset_sbt_on(&pcpu->profc_cyclic, pcpu->profc_expected, 0, profile_fire, pcpu, cpu, C_DIRECT_EXEC | C_ABSOLUTE); Modified: stable/10/sys/compat/ndis/subr_ntoskrnl.c ============================================================================== --- stable/10/sys/compat/ndis/subr_ntoskrnl.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/compat/ndis/subr_ntoskrnl.c Sat Mar 4 13:03:31 2017 (r314667) @@ -3746,7 +3746,7 @@ ntoskrnl_insert_timer(timer, ticks) timer->k_callout = c; - callout_init(c, CALLOUT_MPSAFE); + callout_init(c, 1); callout_reset(c, ticks, ntoskrnl_timercall, timer); } Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c ============================================================================== --- stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Mar 4 13:03:31 2017 (r314667) @@ -190,7 +190,7 @@ ipf_timer_func(arg) #if 0 softc->ipf_slow_ch = timeout(ipf_timer_func, softc, hz/2); #endif - callout_init(&softc->ipf_slow_ch, CALLOUT_MPSAFE); + callout_init(&softc->ipf_slow_ch, 1); callout_reset(&softc->ipf_slow_ch, (hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT, ipf_timer_func, softc); @@ -238,7 +238,7 @@ ipfattach(softc) softc->ipf_slow_ch = timeout(ipf_timer_func, softc, (hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT); #endif - callout_init(&softc->ipf_slow_ch, CALLOUT_MPSAFE); + callout_init(&softc->ipf_slow_ch, 1); callout_reset(&softc->ipf_slow_ch, (hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT, ipf_timer_func, softc); return 0; Modified: stable/10/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c ============================================================================== --- stable/10/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c Sat Mar 4 13:03:31 2017 (r314667) @@ -454,11 +454,11 @@ altera_jtag_uart_attach(struct altera_jt aju_intr_readable_enable(sc); AJU_UNLOCK(sc); } else { - callout_init(&sc->ajus_io_callout, CALLOUT_MPSAFE); + callout_init(&sc->ajus_io_callout, 1); callout_reset(&sc->ajus_io_callout, AJU_IO_POLLINTERVAL, aju_io_callout, sc); } - callout_init(&sc->ajus_ac_callout, CALLOUT_MPSAFE); + callout_init(&sc->ajus_ac_callout, 1); callout_reset(&sc->ajus_ac_callout, AJU_AC_POLLINTERVAL, aju_ac_callout, sc); return (0); Modified: stable/10/sys/dev/ath/if_ath.c ============================================================================== --- stable/10/sys/dev/ath/if_ath.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/ath/if_ath.c Sat Mar 4 13:03:31 2017 (r314667) @@ -547,7 +547,7 @@ ath_attach(u_int16_t devid, struct ath_s sc->sc_ledstate = 1; sc->sc_ledon = 0; /* low true */ sc->sc_ledidle = (2700*hz)/1000; /* 2.7sec */ - callout_init(&sc->sc_ledtimer, CALLOUT_MPSAFE); + callout_init(&sc->sc_ledtimer, 1); /* * Don't setup hardware-based blinking. Modified: stable/10/sys/dev/ce/if_ce.c ============================================================================== --- stable/10/sys/dev/ce/if_ce.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/ce/if_ce.c Sat Mar 4 13:03:31 2017 (r314667) @@ -103,10 +103,6 @@ __FBSDID("$FreeBSD$"); #define CE_DEBUG2(d,s) ({if (d->chan->debug>1) {\ printf ("%s: ", d->name); printf s;}}) -#ifndef CALLOUT_MPSAFE -#define CALLOUT_MPSAFE 0 -#endif - #ifndef IF_DRAIN #define IF_DRAIN(ifq) do { \ struct mbuf *m; \ @@ -625,7 +621,7 @@ static int ce_attach (device_t dev) return (ENXIO); } #if __FreeBSD_version >= 500000 - callout_init (&led_timo[unit], CALLOUT_MPSAFE); + callout_init (&led_timo[unit], 1); #else callout_init (&led_timo[unit]); #endif @@ -677,7 +673,7 @@ static int ce_attach (device_t dev) continue; d = c->sys; - callout_init (&d->timeout_handle, CALLOUT_MPSAFE); + callout_init (&d->timeout_handle, 1); #ifdef NETGRAPH if (ng_make_node_common (&typestruct, &d->node) != 0) { printf ("%s: cannot make common node\n", d->name); @@ -2580,7 +2576,7 @@ static int ce_modevent (module_t mod, in cdevsw_add (&ce_cdevsw); #endif #if __FreeBSD_version >= 500000 - callout_init (&timeout_handle, CALLOUT_MPSAFE); + callout_init (&timeout_handle, 1); #else callout_init (&timeout_handle); #endif Modified: stable/10/sys/dev/cp/if_cp.c ============================================================================== --- stable/10/sys/dev/cp/if_cp.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/cp/if_cp.c Sat Mar 4 13:03:31 2017 (r314667) @@ -461,7 +461,7 @@ static int cp_attach (device_t dev) splx (s); return (ENXIO); } - callout_init (&led_timo[unit], CALLOUT_MPSAFE); + callout_init (&led_timo[unit], 1); error = bus_setup_intr (dev, bd->cp_irq, INTR_TYPE_NET|INTR_MPSAFE, NULL, cp_intr, bd, &bd->cp_intrhand); @@ -490,7 +490,7 @@ static int cp_attach (device_t dev) d->board = b; d->chan = c; c->sys = d; - callout_init (&d->timeout_handle, CALLOUT_MPSAFE); + callout_init (&d->timeout_handle, 1); #ifdef NETGRAPH if (ng_make_node_common (&typestruct, &d->node) != 0) { printf ("%s: cannot make common node\n", d->name); @@ -2240,7 +2240,7 @@ static int cp_modevent (module_t mod, in printf ("Failed to register ng_cp\n"); #endif ++load_count; - callout_init (&timeout_handle, CALLOUT_MPSAFE); + callout_init (&timeout_handle, 1); callout_reset (&timeout_handle, hz*5, cp_timeout, 0); break; case MOD_UNLOAD: Modified: stable/10/sys/dev/ctau/if_ct.c ============================================================================== --- stable/10/sys/dev/ctau/if_ct.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/ctau/if_ct.c Sat Mar 4 13:03:31 2017 (r314667) @@ -663,7 +663,7 @@ static int ct_attach (device_t dev) return ENXIO; } - callout_init (&led_timo[unit], CALLOUT_MPSAFE); + callout_init (&led_timo[unit], 1); s = splimp (); if (bus_setup_intr (dev, bd->irq_res, INTR_TYPE_NET|INTR_MPSAFE, @@ -702,7 +702,7 @@ static int ct_attach (device_t dev) c->sys = d; channel [b->num*NCHAN + c->num] = d; sprintf (d->name, "ct%d.%d", b->num, c->num); - callout_init (&d->timeout_handle, CALLOUT_MPSAFE); + callout_init (&d->timeout_handle, 1); #ifdef NETGRAPH if (ng_make_node_common (&typestruct, &d->node) != 0) { @@ -2180,7 +2180,7 @@ static int ct_modevent (module_t mod, in printf ("Failed to register ng_ct\n"); #endif ++load_count; - callout_init (&timeout_handle, CALLOUT_MPSAFE); + callout_init (&timeout_handle, 1); callout_reset (&timeout_handle, hz*5, ct_timeout, 0); break; case MOD_UNLOAD: Modified: stable/10/sys/dev/cx/if_cx.c ============================================================================== --- stable/10/sys/dev/cx/if_cx.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/cx/if_cx.c Sat Mar 4 13:03:31 2017 (r314667) @@ -762,7 +762,7 @@ static int cx_attach (device_t dev) return ENXIO; } b->sys = bd; - callout_init (&led_timo[b->num], CALLOUT_MPSAFE); + callout_init (&led_timo[b->num], 1); s = splhigh (); if (bus_setup_intr (dev, bd->irq_res, INTR_TYPE_NET|INTR_MPSAFE, @@ -812,7 +812,7 @@ static int cx_attach (device_t dev) case T_UNIV_RS232: case T_UNIV_RS449: case T_UNIV_V35: - callout_init (&d->timeout_handle, CALLOUT_MPSAFE); + callout_init (&d->timeout_handle, 1); #ifdef NETGRAPH if (ng_make_node_common (&typestruct, &d->node) != 0) { printf ("%s: cannot make common node\n", d->name); @@ -883,7 +883,7 @@ static int cx_attach (device_t dev) ttycreate(d->tty, TS_CALLOUT, "x%r%r", b->num, c->num); d->devt = make_dev (&cx_cdevsw, b->num*NCHAN + c->num + 64, UID_ROOT, GID_WHEEL, 0600, "cx%d", b->num*NCHAN + c->num); d->devt->si_drv1 = d; - callout_init (&d->dcd_timeout_handle, CALLOUT_MPSAFE); + callout_init (&d->dcd_timeout_handle, 1); } splx (s); @@ -2514,7 +2514,7 @@ static int cx_modevent (module_t mod, in #endif ++load_count; - callout_init (&timeout_handle, CALLOUT_MPSAFE); + callout_init (&timeout_handle, 1); callout_reset (&timeout_handle, hz*5, cx_timeout, 0); /* Software interrupt. */ swi_add(&tty_intr_event, "cx", cx_softintr, NULL, SWI_TTY, Modified: stable/10/sys/dev/cxgb/cxgb_main.c ============================================================================== --- stable/10/sys/dev/cxgb/cxgb_main.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/cxgb/cxgb_main.c Sat Mar 4 13:03:31 2017 (r314667) @@ -1009,7 +1009,7 @@ cxgb_port_attach(device_t dev) device_get_unit(device_get_parent(dev)), p->port_id); PORT_LOCK_INIT(p, p->lockbuf); - callout_init(&p->link_check_ch, CALLOUT_MPSAFE); + callout_init(&p->link_check_ch, 1); TASK_INIT(&p->link_check_task, 0, check_link_status, p); /* Allocate an ifnet object and set it up */ Modified: stable/10/sys/dev/cxgb/cxgb_sge.c ============================================================================== --- stable/10/sys/dev/cxgb/cxgb_sge.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/cxgb/cxgb_sge.c Sat Mar 4 13:03:31 2017 (r314667) @@ -1013,7 +1013,7 @@ sge_timer_cb(void *arg) int t3_sge_init_adapter(adapter_t *sc) { - callout_init(&sc->sge_timer_ch, CALLOUT_MPSAFE); + callout_init(&sc->sge_timer_ch, 1); callout_reset(&sc->sge_timer_ch, TX_RECLAIM_PERIOD, sge_timer_cb, sc); TASK_INIT(&sc->slow_intr_task, 0, sge_slow_intr_handler, sc); return (0); Modified: stable/10/sys/dev/dcons/dcons_os.c ============================================================================== --- stable/10/sys/dev/dcons/dcons_os.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/dcons/dcons_os.c Sat Mar 4 13:03:31 2017 (r314667) @@ -374,7 +374,7 @@ dcons_attach(void) dcons_attach_port(DCONS_CON, "dcons", 0); dcons_attach_port(DCONS_GDB, "dgdb", DC_GDB); - callout_init(&dcons_callout, CALLOUT_MPSAFE); + callout_init(&dcons_callout, 1); polltime = hz / poll_hz; callout_reset(&dcons_callout, polltime, dcons_timeout, NULL); return(0); Modified: stable/10/sys/dev/drm2/drm_irq.c ============================================================================== --- stable/10/sys/dev/drm2/drm_irq.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/drm2/drm_irq.c Sat Mar 4 13:03:31 2017 (r314667) @@ -210,7 +210,7 @@ int drm_vblank_init(struct drm_device *d { int i, ret = -ENOMEM; - callout_init(&dev->vblank_disable_callout, CALLOUT_MPSAFE); + callout_init(&dev->vblank_disable_callout, 1); mtx_init(&dev->vbl_lock, "drmvbl", NULL, MTX_DEF); mtx_init(&dev->vblank_time_lock, "drmvtl", NULL, MTX_DEF); Modified: stable/10/sys/dev/drm2/i915/intel_display.c ============================================================================== --- stable/10/sys/dev/drm2/i915/intel_display.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/drm2/i915/intel_display.c Sat Mar 4 13:03:31 2017 (r314667) @@ -6449,7 +6449,7 @@ static void intel_crtc_init(struct drm_d intel_crtc->busy = false; - callout_init(&intel_crtc->idle_callout, CALLOUT_MPSAFE); + callout_init(&intel_crtc->idle_callout, 1); } int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data, @@ -7038,7 +7038,7 @@ void intel_modeset_init(struct drm_devic intel_setup_outputs(dev); TASK_INIT(&dev_priv->idle_task, 0, intel_idle_update, dev_priv); - callout_init(&dev_priv->idle_callout, CALLOUT_MPSAFE); + callout_init(&dev_priv->idle_callout, 1); } void intel_modeset_gem_init(struct drm_device *dev) Modified: stable/10/sys/dev/glxsb/glxsb.c ============================================================================== --- stable/10/sys/dev/glxsb/glxsb.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/glxsb/glxsb.c Sat Mar 4 13:03:31 2017 (r314667) @@ -331,7 +331,7 @@ glxsb_attach(device_t dev) sc->sc_rnghz = hz / 100; else sc->sc_rnghz = 1; - callout_init(&sc->sc_rngco, CALLOUT_MPSAFE); + callout_init(&sc->sc_rngco, 1); glxsb_rnd(sc); return (0); Modified: stable/10/sys/dev/gxemul/cons/gxemul_cons.c ============================================================================== --- stable/10/sys/dev/gxemul/cons/gxemul_cons.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/gxemul/cons/gxemul_cons.c Sat Mar 4 13:03:31 2017 (r314667) @@ -279,7 +279,7 @@ gxemul_cons_ttyinit(void *unused) tp = tty_alloc(&gxemul_cons_ttydevsw, NULL); tty_init_console(tp, 0); tty_makedev(tp, NULL, "%s", "ttyu0"); - callout_init(&gxemul_cons_callout, CALLOUT_MPSAFE); + callout_init(&gxemul_cons_callout, 1); callout_reset(&gxemul_cons_callout, gxemul_cons_polltime, gxemul_cons_timeout, tp); Modified: stable/10/sys/dev/hifn/hifn7751.c ============================================================================== --- stable/10/sys/dev/hifn/hifn7751.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/hifn/hifn7751.c Sat Mar 4 13:03:31 2017 (r314667) @@ -590,7 +590,7 @@ hifn_attach(device_t dev) if (sc->sc_flags & (HIFN_HAS_PUBLIC | HIFN_HAS_RNG)) hifn_init_pubrng(sc); - callout_init(&sc->sc_tickto, CALLOUT_MPSAFE); + callout_init(&sc->sc_tickto, 1); callout_reset(&sc->sc_tickto, hz, hifn_tick, sc); return (0); @@ -768,7 +768,7 @@ hifn_init_pubrng(struct hifn_softc *sc) sc->sc_rnghz = hz / 100; else sc->sc_rnghz = 1; - callout_init(&sc->sc_rngto, CALLOUT_MPSAFE); + callout_init(&sc->sc_rngto, 1); callout_reset(&sc->sc_rngto, sc->sc_rnghz, hifn_rng, sc); } Modified: stable/10/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c ============================================================================== --- stable/10/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Sat Mar 4 13:03:31 2017 (r314667) @@ -1553,7 +1553,7 @@ storvsc_action(struct cam_sim *sim, unio #ifdef notyet if (ccb->ccb_h.timeout != CAM_TIME_INFINITY) { - callout_init(&reqp->callout, CALLOUT_MPSAFE); + callout_init(&reqp->callout, 1); callout_reset_sbt(&reqp->callout, SBT_1MS * ccb->ccb_h.timeout, 0, storvsc_timeout, reqp, 0); Modified: stable/10/sys/dev/if_ndis/if_ndis.c ============================================================================== --- stable/10/sys/dev/if_ndis/if_ndis.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/if_ndis/if_ndis.c Sat Mar 4 13:03:31 2017 (r314667) @@ -557,7 +557,7 @@ ndis_attach(dev) InitializeListHead(&sc->ndis_shlist); InitializeListHead(&sc->ndisusb_tasklist); InitializeListHead(&sc->ndisusb_xferdonelist); - callout_init(&sc->ndis_stat_callout, CALLOUT_MPSAFE); + callout_init(&sc->ndis_stat_callout, 1); if (sc->ndis_iftype == PCMCIABus) { error = ndis_alloc_amem(sc); @@ -733,7 +733,7 @@ ndis_attach(dev) uint32_t arg; int r; - callout_init(&sc->ndis_scan_callout, CALLOUT_MPSAFE); + callout_init(&sc->ndis_scan_callout, 1); ifp->if_ioctl = ndis_ioctl_80211; ic->ic_ifp = ifp; Modified: stable/10/sys/dev/isci/isci_io_request.c ============================================================================== --- stable/10/sys/dev/isci/isci_io_request.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/isci/isci_io_request.c Sat Mar 4 13:03:31 2017 (r314667) @@ -680,7 +680,7 @@ isci_request_construct(struct ISCI_REQUE request->dma_tag = io_buffer_dma_tag; request->physical_address = physical_address; bus_dmamap_create(request->dma_tag, 0, &request->dma_map); - callout_init(&request->timer, CALLOUT_MPSAFE); + callout_init(&request->timer, 1); } static void Modified: stable/10/sys/dev/mfi/mfi.c ============================================================================== --- stable/10/sys/dev/mfi/mfi.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/mfi/mfi.c Sat Mar 4 13:03:31 2017 (r314667) @@ -788,7 +788,7 @@ mfi_attach(struct mfi_softc *sc) bus_generic_attach(sc->mfi_dev); /* Start the timeout watchdog */ - callout_init(&sc->mfi_watchdog_callout, CALLOUT_MPSAFE); + callout_init(&sc->mfi_watchdog_callout, 1); callout_reset(&sc->mfi_watchdog_callout, mfi_cmd_timeout * hz, mfi_timeout, sc); Modified: stable/10/sys/dev/mwl/if_mwl.c ============================================================================== --- stable/10/sys/dev/mwl/if_mwl.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/mwl/if_mwl.c Sat Mar 4 13:03:31 2017 (r314667) @@ -368,7 +368,7 @@ mwl_attach(uint16_t devid, struct mwl_so if (error != 0) /* NB: mwl_setupdma prints msg */ goto bad1; - callout_init(&sc->sc_timer, CALLOUT_MPSAFE); + callout_init(&sc->sc_timer, 1); callout_init_mtx(&sc->sc_watchdog, &sc->sc_mtx, 0); sc->sc_tq = taskqueue_create("mwl_taskq", M_NOWAIT, Modified: stable/10/sys/dev/nand/nandsim_chip.c ============================================================================== --- stable/10/sys/dev/nand/nandsim_chip.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/nand/nandsim_chip.c Sat Mar 4 13:03:31 2017 (r314667) @@ -94,7 +94,7 @@ nandsim_chip_init(struct nandsim_softc* return (NULL); mtx_init(&chip->ns_lock, "nandsim lock", NULL, MTX_DEF); - callout_init(&chip->ns_callout, CALLOUT_MPSAFE); + callout_init(&chip->ns_callout, 1); STAILQ_INIT(&chip->nandsim_events); chip->chip_num = chip_num; Modified: stable/10/sys/dev/ntb/ntb_hw/ntb_hw.c ============================================================================== --- stable/10/sys/dev/ntb/ntb_hw/ntb_hw.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/ntb/ntb_hw/ntb_hw.c Sat Mar 4 13:03:31 2017 (r314667) @@ -662,8 +662,8 @@ intel_ntb_attach(device_t device) ntb->msix_mw_idx = B2B_MW_DISABLED; /* Heartbeat timer for NTB_ATOM since there is no link interrupt */ - callout_init(&ntb->heartbeat_timer, CALLOUT_MPSAFE); - callout_init(&ntb->lr_timer, CALLOUT_MPSAFE); + callout_init(&ntb->heartbeat_timer, 1); + callout_init(&ntb->lr_timer, 1); callout_init(&ntb->peer_msix_work, 1); mtx_init(&ntb->db_mask_lock, "ntb hw bits", NULL, MTX_SPIN); Modified: stable/10/sys/dev/nxge/if_nxge.c ============================================================================== --- stable/10/sys/dev/nxge/if_nxge.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/nxge/if_nxge.c Sat Mar 4 13:03:31 2017 (r314667) @@ -1743,7 +1743,7 @@ xge_device_init(xge_lldev_t *lldev, xge_ return; /* Initializing timer */ - callout_init(&lldev->timer, CALLOUT_MPSAFE); + callout_init(&lldev->timer, 1); xge_trace(XGE_TRACE, "Set MTU size"); status = xge_hal_device_mtu_set(hldev, ifnetp->if_mtu); Modified: stable/10/sys/dev/oce/oce_if.c ============================================================================== --- stable/10/sys/dev/oce/oce_if.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/oce/oce_if.c Sat Mar 4 13:03:31 2017 (r314667) @@ -341,7 +341,7 @@ oce_attach(device_t dev) oce_add_sysctls(sc); - callout_init(&sc->timer, CALLOUT_MPSAFE); + callout_init(&sc->timer, 1); rc = callout_reset(&sc->timer, 2 * hz, oce_local_timer, sc); if (rc) goto stats_free; Modified: stable/10/sys/dev/patm/if_patm_attach.c ============================================================================== --- stable/10/sys/dev/patm/if_patm_attach.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/patm/if_patm_attach.c Sat Mar 4 13:03:31 2017 (r314667) @@ -207,7 +207,7 @@ patm_attach(device_t dev) mtx_init(&sc->tst_lock, "tst lock", NULL, MTX_DEF); cv_init(&sc->vcc_cv, "vcc_close"); - callout_init(&sc->tst_callout, CALLOUT_MPSAFE); + callout_init(&sc->tst_callout, 1); sysctl_ctx_init(&sc->sysctl_ctx); Modified: stable/10/sys/dev/rndtest/rndtest.c ============================================================================== --- stable/10/sys/dev/rndtest/rndtest.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/rndtest/rndtest.c Sat Mar 4 13:03:31 2017 (r314667) @@ -98,7 +98,7 @@ rndtest_attach(device_t dev) #if __FreeBSD_version < 500000 callout_init(&rsp->rs_to); #else - callout_init(&rsp->rs_to, CALLOUT_MPSAFE); + callout_init(&rsp->rs_to, 1); #endif } else device_printf(dev, "rndtest_init: no memory for state block\n"); Modified: stable/10/sys/dev/safe/safe.c ============================================================================== --- stable/10/sys/dev/safe/safe.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/safe/safe.c Sat Mar 4 13:03:31 2017 (r314667) @@ -425,7 +425,7 @@ safe_attach(device_t dev) #endif safe_rng_init(sc); - callout_init(&sc->sc_rngto, CALLOUT_MPSAFE); + callout_init(&sc->sc_rngto, 1); callout_reset(&sc->sc_rngto, hz*safe_rnginterval, safe_rng, sc); } #endif /* SAFE_NO_RNG */ Modified: stable/10/sys/dev/sound/midi/mpu401.c ============================================================================== --- stable/10/sys/dev/sound/midi/mpu401.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/sound/midi/mpu401.c Sat Mar 4 13:03:31 2017 (r314667) @@ -185,7 +185,7 @@ mpu401_init(kobj_class_t cls, void *cook kobj_init((kobj_t)m, cls); - callout_init(&m->timer, CALLOUT_MPSAFE); + callout_init(&m->timer, 1); m->si = softintr; m->cookie = cookie; Modified: stable/10/sys/dev/sound/pci/atiixp.c ============================================================================== --- stable/10/sys/dev/sound/pci/atiixp.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/sound/pci/atiixp.c Sat Mar 4 13:03:31 2017 (r314667) @@ -1193,7 +1193,7 @@ atiixp_pci_attach(device_t dev) sc->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_atiixp softc"); sc->dev = dev; - callout_init(&sc->poll_timer, CALLOUT_MPSAFE); + callout_init(&sc->poll_timer, 1); sc->poll_ticks = 1; if (resource_int_value(device_get_name(sc->dev), Modified: stable/10/sys/dev/sound/pci/es137x.c ============================================================================== --- stable/10/sys/dev/sound/pci/es137x.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/sound/pci/es137x.c Sat Mar 4 13:03:31 2017 (r314667) @@ -1741,7 +1741,7 @@ es_pci_attach(device_t dev) es->st = rman_get_bustag(es->reg); es->sh = rman_get_bushandle(es->reg); - callout_init(&es->poll_timer, CALLOUT_MPSAFE); + callout_init(&es->poll_timer, 1); es->poll_ticks = 1; if (resource_int_value(device_get_name(dev), Modified: stable/10/sys/dev/sound/pci/hda/hdaa.c ============================================================================== --- stable/10/sys/dev/sound/pci/hda/hdaa.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/sound/pci/hda/hdaa.c Sat Mar 4 13:03:31 2017 (r314667) @@ -6592,7 +6592,7 @@ hdaa_attach(device_t dev) devinfo->newquirks = -1; devinfo->newgpio = -1; devinfo->newgpo = -1; - callout_init(&devinfo->poll_jack, CALLOUT_MPSAFE); + callout_init(&devinfo->poll_jack, 1); devinfo->poll_ival = hz; hdaa_lock(devinfo); Modified: stable/10/sys/dev/sound/pci/hda/hdac.c ============================================================================== --- stable/10/sys/dev/sound/pci/hda/hdac.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/sound/pci/hda/hdac.c Sat Mar 4 13:03:31 2017 (r314667) @@ -1116,7 +1116,7 @@ hdac_attach(device_t dev) sc->lock = snd_mtxcreate(device_get_nameunit(dev), "HDA driver mutex"); sc->dev = dev; TASK_INIT(&sc->unsolq_task, 0, hdac_unsolq_task, sc); - callout_init(&sc->poll_callout, CALLOUT_MPSAFE); + callout_init(&sc->poll_callout, 1); for (i = 0; i < HDAC_CODEC_MAX; i++) sc->codecs[i].dev = NULL; if (devid >= 0) { Modified: stable/10/sys/dev/sound/pci/via8233.c ============================================================================== --- stable/10/sys/dev/sound/pci/via8233.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/sound/pci/via8233.c Sat Mar 4 13:03:31 2017 (r314667) @@ -1175,7 +1175,7 @@ via_attach(device_t dev) "snd_via8233 softc"); via->dev = dev; - callout_init(&via->poll_timer, CALLOUT_MPSAFE); + callout_init(&via->poll_timer, 1); via->poll_ticks = 1; if (resource_int_value(device_get_name(dev), Modified: stable/10/sys/dev/twa/tw_osl_freebsd.c ============================================================================== --- stable/10/sys/dev/twa/tw_osl_freebsd.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/twa/tw_osl_freebsd.c Sat Mar 4 13:03:31 2017 (r314667) @@ -423,8 +423,8 @@ twa_attach(device_t dev) } sc->watchdog_index = 0; - callout_init(&(sc->watchdog_callout[0]), CALLOUT_MPSAFE); - callout_init(&(sc->watchdog_callout[1]), CALLOUT_MPSAFE); + callout_init(&(sc->watchdog_callout[0]), 1); + callout_init(&(sc->watchdog_callout[1]), 1); callout_reset(&(sc->watchdog_callout[0]), 5*hz, twa_watchdog, &sc->ctlr_handle); return(0); Modified: stable/10/sys/dev/tws/tws.c ============================================================================== --- stable/10/sys/dev/tws/tws.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/tws/tws.c Sat Mar 4 13:03:31 2017 (r314667) @@ -198,7 +198,7 @@ tws_attach(device_t dev) mtx_init( &sc->sim_lock, "tws_sim_lock", NULL, MTX_DEF); mtx_init( &sc->gen_lock, "tws_gen_lock", NULL, MTX_DEF); mtx_init( &sc->io_lock, "tws_io_lock", NULL, MTX_DEF | MTX_RECURSE); - callout_init(&sc->stats_timer, CALLOUT_MPSAFE); + callout_init(&sc->stats_timer, 1); if ( tws_init_trace_q(sc) == FAILURE ) printf("trace init failure\n"); @@ -706,7 +706,7 @@ tws_init_reqs(struct tws_softc *sc, u_in sc->reqs[i].cmd_pkt->hdr.header_desc.size_header = 128; - callout_init(&sc->reqs[i].timeout, CALLOUT_MPSAFE); + callout_init(&sc->reqs[i].timeout, 1); sc->reqs[i].state = TWS_REQ_STATE_FREE; if ( i >= TWS_RESERVED_REQS ) tws_q_insert_tail(sc, &sc->reqs[i], TWS_FREE_Q); Modified: stable/10/sys/dev/ubsec/ubsec.c ============================================================================== --- stable/10/sys/dev/ubsec/ubsec.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/ubsec/ubsec.c Sat Mar 4 13:03:31 2017 (r314667) @@ -456,7 +456,7 @@ ubsec_attach(device_t dev) sc->sc_rnghz = hz / 100; else sc->sc_rnghz = 1; - callout_init(&sc->sc_rngto, CALLOUT_MPSAFE); + callout_init(&sc->sc_rngto, 1); callout_reset(&sc->sc_rngto, sc->sc_rnghz, ubsec_rng, sc); skip_rng: ; Modified: stable/10/sys/dev/virtio/random/virtio_random.c ============================================================================== --- stable/10/sys/dev/virtio/random/virtio_random.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/virtio/random/virtio_random.c Sat Mar 4 13:03:31 2017 (r314667) @@ -129,7 +129,7 @@ vtrnd_attach(device_t dev) sc = device_get_softc(dev); sc->vtrnd_dev = dev; - callout_init(&sc->vtrnd_callout, CALLOUT_MPSAFE); + callout_init(&sc->vtrnd_callout, 1); virtio_set_feature_desc(dev, vtrnd_feature_desc); vtrnd_negotiate_features(sc); Modified: stable/10/sys/dev/xen/netfront/netfront.c ============================================================================== --- stable/10/sys/dev/xen/netfront/netfront.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/dev/xen/netfront/netfront.c Sat Mar 4 13:03:31 2017 (r314667) @@ -2132,7 +2132,7 @@ create_netdev(device_t dev) ifp->if_hw_tsomaxsegsize = PAGE_SIZE; ether_ifattach(ifp, np->mac); - callout_init(&np->xn_stat_ch, CALLOUT_MPSAFE); + callout_init(&np->xn_stat_ch, 1); netfront_carrier_off(np); return (0); Modified: stable/10/sys/fs/nfs/nfs_commonport.c ============================================================================== --- stable/10/sys/fs/nfs/nfs_commonport.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/fs/nfs/nfs_commonport.c Sat Mar 4 13:03:31 2017 (r314667) @@ -609,7 +609,7 @@ nfscommon_modevent(module_t mod, int typ mtx_init(&nfs_req_mutex, "nfs_req_mutex", NULL, MTX_DEF); mtx_init(&nfsrv_nfsuserdsock.nr_mtx, "nfsuserd", NULL, MTX_DEF); - callout_init(&newnfsd_callout, CALLOUT_MPSAFE); + callout_init(&newnfsd_callout, 1); newnfs_init(); nfsd_call_nfscommon = nfssvc_nfscommon; loaded = 1; Modified: stable/10/sys/gdb/gdb_cons.c ============================================================================== --- stable/10/sys/gdb/gdb_cons.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/gdb/gdb_cons.c Sat Mar 4 13:03:31 2017 (r314667) @@ -77,7 +77,7 @@ gdb_cninit(struct consdev *cp) /* setup tx buffer and callout */ if (c->npending == -1) { c->npending = 0; - callout_init(&c->flush, CALLOUT_MPSAFE); + callout_init(&c->flush, 1); cp->cn_arg = c; } } Modified: stable/10/sys/geom/gate/g_gate.c ============================================================================== --- stable/10/sys/geom/gate/g_gate.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/geom/gate/g_gate.c Sat Mar 4 13:03:31 2017 (r314667) @@ -487,7 +487,7 @@ g_gate_create(struct g_gate_ctl_create * if (sc->sc_queue_size > G_GATE_MAX_QUEUE_SIZE) sc->sc_queue_size = G_GATE_MAX_QUEUE_SIZE; sc->sc_timeout = ggio->gctl_timeout; - callout_init(&sc->sc_callout, CALLOUT_MPSAFE); + callout_init(&sc->sc_callout, 1); mtx_lock(&g_gate_units_lock); sc->sc_unit = g_gate_getunit(ggio->gctl_unit, &error); Modified: stable/10/sys/geom/journal/g_journal.c ============================================================================== --- stable/10/sys/geom/journal/g_journal.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/geom/journal/g_journal.c Sat Mar 4 13:03:31 2017 (r314667) @@ -2317,7 +2317,7 @@ g_journal_create(struct g_class *mp, str sc->sc_rootmount = root_mount_hold("GJOURNAL"); GJ_DEBUG(1, "root_mount_hold %p", sc->sc_rootmount); - callout_init(&sc->sc_callout, CALLOUT_MPSAFE); + callout_init(&sc->sc_callout, 1); if (md->md_type != GJ_TYPE_COMPLETE) { /* * Journal and data are on separate providers. Modified: stable/10/sys/geom/mirror/g_mirror.c ============================================================================== --- stable/10/sys/geom/mirror/g_mirror.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/geom/mirror/g_mirror.c Sat Mar 4 13:03:31 2017 (r314667) @@ -2966,7 +2966,7 @@ g_mirror_create(struct g_class *mp, cons LIST_INIT(&sc->sc_disks); TAILQ_INIT(&sc->sc_events); mtx_init(&sc->sc_events_mtx, "gmirror:events", NULL, MTX_DEF); - callout_init(&sc->sc_callout, CALLOUT_MPSAFE); + callout_init(&sc->sc_callout, 1); mtx_init(&sc->sc_done_mtx, "gmirror:done", NULL, MTX_DEF); sc->sc_state = G_MIRROR_DEVICE_STATE_STARTING; gp->softc = sc; Modified: stable/10/sys/geom/raid3/g_raid3.c ============================================================================== --- stable/10/sys/geom/raid3/g_raid3.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/geom/raid3/g_raid3.c Sat Mar 4 13:03:31 2017 (r314667) @@ -3165,7 +3165,7 @@ g_raid3_create(struct g_class *mp, const bioq_init(&sc->sc_sync_delayed); TAILQ_INIT(&sc->sc_events); mtx_init(&sc->sc_events_mtx, "graid3:events", NULL, MTX_DEF); - callout_init(&sc->sc_callout, CALLOUT_MPSAFE); + callout_init(&sc->sc_callout, 1); sc->sc_state = G_RAID3_DEVICE_STATE_STARTING; gp->softc = sc; sc->sc_geom = gp; Modified: stable/10/sys/geom/sched/gs_rr.c ============================================================================== --- stable/10/sys/geom/sched/gs_rr.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/geom/sched/gs_rr.c Sat Mar 4 13:03:31 2017 (r314667) @@ -602,7 +602,7 @@ g_rr_init(struct g_geom *geom) sc = malloc(sizeof *sc, M_GEOM_SCHED, M_NOWAIT | M_ZERO); sc->sc_geom = geom; TAILQ_INIT(&sc->sc_rr_tailq); - callout_init(&sc->sc_wait, CALLOUT_MPSAFE); + callout_init(&sc->sc_wait, 1); LIST_INSERT_HEAD(&me.sc_head, sc, sc_next); me.units++; Modified: stable/10/sys/i386/i386/mp_watchdog.c ============================================================================== --- stable/10/sys/i386/i386/mp_watchdog.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/i386/i386/mp_watchdog.c Sat Mar 4 13:03:31 2017 (r314667) @@ -86,7 +86,7 @@ static void watchdog_init(void *arg) { - callout_init(&watchdog_callout, CALLOUT_MPSAFE); + callout_init(&watchdog_callout, 1); if (watchdog_cpu != -1) watchdog_change(watchdog_cpu); } Modified: stable/10/sys/kern/init_main.c ============================================================================== --- stable/10/sys/kern/init_main.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/kern/init_main.c Sat Mar 4 13:03:31 2017 (r314667) @@ -511,7 +511,7 @@ proc0_init(void *dummy __unused) callout_init_mtx(&p->p_itcallout, &p->p_mtx, 0); callout_init_mtx(&p->p_limco, &p->p_mtx, 0); - callout_init(&td->td_slpcallout, CALLOUT_MPSAFE); + callout_init(&td->td_slpcallout, 1); /* Create credentials. */ newcred = crget(); Modified: stable/10/sys/kern/kern_synch.c ============================================================================== --- stable/10/sys/kern/kern_synch.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/kern/kern_synch.c Sat Mar 4 13:03:31 2017 (r314667) @@ -569,7 +569,7 @@ loadav(void *arg) static void synch_setup(void *dummy) { - callout_init(&loadav_callout, CALLOUT_MPSAFE); + callout_init(&loadav_callout, 1); /* Kick off timeout driven events by calling first time. */ loadav(NULL); Modified: stable/10/sys/kern/kern_thread.c ============================================================================== --- stable/10/sys/kern/kern_thread.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/kern/kern_thread.c Sat Mar 4 13:03:31 2017 (r314667) @@ -551,7 +551,7 @@ thread_link(struct thread *td, struct pr LIST_INIT(&td->td_lprof[0]); LIST_INIT(&td->td_lprof[1]); sigqueue_init(&td->td_sigqueue, p); - callout_init(&td->td_slpcallout, CALLOUT_MPSAFE); + callout_init(&td->td_slpcallout, 1); TAILQ_INSERT_HEAD(&p->p_threads, td, td_plist); p->p_numthreads++; } Modified: stable/10/sys/kern/subr_vmem.c ============================================================================== --- stable/10/sys/kern/subr_vmem.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/kern/subr_vmem.c Sat Mar 4 13:03:31 2017 (r314667) @@ -766,7 +766,7 @@ vmem_start_callout(void *unused) TASK_INIT(&vmem_periodic_wk, 0, vmem_periodic, NULL); vmem_periodic_interval = hz * 10; - callout_init(&vmem_periodic_ch, CALLOUT_MPSAFE); + callout_init(&vmem_periodic_ch, 1); callout_reset(&vmem_periodic_ch, vmem_periodic_interval, vmem_periodic_kick, NULL); } Modified: stable/10/sys/kern/uipc_domain.c ============================================================================== --- stable/10/sys/kern/uipc_domain.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/kern/uipc_domain.c Sat Mar 4 13:03:31 2017 (r314667) @@ -247,8 +247,8 @@ domaininit(void *dummy) if (max_linkhdr < 16) /* XXX */ max_linkhdr = 16; - callout_init(&pffast_callout, CALLOUT_MPSAFE); - callout_init(&pfslow_callout, CALLOUT_MPSAFE); + callout_init(&pffast_callout, 1); + callout_init(&pfslow_callout, 1); mtx_lock(&dom_mtx); KASSERT(domain_init_status == 0, ("domaininit called too late!")); Modified: stable/10/sys/mips/cavium/octe/ethernet.c ============================================================================== --- stable/10/sys/mips/cavium/octe/ethernet.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/mips/cavium/octe/ethernet.c Sat Mar 4 13:03:31 2017 (r314667) @@ -454,7 +454,7 @@ int cvm_oct_init_module(device_t bus) cvmx_write_csr(CVMX_POW_WQ_INT_THRX(pow_receive_group), 0x1001); } - callout_init(&cvm_oct_poll_timer, CALLOUT_MPSAFE); + callout_init(&cvm_oct_poll_timer, 1); callout_reset(&cvm_oct_poll_timer, hz, cvm_do_timer, NULL); return 0; Modified: stable/10/sys/mips/cavium/octeon_rnd.c ============================================================================== --- stable/10/sys/mips/cavium/octeon_rnd.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/mips/cavium/octeon_rnd.c Sat Mar 4 13:03:31 2017 (r314667) @@ -95,7 +95,7 @@ octeon_rnd_attach(device_t dev) struct octeon_rnd_softc *sc; sc = device_get_softc(dev); - callout_init(&sc->sc_callout, CALLOUT_MPSAFE); + callout_init(&sc->sc_callout, 1); callout_reset(&sc->sc_callout, hz * 5, octeon_rnd_harvest, sc); cvmx_rng_enable(); Modified: stable/10/sys/mips/nlm/dev/net/xlpge.c ============================================================================== --- stable/10/sys/mips/nlm/dev/net/xlpge.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/mips/nlm/dev/net/xlpge.c Sat Mar 4 13:03:31 2017 (r314667) @@ -1240,7 +1240,7 @@ nlm_xlpge_attach(device_t dev) sc->prepad_en = sc->network_sc->prepad_en; sc->prepad_size = sc->network_sc->prepad_size; - callout_init(&sc->xlpge_callout, CALLOUT_MPSAFE); + callout_init(&sc->xlpge_callout, 1); XLPGE_LOCK_INIT(sc, device_get_nameunit(dev)); Modified: stable/10/sys/mips/rmi/dev/xlr/rge.c ============================================================================== --- stable/10/sys/mips/rmi/dev/xlr/rge.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/mips/rmi/dev/xlr/rge.c Sat Mar 4 13:03:31 2017 (r314667) @@ -1894,9 +1894,9 @@ rge_attach(device_t dev) if (!gmac_common_init_done) { mac_common_init(); gmac_common_init_done = 1; - callout_init(&xlr_tx_stop_bkp, CALLOUT_MPSAFE); + callout_init(&xlr_tx_stop_bkp, 1); callout_reset(&xlr_tx_stop_bkp, hz, xlr_tx_q_wakeup, NULL); - callout_init(&rge_dbg_count, CALLOUT_MPSAFE); + callout_init(&rge_dbg_count, 1); //callout_reset(&rge_dbg_count, hz, xlr_debug_count, NULL); } if ((ret = rmi_xlr_mac_open(sc)) == -1) { Modified: stable/10/sys/net/if_spppsubr.c ============================================================================== --- stable/10/sys/net/if_spppsubr.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/net/if_spppsubr.c Sat Mar 4 13:03:31 2017 (r314667) @@ -1030,7 +1030,7 @@ sppp_attach(struct ifnet *ifp) mtx_init(&sp->mtx, "sppp", MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); /* Initialize keepalive handler. */ - callout_init(&sp->keepalive_callout, CALLOUT_MPSAFE); + callout_init(&sp->keepalive_callout, 1); callout_reset(&sp->keepalive_callout, hz * 10, sppp_keepalive, (void *)sp); @@ -1062,7 +1062,7 @@ sppp_attach(struct ifnet *ifp) #ifdef INET6 sp->confflags |= CONF_ENABLE_IPV6; #endif - callout_init(&sp->ifstart_callout, CALLOUT_MPSAFE); + callout_init(&sp->ifstart_callout, 1); sp->if_start = ifp->if_start; ifp->if_start = sppp_ifstart; sp->pp_comp = malloc(sizeof(struct slcompress), M_TEMP, M_WAITOK); @@ -2170,7 +2170,7 @@ sppp_lcp_init(struct sppp *sp) sp->lcp.max_terminate = 2; sp->lcp.max_configure = 10; sp->lcp.max_failure = 10; - callout_init(&sp->ch[IDX_LCP], CALLOUT_MPSAFE); + callout_init(&sp->ch[IDX_LCP], 1); } static void @@ -2861,7 +2861,7 @@ sppp_ipcp_init(struct sppp *sp) sp->fail_counter[IDX_IPCP] = 0; sp->pp_seq[IDX_IPCP] = 0; sp->pp_rseq[IDX_IPCP] = 0; - callout_init(&sp->ch[IDX_IPCP], CALLOUT_MPSAFE); + callout_init(&sp->ch[IDX_IPCP], 1); } static void @@ -3420,7 +3420,7 @@ sppp_ipv6cp_init(struct sppp *sp) sp->fail_counter[IDX_IPV6CP] = 0; sp->pp_seq[IDX_IPV6CP] = 0; sp->pp_rseq[IDX_IPV6CP] = 0; - callout_init(&sp->ch[IDX_IPV6CP], CALLOUT_MPSAFE); + callout_init(&sp->ch[IDX_IPV6CP], 1); } static void @@ -4225,7 +4225,7 @@ sppp_chap_init(struct sppp *sp) sp->fail_counter[IDX_CHAP] = 0; sp->pp_seq[IDX_CHAP] = 0; sp->pp_rseq[IDX_CHAP] = 0; - callout_init(&sp->ch[IDX_CHAP], CALLOUT_MPSAFE); + callout_init(&sp->ch[IDX_CHAP], 1); } static void @@ -4547,8 +4547,8 @@ sppp_pap_init(struct sppp *sp) sp->fail_counter[IDX_PAP] = 0; sp->pp_seq[IDX_PAP] = 0; sp->pp_rseq[IDX_PAP] = 0; - callout_init(&sp->ch[IDX_PAP], CALLOUT_MPSAFE); - callout_init(&sp->pap_my_to_ch, CALLOUT_MPSAFE); + callout_init(&sp->ch[IDX_PAP], 1); + callout_init(&sp->pap_my_to_ch, 1); } static void Modified: stable/10/sys/net80211/ieee80211_ht.c ============================================================================== --- stable/10/sys/net80211/ieee80211_ht.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/net80211/ieee80211_ht.c Sat Mar 4 13:03:31 2017 (r314667) @@ -1688,7 +1688,7 @@ ieee80211_setup_basic_htrates(struct iee static void ampdu_tx_setup(struct ieee80211_tx_ampdu *tap) { - callout_init(&tap->txa_timer, CALLOUT_MPSAFE); + callout_init(&tap->txa_timer, 1); tap->txa_flags |= IEEE80211_AGGR_SETUP; } Modified: stable/10/sys/net80211/ieee80211_hwmp.c ============================================================================== --- stable/10/sys/net80211/ieee80211_hwmp.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/net80211/ieee80211_hwmp.c Sat Mar 4 13:03:31 2017 (r314667) @@ -275,7 +275,7 @@ hwmp_vattach(struct ieee80211vap *vap) return; } hs->hs_maxhops = IEEE80211_HWMP_DEFAULT_MAXHOPS; - callout_init(&hs->hs_roottimer, CALLOUT_MPSAFE); + callout_init(&hs->hs_roottimer, 1); vap->iv_hwmp = hs; } Modified: stable/10/sys/net80211/ieee80211_mesh.c ============================================================================== --- stable/10/sys/net80211/ieee80211_mesh.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/net80211/ieee80211_mesh.c Sat Mar 4 13:03:31 2017 (r314667) @@ -216,7 +216,7 @@ mesh_rt_add_locked(struct ieee80211vap * IEEE80211_ADDR_COPY(rt->rt_dest, dest); rt->rt_priv = (void *)ALIGN(&rt[1]); mtx_init(&rt->rt_lock, "MBSS_RT", "802.11s route entry", MTX_DEF); - callout_init(&rt->rt_discovery, CALLOUT_MPSAFE); + callout_init(&rt->rt_discovery, 1); rt->rt_updtime = ticks; /* create time */ TAILQ_INSERT_TAIL(&ms->ms_routes, rt, rt_next); } @@ -678,8 +678,8 @@ mesh_vattach(struct ieee80211vap *vap) TAILQ_INIT(&ms->ms_known_gates); TAILQ_INIT(&ms->ms_routes); mtx_init(&ms->ms_rt_lock, "MBSS", "802.11s routing table", MTX_DEF); - callout_init(&ms->ms_cleantimer, CALLOUT_MPSAFE); - callout_init(&ms->ms_gatetimer, CALLOUT_MPSAFE); + callout_init(&ms->ms_cleantimer, 1); + callout_init(&ms->ms_gatetimer, 1); ms->ms_gateseq = 0; mesh_select_proto_metric(vap, "AIRTIME"); KASSERT(ms->ms_pmetric, ("ms_pmetric == NULL")); @@ -3382,8 +3382,8 @@ void ieee80211_mesh_node_init(struct ieee80211vap *vap, struct ieee80211_node *ni) { ni->ni_flags |= IEEE80211_NODE_QOS; - callout_init(&ni->ni_mltimer, CALLOUT_MPSAFE); - callout_init(&ni->ni_mlhtimer, CALLOUT_MPSAFE); + callout_init(&ni->ni_mltimer, 1); + callout_init(&ni->ni_mlhtimer, 1); } /* Modified: stable/10/sys/net80211/ieee80211_node.c ============================================================================== --- stable/10/sys/net80211/ieee80211_node.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/net80211/ieee80211_node.c Sat Mar 4 13:03:31 2017 (r314667) @@ -111,7 +111,7 @@ ieee80211_node_attach(struct ieee80211co "802.11 staging q"); ieee80211_node_table_init(ic, &ic->ic_sta, "station", IEEE80211_INACT_INIT, ic->ic_max_keyix); - callout_init(&ic->ic_inact, CALLOUT_MPSAFE); + callout_init(&ic->ic_inact, 1); callout_reset(&ic->ic_inact, IEEE80211_INACT_WAIT*hz, ieee80211_node_timeout, ic); Modified: stable/10/sys/net80211/ieee80211_proto.c ============================================================================== --- stable/10/sys/net80211/ieee80211_proto.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/net80211/ieee80211_proto.c Sat Mar 4 13:03:31 2017 (r314667) @@ -194,7 +194,7 @@ ieee80211_proto_vattach(struct ieee80211 vap->iv_fragthreshold = IEEE80211_FRAG_DEFAULT; vap->iv_bmiss_max = IEEE80211_BMISS_MAX; callout_init_mtx(&vap->iv_swbmiss, IEEE80211_LOCK_OBJ(ic), 0); - callout_init(&vap->iv_mgtsend, CALLOUT_MPSAFE); + callout_init(&vap->iv_mgtsend, 1); TASK_INIT(&vap->iv_nstate_task, 0, ieee80211_newstate_cb, vap); TASK_INIT(&vap->iv_swbmiss_task, 0, beacon_swmiss, vap); /* Modified: stable/10/sys/netgraph/netflow/ng_netflow.c ============================================================================== --- stable/10/sys/netgraph/netflow/ng_netflow.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/netgraph/netflow/ng_netflow.c Sat Mar 4 13:03:31 2017 (r314667) @@ -258,7 +258,7 @@ ng_netflow_constructor(node_p node) priv->ifaces[i].info.conf = NG_NETFLOW_CONF_INGRESS; /* Initialize callout handle */ - callout_init(&priv->exp_callout, CALLOUT_MPSAFE); + callout_init(&priv->exp_callout, 1); /* Allocate memory and set up flow cache */ ng_netflow_cache_init(priv); Modified: stable/10/sys/netgraph/netgraph.h ============================================================================== --- stable/10/sys/netgraph/netgraph.h Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/netgraph/netgraph.h Sat Mar 4 13:03:31 2017 (r314667) @@ -1161,7 +1161,7 @@ int ng_send_fn2(node_p node, hook_p hoo int ng_uncallout(struct callout *c, node_p node); int ng_callout(struct callout *c, node_p node, hook_p hook, int ticks, ng_item_fn *fn, void * arg1, int arg2); -#define ng_callout_init(c) callout_init(c, CALLOUT_MPSAFE) +#define ng_callout_init(c) callout_init(c, 1) /* Flags for netgraph functions. */ #define NG_NOFLAGS 0x00000000 /* no special options */ Modified: stable/10/sys/netinet/in_pcb.c ============================================================================== --- stable/10/sys/netinet/in_pcb.c Sat Mar 4 12:51:57 2017 (r314666) +++ stable/10/sys/netinet/in_pcb.c Sat Mar 4 13:03:31 2017 (r314667) @@ -2139,7 +2139,7 @@ ipport_tick_init(const void *unused __un { /* Start ipport_tick. */ - callout_init(&ipport_tick_callout, CALLOUT_MPSAFE); + callout_init(&ipport_tick_callout, 1); callout_reset(&ipport_tick_callout, 1, ipport_tick, NULL); EVENTHANDLER_REGISTER(shutdown_pre_sync, ip_fini, NULL, SHUTDOWN_PRI_DEFAULT); Modified: stable/10/sys/netinet/ip_mroute.c ============================================================================== --- stable/10/sys/netinet/ip_mroute.c Sat Mar 4 12:51:57 2017 (r314666) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Sat Mar 4 13:05:05 2017 Return-Path: Delivered-To: svn-src-all@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 C4A10CF9672; Sat, 4 Mar 2017 13:05:05 +0000 (UTC) (envelope-from avg@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 9CB071F60; Sat, 4 Mar 2017 13:05:05 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24D54RY072931; Sat, 4 Mar 2017 13:05:04 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24D54CP072928; Sat, 4 Mar 2017 13:05:04 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703041305.v24D54CP072928@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Sat, 4 Mar 2017 13:05:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314668 - in stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 13:05:05 -0000 Author: avg Date: Sat Mar 4 13:05:04 2017 New Revision: 314668 URL: https://svnweb.freebsd.org/changeset/base/314668 Log: MFC r314273: zfs: call spa_deadman on a taskqueue thread Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Sat Mar 4 13:03:31 2017 (r314667) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Sat Mar 4 13:05:04 2017 (r314668) @@ -174,10 +174,6 @@ uint_t zio_taskq_basedc = 80; /* base boolean_t spa_create_process = B_TRUE; /* no process ==> no sysdc */ extern int zfs_sync_pass_deferred_free; -#ifndef illumos -extern void spa_deadman(void *arg); -#endif - /* * This (illegal) pool name is used when temporarily importing a spa_t in order * to get the vdev stats associated with the imported devices. @@ -6685,8 +6681,8 @@ spa_sync(spa_t *spa, uint64_t txg) spa->spa_sync_starttime + spa->spa_deadman_synctime)); #else /* !illumos */ #ifdef _KERNEL - callout_reset(&spa->spa_deadman_cycid, - hz * spa->spa_deadman_synctime / NANOSEC, spa_deadman, spa); + callout_schedule(&spa->spa_deadman_cycid, + hz * spa->spa_deadman_synctime / NANOSEC); #endif #endif /* illumos */ Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c Sat Mar 4 13:03:31 2017 (r314667) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c Sat Mar 4 13:05:04 2017 (r314668) @@ -597,8 +597,8 @@ spa_lookup(const char *name) * If the zfs_deadman_enabled flag is set then it inspects all vdev queues * looking for potentially hung I/Os. */ -void -spa_deadman(void *arg) +static void +spa_deadman(void *arg, int pending) { spa_t *spa = arg; @@ -627,6 +627,16 @@ spa_deadman(void *arg) #endif } +#if defined(__FreeBSD__) && defined(_KERNEL) +static void +spa_deadman_timeout(void *arg) +{ + spa_t *spa = arg; + + taskqueue_enqueue(taskqueue_thread, &spa->spa_deadman_task); +} +#endif + /* * Create an uninitialized spa_t with the given name. Requires * spa_namespace_lock. The caller must ensure that the spa_t doesn't already @@ -698,7 +708,23 @@ spa_add(const char *name, nvlist_t *conf mutex_exit(&cpu_lock); #else /* !illumos */ #ifdef _KERNEL + /* + * callout(9) does not provide a way to initialize a callout with + * a function and an argument, so we use callout_reset() to schedule + * the callout in the very distant future. Even if that event ever + * fires, it should be okayas we won't have any active zio-s. + * But normally spa_sync() will reschedule the callout with a proper + * timeout. + * callout(9) does not allow the callback function to sleep but + * vdev_deadman() needs to acquire vq_lock and illumos mutexes are + * emulated using sx(9). For this reason spa_deadman_timeout() + * will schedule spa_deadman() as task on a taskqueue that allows + * sleeping. + */ + TASK_INIT(&spa->spa_deadman_task, 0, spa_deadman, spa); callout_init(&spa->spa_deadman_cycid, 1); + callout_reset_sbt(&spa->spa_deadman_cycid, SBT_MAX, 0, + spa_deadman_timeout, spa, 0); #endif #endif refcount_create(&spa->spa_refcount); @@ -811,6 +837,7 @@ spa_remove(spa_t *spa) #else /* !illumos */ #ifdef _KERNEL callout_drain(&spa->spa_deadman_cycid); + taskqueue_drain(taskqueue_thread, &spa->spa_deadman_task); #endif #endif Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h Sat Mar 4 13:03:31 2017 (r314667) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h Sat Mar 4 13:05:04 2017 (r314668) @@ -261,6 +261,7 @@ struct spa { #else /* !illumos */ #ifdef _KERNEL struct callout spa_deadman_cycid; /* callout id */ + struct task spa_deadman_task; #endif #endif /* illumos */ uint64_t spa_deadman_calls; /* number of deadman calls */ From owner-svn-src-all@freebsd.org Sat Mar 4 13:36:12 2017 Return-Path: Delivered-To: svn-src-all@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 0A7D3CF9D1D; Sat, 4 Mar 2017 13:36:12 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from mx1.scaleengine.net (mx1.scaleengine.net [209.51.186.6]) (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 D17A210CC; Sat, 4 Mar 2017 13:36:11 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from [172.16.1.44] (s224.GtokyoFL6.vectant.ne.jp [222.228.90.224]) (Authenticated sender: allanjude.freebsd@scaleengine.com) by mx1.scaleengine.net (Postfix) with ESMTPSA id 4CEC31316E; Sat, 4 Mar 2017 13:36:09 +0000 (UTC) Date: Sat, 04 Mar 2017 22:36:03 +0900 User-Agent: K-9 Mail for Android In-Reply-To: <8637eu8ag6.fsf@desk.des.no> References: <201703020011.v220BWQ0086961@repo.freebsd.org> <86k28783xe.fsf@desk.des.no> <86fuiv832b.fsf@desk.des.no> <59d9780e-6ec3-4e5d-0c9e-77e3639205f6@freebsd.org> <8FE7A2E0-BB9C-4C48-82D9-B7027CA50358@gmail.com> <86bmti9268.fsf@desk.des.no> <8637eu8ag6.fsf@desk.des.no> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: svn commit: r314527 - in head: crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat crypto/ope... To: =?ISO-8859-1?Q?Dag-Erling_Sm=F8rgrav?= , Ed Maste CC: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" From: Allan Jude Message-ID: <8C2B41F8-3AF4-4CBC-A826-6C0EC25DBB6A@FreeBSD.org> X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 13:36:12 -0000 On March 4, 2017 3:46:49 AM GMT+09:00, "Dag-Erling Sm=C3=B8rgrav" wrote: >Ed Maste writes: >> If you don't want to use Phabricator, I'd ask that you consider >> removing your account=2E > >I didn't realize that was an option=2E And I wonder what will happen to >existing diffs that I have commented on or approved if I do=2E=2E=2E > >DES That is a legit concern=2E There is an experimental clone of phabricator r= unning at HTTPS://reviews3=2Efreebsd=2Eorg if you wanted to try to see what= happens --=20 Allan Jude From owner-svn-src-all@freebsd.org Sat Mar 4 15:04:18 2017 Return-Path: Delivered-To: svn-src-all@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 D56D6CF9E44; Sat, 4 Mar 2017 15:04:18 +0000 (UTC) (envelope-from pfg@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 A4EB21E19; Sat, 4 Mar 2017 15:04:18 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24F4Hkh023938; Sat, 4 Mar 2017 15:04:17 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24F4HMh023937; Sat, 4 Mar 2017 15:04:17 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201703041504.v24F4HMh023937@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sat, 4 Mar 2017 15:04:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314669 - head/sys/i386/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 15:04:18 -0000 Author: pfg Date: Sat Mar 4 15:04:17 2017 New Revision: 314669 URL: https://svnweb.freebsd.org/changeset/base/314669 Log: Drop i486 from the default i386 GENERIC kernel configuration. 80486 production was stopped by Intel on September 2007. Dropping the 486 configuration option from the GENERIC kernel improves performance slightly. Removing I486_CPU is consistent at this time: we don't support any processor without a FPU and the PC-98 arch, which frequently involved i486 CPUs, is also gone so we don't test such platforms anymore. Relnotes: yes MFC after: 2 weeks https://reviews.freebsd.org/D9879 Modified: head/sys/i386/conf/GENERIC Modified: head/sys/i386/conf/GENERIC ============================================================================== --- head/sys/i386/conf/GENERIC Sat Mar 4 13:05:04 2017 (r314668) +++ head/sys/i386/conf/GENERIC Sat Mar 4 15:04:17 2017 (r314669) @@ -18,7 +18,6 @@ # # $FreeBSD$ -cpu I486_CPU cpu I586_CPU cpu I686_CPU ident GENERIC From owner-svn-src-all@freebsd.org Sat Mar 4 15:20:13 2017 Return-Path: Delivered-To: svn-src-all@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 DF90ECF22E5; Sat, 4 Mar 2017 15:20:13 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 447F61657; Sat, 4 Mar 2017 15:20:12 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v24FK9ii077280; Sat, 4 Mar 2017 07:20:09 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v24FK9ne077279; Sat, 4 Mar 2017 07:20:09 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201703041520.v24FK9ne077279@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314654 - in head/cddl: lib/drti lib/libavl lib/libctf lib/libdtrace lib/libnvpair lib/libumem lib/libuutil lib/libzfs lib/libzfs_core lib/libzpool sbin/zfs sbin/zpool usr.bin/ctfconver... In-Reply-To: <201703041130.v24BU4La030976@repo.freebsd.org> To: Ngie Cooper Date: Sat, 4 Mar 2017 07:20:09 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 15:20:14 -0000 [ Charset UTF-8 unsupported, converting... ] > Author: ngie > Date: Sat Mar 4 11:30:04 2017 > New Revision: 314654 > URL: https://svnweb.freebsd.org/changeset/base/314654 > > Log: > cddl: normalize paths using SRCTOP-relative paths or :H when possible > > This simplifies make logic/output > > While here, remove bogus CFLAGS which look for headers in cddl/lib/libumem. > There aren't any source files there (just Makefiles) Please again, dont intermingle other chnages when doing a tree wide sweep. IMHO if you write While here, you probably should do that thing in a seperate commit, unless this is a single thing your touching in a single commit. It is much easier to glue 2 commits togeather than seperate 1 that changes 2 things. It is also still not clear to me that this was adeqautly disccussed as I only saw 2 +'s for staying relative and no one +ing to move forward with this. > > MFC after: 1 month > Sponsored by: Dell EMC Isilon > > Modified: > head/cddl/lib/drti/Makefile > head/cddl/lib/libavl/Makefile > head/cddl/lib/libctf/Makefile > head/cddl/lib/libdtrace/Makefile > head/cddl/lib/libnvpair/Makefile > head/cddl/lib/libumem/Makefile > head/cddl/lib/libuutil/Makefile > head/cddl/lib/libzfs/Makefile > head/cddl/lib/libzfs_core/Makefile > head/cddl/lib/libzpool/Makefile > head/cddl/sbin/zfs/Makefile > head/cddl/sbin/zpool/Makefile > head/cddl/usr.bin/ctfconvert/Makefile > head/cddl/usr.bin/ctfdump/Makefile > head/cddl/usr.bin/ctfmerge/Makefile > head/cddl/usr.bin/zinject/Makefile > head/cddl/usr.bin/zlook/Makefile > head/cddl/usr.bin/zstreamdump/Makefile > head/cddl/usr.bin/ztest/Makefile > head/cddl/usr.sbin/dtrace/Makefile > head/cddl/usr.sbin/lockstat/Makefile > head/cddl/usr.sbin/plockstat/Makefile > head/cddl/usr.sbin/zdb/Makefile > head/cddl/usr.sbin/zhack/Makefile > > Modified: head/cddl/lib/drti/Makefile > ============================================================================== > --- head/cddl/lib/drti/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/drti/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,6 +1,6 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common > > SRCS= drti.c > FILES= ${SRCS:R:S/$/.o/g} > @@ -12,8 +12,8 @@ CLEANFILES= ${FILES} > # These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. > .undef LIBRARIES_ONLY > > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ > - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ > + -I${SRCTOP}/cddl/compat/opensolaris/include \ > -I${OPENSOLARIS_USR_DISTDIR}/head \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ > > Modified: head/cddl/lib/libavl/Makefile > ============================================================================== > --- head/cddl/lib/libavl/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/libavl/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,11 +1,11 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/avl > > LIB= avl > SRCS= avl.c > WARNS?= 3 > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > > .include > > Modified: head/cddl/lib/libctf/Makefile > ============================================================================== > --- head/cddl/lib/libctf/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/libctf/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,8 +1,8 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/common/ctf > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libctf/common > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/ctf > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/common/ctf > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/ctf > > LIB= ctf > SRCS= ctf_create.c \ > @@ -21,8 +21,8 @@ MAN= ctf.5 > WARNS?= 2 > CFLAGS+= -DCTF_OLD_VERSIONS > > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ > - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ > + -I${SRCTOP}/cddl/compat/opensolaris/include \ > -I${OPENSOLARIS_USR_DISTDIR}/head \ > -I${OPENSOLARIS_USR_DISTDIR}/common/ctf \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ > > Modified: head/cddl/lib/libdtrace/Makefile > ============================================================================== > --- head/cddl/lib/libdtrace/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/libdtrace/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,7 +1,7 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libgen/common > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libgen/common > > LIB= dtrace > SRCS= dt_aggregate.c \ > @@ -64,9 +64,9 @@ FILESMODE= ${NOBINMODE} > WARNS?= 1 > > CFLAGS+= -I${.OBJDIR} -I${.CURDIR} \ > - -I${.CURDIR}/../../../sys/cddl/dev/dtrace/${MACHINE_ARCH} \ > - -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ > - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ > + -I${SRCTOP}/sys/cddl/dev/dtrace/${MACHINE_ARCH} \ > + -I${SRCTOP}/sys/cddl/compat/opensolaris \ > + -I${SRCTOP}/cddl/compat/opensolaris/include \ > -I${OPENSOLARIS_USR_DISTDIR}/head \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ > @@ -76,33 +76,33 @@ CFLAGS+= -I${.OBJDIR} -I${.CURDIR} \ > > .if ${MACHINE_CPUARCH} == "aarch64" > CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/aarch64 > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/aarch64 > -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/aarch64 > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/aarch64 > +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/aarch64 > .elif ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/dev/dtrace/x86 > +CFLAGS+= -I${SRCTOP}/sys/cddl/dev/dtrace/x86 > CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel -DDIS_MEM > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/i386 > -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/${MACHINE_ARCH} > -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/x86 > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/i386 > +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/${MACHINE_ARCH} > +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/x86 > .elif ${MACHINE_CPUARCH} == "arm" > CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/arm > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/arm > -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/arm > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/arm > +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/arm > .elif ${MACHINE_CPUARCH} == "mips" > CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/mips > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/mips > -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/mips > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/mips > +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/mips > .elif ${MACHINE_CPUARCH} == "powerpc" > CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/powerpc > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/powerpc > -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/powerpc > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/powerpc > +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/powerpc > .elif ${MACHINE_CPUARCH} == "riscv" > CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/riscv > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/riscv > -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/riscv > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/riscv > +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/riscv > .elif ${MACHINE_CPUARCH} == "sparc64" > CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/sparc > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/sparc > .else > # temporary hack > CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel > > Modified: head/cddl/lib/libnvpair/Makefile > ============================================================================== > --- head/cddl/lib/libnvpair/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/libnvpair/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,7 +1,7 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/nvpair > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/nvpair > > LIB= nvpair > > @@ -13,18 +13,18 @@ SRCS= libnvpair.c \ > opensolaris_nvpair_alloc_fixed.c > > WARNS?= 1 > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > > # This library uses macros to define fprintf behavior for several object types > # The compiler will see the non-string literal arguments to the fprintf calls and > -# omit warnings for them. Quiesce these warnings in contrib code: > +# omit warnings for them. Quiesce these warnings in contrib code: > # > # cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c:743:12: warning: format > # string is not a string literal (potentially insecure) [-Wformat-security] > > Modified: head/cddl/lib/libumem/Makefile > ============================================================================== > --- head/cddl/lib/libumem/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/libumem/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,10 +1,10 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem > +.PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem > > LIB= umem > SRCS= umem.c > WARNS?= 3 > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > > .include > > Modified: head/cddl/lib/libuutil/Makefile > ============================================================================== > --- head/cddl/lib/libuutil/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/libuutil/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,7 +1,7 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/avl > > LIB= uutil > SRCS= avl.c \ > @@ -17,10 +17,10 @@ SRCS= avl.c \ > > WARNS?= 1 > CFLAGS+= -DNATIVE_BUILD > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > > .include > > Modified: head/cddl/lib/libzfs/Makefile > ============================================================================== > --- head/cddl/lib/libzfs/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/libzfs/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,9 +1,9 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/misc > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common > +.PATH: ${SRCTOP}/cddl/compat/opensolaris/misc > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common > > LIB= zfs > LIBADD= md pthread umem util uutil m avl bsdxml geom nvpair z zfs_core > @@ -39,20 +39,19 @@ SRCS+= libzfs_changelist.c \ > WARNS?= 0 > CSTD= c99 > CFLAGS+= -DZFS_NO_ACL > -CFLAGS+= -I${.CURDIR}/../../../sbin/mount > -CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common > +CFLAGS+= -I${SRCTOP}/sbin/mount > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common > > .include > > Modified: head/cddl/lib/libzfs_core/Makefile > ============================================================================== > --- head/cddl/lib/libzfs_core/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/libzfs_core/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,10 +1,10 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/misc > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common > +.PATH: ${SRCTOP}/cddl/compat/opensolaris/misc > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common > > LIB= zfs_core > LIBADD= nvpair > @@ -18,20 +18,19 @@ SRCS+= libzfs_compat.c > WARNS?= 0 > CSTD= c99 > CFLAGS+= -DZFS_NO_ACL > -CFLAGS+= -I${.CURDIR}/../../../sbin/mount > -CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common > +CFLAGS+= -I${SRCTOP}/sbin/mount > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common > > .include > > Modified: head/cddl/lib/libzpool/Makefile > ============================================================================== > --- head/cddl/lib/libzpool/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/libzpool/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,28 +1,28 @@ > # $FreeBSD$ > > -.include "${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/Makefile.files" > +.include "${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/Makefile.files" > > # ZFS_COMMON_SRCS > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > # ZFS_SHARED_SRCS > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > # KERNEL_SRCS > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > # LIST_SRCS > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/os > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/os > # ATOMIC_SRCS > -.if exists(${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S) > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} > +.if exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S) > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} > ATOMIC_SRCS= opensolaris_atomic.S > .if ${MACHINE_ARCH} != "sparc64" > ACFLAGS+= -Wa,--noexecstack > .endif > .else > -.PATH: ${.CURDIR}/../../../sys/cddl/compat/opensolaris/kern > +.PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern > ATOMIC_SRCS= opensolaris_atomic.c > .endif > # UNICODE_SRCS > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/unicode > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/unicode > > LIB= zpool > > @@ -37,24 +37,23 @@ SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_S > ${UNICODE_SRCS} > > WARNS?= 0 > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../lib/libumem > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > # XXX: pthread doesn't have mutex_owned() equivalent, so we need to look > # into libthr private structures. That's sooo evil, but it's only for > # ZFS debugging tools needs. > CFLAGS+= -DWANTS_MUTEX_OWNED > -CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread > -CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys > -CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include > +CFLAGS+= -I${SRCTOP}/lib/libpthread/thread > +CFLAGS+= -I${SRCTOP}/lib/libpthread/sys > +CFLAGS+= -I${SRCTOP}/lib/libthr/arch/${MACHINE_CPUARCH}/include > > LIBADD= md pthread z nvpair avl umem > > > Modified: head/cddl/sbin/zfs/Makefile > ============================================================================== > --- head/cddl/sbin/zfs/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/sbin/zfs/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,26 +1,26 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zfs > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zfs > > PROG= zfs > MAN= zfs.8 > SRCS= zfs_main.c zfs_iter.c > > WARNS?= 0 > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libumem/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > > LIBADD= jail nvpair uutil zfs_core zfs > > > Modified: head/cddl/sbin/zpool/Makefile > ============================================================================== > --- head/cddl/sbin/zpool/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/sbin/zpool/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,8 +1,8 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zpool > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zpool > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/stat/common > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > > PROG= zpool > MAN= zpool.8 zpool-features.7 > @@ -10,22 +10,22 @@ SRCS= zpool_main.c zpool_vdev.c zpool_it > SRCS+= timestamp.c > > WARNS?= 0 > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libumem/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/cmd/stat/common > > LIBADD= geom nvpair uutil zfs > > > Modified: head/cddl/usr.bin/ctfconvert/Makefile > ============================================================================== > --- head/cddl/usr.bin/ctfconvert/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.bin/ctfconvert/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,7 +1,7 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt > > PROG= ctfconvert > SRCS= alist.c \ > @@ -25,8 +25,8 @@ SRCS= alist.c \ > traverse.c \ > util.c > > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ > - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ > + -I${SRCTOP}/cddl/compat/opensolaris/include \ > -I${OPENSOLARIS_USR_DISTDIR} \ > -I${OPENSOLARIS_SYS_DISTDIR} \ > -I${OPENSOLARIS_USR_DISTDIR}/head \ > > Modified: head/cddl/usr.bin/ctfdump/Makefile > ============================================================================== > --- head/cddl/usr.bin/ctfdump/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.bin/ctfdump/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,7 +1,7 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/dump > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/dump > > PROG= ctfdump > SRCS= dump.c \ > @@ -12,8 +12,8 @@ CFLAGS+= -I${OPENSOLARIS_USR_DISTDIR} \ > -I${OPENSOLARIS_SYS_DISTDIR} \ > -I${OPENSOLARIS_USR_DISTDIR}/head \ > -I${OPENSOLARIS_USR_DISTDIR}/cmd/mdb/tools/common \ > - -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ > - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ > + -I${SRCTOP}/sys/cddl/compat/opensolaris \ > + -I${SRCTOP}/cddl/compat/opensolaris/include \ > -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \ > -I${OPENSOLARIS_SYS_DISTDIR}/uts/common > > > Modified: head/cddl/usr.bin/ctfmerge/Makefile > ============================================================================== > --- head/cddl/usr.bin/ctfmerge/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.bin/ctfmerge/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,7 +1,7 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt > > PROG= ctfmerge > SRCS= alist.c \ > @@ -24,8 +24,8 @@ SRCS= alist.c \ > > WARNS?= 1 > > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ > - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ > + -I${SRCTOP}/cddl/compat/opensolaris/include \ > -I${OPENSOLARIS_USR_DISTDIR} \ > -I${OPENSOLARIS_SYS_DISTDIR} \ > -I${OPENSOLARIS_USR_DISTDIR}/head \ > > Modified: head/cddl/usr.bin/zinject/Makefile > ============================================================================== > --- head/cddl/usr.bin/zinject/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.bin/zinject/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,25 +1,24 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zinject > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zinject > > PROG= zinject > SRCS= zinject.c translate.c > MAN= > > WARNS?= 0 > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzfs/common > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzfs_core/common > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs/ > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../lib/libumem > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs/ > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > > LIBADD= geom m nvpair umem uutil zfs_core zfs zpool > > > Modified: head/cddl/usr.bin/zlook/Makefile > ============================================================================== > --- head/cddl/usr.bin/zlook/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.bin/zlook/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,25 +1,12 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zlook > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zlook > > PROG= zlook > MAN= > > WARNS?= 0 > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -#CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include > -#CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem > -#CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzfs/common > -#CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common > -#CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair > -#CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -#CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -#CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head > -#CFLAGS+= -I${.CURDIR}/../../lib/libumem > -# > -#DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ > -# ${LIBZFS} ${LIBZPOOL} > -#LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > > .include > > Modified: head/cddl/usr.bin/zstreamdump/Makefile > ============================================================================== > --- head/cddl/usr.bin/zstreamdump/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.bin/zstreamdump/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,22 +1,21 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/zstreamdump > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zstreamdump > > PROG= zstreamdump > MAN= zstreamdump.1 > > WARNS?= 0 > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../lib/libumem > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > > LIBADD= m nvpair umem zpool pthread z avl > > > Modified: head/cddl/usr.bin/ztest/Makefile > ============================================================================== > --- head/cddl/usr.bin/ztest/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.bin/ztest/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,22 +1,21 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/ztest > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/ztest > > PROG= ztest > MAN= > > WARNS?= 0 > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../lib/libumem > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > > LIBADD= geom m nvpair umem zpool pthread avl zfs_core zfs uutil > > > Modified: head/cddl/usr.sbin/dtrace/Makefile > ============================================================================== > --- head/cddl/usr.sbin/dtrace/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.sbin/dtrace/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -2,7 +2,7 @@ > > .include > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/dtrace > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/dtrace > > PROG= dtrace > SRCS= dtrace.c > @@ -10,8 +10,8 @@ BINDIR?= /usr/sbin > > WARNS?= 1 > > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ > - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ > + -I${SRCTOP}/cddl/compat/opensolaris/include \ > -I${OPENSOLARIS_USR_DISTDIR}/head \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \ > > Modified: head/cddl/usr.sbin/lockstat/Makefile > ============================================================================== > --- head/cddl/usr.sbin/lockstat/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.sbin/lockstat/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,6 +1,6 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/lockstat > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/lockstat > > PROG= lockstat > SRCS= lockstat.c sym.c > @@ -8,14 +8,14 @@ BINDIR?= /usr/sbin > > WARNS?= 1 > > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ > - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ > + -I${SRCTOP}/cddl/compat/opensolaris/include \ > -I${OPENSOLARIS_USR_DISTDIR}/head \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \ > -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ > -I${OPENSOLARIS_SYS_DISTDIR}/compat \ > - -I${.CURDIR}/../../../sys > + -I${SRCTOP}/sys > > CFLAGS+= -DNEED_ERRLOC -g > > > Modified: head/cddl/usr.sbin/plockstat/Makefile > ============================================================================== > --- head/cddl/usr.sbin/plockstat/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.sbin/plockstat/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,22 +1,22 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/plockstat > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/plockstat > > PROG= plockstat > -SRCS= plockstat.c > +SRCS= plockstat.c > BINDIR?= /usr/sbin > > WARNS?= 1 > > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ > - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ > + -I${SRCTOP}/cddl/compat/opensolaris/include \ > -I${OPENSOLARIS_USR_DISTDIR}/head \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \ > -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ > -I${OPENSOLARIS_SYS_DISTDIR}/compat \ > - -I${.CURDIR}/../../../cddl/lib/libdtrace \ > - -I${.CURDIR}/../../../sys > + -I${SRCTOP}/cddl/lib/libdtrace \ > + -I${SRCTOP}/sys > > LIBADD= dtrace proc > > > Modified: head/cddl/usr.sbin/zdb/Makefile > ============================================================================== > --- head/cddl/usr.sbin/zdb/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.sbin/zdb/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,6 +1,6 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zdb > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zdb > > PROG= zdb > MAN= zdb.8 > @@ -9,20 +9,19 @@ SRCS= zdb.c zdb_il.c > WARNS?= 0 > CSTD= c99 > > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../lib/libumem > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > > LIBADD= nvpair umem uutil zfs zpool > > > Modified: head/cddl/usr.sbin/zhack/Makefile > ============================================================================== > --- head/cddl/usr.sbin/zhack/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.sbin/zhack/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,6 +1,6 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zhack > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zhack > > PROG= zhack > MAN= > @@ -8,20 +8,19 @@ MAN= > WARNS?= 0 > CSTD= c99 > > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../lib/libumem > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > > LIBADD= nvpair zfs zpool > > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Sat Mar 4 15:23:07 2017 Return-Path: Delivered-To: svn-src-all@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 DF5D0CF2556; Sat, 4 Mar 2017 15:23:07 +0000 (UTC) (envelope-from pfg@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 AF31F1A96; Sat, 4 Mar 2017 15:23:07 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24FN6Td032008; Sat, 4 Mar 2017 15:23:06 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24FN6RS032007; Sat, 4 Mar 2017 15:23:06 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201703041523.v24FN6RS032007@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sat, 4 Mar 2017 15:23:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314670 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 15:23:08 -0000 Author: pfg Date: Sat Mar 4 15:23:06 2017 New Revision: 314670 URL: https://svnweb.freebsd.org/changeset/base/314670 Log: Add UPDATING entry per r314669: removal of classic i486 configuration. Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Sat Mar 4 15:04:17 2017 (r314669) +++ head/UPDATING Sat Mar 4 15:23:06 2017 (r314670) @@ -51,6 +51,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12 ****************************** SPECIAL WARNING: ****************************** +20170304: + Support for i486 has been dropped from the defauilt GENERIC i386 + kernel. Users of such old processors can still build custom kernels + or can upgrade the processor. + 20170302: Clang, llvm, lldb, compiler-rt and libc++ have been upgraded to 4.0.0. Please see the 20141231 entry below for information about prerequisites From owner-svn-src-all@freebsd.org Sat Mar 4 15:30:45 2017 Return-Path: Delivered-To: svn-src-all@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 73EEECF284E; Sat, 4 Mar 2017 15:30:45 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "vps1.elischer.org", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 504101F51; Sat, 4 Mar 2017 15:30:45 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from Julian-MBP3.local (106-68-109-205.dyn.iinet.net.au [106.68.109.205]) (authenticated bits=0) by vps1.elischer.org (8.15.2/8.15.2) with ESMTPSA id v24FUSeX037697 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sat, 4 Mar 2017 07:30:38 -0800 (PST) (envelope-from julian@freebsd.org) Subject: Re: svn commit: r314667 - in stable/10/sys: amd64/amd64 cddl/contrib/opensolaris/uts/common/dtrace cddl/contrib/opensolaris/uts/common/fs/zfs cddl/dev/profile compat/ndis contrib/ipfilter/netinet dev/a... To: Andriy Gapon , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org References: <201703041303.v24D3Vfi072728@repo.freebsd.org> From: Julian Elischer Message-ID: <1292f504-21e4-1bee-3dd6-6205252bfd26@freebsd.org> Date: Sat, 4 Mar 2017 23:30:22 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <201703041303.v24D3Vfi072728@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 15:30:45 -0000 On 4/3/17 9:03 pm, Andriy Gapon wrote: > Author: avg > Date: Sat Mar 4 13:03:31 2017 > New Revision: 314667 > URL: https://svnweb.freebsd.org/changeset/base/314667 > > Log: > MFC r283291: don't use CALLOUT_MPSAFE with callout_init() > > The main purpose of this MFC is to reduce conflicts for other merges. > Parts of the original change have already "trickled down" via individual MFCs. is there a better name than ''1" when you replace " CALLOUT_MPSAFE"? > - callout_init(&watchdog_callout, CALLOUT_MPSAFE); > + callout_init(&watchdog_callout, 1); > if (watchdog_cpu != -1) > watchdog_change(watchdog_cpu); From owner-svn-src-all@freebsd.org Sat Mar 4 15:32:36 2017 Return-Path: Delivered-To: svn-src-all@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 D1316CF2A97; Sat, 4 Mar 2017 15:32:36 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) (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 92FD4133C; Sat, 4 Mar 2017 15:32:36 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from slw by zxy.spb.ru with local (Exim 4.86 (FreeBSD)) (envelope-from ) id 1ckBfY-000McS-42; Sat, 04 Mar 2017 18:32:28 +0300 Date: Sat, 4 Mar 2017 18:32:28 +0300 From: Slawa Olhovchenkov To: "Pedro F. Giffuni" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314669 - head/sys/i386/conf Message-ID: <20170304153228.GM15630@zxy.spb.ru> References: <201703041504.v24F4HMh023937@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201703041504.v24F4HMh023937@repo.freebsd.org> User-Agent: Mutt/1.5.24 (2015-08-30) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 15:32:36 -0000 On Sat, Mar 04, 2017 at 03:04:17PM +0000, Pedro F. Giffuni wrote: > Author: pfg > Date: Sat Mar 4 15:04:17 2017 > New Revision: 314669 > URL: https://svnweb.freebsd.org/changeset/base/314669 > > Log: > Drop i486 from the default i386 GENERIC kernel configuration. > > 80486 production was stopped by Intel on September 2007. Dropping the 486 > configuration option from the GENERIC kernel improves performance > slightly. > > Removing I486_CPU is consistent at this time: we don't support any > processor without a FPU and the PC-98 arch, which frequently involved i486 > CPUs, is also gone so we don't test such platforms anymore. What is realy mean? Some Via CPU is like i486 (by instruction set). CPU: VIA Ezra (800.04-MHz 686-class CPU) Origin="CentaurHauls" Id=0x678 Family=0x6 Model=0x7 Stepping=8 Features=0x803035 AMD Features=0x80000000<3DNow!> From owner-svn-src-all@freebsd.org Sat Mar 4 15:34:32 2017 Return-Path: Delivered-To: svn-src-all@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 B0ED2CF2B85; Sat, 4 Mar 2017 15:34:32 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 685B51576; Sat, 4 Mar 2017 15:34:32 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v24FYUUS077350; Sat, 4 Mar 2017 07:34:30 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v24FYUeg077349; Sat, 4 Mar 2017 07:34:30 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201703041534.v24FYUeg077349@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314657 - in head/kerberos5: . lib/libgssapi_krb5 lib/libgssapi_ntlm lib/libgssapi_spnego lib/libhdb lib/libkafs5 lib/libkrb5 libexec/hprop libexec/kpasswdd tools/asn1_compile tools/slc In-Reply-To: <201703041134.v24BYbv5035092@repo.freebsd.org> To: Ngie Cooper Date: Sat, 4 Mar 2017 07:34:30 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 15:34:32 -0000 What is ${.CURDIR:H:H} ????? Yes that seems to work but now we are obscuring ../.. into makefile syntax magic, probably not a grand idea. > Author: ngie > Date: Sat Mar 4 11:34:36 2017 > New Revision: 314657 > URL: https://svnweb.freebsd.org/changeset/base/314657 > > Log: > kerberos5: normalize paths using SRCTOP-relative paths or :H when possible > > This simplifies make logic/output > > MFC after: 1 month > Sponsored by: Dell EMC Isilon > > Modified: > head/kerberos5/Makefile > head/kerberos5/Makefile.inc > head/kerberos5/lib/libgssapi_krb5/Makefile > head/kerberos5/lib/libgssapi_ntlm/Makefile > head/kerberos5/lib/libgssapi_spnego/Makefile > head/kerberos5/lib/libhdb/Makefile > head/kerberos5/lib/libkafs5/Makefile > head/kerberos5/lib/libkrb5/Makefile > head/kerberos5/libexec/hprop/Makefile > head/kerberos5/libexec/kpasswdd/Makefile > head/kerberos5/tools/asn1_compile/Makefile > head/kerberos5/tools/slc/Makefile > > Modified: head/kerberos5/Makefile > ============================================================================== > --- head/kerberos5/Makefile Sat Mar 4 11:33:01 2017 (r314656) > +++ head/kerberos5/Makefile Sat Mar 4 11:34:36 2017 (r314657) > @@ -11,7 +11,7 @@ KPROGS= lib/libpam \ > # This target is used to rebuild these programs WITH Kerberos. > kerberize: > .for entry in ${KPROGS} > - cd ${.CURDIR}/../${entry}; \ > + cd ${.CURDIR:H}/${entry}; \ > ${MAKE} cleandir; \ > ${MAKE} obj; \ > ${MAKE} all; \ > @@ -21,7 +21,7 @@ kerberize: > # This target is used to rebuild these programs WITHOUT Kerberos. > dekerberize: > .for entry in ${KPROGS} > - cd ${.CURDIR}/../${entry}; \ > + cd ${.CURDIR:H}/${entry}; \ > ${MAKE} MK_KERBEROS=no cleandir; \ > ${MAKE} MK_KERBEROS=no obj; \ > ${MAKE} MK_KERBEROS=no all; \ > > Modified: head/kerberos5/Makefile.inc > ============================================================================== > --- head/kerberos5/Makefile.inc Sat Mar 4 11:33:01 2017 (r314656) > +++ head/kerberos5/Makefile.inc Sat Mar 4 11:34:36 2017 (r314657) > @@ -4,9 +4,9 @@ > > NO_LINT= > > -KRB5DIR= ${.CURDIR}/../../../crypto/heimdal > +KRB5DIR= ${SRCTOP}/crypto/heimdal > > -CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../../include > +CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR:H:H}/include > > .if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT) > OPENLDAPBASE?= /usr/local > > Modified: head/kerberos5/lib/libgssapi_krb5/Makefile > ============================================================================== > --- head/kerberos5/lib/libgssapi_krb5/Makefile Sat Mar 4 11:33:01 2017 (r314656) > +++ head/kerberos5/lib/libgssapi_krb5/Makefile Sat Mar 4 11:34:36 2017 (r314657) > @@ -82,4 +82,4 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I. > > .include > > -.PATH: ${KRB5DIR}/lib/gssapi/krb5 ${.CURDIR}/../../../lib/libgssapi > +.PATH: ${KRB5DIR}/lib/gssapi/krb5 ${SRCTOP}/lib/libgssapi > > Modified: head/kerberos5/lib/libgssapi_ntlm/Makefile > ============================================================================== > --- head/kerberos5/lib/libgssapi_ntlm/Makefile Sat Mar 4 11:33:01 2017 (r314656) > +++ head/kerberos5/lib/libgssapi_ntlm/Makefile Sat Mar 4 11:34:36 2017 (r314657) > @@ -45,4 +45,4 @@ CFLAGS+=-I${KRB5DIR}/lib/ntlm > > .include > > -.PATH: ${KRB5DIR}/lib/gssapi/ntlm ${.CURDIR}/../../../lib/libgssapi ${.CURDIR}/../libgssapi_krb5 > +.PATH: ${KRB5DIR}/lib/gssapi/ntlm ${SRCTOP}/lib/libgssapi ${.CURDIR:H}/libgssapi_krb5 > > Modified: head/kerberos5/lib/libgssapi_spnego/Makefile > ============================================================================== > --- head/kerberos5/lib/libgssapi_spnego/Makefile Sat Mar 4 11:33:01 2017 (r314656) > +++ head/kerberos5/lib/libgssapi_spnego/Makefile Sat Mar 4 11:34:36 2017 (r314657) > @@ -31,7 +31,7 @@ CFLAGS+=-I${KRB5DIR}/lib/gssapi > CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi > CFLAGS+=-I${KRB5DIR}/lib/gssapi/spnego > CFLAGS+=-I${KRB5DIR}/lib/asn1 > -CFLAGS+=-I${.CURDIR}/../../../lib/libgssapi > +CFLAGS+=-I${SRCTOP}/lib/libgssapi > CFLAGS+=-I${KRB5DIR}/lib/roken -I. > > CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} \ > @@ -45,7 +45,7 @@ ${GEN}: spnego.asn1 spnego.opt > > .SUFFIXES: .h .c .x .hx > > -.x.c: > +.x.c: > ${CP} ${.IMPSRC} ${.TARGET} > > .hx.h: > @@ -55,4 +55,4 @@ ${GEN}: spnego.asn1 spnego.opt > > .SUFFIXES: .h .c .x .hx > > -.PATH: ${KRB5DIR}/lib/gssapi/spnego ${.CURDIR}/../../../lib/libgssapi ${.CURDIR}/../libgssapi_krb5 > +.PATH: ${KRB5DIR}/lib/gssapi/spnego ${SRCTOP}/lib/libgssapi ${.CURDIR:H}/libgssapi_krb5 > > Modified: head/kerberos5/lib/libhdb/Makefile > ============================================================================== > --- head/kerberos5/lib/libhdb/Makefile Sat Mar 4 11:33:01 2017 (r314656) > +++ head/kerberos5/lib/libhdb/Makefile Sat Mar 4 11:34:36 2017 (r314657) > @@ -57,7 +57,7 @@ SRCS= common.c \ > ${GEN:S/.x$/.c/:S/.hx$/.h/} > > CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \ > - -I${KRB5DIR}/lib/roken -I${.CURDIR}/../../../contrib/sqlite3/ \ > + -I${KRB5DIR}/lib/roken -I${SRCTOP}/contrib/sqlite3/ \ > -I${KRB5DIR}/lib/krb5 \ > -I. ${LDAPCFLAGS} > CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\"" > > Modified: head/kerberos5/lib/libkafs5/Makefile > ============================================================================== > --- head/kerberos5/lib/libkafs5/Makefile Sat Mar 4 11:33:01 2017 (r314656) > +++ head/kerberos5/lib/libkafs5/Makefile Sat Mar 4 11:34:36 2017 (r314657) > @@ -26,7 +26,7 @@ SRCS= afssys.c afskrb5.c common.c krb5_e > > CFLAGS+= -I${KRB5DIR}/lib/kafs \ > -I${KRB5DIR}/lib/krb5 \ > - -I${.OBJDIR}/../libkrb5/ \ > + -I${.OBJDIR:H}/libkrb5/ \ > -I${KRB5DIR}/lib/roken > > CLEANFILES= kafs5.3 > > Modified: head/kerberos5/lib/libkrb5/Makefile > ============================================================================== > --- head/kerberos5/lib/libkrb5/Makefile Sat Mar 4 11:33:01 2017 (r314656) > +++ head/kerberos5/lib/libkrb5/Makefile Sat Mar 4 11:34:36 2017 (r314657) > @@ -625,4 +625,4 @@ CFLAGS+= -I${KRB5DIR}/lib/krb5 \ > > .include > > -.PATH: ${KRB5DIR}/lib/krb5 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/include ${.CURDIR}/../../include ${KRB5DIR}/doc/doxyout/krb5/man/man3/ > +.PATH: ${KRB5DIR}/lib/krb5 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/include ${SRCTOP}/kerberos5/include ${KRB5DIR}/doc/doxyout/krb5/man/man3/ > > Modified: head/kerberos5/libexec/hprop/Makefile > ============================================================================== > --- head/kerberos5/libexec/hprop/Makefile Sat Mar 4 11:33:01 2017 (r314656) > +++ head/kerberos5/libexec/hprop/Makefile Sat Mar 4 11:34:36 2017 (r314657) > @@ -9,7 +9,7 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1 > CFLAGS+=-I${KRB5DIR}/lib/hx509 > CFLAGS+=-I${KRB5DIR}/lib/ntlm > CFLAGS+=-I${KRB5DIR}/kdc > -CFLAGS+=-I${.OBJDIR}/../../lib/libkrb5 > +CFLAGS+=-I${.OBJDIR:H:H}/lib/libkrb5 > LIBADD= hdb krb5 roken vers > DPADD= ${LDAPDPADD} > LDADD= ${LDAPLDADD} > > Modified: head/kerberos5/libexec/kpasswdd/Makefile > ============================================================================== > --- head/kerberos5/libexec/kpasswdd/Makefile Sat Mar 4 11:33:01 2017 (r314656) > +++ head/kerberos5/libexec/kpasswdd/Makefile Sat Mar 4 11:34:36 2017 (r314657) > @@ -2,7 +2,7 @@ > > PROG= kpasswdd > MAN= kpasswdd.8 > -CFLAGS+=-I${KRB5DIR}/lib/roken -I../../lib/libhdb ${LDAPCFLAGS} > +CFLAGS+=-I${KRB5DIR}/lib/roken -I${.CURDIR:H:H}/lib/libhdb ${LDAPCFLAGS} > LIBADD= kadm5srv hdb krb5 roken vers asn1 > DPADD= ${LDAPDPADD} > LDADD= ${LDAPLDADD} > > Modified: head/kerberos5/tools/asn1_compile/Makefile > ============================================================================== > --- head/kerberos5/tools/asn1_compile/Makefile Sat Mar 4 11:33:01 2017 (r314656) > +++ head/kerberos5/tools/asn1_compile/Makefile Sat Mar 4 11:34:36 2017 (r314657) > @@ -2,7 +2,7 @@ > > PROG= asn1_compile > MAN= > -LIBROKEN_A= ${.OBJDIR}/../../lib/libroken/libroken.a > +LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a > LIBADD= vers > LDADD= ${LIBROKEN_A} > DPADD= ${LIBROKEN_A} > > Modified: head/kerberos5/tools/slc/Makefile > ============================================================================== > --- head/kerberos5/tools/slc/Makefile Sat Mar 4 11:33:01 2017 (r314656) > +++ head/kerberos5/tools/slc/Makefile Sat Mar 4 11:34:36 2017 (r314657) > @@ -1,7 +1,7 @@ > # $FreeBSD$ > > PROG= slc > -LIBROKEN_A= ${.OBJDIR}/../../lib/libroken/libroken.a > +LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a > LIBADD= vers > LDADD= ${LIBROKEN_A} > DPADD= ${LIBROKEN_A} > @@ -18,7 +18,7 @@ CLEANFILES= roken.h slc-gram.c slc-lex.c > roken.h: > ${MAKE_ROKEN} > ${.TARGET} > > -# ${.OBJDIR}/../make-roken/make-roken > ${.TARGET} > +# ${.OBJDIR:H}/make-roken/make-roken > ${.TARGET} > > .include > > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Sat Mar 4 15:49:59 2017 Return-Path: Delivered-To: svn-src-all@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 42F8BCF2E6A for ; Sat, 4 Mar 2017 15:49:59 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm30-vm5.bullet.mail.ne1.yahoo.com (nm30-vm5.bullet.mail.ne1.yahoo.com [98.138.91.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0E84E1BEE for ; Sat, 4 Mar 2017 15:49:58 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1488642592; bh=QuuFBCwZ8MCmxmgsgZZfFvTOzkZGjs6JHvqWkhOuAok=; h=From:Subject:To:References:Cc:Date:In-Reply-To:From:Subject; b=tDf8tkmiaj3A/skXps2lrpF7TllqkPR92TVht5Ny2hYjhnNc4MKmJLdZb2G+UoNZ2kFZjtAIWyUn8Yw6dOhJiBjWVeyCYpF6ByZUj6g5NrGfeuO8CdjEZZByQjnDm1fL4r1B0CgdPAGPqLOvILScz3i76SMMpBaD+cNoIKcJsuXRr1bW1ihvoGoSPiRbzrsS1aqfdEwSp9KYlwH/vSX+e3IxXY/WqSL7kftql6/qF6JlUPmdM35BZ17RxdB+sW9o7lzDai5Y328pzwjvLk2nwlHNbRtDh0zbC4lvj2YFKcr+DiGMlfbCQpznYHW+QRibrywcEF6d8sHgYtd4fncYtA== Received: from [98.138.226.177] by nm30.bullet.mail.ne1.yahoo.com with NNFMP; 04 Mar 2017 15:49:52 -0000 Received: from [98.138.226.31] by tm12.bullet.mail.ne1.yahoo.com with NNFMP; 04 Mar 2017 15:49:52 -0000 Received: from [127.0.0.1] by smtp202.mail.ne1.yahoo.com with NNFMP; 04 Mar 2017 15:49:52 -0000 X-Yahoo-Newman-Id: 689296.55429.bm@smtp202.mail.ne1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: m99WEU4VM1k_CQfzscU7pOvcEgR54vUNJj0BiGuXf.D64WC YbrQLA.V36K6JEmrvsTZTKl2Ad7eo0sj77FDc72UAtRFoQ6Jlk08lMP5RjDg WsYLPoOPCkJ6o254Pcvzo75aXvKmx0Rg8StmigQg5PciL24D8xHy8Nw4o1Ql 6rg0eMLFfvBM8Kv5aKW_O9zP16PPyA8PfiKwXKfdQuHhU0OgP01tmv_Ev1cR p2H9eu2zkIN2j1pzxC7r2zDJfV4R1RW87lr8UFBTRs3ASaS7FTgeoikNYWCM LHDBxmnxOMvxa7d0T_6wo6_QTHlkLQUFMAmS42reqGwLOap0CVO5j0tpKGA4 bbhJyK_Sj2yoor59Zg3SwX8FFKneOSEgev.dR_meuJIlBhqXmf.wFnKMtgFZ huH3U4GebQkg9B9SH9q3ZYPzWgZ6SG.fEZHWx8tK8A7g2pNQONm2UKfUVq82 c4XPvSEsKOZeEhyvp8VzKvGxDkYcABfwSW984NRNKzauFR5_cEY70mv0nRlU bJvmkOEgObTzJ0cNX12GmZotYkAwpJNfE2kkmkbRI0E4dsrs- X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf From: Pedro Giffuni Subject: Re: svn commit: r314669 - head/sys/i386/conf To: Slawa Olhovchenkov References: <201703041504.v24F4HMh023937@repo.freebsd.org> <20170304153228.GM15630@zxy.spb.ru> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Organization: Apache Software Foundation Message-ID: Date: Sat, 4 Mar 2017 10:52:46 -0500 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <20170304153228.GM15630@zxy.spb.ru> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 15:49:59 -0000 On 03/04/17 10:32, Slawa Olhovchenkov wrote: > On Sat, Mar 04, 2017 at 03:04:17PM +0000, Pedro F. Giffuni wrote: > >> Author: pfg >> Date: Sat Mar 4 15:04:17 2017 >> New Revision: 314669 >> URL: https://svnweb.freebsd.org/changeset/base/314669 >> >> Log: >> Drop i486 from the default i386 GENERIC kernel configuration. >> >> 80486 production was stopped by Intel on September 2007. Dropping the 486 >> configuration option from the GENERIC kernel improves performance >> slightly. >> >> Removing I486_CPU is consistent at this time: we don't support any >> processor without a FPU and the PC-98 arch, which frequently involved i486 >> CPUs, is also gone so we don't test such platforms anymore. > > What is realy mean? This means we don't do work-arounds that would be required for raw 486. Instead we will use the 586 instructions by default. > Some Via CPU is like i486 (by instruction set). > > CPU: VIA Ezra (800.04-MHz 686-class CPU) > Origin="CentaurHauls" Id=0x678 Family=0x6 Model=0x7 Stepping=8 > Features=0x803035 > AMD Features=0x80000000<3DNow!> > 486 never had MMX extensions. This is a 686, performance should improve ~4%. Pedro. From owner-svn-src-all@freebsd.org Sat Mar 4 15:50:28 2017 Return-Path: Delivered-To: svn-src-all@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 600EECF2EF4 for ; Sat, 4 Mar 2017 15:50:28 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm19-vm4.bullet.mail.ne1.yahoo.com (nm19-vm4.bullet.mail.ne1.yahoo.com [98.138.91.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2BD4F1D34 for ; Sat, 4 Mar 2017 15:50:28 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1488642626; bh=nuxpQUvb2dMLpsNhyj+tpU4pt7nfPn1RNsROGyb9/To=; h=From:Subject:To:References:Date:In-Reply-To:From:Subject; b=TjZeyKpr5aIUSnmd3/C7UzQxZbu0nKy+fhZQDpq6X6JVhfJVfqE01L1mlwP8336l9L8htRkdB6kv1eGZz+1w6K8LIKuogvBTdrxhu6up92Ok3mrfWWnzsezTPIowABeezzwGx72BxyEpGojPu/FaX+p4hshNj+Ywukpe+9pj8Zx+WZB0zmWzMZCe5Ir8KwPrXbG0lbenfKrOBam0GD97FmJtbtWn6jOJuAZuVvqMoMgWkOH2IkwY+DgSNIkM0ebRYrBnrovuqz9TcVFHRb23i0dUNzIQRdzrBABQyYj4Yzyqx8wSlCTrPF73ARY1q/YIKfrN75zJYvZ0bgOLQYNSpQ== Received: from [98.138.100.103] by nm19.bullet.mail.ne1.yahoo.com with NNFMP; 04 Mar 2017 15:50:26 -0000 Received: from [98.138.104.112] by tm102.bullet.mail.ne1.yahoo.com with NNFMP; 04 Mar 2017 15:50:26 -0000 Received: from [127.0.0.1] by smtp221.mail.ne1.yahoo.com with NNFMP; 04 Mar 2017 15:50:26 -0000 X-Yahoo-Newman-Id: 673165.26819.bm@smtp221.mail.ne1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: QaOn5FcVM1kaY5qmqgU.rgu0f5O.L7cBCE1GqS8Gm3ds3yL zrxrkhmkevpPGTZZePueYGK7JKY2uK02uQHRqjZRHRv0iWrkj8MzHFBJtWD8 mvwYzTZirPRJipmRKk3nk5MZymG6jPEdKcM0MVTL0XzqqMcUPUpx55JUlSUX Jd15zD0RiJxrIFE0f26GTaOSckv.2bCgNX5L3Azkr4_H0ZFGukLvjUWS8nzh NLMLPLeLrhv2tfKgYlS2JXVbER4_gyMEfZVbTITyvttukDA8Gu9NMq1ED.90 bpHDJBaUyxn1WJzz7RHAc6HVwweKCOFpa.ZtfCHck.Tmxvw2Yefc.WiQgV78 8lfUVnbW_ezAVcFhp8e8bh_8lYRbmZ6OuBnLSRB3HLYZkX.rnWRmFcG.sBbQ dcIom1SQtEQXE1ZpVVyzzP55h96oJxw._fOjGDrb9.W8bAgKjYu6SpqtiWry NKNOj94cwJ9R6mLFoE1NF2TYvgVQHhT1A6dE8KPoeCnrF_76lVZtoI4BXa89 uEjSUaS70U62x8..E5qxGkgNFAnRuemLeWZ3w4tj3zPjhcCs- X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf From: Pedro Giffuni Subject: Re: svn commit: r314669 - head/sys/i386/conf To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201703041504.v24F4HMh023937@repo.freebsd.org> Organization: Apache Software Foundation Message-ID: <82822e00-8b46-c1dd-29f2-735247e0d68c@apache.org> Date: Sat, 4 Mar 2017 10:53:12 -0500 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <201703041504.v24F4HMh023937@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 15:50:28 -0000 On 03/04/17 10:04, Pedro F. Giffuni wrote: > Author: pfg > Date: Sat Mar 4 15:04:17 2017 > New Revision: 314669 > URL: https://svnweb.freebsd.org/changeset/base/314669 > > Log: > Drop i486 from the default i386 GENERIC kernel configuration. > > 80486 production was stopped by Intel on September 2007. Dropping the 486 > configuration option from the GENERIC kernel improves performance > slightly. > > Removing I486_CPU is consistent at this time: we don't support any > processor without a FPU and the PC-98 arch, which frequently involved i486 > CPUs, is also gone so we don't test such platforms anymore. > > Relnotes: yes > MFC after: 2 weeks > https://reviews.freebsd.org/D9879 > I missed the "Differential Revision:" tag in the log. :( From owner-svn-src-all@freebsd.org Sat Mar 4 15:53:42 2017 Return-Path: Delivered-To: svn-src-all@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 E158FCF31B6; Sat, 4 Mar 2017 15:53:42 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B6ED612CC; Sat, 4 Mar 2017 15:53:42 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v24Fretv077438; Sat, 4 Mar 2017 07:53:40 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v24Freaq077437; Sat, 4 Mar 2017 07:53:40 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201703041553.v24Freaq077437@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314669 - head/sys/i386/conf In-Reply-To: <20170304153228.GM15630@zxy.spb.ru> To: Slawa Olhovchenkov Date: Sat, 4 Mar 2017 07:53:40 -0800 (PST) CC: "Pedro F. Giffuni" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 15:53:43 -0000 > On Sat, Mar 04, 2017 at 03:04:17PM +0000, Pedro F. Giffuni wrote: > > > Author: pfg > > Date: Sat Mar 4 15:04:17 2017 > > New Revision: 314669 > > URL: https://svnweb.freebsd.org/changeset/base/314669 > > > > Log: > > Drop i486 from the default i386 GENERIC kernel configuration. > > > > 80486 production was stopped by Intel on September 2007. Dropping the 486 > > configuration option from the GENERIC kernel improves performance > > slightly. > > > > Removing I486_CPU is consistent at this time: we don't support any > > processor without a FPU and the PC-98 arch, which frequently involved i486 > > CPUs, is also gone so we don't test such platforms anymore. > > What is realy mean? > Some Via CPU is like i486 (by instruction set). > > CPU: VIA Ezra (800.04-MHz 686-class CPU) > Origin="CentaurHauls" Id=0x678 Family=0x6 Model=0x7 Stepping=8 > Features=0x803035 > AMD Features=0x80000000<3DNow!> There is also the whole 486sx family that is 486 die that they turned the FPU feature off in cause it failed functional test at die sort. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Sat Mar 4 16:03:07 2017 Return-Path: Delivered-To: svn-src-all@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 449FECF34F3; Sat, 4 Mar 2017 16:03:07 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citapm.icyb.net.ua (citapm.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id BA3451873; Sat, 4 Mar 2017 16:03:05 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citapm.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id SAA01372; Sat, 04 Mar 2017 18:03:03 +0200 (EET) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1ckC99-000C1J-Kg; Sat, 04 Mar 2017 18:03:03 +0200 Subject: Re: svn commit: r314667 - in stable/10/sys: amd64/amd64 cddl/contrib/opensolaris/uts/common/dtrace cddl/contrib/opensolaris/uts/common/fs/zfs cddl/dev/profile compat/ndis contrib/ipfilter/netinet dev/a... To: Julian Elischer , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-stable@FreeBSD.org, svn-src-stable-10@FreeBSD.org References: <201703041303.v24D3Vfi072728@repo.freebsd.org> <1292f504-21e4-1bee-3dd6-6205252bfd26@freebsd.org> From: Andriy Gapon Message-ID: <47d091e5-6efe-5992-f09c-8c231f2da349@FreeBSD.org> Date: Sat, 4 Mar 2017 18:02:02 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <1292f504-21e4-1bee-3dd6-6205252bfd26@freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 16:03:07 -0000 On 04/03/2017 17:30, Julian Elischer wrote: > On 4/3/17 9:03 pm, Andriy Gapon wrote: >> Author: avg >> Date: Sat Mar 4 13:03:31 2017 >> New Revision: 314667 >> URL: https://svnweb.freebsd.org/changeset/base/314667 >> >> Log: >> MFC r283291: don't use CALLOUT_MPSAFE with callout_init() >> The main purpose of this MFC is to reduce conflicts for other merges. >> Parts of the original change have already "trickled down" via individual MFCs. > > is there a better name than ''1" when you replace " CALLOUT_MPSAFE"? Maybe 'true'. The argument has type int and it is documented this way: If the mpsafe argument is zero, the callout structure is not considered to be “multi-processor safeâ€; and the Giant lock will be acquired before calling the callout function and released when the callout function returns. >> - callout_init(&watchdog_callout, CALLOUT_MPSAFE); >> + callout_init(&watchdog_callout, 1); >> if (watchdog_cpu != -1) >> watchdog_change(watchdog_cpu); > -- Andriy Gapon From owner-svn-src-all@freebsd.org Sat Mar 4 16:11:15 2017 Return-Path: Delivered-To: svn-src-all@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 2F1EACF3767; Sat, 4 Mar 2017 16:11:15 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "vps1.elischer.org", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id ED20A1CF2; Sat, 4 Mar 2017 16:11:14 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from Julian-MBP3.local (106-68-109-205.dyn.iinet.net.au [106.68.109.205]) (authenticated bits=0) by vps1.elischer.org (8.15.2/8.15.2) with ESMTPSA id v24GAx5d037861 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sat, 4 Mar 2017 08:11:06 -0800 (PST) (envelope-from julian@freebsd.org) Subject: Re: svn commit: r314667 - in stable/10/sys: amd64/amd64 cddl/contrib/opensolaris/uts/common/dtrace cddl/contrib/opensolaris/uts/common/fs/zfs cddl/dev/profile compat/ndis contrib/ipfilter/netinet dev/a... To: Andriy Gapon , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-stable@FreeBSD.org, svn-src-stable-10@FreeBSD.org References: <201703041303.v24D3Vfi072728@repo.freebsd.org> <1292f504-21e4-1bee-3dd6-6205252bfd26@freebsd.org> <47d091e5-6efe-5992-f09c-8c231f2da349@FreeBSD.org> From: Julian Elischer Message-ID: <0c863f1d-4039-3698-e1f7-e9aea5d190ee@freebsd.org> Date: Sun, 5 Mar 2017 00:10:52 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <47d091e5-6efe-5992-f09c-8c231f2da349@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 16:11:15 -0000 On 5/3/17 12:02 am, Andriy Gapon wrote: > On 04/03/2017 17:30, Julian Elischer wrote: >> On 4/3/17 9:03 pm, Andriy Gapon wrote: >>> Author: avg >>> Date: Sat Mar 4 13:03:31 2017 >>> New Revision: 314667 >>> URL: https://svnweb.freebsd.org/changeset/base/314667 >>> >>> Log: >>> MFC r283291: don't use CALLOUT_MPSAFE with callout_init() >>> The main purpose of this MFC is to reduce conflicts for other merges. >>> Parts of the original change have already "trickled down" via individual MFCs. >> is there a better name than ''1" when you replace " CALLOUT_MPSAFE"? > Maybe 'true'. The argument has type int and it is documented this way: > > If the mpsafe argument is zero, the callout structure > is not considered to be “multi-processor safeâ€; and the Giant lock will > be acquired before calling the callout function and released when the > callout function returns. then I disagree with the change. I think CALLOUT_MPSAFE is a better value than '1'. or CALLOUT_IS_MPSAFE. I'm sort of confused by why 283291 made that change. It seems a regression to me. MFC-ing it is a different question and 'diff reduction' is a valid reason but the original change in head seems suspect. >>> - callout_init(&watchdog_callout, CALLOUT_MPSAFE); >>> + callout_init(&watchdog_callout, 1); >>> if (watchdog_cpu != -1) >>> watchdog_change(watchdog_cpu); > > From owner-svn-src-all@freebsd.org Sat Mar 4 16:59:56 2017 Return-Path: Delivered-To: svn-src-all@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 65625CF9720; Sat, 4 Mar 2017 16:59:56 +0000 (UTC) (envelope-from cem@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 33B6116FA; Sat, 4 Mar 2017 16:59:56 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24GxttH070124; Sat, 4 Mar 2017 16:59:55 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24GxtGL070123; Sat, 4 Mar 2017 16:59:55 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201703041659.v24GxtGL070123@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Sat, 4 Mar 2017 16:59:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314671 - head/sbin/newfs_nandfs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 16:59:56 -0000 Author: cem Date: Sat Mar 4 16:59:55 2017 New Revision: 314671 URL: https://svnweb.freebsd.org/changeset/base/314671 Log: newfs_nandfs: Fix unaligned pointer warning PR: 217532 Submitted by: Trond Endrestol Modified: head/sbin/newfs_nandfs/newfs_nandfs.c Modified: head/sbin/newfs_nandfs/newfs_nandfs.c ============================================================================== --- head/sbin/newfs_nandfs/newfs_nandfs.c Sat Mar 4 15:23:06 2017 (r314670) +++ head/sbin/newfs_nandfs/newfs_nandfs.c Sat Mar 4 16:59:55 2017 (r314671) @@ -520,6 +520,7 @@ save_segsum(struct nandfs_segment_summar static void create_fsdata(void) { + struct uuid tmp; memset(&fsdata, 0, sizeof(struct nandfs_fsdata)); @@ -540,7 +541,8 @@ create_fsdata(void) fsdata.f_checkpoint_size = sizeof(struct nandfs_checkpoint); fsdata.f_segment_usage_size = sizeof(struct nandfs_segment_usage); - uuidgen(&fsdata.f_uuid, 1); + uuidgen(&tmp, 1); + fsdata.f_uuid = tmp; if (volumelabel) memcpy(fsdata.f_volume_name, volumelabel, 16); From owner-svn-src-all@freebsd.org Sat Mar 4 17:34:38 2017 Return-Path: Delivered-To: svn-src-all@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 3128FCF949B; Sat, 4 Mar 2017 17:34:38 +0000 (UTC) (envelope-from gonzo@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 E36DE1DAD; Sat, 4 Mar 2017 17:34:37 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24HYa6f085888; Sat, 4 Mar 2017 17:34:36 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24HYabk085887; Sat, 4 Mar 2017 17:34:36 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <201703041734.v24HYabk085887@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Sat, 4 Mar 2017 17:34:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314672 - head/sys/arm/broadcom/bcm2835 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 17:34:38 -0000 Author: gonzo Date: Sat Mar 4 17:34:36 2017 New Revision: 314672 URL: https://svnweb.freebsd.org/changeset/base/314672 Log: [rpi] rpi3 should use the same cpufreq logic as rpi2, not rpi-b RPi3 cpufreq is more like that on RPi2. Setting arm frequency above min (say, "sysctl hw.cpufreq.arm_freq=600000001") turns on turbo mode, and the firmware automatically raises voltage, sets frequency to max 1200MHz, and throttle when overheat, etc. Swap if/else parts and use SOC_BCM2835 def so RPi3 can share the same cpufreq logic as RPi2, instead of falling to that for RPi. Submitted by: Jia-Shiun Li MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D9640 Modified: head/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c Modified: head/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c ============================================================================== --- head/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c Sat Mar 4 16:59:55 2017 (r314671) +++ head/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c Sat Mar 4 17:34:36 2017 (r314672) @@ -66,16 +66,16 @@ __FBSDID("$FreeBSD$"); #define HZ2MHZ(freq) ((freq) / (1000 * 1000)) #define MHZ2HZ(freq) ((freq) * (1000 * 1000)) -#ifdef SOC_BCM2836 -#define OFFSET2MVOLT(val) (((val) / 1000)) -#define MVOLT2OFFSET(val) (((val) * 1000)) -#define DEFAULT_ARM_FREQUENCY 600 -#define DEFAULT_LOWEST_FREQ 600 -#else +#ifdef SOC_BCM2835 #define OFFSET2MVOLT(val) (1200 + ((val) * 25)) #define MVOLT2OFFSET(val) (((val) - 1200) / 25) #define DEFAULT_ARM_FREQUENCY 700 #define DEFAULT_LOWEST_FREQ 300 +#else +#define OFFSET2MVOLT(val) (((val) / 1000)) +#define MVOLT2OFFSET(val) (((val) * 1000)) +#define DEFAULT_ARM_FREQUENCY 600 +#define DEFAULT_LOWEST_FREQ 600 #endif #define DEFAULT_CORE_FREQUENCY 250 #define DEFAULT_SDRAM_FREQUENCY 400 @@ -1544,7 +1544,20 @@ bcm2835_cpufreq_make_freq_list(device_t if (min_freq > cpufreq_lowest_freq) min_freq = cpufreq_lowest_freq; -#ifdef SOC_BCM2836 +#ifdef SOC_BCM2835 + /* from freq to min_freq */ + for (idx = 0; idx < *count && freq >= min_freq; idx++) { + if (freq > sc->arm_min_freq) + volts = sc->max_voltage_core; + else + volts = sc->min_voltage_core; + sets[idx].freq = freq; + sets[idx].volts = volts; + sets[idx].lat = TRANSITION_LATENCY; + sets[idx].dev = dev; + freq -= MHZSTEP; + } +#else /* XXX RPi2 have only 900/600MHz */ idx = 0; volts = sc->min_voltage_core; @@ -1560,19 +1573,6 @@ bcm2835_cpufreq_make_freq_list(device_t sets[idx].dev = dev; idx++; } -#else - /* from freq to min_freq */ - for (idx = 0; idx < *count && freq >= min_freq; idx++) { - if (freq > sc->arm_min_freq) - volts = sc->max_voltage_core; - else - volts = sc->min_voltage_core; - sets[idx].freq = freq; - sets[idx].volts = volts; - sets[idx].lat = TRANSITION_LATENCY; - sets[idx].dev = dev; - freq -= MHZSTEP; - } #endif *count = idx; From owner-svn-src-all@freebsd.org Sat Mar 4 18:07:31 2017 Return-Path: Delivered-To: svn-src-all@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 79625CF9E31; Sat, 4 Mar 2017 18:07:31 +0000 (UTC) (envelope-from bdrewery@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 484801F32; Sat, 4 Mar 2017 18:07:31 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24I7U7L097907; Sat, 4 Mar 2017 18:07:30 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24I7U4E097906; Sat, 4 Mar 2017 18:07:30 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201703041807.v24I7U4E097906@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 4 Mar 2017 18:07:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314673 - stable/11/sys/kern X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 18:07:31 -0000 Author: bdrewery Date: Sat Mar 4 18:07:30 2017 New Revision: 314673 URL: https://svnweb.freebsd.org/changeset/base/314673 Log: MFC r313909: Fix panic with unlocked vnode to vrecycle(). Modified: stable/11/sys/kern/uipc_mqueue.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/kern/uipc_mqueue.c ============================================================================== --- stable/11/sys/kern/uipc_mqueue.c Sat Mar 4 17:34:36 2017 (r314672) +++ stable/11/sys/kern/uipc_mqueue.c Sat Mar 4 18:07:30 2017 (r314673) @@ -714,7 +714,9 @@ do_recycle(void *context, int pending __ { struct vnode *vp = (struct vnode *)context; + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); vrecycle(vp); + VOP_UNLOCK(vp, 0); vdrop(vp); } From owner-svn-src-all@freebsd.org Sat Mar 4 18:12:00 2017 Return-Path: Delivered-To: svn-src-all@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 5A191CF9FCD; Sat, 4 Mar 2017 18:12:00 +0000 (UTC) (envelope-from bdrewery@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 23A0912D8; Sat, 4 Mar 2017 18:12:00 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24IBx75001181; Sat, 4 Mar 2017 18:11:59 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24IBxwd001179; Sat, 4 Mar 2017 18:11:59 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201703041811.v24IBxwd001179@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 4 Mar 2017 18:11:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314674 - stable/10/sys/kern X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 18:12:00 -0000 Author: bdrewery Date: Sat Mar 4 18:11:59 2017 New Revision: 314674 URL: https://svnweb.freebsd.org/changeset/base/314674 Log: MFC r313909: Fix panic with unlocked vnode to vrecycle(). Modified: stable/10/sys/kern/uipc_mqueue.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/uipc_mqueue.c ============================================================================== --- stable/10/sys/kern/uipc_mqueue.c Sat Mar 4 18:07:30 2017 (r314673) +++ stable/10/sys/kern/uipc_mqueue.c Sat Mar 4 18:11:59 2017 (r314674) @@ -703,7 +703,9 @@ do_recycle(void *context, int pending __ { struct vnode *vp = (struct vnode *)context; + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); vrecycle(vp); + VOP_UNLOCK(vp, 0); vdrop(vp); } From owner-svn-src-all@freebsd.org Sat Mar 4 19:27:40 2017 Return-Path: Delivered-To: svn-src-all@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 1D389CF7672; Sat, 4 Mar 2017 19:27:40 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io0-x22d.google.com (mail-io0-x22d.google.com [IPv6:2607:f8b0:4001:c06::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D4CB9136E; Sat, 4 Mar 2017 19:27:39 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io0-x22d.google.com with SMTP id z13so48950759iof.2; Sat, 04 Mar 2017 11:27:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=c0H8lJ6wNGWlzOCT9BG2Q28C9p41EWag5Xtq40BVMqI=; b=uNOEMWE33aN8suR41yqmHRFWcId+ef1MNZr913+4NyzI7CN+ON8ioMBUDPYfJVY2qQ pk7Q9L86SHKoygiuaPikJuaTnt597aYIXnjFWDOXCVngThPmcnBjM3CTCPJvKtimT/J/ Lyioj4vQpRPYFSsDdQ/ZAnFTcBdHkIDdzO+/l5ujqwZ1pie24UD1u6mkci1bxJ3aMuel ih9NkKhV7DBdb/67FBFxh8z3isseadU4RhxjovibwQC6qGqCpf/QwCgXpb59Gpy8mJEu 81XZw8Gp/SRbqN1c72l/lmMNsNdDOrHbPGmfRq4sqMVOlIl095vwKa9daDW328tkYZnb +hVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=c0H8lJ6wNGWlzOCT9BG2Q28C9p41EWag5Xtq40BVMqI=; b=p6rjOC5NgPPhmGXWJMD8i5l53Env2OkaPJLk7XO+UrV2+VsZxhKGfhfynQshxdpMoZ vPsngvgPkOJ4UDxbHDnMJhvEc6WfIGReeOZ2zRCO5CkR6ebLgPYMMVy956388iHYwy/J Bkdow0B4Ax0GcM8FFV2uu/D8y6EUa/hPw5MChbD8bu3hmzzgDMIsheI87Am5qyM0sp+r FyO5yGuLnPfBT/eHq/9B0VKdMKQG8ALNKmO9OrGXBCj4unZW0LuJxQEHME+JFk0xrKiV 263tpWNuS6hFpkb3yo+ApAFJHPu8ANV1Qs6sc5bQYxHGUA/Zj+0DKXutulqbmUHyFBeN Dt6w== X-Gm-Message-State: AMke39m+bq5Xe8yKel/oY/98iGITmlJV4k6IG5EXY69vLm7pHpWowk/SclrvvtW2pjHhQ3FsVZwPBOQ6IXJtTw== X-Received: by 10.107.37.148 with SMTP id l142mr7711353iol.159.1488655659111; Sat, 04 Mar 2017 11:27:39 -0800 (PST) MIME-Version: 1.0 Sender: carpeddiem@gmail.com Received: by 10.107.39.195 with HTTP; Sat, 4 Mar 2017 11:27:18 -0800 (PST) In-Reply-To: <201703031628.v23GS3Sj064551@repo.freebsd.org> References: <201703031628.v23GS3Sj064551@repo.freebsd.org> From: Ed Maste Date: Sat, 4 Mar 2017 14:27:18 -0500 X-Google-Sender-Auth: EmWSBCN_VbzuasZnxGZ-t0bKhXU Message-ID: Subject: Re: svn commit: r314604 - in head/sys/compat/linuxkpi/common: include/linux src To: Hans Petter Selasky Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 19:27:40 -0000 On 3 March 2017 at 11:28, Hans Petter Selasky wrote: > Author: hselasky > Date: Fri Mar 3 16:28:03 2017 > New Revision: 314604 > URL: https://svnweb.freebsd.org/changeset/base/314604 > > Log: > Update the LinuxKPI RCU and SRCU wrappers for the concurrency kit, CK. >From "make tinderbox" on universe11a.freebsd.org: mips ERL kernel failed, check _.mips.ERL for details cc1: warnings being treated as errors In file included from /scratch/tmp/emaste/freebsd/sys/modules/linuxkpi/../../compat/linuxkpi/common/src/linux_rcu.c:45: /scratch/tmp/emaste/freebsd/sys/compat/linuxkpi/common/include/linux/srcu.h:47: warning: redundant redeclaration of 'srcu_barrier' [-Wredundant-decls] /scratch/tmp/emaste/freebsd/sys/compat/linuxkpi/common/include/linux/srcu.h:44: warning: previous declaration of 'srcu_barrier' was here *** [linux_rcu.o] Error code 1 From owner-svn-src-all@freebsd.org Sat Mar 4 19:43:38 2017 Return-Path: Delivered-To: svn-src-all@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 08EB6CF7DCB; Sat, 4 Mar 2017 19:43:38 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DC2191E29; Sat, 4 Mar 2017 19:43:37 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net [73.231.226.104]) by mail.baldwin.cx (Postfix) with ESMTPSA id D978910A791; Sat, 4 Mar 2017 14:43:36 -0500 (EST) From: John Baldwin To: Pedro Giffuni Cc: Slawa Olhovchenkov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314669 - head/sys/i386/conf Date: Sat, 04 Mar 2017 11:43:06 -0800 Message-ID: <2368011.hGEX4V32U5@ralph.baldwin.cx> User-Agent: KMail/4.14.10 (FreeBSD/11.0-STABLE; KDE/4.14.10; amd64; ; ) In-Reply-To: References: <201703041504.v24F4HMh023937@repo.freebsd.org> <20170304153228.GM15630@zxy.spb.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Sat, 04 Mar 2017 14:43:36 -0500 (EST) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 19:43:38 -0000 On Saturday, March 04, 2017 10:52:46 AM Pedro Giffuni wrote: > > On 03/04/17 10:32, Slawa Olhovchenkov wrote: > > On Sat, Mar 04, 2017 at 03:04:17PM +0000, Pedro F. Giffuni wrote: > > > >> Author: pfg > >> Date: Sat Mar 4 15:04:17 2017 > >> New Revision: 314669 > >> URL: https://svnweb.freebsd.org/changeset/base/314669 > >> > >> Log: > >> Drop i486 from the default i386 GENERIC kernel configuration. > >> > >> 80486 production was stopped by Intel on September 2007. Dropping the 486 > >> configuration option from the GENERIC kernel improves performance > >> slightly. > >> > >> Removing I486_CPU is consistent at this time: we don't support any > >> processor without a FPU and the PC-98 arch, which frequently involved i486 > >> CPUs, is also gone so we don't test such platforms anymore. > > > > What is realy mean? > > This means we don't do work-arounds that would be required for raw 486. > Instead we will use the 586 instructions by default. This doesn't change that. The kernel already has runtime tests in place for new things on 486 and later via cpuid. > > Some Via CPU is like i486 (by instruction set). > > > > CPU: VIA Ezra (800.04-MHz 686-class CPU) > > Origin="CentaurHauls" Id=0x678 Family=0x6 Model=0x7 Stepping=8 > > Features=0x803035 > > AMD Features=0x80000000<3DNow!> > > > > 486 never had MMX extensions. > This is a 686, performance should improve ~4%. How did you measure the improvement? Keeping I486_CPU doesn't really do anything except remove a some #ifdef'd conditionals in identcpu.c and initcpu.c. It doesn't affect whether we use the TSC, MMX, etc. Those are all runtime checks based the CPU feature flags from cpuid. -- John Baldwin From owner-svn-src-all@freebsd.org Sat Mar 4 20:06:48 2017 Return-Path: Delivered-To: svn-src-all@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 DECE4CF92F7; Sat, 4 Mar 2017 20:06:48 +0000 (UTC) (envelope-from hselasky@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 AB5231B76; Sat, 4 Mar 2017 20:06:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24K6lek046372; Sat, 4 Mar 2017 20:06:47 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24K6lqi046371; Sat, 4 Mar 2017 20:06:47 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201703042006.v24K6lqi046371@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Sat, 4 Mar 2017 20:06:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314675 - head/sys/compat/linuxkpi/common/include/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 20:06:49 -0000 Author: hselasky Date: Sat Mar 4 20:06:47 2017 New Revision: 314675 URL: https://svnweb.freebsd.org/changeset/base/314675 Log: Remove duplicate prototype in the LinuxKPI to fix compilation warning. Reported by: emaste @ MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/include/linux/srcu.h Modified: head/sys/compat/linuxkpi/common/include/linux/srcu.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/srcu.h Sat Mar 4 18:11:59 2017 (r314674) +++ head/sys/compat/linuxkpi/common/include/linux/srcu.h Sat Mar 4 20:06:47 2017 (r314675) @@ -44,6 +44,5 @@ extern void synchronize_srcu(struct srcu extern void srcu_barrier(struct srcu_struct *); extern int init_srcu_struct(struct srcu_struct *); extern void cleanup_srcu_struct(struct srcu_struct *); -extern void srcu_barrier(struct srcu_struct *); #endif /* _LINUX_SRCU_H_ */ From owner-svn-src-all@freebsd.org Sat Mar 4 20:07:06 2017 Return-Path: Delivered-To: svn-src-all@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 5BF03CF934A; Sat, 4 Mar 2017 20:07:06 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 280781D23; Sat, 4 Mar 2017 20:07:06 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id C1C8678D4; Sat, 4 Mar 2017 20:06:57 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id EBA8C31FFC; Sat, 4 Mar 2017 20:06:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id ffZwOaRyQGIz; Sat, 4 Mar 2017 20:06:45 +0000 (UTC) Subject: Re: svn commit: r314657 - in head/kerberos5: . lib/libgssapi_krb5 lib/libgssapi_ntlm lib/libgssapi_spnego lib/libhdb lib/libkafs5 lib/libkrb5 libexec/hprop libexec/kpasswdd tools/asn1_compile tools/slc DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 0241131FEF To: rgrimes@freebsd.org, Ngie Cooper References: <201703041534.v24FYUeg077349@pdx.rh.CN85.dnsmgr.net> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <60fc23c8-f80e-9092-9c01-47850a0ad871@FreeBSD.org> Date: Sat, 4 Mar 2017 12:06:47 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <201703041534.v24FYUeg077349@pdx.rh.CN85.dnsmgr.net> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="t87tl932nJ4gbqMC3U7drHCju4tTQoQIn" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 20:07:06 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --t87tl932nJ4gbqMC3U7drHCju4tTQoQIn Content-Type: multipart/mixed; boundary="lniAcROoS3id73GTi8tVfsaWcbcJN6edU"; protected-headers="v1" From: Bryan Drewery To: rgrimes@freebsd.org, Ngie Cooper Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <60fc23c8-f80e-9092-9c01-47850a0ad871@FreeBSD.org> Subject: Re: svn commit: r314657 - in head/kerberos5: . lib/libgssapi_krb5 lib/libgssapi_ntlm lib/libgssapi_spnego lib/libhdb lib/libkafs5 lib/libkrb5 libexec/hprop libexec/kpasswdd tools/asn1_compile tools/slc References: <201703041534.v24FYUeg077349@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201703041534.v24FYUeg077349@pdx.rh.CN85.dnsmgr.net> --lniAcROoS3id73GTi8tVfsaWcbcJN6edU Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 3/4/2017 7:34 AM, Rodney W. Grimes wrote: > What is ${.CURDIR:H:H} ????? Yes that seems to work but now we are obs= curing > ../.. into makefile syntax magic, probably not a grand idea. >=20 It just trims off the last directory component. This both reduces namecache lookups, lessens the amount of data in a log, and makes debugging a log simpler by not having a crazy path like: /home/bdrewery/big/git/buildserver/sys/modules/usb/template/../../../dev/= usb/template/usb_template.c It's far simpler to understand and work with: /home/bdrewery/big/git/buildserver/sys/dev/usb/template/usb_template.c The only downside is it is slightly more obscure in a Makefile, but once you know what :H is then it's not a problem. This is why SRCTOP is even better than this as it is far more clear than even :H and avoids the =2E./../ problems. >> Author: ngie >> Date: Sat Mar 4 11:34:36 2017 >> New Revision: 314657 >> URL: https://svnweb.freebsd.org/changeset/base/314657 >> >> Log: >> kerberos5: normalize paths using SRCTOP-relative paths or :H when po= ssible >> =20 >> This simplifies make logic/output >> =20 >> MFC after: 1 month >> Sponsored by: Dell EMC Isilon >> >> Modified: >> head/kerberos5/Makefile >> head/kerberos5/Makefile.inc >> head/kerberos5/lib/libgssapi_krb5/Makefile >> head/kerberos5/lib/libgssapi_ntlm/Makefile >> head/kerberos5/lib/libgssapi_spnego/Makefile >> head/kerberos5/lib/libhdb/Makefile >> head/kerberos5/lib/libkafs5/Makefile >> head/kerberos5/lib/libkrb5/Makefile >> head/kerberos5/libexec/hprop/Makefile >> head/kerberos5/libexec/kpasswdd/Makefile >> head/kerberos5/tools/asn1_compile/Makefile >> head/kerberos5/tools/slc/Makefile >> >> Modified: head/kerberos5/Makefile >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/kerberos5/Makefile Sat Mar 4 11:33:01 2017 (r314656) >> +++ head/kerberos5/Makefile Sat Mar 4 11:34:36 2017 (r314657) >> @@ -11,7 +11,7 @@ KPROGS=3D lib/libpam \ >> # This target is used to rebuild these programs WITH Kerberos. >> kerberize: >> .for entry in ${KPROGS} >> - cd ${.CURDIR}/../${entry}; \ >> + cd ${.CURDIR:H}/${entry}; \ >> ${MAKE} cleandir; \ >> ${MAKE} obj; \ >> ${MAKE} all; \ >> @@ -21,7 +21,7 @@ kerberize: >> # This target is used to rebuild these programs WITHOUT Kerberos. >> dekerberize: >> .for entry in ${KPROGS} >> - cd ${.CURDIR}/../${entry}; \ >> + cd ${.CURDIR:H}/${entry}; \ >> ${MAKE} MK_KERBEROS=3Dno cleandir; \ >> ${MAKE} MK_KERBEROS=3Dno obj; \ >> ${MAKE} MK_KERBEROS=3Dno all; \ >> >> Modified: head/kerberos5/Makefile.inc >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/kerberos5/Makefile.inc Sat Mar 4 11:33:01 2017 (r314656) >> +++ head/kerberos5/Makefile.inc Sat Mar 4 11:34:36 2017 (r314657) >> @@ -4,9 +4,9 @@ >> =20 >> NO_LINT=3D >> =20 >> -KRB5DIR=3D ${.CURDIR}/../../../crypto/heimdal >> +KRB5DIR=3D ${SRCTOP}/crypto/heimdal >> =20 >> -CFLAGS+=3D -DHAVE_CONFIG_H -I${.CURDIR}/../../include >> +CFLAGS+=3D -DHAVE_CONFIG_H -I${.CURDIR:H:H}/include >> =20 >> .if ${MK_OPENLDAP} !=3D "no" && !defined(COMPAT_32BIT) >> OPENLDAPBASE?=3D /usr/local >> >> Modified: head/kerberos5/lib/libgssapi_krb5/Makefile >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/kerberos5/lib/libgssapi_krb5/Makefile Sat Mar 4 11:33:01 201= 7 (r314656) >> +++ head/kerberos5/lib/libgssapi_krb5/Makefile Sat Mar 4 11:34:36 201= 7 (r314657) >> @@ -82,4 +82,4 @@ CFLAGS+=3D-I${KRB5DIR}/lib/roken -I. >> =20 >> .include >> =20 >> -.PATH: ${KRB5DIR}/lib/gssapi/krb5 ${.CURDIR}/../../../lib/libgssapi >> +.PATH: ${KRB5DIR}/lib/gssapi/krb5 ${SRCTOP}/lib/libgssapi >> >> Modified: head/kerberos5/lib/libgssapi_ntlm/Makefile >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/kerberos5/lib/libgssapi_ntlm/Makefile Sat Mar 4 11:33:01 201= 7 (r314656) >> +++ head/kerberos5/lib/libgssapi_ntlm/Makefile Sat Mar 4 11:34:36 201= 7 (r314657) >> @@ -45,4 +45,4 @@ CFLAGS+=3D-I${KRB5DIR}/lib/ntlm >> =20 >> .include >> =20 >> -.PATH: ${KRB5DIR}/lib/gssapi/ntlm ${.CURDIR}/../../../lib/libgssapi $= {.CURDIR}/../libgssapi_krb5 >> +.PATH: ${KRB5DIR}/lib/gssapi/ntlm ${SRCTOP}/lib/libgssapi ${.CURDIR:H= }/libgssapi_krb5 >> >> Modified: head/kerberos5/lib/libgssapi_spnego/Makefile >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/kerberos5/lib/libgssapi_spnego/Makefile Sat Mar 4 11:33:01 2= 017 (r314656) >> +++ head/kerberos5/lib/libgssapi_spnego/Makefile Sat Mar 4 11:34:36 2= 017 (r314657) >> @@ -31,7 +31,7 @@ CFLAGS+=3D-I${KRB5DIR}/lib/gssapi >> CFLAGS+=3D-I${KRB5DIR}/lib/gssapi/gssapi >> CFLAGS+=3D-I${KRB5DIR}/lib/gssapi/spnego >> CFLAGS+=3D-I${KRB5DIR}/lib/asn1 >> -CFLAGS+=3D-I${.CURDIR}/../../../lib/libgssapi >> +CFLAGS+=3D-I${SRCTOP}/lib/libgssapi >> CFLAGS+=3D-I${KRB5DIR}/lib/roken -I. >> =20 >> CLEANFILES=3D ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} \ >> @@ -45,7 +45,7 @@ ${GEN}: spnego.asn1 spnego.opt >> =20 >> .SUFFIXES: .h .c .x .hx >> =20 >> -.x.c: =20 >> +.x.c: >> ${CP} ${.IMPSRC} ${.TARGET} >> =20 >> .hx.h: >> @@ -55,4 +55,4 @@ ${GEN}: spnego.asn1 spnego.opt >> =20 >> .SUFFIXES: .h .c .x .hx >> =20 >> -.PATH: ${KRB5DIR}/lib/gssapi/spnego ${.CURDIR}/../../../lib/libgssapi= ${.CURDIR}/../libgssapi_krb5 >> +.PATH: ${KRB5DIR}/lib/gssapi/spnego ${SRCTOP}/lib/libgssapi ${.CURDIR= :H}/libgssapi_krb5 >> >> Modified: head/kerberos5/lib/libhdb/Makefile >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/kerberos5/lib/libhdb/Makefile Sat Mar 4 11:33:01 2017 (r3146= 56) >> +++ head/kerberos5/lib/libhdb/Makefile Sat Mar 4 11:34:36 2017 (r3146= 57) >> @@ -57,7 +57,7 @@ SRCS=3D common.c \ >> ${GEN:S/.x$/.c/:S/.hx$/.h/} >> =20 >> CFLAGS+=3D-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \ >> - -I${KRB5DIR}/lib/roken -I${.CURDIR}/../../../contrib/sqlite3/ \ >> + -I${KRB5DIR}/lib/roken -I${SRCTOP}/contrib/sqlite3/ \ >> -I${KRB5DIR}/lib/krb5 \ >> -I. ${LDAPCFLAGS} >> CFLAGS+=3D-DHDB_DB_DIR=3D"\"/var/heimdal\"" >> >> Modified: head/kerberos5/lib/libkafs5/Makefile >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/kerberos5/lib/libkafs5/Makefile Sat Mar 4 11:33:01 2017 (r31= 4656) >> +++ head/kerberos5/lib/libkafs5/Makefile Sat Mar 4 11:34:36 2017 (r31= 4657) >> @@ -26,7 +26,7 @@ SRCS=3D afssys.c afskrb5.c common.c krb5_e >> =20 >> CFLAGS+=3D -I${KRB5DIR}/lib/kafs \ >> -I${KRB5DIR}/lib/krb5 \ >> - -I${.OBJDIR}/../libkrb5/ \ >> + -I${.OBJDIR:H}/libkrb5/ \ >> -I${KRB5DIR}/lib/roken >> =20 >> CLEANFILES=3D kafs5.3 >> >> Modified: head/kerberos5/lib/libkrb5/Makefile >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/kerberos5/lib/libkrb5/Makefile Sat Mar 4 11:33:01 2017 (r314= 656) >> +++ head/kerberos5/lib/libkrb5/Makefile Sat Mar 4 11:34:36 2017 (r314= 657) >> @@ -625,4 +625,4 @@ CFLAGS+=3D -I${KRB5DIR}/lib/krb5 \ >> =20 >> .include >> =20 >> -.PATH: ${KRB5DIR}/lib/krb5 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/include ${.= CURDIR}/../../include ${KRB5DIR}/doc/doxyout/krb5/man/man3/ >> +.PATH: ${KRB5DIR}/lib/krb5 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/include ${S= RCTOP}/kerberos5/include ${KRB5DIR}/doc/doxyout/krb5/man/man3/ >> >> Modified: head/kerberos5/libexec/hprop/Makefile >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/kerberos5/libexec/hprop/Makefile Sat Mar 4 11:33:01 2017 (r3= 14656) >> +++ head/kerberos5/libexec/hprop/Makefile Sat Mar 4 11:34:36 2017 (r3= 14657) >> @@ -9,7 +9,7 @@ CFLAGS+=3D-I${KRB5DIR}/lib/asn1 >> CFLAGS+=3D-I${KRB5DIR}/lib/hx509 >> CFLAGS+=3D-I${KRB5DIR}/lib/ntlm >> CFLAGS+=3D-I${KRB5DIR}/kdc >> -CFLAGS+=3D-I${.OBJDIR}/../../lib/libkrb5 >> +CFLAGS+=3D-I${.OBJDIR:H:H}/lib/libkrb5 >> LIBADD=3D hdb krb5 roken vers >> DPADD=3D ${LDAPDPADD} >> LDADD=3D ${LDAPLDADD} >> >> Modified: head/kerberos5/libexec/kpasswdd/Makefile >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/kerberos5/libexec/kpasswdd/Makefile Sat Mar 4 11:33:01 2017 = (r314656) >> +++ head/kerberos5/libexec/kpasswdd/Makefile Sat Mar 4 11:34:36 2017 = (r314657) >> @@ -2,7 +2,7 @@ >> =20 >> PROG=3D kpasswdd >> MAN=3D kpasswdd.8 >> -CFLAGS+=3D-I${KRB5DIR}/lib/roken -I../../lib/libhdb ${LDAPCFLAGS} >> +CFLAGS+=3D-I${KRB5DIR}/lib/roken -I${.CURDIR:H:H}/lib/libhdb ${LDAPCF= LAGS} >> LIBADD=3D kadm5srv hdb krb5 roken vers asn1 >> DPADD=3D ${LDAPDPADD} >> LDADD=3D ${LDAPLDADD} >> >> Modified: head/kerberos5/tools/asn1_compile/Makefile >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/kerberos5/tools/asn1_compile/Makefile Sat Mar 4 11:33:01 201= 7 (r314656) >> +++ head/kerberos5/tools/asn1_compile/Makefile Sat Mar 4 11:34:36 201= 7 (r314657) >> @@ -2,7 +2,7 @@ >> =20 >> PROG=3D asn1_compile >> MAN=3D >> -LIBROKEN_A=3D ${.OBJDIR}/../../lib/libroken/libroken.a >> +LIBROKEN_A=3D ${.OBJDIR:H:H}/lib/libroken/libroken.a >> LIBADD=3D vers >> LDADD=3D ${LIBROKEN_A} >> DPADD=3D ${LIBROKEN_A} >> >> Modified: head/kerberos5/tools/slc/Makefile >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/kerberos5/tools/slc/Makefile Sat Mar 4 11:33:01 2017 (r31465= 6) >> +++ head/kerberos5/tools/slc/Makefile Sat Mar 4 11:34:36 2017 (r31465= 7) >> @@ -1,7 +1,7 @@ >> # $FreeBSD$ >> =20 >> PROG=3D slc >> -LIBROKEN_A=3D ${.OBJDIR}/../../lib/libroken/libroken.a >> +LIBROKEN_A=3D ${.OBJDIR:H:H}/lib/libroken/libroken.a >> LIBADD=3D vers >> LDADD=3D ${LIBROKEN_A} >> DPADD=3D ${LIBROKEN_A} >> @@ -18,7 +18,7 @@ CLEANFILES=3D roken.h slc-gram.c slc-lex.c >> roken.h: >> ${MAKE_ROKEN} > ${.TARGET} >> =20 >> -# ${.OBJDIR}/../make-roken/make-roken > ${.TARGET} >> +# ${.OBJDIR:H}/make-roken/make-roken > ${.TARGET} >> =20 >> .include >> =20 >> >> >=20 --=20 Regards, Bryan Drewery --lniAcROoS3id73GTi8tVfsaWcbcJN6edU-- --t87tl932nJ4gbqMC3U7drHCju4tTQoQIn Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJYux5YAAoJEDXXcbtuRpfPtU4IALg8iUAd4ksXm5YSvAVSyz34 zL9C8y0eFsoCn6ZK1LU3RvrGPAtgP92JEKJLPjHMQriQT1HsYfzbZ8Cpwpa6E9lW jnSZRLbDE9mf934w55X0Z0ksBbRj5/ykrQpDDyAHC4Um6FmXav4jniEJq5MDskyK 7Bv/5fo5ZOdb7jkC9tTHuvbvoWXEOdOrNH4C92QtYxSQlwhBqOWFP+gPKmGTH6pF hakVvFjLlaZKLX/J6/qINQoMj4Z6eCDEy2IQ2XDtqxa8U6Cjj6N/zvE50cI0Bky7 hT+ioBpTWhi95xZzj6FXg1+rZppscoz2hpRGWdP12tDqTtdnUjy+A029CFx5y0o= =Rqwh -----END PGP SIGNATURE----- --t87tl932nJ4gbqMC3U7drHCju4tTQoQIn-- From owner-svn-src-all@freebsd.org Sat Mar 4 20:08:38 2017 Return-Path: Delivered-To: svn-src-all@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 0A896CF93EE; Sat, 4 Mar 2017 20:08:38 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [IPv6:2a01:4f8:c17:6c4b::2]) (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 C93BA1E9F; Sat, 4 Mar 2017 20:08:37 +0000 (UTC) (envelope-from hps@selasky.org) Received: from hps2016.home.selasky.org (unknown [62.141.129.119]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 2F9261FE025; Sat, 4 Mar 2017 21:08:08 +0100 (CET) Subject: Re: svn commit: r314604 - in head/sys/compat/linuxkpi/common: include/linux src To: Ed Maste References: <201703031628.v23GS3Sj064551@repo.freebsd.org> Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" From: Hans Petter Selasky Message-ID: <4305b2e2-e36b-d890-54d2-cfc185617673@selasky.org> Date: Sat, 4 Mar 2017 21:07:47 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 20:08:38 -0000 On 03/04/17 20:27, Ed Maste wrote: > On 3 March 2017 at 11:28, Hans Petter Selasky wrote: >> Author: hselasky >> Date: Fri Mar 3 16:28:03 2017 >> New Revision: 314604 >> URL: https://svnweb.freebsd.org/changeset/base/314604 >> >> Log: >> Update the LinuxKPI RCU and SRCU wrappers for the concurrency kit, CK. > >>From "make tinderbox" on universe11a.freebsd.org: > mips ERL kernel failed, check _.mips.ERL for details > > cc1: warnings being treated as errors > In file included from > /scratch/tmp/emaste/freebsd/sys/modules/linuxkpi/../../compat/linuxkpi/common/src/linux_rcu.c:45: > /scratch/tmp/emaste/freebsd/sys/compat/linuxkpi/common/include/linux/srcu.h:47: > warning: redundant redeclaration of 'srcu_barrier' [-Wredundant-decls] > /scratch/tmp/emaste/freebsd/sys/compat/linuxkpi/common/include/linux/srcu.h:44: > warning: previous declaration of 'srcu_barrier' was here > *** [linux_rcu.o] Error code 1 > Hi, This is an issue with GCC I think. Anyway, should be fixed in r314675 . --HPS From owner-svn-src-all@freebsd.org Sat Mar 4 20:13:35 2017 Return-Path: Delivered-To: svn-src-all@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 92E4FCF96EA; Sat, 4 Mar 2017 20:13:35 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5201515C3; Sat, 4 Mar 2017 20:13:35 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 7E1487CEF; Sat, 4 Mar 2017 20:13:34 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id B843833050; Sat, 4 Mar 2017 20:13:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id vIO_khJk-nbP; Sat, 4 Mar 2017 20:13:26 +0000 (UTC) Subject: Re: svn commit: r314654 - in head/cddl: lib/drti lib/libavl lib/libctf lib/libdtrace lib/libnvpair lib/libumem lib/libuutil lib/libzfs lib/libzfs_core lib/libzpool sbin/zfs sbin/zpool usr.bin/ctfconver... DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com F0E6C33049 To: rgrimes@freebsd.org, Ngie Cooper References: <201703041520.v24FK9ne077279@pdx.rh.CN85.dnsmgr.net> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: Date: Sat, 4 Mar 2017 12:13:28 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <201703041520.v24FK9ne077279@pdx.rh.CN85.dnsmgr.net> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Ihov9xFw63k2E5qU2sKmSnDWK5MQqd05A" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 20:13:35 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Ihov9xFw63k2E5qU2sKmSnDWK5MQqd05A Content-Type: multipart/mixed; boundary="nggwp8opMlslWnoBvLLiSJmhicnkAl1rW"; protected-headers="v1" From: Bryan Drewery To: rgrimes@freebsd.org, Ngie Cooper Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: Subject: Re: svn commit: r314654 - in head/cddl: lib/drti lib/libavl lib/libctf lib/libdtrace lib/libnvpair lib/libumem lib/libuutil lib/libzfs lib/libzfs_core lib/libzpool sbin/zfs sbin/zpool usr.bin/ctfconver... References: <201703041520.v24FK9ne077279@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201703041520.v24FK9ne077279@pdx.rh.CN85.dnsmgr.net> --nggwp8opMlslWnoBvLLiSJmhicnkAl1rW Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 3/4/2017 7:20 AM, Rodney W. Grimes wrote: > [ Charset UTF-8 unsupported, converting... ] >> Author: ngie >> Date: Sat Mar 4 11:30:04 2017 >> New Revision: 314654 >> URL: https://svnweb.freebsd.org/changeset/base/314654 >> >> Log: >> cddl: normalize paths using SRCTOP-relative paths or :H when possibl= e >> =20 >> This simplifies make logic/output >> =20 >> While here, remove bogus CFLAGS which look for headers in cddl/lib/l= ibumem. >> There aren't any source files there (just Makefiles) > Please again, dont intermingle other chnages when doing a tree wide swe= ep. >=20 > IMHO if you write While here, you probably should do that thing in a=20 > seperate commit, unless this is a single thing your touching in a singl= e > commit. >=20 > It is much easier to glue 2 commits togeather than seperate 1 that > changes 2 things. >=20 Agreed. There were also various comment changes in here. This is why git is nice, you can git add -p and stage multiple commits before pushing. git-svn handles this fine. >=20 > It is also still not clear to me that this was adeqautly disccussed as = I > only saw 2 +'s for staying relative and no one +ing to move forward wit= h this. Where is this discussion? The only one I can find is https://reviews.freebsd.org/D9207 which seems to have a consensus of moving to SRCTOP and :H vs '../..'. --=20 Regards, Bryan Drewery --nggwp8opMlslWnoBvLLiSJmhicnkAl1rW-- --Ihov9xFw63k2E5qU2sKmSnDWK5MQqd05A Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJYux/pAAoJEDXXcbtuRpfPyzQH/iUvkWdAtldR8PQy2gCAgYVh 3sTDhw0y4eLg7RoGZkorKG1T44RS43nFTkmJ9T46fl45DvHJ1qS7n1YFhlE9luPN EwmTqTps9+Tmlf/0aIxCRZFM3fdurR0vpzaxetLh7qRX7hE/tW+nTfiK8HBW+k6/ YYiQQ9GEBvwu/Pe6o//1IuqC/Ndr9AQJceXGN0nHxnNSluevSEtQN93WmRMIhQVH cVkeOF1i5I/6hs9pKqkhsBHC98SlbwtV/WL10F115R3BmDa96WdwjRfO1vf1XGUJ JOJ3iv6na1td1VRHFhrJahSxCtDMLEC+c2kYgvzMjd/1lE3zS+1WfhdTqfWt36Y= =PMH0 -----END PGP SIGNATURE----- --Ihov9xFw63k2E5qU2sKmSnDWK5MQqd05A-- From owner-svn-src-all@freebsd.org Sat Mar 4 20:20:21 2017 Return-Path: Delivered-To: svn-src-all@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 30A77CF989E; Sat, 4 Mar 2017 20:20:21 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ED2761812; Sat, 4 Mar 2017 20:20:20 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v24KKD1v078655; Sat, 4 Mar 2017 12:20:13 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v24KKD5N078654; Sat, 4 Mar 2017 12:20:13 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201703042020.v24KKD5N078654@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314657 - in head/kerberos5: . lib/libgssapi_krb5 lib/libgssapi_ntlm lib/libgssapi_spnego lib/libhdb lib/libkafs5 lib/libkrb5 libexec/hprop libexec/kpasswdd tools/asn1_compile tools/slc In-Reply-To: <60fc23c8-f80e-9092-9c01-47850a0ad871@FreeBSD.org> To: Bryan Drewery Date: Sat, 4 Mar 2017 12:20:13 -0800 (PST) CC: rgrimes@freebsd.org, Ngie Cooper , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 20:20:21 -0000 -- Start of PGP signed section. [ Charset windows-1252 unsupported, converting... ] > On 3/4/2017 7:34 AM, Rodney W. Grimes wrote: > > What is ${.CURDIR:H:H} ????? Yes that seems to work but now we are obscuring > > ../.. into makefile syntax magic, probably not a grand idea. > > > > It just trims off the last directory component. This both reduces > namecache lookups, lessens the amount of data in a log, and makes > debugging a log simpler by not having a crazy path like: > /home/bdrewery/big/git/buildserver/sys/modules/usb/template/../../../dev/usb/template/usb_template.c > > It's far simpler to understand and work with: > /home/bdrewery/big/git/buildserver/sys/dev/usb/template/usb_template.c > > The only downside is it is slightly more obscure in a Makefile, but once > you know what :H is then it's not a problem. This is why SRCTOP is even > better than this as it is far more clear than even :H and avoids the > ../../ problems. Lets do one or the other, but not both ${SRCTOP} and :H:H:H. It appears that we now have a mix and mashed up some one way others the other. > > >> Author: ngie > >> Date: Sat Mar 4 11:34:36 2017 > >> New Revision: 314657 > >> URL: https://svnweb.freebsd.org/changeset/base/314657 > >> > >> Log: > >> kerberos5: normalize paths using SRCTOP-relative paths or :H when possible > >> > >> This simplifies make logic/output > >> > >> MFC after: 1 month > >> Sponsored by: Dell EMC Isilon > >> > >> Modified: > >> head/kerberos5/Makefile > >> head/kerberos5/Makefile.inc > >> head/kerberos5/lib/libgssapi_krb5/Makefile > >> head/kerberos5/lib/libgssapi_ntlm/Makefile > >> head/kerberos5/lib/libgssapi_spnego/Makefile > >> head/kerberos5/lib/libhdb/Makefile > >> head/kerberos5/lib/libkafs5/Makefile > >> head/kerberos5/lib/libkrb5/Makefile > >> head/kerberos5/libexec/hprop/Makefile > >> head/kerberos5/libexec/kpasswdd/Makefile > >> head/kerberos5/tools/asn1_compile/Makefile > >> head/kerberos5/tools/slc/Makefile > >> > >> Modified: head/kerberos5/Makefile > >> ============================================================================== > >> --- head/kerberos5/Makefile Sat Mar 4 11:33:01 2017 (r314656) > >> +++ head/kerberos5/Makefile Sat Mar 4 11:34:36 2017 (r314657) > >> @@ -11,7 +11,7 @@ KPROGS= lib/libpam \ > >> # This target is used to rebuild these programs WITH Kerberos. > >> kerberize: > >> .for entry in ${KPROGS} > >> - cd ${.CURDIR}/../${entry}; \ > >> + cd ${.CURDIR:H}/${entry}; \ Curdir is /usr/src/kerberos5/ curdir :H is /usr/src srctop is /usr/src Please, one way or the other through the whole tree. And again I understand the value of this, but was it discussed and some set of this is how you decide to do :H or .. or :H:H or ../.. and here you use SRCTOP. Cause right now... I see a mess. The computer can burn the cycles, the most expensive thing we have is human brain power. Lets not waste it by making a change just cause we can change it and make less work for the computer and more work for the human. > >> ${MAKE} cleandir; \ > >> ${MAKE} obj; \ > >> ${MAKE} all; \ > >> @@ -21,7 +21,7 @@ kerberize: > >> # This target is used to rebuild these programs WITHOUT Kerberos. > >> dekerberize: > >> .for entry in ${KPROGS} > >> - cd ${.CURDIR}/../${entry}; \ > >> + cd ${.CURDIR:H}/${entry}; \ > >> ${MAKE} MK_KERBEROS=no cleandir; \ > >> ${MAKE} MK_KERBEROS=no obj; \ > >> ${MAKE} MK_KERBEROS=no all; \ > >> > >> Modified: head/kerberos5/Makefile.inc > >> ============================================================================== > >> --- head/kerberos5/Makefile.inc Sat Mar 4 11:33:01 2017 (r314656) > >> +++ head/kerberos5/Makefile.inc Sat Mar 4 11:34:36 2017 (r314657) > >> @@ -4,9 +4,9 @@ > >> > >> NO_LINT= > >> > >> -KRB5DIR= ${.CURDIR}/../../../crypto/heimdal > >> +KRB5DIR= ${SRCTOP}/crypto/heimdal Whats the rule your using? ../../.. gets srctop but two ../.. gets :H:H? > >> > >> -CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../../include > >> +CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR:H:H}/include > >> > >> .if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT) > >> OPENLDAPBASE?= /usr/local > >> > >> Modified: head/kerberos5/lib/libgssapi_krb5/Makefile > >> ============================================================================== > >> --- head/kerberos5/lib/libgssapi_krb5/Makefile Sat Mar 4 11:33:01 2017 (r314656) > >> +++ head/kerberos5/lib/libgssapi_krb5/Makefile Sat Mar 4 11:34:36 2017 (r314657) > >> @@ -82,4 +82,4 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I. > >> > >> .include > >> > >> -.PATH: ${KRB5DIR}/lib/gssapi/krb5 ${.CURDIR}/../../../lib/libgssapi > >> +.PATH: ${KRB5DIR}/lib/gssapi/krb5 ${SRCTOP}/lib/libgssapi > >> > >> Modified: head/kerberos5/lib/libgssapi_ntlm/Makefile > >> ============================================================================== > >> --- head/kerberos5/lib/libgssapi_ntlm/Makefile Sat Mar 4 11:33:01 2017 (r314656) > >> +++ head/kerberos5/lib/libgssapi_ntlm/Makefile Sat Mar 4 11:34:36 2017 (r314657) > >> @@ -45,4 +45,4 @@ CFLAGS+=-I${KRB5DIR}/lib/ntlm > >> > >> .include > >> > >> -.PATH: ${KRB5DIR}/lib/gssapi/ntlm ${.CURDIR}/../../../lib/libgssapi ${.CURDIR}/../libgssapi_krb5 > >> +.PATH: ${KRB5DIR}/lib/gssapi/ntlm ${SRCTOP}/lib/libgssapi ${.CURDIR:H}/libgssapi_krb5 > >> > >> Modified: head/kerberos5/lib/libgssapi_spnego/Makefile > >> ============================================================================== > >> --- head/kerberos5/lib/libgssapi_spnego/Makefile Sat Mar 4 11:33:01 2017 (r314656) > >> +++ head/kerberos5/lib/libgssapi_spnego/Makefile Sat Mar 4 11:34:36 2017 (r314657) > >> @@ -31,7 +31,7 @@ CFLAGS+=-I${KRB5DIR}/lib/gssapi > >> CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi > >> CFLAGS+=-I${KRB5DIR}/lib/gssapi/spnego > >> CFLAGS+=-I${KRB5DIR}/lib/asn1 > >> -CFLAGS+=-I${.CURDIR}/../../../lib/libgssapi > >> +CFLAGS+=-I${SRCTOP}/lib/libgssapi > >> CFLAGS+=-I${KRB5DIR}/lib/roken -I. > >> > >> CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} \ > >> @@ -45,7 +45,7 @@ ${GEN}: spnego.asn1 spnego.opt > >> > >> .SUFFIXES: .h .c .x .hx > >> > >> -.x.c: > >> +.x.c: > >> ${CP} ${.IMPSRC} ${.TARGET} > >> > >> .hx.h: > >> @@ -55,4 +55,4 @@ ${GEN}: spnego.asn1 spnego.opt > >> > >> .SUFFIXES: .h .c .x .hx > >> > >> -.PATH: ${KRB5DIR}/lib/gssapi/spnego ${.CURDIR}/../../../lib/libgssapi ${.CURDIR}/../libgssapi_krb5 > >> +.PATH: ${KRB5DIR}/lib/gssapi/spnego ${SRCTOP}/lib/libgssapi ${.CURDIR:H}/libgssapi_krb5 > >> > >> Modified: head/kerberos5/lib/libhdb/Makefile > >> ============================================================================== > >> --- head/kerberos5/lib/libhdb/Makefile Sat Mar 4 11:33:01 2017 (r314656) > >> +++ head/kerberos5/lib/libhdb/Makefile Sat Mar 4 11:34:36 2017 (r314657) > >> @@ -57,7 +57,7 @@ SRCS= common.c \ > >> ${GEN:S/.x$/.c/:S/.hx$/.h/} > >> > >> CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \ > >> - -I${KRB5DIR}/lib/roken -I${.CURDIR}/../../../contrib/sqlite3/ \ > >> + -I${KRB5DIR}/lib/roken -I${SRCTOP}/contrib/sqlite3/ \ > >> -I${KRB5DIR}/lib/krb5 \ > >> -I. ${LDAPCFLAGS} > >> CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\"" > >> > >> Modified: head/kerberos5/lib/libkafs5/Makefile > >> ============================================================================== > >> --- head/kerberos5/lib/libkafs5/Makefile Sat Mar 4 11:33:01 2017 (r314656) > >> +++ head/kerberos5/lib/libkafs5/Makefile Sat Mar 4 11:34:36 2017 (r314657) > >> @@ -26,7 +26,7 @@ SRCS= afssys.c afskrb5.c common.c krb5_e > >> > >> CFLAGS+= -I${KRB5DIR}/lib/kafs \ > >> -I${KRB5DIR}/lib/krb5 \ > >> - -I${.OBJDIR}/../libkrb5/ \ > >> + -I${.OBJDIR:H}/libkrb5/ \ > >> -I${KRB5DIR}/lib/roken > >> > >> CLEANFILES= kafs5.3 > >> > >> Modified: head/kerberos5/lib/libkrb5/Makefile > >> ============================================================================== > >> --- head/kerberos5/lib/libkrb5/Makefile Sat Mar 4 11:33:01 2017 (r314656) > >> +++ head/kerberos5/lib/libkrb5/Makefile Sat Mar 4 11:34:36 2017 (r314657) > >> @@ -625,4 +625,4 @@ CFLAGS+= -I${KRB5DIR}/lib/krb5 \ > >> > >> .include > >> > >> -.PATH: ${KRB5DIR}/lib/krb5 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/include ${.CURDIR}/../../include ${KRB5DIR}/doc/doxyout/krb5/man/man3/ > >> +.PATH: ${KRB5DIR}/lib/krb5 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/include ${SRCTOP}/kerberos5/include ${KRB5DIR}/doc/doxyout/krb5/man/man3/ > >> > >> Modified: head/kerberos5/libexec/hprop/Makefile > >> ============================================================================== > >> --- head/kerberos5/libexec/hprop/Makefile Sat Mar 4 11:33:01 2017 (r314656) > >> +++ head/kerberos5/libexec/hprop/Makefile Sat Mar 4 11:34:36 2017 (r314657) > >> @@ -9,7 +9,7 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1 > >> CFLAGS+=-I${KRB5DIR}/lib/hx509 > >> CFLAGS+=-I${KRB5DIR}/lib/ntlm > >> CFLAGS+=-I${KRB5DIR}/kdc > >> -CFLAGS+=-I${.OBJDIR}/../../lib/libkrb5 > >> +CFLAGS+=-I${.OBJDIR:H:H}/lib/libkrb5 > >> LIBADD= hdb krb5 roken vers > >> DPADD= ${LDAPDPADD} > >> LDADD= ${LDAPLDADD} > >> > >> Modified: head/kerberos5/libexec/kpasswdd/Makefile > >> ============================================================================== > >> --- head/kerberos5/libexec/kpasswdd/Makefile Sat Mar 4 11:33:01 2017 (r314656) > >> +++ head/kerberos5/libexec/kpasswdd/Makefile Sat Mar 4 11:34:36 2017 (r314657) > >> @@ -2,7 +2,7 @@ > >> > >> PROG= kpasswdd > >> MAN= kpasswdd.8 > >> -CFLAGS+=-I${KRB5DIR}/lib/roken -I../../lib/libhdb ${LDAPCFLAGS} > >> +CFLAGS+=-I${KRB5DIR}/lib/roken -I${.CURDIR:H:H}/lib/libhdb ${LDAPCFLAGS} > >> LIBADD= kadm5srv hdb krb5 roken vers asn1 > >> DPADD= ${LDAPDPADD} > >> LDADD= ${LDAPLDADD} > >> > >> Modified: head/kerberos5/tools/asn1_compile/Makefile > >> ============================================================================== > >> --- head/kerberos5/tools/asn1_compile/Makefile Sat Mar 4 11:33:01 2017 (r314656) > >> +++ head/kerberos5/tools/asn1_compile/Makefile Sat Mar 4 11:34:36 2017 (r314657) > >> @@ -2,7 +2,7 @@ > >> > >> PROG= asn1_compile > >> MAN= > >> -LIBROKEN_A= ${.OBJDIR}/../../lib/libroken/libroken.a > >> +LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a > >> LIBADD= vers > >> LDADD= ${LIBROKEN_A} > >> DPADD= ${LIBROKEN_A} > >> > >> Modified: head/kerberos5/tools/slc/Makefile > >> ============================================================================== > >> --- head/kerberos5/tools/slc/Makefile Sat Mar 4 11:33:01 2017 (r314656) > >> +++ head/kerberos5/tools/slc/Makefile Sat Mar 4 11:34:36 2017 (r314657) > >> @@ -1,7 +1,7 @@ > >> # $FreeBSD$ > >> > >> PROG= slc > >> -LIBROKEN_A= ${.OBJDIR}/../../lib/libroken/libroken.a > >> +LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a > >> LIBADD= vers > >> LDADD= ${LIBROKEN_A} > >> DPADD= ${LIBROKEN_A} > >> @@ -18,7 +18,7 @@ CLEANFILES= roken.h slc-gram.c slc-lex.c > >> roken.h: > >> ${MAKE_ROKEN} > ${.TARGET} > >> > >> -# ${.OBJDIR}/../make-roken/make-roken > ${.TARGET} > >> +# ${.OBJDIR:H}/make-roken/make-roken > ${.TARGET} > >> > >> .include > >> > >> > >> > > > > > -- > Regards, > Bryan Drewery > -- End of PGP section, PGP failed! -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Sat Mar 4 20:25:15 2017 Return-Path: Delivered-To: svn-src-all@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 71CD3CF9AEF; Sat, 4 Mar 2017 20:25:15 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 30D0D1D87; Sat, 4 Mar 2017 20:25:15 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 5D73376; Sat, 4 Mar 2017 20:25:14 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 81E2633128; Sat, 4 Mar 2017 20:25:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id g-jajoi4ec-p; Sat, 4 Mar 2017 20:25:02 +0000 (UTC) Subject: Re: svn commit: r314657 - in head/kerberos5: . lib/libgssapi_krb5 lib/libgssapi_ntlm lib/libgssapi_spnego lib/libhdb lib/libkafs5 lib/libkrb5 libexec/hprop libexec/kpasswdd tools/asn1_compile tools/slc DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 439A033120 To: rgrimes@freebsd.org References: <201703042020.v24KKD5N078654@pdx.rh.CN85.dnsmgr.net> Cc: Ngie Cooper , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <7ed86250-8f8e-d034-0959-dc46e8973583@FreeBSD.org> Date: Sat, 4 Mar 2017 12:25:05 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <201703042020.v24KKD5N078654@pdx.rh.CN85.dnsmgr.net> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="aP9IGkHpjpKPdIdnIDEIfNAS70tTiibMq" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 20:25:15 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --aP9IGkHpjpKPdIdnIDEIfNAS70tTiibMq Content-Type: multipart/mixed; boundary="v2XVT711d3DdXRCAMPThmOPsQXhNHbhgp"; protected-headers="v1" From: Bryan Drewery To: rgrimes@freebsd.org Cc: Ngie Cooper , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <7ed86250-8f8e-d034-0959-dc46e8973583@FreeBSD.org> Subject: Re: svn commit: r314657 - in head/kerberos5: . lib/libgssapi_krb5 lib/libgssapi_ntlm lib/libgssapi_spnego lib/libhdb lib/libkafs5 lib/libkrb5 libexec/hprop libexec/kpasswdd tools/asn1_compile tools/slc References: <201703042020.v24KKD5N078654@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201703042020.v24KKD5N078654@pdx.rh.CN85.dnsmgr.net> --v2XVT711d3DdXRCAMPThmOPsQXhNHbhgp Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 3/4/2017 12:20 PM, Rodney W. Grimes wrote: > -- Start of PGP signed section. > [ Charset windows-1252 unsupported, converting... ] >> On 3/4/2017 7:34 AM, Rodney W. Grimes wrote: >>> What is ${.CURDIR:H:H} ????? Yes that seems to work but now we are o= bscuring >>> ../.. into makefile syntax magic, probably not a grand idea. >> It just trims off the last directory component. This both reduces >> namecache lookups, lessens the amount of data in a log, and makes >> debugging a log simpler by not having a crazy path like: >> /home/bdrewery/big/git/buildserver/sys/modules/usb/template/../../../d= ev/usb/template/usb_template.c >> >> It's far simpler to understand and work with: >> /home/bdrewery/big/git/buildserver/sys/dev/usb/template/usb_template.c= >> >> The only downside is it is slightly more obscure in a Makefile, but on= ce >> you know what :H is then it's not a problem. This is why SRCTOP is ev= en >> better than this as it is far more clear than even :H and avoids the >> ../../ problems. > Lets do one or the other, but not both ${SRCTOP} and :H:H:H. It appear= s > that we now have a mix and mashed up some one way others the other. That I can agree with. I would prefer to standardize on SRCTOP as :H is too obscure without learning about make details. --=20 Regards, Bryan Drewery --v2XVT711d3DdXRCAMPThmOPsQXhNHbhgp-- --aP9IGkHpjpKPdIdnIDEIfNAS70tTiibMq Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJYuyKhAAoJEDXXcbtuRpfPUa8IAJC8qre6gw81FKEUoAe7oRgO YV7tOYDWANTQ6eF5UCqec8buRG5PECWyQ1udlXoE+8RWW5/qlYLDSERRm7tSOlrk AATKgyzUTgqzMQOsJuObjYnmwhMxcPpoGfKJft037nI/rGX6g9M8B8AuS+4yc4Vg 19cz743wJvOSUUnph5XOLFJRm8ugsc49CpePdz9EwdHeAlS6M0aYHzPp+lyGChxx 5YWzc9QRtdwMIWKz/tN7h869przGo1t1R+JlSQPt30G4Kkuyr+HpFuOaX0rHDW6e WV8/EzWGi6a1ZdLgpATe8vFhtdR/uzyv/WppkEOhnCSz0hRWPq87BZxhYdn9lG8= =Z4WD -----END PGP SIGNATURE----- --aP9IGkHpjpKPdIdnIDEIfNAS70tTiibMq-- From owner-svn-src-all@freebsd.org Sat Mar 4 20:35:35 2017 Return-Path: Delivered-To: svn-src-all@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 C75FCCF9D72; Sat, 4 Mar 2017 20:35:35 +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 942521220; Sat, 4 Mar 2017 20:35:35 +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 v24KZYF8058556; Sat, 4 Mar 2017 20:35:34 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24KZYUv058554; Sat, 4 Mar 2017 20:35:34 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703042035.v24KZYUv058554@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 4 Mar 2017 20:35:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314676 - in head/usr.sbin/amd: amd libamu X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 20:35:35 -0000 Author: ngie Date: Sat Mar 4 20:35:34 2017 New Revision: 314676 URL: https://svnweb.freebsd.org/changeset/base/314676 Log: Fix build after r314656 Some of the changes I introduced to use .ALLSRC were correct in spirit, but incorrect in reality -- in particular, ../Makefile.inc hadn't been pulled in via bsd.init.mk (via bsd.lib.mk, bsd.prog.mk), so the value of .ALLSRC (evaluated immediately) was empty. .include bsd.init.mk explicitly so we can be certain that the values used as dependencies in the targets are defined when the target recipe has been evaluated. Reminder: thou shalt separate out separate functional changes before committing them. (YUGE) Pointyhat to: ngie In collaboration with: bdrewery MFC after: 1 month Reported by: Jenkins, cy, ler, O. Hartmann, Michael Butler Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/amd/amd/Makefile head/usr.sbin/amd/libamu/Makefile Modified: head/usr.sbin/amd/amd/Makefile ============================================================================== --- head/usr.sbin/amd/amd/Makefile Sat Mar 4 20:06:47 2017 (r314675) +++ head/usr.sbin/amd/amd/Makefile Sat Mar 4 20:35:34 2017 (r314676) @@ -6,7 +6,7 @@ # $FreeBSD$ # -.include +.include .PATH: ${SRCTOP}/contrib/amd/amd Modified: head/usr.sbin/amd/libamu/Makefile ============================================================================== --- head/usr.sbin/amd/libamu/Makefile Sat Mar 4 20:06:47 2017 (r314675) +++ head/usr.sbin/amd/libamu/Makefile Sat Mar 4 20:35:34 2017 (r314676) @@ -5,6 +5,8 @@ # # $FreeBSD$ +.include + .PATH: ${SRCTOP}/contrib/amd/libamu \ ${SRCTOP}/contrib/amd/conf/transp \ ${SRCTOP}/contrib/amd/conf/mtab \ From owner-svn-src-all@freebsd.org Sat Mar 4 20:39:40 2017 Return-Path: Delivered-To: svn-src-all@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 C8AF4CF9E38; Sat, 4 Mar 2017 20:39:40 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5E81613A1; Sat, 4 Mar 2017 20:39:39 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v24KdcSO078735; Sat, 4 Mar 2017 12:39:38 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v24KdcDE078734; Sat, 4 Mar 2017 12:39:38 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201703042039.v24KdcDE078734@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314654 - in head/cddl: lib/drti lib/libavl lib/libctf lib/libdtrace lib/libnvpair lib/libumem lib/libuutil lib/libzfs lib/libzfs_core lib/libzpool sbin/zfs sbin/zpool usr.bin/ctfconver... In-Reply-To: To: Bryan Drewery Date: Sat, 4 Mar 2017 12:39:38 -0800 (PST) CC: rgrimes@FreeBSD.org, Ngie Cooper , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org Reply-To: rgrimes@FreeBSD.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 20:39:40 -0000 -- Start of PGP signed section. [ Charset windows-1252 unsupported, converting... ] > On 3/4/2017 7:20 AM, Rodney W. Grimes wrote: > > [ Charset UTF-8 unsupported, converting... ] > >> Author: ngie > >> Date: Sat Mar 4 11:30:04 2017 > >> New Revision: 314654 > >> URL: https://svnweb.freebsd.org/changeset/base/314654 > >> > >> Log: > >> cddl: normalize paths using SRCTOP-relative paths or :H when possible > >> > >> This simplifies make logic/output > >> > >> While here, remove bogus CFLAGS which look for headers in cddl/lib/libumem. > >> There aren't any source files there (just Makefiles) > > Please again, dont intermingle other chnages when doing a tree wide sweep. > > > > IMHO if you write While here, you probably should do that thing in a > > seperate commit, unless this is a single thing your touching in a single > > commit. > > > > It is much easier to glue 2 commits togeather than seperate 1 that > > changes 2 things. > > > > Agreed. There were also various comment changes in here. This is why > git is nice, you can git add -p and stage multiple commits before > pushing. git-svn handles this fine. > > > > > It is also still not clear to me that this was adeqautly disccussed as I > > only saw 2 +'s for staying relative and no one +ing to move forward with this. > > Where is this discussion? The only one I can find is > https://reviews.freebsd.org/D9207 which seems to have a consensus of > moving to SRCTOP and :H vs '../..'. There was a short discussion here on the commiters list with some others expressing the prefered the relative status of things even though it clutters logs. D9207 touches 15 files.. I would not consider that an adaquate review that is actually going to change near every Makefile in the tree, and change what people have been looking and at working with for 30 years. I dont think any differntial that only had 3 or 4 people involed that is going to effect all developers is adaquate either. Tree wide sweeping changes should be discussed far more widely. Idk, maybe I am to personally attached to the relative paths.. cause I had a major part in helping them all to work, or perhaps its my been burned by absolute paths that had to be reworked too many times in my past. But my gutt is telling me this change is Bad(tm). -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Sat Mar 4 20:42:58 2017 Return-Path: Delivered-To: svn-src-all@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 77A73CF9160; Sat, 4 Mar 2017 20:42:58 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf0-x241.google.com (mail-pf0-x241.google.com [IPv6:2607:f8b0:400e:c00::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 45BA51AD9; Sat, 4 Mar 2017 20:42:58 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pf0-x241.google.com with SMTP id x66so13268167pfb.1; Sat, 04 Mar 2017 12:42:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:mime-version:from:in-reply-to:date:cc:message-id:references :to; bh=agwYENuahehvun0vfrih/Jc/zAClbgMLq8Wjgdtl7ZM=; b=Aup0INZS68inFw66uCllgWh4JE4EAhzmObKt96+Wq2ekEvlHkLKoZ+u7OzHfW2f3el nq4wNt2P3GG0tkDrHvHOZKE2tR1+rPwdqU5B4869W9LoCvUzf4u5CNbc85JfaWsPRW90 bN+jz27KMVN/2ZPHHTCCfzLuvJfnarQwRx1jkeORYfWrNPflL8T2B+KAyz28Gj6uupwe f24Lzr1kx7Molg4/l4iHKo7+X/3HydGCuB/exzEc7VKnMtxy/izdhxOfyAJy2+DfO7i0 EoYJXwAx2pQYcbN08/jxvWgn/uskeZq+KVmhSXs6I79T23DwazCDwaL3zK8avEEIcsEE N7sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:mime-version:from:in-reply-to:date:cc :message-id:references:to; bh=agwYENuahehvun0vfrih/Jc/zAClbgMLq8Wjgdtl7ZM=; b=hYX0xvl1sjNpmJomVaEh833dQWmx3e4A+WuoQQa89oHqPxsAWz/Tt8sBdtnn2TK5lq PlnZBcjVY6U2/cvNaXOASfNFY4iCKRLOZwxJ2BucRjSJI7sYxoDQwD4tPpIbSyF1NLGK 9Ezj+9mTdiBy5Aiovvxm6ARd3aiNjCdnb/UgxfdwbJloV9mOQrenRfs8jigBtAgYt+DP kmIqfp8/ujluX9H3vw+Qhd5PeAB/+xwp2mR4ybiAqjLUJMN7Gzf6SHnr6Eu94URll3eB wCC2P6WTBMq/tenS0cuKawKpd9zJgJ5ZXXtP/KYYHz793Cv/7eX2EQuh+v9Nfsw2Chzg nrDQ== X-Gm-Message-State: AMke39nACnCbAx4UDljwUxpnhHBIaLKzjnrZZ+OoDH0SDdquNRio6Bcr71sayxrZHsuKrw== X-Received: by 10.84.216.17 with SMTP id m17mr14316502pli.158.1488660177602; Sat, 04 Mar 2017 12:42:57 -0800 (PST) Received: from pinklady.local (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id u80sm30875932pgb.32.2017.03.04.12.42.56 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 04 Mar 2017 12:42:56 -0800 (PST) Subject: Re: svn commit: r314654 - in head/cddl: lib/drti lib/libavl lib/libctf lib/libdtrace lib/libnvpair lib/libumem lib/libuutil lib/libzfs lib/libzfs_core lib/libzpool sbin/zfs sbin/zpool usr.bin/ctfconver... Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Content-Type: multipart/signed; boundary="Apple-Mail=_B9219893-DECE-4180-A18C-1071A263127C"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail From: "Ngie Cooper (yaneurabeya)" In-Reply-To: <201703042039.v24KdcDE078734@pdx.rh.CN85.dnsmgr.net> Date: Sat, 4 Mar 2017 12:42:56 -0800 Cc: Bryan Drewery , Ngie Cooper , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org Message-Id: <03156186-221F-4EEB-A86E-077E46E28296@gmail.com> References: <201703042039.v24KdcDE078734@pdx.rh.CN85.dnsmgr.net> To: rgrimes@FreeBSD.org X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 20:42:58 -0000 --Apple-Mail=_B9219893-DECE-4180-A18C-1071A263127C Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Mar 4, 2017, at 12:39, Rodney W. Grimes = wrote: >=20 > -- Start of PGP signed section. > [ Charset windows-1252 unsupported, converting... ] >> On 3/4/2017 7:20 AM, Rodney W. Grimes wrote: >>> [ Charset UTF-8 unsupported, converting... ] >>>> Author: ngie >>>> Date: Sat Mar 4 11:30:04 2017 >>>> New Revision: 314654 >>>> URL: https://svnweb.freebsd.org/changeset/base/314654 >>>>=20 >>>> Log: >>>> cddl: normalize paths using SRCTOP-relative paths or :H when = possible >>>>=20 >>>> This simplifies make logic/output >>>>=20 >>>> While here, remove bogus CFLAGS which look for headers in = cddl/lib/libumem. >>>> There aren't any source files there (just Makefiles) >>> Please again, dont intermingle other chnages when doing a tree wide = sweep. >>>=20 >>> IMHO if you write While here, you probably should do that thing in a >>> seperate commit, unless this is a single thing your touching in a = single >>> commit. >>>=20 >>> It is much easier to glue 2 commits togeather than seperate 1 that >>> changes 2 things. >>>=20 >>=20 >> Agreed. There were also various comment changes in here. This is = why >> git is nice, you can git add -p and stage multiple commits before >> pushing. git-svn handles this fine. >>=20 >>>=20 >>> It is also still not clear to me that this was adeqautly disccussed = as I >>> only saw 2 +'s for staying relative and no one +ing to move forward = with this. >>=20 >> Where is this discussion? The only one I can find is >> https://reviews.freebsd.org/D9207 which seems to have a consensus of >> moving to SRCTOP and :H vs '../..'. >=20 > There was a short discussion here on the commiters list with some = others > expressing the prefered the relative status of things even though it > clutters logs. >=20 > D9207 touches 15 files.. I would not consider that an adaquate review = that > is actually going to change near every Makefile in the tree, and = change what > people have been looking and at working with for 30 years. >=20 > I dont think any differntial that only had 3 or 4 people involed that > is going to effect all developers is adaquate either. Tree wide = sweeping > changes should be discussed far more widely. >=20 > Idk, maybe I am to personally attached to the relative paths.. cause I > had a major part in helping them all to work, or perhaps its my been > burned by absolute paths that had to be reworked too many times in > my past. But my gutt is telling me this change is Bad(tm). I care about this for the reasons brewery posted, but I also care = because it slows down my terminal output and it bloats my disk with = typescript logs that contain unnecessary information. I agree, the :H .CURDIR bits that could have been done with SRCTOP were = potentially careless -- I was trying to keep things local to components = in the src tree. I=E2=80=99ll go back and fix them if enough people come = at me with pitchforks :(. -Ngie --Apple-Mail=_B9219893-DECE-4180-A18C-1071A263127C Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJYuybQAAoJEPWDqSZpMIYVjs4QALh+l5qR5l8p5cBiLrebYtjb UEm2M+f3AWuyeSZXHl4SpB6v9IipgfQRM1yo3je5QwiSHA/hm6vynW/vHObpS0vc ijNnt+kvRa4k2+mzDNjdg5QO/dIIl8bKqq0ZUqw9XlKm/aVx92XpIOp8iocXxShC 8a4TMMB9Y4eRcDZ2j3McZ5sWKSzmChbHrKE8X8KSXXdZUIpNJtwULzGgFlymfLsl USKL2lrRTrEK3LIjU5D10NsUuDIGeaY2B1zScKSZt0sACue43FKQfIeZaaHvMP50 Bt5OkARxu0PvWdK3fcMD5WrgO2QLh/2Y0Wl+RRM5MzZ9FiZaXWvDJ7lr6mqPMQtN cyYIbhIOGawTGUHUfUCswVYENVgvCPaF4T4qvtEelKiHHbm6ueyaVn3vDTByU3Zc O3Yrtz9WpNBspQ9NVg1vUuXdP/TnZbGk+rdLV/RjySfBDrqbUqBMofwQcyPEbCyq NvOTLtn96D4eMDOLsTse6dK1ZJ9c3ogA60fENPHQzSIVl//vGqeyg4nZ5g4H9gT7 7MvBt2yys51CuTnFrdhso1aqMeTbHM9XtnnTivT4GUUdv6xwRR1BEZhIMQWQDWZh iAUhORRkyymd9Afzap+Nq1ZzXO4oxrj1bFCDtopW7gu4b1R4DTPvNeppkODRxsmE C8h9y0wp4O3tdawIE/Hl =gYq8 -----END PGP SIGNATURE----- --Apple-Mail=_B9219893-DECE-4180-A18C-1071A263127C-- From owner-svn-src-all@freebsd.org Sat Mar 4 20:46:26 2017 Return-Path: Delivered-To: svn-src-all@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 E5509CF9223; Sat, 4 Mar 2017 20:46:26 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg0-x243.google.com (mail-pg0-x243.google.com [IPv6:2607:f8b0:400e:c05::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AD99F1C9F; Sat, 4 Mar 2017 20:46:26 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg0-x243.google.com with SMTP id 77so3240455pgc.0; Sat, 04 Mar 2017 12:46:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:mime-version:from:in-reply-to:date:cc:message-id:references :to; bh=pXDmEbuIYymSNf5DHaVadETuPfeeSZzuthqz4P332fc=; b=robL8aawsqJ9675mt9Gi3ij0zT6SGwsx9XDBCv4S7x3dK5f9k7ktJfAMQ5j1qvCcm9 AMtCdmX1WyJXnX7BWw/cgNi8+n+tezy18XhI1lpDnxOm1GKjMHoUi8WOZqcDV3pA/suM Lp00zQCKVxwPuzHUZM/K5nff4b0u+Ya3y39zhTefIg1GIc2MI07UquEQ6HUnzZen+Df7 67fETPVfans6nKsuGEuvj081t1sZMBQVLkrB6be+JtZwXLOqX0GLCJx+kQyFrr6tH1fr 5G1BLPLpfZB2ZC8q5ulnc4BZWNi3826UQHPTD/FJEWdH9V0ZCQUdjmpkRWBG85CZk6dU rZdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:mime-version:from:in-reply-to:date:cc :message-id:references:to; bh=pXDmEbuIYymSNf5DHaVadETuPfeeSZzuthqz4P332fc=; b=F95hRlPH3bXBv21v/nvLoqOzbw+edGMAYMlCfSPByyNnIuDM2GF5ADBvjHVMhP237d ECsmPTD1lUH9CXoHGpDMp7YcCzmGbp1LN/pZktTavgHXb8oYt9DWexSW54PAw0NpK5+0 1sV4buDeBQogRm79lA0gpabVLdZPe9qiXu+dIHi+LnxGO4F3xuiiMgodnN89Cln2Bdw9 BME7aXlmaoT/n2SVbcsI08YN/8wZUInNGeH+u07LpQjC5GwKnPIOvtJJ6EmpolHnhtcv s9V19N4zMNo1XaRLkgX81kOQECWKpN0SM4Ucs/f9qZKNPCB6rct2arEPWB30ZCyNOTo6 8npA== X-Gm-Message-State: AMke39l0A6aZAQronQ3qSJhDrt4eHOngYfJkWMgc91ReWpsjI2AA4Aff4PCqA64jcFaQGg== X-Received: by 10.98.32.24 with SMTP id g24mr11363297pfg.115.1488660386096; Sat, 04 Mar 2017 12:46:26 -0800 (PST) Received: from pinklady.local (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id r71sm30695098pfa.104.2017.03.04.12.46.25 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 04 Mar 2017 12:46:25 -0800 (PST) Subject: Re: svn commit: r314654 - in head/cddl: lib/drti lib/libavl lib/libctf lib/libdtrace lib/libnvpair lib/libumem lib/libuutil lib/libzfs lib/libzfs_core lib/libzpool sbin/zfs sbin/zpool usr.bin/ctfconver... Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Content-Type: multipart/signed; boundary="Apple-Mail=_824B665C-0078-4E77-9BC4-4537157FB732"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail From: "Ngie Cooper (yaneurabeya)" In-Reply-To: <03156186-221F-4EEB-A86E-077E46E28296@gmail.com> Date: Sat, 4 Mar 2017 12:46:24 -0800 Cc: Bryan Drewery , Ngie Cooper , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org Message-Id: <8F49B826-DC53-45C9-B9BC-3FE614159732@gmail.com> References: <201703042039.v24KdcDE078734@pdx.rh.CN85.dnsmgr.net> <03156186-221F-4EEB-A86E-077E46E28296@gmail.com> To: rgrimes@FreeBSD.org X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 20:46:27 -0000 --Apple-Mail=_824B665C-0078-4E77-9BC4-4537157FB732 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Mar 4, 2017, at 12:42, Ngie Cooper (yaneurabeya) = wrote: ... > I care about this for the reasons brewery posted, but I also care = because it slows down my terminal output and it bloats my disk with = typescript logs that contain unnecessary information. And it=E2=80=99s not just my personal laptop. It bloats log files in CI = services, slows down grep=E2=80=99ing logfiles, increases data retention = requirements, etc. We (at $work) do thousands of builds a week. Saving a few MB here and = there can go a long way over the course of weeks, months, etc. Thanks, -Ngie --Apple-Mail=_824B665C-0078-4E77-9BC4-4537157FB732 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJYuyegAAoJEPWDqSZpMIYV0vAQAJspTcbp5kiGNvQwo1l/PMI9 EfRNATd/O0Dl/7pdPqpUOqRrIRoZbAvwKq2mvwEAAlR+4jDwubgJjcPmhTnR0VN2 8ZqKncTBglpRUmiy78luS6sUhpAH72rCgtf7yWDITPXHwwu4NlyTljdJLq1Q/WzZ ZO/3wrAyo2djKurFzABE4JrzwYS2/6o3Znwb0MideMdihHmRq7F37OtdFAXMi6hB UHNfkcmsI32y3sLkSWmcug7m5kWtpq7uM/fnShELekmRuYXwa1X8+askir0kBEQq nxIknWyrrIodFyx4NtdLgY8P+aVsnB59qckojcFkAX2241FnA1/sBTL39dCxhRkH q/Z2O7ri90/bHbNuuc6MCyYprCtFvsMtm6ijHCEqWIsF6E6DI4FU0x4RgSxGTabC DWmd9FeVOPG58FtpxDHKyjqm0GAS7tR2JR49MjwcrJRS9j2aBPlrhT0QJP29Hbx+ MNhmrH0F10yfdAEdBFeqq+jGaeuE9TCjSdWU7IZV3I6Qd5rGfVC/TKZOSLOj6hjq cIdRwNA5PGYVQV7AwYFEgd0mdyTrvmoRKJTqJxEpu/vydXGwH+9Fki8SVb1C0i5Q aNr4cAUE3FT0vWsyDbQWhzul/v/HBy5nv6Ejc2x2Iyosc0ydwZvLEHXMJZhN5c6Q 3D66eTzKEuyB+dj8Etue =7u0S -----END PGP SIGNATURE----- --Apple-Mail=_824B665C-0078-4E77-9BC4-4537157FB732-- From owner-svn-src-all@freebsd.org Sat Mar 4 20:46:58 2017 Return-Path: Delivered-To: svn-src-all@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 C60FACF92DF; Sat, 4 Mar 2017 20:46:58 +0000 (UTC) (envelope-from cem@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 95F3F1EE2; Sat, 4 Mar 2017 20:46:58 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24KkvQQ062505; Sat, 4 Mar 2017 20:46:57 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24KkvTw062504; Sat, 4 Mar 2017 20:46:57 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201703042046.v24KkvTw062504@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Sat, 4 Mar 2017 20:46:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314677 - head/lib/libc/gen X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 20:46:58 -0000 Author: cem Date: Sat Mar 4 20:46:57 2017 New Revision: 314677 URL: https://svnweb.freebsd.org/changeset/base/314677 Log: fts: Fix a potential memory leak in error case Dan Krejsa reports a potential memory leak in an fts_build error case, detected by Coverity. (It doesn't seem to show up in Coverity Scan, so I don't have a CID to point to.) I don't know whether it is actually possible to arrive in this case with a non-empty 'head' list. The cost is low, though. One additional branch in a terminal error case isn't the end of the world. PR: 217125 Submitted by: Dan Krejsa Modified: head/lib/libc/gen/fts.c Modified: head/lib/libc/gen/fts.c ============================================================================== --- head/lib/libc/gen/fts.c Sat Mar 4 20:35:34 2017 (r314676) +++ head/lib/libc/gen/fts.c Sat Mar 4 20:46:57 2017 (r314677) @@ -850,6 +850,7 @@ mem1: saved_errno = errno; (cur->fts_level == FTS_ROOTLEVEL ? FCHDIR(sp, sp->fts_rfd) : fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) { + fts_lfree(head); cur->fts_info = FTS_ERR; SET(FTS_STOP); return (NULL); From owner-svn-src-all@freebsd.org Sat Mar 4 20:49:36 2017 Return-Path: Delivered-To: svn-src-all@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 A9AD4CF942C for ; Sat, 4 Mar 2017 20:49:36 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1.freebsd.org (Postfix) with SMTP id 86CAE1082 for ; Sat, 4 Mar 2017 20:49:35 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: (qmail 93996 invoked by uid 99); 4 Mar 2017 20:49:34 -0000 Received: from mail-relay.apache.org (HELO mail-relay.apache.org) (140.211.11.15) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Mar 2017 20:49:34 +0000 Received: from [192.168.0.104] (unknown [190.157.139.67]) by mail-relay.apache.org (ASF Mail Server at mail-relay.apache.org) with ESMTPSA id 2612E1A0029; Sat, 4 Mar 2017 20:49:31 +0000 (UTC) From: Pedro Giffuni Message-Id: Mime-Version: 1.0 (Mac OS X Mail 10.2 \(3259\)) Subject: Re: svn commit: r314669 - head/sys/i386/conf Date: Sat, 4 Mar 2017 15:49:52 -0500 In-Reply-To: <2368011.hGEX4V32U5@ralph.baldwin.cx> Cc: Slawa Olhovchenkov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org To: John Baldwin References: <201703041504.v24F4HMh023937@repo.freebsd.org> <20170304153228.GM15630@zxy.spb.ru> <2368011.hGEX4V32U5@ralph.baldwin.cx> X-Mailer: Apple Mail (2.3259) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 20:49:36 -0000 > Il giorno 04 mar 2017, alle ore 14:43, John Baldwin = ha scritto: >=20 > On Saturday, March 04, 2017 10:52:46 AM Pedro Giffuni wrote: >>=20 >> On 03/04/17 10:32, Slawa Olhovchenkov wrote: >>> On Sat, Mar 04, 2017 at 03:04:17PM +0000, Pedro F. Giffuni wrote: >>>=20 >>>> Author: pfg >>>> Date: Sat Mar 4 15:04:17 2017 >>>> New Revision: 314669 >>>> URL: https://svnweb.freebsd.org/changeset/base/314669 >>>>=20 >>>> Log: >>>> Drop i486 from the default i386 GENERIC kernel configuration. >>>>=20 >>>> 80486 production was stopped by Intel on September 2007. Dropping = the 486 >>>> configuration option from the GENERIC kernel improves performance >>>> slightly. >>>>=20 >>>> Removing I486_CPU is consistent at this time: we don't support any >>>> processor without a FPU and the PC-98 arch, which frequently = involved i486 >>>> CPUs, is also gone so we don't test such platforms anymore. >>>=20 >>> What is realy mean? >>=20 >> This means we don't do work-arounds that would be required for raw = 486. >> Instead we will use the 586 instructions by default. >=20 > This doesn't change that. The kernel already has runtime tests in = place > for new things on 486 and later via cpuid. >=20 Hmm ..then I am wondering if I effectively changed anything? >>> Some Via CPU is like i486 (by instruction set). >>>=20 >>> CPU: VIA Ezra (800.04-MHz 686-class CPU) >>> Origin=3D"CentaurHauls" Id=3D0x678 Family=3D0x6 Model=3D0x7 = Stepping=3D8 >>> Features=3D0x803035 >>> AMD Features=3D0x80000000<3DNow!> >>>=20 >>=20 >> 486 never had MMX extensions. >> This is a 686, performance should improve ~4%. >=20 > How did you measure the improvement? Keeping I486_CPU doesn't really > do anything except remove a some #ifdef'd conditionals in identcpu.c > and initcpu.c. It doesn't affect whether we use the TSC, MMX, etc. = Those > are all runtime checks based the CPU feature flags from cpuid. >=20 The number came out from an old posting involving buildworld times, = which I can=E2=80=99t find now :(. Things seem to have changed a lot: it was surely using GCC back then, I = don=E2=80=99t believe clang does much distinction about 486 at all. BTW, does it make sense to keep i586 in the configuration still? Both = i486 and i586 were once removed but later re-instated in r205336. Pedro. From owner-svn-src-all@freebsd.org Sat Mar 4 20:51:32 2017 Return-Path: Delivered-To: svn-src-all@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 54FBECF95D4; Sat, 4 Mar 2017 20:51:32 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1F27613D0; Sat, 4 Mar 2017 20:51:32 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pf0-x243.google.com with SMTP id 67so8917236pfg.2; Sat, 04 Mar 2017 12:51:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:mime-version:from:in-reply-to:date:cc:message-id:references :to; bh=78DBITOX07meZrApg2Gc65DNnwX5Ss6Wr9/YQNhpTpA=; b=J1+KV7Ab3iVDa9uh7OTMmH1TesezWGQrxE4jQMlwezHXRZHiE8wplUW+Tyu+ZZHR2u eLnzVZzOiLvRZ0kLuaiz40GtnEaz2sFYXASP35FkCsDcP0aDluVRxj5QN7KMWQb9VynS 1AAL/VSu0EtkLzoHOwpt+8zZnqaWmH8Hreas9yy26bpzC/bSxzpaYN5ZFAak+T8l0S4s FvTkwmQEooG5VpdogRTFCz7+QLODAT+uDSUXfX8d+0Togs/gDjlEpxzdR6B0PWg56scg WpHT4bAeVCWil2mi/imKA2SMSQQu6kfEonwe4Qy90IZgQCy+elWgwB9c90NxLsVipppB ooKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:mime-version:from:in-reply-to:date:cc :message-id:references:to; bh=78DBITOX07meZrApg2Gc65DNnwX5Ss6Wr9/YQNhpTpA=; b=h0WZJS2ZXiVAU3DfrzGEc3vqTb5AUq6z92G0g31LX/ti5JWq9khQuZQ2Y3g8czQgAL tJvQPmzffT/48cvq6RA95ePvegZBBPpYTz/8RPLTDIQQDcWHz6gq5PFlXAo/AdXm8sHQ ikkK+IadkXNLTOw52cxr5jvLFo/bdlcibHdrCuy5Hmh/nOpjSwjG8S4/wHpr+d8GKUAT d4oWGTqj2+deXjyIMIOp440TsurwRAk3tNfpFLmM0TqLxeYt+1+yz7lnnAcBGMU/JJ57 Huie02JKHV4CocgxZ11b+4+4GkXdOeeAA62uj1xzG0LQ8MtPkZjlpPZrYR5hc7B9/kIv Ylww== X-Gm-Message-State: AMke39m2zGEEyQ3p/nQnp/h2YeMLoqNMgwCQ80qaZ18tnDS0d1XHHvww0IVwgL0vae3OBA== X-Received: by 10.98.198.78 with SMTP id m75mr7186067pfg.160.1488660691570; Sat, 04 Mar 2017 12:51:31 -0800 (PST) Received: from pinklady.local (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id d189sm30956344pga.17.2017.03.04.12.51.30 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 04 Mar 2017 12:51:30 -0800 (PST) Subject: Re: svn commit: r314654 - in head/cddl: lib/drti lib/libavl lib/libctf lib/libdtrace lib/libnvpair lib/libumem lib/libuutil lib/libzfs lib/libzfs_core lib/libzpool sbin/zfs sbin/zpool usr.bin/ctfconver... Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Content-Type: multipart/signed; boundary="Apple-Mail=_24A84B7C-A5A5-4429-B182-B22DACC3A15D"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail From: "Ngie Cooper (yaneurabeya)" In-Reply-To: <8F49B826-DC53-45C9-B9BC-3FE614159732@gmail.com> Date: Sat, 4 Mar 2017 12:51:30 -0800 Cc: Bryan Drewery , Ngie Cooper , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org Message-Id: <2A8909D8-B076-436D-88FE-08050B304FEA@gmail.com> References: <201703042039.v24KdcDE078734@pdx.rh.CN85.dnsmgr.net> <03156186-221F-4EEB-A86E-077E46E28296@gmail.com> <8F49B826-DC53-45C9-B9BC-3FE614159732@gmail.com> To: rgrimes@FreeBSD.org X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 20:51:32 -0000 --Apple-Mail=_24A84B7C-A5A5-4429-B182-B22DACC3A15D Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Mar 4, 2017, at 12:46, Ngie Cooper (yaneurabeya) = wrote: >=20 >=20 >> On Mar 4, 2017, at 12:42, Ngie Cooper (yaneurabeya) = wrote: >=20 > ... >> I care about this for the reasons brewery posted, but I also care = because it slows down my terminal output and it bloats my disk with = typescript logs that contain unnecessary information. >=20 > And it=E2=80=99s not just my personal laptop. It bloats log files in = CI services, slows down grep=E2=80=99ing logfiles, increases data = retention requirements, etc. >=20 > We (at $work) do thousands of builds a week. Saving a few MB here and = there can go a long way over the course of weeks, months, etc. Sidenote: it really peeves me how viewing a log in Jenkins will crash my = browser when it tries to render the text. Maybe now it will work a bit = better. -Ngie --Apple-Mail=_24A84B7C-A5A5-4429-B182-B22DACC3A15D Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJYuyjSAAoJEPWDqSZpMIYVpo8P/37cGCoiFYUvM/Haiym/9U3c fXPcCxWVxjhBKsRXHKZmFr+MNqgWR3+cXe2hNRZx1dFdbISl4zBVh8Zf2WWA61qu y8nZmUfXpV+23mBpURsXHH6WWLf9taVnGbRcez0nF3wRAubBEDFLeEKVlRjZfYQK kMXV+3vbiJ3htTf4dzcZRVd2BHlQ6bU0EEP7i1femrwSg1L6SfqXUMrEdGlJnGD+ IWAU2QDTNi5BJ6SR4vyDDblKhYI4ymvDFhpKFIx04QI4S2tUqBG/c7ytauxvogmo NQAQaE7YoWGikcgftlX4+cIPApOnuX3hpGSUMiFp/YcqntaR99sIs97LXn2vsHQX MeJhKlfDcCwZGC8bldJRgFtspIbJKi3woGZ01Zd72Tmwxu84GYcn9tB0EKV8xvIN oju3/rC7he8Bmr8cZCwP5X1ax/RcjFts6Aja8stv8dLRVT8iOGV2L6sM2bNVH8NI B86bTcjCzEJNnBSg49wpzAzI1yx3lnaafoXNA774ykYyn4x2uewLPuYJfh81YUyQ 8BhlTySmdKwZfS9/cqvk8DZS0dzYiyp/gSKG0hAoYIcum4j+y1RfzrAZ8L5QCAee mBMg8LOt0sBInKE9T43S6yFsNnmBaK0JME6+08z49/jymTIaeHPPMoz4KEfGOazb YvjNOVUxosHCQ8DZ7CCi =etNr -----END PGP SIGNATURE----- --Apple-Mail=_24A84B7C-A5A5-4429-B182-B22DACC3A15D-- From owner-svn-src-all@freebsd.org Sat Mar 4 21:04:35 2017 Return-Path: Delivered-To: svn-src-all@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 D4858CF9E3D; Sat, 4 Mar 2017 21:04:35 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AB77F1447; Sat, 4 Mar 2017 21:04:35 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v24L4XPU078874; Sat, 4 Mar 2017 13:04:33 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v24L4X4x078873; Sat, 4 Mar 2017 13:04:33 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201703042104.v24L4X4x078873@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314654 - in head/cddl: lib/drti lib/libavl lib/libctf lib/libdtrace lib/libnvpair lib/libumem lib/libuutil lib/libzfs lib/libzfs_core lib/libzpool sbin/zfs sbin/zpool usr.bin/ctfconver... In-Reply-To: <2A8909D8-B076-436D-88FE-08050B304FEA@gmail.com> To: "Ngie Cooper (yaneurabeya)" Date: Sat, 4 Mar 2017 13:04:33 -0800 (PST) CC: rgrimes@FreeBSD.org, Bryan Drewery , Ngie Cooper , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org Reply-To: rgrimes@FreeBSD.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 21:04:35 -0000 > > > On Mar 4, 2017, at 12:46, Ngie Cooper (yaneurabeya) wrote: > > > > > >> On Mar 4, 2017, at 12:42, Ngie Cooper (yaneurabeya) wrote: > > > > ... > >> I care about this for the reasons brewery posted, but I also care because it slows down my terminal output and it bloats my disk with typescript logs that contain unnecessary information. > > > > And it?s not just my personal laptop. It bloats log files in CI services, slows down grep?ing logfiles, increases data retention requirements, etc. > > > > We (at $work) do thousands of builds a week. Saving a few MB here and there can go a long way over the course of weeks, months, etc. > > Sidenote: it really peeves me how viewing a log in Jenkins will crash my browser when it tries to render the text. Maybe now it will work a bit better. That is a very bad reason, if this disk space saving and not having to see all the ../.. scroll by on your terminal as make buildworld runs is your motivation for this I would say we need to stop now and have a more reasonable and serious discussion about why this is actually a good idea. Please go fix the bug in your browser and hold off on these changes (in either direction) until a proper discussion, possibly real tests to see if there is any savings in cycles worthy of this sized change. > -Ngie -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Sat Mar 4 21:13:48 2017 Return-Path: Delivered-To: svn-src-all@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 1C685CF51FA for ; Sat, 4 Mar 2017 21:13:48 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound1a.eu.mailhop.org (outbound1a.eu.mailhop.org [52.58.109.202]) (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 A1F861B4D for ; Sat, 4 Mar 2017 21:13:47 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-User: 73b211bc-011f-11e7-95b5-6dfd7dbb0ee5 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 73.78.92.27 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [73.78.92.27]) by outbound1.eu.mailhop.org (Halon) with ESMTPSA id 73b211bc-011f-11e7-95b5-6dfd7dbb0ee5; Sat, 04 Mar 2017 21:13:46 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id v24LDarL004747; Sat, 4 Mar 2017 14:13:36 -0700 (MST) (envelope-from ian@freebsd.org) Message-ID: <1488662016.69705.21.camel@freebsd.org> Subject: Re: svn commit: r314669 - head/sys/i386/conf From: Ian Lepore To: Pedro Giffuni , John Baldwin Cc: Slawa Olhovchenkov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Sat, 04 Mar 2017 14:13:36 -0700 In-Reply-To: References: <201703041504.v24F4HMh023937@repo.freebsd.org> <20170304153228.GM15630@zxy.spb.ru> <2368011.hGEX4V32U5@ralph.baldwin.cx> Content-Type: text/plain; charset="iso-8859-13" X-Mailer: Evolution 3.18.5.1 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 21:13:48 -0000 On Sat, 2017-03-04 at 15:49 -0500, Pedro Giffuni wrote: > > > > Il giorno 04 mar 2017, alle ore 14:43, John Baldwin > g> ha scritto: > > > > On Saturday, March 04, 2017 10:52:46 AM Pedro Giffuni wrote: > > > > > > > > > On 03/04/17 10:32, Slawa Olhovchenkov wrote: > > > > > > > > On Sat, Mar 04, 2017 at 03:04:17PM +0000, Pedro F. Giffuni > > > > wrote: > > > > > > > > > > > > > > Author: pfg > > > > > Date: Sat Mar  4 15:04:17 2017 > > > > > New Revision: 314669 > > > > > URL: https://svnweb.freebsd.org/changeset/base/314669 > > > > > > > > > > Log: > > > > >  Drop i486 from the default i386 GENERIC kernel > > > > > configuration. > > > > > > > > > >  80486 production was stopped by Intel on September 2007. > > > > > Dropping the 486 > > > > >  configuration option from the GENERIC kernel improves > > > > > performance > > > > >  slightly. > > > > > > > > > >  Removing I486_CPU is consistent at this time: we don't > > > > > support any > > > > >  processor without a FPU and the PC-98 arch, which frequently > > > > > involved i486 > > > > >  CPUs, is also gone so we don't test such platforms anymore. > > > > What is realy mean? > > > This means we don't do work-arounds that would be required for > > > raw 486. > > > Instead we will use the 586 instructions by default. > > This doesn't change that.  The kernel already has runtime tests in > > place > > for new things on 486 and later via cpuid. > > > Hmm ..then I am wondering if I effectively changed anything? > > > > > > > > > > > > > > Some Via CPU is like i486 (by instruction set). > > > > > > > > CPU: VIA Ezra (800.04-MHz 686-class CPU) > > > >  Origin="CentaurHauls"  Id=0x678  Family=0x6  Model=0x7  Steppi > > > > ng=8 > > > >  Features=0x803035 > > > >  AMD Features=0x80000000<3DNow!> > > > > > > > 486 never had MMX extensions. > > > This is a 686, performance should improve ~4%. > > How did you measure the improvement?  Keeping I486_CPU doesn't > > really > > do anything except remove a some #ifdef'd conditionals in > > identcpu.c > > and initcpu.c.  It doesn't affect whether we use the TSC, MMX, > > etc.  Those > > are all runtime checks based the CPU feature flags from cpuid. > > > The number came out from an old posting involving buildworld times, > which I canÿt find now :(. > Things seem to have changed a lot: it was surely using GCC back then, > I donÿt believe clang does much distinction about 486 at all. > > BTW, does it make sense to keep i586 in the configuration still? Both > i486 and i586 were once removed but later re-instated in r205336. > > Pedro. i586 hardware which is not also i686 is still alive and well, but I think at this point it's mostly used in specialized applications.  I have no problem with removing i586 from GENERIC, but please don't remove underlying support for setting it in custom kernel configs. -- Ian From owner-svn-src-all@freebsd.org Sat Mar 4 21:14:52 2017 Return-Path: Delivered-To: svn-src-all@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 43B43CF5328; Sat, 4 Mar 2017 21:14:52 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id EC41D1E15; Sat, 4 Mar 2017 21:14:51 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id kH0kczcRvkevukH0lcl8Fa; Sat, 04 Mar 2017 14:14:44 -0700 X-Authority-Analysis: v=2.2 cv=BLbDlBYG c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=6Iz7jQTuP9IA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=gO0ro-WWNe3wqWzS9koA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 1D1738C8; Sat, 4 Mar 2017 13:14:42 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id v24LEfqZ098918; Sat, 4 Mar 2017 13:14:41 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201703042114.v24LEfqZ098918@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Ngie Cooper cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314676 - in head/usr.sbin/amd: amd libamu In-Reply-To: Message from Ngie Cooper of "Sat, 04 Mar 2017 20:35:34 +0000." <201703042035.v24KZYUv058554@repo.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sat, 04 Mar 2017 13:14:41 -0800 X-CMAE-Envelope: MS4wfF+tsGH6fS4zWIOOWyLFKaOiEijFX1ALaYqwgD97EZcVDpCoc8DyFFEP9nwDdxsQm+XZEYcmfI5ObLo8NxZU3Wf/zE41uZ8D/P0XFEgjvdgpVZZeO5Nv rZyboLCivWhYlmAD5HCea7tXnsWUq4lX74RkpX1yRHWDhOBfUzCEUP5vOLjsF8QU/ouDOAFgXc9KjGr/oSWJx702QUmQ9LyI7lrw85AYXJSf9GdUoEny3BtL /jGBzkHSrTAp4uxYCH4ZYwcHIyB5prStGtbUnCR1vt75hsaP1VbDd5i6NEvl2IhA X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 21:14:52 -0000 In message <201703042035.v24KZYUv058554@repo.freebsd.org>, Ngie Cooper writes: > Author: ngie > Date: Sat Mar 4 20:35:34 2017 > New Revision: 314676 > URL: https://svnweb.freebsd.org/changeset/base/314676 > > Log: > Fix build after r314656 > > Some of the changes I introduced to use .ALLSRC were correct in spirit, > but incorrect in reality -- in particular, ../Makefile.inc hadn't been > pulled in via bsd.init.mk (via bsd.lib.mk, bsd.prog.mk), so the value > of .ALLSRC (evaluated immediately) was empty. .include bsd.init.mk > explicitly so we can be certain that the values used as dependencies in > the targets are defined when the target recipe has been evaluated. > > Reminder: thou shalt separate out separate functional changes before > committing them. > > (YUGE) Pointyhat to: ngie > In collaboration with: bdrewery > MFC after: 1 month > Reported by: Jenkins, cy, ler,O. Hartmann , Michael Butler Actually, I didn't report anything. I simply replied to O. Hartmann's email that it was failing to link to rpcsvc. Good to see it's fixed. The NFS RPC relationship makes amd a little tricky. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. From owner-svn-src-all@freebsd.org Sat Mar 4 21:16:19 2017 Return-Path: Delivered-To: svn-src-all@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 3E877CF53E8; Sat, 4 Mar 2017 21:16:19 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 C03441F87; Sat, 4 Mar 2017 21:16:18 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id v24LGBgp012732 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sat, 4 Mar 2017 23:16:11 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua v24LGBgp012732 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id v24LGBbu012730; Sat, 4 Mar 2017 23:16:11 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 4 Mar 2017 23:16:11 +0200 From: Konstantin Belousov To: Pedro Giffuni Cc: John Baldwin , Slawa Olhovchenkov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314669 - head/sys/i386/conf Message-ID: <20170304211611.GW2092@kib.kiev.ua> References: <201703041504.v24F4HMh023937@repo.freebsd.org> <20170304153228.GM15630@zxy.spb.ru> <2368011.hGEX4V32U5@ralph.baldwin.cx> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.7.2 (2016-11-26) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 21:16:19 -0000 On Sat, Mar 04, 2017 at 03:49:52PM -0500, Pedro Giffuni wrote: > > > Il giorno 04 mar 2017, alle ore 14:43, John Baldwin ha scritto: > > > > On Saturday, March 04, 2017 10:52:46 AM Pedro Giffuni wrote: > >> > >> On 03/04/17 10:32, Slawa Olhovchenkov wrote: > >>> On Sat, Mar 04, 2017 at 03:04:17PM +0000, Pedro F. Giffuni wrote: > >>> > >>>> Author: pfg > >>>> Date: Sat Mar 4 15:04:17 2017 > >>>> New Revision: 314669 > >>>> URL: https://svnweb.freebsd.org/changeset/base/314669 > >>>> > >>>> Log: > >>>> Drop i486 from the default i386 GENERIC kernel configuration. > >>>> > >>>> 80486 production was stopped by Intel on September 2007. Dropping the 486 > >>>> configuration option from the GENERIC kernel improves performance > >>>> slightly. > >>>> > >>>> Removing I486_CPU is consistent at this time: we don't support any > >>>> processor without a FPU and the PC-98 arch, which frequently involved i486 > >>>> CPUs, is also gone so we don't test such platforms anymore. > >>> > >>> What is realy mean? > >> > >> This means we don't do work-arounds that would be required for raw 486. > >> Instead we will use the 586 instructions by default. > > > > This doesn't change that. The kernel already has runtime tests in place > > for new things on 486 and later via cpuid. > > > > Hmm ..then I am wondering if I effectively changed anything? > > >>> Some Via CPU is like i486 (by instruction set). > >>> > >>> CPU: VIA Ezra (800.04-MHz 686-class CPU) > >>> Origin="CentaurHauls" Id=0x678 Family=0x6 Model=0x7 Stepping=8 > >>> Features=0x803035 > >>> AMD Features=0x80000000<3DNow!> > >>> > >> > >> 486 never had MMX extensions. > >> This is a 686, performance should improve ~4%. > > > > How did you measure the improvement? Keeping I486_CPU doesn't really > > do anything except remove a some #ifdef'd conditionals in identcpu.c > > and initcpu.c. It doesn't affect whether we use the TSC, MMX, etc. Those > > are all runtime checks based the CPU feature flags from cpuid. > > > > The number came out from an old posting involving buildworld times, which I can???t find now :(. > Things seem to have changed a lot: it was surely using GCC back then, I don???t believe clang does much distinction about 486 at all. > > BTW, does it make sense to keep i586 in the configuration still? Both i486 and i586 were once removed but later re-instated in r205336. > What did make significant impact on 32bit shared libraries some time ago was to compile them with -mtune=i686. Default PIC prologue effectively neutered return stack predictor, adding uneccessary overhead to already expensive PIC code. I think that this is even measureable, i.e. it might give >= 5% of difference. I did not rechecked modern compilers WRT the generated PIC code, but I doubt that the thing changed recently. Several notes: -mtune is not -march, i.e. the code would be still targeted for 486 instruction set, but scheduling is optimized for more modern CPUs. Also, recent gcc puts specific meaning into -mtune=i686, interpreting it as request for scheduling for generic modern CPUs. We already compile 32bit compat libs on amd64 with -march=i686. Working on this stuff would be much more useful than tweaking kernel config for CPU detection. From owner-svn-src-all@freebsd.org Sat Mar 4 21:21:33 2017 Return-Path: Delivered-To: svn-src-all@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 9ED2CCF566F; Sat, 4 Mar 2017 21:21:33 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6AF451500; Sat, 4 Mar 2017 21:21:33 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 955DC1A88; Sat, 4 Mar 2017 21:21:32 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 1DE5133401; Sat, 4 Mar 2017 21:21:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id kt3EP_sk_2BK; Sat, 4 Mar 2017 21:21:24 +0000 (UTC) Subject: Re: svn commit: r314654 - in head/cddl: lib/drti lib/libavl lib/libctf lib/libdtrace lib/libnvpair lib/libumem lib/libuutil lib/libzfs lib/libzfs_core lib/libzpool sbin/zfs sbin/zpool usr.bin/ctfconver... DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com DC2E3333F9 To: rgrimes@FreeBSD.org References: <201703042104.v24L4X4x078873@pdx.rh.CN85.dnsmgr.net> Cc: Ngie Cooper , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <04cd5016-2777-08a6-9279-c0e83e8d3eff@FreeBSD.org> Date: Sat, 4 Mar 2017 13:21:11 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <201703042104.v24L4X4x078873@pdx.rh.CN85.dnsmgr.net> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="DuADjswumbVdKsFlVdccFp6fMC3xTWMmI" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 21:21:33 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --DuADjswumbVdKsFlVdccFp6fMC3xTWMmI Content-Type: multipart/mixed; boundary="gsViOshM24cCSi9U1nBAk7mLeCdgjrDVI"; protected-headers="v1" From: Bryan Drewery To: rgrimes@FreeBSD.org Cc: Ngie Cooper , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org Message-ID: <04cd5016-2777-08a6-9279-c0e83e8d3eff@FreeBSD.org> Subject: Re: svn commit: r314654 - in head/cddl: lib/drti lib/libavl lib/libctf lib/libdtrace lib/libnvpair lib/libumem lib/libuutil lib/libzfs lib/libzfs_core lib/libzpool sbin/zfs sbin/zpool usr.bin/ctfconver... References: <201703042104.v24L4X4x078873@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201703042104.v24L4X4x078873@pdx.rh.CN85.dnsmgr.net> --gsViOshM24cCSi9U1nBAk7mLeCdgjrDVI Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 3/4/2017 1:04 PM, Rodney W. Grimes wrote: >> >>> On Mar 4, 2017, at 12:46, Ngie Cooper (yaneurabeya) wrote: >>> >>> >>>> On Mar 4, 2017, at 12:42, Ngie Cooper (yaneurabeya) wrote: >>> >>> ... >>>> I care about this for the reasons brewery posted, but I also care be= cause it slows down my terminal output and it bloats my disk with typescr= ipt logs that contain unnecessary information. >>> >>> And it?s not just my personal laptop. It bloats log files in CI servi= ces, slows down grep?ing logfiles, increases data retention requirements,= etc. >>> >>> We (at $work) do thousands of builds a week. Saving a few MB here and= there can go a long way over the course of weeks, months, etc. >> >> Sidenote: it really peeves me how viewing a log in Jenkins will crash = my browser when it tries to render the text. Maybe now it will work a bit= better. >=20 > That is a very bad reason, if this disk space saving and not having > to see all the ../.. scroll by on your terminal as make buildworld > runs is your motivation for this I would say we need to stop > now and have a more reasonable and serious discussion about why > this is actually a good idea. >=20 > Please go fix the bug in your browser and hold off on these > changes (in either direction) until a proper discussion, possibly > real tests to see if there is any savings in cycles worthy > of this sized change. >=20 >> -Ngie >=20 Your reason is "a very bad reason" being "my gutt is telling me this change is Bad(tm)." vs the objective list of reasons SRCTOP is better than '../..'. (quotes from you). Changing to SRCTOP is not about speed or saving grand or trivial amounts of space. It's about making Makefiles simpler to write and understand and making the output simpler to read and use. I don't think it is worth the effort to discuss every little thing like this. There has been a discussion among people who maintain the build and all agreed with it. I was telling my wife just last night that if I had put up every little change I did for review/discussion in the build over last year that I likely would be delayed by years due to bikeshedding trivial aspects of them, and would have just given up. I still have a lot left to do as well. Among all of the changes, the only real dissent I've had in the end is from one person saying that some of the work slows down the kernel build by a few seconds when building on a small system over a slow NFS link. That's a valid complaint though vs this thread which is starting to feel like a bikeshed. --=20 Regards, Bryan Drewery --gsViOshM24cCSi9U1nBAk7mLeCdgjrDVI-- --DuADjswumbVdKsFlVdccFp6fMC3xTWMmI Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJYuy/HAAoJEDXXcbtuRpfPUdgIAIE1Z0pnrOsFMkPM5T8bLtYI VfIeADWSTG8vtgneNTD9beEJzT5rJdZPUDqOXRYY/Xxa56X3mUlApH59oVGlLYBa WzeNGoeHbhmfMQpguLnytk1ivQ3rSNUyHL54NcoPbErdGYGbg/rJ0uY1q6uDygAC XG7iI8MnF3DrMkXZLJPybljpGBmx5x9d5SihaLloZFuMUROW4VVVLC+LGLbRkUVU 87Z8wrXMMXC7fec81bJVh7KT22yGPIIVe2xmfswvjGQxAPXZyQpHkY9Hguf6dJoY vSvv50DLKMr3n+E5a89e/X6r8bzVPIeFJK2kPUZmvFnVAgfc/RAF6xFiEzcWlvs= =1xe7 -----END PGP SIGNATURE----- --DuADjswumbVdKsFlVdccFp6fMC3xTWMmI-- From owner-svn-src-all@freebsd.org Sat Mar 4 21:43:23 2017 Return-Path: Delivered-To: svn-src-all@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 E2648CF5D6E for ; Sat, 4 Mar 2017 21:43:23 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x22e.google.com (mail-it0-x22e.google.com [IPv6:2607:f8b0:4001:c0b::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A9BF21047 for ; Sat, 4 Mar 2017 21:43:23 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x22e.google.com with SMTP id 203so31705019ith.0 for ; Sat, 04 Mar 2017 13:43:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=av+uBscM2PY5+/viB0yBeC7bp/XGdO8EPjYNE08WSlw=; b=A8wlKxO3G3BgVuxFe7wa8a7pDQADUfzxN/+KS0+KHqA8C/1vacb8ZmFwZ3pa9I9Gqy lxw3xJlmBz6LNnuEz4jZF85Lj3anMJNUr4w7oS9REtRkXL5JuLbZsFWiqqQPAaXZ4vo9 UrBOnzC55frKxoWZCdOcMQe9B67Mg38YNr3ul1aZqfrX7rGBZe2pwrE3aSv/KoefJbu8 mRs4v1fUsaCX6OPF93AiE3PkrQqLBUguzm8yguzyK+hny63e7pt+FPiBq3eykbqDyrnT fGbLKcIw2My7sjF2bY9pOSLKwiwUg+ZNgxxAJtIEBXG9g7UWORpbTLuZ5T6Jgz1Fzrqp b0lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=av+uBscM2PY5+/viB0yBeC7bp/XGdO8EPjYNE08WSlw=; b=uBZO5Tzfp9eI0azL5SqVZVcGuNmjmm3Q2t8ykC7FDb9+gyprA/5OtTmd0Zr97JtFp0 MA89ajTjtC5y8EcrAxywayiemm/wS6+n/SqJqaZiGadwAEuRJTsjPv2LIkaTEcA6mIZx 1VvmGBWjhTDTxBnV5aSKgNsEMmwJB1bLPqZezXsdRP6xM1lHMaYGvAvWb3e8+KuBNsjG FYJrkeZlj2E3ZPqE0SeBMGNs25K7U5y8tzMlvjGBG1Lyvp6WsHpxipruxYaeWnnqZLZf CMMBSSLoMzqGZbphxTs148Fy2NRwMRfGYo9BnFJqkAmfM28mnjg776j7OyVYgQGoghyT kJGg== X-Gm-Message-State: AMke39nNEu1oBsSNNdGHHxfat9gDFSbl9JHhmuuVmu0wNjc6g1V9n4Cl0HgB7kEFX/CTDsOA4WCQRW6UvVIVcw== X-Received: by 10.36.116.71 with SMTP id o68mr9541774itc.60.1488663802993; Sat, 04 Mar 2017 13:43:22 -0800 (PST) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.134.129 with HTTP; Sat, 4 Mar 2017 13:43:22 -0800 (PST) X-Originating-IP: [69.53.245.200] In-Reply-To: <7ed86250-8f8e-d034-0959-dc46e8973583@FreeBSD.org> References: <201703042020.v24KKD5N078654@pdx.rh.CN85.dnsmgr.net> <7ed86250-8f8e-d034-0959-dc46e8973583@FreeBSD.org> From: Warner Losh Date: Sat, 4 Mar 2017 14:43:22 -0700 X-Google-Sender-Auth: veAQpoOeNybQ9hE7vk7phcXEOKw Message-ID: Subject: Re: svn commit: r314657 - in head/kerberos5: . lib/libgssapi_krb5 lib/libgssapi_ntlm lib/libgssapi_spnego lib/libhdb lib/libkafs5 lib/libkrb5 libexec/hprop libexec/kpasswdd tools/asn1_compile tools/slc To: Bryan Drewery Cc: rgrimes@freebsd.org, Ngie Cooper , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 21:43:24 -0000 On Sat, Mar 4, 2017 at 1:25 PM, Bryan Drewery wrote: > On 3/4/2017 12:20 PM, Rodney W. Grimes wrote: >> -- Start of PGP signed section. >> [ Charset windows-1252 unsupported, converting... ] >>> On 3/4/2017 7:34 AM, Rodney W. Grimes wrote: >>>> What is ${.CURDIR:H:H} ????? Yes that seems to work but now we are obscuring >>>> ../.. into makefile syntax magic, probably not a grand idea. >>> It just trims off the last directory component. This both reduces >>> namecache lookups, lessens the amount of data in a log, and makes >>> debugging a log simpler by not having a crazy path like: >>> /home/bdrewery/big/git/buildserver/sys/modules/usb/template/../../../dev/usb/template/usb_template.c >>> >>> It's far simpler to understand and work with: >>> /home/bdrewery/big/git/buildserver/sys/dev/usb/template/usb_template.c >>> >>> The only downside is it is slightly more obscure in a Makefile, but once >>> you know what :H is then it's not a problem. This is why SRCTOP is even >>> better than this as it is far more clear than even :H and avoids the >>> ../../ problems. >> Lets do one or the other, but not both ${SRCTOP} and :H:H:H. It appears >> that we now have a mix and mashed up some one way others the other. > > That I can agree with. I would prefer to standardize on SRCTOP as :H is > too obscure without learning about make details. :H is insane in 90% of the cases I've seen it used. Let's roll with SRCTOP everywhere we can. That's safer from directory motion anyway... Warner From owner-svn-src-all@freebsd.org Sat Mar 4 21:47:45 2017 Return-Path: Delivered-To: svn-src-all@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 28538CF5E52; Sat, 4 Mar 2017 21:47:45 +0000 (UTC) (envelope-from ian@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 D14CA11DA; Sat, 4 Mar 2017 21:47:44 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24LlhW0088031; Sat, 4 Mar 2017 21:47:43 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24Llh2k088030; Sat, 4 Mar 2017 21:47:43 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703042147.v24Llh2k088030@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sat, 4 Mar 2017 21:47:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314681 - head/sys/dev/uart X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 21:47:45 -0000 Author: ian Date: Sat Mar 4 21:47:43 2017 New Revision: 314681 URL: https://svnweb.freebsd.org/changeset/base/314681 Log: Fix bugs exposed by the recent enabling of FIFOs in the pl011 uart. These have been in the code all along, but were masked by having a fifo depth of one byte at the hardware level, so everything kinda worked by accident. The hardware interrupts when the TX fifo is half empty, so set sc->sc_txfifosz to 8 bytes (half the hardware fifo size) to match. This eliminates dropped characters on output. Restructure the read loop to consume all the bytes in the fifo by using the "rx fifo empty" bit of the flags register rather than the "rx ready" bit of the interrupt status register. The rx-ready interrupt is cleared when the number of bytes in the fifo fall below the interrupt trigger level, leaving the fifo half full every time receive routine was called. Now it loops until the fifo is completely empty every time (including when the function is called due to a receive timeout as well as for fifo-full). Modified: head/sys/dev/uart/uart_dev_pl011.c Modified: head/sys/dev/uart/uart_dev_pl011.c ============================================================================== --- head/sys/dev/uart/uart_dev_pl011.c Sat Mar 4 21:32:23 2017 (r314680) +++ head/sys/dev/uart/uart_dev_pl011.c Sat Mar 4 21:47:43 2017 (r314681) @@ -419,7 +419,7 @@ uart_pl011_bus_probe(struct uart_softc * device_set_desc(sc->sc_dev, "PrimeCell UART (PL011)"); sc->sc_rxfifosz = 16; - sc->sc_txfifosz = 16; + sc->sc_txfifosz = 8; return (0); } @@ -434,8 +434,10 @@ uart_pl011_bus_receive(struct uart_softc bas = &sc->sc_bas; uart_lock(sc->sc_hwmtx); - ints = __uart_getreg(bas, UART_MIS); - while (ints & (UART_RXREADY | RIS_RTIM)) { + for (;;) { + ints = __uart_getreg(bas, UART_FR); + if (ints & FR_RXFE) + break; if (uart_rx_full(sc)) { sc->sc_rxbuf[sc->sc_rxput] = UART_STAT_OVERRUN; break; @@ -450,7 +452,6 @@ uart_pl011_bus_receive(struct uart_softc rx |= UART_STAT_PARERR; uart_rx_put(sc, rx); - ints = __uart_getreg(bas, UART_MIS); } uart_unlock(sc->sc_hwmtx); From owner-svn-src-all@freebsd.org Sat Mar 4 22:00:07 2017 Return-Path: Delivered-To: svn-src-all@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 2DDB2CF912A; Sat, 4 Mar 2017 22:00:07 +0000 (UTC) (envelope-from ian@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 C845519A7; Sat, 4 Mar 2017 22:00:06 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24M05Re092125; Sat, 4 Mar 2017 22:00:05 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24M05qH092124; Sat, 4 Mar 2017 22:00:05 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703042200.v24M05qH092124@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sat, 4 Mar 2017 22:00:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314682 - head/sys/dev/uart X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 22:00:07 -0000 Author: ian Date: Sat Mar 4 22:00:05 2017 New Revision: 314682 URL: https://svnweb.freebsd.org/changeset/base/314682 Log: Reconfigure the fifo watermark levels on the pl011 uart to interrupt when the fifos are 3/4 full (rc) or empty (tx). Modified: head/sys/dev/uart/uart_dev_pl011.c Modified: head/sys/dev/uart/uart_dev_pl011.c ============================================================================== --- head/sys/dev/uart/uart_dev_pl011.c Sat Mar 4 21:47:43 2017 (r314681) +++ head/sys/dev/uart/uart_dev_pl011.c Sat Mar 4 22:00:05 2017 (r314682) @@ -86,6 +86,16 @@ __FBSDID("$FreeBSD$"); #define CR_TXE (1 << 8) /* Transmit enable */ #define CR_UARTEN (1 << 0) /* UART enable */ +#define UART_IFLS 0x0d /* FIFO level select register */ +#define IFLS_RX_SHIFT 3 /* RX level in bits [5:3] */ +#define IFLS_TX_SHIFT 0 /* TX level in bits [2:0] */ +#define IFLS_MASK 0x07 /* RX/TX level is 3 bits */ +#define IFLS_LVL_1_8th 0 /* Interrupt at 1/8 full */ +#define IFLS_LVL_2_8th 1 /* Interrupt at 1/4 full */ +#define IFLS_LVL_4_8th 2 /* Interrupt at 1/2 full */ +#define IFLS_LVL_6_8th 3 /* Interrupt at 3/4 full */ +#define IFLS_LVL_7_8th 4 /* Interrupt at 7/8 full */ + #define UART_IMSC 0x0e /* Interrupt mask set/clear register */ #define IMSC_MASK_ALL 0x7ff /* Mask all interrupts */ @@ -102,6 +112,18 @@ __FBSDID("$FreeBSD$"); #define UART_ICR 0x11 /* Interrupt clear register */ /* + * The hardware FIFOs are 16 bytes each. We configure them to interrupt when + * 3/4 full/empty. For RX we set the size to the full hardware capacity so that + * the uart core allocates enough buffer space to hold a complete fifo full of + * incoming data. For TX, we need to limit the size to the capacity we know + * will be available when the interrupt occurs; uart_core will feed exactly that + * many bytes to uart_pl011_bus_transmit() which must consume them all. + */ +#define FIFO_RX_SIZE 16 +#define FIFO_TX_SIZE 12 +#define FIFO_IFLS_BITS ((IFLS_LVL_6_8th << IFLS_RX_SHIFT) | (IFLS_LVL_2_8th)) + +/* * FIXME: actual register size is SoC-dependent, we need to handle it */ #define __uart_getreg(bas, reg) \ @@ -187,6 +209,9 @@ uart_pl011_param(struct uart_bas *bas, i __uart_setreg(bas, UART_LCR_H, (__uart_getreg(bas, UART_LCR_H) & ~0xff) | line); + /* Set rx and tx fifo levels. */ + __uart_setreg(bas, UART_IFLS, FIFO_IFLS_BITS); + __uart_setreg(bas, UART_CR, ctrl); } @@ -418,8 +443,8 @@ uart_pl011_bus_probe(struct uart_softc * device_set_desc(sc->sc_dev, "PrimeCell UART (PL011)"); - sc->sc_rxfifosz = 16; - sc->sc_txfifosz = 8; + sc->sc_rxfifosz = FIFO_RX_SIZE; + sc->sc_txfifosz = FIFO_TX_SIZE; return (0); } From owner-svn-src-all@freebsd.org Sat Mar 4 22:13:16 2017 Return-Path: Delivered-To: svn-src-all@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 79720CF9678; Sat, 4 Mar 2017 22:13:16 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail109.syd.optusnet.com.au (mail109.syd.optusnet.com.au [211.29.132.80]) by mx1.freebsd.org (Postfix) with ESMTP id 1CE9611D0; Sat, 4 Mar 2017 22:13:15 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from besplex.bde.org (c122-106-153-191.carlnfd1.nsw.optusnet.com.au [122.106.153.191]) by mail109.syd.optusnet.com.au (Postfix) with ESMTPS id 896CED64CBC; Sun, 5 Mar 2017 09:13:06 +1100 (AEDT) Date: Sun, 5 Mar 2017 09:13:05 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: John Baldwin cc: Pedro Giffuni , Slawa Olhovchenkov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314669 - head/sys/i386/conf In-Reply-To: <2368011.hGEX4V32U5@ralph.baldwin.cx> Message-ID: <20170305075947.K914@besplex.bde.org> References: <201703041504.v24F4HMh023937@repo.freebsd.org> <20170304153228.GM15630@zxy.spb.ru> <2368011.hGEX4V32U5@ralph.baldwin.cx> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.2 cv=Ca543Pjl c=1 sm=1 tr=0 a=Tj3pCpwHnMupdyZSltBt7Q==:117 a=Tj3pCpwHnMupdyZSltBt7Q==:17 a=kj9zAlcOel0A:10 a=6I5d2MoRAAAA:8 a=XubOLsDANpqQbRyPppkA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 22:13:16 -0000 On Sat, 4 Mar 2017, John Baldwin wrote: > On Saturday, March 04, 2017 10:52:46 AM Pedro Giffuni wrote: >> >> On 03/04/17 10:32, Slawa Olhovchenkov wrote: >>> On Sat, Mar 04, 2017 at 03:04:17PM +0000, Pedro F. Giffuni wrote: >>> >>>> Author: pfg >>>> Date: Sat Mar 4 15:04:17 2017 >>>> New Revision: 314669 >>>> URL: https://svnweb.freebsd.org/changeset/base/314669 >>>> >>>> Log: >>>> Drop i486 from the default i386 GENERIC kernel configuration. >>>> >>>> 80486 production was stopped by Intel on September 2007. Dropping the 486 >>>> configuration option from the GENERIC kernel improves performance >>>> slightly. >>>> >>>> Removing I486_CPU is consistent at this time: we don't support any >>>> processor without a FPU and the PC-98 arch, which frequently involved i486 >>>> CPUs, is also gone so we don't test such platforms anymore. >>> >>> What is realy mean? It means that GENERIC is less generic. >> This means we don't do work-arounds that would be required for raw 486. >> Instead we will use the 586 instructions by default. > > This doesn't change that. The kernel already has runtime tests in place > for new things on 486 and later via cpuid. I486_CPU also used to control optimization of get_cyclecount(), by removing the dynamic test for a TSC if I486_CPU and some other options are _not_ configured. Now the optimization is never done, but a larger pessimization is always done: get_cyclecount(): - amd64 and old i386 without I486_CPU and some others: return inlined rdtsc(). - old i386 with I486_CPU or some others: test inline for a TSC; then if not an old CPU, return inline rdtsc(); else call binuptime() and do bad swizzling - current i386: always call a function through a function pointer; if not an old CPU, this points to non-inline rdtsc(); otherwise, usually call binuptime() and do differently bad swizzling to partially support abuse of get_cyclecount() as a monotonic timestamp. get_cyclecount() was changed to use cpu_ticks() in 2011 (r220347). cddl has over-engineered direct use of the TSC for timestamps because native APIs are under-engineered, but important native places like ktr still abuse get_cyclecount(). get_cyclecount() is mis-engineered on most arches: - arm: on newer CPUs with pmu, it uses large inline code with many function calls that might be inlined; on newer CPUs without pmu, it uses 1 function call that might be inlined; on older CPUs, it calls binuptime() and does differently again bad swizzling - arm64: like amd64 (?) - mips: like amd64 (?), except get_cyclecount() is a macro instead of an inline function. The register for this is apparently not good enough for the cpu ticker and thus not good enough for abusing for monotonic timestamps. The register is apparently only 32 bits. The cpu ticker function counts wrap-arounds to maintain 32 more top bits. - powerpc: like amd64, except the 64-bit result is assembled from 2 32-bit registers. This looks like it has races on rollover, and correct code would look like mips: return only 32 bits in get_cyclecount(), and try to avoid rollover in the cpu ticker. powerpc does this backwards: it returns 64 bits with races in get_cyclecount(), but returns only 32 bits without races for the cpu ticker. The races are not too bad because using get_cyclecount() is a monotonic timestamp is abuse. Differently bad swizzling breaks monotonicity differently badly too. - riscv: stub that always returns 1. That is really differently bad. This should at least copy the generic i386 implementation. riscv doesn't set a special cpu ticker either. It gets the default one which is a timecounter, just like on i386 without a TSC. Thus might be a stub too, but then more things would break so it would get fixed. - sparc64: like amd64 (?). I486_CPU also used to give an optimized bzero() for i486. That cost a branch and/or call through a function point for newer CPUs. This was removed in 2010 (r209460). >>> Some Via CPU is like i486 (by instruction set). >>> >>> CPU: VIA Ezra (800.04-MHz 686-class CPU) >>> Origin="CentaurHauls" Id=0x678 Family=0x6 Model=0x7 Stepping=8 >>> Features=0x803035 >>> AMD Features=0x80000000<3DNow!> >>> >> >> 486 never had MMX extensions. >> This is a 686, performance should improve ~4%. > > How did you measure the improvement? Keeping I486_CPU doesn't really > do anything except remove a some #ifdef'd conditionals in identcpu.c > and initcpu.c. It doesn't affect whether we use the TSC, MMX, etc. Those > are all runtime checks based the CPU feature flags from cpuid. The old optimization might be worth as much as 0.004%. I think all the removal does on a plain 486 is move a runtime test so that 486 CPUs no longer pass it, causing a panic for an "unsupported" CPU that would work except the panic, and prevent reaching a single 486 optimization. in bocpy(). The special support in initcpu() seems to be only to work around bugs in incompatible 486 variants. Fixes in this area should go the other way and remove the panics and the cpu class stuff to implement them. The cpu class stuff used to mainly give panics for newer CPUs that are backwards compatible but unknown. Feature tests prevent that happening. All new x86 are 686s with optional features. Plain 486 should work if it were classified as a 686 without any features. Bruce From owner-svn-src-all@freebsd.org Sat Mar 4 22:23:33 2017 Return-Path: Delivered-To: svn-src-all@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 08F32CF9A6C; Sat, 4 Mar 2017 22:23:33 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf0-x241.google.com (mail-pf0-x241.google.com [IPv6:2607:f8b0:400e:c00::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C91C41B4B; Sat, 4 Mar 2017 22:23:32 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pf0-x241.google.com with SMTP id j5so13455119pfb.3; Sat, 04 Mar 2017 14:23:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=DAOiFSgnK1Ch/TdpwrhvwWUdenFvg0/4bwgOg3qkOWg=; b=HBSgnKIx7U7WyXCwja8HlQw+WPsnAuAlsfsregTjQTOfBrygkSYAovNcDEgMFUFJb9 bu/Tv6yRRCrRE1NtZb9DiE4L4vqWiRU32qZSMfVDxPNCVjppqJmVSMCziHt9utbFZZ8z mKg4LNQ3w+yezgEj/fziscHDI0gfNGkLMcpeEJZxF/vl+z5CoUCGxkjBIFQ0o70+n7JM N30s6EeNr1AQEe6ialcR3MGL909vcYdSM/ZYZpRMO+WrYrAm0owBfXDz9SYAEjTQZf2h fvSKHKBTS6y09qa3W3hP0JNWj0AEZLphUT1MSB6dCSoJyS905gn2RUdCqQO77gvDA6xm db6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=DAOiFSgnK1Ch/TdpwrhvwWUdenFvg0/4bwgOg3qkOWg=; b=qmVsBMOp2XBCgYGqhwiggGG9eQMeSMEmWVKCPLszVidSqEeE+dcfwmr6+q9DlLZZBM oydZaf7yStXeMZjYdJPGdr8wtfRfWLIvUlO4hVIr6BG6Nkj/ooxCAqUlk1arxhea10cK iRyeZ7Isrd18kulklkzgFczk/qB1X6wEHHlDAFCyMBiZscw7ylOoV4/eY5x3AOm16Qng 45uPVg+l4faBnfX6WVzKhAVYi3IoYv+iE/95YkqbBXN9+L/UjMTUiyU5VXzccIBOJJXQ 4lfsNLTyHqB3J8tys2+gRlKRg+iDXmcF9+r9pXI7PGNZQ8MkPBPYyAwyJDiqsunUDP39 wwjA== X-Gm-Message-State: AMke39nzzMrzl1M9ZU/qRYXO7LmXm3E83Qb/kWc9clUyhSK3kRF5Omu66snXbAVCuAGfIQ== X-Received: by 10.98.60.199 with SMTP id b68mr12143797pfk.102.1488666212319; Sat, 04 Mar 2017 14:23:32 -0800 (PST) Received: from ?IPv6:2607:fb90:277e:24bf:f967:c793:b61:5112? ([2607:fb90:277e:24bf:f967:c793:b61:5112]) by smtp.gmail.com with ESMTPSA id d3sm30918848pfc.51.2017.03.04.14.23.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Mar 2017 14:23:31 -0800 (PST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r314657 - in head/kerberos5: . lib/libgssapi_krb5 lib/libgssapi_ntlm lib/libgssapi_spnego lib/libhdb lib/libkafs5 lib/libkrb5 libexec/hprop libexec/kpasswdd tools/asn1_compile tools/slc From: Ngie Cooper X-Mailer: iPhone Mail (14D27) In-Reply-To: Date: Sat, 4 Mar 2017 14:23:30 -0800 Cc: Bryan Drewery , rgrimes@freebsd.org, Ngie Cooper , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <201703042020.v24KKD5N078654@pdx.rh.CN85.dnsmgr.net> <7ed86250-8f8e-d034-0959-dc46e8973583@FreeBSD.org> To: Warner Losh X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 22:23:33 -0000 > On Mar 4, 2017, at 13:43, Warner Losh wrote: >=20 >> On Sat, Mar 4, 2017 at 1:25 PM, Bryan Drewery wrot= e: >>> On 3/4/2017 12:20 PM, Rodney W. Grimes wrote: >>> -- Start of PGP signed section. >>> [ Charset windows-1252 unsupported, converting... ] >>>>> On 3/4/2017 7:34 AM, Rodney W. Grimes wrote: >>>>> What is ${.CURDIR:H:H} ????? Yes that seems to work but now we are ob= scuring >>>>> ../.. into makefile syntax magic, probably not a grand idea. >>>> It just trims off the last directory component. This both reduces >>>> namecache lookups, lessens the amount of data in a log, and makes >>>> debugging a log simpler by not having a crazy path like: >>>> /home/bdrewery/big/git/buildserver/sys/modules/usb/template/../../../de= v/usb/template/usb_template.c >>>>=20 >>>> It's far simpler to understand and work with: >>>> /home/bdrewery/big/git/buildserver/sys/dev/usb/template/usb_template.c >>>>=20 >>>> The only downside is it is slightly more obscure in a Makefile, but onc= e >>>> you know what :H is then it's not a problem. This is why SRCTOP is eve= n >>>> better than this as it is far more clear than even :H and avoids the >>>> ../../ problems. >>> Lets do one or the other, but not both ${SRCTOP} and :H:H:H. It appears= >>> that we now have a mix and mashed up some one way others the other. >>=20 >> That I can agree with. I would prefer to standardize on SRCTOP as :H is >> too obscure without learning about make details. >=20 > :H is insane in 90% of the cases I've seen it used. Let's roll with > SRCTOP everywhere we can. That's safer from directory motion anyway... Ok, I have 3 votes for SRCTOP, so I'll implement the remaining change using S= RCTOP (for usr.bin), and reimplement the previous changes using SRCTOP. Thank you all for the input, -Ngie= From owner-svn-src-all@freebsd.org Sat Mar 4 22:32:17 2017 Return-Path: Delivered-To: svn-src-all@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 52A7CCF9C8D; Sat, 4 Mar 2017 22:32:17 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B75D110BD; Sat, 4 Mar 2017 22:32:15 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v24MW9ok079230; Sat, 4 Mar 2017 14:32:09 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v24MW9jt079229; Sat, 4 Mar 2017 14:32:09 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201703042232.v24MW9jt079229@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314657 - in head/kerberos5: . lib/libgssapi_krb5 lib/libgssapi_ntlm lib/libgssapi_spnego lib/libhdb lib/libkafs5 lib/libkrb5 libexec/hprop libexec/kpasswdd tools/asn1_compile tools/slc In-Reply-To: To: Ngie Cooper Date: Sat, 4 Mar 2017 14:32:08 -0800 (PST) CC: Warner Losh , Bryan Drewery , rgrimes@freebsd.org, Ngie Cooper , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 22:32:17 -0000 > > > On Mar 4, 2017, at 13:43, Warner Losh wrote: > > > >> On Sat, Mar 4, 2017 at 1:25 PM, Bryan Drewery wrote: > >>> On 3/4/2017 12:20 PM, Rodney W. Grimes wrote: > >>> -- Start of PGP signed section. > >>> [ Charset windows-1252 unsupported, converting... ] > >>>>> On 3/4/2017 7:34 AM, Rodney W. Grimes wrote: > >>>>> What is ${.CURDIR:H:H} ????? Yes that seems to work but now we are obscuring > >>>>> ../.. into makefile syntax magic, probably not a grand idea. > >>>> It just trims off the last directory component. This both reduces > >>>> namecache lookups, lessens the amount of data in a log, and makes > >>>> debugging a log simpler by not having a crazy path like: > >>>> /home/bdrewery/big/git/buildserver/sys/modules/usb/template/../../../dev/usb/template/usb_template.c > >>>> > >>>> It's far simpler to understand and work with: > >>>> /home/bdrewery/big/git/buildserver/sys/dev/usb/template/usb_template.c > >>>> > >>>> The only downside is it is slightly more obscure in a Makefile, but once > >>>> you know what :H is then it's not a problem. This is why SRCTOP is even > >>>> better than this as it is far more clear than even :H and avoids the > >>>> ../../ problems. > >>> Lets do one or the other, but not both ${SRCTOP} and :H:H:H. It appears > >>> that we now have a mix and mashed up some one way others the other. > >> > >> That I can agree with. I would prefer to standardize on SRCTOP as :H is > >> too obscure without learning about make details. > > > > :H is insane in 90% of the cases I've seen it used. Let's roll with > > SRCTOP everywhere we can. That's safer from directory motion anyway... > > Ok, I have 3 votes for SRCTOP, so I'll implement the remaining change using SRCTOP (for usr.bin), and reimplement the previous changes using SRCTOP. And that some how over rides the 3 votes for not doing any of these changes? Slow down please. We dont need a bike shed, but I think we need a clear target and a consense larger than 3+ 3- and less than a 6 hour wall clock of discussion. It would also be best if it was this change and only this change committed in very large (preferably about 20) commits. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Sat Mar 4 22:38:12 2017 Return-Path: Delivered-To: svn-src-all@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 34B7FCF9D20; Sat, 4 Mar 2017 22:38:12 +0000 (UTC) (envelope-from cem@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 D27891266; Sat, 4 Mar 2017 22:38:11 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24McA4H008838; Sat, 4 Mar 2017 22:38:10 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24McAD8008837; Sat, 4 Mar 2017 22:38:10 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201703042238.v24McAD8008837@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Sat, 4 Mar 2017 22:38:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314685 - head/bin/ps X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 22:38:12 -0000 Author: cem Date: Sat Mar 4 22:38:10 2017 New Revision: 314685 URL: https://svnweb.freebsd.org/changeset/base/314685 Log: ps(1): Only detect terminal width if stdout is a tty If stdout isn't a tty, use unlimited width output rather than truncating to 79 characters. This is helpful for shell scripts or e.g., 'ps | grep foo'. This hardcoded width has some history: In The Beginning of History[0], the width of ps was hardcoded as 80 bytes. In 1985, Bloom@ added detection using TIOCGWINSZ on stdin.[1] In 1986, Kirk merged a change to check stdout's window size instead. In 1990, the fallback checks to stderr and stdin's TIOCGWINSZ were added by Marc@, with the commit message "new version."[2] OS X Darwin has a very similar modification to ps(1), which simply sets UNLIMITED for all non-tty outputs.[3] I've chosen to respect COLUMNS instead of behaving identically to Darwin here, but I don't feel strongly about that. We could match OS X for parity if that is desired. [0]: https://svnweb.freebsd.org/csrg/bin/ps/ps.c?annotate=1065 [1]: https://svnweb.freebsd.org/csrg/bin/ps/ps.c?r1=18105&r2=18106 [2]: https://svnweb.freebsd.org/csrg/bin/ps/ps.c?r1=40675&r2=40674&pathrev=40675 [3]: https://opensource.apple.com/source/adv_cmds/adv_cmds-168/ps/ps.c.auto.html PR: 217159 Reported by: Deepak Nagaraj Modified: head/bin/ps/ps.c Modified: head/bin/ps/ps.c ============================================================================== --- head/bin/ps/ps.c Sat Mar 4 22:23:59 2017 (r314684) +++ head/bin/ps/ps.c Sat Mar 4 22:38:10 2017 (r314685) @@ -194,6 +194,8 @@ main(int argc, char *argv[]) if ((cols = getenv("COLUMNS")) != NULL && *cols != '\0') termwidth = atoi(cols); + else if (!isatty(STDOUT_FILENO)) + termwidth = UNLIMITED; else if ((ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&ws) == -1 && ioctl(STDERR_FILENO, TIOCGWINSZ, (char *)&ws) == -1 && ioctl(STDIN_FILENO, TIOCGWINSZ, (char *)&ws) == -1) || From owner-svn-src-all@freebsd.org Sat Mar 4 22:58:25 2017 Return-Path: Delivered-To: svn-src-all@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 7832CCF82AB; Sat, 4 Mar 2017 22:58:25 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 56FAD1CD3; Sat, 4 Mar 2017 22:58:25 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net [73.231.226.104]) by mail.baldwin.cx (Postfix) with ESMTPSA id 78BC010A7B9; Sat, 4 Mar 2017 17:58:23 -0500 (EST) From: John Baldwin To: Konstantin Belousov Cc: Pedro Giffuni , Slawa Olhovchenkov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314669 - head/sys/i386/conf Date: Sat, 04 Mar 2017 14:54:56 -0800 Message-ID: <1951800.W2d2k3eamI@ralph.baldwin.cx> User-Agent: KMail/4.14.10 (FreeBSD/11.0-STABLE; KDE/4.14.10; amd64; ; ) In-Reply-To: <20170304211611.GW2092@kib.kiev.ua> References: <201703041504.v24F4HMh023937@repo.freebsd.org> <20170304211611.GW2092@kib.kiev.ua> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Sat, 04 Mar 2017 17:58:23 -0500 (EST) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 22:58:25 -0000 On Saturday, March 04, 2017 11:16:11 PM Konstantin Belousov wrote: > On Sat, Mar 04, 2017 at 03:49:52PM -0500, Pedro Giffuni wrote: > > The number came out from an old posting involving buildworld times, which I can???t find now :(. > > Things seem to have changed a lot: it was surely using GCC back then, I don???t believe clang does much distinction about 486 at all. > > > > BTW, does it make sense to keep i586 in the configuration still? Both i486 and i586 were once removed but later re-instated in r205336. > > > What did make significant impact on 32bit shared libraries some time ago > was to compile them with -mtune=i686. Default PIC prologue effectively > neutered return stack predictor, adding uneccessary overhead to already > expensive PIC code. I think that this is even measureable, i.e. it might > give >= 5% of difference. > > I did not rechecked modern compilers WRT the generated PIC code, but I doubt > that the thing changed recently. > > Several notes: -mtune is not -march, i.e. the code would be still targeted > for 486 instruction set, but scheduling is optimized for more modern CPUs. > Also, recent gcc puts specific meaning into -mtune=i686, interpreting it > as request for scheduling for generic modern CPUs. We already compile > 32bit compat libs on amd64 with -march=i686. > > Working on this stuff would be much more useful than tweaking kernel config > for CPU detection. Hmm, I originally wanted to use -mtune=i686 (spelled as -mcpu=pentiumpro) on i386 builds for this reason, but I removed it at bde@'s request in r125252. I would be happy to go back to adding -mtune for i386 when CPUTYPE isn't specified. -- John Baldwin From owner-svn-src-all@freebsd.org Sat Mar 4 22:58:29 2017 Return-Path: Delivered-To: svn-src-all@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 8D678CF82EE; Sat, 4 Mar 2017 22:58:29 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [96.47.65.170]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 62D181CF0; Sat, 4 Mar 2017 22:58:28 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net [73.231.226.104]) by mail.baldwin.cx (Postfix) with ESMTPSA id 1B66010A791; Sat, 4 Mar 2017 17:58:22 -0500 (EST) From: John Baldwin To: Bruce Evans Cc: Pedro Giffuni , Slawa Olhovchenkov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314669 - head/sys/i386/conf Date: Sat, 04 Mar 2017 14:57:47 -0800 Message-ID: <8173144.jrBJ3AIVVW@ralph.baldwin.cx> User-Agent: KMail/4.14.10 (FreeBSD/11.0-STABLE; KDE/4.14.10; amd64; ; ) In-Reply-To: <20170305075947.K914@besplex.bde.org> References: <201703041504.v24F4HMh023937@repo.freebsd.org> <2368011.hGEX4V32U5@ralph.baldwin.cx> <20170305075947.K914@besplex.bde.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Sat, 04 Mar 2017 17:58:22 -0500 (EST) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 22:58:29 -0000 On Sunday, March 05, 2017 09:13:05 AM Bruce Evans wrote: > On Sat, 4 Mar 2017, John Baldwin wrote: > I think all the removal does on a plain 486 is move a runtime test so that > 486 CPUs no longer pass it, causing a panic for an "unsupported" CPU that > would work except the panic, and prevent reaching a single 486 optimization. > in bocpy(). The special support in initcpu() seems to be only to work > around bugs in incompatible 486 variants. The last time I looked at initcpu.c it wasn't clear how much of those old workarounds were for CPUs we don't support that could just be axed. > Fixes in this area should go the other way and remove the panics and the > cpu class stuff to implement them. The cpu class stuff used to mainly > give panics for newer CPUs that are backwards compatible but unknown. > Feature tests prevent that happening. All new x86 are 686s with optional > features. Plain 486 should work if it were classified as a 686 without > any features. I recently removed cpu_class from amd64 entirely. Removing it from i386 and just replying on cpu_feature* the way amd64 does would be fine with me. I'd probably remove all the I?86_CPU options in that case and just compile them all in. In regards to the TSC, that is one thing I've wondered if we should require for i386 to avoid some runtime checks and simplify the i386 code. There were 486's with a TSC even. -- John Baldwin From owner-svn-src-all@freebsd.org Sat Mar 4 22:58:26 2017 Return-Path: Delivered-To: svn-src-all@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 0D675CF82B3; Sat, 4 Mar 2017 22:58:26 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D99EF1CD4; Sat, 4 Mar 2017 22:58:25 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net [73.231.226.104]) by mail.baldwin.cx (Postfix) with ESMTPSA id D572A10A7DB; Sat, 4 Mar 2017 17:58:24 -0500 (EST) From: John Baldwin To: Pedro Giffuni Cc: Slawa Olhovchenkov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314669 - head/sys/i386/conf Date: Sat, 04 Mar 2017 14:51:50 -0800 Message-ID: <7873439.f6BlOXHt6g@ralph.baldwin.cx> User-Agent: KMail/4.14.10 (FreeBSD/11.0-STABLE; KDE/4.14.10; amd64; ; ) In-Reply-To: References: <201703041504.v24F4HMh023937@repo.freebsd.org> <2368011.hGEX4V32U5@ralph.baldwin.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Sat, 04 Mar 2017 17:58:24 -0500 (EST) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 22:58:26 -0000 On Saturday, March 04, 2017 03:49:52 PM Pedro Giffuni wrote: >=20 > > Il giorno 04 mar 2017, alle ore 14:43, John Baldwin ha scritto: > >=20 > > On Saturday, March 04, 2017 10:52:46 AM Pedro Giffuni wrote: > >>=20 > >> On 03/04/17 10:32, Slawa Olhovchenkov wrote: > >>> On Sat, Mar 04, 2017 at 03:04:17PM +0000, Pedro F. Giffuni wrote:= > >>>=20 > >>>> Author: pfg > >>>> Date: Sat Mar 4 15:04:17 2017 > >>>> New Revision: 314669 > >>>> URL: https://svnweb.freebsd.org/changeset/base/314669 > >>>>=20 > >>>> Log: > >>>> Drop i486 from the default i386 GENERIC kernel configuration. > >>>>=20 > >>>> 80486 production was stopped by Intel on September 2007. Droppi= ng the 486 > >>>> configuration option from the GENERIC kernel improves performan= ce > >>>> slightly. > >>>>=20 > >>>> Removing I486_CPU is consistent at this time: we don't support = any > >>>> processor without a FPU and the PC-98 arch, which frequently in= volved i486 > >>>> CPUs, is also gone so we don't test such platforms anymore. > >>>=20 > >>> What is realy mean? > >>=20 > >> This means we don't do work-arounds that would be required for raw= 486. > >> Instead we will use the 586 instructions by default. > >=20 > > This doesn't change that. The kernel already has runtime tests in = place > > for new things on 486 and later via cpuid. > >=20 >=20 > Hmm ..then I am wondering if I effectively changed anything? The only change is a 486 now panics on boot when it used to work fine. = :-/ Nothing for other CPUs has changed. =20 > The number came out from an old posting involving buildworld times, w= hich I can=E2=80=99t find now :(. > Things seem to have changed a lot: it was surely using GCC back then,= I don=E2=80=99t believe clang does much distinction about 486 at all. >=20 > BTW, does it make sense to keep i586 in the configuration still? Both= i486 and i586 were once removed but later re-instated in r205336. If anything I'd probably say we should do what bde@ suggested and just remove CPU class entirely (and act as if 486, 586, and 686 are always defined). --=20 John Baldwin From owner-svn-src-all@freebsd.org Sat Mar 4 22:58:36 2017 Return-Path: Delivered-To: svn-src-all@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 7C07CCF836A; Sat, 4 Mar 2017 22:58:36 +0000 (UTC) (envelope-from jilles@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 3E4F61DC3; Sat, 4 Mar 2017 22:58:36 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24MwZ6f017072; Sat, 4 Mar 2017 22:58:35 GMT (envelope-from jilles@FreeBSD.org) Received: (from jilles@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24MwZmp017067; Sat, 4 Mar 2017 22:58:35 GMT (envelope-from jilles@FreeBSD.org) Message-Id: <201703042258.v24MwZmp017067@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jilles set sender to jilles@FreeBSD.org using -f From: Jilles Tjoelker Date: Sat, 4 Mar 2017 22:58:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314686 - in head/bin/sh: . tests/expansion X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 22:58:36 -0000 Author: jilles Date: Sat Mar 4 22:58:34 2017 New Revision: 314686 URL: https://svnweb.freebsd.org/changeset/base/314686 Log: sh: Fix crash if a -T trap is taken during command substitution. Code like t=$(stat -f %m "$file") segfaulted if -T was active and a trap was taken while the shell was waiting for the child process to finish. What happened was that the dotrap() call in waitforjob() was hit. This re-entered command execution (including expand.c) at a point not expected by expbackq(), and global state (unallocated stack string and argbackq) was corrupted. To fix this, change expbackq() to prepare for command execution to be re-entered. Reported by: bdrewery MFC after: 1 week Added: head/bin/sh/tests/expansion/cmdsubst21.0 (contents, props changed) head/bin/sh/tests/expansion/cmdsubst22.0 (contents, props changed) Modified: head/bin/sh/expand.c head/bin/sh/tests/expansion/Makefile Modified: head/bin/sh/expand.c ============================================================================== --- head/bin/sh/expand.c Sat Mar 4 22:38:10 2017 (r314685) +++ head/bin/sh/expand.c Sat Mar 4 22:58:34 2017 (r314686) @@ -460,7 +460,6 @@ expbackq(union node *cmd, int quoted, in p = grabstackstr(dest); evalbackcmd(cmd, &in); ungrabstackstr(p, dest); - argbackq = saveargbackq; p = in.buf; nnl = 0; @@ -514,12 +513,16 @@ expbackq(union node *cmd, int quoted, in close(in.fd); if (in.buf) ckfree(in.buf); - if (in.jp) + if (in.jp) { + p = grabstackstr(dest); exitstatus = waitforjob(in.jp, (int *)NULL); + ungrabstackstr(p, dest); + } TRACE(("expbackq: size=%td: \"%.*s\"\n", ((dest - stackblock()) - startloc), (int)((dest - stackblock()) - startloc), stackblock() + startloc)); + argbackq = saveargbackq; expdest = dest; INTON; } Modified: head/bin/sh/tests/expansion/Makefile ============================================================================== --- head/bin/sh/tests/expansion/Makefile Sat Mar 4 22:38:10 2017 (r314685) +++ head/bin/sh/tests/expansion/Makefile Sat Mar 4 22:58:34 2017 (r314686) @@ -42,6 +42,8 @@ ${PACKAGE}FILES+= cmdsubst17.0 ${PACKAGE}FILES+= cmdsubst18.0 ${PACKAGE}FILES+= cmdsubst19.0 ${PACKAGE}FILES+= cmdsubst20.0 +${PACKAGE}FILES+= cmdsubst21.0 +${PACKAGE}FILES+= cmdsubst22.0 ${PACKAGE}FILES+= export1.0 ${PACKAGE}FILES+= export2.0 ${PACKAGE}FILES+= export3.0 Added: head/bin/sh/tests/expansion/cmdsubst21.0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/bin/sh/tests/expansion/cmdsubst21.0 Sat Mar 4 22:58:34 2017 (r314686) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +set -T +trapped='' +trap "trapped=x$trapped" TERM +[ "x$($SH -c "kill $$")y" = xy ] && [ "$trapped" = x ] Added: head/bin/sh/tests/expansion/cmdsubst22.0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/bin/sh/tests/expansion/cmdsubst22.0 Sat Mar 4 22:58:34 2017 (r314686) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +set -T +trapped='' +trap "trapped=x$trapped" TERM +[ "x$(:; kill $$)y" = xy ] && [ "$trapped" = x ] From owner-svn-src-all@freebsd.org Sat Mar 4 22:59:08 2017 Return-Path: Delivered-To: svn-src-all@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 0772FCF8488 for ; Sat, 4 Mar 2017 22:59:08 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: from mail-yw0-x234.google.com (mail-yw0-x234.google.com [IPv6:2607:f8b0:4002:c05::234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BE56F10D6 for ; Sat, 4 Mar 2017 22:59:07 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: by mail-yw0-x234.google.com with SMTP id v198so14783070ywc.2 for ; Sat, 04 Mar 2017 14:59:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuxi-nl.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=HhFjUEOK95n8DkzZ4ePef0GGKz7SrT27yUDCiYQJ1Rc=; b=qwf9VlTRXMh5nOam4mh4vOyZBOZuQ5H6P3sq/w/Ev3dhfBTV6gx2y+8OteYQnjhzCZ UauTbdJIwqOAaCfEbq1bN4427pEfgVocmDukqg6+J5eRl4QHKB2Pawx5fN+Q8Eq/TSp9 g4viW4Pi94tZXc8LK6CQGemgc5cpQ0kfZSAWVgUC+DVSHxd8KMe7SGGs5l9KrTlYz/Bo 9RKT8SbULC7+essz9pM5VYqQQCt6irMise4ygxsTaaxul4simLHVirXoPwQEFesWNk0t P81URj57rJIW7Nb5STqud714jZSgiixu0PZbixjkywcMa/ztqkGtCxIl0zwj6qYMP9nt qO9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=HhFjUEOK95n8DkzZ4ePef0GGKz7SrT27yUDCiYQJ1Rc=; b=eTJf0s6mx6ZcBTnhIa82aRJ4/sJVtrmx6M09mQs5bk/Fqt5nJshrpVYvOwTWX6hEi4 M3KQFE2tdmmWzSJsSqm2D+sw8xU+MZxK4i0s0ejPQvST0S1CyDn2692FrnlqFcGkbncx cHlblF3acckiQ2HCuQ/HTz3dDPd3zt3bGVSzZdJrOLinXzZgICWxXeadT4zKVH0bbURl BcRdL2xaQqak36421qoe+UrSupnR0W3lIh/Ug7X2O/4x4zL+jxX0zv7AS1I2WXznn9UV Hf0cVFkil7rDUdCUaIddVTmSC8Cp/CrzZmrun0DyxXAE6EI859oZpuL9PxdjymBEkE+E CiPg== X-Gm-Message-State: AMke39mTWQo7YGDfSAXlEp1CI/q3agbcqe9XlAXKZisUmd7WLnUHh/1x+QdDn6HmksgPtIX64hdLiMiOeHqD6w== X-Received: by 10.37.224.138 with SMTP id x132mr6496234ybg.168.1488668346559; Sat, 04 Mar 2017 14:59:06 -0800 (PST) MIME-Version: 1.0 Received: by 10.129.51.198 with HTTP; Sat, 4 Mar 2017 14:58:36 -0800 (PST) In-Reply-To: <201703042238.v24McAD8008837@repo.freebsd.org> References: <201703042238.v24McAD8008837@repo.freebsd.org> From: Ed Schouten Date: Sat, 4 Mar 2017 23:58:36 +0100 Message-ID: Subject: Re: svn commit: r314685 - head/bin/ps To: Conrad Meyer Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 22:59:08 -0000 Hi Conrad, 2017-03-04 23:38 GMT+01:00 Conrad Meyer : > Log: > ps(1): Only detect terminal width if stdout is a tty Nice! > Modified: head/bin/ps/ps.c > ============================================================================== > --- head/bin/ps/ps.c Sat Mar 4 22:23:59 2017 (r314684) > +++ head/bin/ps/ps.c Sat Mar 4 22:38:10 2017 (r314685) > @@ -194,6 +194,8 @@ main(int argc, char *argv[]) > > if ((cols = getenv("COLUMNS")) != NULL && *cols != '\0') > termwidth = atoi(cols); > + else if (!isatty(STDOUT_FILENO)) > + termwidth = UNLIMITED; > else if ((ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&ws) == -1 && > ioctl(STDERR_FILENO, TIOCGWINSZ, (char *)&ws) == -1 && > ioctl(STDIN_FILENO, TIOCGWINSZ, (char *)&ws) == -1) || > I think you can actually go ahead and simplify this a bit: - If something is a TTY, then our implementation of the TTY layer guarantees that TIOCGWINSZ always works. - If we're only interested in testing stdout whether it's a TTY, I think it makes little sense to check TIOCGWINSZ on stdin, stderr. I think there would therefore be very little harm to use something like this: | if ((cols = getenv("COLUMNS")) != NULL && *cols != '\0') | termwidth = atoi(cols); | else if ((ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&ws) == -1 && ws.ws_row == 0) | termwidth = UNLIMITED; | else | termwidth = ws.ws_col - 1; -- Ed Schouten Nuxi, 's-Hertogenbosch, the Netherlands KvK-nr.: 62051717 From owner-svn-src-all@freebsd.org Sat Mar 4 23:07:56 2017 Return-Path: Delivered-To: svn-src-all@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 03328CF8706; Sat, 4 Mar 2017 23:07:56 +0000 (UTC) (envelope-from avos@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 B7EDC16DE; Sat, 4 Mar 2017 23:07:55 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24N7smt021023; Sat, 4 Mar 2017 23:07:54 GMT (envelope-from avos@FreeBSD.org) Received: (from avos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24N7sSx021021; Sat, 4 Mar 2017 23:07:54 GMT (envelope-from avos@FreeBSD.org) Message-Id: <201703042307.v24N7sSx021021@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avos set sender to avos@FreeBSD.org using -f From: Andriy Voskoboinyk Date: Sat, 4 Mar 2017 23:07:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314687 - head/sys/dev/iwn X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 23:07:56 -0000 Author: avos Date: Sat Mar 4 23:07:54 2017 New Revision: 314687 URL: https://svnweb.freebsd.org/changeset/base/314687 Log: iwn: drop 'channel' parameter from iwn*_set_txpower() For 4965 just extract 'is_chan_5ghz' flag from the RXON structure (like it was done in r281287); for others it was never used. Tested with Intel 6205, STA mode. Modified: head/sys/dev/iwn/if_iwn.c head/sys/dev/iwn/if_iwnvar.h Modified: head/sys/dev/iwn/if_iwn.c ============================================================================== --- head/sys/dev/iwn/if_iwn.c Sat Mar 4 22:58:34 2017 (r314686) +++ head/sys/dev/iwn/if_iwn.c Sat Mar 4 23:07:54 2017 (r314687) @@ -254,10 +254,8 @@ static void iwn_set_led(struct iwn_softc static int iwn_set_critical_temp(struct iwn_softc *); static int iwn_set_timing(struct iwn_softc *, struct ieee80211_node *); static void iwn4965_power_calibration(struct iwn_softc *, int); -static int iwn4965_set_txpower(struct iwn_softc *, - struct ieee80211_channel *, int); -static int iwn5000_set_txpower(struct iwn_softc *, - struct ieee80211_channel *, int); +static int iwn4965_set_txpower(struct iwn_softc *, int); +static int iwn5000_set_txpower(struct iwn_softc *, int); static int iwn4965_get_rssi(struct iwn_softc *, struct iwn_rx_stat *); static int iwn5000_get_rssi(struct iwn_softc *, struct iwn_rx_stat *); static int iwn_get_noise(const struct iwn_rx_general_stats *); @@ -5510,7 +5508,6 @@ iwn_set_timing(struct iwn_softc *sc, str static void iwn4965_power_calibration(struct iwn_softc *sc, int temp) { - struct ieee80211com *ic = &sc->sc_ic; DPRINTF(sc, IWN_DEBUG_TRACE, "->Doing %s\n", __func__); @@ -5520,7 +5517,7 @@ iwn4965_power_calibration(struct iwn_sof if (abs(temp - sc->temp) >= 3) { /* Record temperature of last calibration. */ sc->temp = temp; - (void)iwn4965_set_txpower(sc, ic->ic_bsschan, 1); + (void)iwn4965_set_txpower(sc, 1); } } @@ -5530,8 +5527,7 @@ iwn4965_power_calibration(struct iwn_sof * the current temperature and the current voltage. */ static int -iwn4965_set_txpower(struct iwn_softc *sc, struct ieee80211_channel *ch, - int async) +iwn4965_set_txpower(struct iwn_softc *sc, int async) { /* Fixed-point arithmetic division using a n-bit fractional part. */ #define fdivround(a, b, n) \ @@ -5546,20 +5542,21 @@ iwn4965_set_txpower(struct iwn_softc *sc struct iwn4965_eeprom_chan_samples *chans; const uint8_t *rf_gain, *dsp_gain; int32_t vdiff, tdiff; - int i, c, grp, maxpwr; + int i, is_chan_5ghz, c, grp, maxpwr; uint8_t chan; sc->rxon = &sc->rx_on[IWN_RXON_BSS_CTX]; /* Retrieve current channel from last RXON. */ chan = sc->rxon->chan; + is_chan_5ghz = (sc->rxon->flags & htole32(IWN_RXON_24GHZ)) == 0; DPRINTF(sc, IWN_DEBUG_RESET, "setting TX power for channel %d\n", chan); memset(&cmd, 0, sizeof cmd); - cmd.band = IEEE80211_IS_CHAN_5GHZ(ch) ? 0 : 1; + cmd.band = is_chan_5ghz ? 0 : 1; cmd.chan = chan; - if (IEEE80211_IS_CHAN_5GHZ(ch)) { + if (is_chan_5ghz) { maxpwr = sc->maxpwr5GHz; rf_gain = iwn4965_rf_gain_5ghz; dsp_gain = iwn4965_dsp_gain_5ghz; @@ -5681,8 +5678,7 @@ iwn4965_set_txpower(struct iwn_softc *sc } static int -iwn5000_set_txpower(struct iwn_softc *sc, struct ieee80211_channel *ch, - int async) +iwn5000_set_txpower(struct iwn_softc *sc, int async) { struct iwn5000_cmd_txpower cmd; int cmdid; @@ -6693,7 +6689,7 @@ iwn_config(struct iwn_softc *sc) } /* Configuration has changed, set TX power accordingly. */ - if ((error = ops->set_txpower(sc, ic->ic_curchan, 0)) != 0) { + if ((error = ops->set_txpower(sc, 0)) != 0) { device_printf(sc->sc_dev, "%s: could not set TX power\n", __func__); return error; @@ -7096,7 +7092,7 @@ iwn_auth(struct iwn_softc *sc, struct ie } /* Configuration has changed, set TX power accordingly. */ - if ((error = ops->set_txpower(sc, ni->ni_chan, 1)) != 0) { + if ((error = ops->set_txpower(sc, 1)) != 0) { device_printf(sc->sc_dev, "%s: could not set TX power, error %d\n", __func__, error); return error; @@ -7180,7 +7176,7 @@ iwn_run(struct iwn_softc *sc, struct iee } /* Configuration has changed, set TX power accordingly. */ - if ((error = ops->set_txpower(sc, ni->ni_chan, 1)) != 0) { + if ((error = ops->set_txpower(sc, 1)) != 0) { device_printf(sc->sc_dev, "%s: could not set TX power, error %d\n", __func__, error); return error; Modified: head/sys/dev/iwn/if_iwnvar.h ============================================================================== --- head/sys/dev/iwn/if_iwnvar.h Sat Mar 4 22:58:34 2017 (r314686) +++ head/sys/dev/iwn/if_iwnvar.h Sat Mar 4 23:07:54 2017 (r314687) @@ -206,8 +206,7 @@ struct iwn_ops { uint16_t); int (*get_temperature)(struct iwn_softc *); int (*get_rssi)(struct iwn_softc *, struct iwn_rx_stat *); - int (*set_txpower)(struct iwn_softc *, - struct ieee80211_channel *, int); + int (*set_txpower)(struct iwn_softc *, int); int (*init_gains)(struct iwn_softc *); int (*set_gains)(struct iwn_softc *); int (*add_node)(struct iwn_softc *, struct iwn_node_info *, From owner-svn-src-all@freebsd.org Sat Mar 4 23:08:43 2017 Return-Path: Delivered-To: svn-src-all@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 18CDBCF8796; Sat, 4 Mar 2017 23:08:43 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AD921185D; Sat, 4 Mar 2017 23:08:42 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-wm0-f46.google.com with SMTP id n11so39092554wma.1; Sat, 04 Mar 2017 15:08:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=Yuq1AbRU4eLZThOCaKgG57PAsJa4D/MGkytWHC9q94M=; b=rZyOwzi4rKR43V6f9id4ZXfdrJ8U5XnYdLxoIwP5zSlvFMG2br2UQscY9L9zk6GEi8 TNNB8jmgWweikDjX5/NI3dM1jzhdKNnKRFe+6u1mRQldFE/zw7D5/kZRpX84eHDFYIJ4 UglpXBFDG6kwZz79q2dhKh4xiSocX5UVMIXFvEkP5+Tw8B2zjD1bHcadQGtbcvJXucIc /IBdxSjsc2fTGCjz08oLMalJXtdpktLBciuUH4MICNAWYpwJa0ApcLjk+HYKUGYZEEKF U7TO9bV/1RRO7wr2mQ4kjYzgOyJNO7M/4wDCn+qHKAt6uFOxCifmPFR0qlJ2eagH78Z9 XKwA== X-Gm-Message-State: AMke39nOEJhYafaYP4dakF5jYtyUWpwwTJeUWNcgtDL/KIazDdPRwJBCetbNORJuL+x0qQ== X-Received: by 10.28.158.193 with SMTP id h184mr8075010wme.59.1488668915259; Sat, 04 Mar 2017 15:08:35 -0800 (PST) Received: from mail-wr0-f182.google.com (mail-wr0-f182.google.com. [209.85.128.182]) by smtp.gmail.com with ESMTPSA id 10sm8652553wmi.23.2017.03.04.15.08.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Mar 2017 15:08:35 -0800 (PST) Received: by mail-wr0-f182.google.com with SMTP id l37so94602049wrc.1; Sat, 04 Mar 2017 15:08:35 -0800 (PST) X-Received: by 10.223.162.211 with SMTP id t19mr8340433wra.57.1488668914966; Sat, 04 Mar 2017 15:08:34 -0800 (PST) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 10.80.169.4 with HTTP; Sat, 4 Mar 2017 15:08:34 -0800 (PST) In-Reply-To: References: <201703042238.v24McAD8008837@repo.freebsd.org> From: Conrad Meyer Date: Sat, 4 Mar 2017 15:08:34 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r314685 - head/bin/ps To: Ed Schouten Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 23:08:43 -0000 Hi Ed, On Sat, Mar 4, 2017 at 2:58 PM, Ed Schouten wrote: >> @@ -194,6 +194,8 @@ main(int argc, char *argv[]) >> >> if ((cols = getenv("COLUMNS")) != NULL && *cols != '\0') >> termwidth = atoi(cols); >> + else if (!isatty(STDOUT_FILENO)) >> + termwidth = UNLIMITED; >> else if ((ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&ws) == -1 && >> ioctl(STDERR_FILENO, TIOCGWINSZ, (char *)&ws) == -1 && >> ioctl(STDIN_FILENO, TIOCGWINSZ, (char *)&ws) == -1) || >> > > I think you can actually go ahead and simplify this a bit: > > - If something is a TTY, then our implementation of the TTY layer > guarantees that TIOCGWINSZ always works. Do you know if it did in 1990 too? It's hard to tell why Marc@ made this change way back then. I wasn't sure so I left it alone. > - If we're only interested in testing stdout whether it's a TTY, I > think it makes little sense to check TIOCGWINSZ on stdin, stderr. > > I think there would therefore be very little harm to use something like this: > > | if ((cols = getenv("COLUMNS")) != NULL && *cols != '\0') > | termwidth = atoi(cols); > | else if ((ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&ws) == > -1 && ws.ws_row == 0) Shouldn't this remain || ws.ws_row == 0? > | termwidth = UNLIMITED; > | else > | termwidth = ws.ws_col - 1; I had a very similar cleanup in mind (|| instead of &&). But I wasn't sure if there was any reason TIOCGWINSZ might fail on stdout (and why that change was added originally). Best, Conrad From owner-svn-src-all@freebsd.org Sat Mar 4 23:18:31 2017 Return-Path: Delivered-To: svn-src-all@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 5BECCCF8A96; Sat, 4 Mar 2017 23:18:31 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 CBDA31D1F; Sat, 4 Mar 2017 23:18:30 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id v24NIMoF039770 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sun, 5 Mar 2017 01:18:22 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua v24NIMoF039770 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id v24NIM6J039769; Sun, 5 Mar 2017 01:18:22 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 5 Mar 2017 01:18:22 +0200 From: Konstantin Belousov To: John Baldwin Cc: Pedro Giffuni , Slawa Olhovchenkov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314669 - head/sys/i386/conf Message-ID: <20170304231822.GA30979@kib.kiev.ua> References: <201703041504.v24F4HMh023937@repo.freebsd.org> <20170304211611.GW2092@kib.kiev.ua> <1951800.W2d2k3eamI@ralph.baldwin.cx> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1951800.W2d2k3eamI@ralph.baldwin.cx> User-Agent: Mutt/1.8.0 (2017-02-23) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 23:18:31 -0000 On Sat, Mar 04, 2017 at 02:54:56PM -0800, John Baldwin wrote: > On Saturday, March 04, 2017 11:16:11 PM Konstantin Belousov wrote: > > On Sat, Mar 04, 2017 at 03:49:52PM -0500, Pedro Giffuni wrote: > > > The number came out from an old posting involving buildworld times, which I can???t find now :(. > > > Things seem to have changed a lot: it was surely using GCC back then, I don???t believe clang does much distinction about 486 at all. > > > > > > BTW, does it make sense to keep i586 in the configuration still? Both i486 and i586 were once removed but later re-instated in r205336. > > > > > What did make significant impact on 32bit shared libraries some time ago > > was to compile them with -mtune=i686. Default PIC prologue effectively > > neutered return stack predictor, adding uneccessary overhead to already > > expensive PIC code. I think that this is even measureable, i.e. it might > > give >= 5% of difference. > > > > I did not rechecked modern compilers WRT the generated PIC code, but I doubt > > that the thing changed recently. > > > > Several notes: -mtune is not -march, i.e. the code would be still targeted > > for 486 instruction set, but scheduling is optimized for more modern CPUs. > > Also, recent gcc puts specific meaning into -mtune=i686, interpreting it > > as request for scheduling for generic modern CPUs. We already compile > > 32bit compat libs on amd64 with -march=i686. > > > > Working on this stuff would be much more useful than tweaking kernel config > > for CPU detection. > > Hmm, I originally wanted to use -mtune=i686 (spelled as -mcpu=pentiumpro) on > i386 builds for this reason, but I removed it at bde@'s request in r125252. > I would be happy to go back to adding -mtune for i386 when CPUTYPE isn't > specified. I just rechecked. gcc, at least 4.9 and 6.3, generate 'right' prologue, i.e. call __x86.get_pc_thunk.cx (ecx or whatever register which is used to address GOT) __x86.get_pc_thunk.cx: movl (%esp), %ecx ret even when compiling for -march=i486. OTOH, clang 3.9.1 uses calll .L0 .L0: popl %eax to get the base even for native nehalem and newer CPUs. So indeed there is no reason to bother. gcc become too good to require any tuning, and clang generates unoptimal code even when hinted. I did not checked 4.0.