From owner-svn-src-stable@freebsd.org Sun Mar 11 17:17:46 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 69DFFF3D6C7 for ; Sun, 11 Mar 2018 17:17:46 +0000 (UTC) (envelope-from oliver.pinter@balabit.com) Received: from mail-io0-x243.google.com (mail-io0-x243.google.com [IPv6:2607:f8b0:4001:c06::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 EE4CB749D2 for ; Sun, 11 Mar 2018 17:17:45 +0000 (UTC) (envelope-from oliver.pinter@balabit.com) Received: by mail-io0-x243.google.com with SMTP id h23so8734443iob.11 for ; Sun, 11 Mar 2018 10:17:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=balabit-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=CWxCqlodFyER1I8sjS+607lkn84e30o6GJKsTws1QP4=; b=eU3a1yiazeAfbwO1sywQXaesxvlNIlB06K5QMR0WjfZ19hdzWyZEX+CGUJ9Cb/b/Df vG8eb5alOOIHUUSMPX92RDE+knrrhA6X/LtD3z1Td1ffTI302/v4E1X82CUiZPBqNgNe o3UBirB+JwO1Er5yACsQt+WN+7ZVAYN5A3RDOE5A0Ox+XYmsYBZzUIPzQfpn/QfhkSv/ TnVCZz8ynrqKiz2mXwX2d07aq12x/INDQ+E891i9DXOqNbnqA2fDkqCWd89Bv7iDpRlf yrhSlAtxd8m3yIgX9+GRWaa+kUZrQEgPkr05/TplMByrAa0VS5RboEnoCQyjrJDJffuV xq9w== 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=CWxCqlodFyER1I8sjS+607lkn84e30o6GJKsTws1QP4=; b=MyXbg0WIi+HYfI53iIs3rC6Rrmpy8OrxwU8/toUMRuKKgPL4F2G007UuQ0VxfBPVwd 64C2WW6PHKIglAvfovxcsC1tNpaWPOw7bSD3w1n63SJD7dmibv2o+ek1hYWa/p32/gQX woQXn81DPeNKTlHDeDHDp6Vlld+uXkJ6uICKs7B2auR7lNe9QnZCcXe+4E9zRQAb9kmZ NZ1v7267cFxpuaUCUxtdwpDnLxDPKSW7HfQU9XT1uCiDwSQg9h5y2rLbk2DXd1oGYWhp aHDQe5AWqms+l+ZdnTi8GQZDxwvBikfamPLfGEvGBQigAFUMwYefaHj8jAAPG8Yci69d xvuA== X-Gm-Message-State: AElRT7E3E5Tl+ICPcJOxjUXO63hORdPXBKeL39JylSRvie9n83pQRjhI WiS98wjPGaC8a+T04SJ3utm621ZLipPEyO+uXZ86lw== X-Google-Smtp-Source: AG47ELvRMkMiLYwIkMWq+JlkvQAClJpZdp3lwFhfddKisnLYXpgU+q07lNgR2mAs//I+TIQQXYxUNve3VUb44WuWEhE= X-Received: by 10.107.112.21 with SMTP id l21mr6241534ioc.80.1520788665260; Sun, 11 Mar 2018 10:17:45 -0700 (PDT) MIME-Version: 1.0 Received: by 10.192.225.141 with HTTP; Sun, 11 Mar 2018 10:17:44 -0700 (PDT) In-Reply-To: References: <201803072318.w27NIrI6056501@pdx.rh.CN85.dnsmgr.net> From: =?UTF-8?B?UGludMOpciwgT2xpdsOpcg==?= Date: Sun, 11 Mar 2018 18:17:44 +0100 Message-ID: Subject: Re: svn commit: r330451 - in stable/11/sys: dev/iwm dev/otus dev/usb/wlan net80211 To: rgrimes@freebsd.org Cc: Eitan Adler , svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers , svn-src-stable-11@freebsd.org, John Baldwin Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Mar 2018 17:17:46 -0000 On Thu, Mar 8, 2018 at 12:51 PM, Pint=C3=A9r, Oliv=C3=A9r wrote: > > > On Thu, Mar 8, 2018 at 12:18 AM, Rodney W. Grimes < > freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > >> > On 7 March 2018 at 09:37, John Baldwin wrote: >> > > On Tuesday, March 06, 2018 06:46:37 PM Eitan Adler wrote: >> > >> On 6 March 2018 at 08:26, John Baldwin wrote: >> > >> > On Monday, March 05, 2018 07:13:59 PM Eitan Adler wrote: >> > >> >> On 5 March 2018 at 10:08, John Baldwin wrote: >> > >> >> > On Monday, March 05, 2018 07:54:58 AM Eitan Adler wrote: >> > >> >> >> Author: eadler >> > >> >> >> Date: Mon Mar 5 07:54:57 2018 >> > >> >> >> New Revision: 330451 >> > >> >> >> URL: https://svnweb.freebsd.org/changeset/base/330451 >> > >> >> >> >> > >> >> >> Log: >> > >> >> >> MFC r306837: >> > >> >> >> >> > >> >> >> [net80211] extend the ieee80211_rx_stats struct to include >> more information. >> > >> >> > >> > >> >> > Have you thought about the KBI implications of this change and >> some of the >> > >> >> > other changes you've merged? >> > >> >> >> > >> >> I do have a copy of the modules from 11.1 and have loaded them a= t >> > >> >> various points in time after merging. That said, I am not perfec= t. >> > >> >> Unfortunately, my -STABLE box did not have fully functioning >> drivers >> > >> >> before these changes so its difficult to test anything beyond >> "loads >> > >> >> and does not panic.". I havn't done so today yet, but that will >> happen >> > >> >> soon. >> > >> >> >> > >> >> Ensuring these things work through code inspection is certainly >> > >> >> possible and I've skipped over several changes as a result. >> > >> > >> > >> > Loading a module doesn't alone doesn't actually test for breakage= . >> > >> >> > >> I'm aware. In this case I should likely just revert this change sin= ce >> > >> its a pretty blatant break. >> > > >> > > I suspect many of these changes for iwm, etc. are all intertwined so >> I'm not >> > > sure if you can leave out individual ones. >> > >> > Possibly. I do have iwm working on my laptop though. I also know of >> > one open PR assigned to me w.r.t. a model I don't own. I'll be >> > addressing it some time this week. >> >> I believe I also have a tester of stable/11 iwm patches avaliable, >> he has an 8265? >> > > At weekend I will test them. > Sorry, -ENOTIME for 8265 this weekend, but it working fine (and much more stable) with 7260. > > >> >> -- >> Rod Grimes >> rgrimes@freebsd.org >> _______________________________________________ >> 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" >> > > From owner-svn-src-stable@freebsd.org Sun Mar 11 17:40:03 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8E49CF403DF; Sun, 11 Mar 2018 17:40:03 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3DF4B75A78; Sun, 11 Mar 2018 17:40:03 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 38A212058B; Sun, 11 Mar 2018 17:40:03 +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 w2BHe3m8086787; Sun, 11 Mar 2018 17:40:03 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2BHe2hT086781; Sun, 11 Mar 2018 17:40:02 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201803111740.w2BHe2hT086781@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 11 Mar 2018 17:40: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: r330769 - in stable/11: tools/build/mk usr.bin usr.bin/ruptime usr.bin/rwho usr.sbin usr.sbin/rwhod X-SVN-Group: stable-11 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in stable/11: tools/build/mk usr.bin usr.bin/ruptime usr.bin/rwho usr.sbin usr.sbin/rwhod X-SVN-Commit-Revision: 330769 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Mar 2018 17:40:03 -0000 Author: emaste Date: Sun Mar 11 17:40:02 2018 New Revision: 330769 URL: https://svnweb.freebsd.org/changeset/base/330769 Log: MFC r322277 by jlh: rwho/ruptime/rwhod shouldn't be gated by RCMDS. As peter@ points out in pr/220953: "rwho, rwhod and ruptime are not part of the remote login suite (rsh, rlogin etc). They should *not* be in the rcmds package which is disabled by default. We rely on rwho/rwhod/ruptime in the freebsd.org cluster." This commit is a re-commit of r322029 and r322031 with a better commit log, as pointed out by ngie@. This also includes the necesary changes to OptionalObsoleteFiles.inc, as requested by jhb@. PR: 220953 Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc stable/11/usr.bin/Makefile stable/11/usr.bin/ruptime/ruptime.1 stable/11/usr.bin/rwho/rwho.1 stable/11/usr.sbin/Makefile stable/11/usr.sbin/rwhod/rwhod.8 Directory Properties: stable/11/ (props changed) Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/11/tools/build/mk/OptionalObsoleteFiles.inc Sun Mar 11 17:21:48 2018 (r330768) +++ stable/11/tools/build/mk/OptionalObsoleteFiles.inc Sun Mar 11 17:40:02 2018 (r330769) @@ -7147,24 +7147,16 @@ OLD_FILES+=usr/share/man/man8/rbootd.8.gz .if ${MK_RCMDS} == no OLD_FILES+=bin/rcp -OLD_FILES+=etc/rc.d/rwho -OLD_FILES+=etc/periodic/daily/140.clean-rwho OLD_FILES+=rescue/rcp OLD_FILES+=usr/bin/rlogin OLD_FILES+=usr/bin/rsh -OLD_FILES+=usr/bin/ruptime -OLD_FILES+=usr/bin/rwho OLD_FILES+=usr/libexec/rlogind OLD_FILES+=usr/libexec/rshd -OLD_FILES+=usr/sbin/rwhod OLD_FILES+=usr/share/man/man1/rcp.1.gz OLD_FILES+=usr/share/man/man1/rlogin.1.gz OLD_FILES+=usr/share/man/man1/rsh.1.gz -OLD_FILES+=usr/share/man/man1/ruptime.1.gz -OLD_FILES+=usr/share/man/man1/rwho.1.gz OLD_FILES+=usr/share/man/man8/rlogind.8.gz OLD_FILES+=usr/share/man/man8/rshd.8.gz -OLD_FILES+=usr/share/man/man8/rwhod.8.gz .endif .if ${MK_RCS} == no Modified: stable/11/usr.bin/Makefile ============================================================================== --- stable/11/usr.bin/Makefile Sun Mar 11 17:21:48 2018 (r330768) +++ stable/11/usr.bin/Makefile Sun Mar 11 17:40:02 2018 (r330769) @@ -133,8 +133,10 @@ SUBDIR= alias \ rpcinfo \ rs \ rup \ + ruptime \ rusers \ rwall \ + rwho \ script \ sdiff \ sed \ @@ -255,8 +257,6 @@ SUBDIR.${MK_OPENSSL}+= newkey SUBDIR.${MK_QUOTAS}+= quota SUBDIR.${MK_RCMDS}+= rlogin SUBDIR.${MK_RCMDS}+= rsh -SUBDIR.${MK_RCMDS}+= ruptime -SUBDIR.${MK_RCMDS}+= rwho SUBDIR.${MK_SENDMAIL}+= vacation SUBDIR.${MK_TALK}+= talk SUBDIR.${MK_TELNET}+= telnet Modified: stable/11/usr.bin/ruptime/ruptime.1 ============================================================================== --- stable/11/usr.bin/ruptime/ruptime.1 Sun Mar 11 17:21:48 2018 (r330768) +++ stable/11/usr.bin/ruptime/ruptime.1 Sun Mar 11 17:40:02 2018 (r330769) @@ -38,15 +38,6 @@ .Nm .Op Fl alrtu .Op Ar host ... -.Sh DEPRECATION NOTICE -.Nm -is deprecated and will be removed from future versions of the -.Fx -base system. -If -.Nm -is still required, it can be installed from ports or packages -(net/bsdrcmds). .Sh DESCRIPTION The .Nm Modified: stable/11/usr.bin/rwho/rwho.1 ============================================================================== --- stable/11/usr.bin/rwho/rwho.1 Sun Mar 11 17:21:48 2018 (r330768) +++ stable/11/usr.bin/rwho/rwho.1 Sun Mar 11 17:40:02 2018 (r330769) @@ -37,15 +37,6 @@ .Sh SYNOPSIS .Nm .Op Fl a -.Sh DEPRECATION NOTICE -.Nm -is deprecated and will be removed from future versions of the -.Fx -base system. -If -.Nm -is still required, it can be installed from ports or packages -(net/bsdrcmds). .Sh DESCRIPTION The .Nm Modified: stable/11/usr.sbin/Makefile ============================================================================== --- stable/11/usr.sbin/Makefile Sun Mar 11 17:21:48 2018 (r330768) +++ stable/11/usr.sbin/Makefile Sun Mar 11 17:40:02 2018 (r330769) @@ -73,6 +73,7 @@ SUBDIR= adduser \ rpc.statd \ rpc.umntall \ rtprio \ + rwhod \ service \ services_mkdb \ sesutil \ @@ -190,7 +191,6 @@ SUBDIR.${MK_PPP}+= ppp SUBDIR.${MK_QUOTAS}+= edquota SUBDIR.${MK_QUOTAS}+= quotaon SUBDIR.${MK_QUOTAS}+= repquota -SUBDIR.${MK_RCMDS}+= rwhod SUBDIR.${MK_SENDMAIL}+= editmap SUBDIR.${MK_SENDMAIL}+= mailstats SUBDIR.${MK_SENDMAIL}+= makemap Modified: stable/11/usr.sbin/rwhod/rwhod.8 ============================================================================== --- stable/11/usr.sbin/rwhod/rwhod.8 Sun Mar 11 17:21:48 2018 (r330768) +++ stable/11/usr.sbin/rwhod/rwhod.8 Sun Mar 11 17:40:02 2018 (r330769) @@ -40,15 +40,6 @@ .Op Fl p .Op Fl l .Op Fl m Op Ar ttl -.Sh DEPRECATION NOTICE -.Nm -is deprecated and will be removed from future versions of the -.Fx -base system. -If -.Nm -is still required, it can be installed from ports or packages -(net/bsdrcmds). .Sh DESCRIPTION The .Nm From owner-svn-src-stable@freebsd.org Sun Mar 11 17:43:05 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A413BF4097B; Sun, 11 Mar 2018 17:43:05 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 568A375EA1; Sun, 11 Mar 2018 17:43:05 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5066B2070E; Sun, 11 Mar 2018 17:43:05 +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 w2BHh5Vn091697; Sun, 11 Mar 2018 17:43:05 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2BHh5rI091694; Sun, 11 Mar 2018 17:43:05 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201803111743.w2BHh5rI091694@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 11 Mar 2018 17:43: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: r330770 - in stable/11/etc: periodic/daily rc.d X-SVN-Group: stable-11 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in stable/11/etc: periodic/daily rc.d X-SVN-Commit-Revision: 330770 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Mar 2018 17:43:05 -0000 Author: emaste Date: Sun Mar 11 17:43:04 2018 New Revision: 330770 URL: https://svnweb.freebsd.org/changeset/base/330770 Log: MFC r322552 by jhb: Unconditionally install rwhod support scripts. r322277 moved rwho* and ruptime out of the MK_RCMDS conditional including updating the obsolete files entries to not remove these scripts due to WITHOUT_RCMDS=yes. However, the initial installation was still conditional on MK_RCMDS, so new installs did not include these scripts and upgrades via mergemaster or etcupdate removed them. PR: 220953 Modified: stable/11/etc/periodic/daily/Makefile stable/11/etc/rc.d/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/etc/periodic/daily/Makefile ============================================================================== --- stable/11/etc/periodic/daily/Makefile Sun Mar 11 17:40:02 2018 (r330769) +++ stable/11/etc/periodic/daily/Makefile Sun Mar 11 17:43:04 2018 (r330770) @@ -7,6 +7,7 @@ FILESGROUPS=FILES FILES= 100.clean-disks \ 110.clean-tmps \ 120.clean-preserve \ + 140.clean-rwho \ 200.backup-passwd \ 210.backup-aliases \ 330.news \ @@ -45,14 +46,6 @@ FILES+= 130.clean-msgs FILES+= 480.status-ntpd \ 480.leapfile-ntpd .endif - -.if ${MK_RCMDS} != "no" -FILESGROUPS+= RCMDS -RCMDS+= 140.clean-rwho -.endif -RCMDSDIR= /etc/periodic/daily -RCMDSMODE= ${BINMODE} -RCMDSPACKAGE= rcmds .if ${MK_SENDMAIL} != "no" FILES+= 150.clean-hoststat \ Modified: stable/11/etc/rc.d/Makefile ============================================================================== --- stable/11/etc/rc.d/Makefile Sun Mar 11 17:40:02 2018 (r330769) +++ stable/11/etc/rc.d/Makefile Sun Mar 11 17:43:04 2018 (r330770) @@ -100,6 +100,7 @@ FILES= DAEMON \ rpcbind \ rtadvd \ rtsold \ + rwho \ savecore \ securelevel \ serial \ @@ -277,12 +278,6 @@ SSHPACKAGE= ssh .if ${MK_PF} != "no" FILES+= ftp-proxy -.endif - -.if ${MK_RCMDS} != "no" -FILESGROUPS+= RCMDS -RCMDS+= rwho -RCMDSPACKAGE= rcmds .endif .if ${MK_ROUTED} != "no" From owner-svn-src-stable@freebsd.org Sun Mar 11 17:53:48 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 89186F41690; Sun, 11 Mar 2018 17:53:48 +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 EF3CE76520; Sun, 11 Mar 2018 17:53:47 +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 w2BHrkpS074878; Sun, 11 Mar 2018 10:53:46 -0700 (PDT) (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 w2BHrk7R074877; Sun, 11 Mar 2018 10:53:46 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201803111753.w2BHrk7R074877@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r330451 - in stable/11/sys: dev/iwm dev/otus dev/usb/wlan net80211 In-Reply-To: To: =?UTF-8?Q?Pint=C3=A9r=2C_Oliv=C3=A9r?= Date: Sun, 11 Mar 2018 10:53:46 -0700 (PDT) CC: rgrimes@freebsd.org, Eitan Adler , svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers , svn-src-stable-11@freebsd.org, John Baldwin 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-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Mar 2018 17:53:48 -0000 > On Thu, Mar 8, 2018 at 12:51 PM, Pint?r, Oliv?r > wrote: > > > > > > > On Thu, Mar 8, 2018 at 12:18 AM, Rodney W. Grimes < > > freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > > > >> > On 7 March 2018 at 09:37, John Baldwin wrote: > >> > > On Tuesday, March 06, 2018 06:46:37 PM Eitan Adler wrote: > >> > >> On 6 March 2018 at 08:26, John Baldwin wrote: > >> > >> > On Monday, March 05, 2018 07:13:59 PM Eitan Adler wrote: > >> > >> >> On 5 March 2018 at 10:08, John Baldwin wrote: > >> > >> >> > On Monday, March 05, 2018 07:54:58 AM Eitan Adler wrote: > >> > >> >> >> Author: eadler > >> > >> >> >> Date: Mon Mar 5 07:54:57 2018 > >> > >> >> >> New Revision: 330451 > >> > >> >> >> URL: https://svnweb.freebsd.org/changeset/base/330451 > >> > >> >> >> > >> > >> >> >> Log: > >> > >> >> >> MFC r306837: > >> > >> >> >> > >> > >> >> >> [net80211] extend the ieee80211_rx_stats struct to include > >> more information. > >> > >> >> > > >> > >> >> > Have you thought about the KBI implications of this change and > >> some of the > >> > >> >> > other changes you've merged? > >> > >> >> > >> > >> >> I do have a copy of the modules from 11.1 and have loaded them at > >> > >> >> various points in time after merging. That said, I am not perfect. > >> > >> >> Unfortunately, my -STABLE box did not have fully functioning > >> drivers > >> > >> >> before these changes so its difficult to test anything beyond > >> "loads > >> > >> >> and does not panic.". I havn't done so today yet, but that will > >> happen > >> > >> >> soon. > >> > >> >> > >> > >> >> Ensuring these things work through code inspection is certainly > >> > >> >> possible and I've skipped over several changes as a result. > >> > >> > > >> > >> > Loading a module doesn't alone doesn't actually test for breakage. > >> > >> > >> > >> I'm aware. In this case I should likely just revert this change since > >> > >> its a pretty blatant break. > >> > > > >> > > I suspect many of these changes for iwm, etc. are all intertwined so > >> I'm not > >> > > sure if you can leave out individual ones. > >> > > >> > Possibly. I do have iwm working on my laptop though. I also know of > >> > one open PR assigned to me w.r.t. a model I don't own. I'll be > >> > addressing it some time this week. > >> > >> I believe I also have a tester of stable/11 iwm patches avaliable, > >> he has an 8265? ^^^^ Its an 8565, my mistake. > >> > > > > At weekend I will test them. > > > > Sorry, -ENOTIME for 8265 this weekend, but it working fine (and much more > stable) with 7260. Thanks for keeping us informed. I am uncertain as to the state of iwm in stable/11, should the Intel 8565ac work, or not? I have exchanged an additional round of email with the volunteer tester, he says he is running an unmodified stable/11, now trying to find out if he is updating that regular or not. Hopefully we can have some test results soon. Thanks, -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-stable@freebsd.org Sun Mar 11 19:30:03 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E0D84F48889 for ; Sun, 11 Mar 2018 19:30:02 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-yw0-x22a.google.com (mail-yw0-x22a.google.com [IPv6:2607:f8b0:4002:c05::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 4FBFC7A7A5 for ; Sun, 11 Mar 2018 19:30:02 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yw0-x22a.google.com with SMTP id l24so4096080ywk.6 for ; Sun, 11 Mar 2018 12:30:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=aTJ4C+XyjfbBgkNzuXOJQj9yIXVVaRnxww2dId0D6/U=; b=YY3mhFt1VqE2uKABArN6GbxxFMAuPTre96EOrzVONis0PkgO4AaHGI3A8YlQyA/Oxu UNIjZ1AXoitX6FAB8/ZJkKoCTXQsz3lWkDPqOEaqMPE1DnSgt45sByAm4SmDIZh6cR4D M1GKEx44AvBwMUFnG1o3UFghVUgv9Xf0qRbp0= 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=aTJ4C+XyjfbBgkNzuXOJQj9yIXVVaRnxww2dId0D6/U=; b=aQrBqrKTpFMh+m3lT432XJojI7YONRzL7X71ejXk3qE+j4QtcutEyittZnuSC/ZCzm YpcRpprw+xEcaVAMMDlw4ItU5tYB1TPPUePbNEGcxw1lR9tDen3WkrtCPnpAXKl2w0Xy qlNA2fHF4Qwb04TXZ4Ovp7ditzvR1PUBak7s70Tg6Fb4l1egfJdmCnTB72g4+qnJmWEB Rq7Mxm5+ndYW4IAgR4TDK8tXR7H0lu2hk5o7C2Rf/rt/BkvFztn+v9wR1MOHMG11MEj/ WK0Yd7QXmF5OUiLyCTsOZ/itTuep9YhUtT/yTM98dRCfGdlCT7ijttN6WaEPrT4x0ZZQ TifQ== X-Gm-Message-State: AElRT7Ge8768OjDg1Rf9hoZzHzP9xDdeB2177BhnV4o5LWrubGAa1GWc Xkl9YuBGMP7M4xpreDeB3tgmp/psn2j8lpnmEnNZMw== X-Google-Smtp-Source: AG47ELt/7rGieyc/Fnfd5WlAKhpSJ0oh9m4sy3UVeZjFR/xRxK9MnP6X/p15gSUvhElKCCphmKMP6EB1Hj6LYP8pzBU= X-Received: by 10.129.159.132 with SMTP id w126mr11752ywg.141.1520796601499; Sun, 11 Mar 2018 12:30:01 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 2002:a25:23d2:0:0:0:0:0 with HTTP; Sun, 11 Mar 2018 12:29:31 -0700 (PDT) In-Reply-To: <201803111753.w2BHrk7R074877@pdx.rh.CN85.dnsmgr.net> References: <201803111753.w2BHrk7R074877@pdx.rh.CN85.dnsmgr.net> From: Eitan Adler Date: Sun, 11 Mar 2018 12:29:31 -0700 X-Google-Sender-Auth: _k74tZGtUm6BzWc-OGlkUioHFDI Message-ID: Subject: Re: svn commit: r330451 - in stable/11/sys: dev/iwm dev/otus dev/usb/wlan net80211 To: rgrimes@freebsd.org Cc: =?UTF-8?B?UGludMOpciwgT2xpdsOpcg==?= , svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers , svn-src-stable-11@freebsd.org, John Baldwin Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Mar 2018 19:30:03 -0000 On 11 March 2018 at 10:53, Rodney W. Grimes wrote: >> Sorry, -ENOTIME for 8265 this weekend, but it working fine (and much more >> stable) with 7260. > > Thanks for keeping us informed. > > I am uncertain as to the state of iwm in stable/11, should the > Intel 8565ac work, or not? I have exchanged an additional > round of email with the volunteer tester, he says he is > running an unmodified stable/11, now trying to find out if he > is updating that regular or not. Hopefully we can have some > test results soon. There has been a lot of discussion on this thread and I did not have time to digest it all. That being said - stable works for my hardware - there is one known issue that I have not yet resolved. I originally committed to resolving it this past week, but held off due to the long discussion here - I will take full responsibility for ensuring that anything working before my changes continues to work on stable - however, I will need reports of people who are able to help bisect to the broken changes -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams From owner-svn-src-stable@freebsd.org Sun Mar 11 19:46:42 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7602DF49B93; Sun, 11 Mar 2018 19:46:41 +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 0FADD7B51D; Sun, 11 Mar 2018 19:46: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 w2BJkaUX075427; Sun, 11 Mar 2018 12:46:36 -0700 (PDT) (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 w2BJkZBr075426; Sun, 11 Mar 2018 12:46:36 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201803111946.w2BJkZBr075426@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r330451 - in stable/11/sys: dev/iwm dev/otus dev/usb/wlan net80211 In-Reply-To: To: Eitan Adler Date: Sun, 11 Mar 2018 12:46:35 -0700 (PDT) CC: rgrimes@freebsd.org, =?UTF-8?Q?Pint=C3=A9r=2C_Oliv=C3=A9r?= , svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers , svn-src-stable-11@freebsd.org, John Baldwin 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-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Mar 2018 19:46:42 -0000 > On 11 March 2018 at 10:53, Rodney W. Grimes > wrote: > > >> Sorry, -ENOTIME for 8265 this weekend, but it working fine (and much more > >> stable) with 7260. > > > > Thanks for keeping us informed. > > > > I am uncertain as to the state of iwm in stable/11, should the > > Intel 8565ac work, or not? I have exchanged an additional > > round of email with the volunteer tester, he says he is > > running an unmodified stable/11, now trying to find out if he > > is updating that regular or not. Hopefully we can have some > > test results soon. > > There has been a lot of discussion on this thread and I did not have > time to digest it all. > > That being said > > - stable works for my hardware > - there is one known issue that I have not yet resolved. I originally > committed to resolving it this past week, but held off due to the long > discussion here > - I will take full responsibility for ensuring that anything working > before my changes continues to work on stable > - however, I will need reports of people who are able to help bisect > to the broken changes Simple question you could answer before I have this guy do a bunch of work, *should* the Intel 8565AC work in stable/11 now? There is a specific PR and commit to ^/head that adds this functionality, did that get merged and stay, or ? Thanks, -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-stable@freebsd.org Sun Mar 11 19:52:45 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5165FF4A339; Sun, 11 Mar 2018 19:52:45 +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 8DEFD7BBD8; Sun, 11 Mar 2018 19:52:44 +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 w2BJqgiA075491; Sun, 11 Mar 2018 12:52:42 -0700 (PDT) (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 w2BJqgqO075490; Sun, 11 Mar 2018 12:52:42 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201803111952.w2BJqgqO075490@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r330451 - in stable/11/sys: dev/iwm dev/otus dev/usb/wlan net80211 In-Reply-To: <201803111946.w2BJkZBr075426@pdx.rh.CN85.dnsmgr.net> To: rgrimes@freebsd.org Date: Sun, 11 Mar 2018 12:52:42 -0700 (PDT) CC: Eitan Adler , =?UTF-8?Q?Pint=C3=A9r=2C_Oliv=C3=A9r?= , svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers , svn-src-stable-11@freebsd.org, John Baldwin 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-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Mar 2018 19:52:45 -0000 > > On 11 March 2018 at 10:53, Rodney W. Grimes > > wrote: > > > > >> Sorry, -ENOTIME for 8265 this weekend, but it working fine (and much more > > >> stable) with 7260. > > > > > > Thanks for keeping us informed. > > > > > > I am uncertain as to the state of iwm in stable/11, should the > > > Intel 8565ac work, or not? I have exchanged an additional > > > round of email with the volunteer tester, he says he is > > > running an unmodified stable/11, now trying to find out if he > > > is updating that regular or not. Hopefully we can have some > > > test results soon. > > > > There has been a lot of discussion on this thread and I did not have > > time to digest it all. > > > > That being said > > > > - stable works for my hardware > > - there is one known issue that I have not yet resolved. I originally > > committed to resolving it this past week, but held off due to the long > > discussion here > > - I will take full responsibility for ensuring that anything working > > before my changes continues to work on stable > > - however, I will need reports of people who are able to help bisect > > to the broken changes > > Simple question you could answer before I have this guy do a bunch > of work, *should* the Intel 8565AC work in stable/11 now? There > is a specific PR and commit to ^/head that adds this functionality, > did that get merged and stay, or ? Specifically: from bug 220229 and commit r324434 -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-stable@freebsd.org Sun Mar 11 22:49:47 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7D187F2D1C0; Sun, 11 Mar 2018 22:49:47 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2680E83593; Sun, 11 Mar 2018 22:49:47 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1AF14236A2; Sun, 11 Mar 2018 22:49:47 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2BMnk2I044356; Sun, 11 Mar 2018 22:49:46 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2BMnkwJ044355; Sun, 11 Mar 2018 22:49:46 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803112249.w2BMnkwJ044355@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sun, 11 Mar 2018 22:49: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: r330784 - stable/11/sys/dev/iwm X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/iwm X-SVN-Commit-Revision: 330784 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Mar 2018 22:49:47 -0000 Author: eadler Date: Sun Mar 11 22:49:46 2018 New Revision: 330784 URL: https://svnweb.freebsd.org/changeset/base/330784 Log: Revert r324434 Some users are reporting that it is causing issues for their hardware. In the interest of not breaking stable, revert while we investigate. Modified: stable/11/sys/dev/iwm/if_iwm.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/iwm/if_iwm.c ============================================================================== --- stable/11/sys/dev/iwm/if_iwm.c Sun Mar 11 20:13:15 2018 (r330783) +++ stable/11/sys/dev/iwm/if_iwm.c Sun Mar 11 22:49:46 2018 (r330784) @@ -547,14 +547,12 @@ iwm_read_firmware(struct iwm_softc *sc, enum iwm_ucode { struct iwm_fw_info *fw = &sc->sc_fw; const struct iwm_tlv_ucode_header *uhdr; - const struct iwm_ucode_tlv *tlv; + struct iwm_ucode_tlv tlv; struct iwm_ucode_capabilities *capa = &sc->ucode_capa; enum iwm_ucode_tlv_type tlv_type; const struct firmware *fwp; const uint8_t *data; - uint32_t tlv_len; uint32_t usniffer_img; - const uint8_t *tlv_data; uint32_t paging_mem_size; int num_of_cpus; int error = 0; @@ -607,21 +605,25 @@ iwm_read_firmware(struct iwm_softc *sc, enum iwm_ucode goto out; } - snprintf(sc->sc_fwver, sizeof(sc->sc_fwver), "%u.%u (API ver %u)", + snprintf(sc->sc_fwver, sizeof(sc->sc_fwver), "%d.%d (API ver %d)", IWM_UCODE_MAJOR(le32toh(uhdr->ver)), IWM_UCODE_MINOR(le32toh(uhdr->ver)), IWM_UCODE_API(le32toh(uhdr->ver))); data = uhdr->data; len = fw->fw_fp->datasize - sizeof(*uhdr); - while (len >= sizeof(*tlv)) { - len -= sizeof(*tlv); - tlv = (const void *)data; + while (len >= sizeof(tlv)) { + size_t tlv_len; + const void *tlv_data; - tlv_len = le32toh(tlv->length); - tlv_type = le32toh(tlv->type); - tlv_data = tlv->data; + memcpy(&tlv, data, sizeof(tlv)); + tlv_len = le32toh(tlv.length); + tlv_type = le32toh(tlv.type); + len -= sizeof(tlv); + data += sizeof(tlv); + tlv_data = data; + if (len < tlv_len) { device_printf(sc->sc_dev, "firmware too short: %zu bytes\n", @@ -629,21 +631,19 @@ iwm_read_firmware(struct iwm_softc *sc, enum iwm_ucode error = EINVAL; goto parse_out; } - len -= roundup2(tlv_len, 4); - data += sizeof(tlv) + roundup2(tlv_len, 4); switch ((int)tlv_type) { case IWM_UCODE_TLV_PROBE_MAX_LEN: - if (tlv_len != sizeof(uint32_t)) { + if (tlv_len < sizeof(uint32_t)) { device_printf(sc->sc_dev, - "%s: PROBE_MAX_LEN (%d) != sizeof(uint32_t)\n", + "%s: PROBE_MAX_LEN (%d) < sizeof(uint32_t)\n", __func__, (int) tlv_len); error = EINVAL; goto parse_out; } capa->max_probe_length = - le32_to_cpup((const uint32_t *)tlv_data); + le32toh(*(const uint32_t *)tlv_data); /* limit it to something sensible */ if (capa->max_probe_length > IWM_SCAN_OFFLOAD_PROBE_REQ_SIZE) { @@ -674,14 +674,6 @@ iwm_read_firmware(struct iwm_softc *sc, enum iwm_ucode error = EINVAL; goto parse_out; } - if (tlv_len % sizeof(uint32_t)) { - device_printf(sc->sc_dev, - "%s: IWM_UCODE_TLV_FLAGS: tlv_len (%d) %% sizeof(uint32_t)\n", - __func__, - (int) tlv_len); - error = EINVAL; - goto parse_out; - } /* * Apparently there can be many flags, but Linux driver * parses only the first one, and so do we. @@ -693,7 +685,7 @@ iwm_read_firmware(struct iwm_softc *sc, enum iwm_ucode * 2) TLV_FLAGS contains TLV_FLAGS_PAN * ==> this resets TLV_PAN to itself... hnnnk */ - capa->flags = le32_to_cpup((const uint32_t *)tlv_data); + capa->flags = le32toh(*(const uint32_t *)tlv_data); break; case IWM_UCODE_TLV_CSCHEME: if ((error = iwm_store_cscheme(sc, @@ -714,7 +706,7 @@ iwm_read_firmware(struct iwm_softc *sc, enum iwm_ucode error = EINVAL; goto parse_out; } - num_of_cpus = le32_to_cpup((const uint32_t *)tlv_data); + num_of_cpus = le32toh(*(const uint32_t *)tlv_data); if (num_of_cpus == 2) { fw->fw_sects[IWM_UCODE_REGULAR].is_dual_cpus = TRUE; @@ -788,7 +780,7 @@ iwm_read_firmware(struct iwm_softc *sc, enum iwm_ucode goto parse_out; } sc->sc_fw.phy_config = - le32_to_cpup((const uint32_t *)tlv_data); + le32toh(*(const uint32_t *)tlv_data); sc->sc_fw.valid_tx_ant = (sc->sc_fw.phy_config & IWM_FW_PHY_CFG_TX_CHAIN) >> IWM_FW_PHY_CFG_TX_CHAIN_POS; @@ -839,7 +831,7 @@ iwm_read_firmware(struct iwm_softc *sc, enum iwm_ucode error = EINVAL; goto parse_out; } - paging_mem_size = le32_to_cpup((const uint32_t *)tlv_data); + paging_mem_size = le32toh(*(const uint32_t *)tlv_data); IWM_DPRINTF(sc, IWM_DEBUG_FIRMWARE_TLV, "%s: Paging: paging enabled (size = %u bytes)\n", @@ -872,7 +864,7 @@ iwm_read_firmware(struct iwm_softc *sc, enum iwm_ucode goto parse_out; } capa->n_scan_channels = - le32_to_cpup((const uint32_t *)tlv_data); + le32toh(*(const uint32_t *)tlv_data); break; case IWM_UCODE_TLV_FW_VERSION: @@ -897,6 +889,9 @@ iwm_read_firmware(struct iwm_softc *sc, enum iwm_ucode error = EINVAL; goto parse_out; } + + len -= roundup(tlv_len, 4); + data += roundup(tlv_len, 4); } KASSERT(error == 0, ("unhandled error")); From owner-svn-src-stable@freebsd.org Sun Mar 11 22:51:02 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C9C64F2D39E for ; Sun, 11 Mar 2018 22:51:02 +0000 (UTC) (envelope-from lists@eitanadler.com) 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 5A45383750 for ; Sun, 11 Mar 2018 22:51:02 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yw0-x22e.google.com with SMTP id j143so4270696ywb.4 for ; Sun, 11 Mar 2018 15:51:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-transfer-encoding; bh=pxp+atD63/vE8Bb8uWfqtOfzvwOJJX2LPGeYVJZ6F/c=; b=uHxqywhx24NUZYOe4PVjMbmvQId4/vJOWWGBVC3C78recKlxJBWLIGkr0G6UyRLkfo WX62vz9DYKEr1zpYUxiaD+m5q4sJWPmjRoesar22/GHVs30R2IpFf1LcPnIFWkddw7WX KTOhRdJtorJX8q3MktwmoMpA5rJgVbV0A59YI= 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=pxp+atD63/vE8Bb8uWfqtOfzvwOJJX2LPGeYVJZ6F/c=; b=DKXuGirMIhUpTrrm6hQkoLcNvdyymWCxoobK4mlHD/nAWkr3UCmnmMEOWZQUielDdw QLtS7NrrFK7sHuaqOrFQsJoWxcMd+YqgM5Na8KMnmLXHsisw4bBHOlNjRL4g1ofDWE1H OSnCS0/gGJnPNlNG63LOwpz4QjxzhVRKTv+fVbkqTP5youD2IuobvlCHm+bQf4g0twYK JSBIkkW6OLloMbJZsYd377pwwnRXgMnfKKyDRAmDkqug0YB3mk552iqvDZq0CNBk0Lz2 sfyCsHIUucfBcNEg2Q4ug/tqbsjU/noMR2P2jDclfZY9oYPLq0QI9lsvp7/wwRrS9RFd qM6A== X-Gm-Message-State: AElRT7F+MY3UHPz2xaipe81XTT3IaYuyBmv0Vg1Wcrjs6dGNkER+lG4a /rh7/WiU4cFqmduMiRcN+/3/ECtu7WeEN1GJlHjsmA== X-Google-Smtp-Source: AG47ELvAhcMvW1WClGawopfR67fPcQIYtxOnhIoBu+1iW1kachjobKg67xL3+4x70yt8AhqC0XRlgZH9iBmglovskZ4= X-Received: by 10.129.110.86 with SMTP id j83mr3555997ywc.19.1520808661456; Sun, 11 Mar 2018 15:51:01 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 2002:a25:23d2:0:0:0:0:0 with HTTP; Sun, 11 Mar 2018 15:50:30 -0700 (PDT) In-Reply-To: <201803112104.w2BL4uAE042123@nuc.oldach.net> References: <201803112104.w2BL4uAE042123@nuc.oldach.net> From: Eitan Adler Date: Sun, 11 Mar 2018 15:50:30 -0700 X-Google-Sender-Auth: AyCQZolx1hawYSyAtmTdGQUiows Message-ID: Subject: Re: svn commit: r330451 - in stable/11/sys: dev/iwm dev/otus dev/usb/wlan net80211 To: Helge Oldach Cc: =?UTF-8?B?UGludMOpciwgT2xpdsOpcg==?= , rgrimes@freebsd.org, src-committers , John Baldwin , svn-src-stable@freebsd.org, svn-src-all@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Mar 2018 22:51:03 -0000 On 11 March 2018 at 14:04, Helge Oldach wrote: > Pint=C3=A9r, Oliv=C3=A9r wrote on Sun, 11 Mar 2018 18:17:44 +0100 (CET): >> On Thu, Mar 8, 2018 at 12:51 PM, Pint=C3=A9r, Oliv=C3=A9r > Reverting r330206 (only, but keeping the succeeding commits) fixed it for= me, as described in the PR. r330206 has been reverted. --=20 Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams From owner-svn-src-stable@freebsd.org Mon Mar 12 08:52:36 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C1825F2C88B for ; Mon, 12 Mar 2018 08:52:35 +0000 (UTC) (envelope-from oliver.pinter@balabit.com) Received: from mail-io0-x243.google.com (mail-io0-x243.google.com [IPv6:2607:f8b0:4001:c06::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 094A9700A1 for ; Mon, 12 Mar 2018 08:52:34 +0000 (UTC) (envelope-from oliver.pinter@balabit.com) Received: by mail-io0-x243.google.com with SMTP id m22so10466870iob.12 for ; Mon, 12 Mar 2018 01:52:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=balabit-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=embZVTQmaUUgc8ErBXF0L0lBrlfVLy6qYpa785Oo35c=; b=fjr9ChRAuJz5NRn1P9qjmbKJzw0j26DeTSQJTpLkKrfC3AE9isaeQTAHwg65xHH450 /4jZtNWli0P9A9JKfj/PDiwWDJn8tI9RaUOr3JgTdDgCmMjhth/USiyTyBwhqacqJB+i e2kf1C330DRu86s4cfKRicwaQEVmCqQWOTij6eN//y2JM72QVr3b10+Vw7eczCamB9Cf FVh9u7GCYlIsIYXnWf/IofYks6THQSY/2Dq4MVbIL1BIHH82UbC/WHVt97dREO8gjeg5 L3/+ihSG12ol96F4C9HqbPHJqyc2deepMc7TWeVb/NgLzf3bcijEc/JZZib2fEIf7OB/ LTpQ== 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=embZVTQmaUUgc8ErBXF0L0lBrlfVLy6qYpa785Oo35c=; b=Gg9CR7KKyOBDbDRsn63IHtxq3aGjoaOlK6SE4rFy9Explg/csOHuLcwZ/A4O1IBjqS /ODQjmQ9OugmrQXG+khjfydLlcBMNAreCmlHbbo8otuvLWGKKYyokfGwwPsWhLRIvzlH mUfeggDOi0bI6mua9EUgjWzoKZK71lL6YwC11dt75pKHOwo1YiAgtLlRYFFbY8OyxBTT 4PaV2MX3sTuNfSdG/vj6HefPzD3lq9kJGbCnogNwnEebvqBdlCLuUE/QiQ3nvqGxw/wm x8zFOAC27HxVtqhE29Un6k3EHPzbSIFNzQBJMXV/4IEM8R4BQlNkb6MnZAmlKXn2gGWn /JYA== X-Gm-Message-State: AElRT7H+cabuDzupSyyP+s8u2eoD9B6rNjxSKaWNTmW22fSbUM4vNgy0 lPz77qwEwZLTLvGM7ltI6jBHb7yLpE4fZoyovc+h/Q== X-Google-Smtp-Source: AG47ELvaKs/WH1JyJtap9Oiw+s9aQM6ixnXKqWUz70Jg2FWBBQnARyVC4PVS4QJ7kXVjKbnikCREoC3tIIxdYvqg2YQ= X-Received: by 10.107.48.3 with SMTP id w3mr7807269iow.84.1520844754324; Mon, 12 Mar 2018 01:52:34 -0700 (PDT) MIME-Version: 1.0 Received: by 10.192.225.141 with HTTP; Mon, 12 Mar 2018 01:52:33 -0700 (PDT) In-Reply-To: <201803112249.w2BMnkwJ044355@repo.freebsd.org> References: <201803112249.w2BMnkwJ044355@repo.freebsd.org> From: =?UTF-8?B?UGludMOpciwgT2xpdsOpcg==?= Date: Mon, 12 Mar 2018 09:52:33 +0100 Message-ID: Subject: Re: svn commit: r330784 - stable/11/sys/dev/iwm To: Eitan Adler Cc: src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Mar 2018 08:52:36 -0000 On Sun, Mar 11, 2018 at 11:49 PM, Eitan Adler wrote: > Author: eadler > Date: Sun Mar 11 22:49:46 2018 > New Revision: 330784 > URL: https://svnweb.freebsd.org/changeset/base/330784 > > Log: > Revert r324434 > Wrong revision here^ based on this: https://svnweb.freebsd.org/base?view=revision&revision=324434 > > Some users are reporting that it is causing issues for their hardware. > In the interest of not breaking stable, revert while we investigate. > > Modified: > stable/11/sys/dev/iwm/if_iwm.c > Directory Properties: > stable/11/ (props changed) > > Modified: stable/11/sys/dev/iwm/if_iwm.c > ============================================================ > ================== > --- stable/11/sys/dev/iwm/if_iwm.c Sun Mar 11 20:13:15 2018 > (r330783) > +++ stable/11/sys/dev/iwm/if_iwm.c Sun Mar 11 22:49:46 2018 > (r330784) > @@ -547,14 +547,12 @@ iwm_read_firmware(struct iwm_softc *sc, enum > iwm_ucode > { > struct iwm_fw_info *fw = &sc->sc_fw; > const struct iwm_tlv_ucode_header *uhdr; > - const struct iwm_ucode_tlv *tlv; > + struct iwm_ucode_tlv tlv; > struct iwm_ucode_capabilities *capa = &sc->ucode_capa; > enum iwm_ucode_tlv_type tlv_type; > const struct firmware *fwp; > const uint8_t *data; > - uint32_t tlv_len; > uint32_t usniffer_img; > - const uint8_t *tlv_data; > uint32_t paging_mem_size; > int num_of_cpus; > int error = 0; > @@ -607,21 +605,25 @@ iwm_read_firmware(struct iwm_softc *sc, enum > iwm_ucode > goto out; > } > > - snprintf(sc->sc_fwver, sizeof(sc->sc_fwver), "%u.%u (API ver %u)", > + snprintf(sc->sc_fwver, sizeof(sc->sc_fwver), "%d.%d (API ver %d)", > IWM_UCODE_MAJOR(le32toh(uhdr->ver)), > IWM_UCODE_MINOR(le32toh(uhdr->ver)), > IWM_UCODE_API(le32toh(uhdr->ver))); > data = uhdr->data; > len = fw->fw_fp->datasize - sizeof(*uhdr); > > - while (len >= sizeof(*tlv)) { > - len -= sizeof(*tlv); > - tlv = (const void *)data; > + while (len >= sizeof(tlv)) { > + size_t tlv_len; > + const void *tlv_data; > > - tlv_len = le32toh(tlv->length); > - tlv_type = le32toh(tlv->type); > - tlv_data = tlv->data; > + memcpy(&tlv, data, sizeof(tlv)); > + tlv_len = le32toh(tlv.length); > + tlv_type = le32toh(tlv.type); > > + len -= sizeof(tlv); > + data += sizeof(tlv); > + tlv_data = data; > + > if (len < tlv_len) { > device_printf(sc->sc_dev, > "firmware too short: %zu bytes\n", > @@ -629,21 +631,19 @@ iwm_read_firmware(struct iwm_softc *sc, enum > iwm_ucode > error = EINVAL; > goto parse_out; > } > - len -= roundup2(tlv_len, 4); > - data += sizeof(tlv) + roundup2(tlv_len, 4); > > switch ((int)tlv_type) { > case IWM_UCODE_TLV_PROBE_MAX_LEN: > - if (tlv_len != sizeof(uint32_t)) { > + if (tlv_len < sizeof(uint32_t)) { > device_printf(sc->sc_dev, > - "%s: PROBE_MAX_LEN (%d) != > sizeof(uint32_t)\n", > + "%s: PROBE_MAX_LEN (%d) < > sizeof(uint32_t)\n", > __func__, > (int) tlv_len); > error = EINVAL; > goto parse_out; > } > capa->max_probe_length = > - le32_to_cpup((const uint32_t *)tlv_data); > + le32toh(*(const uint32_t *)tlv_data); > /* limit it to something sensible */ > if (capa->max_probe_length > > IWM_SCAN_OFFLOAD_PROBE_REQ_SIZE) { > @@ -674,14 +674,6 @@ iwm_read_firmware(struct iwm_softc *sc, enum iwm_ucode > error = EINVAL; > goto parse_out; > } > - if (tlv_len % sizeof(uint32_t)) { > - device_printf(sc->sc_dev, > - "%s: IWM_UCODE_TLV_FLAGS: tlv_len (%d) > %% sizeof(uint32_t)\n", > - __func__, > - (int) tlv_len); > - error = EINVAL; > - goto parse_out; > - } > /* > * Apparently there can be many flags, but Linux > driver > * parses only the first one, and so do we. > @@ -693,7 +685,7 @@ iwm_read_firmware(struct iwm_softc *sc, enum iwm_ucode > * 2) TLV_FLAGS contains TLV_FLAGS_PAN > * ==> this resets TLV_PAN to itself... hnnnk > */ > - capa->flags = le32_to_cpup((const uint32_t > *)tlv_data); > + capa->flags = le32toh(*(const uint32_t *)tlv_data); > break; > case IWM_UCODE_TLV_CSCHEME: > if ((error = iwm_store_cscheme(sc, > @@ -714,7 +706,7 @@ iwm_read_firmware(struct iwm_softc *sc, enum iwm_ucode > error = EINVAL; > goto parse_out; > } > - num_of_cpus = le32_to_cpup((const uint32_t > *)tlv_data); > + num_of_cpus = le32toh(*(const uint32_t *)tlv_data); > if (num_of_cpus == 2) { > fw->fw_sects[IWM_UCODE_REGULAR].is_dual_cpus > = > TRUE; > @@ -788,7 +780,7 @@ iwm_read_firmware(struct iwm_softc *sc, enum iwm_ucode > goto parse_out; > } > sc->sc_fw.phy_config = > - le32_to_cpup((const uint32_t *)tlv_data); > + le32toh(*(const uint32_t *)tlv_data); > sc->sc_fw.valid_tx_ant = (sc->sc_fw.phy_config & > IWM_FW_PHY_CFG_TX_CHAIN) > >> > > IWM_FW_PHY_CFG_TX_CHAIN_POS; > @@ -839,7 +831,7 @@ iwm_read_firmware(struct iwm_softc *sc, enum iwm_ucode > error = EINVAL; > goto parse_out; > } > - paging_mem_size = le32_to_cpup((const uint32_t > *)tlv_data); > + paging_mem_size = le32toh(*(const uint32_t > *)tlv_data); > > IWM_DPRINTF(sc, IWM_DEBUG_FIRMWARE_TLV, > "%s: Paging: paging enabled (size = %u > bytes)\n", > @@ -872,7 +864,7 @@ iwm_read_firmware(struct iwm_softc *sc, enum iwm_ucode > goto parse_out; > } > capa->n_scan_channels = > - le32_to_cpup((const uint32_t *)tlv_data); > + le32toh(*(const uint32_t *)tlv_data); > break; > > case IWM_UCODE_TLV_FW_VERSION: > @@ -897,6 +889,9 @@ iwm_read_firmware(struct iwm_softc *sc, enum iwm_ucode > error = EINVAL; > goto parse_out; > } > + > + len -= roundup(tlv_len, 4); > + data += roundup(tlv_len, 4); > } > > KASSERT(error == 0, ("unhandled error")); > _______________________________________________ > 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" > From owner-svn-src-stable@freebsd.org Mon Mar 12 15:57:56 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8E795F50F22; Mon, 12 Mar 2018 15:57:56 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3FCC9827EB; Mon, 12 Mar 2018 15:57:56 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 360B05DDF; Mon, 12 Mar 2018 15:57:56 +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 w2CFvuut057957; Mon, 12 Mar 2018 15:57:56 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2CFvtYF057954; Mon, 12 Mar 2018 15:57:55 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201803121557.w2CFvtYF057954@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Mon, 12 Mar 2018 15:57:55 +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: r330800 - stable/11/lib/libc/sys X-SVN-Group: stable-11 X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: stable/11/lib/libc/sys X-SVN-Commit-Revision: 330800 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Mar 2018 15:57:56 -0000 Author: brooks Date: Mon Mar 12 15:57:55 2018 New Revision: 330800 URL: https://svnweb.freebsd.org/changeset/base/330800 Log: MFC r330409: Refer to SysV IPC permissions as numeric constants. POSIX defines no macros for these permissions. Also remove unneeded headers from synopsis. PR: 225905 Reviewed by: wblock Differential Revision: https://reviews.freebsd.org/D14461 Modified: stable/11/lib/libc/sys/msgget.2 stable/11/lib/libc/sys/semget.2 stable/11/lib/libc/sys/shmget.2 Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libc/sys/msgget.2 ============================================================================== --- stable/11/lib/libc/sys/msgget.2 Mon Mar 12 15:45:50 2018 (r330799) +++ stable/11/lib/libc/sys/msgget.2 Mon Mar 12 15:57:55 2018 (r330800) @@ -31,7 +31,7 @@ .\" $FreeBSD$ .\" .\"/ -.Dd July 9, 2009 +.Dd March 4, 2018 .Dt MSGGET 2 .Os .Sh NAME @@ -40,8 +40,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h -.In sys/ipc.h .In sys/msg.h .Ft int .Fn msgget "key_t key" "int msgflg" @@ -83,7 +81,22 @@ are set to the effective gid of the calling process. .It .Va msg_perm.mode is set to the lower 9 bits of -.Fa msgflg . +.Fa msgflg +which are set by ORing these constants: +.Bl -tag -width 0000 +.It Dv 0400 +Read access for user. +.It Dv 0200 +Write access for user. +.It Dv 0040 +Read access for group. +.It Dv 0020 +Write access for group. +.It Dv 0004 +Read access for other. +.It Dv 0002 +Write access for other. +.El .It .Va msg_cbytes , .Va msg_qnum , Modified: stable/11/lib/libc/sys/semget.2 ============================================================================== --- stable/11/lib/libc/sys/semget.2 Mon Mar 12 15:45:50 2018 (r330799) +++ stable/11/lib/libc/sys/semget.2 Mon Mar 12 15:57:55 2018 (r330800) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 7, 2016 +.Dd March 4, 2018 .Dt SEMGET 2 .Os .Sh NAME @@ -34,8 +34,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h -.In sys/ipc.h .In sys/sem.h .Ft int .Fn semget "key_t key" "int nsems" "int flag" @@ -77,23 +75,22 @@ may be used to generate a key from a pathname. .\" Likewise for this section, except SHM_* becomes SEM_*. .\" .Pp -The mode of a newly created IPC object is determined by -.Em OR Ns 'ing -the following constants into the +The mode of a newly created IPC object is determined by ORing these constants +into the .Fa flag argument: -.Bl -tag -width XSEM_WXX6XXX -.It Dv SEM_R +.Bl -tag -width 0000 +.It Dv 0400 Read access for user. -.It Dv SEM_A +.It Dv 0200 Alter access for user. -.It Dv ( SEM_R>>3 ) +.It Dv 0040 Read access for group. -.It Dv ( SEM_A>>3 ) +.It Dv 0020 Alter access for group. -.It Dv ( SEM_R>>6 ) +.It Dv 0004 Read access for other. -.It Dv ( SEM_A>>6 ) +.It Dv 0002 Alter access for other. .El .Pp Modified: stable/11/lib/libc/sys/shmget.2 ============================================================================== --- stable/11/lib/libc/sys/shmget.2 Mon Mar 12 15:45:50 2018 (r330799) +++ stable/11/lib/libc/sys/shmget.2 Mon Mar 12 15:57:55 2018 (r330800) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 17, 2010 +.Dd March 4, 2018 .Dt SHMGET 2 .Os .Sh NAME @@ -34,8 +34,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h -.In sys/ipc.h .In sys/shm.h .Ft int .Fn shmget "key_t key" "size_t size" "int flag" @@ -74,22 +72,21 @@ may be used to generate a key from a pathname. .El .Pp The mode of a newly created IPC object is determined by -.Em OR Ns 'ing -the following constants into the +which are set by ORing these constants into the .Fa flag argument: -.Bl -tag -width XSHM_WXX6XXX -.It Dv S_IRUSR +.Bl -tag -width 0000 +.It Dv 0400 Read access for owner. -.It Dv S_IWUSR +.It Dv 0200 Write access for owner. -.It Dv S_IRGRP +.It Dv 0040 Read access for group. -.It Dv S_IWGRP +.It Dv 0020 Write access for group. -.It Dv S_IROTH +.It Dv 0004 Read access for other. -.It Dv S_IWOTH +.It Dv 0002 Write access for other. .El .\" @@ -142,5 +139,4 @@ already exists. .Xr shmat 2 , .Xr shmctl 2 , .Xr shmdt 2 , -.Xr stat 2 , .Xr ftok 3 From owner-svn-src-stable@freebsd.org Mon Mar 12 16:04:11 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AE849F51686; Mon, 12 Mar 2018 16:04:11 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5CF1A82EA4; Mon, 12 Mar 2018 16:04:11 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 533A25F60; Mon, 12 Mar 2018 16:04:11 +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 w2CG4BPk063014; Mon, 12 Mar 2018 16:04:11 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2CG4Ac2063011; Mon, 12 Mar 2018 16:04:10 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201803121604.w2CG4Ac2063011@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Mon, 12 Mar 2018 16:04:10 +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: r330801 - stable/10/lib/libc/sys X-SVN-Group: stable-10 X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: stable/10/lib/libc/sys X-SVN-Commit-Revision: 330801 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Mar 2018 16:04:11 -0000 Author: brooks Date: Mon Mar 12 16:04:10 2018 New Revision: 330801 URL: https://svnweb.freebsd.org/changeset/base/330801 Log: MFC r330409: Refer to SysV IPC permissions as numeric constants. POSIX defines no macros for these permissions. Also remove unneeded headers from synopsis. PR: 225905 Reviewed by: wblock Differential Revision: https://reviews.freebsd.org/D14461 Modified: stable/10/lib/libc/sys/msgget.2 stable/10/lib/libc/sys/semget.2 stable/10/lib/libc/sys/shmget.2 Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/sys/msgget.2 ============================================================================== --- stable/10/lib/libc/sys/msgget.2 Mon Mar 12 15:57:55 2018 (r330800) +++ stable/10/lib/libc/sys/msgget.2 Mon Mar 12 16:04:10 2018 (r330801) @@ -31,7 +31,7 @@ .\" $FreeBSD$ .\" .\"/ -.Dd July 9, 2009 +.Dd March 4, 2018 .Dt MSGGET 2 .Os .Sh NAME @@ -40,8 +40,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h -.In sys/ipc.h .In sys/msg.h .Ft int .Fn msgget "key_t key" "int msgflg" @@ -83,7 +81,22 @@ are set to the effective gid of the calling process. .It .Va msg_perm.mode is set to the lower 9 bits of -.Fa msgflg . +.Fa msgflg +which are set by ORing these constants: +.Bl -tag -width 0000 +.It Dv 0400 +Read access for user. +.It Dv 0200 +Write access for user. +.It Dv 0040 +Read access for group. +.It Dv 0020 +Write access for group. +.It Dv 0004 +Read access for other. +.It Dv 0002 +Write access for other. +.El .It .Va msg_cbytes , .Va msg_qnum , Modified: stable/10/lib/libc/sys/semget.2 ============================================================================== --- stable/10/lib/libc/sys/semget.2 Mon Mar 12 15:57:55 2018 (r330800) +++ stable/10/lib/libc/sys/semget.2 Mon Mar 12 16:04:10 2018 (r330801) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 7, 2016 +.Dd March 4, 2018 .Dt SEMGET 2 .Os .Sh NAME @@ -34,8 +34,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h -.In sys/ipc.h .In sys/sem.h .Ft int .Fn semget "key_t key" "int nsems" "int flag" @@ -77,23 +75,22 @@ may be used to generate a key from a pathname. .\" Likewise for this section, except SHM_* becomes SEM_*. .\" .Pp -The mode of a newly created IPC object is determined by -.Em OR Ns 'ing -the following constants into the +The mode of a newly created IPC object is determined by ORing these constants +into the .Fa flag argument: -.Bl -tag -width XSEM_WXX6XXX -.It Dv SEM_R +.Bl -tag -width 0000 +.It Dv 0400 Read access for user. -.It Dv SEM_A +.It Dv 0200 Alter access for user. -.It Dv ( SEM_R>>3 ) +.It Dv 0040 Read access for group. -.It Dv ( SEM_A>>3 ) +.It Dv 0020 Alter access for group. -.It Dv ( SEM_R>>6 ) +.It Dv 0004 Read access for other. -.It Dv ( SEM_A>>6 ) +.It Dv 0002 Alter access for other. .El .Pp Modified: stable/10/lib/libc/sys/shmget.2 ============================================================================== --- stable/10/lib/libc/sys/shmget.2 Mon Mar 12 15:57:55 2018 (r330800) +++ stable/10/lib/libc/sys/shmget.2 Mon Mar 12 16:04:10 2018 (r330801) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 17, 2010 +.Dd March 4, 2018 .Dt SHMGET 2 .Os .Sh NAME @@ -34,8 +34,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h -.In sys/ipc.h .In sys/shm.h .Ft int .Fn shmget "key_t key" "size_t size" "int flag" @@ -74,22 +72,21 @@ may be used to generate a key from a pathname. .El .Pp The mode of a newly created IPC object is determined by -.Em OR Ns 'ing -the following constants into the +which are set by ORing these constants into the .Fa flag argument: -.Bl -tag -width XSHM_WXX6XXX -.It Dv S_IRUSR +.Bl -tag -width 0000 +.It Dv 0400 Read access for owner. -.It Dv S_IWUSR +.It Dv 0200 Write access for owner. -.It Dv S_IRGRP +.It Dv 0040 Read access for group. -.It Dv S_IWGRP +.It Dv 0020 Write access for group. -.It Dv S_IROTH +.It Dv 0004 Read access for other. -.It Dv S_IWOTH +.It Dv 0002 Write access for other. .El .\" @@ -142,5 +139,4 @@ already exists. .Xr shmat 2 , .Xr shmctl 2 , .Xr shmdt 2 , -.Xr stat 2 , .Xr ftok 3 From owner-svn-src-stable@freebsd.org Mon Mar 12 17:36:38 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 72F41F2EDE8; Mon, 12 Mar 2018 17:36:38 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 227A587A48; Mon, 12 Mar 2018 17:36:38 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 18D026D25; Mon, 12 Mar 2018 17:36:38 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2CHabCq008106; Mon, 12 Mar 2018 17:36:37 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2CHabOT008099; Mon, 12 Mar 2018 17:36:37 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201803121736.w2CHabOT008099@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Mon, 12 Mar 2018 17:36: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: r330804 - stable/11/usr.sbin/ppp X-SVN-Group: stable-11 X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: stable/11/usr.sbin/ppp X-SVN-Commit-Revision: 330804 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Mar 2018 17:36:38 -0000 Author: eugen Date: Mon Mar 12 17:36:37 2018 New Revision: 330804 URL: https://svnweb.freebsd.org/changeset/base/330804 Log: MFC r329105: ppp(8): fix code producing debugging logs ppp(8): fix code producing debugging logs Fix several cases when long buffer is copied to shorter one using snprintf that results in contents truncation and clobbering unsaved errno value and creation of misleading logs. PR: 218517 Approved by: mav (mentor) Modified: stable/11/usr.sbin/ppp/defs.h stable/11/usr.sbin/ppp/iface.c stable/11/usr.sbin/ppp/ip.c stable/11/usr.sbin/ppp/ipv6cp.c stable/11/usr.sbin/ppp/ncpaddr.c stable/11/usr.sbin/ppp/route.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/ppp/defs.h ============================================================================== --- stable/11/usr.sbin/ppp/defs.h Mon Mar 12 17:05:53 2018 (r330803) +++ stable/11/usr.sbin/ppp/defs.h Mon Mar 12 17:36:37 2018 (r330804) @@ -119,6 +119,8 @@ #define ROUNDUP(x) ((x) ? (1 + (((x) - 1) | (sizeof(long) - 1))) : sizeof(long)) +#define NCP_ASCIIBUFFERSIZE 52 + #ifdef __NetBSD__ extern void randinit(void); #else Modified: stable/11/usr.sbin/ppp/iface.c ============================================================================== --- stable/11/usr.sbin/ppp/iface.c Mon Mar 12 17:05:53 2018 (r330803) +++ stable/11/usr.sbin/ppp/iface.c Mon Mar 12 17:36:37 2018 (r330804) @@ -208,7 +208,7 @@ iface_addr_Zap(const char *name, struct iface_addr *ad #endif struct sockaddr_in *me4, *msk4, *peer4; struct sockaddr_storage ssme, sspeer, ssmsk; - int res; + int res, saved_errno; ncprange_getsa(&addr->ifa, &ssme, &ssmsk); ncpaddr_getsa(&addr->peer, &sspeer); @@ -234,8 +234,9 @@ iface_addr_Zap(const char *name, struct iface_addr *ad memcpy(peer4, &sspeer, sizeof *peer4); res = ID0ioctl(s, SIOCDIFADDR, &ifra); + saved_errno = errno; if (log_IsKept(LogDEBUG)) { - char buf[100]; + char buf[NCP_ASCIIBUFFERSIZE]; snprintf(buf, sizeof buf, "%s", ncprange_ntoa(&addr->ifa)); log_Printf(LogWARN, "%s: DIFADDR %s -> %s returns %d\n", @@ -259,12 +260,13 @@ iface_addr_Zap(const char *name, struct iface_addr *ad ifra6.ifra_lifetime.ia6t_pltime = ND6_INFINITE_LIFETIME; res = ID0ioctl(s, SIOCDIFADDR_IN6, &ifra6); + saved_errno = errno; break; #endif } if (res == -1) { - char dst[40]; + char dst[NCP_ASCIIBUFFERSIZE]; const char *end = #ifndef NOINET6 ncprange_family(&addr->ifa) == AF_INET6 ? "_IN6" : @@ -273,11 +275,11 @@ iface_addr_Zap(const char *name, struct iface_addr *ad if (ncpaddr_family(&addr->peer) == AF_UNSPEC) log_Printf(LogWARN, "iface rm: ioctl(SIOCDIFADDR%s, %s): %s\n", - end, ncprange_ntoa(&addr->ifa), strerror(errno)); + end, ncprange_ntoa(&addr->ifa), strerror(saved_errno)); else { snprintf(dst, sizeof dst, "%s", ncpaddr_ntoa(&addr->peer)); log_Printf(LogWARN, "iface rm: ioctl(SIOCDIFADDR%s, %s -> %s): %s\n", - end, ncprange_ntoa(&addr->ifa), dst, strerror(errno)); + end, ncprange_ntoa(&addr->ifa), dst, strerror(saved_errno)); } } @@ -293,7 +295,7 @@ iface_addr_Add(const char *name, struct iface_addr *ad #endif struct sockaddr_in *me4, *msk4, *peer4; struct sockaddr_storage ssme, sspeer, ssmsk; - int res; + int res, saved_errno; ncprange_getsa(&addr->ifa, &ssme, &ssmsk); ncpaddr_getsa(&addr->peer, &sspeer); @@ -319,8 +321,9 @@ iface_addr_Add(const char *name, struct iface_addr *ad memcpy(peer4, &sspeer, sizeof *peer4); res = ID0ioctl(s, SIOCAIFADDR, &ifra); + saved_errno = errno; if (log_IsKept(LogDEBUG)) { - char buf[100]; + char buf[NCP_ASCIIBUFFERSIZE]; snprintf(buf, sizeof buf, "%s", ncprange_ntoa(&addr->ifa)); log_Printf(LogWARN, "%s: AIFADDR %s -> %s returns %d\n", @@ -344,12 +347,13 @@ iface_addr_Add(const char *name, struct iface_addr *ad ifra6.ifra_lifetime.ia6t_pltime = ND6_INFINITE_LIFETIME; res = ID0ioctl(s, SIOCAIFADDR_IN6, &ifra6); + saved_errno = errno; break; #endif } if (res == -1) { - char dst[40]; + char dst[NCP_ASCIIBUFFERSIZE]; const char *end = #ifndef NOINET6 ncprange_family(&addr->ifa) == AF_INET6 ? "_IN6" : @@ -358,11 +362,11 @@ iface_addr_Add(const char *name, struct iface_addr *ad if (ncpaddr_family(&addr->peer) == AF_UNSPEC) log_Printf(LogWARN, "iface add: ioctl(SIOCAIFADDR%s, %s): %s\n", - end, ncprange_ntoa(&addr->ifa), strerror(errno)); + end, ncprange_ntoa(&addr->ifa), strerror(saved_errno)); else { snprintf(dst, sizeof dst, "%s", ncpaddr_ntoa(&addr->peer)); log_Printf(LogWARN, "iface add: ioctl(SIOCAIFADDR%s, %s -> %s): %s\n", - end, ncprange_ntoa(&addr->ifa), dst, strerror(errno)); + end, ncprange_ntoa(&addr->ifa), dst, strerror(saved_errno)); } } Modified: stable/11/usr.sbin/ppp/ip.c ============================================================================== --- stable/11/usr.sbin/ppp/ip.c Mon Mar 12 17:05:53 2018 (r330803) +++ stable/11/usr.sbin/ppp/ip.c Mon Mar 12 17:36:37 2018 (r330804) @@ -226,7 +226,7 @@ FilterCheck(const unsigned char *packet, int match; /* true if condition matched */ int mindata; /* minimum data size or zero */ const struct filterent *fp = filter->rule; - char dbuff[100], dstip[16]; + char dbuff[100], dstip[NCP_ASCIIBUFFERSIZE]; struct ncpaddr srcaddr, dstaddr; const char *payload; /* IP payload */ int datalen; /* IP datagram length */ Modified: stable/11/usr.sbin/ppp/ipv6cp.c ============================================================================== --- stable/11/usr.sbin/ppp/ipv6cp.c Mon Mar 12 17:05:53 2018 (r330803) +++ stable/11/usr.sbin/ppp/ipv6cp.c Mon Mar 12 17:36:37 2018 (r330804) @@ -467,7 +467,7 @@ ipv6cp_LayerUp(struct fsm *fp) { /* We're now up */ struct ipv6cp *ipv6cp = fsm2ipv6cp(fp); - char tbuff[40]; + char tbuff[NCP_ASCIIBUFFERSIZE]; log_Printf(LogIPV6CP, "%s: LayerUp.\n", fp->link->name); if (!ipv6cp_InterfaceUp(ipv6cp)) @@ -524,7 +524,7 @@ ipv6cp_LayerDown(struct fsm *fp) /* About to come down */ struct ipv6cp *ipv6cp = fsm2ipv6cp(fp); static int recursing; - char addr[40]; + char addr[NCP_ASCIIBUFFERSIZE]; if (!recursing++) { snprintf(addr, sizeof addr, "%s", ncpaddr_ntoa(&ipv6cp->myaddr)); Modified: stable/11/usr.sbin/ppp/ncpaddr.c ============================================================================== --- stable/11/usr.sbin/ppp/ncpaddr.c Mon Mar 12 17:05:53 2018 (r330803) +++ stable/11/usr.sbin/ppp/ncpaddr.c Mon Mar 12 17:36:37 2018 (r330804) @@ -78,8 +78,6 @@ #define ncpaddr_ip6addr u.ip6addr #endif -#define NCP_ASCIIBUFFERSIZE 52 - static struct in_addr bits2mask4(int bits) { Modified: stable/11/usr.sbin/ppp/route.c ============================================================================== --- stable/11/usr.sbin/ppp/route.c Mon Mar 12 17:05:53 2018 (r330803) +++ stable/11/usr.sbin/ppp/route.c Mon Mar 12 17:36:37 2018 (r330804) @@ -437,7 +437,7 @@ route_IfDelete(struct bundle *bundle, int all) ) && (all || (rtm->rtm_flags & RTF_GATEWAY))) { if (log_IsKept(LogDEBUG)) { - char gwstr[41]; + char gwstr[NCP_ASCIIBUFFERSIZE]; struct ncpaddr gw; ncprange_setsa(&range, sa[RTAX_DST], sa[RTAX_NETMASK]); ncpaddr_setsa(&gw, sa[RTAX_GATEWAY]); @@ -843,7 +843,7 @@ failed: } if (log_IsKept(LogDEBUG)) { - char gwstr[40]; + char gwstr[NCP_ASCIIBUFFERSIZE]; if (gw) snprintf(gwstr, sizeof gwstr, "%s", ncpaddr_ntoa(gw)); From owner-svn-src-stable@freebsd.org Mon Mar 12 17:37:39 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 551B2F2EFCE; Mon, 12 Mar 2018 17:37:39 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0A37387C21; Mon, 12 Mar 2018 17:37:39 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 053FD6D2A; Mon, 12 Mar 2018 17:37:39 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2CHbclB008204; Mon, 12 Mar 2018 17:37:38 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2CHbcWX008197; Mon, 12 Mar 2018 17:37:38 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201803121737.w2CHbcWX008197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Mon, 12 Mar 2018 17:37: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: r330805 - stable/10/usr.sbin/ppp X-SVN-Group: stable-10 X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: stable/10/usr.sbin/ppp X-SVN-Commit-Revision: 330805 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Mar 2018 17:37:39 -0000 Author: eugen Date: Mon Mar 12 17:37:38 2018 New Revision: 330805 URL: https://svnweb.freebsd.org/changeset/base/330805 Log: MFC r329105: ppp(8): fix code producing debugging logs ppp(8): fix code producing debugging logs Fix several cases when long buffer is copied to shorter one using snprintf that results in contents truncation and clobbering unsaved errno value and creation of misleading logs. PR: 218517 Approved by: mav (mentor) Modified: stable/10/usr.sbin/ppp/defs.h stable/10/usr.sbin/ppp/iface.c stable/10/usr.sbin/ppp/ip.c stable/10/usr.sbin/ppp/ipv6cp.c stable/10/usr.sbin/ppp/ncpaddr.c stable/10/usr.sbin/ppp/route.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/ppp/defs.h ============================================================================== --- stable/10/usr.sbin/ppp/defs.h Mon Mar 12 17:36:37 2018 (r330804) +++ stable/10/usr.sbin/ppp/defs.h Mon Mar 12 17:37:38 2018 (r330805) @@ -117,6 +117,8 @@ #define ROUNDUP(x) ((x) ? (1 + (((x) - 1) | (sizeof(long) - 1))) : sizeof(long)) +#define NCP_ASCIIBUFFERSIZE 52 + #ifdef __NetBSD__ extern void randinit(void); #else Modified: stable/10/usr.sbin/ppp/iface.c ============================================================================== --- stable/10/usr.sbin/ppp/iface.c Mon Mar 12 17:36:37 2018 (r330804) +++ stable/10/usr.sbin/ppp/iface.c Mon Mar 12 17:37:38 2018 (r330805) @@ -209,7 +209,7 @@ iface_addr_Zap(const char *name, struct iface_addr *ad #endif struct sockaddr_in *me4, *msk4, *peer4; struct sockaddr_storage ssme, sspeer, ssmsk; - int res; + int res, saved_errno; ncprange_getsa(&addr->ifa, &ssme, &ssmsk); ncpaddr_getsa(&addr->peer, &sspeer); @@ -235,8 +235,9 @@ iface_addr_Zap(const char *name, struct iface_addr *ad memcpy(peer4, &sspeer, sizeof *peer4); res = ID0ioctl(s, SIOCDIFADDR, &ifra); + saved_errno = errno; if (log_IsKept(LogDEBUG)) { - char buf[100]; + char buf[NCP_ASCIIBUFFERSIZE]; snprintf(buf, sizeof buf, "%s", ncprange_ntoa(&addr->ifa)); log_Printf(LogWARN, "%s: DIFADDR %s -> %s returns %d\n", @@ -260,12 +261,13 @@ iface_addr_Zap(const char *name, struct iface_addr *ad ifra6.ifra_lifetime.ia6t_pltime = ND6_INFINITE_LIFETIME; res = ID0ioctl(s, SIOCDIFADDR_IN6, &ifra6); + saved_errno = errno; break; #endif } if (res == -1) { - char dst[40]; + char dst[NCP_ASCIIBUFFERSIZE]; const char *end = #ifndef NOINET6 ncprange_family(&addr->ifa) == AF_INET6 ? "_IN6" : @@ -274,11 +276,11 @@ iface_addr_Zap(const char *name, struct iface_addr *ad if (ncpaddr_family(&addr->peer) == AF_UNSPEC) log_Printf(LogWARN, "iface rm: ioctl(SIOCDIFADDR%s, %s): %s\n", - end, ncprange_ntoa(&addr->ifa), strerror(errno)); + end, ncprange_ntoa(&addr->ifa), strerror(saved_errno)); else { snprintf(dst, sizeof dst, "%s", ncpaddr_ntoa(&addr->peer)); log_Printf(LogWARN, "iface rm: ioctl(SIOCDIFADDR%s, %s -> %s): %s\n", - end, ncprange_ntoa(&addr->ifa), dst, strerror(errno)); + end, ncprange_ntoa(&addr->ifa), dst, strerror(saved_errno)); } } @@ -294,7 +296,7 @@ iface_addr_Add(const char *name, struct iface_addr *ad #endif struct sockaddr_in *me4, *msk4, *peer4; struct sockaddr_storage ssme, sspeer, ssmsk; - int res; + int res, saved_errno; ncprange_getsa(&addr->ifa, &ssme, &ssmsk); ncpaddr_getsa(&addr->peer, &sspeer); @@ -320,8 +322,9 @@ iface_addr_Add(const char *name, struct iface_addr *ad memcpy(peer4, &sspeer, sizeof *peer4); res = ID0ioctl(s, SIOCAIFADDR, &ifra); + saved_errno = errno; if (log_IsKept(LogDEBUG)) { - char buf[100]; + char buf[NCP_ASCIIBUFFERSIZE]; snprintf(buf, sizeof buf, "%s", ncprange_ntoa(&addr->ifa)); log_Printf(LogWARN, "%s: AIFADDR %s -> %s returns %d\n", @@ -345,12 +348,13 @@ iface_addr_Add(const char *name, struct iface_addr *ad ifra6.ifra_lifetime.ia6t_pltime = ND6_INFINITE_LIFETIME; res = ID0ioctl(s, SIOCAIFADDR_IN6, &ifra6); + saved_errno = errno; break; #endif } if (res == -1) { - char dst[40]; + char dst[NCP_ASCIIBUFFERSIZE]; const char *end = #ifndef NOINET6 ncprange_family(&addr->ifa) == AF_INET6 ? "_IN6" : @@ -359,11 +363,11 @@ iface_addr_Add(const char *name, struct iface_addr *ad if (ncpaddr_family(&addr->peer) == AF_UNSPEC) log_Printf(LogWARN, "iface add: ioctl(SIOCAIFADDR%s, %s): %s\n", - end, ncprange_ntoa(&addr->ifa), strerror(errno)); + end, ncprange_ntoa(&addr->ifa), strerror(saved_errno)); else { snprintf(dst, sizeof dst, "%s", ncpaddr_ntoa(&addr->peer)); log_Printf(LogWARN, "iface add: ioctl(SIOCAIFADDR%s, %s -> %s): %s\n", - end, ncprange_ntoa(&addr->ifa), dst, strerror(errno)); + end, ncprange_ntoa(&addr->ifa), dst, strerror(saved_errno)); } } Modified: stable/10/usr.sbin/ppp/ip.c ============================================================================== --- stable/10/usr.sbin/ppp/ip.c Mon Mar 12 17:36:37 2018 (r330804) +++ stable/10/usr.sbin/ppp/ip.c Mon Mar 12 17:37:38 2018 (r330805) @@ -224,7 +224,7 @@ FilterCheck(const unsigned char *packet, int match; /* true if condition matched */ int mindata; /* minimum data size or zero */ const struct filterent *fp = filter->rule; - char dbuff[100], dstip[16]; + char dbuff[100], dstip[NCP_ASCIIBUFFERSIZE]; struct ncpaddr srcaddr, dstaddr; const char *payload; /* IP payload */ int datalen; /* IP datagram length */ Modified: stable/10/usr.sbin/ppp/ipv6cp.c ============================================================================== --- stable/10/usr.sbin/ppp/ipv6cp.c Mon Mar 12 17:36:37 2018 (r330804) +++ stable/10/usr.sbin/ppp/ipv6cp.c Mon Mar 12 17:37:38 2018 (r330805) @@ -465,7 +465,7 @@ ipv6cp_LayerUp(struct fsm *fp) { /* We're now up */ struct ipv6cp *ipv6cp = fsm2ipv6cp(fp); - char tbuff[40]; + char tbuff[NCP_ASCIIBUFFERSIZE]; log_Printf(LogIPV6CP, "%s: LayerUp.\n", fp->link->name); if (!ipv6cp_InterfaceUp(ipv6cp)) @@ -522,7 +522,7 @@ ipv6cp_LayerDown(struct fsm *fp) /* About to come down */ struct ipv6cp *ipv6cp = fsm2ipv6cp(fp); static int recursing; - char addr[40]; + char addr[NCP_ASCIIBUFFERSIZE]; if (!recursing++) { snprintf(addr, sizeof addr, "%s", ncpaddr_ntoa(&ipv6cp->myaddr)); Modified: stable/10/usr.sbin/ppp/ncpaddr.c ============================================================================== --- stable/10/usr.sbin/ppp/ncpaddr.c Mon Mar 12 17:36:37 2018 (r330804) +++ stable/10/usr.sbin/ppp/ncpaddr.c Mon Mar 12 17:37:38 2018 (r330805) @@ -76,8 +76,6 @@ #define ncpaddr_ip6addr u.ip6addr #endif -#define NCP_ASCIIBUFFERSIZE 52 - static struct in_addr bits2mask4(int bits) { Modified: stable/10/usr.sbin/ppp/route.c ============================================================================== --- stable/10/usr.sbin/ppp/route.c Mon Mar 12 17:36:37 2018 (r330804) +++ stable/10/usr.sbin/ppp/route.c Mon Mar 12 17:37:38 2018 (r330805) @@ -435,7 +435,7 @@ route_IfDelete(struct bundle *bundle, int all) ) && (all || (rtm->rtm_flags & RTF_GATEWAY))) { if (log_IsKept(LogDEBUG)) { - char gwstr[41]; + char gwstr[NCP_ASCIIBUFFERSIZE]; struct ncpaddr gw; ncprange_setsa(&range, sa[RTAX_DST], sa[RTAX_NETMASK]); ncpaddr_setsa(&gw, sa[RTAX_GATEWAY]); @@ -840,7 +840,7 @@ failed: } if (log_IsKept(LogDEBUG)) { - char gwstr[40]; + char gwstr[NCP_ASCIIBUFFERSIZE]; if (gw) snprintf(gwstr, sizeof gwstr, "%s", ncpaddr_ntoa(gw)); From owner-svn-src-stable@freebsd.org Tue Mar 13 01:19:08 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1EB0AA7EEFB; Tue, 13 Mar 2018 01:19:08 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C42FB7E2A1; Tue, 13 Mar 2018 01:19: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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BEEEF133E8; Tue, 13 Mar 2018 01:19: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 w2D1J7QV048778; Tue, 13 Mar 2018 01:19:07 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2D1J7sn048777; Tue, 13 Mar 2018 01:19:07 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201803130119.w2D1J7sn048777@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Tue, 13 Mar 2018 01:19:07 +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: r330824 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-11 X-SVN-Commit-Author: mav X-SVN-Commit-Paths: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Commit-Revision: 330824 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 01:19:08 -0000 Author: mav Date: Tue Mar 13 01:19:07 2018 New Revision: 330824 URL: https://svnweb.freebsd.org/changeset/base/330824 Log: MFC r330048: Add sysctls/tunables for dbuf cache size. Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c Tue Mar 13 00:40:05 2018 (r330823) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c Tue Mar 13 01:19:07 2018 (r330824) @@ -133,6 +133,16 @@ int dbuf_cache_max_shift = 5; uint_t dbuf_cache_hiwater_pct = 10; uint_t dbuf_cache_lowater_pct = 10; +SYSCTL_DECL(_vfs_zfs); +SYSCTL_QUAD(_vfs_zfs, OID_AUTO, dbuf_cache_max_bytes, CTLFLAG_RWTUN, + &dbuf_cache_max_bytes, 0, "dbuf cache size in bytes"); +SYSCTL_INT(_vfs_zfs, OID_AUTO, dbuf_cache_max_shift, CTLFLAG_RDTUN, + &dbuf_cache_max_shift, 0, "dbuf size as log2 fraction of ARC"); +SYSCTL_UINT(_vfs_zfs, OID_AUTO, dbuf_cache_hiwater_pct, CTLFLAG_RWTUN, + &dbuf_cache_hiwater_pct, 0, "max percents above the dbuf cache size"); +SYSCTL_UINT(_vfs_zfs, OID_AUTO, dbuf_cache_lowater_pct, CTLFLAG_RWTUN, + &dbuf_cache_lowater_pct, 0, "max percents below the dbuf cache size"); + /* ARGSUSED */ static int dbuf_cons(void *vdb, void *unused, int kmflag) From owner-svn-src-stable@freebsd.org Tue Mar 13 08:45:07 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9422AF2D5F2; Tue, 13 Mar 2018 08:45:07 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3F9A570C28; Tue, 13 Mar 2018 08:45:07 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3A92C17BAC; Tue, 13 Mar 2018 08:45:07 +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 w2D8j7EH073635; Tue, 13 Mar 2018 08:45:07 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2D8j7Ep073634; Tue, 13 Mar 2018 08:45:07 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201803130845.w2D8j7Ep073634@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Tue, 13 Mar 2018 08:45:07 +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: r330829 - stable/11/sys/net X-SVN-Group: stable-11 X-SVN-Commit-Author: ae X-SVN-Commit-Paths: stable/11/sys/net X-SVN-Commit-Revision: 330829 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 08:45:07 -0000 Author: ae Date: Tue Mar 13 08:45:06 2018 New Revision: 330829 URL: https://svnweb.freebsd.org/changeset/base/330829 Log: MFC r330536: Define ethernet type 0x88A8 as ETHERTYPE_QINQ. Reviewed by: kp Obtained from: OpenBSD Differential Revision: https://reviews.freebsd.org/D14593 Modified: stable/11/sys/net/ethernet.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/net/ethernet.h ============================================================================== --- stable/11/sys/net/ethernet.h Tue Mar 13 03:54:41 2018 (r330828) +++ stable/11/sys/net/ethernet.h Tue Mar 13 08:45:06 2018 (r330829) @@ -341,6 +341,7 @@ struct ether_vlan_header { #define ETHERTYPE_PPPOE 0x8864 /* PPP Over Ethernet Session Stage */ #define ETHERTYPE_LANPROBE 0x8888 /* HP LanProbe test? */ #define ETHERTYPE_PAE 0x888e /* EAPOL PAE/802.1x */ +#define ETHERTYPE_QINQ 0x88A8 /* 802.1ad VLAN stacking */ #define ETHERTYPE_LOOPBACK 0x9000 /* Loopback: used to test interfaces */ #define ETHERTYPE_LBACK ETHERTYPE_LOOPBACK /* DEC MOP loopback */ #define ETHERTYPE_XNSSM 0x9001 /* 3Com (Formerly Bridge Communications), XNS Systems Management */ From owner-svn-src-stable@freebsd.org Tue Mar 13 08:46:48 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A4D29F2D85E; Tue, 13 Mar 2018 08:46:48 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4602970DDD; Tue, 13 Mar 2018 08:46:48 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 40E4817BB0; Tue, 13 Mar 2018 08:46:48 +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 w2D8kmsV073749; Tue, 13 Mar 2018 08:46:48 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2D8klPu073747; Tue, 13 Mar 2018 08:46:47 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201803130846.w2D8klPu073747@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Tue, 13 Mar 2018 08:46:47 +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: r330830 - in stable/11/sys: compat/linuxkpi/common/include/linux dev/mlx4/mlx4_core X-SVN-Group: stable-11 X-SVN-Commit-Author: ae X-SVN-Commit-Paths: in stable/11/sys: compat/linuxkpi/common/include/linux dev/mlx4/mlx4_core X-SVN-Commit-Revision: 330830 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 08:46:48 -0000 Author: ae Date: Tue Mar 13 08:46:47 2018 New Revision: 330830 URL: https://svnweb.freebsd.org/changeset/base/330830 Log: MFC r330537: Add mapping for several ethernet types used by Linux to FreeBSD ethernet types. Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D14594 Modified: stable/11/sys/compat/linuxkpi/common/include/linux/if_ether.h stable/11/sys/dev/mlx4/mlx4_core/mlx4.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/include/linux/if_ether.h ============================================================================== --- stable/11/sys/compat/linuxkpi/common/include/linux/if_ether.h Tue Mar 13 08:45:06 2018 (r330829) +++ stable/11/sys/compat/linuxkpi/common/include/linux/if_ether.h Tue Mar 13 08:46:47 2018 (r330830) @@ -35,8 +35,6 @@ #include -#define ETH_P_8021Q ETHERTYPE_VLAN - #define ETH_HLEN ETHER_HDR_LEN /* Total octets in header. */ #ifndef ETH_ALEN #define ETH_ALEN ETHER_ADDR_LEN @@ -47,6 +45,11 @@ /* * defined Ethernet Protocol ID's. */ -#define ETH_P_IP 0x0800 /* Internet Protocol packet */ +#define ETH_P_IP ETHERTYPE_IP +#define ETH_P_IPV6 ETHERTYPE_IPV6 +#define ETH_P_MPLS_UC ETHERTYPE_MPLS +#define ETH_P_MPLS_MC ETHERTYPE_MPLS_MCAST +#define ETH_P_8021Q ETHERTYPE_VLAN +#define ETH_P_8021AD ETHERTYPE_QINQ #endif /* _LINUX_IF_ETHER_H_ */ Modified: stable/11/sys/dev/mlx4/mlx4_core/mlx4.h ============================================================================== --- stable/11/sys/dev/mlx4/mlx4_core/mlx4.h Tue Mar 13 08:45:06 2018 (r330829) +++ stable/11/sys/dev/mlx4/mlx4_core/mlx4.h Tue Mar 13 08:46:47 2018 (r330830) @@ -66,8 +66,6 @@ #define MLX4_QUERY_IF_STAT_RESET BIT(31) -#define ETH_P_8021AD 0x88A8 - enum { MLX4_HCR_BASE = 0x80680, MLX4_HCR_SIZE = 0x0001c, From owner-svn-src-stable@freebsd.org Tue Mar 13 09:18:05 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 241BFF311F1; Tue, 13 Mar 2018 09:18:05 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CDE2072085; Tue, 13 Mar 2018 09:18:04 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C43A818046; Tue, 13 Mar 2018 09:18:04 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2D9I4Q8088606; Tue, 13 Mar 2018 09:18:04 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2D9I4PG088605; Tue, 13 Mar 2018 09:18:04 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803130918.w2D9I4PG088605@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Tue, 13 Mar 2018 09:18: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: r330831 - stable/11/sys/dev/syscons/fonts X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/syscons/fonts X-SVN-Commit-Revision: 330831 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 09:18:05 -0000 Author: eadler Date: Tue Mar 13 09:18:04 2018 New Revision: 330831 URL: https://svnweb.freebsd.org/changeset/base/330831 Log: MFC r320805: Add files to help manage the (vga) syscons mouse cursor. To mostly fix distortion of mouse cursors by non-square pixels, I needed 8 variants of the same cursor shape for large fonts and another 7 variants for small fonts. Some variants are shared, leaving only 13 variants in 26 glyphs altogether. Keep these in the BDF source file cursor.bdf. cursor.bdf has another 5 unused experimental cursors in 10 glyphs. cursor.awk is a simple awk script for converting this and similar bdf files into C declarations for copying into scvgarndr.c. syscons doesn't use any of this yet. Added: stable/11/sys/dev/syscons/fonts/ - copied from r320805, head/sys/dev/syscons/fonts/ Modified: Directory Properties: stable/11/ (props changed) From owner-svn-src-stable@freebsd.org Tue Mar 13 09:21:08 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9AE40F31567; Tue, 13 Mar 2018 09:21:08 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4E807722DC; Tue, 13 Mar 2018 09:21:08 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 498541816C; Tue, 13 Mar 2018 09:21:08 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2D9L8p4091824; Tue, 13 Mar 2018 09:21:08 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2D9L86q091822; Tue, 13 Mar 2018 09:21:08 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803130921.w2D9L86q091822@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Tue, 13 Mar 2018 09:21: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: r330832 - stable/11/sys/dev/syscons X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/syscons X-SVN-Commit-Revision: 330832 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 09:21:08 -0000 Author: eadler Date: Tue Mar 13 09:21:07 2018 New Revision: 330832 URL: https://svnweb.freebsd.org/changeset/base/330832 Log: MFC r304153: Quick fix for locking fixes in r172250. The lock added there was per- virtual-device, but needs to be per-physical-device so that it protects shared data. Usually, scp->sc->write_in_progress got corrupted first and further corruption was limited when this variable was left at nonzero with no write in progress. Attempt to fix missing lock destruction in r162285. Put it with the lock destruction for r172250 after moving the latter. Both might be unreachable. To demonstrate the bug, find a buggy syscall or sysctl that calls printf(9) and run this often. Run hd /dev/zero >/dev/ttyvN for any N != 0. The console spam goes to ttyv0 and the non-console spam goes to ttyvN, so the lock provided no protection (but it helped for N == 0). Modified: stable/11/sys/dev/syscons/syscons.c stable/11/sys/dev/syscons/syscons.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/syscons/syscons.c ============================================================================== --- stable/11/sys/dev/syscons/syscons.c Tue Mar 13 09:18:04 2018 (r330831) +++ stable/11/sys/dev/syscons/syscons.c Tue Mar 13 09:21:07 2018 (r330832) @@ -2688,13 +2688,13 @@ sc_puts(scr_stat *scp, u_char *buf, int len, int kerne #endif if (scp->tsw) { - if (!kdb_active && !mtx_owned(&scp->scr_lock)) { + if (!kdb_active && !mtx_owned(&scp->sc->scr_lock)) { need_unlock = 1; - mtx_lock_spin(&scp->scr_lock); + mtx_lock_spin(&scp->sc->scr_lock); } (*scp->tsw->te_puts)(scp, buf, len, kernel); if (need_unlock) - mtx_unlock_spin(&scp->scr_lock); + mtx_unlock_spin(&scp->sc->scr_lock); } if (scp->sc->delayed_next_scr) @@ -2859,8 +2859,10 @@ scinit(int unit, int flags) * disappeared... */ sc = sc_get_softc(unit, flags & SC_KERNEL_CONSOLE); - if ((sc->flags & SC_INIT_DONE) == 0) + if ((sc->flags & SC_INIT_DONE) == 0) { + mtx_init(&sc->scr_lock, "scrlock", NULL, MTX_SPIN); SC_VIDEO_LOCKINIT(sc); + } adp = NULL; if (sc->adapter >= 0) { @@ -3077,7 +3079,8 @@ scterm(int unit, int flags) (*scp->tsw->te_term)(scp, &scp->ts); if (scp->ts != NULL) free(scp->ts, M_DEVBUF); - mtx_destroy(&scp->scr_lock); + mtx_destroy(&sc->scr_lock); + mtx_destroy(&sc->video_mtx); /* clear the structure */ if (!(flags & SC_KERNEL_CONSOLE)) { @@ -3302,8 +3305,6 @@ init_scp(sc_softc_t *sc, int vty, scr_stat *scp) scp->history = NULL; scp->history_pos = 0; scp->history_size = 0; - - mtx_init(&scp->scr_lock, "scrlock", NULL, MTX_SPIN); } int Modified: stable/11/sys/dev/syscons/syscons.h ============================================================================== --- stable/11/sys/dev/syscons/syscons.h Tue Mar 13 09:18:04 2018 (r330831) +++ stable/11/sys/dev/syscons/syscons.h Tue Mar 13 09:21:07 2018 (r330832) @@ -230,6 +230,7 @@ typedef struct sc_softc { char switch_in_progress; char write_in_progress; char blink_in_progress; + struct mtx scr_lock; /* mutex for sc_puts() */ struct mtx video_mtx; long scrn_time_stamp; @@ -344,7 +345,6 @@ typedef struct scr_stat { int splash_save_mode; /* saved mode for splash screen */ int splash_save_status; /* saved status for splash screen */ - struct mtx scr_lock; /* mutex for sc_puts() */ #ifdef _SCR_MD_STAT_DECLARED_ scr_md_stat_t md; /* machine dependent vars */ #endif From owner-svn-src-stable@freebsd.org Tue Mar 13 09:29:57 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 881DAF3232D; Tue, 13 Mar 2018 09:29:57 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 377AA72B9B; Tue, 13 Mar 2018 09:29:57 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 307B9181C7; Tue, 13 Mar 2018 09:29:57 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2D9TvTs093883; Tue, 13 Mar 2018 09:29:57 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2D9Tvxf093882; Tue, 13 Mar 2018 09:29:57 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803130929.w2D9Tvxf093882@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Tue, 13 Mar 2018 09:29: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: r330833 - stable/11/sys/dev/syscons X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/syscons X-SVN-Commit-Revision: 330833 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 09:29:57 -0000 Author: eadler Date: Tue Mar 13 09:29:56 2018 New Revision: 330833 URL: https://svnweb.freebsd.org/changeset/base/330833 Log: MFC r304161: Change all uses of 'debugger' to kdb_active and remove this variable. This restores avoidance of doing dangerous things like calling wakeup() and callouts while in ddb. Initialization of 'debugger' was broken by removing the cndbctl() console method that was used mainly in this driver to initialize 'debugger' and switch to the console screen on entry to ddb. The screen switch was restored using the cngrab() method, but cngrab() is more general so it should not initialize 'debugger' and never did. 'debugger' was just an over-engineered alias for kdb_active anyway. It existed because kdb_active (when it was named ddb_active) was considered as a private kdb variable, and there are ordering problems initializing the variables atomically with the state that they represent, but an extra variable and method to set it increased these problems. The bug caused LORs, but WITNESS is normally misconfigured with WITNESS_SKIPSIN so it doesn't check the spinlocks used by wakeup() and callouts. Modified: stable/11/sys/dev/syscons/syscons.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/syscons/syscons.c ============================================================================== --- stable/11/sys/dev/syscons/syscons.c Tue Mar 13 09:21:07 2018 (r330832) +++ stable/11/sys/dev/syscons/syscons.c Tue Mar 13 09:29:56 2018 (r330833) @@ -172,8 +172,6 @@ SYSCTL_INT(_machdep, OID_AUTO, enable_panic_key, CTLFL #define VTY_WCHAN(sc, vty) (&SC_DEV(sc, vty)) -static int debugger; - /* prototypes */ static int sc_allocate_keyboard(sc_softc_t *sc, int unit); static int scvidprobe(int unit, int flags, int cons); @@ -1815,7 +1813,7 @@ sccnupdate(scr_stat *scp) if (suspend_in_progress || scp->sc->font_loading_in_progress) return; - if (debugger > 0 || panicstr || shutdown_in_progress) { + if (kdb_active || panicstr || shutdown_in_progress) { sc_touch_scrn_saver(); } else if (scp != scp->sc->cur_scp) { return; @@ -1884,7 +1882,7 @@ scrn_timer(void *arg) #endif /* PC98 */ /* should we stop the screen saver? */ - if (debugger > 0 || panicstr || shutdown_in_progress) + if (kdb_active || panicstr || shutdown_in_progress) sc_touch_scrn_saver(); if (run_scrn_saver) { if (time_uptime > sc->scrn_time_stamp + scrn_blank_time) @@ -2279,7 +2277,7 @@ stop_scrn_saver(sc_softc_t *sc, void (*saver)(sc_softc mark_all(sc->cur_scp); if (sc->delayed_next_scr) sc_switch_scr(sc, sc->delayed_next_scr - 1); - if (debugger == 0) + if (!kdb_active) wakeup(&scrn_blanked); } @@ -2474,7 +2472,7 @@ sc_switch_scr(sc_softc_t *sc, u_int next_scr) DPRINTF(5, ("error 2, requested vty isn't open!\n")); return EINVAL; } - if ((debugger > 0) && (SC_STAT(tp)->smode.mode == VT_PROCESS)) { + if (kdb_active && SC_STAT(tp)->smode.mode == VT_PROCESS) { splx(s); DPRINTF(5, ("error 3, requested vty is in the VT_PROCESS mode\n")); return EINVAL; @@ -2495,7 +2493,7 @@ sc_switch_scr(sc_softc_t *sc, u_int next_scr) * is supposed to be locked by splhigh(), but the debugger may * be invoked at splhigh(). */ - if (debugger == 0) + if (!kdb_active) wakeup(VTY_WCHAN(sc,next_scr)); splx(s); DPRINTF(5, ("switch done (new == old)\n")); @@ -2518,7 +2516,7 @@ sc_switch_scr(sc_softc_t *sc, u_int next_scr) s = spltty(); /* wake up processes waiting for this vty */ - if (debugger == 0) + if (!kdb_active) wakeup(VTY_WCHAN(sc,next_scr)); /* wait for the controlling process to acknowledge, if necessary */ From owner-svn-src-stable@freebsd.org Tue Mar 13 09:46:10 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DDA06F33951; Tue, 13 Mar 2018 09:46:09 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8FEE373956; Tue, 13 Mar 2018 09:46:09 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8A60718518; Tue, 13 Mar 2018 09:46:09 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2D9k9pe004154; Tue, 13 Mar 2018 09:46:09 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2D9k9sN004152; Tue, 13 Mar 2018 09:46:09 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803130946.w2D9k9sN004152@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Tue, 13 Mar 2018 09:46:09 +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: r330836 - stable/11/sys/dev/syscons X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/syscons X-SVN-Commit-Revision: 330836 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 09:46:10 -0000 Author: eadler Date: Tue Mar 13 09:46:09 2018 New Revision: 330836 URL: https://svnweb.freebsd.org/changeset/base/330836 Log: MFC r304165,r304166: Like scr_lock, the grab count needs to be per-physical-device to work. This bug corrupted the grab count on both vtys if the ungrabbed vty is different from the console, and failed to restore the keyboard state on the ungrabbed vty, but not restoring the latter usually left the keyboard mode part of it uncorrupted at 1 (K_XLATE), while after this fix the keyboard mode part is usually corrupted to 0 (K_RAW). While here, rename the grab count from 'grabbed' to grab_level. Modified: stable/11/sys/dev/syscons/syscons.c stable/11/sys/dev/syscons/syscons.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/syscons/syscons.c ============================================================================== --- stable/11/sys/dev/syscons/syscons.c Tue Mar 13 09:42:33 2018 (r330835) +++ stable/11/sys/dev/syscons/syscons.c Tue Mar 13 09:46:09 2018 (r330836) @@ -1661,7 +1661,7 @@ sc_cngrab(struct consdev *cp) if (scp->sc->kbd == NULL) return; - if (scp->grabbed++ > 0) + if (scp->sc->grab_level++ > 0) return; /* @@ -1687,7 +1687,7 @@ sc_cnungrab(struct consdev *cp) if (scp->sc->kbd == NULL) return; - if (--scp->grabbed > 0) + if (--scp->sc->grab_level > 0) return; kbdd_poll(scp->sc->kbd, FALSE); Modified: stable/11/sys/dev/syscons/syscons.h ============================================================================== --- stable/11/sys/dev/syscons/syscons.h Tue Mar 13 09:42:33 2018 (r330835) +++ stable/11/sys/dev/syscons/syscons.h Tue Mar 13 09:46:09 2018 (r330836) @@ -230,6 +230,7 @@ typedef struct sc_softc { char switch_in_progress; char write_in_progress; char blink_in_progress; + int grab_level; struct mtx scr_lock; /* mutex for sc_puts() */ struct mtx video_mtx; @@ -304,7 +305,6 @@ typedef struct scr_stat { void *ts; int status; /* status (bitfield) */ - int grabbed; int kbd_mode; /* keyboard I/O mode */ int kbd_prev_mode; /* keyboard I/O mode */ From owner-svn-src-stable@freebsd.org Tue Mar 13 10:00:15 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DCE1EF34CA3; Tue, 13 Mar 2018 10:00:14 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 901C3743C7; Tue, 13 Mar 2018 10:00:14 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 70D70186A1; Tue, 13 Mar 2018 10:00:14 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2DA0EQI009217; Tue, 13 Mar 2018 10:00:14 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DA0Ebi009216; Tue, 13 Mar 2018 10:00:14 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803131000.w2DA0Ebi009216@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Tue, 13 Mar 2018 10:00: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: r330838 - stable/11/sys/dev/syscons X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/syscons X-SVN-Commit-Revision: 330838 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 10:00:15 -0000 Author: eadler Date: Tue Mar 13 10:00:14 2018 New Revision: 330838 URL: https://svnweb.freebsd.org/changeset/base/330838 Log: MFC r304164: Disable some more unsafe things in (low level) console mode: - never call up to the tty layer to restart output for keyboard input in console mode. This was already disallowed in kdb mode. Other cases are rarely reached. - disable the reboot, halt and powerdown keys in console mode. The suspend, standby and panic keys are still allowed, and aren't even conditonal on excessive configuration options. Some of these actions are still available in ddb mode as ddb commands which are equally unsafe. Some are useful at input prompts and should be restored when the locking is fixed. - disallow bells in kdb mode (should be in console mode, but the flag for that is not available). Visual bell gives very alarming behaviour by trying to use callouts which don't work in kdb mode. Audio bell uses timeouts and hardware resources with mutexes that can deadlock in reasonable use of ddb. Screen switches in kdb mode are not very safe, but they are important functionality and there is a lot of code to make them sort of work. Modified: stable/11/sys/dev/syscons/syscons.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/syscons/syscons.c ============================================================================== --- stable/11/sys/dev/syscons/syscons.c Tue Mar 13 09:58:29 2018 (r330837) +++ stable/11/sys/dev/syscons/syscons.c Tue Mar 13 10:00:14 2018 (r330838) @@ -3505,8 +3505,9 @@ next_code: scp->status |= CURSOR_ENABLED; sc_draw_cursor_image(scp); } + /* Only safe in Giant-locked context. */ tp = SC_DEV(sc, scp->index); - if (!kdb_active && tty_opened_ns(tp)) + if (!(flags & SCGETC_CN) && tty_opened_ns(tp)) sctty_outwakeup(tp); #endif } @@ -3557,21 +3558,21 @@ next_code: case RBT: #ifndef SC_DISABLE_REBOOT - if (enable_reboot) + if (enable_reboot && !(flags & SCGETC_CN)) shutdown_nice(0); #endif break; case HALT: #ifndef SC_DISABLE_REBOOT - if (enable_reboot) + if (enable_reboot && !(flags & SCGETC_CN)) shutdown_nice(RB_HALT); #endif break; case PDWN: #ifndef SC_DISABLE_REBOOT - if (enable_reboot) + if (enable_reboot && !(flags & SCGETC_CN)) shutdown_nice(RB_HALT|RB_POWEROFF); #endif break; @@ -3842,7 +3843,7 @@ sc_respond(scr_stat *scp, const u_char *p, int count, void sc_bell(scr_stat *scp, int pitch, int duration) { - if (cold || shutdown_in_progress || !enable_bell) + if (cold || kdb_active || shutdown_in_progress || !enable_bell) return; if (scp != scp->sc->cur_scp && (scp->sc->flags & SC_QUIET_BELL)) From owner-svn-src-stable@freebsd.org Tue Mar 13 16:07:38 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D1AD2F2BFFC; Tue, 13 Mar 2018 16:07:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 86FF884DBA; Tue, 13 Mar 2018 16:07:38 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7D8491BFAE; Tue, 13 Mar 2018 16:07:38 +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 w2DG7cV2094653; Tue, 13 Mar 2018 16:07:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DG7cgl094652; Tue, 13 Mar 2018 16:07:38 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803131607.w2DG7cgl094652@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 13 Mar 2018 16:07:38 +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: r330847 - stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Commit-Revision: 330847 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 16:07:39 -0000 Author: hselasky Date: Tue Mar 13 16:07:38 2018 New Revision: 330847 URL: https://svnweb.freebsd.org/changeset/base/330847 Log: MFC r330272: Implement wait_on_bit() function macro in the LinuxKPI. Submitted by: Johannes Lundberg Sponsored by: Mellanox Technologies Sponsored by: Limelight Networks Modified: stable/11/sys/compat/linuxkpi/common/include/linux/wait.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/include/linux/wait.h ============================================================================== --- stable/11/sys/compat/linuxkpi/common/include/linux/wait.h Tue Mar 13 15:29:13 2018 (r330846) +++ stable/11/sys/compat/linuxkpi/common/include/linux/wait.h Tue Mar 13 16:07:38 2018 (r330847) @@ -249,6 +249,8 @@ void linux_wake_up_atomic_t(atomic_t *); int linux_wait_on_atomic_t(atomic_t *, unsigned int); #define wake_up_bit(word, bit) linux_wake_up_bit(word, bit) +#define wait_on_bit(word, bit, state) \ + linux_wait_on_bit_timeout(word, bit, state, MAX_SCHEDULE_TIMEOUT) #define wait_on_bit_timeout(word, bit, state, timeout) \ linux_wait_on_bit_timeout(word, bit, state, timeout) #define wake_up_atomic_t(a) linux_wake_up_atomic_t(a) From owner-svn-src-stable@freebsd.org Tue Mar 13 16:09:05 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7AE8BF2C309; Tue, 13 Mar 2018 16:09:05 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1EDE984FE9; Tue, 13 Mar 2018 16:09: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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 19D7B1BFB0; Tue, 13 Mar 2018 16:09:05 +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 w2DG94Ef094757; Tue, 13 Mar 2018 16:09:04 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DG94bF094756; Tue, 13 Mar 2018 16:09:04 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803131609.w2DG94bF094756@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 13 Mar 2018 16:09: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: r330848 - stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Commit-Revision: 330848 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 16:09:05 -0000 Author: hselasky Date: Tue Mar 13 16:09:04 2018 New Revision: 330848 URL: https://svnweb.freebsd.org/changeset/base/330848 Log: MFC r330273: Implement ktime_get_raw() function in the LinuxKPI. Submitted by: Johannes Lundberg Sponsored by: Mellanox Technologies Sponsored by: Limelight Networks Modified: stable/11/sys/compat/linuxkpi/common/include/linux/ktime.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/include/linux/ktime.h ============================================================================== --- stable/11/sys/compat/linuxkpi/common/include/linux/ktime.h Tue Mar 13 16:07:38 2018 (r330847) +++ stable/11/sys/compat/linuxkpi/common/include/linux/ktime.h Tue Mar 13 16:09:04 2018 (r330848) @@ -189,6 +189,15 @@ ktime_get_real_seconds(void) return (ts.tv_sec); } +static inline ktime_t +ktime_get_raw(void) +{ + struct timespec ts; + + nanotime(&ts); + return (timespec_to_ktime(ts)); +} + static inline u64 ktime_get_raw_ns(void) { From owner-svn-src-stable@freebsd.org Tue Mar 13 16:10:12 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F3E62F2C4D1; Tue, 13 Mar 2018 16:10:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A6F7185182; Tue, 13 Mar 2018 16:10:11 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A1DFC1BFB4; Tue, 13 Mar 2018 16:10:11 +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 w2DGABhC094884; Tue, 13 Mar 2018 16:10:11 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DGABPP094883; Tue, 13 Mar 2018 16:10:11 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803131610.w2DGABPP094883@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 13 Mar 2018 16:10:11 +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: r330849 - stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Commit-Revision: 330849 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 16:10:12 -0000 Author: hselasky Date: Tue Mar 13 16:10:11 2018 New Revision: 330849 URL: https://svnweb.freebsd.org/changeset/base/330849 Log: MFC r330274: Implement more lockdep stubs in the LinuxKPI. Submitted by: Johannes Lundberg Sponsored by: Mellanox Technologies Sponsored by: Limelight Networks Modified: stable/11/sys/compat/linuxkpi/common/include/linux/lockdep.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/include/linux/lockdep.h ============================================================================== --- stable/11/sys/compat/linuxkpi/common/include/linux/lockdep.h Tue Mar 13 16:09:04 2018 (r330848) +++ stable/11/sys/compat/linuxkpi/common/include/linux/lockdep.h Tue Mar 13 16:10:11 2018 (r330849) @@ -36,8 +36,9 @@ struct lock_class_key { }; #define lockdep_set_class(lock, key) - #define lockdep_set_class_and_name(lock, key, name) +#define lockdep_set_current_reclaim_state(g) do { } while (0) +#define lockdep_clear_current_reclaim_state() do { } while (0) #define lockdep_assert_held(m) \ sx_assert(&(m)->sx, SA_XLOCKED) From owner-svn-src-stable@freebsd.org Tue Mar 13 16:14:54 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DBCCCF2CB7B; Tue, 13 Mar 2018 16:14:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 89792857E5; Tue, 13 Mar 2018 16:14: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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 844FB1C12C; Tue, 13 Mar 2018 16:14:53 +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 w2DGErsA099866; Tue, 13 Mar 2018 16:14:53 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DGErSi099861; Tue, 13 Mar 2018 16:14:53 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803131614.w2DGErSi099861@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 13 Mar 2018 16:14:53 +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: r330850 - in stable/11: share/man/man9 sys/kern sys/sys X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in stable/11: share/man/man9 sys/kern sys/sys X-SVN-Commit-Revision: 330850 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 16:14:54 -0000 Author: hselasky Date: Tue Mar 13 16:14:52 2018 New Revision: 330850 URL: https://svnweb.freebsd.org/changeset/base/330850 Log: MFC r330349 and r330362: Allow pause_sbt() to catch signals during sleep by passing C_CATCH flag. Define pause_sig() function macro helper similarly to other kernel functions which catch signals. Update outdated function description. Document pause_sig(9) and update prototypes for existing pause(9) and pause_sbt(9) functions. Discussed with: kib@ Suggested by: cem@ Sponsored by: Mellanox Technologies Modified: stable/11/share/man/man9/Makefile stable/11/share/man/man9/sleep.9 stable/11/sys/kern/kern_synch.c stable/11/sys/sys/callout.h stable/11/sys/sys/systm.h Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man9/Makefile ============================================================================== --- stable/11/share/man/man9/Makefile Tue Mar 13 16:10:11 2018 (r330849) +++ stable/11/share/man/man9/Makefile Tue Mar 13 16:14:52 2018 (r330850) @@ -1597,6 +1597,7 @@ MLINKS+=sleep.9 msleep.9 \ sleep.9 msleep_spin.9 \ sleep.9 msleep_spin_sbt.9 \ sleep.9 pause.9 \ + sleep.9 pause_sig.9 \ sleep.9 pause_sbt.9 \ sleep.9 tsleep.9 \ sleep.9 tsleep_sbt.9 \ Modified: stable/11/share/man/man9/sleep.9 ============================================================================== --- stable/11/share/man/man9/sleep.9 Tue Mar 13 16:10:11 2018 (r330849) +++ stable/11/share/man/man9/sleep.9 Tue Mar 13 16:14:52 2018 (r330850) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 24, 2015 +.Dd March 4, 2018 .Dt SLEEP 9 .Os .Sh NAME @@ -34,6 +34,7 @@ .Nm msleep_spin , .Nm msleep_spin_sbt , .Nm pause , +.Nm pause_sig , .Nm pause_sbt , .Nm tsleep , .Nm tsleep_sbt , @@ -53,9 +54,11 @@ .Ft int .Fn msleep_spin_sbt "void *chan" "struct mtx *mtx" "const char *wmesg" \ "sbintime_t sbt" "sbintime_t pr" "int flags" -.Ft void +.Ft int .Fn pause "const char *wmesg" "int timo" -.Ft void +.Ft int +.Fn pause_sig "const char *wmesg" "int timo" +.Ft int .Fn pause_sbt "const char *wmesg" "sbintime_t sbt" "sbintime_t pr" \ "int flags" .Ft int @@ -73,6 +76,8 @@ The functions .Fn msleep , .Fn msleep_spin , .Fn pause , +.Fn pause_sig , +.Fn pause_sbt , .Fn wakeup , and .Fn wakeup_one @@ -82,8 +87,10 @@ external event, it is put to sleep by .Fn tsleep , .Fn msleep , .Fn msleep_spin , +.Fn pause , +.Fn pause_sig , or -.Fn pause . +.Fn pause_sbt . Threads may also wait using one of the locking primitive sleep routines .Xr mtx_sleep 9 , .Xr rw_sleep 9 , @@ -248,6 +255,11 @@ The thread can not be awakened early by signals or cal .Fn wakeup or .Fn wakeup_one . +The +.Fn pause_sig +function is a variant of +.Fn pause +which can be awakened early by signals. .Pp The .Fn wakeup_one @@ -385,6 +397,10 @@ The .Fn pause function appeared in .Fx 7.0 . +The +.Fn pause_sig +function appeared in +.Fx 12.0 . .Sh AUTHORS .An -nosplit This manual page was written by Modified: stable/11/sys/kern/kern_synch.c ============================================================================== --- stable/11/sys/kern/kern_synch.c Tue Mar 13 16:10:11 2018 (r330849) +++ stable/11/sys/kern/kern_synch.c Tue Mar 13 16:14:52 2018 (r330850) @@ -299,16 +299,16 @@ msleep_spin_sbt(void *ident, struct mtx *mtx, const ch } /* - * pause() delays the calling thread by the given number of system ticks. - * During cold bootup, pause() uses the DELAY() function instead of - * the tsleep() function to do the waiting. The "timo" argument must be - * greater than or equal to zero. A "timo" value of zero is equivalent - * to a "timo" value of one. + * pause_sbt() delays the calling thread by the given signed binary + * time. During cold bootup, pause_sbt() uses the DELAY() function + * instead of the _sleep() function to do the waiting. The "sbt" + * argument must be greater than or equal to zero. A "sbt" value of + * zero is equivalent to a "sbt" value of one tick. */ int pause_sbt(const char *wmesg, sbintime_t sbt, sbintime_t pr, int flags) { - KASSERT(sbt >= 0, ("pause: timeout must be >= 0")); + KASSERT(sbt >= 0, ("pause_sbt: timeout must be >= 0")); /* silently convert invalid timeouts */ if (sbt == 0) @@ -330,7 +330,8 @@ pause_sbt(const char *wmesg, sbintime_t sbt, sbintime_ DELAY(sbt); return (0); } - return (_sleep(&pause_wchan[curcpu], NULL, 0, wmesg, sbt, pr, flags)); + return (_sleep(&pause_wchan[curcpu], NULL, + (flags & C_CATCH) ? PCATCH : 0, wmesg, sbt, pr, flags)); } /* Modified: stable/11/sys/sys/callout.h ============================================================================== --- stable/11/sys/sys/callout.h Tue Mar 13 16:10:11 2018 (r330849) +++ stable/11/sys/sys/callout.h Tue Mar 13 16:14:52 2018 (r330850) @@ -58,6 +58,7 @@ #define C_HARDCLOCK 0x0100 /* align to hardclock() calls */ #define C_ABSOLUTE 0x0200 /* event time is absolute. */ #define C_PRECALC 0x0400 /* event time is pre-calculated. */ +#define C_CATCH 0x0800 /* catch signals, used by pause_sbt(9) */ struct callout_handle { struct callout *callout; Modified: stable/11/sys/sys/systm.h ============================================================================== --- stable/11/sys/sys/systm.h Tue Mar 13 16:10:11 2018 (r330849) +++ stable/11/sys/sys/systm.h Tue Mar 13 16:14:52 2018 (r330850) @@ -407,6 +407,8 @@ int pause_sbt(const char *wmesg, sbintime_t sbt, sbint int flags); #define pause(wmesg, timo) \ pause_sbt((wmesg), tick_sbt * (timo), 0, C_HARDCLOCK) +#define pause_sig(wmesg, timo) \ + pause_sbt((wmesg), tick_sbt * (timo), 0, C_HARDCLOCK | C_CATCH) #define tsleep(chan, pri, wmesg, timo) \ _sleep((chan), NULL, (pri), (wmesg), tick_sbt * (timo), \ 0, C_HARDCLOCK) From owner-svn-src-stable@freebsd.org Tue Mar 13 16:17:37 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8C8BAF2CF86; Tue, 13 Mar 2018 16:17:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3F1B185A53; Tue, 13 Mar 2018 16:17:37 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1BC4B1C13B; Tue, 13 Mar 2018 16:17:37 +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 w2DGHaUc000122; Tue, 13 Mar 2018 16:17:36 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DGHafB000120; Tue, 13 Mar 2018 16:17:36 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803131617.w2DGHafB000120@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 13 Mar 2018 16:17: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: r330851 - in stable/11/sys/compat/linuxkpi/common: include/linux src X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in stable/11/sys/compat/linuxkpi/common: include/linux src X-SVN-Commit-Revision: 330851 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 16:17:37 -0000 Author: hselasky Date: Tue Mar 13 16:17:36 2018 New Revision: 330851 URL: https://svnweb.freebsd.org/changeset/base/330851 Log: MFC r330352 and r330353: Implement msleep_interruptible() in the LinuxKPI. While at it use pause_sbt() instead of pause() in the msleep() function to avoid rounding errors when converting delay values forth and back. Add a guard for a delay value of zero milliseconds which is undefined. Suggested by: ian@ Requested by: Johannes Lundberg Sponsored by: Mellanox Technologies Modified: stable/11/sys/compat/linuxkpi/common/include/linux/delay.h stable/11/sys/compat/linuxkpi/common/src/linux_schedule.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/include/linux/delay.h ============================================================================== --- stable/11/sys/compat/linuxkpi/common/include/linux/delay.h Tue Mar 13 16:14:52 2018 (r330850) +++ stable/11/sys/compat/linuxkpi/common/include/linux/delay.h Tue Mar 13 16:17:36 2018 (r330851) @@ -36,14 +36,20 @@ #include static inline void -linux_msleep(int ms) +linux_msleep(unsigned int ms) { - pause("lnxsleep", msecs_to_jiffies(ms)); + /* guard against invalid values */ + if (ms == 0) + ms = 1; + pause_sbt("lnxsleep", mstosbt(ms), 0, C_HARDCLOCK); } #undef msleep -#define msleep linux_msleep +#define msleep(ms) linux_msleep(ms) +#undef msleep_interruptible +#define msleep_interruptible(ms) linux_msleep_interruptible(ms) + #define udelay(t) DELAY(t) static inline void @@ -64,5 +70,7 @@ usleep_range(unsigned long min, unsigned long max) { DELAY(min); } + +extern unsigned int linux_msleep_interruptible(unsigned int ms); #endif /* _LINUX_DELAY_H_ */ Modified: stable/11/sys/compat/linuxkpi/common/src/linux_schedule.c ============================================================================== --- stable/11/sys/compat/linuxkpi/common/src/linux_schedule.c Tue Mar 13 16:14:52 2018 (r330850) +++ stable/11/sys/compat/linuxkpi/common/src/linux_schedule.c Tue Mar 13 16:17:36 2018 (r330851) @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -72,6 +73,25 @@ linux_add_to_sleepqueue(void *wchan, struct task_struc ret = -ERESTARTSYS; } return (ret); +} + +unsigned int +linux_msleep_interruptible(unsigned int ms) +{ + int ret; + + /* guard against invalid values */ + if (ms == 0) + ms = 1; + ret = -pause_sbt("lnxsleep", mstosbt(ms), 0, C_HARDCLOCK | C_CATCH); + + switch (ret) { + case -EWOULDBLOCK: + return (0); + default: + linux_schedule_save_interrupt_value(current, ret); + return (ms); + } } static int From owner-svn-src-stable@freebsd.org Tue Mar 13 16:18:39 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E614FF2D155; Tue, 13 Mar 2018 16:18:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 91C3685BDB; Tue, 13 Mar 2018 16:18:38 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8C21D1C13C; Tue, 13 Mar 2018 16:18:38 +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 w2DGIcB1000219; Tue, 13 Mar 2018 16:18:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DGIc8X000218; Tue, 13 Mar 2018 16:18:38 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803131618.w2DGIc8X000218@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 13 Mar 2018 16:18:38 +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: r330852 - stable/11/sys/kern X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/kern X-SVN-Commit-Revision: 330852 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 16:18:39 -0000 Author: hselasky Date: Tue Mar 13 16:18:38 2018 New Revision: 330852 URL: https://svnweb.freebsd.org/changeset/base/330852 Log: MFC r330344: Correct the return code from pause() during cold startup from zero to EWOULDBLOCK. This also matches the description in pause(9). Discussed with: kib@ Sponsored by: Mellanox Technologies Modified: stable/11/sys/kern/kern_synch.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/kern/kern_synch.c ============================================================================== --- stable/11/sys/kern/kern_synch.c Tue Mar 13 16:17:36 2018 (r330851) +++ stable/11/sys/kern/kern_synch.c Tue Mar 13 16:18:38 2018 (r330852) @@ -328,7 +328,7 @@ pause_sbt(const char *wmesg, sbintime_t sbt, sbintime_ sbt = howmany(sbt, SBT_1US); if (sbt > 0) DELAY(sbt); - return (0); + return (EWOULDBLOCK); } return (_sleep(&pause_wchan[curcpu], NULL, (flags & C_CATCH) ? PCATCH : 0, wmesg, sbt, pr, flags)); From owner-svn-src-stable@freebsd.org Tue Mar 13 16:21:00 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F4BDF2D4F3; Tue, 13 Mar 2018 16:21:00 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0CB2E85F70; Tue, 13 Mar 2018 16:21:00 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DDBEF1C162; Tue, 13 Mar 2018 16:20:59 +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 w2DGKxDl001323; Tue, 13 Mar 2018 16:20:59 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DGKxkD001106; Tue, 13 Mar 2018 16:20:59 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803131620.w2DGKxkD001106@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 13 Mar 2018 16:20: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: r330853 - in stable/11/sys/compat/linuxkpi/common: include/linux src X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in stable/11/sys/compat/linuxkpi/common: include/linux src X-SVN-Commit-Revision: 330853 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 16:21:00 -0000 Author: hselasky Date: Tue Mar 13 16:20:59 2018 New Revision: 330853 URL: https://svnweb.freebsd.org/changeset/base/330853 Log: MFC r330387 and r330396: Rename the SLAB_DESTROY_BY_RCU flag into SLAB_TYPESAFE_BY_RCU in the LinuxKPI to be compatible with Linux. Keep the old SLAB_DESTROY_BY_RCU macro definition around in the LinuxKPI to avoid compilation breakage in external kernel modules. Requested by: Johannes Lundberg Sponsored by: Mellanox Technologies Modified: stable/11/sys/compat/linuxkpi/common/include/linux/slab.h stable/11/sys/compat/linuxkpi/common/src/linux_slab.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/include/linux/slab.h ============================================================================== --- stable/11/sys/compat/linuxkpi/common/include/linux/slab.h Tue Mar 13 16:18:38 2018 (r330852) +++ stable/11/sys/compat/linuxkpi/common/include/linux/slab.h Tue Mar 13 16:20:59 2018 (r330853) @@ -79,9 +79,12 @@ struct linux_kmem_cache { }; #define SLAB_HWCACHE_ALIGN (1 << 0) -#define SLAB_DESTROY_BY_RCU (1 << 1) +#define SLAB_TYPESAFE_BY_RCU (1 << 1) #define SLAB_RECLAIM_ACCOUNT (1 << 2) +#define SLAB_DESTROY_BY_RCU \ + SLAB_TYPESAFE_BY_RCU + static inline gfp_t linux_check_m_flags(gfp_t flags) { @@ -162,7 +165,7 @@ extern void linux_kmem_cache_free_rcu(struct linux_kme static inline void linux_kmem_cache_free(struct linux_kmem_cache *c, void *m) { - if (unlikely(c->cache_flags & SLAB_DESTROY_BY_RCU)) + if (unlikely(c->cache_flags & SLAB_TYPESAFE_BY_RCU)) linux_kmem_cache_free_rcu(c, m); else uma_zfree(c->cache_zone, m); Modified: stable/11/sys/compat/linuxkpi/common/src/linux_slab.c ============================================================================== --- stable/11/sys/compat/linuxkpi/common/src/linux_slab.c Tue Mar 13 16:18:38 2018 (r330852) +++ stable/11/sys/compat/linuxkpi/common/src/linux_slab.c Tue Mar 13 16:20:59 2018 (r330853) @@ -49,7 +49,7 @@ linux_kmem_ctor(void *mem, int size, void *arg, int fl { struct linux_kmem_cache *c = arg; - if (unlikely(c->cache_flags & SLAB_DESTROY_BY_RCU)) { + if (unlikely(c->cache_flags & SLAB_TYPESAFE_BY_RCU)) { struct linux_kmem_rcu *rcu = LINUX_KMEM_TO_RCU(c, mem); /* duplicate cache pointer */ @@ -85,7 +85,7 @@ linux_kmem_cache_create(const char *name, size_t size, else if (align != 0) align--; - if (flags & SLAB_DESTROY_BY_RCU) { + if (flags & SLAB_TYPESAFE_BY_RCU) { /* make room for RCU structure */ size = ALIGN(size, sizeof(void *)); size += sizeof(struct linux_kmem_rcu); @@ -118,7 +118,7 @@ linux_kmem_cache_free_rcu(struct linux_kmem_cache *c, void linux_kmem_cache_destroy(struct linux_kmem_cache *c) { - if (unlikely(c->cache_flags & SLAB_DESTROY_BY_RCU)) { + if (unlikely(c->cache_flags & SLAB_TYPESAFE_BY_RCU)) { /* make sure all free callbacks have been called */ rcu_barrier(); } From owner-svn-src-stable@freebsd.org Tue Mar 13 16:22:33 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 86EC0F2D8E0; Tue, 13 Mar 2018 16:22:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 37A3786340; Tue, 13 Mar 2018 16:22:33 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 32AAC1C2CD; Tue, 13 Mar 2018 16:22:33 +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 w2DGMXD0004998; Tue, 13 Mar 2018 16:22:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DGMXLD004997; Tue, 13 Mar 2018 16:22:33 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803131622.w2DGMXLD004997@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 13 Mar 2018 16:22: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: r330854 - stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Commit-Revision: 330854 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 16:22:33 -0000 Author: hselasky Date: Tue Mar 13 16:22:32 2018 New Revision: 330854 URL: https://svnweb.freebsd.org/changeset/base/330854 Log: MFC r330388: Implement GENMASK_ULL() function macro in the LinuxKPI. Submitted by: Johannes Lundberg Sponsored by: Mellanox Technologies Sponsored by: Limelight Networks Modified: stable/11/sys/compat/linuxkpi/common/include/linux/bitops.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/include/linux/bitops.h ============================================================================== --- stable/11/sys/compat/linuxkpi/common/include/linux/bitops.h Tue Mar 13 16:20:59 2018 (r330853) +++ stable/11/sys/compat/linuxkpi/common/include/linux/bitops.h Tue Mar 13 16:22:32 2018 (r330854) @@ -45,12 +45,15 @@ #define BITS_PER_LONG 32 #endif +#define BITS_PER_LONG_LONG 64 + #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) #define BIT_MASK(nr) (1UL << ((nr) & (BITS_PER_LONG - 1))) #define BIT_WORD(nr) ((nr) / BITS_PER_LONG) #define GENMASK(h, l) (((~0UL) >> (BITS_PER_LONG - (h) - 1)) & ((~0UL) << (l))) +#define GENMASK_ULL(h, l) (((~0ULL) >> (BITS_PER_LONG_LONG - (h) - 1)) & ((~0ULL) << (l))) #define BITS_PER_BYTE 8 #define hweight8(x) bitcount((uint8_t)(x)) From owner-svn-src-stable@freebsd.org Tue Mar 13 16:23:34 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4EF1CF2DA94; Tue, 13 Mar 2018 16:23:34 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EB214864E2; Tue, 13 Mar 2018 16:23:33 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E610C1C2D0; Tue, 13 Mar 2018 16:23:33 +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 w2DGNXd0005095; Tue, 13 Mar 2018 16:23:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DGNX3L005094; Tue, 13 Mar 2018 16:23:33 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803131623.w2DGNX3L005094@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 13 Mar 2018 16:23: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: r330855 - stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Commit-Revision: 330855 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 16:23:34 -0000 Author: hselasky Date: Tue Mar 13 16:23:33 2018 New Revision: 330855 URL: https://svnweb.freebsd.org/changeset/base/330855 Log: MFC r330389: Implement for_each_clear_bit() function macro in the LinuxKPI. Submitted by: Johannes Lundberg Sponsored by: Mellanox Technologies Sponsored by: Limelight Networks Modified: stable/11/sys/compat/linuxkpi/common/include/linux/bitops.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/include/linux/bitops.h ============================================================================== --- stable/11/sys/compat/linuxkpi/common/include/linux/bitops.h Tue Mar 13 16:22:32 2018 (r330854) +++ stable/11/sys/compat/linuxkpi/common/include/linux/bitops.h Tue Mar 13 16:23:33 2018 (r330855) @@ -390,6 +390,10 @@ done: (bit) < (size); \ (bit) = find_next_bit((addr), (size), (bit) + 1)) +#define for_each_clear_bit(bit, addr, size) \ + for ((bit) = find_first_zero_bit((addr), (size)); \ + (bit) < (size); \ + (bit) = find_next_zero_bit((addr), (size), (bit) + 1)) static inline uint64_t sign_extend64(uint64_t value, int index) From owner-svn-src-stable@freebsd.org Tue Mar 13 16:24:29 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13AF0F2DC09; Tue, 13 Mar 2018 16:24:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B3E7D8665D; Tue, 13 Mar 2018 16:24:28 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AEFA81C2D3; Tue, 13 Mar 2018 16:24:28 +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 w2DGOSYf005184; Tue, 13 Mar 2018 16:24:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DGOSX5005183; Tue, 13 Mar 2018 16:24:28 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803131624.w2DGOSX5005183@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 13 Mar 2018 16:24: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: r330856 - stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Commit-Revision: 330856 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 16:24:29 -0000 Author: hselasky Date: Tue Mar 13 16:24:28 2018 New Revision: 330856 URL: https://svnweb.freebsd.org/changeset/base/330856 Log: MFC r330390: Define noinline and __maybe_unused macros in the LinuxKPI. Submitted by: Johannes Lundberg Sponsored by: Mellanox Technologies Sponsored by: Limelight Networks Modified: stable/11/sys/compat/linuxkpi/common/include/linux/compiler.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/include/linux/compiler.h ============================================================================== --- stable/11/sys/compat/linuxkpi/common/include/linux/compiler.h Tue Mar 13 16:23:33 2018 (r330855) +++ stable/11/sys/compat/linuxkpi/common/include/linux/compiler.h Tue Mar 13 16:24:28 2018 (r330856) @@ -64,6 +64,7 @@ #define __attribute_const__ __attribute__((__const__)) #undef __always_inline #define __always_inline inline +#define noinline __noinline #define ____cacheline_aligned __aligned(CACHE_LINE_SIZE) #define likely(x) __builtin_expect(!!(x), 1) @@ -71,6 +72,7 @@ #define typeof(x) __typeof(x) #define uninitialized_var(x) x = x +#define __maybe_unused __unused #define __always_unused __unused #define __must_check __result_use_check From owner-svn-src-stable@freebsd.org Tue Mar 13 16:25:28 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BA62BF2DD51; Tue, 13 Mar 2018 16:25:28 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 679BF86812; Tue, 13 Mar 2018 16:25:28 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 629061C2D4; Tue, 13 Mar 2018 16:25:28 +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 w2DGPSFs005294; Tue, 13 Mar 2018 16:25:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DGPSTf005293; Tue, 13 Mar 2018 16:25:28 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803131625.w2DGPSTf005293@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 13 Mar 2018 16:25: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: r330857 - stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Commit-Revision: 330857 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 16:25:28 -0000 Author: hselasky Date: Tue Mar 13 16:25:28 2018 New Revision: 330857 URL: https://svnweb.freebsd.org/changeset/base/330857 Log: MFC r330391: Implement writel_relaxed() in the LinuxKPI. Submitted by: Johannes Lundberg Sponsored by: Mellanox Technologies Sponsored by: Limelight Networks Modified: stable/11/sys/compat/linuxkpi/common/include/linux/io.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/include/linux/io.h ============================================================================== --- stable/11/sys/compat/linuxkpi/common/include/linux/io.h Tue Mar 13 16:24:28 2018 (r330856) +++ stable/11/sys/compat/linuxkpi/common/include/linux/io.h Tue Mar 13 16:25:28 2018 (r330857) @@ -74,6 +74,13 @@ writel(uint32_t b, void *addr) *(volatile uint32_t *)addr = b; } +#undef writel_relaxed +static inline void +writel_relaxed(uint32_t b, void *addr) +{ + *(volatile uint32_t *)addr = b; +} + #undef writeq static inline void writeq(uint64_t b, void *addr) From owner-svn-src-stable@freebsd.org Tue Mar 13 16:26:58 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 287E6F2F032; Tue, 13 Mar 2018 16:26:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CEB4986A68; Tue, 13 Mar 2018 16:26:57 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C9B111C2D6; Tue, 13 Mar 2018 16:26:57 +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 w2DGQvfG005405; Tue, 13 Mar 2018 16:26:57 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DGQvwJ005404; Tue, 13 Mar 2018 16:26:57 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803131626.w2DGQvwJ005404@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 13 Mar 2018 16:26: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: r330858 - stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Commit-Revision: 330858 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 16:26:58 -0000 Author: hselasky Date: Tue Mar 13 16:26:57 2018 New Revision: 330858 URL: https://svnweb.freebsd.org/changeset/base/330858 Log: MFC r330392 and r330408: Implement BUILD_BUG() function macro in the LinuxKPI. Submitted by: Johannes Lundberg Sponsored by: Mellanox Technologies Sponsored by: Limelight Networks Modified: stable/11/sys/compat/linuxkpi/common/include/linux/kernel.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/include/linux/kernel.h ============================================================================== --- stable/11/sys/compat/linuxkpi/common/include/linux/kernel.h Tue Mar 13 16:25:28 2018 (r330857) +++ stable/11/sys/compat/linuxkpi/common/include/linux/kernel.h Tue Mar 13 16:26:57 2018 (r330858) @@ -86,6 +86,7 @@ #define S64_C(x) x ## LL #define U64_C(x) x ## ULL +#define BUILD_BUG() do { CTASSERT(0); } while (0) #define BUILD_BUG_ON(x) CTASSERT(!(x)) #define BUILD_BUG_ON_MSG(x, msg) BUILD_BUG_ON(x) #define BUILD_BUG_ON_NOT_POWER_OF_2(x) BUILD_BUG_ON(!powerof2(x)) From owner-svn-src-stable@freebsd.org Tue Mar 13 16:28:05 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A136F2F241; Tue, 13 Mar 2018 16:28:05 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DE89D86C18; Tue, 13 Mar 2018 16:28:04 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D94671C2E4; Tue, 13 Mar 2018 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 w2DGS4Aw005504; Tue, 13 Mar 2018 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 w2DGS46k005503; Tue, 13 Mar 2018 16:28:04 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803131628.w2DGS46k005503@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 13 Mar 2018 16:28: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: r330859 - stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Commit-Revision: 330859 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 16:28:05 -0000 Author: hselasky Date: Tue Mar 13 16:28:04 2018 New Revision: 330859 URL: https://svnweb.freebsd.org/changeset/base/330859 Log: MFC r330393: Implement __MODULE_STRING() function macro in the LinuxKPI. Submitted by: Johannes Lundberg Sponsored by: Mellanox Technologies Sponsored by: Limelight Networks Modified: stable/11/sys/compat/linuxkpi/common/include/linux/module.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/include/linux/module.h ============================================================================== --- stable/11/sys/compat/linuxkpi/common/include/linux/module.h Tue Mar 13 16:26:57 2018 (r330858) +++ stable/11/sys/compat/linuxkpi/common/include/linux/module.h Tue Mar 13 16:28:04 2018 (r330859) @@ -53,6 +53,7 @@ #define EXPORT_SYMBOL(name) #define EXPORT_SYMBOL_GPL(name) +#define __MODULE_STRING(x) __stringify(x) /* OFED pre-module initialization */ #define SI_SUB_OFED_PREINIT (SI_SUB_ROOT_CONF - 2) From owner-svn-src-stable@freebsd.org Tue Mar 13 16:29:03 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1746EF2F3E5; Tue, 13 Mar 2018 16:29:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BA1C386DBE; Tue, 13 Mar 2018 16:29:02 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B52F71C2E8; Tue, 13 Mar 2018 16:29:02 +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 w2DGT24F005595; Tue, 13 Mar 2018 16:29:02 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DGT2bY005594; Tue, 13 Mar 2018 16:29:02 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803131629.w2DGT2bY005594@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 13 Mar 2018 16:29: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: r330860 - stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Commit-Revision: 330860 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 16:29:03 -0000 Author: hselasky Date: Tue Mar 13 16:29:02 2018 New Revision: 330860 URL: https://svnweb.freebsd.org/changeset/base/330860 Log: MFC r330394: Implement pr_err_ratelimited() function macro in the LinuxKPI. Submitted by: Johannes Lundberg Sponsored by: Mellanox Technologies Sponsored by: Limelight Networks Modified: stable/11/sys/compat/linuxkpi/common/include/linux/printk.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/include/linux/printk.h ============================================================================== --- stable/11/sys/compat/linuxkpi/common/include/linux/printk.h Tue Mar 13 16:28:04 2018 (r330859) +++ stable/11/sys/compat/linuxkpi/common/include/linux/printk.h Tue Mar 13 16:29:02 2018 (r330860) @@ -118,4 +118,7 @@ print_hex_dump_bytes(const char *prefix_str, const int __retval; \ }) +#define pr_err_ratelimited(fmt, ...) \ + printk_ratelimited(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__) + #endif /* _LINUX_PRINTK_H_ */ From owner-svn-src-stable@freebsd.org Tue Mar 13 16:30:02 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ED66EF2F548; Tue, 13 Mar 2018 16:30:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9A66F86F44; Tue, 13 Mar 2018 16:30:01 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 955AD1C2F4; Tue, 13 Mar 2018 16:30:01 +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 w2DGU1Wl005715; Tue, 13 Mar 2018 16:30:01 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DGU1Rn005713; Tue, 13 Mar 2018 16:30:01 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803131630.w2DGU1Rn005713@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 13 Mar 2018 16:30: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: r330861 - in stable/11/sys/compat/linuxkpi/common: include/linux src X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in stable/11/sys/compat/linuxkpi/common: include/linux src X-SVN-Commit-Revision: 330861 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 16:30:02 -0000 Author: hselasky Date: Tue Mar 13 16:30:01 2018 New Revision: 330861 URL: https://svnweb.freebsd.org/changeset/base/330861 Log: MFC r330395: Implement DEFINE_WAIT_FUNC() function macro and default_wake_function() in the LinuxKPI. Submitted by: Johannes Lundberg Sponsored by: Mellanox Technologies Sponsored by: Limelight Networks Modified: stable/11/sys/compat/linuxkpi/common/include/linux/wait.h stable/11/sys/compat/linuxkpi/common/src/linux_schedule.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/include/linux/wait.h ============================================================================== --- stable/11/sys/compat/linuxkpi/common/include/linux/wait.h Tue Mar 13 16:29:02 2018 (r330860) +++ stable/11/sys/compat/linuxkpi/common/include/linux/wait.h Tue Mar 13 16:30:01 2018 (r330861) @@ -76,13 +76,17 @@ struct wait_queue_head { * renamed and furthermore must be the default wait queue callback. */ extern wait_queue_func_t autoremove_wake_function; +extern wait_queue_func_t default_wake_function; -#define DEFINE_WAIT(name) \ +#define DEFINE_WAIT_FUNC(name, function) \ wait_queue_t name = { \ .private = current, \ - .func = autoremove_wake_function, \ + .func = function, \ .task_list = LINUX_LIST_HEAD_INIT(name.task_list) \ } + +#define DEFINE_WAIT(name) \ + DEFINE_WAIT_FUNC(name, autoremove_wake_function) #define DECLARE_WAITQUEUE(name, task) \ wait_queue_t name = { \ Modified: stable/11/sys/compat/linuxkpi/common/src/linux_schedule.c ============================================================================== --- stable/11/sys/compat/linuxkpi/common/src/linux_schedule.c Tue Mar 13 16:29:02 2018 (r330860) +++ stable/11/sys/compat/linuxkpi/common/src/linux_schedule.c Tue Mar 13 16:30:01 2018 (r330861) @@ -176,6 +176,13 @@ autoremove_wake_function(wait_queue_t *wq, unsigned in return (ret); } +int +default_wake_function(wait_queue_t *wq, unsigned int state, int flags, + void *key __unused) +{ + return (wake_up_task(wq->private, state)); +} + void linux_wake_up(wait_queue_head_t *wqh, unsigned int state, int nr, bool locked) { From owner-svn-src-stable@freebsd.org Tue Mar 13 16:30:52 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E7A21F2F799; Tue, 13 Mar 2018 16:30:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9C955870E1; Tue, 13 Mar 2018 16:30:51 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 978591C311; Tue, 13 Mar 2018 16:30:51 +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 w2DGUpf2009560; Tue, 13 Mar 2018 16:30:51 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DGUpSP009559; Tue, 13 Mar 2018 16:30:51 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803131630.w2DGUpSP009559@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 13 Mar 2018 16:30: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: r330862 - stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Commit-Revision: 330862 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 16:30:52 -0000 Author: hselasky Date: Tue Mar 13 16:30:51 2018 New Revision: 330862 URL: https://svnweb.freebsd.org/changeset/base/330862 Log: MFC r330398: Implement wait_event_lock_irq() macro function in the LinuxKPI. Requested by: Johannes Lundberg Sponsored by: Mellanox Technologies Modified: stable/11/sys/compat/linuxkpi/common/include/linux/wait.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/include/linux/wait.h ============================================================================== --- stable/11/sys/compat/linuxkpi/common/include/linux/wait.h Tue Mar 13 16:30:01 2018 (r330861) +++ stable/11/sys/compat/linuxkpi/common/include/linux/wait.h Tue Mar 13 16:30:51 2018 (r330862) @@ -194,11 +194,19 @@ int linux_wait_event_common(wait_queue_head_t *, wait_ }) /* - * Hold the (locked) spinlock when testing the cond. + * The passed spinlock is held when testing the condition. */ #define wait_event_interruptible_lock_irq(wqh, cond, lock) ({ \ __wait_event_common(wqh, cond, MAX_SCHEDULE_TIMEOUT, \ TASK_INTERRUPTIBLE, &(lock)); \ +}) + +/* + * The passed spinlock is held when testing the condition. + */ +#define wait_event_lock_irq(wqh, cond, lock) ({ \ + __wait_event_common(wqh, cond, MAX_SCHEDULE_TIMEOUT, \ + TASK_UNINTERRUPTIBLE, &(lock)); \ }) static inline void From owner-svn-src-stable@freebsd.org Tue Mar 13 16:31:55 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 40580F2F96B; Tue, 13 Mar 2018 16:31:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E5B4987315; Tue, 13 Mar 2018 16:31:54 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E0AEE1C444; Tue, 13 Mar 2018 16:31:54 +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 w2DGVs86009651; Tue, 13 Mar 2018 16:31:54 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DGVssv009650; Tue, 13 Mar 2018 16:31:54 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803131631.w2DGVssv009650@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 13 Mar 2018 16:31: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: r330863 - stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/compat/linuxkpi/common/include/linux X-SVN-Commit-Revision: 330863 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 16:31:55 -0000 Author: hselasky Date: Tue Mar 13 16:31:54 2018 New Revision: 330863 URL: https://svnweb.freebsd.org/changeset/base/330863 Log: MFC r330399: Stub kernel_param_lock() and kernel_param_unlock() in the LinuxKPI. Submitted by: Johannes Lundberg Sponsored by: Mellanox Technologies Sponsored by: Limelight Networks Modified: stable/11/sys/compat/linuxkpi/common/include/linux/moduleparam.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/include/linux/moduleparam.h ============================================================================== --- stable/11/sys/compat/linuxkpi/common/include/linux/moduleparam.h Tue Mar 13 16:30:51 2018 (r330862) +++ stable/11/sys/compat/linuxkpi/common/include/linux/moduleparam.h Tue Mar 13 16:31:54 2018 (r330863) @@ -125,6 +125,9 @@ #define MODULE_PARM_DESC(name, desc) \ const char LINUXKPI_PARAM_DESC(name)[] = { desc } +#define kernel_param_lock(...) do {} while (0) +#define kernel_param_unlock(...) do {} while (0) + SYSCTL_DECL(_compat_linuxkpi); #endif /* _LINUX_MODULEPARAM_H_ */ From owner-svn-src-stable@freebsd.org Tue Mar 13 16:33:42 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 192A7F2FCD3; Tue, 13 Mar 2018 16:33:42 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BF98B87878; Tue, 13 Mar 2018 16:33:41 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BA8E21C46C; Tue, 13 Mar 2018 16:33:41 +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 w2DGXfW3010573; Tue, 13 Mar 2018 16:33:41 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DGXfA5010572; Tue, 13 Mar 2018 16:33:41 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803131633.w2DGXfA5010572@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 13 Mar 2018 16: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: r330865 - stable/11/sys/compat/linuxkpi/common/src X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/compat/linuxkpi/common/src X-SVN-Commit-Revision: 330865 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 16:33:42 -0000 Author: hselasky Date: Tue Mar 13 16:33:41 2018 New Revision: 330865 URL: https://svnweb.freebsd.org/changeset/base/330865 Log: MFC r330689: Implement proper support for complete_all() in the LinuxKPI. When complete_all() is called there might be multiple waiters. The current implementation could only handle one waiter. Make sure the completion is sticky when complete_all() is called to be compatible with Linux. Found by: Johannes Lundberg Sponsored by: Mellanox Technologies Sponsored by: Limelight Networks Modified: stable/11/sys/compat/linuxkpi/common/src/linux_compat.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/src/linux_compat.c ============================================================================== --- stable/11/sys/compat/linuxkpi/common/src/linux_compat.c Tue Mar 13 16:33:00 2018 (r330864) +++ stable/11/sys/compat/linuxkpi/common/src/linux_compat.c Tue Mar 13 16:33:41 2018 (r330865) @@ -1779,11 +1779,14 @@ linux_complete_common(struct completion *c, int all) int wakeup_swapper; sleepq_lock(c); - c->done++; - if (all) + if (all) { + c->done = UINT_MAX; wakeup_swapper = sleepq_broadcast(c, SLEEPQ_SLEEP, 0, 0); - else + } else { + if (c->done != UINT_MAX) + c->done++; wakeup_swapper = sleepq_signal(c, SLEEPQ_SLEEP, 0, 0); + } sleepq_release(c); if (wakeup_swapper) kick_proc0(); @@ -1825,7 +1828,8 @@ linux_wait_for_common(struct completion *c, int flags) } else sleepq_wait(c, 0); } - c->done--; + if (c->done != UINT_MAX) + c->done--; sleepq_release(c); intr: @@ -1878,7 +1882,8 @@ linux_wait_for_timeout_common(struct completion *c, in goto done; } } - c->done--; + if (c->done != UINT_MAX) + c->done--; sleepq_release(c); /* return how many jiffies are left */ @@ -1894,12 +1899,10 @@ linux_try_wait_for_completion(struct completion *c) { int isdone; - isdone = 1; sleepq_lock(c); - if (c->done) + isdone = (c->done != 0); + if (c->done != 0 && c->done != UINT_MAX) c->done--; - else - isdone = 0; sleepq_release(c); return (isdone); } @@ -1909,10 +1912,8 @@ linux_completion_done(struct completion *c) { int isdone; - isdone = 1; sleepq_lock(c); - if (c->done == 0) - isdone = 0; + isdone = (c->done != 0); sleepq_release(c); return (isdone); } From owner-svn-src-stable@freebsd.org Tue Mar 13 17:04:15 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 70A08F32FD9; Tue, 13 Mar 2018 17:04:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1B3A469682; Tue, 13 Mar 2018 17:04:15 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 15F1E1C8FC; Tue, 13 Mar 2018 17:04:15 +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 w2DH4EtF025827; Tue, 13 Mar 2018 17:04:14 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DH4E2w025825; Tue, 13 Mar 2018 17:04:14 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803131704.w2DH4E2w025825@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 13 Mar 2018 17:04: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: r330867 - in stable/11/sys/compat/linuxkpi/common: include/linux src X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in stable/11/sys/compat/linuxkpi/common: include/linux src X-SVN-Commit-Revision: 330867 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 17:04:15 -0000 Author: hselasky Date: Tue Mar 13 17:04:14 2018 New Revision: 330867 URL: https://svnweb.freebsd.org/changeset/base/330867 Log: MFC r330271: Rename callout member in struct timer_list to match the one in struct delayed_work in the LinuxKPI. This allows the timer_pending() function macro to be used with delayed work structures. No functional nor structural change. Submitted by: Johannes Lundberg Sponsored by: Mellanox Technologies Sponsored by: Limelight Networks Modified: stable/11/sys/compat/linuxkpi/common/include/linux/timer.h stable/11/sys/compat/linuxkpi/common/src/linux_compat.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/include/linux/timer.h ============================================================================== --- stable/11/sys/compat/linuxkpi/common/include/linux/timer.h Tue Mar 13 16:40:29 2018 (r330866) +++ stable/11/sys/compat/linuxkpi/common/include/linux/timer.h Tue Mar 13 17:04:14 2018 (r330867) @@ -38,7 +38,7 @@ #include struct timer_list { - struct callout timer_callout; + struct callout callout; void (*function) (unsigned long); unsigned long data; int expires; @@ -51,7 +51,7 @@ extern unsigned long linux_timer_hz_mask; #define setup_timer(timer, func, dat) do { \ (timer)->function = (func); \ (timer)->data = (dat); \ - callout_init(&(timer)->timer_callout, 1); \ + callout_init(&(timer)->callout, 1); \ } while (0) #define __setup_timer(timer, func, dat, flags) do { \ @@ -62,16 +62,16 @@ extern unsigned long linux_timer_hz_mask; #define init_timer(timer) do { \ (timer)->function = NULL; \ (timer)->data = 0; \ - callout_init(&(timer)->timer_callout, 1); \ + callout_init(&(timer)->callout, 1); \ } while (0) extern void mod_timer(struct timer_list *, int); extern void add_timer(struct timer_list *); extern void add_timer_on(struct timer_list *, int cpu); -#define del_timer(timer) (void)callout_stop(&(timer)->timer_callout) -#define del_timer_sync(timer) (void)callout_drain(&(timer)->timer_callout) -#define timer_pending(timer) callout_pending(&(timer)->timer_callout) +#define del_timer(timer) (void)callout_stop(&(timer)->callout) +#define del_timer_sync(timer) (void)callout_drain(&(timer)->callout) +#define timer_pending(timer) callout_pending(&(timer)->callout) #define round_jiffies(j) \ ((int)(((j) + linux_timer_hz_mask) & ~linux_timer_hz_mask)) #define round_jiffies_relative(j) round_jiffies(j) Modified: stable/11/sys/compat/linuxkpi/common/src/linux_compat.c ============================================================================== --- stable/11/sys/compat/linuxkpi/common/src/linux_compat.c Tue Mar 13 16:40:29 2018 (r330866) +++ stable/11/sys/compat/linuxkpi/common/src/linux_compat.c Tue Mar 13 17:04:14 2018 (r330867) @@ -1734,7 +1734,7 @@ mod_timer(struct timer_list *timer, int expires) { timer->expires = expires; - callout_reset(&timer->timer_callout, + callout_reset(&timer->callout, linux_timer_jiffies_until(expires), &linux_timer_callback_wrapper, timer); } @@ -1743,7 +1743,7 @@ void add_timer(struct timer_list *timer) { - callout_reset(&timer->timer_callout, + callout_reset(&timer->callout, linux_timer_jiffies_until(timer->expires), &linux_timer_callback_wrapper, timer); } @@ -1752,7 +1752,7 @@ void add_timer_on(struct timer_list *timer, int cpu) { - callout_reset_on(&timer->timer_callout, + callout_reset_on(&timer->callout, linux_timer_jiffies_until(timer->expires), &linux_timer_callback_wrapper, timer, cpu); } From owner-svn-src-stable@freebsd.org Wed Mar 14 00:27:26 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 78F4FF301D4; Wed, 14 Mar 2018 00:27:26 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2776B7E990; Wed, 14 Mar 2018 00:27:26 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 084CD20E24; Wed, 14 Mar 2018 00:27:26 +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 w2E0RQb2050113; Wed, 14 Mar 2018 00:27:26 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E0RP2M050108; Wed, 14 Mar 2018 00:27:25 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201803140027.w2E0RP2M050108@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Wed, 14 Mar 2018 00:27: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: r330888 - in stable/11: share/man/man4 sys/dev/isp X-SVN-Group: stable-11 X-SVN-Commit-Author: mav X-SVN-Commit-Paths: in stable/11: share/man/man4 sys/dev/isp X-SVN-Commit-Revision: 330888 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 00:27:26 -0000 Author: mav Date: Wed Mar 14 00:27:25 2018 New Revision: 330888 URL: https://svnweb.freebsd.org/changeset/base/330888 Log: MFC r330121: Add support for Enhanced Gen 5 (16Gb) and Gen 6 (32Gb) QLogic FC HBAs. Sponsored by: iXsystems, Inc. Modified: stable/11/share/man/man4/isp.4 stable/11/sys/dev/isp/isp.c stable/11/sys/dev/isp/isp_pci.c stable/11/sys/dev/isp/ispmbox.h stable/11/sys/dev/isp/ispvar.h Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man4/isp.4 ============================================================================== --- stable/11/share/man/man4/isp.4 Wed Mar 14 00:04:58 2018 (r330887) +++ stable/11/share/man/man4/isp.4 Wed Mar 14 00:27:25 2018 (r330888) @@ -1,4 +1,4 @@ -.\" Copyright (c) 2009-2017 Alexander Motin +.\" Copyright (c) 2009-2018 Alexander Motin .\" Copyright (c) 2006 Marcus Alves Grando .\" Copyright (c) 1998-2001 Matthew Jacob, for NASA/Ames Research Center .\" @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 3, 2017 +.Dd February 27, 2018 .Dt ISP 4 .Os .Sh NAME @@ -139,6 +139,10 @@ Optical 4Gb Fibre Channel PCIe cards. Optical 8Gb Fibre Channel PCIe cards. .It Qlogic 267x/836x (aka 2031/8031) Optical 16Gb FC/FCoE PCIe cards. +.It Qlogic 2690/2692/2694 (aka 2684/2692) +Optical 16Gb Fibre Channel PCIe cards. +.It Qlogic 2740/2742/2764 (aka 2722/2714) +Optical 32Gb Fibre Channel PCIe cards. .El .Sh CONFIGURATION OPTIONS Target mode support for Fibre Channel adapters may be enabled with the Modified: stable/11/sys/dev/isp/isp.c ============================================================================== --- stable/11/sys/dev/isp/isp.c Wed Mar 14 00:04:58 2018 (r330887) +++ stable/11/sys/dev/isp/isp.c Wed Mar 14 00:27:25 2018 (r330888) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2009-2017 Alexander Motin + * Copyright (c) 2009-2018 Alexander Motin * Copyright (c) 1997-2009 by Matthew Jacob * All rights reserved. * @@ -224,8 +224,11 @@ isp_reset(ispsoftc_t *isp, int do_load_defaults) btype = "2532"; break; case ISP_HA_FC_2600: - btype = "2031"; + btype = "2600"; break; + case ISP_HA_FC_2700: + btype = "2700"; + break; default: break; } @@ -2018,7 +2021,7 @@ isp_fibre_init_2400(ispsoftc_t *isp) } icbp->icb_execthrottle = DEFAULT_EXEC_THROTTLE(isp); - if (icbp->icb_execthrottle < 1) { + if (icbp->icb_execthrottle < 1 && !IS_26XX(isp)) { isp_prt(isp, ISP_LOGERR, "bad execution throttle of %d- using %d", DEFAULT_EXEC_THROTTLE(isp), ICB_DFLT_THROTTLE); icbp->icb_execthrottle = ICB_DFLT_THROTTLE; } @@ -2123,11 +2126,15 @@ isp_fibre_init_2400(ispsoftc_t *isp) } else if (isp->isp_confopts & ISP_CFG_16GB) { icbp->icb_fwoptions3 &= ~ICB2400_OPT3_RATE_MASK; icbp->icb_fwoptions3 |= ICB2400_OPT3_RATE_16GB; + } else if (isp->isp_confopts & ISP_CFG_32GB) { + icbp->icb_fwoptions3 &= ~ICB2400_OPT3_RATE_MASK; + icbp->icb_fwoptions3 |= ICB2400_OPT3_RATE_32GB; } else { switch (icbp->icb_fwoptions3 & ICB2400_OPT3_RATE_MASK) { case ICB2400_OPT3_RATE_4GB: case ICB2400_OPT3_RATE_8GB: case ICB2400_OPT3_RATE_16GB: + case ICB2400_OPT3_RATE_32GB: case ICB2400_OPT3_RATE_AUTO: break; case ICB2400_OPT3_RATE_2GB: @@ -3092,6 +3099,8 @@ not_on_fabric: if (mbs.param[0] == MBOX_COMMAND_COMPLETE) { if (mbs.param[1] == MBGSD_10GB) fcp->isp_gbspeed = 10; + else if (mbs.param[1] == MBGSD_32GB) + fcp->isp_gbspeed = 32; else if (mbs.param[1] == MBGSD_16GB) fcp->isp_gbspeed = 16; else if (mbs.param[1] == MBGSD_8GB) @@ -5900,6 +5909,13 @@ isp_parse_async_fc(ispsoftc_t *isp, uint16_t mbox) isp_prt(isp, ISP_LOGERR, "Temperature alert (subcode 0x%x)", ISP_READ(isp, OUTMAILBOX1)); break; + case ASYNC_TRANSCEIVER_INSERTION: + isp_prt(isp, ISP_LOGDEBUG0, "Transceiver insertion (0x%x)", + ISP_READ(isp, OUTMAILBOX1)); + break; + case ASYNC_TRANSCEIVER_REMOVAL: + isp_prt(isp, ISP_LOGDEBUG0, "Transceiver removal"); + break; case ASYNC_AUTOLOAD_FW_COMPLETE: isp_prt(isp, ISP_LOGDEBUG0, "Autoload FW init complete"); break; @@ -6824,7 +6840,7 @@ static const uint32_t mbpfc[] = { ISP_FC_OPMAP(0x07, 0x01), /* 0x66: MBOX_TARGET_RESET */ ISP_FC_OPMAP(0x07, 0x01), /* 0x67: MBOX_CLEAR_TASK_SET */ ISP_FC_OPMAP(0x07, 0x01), /* 0x68: MBOX_ABORT_TASK_SET */ - ISP_FC_OPMAP(0x01, 0x07), /* 0x69: MBOX_GET_FW_STATE */ + ISP_FC_OPMAP_HALF(0x00, 0x01, 0x0f, 0x1f), /* 0x69: MBOX_GET_FW_STATE */ ISP_FC_OPMAP_HALF(0x6, 0x03, 0x0, 0xcf), /* 0x6a: MBOX_GET_PORT_NAME */ ISP_FC_OPMAP(0xcf, 0x01), /* 0x6b: MBOX_GET_LINK_STATUS */ ISP_FC_OPMAP(0x0f, 0x01), /* 0x6c: MBOX_INIT_LIP_RESET */ Modified: stable/11/sys/dev/isp/isp_pci.c ============================================================================== --- stable/11/sys/dev/isp/isp_pci.c Wed Mar 14 00:04:58 2018 (r330887) +++ stable/11/sys/dev/isp/isp_pci.c Wed Mar 14 00:27:25 2018 (r330888) @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2009-2018 Alexander Motin * Copyright (c) 1997-2008 by Matthew Jacob * All rights reserved. * @@ -175,6 +176,17 @@ static struct ispmdvec mdvec_2600 = { NULL }; +static struct ispmdvec mdvec_2700 = { + isp_pci_run_isr_2400, + isp_pci_rd_reg_2600, + isp_pci_wr_reg_2600, + isp_pci_mbxdma, + isp_pci_dmasetup, + isp_common_dmateardown, + isp_pci_irqsetup, + NULL +}; + #ifndef PCIM_CMD_INVEN #define PCIM_CMD_INVEN 0x10 #endif @@ -207,142 +219,80 @@ static struct ispmdvec mdvec_2600 = { #define PCIR_ROMADDR 0x30 #endif -#ifndef PCI_VENDOR_QLOGIC #define PCI_VENDOR_QLOGIC 0x1077 -#endif -#ifndef PCI_PRODUCT_QLOGIC_ISP1020 #define PCI_PRODUCT_QLOGIC_ISP1020 0x1020 -#endif - -#ifndef PCI_PRODUCT_QLOGIC_ISP1080 #define PCI_PRODUCT_QLOGIC_ISP1080 0x1080 -#endif - -#ifndef PCI_PRODUCT_QLOGIC_ISP10160 #define PCI_PRODUCT_QLOGIC_ISP10160 0x1016 -#endif - -#ifndef PCI_PRODUCT_QLOGIC_ISP12160 #define PCI_PRODUCT_QLOGIC_ISP12160 0x1216 -#endif - -#ifndef PCI_PRODUCT_QLOGIC_ISP1240 #define PCI_PRODUCT_QLOGIC_ISP1240 0x1240 -#endif - -#ifndef PCI_PRODUCT_QLOGIC_ISP1280 #define PCI_PRODUCT_QLOGIC_ISP1280 0x1280 -#endif -#ifndef PCI_PRODUCT_QLOGIC_ISP2100 #define PCI_PRODUCT_QLOGIC_ISP2100 0x2100 -#endif - -#ifndef PCI_PRODUCT_QLOGIC_ISP2200 #define PCI_PRODUCT_QLOGIC_ISP2200 0x2200 -#endif - -#ifndef PCI_PRODUCT_QLOGIC_ISP2300 #define PCI_PRODUCT_QLOGIC_ISP2300 0x2300 -#endif - -#ifndef PCI_PRODUCT_QLOGIC_ISP2312 #define PCI_PRODUCT_QLOGIC_ISP2312 0x2312 -#endif - -#ifndef PCI_PRODUCT_QLOGIC_ISP2322 #define PCI_PRODUCT_QLOGIC_ISP2322 0x2322 -#endif - -#ifndef PCI_PRODUCT_QLOGIC_ISP2422 #define PCI_PRODUCT_QLOGIC_ISP2422 0x2422 -#endif - -#ifndef PCI_PRODUCT_QLOGIC_ISP2432 #define PCI_PRODUCT_QLOGIC_ISP2432 0x2432 -#endif - -#ifndef PCI_PRODUCT_QLOGIC_ISP2532 #define PCI_PRODUCT_QLOGIC_ISP2532 0x2532 -#endif - -#ifndef PCI_PRODUCT_QLOGIC_ISP6312 +#define PCI_PRODUCT_QLOGIC_ISP5432 0x5432 #define PCI_PRODUCT_QLOGIC_ISP6312 0x6312 -#endif - -#ifndef PCI_PRODUCT_QLOGIC_ISP6322 #define PCI_PRODUCT_QLOGIC_ISP6322 0x6322 -#endif - -#ifndef PCI_PRODUCT_QLOGIC_ISP5432 -#define PCI_PRODUCT_QLOGIC_ISP5432 0x5432 -#endif - -#ifndef PCI_PRODUCT_QLOGIC_ISP2031 #define PCI_PRODUCT_QLOGIC_ISP2031 0x2031 -#endif - -#ifndef PCI_PRODUCT_QLOGIC_ISP8031 #define PCI_PRODUCT_QLOGIC_ISP8031 0x8031 -#endif +#define PCI_PRODUCT_QLOGIC_ISP2684 0x2171 +#define PCI_PRODUCT_QLOGIC_ISP2692 0x2b61 +#define PCI_PRODUCT_QLOGIC_ISP2714 0x2071 +#define PCI_PRODUCT_QLOGIC_ISP2722 0x2261 -#define PCI_QLOGIC_ISP5432 \ - ((PCI_PRODUCT_QLOGIC_ISP5432 << 16) | PCI_VENDOR_QLOGIC) - #define PCI_QLOGIC_ISP1020 \ ((PCI_PRODUCT_QLOGIC_ISP1020 << 16) | PCI_VENDOR_QLOGIC) - #define PCI_QLOGIC_ISP1080 \ ((PCI_PRODUCT_QLOGIC_ISP1080 << 16) | PCI_VENDOR_QLOGIC) - #define PCI_QLOGIC_ISP10160 \ ((PCI_PRODUCT_QLOGIC_ISP10160 << 16) | PCI_VENDOR_QLOGIC) - #define PCI_QLOGIC_ISP12160 \ ((PCI_PRODUCT_QLOGIC_ISP12160 << 16) | PCI_VENDOR_QLOGIC) - #define PCI_QLOGIC_ISP1240 \ ((PCI_PRODUCT_QLOGIC_ISP1240 << 16) | PCI_VENDOR_QLOGIC) - #define PCI_QLOGIC_ISP1280 \ ((PCI_PRODUCT_QLOGIC_ISP1280 << 16) | PCI_VENDOR_QLOGIC) #define PCI_QLOGIC_ISP2100 \ ((PCI_PRODUCT_QLOGIC_ISP2100 << 16) | PCI_VENDOR_QLOGIC) - #define PCI_QLOGIC_ISP2200 \ ((PCI_PRODUCT_QLOGIC_ISP2200 << 16) | PCI_VENDOR_QLOGIC) - #define PCI_QLOGIC_ISP2300 \ ((PCI_PRODUCT_QLOGIC_ISP2300 << 16) | PCI_VENDOR_QLOGIC) - #define PCI_QLOGIC_ISP2312 \ ((PCI_PRODUCT_QLOGIC_ISP2312 << 16) | PCI_VENDOR_QLOGIC) - #define PCI_QLOGIC_ISP2322 \ ((PCI_PRODUCT_QLOGIC_ISP2322 << 16) | PCI_VENDOR_QLOGIC) - #define PCI_QLOGIC_ISP2422 \ ((PCI_PRODUCT_QLOGIC_ISP2422 << 16) | PCI_VENDOR_QLOGIC) - #define PCI_QLOGIC_ISP2432 \ ((PCI_PRODUCT_QLOGIC_ISP2432 << 16) | PCI_VENDOR_QLOGIC) - #define PCI_QLOGIC_ISP2532 \ ((PCI_PRODUCT_QLOGIC_ISP2532 << 16) | PCI_VENDOR_QLOGIC) - +#define PCI_QLOGIC_ISP5432 \ + ((PCI_PRODUCT_QLOGIC_ISP5432 << 16) | PCI_VENDOR_QLOGIC) #define PCI_QLOGIC_ISP6312 \ ((PCI_PRODUCT_QLOGIC_ISP6312 << 16) | PCI_VENDOR_QLOGIC) - #define PCI_QLOGIC_ISP6322 \ ((PCI_PRODUCT_QLOGIC_ISP6322 << 16) | PCI_VENDOR_QLOGIC) - #define PCI_QLOGIC_ISP2031 \ ((PCI_PRODUCT_QLOGIC_ISP2031 << 16) | PCI_VENDOR_QLOGIC) - #define PCI_QLOGIC_ISP8031 \ ((PCI_PRODUCT_QLOGIC_ISP8031 << 16) | PCI_VENDOR_QLOGIC) +#define PCI_QLOGIC_ISP2684 \ + ((PCI_PRODUCT_QLOGIC_ISP2684 << 16) | PCI_VENDOR_QLOGIC) +#define PCI_QLOGIC_ISP2692 \ + ((PCI_PRODUCT_QLOGIC_ISP2692 << 16) | PCI_VENDOR_QLOGIC) +#define PCI_QLOGIC_ISP2714 \ + ((PCI_PRODUCT_QLOGIC_ISP2714 << 16) | PCI_VENDOR_QLOGIC) +#define PCI_QLOGIC_ISP2722 \ + ((PCI_PRODUCT_QLOGIC_ISP2722 << 16) | PCI_VENDOR_QLOGIC) /* * Odd case for some AMI raid cards... We need to *not* attach to this. @@ -462,6 +412,18 @@ isp_pci_probe(device_t dev) case PCI_QLOGIC_ISP8031: device_set_desc(dev, "Qlogic ISP 8031 PCI FCoE Adapter"); break; + case PCI_QLOGIC_ISP2684: + device_set_desc(dev, "Qlogic ISP 2684 PCI FC Adapter"); + break; + case PCI_QLOGIC_ISP2692: + device_set_desc(dev, "Qlogic ISP 2692 PCI FC Adapter"); + break; + case PCI_QLOGIC_ISP2714: + device_set_desc(dev, "Qlogic ISP 2714 PCI FC Adapter"); + break; + case PCI_QLOGIC_ISP2722: + device_set_desc(dev, "Qlogic ISP 2722 PCI FC Adapter"); + break; default: return (ENXIO); } @@ -807,6 +769,16 @@ isp_pci_attach(device_t dev) isp->isp_nchan += isp_nvports; isp->isp_mdvec = &mdvec_2600; isp->isp_type = ISP_HA_FC_2600; + pcs->pci_poff[MBOX_BLOCK >> _BLK_REG_SHFT] = PCI_MBOX_REGS2400_OFF; + break; + case PCI_QLOGIC_ISP2684: + case PCI_QLOGIC_ISP2692: + case PCI_QLOGIC_ISP2714: + case PCI_QLOGIC_ISP2722: + did = 0x2700; + isp->isp_nchan += isp_nvports; + isp->isp_mdvec = &mdvec_2700; + isp->isp_type = ISP_HA_FC_2700; pcs->pci_poff[MBOX_BLOCK >> _BLK_REG_SHFT] = PCI_MBOX_REGS2400_OFF; break; default: Modified: stable/11/sys/dev/isp/ispmbox.h ============================================================================== --- stable/11/sys/dev/isp/ispmbox.h Wed Mar 14 00:04:58 2018 (r330887) +++ stable/11/sys/dev/isp/ispmbox.h Wed Mar 14 00:27:25 2018 (r330888) @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /*- - * Copyright (c) 2009-2017 Alexander Motin + * Copyright (c) 2009-2018 Alexander Motin * Copyright (c) 1997-2009 by Matthew Jacob * All rights reserved. * @@ -176,6 +176,7 @@ #define MBGSD_4GB 0x03 /* 24XX only */ #define MBGSD_8GB 0x04 /* 25XX only */ #define MBGSD_16GB 0x05 /* 26XX only */ +#define MBGSD_32GB 0x06 /* 27XX only */ #define MBGSD_10GB 0x13 /* 26XX only */ #define MBOX_SEND_RNFT 0x005e #define MBOX_INIT_FIRMWARE 0x0060 @@ -297,6 +298,8 @@ #define ASYNC_INTER_DRIVER_COMP 0x8100 /* FCoE only */ #define ASYNC_INTER_DRIVER_NOTIFY 0x8101 /* FCoE only */ #define ASYNC_INTER_DRIVER_TIME_EXT 0x8102 /* FCoE only */ +#define ASYNC_TRANSCEIVER_INSERTION 0x8130 +#define ASYNC_TRANSCEIVER_REMOVAL 0x8131 #define ASYNC_NIC_FW_STATE_CHANGE 0x8200 /* FCoE only */ #define ASYNC_AUTOLOAD_FW_COMPLETE 0x8400 #define ASYNC_AUTOLOAD_FW_FAILURE 0x8401 @@ -1070,6 +1073,7 @@ typedef struct { #define ICB2400_OPT3_RATE_4GB 0x00006000 #define ICB2400_OPT3_RATE_8GB 0x00008000 #define ICB2400_OPT3_RATE_16GB 0x0000A000 +#define ICB2400_OPT3_RATE_32GB 0x0000C000 #define ICB2400_OPT3_ENA_OOF_XFRDY 0x00000200 #define ICB2400_OPT3_NO_N2N_LOGI 0x00000100 #define ICB2400_OPT3_NO_LOCAL_PLOGI 0x00000080 Modified: stable/11/sys/dev/isp/ispvar.h ============================================================================== --- stable/11/sys/dev/isp/ispvar.h Wed Mar 14 00:04:58 2018 (r330887) +++ stable/11/sys/dev/isp/ispvar.h Wed Mar 14 00:27:25 2018 (r330888) @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /*- - * Copyright (c) 2009-2017 Alexander Motin + * Copyright (c) 2009-2018 Alexander Motin * Copyright (c) 1997-2009 by Matthew Jacob * All rights reserved. * @@ -631,8 +631,8 @@ struct ispsoftc { #define ISP_CFG_NPORT_ONLY 0x04 /* insist on {N/F}-Port connection */ #define ISP_CFG_LPORT 0x06 /* prefer {N/F}L-Port connection */ #define ISP_CFG_NPORT 0x08 /* prefer {N/F}-Port connection */ -#define ISP_CFG_1GB 0x10 /* force 1GB connection (23XX only) */ -#define ISP_CFG_2GB 0x20 /* force 2GB connection (23XX only) */ +#define ISP_CFG_1GB 0x10 /* force 1Gb connection (23XX only) */ +#define ISP_CFG_2GB 0x20 /* force 2Gb connection (23XX only) */ #define ISP_CFG_NORELOAD 0x80 /* don't download f/w */ #define ISP_CFG_NONVRAM 0x40 /* ignore NVRAM */ #define ISP_CFG_NOFCTAPE 0x100 /* disable FC-Tape */ @@ -640,9 +640,10 @@ struct ispsoftc { #define ISP_CFG_OWNFSZ 0x400 /* override NVRAM frame size */ #define ISP_CFG_OWNLOOPID 0x800 /* override NVRAM loopid */ #define ISP_CFG_OWNEXCTHROTTLE 0x1000 /* override NVRAM execution throttle */ -#define ISP_CFG_4GB 0x2000 /* force 4GB connection (24XX only) */ -#define ISP_CFG_8GB 0x4000 /* force 8GB connection (25XX only) */ -#define ISP_CFG_16GB 0x8000 /* force 16GB connection (82XX only) */ +#define ISP_CFG_4GB 0x2000 /* force 4Gb connection (24XX only) */ +#define ISP_CFG_8GB 0x4000 /* force 8Gb connection (25XX only) */ +#define ISP_CFG_16GB 0x8000 /* force 16Gb connection (26XX only) */ +#define ISP_CFG_32GB 0x10000 /* force 32Gb connection (27XX only) */ /* * For each channel, the outer layers should know what role that channel @@ -743,6 +744,7 @@ struct ispsoftc { #define ISP_HA_FC_2400 0x60 #define ISP_HA_FC_2500 0x70 #define ISP_HA_FC_2600 0x80 +#define ISP_HA_FC_2700 0x90 #define IS_SCSI(isp) (isp->isp_type & ISP_HA_SCSI) #define IS_1020(isp) (isp->isp_type < ISP_HA_SCSI_1240) @@ -769,6 +771,7 @@ struct ispsoftc { #define IS_24XX(isp) ((isp)->isp_type >= ISP_HA_FC_2400) #define IS_25XX(isp) ((isp)->isp_type >= ISP_HA_FC_2500) #define IS_26XX(isp) ((isp)->isp_type >= ISP_HA_FC_2600) +#define IS_27XX(isp) ((isp)->isp_type >= ISP_HA_FC_2700) /* * DMA related macros From owner-svn-src-stable@freebsd.org Wed Mar 14 01:38:48 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8B94FF3A962; Wed, 14 Mar 2018 01:38:48 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 39D03814A3; Wed, 14 Mar 2018 01:38:48 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 33F2A218C5; Wed, 14 Mar 2018 01:38:48 +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 w2E1cmUo084669; Wed, 14 Mar 2018 01:38:48 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E1cmMJ084668; Wed, 14 Mar 2018 01:38:48 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201803140138.w2E1cmMJ084668@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 14 Mar 2018 01:38:48 +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: r330890 - stable/11/share/mk X-SVN-Group: stable-11 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/11/share/mk X-SVN-Commit-Revision: 330890 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 01:38:48 -0000 Author: emaste Date: Wed Mar 14 01:38:47 2018 New Revision: 330890 URL: https://svnweb.freebsd.org/changeset/base/330890 Log: MFC r330613: Disable LLD_BOOTSTRAP under WITHOUT_CROSS_COMPILER LLD is a cross toolchain component. It shouldn't be built when requesting a build without building a cross compiler. (CROSS_COMPILER is somewhat unfortunately named; in any case, lld should be treated as GNU binutils here.) Submitted by: Dan McGregor Modified: stable/11/share/mk/src.opts.mk Directory Properties: stable/11/ (props changed) Modified: stable/11/share/mk/src.opts.mk ============================================================================== --- stable/11/share/mk/src.opts.mk Wed Mar 14 00:30:49 2018 (r330889) +++ stable/11/share/mk/src.opts.mk Wed Mar 14 01:38:47 2018 (r330890) @@ -397,6 +397,7 @@ MK_BINUTILS_BOOTSTRAP:= no MK_CLANG_BOOTSTRAP:= no MK_ELFTOOLCHAIN_BOOTSTRAP:= no MK_GCC_BOOTSTRAP:= no +MK_LLD_BOOTSTRAP:= no .endif .if ${MK_META_MODE} == "yes" From owner-svn-src-stable@freebsd.org Wed Mar 14 02:45:43 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0EB6FF43BD8; Wed, 14 Mar 2018 02:45:43 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B12EA83C2E; Wed, 14 Mar 2018 02:45:42 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 89EBD22371; Wed, 14 Mar 2018 02:45:42 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E2jges019646; Wed, 14 Mar 2018 02:45:42 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E2jgpG019644; Wed, 14 Mar 2018 02:45:42 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140245.w2E2jgpG019644@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 02:45: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: r330892 - stable/11/sys/dev/syscons X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/syscons X-SVN-Commit-Revision: 330892 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 02:45:43 -0000 Author: eadler Date: Wed Mar 14 02:45:42 2018 New Revision: 330892 URL: https://svnweb.freebsd.org/changeset/base/330892 Log: MFC r304173,r304181,r304186: Fix restoring the kbd_mode part of the keyboard state in grab/ungrab. Simply change the mode to K_XLATE using a local variable and use the grab level as a flag to tell screen switches not to change it again, so that we don't need to switch scp->kbd_mode. We did the latter, but didn't have the complications to update the keyboard mode switch for every screen switch. sc->kbd_mode remains at its user setting for all scp's and ungrabbing restores to it. Restructure the grabbing functions into mere wrappers of new open and close functions. Scattered calls to sc_cnputc() and sc_cngetc() were broken by turning the semi-reentrant inline context-switching code in these functions into the grabbing functions. cncheckc() calls for panic dumps are the main broken case. The grabbing functions have special behaviour (mainly screen switching in sc_cngrab()) which makes them unsuitable as replacements for the inline code. Clean up the new sc cn open and close functions (old sc cn grab and ungrab functions). Mainly, spell sc as itself instead of as scp->sc. Modified: stable/11/sys/dev/syscons/syscons.c stable/11/sys/dev/syscons/syscons.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/syscons/syscons.c ============================================================================== --- stable/11/sys/dev/syscons/syscons.c Wed Mar 14 02:35:49 2018 (r330891) +++ stable/11/sys/dev/syscons/syscons.c Wed Mar 14 02:45:42 2018 (r330892) @@ -1645,59 +1645,70 @@ sc_cnterm(struct consdev *cp) sc_console = NULL; } +struct sc_cnstate; /* not used yet */ +static void sccnclose(sc_softc_t *sc, struct sc_cnstate *sp); +static void sccnopen(sc_softc_t *sc, struct sc_cnstate *sp, int flags); + static void -sc_cngrab(struct consdev *cp) +sccnopen(sc_softc_t *sc, struct sc_cnstate *sp, int flags) { - scr_stat *scp; + int kbd_mode; if (!cold && - sc_console->sc->cur_scp->index != sc_console->index && - sc_console->sc->cur_scp->smode.mode == VT_AUTO && + sc->cur_scp->index != sc_console->index && + sc->cur_scp->smode.mode == VT_AUTO && sc_console->smode.mode == VT_AUTO) - sc_switch_scr(sc_console->sc, sc_console->index); + sc_switch_scr(sc, sc_console->index); - scp = sc_console->sc->cur_scp; - - if (scp->sc->kbd == NULL) + if (sc->kbd == NULL) return; - if (scp->sc->grab_level++ > 0) - return; - /* * Make sure the keyboard is accessible even when the kbd device * driver is disabled. */ - kbdd_enable(scp->sc->kbd); + kbdd_enable(sc->kbd); - /* we shall always use the keyboard in the XLATE mode here */ - scp->kbd_prev_mode = scp->kbd_mode; - scp->kbd_mode = K_XLATE; - (void)kbdd_ioctl(scp->sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode); - - kbdd_poll(scp->sc->kbd, TRUE); + /* Switch the keyboard to console mode (K_XLATE, polled) on all scp's. */ + kbd_mode = K_XLATE; + (void)kbdd_ioctl(sc->kbd, KDSKBMODE, (caddr_t)&kbd_mode); + kbdd_poll(sc->kbd, TRUE); } static void -sc_cnungrab(struct consdev *cp) +sccnclose(sc_softc_t *sc, struct sc_cnstate *sp) { - scr_stat *scp; - - scp = sc_console->sc->cur_scp; /* XXX */ - if (scp->sc->kbd == NULL) + if (sc->kbd == NULL) return; - if (--scp->sc->grab_level > 0) - return; + /* Restore keyboard mode (for the current, possibly-changed scp). */ + kbdd_poll(sc->kbd, FALSE); + (void)kbdd_ioctl(sc->kbd, KDSKBMODE, (caddr_t)&sc->cur_scp->kbd_mode); - kbdd_poll(scp->sc->kbd, FALSE); + kbdd_disable(sc->kbd); +} - scp->kbd_mode = scp->kbd_prev_mode; - (void)kbdd_ioctl(scp->sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode); - kbdd_disable(scp->sc->kbd); +static void +sc_cngrab(struct consdev *cp) +{ + sc_softc_t *sc; + + sc = sc_console->sc; + if (sc->grab_level++ == 0) + sccnopen(sc, NULL, 0); } static void +sc_cnungrab(struct consdev *cp) +{ + sc_softc_t *sc; + + sc = sc_console->sc; + if (--sc->grab_level == 0) + sccnclose(sc, NULL); +} + +static void sc_cnputc(struct consdev *cd, int c) { u_char buf[1]; @@ -2667,7 +2678,7 @@ exchange_scr(sc_softc_t *sc) sc_set_border(scp, scp->border); /* set up the keyboard for the new screen */ - if (sc->old_scp->kbd_mode != scp->kbd_mode) + if (sc->grab_level == 0 && sc->old_scp->kbd_mode != scp->kbd_mode) (void)kbdd_ioctl(sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode); update_kbd_state(scp, scp->status, LOCK_MASK); @@ -3412,7 +3423,7 @@ next_code: if (!(flags & SCGETC_CN)) random_harvest_queue(&c, sizeof(c), 1, RANDOM_KEYBOARD); - if (scp->kbd_mode != K_XLATE) + if (sc->grab_level == 0 && scp->kbd_mode != K_XLATE) return KEYCHAR(c); /* if scroll-lock pressed allow history browsing */ Modified: stable/11/sys/dev/syscons/syscons.h ============================================================================== --- stable/11/sys/dev/syscons/syscons.h Wed Mar 14 02:35:49 2018 (r330891) +++ stable/11/sys/dev/syscons/syscons.h Wed Mar 14 02:45:42 2018 (r330892) @@ -306,7 +306,6 @@ typedef struct scr_stat { int status; /* status (bitfield) */ int kbd_mode; /* keyboard I/O mode */ - int kbd_prev_mode; /* keyboard I/O mode */ int cursor_pos; /* cursor buffer position */ int cursor_oldpos; /* cursor old buffer position */ From owner-svn-src-stable@freebsd.org Wed Mar 14 02:56:43 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AA895F468B6; Wed, 14 Mar 2018 02:56:43 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 58770843DB; Wed, 14 Mar 2018 02:56:43 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 535D7224EF; Wed, 14 Mar 2018 02:56:43 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E2uhjK024420; Wed, 14 Mar 2018 02:56:43 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E2uhgs024419; Wed, 14 Mar 2018 02:56:43 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140256.w2E2uhgs024419@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 02:56: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: r330893 - stable/11/sys/dev/syscons X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/syscons X-SVN-Commit-Revision: 330893 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 02:56:44 -0000 Author: eadler Date: Wed Mar 14 02:56:43 2018 New Revision: 330893 URL: https://svnweb.freebsd.org/changeset/base/330893 Log: MFC r304758: Reorganise a little to prepare for locking fixes: - in sccnopen(), open the keyboard before the screen. The keyboard currently requires Giant (although it must be spinlocked to work correctly as a console), so the previous order would be a LOR if it has any semblance of locking. - add a (currently dummy) state arg to scgetc(). Modified: stable/11/sys/dev/syscons/syscons.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/syscons/syscons.c ============================================================================== --- stable/11/sys/dev/syscons/syscons.c Wed Mar 14 02:45:42 2018 (r330892) +++ stable/11/sys/dev/syscons/syscons.c Wed Mar 14 02:56:43 2018 (r330893) @@ -79,6 +79,8 @@ __FBSDID("$FreeBSD$"); #include #include +struct sc_cnstate; /* not used yet */ + #define COLD 0 #define WARM 1 @@ -185,7 +187,7 @@ static void scterm(int unit, int flags); static void scshutdown(void *, int); static void scsuspend(void *); static void scresume(void *); -static u_int scgetc(sc_softc_t *sc, u_int flags); +static u_int scgetc(sc_softc_t *sc, u_int flags, struct sc_cnstate *sp); static void sc_puts(scr_stat *scp, u_char *buf, int len, int kernel); #define SCGETC_CN 1 #define SCGETC_NONBLOCK 2 @@ -750,7 +752,7 @@ sckbdevent(keyboard_t *thiskbd, int event, void *arg) * I don't think this is nessesary, and it doesn't fix * the Xaccel-2.1 keyboard hang, but it can't hurt. XXX */ - while ((c = scgetc(sc, SCGETC_NONBLOCK)) != NOKEY) { + while ((c = scgetc(sc, SCGETC_NONBLOCK, NULL)) != NOKEY) { cur_tty = SC_DEV(sc, sc->cur_scp->index); if (!tty_opened_ns(cur_tty)) @@ -1645,7 +1647,6 @@ sc_cnterm(struct consdev *cp) sc_console = NULL; } -struct sc_cnstate; /* not used yet */ static void sccnclose(sc_softc_t *sc, struct sc_cnstate *sp); static void sccnopen(sc_softc_t *sc, struct sc_cnstate *sp, int flags); @@ -1654,14 +1655,8 @@ sccnopen(sc_softc_t *sc, struct sc_cnstate *sp, int fl { int kbd_mode; - if (!cold && - sc->cur_scp->index != sc_console->index && - sc->cur_scp->smode.mode == VT_AUTO && - sc_console->smode.mode == VT_AUTO) - sc_switch_scr(sc, sc_console->index); - if (sc->kbd == NULL) - return; + goto over_keyboard; /* * Make sure the keyboard is accessible even when the kbd device @@ -1673,6 +1668,14 @@ sccnopen(sc_softc_t *sc, struct sc_cnstate *sp, int fl kbd_mode = K_XLATE; (void)kbdd_ioctl(sc->kbd, KDSKBMODE, (caddr_t)&kbd_mode); kbdd_poll(sc->kbd, TRUE); +over_keyboard: ; + + if (!cold && + sc->cur_scp->index != sc_console->index && + sc->cur_scp->smode.mode == VT_AUTO && + sc_console->smode.mode == VT_AUTO) + sc_switch_scr(sc, sc_console->index); + } static void @@ -1787,7 +1790,7 @@ sc_cngetc(struct consdev *cd) return -1; } - c = scgetc(scp->sc, SCGETC_CN | SCGETC_NONBLOCK); + c = scgetc(scp->sc, SCGETC_CN | SCGETC_NONBLOCK, NULL); switch (KEYFLAGS(c)) { case 0: /* normal char */ @@ -3383,7 +3386,7 @@ sc_init_emulator(scr_stat *scp, char *name) * return NOKEY if there is nothing there. */ static u_int -scgetc(sc_softc_t *sc, u_int flags) +scgetc(sc_softc_t *sc, u_int flags, struct sc_cnstate *sp) { scr_stat *scp; #ifndef SC_NO_HISTORY From owner-svn-src-stable@freebsd.org Wed Mar 14 03:04:25 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 856B4F496AC; Wed, 14 Mar 2018 03:04:25 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 358F08510A; Wed, 14 Mar 2018 03:04:25 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3076C226F6; Wed, 14 Mar 2018 03:04:25 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E34PwR031032; Wed, 14 Mar 2018 03:04:25 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E34O5P031030; Wed, 14 Mar 2018 03:04:24 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140304.w2E34O5P031030@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 03:04: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: r330895 - stable/11/sys/dev/syscons X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/syscons X-SVN-Commit-Revision: 330895 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 03:04:25 -0000 Author: eadler Date: Wed Mar 14 03:04:24 2018 New Revision: 330895 URL: https://svnweb.freebsd.org/changeset/base/330895 Log: MFC r304773,r304800: Flesh out the state and flags args to sccnopen(). Set state flags to indicate (potentially partial) success of the open. Use these to decide what to close in sccnclose(). Only grab/ungrab use open/close so far. Add a per-sc variable to count successful keyboard opens and use this instead of the grab count to decide if the keyboad state has been switched. Start fixing the locking by using atomic ops for the most important counter -- the grab level one. Other racy counting will eventually be fixed by normal mutex or kdb locking in most cases. Use a 2-entry per-sc stack of states for grabbing. 2 is just enough to debug grabbing, e.g., for gets(). gets() grabs once and might not be able to do a full (or any) state switch. ddb grabs again and has a better chance of doing a full state switch and needs a place to stack the previous state. For more than 3 levels, grabbing just changes the count. Console drivers should try to switch on every i/o in case lower levels of nesting failed to switch but the current level succeeds, but then the switch (back) must be completed on every i/o and this flaps the state unless the switch is null. The main point of grabbing is to make it null quite often. Syscons grabbing also does a carefully chosen screen focus that is not done on every i/o. Add a large comment about grabbing. Restore some small lost comments. Modified: stable/11/sys/dev/syscons/syscons.c stable/11/sys/dev/syscons/syscons.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/syscons/syscons.c ============================================================================== --- stable/11/sys/dev/syscons/syscons.c Wed Mar 14 03:00:17 2018 (r330894) +++ stable/11/sys/dev/syscons/syscons.c Wed Mar 14 03:04:24 2018 (r330895) @@ -79,8 +79,6 @@ __FBSDID("$FreeBSD$"); #include #include -struct sc_cnstate; /* not used yet */ - #define COLD 0 #define WARM 1 @@ -1655,7 +1653,13 @@ sccnopen(sc_softc_t *sc, struct sc_cnstate *sp, int fl { int kbd_mode; - if (sc->kbd == NULL) + /* assert(sc_console_unit >= 0) */ + + sp->kbd_opened = FALSE; + sp->scr_opened = FALSE; + + /* Opening the keyboard is optional. */ + if (!(flags & 1) || sc->kbd == NULL) goto over_keyboard; /* @@ -1667,48 +1671,79 @@ sccnopen(sc_softc_t *sc, struct sc_cnstate *sp, int fl /* Switch the keyboard to console mode (K_XLATE, polled) on all scp's. */ kbd_mode = K_XLATE; (void)kbdd_ioctl(sc->kbd, KDSKBMODE, (caddr_t)&kbd_mode); + sc->kbd_open_level++; kbdd_poll(sc->kbd, TRUE); + + sp->kbd_opened = TRUE; over_keyboard: ; + /* The screen is opened iff locking it succeeds. */ + sp->scr_opened = TRUE; + + /* The screen switch is optional. */ + if (!(flags & 2)) + return; + + /* try to switch to the kernel console screen */ if (!cold && sc->cur_scp->index != sc_console->index && sc->cur_scp->smode.mode == VT_AUTO && sc_console->smode.mode == VT_AUTO) sc_switch_scr(sc, sc_console->index); - } static void sccnclose(sc_softc_t *sc, struct sc_cnstate *sp) { - if (sc->kbd == NULL) + sp->scr_opened = FALSE; + + if (!sp->kbd_opened) return; /* Restore keyboard mode (for the current, possibly-changed scp). */ kbdd_poll(sc->kbd, FALSE); - (void)kbdd_ioctl(sc->kbd, KDSKBMODE, (caddr_t)&sc->cur_scp->kbd_mode); + if (--sc->kbd_open_level == 0) + (void)kbdd_ioctl(sc->kbd, KDSKBMODE, (caddr_t)&sc->cur_scp->kbd_mode); kbdd_disable(sc->kbd); + sp->kbd_opened = FALSE; } +/* + * Grabbing switches the screen and keyboard focus to sc_console and the + * keyboard mode to (K_XLATE, polled). Only switching to polled mode is + * essential (for preventing the interrupt handler from eating input + * between polls). Focus is part of the UI, and the other switches are + * work just was well when they are done on every entry and exit. + * + * Screen switches while grabbed are supported, and to maintain focus for + * this ungrabbing and closing only restore the polling state and then + * the keyboard mode if on the original screen. + */ + static void sc_cngrab(struct consdev *cp) { sc_softc_t *sc; + int lev; sc = sc_console->sc; - if (sc->grab_level++ == 0) - sccnopen(sc, NULL, 0); + lev = atomic_fetchadd_int(&sc->grab_level, 1); + if (lev >= 0 && lev < 2) + sccnopen(sc, &sc->grab_state[lev], 1 | 2); } static void sc_cnungrab(struct consdev *cp) { sc_softc_t *sc; + int lev; sc = sc_console->sc; - if (--sc->grab_level == 0) - sccnclose(sc, NULL); + lev = atomic_load_acq_int(&sc->grab_level) - 1; + if (lev >= 0 && lev < 2) + sccnclose(sc, &sc->grab_state[lev]); + atomic_add_int(&sc->grab_level, -1); } static void @@ -2681,7 +2716,7 @@ exchange_scr(sc_softc_t *sc) sc_set_border(scp, scp->border); /* set up the keyboard for the new screen */ - if (sc->grab_level == 0 && sc->old_scp->kbd_mode != scp->kbd_mode) + if (sc->kbd_open_level == 0 && sc->old_scp->kbd_mode != scp->kbd_mode) (void)kbdd_ioctl(sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode); update_kbd_state(scp, scp->status, LOCK_MASK); @@ -3426,7 +3461,7 @@ next_code: if (!(flags & SCGETC_CN)) random_harvest_queue(&c, sizeof(c), 1, RANDOM_KEYBOARD); - if (sc->grab_level == 0 && scp->kbd_mode != K_XLATE) + if (sc->kbd_open_level == 0 && scp->kbd_mode != K_XLATE) return KEYCHAR(c); /* if scroll-lock pressed allow history browsing */ Modified: stable/11/sys/dev/syscons/syscons.h ============================================================================== --- stable/11/sys/dev/syscons/syscons.h Wed Mar 14 03:00:17 2018 (r330894) +++ stable/11/sys/dev/syscons/syscons.h Wed Mar 14 03:04:24 2018 (r330895) @@ -188,6 +188,11 @@ struct video_adapter; struct scr_stat; struct tty; +struct sc_cnstate { + u_char kbd_opened; + u_char scr_opened; +}; + typedef struct sc_softc { int unit; /* unit # */ int config; /* configuration flags */ @@ -231,6 +236,9 @@ typedef struct sc_softc { char write_in_progress; char blink_in_progress; int grab_level; + /* 2 is just enough for kdb to grab for stepping normal grabbing: */ + struct sc_cnstate grab_state[2]; + int kbd_open_level; struct mtx scr_lock; /* mutex for sc_puts() */ struct mtx video_mtx; From owner-svn-src-stable@freebsd.org Wed Mar 14 03:09:49 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BA068F49BB5; Wed, 14 Mar 2018 03:09:48 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 67E7F85779; Wed, 14 Mar 2018 03:09:48 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 62BE9226FC; Wed, 14 Mar 2018 03:09:48 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E39mxg031371; Wed, 14 Mar 2018 03:09:48 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E39mMD031368; Wed, 14 Mar 2018 03:09:48 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140309.w2E39mMD031368@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 03:09:48 +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: r330896 - in stable/11/sys: dev/syscons kern X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: in stable/11/sys: dev/syscons kern X-SVN-Commit-Revision: 330896 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 03:09:49 -0000 Author: eadler Date: Wed Mar 14 03:09:47 2018 New Revision: 330896 URL: https://svnweb.freebsd.org/changeset/base/330896 Log: MFC r304804: Less-quick fix for locking fixes in r172250. r172250 added a second syscons spinlock for the output routine alone. It is better to extend the coverage of the first syscons spinlock added in r162285. 2 locks might work with complicated juggling, but no juggling was done. What the 2 locks actually did was to cover some of the missing locking in each other and deadlock less often against each other than a single lock with larger coverage would against itself. Races are preferable to deadlocks here, but 2 locks are still worse since they are harder to understand and fix. Prefer deadlocks to races and merge the second lock into the first one. Extend the scope of the spinlocking to all of sc_cnputc() instead of just the sc_puts() part. This further prefers deadlocks to races. Extend the kdb_active hack from sc_puts() internals for the second lock to all spinlocking. This reduces deadlocks much more than the other changes increases them. The s/p,10* test in ddb gets much further now. Hide this detail in the SC_VIDEO_LOCK() macro. Add namespace pollution in 1 nested #include and reduce namespace pollution in other nested #includes to pay for this. Move the first lock higher in the witness order. The second lock was unnaturally low and the first lock was unnaturally high. The second lock had to be above "sleepq chain" and/or "callout" to avoid spurious LORs for visual bells in sc_puts(). Other console driver locks are already even higher (but not adjacent like they should be) except when they are missing from the table. Audio bells also benefit from the syscons lock being high so that audio mutexes have chance of being lower. Otherwise, console drviver locks should be as low as possible. Non-spurious LORs now occur if the bell code calls printf() or is interrupted (perhaps by an NMI) and the interrupt handler calls printf(). Previous commits turned off many bells in console i/o but missed ones done by the teken layer. Modified: stable/11/sys/dev/syscons/syscons.c stable/11/sys/dev/syscons/syscons.h stable/11/sys/kern/subr_witness.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/syscons/syscons.c ============================================================================== --- stable/11/sys/dev/syscons/syscons.c Wed Mar 14 03:04:24 2018 (r330895) +++ stable/11/sys/dev/syscons/syscons.c Wed Mar 14 03:09:47 2018 (r330896) @@ -343,7 +343,9 @@ sctty_outwakeup(struct tty *tp) len = ttydisc_getc(tp, buf, sizeof buf); if (len == 0) break; + SC_VIDEO_LOCK(scp->sc); sc_puts(scp, buf, len, 0); + SC_VIDEO_UNLOCK(scp->sc); } } @@ -1760,6 +1762,8 @@ sc_cnputc(struct consdev *cd, int c) /* assert(sc_console != NULL) */ + SC_VIDEO_LOCK(scp->sc); + #ifndef SC_NO_HISTORY if (scp == scp->sc->cur_scp && scp->status & SLKED) { scp->status &= ~SLKED; @@ -1793,6 +1797,7 @@ sc_cnputc(struct consdev *cd, int c) s = spltty(); /* block sckbdevent and scrn_timer */ sccnupdate(scp); splx(s); + SC_VIDEO_UNLOCK(scp->sc); } static int @@ -2726,24 +2731,14 @@ exchange_scr(sc_softc_t *sc) static void sc_puts(scr_stat *scp, u_char *buf, int len, int kernel) { - int need_unlock = 0; - #ifdef DEV_SPLASH /* make screensaver happy */ if (!sticky_splash && scp == scp->sc->cur_scp && !sc_saver_keyb_only) run_scrn_saver = FALSE; #endif - if (scp->tsw) { - if (!kdb_active && !mtx_owned(&scp->sc->scr_lock)) { - need_unlock = 1; - mtx_lock_spin(&scp->sc->scr_lock); - } + if (scp->tsw) (*scp->tsw->te_puts)(scp, buf, len, kernel); - if (need_unlock) - mtx_unlock_spin(&scp->sc->scr_lock); - } - if (scp->sc->delayed_next_scr) sc_switch_scr(scp->sc, scp->sc->delayed_next_scr - 1); } @@ -2906,10 +2901,8 @@ scinit(int unit, int flags) * disappeared... */ sc = sc_get_softc(unit, flags & SC_KERNEL_CONSOLE); - if ((sc->flags & SC_INIT_DONE) == 0) { - mtx_init(&sc->scr_lock, "scrlock", NULL, MTX_SPIN); + if ((sc->flags & SC_INIT_DONE) == 0) SC_VIDEO_LOCKINIT(sc); - } adp = NULL; if (sc->adapter >= 0) { @@ -3126,7 +3119,6 @@ scterm(int unit, int flags) (*scp->tsw->te_term)(scp, &scp->ts); if (scp->ts != NULL) free(scp->ts, M_DEVBUF); - mtx_destroy(&sc->scr_lock); mtx_destroy(&sc->video_mtx); /* clear the structure */ Modified: stable/11/sys/dev/syscons/syscons.h ============================================================================== --- stable/11/sys/dev/syscons/syscons.h Wed Mar 14 03:04:24 2018 (r330895) +++ stable/11/sys/dev/syscons/syscons.h Wed Mar 14 03:09:47 2018 (r330896) @@ -34,8 +34,9 @@ #ifndef _DEV_SYSCONS_SYSCONS_H_ #define _DEV_SYSCONS_SYSCONS_H_ -#include -#include +#include /* XXX */ +#include +#include /* machine-dependent part of the header */ @@ -239,7 +240,6 @@ typedef struct sc_softc { /* 2 is just enough for kdb to grab for stepping normal grabbing: */ struct sc_cnstate grab_state[2]; int kbd_open_level; - struct mtx scr_lock; /* mutex for sc_puts() */ struct mtx video_mtx; long scrn_time_stamp; @@ -547,12 +547,12 @@ typedef struct { MTX_SPIN | MTX_RECURSE); #define SC_VIDEO_LOCK(sc) \ do { \ - if (!cold) \ + if (!kdb_active) \ mtx_lock_spin(&(sc)->video_mtx); \ } while(0) #define SC_VIDEO_UNLOCK(sc) \ do { \ - if (!cold) \ + if (!kdb_active) \ mtx_unlock_spin(&(sc)->video_mtx); \ } while(0) Modified: stable/11/sys/kern/subr_witness.c ============================================================================== --- stable/11/sys/kern/subr_witness.c Wed Mar 14 03:04:24 2018 (r330895) +++ stable/11/sys/kern/subr_witness.c Wed Mar 14 03:09:47 2018 (r330896) @@ -645,7 +645,6 @@ static struct witness_order_list_entry order_lists[] = #endif { "rm.mutex_mtx", &lock_class_mtx_spin }, { "sio", &lock_class_mtx_spin }, - { "scrlock", &lock_class_mtx_spin }, #ifdef __i386__ { "cy", &lock_class_mtx_spin }, #endif @@ -661,6 +660,7 @@ static struct witness_order_list_entry order_lists[] = { "pmc-per-proc", &lock_class_mtx_spin }, #endif { "process slock", &lock_class_mtx_spin }, + { "syscons video lock", &lock_class_mtx_spin }, { "sleepq chain", &lock_class_mtx_spin }, { "rm_spinlock", &lock_class_mtx_spin }, { "turnstile chain", &lock_class_mtx_spin }, @@ -669,7 +669,6 @@ static struct witness_order_list_entry order_lists[] = { "td_contested", &lock_class_mtx_spin }, { "callout", &lock_class_mtx_spin }, { "entropy harvest mutex", &lock_class_mtx_spin }, - { "syscons video lock", &lock_class_mtx_spin }, #ifdef SMP { "smp rendezvous", &lock_class_mtx_spin }, #endif From owner-svn-src-stable@freebsd.org Wed Mar 14 03:20:09 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B426CF4A60F; Wed, 14 Mar 2018 03:20:08 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6644385D52; Wed, 14 Mar 2018 03:20:08 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5FDD12287D; Wed, 14 Mar 2018 03:20:08 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E3K8x7036486; Wed, 14 Mar 2018 03:20:08 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E3JuGP036341; Wed, 14 Mar 2018 03:19:56 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140319.w2E3JuGP036341@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 03:19: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: r330897 - in stable/11: 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 bi... X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: in stable/11: 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 bin/realpath bin/rm... X-SVN-Commit-Revision: 330897 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 03:20:10 -0000 Author: eadler Date: Wed Mar 14 03:19:51 2018 New Revision: 330897 URL: https://svnweb.freebsd.org/changeset/base/330897 Log: Partial merge of the SPDX changes These changes are incomplete but are making it difficult to determine what other changes can/should be merged. No objections from: pfg Modified: stable/11/bin/cat/cat.c stable/11/bin/chflags/chflags.c stable/11/bin/chmod/chmod.c stable/11/bin/cp/cp.c stable/11/bin/cp/extern.h stable/11/bin/cp/utils.c stable/11/bin/date/date.c stable/11/bin/date/extern.h stable/11/bin/date/netdate.c stable/11/bin/dd/args.c stable/11/bin/dd/conv.c stable/11/bin/dd/conv_tab.c stable/11/bin/dd/dd.c stable/11/bin/dd/dd.h stable/11/bin/dd/extern.h stable/11/bin/dd/misc.c stable/11/bin/dd/position.c stable/11/bin/df/df.c stable/11/bin/domainname/domainname.c stable/11/bin/echo/echo.c stable/11/bin/ed/cbc.c stable/11/bin/hostname/hostname.c stable/11/bin/kill/kill.c stable/11/bin/ln/ln.c stable/11/bin/ls/cmp.c stable/11/bin/ls/extern.h stable/11/bin/ls/ls.c stable/11/bin/ls/ls.h stable/11/bin/ls/print.c stable/11/bin/ls/util.c stable/11/bin/mkdir/mkdir.c stable/11/bin/mv/mv.c stable/11/bin/pax/ar_io.c stable/11/bin/pax/ar_subs.c stable/11/bin/pax/buf_subs.c stable/11/bin/pax/cache.c stable/11/bin/pax/cache.h stable/11/bin/pax/cpio.c stable/11/bin/pax/cpio.h stable/11/bin/pax/extern.h stable/11/bin/pax/file_subs.c stable/11/bin/pax/ftree.c stable/11/bin/pax/ftree.h stable/11/bin/pax/gen_subs.c stable/11/bin/pax/options.c stable/11/bin/pax/options.h stable/11/bin/pax/pat_rep.c stable/11/bin/pax/pat_rep.h stable/11/bin/pax/pax.c stable/11/bin/pax/pax.h stable/11/bin/pax/sel_subs.c stable/11/bin/pax/sel_subs.h stable/11/bin/pax/tables.c stable/11/bin/pax/tables.h stable/11/bin/pax/tar.c stable/11/bin/pax/tar.h stable/11/bin/pax/tty_subs.c stable/11/bin/ps/extern.h stable/11/bin/ps/fmt.c stable/11/bin/ps/keyword.c stable/11/bin/ps/nlist.c stable/11/bin/ps/print.c stable/11/bin/ps/ps.c stable/11/bin/ps/ps.h stable/11/bin/pwd/pwd.c stable/11/bin/realpath/realpath.c stable/11/bin/rm/rm.c stable/11/bin/rmdir/rmdir.c stable/11/bin/sh/bltin/bltin.h stable/11/bin/sh/bltin/echo.c stable/11/bin/sh/mail.h stable/11/bin/sh/main.c stable/11/bin/sh/main.h stable/11/bin/sh/memalloc.c stable/11/bin/sh/memalloc.h stable/11/bin/sh/miscbltin.c stable/11/bin/sh/mknodes.c stable/11/bin/sh/mksyntax.c stable/11/bin/sh/myhistedit.h stable/11/bin/sh/mystring.c stable/11/bin/sh/mystring.h stable/11/bin/sh/options.c stable/11/bin/sh/options.h stable/11/bin/sh/output.c stable/11/bin/sh/output.h stable/11/bin/sh/parser.c stable/11/bin/sh/parser.h stable/11/bin/sh/redir.c stable/11/bin/sh/redir.h stable/11/bin/sh/shell.h stable/11/bin/sh/show.c stable/11/bin/sh/show.h stable/11/bin/sh/trap.c stable/11/bin/sh/trap.h stable/11/bin/sh/var.c stable/11/bin/sh/var.h stable/11/include/_ctype.h stable/11/include/a.out.h stable/11/include/ar.h stable/11/include/arpa/ftp.h stable/11/include/arpa/inet.h stable/11/include/arpa/nameser.h stable/11/include/arpa/nameser_compat.h stable/11/include/arpa/telnet.h stable/11/include/arpa/tftp.h stable/11/include/assert.h stable/11/include/bitstring.h stable/11/include/complex.h stable/11/include/cpio.h stable/11/include/ctype.h stable/11/include/db.h stable/11/include/dirent.h stable/11/include/dlfcn.h stable/11/include/elf-hints.h stable/11/include/elf.h stable/11/include/err.h stable/11/include/fmtmsg.h stable/11/include/fnmatch.h stable/11/include/fstab.h stable/11/include/fts.h stable/11/include/getopt.h stable/11/include/glob.h stable/11/include/grp.h stable/11/include/hesiod.h stable/11/include/iconv.h stable/11/include/inttypes.h stable/11/include/iso646.h stable/11/include/kenv.h stable/11/include/langinfo.h stable/11/include/libgen.h stable/11/include/limits.h stable/11/include/link.h stable/11/include/locale.h stable/11/include/malloc_np.h stable/11/include/memory.h stable/11/include/mk-osreldate.sh stable/11/include/monetary.h stable/11/include/mpool.h stable/11/include/mqueue.h stable/11/include/ndbm.h stable/11/include/netdb.h stable/11/include/nl_types.h stable/11/include/nlist.h stable/11/include/nss.h stable/11/include/nsswitch.h stable/11/include/paths.h stable/11/include/printf.h stable/11/include/proc_service.h stable/11/include/protocols/dumprestore.h stable/11/include/protocols/routed.h stable/11/include/protocols/rwhod.h stable/11/include/protocols/talkd.h stable/11/include/protocols/timed.h stable/11/include/pthread.h stable/11/include/pthread_np.h stable/11/include/pwd.h stable/11/include/ranlib.h stable/11/include/regex.h stable/11/include/resolv.h stable/11/include/rpc/auth.h stable/11/include/rpc/auth_des.h stable/11/include/rpc/auth_kerb.h stable/11/include/rpc/auth_unix.h stable/11/include/rpc/clnt.h stable/11/include/rpc/clnt_soc.h stable/11/include/rpc/des.h stable/11/include/rpc/des_crypt.h stable/11/include/rpc/nettype.h stable/11/include/rpc/pmap_clnt.h stable/11/include/rpc/pmap_prot.h stable/11/include/rpc/pmap_rmt.h stable/11/include/rpc/raw.h stable/11/include/rpc/rpc.h stable/11/include/rpc/rpc_com.h stable/11/include/rpc/rpc_msg.h stable/11/include/rpc/rpcb_clnt.h stable/11/include/rpc/rpcent.h stable/11/include/rpc/rpcsec_gss.h stable/11/include/rpc/svc.h stable/11/include/rpc/svc_auth.h stable/11/include/rpc/svc_dg.h stable/11/include/rpc/svc_soc.h stable/11/include/rpc/xdr.h stable/11/include/rpcsvc/nis_tags.h stable/11/include/rpcsvc/yp_prot.h stable/11/include/rpcsvc/ypclnt.h stable/11/include/runetype.h stable/11/include/semaphore.h stable/11/include/setjmp.h stable/11/include/signal.h stable/11/include/spawn.h stable/11/include/stab.h stable/11/include/stdalign.h stable/11/include/stdbool.h stable/11/include/stddef.h stable/11/include/stdio.h stable/11/include/stdlib.h stable/11/include/stdnoreturn.h stable/11/include/string.h stable/11/include/stringlist.h stable/11/include/strings.h stable/11/include/sysexits.h stable/11/include/tar.h stable/11/include/termios.h stable/11/include/tgmath.h stable/11/include/time.h stable/11/include/timeconv.h stable/11/include/timers.h stable/11/include/ttyent.h stable/11/include/uchar.h stable/11/include/ulimit.h stable/11/include/unistd.h stable/11/include/utime.h stable/11/include/utmpx.h stable/11/include/uuid.h stable/11/include/varargs.h stable/11/include/wchar.h stable/11/include/wctype.h stable/11/include/wordexp.h stable/11/include/xlocale.h stable/11/include/xlocale/_ctype.h stable/11/include/xlocale/_inttypes.h stable/11/include/xlocale/_langinfo.h stable/11/include/xlocale/_locale.h stable/11/include/xlocale/_monetary.h stable/11/include/xlocale/_stdio.h stable/11/include/xlocale/_stdlib.h stable/11/include/xlocale/_string.h stable/11/include/xlocale/_time.h stable/11/include/xlocale/_uchar.h stable/11/include/xlocale/_wchar.h stable/11/lib/csu/amd64/crt1.c stable/11/lib/csu/arm/crt1.c stable/11/lib/csu/common/crtbrand.c stable/11/lib/csu/common/ignore_init.c stable/11/lib/csu/common/notes.h stable/11/lib/csu/mips/crt1.c stable/11/lib/csu/powerpc/crt1.c stable/11/lib/csu/powerpc64/crt1.c stable/11/lib/csu/sparc64/crt1.c stable/11/lib/libarchive/config_freebsd.h stable/11/lib/libbluetooth/bluetooth.c stable/11/lib/libbluetooth/bluetooth.h stable/11/lib/libbluetooth/dev.c stable/11/lib/libbluetooth/hci.c stable/11/lib/libbsdstat/bsdstat.c stable/11/lib/libbsdstat/bsdstat.h stable/11/lib/libc/amd64/SYS.h stable/11/lib/libc/amd64/_fpmath.h stable/11/lib/libc/amd64/gen/_set_tp.c stable/11/lib/libc/amd64/gen/getcontextx.c stable/11/lib/libc/amd64/gen/makecontext.c stable/11/lib/libc/amd64/gen/signalcontext.c stable/11/lib/libc/amd64/string/strcpy.c stable/11/lib/libc/amd64/sys/amd64_get_fsbase.c stable/11/lib/libc/amd64/sys/amd64_get_gsbase.c stable/11/lib/libc/amd64/sys/amd64_set_fsbase.c stable/11/lib/libc/amd64/sys/amd64_set_gsbase.c stable/11/lib/libc/arm/SYS.h stable/11/lib/libc/arm/_fpmath.h stable/11/lib/libc/arm/aeabi/aeabi_atexit.c stable/11/lib/libc/arm/aeabi/aeabi_double.c stable/11/lib/libc/arm/aeabi/aeabi_float.c stable/11/lib/libc/arm/aeabi/aeabi_unwind_cpp.c stable/11/lib/libc/arm/gen/_set_tp.c stable/11/lib/libc/arm/gen/arm_initfini.c stable/11/lib/libc/arm/gen/fabs.c stable/11/lib/libc/arm/gen/flt_rounds.c stable/11/lib/libc/arm/gen/getcontextx.c stable/11/lib/libc/arm/gen/makecontext.c stable/11/lib/libc/arm/gen/signalcontext.c stable/11/lib/libc/arm/sys/__vdso_gettc.c stable/11/lib/libc/compat-43/creat.c stable/11/lib/libc/compat-43/gethostid.c stable/11/lib/libc/compat-43/getwd.c stable/11/lib/libc/compat-43/killpg.c stable/11/lib/libc/compat-43/sethostid.c stable/11/lib/libc/compat-43/setpgrp.c stable/11/lib/libc/compat-43/setrgid.c stable/11/lib/libc/compat-43/setruid.c stable/11/lib/libc/compat-43/sigcompat.c stable/11/lib/libc/db/btree/bt_close.c stable/11/lib/libc/db/btree/bt_conv.c stable/11/lib/libc/db/btree/bt_debug.c stable/11/lib/libc/db/btree/bt_delete.c stable/11/lib/libc/db/btree/bt_get.c stable/11/lib/libc/db/btree/bt_open.c stable/11/lib/libc/db/btree/bt_overflow.c stable/11/lib/libc/db/btree/bt_page.c stable/11/lib/libc/db/btree/bt_put.c stable/11/lib/libc/db/btree/bt_search.c stable/11/lib/libc/db/btree/bt_seq.c stable/11/lib/libc/db/btree/bt_split.c stable/11/lib/libc/db/btree/bt_utils.c stable/11/lib/libc/db/btree/btree.h stable/11/lib/libc/db/btree/extern.h stable/11/lib/libc/db/db/db.c stable/11/lib/libc/db/hash/extern.h stable/11/lib/libc/db/hash/hash.c stable/11/lib/libc/db/hash/hash.h stable/11/lib/libc/db/hash/hash_bigkey.c stable/11/lib/libc/db/hash/hash_buf.c stable/11/lib/libc/db/hash/hash_func.c stable/11/lib/libc/db/hash/hash_log2.c stable/11/lib/libc/db/hash/hash_page.c stable/11/lib/libc/db/hash/ndbm.c stable/11/lib/libc/db/hash/page.h stable/11/lib/libc/db/mpool/mpool-compat.c stable/11/lib/libc/db/mpool/mpool.c stable/11/lib/libc/db/recno/extern.h stable/11/lib/libc/db/recno/rec_close.c stable/11/lib/libc/db/recno/rec_delete.c stable/11/lib/libc/db/recno/rec_get.c stable/11/lib/libc/db/recno/rec_open.c stable/11/lib/libc/db/recno/rec_put.c stable/11/lib/libc/db/recno/rec_search.c stable/11/lib/libc/db/recno/rec_seq.c stable/11/lib/libc/db/recno/rec_utils.c stable/11/lib/libc/db/recno/recno.h stable/11/lib/libc/db/test/btree.tests/main.c stable/11/lib/libc/db/test/dbtest.c stable/11/lib/libc/db/test/hash.tests/driver2.c stable/11/lib/libc/db/test/hash.tests/tcreat3.c stable/11/lib/libc/db/test/hash.tests/tdel.c stable/11/lib/libc/db/test/hash.tests/thash4.c stable/11/lib/libc/db/test/hash.tests/tread2.c stable/11/lib/libc/db/test/hash.tests/tseq.c stable/11/lib/libc/db/test/hash.tests/tverify.c stable/11/lib/libc/gdtoa/_hdtoa.c stable/11/lib/libc/gdtoa/_hldtoa.c stable/11/lib/libc/gdtoa/_ldtoa.c stable/11/lib/libc/gdtoa/machdep_ldisQ.c stable/11/lib/libc/gdtoa/machdep_ldisd.c stable/11/lib/libc/gdtoa/machdep_ldisx.c stable/11/lib/libc/gen/__getosreldate.c stable/11/lib/libc/gen/__xuname.c stable/11/lib/libc/gen/_once_stub.c stable/11/lib/libc/gen/_pthread_stubs.c stable/11/lib/libc/gen/_spinlock_stub.c stable/11/lib/libc/gen/_thread_init.c stable/11/lib/libc/gen/alarm.c stable/11/lib/libc/gen/assert.c stable/11/lib/libc/gen/auxv.c stable/11/lib/libc/gen/cap_sandboxed.c stable/11/lib/libc/gen/clock.c stable/11/lib/libc/gen/clock_getcpuclockid.c stable/11/lib/libc/gen/closedir.c stable/11/lib/libc/gen/confstr.c stable/11/lib/libc/gen/crypt.c stable/11/lib/libc/gen/ctermid.c stable/11/lib/libc/gen/daemon.c stable/11/lib/libc/gen/devname.c stable/11/lib/libc/gen/dirfd.c stable/11/lib/libc/gen/disklabel.c stable/11/lib/libc/gen/dlfcn.c stable/11/lib/libc/gen/dup3.c stable/11/lib/libc/gen/elf_utils.c stable/11/lib/libc/gen/err.c stable/11/lib/libc/gen/errlst.c stable/11/lib/libc/gen/errno.c stable/11/lib/libc/gen/exec.c stable/11/lib/libc/gen/fdevname.c stable/11/lib/libc/gen/feature_present.c stable/11/lib/libc/gen/fmtcheck.c stable/11/lib/libc/gen/fmtmsg.c stable/11/lib/libc/gen/fnmatch.c stable/11/lib/libc/gen/fpclassify.c stable/11/lib/libc/gen/frexp.c stable/11/lib/libc/gen/fstab.c stable/11/lib/libc/gen/ftok.c stable/11/lib/libc/gen/fts-compat.c stable/11/lib/libc/gen/fts-compat.h stable/11/lib/libc/gen/fts.c stable/11/lib/libc/gen/gen-private.h stable/11/lib/libc/gen/getbootfile.c stable/11/lib/libc/gen/getbsize.c stable/11/lib/libc/gen/getcap.c stable/11/lib/libc/gen/getcwd.c stable/11/lib/libc/gen/getdomainname.c stable/11/lib/libc/gen/getgrent.c stable/11/lib/libc/gen/getgrouplist.c stable/11/lib/libc/gen/gethostname.c stable/11/lib/libc/gen/getloadavg.c stable/11/lib/libc/gen/getlogin.c stable/11/lib/libc/gen/getmntinfo.c stable/11/lib/libc/gen/getnetgrent.c stable/11/lib/libc/gen/getosreldate.c stable/11/lib/libc/gen/getpagesize.c stable/11/lib/libc/gen/getpagesizes.c stable/11/lib/libc/gen/getpeereid.c stable/11/lib/libc/gen/getpwent.c stable/11/lib/libc/gen/getttyent.c stable/11/lib/libc/gen/getusershell.c stable/11/lib/libc/gen/getutxent.c stable/11/lib/libc/gen/getvfsbyname.c stable/11/lib/libc/gen/glob.c stable/11/lib/libc/gen/initgroups.c stable/11/lib/libc/gen/isatty.c stable/11/lib/libc/gen/isinf.c stable/11/lib/libc/gen/isnan.c stable/11/lib/libc/gen/libc_dlopen.c stable/11/lib/libc/gen/lockf.c stable/11/lib/libc/gen/nice.c stable/11/lib/libc/gen/nlist.c stable/11/lib/libc/gen/opendir.c stable/11/lib/libc/gen/pause.c stable/11/lib/libc/gen/popen.c stable/11/lib/libc/gen/posix_spawn.c stable/11/lib/libc/gen/psignal.c stable/11/lib/libc/gen/pututxline.c stable/11/lib/libc/gen/pw_scan.c stable/11/lib/libc/gen/pw_scan.h stable/11/lib/libc/gen/raise.c stable/11/lib/libc/gen/readdir.c stable/11/lib/libc/gen/rewinddir.c stable/11/lib/libc/gen/scandir.c stable/11/lib/libc/gen/seekdir.c stable/11/lib/libc/gen/sem.c stable/11/lib/libc/gen/sem_new.c stable/11/lib/libc/gen/semctl.c stable/11/lib/libc/gen/setdomainname.c stable/11/lib/libc/gen/sethostname.c stable/11/lib/libc/gen/setjmperr.c stable/11/lib/libc/gen/setmode.c stable/11/lib/libc/gen/siginterrupt.c stable/11/lib/libc/gen/siglist.c stable/11/lib/libc/gen/signal.c stable/11/lib/libc/gen/sigsetops.c stable/11/lib/libc/gen/sleep.c stable/11/lib/libc/gen/stringlist.c stable/11/lib/libc/gen/strtofflags.c stable/11/lib/libc/gen/sysconf.c stable/11/lib/libc/gen/sysctl.c stable/11/lib/libc/gen/sysctlnametomib.c stable/11/lib/libc/gen/syslog.c stable/11/lib/libc/gen/telldir.c stable/11/lib/libc/gen/telldir.h stable/11/lib/libc/gen/termios.c stable/11/lib/libc/gen/time.c stable/11/lib/libc/gen/times.c stable/11/lib/libc/gen/timezone.c stable/11/lib/libc/gen/tls.c stable/11/lib/libc/gen/ttyname.c stable/11/lib/libc/gen/ttyslot.c stable/11/lib/libc/gen/ualarm.c stable/11/lib/libc/gen/ulimit.c stable/11/lib/libc/gen/uname.c stable/11/lib/libc/gen/unvis-compat.c stable/11/lib/libc/gen/usleep.c stable/11/lib/libc/gen/utime.c stable/11/lib/libc/gen/utxdb.c stable/11/lib/libc/gen/utxdb.h stable/11/lib/libc/gen/valloc.c stable/11/lib/libc/gen/wait.c stable/11/lib/libc/gen/wait3.c stable/11/lib/libc/gen/waitid.c stable/11/lib/libc/gen/waitpid.c stable/11/lib/libc/gen/wordexp.c stable/11/lib/libc/gmon/gmon.c stable/11/lib/libc/gmon/mcount.c stable/11/lib/libc/i386/SYS.h stable/11/lib/libc/i386/_fpmath.h stable/11/lib/libc/i386/gen/_set_tp.c stable/11/lib/libc/i386/gen/getcontextx.c stable/11/lib/libc/i386/gen/makecontext.c stable/11/lib/libc/i386/gen/signalcontext.c stable/11/lib/libc/i386/sys/i386_clr_watch.c stable/11/lib/libc/i386/sys/i386_get_fsbase.c stable/11/lib/libc/i386/sys/i386_get_gsbase.c stable/11/lib/libc/i386/sys/i386_get_ioperm.c stable/11/lib/libc/i386/sys/i386_get_ldt.c stable/11/lib/libc/i386/sys/i386_set_fsbase.c stable/11/lib/libc/i386/sys/i386_set_gsbase.c stable/11/lib/libc/i386/sys/i386_set_ioperm.c stable/11/lib/libc/i386/sys/i386_set_ldt.c stable/11/lib/libc/i386/sys/i386_set_watch.c stable/11/lib/libc/i386/sys/i386_vm86.c stable/11/lib/libc/iconv/__iconv.c stable/11/lib/libc/iconv/__iconv_free_list.c stable/11/lib/libc/iconv/__iconv_get_list.c stable/11/lib/libc/iconv/_strtol.h stable/11/lib/libc/iconv/_strtoul.h stable/11/lib/libc/iconv/bsd_iconv.c stable/11/lib/libc/iconv/citrus_aliasname_local.h stable/11/lib/libc/iconv/citrus_bcs.c stable/11/lib/libc/iconv/citrus_bcs.h stable/11/lib/libc/iconv/citrus_bcs_strtol.c stable/11/lib/libc/iconv/citrus_bcs_strtoul.c stable/11/lib/libc/iconv/citrus_csmapper.c stable/11/lib/libc/iconv/citrus_csmapper.h stable/11/lib/libc/iconv/citrus_db.c stable/11/lib/libc/iconv/citrus_db.h stable/11/lib/libc/iconv/citrus_db_factory.c stable/11/lib/libc/iconv/citrus_db_factory.h stable/11/lib/libc/iconv/citrus_db_file.h stable/11/lib/libc/iconv/citrus_db_hash.c stable/11/lib/libc/iconv/citrus_db_hash.h stable/11/lib/libc/iconv/citrus_esdb.c stable/11/lib/libc/iconv/citrus_esdb.h stable/11/lib/libc/iconv/citrus_esdb_file.h stable/11/lib/libc/iconv/citrus_fix_grouping.h stable/11/lib/libc/iconv/citrus_hash.c stable/11/lib/libc/iconv/citrus_hash.h stable/11/lib/libc/iconv/citrus_iconv.c stable/11/lib/libc/iconv/citrus_iconv.h stable/11/lib/libc/iconv/citrus_iconv_local.h stable/11/lib/libc/iconv/citrus_lock.h stable/11/lib/libc/iconv/citrus_lookup.c stable/11/lib/libc/iconv/citrus_lookup.h stable/11/lib/libc/iconv/citrus_lookup_factory.c stable/11/lib/libc/iconv/citrus_lookup_factory.h stable/11/lib/libc/iconv/citrus_lookup_file.h stable/11/lib/libc/iconv/citrus_mapper.c stable/11/lib/libc/iconv/citrus_mapper.h stable/11/lib/libc/iconv/citrus_mapper_local.h stable/11/lib/libc/iconv/citrus_memstream.c stable/11/lib/libc/iconv/citrus_memstream.h stable/11/lib/libc/iconv/citrus_mmap.c stable/11/lib/libc/iconv/citrus_mmap.h stable/11/lib/libc/iconv/citrus_module.c stable/11/lib/libc/iconv/citrus_module.h stable/11/lib/libc/iconv/citrus_namespace.h stable/11/lib/libc/iconv/citrus_none.c stable/11/lib/libc/iconv/citrus_none.h stable/11/lib/libc/iconv/citrus_pivot_factory.c stable/11/lib/libc/iconv/citrus_pivot_factory.h stable/11/lib/libc/iconv/citrus_pivot_file.h stable/11/lib/libc/iconv/citrus_prop.c stable/11/lib/libc/iconv/citrus_prop.h stable/11/lib/libc/iconv/citrus_region.h stable/11/lib/libc/iconv/citrus_stdenc.c stable/11/lib/libc/iconv/citrus_stdenc.h stable/11/lib/libc/iconv/citrus_stdenc_local.h stable/11/lib/libc/iconv/citrus_stdenc_template.h stable/11/lib/libc/iconv/citrus_types.h stable/11/lib/libc/iconv/iconv-internal.h stable/11/lib/libc/iconv/iconv.c stable/11/lib/libc/iconv/iconv_canonicalize.c stable/11/lib/libc/iconv/iconv_close.c stable/11/lib/libc/iconv/iconv_compat.c stable/11/lib/libc/iconv/iconv_open.c stable/11/lib/libc/iconv/iconv_open_into.c stable/11/lib/libc/iconv/iconv_set_relocation_prefix.c stable/11/lib/libc/iconv/iconvctl.c stable/11/lib/libc/iconv/iconvlist.c stable/11/lib/libc/include/compat.h stable/11/lib/libc/include/errlst.h stable/11/lib/libc/include/fpmath.h stable/11/lib/libc/include/libc_private.h stable/11/lib/libc/include/namespace.h stable/11/lib/libc/include/nscache.h stable/11/lib/libc/include/nscachedcli.h stable/11/lib/libc/include/nss_tls.h stable/11/lib/libc/include/reentrant.h stable/11/lib/libc/include/spinlock.h stable/11/lib/libc/include/un-namespace.h stable/11/lib/libc/inet/inet_addr.c stable/11/lib/libc/inet/inet_lnaof.c stable/11/lib/libc/inet/inet_makeaddr.c stable/11/lib/libc/inet/inet_netof.c stable/11/lib/libc/inet/inet_network.c stable/11/lib/libc/inet/inet_ntoa.c stable/11/lib/libc/locale/ascii.c stable/11/lib/libc/locale/btowc.c stable/11/lib/libc/locale/c16rtomb.c stable/11/lib/libc/locale/c32rtomb.c stable/11/lib/libc/locale/cXXrtomb_iconv.h stable/11/lib/libc/locale/collate.c stable/11/lib/libc/locale/collate.h stable/11/lib/libc/locale/collcmp.c stable/11/lib/libc/locale/ctype.c stable/11/lib/libc/locale/euc.c stable/11/lib/libc/locale/fix_grouping.c stable/11/lib/libc/locale/gb18030.c stable/11/lib/libc/locale/gb2312.c stable/11/lib/libc/locale/gbk.c stable/11/lib/libc/locale/isctype.c stable/11/lib/libc/locale/iswctype.c stable/11/lib/libc/locale/ldpart.c stable/11/lib/libc/locale/ldpart.h stable/11/lib/libc/locale/lmessages.c stable/11/lib/libc/locale/lmessages.h stable/11/lib/libc/locale/lmonetary.c stable/11/lib/libc/locale/lmonetary.h stable/11/lib/libc/locale/lnumeric.c stable/11/lib/libc/locale/lnumeric.h stable/11/lib/libc/locale/localeconv.c stable/11/lib/libc/locale/mblen.c stable/11/lib/libc/locale/mblocal.h stable/11/lib/libc/locale/mbrlen.c stable/11/lib/libc/locale/mbrtoc16.c stable/11/lib/libc/locale/mbrtoc32.c stable/11/lib/libc/locale/mbrtocXX_iconv.h stable/11/lib/libc/locale/mbrtowc.c stable/11/lib/libc/locale/mbsinit.c stable/11/lib/libc/locale/mbsnrtowcs.c stable/11/lib/libc/locale/mbsrtowcs.c stable/11/lib/libc/locale/mbstowcs.c stable/11/lib/libc/locale/mbtowc.c stable/11/lib/libc/locale/mskanji.c stable/11/lib/libc/locale/nextwctype.c stable/11/lib/libc/locale/nl_langinfo.c stable/11/lib/libc/locale/none.c stable/11/lib/libc/locale/rpmatch.c stable/11/lib/libc/locale/rune.c stable/11/lib/libc/locale/runefile.h stable/11/lib/libc/locale/runetype.c stable/11/lib/libc/locale/setlocale.c stable/11/lib/libc/locale/setlocale.h stable/11/lib/libc/locale/setrunelocale.c stable/11/lib/libc/locale/table.c stable/11/lib/libc/locale/tolower.c stable/11/lib/libc/locale/toupper.c stable/11/lib/libc/locale/utf8.c stable/11/lib/libc/locale/wcrtomb.c stable/11/lib/libc/locale/wcsftime.c stable/11/lib/libc/locale/wcsnrtombs.c stable/11/lib/libc/locale/wcsrtombs.c stable/11/lib/libc/locale/wcstod.c stable/11/lib/libc/locale/wcstof.c stable/11/lib/libc/locale/wcstoimax.c stable/11/lib/libc/locale/wcstol.c stable/11/lib/libc/locale/wcstold.c stable/11/lib/libc/locale/wcstoll.c stable/11/lib/libc/locale/wcstombs.c stable/11/lib/libc/locale/wcstoul.c stable/11/lib/libc/locale/wcstoull.c stable/11/lib/libc/locale/wcstoumax.c stable/11/lib/libc/locale/wctob.c stable/11/lib/libc/locale/wctomb.c stable/11/lib/libc/locale/wctrans.c stable/11/lib/libc/locale/wctype.c stable/11/lib/libc/locale/wcwidth.c stable/11/lib/libc/locale/xlocale.c stable/11/lib/libc/locale/xlocale_private.h stable/11/lib/libc/mips/SYS.h stable/11/lib/libc/mips/_fpmath.h stable/11/lib/libc/mips/gen/_set_tp.c stable/11/lib/libc/mips/gen/fabs.c stable/11/lib/libc/mips/gen/longjmp.c stable/11/lib/libc/mips/gen/makecontext.c stable/11/lib/libc/mips/gen/signalcontext.c stable/11/lib/libc/net/ether_addr.c stable/11/lib/libc/net/gai_strerror.c stable/11/lib/libc/net/getaddrinfo.c stable/11/lib/libc/net/gethostbydns.c stable/11/lib/libc/net/gethostbyht.c stable/11/lib/libc/net/gethostbynis.c stable/11/lib/libc/net/gethostnamadr.c stable/11/lib/libc/net/getifmaddrs.c stable/11/lib/libc/net/getnameinfo.c stable/11/lib/libc/net/getnetbydns.c stable/11/lib/libc/net/getnetbyht.c stable/11/lib/libc/net/getnetbynis.c stable/11/lib/libc/net/getnetnamadr.c stable/11/lib/libc/net/getproto.c stable/11/lib/libc/net/getprotoent.c stable/11/lib/libc/net/getprotoname.c stable/11/lib/libc/net/getservent.c stable/11/lib/libc/net/ip6opt.c stable/11/lib/libc/net/linkaddr.c stable/11/lib/libc/net/map_v4v6.c stable/11/lib/libc/net/name6.c stable/11/lib/libc/net/netdb_private.h stable/11/lib/libc/net/nscache.c stable/11/lib/libc/net/nscachedcli.c stable/11/lib/libc/net/nsdispatch.c stable/11/lib/libc/net/nslexer.l stable/11/lib/libc/net/nsparser.y stable/11/lib/libc/net/nss_backends.h stable/11/lib/libc/net/nss_compat.c stable/11/lib/libc/net/ntoh.c stable/11/lib/libc/net/rcmd.c stable/11/lib/libc/net/rcmdsh.c stable/11/lib/libc/net/recv.c stable/11/lib/libc/net/rthdr.c stable/11/lib/libc/net/sctp_sys_calls.c stable/11/lib/libc/net/send.c stable/11/lib/libc/net/sockatmark.c stable/11/lib/libc/net/sourcefilter.c stable/11/lib/libc/net/vars.c stable/11/lib/libc/posix1e/acl_branding.c stable/11/lib/libc/posix1e/acl_calc_mask.c stable/11/lib/libc/posix1e/acl_compat.c stable/11/lib/libc/posix1e/acl_copy.c stable/11/lib/libc/posix1e/acl_delete.c stable/11/lib/libc/posix1e/acl_delete_entry.c stable/11/lib/libc/posix1e/acl_entry.c stable/11/lib/libc/posix1e/acl_flag.c stable/11/lib/libc/posix1e/acl_free.c stable/11/lib/libc/posix1e/acl_from_text.c stable/11/lib/libc/posix1e/acl_from_text_nfs4.c stable/11/lib/libc/posix1e/acl_get.c stable/11/lib/libc/posix1e/acl_id_to_name.c stable/11/lib/libc/posix1e/acl_init.c stable/11/lib/libc/posix1e/acl_perm.c stable/11/lib/libc/posix1e/acl_set.c stable/11/lib/libc/posix1e/acl_strip.c stable/11/lib/libc/posix1e/acl_support.c stable/11/lib/libc/posix1e/acl_support.h stable/11/lib/libc/posix1e/acl_support_nfs4.c stable/11/lib/libc/posix1e/acl_to_text.c stable/11/lib/libc/posix1e/acl_to_text_nfs4.c stable/11/lib/libc/posix1e/acl_valid.c stable/11/lib/libc/posix1e/extattr.c stable/11/lib/libc/posix1e/mac.c stable/11/lib/libc/posix1e/mac_exec.c stable/11/lib/libc/posix1e/mac_get.c stable/11/lib/libc/posix1e/mac_set.c stable/11/lib/libc/powerpc/SYS.h stable/11/lib/libc/powerpc/_fpmath.h stable/11/lib/libc/powerpc/gen/_set_tp.c stable/11/lib/libc/powerpc/gen/flt_rounds.c stable/11/lib/libc/powerpc/gen/fpgetmask.c stable/11/lib/libc/powerpc/gen/fpgetround.c stable/11/lib/libc/powerpc/gen/fpgetsticky.c stable/11/lib/libc/powerpc/gen/fpsetmask.c stable/11/lib/libc/powerpc/gen/fpsetround.c stable/11/lib/libc/powerpc/gen/makecontext.c stable/11/lib/libc/powerpc/gen/signalcontext.c stable/11/lib/libc/powerpc/gen/syncicache.c stable/11/lib/libc/powerpc64/SYS.h stable/11/lib/libc/powerpc64/_fpmath.h stable/11/lib/libc/powerpc64/gen/_set_tp.c stable/11/lib/libc/powerpc64/gen/flt_rounds.c stable/11/lib/libc/powerpc64/gen/fpgetmask.c stable/11/lib/libc/powerpc64/gen/fpgetround.c stable/11/lib/libc/powerpc64/gen/fpgetsticky.c stable/11/lib/libc/powerpc64/gen/fpsetmask.c stable/11/lib/libc/powerpc64/gen/fpsetround.c stable/11/lib/libc/powerpc64/gen/makecontext.c stable/11/lib/libc/powerpc64/gen/signalcontext.c stable/11/lib/libc/powerpc64/gen/syncicache.c stable/11/lib/libc/quad/TESTS/divrem.c stable/11/lib/libc/quad/TESTS/mul.c stable/11/lib/libc/quad/adddi3.c stable/11/lib/libc/quad/anddi3.c stable/11/lib/libc/quad/ashldi3.c stable/11/lib/libc/quad/ashrdi3.c stable/11/lib/libc/quad/cmpdi2.c stable/11/lib/libc/quad/divdi3.c stable/11/lib/libc/quad/fixdfdi.c stable/11/lib/libc/quad/fixsfdi.c stable/11/lib/libc/quad/fixunsdfdi.c stable/11/lib/libc/quad/fixunssfdi.c stable/11/lib/libc/quad/floatdidf.c stable/11/lib/libc/quad/floatdisf.c stable/11/lib/libc/quad/floatunsdidf.c stable/11/lib/libc/quad/iordi3.c stable/11/lib/libc/quad/lshldi3.c stable/11/lib/libc/quad/lshrdi3.c stable/11/lib/libc/quad/moddi3.c stable/11/lib/libc/quad/muldi3.c stable/11/lib/libc/quad/negdi2.c stable/11/lib/libc/quad/notdi2.c stable/11/lib/libc/quad/qdivrem.c stable/11/lib/libc/quad/quad.h stable/11/lib/libc/quad/subdi3.c stable/11/lib/libc/quad/ucmpdi2.c stable/11/lib/libc/quad/udivdi3.c stable/11/lib/libc/quad/umoddi3.c stable/11/lib/libc/quad/xordi3.c stable/11/lib/libc/regex/cname.h stable/11/lib/libc/regex/engine.c stable/11/lib/libc/regex/regcomp.c stable/11/lib/libc/regex/regerror.c stable/11/lib/libc/regex/regex2.h stable/11/lib/libc/regex/regexec.c stable/11/lib/libc/regex/regfree.c stable/11/lib/libc/regex/utils.h stable/11/lib/libc/resolv/h_errno.c stable/11/lib/libc/resolv/herror.c stable/11/lib/libc/resolv/res_comp.c stable/11/lib/libc/resolv/res_debug.c stable/11/lib/libc/resolv/res_init.c stable/11/lib/libc/resolv/res_mkquery.c stable/11/lib/libc/resolv/res_query.c stable/11/lib/libc/resolv/res_send.c stable/11/lib/libc/resolv/res_state.c stable/11/lib/libc/rpc/auth_des.c stable/11/lib/libc/rpc/auth_none.c stable/11/lib/libc/rpc/auth_unix.c stable/11/lib/libc/rpc/authdes_prot.c stable/11/lib/libc/rpc/authunix_prot.c stable/11/lib/libc/rpc/bindresvport.c stable/11/lib/libc/rpc/clnt_bcast.c stable/11/lib/libc/rpc/clnt_dg.c stable/11/lib/libc/rpc/clnt_generic.c stable/11/lib/libc/rpc/clnt_perror.c stable/11/lib/libc/rpc/clnt_raw.c stable/11/lib/libc/rpc/clnt_simple.c stable/11/lib/libc/rpc/clnt_vc.c stable/11/lib/libc/rpc/crypt_client.c stable/11/lib/libc/rpc/des_crypt.c stable/11/lib/libc/rpc/des_soft.c stable/11/lib/libc/rpc/getnetconfig.c stable/11/lib/libc/rpc/getnetpath.c stable/11/lib/libc/rpc/getpublickey.c stable/11/lib/libc/rpc/getrpcent.c stable/11/lib/libc/rpc/getrpcport.c stable/11/lib/libc/rpc/key_call.c stable/11/lib/libc/rpc/key_prot_xdr.c stable/11/lib/libc/rpc/mt_misc.h stable/11/lib/libc/rpc/netname.c stable/11/lib/libc/rpc/netnamer.c stable/11/lib/libc/rpc/pmap_clnt.c stable/11/lib/libc/rpc/pmap_getmaps.c stable/11/lib/libc/rpc/pmap_getport.c stable/11/lib/libc/rpc/pmap_prot.c stable/11/lib/libc/rpc/pmap_prot2.c stable/11/lib/libc/rpc/pmap_rmt.c stable/11/lib/libc/rpc/rpc_callmsg.c stable/11/lib/libc/rpc/rpc_com.h stable/11/lib/libc/rpc/rpc_commondata.c stable/11/lib/libc/rpc/rpc_dtablesize.c stable/11/lib/libc/rpc/rpc_generic.c stable/11/lib/libc/rpc/rpc_prot.c stable/11/lib/libc/rpc/rpc_soc.c stable/11/lib/libc/rpc/rpcb_clnt.c stable/11/lib/libc/rpc/rpcb_prot.c stable/11/lib/libc/rpc/rpcb_st_xdr.c stable/11/lib/libc/rpc/rpcdname.c stable/11/lib/libc/rpc/rpcsec_gss_stub.c stable/11/lib/libc/rpc/rtime.c stable/11/lib/libc/rpc/svc.c stable/11/lib/libc/rpc/svc_auth.c stable/11/lib/libc/rpc/svc_auth_des.c stable/11/lib/libc/rpc/svc_auth_unix.c stable/11/lib/libc/rpc/svc_dg.c stable/11/lib/libc/rpc/svc_generic.c stable/11/lib/libc/rpc/svc_raw.c stable/11/lib/libc/rpc/svc_run.c stable/11/lib/libc/rpc/svc_simple.c stable/11/lib/libc/rpc/svc_vc.c stable/11/lib/libc/softfloat/fpgetmask.c stable/11/lib/libc/softfloat/fpgetround.c stable/11/lib/libc/softfloat/fpgetsticky.c stable/11/lib/libc/softfloat/fpsetmask.c stable/11/lib/libc/softfloat/fpsetround.c stable/11/lib/libc/softfloat/fpsetsticky.c stable/11/lib/libc/sparc64/SYS.h stable/11/lib/libc/sparc64/_fpmath.h stable/11/lib/libc/sparc64/fpu/fpu.c stable/11/lib/libc/sparc64/fpu/fpu_add.c stable/11/lib/libc/sparc64/fpu/fpu_arith.h stable/11/lib/libc/sparc64/fpu/fpu_compare.c stable/11/lib/libc/sparc64/fpu/fpu_emu.h stable/11/lib/libc/sparc64/fpu/fpu_extern.h stable/11/lib/libc/sparc64/fpu/fpu_qp.c stable/11/lib/libc/sparc64/fpu/fpu_reg.h stable/11/lib/libc/sparc64/gen/_set_tp.c stable/11/lib/libc/sparc64/gen/makecontext.c stable/11/lib/libc/sparc64/gen/signalcontext.c stable/11/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c stable/11/lib/libc/sparc64/sys/__sparc_utrap.c stable/11/lib/libc/sparc64/sys/__sparc_utrap_align.c stable/11/lib/libc/sparc64/sys/__sparc_utrap_emul.c stable/11/lib/libc/sparc64/sys/__sparc_utrap_install.c stable/11/lib/libc/sparc64/sys/__sparc_utrap_private.h stable/11/lib/libc/sparc64/sys/__sparc_utrap_setup.c stable/11/lib/libc/stdio/_flock_stub.c stable/11/lib/libc/stdio/asprintf.c stable/11/lib/libc/stdio/clrerr.c stable/11/lib/libc/stdio/dprintf.c stable/11/lib/libc/stdio/fclose.c stable/11/lib/libc/stdio/fcloseall.c stable/11/lib/libc/stdio/fdopen.c stable/11/lib/libc/stdio/feof.c stable/11/lib/libc/stdio/ferror.c stable/11/lib/libc/stdio/fflush.c stable/11/lib/libc/stdio/fgetc.c stable/11/lib/libc/stdio/fgetln.c stable/11/lib/libc/stdio/fgetpos.c stable/11/lib/libc/stdio/fgets.c stable/11/lib/libc/stdio/fgetwc.c stable/11/lib/libc/stdio/fgetwln.c stable/11/lib/libc/stdio/fgetws.c stable/11/lib/libc/stdio/fileno.c stable/11/lib/libc/stdio/findfp.c stable/11/lib/libc/stdio/flags.c stable/11/lib/libc/stdio/floatio.h stable/11/lib/libc/stdio/fmemopen.c stable/11/lib/libc/stdio/fopen.c stable/11/lib/libc/stdio/fprintf.c stable/11/lib/libc/stdio/fpurge.c stable/11/lib/libc/stdio/fputc.c stable/11/lib/libc/stdio/fputs.c stable/11/lib/libc/stdio/fputwc.c stable/11/lib/libc/stdio/fputws.c stable/11/lib/libc/stdio/fread.c stable/11/lib/libc/stdio/freopen.c stable/11/lib/libc/stdio/fscanf.c stable/11/lib/libc/stdio/fseek.c stable/11/lib/libc/stdio/fsetpos.c stable/11/lib/libc/stdio/ftell.c stable/11/lib/libc/stdio/funopen.c stable/11/lib/libc/stdio/fvwrite.c stable/11/lib/libc/stdio/fvwrite.h stable/11/lib/libc/stdio/fwalk.c stable/11/lib/libc/stdio/fwide.c stable/11/lib/libc/stdio/fwprintf.c stable/11/lib/libc/stdio/fwrite.c stable/11/lib/libc/stdio/fwscanf.c stable/11/lib/libc/stdio/getc.c stable/11/lib/libc/stdio/getchar.c stable/11/lib/libc/stdio/getdelim.c stable/11/lib/libc/stdio/getline.c stable/11/lib/libc/stdio/gets.c stable/11/lib/libc/stdio/getw.c stable/11/lib/libc/stdio/getwc.c stable/11/lib/libc/stdio/getwchar.c stable/11/lib/libc/stdio/glue.h stable/11/lib/libc/stdio/local.h stable/11/lib/libc/stdio/makebuf.c stable/11/lib/libc/stdio/mktemp.c stable/11/lib/libc/stdio/open_memstream.c stable/11/lib/libc/stdio/open_wmemstream.c stable/11/lib/libc/stdio/perror.c stable/11/lib/libc/stdio/printf-pos.c stable/11/lib/libc/stdio/printf.c stable/11/lib/libc/stdio/printfcommon.h stable/11/lib/libc/stdio/printflocal.h stable/11/lib/libc/stdio/putc.c stable/11/lib/libc/stdio/putchar.c stable/11/lib/libc/stdio/puts.c stable/11/lib/libc/stdio/putw.c stable/11/lib/libc/stdio/putwc.c stable/11/lib/libc/stdio/putwchar.c stable/11/lib/libc/stdio/refill.c stable/11/lib/libc/stdio/remove.c stable/11/lib/libc/stdio/rewind.c stable/11/lib/libc/stdio/rget.c stable/11/lib/libc/stdio/scanf.c stable/11/lib/libc/stdio/setbuf.c stable/11/lib/libc/stdio/setbuffer.c stable/11/lib/libc/stdio/setvbuf.c stable/11/lib/libc/stdio/snprintf.c stable/11/lib/libc/stdio/sprintf.c stable/11/lib/libc/stdio/sscanf.c stable/11/lib/libc/stdio/stdio.c stable/11/lib/libc/stdio/swprintf.c stable/11/lib/libc/stdio/swscanf.c stable/11/lib/libc/stdio/tempnam.c stable/11/lib/libc/stdio/tmpfile.c stable/11/lib/libc/stdio/tmpnam.c stable/11/lib/libc/stdio/ungetc.c stable/11/lib/libc/stdio/ungetwc.c stable/11/lib/libc/stdio/vasprintf.c stable/11/lib/libc/stdio/vdprintf.c stable/11/lib/libc/stdio/vfprintf.c stable/11/lib/libc/stdio/vfscanf.c stable/11/lib/libc/stdio/vfwprintf.c stable/11/lib/libc/stdio/vfwscanf.c stable/11/lib/libc/stdio/vprintf.c stable/11/lib/libc/stdio/vscanf.c stable/11/lib/libc/stdio/vsnprintf.c stable/11/lib/libc/stdio/vsprintf.c stable/11/lib/libc/stdio/vsscanf.c stable/11/lib/libc/stdio/vswprintf.c stable/11/lib/libc/stdio/vswscanf.c stable/11/lib/libc/stdio/vwprintf.c stable/11/lib/libc/stdio/vwscanf.c stable/11/lib/libc/stdio/wbuf.c stable/11/lib/libc/stdio/wprintf.c stable/11/lib/libc/stdio/wscanf.c stable/11/lib/libc/stdio/wsetup.c stable/11/lib/libc/stdio/xprintf.c stable/11/lib/libc/stdio/xprintf_errno.c stable/11/lib/libc/stdio/xprintf_float.c stable/11/lib/libc/stdio/xprintf_hexdump.c stable/11/lib/libc/stdio/xprintf_int.c stable/11/lib/libc/stdio/xprintf_quote.c stable/11/lib/libc/stdio/xprintf_str.c stable/11/lib/libc/stdio/xprintf_time.c stable/11/lib/libc/stdio/xprintf_vis.c stable/11/lib/libc/stdlib/abort.c stable/11/lib/libc/stdlib/abs.c stable/11/lib/libc/stdlib/atexit.c stable/11/lib/libc/stdlib/atexit.h stable/11/lib/libc/stdlib/atof.c stable/11/lib/libc/stdlib/atoi.c stable/11/lib/libc/stdlib/atol.c stable/11/lib/libc/stdlib/atoll.c stable/11/lib/libc/stdlib/bsearch.c stable/11/lib/libc/stdlib/div.c stable/11/lib/libc/stdlib/exit.c stable/11/lib/libc/stdlib/getenv.c stable/11/lib/libc/stdlib/getopt.c stable/11/lib/libc/stdlib/getsubopt.c stable/11/lib/libc/stdlib/hcreate.c stable/11/lib/libc/stdlib/heapsort.c stable/11/lib/libc/stdlib/imaxabs.c stable/11/lib/libc/stdlib/imaxdiv.c stable/11/lib/libc/stdlib/labs.c stable/11/lib/libc/stdlib/ldiv.c stable/11/lib/libc/stdlib/llabs.c stable/11/lib/libc/stdlib/lldiv.c stable/11/lib/libc/stdlib/merge.c stable/11/lib/libc/stdlib/ptsname.c stable/11/lib/libc/stdlib/qsort.c stable/11/lib/libc/stdlib/quick_exit.c stable/11/lib/libc/stdlib/radixsort.c stable/11/lib/libc/stdlib/rand.c stable/11/lib/libc/stdlib/random.c stable/11/lib/libc/stdlib/reallocf.c stable/11/lib/libc/stdlib/realpath.c stable/11/lib/libc/stdlib/strfmon.c stable/11/lib/libc/stdlib/strtoimax.c stable/11/lib/libc/stdlib/strtol.c stable/11/lib/libc/stdlib/strtoll.c stable/11/lib/libc/stdlib/strtoq.c stable/11/lib/libc/stdlib/strtoul.c stable/11/lib/libc/stdlib/strtoull.c stable/11/lib/libc/stdlib/strtoumax.c stable/11/lib/libc/stdlib/strtouq.c stable/11/lib/libc/stdlib/system.c stable/11/lib/libc/stdtime/strptime.c stable/11/lib/libc/stdtime/timelocal.c stable/11/lib/libc/stdtime/timelocal.h stable/11/lib/libc/string/bcmp.c stable/11/lib/libc/string/bcopy.c stable/11/lib/libc/string/ffs.c stable/11/lib/libc/string/ffsl.c stable/11/lib/libc/string/ffsll.c stable/11/lib/libc/string/fls.c stable/11/lib/libc/string/flsl.c stable/11/lib/libc/string/flsll.c stable/11/lib/libc/string/memccpy.c stable/11/lib/libc/string/memchr.c stable/11/lib/libc/string/memcmp.c stable/11/lib/libc/string/memmem.c stable/11/lib/libc/string/memset.c stable/11/lib/libc/string/stpcpy.c stable/11/lib/libc/string/stpncpy.c stable/11/lib/libc/string/strcasecmp.c stable/11/lib/libc/string/strcasestr.c stable/11/lib/libc/string/strcat.c stable/11/lib/libc/string/strchr.c stable/11/lib/libc/string/strchrnul.c stable/11/lib/libc/string/strcmp.c stable/11/lib/libc/string/strcoll.c stable/11/lib/libc/string/strcpy.c stable/11/lib/libc/string/strcspn.c stable/11/lib/libc/string/strdup.c stable/11/lib/libc/string/strerror.c stable/11/lib/libc/string/strlen.c stable/11/lib/libc/string/strmode.c stable/11/lib/libc/string/strncat.c stable/11/lib/libc/string/strncmp.c stable/11/lib/libc/string/strncpy.c stable/11/lib/libc/string/strnlen.c stable/11/lib/libc/string/strnstr.c stable/11/lib/libc/string/strpbrk.c stable/11/lib/libc/string/strrchr.c stable/11/lib/libc/string/strsep.c stable/11/lib/libc/string/strsignal.c stable/11/lib/libc/string/strspn.c stable/11/lib/libc/string/strstr.c stable/11/lib/libc/string/strtok.c stable/11/lib/libc/string/strxfrm.c stable/11/lib/libc/string/swab.c stable/11/lib/libc/string/wcpcpy.c stable/11/lib/libc/string/wcpncpy.c stable/11/lib/libc/string/wcscasecmp.c stable/11/lib/libc/string/wcscat.c stable/11/lib/libc/string/wcschr.c stable/11/lib/libc/string/wcscmp.c stable/11/lib/libc/string/wcscoll.c stable/11/lib/libc/string/wcscpy.c stable/11/lib/libc/string/wcscspn.c stable/11/lib/libc/string/wcsdup.c stable/11/lib/libc/string/wcslcat.c stable/11/lib/libc/string/wcslcpy.c stable/11/lib/libc/string/wcslen.c stable/11/lib/libc/string/wcsncasecmp.c stable/11/lib/libc/string/wcsncat.c stable/11/lib/libc/string/wcsncmp.c stable/11/lib/libc/string/wcsncpy.c stable/11/lib/libc/string/wcsnlen.c stable/11/lib/libc/string/wcspbrk.c stable/11/lib/libc/string/wcsrchr.c stable/11/lib/libc/string/wcsspn.c stable/11/lib/libc/string/wcsstr.c stable/11/lib/libc/string/wcstok.c stable/11/lib/libc/string/wcswidth.c stable/11/lib/libc/string/wcsxfrm.c stable/11/lib/libc/string/wmemchr.c stable/11/lib/libc/string/wmemcmp.c stable/11/lib/libc/string/wmemcpy.c stable/11/lib/libc/string/wmemmove.c stable/11/lib/libc/string/wmemset.c stable/11/lib/libc/sys/__error.c stable/11/lib/libc/sys/__vdso_gettimeofday.c stable/11/lib/libc/sys/clock_gettime.c stable/11/lib/libc/sys/fcntl.c stable/11/lib/libc/sys/gettimeofday.c stable/11/lib/libc/sys/sigwait.c stable/11/lib/libc/uuid/uuid_compare.c stable/11/lib/libc/uuid/uuid_create.c stable/11/lib/libc/uuid/uuid_create_nil.c stable/11/lib/libc/uuid/uuid_equal.c stable/11/lib/libc/uuid/uuid_from_string.c stable/11/lib/libc/uuid/uuid_hash.c stable/11/lib/libc/uuid/uuid_is_nil.c stable/11/lib/libc/uuid/uuid_stream.c stable/11/lib/libc/uuid/uuid_to_string.c stable/11/lib/libc/xdr/xdr.c stable/11/lib/libc/xdr/xdr_array.c stable/11/lib/libc/xdr/xdr_float.c stable/11/lib/libc/xdr/xdr_mem.c stable/11/lib/libc/xdr/xdr_rec.c stable/11/lib/libc/xdr/xdr_reference.c stable/11/lib/libc/xdr/xdr_sizeof.c stable/11/lib/libc/xdr/xdr_stdio.c stable/11/lib/libc/yp/xdryp.c stable/11/lib/libc/yp/yplib.c stable/11/lib/libc_nonshared/__stub.c stable/11/lib/libcalendar/calendar.c stable/11/lib/libcalendar/calendar.h stable/11/lib/libcalendar/easter.c stable/11/lib/libcam/camlib.c stable/11/lib/libcam/camlib.h stable/11/lib/libcam/scsi_cmdparse.c stable/11/lib/libcompat/4.1/ftime.c stable/11/lib/libcompat/4.3/re_comp.c stable/11/lib/libcompat/4.3/rexec.c stable/11/lib/libcompat/4.4/cuserid.c stable/11/lib/libcrypt/crypt-md5.c stable/11/lib/libcrypt/crypt-nthash.c stable/11/lib/libcrypt/crypt-sha256.c stable/11/lib/libcrypt/crypt-sha512.c stable/11/lib/libcrypt/crypt.c stable/11/lib/libcrypt/crypt.h stable/11/lib/libcrypt/misc.c stable/11/lib/libdevinfo/devinfo.c stable/11/lib/libdevinfo/devinfo.h stable/11/lib/libdevinfo/devinfo_var.h stable/11/lib/libdevstat/devstat.c stable/11/lib/libdevstat/devstat.h stable/11/lib/libfetch/common.c stable/11/lib/libfetch/common.h stable/11/lib/libfetch/fetch.c stable/11/lib/libfetch/fetch.h stable/11/lib/libfetch/file.c stable/11/lib/libfetch/ftp.c stable/11/lib/libfetch/http.c stable/11/lib/libgeom/geom_ctl.c stable/11/lib/libgeom/geom_getxml.c stable/11/lib/libgeom/geom_stats.c stable/11/lib/libgeom/geom_util.c stable/11/lib/libgeom/geom_xml2tree.c stable/11/lib/libgeom/libgeom.h stable/11/lib/libgssapi/context.h stable/11/lib/libgssapi/cred.h stable/11/lib/libgssapi/gss_accept_sec_context.c stable/11/lib/libgssapi/gss_acquire_cred.c stable/11/lib/libgssapi/gss_add_cred.c stable/11/lib/libgssapi/gss_add_oid_set_member.c stable/11/lib/libgssapi/gss_buffer_set.c stable/11/lib/libgssapi/gss_canonicalize_name.c stable/11/lib/libgssapi/gss_compare_name.c stable/11/lib/libgssapi/gss_context_time.c stable/11/lib/libgssapi/gss_create_empty_oid_set.c stable/11/lib/libgssapi/gss_decapsulate_token.c stable/11/lib/libgssapi/gss_delete_sec_context.c stable/11/lib/libgssapi/gss_display_name.c stable/11/lib/libgssapi/gss_display_status.c stable/11/lib/libgssapi/gss_duplicate_name.c stable/11/lib/libgssapi/gss_duplicate_oid.c stable/11/lib/libgssapi/gss_encapsulate_token.c stable/11/lib/libgssapi/gss_export_name.c stable/11/lib/libgssapi/gss_export_sec_context.c stable/11/lib/libgssapi/gss_get_mic.c stable/11/lib/libgssapi/gss_import_name.c stable/11/lib/libgssapi/gss_import_sec_context.c stable/11/lib/libgssapi/gss_indicate_mechs.c stable/11/lib/libgssapi/gss_init_sec_context.c stable/11/lib/libgssapi/gss_inquire_context.c stable/11/lib/libgssapi/gss_inquire_cred.c stable/11/lib/libgssapi/gss_inquire_cred_by_mech.c stable/11/lib/libgssapi/gss_inquire_cred_by_oid.c stable/11/lib/libgssapi/gss_inquire_mechs_for_name.c stable/11/lib/libgssapi/gss_inquire_names_for_mech.c stable/11/lib/libgssapi/gss_inquire_sec_context_by_oid.c stable/11/lib/libgssapi/gss_krb5.c stable/11/lib/libgssapi/gss_mech_switch.c stable/11/lib/libgssapi/gss_names.c stable/11/lib/libgssapi/gss_oid_to_str.c stable/11/lib/libgssapi/gss_pname_to_uid.c stable/11/lib/libgssapi/gss_process_context_token.c stable/11/lib/libgssapi/gss_pseudo_random.c stable/11/lib/libgssapi/gss_release_buffer.c stable/11/lib/libgssapi/gss_release_cred.c stable/11/lib/libgssapi/gss_release_name.c stable/11/lib/libgssapi/gss_release_oid.c stable/11/lib/libgssapi/gss_release_oid_set.c stable/11/lib/libgssapi/gss_seal.c stable/11/lib/libgssapi/gss_set_cred_option.c stable/11/lib/libgssapi/gss_set_sec_context_option.c stable/11/lib/libgssapi/gss_sign.c stable/11/lib/libgssapi/gss_test_oid_set_member.c stable/11/lib/libgssapi/gss_unseal.c stable/11/lib/libgssapi/gss_unwrap.c stable/11/lib/libgssapi/gss_utils.c stable/11/lib/libgssapi/gss_verify.c stable/11/lib/libgssapi/gss_verify_mic.c stable/11/lib/libgssapi/gss_wrap.c stable/11/lib/libgssapi/gss_wrap_size_limit.c stable/11/lib/libgssapi/mech_switch.h stable/11/lib/libgssapi/name.h stable/11/lib/libgssapi/spnego.h stable/11/lib/libgssapi/utils.h stable/11/lib/libiconv_modules/BIG5/citrus_big5.c stable/11/lib/libiconv_modules/BIG5/citrus_big5.h stable/11/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c stable/11/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h stable/11/lib/libiconv_modules/EUC/citrus_euc.c stable/11/lib/libiconv_modules/EUC/citrus_euc.h stable/11/lib/libiconv_modules/EUCTW/citrus_euctw.c stable/11/lib/libiconv_modules/EUCTW/citrus_euctw.h stable/11/lib/libiconv_modules/GBK2K/citrus_gbk2k.c stable/11/lib/libiconv_modules/GBK2K/citrus_gbk2k.h stable/11/lib/libiconv_modules/HZ/citrus_hz.c stable/11/lib/libiconv_modules/HZ/citrus_hz.h stable/11/lib/libiconv_modules/ISO2022/citrus_iso2022.c stable/11/lib/libiconv_modules/ISO2022/citrus_iso2022.h stable/11/lib/libiconv_modules/JOHAB/citrus_johab.c stable/11/lib/libiconv_modules/JOHAB/citrus_johab.h stable/11/lib/libiconv_modules/MSKanji/citrus_mskanji.c stable/11/lib/libiconv_modules/MSKanji/citrus_mskanji.h stable/11/lib/libiconv_modules/UES/citrus_ues.c stable/11/lib/libiconv_modules/UES/citrus_ues.h stable/11/lib/libiconv_modules/UTF1632/citrus_utf1632.c stable/11/lib/libiconv_modules/UTF1632/citrus_utf1632.h stable/11/lib/libiconv_modules/UTF7/citrus_utf7.c stable/11/lib/libiconv_modules/UTF7/citrus_utf7.h stable/11/lib/libiconv_modules/UTF8/citrus_utf8.c stable/11/lib/libiconv_modules/UTF8/citrus_utf8.h stable/11/lib/libiconv_modules/VIQR/citrus_viqr.c stable/11/lib/libiconv_modules/VIQR/citrus_viqr.h stable/11/lib/libiconv_modules/ZW/citrus_zw.c stable/11/lib/libiconv_modules/ZW/citrus_zw.h stable/11/lib/libiconv_modules/iconv_none/citrus_iconv_none.c stable/11/lib/libiconv_modules/iconv_none/citrus_iconv_none.h stable/11/lib/libiconv_modules/iconv_std/citrus_iconv_std.c stable/11/lib/libiconv_modules/iconv_std/citrus_iconv_std.h stable/11/lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h stable/11/lib/libiconv_modules/mapper_646/citrus_mapper_646.c stable/11/lib/libiconv_modules/mapper_646/citrus_mapper_646.h stable/11/lib/libiconv_modules/mapper_none/citrus_mapper_none.c stable/11/lib/libiconv_modules/mapper_none/citrus_mapper_none.h stable/11/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c stable/11/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h stable/11/lib/libiconv_modules/mapper_std/citrus_mapper_std.c stable/11/lib/libiconv_modules/mapper_std/citrus_mapper_std.h stable/11/lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h stable/11/lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h stable/11/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c stable/11/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h stable/11/lib/libipsec/ipsec_dump_policy.c stable/11/lib/libipsec/ipsec_get_policylen.c stable/11/lib/libipsec/ipsec_strerror.c stable/11/lib/libipsec/ipsec_strerror.h stable/11/lib/libipsec/libpfkey.h stable/11/lib/libipsec/pfkey.c stable/11/lib/libipsec/pfkey_dump.c stable/11/lib/libipsec/policy_parse.y stable/11/lib/libipsec/policy_token.l stable/11/lib/libipsec/test-policy.c stable/11/lib/libjail/jail.c stable/11/lib/libjail/jail.h stable/11/lib/libjail/jail_getid.c stable/11/lib/libkiconv/kiconv_sysctl.c stable/11/lib/libkiconv/quirks.c stable/11/lib/libkiconv/quirks.h stable/11/lib/libkiconv/xlat16_iconv.c stable/11/lib/libkiconv/xlat16_sysctl.c stable/11/lib/libkvm/kvm.c stable/11/lib/libkvm/kvm.h stable/11/lib/libkvm/kvm_amd64.c stable/11/lib/libkvm/kvm_arm.c stable/11/lib/libkvm/kvm_cptime.c stable/11/lib/libkvm/kvm_getloadavg.c stable/11/lib/libkvm/kvm_getswapinfo.c stable/11/lib/libkvm/kvm_i386.c stable/11/lib/libkvm/kvm_minidump_amd64.c stable/11/lib/libkvm/kvm_minidump_arm.c stable/11/lib/libkvm/kvm_minidump_i386.c stable/11/lib/libkvm/kvm_minidump_mips.c stable/11/lib/libkvm/kvm_pcpu.c stable/11/lib/libkvm/kvm_powerpc.c stable/11/lib/libkvm/kvm_powerpc64.c stable/11/lib/libkvm/kvm_private.h stable/11/lib/libkvm/kvm_proc.c stable/11/lib/libkvm/kvm_sparc64.c stable/11/lib/libkvm/kvm_vnet.c stable/11/lib/libmemstat/memstat.c stable/11/lib/libmemstat/memstat.h stable/11/lib/libmemstat/memstat_all.c stable/11/lib/libmemstat/memstat_internal.h stable/11/lib/libmemstat/memstat_malloc.c stable/11/lib/libmemstat/memstat_uma.c stable/11/lib/libmp/mpasbn.c stable/11/lib/libnandfs/libnandfs.h stable/11/lib/libnandfs/nandfs.c stable/11/lib/libnetbsd/rmd160.h stable/11/lib/libnetbsd/sha1.h stable/11/lib/libnetbsd/sha2.h stable/11/lib/libnetbsd/stdlib.h stable/11/lib/libnetbsd/strsuftoll.c stable/11/lib/libnetbsd/sys/cdefs.h stable/11/lib/libnetbsd/util.c stable/11/lib/libnetbsd/util.h stable/11/lib/libnv/common_impl.h stable/11/lib/libnv/msgio.c stable/11/lib/libnv/msgio.h stable/11/lib/libpam/libpam/security/pam_mod_misc.h stable/11/lib/libpam/modules/pam_chroot/pam_chroot.c stable/11/lib/libpam/modules/pam_deny/pam_deny.c stable/11/lib/libpam/modules/pam_echo/pam_echo.c stable/11/lib/libpam/modules/pam_exec/pam_exec.c stable/11/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c stable/11/lib/libpam/modules/pam_group/pam_group.c stable/11/lib/libpam/modules/pam_guest/pam_guest.c stable/11/lib/libpam/modules/pam_ksu/pam_ksu.c stable/11/lib/libpam/modules/pam_lastlog/pam_lastlog.c stable/11/lib/libpam/modules/pam_login_access/pam_login_access.c stable/11/lib/libpam/modules/pam_login_access/pam_login_access.h stable/11/lib/libpam/modules/pam_nologin/pam_nologin.c stable/11/lib/libpam/modules/pam_opie/pam_opie.c stable/11/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c stable/11/lib/libpam/modules/pam_permit/pam_permit.c stable/11/lib/libpam/modules/pam_radius/pam_radius.c stable/11/lib/libpam/modules/pam_rhosts/pam_rhosts.c stable/11/lib/libpam/modules/pam_rootok/pam_rootok.c stable/11/lib/libpam/modules/pam_securetty/pam_securetty.c stable/11/lib/libpam/modules/pam_self/pam_self.c stable/11/lib/libpam/modules/pam_ssh/pam_ssh.c stable/11/lib/libpam/modules/pam_tacplus/pam_tacplus.c stable/11/lib/libpam/modules/pam_unix/pam_unix.c stable/11/lib/libpjdlog/pjdlog.c stable/11/lib/libpjdlog/pjdlog.h stable/11/lib/libpmc/libpmc.c stable/11/lib/libpmc/libpmcinternal.h stable/11/lib/libpmc/pmc.h stable/11/lib/libpmc/pmclog.c stable/11/lib/libpmc/pmclog.h stable/11/lib/libprocstat/cd9660.c stable/11/lib/libprocstat/common_kvm.c stable/11/lib/libprocstat/common_kvm.h stable/11/lib/libprocstat/core.c stable/11/lib/libprocstat/core.h stable/11/lib/libprocstat/libprocstat.c stable/11/lib/libprocstat/libprocstat.h stable/11/lib/libprocstat/libprocstat_internal.h stable/11/lib/libprocstat/msdosfs.c stable/11/lib/libprocstat/smbfs.c stable/11/lib/libprocstat/udf.c stable/11/lib/libprocstat/zfs.c stable/11/lib/libradius/radlib.c stable/11/lib/libradius/radlib.h stable/11/lib/libradius/radlib_private.h stable/11/lib/libradius/radlib_vs.h stable/11/lib/librpcsec_gss/rpcsec_gss.c stable/11/lib/librpcsec_gss/rpcsec_gss_conf.c stable/11/lib/librpcsec_gss/rpcsec_gss_int.h stable/11/lib/librpcsec_gss/rpcsec_gss_misc.c stable/11/lib/librpcsec_gss/rpcsec_gss_prot.c stable/11/lib/librpcsec_gss/svc_rpcsec_gss.c stable/11/lib/librpcsvc/yp_passwd.c stable/11/lib/librpcsvc/yp_update.c stable/11/lib/librt/aio.c stable/11/lib/librt/mq.c stable/11/lib/librt/sigev_thread.c stable/11/lib/librt/sigev_thread.h stable/11/lib/librt/timer.c stable/11/lib/librtld_db/rtld_db.c stable/11/lib/librtld_db/rtld_db.h stable/11/lib/libsdp/sdp-int.h stable/11/lib/libsdp/sdp.h stable/11/lib/libsdp/search.c stable/11/lib/libsdp/service.c stable/11/lib/libsdp/session.c stable/11/lib/libsdp/util.c stable/11/lib/libstdbuf/stdbuf.c stable/11/lib/libstdthreads/call_once.c stable/11/lib/libstdthreads/cnd.c stable/11/lib/libstdthreads/mtx.c stable/11/lib/libstdthreads/thrd.c stable/11/lib/libstdthreads/threads.h stable/11/lib/libstdthreads/tss.c stable/11/lib/libtacplus/taclib.c stable/11/lib/libtacplus/taclib.h stable/11/lib/libtacplus/taclib_private.h stable/11/lib/libthr/arch/amd64/include/pthread_md.h stable/11/lib/libthr/arch/arm/include/pthread_md.h stable/11/lib/libthr/arch/i386/include/pthread_md.h stable/11/lib/libthr/arch/mips/include/pthread_md.h stable/11/lib/libthr/arch/powerpc/include/pthread_md.h stable/11/lib/libthr/arch/sparc64/include/pthread_md.h stable/11/lib/libthr/sys/thr_error.c stable/11/lib/libthr/thread/thr_affinity.c stable/11/lib/libthr/thread/thr_attr.c stable/11/lib/libthr/thread/thr_autoinit.c stable/11/lib/libthr/thread/thr_barrier.c stable/11/lib/libthr/thread/thr_barrierattr.c stable/11/lib/libthr/thread/thr_cancel.c stable/11/lib/libthr/thread/thr_clean.c stable/11/lib/libthr/thread/thr_concurrency.c stable/11/lib/libthr/thread/thr_cond.c stable/11/lib/libthr/thread/thr_condattr.c stable/11/lib/libthr/thread/thr_create.c stable/11/lib/libthr/thread/thr_detach.c stable/11/lib/libthr/thread/thr_equal.c stable/11/lib/libthr/thread/thr_event.c stable/11/lib/libthr/thread/thr_exit.c stable/11/lib/libthr/thread/thr_fork.c stable/11/lib/libthr/thread/thr_getcpuclockid.c stable/11/lib/libthr/thread/thr_getprio.c stable/11/lib/libthr/thread/thr_getschedparam.c stable/11/lib/libthr/thread/thr_getthreadid_np.c stable/11/lib/libthr/thread/thr_info.c stable/11/lib/libthr/thread/thr_init.c stable/11/lib/libthr/thread/thr_join.c stable/11/lib/libthr/thread/thr_kern.c stable/11/lib/libthr/thread/thr_kill.c stable/11/lib/libthr/thread/thr_list.c stable/11/lib/libthr/thread/thr_main_np.c stable/11/lib/libthr/thread/thr_multi_np.c stable/11/lib/libthr/thread/thr_mutex.c stable/11/lib/libthr/thread/thr_mutexattr.c stable/11/lib/libthr/thread/thr_once.c stable/11/lib/libthr/thread/thr_printf.c stable/11/lib/libthr/thread/thr_private.h stable/11/lib/libthr/thread/thr_pspinlock.c stable/11/lib/libthr/thread/thr_resume_np.c stable/11/lib/libthr/thread/thr_rtld.c stable/11/lib/libthr/thread/thr_rwlock.c stable/11/lib/libthr/thread/thr_rwlockattr.c stable/11/lib/libthr/thread/thr_self.c stable/11/lib/libthr/thread/thr_sem.c stable/11/lib/libthr/thread/thr_setprio.c stable/11/lib/libthr/thread/thr_setschedparam.c stable/11/lib/libthr/thread/thr_sig.c stable/11/lib/libthr/thread/thr_single_np.c stable/11/lib/libthr/thread/thr_sleepq.c stable/11/lib/libthr/thread/thr_spec.c stable/11/lib/libthr/thread/thr_spinlock.c stable/11/lib/libthr/thread/thr_stack.c stable/11/lib/libthr/thread/thr_suspend_np.c stable/11/lib/libthr/thread/thr_switch_np.c stable/11/lib/libthr/thread/thr_symbols.c stable/11/lib/libthr/thread/thr_syscalls.c stable/11/lib/libthr/thread/thr_umtx.c stable/11/lib/libthr/thread/thr_umtx.h stable/11/lib/libthr/thread/thr_yield.c stable/11/lib/libthread_db/arch/amd64/libpthread_md.c stable/11/lib/libthread_db/arch/arm/libpthread_md.c stable/11/lib/libthread_db/arch/i386/libpthread_md.c stable/11/lib/libthread_db/arch/mips/libpthread_md.c stable/11/lib/libthread_db/arch/powerpc/libpthread_md.c stable/11/lib/libthread_db/arch/sparc64/libpthread_md.c stable/11/lib/libthread_db/kse.h stable/11/lib/libthread_db/libpthread_db.c stable/11/lib/libthread_db/libpthread_db.h stable/11/lib/libthread_db/libthr_db.c stable/11/lib/libthread_db/thread_db.c stable/11/lib/libthread_db/thread_db.h stable/11/lib/libthread_db/thread_db_int.h stable/11/lib/libufs/block.c stable/11/lib/libufs/cgroup.c stable/11/lib/libufs/inode.c stable/11/lib/libufs/libufs.h stable/11/lib/libufs/sblock.c stable/11/lib/libufs/type.c stable/11/lib/libugidfw/ugidfw.c stable/11/lib/libugidfw/ugidfw.h stable/11/lib/libulog/ulog.h stable/11/lib/libulog/ulog_login.c stable/11/lib/libulog/ulog_login_pseudo.c stable/11/lib/libulog/utempter.c stable/11/lib/libulog/utempter.h stable/11/lib/libusb/libusb.h stable/11/lib/libusb/libusb01.c stable/11/lib/libusb/libusb10.c stable/11/lib/libusb/libusb10.h stable/11/lib/libusb/libusb10_desc.c stable/11/lib/libusb/libusb10_io.c stable/11/lib/libusb/libusb20.c stable/11/lib/libusb/libusb20.h stable/11/lib/libusb/libusb20_desc.c stable/11/lib/libusb/libusb20_desc.h stable/11/lib/libusb/libusb20_int.h stable/11/lib/libusb/libusb20_ugen20.c stable/11/lib/libusb/libusb_global_linux.h stable/11/lib/libusb/usb.h stable/11/lib/libusbhid/data.c stable/11/lib/libusbhid/descr.c stable/11/lib/libusbhid/descr_compat.c stable/11/lib/libusbhid/parse.c stable/11/lib/libusbhid/usage.c stable/11/lib/libusbhid/usbhid.h stable/11/lib/libusbhid/usbvar.h stable/11/lib/libutil/auth.c stable/11/lib/libutil/expand_number.c stable/11/lib/libutil/fparseln.c stable/11/lib/libutil/gr_util.c stable/11/lib/libutil/hexdump.c stable/11/lib/libutil/humanize_number.c stable/11/lib/libutil/kinfo_getallproc.c stable/11/lib/libutil/kinfo_getproc.c stable/11/lib/libutil/kld.c stable/11/lib/libutil/libutil.h stable/11/lib/libutil/login_crypt.c stable/11/lib/libutil/login_tty.c stable/11/lib/libutil/pidfile.c stable/11/lib/libutil/property.c stable/11/lib/libutil/pty.c stable/11/lib/libutil/pw_util.c stable/11/lib/libutil/quotafile.c stable/11/lib/libutil/realhostname.c stable/11/lib/libutil/stub.c stable/11/lib/libutil/trimdomain.c stable/11/lib/libutil/uucplock.c stable/11/lib/libvgl/bitmap.c stable/11/lib/libvgl/keyboard.c stable/11/lib/libvgl/main.c stable/11/lib/libvgl/mouse.c stable/11/lib/libvgl/simple.c stable/11/lib/libvgl/text.c stable/11/lib/libvgl/vgl.h stable/11/lib/libvmmapi/vmmapi.c stable/11/lib/libvmmapi/vmmapi.h stable/11/lib/libvmmapi/vmmapi_freebsd.c stable/11/lib/liby/main.c stable/11/lib/liby/yyerror.c stable/11/lib/libypclnt/ypclnt.h stable/11/lib/libypclnt/ypclnt_connect.c stable/11/lib/libypclnt/ypclnt_error.c stable/11/lib/libypclnt/ypclnt_free.c stable/11/lib/libypclnt/ypclnt_get.c stable/11/lib/libypclnt/ypclnt_new.c stable/11/lib/libypclnt/ypclnt_passwd.c stable/11/lib/msun/amd64/fenv.c stable/11/lib/msun/arm/fenv.c stable/11/lib/msun/arm/fenv.h stable/11/lib/msun/bsdsrc/b_exp.c stable/11/lib/msun/bsdsrc/b_log.c stable/11/lib/msun/bsdsrc/b_tgamma.c stable/11/lib/msun/bsdsrc/mathimpl.h stable/11/lib/msun/i387/fenv.c stable/11/lib/msun/i387/invtrig.c stable/11/lib/msun/ld128/invtrig.c stable/11/lib/msun/ld128/invtrig.h stable/11/lib/msun/ld128/k_expl.h stable/11/lib/msun/ld128/s_exp2l.c stable/11/lib/msun/ld128/s_expl.c stable/11/lib/msun/ld128/s_logl.c stable/11/lib/msun/ld128/s_nanl.c stable/11/lib/msun/ld80/invtrig.c stable/11/lib/msun/ld80/invtrig.h stable/11/lib/msun/ld80/k_expl.h stable/11/lib/msun/ld80/s_exp2l.c stable/11/lib/msun/ld80/s_expl.c stable/11/lib/msun/ld80/s_logl.c stable/11/lib/msun/ld80/s_nanl.c stable/11/lib/msun/mips/fenv.c stable/11/lib/msun/mips/fenv.h stable/11/lib/msun/powerpc/fenv.c stable/11/lib/msun/powerpc/fenv.h stable/11/lib/msun/sparc64/fenv.c stable/11/lib/msun/sparc64/fenv.h stable/11/lib/msun/src/catrig.c stable/11/lib/msun/src/catrigf.c stable/11/lib/msun/src/e_remainderl.c stable/11/lib/msun/src/e_sqrtl.c stable/11/lib/msun/src/fenv-softfloat.h stable/11/lib/msun/src/imprecise.c stable/11/lib/msun/src/k_exp.c stable/11/lib/msun/src/k_expf.c stable/11/lib/msun/src/s_carg.c stable/11/lib/msun/src/s_cargf.c stable/11/lib/msun/src/s_cargl.c stable/11/lib/msun/src/s_ccosh.c stable/11/lib/msun/src/s_ccoshf.c stable/11/lib/msun/src/s_cexp.c stable/11/lib/msun/src/s_cexpf.c stable/11/lib/msun/src/s_cimag.c stable/11/lib/msun/src/s_cimagf.c stable/11/lib/msun/src/s_cimagl.c stable/11/lib/msun/src/s_conj.c stable/11/lib/msun/src/s_conjf.c stable/11/lib/msun/src/s_conjl.c stable/11/lib/msun/src/s_copysignl.c stable/11/lib/msun/src/s_cosl.c stable/11/lib/msun/src/s_cproj.c stable/11/lib/msun/src/s_cprojf.c stable/11/lib/msun/src/s_cprojl.c stable/11/lib/msun/src/s_creal.c stable/11/lib/msun/src/s_crealf.c stable/11/lib/msun/src/s_creall.c stable/11/lib/msun/src/s_csinh.c stable/11/lib/msun/src/s_csinhf.c stable/11/lib/msun/src/s_csqrt.c stable/11/lib/msun/src/s_csqrtf.c stable/11/lib/msun/src/s_csqrtl.c stable/11/lib/msun/src/s_ctanh.c stable/11/lib/msun/src/s_ctanhf.c stable/11/lib/msun/src/s_exp2.c stable/11/lib/msun/src/s_exp2f.c stable/11/lib/msun/src/s_fabsl.c stable/11/lib/msun/src/s_fdim.c stable/11/lib/msun/src/s_fma.c stable/11/lib/msun/src/s_fmaf.c stable/11/lib/msun/src/s_fmal.c stable/11/lib/msun/src/s_fmax.c stable/11/lib/msun/src/s_fmaxf.c stable/11/lib/msun/src/s_fmaxl.c stable/11/lib/msun/src/s_fmin.c stable/11/lib/msun/src/s_fminf.c stable/11/lib/msun/src/s_fminl.c stable/11/lib/msun/src/s_frexpl.c stable/11/lib/msun/src/s_isfinite.c stable/11/lib/msun/src/s_isnan.c stable/11/lib/msun/src/s_isnormal.c stable/11/lib/msun/src/s_lrint.c stable/11/lib/msun/src/s_lround.c stable/11/lib/msun/src/s_modfl.c stable/11/lib/msun/src/s_nan.c stable/11/lib/msun/src/s_nearbyint.c stable/11/lib/msun/src/s_rintl.c stable/11/lib/msun/src/s_round.c stable/11/lib/msun/src/s_roundf.c stable/11/lib/msun/src/s_roundl.c stable/11/lib/msun/src/s_scalbln.c stable/11/lib/msun/src/s_signbit.c stable/11/lib/msun/src/s_sinl.c stable/11/lib/msun/src/s_tanl.c stable/11/lib/msun/src/s_tgammaf.c stable/11/lib/msun/x86/fenv.h stable/11/lib/ncurses/ncurses/pathnames.h stable/11/lib/ncurses/ncurses/termcap.c stable/11/libexec/bootpd/rtmsg.c stable/11/libexec/comsat/comsat.c stable/11/libexec/fingerd/fingerd.c stable/11/libexec/fingerd/pathnames.h stable/11/libexec/ftpd/extern.h stable/11/libexec/ftpd/ftpcmd.y stable/11/libexec/ftpd/ftpd.c stable/11/libexec/ftpd/logwtmp.c stable/11/libexec/ftpd/pathnames.h stable/11/libexec/ftpd/popen.c stable/11/libexec/getty/extern.h stable/11/libexec/getty/gettytab.h stable/11/libexec/getty/init.c stable/11/libexec/getty/main.c stable/11/libexec/getty/pathnames.h stable/11/libexec/getty/subr.c stable/11/libexec/mknetid/hash.c stable/11/libexec/mknetid/hash.h stable/11/libexec/mknetid/mknetid.c stable/11/libexec/mknetid/parse_group.c stable/11/libexec/rbootd/bpf.c stable/11/libexec/rbootd/conf.c stable/11/libexec/rbootd/defs.h stable/11/libexec/rbootd/parseconf.c stable/11/libexec/rbootd/pathnames.h stable/11/libexec/rbootd/rbootd.c stable/11/libexec/rbootd/rmp.h stable/11/libexec/rbootd/rmp_var.h stable/11/libexec/rbootd/rmpproto.c stable/11/libexec/rbootd/utils.c stable/11/libexec/revnetgroup/hash.c stable/11/libexec/revnetgroup/hash.h stable/11/libexec/revnetgroup/parse_netgroup.c stable/11/libexec/revnetgroup/revnetgroup.c stable/11/libexec/rpc.rstatd/rstatd.c stable/11/libexec/rpc.rusersd/extern.h stable/11/libexec/rpc.rusersd/rusers_proc.c stable/11/libexec/rpc.rusersd/rusersd.c stable/11/libexec/rtld-elf/malloc.c stable/11/libexec/rtld-elf/rtld_printf.c stable/11/libexec/talkd/announce.c stable/11/libexec/talkd/print.c stable/11/libexec/talkd/process.c stable/11/libexec/talkd/table.c stable/11/libexec/talkd/talkd.c stable/11/libexec/tftpd/tftpd.c stable/11/libexec/ypxfr/yp_dbwrite.c stable/11/libexec/ypxfr/ypxfr_extern.h stable/11/libexec/ypxfr/ypxfr_getmap.c stable/11/libexec/ypxfr/ypxfr_main.c stable/11/libexec/ypxfr/ypxfr_misc.c stable/11/libexec/ypxfr/ypxfrd_getmap.c stable/11/release/picobsd/tinyware/login/pathnames.h stable/11/release/picobsd/tinyware/login/pico-login.c stable/11/release/picobsd/tinyware/passwd/extern.h stable/11/release/picobsd/tinyware/passwd/local_passwd.c stable/11/release/picobsd/tinyware/passwd/passwd.c stable/11/release/picobsd/tinyware/passwd/pw_copy.c stable/11/release/picobsd/tinyware/passwd/pw_util.c stable/11/release/picobsd/tinyware/passwd/pw_util.h stable/11/sbin/bsdlabel/bsdlabel.c stable/11/sbin/bsdlabel/pathnames.h stable/11/sbin/clri/clri.c stable/11/sbin/devd/devd.cc stable/11/sbin/dhclient/alloc.c stable/11/sbin/dhclient/bpf.c stable/11/sbin/dhclient/clparse.c stable/11/sbin/dhclient/conflex.c stable/11/sbin/dhclient/convert.c stable/11/sbin/dhclient/dhclient.c stable/11/sbin/dhclient/dhcp.h stable/11/sbin/dhclient/dhcpd.h stable/11/sbin/dhclient/dhctoken.h stable/11/sbin/dhclient/dispatch.c stable/11/sbin/dhclient/errwarn.c stable/11/sbin/dhclient/hash.c stable/11/sbin/dhclient/inet.c stable/11/sbin/dhclient/options.c stable/11/sbin/dhclient/packet.c stable/11/sbin/dhclient/parse.c stable/11/sbin/dhclient/tables.c stable/11/sbin/dhclient/tree.c stable/11/sbin/dhclient/tree.h stable/11/sbin/dmesg/dmesg.c stable/11/sbin/dump/dump.h stable/11/sbin/dump/dumprmt.c stable/11/sbin/dump/itime.c stable/11/sbin/dump/main.c stable/11/sbin/dump/optr.c stable/11/sbin/dump/pathnames.h stable/11/sbin/dump/tape.c stable/11/sbin/dump/traverse.c stable/11/sbin/dump/unctime.c stable/11/sbin/dumpfs/dumpfs.c stable/11/sbin/dumpon/dumpon.c stable/11/sbin/etherswitchcfg/ifmedia.c stable/11/sbin/ffsinfo/ffsinfo.c stable/11/sbin/fsck/fsck.c stable/11/sbin/fsck/fsutil.c stable/11/sbin/fsck/preen.c stable/11/sbin/fsck_ffs/dir.c stable/11/sbin/fsck_ffs/fsck.h stable/11/sbin/fsck_ffs/fsutil.c stable/11/sbin/fsck_ffs/gjournal.c stable/11/sbin/fsck_ffs/globs.c stable/11/sbin/fsck_ffs/inode.c stable/11/sbin/fsck_ffs/main.c stable/11/sbin/fsck_ffs/pass1.c stable/11/sbin/fsck_ffs/pass1b.c stable/11/sbin/fsck_ffs/pass2.c stable/11/sbin/fsck_ffs/pass3.c stable/11/sbin/fsck_ffs/pass4.c stable/11/sbin/fsck_ffs/pass5.c stable/11/sbin/fsck_ffs/setup.c stable/11/sbin/fsck_ffs/utilities.c stable/11/sbin/growfs/debug.c stable/11/sbin/growfs/debug.h stable/11/sbin/growfs/growfs.c stable/11/sbin/gvinum/gvinum.h stable/11/sbin/ifconfig/af_inet.c stable/11/sbin/ifconfig/af_inet6.c stable/11/sbin/ifconfig/af_link.c stable/11/sbin/ifconfig/ifclone.c stable/11/sbin/ifconfig/ifconfig.c stable/11/sbin/ifconfig/ifmedia.c stable/11/sbin/ifconfig/ifvlan.c stable/11/sbin/init/init.c stable/11/sbin/init/pathnames.h stable/11/sbin/mknod/mknod.c stable/11/sbin/mount/getmntopts.c stable/11/sbin/mount/mntopts.h stable/11/sbin/mount/mount.c stable/11/sbin/mount/mount_fs.c stable/11/sbin/mount/pathnames.h stable/11/sbin/mount/vfslist.c stable/11/sbin/mount_cd9660/mount_cd9660.c stable/11/sbin/mount_nfs/mount_nfs.c stable/11/sbin/mount_nullfs/mount_nullfs.c stable/11/sbin/mount_udf/mount_udf.c stable/11/sbin/mount_unionfs/mount_unionfs.c stable/11/sbin/newfs/mkfs.c stable/11/sbin/newfs/newfs.c stable/11/sbin/newfs/newfs.h stable/11/sbin/nfsiod/nfsiod.c stable/11/sbin/ping/ping.c stable/11/sbin/ping6/ping6.c stable/11/sbin/quotacheck/preen.c stable/11/sbin/quotacheck/quotacheck.c stable/11/sbin/quotacheck/quotacheck.h stable/11/sbin/rcorder/ealloc.c stable/11/sbin/rcorder/hash.c stable/11/sbin/rcorder/hash.h stable/11/sbin/rcorder/sprite.h stable/11/sbin/reboot/reboot.c stable/11/sbin/restore/dirs.c stable/11/sbin/restore/extern.h stable/11/sbin/restore/interactive.c stable/11/sbin/restore/main.c stable/11/sbin/restore/restore.c stable/11/sbin/restore/restore.h stable/11/sbin/restore/symtab.c stable/11/sbin/restore/tape.c stable/11/sbin/restore/utilities.c stable/11/sbin/route/route.c stable/11/sbin/routed/defs.h stable/11/sbin/routed/if.c stable/11/sbin/routed/input.c stable/11/sbin/routed/main.c stable/11/sbin/routed/output.c stable/11/sbin/routed/parms.c stable/11/sbin/routed/pathnames.h stable/11/sbin/routed/radix.c stable/11/sbin/routed/radix.h stable/11/sbin/routed/rdisc.c stable/11/sbin/routed/rtquery/rtquery.c stable/11/sbin/routed/table.c stable/11/sbin/routed/trace.c stable/11/sbin/savecore/savecore.c stable/11/sbin/setkey/parse.y stable/11/sbin/setkey/setkey.c stable/11/sbin/setkey/test-pfkey.c stable/11/sbin/setkey/test-policy.c stable/11/sbin/setkey/token.l stable/11/sbin/setkey/vchar.h stable/11/sbin/shutdown/shutdown.c stable/11/sbin/sunlabel/sunlabel.c stable/11/sbin/swapon/swapon.c stable/11/sbin/sysctl/sysctl.c stable/11/sbin/tunefs/tunefs.c stable/11/sbin/umount/umount.c stable/11/share/examples/tests/tests/atf/cp_test.sh stable/11/share/examples/tests/tests/atf/printf_test.c stable/11/share/examples/tests/tests/plain/printf_test.c stable/11/sys/amd64/acpica/acpi_machdep.c stable/11/sys/amd64/amd64/atomic.c stable/11/sys/amd64/amd64/bios.c stable/11/sys/amd64/amd64/bpf_jit_machdep.c stable/11/sys/amd64/amd64/bpf_jit_machdep.h stable/11/sys/amd64/amd64/elf_machdep.c stable/11/sys/amd64/amd64/fpu.c stable/11/sys/amd64/amd64/gdb_machdep.c stable/11/sys/amd64/amd64/genassym.c stable/11/sys/amd64/amd64/in_cksum.c stable/11/sys/amd64/amd64/initcpu.c stable/11/sys/amd64/amd64/io.c stable/11/sys/amd64/amd64/machdep.c stable/11/sys/amd64/amd64/mem.c stable/11/sys/amd64/amd64/minidump_machdep.c stable/11/sys/amd64/amd64/mp_machdep.c stable/11/sys/amd64/amd64/pmap.c stable/11/sys/amd64/amd64/prof_machdep.c stable/11/sys/amd64/amd64/ptrace_machdep.c stable/11/sys/amd64/amd64/sys_machdep.c stable/11/sys/amd64/amd64/trap.c stable/11/sys/amd64/amd64/uio_machdep.c stable/11/sys/amd64/amd64/uma_machdep.c stable/11/sys/amd64/amd64/vm_machdep.c stable/11/sys/amd64/ia32/ia32_misc.c stable/11/sys/amd64/ia32/ia32_reg.c stable/11/sys/amd64/ia32/ia32_signal.c stable/11/sys/amd64/ia32/ia32_syscall.c stable/11/sys/amd64/include/_bus.h stable/11/sys/amd64/include/asm.h stable/11/sys/amd64/include/asmacros.h stable/11/sys/amd64/include/atomic.h stable/11/sys/amd64/include/bus_dma.h stable/11/sys/amd64/include/counter.h stable/11/sys/amd64/include/cpu.h stable/11/sys/amd64/include/cpufunc.h stable/11/sys/amd64/include/exec.h stable/11/sys/amd64/include/floatingpoint.h stable/11/sys/amd64/include/fpu.h stable/11/sys/amd64/include/gdb_machdep.h stable/11/sys/amd64/include/ieeefp.h stable/11/sys/amd64/include/in_cksum.h stable/11/sys/amd64/include/intr_machdep.h stable/11/sys/amd64/include/iodev.h stable/11/sys/amd64/include/kdb.h stable/11/sys/amd64/include/limits.h stable/11/sys/amd64/include/md_var.h stable/11/sys/amd64/include/memdev.h stable/11/sys/amd64/include/minidump.h stable/11/sys/amd64/include/mp_watchdog.h stable/11/sys/amd64/include/param.h stable/11/sys/amd64/include/pc/bios.h stable/11/sys/amd64/include/pcb.h stable/11/sys/amd64/include/pcpu.h stable/11/sys/amd64/include/pmap.h stable/11/sys/amd64/include/pmc_mdep.h stable/11/sys/amd64/include/ppireg.h stable/11/sys/amd64/include/proc.h stable/11/sys/amd64/include/profile.h stable/11/sys/amd64/include/reloc.h stable/11/sys/amd64/include/runq.h stable/11/sys/amd64/include/segments.h stable/11/sys/amd64/include/sf_buf.h stable/11/sys/amd64/include/timerreg.h stable/11/sys/amd64/include/tss.h stable/11/sys/amd64/include/varargs.h stable/11/sys/amd64/include/vm.h stable/11/sys/amd64/include/vmm.h stable/11/sys/amd64/include/vmm_dev.h stable/11/sys/amd64/include/vmm_instruction_emul.h stable/11/sys/amd64/include/vmparam.h stable/11/sys/amd64/linux32/linux.h stable/11/sys/amd64/linux32/linux32_dummy.c stable/11/sys/amd64/linux32/linux32_machdep.c stable/11/sys/amd64/linux32/linux32_sysvec.c stable/11/sys/amd64/pci/pci_cfgreg.c stable/11/sys/amd64/vmm/amd/amdv.c stable/11/sys/amd64/vmm/intel/ept.c stable/11/sys/amd64/vmm/intel/ept.h stable/11/sys/amd64/vmm/intel/vmcs.c stable/11/sys/amd64/vmm/intel/vmcs.h stable/11/sys/amd64/vmm/intel/vmx.c stable/11/sys/amd64/vmm/intel/vmx.h stable/11/sys/amd64/vmm/intel/vmx_controls.h stable/11/sys/amd64/vmm/intel/vmx_cpufunc.h stable/11/sys/amd64/vmm/intel/vmx_genassym.c stable/11/sys/amd64/vmm/intel/vmx_msr.c stable/11/sys/amd64/vmm/intel/vmx_msr.h stable/11/sys/amd64/vmm/intel/vtd.c stable/11/sys/amd64/vmm/io/iommu.c stable/11/sys/amd64/vmm/io/iommu.h stable/11/sys/amd64/vmm/io/ppt.c stable/11/sys/amd64/vmm/io/ppt.h stable/11/sys/amd64/vmm/io/vhpet.c stable/11/sys/amd64/vmm/io/vhpet.h stable/11/sys/amd64/vmm/io/vioapic.c stable/11/sys/amd64/vmm/io/vioapic.h stable/11/sys/amd64/vmm/io/vlapic.c stable/11/sys/amd64/vmm/io/vlapic.h stable/11/sys/amd64/vmm/io/vlapic_priv.h stable/11/sys/amd64/vmm/vmm.c stable/11/sys/amd64/vmm/vmm_dev.c stable/11/sys/amd64/vmm/vmm_host.c stable/11/sys/amd64/vmm/vmm_host.h stable/11/sys/amd64/vmm/vmm_instruction_emul.c stable/11/sys/amd64/vmm/vmm_ktr.h stable/11/sys/amd64/vmm/vmm_lapic.c stable/11/sys/amd64/vmm/vmm_lapic.h stable/11/sys/amd64/vmm/vmm_mem.c stable/11/sys/amd64/vmm/vmm_mem.h stable/11/sys/amd64/vmm/vmm_stat.c stable/11/sys/amd64/vmm/vmm_stat.h stable/11/sys/amd64/vmm/vmm_util.c stable/11/sys/amd64/vmm/vmm_util.h stable/11/sys/amd64/vmm/x86.c stable/11/sys/amd64/vmm/x86.h stable/11/sys/arm/allwinner/a10_ehci.c stable/11/sys/arm/allwinner/a10_gpio.c stable/11/sys/arm/allwinner/a10_sramc.c stable/11/sys/arm/allwinner/a10_sramc.h stable/11/sys/arm/allwinner/a20/a20_cpu_cfg.c stable/11/sys/arm/allwinner/a20/a20_cpu_cfg.h stable/11/sys/arm/allwinner/if_emac.c stable/11/sys/arm/allwinner/if_emacreg.h stable/11/sys/arm/arm/autoconf.c stable/11/sys/arm/arm/bus_space_generic.c stable/11/sys/arm/arm/busdma_machdep-v6.c stable/11/sys/arm/arm/cpufunc.c stable/11/sys/arm/arm/db_disasm.c stable/11/sys/arm/arm/disassem.c stable/11/sys/arm/arm/dump_machdep.c stable/11/sys/arm/arm/elf_machdep.c stable/11/sys/arm/arm/elf_trampoline.c stable/11/sys/arm/arm/fiq.c stable/11/sys/arm/arm/gdb_machdep.c stable/11/sys/arm/arm/genassym.c stable/11/sys/arm/arm/generic_timer.c stable/11/sys/arm/arm/gic.c stable/11/sys/arm/arm/in_cksum.c stable/11/sys/arm/arm/intr.c stable/11/sys/arm/arm/machdep.c stable/11/sys/arm/arm/mem.c stable/11/sys/arm/arm/minidump_machdep.c stable/11/sys/arm/arm/mp_machdep.c stable/11/sys/arm/arm/mpcore_timer.c stable/11/sys/arm/arm/physmem.c stable/11/sys/arm/arm/pl190.c stable/11/sys/arm/arm/pl310.c stable/11/sys/arm/arm/pmap-v6.c stable/11/sys/arm/arm/sc_machdep.c stable/11/sys/arm/arm/stack_machdep.c stable/11/sys/arm/arm/stdatomic.c stable/11/sys/arm/arm/sys_machdep.c stable/11/sys/arm/arm/uio_machdep.c stable/11/sys/arm/arm/undefined.c stable/11/sys/arm/arm/vfp.c stable/11/sys/arm/arm/vm_machdep.c stable/11/sys/arm/at91/at91.c stable/11/sys/arm/at91/at91_aic.c stable/11/sys/arm/at91/at91_aicreg.h stable/11/sys/arm/at91/at91_cfata.c stable/11/sys/arm/at91/at91_gpio.h stable/11/sys/arm/at91/at91_machdep.c stable/11/sys/arm/at91/at91_mci.c stable/11/sys/arm/at91/at91_mcireg.h stable/11/sys/arm/at91/at91_pdcreg.h stable/11/sys/arm/at91/at91_pio.c stable/11/sys/arm/at91/at91_pio_sam9g45.h stable/11/sys/arm/at91/at91_pioreg.h stable/11/sys/arm/at91/at91_piovar.h stable/11/sys/arm/at91/at91_pit.c stable/11/sys/arm/at91/at91_pitreg.h stable/11/sys/arm/at91/at91_pmc.c stable/11/sys/arm/at91/at91_pmcreg.h stable/11/sys/arm/at91/at91_pmcvar.h stable/11/sys/arm/at91/at91_rst.c stable/11/sys/arm/at91/at91_rstreg.h stable/11/sys/arm/at91/at91_rtc.c stable/11/sys/arm/at91/at91_rtcreg.h stable/11/sys/arm/at91/at91_sdramc.c stable/11/sys/arm/at91/at91_shdwc.c stable/11/sys/arm/at91/at91_smc.c stable/11/sys/arm/at91/at91_smc.h stable/11/sys/arm/at91/at91_spi.c stable/11/sys/arm/at91/at91_spireg.h stable/11/sys/arm/at91/at91_ssc.c stable/11/sys/arm/at91/at91_sscreg.h stable/11/sys/arm/at91/at91_st.c stable/11/sys/arm/at91/at91_streg.h stable/11/sys/arm/at91/at91_tcb.c stable/11/sys/arm/at91/at91_twi.c stable/11/sys/arm/at91/at91_twiio.h stable/11/sys/arm/at91/at91_twireg.h stable/11/sys/arm/at91/at91_usartreg.h stable/11/sys/arm/at91/at91_wdt.c stable/11/sys/arm/at91/at91_wdtreg.h stable/11/sys/arm/at91/at91board.h stable/11/sys/arm/at91/at91reg.h stable/11/sys/arm/at91/at91rm9200.c stable/11/sys/arm/at91/at91rm9200_devices.c stable/11/sys/arm/at91/at91rm9200var.h stable/11/sys/arm/at91/at91rm92reg.h stable/11/sys/arm/at91/at91sam9260.c stable/11/sys/arm/at91/at91sam9260reg.h stable/11/sys/arm/at91/at91sam9g20.c stable/11/sys/arm/at91/at91sam9g20reg.h stable/11/sys/arm/at91/at91sam9g45.c stable/11/sys/arm/at91/at91sam9g45reg.h stable/11/sys/arm/at91/at91sam9x5.c stable/11/sys/arm/at91/at91sam9x5reg.h stable/11/sys/arm/at91/at91soc.c stable/11/sys/arm/at91/at91soc.h stable/11/sys/arm/at91/at91var.h stable/11/sys/arm/at91/board_bwct.c stable/11/sys/arm/at91/board_eb9200.c stable/11/sys/arm/at91/board_ethernut5.c stable/11/sys/arm/at91/board_hl200.c stable/11/sys/arm/at91/board_hl201.c stable/11/sys/arm/at91/board_kb920x.c stable/11/sys/arm/at91/board_qila9g20.c stable/11/sys/arm/at91/board_sam9260ek.c stable/11/sys/arm/at91/board_sam9g20ek.c stable/11/sys/arm/at91/board_sam9x25ek.c stable/11/sys/arm/at91/board_sn9g45.c stable/11/sys/arm/at91/board_tsc4370.c stable/11/sys/arm/at91/if_ate.c stable/11/sys/arm/at91/if_atereg.h stable/11/sys/arm/at91/if_macb.c stable/11/sys/arm/at91/uart_bus_at91usart.c stable/11/sys/arm/at91/uart_cpu_at91usart.c stable/11/sys/arm/at91/uart_dev_at91usart.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_bsc.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h stable/11/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h stable/11/sys/arm/broadcom/bcm2835/bcm2835_dma.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_dma.h stable/11/sys/arm/broadcom/bcm2835/bcm2835_fb.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_fbd.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_gpio.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_gpio.h stable/11/sys/arm/broadcom/bcm2835/bcm2835_intr.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_machdep.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_mbox.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_mbox.h stable/11/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_spi.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_spireg.h stable/11/sys/arm/broadcom/bcm2835/bcm2835_spivar.h stable/11/sys/arm/broadcom/bcm2835/bcm2835_systimer.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h stable/11/sys/arm/broadcom/bcm2835/bcm2835_wdog.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_wdog.h stable/11/sys/arm/conf/genboardid.awk stable/11/sys/arm/freescale/fsl_ocotp.c stable/11/sys/arm/freescale/fsl_ocotpreg.h stable/11/sys/arm/freescale/fsl_ocotpvar.h stable/11/sys/arm/freescale/imx/imx51_ccm.c stable/11/sys/arm/freescale/imx/imx51_ccmreg.h stable/11/sys/arm/freescale/imx/imx51_ccmvar.h stable/11/sys/arm/freescale/imx/imx51_dpllreg.h 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/imx51_ipuv3reg.h stable/11/sys/arm/freescale/imx/imx51_machdep.c stable/11/sys/arm/freescale/imx/imx51_sdmareg.h stable/11/sys/arm/freescale/imx/imx51_ssireg.h stable/11/sys/arm/freescale/imx/imx51_tzicreg.h stable/11/sys/arm/freescale/imx/imx53_machdep.c stable/11/sys/arm/freescale/imx/imx6_anatop.c stable/11/sys/arm/freescale/imx/imx6_anatopreg.h stable/11/sys/arm/freescale/imx/imx6_anatopvar.h stable/11/sys/arm/freescale/imx/imx6_ccm.c stable/11/sys/arm/freescale/imx/imx6_ccmreg.h stable/11/sys/arm/freescale/imx/imx6_machdep.c stable/11/sys/arm/freescale/imx/imx6_mp.c stable/11/sys/arm/freescale/imx/imx6_pl310.c stable/11/sys/arm/freescale/imx/imx6_usbphy.c stable/11/sys/arm/freescale/imx/imx_common.c stable/11/sys/arm/freescale/imx/imx_gpt.c stable/11/sys/arm/freescale/imx/imx_gptreg.h stable/11/sys/arm/freescale/imx/imx_machdep.c stable/11/sys/arm/freescale/imx/imx_machdep.h stable/11/sys/arm/freescale/imx/imx_nop_usbphy.c stable/11/sys/arm/freescale/imx/imx_wdog.c stable/11/sys/arm/freescale/imx/imx_wdogreg.h stable/11/sys/arm/freescale/imx/tzic.c stable/11/sys/arm/freescale/vybrid/vf_anadig.c stable/11/sys/arm/freescale/vybrid/vf_ccm.c stable/11/sys/arm/freescale/vybrid/vf_common.h stable/11/sys/arm/freescale/vybrid/vf_dcu4.c stable/11/sys/arm/freescale/vybrid/vf_dmamux.c stable/11/sys/arm/freescale/vybrid/vf_dmamux.h stable/11/sys/arm/freescale/vybrid/vf_edma.c stable/11/sys/arm/freescale/vybrid/vf_edma.h stable/11/sys/arm/freescale/vybrid/vf_ehci.c stable/11/sys/arm/freescale/vybrid/vf_gpio.c stable/11/sys/arm/freescale/vybrid/vf_i2c.c stable/11/sys/arm/freescale/vybrid/vf_iomuxc.c stable/11/sys/arm/freescale/vybrid/vf_iomuxc.h stable/11/sys/arm/freescale/vybrid/vf_machdep.c stable/11/sys/arm/freescale/vybrid/vf_mscm.c stable/11/sys/arm/freescale/vybrid/vf_nfc.c stable/11/sys/arm/freescale/vybrid/vf_port.c stable/11/sys/arm/freescale/vybrid/vf_port.h stable/11/sys/arm/freescale/vybrid/vf_sai.c stable/11/sys/arm/freescale/vybrid/vf_src.c stable/11/sys/arm/freescale/vybrid/vf_src.h stable/11/sys/arm/freescale/vybrid/vf_tcon.c stable/11/sys/arm/freescale/vybrid/vf_uart.c stable/11/sys/arm/include/_align.h stable/11/sys/arm/include/_bus.h stable/11/sys/arm/include/_inttypes.h stable/11/sys/arm/include/_limits.h stable/11/sys/arm/include/_stdint.h stable/11/sys/arm/include/_types.h stable/11/sys/arm/include/armreg.h stable/11/sys/arm/include/asm.h stable/11/sys/arm/include/asmacros.h stable/11/sys/arm/include/at91_gpio.h stable/11/sys/arm/include/atags.h stable/11/sys/arm/include/atomic.h stable/11/sys/arm/include/blockio.h stable/11/sys/arm/include/board.h stable/11/sys/arm/include/bus.h stable/11/sys/arm/include/bus_dma.h stable/11/sys/arm/include/clock.h stable/11/sys/arm/include/counter.h stable/11/sys/arm/include/cpufunc.h stable/11/sys/arm/include/disassem.h stable/11/sys/arm/include/elf.h stable/11/sys/arm/include/endian.h stable/11/sys/arm/include/exec.h stable/11/sys/arm/include/fdt.h stable/11/sys/arm/include/fiq.h stable/11/sys/arm/include/float.h stable/11/sys/arm/include/floatingpoint.h stable/11/sys/arm/include/frame.h stable/11/sys/arm/include/gdb_machdep.h stable/11/sys/arm/include/ieee.h stable/11/sys/arm/include/in_cksum.h stable/11/sys/arm/include/intr.h stable/11/sys/arm/include/kdb.h stable/11/sys/arm/include/limits.h stable/11/sys/arm/include/md_var.h stable/11/sys/arm/include/memdev.h stable/11/sys/arm/include/metadata.h stable/11/sys/arm/include/minidump.h stable/11/sys/arm/include/ofw_machdep.h stable/11/sys/arm/include/param.h stable/11/sys/arm/include/pcb.h stable/11/sys/arm/include/pcpu.h stable/11/sys/arm/include/physmem.h stable/11/sys/arm/include/pl310.h stable/11/sys/arm/include/pmap.h stable/11/sys/arm/include/pmc_mdep.h stable/11/sys/arm/include/proc.h stable/11/sys/arm/include/profile.h stable/11/sys/arm/include/psl.h stable/11/sys/arm/include/reloc.h stable/11/sys/arm/include/runq.h stable/11/sys/arm/include/sc_machdep.h stable/11/sys/arm/include/sf_buf.h stable/11/sys/arm/include/signal.h stable/11/sys/arm/include/stdarg.h stable/11/sys/arm/include/sysarch.h stable/11/sys/arm/include/ucontext.h stable/11/sys/arm/include/undefined.h stable/11/sys/arm/include/utrap.h stable/11/sys/arm/include/vdso.h stable/11/sys/arm/include/vfp.h stable/11/sys/arm/include/vm.h stable/11/sys/arm/include/vmparam.h stable/11/sys/arm/lpc/if_lpe.c stable/11/sys/arm/lpc/if_lpereg.h stable/11/sys/arm/lpc/lpc_dmac.c stable/11/sys/arm/lpc/lpc_fb.c stable/11/sys/arm/lpc/lpc_gpio.c stable/11/sys/arm/lpc/lpc_intc.c stable/11/sys/arm/lpc/lpc_machdep.c stable/11/sys/arm/lpc/lpc_mmc.c stable/11/sys/arm/lpc/lpc_ohci.c stable/11/sys/arm/lpc/lpc_pll.c stable/11/sys/arm/lpc/lpc_pwr.c stable/11/sys/arm/lpc/lpc_rtc.c stable/11/sys/arm/lpc/lpc_spi.c stable/11/sys/arm/lpc/lpc_timer.c stable/11/sys/arm/lpc/lpcreg.h stable/11/sys/arm/lpc/lpcvar.h stable/11/sys/arm/lpc/ssd1289.c stable/11/sys/arm/mv/armadaxp/armadaxp.c stable/11/sys/arm/mv/armadaxp/armadaxp_mp.c stable/11/sys/arm/mv/discovery/discovery.c stable/11/sys/arm/mv/gpio.c stable/11/sys/arm/mv/ic.c stable/11/sys/arm/mv/kirkwood/kirkwood.c stable/11/sys/arm/mv/mpic.c stable/11/sys/arm/mv/mv_common.c stable/11/sys/arm/mv/mv_localbus.c stable/11/sys/arm/mv/mv_machdep.c stable/11/sys/arm/mv/mv_pci.c stable/11/sys/arm/mv/mv_ts.c stable/11/sys/arm/mv/mvreg.h stable/11/sys/arm/mv/mvvar.h stable/11/sys/arm/mv/mvwin.h stable/11/sys/arm/mv/orion/db88f5xxx.c stable/11/sys/arm/mv/orion/orion.c stable/11/sys/arm/mv/rtc.c stable/11/sys/arm/mv/timer.c stable/11/sys/arm/rockchip/rk30xx_gpio.c stable/11/sys/arm/rockchip/rk30xx_grf.c stable/11/sys/arm/rockchip/rk30xx_grf.h stable/11/sys/arm/rockchip/rk30xx_machdep.c stable/11/sys/arm/rockchip/rk30xx_pmu.c stable/11/sys/arm/rockchip/rk30xx_pmu.h stable/11/sys/arm/rockchip/rk30xx_wdog.c stable/11/sys/arm/rockchip/rk30xx_wdog.h stable/11/sys/arm/samsung/exynos/exynos5_machdep.c stable/11/sys/arm/samsung/exynos/exynos5_mp.c stable/11/sys/arm/ti/aintc.c stable/11/sys/arm/ti/am335x/am335x_dmtimer.c stable/11/sys/arm/ti/am335x/am335x_lcd.c stable/11/sys/arm/ti/am335x/am335x_lcd.h stable/11/sys/arm/ti/am335x/am335x_lcd_syscons.c stable/11/sys/arm/ti/am335x/am335x_pmic.c stable/11/sys/arm/ti/am335x/am335x_prcm.c stable/11/sys/arm/ti/am335x/am335x_pwm.h stable/11/sys/arm/ti/am335x/am335x_reg.h stable/11/sys/arm/ti/am335x/am335x_scm.h stable/11/sys/arm/ti/am335x/am335x_scm_padconf.c stable/11/sys/arm/ti/am335x/am335x_usbss.c stable/11/sys/arm/ti/cpsw/if_cpsw.c stable/11/sys/arm/ti/cpsw/if_cpswreg.h stable/11/sys/arm/ti/cpsw/if_cpswvar.h stable/11/sys/arm/ti/omap4/omap4_l2cache.c stable/11/sys/arm/ti/omap4/omap4_mp.c stable/11/sys/arm/ti/omap4/omap4_prcm_clks.c stable/11/sys/arm/ti/omap4/omap4_reg.h stable/11/sys/arm/ti/omap4/omap4_scm_padconf.c stable/11/sys/arm/ti/omap4/omap4_smc.h stable/11/sys/arm/ti/omap4/pandaboard/pandaboard.c stable/11/sys/arm/ti/ti_cpuid.c stable/11/sys/arm/ti/ti_cpuid.h stable/11/sys/arm/ti/ti_edma3.c stable/11/sys/arm/ti/ti_edma3.h stable/11/sys/arm/ti/ti_gpio.c stable/11/sys/arm/ti/ti_i2c.c stable/11/sys/arm/ti/ti_i2c.h stable/11/sys/arm/ti/ti_machdep.c stable/11/sys/arm/ti/ti_mbox.c stable/11/sys/arm/ti/ti_mbox.h stable/11/sys/arm/ti/ti_prcm.c stable/11/sys/arm/ti/ti_prcm.h stable/11/sys/arm/ti/ti_pruss.c stable/11/sys/arm/ti/ti_pruss.h stable/11/sys/arm/ti/ti_scm.c stable/11/sys/arm/ti/ti_scm.h stable/11/sys/arm/ti/ti_sdhci.c stable/11/sys/arm/ti/ti_sdma.c stable/11/sys/arm/ti/ti_sdma.h stable/11/sys/arm/ti/ti_sdmareg.h stable/11/sys/arm/ti/ti_smc.h stable/11/sys/arm/ti/tivar.h stable/11/sys/arm/ti/twl/twl.c stable/11/sys/arm/ti/twl/twl.h stable/11/sys/arm/ti/twl/twl_clks.c stable/11/sys/arm/ti/twl/twl_clks.h stable/11/sys/arm/ti/twl/twl_vreg.c stable/11/sys/arm/ti/twl/twl_vreg.h stable/11/sys/arm/ti/usb/omap_ehci.c stable/11/sys/arm/ti/usb/omap_usb.h stable/11/sys/arm/versatile/pl050.c stable/11/sys/arm/versatile/sp804.c stable/11/sys/arm/versatile/versatile_clcd.c stable/11/sys/arm/versatile/versatile_common.c stable/11/sys/arm/versatile/versatile_machdep.c stable/11/sys/arm/versatile/versatile_pci.c stable/11/sys/arm/versatile/versatile_sic.c stable/11/sys/arm/xilinx/uart_dev_cdnc.c stable/11/sys/arm/xilinx/zy7_devcfg.c stable/11/sys/arm/xilinx/zy7_ehci.c stable/11/sys/arm/xilinx/zy7_gpio.c stable/11/sys/arm/xilinx/zy7_l2cache.c stable/11/sys/arm/xilinx/zy7_machdep.c stable/11/sys/arm/xilinx/zy7_reg.h stable/11/sys/arm/xilinx/zy7_slcr.c stable/11/sys/arm/xilinx/zy7_slcr.h stable/11/sys/arm/xscale/i8134x/crb_machdep.c stable/11/sys/arm/xscale/i8134x/i81342.c stable/11/sys/arm/xscale/i8134x/i81342_mcu.c stable/11/sys/arm/xscale/i8134x/i81342_pci.c stable/11/sys/arm/xscale/i8134x/i81342_space.c stable/11/sys/arm/xscale/i8134x/i81342reg.h stable/11/sys/arm/xscale/i8134x/i81342var.h stable/11/sys/arm/xscale/i8134x/iq81342_7seg.c stable/11/sys/arm/xscale/i8134x/iq81342reg.h stable/11/sys/arm/xscale/i8134x/iq81342var.h stable/11/sys/arm/xscale/i8134x/obio.c stable/11/sys/arm/xscale/i8134x/obiovar.h stable/11/sys/arm/xscale/i8134x/uart_bus_i81342.c stable/11/sys/arm/xscale/i8134x/uart_cpu_i81342.c stable/11/sys/arm/xscale/ixp425/avila_ata.c stable/11/sys/arm/xscale/ixp425/avila_gpio.c stable/11/sys/arm/xscale/ixp425/avila_led.c stable/11/sys/arm/xscale/ixp425/avila_machdep.c stable/11/sys/arm/xscale/ixp425/cambria_exp_space.c stable/11/sys/arm/xscale/ixp425/cambria_fled.c stable/11/sys/arm/xscale/ixp425/cambria_gpio.c stable/11/sys/arm/xscale/ixp425/cambria_led.c stable/11/sys/arm/xscale/ixp425/if_npe.c stable/11/sys/arm/xscale/ixp425/if_npereg.h stable/11/sys/arm/xscale/ixp425/ixdp425_pci.c stable/11/sys/arm/xscale/ixp425/ixdp425reg.h stable/11/sys/arm/xscale/ixp425/ixp425.c stable/11/sys/arm/xscale/ixp425/ixp425_a4x_space.c stable/11/sys/arm/xscale/ixp425/ixp425_iic.c stable/11/sys/arm/xscale/ixp425/ixp425_intr.h stable/11/sys/arm/xscale/ixp425/ixp425_mem.c stable/11/sys/arm/xscale/ixp425/ixp425_npe.c stable/11/sys/arm/xscale/ixp425/ixp425_npereg.h stable/11/sys/arm/xscale/ixp425/ixp425_npevar.h stable/11/sys/arm/xscale/ixp425/ixp425_pci.c stable/11/sys/arm/xscale/ixp425/ixp425_pci_space.c stable/11/sys/arm/xscale/ixp425/ixp425_qmgr.c stable/11/sys/arm/xscale/ixp425/ixp425_qmgr.h stable/11/sys/arm/xscale/ixp425/ixp425_space.c stable/11/sys/arm/xscale/ixp425/ixp425_timer.c stable/11/sys/arm/xscale/ixp425/ixp425_wdog.c stable/11/sys/arm/xscale/ixp425/ixp425reg.h stable/11/sys/arm/xscale/ixp425/ixp425var.h stable/11/sys/arm/xscale/ixp425/uart_bus_ixp425.c stable/11/sys/arm/xscale/ixp425/uart_cpu_ixp425.c stable/11/sys/arm/xscale/pxa/if_smc_smi.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_machdep.c stable/11/sys/arm/xscale/pxa/pxa_obio.c stable/11/sys/arm/xscale/pxa/pxa_smi.c stable/11/sys/arm/xscale/pxa/pxa_space.c stable/11/sys/arm/xscale/pxa/pxa_timer.c stable/11/sys/arm/xscale/pxa/pxareg.h stable/11/sys/arm/xscale/pxa/pxavar.h stable/11/sys/arm/xscale/pxa/uart_bus_pxa.c stable/11/sys/arm/xscale/pxa/uart_cpu_pxa.c stable/11/sys/bsm/audit.h stable/11/sys/bsm/audit_domain.h stable/11/sys/bsm/audit_errno.h stable/11/sys/bsm/audit_fcntl.h stable/11/sys/bsm/audit_internal.h stable/11/sys/bsm/audit_kevents.h stable/11/sys/bsm/audit_record.h stable/11/sys/bsm/audit_socket_type.h stable/11/sys/compat/freebsd32/freebsd32_ioctl.c stable/11/sys/compat/freebsd32/freebsd32_ioctl.h stable/11/sys/compat/linprocfs/linprocfs.c stable/11/sys/compat/ndis/cfg_var.h stable/11/sys/compat/ndis/hal_var.h stable/11/sys/compat/ndis/kern_ndis.c stable/11/sys/compat/ndis/kern_windrv.c stable/11/sys/compat/ndis/ndis_var.h stable/11/sys/compat/ndis/ntoskrnl_var.h stable/11/sys/compat/ndis/pe_var.h stable/11/sys/compat/ndis/resource_var.h stable/11/sys/compat/ndis/subr_hal.c stable/11/sys/compat/ndis/subr_ndis.c stable/11/sys/compat/ndis/subr_ntoskrnl.c stable/11/sys/compat/ndis/subr_pe.c stable/11/sys/compat/ndis/subr_usbd.c stable/11/sys/compat/ndis/usbd_var.h stable/11/sys/conf/newvers.sh stable/11/sys/conf/systags.sh stable/11/sys/crypto/sha1.c stable/11/sys/crypto/sha1.h stable/11/sys/ddb/db_ps.c stable/11/sys/ddb/ddb.h stable/11/sys/dev/aac/aac.c stable/11/sys/dev/aac/aac_cam.c stable/11/sys/dev/aac/aac_debug.c stable/11/sys/dev/aac/aac_disk.c stable/11/sys/dev/aac/aac_linux.c stable/11/sys/dev/aac/aac_pci.c stable/11/sys/dev/aac/aac_tables.h stable/11/sys/dev/aac/aacreg.h stable/11/sys/dev/aac/aacvar.h stable/11/sys/dev/aacraid/aacraid.c stable/11/sys/dev/aacraid/aacraid_cam.c stable/11/sys/dev/aacraid/aacraid_debug.c stable/11/sys/dev/aacraid/aacraid_debug.h stable/11/sys/dev/aacraid/aacraid_linux.c stable/11/sys/dev/aacraid/aacraid_pci.c stable/11/sys/dev/aacraid/aacraid_reg.h stable/11/sys/dev/aacraid/aacraid_var.h stable/11/sys/dev/adb/adb.h stable/11/sys/dev/adb/adb_bus.c stable/11/sys/dev/adb/adb_buttons.c stable/11/sys/dev/adb/adb_kbd.c stable/11/sys/dev/adb/adb_mouse.c stable/11/sys/dev/adb/adbvar.h stable/11/sys/dev/adlink/adlink.c stable/11/sys/dev/advansys/adv_isa.c stable/11/sys/dev/advansys/adv_pci.c stable/11/sys/dev/advansys/advansys.c stable/11/sys/dev/advansys/advansys.h stable/11/sys/dev/advansys/advlib.c stable/11/sys/dev/advansys/advlib.h stable/11/sys/dev/advansys/adw_pci.c stable/11/sys/dev/advansys/adwcam.c stable/11/sys/dev/advansys/adwlib.c stable/11/sys/dev/advansys/adwlib.h stable/11/sys/dev/advansys/adwvar.h stable/11/sys/dev/ae/if_ae.c stable/11/sys/dev/ae/if_aereg.h stable/11/sys/dev/ae/if_aevar.h stable/11/sys/dev/age/if_age.c stable/11/sys/dev/age/if_agereg.h stable/11/sys/dev/age/if_agevar.h stable/11/sys/dev/agp/agp.c stable/11/sys/dev/agp/agp_ali.c stable/11/sys/dev/agp/agp_amd.c stable/11/sys/dev/agp/agp_amd64.c stable/11/sys/dev/agp/agp_apple.c stable/11/sys/dev/agp/agp_ati.c stable/11/sys/dev/agp/agp_i810.c stable/11/sys/dev/agp/agp_i810.h stable/11/sys/dev/agp/agp_intel.c stable/11/sys/dev/agp/agp_nvidia.c stable/11/sys/dev/agp/agp_sis.c stable/11/sys/dev/agp/agp_via.c stable/11/sys/dev/agp/agppriv.h stable/11/sys/dev/agp/agpreg.h stable/11/sys/dev/agp/agpvar.h stable/11/sys/dev/aha/aha.c stable/11/sys/dev/aha/aha_isa.c stable/11/sys/dev/aha/ahareg.h stable/11/sys/dev/ahci/ahci.c stable/11/sys/dev/ahci/ahci.h stable/11/sys/dev/ahci/ahciem.c stable/11/sys/dev/aic/aic.c stable/11/sys/dev/aic/aic6360reg.h stable/11/sys/dev/aic/aic_isa.c stable/11/sys/dev/aic/aic_pccard.c stable/11/sys/dev/aic/aicvar.h stable/11/sys/dev/aic7xxx/ahc_isa.c stable/11/sys/dev/aic7xxx/aic7770.c stable/11/sys/dev/aic7xxx/aic79xx.c stable/11/sys/dev/aic7xxx/aic79xx.h stable/11/sys/dev/aic7xxx/aic79xx_inline.h stable/11/sys/dev/aic7xxx/aic79xx_pci.c stable/11/sys/dev/aic7xxx/aic7xxx.c stable/11/sys/dev/aic7xxx/aic7xxx.h stable/11/sys/dev/aic7xxx/aic7xxx_93cx6.h stable/11/sys/dev/aic7xxx/aic7xxx_inline.h stable/11/sys/dev/aic7xxx/aic7xxx_pci.c stable/11/sys/dev/aic7xxx/aicasm/aicasm.c stable/11/sys/dev/aic7xxx/aicasm/aicasm.h stable/11/sys/dev/aic7xxx/aicasm/aicasm_gram.y stable/11/sys/dev/aic7xxx/aicasm/aicasm_insformat.h stable/11/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y stable/11/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l stable/11/sys/dev/aic7xxx/aicasm/aicasm_scan.l stable/11/sys/dev/aic7xxx/aicasm/aicasm_symbol.c stable/11/sys/dev/aic7xxx/aicasm/aicasm_symbol.h stable/11/sys/dev/alc/if_alc.c stable/11/sys/dev/alc/if_alcreg.h stable/11/sys/dev/alc/if_alcvar.h stable/11/sys/dev/ale/if_ale.c stable/11/sys/dev/ale/if_alereg.h stable/11/sys/dev/ale/if_alevar.h stable/11/sys/dev/altera/atse/a_api.h stable/11/sys/dev/altera/atse/if_atse.c stable/11/sys/dev/altera/atse/if_atse_fdt.c stable/11/sys/dev/altera/atse/if_atse_nexus.c stable/11/sys/dev/altera/atse/if_atsereg.h stable/11/sys/dev/altera/avgen/altera_avgen.c stable/11/sys/dev/altera/avgen/altera_avgen.h stable/11/sys/dev/altera/avgen/altera_avgen_fdt.c stable/11/sys/dev/altera/avgen/altera_avgen_nexus.c stable/11/sys/dev/altera/jtag_uart/altera_jtag_uart.h stable/11/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c stable/11/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c stable/11/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c stable/11/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c stable/11/sys/dev/altera/sdcard/altera_sdcard.c stable/11/sys/dev/altera/sdcard/altera_sdcard.h stable/11/sys/dev/altera/sdcard/altera_sdcard_disk.c stable/11/sys/dev/altera/sdcard/altera_sdcard_fdt.c stable/11/sys/dev/altera/sdcard/altera_sdcard_io.c stable/11/sys/dev/altera/sdcard/altera_sdcard_nexus.c stable/11/sys/dev/amdsbwd/amdsbwd.c stable/11/sys/dev/amdtemp/amdtemp.c stable/11/sys/dev/amr/amr.c stable/11/sys/dev/amr/amr_cam.c stable/11/sys/dev/amr/amr_disk.c stable/11/sys/dev/amr/amr_linux.c stable/11/sys/dev/amr/amr_pci.c stable/11/sys/dev/amr/amr_tables.h stable/11/sys/dev/amr/amrio.h stable/11/sys/dev/amr/amrreg.h stable/11/sys/dev/amr/amrvar.h stable/11/sys/dev/an/if_aironet_ieee.h stable/11/sys/dev/an/if_an.c stable/11/sys/dev/an/if_an_isa.c stable/11/sys/dev/an/if_an_pccard.c stable/11/sys/dev/an/if_an_pci.c stable/11/sys/dev/an/if_anreg.h stable/11/sys/dev/arcmsr/arcmsr.c stable/11/sys/dev/arcmsr/arcmsr.h stable/11/sys/dev/asmc/asmc.c stable/11/sys/dev/asmc/asmcvar.h stable/11/sys/dev/ata/ata-all.c stable/11/sys/dev/ata/ata-all.h stable/11/sys/dev/ata/ata-card.c stable/11/sys/dev/ata/ata-dma.c stable/11/sys/dev/ata/ata-isa.c stable/11/sys/dev/ata/ata-lowlevel.c stable/11/sys/dev/ata/ata-pci.c stable/11/sys/dev/ata/ata-pci.h stable/11/sys/dev/ata/ata-sata.c stable/11/sys/dev/ata/chipsets/ata-acard.c stable/11/sys/dev/ata/chipsets/ata-acerlabs.c stable/11/sys/dev/ata/chipsets/ata-amd.c stable/11/sys/dev/ata/chipsets/ata-ati.c stable/11/sys/dev/ata/chipsets/ata-cenatek.c stable/11/sys/dev/ata/chipsets/ata-cypress.c stable/11/sys/dev/ata/chipsets/ata-cyrix.c stable/11/sys/dev/ata/chipsets/ata-fsl.c stable/11/sys/dev/ata/chipsets/ata-highpoint.c stable/11/sys/dev/ata/chipsets/ata-intel.c stable/11/sys/dev/ata/chipsets/ata-ite.c stable/11/sys/dev/ata/chipsets/ata-jmicron.c stable/11/sys/dev/ata/chipsets/ata-marvell.c stable/11/sys/dev/ata/chipsets/ata-micron.c stable/11/sys/dev/ata/chipsets/ata-national.c stable/11/sys/dev/ata/chipsets/ata-netcell.c stable/11/sys/dev/ata/chipsets/ata-nvidia.c stable/11/sys/dev/ata/chipsets/ata-promise.c stable/11/sys/dev/ata/chipsets/ata-serverworks.c stable/11/sys/dev/ata/chipsets/ata-siliconimage.c stable/11/sys/dev/ata/chipsets/ata-sis.c stable/11/sys/dev/ata/chipsets/ata-via.c stable/11/sys/dev/ath/ah_osdep.c stable/11/sys/dev/ath/ah_osdep.h stable/11/sys/dev/ath/ath_dfs/null/dfs_null.c stable/11/sys/dev/ath/ath_hal/ar9002/ar9002phy.h stable/11/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c stable/11/sys/dev/ath/ath_hal/ar9002/ar9280_olc.h stable/11/sys/dev/ath/ath_hal/ar9002/ar9285_cal.c stable/11/sys/dev/ath/ath_hal/ar9002/ar9285_cal.h stable/11/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c stable/11/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h stable/11/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c stable/11/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h stable/11/sys/dev/ath/ath_hal/ar9002/ar9285phy.h stable/11/sys/dev/ath/ath_hal/ar9002/ar9287_cal.c stable/11/sys/dev/ath/ath_hal/ar9002/ar9287_cal.h stable/11/sys/dev/ath/ath_hal/ar9002/ar9287_olc.c stable/11/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h stable/11/sys/dev/ath/ath_rate/amrr/amrr.c stable/11/sys/dev/ath/ath_rate/amrr/amrr.h stable/11/sys/dev/ath/ath_rate/onoe/onoe.c stable/11/sys/dev/ath/ath_rate/onoe/onoe.h stable/11/sys/dev/ath/ath_rate/sample/sample.c stable/11/sys/dev/ath/ath_rate/sample/sample.h stable/11/sys/dev/ath/ath_rate/sample/tx_schedules.h stable/11/sys/dev/ath/if_ath.c stable/11/sys/dev/ath/if_ath_ahb.c stable/11/sys/dev/ath/if_ath_alq.c stable/11/sys/dev/ath/if_ath_alq.h stable/11/sys/dev/ath/if_ath_beacon.c stable/11/sys/dev/ath/if_ath_beacon.h stable/11/sys/dev/ath/if_ath_btcoex.c stable/11/sys/dev/ath/if_ath_btcoex.h stable/11/sys/dev/ath/if_ath_debug.c stable/11/sys/dev/ath/if_ath_debug.h stable/11/sys/dev/ath/if_ath_keycache.c stable/11/sys/dev/ath/if_ath_keycache.h stable/11/sys/dev/ath/if_ath_led.c stable/11/sys/dev/ath/if_ath_led.h stable/11/sys/dev/ath/if_ath_lna_div.c stable/11/sys/dev/ath/if_ath_lna_div.h stable/11/sys/dev/ath/if_ath_misc.h stable/11/sys/dev/ath/if_ath_pci.c stable/11/sys/dev/ath/if_ath_rx.c stable/11/sys/dev/ath/if_ath_rx.h stable/11/sys/dev/ath/if_ath_rx_edma.c stable/11/sys/dev/ath/if_ath_rx_edma.h stable/11/sys/dev/ath/if_ath_spectral.c stable/11/sys/dev/ath/if_ath_spectral.h stable/11/sys/dev/ath/if_ath_sysctl.c stable/11/sys/dev/ath/if_ath_sysctl.h stable/11/sys/dev/ath/if_ath_tdma.c stable/11/sys/dev/ath/if_ath_tdma.h stable/11/sys/dev/ath/if_ath_tsf.h stable/11/sys/dev/ath/if_ath_tx.c stable/11/sys/dev/ath/if_ath_tx.h stable/11/sys/dev/ath/if_ath_tx_edma.c stable/11/sys/dev/ath/if_ath_tx_edma.h stable/11/sys/dev/ath/if_ath_tx_ht.c stable/11/sys/dev/ath/if_ath_tx_ht.h stable/11/sys/dev/ath/if_athdfs.h stable/11/sys/dev/ath/if_athioctl.h stable/11/sys/dev/ath/if_athrate.h stable/11/sys/dev/ath/if_athvar.h stable/11/sys/dev/atkbdc/atkbd.c stable/11/sys/dev/atkbdc/atkbd_atkbdc.c stable/11/sys/dev/atkbdc/atkbdc.c stable/11/sys/dev/atkbdc/atkbdc_ebus.c stable/11/sys/dev/atkbdc/atkbdc_isa.c stable/11/sys/dev/atkbdc/atkbdc_subr.c stable/11/sys/dev/atkbdc/atkbdc_subr.h stable/11/sys/dev/atkbdc/atkbdcreg.h stable/11/sys/dev/atkbdc/atkbdreg.h stable/11/sys/dev/auxio/auxio.c stable/11/sys/dev/auxio/auxioreg.h stable/11/sys/dev/bce/if_bce.c stable/11/sys/dev/bce/if_bcefw.h stable/11/sys/dev/bce/if_bcereg.h stable/11/sys/dev/bfe/if_bfe.c stable/11/sys/dev/bfe/if_bfereg.h stable/11/sys/dev/bge/if_bge.c stable/11/sys/dev/bge/if_bgereg.h stable/11/sys/dev/bktr/bktr_audio.c stable/11/sys/dev/bktr/bktr_audio.h stable/11/sys/dev/bktr/bktr_card.c stable/11/sys/dev/bktr/bktr_card.h stable/11/sys/dev/bktr/bktr_core.c stable/11/sys/dev/bktr/bktr_core.h stable/11/sys/dev/bktr/bktr_i2c.c stable/11/sys/dev/bktr/bktr_i2c.h stable/11/sys/dev/bktr/bktr_mem.c stable/11/sys/dev/bktr/bktr_mem.h stable/11/sys/dev/bktr/bktr_os.c stable/11/sys/dev/bktr/bktr_os.h stable/11/sys/dev/bktr/bktr_reg.h stable/11/sys/dev/bktr/bktr_tuner.c stable/11/sys/dev/bktr/bktr_tuner.h stable/11/sys/dev/bktr/ioctl_meteor.h stable/11/sys/dev/bktr/msp34xx.c stable/11/sys/dev/bm/if_bm.c stable/11/sys/dev/bm/if_bmreg.h stable/11/sys/dev/bm/if_bmvar.h stable/11/sys/dev/buslogic/bt.c stable/11/sys/dev/buslogic/bt_isa.c stable/11/sys/dev/buslogic/bt_pci.c stable/11/sys/dev/buslogic/btreg.h stable/11/sys/dev/bvm/bvm_console.c stable/11/sys/dev/bvm/bvm_dbg.c stable/11/sys/dev/bwi/bitops.h stable/11/sys/dev/bwi/bwimac.c stable/11/sys/dev/bwi/bwimac.h stable/11/sys/dev/bwi/bwiphy.c stable/11/sys/dev/bwi/bwiphy.h stable/11/sys/dev/bwi/bwirf.c stable/11/sys/dev/bwi/bwirf.h stable/11/sys/dev/bwi/if_bwi.c stable/11/sys/dev/bwi/if_bwi_pci.c stable/11/sys/dev/bwi/if_bwireg.h stable/11/sys/dev/bwi/if_bwivar.h stable/11/sys/dev/bwn/if_bwn.c stable/11/sys/dev/bwn/if_bwnreg.h stable/11/sys/dev/bwn/if_bwnvar.h stable/11/sys/dev/bxe/57710_init_values.c stable/11/sys/dev/bxe/57710_int_offsets.h stable/11/sys/dev/bxe/57711_init_values.c stable/11/sys/dev/bxe/57711_int_offsets.h stable/11/sys/dev/bxe/57712_init_values.c stable/11/sys/dev/bxe/57712_int_offsets.h stable/11/sys/dev/bxe/bxe.c stable/11/sys/dev/bxe/bxe.h stable/11/sys/dev/bxe/bxe_dcb.h stable/11/sys/dev/bxe/bxe_debug.c stable/11/sys/dev/bxe/bxe_elink.c stable/11/sys/dev/bxe/bxe_elink.h stable/11/sys/dev/bxe/bxe_stats.c stable/11/sys/dev/bxe/bxe_stats.h stable/11/sys/dev/bxe/ecore_fw_defs.h stable/11/sys/dev/bxe/ecore_hsi.h stable/11/sys/dev/bxe/ecore_init.h stable/11/sys/dev/bxe/ecore_init_ops.h stable/11/sys/dev/bxe/ecore_mfw_req.h stable/11/sys/dev/bxe/ecore_reg.h stable/11/sys/dev/bxe/ecore_sp.c stable/11/sys/dev/bxe/ecore_sp.h stable/11/sys/dev/cadence/if_cgem.c stable/11/sys/dev/cadence/if_cgem_hw.h stable/11/sys/dev/cardbus/cardbus.c stable/11/sys/dev/cardbus/cardbus_cis.c stable/11/sys/dev/cardbus/cardbus_cis.h stable/11/sys/dev/cardbus/cardbus_device.c stable/11/sys/dev/cardbus/cardbusreg.h stable/11/sys/dev/cardbus/cardbusvar.h stable/11/sys/dev/cas/if_cas.c stable/11/sys/dev/cas/if_casreg.h stable/11/sys/dev/cas/if_casvar.h stable/11/sys/dev/cesa/cesa.c stable/11/sys/dev/cesa/cesa.h stable/11/sys/dev/cfe/cfe_api.c stable/11/sys/dev/cfe/cfe_api.h stable/11/sys/dev/cfe/cfe_api_int.h stable/11/sys/dev/cfe/cfe_console.c stable/11/sys/dev/cfe/cfe_env.c stable/11/sys/dev/cfe/cfe_error.h stable/11/sys/dev/cfe/cfe_ioctl.h stable/11/sys/dev/cfe/cfe_resource.c stable/11/sys/dev/cfi/cfi_bus_fdt.c stable/11/sys/dev/cfi/cfi_bus_ixp4xx.c stable/11/sys/dev/cfi/cfi_bus_nexus.c stable/11/sys/dev/cfi/cfi_core.c stable/11/sys/dev/cfi/cfi_dev.c stable/11/sys/dev/cfi/cfi_disk.c stable/11/sys/dev/cfi/cfi_reg.h stable/11/sys/dev/cfi/cfi_var.h stable/11/sys/dev/ciss/ciss.c stable/11/sys/dev/ciss/cissio.h stable/11/sys/dev/ciss/cissreg.h stable/11/sys/dev/ciss/cissvar.h stable/11/sys/dev/cm/if_cm_isa.c stable/11/sys/dev/cm/smc90cx6.c stable/11/sys/dev/cm/smc90cx6reg.h stable/11/sys/dev/cm/smc90cx6var.h stable/11/sys/dev/cmx/cmx_pccard.c stable/11/sys/dev/cmx/cmxreg.h stable/11/sys/dev/cmx/cmxvar.h stable/11/sys/dev/coretemp/coretemp.c stable/11/sys/dev/cpuctl/cpuctl.c stable/11/sys/dev/cpufreq/ichss.c stable/11/sys/dev/cs/if_cs.c stable/11/sys/dev/cs/if_cs_isa.c stable/11/sys/dev/cs/if_cs_pccard.c stable/11/sys/dev/cs/if_csreg.h stable/11/sys/dev/cs/if_csvar.h stable/11/sys/dev/cxgb/bin2h.pl stable/11/sys/dev/cxgb/common/cxgb_ael1002.c stable/11/sys/dev/cxgb/common/cxgb_aq100x.c stable/11/sys/dev/cxgb/common/cxgb_common.h stable/11/sys/dev/cxgb/common/cxgb_firmware_exports.h stable/11/sys/dev/cxgb/common/cxgb_mc5.c stable/11/sys/dev/cxgb/common/cxgb_mv88e1xxx.c stable/11/sys/dev/cxgb/common/cxgb_regs.h stable/11/sys/dev/cxgb/common/cxgb_sge_defs.h stable/11/sys/dev/cxgb/common/cxgb_t3_cpl.h stable/11/sys/dev/cxgb/common/cxgb_t3_hw.c stable/11/sys/dev/cxgb/common/cxgb_tcb.h stable/11/sys/dev/cxgb/common/cxgb_tn1010.c stable/11/sys/dev/cxgb/common/cxgb_vsc7323.c stable/11/sys/dev/cxgb/common/cxgb_vsc8211.c stable/11/sys/dev/cxgb/common/cxgb_xgmac.c stable/11/sys/dev/cxgb/cxgb_adapter.h stable/11/sys/dev/cxgb/cxgb_ioctl.h stable/11/sys/dev/cxgb/cxgb_main.c stable/11/sys/dev/cxgb/cxgb_offload.h stable/11/sys/dev/cxgb/cxgb_osdep.h stable/11/sys/dev/cxgb/cxgb_sge.c stable/11/sys/dev/cxgb/cxgb_t3fw.h stable/11/sys/dev/cxgb/sys/mvec.h stable/11/sys/dev/cxgb/sys/uipc_mvec.c stable/11/sys/dev/cxgb/t3b_protocol_sram.h stable/11/sys/dev/cxgb/t3b_tp_eeprom.h stable/11/sys/dev/cxgb/t3c_protocol_sram.h stable/11/sys/dev/cxgb/t3c_tp_eeprom.h stable/11/sys/dev/cxgbe/adapter.h stable/11/sys/dev/cxgbe/common/common.h stable/11/sys/dev/cxgbe/common/t4_hw.c stable/11/sys/dev/cxgbe/common/t4_hw.h stable/11/sys/dev/cxgbe/common/t4_msg.h stable/11/sys/dev/cxgbe/common/t4_regs.h stable/11/sys/dev/cxgbe/common/t4_regs_values.h stable/11/sys/dev/cxgbe/common/t4_tcb.h stable/11/sys/dev/cxgbe/iw_cxgbe/cm.c stable/11/sys/dev/cxgbe/iw_cxgbe/cq.c stable/11/sys/dev/cxgbe/iw_cxgbe/device.c stable/11/sys/dev/cxgbe/iw_cxgbe/ev.c stable/11/sys/dev/cxgbe/iw_cxgbe/id_table.c stable/11/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h stable/11/sys/dev/cxgbe/iw_cxgbe/mem.c stable/11/sys/dev/cxgbe/iw_cxgbe/provider.c stable/11/sys/dev/cxgbe/iw_cxgbe/qp.c stable/11/sys/dev/cxgbe/iw_cxgbe/resource.c stable/11/sys/dev/cxgbe/iw_cxgbe/t4.h stable/11/sys/dev/cxgbe/iw_cxgbe/user.h stable/11/sys/dev/cxgbe/offload.h stable/11/sys/dev/cxgbe/osdep.h stable/11/sys/dev/cxgbe/t4_ioctl.h stable/11/sys/dev/cxgbe/t4_l2t.c stable/11/sys/dev/cxgbe/t4_l2t.h stable/11/sys/dev/cxgbe/t4_main.c stable/11/sys/dev/cxgbe/t4_sge.c stable/11/sys/dev/cxgbe/t4_tracer.c stable/11/sys/dev/cxgbe/tom/t4_connect.c stable/11/sys/dev/cxgbe/tom/t4_cpl_io.c stable/11/sys/dev/cxgbe/tom/t4_ddp.c stable/11/sys/dev/cxgbe/tom/t4_listen.c stable/11/sys/dev/cxgbe/tom/t4_tom.c stable/11/sys/dev/cxgbe/tom/t4_tom.h stable/11/sys/dev/cxgbe/tom/t4_tom_l2t.c stable/11/sys/dev/cxgbe/tom/t4_tom_l2t.h stable/11/sys/dev/cy/cy.c stable/11/sys/dev/cy/cy_isa.c stable/11/sys/dev/cy/cy_pci.c stable/11/sys/dev/cy/cyreg.h stable/11/sys/dev/cy/cyvar.h stable/11/sys/dev/dc/dcphy.c stable/11/sys/dev/dc/if_dc.c stable/11/sys/dev/dc/if_dcreg.h stable/11/sys/dev/dc/pnphy.c stable/11/sys/dev/dcons/dcons.c stable/11/sys/dev/dcons/dcons.h stable/11/sys/dev/dcons/dcons_crom.c stable/11/sys/dev/dcons/dcons_os.c stable/11/sys/dev/dcons/dcons_os.h stable/11/sys/dev/de/dc21040reg.h stable/11/sys/dev/de/if_de.c stable/11/sys/dev/de/if_devar.h stable/11/sys/dev/dpms/dpms.c stable/11/sys/dev/dpt/dpt.h stable/11/sys/dev/dpt/dpt_pci.c stable/11/sys/dev/dpt/dpt_scsi.c stable/11/sys/dev/drm2/drm_gem.c stable/11/sys/dev/drm2/drm_gem_names.c stable/11/sys/dev/drm2/drm_gem_names.h stable/11/sys/dev/drm2/drm_linux_list_sort.c stable/11/sys/dev/drm2/i915/i915_gem.c stable/11/sys/dev/e1000/e1000_80003es2lan.c stable/11/sys/dev/e1000/e1000_80003es2lan.h stable/11/sys/dev/e1000/e1000_82540.c stable/11/sys/dev/e1000/e1000_82541.c stable/11/sys/dev/e1000/e1000_82541.h stable/11/sys/dev/e1000/e1000_82542.c stable/11/sys/dev/e1000/e1000_82543.c stable/11/sys/dev/e1000/e1000_82543.h stable/11/sys/dev/e1000/e1000_82571.c stable/11/sys/dev/e1000/e1000_82571.h stable/11/sys/dev/e1000/e1000_82575.c stable/11/sys/dev/e1000/e1000_82575.h stable/11/sys/dev/e1000/e1000_api.c stable/11/sys/dev/e1000/e1000_api.h stable/11/sys/dev/e1000/e1000_defines.h stable/11/sys/dev/e1000/e1000_hw.h stable/11/sys/dev/e1000/e1000_i210.c stable/11/sys/dev/e1000/e1000_i210.h stable/11/sys/dev/e1000/e1000_ich8lan.c stable/11/sys/dev/e1000/e1000_ich8lan.h stable/11/sys/dev/e1000/e1000_mac.c stable/11/sys/dev/e1000/e1000_mac.h stable/11/sys/dev/e1000/e1000_manage.c stable/11/sys/dev/e1000/e1000_manage.h stable/11/sys/dev/e1000/e1000_mbx.c stable/11/sys/dev/e1000/e1000_mbx.h stable/11/sys/dev/e1000/e1000_nvm.c stable/11/sys/dev/e1000/e1000_nvm.h stable/11/sys/dev/e1000/e1000_osdep.c stable/11/sys/dev/e1000/e1000_osdep.h stable/11/sys/dev/e1000/e1000_phy.c stable/11/sys/dev/e1000/e1000_phy.h stable/11/sys/dev/e1000/e1000_regs.h stable/11/sys/dev/e1000/e1000_vf.c stable/11/sys/dev/e1000/e1000_vf.h stable/11/sys/dev/e1000/if_em.c stable/11/sys/dev/e1000/if_em.h stable/11/sys/dev/ed/ax88x90reg.h stable/11/sys/dev/ed/dl100xxreg.h stable/11/sys/dev/ed/if_ed.c stable/11/sys/dev/ed/if_ed_3c503.c stable/11/sys/dev/ed/if_ed_hpp.c stable/11/sys/dev/ed/if_ed_isa.c stable/11/sys/dev/ed/if_ed_novell.c stable/11/sys/dev/ed/if_ed_pccard.c stable/11/sys/dev/ed/if_ed_pci.c stable/11/sys/dev/ed/if_ed_rtl80x9.c stable/11/sys/dev/ed/if_ed_sic.c stable/11/sys/dev/ed/if_ed_wd80x3.c stable/11/sys/dev/ed/if_edvar.h stable/11/sys/dev/ed/rtl80x9reg.h stable/11/sys/dev/ed/tc5299jreg.h stable/11/sys/dev/ep/if_ep.c stable/11/sys/dev/ep/if_ep_isa.c stable/11/sys/dev/ep/if_ep_pccard.c stable/11/sys/dev/ep/if_epreg.h stable/11/sys/dev/ep/if_epvar.h stable/11/sys/dev/esp/am53c974reg.h stable/11/sys/dev/esp/esp_pci.c stable/11/sys/dev/esp/esp_sbus.c stable/11/sys/dev/esp/ncr53c9x.c stable/11/sys/dev/esp/ncr53c9xreg.h stable/11/sys/dev/esp/ncr53c9xvar.h stable/11/sys/dev/et/if_et.c stable/11/sys/dev/et/if_etreg.h stable/11/sys/dev/et/if_etvar.h stable/11/sys/dev/etherswitch/arswitch/arswitch.c stable/11/sys/dev/etherswitch/arswitch/arswitch_7240.c stable/11/sys/dev/etherswitch/arswitch/arswitch_7240.h stable/11/sys/dev/etherswitch/arswitch/arswitch_8216.c stable/11/sys/dev/etherswitch/arswitch/arswitch_8216.h stable/11/sys/dev/etherswitch/arswitch/arswitch_8226.c stable/11/sys/dev/etherswitch/arswitch/arswitch_8226.h stable/11/sys/dev/etherswitch/arswitch/arswitch_8316.c stable/11/sys/dev/etherswitch/arswitch/arswitch_8316.h stable/11/sys/dev/etherswitch/arswitch/arswitch_8327.c stable/11/sys/dev/etherswitch/arswitch/arswitch_8327.h stable/11/sys/dev/etherswitch/arswitch/arswitch_9340.c stable/11/sys/dev/etherswitch/arswitch/arswitch_9340.h stable/11/sys/dev/etherswitch/arswitch/arswitch_phy.c stable/11/sys/dev/etherswitch/arswitch/arswitch_phy.h stable/11/sys/dev/etherswitch/arswitch/arswitch_reg.c stable/11/sys/dev/etherswitch/arswitch/arswitch_reg.h stable/11/sys/dev/etherswitch/arswitch/arswitch_vlans.c stable/11/sys/dev/etherswitch/arswitch/arswitch_vlans.h stable/11/sys/dev/etherswitch/arswitch/arswitchreg.h stable/11/sys/dev/etherswitch/arswitch/arswitchvar.h stable/11/sys/dev/etherswitch/etherswitch.c stable/11/sys/dev/etherswitch/ip17x/ip175c.c stable/11/sys/dev/etherswitch/ip17x/ip175c.h stable/11/sys/dev/etherswitch/ip17x/ip175d.c stable/11/sys/dev/etherswitch/ip17x/ip175d.h stable/11/sys/dev/etherswitch/ip17x/ip17x.c stable/11/sys/dev/etherswitch/ip17x/ip17x_phy.c stable/11/sys/dev/etherswitch/ip17x/ip17x_phy.h stable/11/sys/dev/etherswitch/ip17x/ip17x_reg.h stable/11/sys/dev/etherswitch/ip17x/ip17x_var.h stable/11/sys/dev/etherswitch/ip17x/ip17x_vlans.c stable/11/sys/dev/etherswitch/ip17x/ip17x_vlans.h stable/11/sys/dev/etherswitch/miiproxy.c stable/11/sys/dev/etherswitch/miiproxy.h stable/11/sys/dev/etherswitch/rtl8366/rtl8366rb.c stable/11/sys/dev/etherswitch/rtl8366/rtl8366rbvar.h stable/11/sys/dev/etherswitch/ukswitch/ukswitch.c stable/11/sys/dev/ex/if_ex.c stable/11/sys/dev/ex/if_ex_isa.c stable/11/sys/dev/ex/if_ex_pccard.c stable/11/sys/dev/ex/if_exreg.h stable/11/sys/dev/ex/if_exvar.h stable/11/sys/dev/exca/exca.c stable/11/sys/dev/exca/excareg.h stable/11/sys/dev/exca/excavar.h stable/11/sys/dev/fb/creator.c stable/11/sys/dev/fb/creatorreg.h stable/11/sys/dev/fb/fb.c stable/11/sys/dev/fb/fbd.c stable/11/sys/dev/fb/fbreg.h stable/11/sys/dev/fb/gallant12x22.c stable/11/sys/dev/fb/machfb.c stable/11/sys/dev/fb/s3_pci.c stable/11/sys/dev/fb/splash.c stable/11/sys/dev/fb/splash_bmp.c stable/11/sys/dev/fb/splash_pcx.c stable/11/sys/dev/fb/splash_txt.c stable/11/sys/dev/fb/splashreg.h stable/11/sys/dev/fb/vesa.c stable/11/sys/dev/fb/vesa.h stable/11/sys/dev/fb/vga.c stable/11/sys/dev/fb/vgareg.h stable/11/sys/dev/fdc/fdc.c stable/11/sys/dev/fdc/fdc_acpi.c stable/11/sys/dev/fdc/fdc_isa.c stable/11/sys/dev/fdc/fdc_pccard.c stable/11/sys/dev/fdc/fdcvar.h stable/11/sys/dev/fdt/fdt_common.c stable/11/sys/dev/fdt/fdt_common.h stable/11/sys/dev/fdt/fdt_powerpc.c stable/11/sys/dev/fdt/fdt_slicer.c stable/11/sys/dev/fdt/simplebus.c stable/11/sys/dev/ffec/if_ffec.c stable/11/sys/dev/ffec/if_ffecreg.h stable/11/sys/dev/filemon/filemon.c stable/11/sys/dev/filemon/filemon.h stable/11/sys/dev/filemon/filemon_wrapper.c stable/11/sys/dev/firewire/firewire.c stable/11/sys/dev/firewire/firewire.h stable/11/sys/dev/firewire/firewire_phy.h stable/11/sys/dev/firewire/firewirereg.h stable/11/sys/dev/firewire/fwcrom.c stable/11/sys/dev/firewire/fwdev.c stable/11/sys/dev/firewire/fwdma.c stable/11/sys/dev/firewire/fwdma.h stable/11/sys/dev/firewire/fwmem.c stable/11/sys/dev/firewire/fwmem.h stable/11/sys/dev/firewire/fwohci.c stable/11/sys/dev/firewire/fwohci_pci.c stable/11/sys/dev/firewire/fwohcireg.h stable/11/sys/dev/firewire/fwohcivar.h stable/11/sys/dev/firewire/fwphyreg.h stable/11/sys/dev/firewire/iec13213.h stable/11/sys/dev/firewire/iec68113.h stable/11/sys/dev/firewire/if_fwe.c stable/11/sys/dev/firewire/if_fwevar.h stable/11/sys/dev/firewire/if_fwip.c stable/11/sys/dev/firewire/if_fwipvar.h stable/11/sys/dev/firewire/sbp.c stable/11/sys/dev/firewire/sbp.h stable/11/sys/dev/firewire/sbp_targ.c stable/11/sys/dev/flash/at45d.c stable/11/sys/dev/flash/mx25l.c stable/11/sys/dev/flash/mx25lreg.h stable/11/sys/dev/fxp/if_fxp.c stable/11/sys/dev/fxp/if_fxpreg.h stable/11/sys/dev/fxp/if_fxpvar.h stable/11/sys/dev/fxp/inphy.c stable/11/sys/dev/fxp/inphyreg.h stable/11/sys/dev/fxp/rcvbundl.h stable/11/sys/dev/gem/if_gem.c stable/11/sys/dev/gem/if_gem_pci.c stable/11/sys/dev/gem/if_gem_sbus.c stable/11/sys/dev/gem/if_gemreg.h stable/11/sys/dev/gem/if_gemvar.h stable/11/sys/dev/glxiic/glxiic.c stable/11/sys/dev/glxsb/glxsb.h stable/11/sys/dev/glxsb/glxsb_hash.c stable/11/sys/dev/gpio/gpiobus.c stable/11/sys/dev/gpio/gpiobusvar.h stable/11/sys/dev/gpio/gpioc.c stable/11/sys/dev/gpio/gpioiic.c stable/11/sys/dev/gpio/gpioled.c stable/11/sys/dev/gpio/ofw_gpiobus.c stable/11/sys/dev/gxemul/cons/gxemul_cons.c stable/11/sys/dev/gxemul/disk/gxemul_disk.c stable/11/sys/dev/gxemul/disk/gxemul_diskreg.h stable/11/sys/dev/gxemul/ether/gxreg.h stable/11/sys/dev/gxemul/ether/if_gx.c stable/11/sys/dev/hifn/hifn7751.c stable/11/sys/dev/hifn/hifn7751reg.h stable/11/sys/dev/hifn/hifn7751var.h stable/11/sys/dev/hme/if_hme.c stable/11/sys/dev/hme/if_hme_pci.c stable/11/sys/dev/hme/if_hme_sbus.c stable/11/sys/dev/hme/if_hmereg.h stable/11/sys/dev/hme/if_hmevar.h stable/11/sys/dev/hpt27xx/array.h stable/11/sys/dev/hpt27xx/him.h stable/11/sys/dev/hpt27xx/himfuncs.h stable/11/sys/dev/hpt27xx/hpt27xx_config.c stable/11/sys/dev/hpt27xx/hpt27xx_config.h stable/11/sys/dev/hpt27xx/hpt27xx_os_bsd.c stable/11/sys/dev/hpt27xx/hpt27xx_osm_bsd.c stable/11/sys/dev/hpt27xx/hptintf.h stable/11/sys/dev/hpt27xx/ldm.h stable/11/sys/dev/hpt27xx/list.h stable/11/sys/dev/hpt27xx/os_bsd.h stable/11/sys/dev/hpt27xx/osm.h stable/11/sys/dev/hpt27xx/wj.h stable/11/sys/dev/hptiop/hptiop.c stable/11/sys/dev/hptiop/hptiop.h stable/11/sys/dev/hptmv/access601.h stable/11/sys/dev/hptmv/array.h stable/11/sys/dev/hptmv/atapi.h stable/11/sys/dev/hptmv/command.h stable/11/sys/dev/hptmv/entry.c stable/11/sys/dev/hptmv/global.h stable/11/sys/dev/hptmv/gui_lib.c stable/11/sys/dev/hptmv/hptintf.h stable/11/sys/dev/hptmv/hptproc.c stable/11/sys/dev/hptmv/ioctl.c stable/11/sys/dev/hptmv/mv.c stable/11/sys/dev/hptmv/mvOs.h stable/11/sys/dev/hptmv/mvSata.h stable/11/sys/dev/hptmv/mvStorageDev.h stable/11/sys/dev/hptmv/osbsd.h stable/11/sys/dev/hptmv/raid5n.h stable/11/sys/dev/hptmv/vdevice.h stable/11/sys/dev/hptnr/array.h stable/11/sys/dev/hptnr/him.h stable/11/sys/dev/hptnr/himfuncs.h stable/11/sys/dev/hptnr/hptintf.h stable/11/sys/dev/hptnr/hptnr_config.c stable/11/sys/dev/hptnr/hptnr_config.h stable/11/sys/dev/hptnr/hptnr_os_bsd.c stable/11/sys/dev/hptnr/hptnr_osm_bsd.c stable/11/sys/dev/hptnr/ldm.h stable/11/sys/dev/hptnr/list.h stable/11/sys/dev/hptnr/os_bsd.h stable/11/sys/dev/hptnr/osm.h stable/11/sys/dev/hptnr/wj.h stable/11/sys/dev/hptrr/array.h stable/11/sys/dev/hptrr/him.h stable/11/sys/dev/hptrr/himfuncs.h stable/11/sys/dev/hptrr/hptintf.h stable/11/sys/dev/hptrr/hptrr_config.c stable/11/sys/dev/hptrr/hptrr_config.h stable/11/sys/dev/hptrr/hptrr_os_bsd.c stable/11/sys/dev/hptrr/hptrr_osm_bsd.c stable/11/sys/dev/hptrr/ldm.h stable/11/sys/dev/hptrr/list.h stable/11/sys/dev/hptrr/os_bsd.h stable/11/sys/dev/hptrr/osm.h stable/11/sys/dev/hwpmc/hwpmc_amd.c stable/11/sys/dev/hwpmc/hwpmc_amd.h stable/11/sys/dev/hwpmc/hwpmc_arm.c stable/11/sys/dev/hwpmc/hwpmc_core.c stable/11/sys/dev/hwpmc/hwpmc_core.h stable/11/sys/dev/hwpmc/hwpmc_intel.c stable/11/sys/dev/hwpmc/hwpmc_logging.c stable/11/sys/dev/hwpmc/hwpmc_mips.c stable/11/sys/dev/hwpmc/hwpmc_mips24k.c stable/11/sys/dev/hwpmc/hwpmc_mod.c stable/11/sys/dev/hwpmc/hwpmc_mpc7xxx.c stable/11/sys/dev/hwpmc/hwpmc_octeon.c stable/11/sys/dev/hwpmc/hwpmc_pentium.c stable/11/sys/dev/hwpmc/hwpmc_pentium.h stable/11/sys/dev/hwpmc/hwpmc_piv.c stable/11/sys/dev/hwpmc/hwpmc_piv.h stable/11/sys/dev/hwpmc/hwpmc_powerpc.c stable/11/sys/dev/hwpmc/hwpmc_powerpc.h stable/11/sys/dev/hwpmc/hwpmc_ppc970.c stable/11/sys/dev/hwpmc/hwpmc_ppro.c stable/11/sys/dev/hwpmc/hwpmc_ppro.h stable/11/sys/dev/hwpmc/hwpmc_soft.c stable/11/sys/dev/hwpmc/hwpmc_soft.h stable/11/sys/dev/hwpmc/hwpmc_sparc64.c stable/11/sys/dev/hwpmc/hwpmc_tsc.c stable/11/sys/dev/hwpmc/hwpmc_tsc.h stable/11/sys/dev/hwpmc/hwpmc_uncore.c stable/11/sys/dev/hwpmc/hwpmc_uncore.h stable/11/sys/dev/hwpmc/hwpmc_x86.c stable/11/sys/dev/hwpmc/hwpmc_xscale.c stable/11/sys/dev/hwpmc/hwpmc_xscale.h stable/11/sys/dev/hwpmc/pmc_events.h stable/11/sys/dev/hyperv/include/hyperv.h stable/11/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c stable/11/sys/dev/hyperv/storvsc/hv_vstorage.h stable/11/sys/dev/hyperv/utilities/hv_kvp.h stable/11/sys/dev/ic/cd1400.h stable/11/sys/dev/ic/cd180.h stable/11/sys/dev/ic/esp.h stable/11/sys/dev/ic/i8253reg.h stable/11/sys/dev/ic/i82586.h stable/11/sys/dev/ic/i8259.h stable/11/sys/dev/ic/nec765.h stable/11/sys/dev/ic/ns16550.h stable/11/sys/dev/ic/quicc.h stable/11/sys/dev/ic/sab82532.h stable/11/sys/dev/ic/via6522reg.h stable/11/sys/dev/ic/z8530.h stable/11/sys/dev/ichwd/ichwd.c stable/11/sys/dev/ichwd/ichwd.h stable/11/sys/dev/ida/ida.c stable/11/sys/dev/ida/ida_disk.c stable/11/sys/dev/ida/ida_pci.c stable/11/sys/dev/ida/idareg.h stable/11/sys/dev/ida/idavar.h stable/11/sys/dev/if_ndis/if_ndis.c stable/11/sys/dev/if_ndis/if_ndis_pccard.c stable/11/sys/dev/if_ndis/if_ndis_pci.c stable/11/sys/dev/if_ndis/if_ndis_usb.c stable/11/sys/dev/if_ndis/if_ndisvar.h stable/11/sys/dev/iicbus/ad7417.c stable/11/sys/dev/iicbus/ad7418.c stable/11/sys/dev/iicbus/adt746x.c stable/11/sys/dev/iicbus/ds1631.c stable/11/sys/dev/iicbus/ds1672.c stable/11/sys/dev/iicbus/ds1775.c stable/11/sys/dev/iicbus/icee.c stable/11/sys/dev/iicbus/if_ic.c stable/11/sys/dev/iicbus/iic.c stable/11/sys/dev/iicbus/iic.h stable/11/sys/dev/iicbus/iicbb.c stable/11/sys/dev/iicbus/iicbus.c stable/11/sys/dev/iicbus/iicbus.h stable/11/sys/dev/iicbus/iicoc.c stable/11/sys/dev/iicbus/iicoc.h stable/11/sys/dev/iicbus/iiconf.c stable/11/sys/dev/iicbus/iiconf.h stable/11/sys/dev/iicbus/iicsmb.c stable/11/sys/dev/iicbus/max6690.c stable/11/sys/dev/iicbus/s35390a.c stable/11/sys/dev/iir/iir.c stable/11/sys/dev/iir/iir.h stable/11/sys/dev/iir/iir_ctrl.c stable/11/sys/dev/iir/iir_pci.c stable/11/sys/dev/io/iodev.c stable/11/sys/dev/io/iodev.h stable/11/sys/dev/ipmi/ipmi.c stable/11/sys/dev/ipmi/ipmi_acpi.c stable/11/sys/dev/ipmi/ipmi_isa.c stable/11/sys/dev/ipmi/ipmi_kcs.c stable/11/sys/dev/ipmi/ipmi_linux.c stable/11/sys/dev/ipmi/ipmi_pci.c stable/11/sys/dev/ipmi/ipmi_smbios.c stable/11/sys/dev/ipmi/ipmi_smbus.c stable/11/sys/dev/ipmi/ipmi_smic.c stable/11/sys/dev/ipmi/ipmi_ssif.c stable/11/sys/dev/ipmi/ipmivars.h stable/11/sys/dev/ips/ips.c stable/11/sys/dev/ips/ips.h stable/11/sys/dev/ips/ips_commands.c stable/11/sys/dev/ips/ips_disk.c stable/11/sys/dev/ips/ips_disk.h stable/11/sys/dev/ips/ips_ioctl.c stable/11/sys/dev/ips/ips_ioctl.h stable/11/sys/dev/ips/ips_pci.c stable/11/sys/dev/ips/ipsreg.h stable/11/sys/dev/ipw/if_ipw.c stable/11/sys/dev/ipw/if_ipwreg.h stable/11/sys/dev/ipw/if_ipwvar.h stable/11/sys/dev/isci/environment.h stable/11/sys/dev/isci/isci.c stable/11/sys/dev/isci/isci.h stable/11/sys/dev/isci/isci_controller.c stable/11/sys/dev/isci/isci_domain.c stable/11/sys/dev/isci/isci_interrupt.c stable/11/sys/dev/isci/isci_io_request.c stable/11/sys/dev/isci/isci_logger.c stable/11/sys/dev/isci/isci_oem_parameters.c stable/11/sys/dev/isci/isci_remote_device.c stable/11/sys/dev/isci/isci_sysctl.c stable/11/sys/dev/isci/isci_task_request.c stable/11/sys/dev/isci/isci_timer.c stable/11/sys/dev/isci/scil/intel_ata.h stable/11/sys/dev/isci/scil/intel_pci.h stable/11/sys/dev/isci/scil/intel_sas.h stable/11/sys/dev/isci/scil/intel_sat.h stable/11/sys/dev/isci/scil/intel_sata.h stable/11/sys/dev/isci/scil/intel_scsi.h stable/11/sys/dev/isci/scil/sati.c stable/11/sys/dev/isci/scil/sati.h stable/11/sys/dev/isci/scil/sati_abort_task_set.c stable/11/sys/dev/isci/scil/sati_abort_task_set.h stable/11/sys/dev/isci/scil/sati_atapi.c stable/11/sys/dev/isci/scil/sati_atapi.h stable/11/sys/dev/isci/scil/sati_callbacks.h stable/11/sys/dev/isci/scil/sati_design.h stable/11/sys/dev/isci/scil/sati_device.c stable/11/sys/dev/isci/scil/sati_device.h stable/11/sys/dev/isci/scil/sati_inquiry.c stable/11/sys/dev/isci/scil/sati_inquiry.h stable/11/sys/dev/isci/scil/sati_log_sense.c stable/11/sys/dev/isci/scil/sati_log_sense.h stable/11/sys/dev/isci/scil/sati_lun_reset.c stable/11/sys/dev/isci/scil/sati_lun_reset.h stable/11/sys/dev/isci/scil/sati_mode_pages.c stable/11/sys/dev/isci/scil/sati_mode_pages.h stable/11/sys/dev/isci/scil/sati_mode_select.c stable/11/sys/dev/isci/scil/sati_mode_select.h stable/11/sys/dev/isci/scil/sati_mode_sense.c stable/11/sys/dev/isci/scil/sati_mode_sense.h stable/11/sys/dev/isci/scil/sati_mode_sense_10.c stable/11/sys/dev/isci/scil/sati_mode_sense_10.h stable/11/sys/dev/isci/scil/sati_mode_sense_6.c stable/11/sys/dev/isci/scil/sati_mode_sense_6.h stable/11/sys/dev/isci/scil/sati_move.c stable/11/sys/dev/isci/scil/sati_move.h stable/11/sys/dev/isci/scil/sati_passthrough.c stable/11/sys/dev/isci/scil/sati_passthrough.h stable/11/sys/dev/isci/scil/sati_read.c stable/11/sys/dev/isci/scil/sati_read.h stable/11/sys/dev/isci/scil/sati_read_buffer.c stable/11/sys/dev/isci/scil/sati_read_buffer.h stable/11/sys/dev/isci/scil/sati_read_capacity.c stable/11/sys/dev/isci/scil/sati_read_capacity.h stable/11/sys/dev/isci/scil/sati_reassign_blocks.c stable/11/sys/dev/isci/scil/sati_reassign_blocks.h stable/11/sys/dev/isci/scil/sati_report_luns.c stable/11/sys/dev/isci/scil/sati_report_luns.h stable/11/sys/dev/isci/scil/sati_request_sense.c stable/11/sys/dev/isci/scil/sati_request_sense.h stable/11/sys/dev/isci/scil/sati_start_stop_unit.c stable/11/sys/dev/isci/scil/sati_start_stop_unit.h stable/11/sys/dev/isci/scil/sati_synchronize_cache.c stable/11/sys/dev/isci/scil/sati_synchronize_cache.h stable/11/sys/dev/isci/scil/sati_test_unit_ready.c stable/11/sys/dev/isci/scil/sati_test_unit_ready.h stable/11/sys/dev/isci/scil/sati_translator_sequence.h stable/11/sys/dev/isci/scil/sati_types.h stable/11/sys/dev/isci/scil/sati_unmap.c stable/11/sys/dev/isci/scil/sati_unmap.h stable/11/sys/dev/isci/scil/sati_util.c stable/11/sys/dev/isci/scil/sati_util.h stable/11/sys/dev/isci/scil/sati_verify.c stable/11/sys/dev/isci/scil/sati_verify.h stable/11/sys/dev/isci/scil/sati_write.c stable/11/sys/dev/isci/scil/sati_write.h stable/11/sys/dev/isci/scil/sati_write_and_verify.c stable/11/sys/dev/isci/scil/sati_write_and_verify.h stable/11/sys/dev/isci/scil/sati_write_buffer.c stable/11/sys/dev/isci/scil/sati_write_buffer.h stable/11/sys/dev/isci/scil/sati_write_long.c stable/11/sys/dev/isci/scil/sati_write_long.h stable/11/sys/dev/isci/scil/sci_abstract_list.c stable/11/sys/dev/isci/scil/sci_abstract_list.h stable/11/sys/dev/isci/scil/sci_base_controller.c stable/11/sys/dev/isci/scil/sci_base_controller.h stable/11/sys/dev/isci/scil/sci_base_domain.c stable/11/sys/dev/isci/scil/sci_base_domain.h stable/11/sys/dev/isci/scil/sci_base_iterator.c stable/11/sys/dev/isci/scil/sci_base_iterator.h stable/11/sys/dev/isci/scil/sci_base_library.c stable/11/sys/dev/isci/scil/sci_base_library.h stable/11/sys/dev/isci/scil/sci_base_logger.c stable/11/sys/dev/isci/scil/sci_base_logger.h stable/11/sys/dev/isci/scil/sci_base_memory_descriptor_list.c stable/11/sys/dev/isci/scil/sci_base_memory_descriptor_list.h stable/11/sys/dev/isci/scil/sci_base_memory_descriptor_list_decorator.c stable/11/sys/dev/isci/scil/sci_base_object.c stable/11/sys/dev/isci/scil/sci_base_object.h stable/11/sys/dev/isci/scil/sci_base_observer.c stable/11/sys/dev/isci/scil/sci_base_observer.h stable/11/sys/dev/isci/scil/sci_base_phy.c stable/11/sys/dev/isci/scil/sci_base_phy.h stable/11/sys/dev/isci/scil/sci_base_port.c stable/11/sys/dev/isci/scil/sci_base_port.h stable/11/sys/dev/isci/scil/sci_base_remote_device.c stable/11/sys/dev/isci/scil/sci_base_remote_device.h stable/11/sys/dev/isci/scil/sci_base_request.c stable/11/sys/dev/isci/scil/sci_base_request.h stable/11/sys/dev/isci/scil/sci_base_state.h stable/11/sys/dev/isci/scil/sci_base_state_machine.c stable/11/sys/dev/isci/scil/sci_base_state_machine.h stable/11/sys/dev/isci/scil/sci_base_state_machine_logger.c stable/11/sys/dev/isci/scil/sci_base_state_machine_logger.h stable/11/sys/dev/isci/scil/sci_base_state_machine_observer.c stable/11/sys/dev/isci/scil/sci_base_state_machine_observer.h stable/11/sys/dev/isci/scil/sci_base_subject.c stable/11/sys/dev/isci/scil/sci_base_subject.h stable/11/sys/dev/isci/scil/sci_controller.h stable/11/sys/dev/isci/scil/sci_controller_constants.h stable/11/sys/dev/isci/scil/sci_fast_list.h stable/11/sys/dev/isci/scil/sci_iterator.h stable/11/sys/dev/isci/scil/sci_library.h stable/11/sys/dev/isci/scil/sci_logger.h stable/11/sys/dev/isci/scil/sci_memory_descriptor_list.h stable/11/sys/dev/isci/scil/sci_memory_descriptor_list_decorator.h stable/11/sys/dev/isci/scil/sci_object.h stable/11/sys/dev/isci/scil/sci_overview.h stable/11/sys/dev/isci/scil/sci_pool.h stable/11/sys/dev/isci/scil/sci_simple_list.h stable/11/sys/dev/isci/scil/sci_status.h stable/11/sys/dev/isci/scil/sci_types.h stable/11/sys/dev/isci/scil/sci_util.c stable/11/sys/dev/isci/scil/sci_util.h stable/11/sys/dev/isci/scil/scic_config_parameters.h stable/11/sys/dev/isci/scil/scic_controller.h stable/11/sys/dev/isci/scil/scic_io_request.h stable/11/sys/dev/isci/scil/scic_library.h stable/11/sys/dev/isci/scil/scic_logger.h stable/11/sys/dev/isci/scil/scic_overview.h stable/11/sys/dev/isci/scil/scic_phy.h stable/11/sys/dev/isci/scil/scic_port.h stable/11/sys/dev/isci/scil/scic_remote_device.h stable/11/sys/dev/isci/scil/scic_sds_controller.c stable/11/sys/dev/isci/scil/scic_sds_controller.h stable/11/sys/dev/isci/scil/scic_sds_controller_registers.h stable/11/sys/dev/isci/scil/scic_sds_library.c stable/11/sys/dev/isci/scil/scic_sds_library.h stable/11/sys/dev/isci/scil/scic_sds_logger.h stable/11/sys/dev/isci/scil/scic_sds_pci.c stable/11/sys/dev/isci/scil/scic_sds_pci.h stable/11/sys/dev/isci/scil/scic_sds_phy.c stable/11/sys/dev/isci/scil/scic_sds_phy.h stable/11/sys/dev/isci/scil/scic_sds_phy_registers.h stable/11/sys/dev/isci/scil/scic_sds_port.c stable/11/sys/dev/isci/scil/scic_sds_port.h stable/11/sys/dev/isci/scil/scic_sds_port_configuration_agent.c stable/11/sys/dev/isci/scil/scic_sds_port_configuration_agent.h stable/11/sys/dev/isci/scil/scic_sds_port_registers.h stable/11/sys/dev/isci/scil/scic_sds_remote_device.c stable/11/sys/dev/isci/scil/scic_sds_remote_device.h stable/11/sys/dev/isci/scil/scic_sds_remote_node_context.c stable/11/sys/dev/isci/scil/scic_sds_remote_node_context.h stable/11/sys/dev/isci/scil/scic_sds_remote_node_table.c stable/11/sys/dev/isci/scil/scic_sds_remote_node_table.h stable/11/sys/dev/isci/scil/scic_sds_request.c stable/11/sys/dev/isci/scil/scic_sds_request.h stable/11/sys/dev/isci/scil/scic_sds_sgpio.c stable/11/sys/dev/isci/scil/scic_sds_smp_remote_device.c stable/11/sys/dev/isci/scil/scic_sds_smp_request.c stable/11/sys/dev/isci/scil/scic_sds_smp_request.h stable/11/sys/dev/isci/scil/scic_sds_ssp_request.c stable/11/sys/dev/isci/scil/scic_sds_stp_packet_request.c stable/11/sys/dev/isci/scil/scic_sds_stp_packet_request.h stable/11/sys/dev/isci/scil/scic_sds_stp_pio_request.h stable/11/sys/dev/isci/scil/scic_sds_stp_remote_device.c stable/11/sys/dev/isci/scil/scic_sds_stp_request.c stable/11/sys/dev/isci/scil/scic_sds_stp_request.h stable/11/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.c stable/11/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.h stable/11/sys/dev/isci/scil/scic_sgpio.h stable/11/sys/dev/isci/scil/scic_task_request.h stable/11/sys/dev/isci/scil/scic_user_callback.h stable/11/sys/dev/isci/scil/scif_config_parameters.h stable/11/sys/dev/isci/scil/scif_controller.h stable/11/sys/dev/isci/scil/scif_domain.h stable/11/sys/dev/isci/scil/scif_io_request.h stable/11/sys/dev/isci/scil/scif_library.h stable/11/sys/dev/isci/scil/scif_logger.h stable/11/sys/dev/isci/scil/scif_overview.h stable/11/sys/dev/isci/scil/scif_remote_device.h stable/11/sys/dev/isci/scil/scif_sas_constants.h stable/11/sys/dev/isci/scil/scif_sas_controller.c stable/11/sys/dev/isci/scil/scif_sas_controller.h stable/11/sys/dev/isci/scil/scif_sas_controller_state_handlers.c stable/11/sys/dev/isci/scil/scif_sas_controller_states.c stable/11/sys/dev/isci/scil/scif_sas_design.h stable/11/sys/dev/isci/scil/scif_sas_domain.c stable/11/sys/dev/isci/scil/scif_sas_domain.h stable/11/sys/dev/isci/scil/scif_sas_domain_state_handlers.c stable/11/sys/dev/isci/scil/scif_sas_domain_states.c stable/11/sys/dev/isci/scil/scif_sas_high_priority_request_queue.c stable/11/sys/dev/isci/scil/scif_sas_high_priority_request_queue.h stable/11/sys/dev/isci/scil/scif_sas_internal_io_request.c stable/11/sys/dev/isci/scil/scif_sas_internal_io_request.h stable/11/sys/dev/isci/scil/scif_sas_io_request.c stable/11/sys/dev/isci/scil/scif_sas_io_request.h stable/11/sys/dev/isci/scil/scif_sas_io_request_state_handlers.c stable/11/sys/dev/isci/scil/scif_sas_io_request_states.c stable/11/sys/dev/isci/scil/scif_sas_library.c stable/11/sys/dev/isci/scil/scif_sas_library.h stable/11/sys/dev/isci/scil/scif_sas_logger.h stable/11/sys/dev/isci/scil/scif_sas_remote_device.c stable/11/sys/dev/isci/scil/scif_sas_remote_device.h stable/11/sys/dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c stable/11/sys/dev/isci/scil/scif_sas_remote_device_ready_substates.c stable/11/sys/dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c stable/11/sys/dev/isci/scil/scif_sas_remote_device_starting_substates.c stable/11/sys/dev/isci/scil/scif_sas_remote_device_state_handlers.c stable/11/sys/dev/isci/scil/scif_sas_remote_device_states.c stable/11/sys/dev/isci/scil/scif_sas_request.c stable/11/sys/dev/isci/scil/scif_sas_request.h stable/11/sys/dev/isci/scil/scif_sas_sati_binding.h stable/11/sys/dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c stable/11/sys/dev/isci/scil/scif_sas_smp_io_request.c stable/11/sys/dev/isci/scil/scif_sas_smp_io_request.h stable/11/sys/dev/isci/scil/scif_sas_smp_phy.c stable/11/sys/dev/isci/scil/scif_sas_smp_phy.h stable/11/sys/dev/isci/scil/scif_sas_smp_remote_device.c stable/11/sys/dev/isci/scil/scif_sas_smp_remote_device.h stable/11/sys/dev/isci/scil/scif_sas_stp_io_request.c stable/11/sys/dev/isci/scil/scif_sas_stp_io_request.h stable/11/sys/dev/isci/scil/scif_sas_stp_remote_device.c stable/11/sys/dev/isci/scil/scif_sas_stp_remote_device.h stable/11/sys/dev/isci/scil/scif_sas_stp_task_request.c stable/11/sys/dev/isci/scil/scif_sas_stp_task_request.h stable/11/sys/dev/isci/scil/scif_sas_task_request.c stable/11/sys/dev/isci/scil/scif_sas_task_request.h stable/11/sys/dev/isci/scil/scif_sas_task_request_state_handlers.c stable/11/sys/dev/isci/scil/scif_sas_task_request_states.c stable/11/sys/dev/isci/scil/scif_sas_timer.c stable/11/sys/dev/isci/scil/scif_task_request.h stable/11/sys/dev/isci/scil/scif_user_callback.h stable/11/sys/dev/isci/scil/scu_bios_definitions.h stable/11/sys/dev/isci/scil/scu_completion_codes.h stable/11/sys/dev/isci/scil/scu_constants.h stable/11/sys/dev/isci/scil/scu_event_codes.h stable/11/sys/dev/isci/scil/scu_registers.h stable/11/sys/dev/isci/scil/scu_remote_node_context.h stable/11/sys/dev/isci/scil/scu_task_context.h stable/11/sys/dev/isci/scil/scu_unsolicited_frame.h stable/11/sys/dev/isci/scil/scu_viit_data.h stable/11/sys/dev/isci/types.h stable/11/sys/dev/iscsi/icl.c stable/11/sys/dev/iscsi/icl.h stable/11/sys/dev/iscsi/iscsi.c stable/11/sys/dev/iscsi/iscsi.h stable/11/sys/dev/iscsi/iscsi_ioctl.h stable/11/sys/dev/iscsi/iscsi_proto.h stable/11/sys/dev/iscsi_initiator/isc_cam.c stable/11/sys/dev/iscsi_initiator/isc_sm.c stable/11/sys/dev/iscsi_initiator/isc_soc.c stable/11/sys/dev/iscsi_initiator/isc_subr.c stable/11/sys/dev/iscsi_initiator/iscsi.c stable/11/sys/dev/iscsi_initiator/iscsi.h stable/11/sys/dev/iscsi_initiator/iscsi_subr.c stable/11/sys/dev/iscsi_initiator/iscsivar.h stable/11/sys/dev/isp/isp_freebsd.c stable/11/sys/dev/isp/isp_freebsd.h stable/11/sys/dev/isp/isp_ioctl.h stable/11/sys/dev/isp/isp_library.c stable/11/sys/dev/isp/isp_library.h stable/11/sys/dev/isp/isp_sbus.c stable/11/sys/dev/isp/isp_stds.h stable/11/sys/dev/isp/isp_target.c stable/11/sys/dev/isp/isp_target.h stable/11/sys/dev/isp/ispreg.h stable/11/sys/dev/ispfw/asm_1000.h stable/11/sys/dev/ispfw/asm_1040.h stable/11/sys/dev/ispfw/asm_1080.h stable/11/sys/dev/ispfw/asm_12160.h stable/11/sys/dev/ispfw/asm_2100.h stable/11/sys/dev/ispfw/asm_2200.h stable/11/sys/dev/ispfw/asm_2300.h stable/11/sys/dev/ispfw/asm_2322.h stable/11/sys/dev/ispfw/asm_2400.h stable/11/sys/dev/ispfw/asm_2500.h stable/11/sys/dev/ispfw/ispfw.c stable/11/sys/dev/iwi/if_iwi.c stable/11/sys/dev/iwi/if_iwireg.h stable/11/sys/dev/iwi/if_iwivar.h stable/11/sys/dev/ixgb/if_ixgb.c stable/11/sys/dev/ixgb/if_ixgb.h stable/11/sys/dev/ixgb/if_ixgb_osdep.h stable/11/sys/dev/ixgb/ixgb_ee.c stable/11/sys/dev/ixgb/ixgb_ee.h stable/11/sys/dev/ixgb/ixgb_hw.c stable/11/sys/dev/ixgb/ixgb_hw.h stable/11/sys/dev/ixgb/ixgb_ids.h stable/11/sys/dev/ixgbe/ixgbe.h stable/11/sys/dev/ixgbe/ixgbe_82598.c stable/11/sys/dev/ixgbe/ixgbe_82598.h stable/11/sys/dev/ixgbe/ixgbe_82599.c stable/11/sys/dev/ixgbe/ixgbe_82599.h stable/11/sys/dev/ixgbe/ixgbe_api.c stable/11/sys/dev/ixgbe/ixgbe_api.h stable/11/sys/dev/ixgbe/ixgbe_common.c stable/11/sys/dev/ixgbe/ixgbe_common.h stable/11/sys/dev/ixgbe/ixgbe_dcb.c stable/11/sys/dev/ixgbe/ixgbe_dcb.h stable/11/sys/dev/ixgbe/ixgbe_dcb_82598.c stable/11/sys/dev/ixgbe/ixgbe_dcb_82598.h stable/11/sys/dev/ixgbe/ixgbe_dcb_82599.c stable/11/sys/dev/ixgbe/ixgbe_dcb_82599.h stable/11/sys/dev/ixgbe/ixgbe_mbx.c stable/11/sys/dev/ixgbe/ixgbe_mbx.h stable/11/sys/dev/ixgbe/ixgbe_osdep.h stable/11/sys/dev/ixgbe/ixgbe_phy.c stable/11/sys/dev/ixgbe/ixgbe_phy.h stable/11/sys/dev/ixgbe/ixgbe_type.h stable/11/sys/dev/ixgbe/ixgbe_vf.c stable/11/sys/dev/ixgbe/ixgbe_vf.h stable/11/sys/dev/ixgbe/ixgbe_x540.c stable/11/sys/dev/ixgbe/ixgbe_x540.h stable/11/sys/dev/jme/if_jme.c stable/11/sys/dev/jme/if_jmereg.h stable/11/sys/dev/jme/if_jmevar.h stable/11/sys/dev/joy/joy.c stable/11/sys/dev/joy/joy_isa.c stable/11/sys/dev/joy/joyvar.h stable/11/sys/dev/kbd/kbd.c stable/11/sys/dev/kbd/kbdreg.h stable/11/sys/dev/kbd/kbdtables.h stable/11/sys/dev/kbdmux/kbdmux.c stable/11/sys/dev/ksyms/ksyms.c stable/11/sys/dev/le/am7990.c stable/11/sys/dev/le/am79900.c stable/11/sys/dev/le/am79900reg.h stable/11/sys/dev/le/am79900var.h stable/11/sys/dev/le/am7990reg.h stable/11/sys/dev/le/am7990var.h stable/11/sys/dev/le/if_le_isa.c stable/11/sys/dev/le/if_le_lebuffer.c stable/11/sys/dev/le/if_le_ledma.c stable/11/sys/dev/le/if_le_pci.c stable/11/sys/dev/le/lance.c stable/11/sys/dev/le/lancereg.h stable/11/sys/dev/le/lancevar.h stable/11/sys/dev/le/lebuffer_sbus.c stable/11/sys/dev/lge/if_lge.c stable/11/sys/dev/lge/if_lgereg.h stable/11/sys/dev/lmc/if_lmc.c stable/11/sys/dev/lmc/if_lmc.h stable/11/sys/dev/malo/if_malo.c stable/11/sys/dev/malo/if_malo.h stable/11/sys/dev/malo/if_malo_pci.c stable/11/sys/dev/malo/if_malohal.c stable/11/sys/dev/malo/if_malohal.h stable/11/sys/dev/malo/if_maloioctl.h stable/11/sys/dev/mc146818/mc146818.c stable/11/sys/dev/mc146818/mc146818var.h stable/11/sys/dev/md/md.c stable/11/sys/dev/mem/memdev.c stable/11/sys/dev/mem/memutil.c stable/11/sys/dev/mfi/mfi.c stable/11/sys/dev/mfi/mfi_cam.c stable/11/sys/dev/mfi/mfi_debug.c stable/11/sys/dev/mfi/mfi_disk.c stable/11/sys/dev/mfi/mfi_ioctl.h stable/11/sys/dev/mfi/mfi_linux.c stable/11/sys/dev/mfi/mfi_pci.c stable/11/sys/dev/mfi/mfi_syspd.c stable/11/sys/dev/mfi/mfi_tbolt.c stable/11/sys/dev/mfi/mfireg.h stable/11/sys/dev/mfi/mfivar.h stable/11/sys/dev/mge/if_mge.c stable/11/sys/dev/mge/if_mgevar.h stable/11/sys/dev/mii/acphy.c stable/11/sys/dev/mii/acphyreg.h stable/11/sys/dev/mii/amphy.c stable/11/sys/dev/mii/amphyreg.h stable/11/sys/dev/mii/atphy.c stable/11/sys/dev/mii/atphyreg.h stable/11/sys/dev/mii/axphy.c stable/11/sys/dev/mii/bmtphy.c stable/11/sys/dev/mii/bmtphyreg.h stable/11/sys/dev/mii/brgphy.c stable/11/sys/dev/mii/brgphyreg.h stable/11/sys/dev/mii/ciphy.c stable/11/sys/dev/mii/ciphyreg.h stable/11/sys/dev/mii/e1000phy.c stable/11/sys/dev/mii/e1000phyreg.h stable/11/sys/dev/mii/gentbi.c stable/11/sys/dev/mii/icsphy.c stable/11/sys/dev/mii/icsphyreg.h stable/11/sys/dev/mii/ip1000phy.c stable/11/sys/dev/mii/ip1000phyreg.h stable/11/sys/dev/mii/jmphy.c stable/11/sys/dev/mii/jmphyreg.h stable/11/sys/dev/mii/lxtphy.c stable/11/sys/dev/mii/lxtphyreg.h stable/11/sys/dev/mii/mii.c stable/11/sys/dev/mii/mii.h stable/11/sys/dev/mii/mii_bitbang.c stable/11/sys/dev/mii/mii_bitbang.h stable/11/sys/dev/mii/mii_physubr.c stable/11/sys/dev/mii/miivar.h stable/11/sys/dev/mii/mlphy.c stable/11/sys/dev/mii/nsgphy.c stable/11/sys/dev/mii/nsgphyreg.h stable/11/sys/dev/mii/nsphy.c stable/11/sys/dev/mii/nsphyreg.h stable/11/sys/dev/mii/nsphyter.c stable/11/sys/dev/mii/nsphyterreg.h stable/11/sys/dev/mii/pnaphy.c stable/11/sys/dev/mii/qsphy.c stable/11/sys/dev/mii/qsphyreg.h stable/11/sys/dev/mii/rdcphy.c stable/11/sys/dev/mii/rdcphyreg.h stable/11/sys/dev/mii/rgephy.c stable/11/sys/dev/mii/rgephyreg.h stable/11/sys/dev/mii/rlphy.c stable/11/sys/dev/mii/rlswitch.c stable/11/sys/dev/mii/smcphy.c stable/11/sys/dev/mii/smscphy.c stable/11/sys/dev/mii/tdkphy.c stable/11/sys/dev/mii/tdkphyreg.h stable/11/sys/dev/mii/tlphy.c stable/11/sys/dev/mii/tlphyreg.h stable/11/sys/dev/mii/truephy.c stable/11/sys/dev/mii/truephyreg.h stable/11/sys/dev/mii/ukphy.c stable/11/sys/dev/mii/ukphy_subr.c stable/11/sys/dev/mii/xmphy.c stable/11/sys/dev/mii/xmphyreg.h stable/11/sys/dev/mk48txx/mk48txx.c stable/11/sys/dev/mk48txx/mk48txxreg.h stable/11/sys/dev/mk48txx/mk48txxvar.h stable/11/sys/dev/mlx/mlx.c stable/11/sys/dev/mlx/mlx_disk.c stable/11/sys/dev/mlx/mlx_pci.c stable/11/sys/dev/mlx/mlxio.h stable/11/sys/dev/mlx/mlxreg.h stable/11/sys/dev/mlx/mlxvar.h stable/11/sys/dev/mly/mly.c stable/11/sys/dev/mly/mly_tables.h stable/11/sys/dev/mly/mlyio.h stable/11/sys/dev/mly/mlyreg.h stable/11/sys/dev/mly/mlyvar.h stable/11/sys/dev/mmc/bridge.h stable/11/sys/dev/mmc/mmc.c stable/11/sys/dev/mmc/mmcbrvar.h stable/11/sys/dev/mmc/mmcreg.h stable/11/sys/dev/mmc/mmcsd.c stable/11/sys/dev/mmc/mmcvar.h stable/11/sys/dev/mps/mpi/mpi2.h stable/11/sys/dev/mps/mpi/mpi2_cnfg.h stable/11/sys/dev/mps/mpi/mpi2_hbd.h stable/11/sys/dev/mps/mpi/mpi2_init.h stable/11/sys/dev/mps/mpi/mpi2_ioc.h stable/11/sys/dev/mps/mpi/mpi2_ra.h stable/11/sys/dev/mps/mpi/mpi2_raid.h stable/11/sys/dev/mps/mpi/mpi2_sas.h stable/11/sys/dev/mps/mpi/mpi2_targ.h stable/11/sys/dev/mps/mpi/mpi2_tool.h stable/11/sys/dev/mps/mpi/mpi2_type.h stable/11/sys/dev/mps/mps.c stable/11/sys/dev/mps/mps_config.c stable/11/sys/dev/mps/mps_ioctl.h stable/11/sys/dev/mps/mps_mapping.c stable/11/sys/dev/mps/mps_mapping.h stable/11/sys/dev/mps/mps_pci.c stable/11/sys/dev/mps/mps_sas.c stable/11/sys/dev/mps/mps_sas.h stable/11/sys/dev/mps/mps_sas_lsi.c stable/11/sys/dev/mps/mps_table.c stable/11/sys/dev/mps/mps_table.h stable/11/sys/dev/mps/mps_user.c stable/11/sys/dev/mps/mpsvar.h stable/11/sys/dev/mpt/mpilib/mpi.h stable/11/sys/dev/mpt/mpilib/mpi_cnfg.h stable/11/sys/dev/mpt/mpilib/mpi_fc.h stable/11/sys/dev/mpt/mpilib/mpi_init.h stable/11/sys/dev/mpt/mpilib/mpi_ioc.h stable/11/sys/dev/mpt/mpilib/mpi_lan.h stable/11/sys/dev/mpt/mpilib/mpi_log_fc.h stable/11/sys/dev/mpt/mpilib/mpi_log_sas.h stable/11/sys/dev/mpt/mpilib/mpi_raid.h stable/11/sys/dev/mpt/mpilib/mpi_sas.h stable/11/sys/dev/mpt/mpilib/mpi_targ.h stable/11/sys/dev/mpt/mpilib/mpi_tool.h stable/11/sys/dev/mpt/mpilib/mpi_type.h stable/11/sys/dev/mpt/mpt.c stable/11/sys/dev/mpt/mpt.h stable/11/sys/dev/mpt/mpt_cam.c stable/11/sys/dev/mpt/mpt_cam.h stable/11/sys/dev/mpt/mpt_debug.c stable/11/sys/dev/mpt/mpt_pci.c stable/11/sys/dev/mpt/mpt_raid.c stable/11/sys/dev/mpt/mpt_raid.h stable/11/sys/dev/mpt/mpt_reg.h stable/11/sys/dev/mpt/mpt_user.c stable/11/sys/dev/mse/mse.c stable/11/sys/dev/mse/mse_isa.c stable/11/sys/dev/mse/msevar.h stable/11/sys/dev/msk/if_msk.c stable/11/sys/dev/msk/if_mskreg.h stable/11/sys/dev/mvs/mvs.c stable/11/sys/dev/mvs/mvs.h stable/11/sys/dev/mvs/mvs_pci.c stable/11/sys/dev/mvs/mvs_soc.c stable/11/sys/dev/mwl/if_mwl.c stable/11/sys/dev/mwl/if_mwl_pci.c stable/11/sys/dev/mwl/if_mwlioctl.h stable/11/sys/dev/mwl/if_mwlvar.h stable/11/sys/dev/mwl/mwldiag.h stable/11/sys/dev/mwl/mwlhal.c stable/11/sys/dev/mwl/mwlhal.h stable/11/sys/dev/mwl/mwlreg.h stable/11/sys/dev/mxge/eth_z8e.h stable/11/sys/dev/mxge/ethp_z8e.h stable/11/sys/dev/mxge/if_mxge.c stable/11/sys/dev/mxge/if_mxge_var.h stable/11/sys/dev/mxge/mcp_gen_header.h stable/11/sys/dev/mxge/mxge_mcp.h stable/11/sys/dev/mxge/rss_eth_z8e.h stable/11/sys/dev/mxge/rss_ethp_z8e.h stable/11/sys/dev/my/if_my.c stable/11/sys/dev/my/if_myreg.h stable/11/sys/dev/nand/nand.c stable/11/sys/dev/nand/nand.h stable/11/sys/dev/nand/nand_bbt.c stable/11/sys/dev/nand/nand_cdev.c stable/11/sys/dev/nand/nand_dev.h stable/11/sys/dev/nand/nand_ecc_pos.h stable/11/sys/dev/nand/nand_generic.c stable/11/sys/dev/nand/nand_geom.c stable/11/sys/dev/nand/nand_id.c stable/11/sys/dev/nand/nandbus.c stable/11/sys/dev/nand/nandbus.h stable/11/sys/dev/nand/nandsim.c stable/11/sys/dev/nand/nandsim.h stable/11/sys/dev/nand/nandsim_chip.c stable/11/sys/dev/nand/nandsim_chip.h stable/11/sys/dev/nand/nandsim_ctrl.c stable/11/sys/dev/nand/nandsim_log.c stable/11/sys/dev/nand/nandsim_log.h stable/11/sys/dev/nand/nandsim_swap.c stable/11/sys/dev/nand/nandsim_swap.h stable/11/sys/dev/nand/nfc_at91.c stable/11/sys/dev/nand/nfc_at91.h stable/11/sys/dev/nand/nfc_fsl.c stable/11/sys/dev/nand/nfc_fsl.h stable/11/sys/dev/nand/nfc_mv.c stable/11/sys/dev/ncv/ncr53c500.c stable/11/sys/dev/ncv/ncr53c500_pccard.c stable/11/sys/dev/ncv/ncr53c500hw.h stable/11/sys/dev/ncv/ncr53c500hwtab.h stable/11/sys/dev/ncv/ncr53c500reg.h stable/11/sys/dev/ncv/ncr53c500var.h stable/11/sys/dev/netmap/if_em_netmap.h stable/11/sys/dev/netmap/if_igb_netmap.h stable/11/sys/dev/netmap/if_lem_netmap.h stable/11/sys/dev/netmap/if_re_netmap.h stable/11/sys/dev/netmap/ixgbe_netmap.h stable/11/sys/dev/netmap/netmap.c stable/11/sys/dev/netmap/netmap_freebsd.c stable/11/sys/dev/netmap/netmap_generic.c stable/11/sys/dev/netmap/netmap_kern.h stable/11/sys/dev/netmap/netmap_mbq.c stable/11/sys/dev/netmap/netmap_mbq.h stable/11/sys/dev/netmap/netmap_mem2.c stable/11/sys/dev/netmap/netmap_mem2.h stable/11/sys/dev/netmap/netmap_offloadings.c stable/11/sys/dev/netmap/netmap_pipe.c stable/11/sys/dev/netmap/netmap_vale.c stable/11/sys/dev/nge/if_nge.c stable/11/sys/dev/nge/if_ngereg.h stable/11/sys/dev/nmdm/nmdm.c stable/11/sys/dev/nsp/nsp.c stable/11/sys/dev/nsp/nsp_pccard.c stable/11/sys/dev/nsp/nspreg.h stable/11/sys/dev/nsp/nspvar.h stable/11/sys/dev/null/null.c stable/11/sys/dev/nvd/nvd.c stable/11/sys/dev/nvme/nvme.c stable/11/sys/dev/nvme/nvme.h stable/11/sys/dev/nvme/nvme_ctrlr.c stable/11/sys/dev/nvme/nvme_ctrlr_cmd.c stable/11/sys/dev/nvme/nvme_ns.c stable/11/sys/dev/nvme/nvme_ns_cmd.c stable/11/sys/dev/nvme/nvme_private.h stable/11/sys/dev/nvme/nvme_qpair.c stable/11/sys/dev/nvme/nvme_sysctl.c stable/11/sys/dev/nvme/nvme_test.c stable/11/sys/dev/nvme/nvme_util.c stable/11/sys/dev/nvram/nvram.c stable/11/sys/dev/nvram2env/nvram2env.c stable/11/sys/dev/nxge/if_nxge.c stable/11/sys/dev/nxge/if_nxge.h stable/11/sys/dev/nxge/include/version.h stable/11/sys/dev/nxge/include/xge-debug.h stable/11/sys/dev/nxge/include/xge-defs.h stable/11/sys/dev/nxge/include/xge-list.h stable/11/sys/dev/nxge/include/xge-os-pal.h stable/11/sys/dev/nxge/include/xge-queue.h stable/11/sys/dev/nxge/include/xgehal-channel.h stable/11/sys/dev/nxge/include/xgehal-config.h stable/11/sys/dev/nxge/include/xgehal-device.h stable/11/sys/dev/nxge/include/xgehal-driver.h stable/11/sys/dev/nxge/include/xgehal-event.h stable/11/sys/dev/nxge/include/xgehal-fifo.h stable/11/sys/dev/nxge/include/xgehal-mgmt.h stable/11/sys/dev/nxge/include/xgehal-mgmtaux.h stable/11/sys/dev/nxge/include/xgehal-mm.h stable/11/sys/dev/nxge/include/xgehal-regs.h stable/11/sys/dev/nxge/include/xgehal-ring.h stable/11/sys/dev/nxge/include/xgehal-stats.h stable/11/sys/dev/nxge/include/xgehal-types.h stable/11/sys/dev/nxge/include/xgehal.h stable/11/sys/dev/nxge/xge-osdep.h stable/11/sys/dev/nxge/xgehal/xge-queue.c stable/11/sys/dev/nxge/xgehal/xgehal-channel-fp.c stable/11/sys/dev/nxge/xgehal/xgehal-channel.c stable/11/sys/dev/nxge/xgehal/xgehal-config.c stable/11/sys/dev/nxge/xgehal/xgehal-device-fp.c stable/11/sys/dev/nxge/xgehal/xgehal-device.c stable/11/sys/dev/nxge/xgehal/xgehal-driver.c stable/11/sys/dev/nxge/xgehal/xgehal-fifo-fp.c stable/11/sys/dev/nxge/xgehal/xgehal-fifo.c stable/11/sys/dev/nxge/xgehal/xgehal-mgmt.c stable/11/sys/dev/nxge/xgehal/xgehal-mgmtaux.c stable/11/sys/dev/nxge/xgehal/xgehal-mm.c stable/11/sys/dev/nxge/xgehal/xgehal-ring-fp.c stable/11/sys/dev/nxge/xgehal/xgehal-ring.c stable/11/sys/dev/nxge/xgehal/xgehal-stats.c stable/11/sys/dev/nxge/xgell-version.h stable/11/sys/dev/oce/oce_hw.c stable/11/sys/dev/oce/oce_hw.h stable/11/sys/dev/oce/oce_if.c stable/11/sys/dev/oce/oce_if.h stable/11/sys/dev/oce/oce_mbox.c stable/11/sys/dev/oce/oce_queue.c stable/11/sys/dev/oce/oce_sysctl.c stable/11/sys/dev/oce/oce_util.c stable/11/sys/dev/ofw/ofw_bus.h stable/11/sys/dev/ofw/ofw_bus_subr.c stable/11/sys/dev/ofw/ofw_bus_subr.h stable/11/sys/dev/ofw/ofw_console.c stable/11/sys/dev/ofw/ofw_disk.c stable/11/sys/dev/ofw/ofw_fdt.c stable/11/sys/dev/ofw/ofw_pci.h stable/11/sys/dev/ofw/ofw_standard.c stable/11/sys/dev/ofw/ofwvar.h stable/11/sys/dev/ofw/openfirm.c stable/11/sys/dev/ofw/openfirm.h stable/11/sys/dev/ofw/openfirmio.c stable/11/sys/dev/ofw/openfirmio.h stable/11/sys/dev/ofw/openpromio.c stable/11/sys/dev/ofw/openpromio.h stable/11/sys/dev/pbio/pbio.c stable/11/sys/dev/pbio/pbioio.h stable/11/sys/dev/pccard/pccard.c stable/11/sys/dev/pccard/pccard_cis.c stable/11/sys/dev/pccard/pccard_cis.h stable/11/sys/dev/pccard/pccard_cis_quirks.c stable/11/sys/dev/pccard/pccard_device.c stable/11/sys/dev/pccard/pccardreg.h stable/11/sys/dev/pccard/pccardvar.h stable/11/sys/dev/pccard/pccardvarp.h stable/11/sys/dev/pccbb/pccbb.c stable/11/sys/dev/pccbb/pccbb_isa.c stable/11/sys/dev/pccbb/pccbb_pci.c stable/11/sys/dev/pccbb/pccbbdevid.h stable/11/sys/dev/pccbb/pccbbreg.h stable/11/sys/dev/pccbb/pccbbvar.h stable/11/sys/dev/pcf/envctrl.c stable/11/sys/dev/pcf/pcf.c stable/11/sys/dev/pcf/pcf_ebus.c stable/11/sys/dev/pcf/pcf_isa.c stable/11/sys/dev/pcf/pcfvar.h stable/11/sys/dev/pci/fixup_pci.c stable/11/sys/dev/pci/hostb_pci.c stable/11/sys/dev/pci/ignore_pci.c stable/11/sys/dev/pci/isa_pci.c stable/11/sys/dev/pci/pci.c stable/11/sys/dev/pci/pci_pci.c stable/11/sys/dev/pci/pci_private.h stable/11/sys/dev/pci/pci_subr.c stable/11/sys/dev/pci/pci_user.c stable/11/sys/dev/pci/pcib_private.h stable/11/sys/dev/pci/pcireg.h stable/11/sys/dev/pci/pcivar.h stable/11/sys/dev/pci/vga_pci.c stable/11/sys/dev/pcn/if_pcn.c stable/11/sys/dev/pcn/if_pcnreg.h stable/11/sys/dev/pdq/if_fpa.c stable/11/sys/dev/pdq/pdq.c stable/11/sys/dev/pdq/pdq_freebsd.h stable/11/sys/dev/pdq/pdq_ifsubr.c stable/11/sys/dev/pdq/pdqreg.h stable/11/sys/dev/pdq/pdqvar.h stable/11/sys/dev/powermac_nvram/powermac_nvram.c stable/11/sys/dev/powermac_nvram/powermac_nvramvar.h stable/11/sys/dev/ppbus/if_plip.c stable/11/sys/dev/ppbus/immio.c stable/11/sys/dev/ppbus/lpbb.c stable/11/sys/dev/ppbus/lpt.c stable/11/sys/dev/ppbus/lpt.h stable/11/sys/dev/ppbus/pcfclock.c stable/11/sys/dev/ppbus/ppb_1284.c stable/11/sys/dev/ppbus/ppb_1284.h stable/11/sys/dev/ppbus/ppb_base.c stable/11/sys/dev/ppbus/ppb_msq.c stable/11/sys/dev/ppbus/ppb_msq.h stable/11/sys/dev/ppbus/ppbconf.c stable/11/sys/dev/ppbus/ppbconf.h stable/11/sys/dev/ppbus/ppbio.h stable/11/sys/dev/ppbus/ppi.c stable/11/sys/dev/ppbus/ppi.h stable/11/sys/dev/ppbus/vpo.c stable/11/sys/dev/ppbus/vpoio.c stable/11/sys/dev/ppbus/vpoio.h stable/11/sys/dev/ppc/ppc.c stable/11/sys/dev/ppc/ppc_acpi.c stable/11/sys/dev/ppc/ppc_isa.c stable/11/sys/dev/ppc/ppc_pci.c stable/11/sys/dev/ppc/ppc_puc.c stable/11/sys/dev/ppc/ppcreg.h stable/11/sys/dev/ppc/ppcvar.h stable/11/sys/dev/pst/pst-iop.c stable/11/sys/dev/pst/pst-iop.h stable/11/sys/dev/pst/pst-pci.c stable/11/sys/dev/pst/pst-raid.c stable/11/sys/dev/pty/pty.c stable/11/sys/dev/puc/puc.c stable/11/sys/dev/puc/puc_bfe.h stable/11/sys/dev/puc/puc_bus.h stable/11/sys/dev/puc/puc_cfg.c stable/11/sys/dev/puc/puc_cfg.h stable/11/sys/dev/puc/puc_pccard.c stable/11/sys/dev/puc/puc_pci.c stable/11/sys/dev/puc/pucdata.c stable/11/sys/dev/qlxgb/qla_dbg.c stable/11/sys/dev/qlxgb/qla_dbg.h stable/11/sys/dev/qlxgb/qla_def.h stable/11/sys/dev/qlxgb/qla_glbl.h stable/11/sys/dev/qlxgb/qla_hw.c stable/11/sys/dev/qlxgb/qla_hw.h stable/11/sys/dev/qlxgb/qla_inline.h stable/11/sys/dev/qlxgb/qla_ioctl.c stable/11/sys/dev/qlxgb/qla_ioctl.h stable/11/sys/dev/qlxgb/qla_isr.c stable/11/sys/dev/qlxgb/qla_misc.c stable/11/sys/dev/qlxgb/qla_os.c stable/11/sys/dev/qlxgb/qla_os.h stable/11/sys/dev/qlxgb/qla_reg.h stable/11/sys/dev/qlxgb/qla_ver.h stable/11/sys/dev/qlxgbe/ql_dbg.c stable/11/sys/dev/qlxgbe/ql_dbg.h stable/11/sys/dev/qlxgbe/ql_def.h stable/11/sys/dev/qlxgbe/ql_glbl.h stable/11/sys/dev/qlxgbe/ql_hw.c stable/11/sys/dev/qlxgbe/ql_hw.h stable/11/sys/dev/qlxgbe/ql_inline.h stable/11/sys/dev/qlxgbe/ql_ioctl.c stable/11/sys/dev/qlxgbe/ql_ioctl.h stable/11/sys/dev/qlxgbe/ql_isr.c stable/11/sys/dev/qlxgbe/ql_misc.c stable/11/sys/dev/qlxgbe/ql_os.c stable/11/sys/dev/qlxgbe/ql_os.h stable/11/sys/dev/qlxgbe/ql_reset.c stable/11/sys/dev/qlxgbe/ql_tmplt.h stable/11/sys/dev/qlxgbe/ql_ver.h stable/11/sys/dev/qlxge/qls_dbg.c stable/11/sys/dev/qlxge/qls_dbg.h stable/11/sys/dev/qlxge/qls_def.h stable/11/sys/dev/qlxge/qls_dump.c stable/11/sys/dev/qlxge/qls_dump.h stable/11/sys/dev/qlxge/qls_glbl.h stable/11/sys/dev/qlxge/qls_hw.c stable/11/sys/dev/qlxge/qls_hw.h stable/11/sys/dev/qlxge/qls_inline.h stable/11/sys/dev/qlxge/qls_ioctl.c stable/11/sys/dev/qlxge/qls_ioctl.h stable/11/sys/dev/qlxge/qls_isr.c stable/11/sys/dev/qlxge/qls_os.c stable/11/sys/dev/qlxge/qls_os.h stable/11/sys/dev/qlxge/qls_ver.h stable/11/sys/dev/quicc/quicc_bfe.h stable/11/sys/dev/quicc/quicc_bfe_fdt.c stable/11/sys/dev/quicc/quicc_bus.h stable/11/sys/dev/quicc/quicc_core.c stable/11/sys/dev/rc/rc.c stable/11/sys/dev/rc/rcreg.h stable/11/sys/dev/re/if_re.c stable/11/sys/dev/rndtest/rndtest.c stable/11/sys/dev/rndtest/rndtest.h stable/11/sys/dev/rp/rp.c stable/11/sys/dev/rp/rp_isa.c stable/11/sys/dev/rp/rp_pci.c stable/11/sys/dev/rp/rpreg.h stable/11/sys/dev/rp/rpvar.h stable/11/sys/dev/rt/if_rt.c stable/11/sys/dev/rt/if_rtreg.h stable/11/sys/dev/rt/if_rtvar.h stable/11/sys/dev/safe/safe.c stable/11/sys/dev/safe/safereg.h stable/11/sys/dev/safe/safevar.h stable/11/sys/dev/scc/scc_bfe.h stable/11/sys/dev/scc/scc_bfe_ebus.c stable/11/sys/dev/scc/scc_bfe_macio.c stable/11/sys/dev/scc/scc_bfe_quicc.c stable/11/sys/dev/scc/scc_bfe_sbus.c stable/11/sys/dev/scc/scc_bus.h stable/11/sys/dev/scc/scc_core.c stable/11/sys/dev/scc/scc_dev_quicc.c stable/11/sys/dev/scc/scc_dev_sab82532.c stable/11/sys/dev/scc/scc_dev_z8530.c stable/11/sys/dev/sdhci/sdhci.c stable/11/sys/dev/sdhci/sdhci.h stable/11/sys/dev/sdhci/sdhci_fdt.c stable/11/sys/dev/sdhci/sdhci_pci.c stable/11/sys/dev/sec/sec.c stable/11/sys/dev/sec/sec.h stable/11/sys/dev/sf/if_sf.c stable/11/sys/dev/sf/if_sfreg.h stable/11/sys/dev/sfxge/common/efsys.h stable/11/sys/dev/sfxge/common/efx.h stable/11/sys/dev/sfxge/common/efx_bootcfg.c stable/11/sys/dev/sfxge/common/efx_ev.c stable/11/sys/dev/sfxge/common/efx_filter.c stable/11/sys/dev/sfxge/common/efx_impl.h stable/11/sys/dev/sfxge/common/efx_intr.c stable/11/sys/dev/sfxge/common/efx_mac.c stable/11/sys/dev/sfxge/common/efx_mcdi.c stable/11/sys/dev/sfxge/common/efx_mcdi.h stable/11/sys/dev/sfxge/common/efx_mon.c stable/11/sys/dev/sfxge/common/efx_nic.c stable/11/sys/dev/sfxge/common/efx_nvram.c stable/11/sys/dev/sfxge/common/efx_phy.c stable/11/sys/dev/sfxge/common/efx_port.c stable/11/sys/dev/sfxge/common/efx_regs.h stable/11/sys/dev/sfxge/common/efx_regs_ef10.h stable/11/sys/dev/sfxge/common/efx_regs_mcdi.h stable/11/sys/dev/sfxge/common/efx_regs_pci.h stable/11/sys/dev/sfxge/common/efx_rx.c stable/11/sys/dev/sfxge/common/efx_sram.c stable/11/sys/dev/sfxge/common/efx_tx.c stable/11/sys/dev/sfxge/common/efx_types.h stable/11/sys/dev/sfxge/common/efx_vpd.c stable/11/sys/dev/sfxge/common/siena_flash.h stable/11/sys/dev/sfxge/common/siena_impl.h stable/11/sys/dev/sfxge/common/siena_mac.c stable/11/sys/dev/sfxge/common/siena_nic.c stable/11/sys/dev/sfxge/common/siena_nvram.c stable/11/sys/dev/sfxge/common/siena_phy.c stable/11/sys/dev/sfxge/common/siena_sram.c stable/11/sys/dev/sfxge/common/siena_vpd.c stable/11/sys/dev/sfxge/sfxge.c stable/11/sys/dev/sfxge/sfxge.h stable/11/sys/dev/sfxge/sfxge_dma.c stable/11/sys/dev/sfxge/sfxge_ev.c stable/11/sys/dev/sfxge/sfxge_intr.c stable/11/sys/dev/sfxge/sfxge_mcdi.c stable/11/sys/dev/sfxge/sfxge_port.c stable/11/sys/dev/sfxge/sfxge_rx.c stable/11/sys/dev/sfxge/sfxge_rx.h stable/11/sys/dev/sfxge/sfxge_tx.c stable/11/sys/dev/sfxge/sfxge_tx.h stable/11/sys/dev/sge/if_sge.c stable/11/sys/dev/sge/if_sgereg.h stable/11/sys/dev/siba/siba_bwn.c stable/11/sys/dev/siba/siba_core.c stable/11/sys/dev/siba/siba_ids.h stable/11/sys/dev/siba/sibareg.h stable/11/sys/dev/siba/sibavar.h stable/11/sys/dev/siis/siis.c stable/11/sys/dev/siis/siis.h stable/11/sys/dev/sio/sio.c stable/11/sys/dev/sio/sio_isa.c stable/11/sys/dev/sio/sio_pccard.c stable/11/sys/dev/sio/sio_pci.c stable/11/sys/dev/sio/sio_puc.c stable/11/sys/dev/sio/sioreg.h stable/11/sys/dev/sio/siovar.h stable/11/sys/dev/sis/if_sis.c stable/11/sys/dev/sis/if_sisreg.h stable/11/sys/dev/sk/if_sk.c stable/11/sys/dev/sk/if_skreg.h stable/11/sys/dev/sk/xmaciireg.h stable/11/sys/dev/smbus/smb.c stable/11/sys/dev/smbus/smb.h stable/11/sys/dev/smbus/smbconf.c stable/11/sys/dev/smbus/smbconf.h stable/11/sys/dev/smbus/smbus.c stable/11/sys/dev/smbus/smbus.h stable/11/sys/dev/smc/if_smc.c stable/11/sys/dev/smc/if_smcreg.h stable/11/sys/dev/smc/if_smcvar.h stable/11/sys/dev/sn/if_sn.c stable/11/sys/dev/sn/if_sn_isa.c stable/11/sys/dev/sn/if_sn_pccard.c stable/11/sys/dev/sn/if_snreg.h stable/11/sys/dev/sn/if_snvar.h stable/11/sys/dev/sn/ositech.h stable/11/sys/dev/snp/snp.c stable/11/sys/dev/sound/chip.h stable/11/sys/dev/sound/clone.c stable/11/sys/dev/sound/clone.h stable/11/sys/dev/sound/driver.c stable/11/sys/dev/sound/isa/ad1816.c stable/11/sys/dev/sound/isa/ad1816.h stable/11/sys/dev/sound/isa/ess.c stable/11/sys/dev/sound/isa/gusc.c stable/11/sys/dev/sound/isa/mss.c stable/11/sys/dev/sound/isa/mss.h stable/11/sys/dev/sound/isa/sb.h stable/11/sys/dev/sound/isa/sb16.c stable/11/sys/dev/sound/isa/sb8.c stable/11/sys/dev/sound/isa/sbc.c stable/11/sys/dev/sound/isa/sndbuf_dma.c stable/11/sys/dev/sound/macio/aoa.c stable/11/sys/dev/sound/macio/aoa.h stable/11/sys/dev/sound/macio/davbus.c stable/11/sys/dev/sound/macio/davbusreg.h stable/11/sys/dev/sound/macio/i2s.c stable/11/sys/dev/sound/macio/onyx.c stable/11/sys/dev/sound/macio/snapper.c stable/11/sys/dev/sound/macio/tumbler.c stable/11/sys/dev/sound/midi/midi.c stable/11/sys/dev/sound/midi/midi.h stable/11/sys/dev/sound/midi/midiq.h stable/11/sys/dev/sound/midi/mpu401.c stable/11/sys/dev/sound/midi/mpu401.h stable/11/sys/dev/sound/midi/sequencer.c stable/11/sys/dev/sound/midi/sequencer.h stable/11/sys/dev/sound/pci/allegro_code.h stable/11/sys/dev/sound/pci/allegro_reg.h stable/11/sys/dev/sound/pci/als4000.c stable/11/sys/dev/sound/pci/als4000.h stable/11/sys/dev/sound/pci/atiixp.c stable/11/sys/dev/sound/pci/atiixp.h stable/11/sys/dev/sound/pci/aureal.c stable/11/sys/dev/sound/pci/aureal.h stable/11/sys/dev/sound/pci/cmi.c stable/11/sys/dev/sound/pci/cmireg.h stable/11/sys/dev/sound/pci/cs4281.c stable/11/sys/dev/sound/pci/cs4281.h stable/11/sys/dev/sound/pci/cs461x_dsp.h stable/11/sys/dev/sound/pci/csa.c stable/11/sys/dev/sound/pci/csapcm.c stable/11/sys/dev/sound/pci/csareg.h stable/11/sys/dev/sound/pci/csavar.h stable/11/sys/dev/sound/pci/ds1-fw.h stable/11/sys/dev/sound/pci/ds1.c stable/11/sys/dev/sound/pci/emu10k1.c stable/11/sys/dev/sound/pci/emu10kx-midi.c stable/11/sys/dev/sound/pci/emu10kx-pcm.c stable/11/sys/dev/sound/pci/emu10kx.c stable/11/sys/dev/sound/pci/emu10kx.h stable/11/sys/dev/sound/pci/envy24.c stable/11/sys/dev/sound/pci/envy24.h stable/11/sys/dev/sound/pci/envy24ht.c stable/11/sys/dev/sound/pci/envy24ht.h stable/11/sys/dev/sound/pci/es137x.c stable/11/sys/dev/sound/pci/es137x.h stable/11/sys/dev/sound/pci/fm801.c stable/11/sys/dev/sound/pci/hda/hda_reg.h stable/11/sys/dev/sound/pci/hda/hdaa.c stable/11/sys/dev/sound/pci/hda/hdaa.h stable/11/sys/dev/sound/pci/hda/hdaa_patches.c stable/11/sys/dev/sound/pci/hda/hdac.c stable/11/sys/dev/sound/pci/hda/hdac.h stable/11/sys/dev/sound/pci/hda/hdac_private.h stable/11/sys/dev/sound/pci/hda/hdac_reg.h stable/11/sys/dev/sound/pci/hda/hdacc.c stable/11/sys/dev/sound/pci/hdspe-pcm.c stable/11/sys/dev/sound/pci/hdspe.c stable/11/sys/dev/sound/pci/hdspe.h stable/11/sys/dev/sound/pci/ich.c stable/11/sys/dev/sound/pci/ich.h stable/11/sys/dev/sound/pci/maestro.c stable/11/sys/dev/sound/pci/maestro3.c stable/11/sys/dev/sound/pci/maestro_reg.h stable/11/sys/dev/sound/pci/neomagic-coeff.h stable/11/sys/dev/sound/pci/neomagic.c stable/11/sys/dev/sound/pci/neomagic.h stable/11/sys/dev/sound/pci/solo.c stable/11/sys/dev/sound/pci/spicds.c stable/11/sys/dev/sound/pci/spicds.h stable/11/sys/dev/sound/pci/t4dwave.c stable/11/sys/dev/sound/pci/t4dwave.h stable/11/sys/dev/sound/pci/via8233.c stable/11/sys/dev/sound/pci/via8233.h stable/11/sys/dev/sound/pci/via82c686.c stable/11/sys/dev/sound/pci/via82c686.h stable/11/sys/dev/sound/pci/vibes.c stable/11/sys/dev/sound/pci/vibes.h stable/11/sys/dev/sound/pcm/ac97.c stable/11/sys/dev/sound/pcm/ac97.h stable/11/sys/dev/sound/pcm/ac97_patch.c stable/11/sys/dev/sound/pcm/ac97_patch.h stable/11/sys/dev/sound/pcm/buffer.c stable/11/sys/dev/sound/pcm/buffer.h stable/11/sys/dev/sound/pcm/channel.c stable/11/sys/dev/sound/pcm/channel.h stable/11/sys/dev/sound/pcm/dsp.c stable/11/sys/dev/sound/pcm/dsp.h stable/11/sys/dev/sound/pcm/feeder.c stable/11/sys/dev/sound/pcm/feeder.h stable/11/sys/dev/sound/pcm/feeder_chain.c stable/11/sys/dev/sound/pcm/feeder_eq.c stable/11/sys/dev/sound/pcm/feeder_format.c stable/11/sys/dev/sound/pcm/feeder_matrix.c stable/11/sys/dev/sound/pcm/feeder_mixer.c stable/11/sys/dev/sound/pcm/feeder_rate.c stable/11/sys/dev/sound/pcm/feeder_volume.c stable/11/sys/dev/sound/pcm/g711.h stable/11/sys/dev/sound/pcm/intpcm.h stable/11/sys/dev/sound/pcm/matrix.h stable/11/sys/dev/sound/pcm/matrix_map.h stable/11/sys/dev/sound/pcm/mixer.c stable/11/sys/dev/sound/pcm/mixer.h stable/11/sys/dev/sound/pcm/pcm.h stable/11/sys/dev/sound/pcm/sndstat.c stable/11/sys/dev/sound/pcm/sndstat.h stable/11/sys/dev/sound/pcm/sound.c stable/11/sys/dev/sound/pcm/sound.h stable/11/sys/dev/sound/pcm/vchan.c stable/11/sys/dev/sound/pcm/vchan.h stable/11/sys/dev/sound/sbus/apcdmareg.h stable/11/sys/dev/sound/sbus/cs4231.c stable/11/sys/dev/sound/sbus/cs4231.h stable/11/sys/dev/sound/unit.c stable/11/sys/dev/sound/unit.h stable/11/sys/dev/sound/usb/uaudio.c stable/11/sys/dev/sound/usb/uaudio.h stable/11/sys/dev/sound/usb/uaudio_pcm.c stable/11/sys/dev/sound/usb/uaudioreg.h stable/11/sys/dev/sound/version.h stable/11/sys/dev/spibus/ofw_spibus.c stable/11/sys/dev/ste/if_ste.c stable/11/sys/dev/ste/if_stereg.h stable/11/sys/dev/stg/tmc18c30.c stable/11/sys/dev/stg/tmc18c30_isa.c stable/11/sys/dev/stg/tmc18c30_pccard.c stable/11/sys/dev/stg/tmc18c30_pci.c stable/11/sys/dev/stg/tmc18c30_subr.c stable/11/sys/dev/stg/tmc18c30reg.h stable/11/sys/dev/stg/tmc18c30var.h stable/11/sys/dev/stge/if_stge.c stable/11/sys/dev/stge/if_stgereg.h stable/11/sys/dev/sym/sym_conf.h stable/11/sys/dev/sym/sym_defs.h stable/11/sys/dev/sym/sym_fw.h stable/11/sys/dev/sym/sym_fw1.h stable/11/sys/dev/sym/sym_fw2.h stable/11/sys/dev/sym/sym_hipd.c stable/11/sys/dev/syscons/apm/apm_saver.c stable/11/sys/dev/syscons/blank/blank_saver.c stable/11/sys/dev/syscons/daemon/daemon_saver.c stable/11/sys/dev/syscons/dragon/dragon_saver.c stable/11/sys/dev/syscons/fade/fade_saver.c stable/11/sys/dev/syscons/fire/fire_saver.c stable/11/sys/dev/syscons/green/green_saver.c stable/11/sys/dev/syscons/logo/logo_saver.c stable/11/sys/dev/syscons/rain/rain_saver.c stable/11/sys/dev/syscons/scgfbrndr.c stable/11/sys/dev/syscons/schistory.c stable/11/sys/dev/syscons/scmouse.c stable/11/sys/dev/syscons/scterm-teken.c stable/11/sys/dev/syscons/scterm.c stable/11/sys/dev/syscons/scvesactl.c stable/11/sys/dev/syscons/scvgarndr.c stable/11/sys/dev/syscons/scvidctl.c stable/11/sys/dev/syscons/scvtb.c stable/11/sys/dev/syscons/snake/snake_saver.c stable/11/sys/dev/syscons/star/star_saver.c stable/11/sys/dev/syscons/syscons.c stable/11/sys/dev/syscons/syscons.h stable/11/sys/dev/syscons/sysmouse.c stable/11/sys/dev/syscons/warp/warp_saver.c stable/11/sys/dev/tdfx/tdfx_io.h stable/11/sys/dev/tdfx/tdfx_linux.c stable/11/sys/dev/tdfx/tdfx_linux.h stable/11/sys/dev/tdfx/tdfx_pci.c stable/11/sys/dev/tdfx/tdfx_pci.h stable/11/sys/dev/tdfx/tdfx_vars.h stable/11/sys/dev/terasic/de4led/terasic_de4led.c stable/11/sys/dev/terasic/de4led/terasic_de4led.h stable/11/sys/dev/terasic/de4led/terasic_de4led_fdt.c stable/11/sys/dev/terasic/de4led/terasic_de4led_nexus.c stable/11/sys/dev/terasic/mtl/terasic_mtl.c stable/11/sys/dev/terasic/mtl/terasic_mtl.h stable/11/sys/dev/terasic/mtl/terasic_mtl_fdt.c stable/11/sys/dev/terasic/mtl/terasic_mtl_nexus.c stable/11/sys/dev/terasic/mtl/terasic_mtl_pixel.c stable/11/sys/dev/terasic/mtl/terasic_mtl_reg.c stable/11/sys/dev/terasic/mtl/terasic_mtl_syscons.c stable/11/sys/dev/terasic/mtl/terasic_mtl_text.c stable/11/sys/dev/ti/if_ti.c stable/11/sys/dev/ti/if_tireg.h stable/11/sys/dev/tl/if_tl.c stable/11/sys/dev/tl/if_tlreg.h stable/11/sys/dev/trm/trm.c stable/11/sys/dev/trm/trm.h stable/11/sys/dev/tsec/if_tsec.c stable/11/sys/dev/tsec/if_tsec.h stable/11/sys/dev/tsec/if_tsec_fdt.c stable/11/sys/dev/tsec/if_tsecreg.h stable/11/sys/dev/twa/tw_cl.h stable/11/sys/dev/twa/tw_cl_externs.h stable/11/sys/dev/twa/tw_cl_fwif.h stable/11/sys/dev/twa/tw_cl_init.c stable/11/sys/dev/twa/tw_cl_intr.c stable/11/sys/dev/twa/tw_cl_io.c stable/11/sys/dev/twa/tw_cl_ioctl.h stable/11/sys/dev/twa/tw_cl_misc.c stable/11/sys/dev/twa/tw_cl_share.h stable/11/sys/dev/twa/tw_osl.h stable/11/sys/dev/twa/tw_osl_cam.c stable/11/sys/dev/twa/tw_osl_externs.h stable/11/sys/dev/twa/tw_osl_freebsd.c stable/11/sys/dev/twa/tw_osl_includes.h stable/11/sys/dev/twa/tw_osl_inline.h stable/11/sys/dev/twa/tw_osl_ioctl.h stable/11/sys/dev/twa/tw_osl_share.h stable/11/sys/dev/twa/tw_osl_types.h stable/11/sys/dev/twe/twe.c stable/11/sys/dev/twe/twe_compat.h stable/11/sys/dev/twe/twe_freebsd.c stable/11/sys/dev/twe/twe_tables.h stable/11/sys/dev/twe/tweio.h stable/11/sys/dev/twe/twereg.h stable/11/sys/dev/twe/twevar.h stable/11/sys/dev/tws/tws.c stable/11/sys/dev/tws/tws.h stable/11/sys/dev/tws/tws_cam.c stable/11/sys/dev/tws/tws_hdm.c stable/11/sys/dev/tws/tws_hdm.h stable/11/sys/dev/tws/tws_services.c stable/11/sys/dev/tws/tws_services.h stable/11/sys/dev/tws/tws_user.c stable/11/sys/dev/tws/tws_user.h stable/11/sys/dev/tx/if_tx.c stable/11/sys/dev/tx/if_txreg.h stable/11/sys/dev/tx/if_txvar.h stable/11/sys/dev/txp/3c990img.h stable/11/sys/dev/txp/if_txp.c stable/11/sys/dev/txp/if_txpreg.h stable/11/sys/dev/uart/uart.h stable/11/sys/dev/uart/uart_bus.h stable/11/sys/dev/uart/uart_bus_acpi.c stable/11/sys/dev/uart/uart_bus_ebus.c stable/11/sys/dev/uart/uart_bus_fdt.c stable/11/sys/dev/uart/uart_bus_isa.c stable/11/sys/dev/uart/uart_bus_pccard.c stable/11/sys/dev/uart/uart_bus_pci.c stable/11/sys/dev/uart/uart_bus_puc.c stable/11/sys/dev/uart/uart_bus_scc.c stable/11/sys/dev/uart/uart_core.c stable/11/sys/dev/uart/uart_cpu.h stable/11/sys/dev/uart/uart_cpu_fdt.c stable/11/sys/dev/uart/uart_cpu_powerpc.c stable/11/sys/dev/uart/uart_cpu_sparc64.c stable/11/sys/dev/uart/uart_cpu_x86.c stable/11/sys/dev/uart/uart_dbg.c stable/11/sys/dev/uart/uart_dev_imx.c stable/11/sys/dev/uart/uart_dev_lpc.c stable/11/sys/dev/uart/uart_dev_ns8250.c stable/11/sys/dev/uart/uart_dev_ns8250.h stable/11/sys/dev/uart/uart_dev_pl011.c stable/11/sys/dev/uart/uart_dev_quicc.c stable/11/sys/dev/uart/uart_dev_sab82532.c stable/11/sys/dev/uart/uart_dev_ti8250.c stable/11/sys/dev/uart/uart_dev_z8530.c stable/11/sys/dev/uart/uart_kbd_sun.c stable/11/sys/dev/uart/uart_kbd_sun.h stable/11/sys/dev/uart/uart_subr.c stable/11/sys/dev/uart/uart_tty.c stable/11/sys/dev/ubsec/ubsec.c stable/11/sys/dev/ubsec/ubsecreg.h stable/11/sys/dev/ubsec/ubsecvar.h stable/11/sys/dev/usb/controller/at91dci.c stable/11/sys/dev/usb/controller/at91dci.h stable/11/sys/dev/usb/controller/at91dci_atmelarm.c stable/11/sys/dev/usb/controller/at91dci_fdt.c stable/11/sys/dev/usb/controller/atmegadci.c stable/11/sys/dev/usb/controller/atmegadci.h stable/11/sys/dev/usb/controller/atmegadci_atmelarm.c stable/11/sys/dev/usb/controller/avr32dci.c stable/11/sys/dev/usb/controller/avr32dci.h stable/11/sys/dev/usb/controller/dwc_otg.c stable/11/sys/dev/usb/controller/dwc_otg.h stable/11/sys/dev/usb/controller/dwc_otg_fdt.c stable/11/sys/dev/usb/controller/dwc_otgreg.h stable/11/sys/dev/usb/controller/ehci.c stable/11/sys/dev/usb/controller/ehci.h stable/11/sys/dev/usb/controller/ehci_fsl.c stable/11/sys/dev/usb/controller/ehci_imx.c stable/11/sys/dev/usb/controller/ehci_ixp4xx.c stable/11/sys/dev/usb/controller/ehci_mv.c stable/11/sys/dev/usb/controller/ehci_pci.c stable/11/sys/dev/usb/controller/ehcireg.h stable/11/sys/dev/usb/controller/musb_otg.c stable/11/sys/dev/usb/controller/musb_otg.h stable/11/sys/dev/usb/controller/musb_otg_atmelarm.c stable/11/sys/dev/usb/controller/ohci.c stable/11/sys/dev/usb/controller/ohci.h stable/11/sys/dev/usb/controller/ohci_pci.c stable/11/sys/dev/usb/controller/ohci_s3c24x0.c stable/11/sys/dev/usb/controller/ohcireg.h stable/11/sys/dev/usb/controller/uhci.c stable/11/sys/dev/usb/controller/uhci.h stable/11/sys/dev/usb/controller/uhci_pci.c stable/11/sys/dev/usb/controller/uhcireg.h stable/11/sys/dev/usb/controller/usb_controller.c stable/11/sys/dev/usb/controller/uss820dci.c stable/11/sys/dev/usb/controller/uss820dci.h stable/11/sys/dev/usb/controller/uss820dci_atmelarm.c stable/11/sys/dev/usb/controller/xhci.c stable/11/sys/dev/usb/controller/xhci.h stable/11/sys/dev/usb/controller/xhci_pci.c stable/11/sys/dev/usb/controller/xhcireg.h stable/11/sys/dev/usb/gadget/g_audio.c stable/11/sys/dev/usb/gadget/g_audio.h stable/11/sys/dev/usb/gadget/g_keyboard.c stable/11/sys/dev/usb/gadget/g_keyboard.h stable/11/sys/dev/usb/gadget/g_modem.c stable/11/sys/dev/usb/gadget/g_modem.h stable/11/sys/dev/usb/gadget/g_mouse.c stable/11/sys/dev/usb/gadget/g_mouse.h stable/11/sys/dev/usb/input/atp.c stable/11/sys/dev/usb/input/uep.c stable/11/sys/dev/usb/input/uhid.c stable/11/sys/dev/usb/input/ukbd.c stable/11/sys/dev/usb/input/ums.c stable/11/sys/dev/usb/input/usb_rdesc.h stable/11/sys/dev/usb/input/wsp.c stable/11/sys/dev/usb/misc/udbp.c stable/11/sys/dev/usb/misc/ufm.c stable/11/sys/dev/usb/net/if_aue.c stable/11/sys/dev/usb/net/if_auereg.h stable/11/sys/dev/usb/net/if_axe.c stable/11/sys/dev/usb/net/if_axereg.h stable/11/sys/dev/usb/net/if_axge.c stable/11/sys/dev/usb/net/if_axgereg.h stable/11/sys/dev/usb/net/if_cdce.c stable/11/sys/dev/usb/net/if_cdcereg.h stable/11/sys/dev/usb/net/if_cue.c stable/11/sys/dev/usb/net/if_cuereg.h stable/11/sys/dev/usb/net/if_ipheth.c stable/11/sys/dev/usb/net/if_iphethvar.h stable/11/sys/dev/usb/net/if_kue.c stable/11/sys/dev/usb/net/if_kuefw.h stable/11/sys/dev/usb/net/if_kuereg.h stable/11/sys/dev/usb/net/if_mos.c stable/11/sys/dev/usb/net/if_mosreg.h stable/11/sys/dev/usb/net/if_rue.c stable/11/sys/dev/usb/net/if_ruereg.h stable/11/sys/dev/usb/net/if_smsc.c stable/11/sys/dev/usb/net/if_smscreg.h stable/11/sys/dev/usb/net/if_udav.c stable/11/sys/dev/usb/net/if_udavreg.h stable/11/sys/dev/usb/net/if_usie.c stable/11/sys/dev/usb/net/if_usievar.h stable/11/sys/dev/usb/net/ruephy.c stable/11/sys/dev/usb/net/ruephyreg.h stable/11/sys/dev/usb/net/uhso.c stable/11/sys/dev/usb/net/usb_ethernet.c stable/11/sys/dev/usb/net/usb_ethernet.h stable/11/sys/dev/usb/quirk/usb_quirk.c stable/11/sys/dev/usb/quirk/usb_quirk.h stable/11/sys/dev/usb/serial/ubsa.c stable/11/sys/dev/usb/serial/ubser.c stable/11/sys/dev/usb/serial/uchcom.c stable/11/sys/dev/usb/serial/ucycom.c stable/11/sys/dev/usb/serial/ufoma.c stable/11/sys/dev/usb/serial/uftdi.c stable/11/sys/dev/usb/serial/ugensa.c stable/11/sys/dev/usb/serial/uipaq.c stable/11/sys/dev/usb/serial/ulpt.c stable/11/sys/dev/usb/serial/umcs.c stable/11/sys/dev/usb/serial/umcs.h 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/usb_serial.c stable/11/sys/dev/usb/serial/usb_serial.h stable/11/sys/dev/usb/serial/uvisor.c stable/11/sys/dev/usb/serial/uvscom.c stable/11/sys/dev/usb/storage/umass.c stable/11/sys/dev/usb/storage/urio.c stable/11/sys/dev/usb/storage/ustorage_fs.c stable/11/sys/dev/usb/template/usb_template.c stable/11/sys/dev/usb/template/usb_template.h stable/11/sys/dev/usb/template/usb_template_audio.c stable/11/sys/dev/usb/template/usb_template_cdce.c stable/11/sys/dev/usb/template/usb_template_kbd.c stable/11/sys/dev/usb/template/usb_template_modem.c stable/11/sys/dev/usb/template/usb_template_mouse.c stable/11/sys/dev/usb/template/usb_template_msc.c stable/11/sys/dev/usb/template/usb_template_mtp.c stable/11/sys/dev/usb/ufm_ioctl.h stable/11/sys/dev/usb/usb.h stable/11/sys/dev/usb/usb_bus.h stable/11/sys/dev/usb/usb_busdma.c stable/11/sys/dev/usb/usb_busdma.h stable/11/sys/dev/usb/usb_cdc.h stable/11/sys/dev/usb/usb_controller.h stable/11/sys/dev/usb/usb_core.c stable/11/sys/dev/usb/usb_core.h stable/11/sys/dev/usb/usb_debug.c stable/11/sys/dev/usb/usb_debug.h stable/11/sys/dev/usb/usb_dev.c stable/11/sys/dev/usb/usb_dev.h stable/11/sys/dev/usb/usb_device.c stable/11/sys/dev/usb/usb_device.h stable/11/sys/dev/usb/usb_dynamic.c stable/11/sys/dev/usb/usb_dynamic.h stable/11/sys/dev/usb/usb_endian.h stable/11/sys/dev/usb/usb_error.c stable/11/sys/dev/usb/usb_freebsd.h stable/11/sys/dev/usb/usb_freebsd_loader.h stable/11/sys/dev/usb/usb_generic.c stable/11/sys/dev/usb/usb_generic.h stable/11/sys/dev/usb/usb_handle_request.c stable/11/sys/dev/usb/usb_hid.c stable/11/sys/dev/usb/usb_hub.c stable/11/sys/dev/usb/usb_hub.h stable/11/sys/dev/usb/usb_ioctl.h stable/11/sys/dev/usb/usb_lookup.c stable/11/sys/dev/usb/usb_mbuf.c stable/11/sys/dev/usb/usb_mbuf.h stable/11/sys/dev/usb/usb_msctest.c stable/11/sys/dev/usb/usb_msctest.h stable/11/sys/dev/usb/usb_parse.c stable/11/sys/dev/usb/usb_pci.h stable/11/sys/dev/usb/usb_pf.c stable/11/sys/dev/usb/usb_pf.h stable/11/sys/dev/usb/usb_process.c stable/11/sys/dev/usb/usb_process.h stable/11/sys/dev/usb/usb_request.c stable/11/sys/dev/usb/usb_request.h stable/11/sys/dev/usb/usb_transfer.c stable/11/sys/dev/usb/usb_transfer.h stable/11/sys/dev/usb/usb_util.c stable/11/sys/dev/usb/usb_util.h stable/11/sys/dev/usb/usbdi.h stable/11/sys/dev/usb/usbdi_util.h stable/11/sys/dev/usb/usbhid.h stable/11/sys/dev/usb/wlan/if_uath.c stable/11/sys/dev/usb/wlan/if_zydfw.h stable/11/sys/dev/vge/if_vge.c stable/11/sys/dev/vge/if_vgereg.h stable/11/sys/dev/vge/if_vgevar.h stable/11/sys/dev/viawd/viawd.c stable/11/sys/dev/viawd/viawd.h stable/11/sys/dev/virtio/balloon/virtio_balloon.c stable/11/sys/dev/virtio/balloon/virtio_balloon.h stable/11/sys/dev/virtio/block/virtio_blk.c stable/11/sys/dev/virtio/block/virtio_blk.h stable/11/sys/dev/virtio/network/if_vtnet.c stable/11/sys/dev/virtio/network/if_vtnetvar.h stable/11/sys/dev/virtio/network/virtio_net.h stable/11/sys/dev/virtio/pci/virtio_pci.c stable/11/sys/dev/virtio/pci/virtio_pci.h stable/11/sys/dev/virtio/random/virtio_random.c stable/11/sys/dev/virtio/scsi/virtio_scsi.c stable/11/sys/dev/virtio/scsi/virtio_scsi.h stable/11/sys/dev/virtio/scsi/virtio_scsivar.h stable/11/sys/dev/virtio/virtio.c stable/11/sys/dev/virtio/virtio.h stable/11/sys/dev/virtio/virtio_ring.h stable/11/sys/dev/virtio/virtqueue.c stable/11/sys/dev/virtio/virtqueue.h stable/11/sys/dev/vkbd/vkbd.c stable/11/sys/dev/vkbd/vkbd_var.h stable/11/sys/dev/vr/if_vr.c stable/11/sys/dev/vr/if_vrreg.h stable/11/sys/dev/vt/colors/vt_termcolors.c stable/11/sys/dev/vt/colors/vt_termcolors.h stable/11/sys/dev/vt/font/vt_font_default.c stable/11/sys/dev/vt/font/vt_mouse_cursor.c stable/11/sys/dev/vt/hw/efifb/efifb.c stable/11/sys/dev/vt/hw/fb/vt_early_fb.c stable/11/sys/dev/vt/hw/fb/vt_fb.c stable/11/sys/dev/vt/hw/fb/vt_fb.h stable/11/sys/dev/vt/hw/ofwfb/ofwfb.c stable/11/sys/dev/vt/logo/logo_freebsd.c stable/11/sys/dev/vt/vt.h stable/11/sys/dev/vt/vt_buf.c stable/11/sys/dev/vt/vt_consolectl.c stable/11/sys/dev/vt/vt_core.c stable/11/sys/dev/vt/vt_font.c stable/11/sys/dev/vt/vt_sysmouse.c stable/11/sys/dev/vte/if_vte.c stable/11/sys/dev/vte/if_vtereg.h stable/11/sys/dev/vte/if_vtevar.h stable/11/sys/dev/vx/if_vx.c stable/11/sys/dev/vx/if_vx_pci.c stable/11/sys/dev/vx/if_vxreg.h stable/11/sys/dev/vx/if_vxvar.h stable/11/sys/dev/vxge/include/vxge-debug.h stable/11/sys/dev/vxge/include/vxge-defs.h stable/11/sys/dev/vxge/include/vxge-list.h stable/11/sys/dev/vxge/include/vxge-os-debug.h stable/11/sys/dev/vxge/include/vxge-os-pal.h stable/11/sys/dev/vxge/include/vxge-queue.h stable/11/sys/dev/vxge/include/vxgehal-config.h stable/11/sys/dev/vxge/include/vxgehal-ll.h stable/11/sys/dev/vxge/include/vxgehal-mgmt.h stable/11/sys/dev/vxge/include/vxgehal-mgmtaux.h stable/11/sys/dev/vxge/include/vxgehal-stats.h stable/11/sys/dev/vxge/include/vxgehal-status.h stable/11/sys/dev/vxge/include/vxgehal-types.h stable/11/sys/dev/vxge/include/vxgehal-version.h stable/11/sys/dev/vxge/vxge-firmware.h stable/11/sys/dev/vxge/vxge-osdep.h stable/11/sys/dev/vxge/vxge.c stable/11/sys/dev/vxge/vxge.h stable/11/sys/dev/vxge/vxgehal/vxge-queue.c stable/11/sys/dev/vxge/vxgehal/vxgehal-blockpool.c stable/11/sys/dev/vxge/vxgehal/vxgehal-blockpool.h stable/11/sys/dev/vxge/vxgehal/vxgehal-channel.c stable/11/sys/dev/vxge/vxgehal/vxgehal-channel.h stable/11/sys/dev/vxge/vxgehal/vxgehal-common-reg.h stable/11/sys/dev/vxge/vxgehal/vxgehal-config-priv.h stable/11/sys/dev/vxge/vxgehal/vxgehal-config.c stable/11/sys/dev/vxge/vxgehal/vxgehal-debug.h stable/11/sys/dev/vxge/vxgehal/vxgehal-device.c stable/11/sys/dev/vxge/vxgehal/vxgehal-device.h stable/11/sys/dev/vxge/vxgehal/vxgehal-doorbells.c stable/11/sys/dev/vxge/vxgehal/vxgehal-doorbells.h stable/11/sys/dev/vxge/vxgehal/vxgehal-driver.c stable/11/sys/dev/vxge/vxgehal/vxgehal-driver.h stable/11/sys/dev/vxge/vxgehal/vxgehal-fifo.c stable/11/sys/dev/vxge/vxgehal/vxgehal-fifo.h stable/11/sys/dev/vxge/vxgehal/vxgehal-ifmsg.c stable/11/sys/dev/vxge/vxgehal/vxgehal-ifmsg.h stable/11/sys/dev/vxge/vxgehal/vxgehal-legacy-reg.h stable/11/sys/dev/vxge/vxgehal/vxgehal-memrepair-reg.h stable/11/sys/dev/vxge/vxgehal/vxgehal-mgmt.c stable/11/sys/dev/vxge/vxgehal/vxgehal-mgmtaux.c stable/11/sys/dev/vxge/vxgehal/vxgehal-mm.c stable/11/sys/dev/vxge/vxgehal/vxgehal-mm.h stable/11/sys/dev/vxge/vxgehal/vxgehal-mrpcim-reg.h stable/11/sys/dev/vxge/vxgehal/vxgehal-mrpcim.c stable/11/sys/dev/vxge/vxgehal/vxgehal-mrpcim.h stable/11/sys/dev/vxge/vxgehal/vxgehal-pcicfgmgmt-reg.h stable/11/sys/dev/vxge/vxgehal/vxgehal-regdefs.h stable/11/sys/dev/vxge/vxgehal/vxgehal-regs.h stable/11/sys/dev/vxge/vxgehal/vxgehal-ring.c stable/11/sys/dev/vxge/vxgehal/vxgehal-ring.h stable/11/sys/dev/vxge/vxgehal/vxgehal-srpcim-reg.h stable/11/sys/dev/vxge/vxgehal/vxgehal-srpcim.c stable/11/sys/dev/vxge/vxgehal/vxgehal-srpcim.h stable/11/sys/dev/vxge/vxgehal/vxgehal-swapper.c stable/11/sys/dev/vxge/vxgehal/vxgehal-swapper.h stable/11/sys/dev/vxge/vxgehal/vxgehal-toc-reg.h stable/11/sys/dev/vxge/vxgehal/vxgehal-virtualpath.c stable/11/sys/dev/vxge/vxgehal/vxgehal-virtualpath.h stable/11/sys/dev/vxge/vxgehal/vxgehal-vpath-reg.h stable/11/sys/dev/vxge/vxgehal/vxgehal-vpmgmt-reg.h stable/11/sys/dev/vxge/vxgehal/vxgehal.h stable/11/sys/dev/vxge/vxgell-version.h stable/11/sys/dev/watchdog/watchdog.c stable/11/sys/dev/wb/if_wb.c stable/11/sys/dev/wb/if_wbreg.h stable/11/sys/dev/wbwd/wbwd.c stable/11/sys/dev/wi/if_wavelan_ieee.h stable/11/sys/dev/wi/if_wi_macio.c stable/11/sys/dev/wi/if_wi_pccard.c stable/11/sys/dev/wi/if_wi_pci.c stable/11/sys/dev/wi/if_wireg.h stable/11/sys/dev/wi/if_wivar.h stable/11/sys/dev/wtap/if_medium.c stable/11/sys/dev/wtap/if_medium.h stable/11/sys/dev/wtap/if_wtap.c stable/11/sys/dev/wtap/if_wtap_module.c stable/11/sys/dev/wtap/if_wtapioctl.h stable/11/sys/dev/wtap/if_wtapvar.h stable/11/sys/dev/wtap/plugins/visibility.c stable/11/sys/dev/wtap/plugins/visibility.h stable/11/sys/dev/wtap/plugins/visibility_ioctl.h stable/11/sys/dev/wtap/plugins/wtap_plugin.h stable/11/sys/dev/wtap/wtap_hal/hal.c stable/11/sys/dev/wtap/wtap_hal/hal.h stable/11/sys/dev/wtap/wtap_hal/handler.h stable/11/sys/dev/xe/if_xe.c stable/11/sys/dev/xe/if_xe_pccard.c stable/11/sys/dev/xe/if_xereg.h stable/11/sys/dev/xe/if_xevar.h stable/11/sys/dev/xen/blkback/blkback.c stable/11/sys/dev/xen/control/control.c stable/11/sys/dev/xen/netback/netback.c stable/11/sys/dev/xen/netback/netback_unit_tests.c stable/11/sys/dev/xen/netfront/netfront.c stable/11/sys/dev/xen/pcifront/pcifront.c stable/11/sys/dev/xen/timer/timer.c stable/11/sys/dev/xen/timer/timer.h stable/11/sys/dev/xen/xenpci/xenpci.c stable/11/sys/dev/xen/xenpci/xenpcivar.h stable/11/sys/dev/xl/if_xl.c stable/11/sys/dev/xl/if_xlreg.h stable/11/sys/dev/xl/xlphy.c stable/11/sys/fs/cd9660/cd9660_bmap.c stable/11/sys/fs/cd9660/cd9660_lookup.c stable/11/sys/fs/cd9660/cd9660_mount.h stable/11/sys/fs/cd9660/cd9660_node.c stable/11/sys/fs/cd9660/cd9660_node.h stable/11/sys/fs/cd9660/cd9660_rrip.c stable/11/sys/fs/cd9660/cd9660_rrip.h stable/11/sys/fs/cd9660/cd9660_util.c stable/11/sys/fs/cd9660/cd9660_vfsops.c stable/11/sys/fs/cd9660/cd9660_vnops.c stable/11/sys/fs/cd9660/iso.h stable/11/sys/fs/cd9660/iso_rrip.h stable/11/sys/fs/deadfs/dead_vnops.c stable/11/sys/fs/ext2fs/ext2_alloc.c stable/11/sys/fs/ext2fs/ext2_balloc.c stable/11/sys/fs/ext2fs/ext2_bmap.c stable/11/sys/fs/ext2fs/ext2_extern.h stable/11/sys/fs/ext2fs/ext2_inode.c stable/11/sys/fs/ext2fs/ext2_lookup.c stable/11/sys/fs/ext2fs/ext2_mount.h stable/11/sys/fs/ext2fs/ext2_subr.c stable/11/sys/fs/ext2fs/ext2_vfsops.c stable/11/sys/fs/ext2fs/ext2_vnops.c stable/11/sys/fs/ext2fs/fs.h stable/11/sys/fs/ext2fs/inode.h stable/11/sys/fs/fdescfs/fdesc.h stable/11/sys/fs/fdescfs/fdesc_vfsops.c stable/11/sys/fs/fdescfs/fdesc_vnops.c stable/11/sys/fs/fifofs/fifo_vnops.c stable/11/sys/fs/fuse/fuse.h stable/11/sys/fs/fuse/fuse_debug.h stable/11/sys/fs/fuse/fuse_device.c stable/11/sys/fs/fuse/fuse_file.c stable/11/sys/fs/fuse/fuse_file.h stable/11/sys/fs/fuse/fuse_internal.c stable/11/sys/fs/fuse/fuse_internal.h stable/11/sys/fs/fuse/fuse_io.c stable/11/sys/fs/fuse/fuse_io.h stable/11/sys/fs/fuse/fuse_ipc.c stable/11/sys/fs/fuse/fuse_ipc.h stable/11/sys/fs/fuse/fuse_kernel.h stable/11/sys/fs/fuse/fuse_main.c stable/11/sys/fs/fuse/fuse_node.c stable/11/sys/fs/fuse/fuse_node.h stable/11/sys/fs/fuse/fuse_param.h stable/11/sys/fs/fuse/fuse_vfsops.c stable/11/sys/fs/fuse/fuse_vnops.c stable/11/sys/fs/nfs/nfs.h stable/11/sys/fs/nfs/nfs_commonkrpc.c stable/11/sys/fs/nfs/nfs_commonport.c stable/11/sys/fs/nfs/nfs_commonsubs.c stable/11/sys/fs/nfs/nfs_var.h stable/11/sys/fs/nfs/nfsm_subs.h stable/11/sys/fs/nfs/nfsport.h stable/11/sys/fs/nfs/nfsproto.h stable/11/sys/fs/nfs/nfsrvcache.h stable/11/sys/fs/nfs/rpcv2.h stable/11/sys/fs/nfs/xdr_subs.h stable/11/sys/fs/nfsclient/nfs.h stable/11/sys/fs/nfsclient/nfs_clbio.c stable/11/sys/fs/nfsclient/nfs_clcomsubs.c stable/11/sys/fs/nfsclient/nfs_clkrpc.c stable/11/sys/fs/nfsclient/nfs_clnfsiod.c stable/11/sys/fs/nfsclient/nfs_clnode.c stable/11/sys/fs/nfsclient/nfs_clport.c stable/11/sys/fs/nfsclient/nfs_clrpcops.c stable/11/sys/fs/nfsclient/nfs_clsubs.c stable/11/sys/fs/nfsclient/nfs_clvfsops.c stable/11/sys/fs/nfsclient/nfs_clvnops.c stable/11/sys/fs/nfsclient/nfsmount.h stable/11/sys/fs/nfsclient/nfsnode.h stable/11/sys/fs/nfsserver/nfs_nfsdcache.c stable/11/sys/fs/nfsserver/nfs_nfsdkrpc.c stable/11/sys/fs/nfsserver/nfs_nfsdport.c stable/11/sys/fs/nfsserver/nfs_nfsdserv.c stable/11/sys/fs/nfsserver/nfs_nfsdsocket.c stable/11/sys/fs/nfsserver/nfs_nfsdsubs.c stable/11/sys/fs/nullfs/null.h stable/11/sys/fs/nullfs/null_subr.c stable/11/sys/fs/nullfs/null_vfsops.c stable/11/sys/fs/nullfs/null_vnops.c stable/11/sys/fs/procfs/procfs.c stable/11/sys/fs/procfs/procfs.h stable/11/sys/fs/procfs/procfs_dbregs.c stable/11/sys/fs/procfs/procfs_fpregs.c stable/11/sys/fs/procfs/procfs_map.c stable/11/sys/fs/procfs/procfs_mem.c stable/11/sys/fs/procfs/procfs_note.c stable/11/sys/fs/procfs/procfs_osrel.c stable/11/sys/fs/procfs/procfs_regs.c stable/11/sys/fs/procfs/procfs_rlimit.c stable/11/sys/fs/procfs/procfs_status.c stable/11/sys/fs/procfs/procfs_type.c stable/11/sys/fs/unionfs/union.h stable/11/sys/fs/unionfs/union_subr.c stable/11/sys/fs/unionfs/union_vfsops.c stable/11/sys/fs/unionfs/union_vnops.c stable/11/sys/geom/vinum/geom_vinum_share.c stable/11/sys/geom/vinum/geom_vinum_subr.c stable/11/sys/geom/vinum/geom_vinum_var.h stable/11/sys/i386/acpica/acpi_machdep.c stable/11/sys/i386/bios/smapi.c stable/11/sys/i386/i386/atomic.c stable/11/sys/i386/i386/bios.c stable/11/sys/i386/i386/bpf_jit_machdep.c stable/11/sys/i386/i386/bpf_jit_machdep.h stable/11/sys/i386/i386/elf_machdep.c stable/11/sys/i386/i386/gdb_machdep.c stable/11/sys/i386/i386/genassym.c stable/11/sys/i386/i386/geode.c stable/11/sys/i386/i386/in_cksum.c stable/11/sys/i386/i386/initcpu.c stable/11/sys/i386/i386/io.c stable/11/sys/i386/i386/k6_mem.c stable/11/sys/i386/i386/longrun.c stable/11/sys/i386/i386/machdep.c stable/11/sys/i386/i386/mem.c stable/11/sys/i386/i386/minidump_machdep.c stable/11/sys/i386/i386/mp_machdep.c stable/11/sys/i386/i386/pmap.c stable/11/sys/i386/i386/ptrace_machdep.c stable/11/sys/i386/i386/sys_machdep.c stable/11/sys/i386/i386/trap.c stable/11/sys/i386/i386/uio_machdep.c stable/11/sys/i386/i386/vm86.c stable/11/sys/i386/i386/vm_machdep.c stable/11/sys/i386/ibcs2/coff.h stable/11/sys/i386/ibcs2/ibcs2_dirent.h stable/11/sys/i386/ibcs2/ibcs2_errno.c stable/11/sys/i386/ibcs2/ibcs2_errno.h stable/11/sys/i386/ibcs2/ibcs2_fcntl.c stable/11/sys/i386/ibcs2/ibcs2_fcntl.h stable/11/sys/i386/ibcs2/ibcs2_ioctl.c stable/11/sys/i386/ibcs2/ibcs2_ipc.c stable/11/sys/i386/ibcs2/ibcs2_ipc.h stable/11/sys/i386/ibcs2/ibcs2_isc.c stable/11/sys/i386/ibcs2/ibcs2_misc.c stable/11/sys/i386/ibcs2/ibcs2_mount.h stable/11/sys/i386/ibcs2/ibcs2_msg.c stable/11/sys/i386/ibcs2/ibcs2_other.c stable/11/sys/i386/ibcs2/ibcs2_signal.c stable/11/sys/i386/ibcs2/ibcs2_signal.h stable/11/sys/i386/ibcs2/ibcs2_socksys.c stable/11/sys/i386/ibcs2/ibcs2_socksys.h stable/11/sys/i386/ibcs2/ibcs2_stat.c stable/11/sys/i386/ibcs2/ibcs2_stat.h stable/11/sys/i386/ibcs2/ibcs2_statfs.h stable/11/sys/i386/ibcs2/ibcs2_stropts.h stable/11/sys/i386/ibcs2/ibcs2_sysi86.c stable/11/sys/i386/ibcs2/ibcs2_sysvec.c stable/11/sys/i386/ibcs2/ibcs2_termios.h stable/11/sys/i386/ibcs2/ibcs2_time.h stable/11/sys/i386/ibcs2/ibcs2_types.h stable/11/sys/i386/ibcs2/ibcs2_unistd.h stable/11/sys/i386/ibcs2/ibcs2_ustat.h stable/11/sys/i386/ibcs2/ibcs2_util.c stable/11/sys/i386/ibcs2/ibcs2_util.h stable/11/sys/i386/ibcs2/ibcs2_utime.h stable/11/sys/i386/ibcs2/ibcs2_utsname.h stable/11/sys/i386/ibcs2/ibcs2_xenix.c stable/11/sys/i386/ibcs2/imgact_coff.c stable/11/sys/i386/include/_bus.h stable/11/sys/i386/include/asm.h stable/11/sys/i386/include/asmacros.h stable/11/sys/i386/include/atomic.h stable/11/sys/i386/include/bootinfo.h stable/11/sys/i386/include/bus_dma.h stable/11/sys/i386/include/counter.h stable/11/sys/i386/include/cpu.h stable/11/sys/i386/include/cpufunc.h stable/11/sys/i386/include/cputypes.h stable/11/sys/i386/include/elan_mmcr.h stable/11/sys/i386/include/exec.h stable/11/sys/i386/include/floatingpoint.h stable/11/sys/i386/include/gdb_machdep.h stable/11/sys/i386/include/ieeefp.h stable/11/sys/i386/include/if_wl_wavelan.h stable/11/sys/i386/include/in_cksum.h stable/11/sys/i386/include/intr_machdep.h stable/11/sys/i386/include/ioctl_bt848.h stable/11/sys/i386/include/ioctl_meteor.h stable/11/sys/i386/include/iodev.h stable/11/sys/i386/include/kdb.h stable/11/sys/i386/include/limits.h stable/11/sys/i386/include/md_var.h stable/11/sys/i386/include/memdev.h stable/11/sys/i386/include/minidump.h stable/11/sys/i386/include/mp_watchdog.h stable/11/sys/i386/include/npx.h stable/11/sys/i386/include/param.h stable/11/sys/i386/include/pc/bios.h stable/11/sys/i386/include/pcaudioio.h stable/11/sys/i386/include/pcb.h stable/11/sys/i386/include/pcb_ext.h stable/11/sys/i386/include/pcpu.h stable/11/sys/i386/include/pmap.h stable/11/sys/i386/include/pmc_mdep.h stable/11/sys/i386/include/ppireg.h stable/11/sys/i386/include/proc.h stable/11/sys/i386/include/profile.h stable/11/sys/i386/include/reloc.h stable/11/sys/i386/include/runq.h stable/11/sys/i386/include/segments.h stable/11/sys/i386/include/sf_buf.h stable/11/sys/i386/include/sigframe.h stable/11/sys/i386/include/signal.h stable/11/sys/i386/include/smapi.h stable/11/sys/i386/include/timerreg.h stable/11/sys/i386/include/tss.h stable/11/sys/i386/include/ucontext.h stable/11/sys/i386/include/varargs.h stable/11/sys/i386/include/vm.h stable/11/sys/i386/include/vm86.h stable/11/sys/i386/include/vmparam.h stable/11/sys/i386/isa/ccbque.h stable/11/sys/i386/isa/elink.c stable/11/sys/i386/isa/elink.h stable/11/sys/i386/isa/pmtimer.c stable/11/sys/i386/isa/prof_machdep.c stable/11/sys/i386/linux/imgact_linux.c stable/11/sys/i386/linux/linux.h stable/11/sys/i386/linux/linux_dummy.c stable/11/sys/i386/linux/linux_machdep.c stable/11/sys/i386/linux/linux_ptrace.c stable/11/sys/i386/linux/linux_sysvec.c stable/11/sys/i386/pci/pci_cfgreg.c stable/11/sys/i386/pci/pci_pir.c stable/11/sys/isa/isareg.h stable/11/sys/isa/pnpreg.h stable/11/sys/isa/rtc.h stable/11/sys/kern/init_main.c stable/11/sys/kern/kern_acct.c stable/11/sys/kern/kern_clock.c stable/11/sys/kern/kern_cons.c stable/11/sys/kern/kern_descrip.c stable/11/sys/kern/kern_exit.c stable/11/sys/kern/kern_fork.c stable/11/sys/kern/kern_ktrace.c stable/11/sys/kern/kern_lockf.c stable/11/sys/kern/kern_malloc.c stable/11/sys/kern/kern_mib.c stable/11/sys/kern/kern_proc.c stable/11/sys/kern/kern_prot.c stable/11/sys/kern/kern_resource.c stable/11/sys/kern/kern_rmlock.c stable/11/sys/kern/kern_shutdown.c stable/11/sys/kern/kern_sig.c stable/11/sys/kern/kern_synch.c stable/11/sys/kern/kern_sysctl.c stable/11/sys/kern/kern_time.c stable/11/sys/kern/kern_timeout.c stable/11/sys/kern/kern_xxx.c stable/11/sys/kern/ksched.c stable/11/sys/kern/p1003_1b.c stable/11/sys/kern/posix4_mib.c stable/11/sys/kern/sched_4bsd.c stable/11/sys/kern/subr_autoconf.c stable/11/sys/kern/subr_blist.c stable/11/sys/kern/subr_clock.c stable/11/sys/kern/subr_hash.c stable/11/sys/kern/subr_log.c stable/11/sys/kern/subr_mchain.c stable/11/sys/kern/subr_param.c stable/11/sys/kern/subr_pcpu.c stable/11/sys/kern/subr_prf.c stable/11/sys/kern/subr_prof.c stable/11/sys/kern/subr_rtc.c stable/11/sys/kern/subr_scanf.c stable/11/sys/kern/subr_sglist.c stable/11/sys/kern/subr_syscall.c stable/11/sys/kern/subr_trap.c stable/11/sys/kern/subr_uio.c stable/11/sys/kern/sys_generic.c stable/11/sys/kern/sys_socket.c stable/11/sys/kern/tty_compat.c stable/11/sys/kern/tty_info.c stable/11/sys/kern/uipc_domain.c stable/11/sys/kern/uipc_mbuf.c stable/11/sys/kern/uipc_mbuf2.c stable/11/sys/kern/uipc_sockbuf.c stable/11/sys/kern/uipc_socket.c stable/11/sys/kern/uipc_syscalls.c stable/11/sys/kern/uipc_usrreq.c stable/11/sys/kern/vfs_cache.c stable/11/sys/kern/vfs_cluster.c stable/11/sys/kern/vfs_default.c stable/11/sys/kern/vfs_export.c stable/11/sys/kern/vfs_init.c stable/11/sys/kern/vfs_lookup.c stable/11/sys/kern/vfs_mount.c stable/11/sys/kern/vfs_mountroot.c stable/11/sys/kern/vfs_subr.c stable/11/sys/kern/vfs_syscalls.c stable/11/sys/kern/vfs_vnops.c stable/11/sys/libkern/arm/muldi3.c stable/11/sys/libkern/ashldi3.c stable/11/sys/libkern/ashrdi3.c stable/11/sys/libkern/bcmp.c stable/11/sys/libkern/bsearch.c stable/11/sys/libkern/cmpdi2.c stable/11/sys/libkern/divdi3.c stable/11/sys/libkern/ffs.c stable/11/sys/libkern/ffsl.c stable/11/sys/libkern/fls.c stable/11/sys/libkern/flsl.c stable/11/sys/libkern/flsll.c stable/11/sys/libkern/fnmatch.c stable/11/sys/libkern/lshrdi3.c stable/11/sys/libkern/mcount.c stable/11/sys/libkern/memchr.c stable/11/sys/libkern/memcmp.c stable/11/sys/libkern/moddi3.c stable/11/sys/libkern/qdivrem.c stable/11/sys/libkern/qsort.c stable/11/sys/libkern/quad.h stable/11/sys/libkern/random.c stable/11/sys/libkern/scanc.c stable/11/sys/libkern/strcasecmp.c stable/11/sys/libkern/strcat.c stable/11/sys/libkern/strchr.c stable/11/sys/libkern/strcmp.c stable/11/sys/libkern/strcpy.c stable/11/sys/libkern/strncmp.c stable/11/sys/libkern/strncpy.c stable/11/sys/libkern/strrchr.c stable/11/sys/libkern/strsep.c stable/11/sys/libkern/strstr.c stable/11/sys/libkern/strtol.c stable/11/sys/libkern/strtoq.c stable/11/sys/libkern/strtoul.c stable/11/sys/libkern/strtouq.c stable/11/sys/libkern/ucmpdi2.c stable/11/sys/libkern/udivdi3.c stable/11/sys/libkern/umoddi3.c stable/11/sys/mips/adm5120/adm5120_machdep.c stable/11/sys/mips/adm5120/adm5120reg.h stable/11/sys/mips/adm5120/admpci.c stable/11/sys/mips/adm5120/console.c stable/11/sys/mips/adm5120/if_admsw.c stable/11/sys/mips/adm5120/if_admswreg.h stable/11/sys/mips/adm5120/if_admswvar.h stable/11/sys/mips/adm5120/obio.c stable/11/sys/mips/adm5120/obiovar.h stable/11/sys/mips/adm5120/uart_bus_adm5120.c stable/11/sys/mips/adm5120/uart_cpu_adm5120.c stable/11/sys/mips/adm5120/uart_dev_adm5120.c stable/11/sys/mips/adm5120/uart_dev_adm5120.h stable/11/sys/mips/alchemy/alchemy_machdep.c stable/11/sys/mips/alchemy/aureg.h stable/11/sys/mips/alchemy/obio.c stable/11/sys/mips/alchemy/uart_bus_alchemy.c stable/11/sys/mips/alchemy/uart_cpu_alchemy.c stable/11/sys/mips/atheros/apb.c stable/11/sys/mips/atheros/apbvar.h stable/11/sys/mips/atheros/ar71xx_bus_space_reversed.c stable/11/sys/mips/atheros/ar71xx_bus_space_reversed.h stable/11/sys/mips/atheros/ar71xx_chip.c stable/11/sys/mips/atheros/ar71xx_chip.h stable/11/sys/mips/atheros/ar71xx_cpudef.h stable/11/sys/mips/atheros/ar71xx_ehci.c stable/11/sys/mips/atheros/ar71xx_fixup.c stable/11/sys/mips/atheros/ar71xx_fixup.h stable/11/sys/mips/atheros/ar71xx_gpio.c stable/11/sys/mips/atheros/ar71xx_gpiovar.h stable/11/sys/mips/atheros/ar71xx_machdep.c stable/11/sys/mips/atheros/ar71xx_ohci.c stable/11/sys/mips/atheros/ar71xx_pci.c stable/11/sys/mips/atheros/ar71xx_pci_bus_space.c stable/11/sys/mips/atheros/ar71xx_pci_bus_space.h stable/11/sys/mips/atheros/ar71xx_setup.c stable/11/sys/mips/atheros/ar71xx_setup.h stable/11/sys/mips/atheros/ar71xx_spi.c stable/11/sys/mips/atheros/ar71xx_wdog.c stable/11/sys/mips/atheros/ar71xxreg.h stable/11/sys/mips/atheros/ar724x_chip.c stable/11/sys/mips/atheros/ar724x_chip.h stable/11/sys/mips/atheros/ar724x_pci.c stable/11/sys/mips/atheros/ar724xreg.h stable/11/sys/mips/atheros/ar91xx_chip.c stable/11/sys/mips/atheros/ar91xx_chip.h stable/11/sys/mips/atheros/ar91xxreg.h stable/11/sys/mips/atheros/ar933x_chip.c stable/11/sys/mips/atheros/ar933x_chip.h stable/11/sys/mips/atheros/ar933x_uart.h stable/11/sys/mips/atheros/ar933xreg.h stable/11/sys/mips/atheros/ar934x_chip.c stable/11/sys/mips/atheros/ar934x_chip.h stable/11/sys/mips/atheros/ar934xreg.h stable/11/sys/mips/atheros/if_arge.c stable/11/sys/mips/atheros/if_argevar.h stable/11/sys/mips/atheros/pcf2123_rtc.c stable/11/sys/mips/atheros/pcf2123reg.h stable/11/sys/mips/atheros/uart_bus_ar71xx.c stable/11/sys/mips/atheros/uart_bus_ar933x.c stable/11/sys/mips/atheros/uart_cpu_ar71xx.c stable/11/sys/mips/atheros/uart_cpu_ar933x.c stable/11/sys/mips/atheros/uart_dev_ar933x.c stable/11/sys/mips/atheros/uart_dev_ar933x.h stable/11/sys/mips/beri/beri_machdep.c stable/11/sys/mips/beri/beri_pic.c stable/11/sys/mips/cavium/ciu.c stable/11/sys/mips/cavium/cryptocteon/cavium_crypto.c stable/11/sys/mips/cavium/cvmx_config.h stable/11/sys/mips/cavium/if_octm.c stable/11/sys/mips/cavium/obio.c stable/11/sys/mips/cavium/obiovar.h stable/11/sys/mips/cavium/octe/cavium-ethernet.h stable/11/sys/mips/cavium/octe/ethernet-common.c stable/11/sys/mips/cavium/octe/ethernet-common.h stable/11/sys/mips/cavium/octe/ethernet-defines.h stable/11/sys/mips/cavium/octe/ethernet-headers.h stable/11/sys/mips/cavium/octe/ethernet-mdio.c stable/11/sys/mips/cavium/octe/ethernet-mdio.h stable/11/sys/mips/cavium/octe/ethernet-mem.c stable/11/sys/mips/cavium/octe/ethernet-mem.h stable/11/sys/mips/cavium/octe/ethernet-mv88e61xx.c stable/11/sys/mips/cavium/octe/ethernet-mv88e61xx.h stable/11/sys/mips/cavium/octe/ethernet-rgmii.c stable/11/sys/mips/cavium/octe/ethernet-rx.c stable/11/sys/mips/cavium/octe/ethernet-rx.h stable/11/sys/mips/cavium/octe/ethernet-sgmii.c stable/11/sys/mips/cavium/octe/ethernet-spi.c stable/11/sys/mips/cavium/octe/ethernet-tx.c stable/11/sys/mips/cavium/octe/ethernet-tx.h stable/11/sys/mips/cavium/octe/ethernet-util.h stable/11/sys/mips/cavium/octe/ethernet-xaui.c stable/11/sys/mips/cavium/octe/ethernet.c stable/11/sys/mips/cavium/octe/mv88e61xxphy.c stable/11/sys/mips/cavium/octe/mv88e61xxphyreg.h stable/11/sys/mips/cavium/octe/octe.c stable/11/sys/mips/cavium/octe/octebus.c stable/11/sys/mips/cavium/octe/octebusvar.h stable/11/sys/mips/cavium/octe/wrapper-cvmx-includes.h stable/11/sys/mips/cavium/octeon_cop2.h stable/11/sys/mips/cavium/octeon_ds1337.c stable/11/sys/mips/cavium/octeon_ebt3000_cf.c stable/11/sys/mips/cavium/octeon_gpio.c stable/11/sys/mips/cavium/octeon_gpiovar.h stable/11/sys/mips/cavium/octeon_irq.h stable/11/sys/mips/cavium/octeon_machdep.c stable/11/sys/mips/cavium/octeon_mp.c stable/11/sys/mips/cavium/octeon_pci_console.c stable/11/sys/mips/cavium/octeon_pcmap_regs.h stable/11/sys/mips/cavium/octeon_pmc.c stable/11/sys/mips/cavium/octeon_rnd.c stable/11/sys/mips/cavium/octeon_rtc.c stable/11/sys/mips/cavium/octeon_wdog.c stable/11/sys/mips/cavium/octopci.c stable/11/sys/mips/cavium/octopci_bus_space.c stable/11/sys/mips/cavium/octopcireg.h stable/11/sys/mips/cavium/octopcivar.h stable/11/sys/mips/cavium/uart_bus_octeonusart.c stable/11/sys/mips/cavium/uart_cpu_octeonusart.c stable/11/sys/mips/cavium/uart_dev_oct16550.c stable/11/sys/mips/cavium/usb/octusb.c stable/11/sys/mips/cavium/usb/octusb.h stable/11/sys/mips/cavium/usb/octusb_octeon.c stable/11/sys/mips/gxemul/gxemul_machdep.c stable/11/sys/mips/gxemul/mpreg.h stable/11/sys/mips/idt/idt_machdep.c stable/11/sys/mips/idt/idtpci.c stable/11/sys/mips/idt/idtreg.h stable/11/sys/mips/idt/if_kr.c stable/11/sys/mips/idt/if_krreg.h stable/11/sys/mips/idt/obio.c stable/11/sys/mips/idt/obiovar.h stable/11/sys/mips/idt/uart_bus_rc32434.c stable/11/sys/mips/idt/uart_cpu_rc32434.c stable/11/sys/mips/include/_align.h stable/11/sys/mips/include/_bus.h stable/11/sys/mips/include/_inttypes.h stable/11/sys/mips/include/_limits.h stable/11/sys/mips/include/_stdint.h stable/11/sys/mips/include/_types.h stable/11/sys/mips/include/asm.h stable/11/sys/mips/include/atomic.h stable/11/sys/mips/include/bootinfo.h stable/11/sys/mips/include/bus.h stable/11/sys/mips/include/bus_dma.h stable/11/sys/mips/include/cache.h stable/11/sys/mips/include/cache_mipsNN.h stable/11/sys/mips/include/cache_r4k.h stable/11/sys/mips/include/counter.h stable/11/sys/mips/include/cpu.h stable/11/sys/mips/include/cpufunc.h stable/11/sys/mips/include/cpuinfo.h stable/11/sys/mips/include/cpuregs.h stable/11/sys/mips/include/db_machdep.h stable/11/sys/mips/include/elf.h stable/11/sys/mips/include/endian.h stable/11/sys/mips/include/exec.h stable/11/sys/mips/include/fdt.h stable/11/sys/mips/include/float.h stable/11/sys/mips/include/floatingpoint.h stable/11/sys/mips/include/fls64.h stable/11/sys/mips/include/frame.h stable/11/sys/mips/include/gdb_machdep.h stable/11/sys/mips/include/hwfunc.h stable/11/sys/mips/include/ieee.h stable/11/sys/mips/include/in_cksum.h stable/11/sys/mips/include/intr_machdep.h stable/11/sys/mips/include/kdb.h stable/11/sys/mips/include/limits.h stable/11/sys/mips/include/md_var.h stable/11/sys/mips/include/memdev.h stable/11/sys/mips/include/metadata.h stable/11/sys/mips/include/minidump.h stable/11/sys/mips/include/mips_opcode.h stable/11/sys/mips/include/octeon_cop2.h stable/11/sys/mips/include/ofw_machdep.h stable/11/sys/mips/include/param.h stable/11/sys/mips/include/pcb.h stable/11/sys/mips/include/pcpu.h stable/11/sys/mips/include/pmap.h stable/11/sys/mips/include/proc.h stable/11/sys/mips/include/profile.h stable/11/sys/mips/include/pte.h stable/11/sys/mips/include/ptrace.h stable/11/sys/mips/include/reg.h stable/11/sys/mips/include/regdef.h stable/11/sys/mips/include/regnum.h stable/11/sys/mips/include/reloc.h stable/11/sys/mips/include/runq.h stable/11/sys/mips/include/sc_machdep.h stable/11/sys/mips/include/sf_buf.h stable/11/sys/mips/include/sigframe.h stable/11/sys/mips/include/signal.h stable/11/sys/mips/include/sysarch.h stable/11/sys/mips/include/tlb.h stable/11/sys/mips/include/tls.h stable/11/sys/mips/include/trap.h stable/11/sys/mips/include/ucontext.h stable/11/sys/mips/include/varargs.h stable/11/sys/mips/include/vdso.h stable/11/sys/mips/include/vm.h stable/11/sys/mips/include/vmparam.h stable/11/sys/mips/malta/gt.c stable/11/sys/mips/malta/gt_pci.c stable/11/sys/mips/malta/gt_pci_bus_space.c stable/11/sys/mips/malta/gt_pci_bus_space.h stable/11/sys/mips/malta/gtreg.h stable/11/sys/mips/malta/gtvar.h stable/11/sys/mips/malta/malta_machdep.c stable/11/sys/mips/malta/maltareg.h stable/11/sys/mips/malta/obio.c stable/11/sys/mips/malta/obiovar.h stable/11/sys/mips/malta/uart_bus_maltausart.c stable/11/sys/mips/malta/uart_cpu_maltausart.c stable/11/sys/mips/malta/yamon.c stable/11/sys/mips/malta/yamon.h stable/11/sys/mips/mips/autoconf.c stable/11/sys/mips/mips/bus_space_generic.c stable/11/sys/mips/mips/busdma_machdep.c stable/11/sys/mips/mips/cache.c stable/11/sys/mips/mips/cache_mipsNN.c stable/11/sys/mips/mips/cpu.c stable/11/sys/mips/mips/db_disasm.c stable/11/sys/mips/mips/db_interface.c stable/11/sys/mips/mips/db_trace.c stable/11/sys/mips/mips/dump_machdep.c stable/11/sys/mips/mips/elf_machdep.c stable/11/sys/mips/mips/elf_trampoline.c stable/11/sys/mips/mips/freebsd32_machdep.c stable/11/sys/mips/mips/gdb_machdep.c stable/11/sys/mips/mips/genassym.c stable/11/sys/mips/mips/in_cksum.c stable/11/sys/mips/mips/intr_machdep.c stable/11/sys/mips/mips/libkern_machdep.c stable/11/sys/mips/mips/machdep.c stable/11/sys/mips/mips/mem.c stable/11/sys/mips/mips/minidump_machdep.c stable/11/sys/mips/mips/mp_machdep.c stable/11/sys/mips/mips/octeon_cop2.c stable/11/sys/mips/mips/pm_machdep.c stable/11/sys/mips/mips/pmap.c stable/11/sys/mips/mips/ptrace_machdep.c stable/11/sys/mips/mips/sc_machdep.c stable/11/sys/mips/mips/stack_machdep.c stable/11/sys/mips/mips/stdatomic.c stable/11/sys/mips/mips/sys_machdep.c stable/11/sys/mips/mips/tick.c stable/11/sys/mips/mips/tlb.c stable/11/sys/mips/mips/trap.c stable/11/sys/mips/mips/uio_machdep.c stable/11/sys/mips/mips/uma_machdep.c stable/11/sys/mips/mips/vm_machdep.c stable/11/sys/mips/nlm/board.c stable/11/sys/mips/nlm/board.h stable/11/sys/mips/nlm/board_cpld.c stable/11/sys/mips/nlm/board_eeprom.c stable/11/sys/mips/nlm/bus_space_rmi.c stable/11/sys/mips/nlm/bus_space_rmi_pci.c stable/11/sys/mips/nlm/clock.h stable/11/sys/mips/nlm/cms.c stable/11/sys/mips/nlm/dev/net/mdio.c stable/11/sys/mips/nlm/dev/net/nae.c stable/11/sys/mips/nlm/dev/net/sgmii.c stable/11/sys/mips/nlm/dev/net/ucore/ucore.h stable/11/sys/mips/nlm/dev/net/ucore/ucore_app.c stable/11/sys/mips/nlm/dev/net/xaui.c stable/11/sys/mips/nlm/dev/net/xlpge.c stable/11/sys/mips/nlm/dev/net/xlpge.h stable/11/sys/mips/nlm/dev/sec/nlmrsa.c stable/11/sys/mips/nlm/dev/sec/nlmrsalib.h stable/11/sys/mips/nlm/dev/sec/nlmsec.c stable/11/sys/mips/nlm/dev/sec/nlmseclib.c stable/11/sys/mips/nlm/dev/sec/nlmseclib.h stable/11/sys/mips/nlm/dev/sec/rsa_ucode.h stable/11/sys/mips/nlm/hal/bridge.h stable/11/sys/mips/nlm/hal/cop2.h stable/11/sys/mips/nlm/hal/cpucontrol.h stable/11/sys/mips/nlm/hal/fmn.c stable/11/sys/mips/nlm/hal/fmn.h stable/11/sys/mips/nlm/hal/gbu.h stable/11/sys/mips/nlm/hal/haldefs.h stable/11/sys/mips/nlm/hal/interlaken.h stable/11/sys/mips/nlm/hal/iomap.h stable/11/sys/mips/nlm/hal/mdio.h stable/11/sys/mips/nlm/hal/mips-extns.h stable/11/sys/mips/nlm/hal/mmu.h stable/11/sys/mips/nlm/hal/nae.h stable/11/sys/mips/nlm/hal/nlm_hal.c stable/11/sys/mips/nlm/hal/nlmsaelib.h stable/11/sys/mips/nlm/hal/pcibus.h stable/11/sys/mips/nlm/hal/pic.h stable/11/sys/mips/nlm/hal/poe.h stable/11/sys/mips/nlm/hal/sgmii.h stable/11/sys/mips/nlm/hal/sys.h stable/11/sys/mips/nlm/hal/uart.h stable/11/sys/mips/nlm/hal/ucore_loader.h stable/11/sys/mips/nlm/hal/usb.h stable/11/sys/mips/nlm/hal/xaui.h stable/11/sys/mips/nlm/interrupt.h stable/11/sys/mips/nlm/intr_machdep.c stable/11/sys/mips/nlm/msgring.h stable/11/sys/mips/nlm/tick.c stable/11/sys/mips/nlm/uart_cpu_xlp.c stable/11/sys/mips/nlm/usb_init.c stable/11/sys/mips/nlm/xlp.h stable/11/sys/mips/nlm/xlp_machdep.c stable/11/sys/mips/nlm/xlp_pci.c stable/11/sys/mips/rmi/board.c stable/11/sys/mips/rmi/board.h stable/11/sys/mips/rmi/bus_space_rmi.c stable/11/sys/mips/rmi/bus_space_rmi_pci.c stable/11/sys/mips/rmi/dev/iic/at24co2n.c stable/11/sys/mips/rmi/dev/iic/max6657.c stable/11/sys/mips/rmi/dev/nlge/if_nlge.c stable/11/sys/mips/rmi/dev/nlge/if_nlge.h stable/11/sys/mips/rmi/dev/sec/desc.h stable/11/sys/mips/rmi/dev/sec/rmilib.c stable/11/sys/mips/rmi/dev/sec/rmilib.h stable/11/sys/mips/rmi/dev/sec/rmisec.c stable/11/sys/mips/rmi/dev/xlr/atx_cpld.h stable/11/sys/mips/rmi/dev/xlr/debug.h stable/11/sys/mips/rmi/dev/xlr/xgmac_mdio.h stable/11/sys/mips/rmi/fmn.c stable/11/sys/mips/rmi/interrupt.h stable/11/sys/mips/rmi/intr_machdep.c stable/11/sys/mips/rmi/iodi.c stable/11/sys/mips/rmi/iomap.h stable/11/sys/mips/rmi/msgring.c stable/11/sys/mips/rmi/msgring.cfg stable/11/sys/mips/rmi/msgring.h stable/11/sys/mips/rmi/pcibus.h stable/11/sys/mips/rmi/pic.h stable/11/sys/mips/rmi/rmi_boot_info.h stable/11/sys/mips/rmi/rmi_mips_exts.h stable/11/sys/mips/rmi/tick.c stable/11/sys/mips/rmi/uart_bus_xlr_iodi.c stable/11/sys/mips/rmi/uart_cpu_mips_xlr.c stable/11/sys/mips/rmi/xlr_i2c.c stable/11/sys/mips/rmi/xlr_machdep.c stable/11/sys/mips/rmi/xlr_pci.c stable/11/sys/mips/rmi/xlr_pcmcia.c stable/11/sys/mips/rmi/xls_ehci.c stable/11/sys/mips/rt305x/obio.c stable/11/sys/mips/rt305x/obiovar.h stable/11/sys/mips/rt305x/rt305x_dotg.c stable/11/sys/mips/rt305x/rt305x_gpio.c stable/11/sys/mips/rt305x/rt305x_gpio.h stable/11/sys/mips/rt305x/rt305x_gpiovar.h stable/11/sys/mips/rt305x/rt305x_ic.c stable/11/sys/mips/rt305x/rt305x_icvar.h stable/11/sys/mips/rt305x/rt305x_machdep.c stable/11/sys/mips/rt305x/rt305x_sysctl.c stable/11/sys/mips/rt305x/rt305x_sysctlvar.h stable/11/sys/mips/rt305x/rt305xreg.h stable/11/sys/mips/rt305x/rt_swreg.h stable/11/sys/mips/rt305x/uart_bus_rt305x.c stable/11/sys/mips/rt305x/uart_cpu_rt305x.c stable/11/sys/mips/rt305x/uart_dev_rt305x.c stable/11/sys/mips/rt305x/uart_dev_rt305x.h stable/11/sys/mips/sibyte/ata_zbbus.c stable/11/sys/mips/sibyte/sb_bus_space.h stable/11/sys/mips/sibyte/sb_machdep.c stable/11/sys/mips/sibyte/sb_scd.c stable/11/sys/mips/sibyte/sb_scd.h stable/11/sys/mips/sibyte/sb_zbbus.c stable/11/sys/mips/sibyte/sb_zbpci.c stable/11/sys/net/bpf.c stable/11/sys/net/bpf.h stable/11/sys/net/bpf_buffer.c stable/11/sys/net/bpf_filter.c stable/11/sys/net/bpf_jitter.c stable/11/sys/net/bpf_jitter.h stable/11/sys/net/bpfdesc.h stable/11/sys/net/fddi.h stable/11/sys/net/if.c stable/11/sys/net/if.h stable/11/sys/net/if_arc.h stable/11/sys/net/if_arcsubr.c stable/11/sys/net/if_arp.h stable/11/sys/net/if_clone.c stable/11/sys/net/if_clone.h stable/11/sys/net/if_disc.c stable/11/sys/net/if_dl.h stable/11/sys/net/if_edsc.c stable/11/sys/net/if_ethersubr.c stable/11/sys/net/if_fddisubr.c stable/11/sys/net/if_fwsubr.c stable/11/sys/net/if_gif.c stable/11/sys/net/if_gif.h stable/11/sys/net/if_llc.h stable/11/sys/net/if_loop.c stable/11/sys/net/if_stf.c stable/11/sys/net/if_types.h stable/11/sys/net/if_var.h stable/11/sys/net/ifq.h stable/11/sys/net/pfkeyv2.h stable/11/sys/net/radix.c stable/11/sys/net/radix.h stable/11/sys/net/radix_mpath.c stable/11/sys/net/radix_mpath.h stable/11/sys/net/raw_cb.c stable/11/sys/net/raw_cb.h stable/11/sys/net/raw_usrreq.c stable/11/sys/net/route.c stable/11/sys/net/route.h stable/11/sys/net/rtsock.c stable/11/sys/net/slcompress.c stable/11/sys/net/slcompress.h stable/11/sys/netinet/icmp6.h stable/11/sys/netinet/icmp_var.h stable/11/sys/netinet/if_ether.c stable/11/sys/netinet/if_ether.h stable/11/sys/netinet/igmp.c stable/11/sys/netinet/igmp.h stable/11/sys/netinet/igmp_var.h stable/11/sys/netinet/in.c stable/11/sys/netinet/in.h stable/11/sys/netinet/in_cksum.c stable/11/sys/netinet/in_gif.c stable/11/sys/netinet/in_pcb.c stable/11/sys/netinet/in_pcb.h stable/11/sys/netinet/in_proto.c stable/11/sys/netinet/in_systm.h stable/11/sys/netinet/in_var.h stable/11/sys/netinet/ip.h stable/11/sys/netinet/ip6.h stable/11/sys/netinet/ip_divert.c stable/11/sys/netinet/ip_ecn.c stable/11/sys/netinet/ip_ecn.h stable/11/sys/netinet/ip_encap.c stable/11/sys/netinet/ip_encap.h stable/11/sys/netinet/ip_icmp.c stable/11/sys/netinet/ip_icmp.h stable/11/sys/netinet/ip_input.c stable/11/sys/netinet/ip_mroute.c stable/11/sys/netinet/ip_mroute.h stable/11/sys/netinet/ip_options.c stable/11/sys/netinet/ip_options.h stable/11/sys/netinet/ip_output.c stable/11/sys/netinet/ip_var.h stable/11/sys/netinet/pim.h stable/11/sys/netinet/pim_var.h stable/11/sys/netinet/raw_ip.c stable/11/sys/netinet/sctp.h stable/11/sys/netinet/sctp_asconf.c stable/11/sys/netinet/sctp_asconf.h stable/11/sys/netinet/sctp_auth.c stable/11/sys/netinet/sctp_auth.h stable/11/sys/netinet/sctp_bsd_addr.c stable/11/sys/netinet/sctp_bsd_addr.h stable/11/sys/netinet/sctp_cc_functions.c stable/11/sys/netinet/sctp_constants.h stable/11/sys/netinet/sctp_crc32.c stable/11/sys/netinet/sctp_crc32.h stable/11/sys/netinet/sctp_dtrace_declare.h stable/11/sys/netinet/sctp_dtrace_define.h stable/11/sys/netinet/sctp_header.h stable/11/sys/netinet/sctp_indata.c stable/11/sys/netinet/sctp_indata.h stable/11/sys/netinet/sctp_input.c stable/11/sys/netinet/sctp_input.h stable/11/sys/netinet/sctp_lock_bsd.h stable/11/sys/netinet/sctp_os.h stable/11/sys/netinet/sctp_os_bsd.h stable/11/sys/netinet/sctp_output.c stable/11/sys/netinet/sctp_output.h stable/11/sys/netinet/sctp_pcb.c stable/11/sys/netinet/sctp_pcb.h stable/11/sys/netinet/sctp_peeloff.c stable/11/sys/netinet/sctp_peeloff.h stable/11/sys/netinet/sctp_structs.h stable/11/sys/netinet/sctp_sysctl.c stable/11/sys/netinet/sctp_sysctl.h stable/11/sys/netinet/sctp_timer.c stable/11/sys/netinet/sctp_timer.h stable/11/sys/netinet/sctp_uio.h stable/11/sys/netinet/sctp_usrreq.c stable/11/sys/netinet/sctp_var.h stable/11/sys/netinet/sctputil.c stable/11/sys/netinet/sctputil.h stable/11/sys/netinet/tcp.h stable/11/sys/netinet/tcp_debug.c stable/11/sys/netinet/tcp_debug.h stable/11/sys/netinet/tcp_fsm.h stable/11/sys/netinet/tcp_input.c stable/11/sys/netinet/tcp_output.c stable/11/sys/netinet/tcp_reass.c stable/11/sys/netinet/tcp_sack.c stable/11/sys/netinet/tcp_seq.h stable/11/sys/netinet/tcp_subr.c stable/11/sys/netinet/tcp_syncache.h stable/11/sys/netinet/tcp_timer.c stable/11/sys/netinet/tcp_timer.h stable/11/sys/netinet/tcp_timewait.c stable/11/sys/netinet/tcp_usrreq.c stable/11/sys/netinet/tcp_var.h stable/11/sys/netinet/tcpip.h stable/11/sys/netinet/udp.h stable/11/sys/netinet/udp_usrreq.c stable/11/sys/netinet/udp_var.h stable/11/sys/netinet6/dest6.c stable/11/sys/netinet6/frag6.c stable/11/sys/netinet6/icmp6.c stable/11/sys/netinet6/in6.c stable/11/sys/netinet6/in6.h stable/11/sys/netinet6/in6_cksum.c stable/11/sys/netinet6/in6_gif.c stable/11/sys/netinet6/in6_ifattach.c stable/11/sys/netinet6/in6_ifattach.h stable/11/sys/netinet6/in6_pcb.c stable/11/sys/netinet6/in6_pcb.h stable/11/sys/netinet6/in6_proto.c stable/11/sys/netinet6/in6_rmx.c stable/11/sys/netinet6/in6_src.c stable/11/sys/netinet6/in6_var.h stable/11/sys/netinet6/ip6_ecn.h stable/11/sys/netinet6/ip6_forward.c stable/11/sys/netinet6/ip6_id.c stable/11/sys/netinet6/ip6_input.c stable/11/sys/netinet6/ip6_mroute.c stable/11/sys/netinet6/ip6_mroute.h stable/11/sys/netinet6/ip6_output.c stable/11/sys/netinet6/ip6_var.h stable/11/sys/netinet6/ip6protosw.h stable/11/sys/netinet6/mld6.c stable/11/sys/netinet6/nd6.c stable/11/sys/netinet6/nd6.h stable/11/sys/netinet6/nd6_nbr.c stable/11/sys/netinet6/nd6_rtr.c stable/11/sys/netinet6/pim6.h stable/11/sys/netinet6/pim6_var.h stable/11/sys/netinet6/raw_ip6.c stable/11/sys/netinet6/raw_ip6.h stable/11/sys/netinet6/route6.c stable/11/sys/netinet6/scope6.c stable/11/sys/netinet6/scope6_var.h stable/11/sys/netinet6/sctp6_usrreq.c stable/11/sys/netinet6/sctp6_var.h stable/11/sys/netinet6/tcp6_var.h stable/11/sys/netinet6/udp6_usrreq.c stable/11/sys/netinet6/udp6_var.h stable/11/sys/netipsec/ah.h stable/11/sys/netipsec/esp.h stable/11/sys/netipsec/ipcomp.h stable/11/sys/netipsec/ipcomp_var.h stable/11/sys/netipsec/ipsec.c stable/11/sys/netipsec/ipsec.h stable/11/sys/netipsec/ipsec6.h stable/11/sys/netipsec/key.c stable/11/sys/netipsec/key.h stable/11/sys/netipsec/key_debug.c stable/11/sys/netipsec/key_debug.h stable/11/sys/netipsec/key_var.h stable/11/sys/netipsec/keydb.h stable/11/sys/netipsec/keysock.c stable/11/sys/netipsec/keysock.h stable/11/sys/netpfil/pf/in4_cksum.c stable/11/sys/netsmb/smb_crypt.c stable/11/sys/nfs/bootp_subr.c stable/11/sys/nfs/krpc_subr.c stable/11/sys/nfs/nfs_common.h stable/11/sys/nfs/nfs_diskless.c stable/11/sys/nfs/nfs_nfssvc.c stable/11/sys/nfs/nfsdiskless.h stable/11/sys/nfs/nfsproto.h stable/11/sys/nfs/nfssvc.h stable/11/sys/nfs/xdr_subs.h stable/11/sys/nfsclient/nfs.h stable/11/sys/nfsclient/nfsargs.h stable/11/sys/nfsclient/nfsm_subs.h stable/11/sys/nfsclient/nfsmount.h stable/11/sys/nfsclient/nfsnode.h stable/11/sys/nfsclient/nfsstats.h stable/11/sys/nfsserver/nfs.h stable/11/sys/nfsserver/nfsm_subs.h stable/11/sys/nfsserver/nfsrvcache.h stable/11/sys/nfsserver/nfsrvstats.h stable/11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c stable/11/sys/powerpc/aim/mmu_oea.c stable/11/sys/powerpc/aim/mmu_oea64.c stable/11/sys/powerpc/aim/mmu_oea64.h stable/11/sys/powerpc/aim/moea64_native.c stable/11/sys/powerpc/aim/mp_cpudep.c stable/11/sys/powerpc/aim/slb.c stable/11/sys/powerpc/booke/machdep_e500.c stable/11/sys/powerpc/booke/machdep_ppc4xx.c stable/11/sys/powerpc/booke/mp_cpudep.c stable/11/sys/powerpc/booke/platform_bare.c stable/11/sys/powerpc/booke/pmap.c stable/11/sys/powerpc/cpufreq/dfs.c stable/11/sys/powerpc/cpufreq/pcr.c stable/11/sys/powerpc/cpufreq/pmufreq.c stable/11/sys/powerpc/fpu/fpu_add.c stable/11/sys/powerpc/fpu/fpu_arith.h stable/11/sys/powerpc/fpu/fpu_compare.c stable/11/sys/powerpc/fpu/fpu_div.c stable/11/sys/powerpc/fpu/fpu_emu.c stable/11/sys/powerpc/fpu/fpu_emu.h stable/11/sys/powerpc/fpu/fpu_explode.c stable/11/sys/powerpc/fpu/fpu_extern.h stable/11/sys/powerpc/fpu/fpu_implode.c stable/11/sys/powerpc/fpu/fpu_instr.h stable/11/sys/powerpc/fpu/fpu_mul.c stable/11/sys/powerpc/fpu/fpu_sqrt.c stable/11/sys/powerpc/fpu/fpu_subr.c stable/11/sys/powerpc/include/_align.h stable/11/sys/powerpc/include/_bus.h stable/11/sys/powerpc/include/_inttypes.h stable/11/sys/powerpc/include/_limits.h stable/11/sys/powerpc/include/_stdint.h stable/11/sys/powerpc/include/_types.h stable/11/sys/powerpc/include/altivec.h stable/11/sys/powerpc/include/asm.h stable/11/sys/powerpc/include/atomic.h stable/11/sys/powerpc/include/bat.h stable/11/sys/powerpc/include/bus.h stable/11/sys/powerpc/include/bus_dma.h stable/11/sys/powerpc/include/counter.h stable/11/sys/powerpc/include/cpu.h stable/11/sys/powerpc/include/cpufunc.h stable/11/sys/powerpc/include/dbdma.h stable/11/sys/powerpc/include/elf.h stable/11/sys/powerpc/include/endian.h stable/11/sys/powerpc/include/exec.h stable/11/sys/powerpc/include/float.h stable/11/sys/powerpc/include/floatingpoint.h stable/11/sys/powerpc/include/fpu.h stable/11/sys/powerpc/include/frame.h stable/11/sys/powerpc/include/gdb_machdep.h stable/11/sys/powerpc/include/hid.h stable/11/sys/powerpc/include/ieee.h stable/11/sys/powerpc/include/in_cksum.h stable/11/sys/powerpc/include/intr_machdep.h stable/11/sys/powerpc/include/kdb.h stable/11/sys/powerpc/include/limits.h stable/11/sys/powerpc/include/machdep.h stable/11/sys/powerpc/include/md_var.h stable/11/sys/powerpc/include/memdev.h stable/11/sys/powerpc/include/metadata.h stable/11/sys/powerpc/include/mmuvar.h stable/11/sys/powerpc/include/ofw_machdep.h stable/11/sys/powerpc/include/openpicreg.h stable/11/sys/powerpc/include/openpicvar.h stable/11/sys/powerpc/include/param.h stable/11/sys/powerpc/include/pcb.h stable/11/sys/powerpc/include/pcpu.h stable/11/sys/powerpc/include/pio.h stable/11/sys/powerpc/include/platform.h stable/11/sys/powerpc/include/platformvar.h stable/11/sys/powerpc/include/pmap.h stable/11/sys/powerpc/include/proc.h stable/11/sys/powerpc/include/psl.h stable/11/sys/powerpc/include/pte.h stable/11/sys/powerpc/include/ptrace.h stable/11/sys/powerpc/include/reloc.h stable/11/sys/powerpc/include/rtas.h stable/11/sys/powerpc/include/runq.h stable/11/sys/powerpc/include/sc_machdep.h stable/11/sys/powerpc/include/sigframe.h stable/11/sys/powerpc/include/signal.h stable/11/sys/powerpc/include/slb.h stable/11/sys/powerpc/include/smp.h stable/11/sys/powerpc/include/spr.h stable/11/sys/powerpc/include/sr.h stable/11/sys/powerpc/include/stdarg.h stable/11/sys/powerpc/include/sysarch.h stable/11/sys/powerpc/include/tlb.h stable/11/sys/powerpc/include/trap.h stable/11/sys/powerpc/include/ucontext.h stable/11/sys/powerpc/include/varargs.h stable/11/sys/powerpc/include/vdso.h stable/11/sys/powerpc/include/vm.h stable/11/sys/powerpc/include/vmparam.h stable/11/sys/powerpc/mambo/mambo.c stable/11/sys/powerpc/mambo/mambo_console.c stable/11/sys/powerpc/mambo/mambo_disk.c stable/11/sys/powerpc/mambo/mambocall.h stable/11/sys/powerpc/mpc85xx/atpic.c stable/11/sys/powerpc/mpc85xx/ds1553_bus_fdt.c stable/11/sys/powerpc/mpc85xx/ds1553_core.c stable/11/sys/powerpc/mpc85xx/ds1553_reg.h stable/11/sys/powerpc/mpc85xx/i2c.c stable/11/sys/powerpc/mpc85xx/isa.c stable/11/sys/powerpc/mpc85xx/lbc.c stable/11/sys/powerpc/mpc85xx/lbc.h stable/11/sys/powerpc/mpc85xx/mpc85xx.c stable/11/sys/powerpc/mpc85xx/mpc85xx.h stable/11/sys/powerpc/mpc85xx/pci_mpc85xx.c stable/11/sys/powerpc/mpc85xx/platform_mpc85xx.c stable/11/sys/powerpc/ofw/ofw_machdep.c stable/11/sys/powerpc/ofw/ofw_pcib_pci.c stable/11/sys/powerpc/ofw/ofw_pcibus.c stable/11/sys/powerpc/ofw/ofw_pcibus.h stable/11/sys/powerpc/ofw/ofw_real.c stable/11/sys/powerpc/ofw/ofw_syscons.c stable/11/sys/powerpc/ofw/ofw_syscons.h stable/11/sys/powerpc/ofw/openpic_ofw.c stable/11/sys/powerpc/ofw/rtas.c stable/11/sys/powerpc/powermac/ata_dbdma.c stable/11/sys/powerpc/powermac/ata_dbdma.h stable/11/sys/powerpc/powermac/ata_kauai.c stable/11/sys/powerpc/powermac/ata_macio.c stable/11/sys/powerpc/powermac/atibl.c stable/11/sys/powerpc/powermac/cpcht.c stable/11/sys/powerpc/powermac/cuda.c stable/11/sys/powerpc/powermac/cudavar.h stable/11/sys/powerpc/powermac/dbdma.c stable/11/sys/powerpc/powermac/dbdmavar.h stable/11/sys/powerpc/powermac/fcu.c stable/11/sys/powerpc/powermac/grackle.c stable/11/sys/powerpc/powermac/gracklevar.h stable/11/sys/powerpc/powermac/hrowpic.c stable/11/sys/powerpc/powermac/hrowpicvar.h stable/11/sys/powerpc/powermac/kiic.c stable/11/sys/powerpc/powermac/macgpio.c stable/11/sys/powerpc/powermac/macgpiovar.h stable/11/sys/powerpc/powermac/macio.c stable/11/sys/powerpc/powermac/maciovar.h stable/11/sys/powerpc/powermac/nvbl.c stable/11/sys/powerpc/powermac/platform_powermac.c stable/11/sys/powerpc/powermac/pmu.c stable/11/sys/powerpc/powermac/pmuvar.h stable/11/sys/powerpc/powermac/powermac_thermal.c stable/11/sys/powerpc/powermac/powermac_thermal.h stable/11/sys/powerpc/powermac/pswitch.c stable/11/sys/powerpc/powermac/smu.c stable/11/sys/powerpc/powermac/smusat.c stable/11/sys/powerpc/powermac/uninorth.c stable/11/sys/powerpc/powermac/uninorthpci.c stable/11/sys/powerpc/powermac/uninorthvar.h stable/11/sys/powerpc/powermac/vcoregpio.c stable/11/sys/powerpc/powermac/viareg.h stable/11/sys/powerpc/powerpc/altivec.c stable/11/sys/powerpc/powerpc/autoconf.c stable/11/sys/powerpc/powerpc/bcopy.c stable/11/sys/powerpc/powerpc/bus_machdep.c stable/11/sys/powerpc/powerpc/busdma_machdep.c stable/11/sys/powerpc/powerpc/clock.c stable/11/sys/powerpc/powerpc/copyinout.c stable/11/sys/powerpc/powerpc/copystr.c stable/11/sys/powerpc/powerpc/cpu.c stable/11/sys/powerpc/powerpc/db_hwwatch.c stable/11/sys/powerpc/powerpc/dump_machdep.c stable/11/sys/powerpc/powerpc/elf32_machdep.c stable/11/sys/powerpc/powerpc/elf64_machdep.c stable/11/sys/powerpc/powerpc/exec_machdep.c stable/11/sys/powerpc/powerpc/fpu.c stable/11/sys/powerpc/powerpc/fuswintr.c stable/11/sys/powerpc/powerpc/gdb_machdep.c stable/11/sys/powerpc/powerpc/genassym.c stable/11/sys/powerpc/powerpc/in_cksum.c stable/11/sys/powerpc/powerpc/intr_machdep.c stable/11/sys/powerpc/powerpc/mem.c stable/11/sys/powerpc/powerpc/mp_machdep.c stable/11/sys/powerpc/powerpc/openpic.c stable/11/sys/powerpc/powerpc/platform.c stable/11/sys/powerpc/powerpc/pmap_dispatch.c stable/11/sys/powerpc/powerpc/sc_machdep.c stable/11/sys/powerpc/powerpc/stack_machdep.c stable/11/sys/powerpc/powerpc/suswintr.c stable/11/sys/powerpc/powerpc/syncicache.c stable/11/sys/powerpc/powerpc/sys_machdep.c stable/11/sys/powerpc/powerpc/uio_machdep.c stable/11/sys/powerpc/powerpc/vm_machdep.c stable/11/sys/powerpc/ps3/ehci_ps3.c stable/11/sys/powerpc/ps3/if_glc.c stable/11/sys/powerpc/ps3/if_glcreg.h stable/11/sys/powerpc/ps3/mmu_ps3.c stable/11/sys/powerpc/ps3/ohci_ps3.c stable/11/sys/powerpc/ps3/platform_ps3.c stable/11/sys/powerpc/ps3/ps3_syscons.c stable/11/sys/powerpc/ps3/ps3bus.c stable/11/sys/powerpc/ps3/ps3bus.h stable/11/sys/powerpc/ps3/ps3cdrom.c stable/11/sys/powerpc/ps3/ps3disk.c stable/11/sys/powerpc/ps3/ps3pic.c stable/11/sys/powerpc/pseries/mmu_phyp.c stable/11/sys/powerpc/pseries/phyp-hvcall.h stable/11/sys/powerpc/pseries/phyp_console.c stable/11/sys/powerpc/pseries/phyp_llan.c stable/11/sys/powerpc/pseries/phyp_vscsi.c stable/11/sys/powerpc/pseries/platform_chrp.c stable/11/sys/powerpc/pseries/plpar_iommu.c stable/11/sys/powerpc/pseries/plpar_iommu.h stable/11/sys/powerpc/pseries/plpar_pcibus.c stable/11/sys/powerpc/pseries/rtas_dev.c stable/11/sys/powerpc/pseries/rtas_pci.c stable/11/sys/powerpc/pseries/vdevice.c stable/11/sys/powerpc/pseries/xics.c stable/11/sys/powerpc/psim/ata_iobus.c stable/11/sys/powerpc/psim/iobus.c stable/11/sys/powerpc/psim/iobusvar.h stable/11/sys/powerpc/psim/openpic_iobus.c stable/11/sys/powerpc/psim/uart_iobus.c stable/11/sys/riscv/riscv/in_cksum.c stable/11/sys/riscv/riscv/pmap.c stable/11/sys/rpc/auth.h stable/11/sys/rpc/auth_none.c stable/11/sys/rpc/auth_unix.c stable/11/sys/rpc/authunix_prot.c stable/11/sys/rpc/clnt.h stable/11/sys/rpc/clnt_dg.c stable/11/sys/rpc/clnt_vc.c stable/11/sys/rpc/krpc.h stable/11/sys/rpc/nettype.h stable/11/sys/rpc/pmap_prot.h stable/11/sys/rpc/rpc.h stable/11/sys/rpc/rpc_callmsg.c stable/11/sys/rpc/rpc_com.h stable/11/sys/rpc/rpc_generic.c stable/11/sys/rpc/rpc_msg.h stable/11/sys/rpc/rpc_prot.c stable/11/sys/rpc/rpcb_clnt.c stable/11/sys/rpc/rpcb_clnt.h stable/11/sys/rpc/rpcb_prot.c stable/11/sys/rpc/rpcb_prot.h stable/11/sys/rpc/rpcm_subs.h stable/11/sys/rpc/rpcsec_gss/rpcsec_gss.c stable/11/sys/rpc/rpcsec_gss/rpcsec_gss_int.h stable/11/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c stable/11/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c stable/11/sys/rpc/svc.c stable/11/sys/rpc/svc.h stable/11/sys/rpc/svc_auth.c stable/11/sys/rpc/svc_auth.h stable/11/sys/rpc/svc_auth_unix.c stable/11/sys/rpc/svc_dg.c stable/11/sys/rpc/svc_generic.c stable/11/sys/rpc/svc_vc.c stable/11/sys/rpc/types.h stable/11/sys/rpc/xdr.h stable/11/sys/security/audit/audit.c stable/11/sys/security/audit/audit.h stable/11/sys/security/audit/audit_arg.c stable/11/sys/security/audit/audit_bsm.c stable/11/sys/security/audit/audit_bsm_klib.c stable/11/sys/security/audit/audit_private.h stable/11/sys/security/audit/audit_syscalls.c stable/11/sys/security/audit/audit_worker.c stable/11/sys/security/audit/bsm_domain.c stable/11/sys/security/audit/bsm_errno.c stable/11/sys/security/audit/bsm_fcntl.c stable/11/sys/security/audit/bsm_socket_type.c stable/11/sys/security/audit/bsm_token.c stable/11/sys/sparc64/include/_types.h stable/11/sys/sparc64/include/asm.h stable/11/sys/sparc64/include/bus_common.h stable/11/sys/sparc64/include/cache.h stable/11/sys/sparc64/include/cpu.h stable/11/sys/sparc64/include/endian.h stable/11/sys/sparc64/include/float.h stable/11/sys/sparc64/include/floatingpoint.h stable/11/sys/sparc64/include/ieee.h stable/11/sys/sparc64/include/in_cksum.h stable/11/sys/sparc64/include/iommureg.h stable/11/sys/sparc64/include/md_var.h stable/11/sys/sparc64/include/pmap.h stable/11/sys/sparc64/include/proc.h stable/11/sys/sparc64/include/ptrace.h stable/11/sys/sparc64/include/reg.h stable/11/sys/sparc64/include/reloc.h stable/11/sys/sparc64/include/setjmp.h stable/11/sys/sparc64/include/signal.h stable/11/sys/sparc64/include/sysarch.h stable/11/sys/sparc64/include/varargs.h stable/11/sys/sparc64/include/vmparam.h stable/11/sys/sparc64/sparc64/cache.c stable/11/sys/sparc64/sparc64/eeprom.c stable/11/sys/sparc64/sparc64/in_cksum.c stable/11/sys/sparc64/sparc64/intr_machdep.c stable/11/sys/sparc64/sparc64/machdep.c stable/11/sys/sparc64/sparc64/mem.c stable/11/sys/sparc64/sparc64/pmap.c stable/11/sys/sparc64/sparc64/trap.c stable/11/sys/sparc64/sparc64/uio_machdep.c stable/11/sys/sparc64/sparc64/vm_machdep.c stable/11/sys/sys/_bitset.h stable/11/sys/sys/_bus_dma.h stable/11/sys/sys/_callout.h stable/11/sys/sys/_cpuset.h stable/11/sys/sys/_ffcounter.h stable/11/sys/sys/_iovec.h stable/11/sys/sys/_kstack_cache.h stable/11/sys/sys/_lock.h stable/11/sys/sys/_lockmgr.h stable/11/sys/sys/_mutex.h stable/11/sys/sys/_null.h stable/11/sys/sys/_pctrie.h stable/11/sys/sys/_pthreadtypes.h stable/11/sys/sys/_rmlock.h stable/11/sys/sys/_rwlock.h stable/11/sys/sys/_semaphore.h stable/11/sys/sys/_sigset.h stable/11/sys/sys/_sockaddr_storage.h stable/11/sys/sys/_stack.h stable/11/sys/sys/_stdint.h stable/11/sys/sys/_sx.h stable/11/sys/sys/_task.h stable/11/sys/sys/_termios.h stable/11/sys/sys/_timespec.h stable/11/sys/sys/_timeval.h stable/11/sys/sys/_types.h stable/11/sys/sys/_umtx.h stable/11/sys/sys/_unrhdr.h stable/11/sys/sys/aac_ioctl.h stable/11/sys/sys/acct.h stable/11/sys/sys/acl.h stable/11/sys/sys/agpio.h stable/11/sys/sys/aio.h stable/11/sys/sys/alq.h stable/11/sys/sys/assym.h stable/11/sys/sys/ata.h stable/11/sys/sys/bio.h stable/11/sys/sys/bitset.h stable/11/sys/sys/bitstring.h stable/11/sys/sys/blist.h stable/11/sys/sys/boot.h stable/11/sys/sys/buf.h stable/11/sys/sys/buf_ring.h stable/11/sys/sys/bufobj.h stable/11/sys/sys/bus.h stable/11/sys/sys/bus_dma.h stable/11/sys/sys/busdma_bufalloc.h stable/11/sys/sys/callout.h stable/11/sys/sys/capability.h stable/11/sys/sys/caprights.h stable/11/sys/sys/cdefs.h stable/11/sys/sys/cdrio.h stable/11/sys/sys/cfictl.h stable/11/sys/sys/chio.h stable/11/sys/sys/clock.h stable/11/sys/sys/condvar.h stable/11/sys/sys/conf.h stable/11/sys/sys/cons.h stable/11/sys/sys/consio.h stable/11/sys/sys/copyright.h stable/11/sys/sys/counter.h stable/11/sys/sys/cpu.h stable/11/sys/sys/cpuctl.h stable/11/sys/sys/cpuset.h stable/11/sys/sys/ctype.h stable/11/sys/sys/devicestat.h stable/11/sys/sys/digiio.h stable/11/sys/sys/dir.h stable/11/sys/sys/dirent.h stable/11/sys/sys/disklabel.h stable/11/sys/sys/diskmbr.h stable/11/sys/sys/dkstat.h stable/11/sys/sys/domain.h stable/11/sys/sys/dtrace_bsd.h stable/11/sys/sys/dvdio.h stable/11/sys/sys/elf.h stable/11/sys/sys/elf32.h stable/11/sys/sys/elf64.h stable/11/sys/sys/elf_common.h stable/11/sys/sys/elf_generic.h stable/11/sys/sys/endian.h stable/11/sys/sys/errno.h stable/11/sys/sys/eui64.h stable/11/sys/sys/event.h stable/11/sys/sys/eventhandler.h stable/11/sys/sys/eventvar.h stable/11/sys/sys/exec.h stable/11/sys/sys/extattr.h stable/11/sys/sys/fail.h stable/11/sys/sys/fbio.h stable/11/sys/sys/fcntl.h stable/11/sys/sys/fdcio.h stable/11/sys/sys/file.h stable/11/sys/sys/filedesc.h stable/11/sys/sys/filio.h stable/11/sys/sys/firmware.h stable/11/sys/sys/gmon.h stable/11/sys/sys/gpio.h stable/11/sys/sys/gpt.h stable/11/sys/sys/hash.h stable/11/sys/sys/hhook.h stable/11/sys/sys/iconv.h stable/11/sys/sys/imgact.h stable/11/sys/sys/imgact_aout.h stable/11/sys/sys/imgact_elf.h stable/11/sys/sys/interrupt.h stable/11/sys/sys/ioccom.h stable/11/sys/sys/ioctl.h stable/11/sys/sys/ioctl_compat.h stable/11/sys/sys/ipc.h stable/11/sys/sys/ipmi.h stable/11/sys/sys/jail.h stable/11/sys/sys/joystick.h stable/11/sys/sys/kdb.h stable/11/sys/sys/kenv.h stable/11/sys/sys/kernel.h stable/11/sys/sys/kerneldump.h stable/11/sys/sys/khelp.h stable/11/sys/sys/kobj.h stable/11/sys/sys/ksem.h stable/11/sys/sys/kthread.h stable/11/sys/sys/ktr.h stable/11/sys/sys/ktr_class.h stable/11/sys/sys/ktrace.h stable/11/sys/sys/libkern.h stable/11/sys/sys/limits.h stable/11/sys/sys/link_aout.h stable/11/sys/sys/link_elf.h stable/11/sys/sys/linker.h stable/11/sys/sys/linker_set.h stable/11/sys/sys/lock.h stable/11/sys/sys/lock_profile.h stable/11/sys/sys/lockf.h stable/11/sys/sys/lockmgr.h stable/11/sys/sys/lockstat.h stable/11/sys/sys/loginclass.h stable/11/sys/sys/mac.h stable/11/sys/sys/malloc.h stable/11/sys/sys/mbuf.h stable/11/sys/sys/mchain.h stable/11/sys/sys/mdioctl.h stable/11/sys/sys/memdesc.h stable/11/sys/sys/mman.h stable/11/sys/sys/module.h stable/11/sys/sys/module_khelp.h stable/11/sys/sys/mount.h stable/11/sys/sys/mpt_ioctl.h stable/11/sys/sys/mqueue.h stable/11/sys/sys/msg.h stable/11/sys/sys/msgbuf.h stable/11/sys/sys/mtio.h stable/11/sys/sys/mutex.h stable/11/sys/sys/namei.h stable/11/sys/sys/nlist_aout.h stable/11/sys/sys/osd.h stable/11/sys/sys/param.h stable/11/sys/sys/pciio.h stable/11/sys/sys/pcpu.h stable/11/sys/sys/pctrie.h stable/11/sys/sys/pioctl.h stable/11/sys/sys/pmc.h stable/11/sys/sys/pmckern.h stable/11/sys/sys/pmclog.h stable/11/sys/sys/poll.h stable/11/sys/sys/posix4.h stable/11/sys/sys/power.h stable/11/sys/sys/priority.h stable/11/sys/sys/priv.h stable/11/sys/sys/proc.h stable/11/sys/sys/procctl.h stable/11/sys/sys/procdesc.h stable/11/sys/sys/procfs.h stable/11/sys/sys/protosw.h stable/11/sys/sys/ptio.h stable/11/sys/sys/ptrace.h stable/11/sys/sys/queue.h stable/11/sys/sys/racct.h stable/11/sys/sys/random.h stable/11/sys/sys/rangelock.h stable/11/sys/sys/rctl.h stable/11/sys/sys/reboot.h stable/11/sys/sys/refcount.h stable/11/sys/sys/regression.h stable/11/sys/sys/resource.h stable/11/sys/sys/resourcevar.h stable/11/sys/sys/rmlock.h stable/11/sys/sys/rtprio.h stable/11/sys/sys/runq.h stable/11/sys/sys/rwlock.h stable/11/sys/sys/sbuf.h stable/11/sys/sys/sched.h stable/11/sys/sys/sdt.h stable/11/sys/sys/select.h stable/11/sys/sys/selinfo.h stable/11/sys/sys/sema.h stable/11/sys/sys/serial.h stable/11/sys/sys/sf_buf.h stable/11/sys/sys/sglist.h stable/11/sys/sys/shm.h stable/11/sys/sys/sigio.h stable/11/sys/sys/signal.h stable/11/sys/sys/signalvar.h stable/11/sys/sys/sleepqueue.h stable/11/sys/sys/slicer.h stable/11/sys/sys/snoop.h stable/11/sys/sys/sockbuf.h stable/11/sys/sys/socket.h stable/11/sys/sys/socketvar.h stable/11/sys/sys/sockio.h stable/11/sys/sys/sockopt.h stable/11/sys/sys/stack.h stable/11/sys/sys/stat.h stable/11/sys/sys/stdatomic.h stable/11/sys/sys/stddef.h stable/11/sys/sys/stdint.h stable/11/sys/sys/sun_disklabel.h stable/11/sys/sys/sx.h stable/11/sys/sys/syscallsubr.h stable/11/sys/sys/sysctl.h stable/11/sys/sys/sysent.h stable/11/sys/sys/syslimits.h stable/11/sys/sys/syslog.h stable/11/sys/sys/systm.h stable/11/sys/sys/taskqueue.h stable/11/sys/sys/terminal.h stable/11/sys/sys/thr.h stable/11/sys/sys/tiio.h stable/11/sys/sys/time.h stable/11/sys/sys/timeb.h stable/11/sys/sys/timeet.h stable/11/sys/sys/timeffc.h stable/11/sys/sys/timers.h stable/11/sys/sys/times.h stable/11/sys/sys/timespec.h stable/11/sys/sys/tree.h stable/11/sys/sys/tty.h stable/11/sys/sys/ttycom.h stable/11/sys/sys/ttydefaults.h stable/11/sys/sys/ttydevsw.h stable/11/sys/sys/ttydisc.h stable/11/sys/sys/ttyhook.h stable/11/sys/sys/ttyqueue.h stable/11/sys/sys/turnstile.h stable/11/sys/sys/types.h stable/11/sys/sys/ucontext.h stable/11/sys/sys/ucred.h stable/11/sys/sys/uio.h stable/11/sys/sys/umtx.h stable/11/sys/sys/un.h stable/11/sys/sys/unistd.h stable/11/sys/sys/unpcb.h stable/11/sys/sys/user.h stable/11/sys/sys/utsname.h stable/11/sys/sys/uuid.h stable/11/sys/sys/vdso.h stable/11/sys/sys/vmem.h stable/11/sys/sys/vmmeter.h stable/11/sys/sys/vnode.h stable/11/sys/sys/wait.h stable/11/sys/sys/watchdog.h stable/11/sys/tools/makeobjops.awk stable/11/sys/tools/vnode_if.awk stable/11/sys/ufs/ffs/ffs_alloc.c stable/11/sys/ufs/ffs/ffs_balloc.c stable/11/sys/ufs/ffs/ffs_extern.h stable/11/sys/ufs/ffs/ffs_inode.c stable/11/sys/ufs/ffs/ffs_subr.c stable/11/sys/ufs/ffs/ffs_tables.c stable/11/sys/ufs/ffs/ffs_vfsops.c stable/11/sys/ufs/ffs/ffs_vnops.c stable/11/sys/ufs/ffs/fs.h stable/11/sys/ufs/ufs/dir.h stable/11/sys/ufs/ufs/inode.h stable/11/sys/ufs/ufs/quota.h stable/11/sys/ufs/ufs/ufs_bmap.c stable/11/sys/ufs/ufs/ufs_extern.h stable/11/sys/ufs/ufs/ufs_inode.c stable/11/sys/ufs/ufs/ufs_lookup.c stable/11/sys/ufs/ufs/ufs_quota.c stable/11/sys/ufs/ufs/ufs_vfsops.c stable/11/sys/ufs/ufs/ufs_vnops.c stable/11/sys/ufs/ufs/ufsmount.h stable/11/sys/vm/device_pager.c stable/11/sys/vm/pmap.h stable/11/sys/vm/swap_pager.c stable/11/sys/vm/swap_pager.h stable/11/sys/vm/vm.h stable/11/sys/vm/vm_extern.h stable/11/sys/vm/vm_fault.c stable/11/sys/vm/vm_glue.c stable/11/sys/vm/vm_init.c stable/11/sys/vm/vm_kern.c stable/11/sys/vm/vm_kern.h stable/11/sys/vm/vm_map.c stable/11/sys/vm/vm_map.h stable/11/sys/vm/vm_meter.c stable/11/sys/vm/vm_mmap.c stable/11/sys/vm/vm_object.c stable/11/sys/vm/vm_object.h stable/11/sys/vm/vm_page.c stable/11/sys/vm/vm_page.h stable/11/sys/vm/vm_pageout.c stable/11/sys/vm/vm_pageout.h stable/11/sys/vm/vm_pager.c stable/11/sys/vm/vm_pager.h stable/11/sys/vm/vm_param.h stable/11/sys/vm/vm_unix.c stable/11/sys/vm/vnode_pager.c stable/11/sys/vm/vnode_pager.h stable/11/sys/x86/include/_align.h stable/11/sys/x86/include/_limits.h stable/11/sys/x86/include/_types.h stable/11/sys/x86/include/endian.h stable/11/sys/x86/include/float.h stable/11/sys/x86/include/frame.h stable/11/sys/x86/include/psl.h stable/11/sys/x86/include/ptrace.h stable/11/sys/x86/include/reg.h stable/11/sys/x86/include/segments.h stable/11/sys/x86/include/setjmp.h stable/11/sys/x86/include/signal.h stable/11/sys/x86/include/specialreg.h stable/11/sys/x86/include/stdarg.h stable/11/sys/x86/include/sysarch.h stable/11/sys/x86/include/trap.h stable/11/sys/x86/isa/clock.c stable/11/sys/x86/isa/icu.h stable/11/sys/x86/isa/isa_dma.c stable/11/sys/x86/isa/nmi.c stable/11/sys/x86/x86/delay.c stable/11/sys/x86/x86/msi.c stable/11/tools/regression/aio/aiop/aiop.c stable/11/tools/regression/p1003_1b/fifo.c stable/11/tools/regression/p1003_1b/memlock.c stable/11/tools/regression/p1003_1b/p26.c stable/11/tools/regression/p1003_1b/sched.c stable/11/tools/regression/p1003_1b/yield.c stable/11/tools/regression/posixsem/posixsem.c stable/11/tools/regression/posixsem/test.c stable/11/tools/regression/posixsem/test.h stable/11/tools/test/hwpmc/pmctest.py stable/11/tools/tools/cxgbtool/cxgbtool.c stable/11/tools/tools/pirtool/pirtable.h stable/11/tools/tools/pirtool/pirtool.c stable/11/tools/tools/vxge/vxge_cmn.h stable/11/tools/tools/vxge/vxge_info.c stable/11/tools/tools/vxge/vxge_info.h stable/11/tools/tools/vxge/vxge_log.c stable/11/tools/tools/vxge/vxge_log.h stable/11/usr.bin/apply/apply.c stable/11/usr.bin/ar/ar.c stable/11/usr.bin/banner/banner.c stable/11/usr.bin/basename/basename.c stable/11/usr.bin/biff/biff.c stable/11/usr.bin/calendar/calendar.c stable/11/usr.bin/calendar/calendar.h stable/11/usr.bin/calendar/day.c stable/11/usr.bin/calendar/io.c stable/11/usr.bin/calendar/locale.c stable/11/usr.bin/calendar/pathnames.h stable/11/usr.bin/calendar/pom.c stable/11/usr.bin/cap_mkdb/cap_mkdb.c stable/11/usr.bin/chpass/chpass.c stable/11/usr.bin/chpass/chpass.h stable/11/usr.bin/chpass/edit.c stable/11/usr.bin/chpass/field.c stable/11/usr.bin/chpass/table.c stable/11/usr.bin/chpass/util.c stable/11/usr.bin/cksum/cksum.c stable/11/usr.bin/cksum/crc.c stable/11/usr.bin/cksum/extern.h stable/11/usr.bin/cksum/print.c stable/11/usr.bin/cksum/sum1.c stable/11/usr.bin/cksum/sum2.c stable/11/usr.bin/cmp/cmp.c stable/11/usr.bin/cmp/extern.h stable/11/usr.bin/cmp/misc.c stable/11/usr.bin/cmp/regular.c stable/11/usr.bin/cmp/special.c stable/11/usr.bin/col/col.c stable/11/usr.bin/colrm/colrm.c stable/11/usr.bin/column/column.c stable/11/usr.bin/comm/comm.c stable/11/usr.bin/compress/compress.c stable/11/usr.bin/compress/zopen.c stable/11/usr.bin/ctags/C.c stable/11/usr.bin/ctags/ctags.c stable/11/usr.bin/ctags/ctags.h stable/11/usr.bin/ctags/fortran.c stable/11/usr.bin/ctags/lisp.c stable/11/usr.bin/ctags/print.c stable/11/usr.bin/ctags/tree.c stable/11/usr.bin/ctags/yacc.c stable/11/usr.bin/cut/cut.c stable/11/usr.bin/dirname/dirname.c stable/11/usr.bin/du/du.c stable/11/usr.bin/env/env.c stable/11/usr.bin/expand/expand.c stable/11/usr.bin/false/false.c stable/11/usr.bin/find/extern.h stable/11/usr.bin/find/find.c stable/11/usr.bin/find/find.h stable/11/usr.bin/find/function.c stable/11/usr.bin/find/ls.c stable/11/usr.bin/find/main.c stable/11/usr.bin/find/misc.c stable/11/usr.bin/find/operator.c stable/11/usr.bin/find/option.c stable/11/usr.bin/finger/extern.h stable/11/usr.bin/finger/finger.c stable/11/usr.bin/finger/finger.h stable/11/usr.bin/finger/lprint.c stable/11/usr.bin/finger/net.c stable/11/usr.bin/finger/sprint.c stable/11/usr.bin/finger/util.c stable/11/usr.bin/fold/fold.c stable/11/usr.bin/from/from.c stable/11/usr.bin/fstat/fstat.c stable/11/usr.bin/gcore/extern.h stable/11/usr.bin/gcore/gcore.c stable/11/usr.bin/gprof/amd64.h stable/11/usr.bin/gprof/aout.c stable/11/usr.bin/gprof/arcs.c stable/11/usr.bin/gprof/arm.h stable/11/usr.bin/gprof/dfn.c stable/11/usr.bin/gprof/elf.c stable/11/usr.bin/gprof/gprof.c stable/11/usr.bin/gprof/gprof.h stable/11/usr.bin/gprof/hertz.c stable/11/usr.bin/gprof/i386.h stable/11/usr.bin/gprof/lookup.c stable/11/usr.bin/gprof/mips.h stable/11/usr.bin/gprof/pathnames.h stable/11/usr.bin/gprof/powerpc.h stable/11/usr.bin/gprof/printgprof.c stable/11/usr.bin/gprof/printlist.c stable/11/usr.bin/gprof/sparc64.h stable/11/usr.bin/gzip/zuncompress.c stable/11/usr.bin/head/head.c stable/11/usr.bin/hexdump/conv.c stable/11/usr.bin/hexdump/display.c stable/11/usr.bin/hexdump/hexdump.c stable/11/usr.bin/hexdump/hexdump.h stable/11/usr.bin/hexdump/hexsyntax.c stable/11/usr.bin/hexdump/odsyntax.c stable/11/usr.bin/hexdump/parse.c stable/11/usr.bin/id/id.c stable/11/usr.bin/indent/args.c stable/11/usr.bin/indent/indent.c stable/11/usr.bin/indent/indent_codes.h stable/11/usr.bin/indent/indent_globs.h stable/11/usr.bin/indent/io.c stable/11/usr.bin/indent/lexi.c stable/11/usr.bin/indent/parse.c stable/11/usr.bin/indent/pr_comment.c stable/11/usr.bin/join/join.c stable/11/usr.bin/jot/jot.c stable/11/usr.bin/kdump/kdump.c stable/11/usr.bin/ktrace/ktrace.c stable/11/usr.bin/ktrace/ktrace.h stable/11/usr.bin/ktrace/subr.c stable/11/usr.bin/lam/lam.c stable/11/usr.bin/last/last.c stable/11/usr.bin/lastcomm/lastcomm.c stable/11/usr.bin/lastcomm/pathnames.h stable/11/usr.bin/leave/leave.c stable/11/usr.bin/lex/initparse.c stable/11/usr.bin/locate/bigram/locate.bigram.c stable/11/usr.bin/locate/code/locate.code.c stable/11/usr.bin/locate/locate/fastfind.c stable/11/usr.bin/locate/locate/locate.c stable/11/usr.bin/locate/locate/locate.h stable/11/usr.bin/locate/locate/util.c stable/11/usr.bin/lock/lock.c stable/11/usr.bin/logger/logger.c stable/11/usr.bin/login/login.c stable/11/usr.bin/login/login_audit.c stable/11/usr.bin/login/pathnames.h stable/11/usr.bin/logname/logname.c stable/11/usr.bin/look/look.c stable/11/usr.bin/look/pathnames.h stable/11/usr.bin/lorder/lorder.sh stable/11/usr.bin/m4/eval.c stable/11/usr.bin/m4/extern.h stable/11/usr.bin/m4/look.c stable/11/usr.bin/m4/main.c stable/11/usr.bin/m4/mdef.h stable/11/usr.bin/m4/misc.c stable/11/usr.bin/m4/pathnames.h stable/11/usr.bin/m4/stdd.h stable/11/usr.bin/mail/cmd1.c stable/11/usr.bin/mail/cmd2.c stable/11/usr.bin/mail/cmd3.c stable/11/usr.bin/mail/cmdtab.c stable/11/usr.bin/mail/collect.c stable/11/usr.bin/mail/def.h stable/11/usr.bin/mail/edit.c stable/11/usr.bin/mail/extern.h stable/11/usr.bin/mail/fio.c stable/11/usr.bin/mail/getname.c stable/11/usr.bin/mail/glob.h stable/11/usr.bin/mail/head.c stable/11/usr.bin/mail/lex.c stable/11/usr.bin/mail/list.c stable/11/usr.bin/mail/main.c stable/11/usr.bin/mail/names.c stable/11/usr.bin/mail/pathnames.h stable/11/usr.bin/mail/popen.c stable/11/usr.bin/mail/quit.c stable/11/usr.bin/mail/rcv.h stable/11/usr.bin/mail/send.c stable/11/usr.bin/mail/strings.c stable/11/usr.bin/mail/temp.c stable/11/usr.bin/mail/tty.c stable/11/usr.bin/mail/util.c stable/11/usr.bin/mail/v7.local.c stable/11/usr.bin/mail/vars.c stable/11/usr.bin/mail/version.c stable/11/usr.bin/mesg/mesg.c stable/11/usr.bin/mkdep/mkdep.gcc.sh stable/11/usr.bin/mkdep/mkdep.sh stable/11/usr.bin/mkfifo/mkfifo.c stable/11/usr.bin/mklocale/extern.h stable/11/usr.bin/mklocale/ldef.h stable/11/usr.bin/mklocale/lex.l stable/11/usr.bin/mklocale/yacc.y stable/11/usr.bin/mkstr/mkstr.c stable/11/usr.bin/msgs/msgs.c stable/11/usr.bin/msgs/pathnames.h stable/11/usr.bin/mt/mt.c stable/11/usr.bin/netstat/if.c stable/11/usr.bin/netstat/inet6.c stable/11/usr.bin/netstat/ipsec.c stable/11/usr.bin/netstat/main.c stable/11/usr.bin/netstat/mbuf.c stable/11/usr.bin/netstat/mroute.c stable/11/usr.bin/netstat/mroute6.c stable/11/usr.bin/netstat/netstat.h stable/11/usr.bin/netstat/pfkey.c stable/11/usr.bin/netstat/route.c stable/11/usr.bin/netstat/sctp.c stable/11/usr.bin/netstat/unix.c stable/11/usr.bin/nice/nice.c stable/11/usr.bin/nohup/nohup.c stable/11/usr.bin/pagesize/pagesize.sh stable/11/usr.bin/paste/paste.c stable/11/usr.bin/patch/mkpath.c stable/11/usr.bin/pr/egetopt.c stable/11/usr.bin/pr/extern.h stable/11/usr.bin/pr/pr.c stable/11/usr.bin/pr/pr.h stable/11/usr.bin/printenv/printenv.c stable/11/usr.bin/printf/printf.c stable/11/usr.bin/quota/quota.c stable/11/usr.bin/renice/renice.c stable/11/usr.bin/rev/rev.c stable/11/usr.bin/rs/rs.c stable/11/usr.bin/rup/rup.c stable/11/usr.bin/ruptime/ruptime.c stable/11/usr.bin/rusers/rusers.c stable/11/usr.bin/rwall/rwall.c stable/11/usr.bin/rwho/rwho.c stable/11/usr.bin/script/script.c stable/11/usr.bin/sed/compile.c stable/11/usr.bin/sed/defs.h stable/11/usr.bin/sed/extern.h stable/11/usr.bin/sed/main.c stable/11/usr.bin/sed/misc.c stable/11/usr.bin/sed/process.c stable/11/usr.bin/shar/shar.sh stable/11/usr.bin/showmount/showmount.c stable/11/usr.bin/split/split.c stable/11/usr.bin/su/su.c stable/11/usr.bin/systat/cmds.c stable/11/usr.bin/systat/cmdtab.c stable/11/usr.bin/systat/devs.c stable/11/usr.bin/systat/extern.h stable/11/usr.bin/systat/fetch.c stable/11/usr.bin/systat/icmp.c stable/11/usr.bin/systat/icmp6.c stable/11/usr.bin/systat/iostat.c stable/11/usr.bin/systat/ip.c stable/11/usr.bin/systat/ip6.c stable/11/usr.bin/systat/keyboard.c stable/11/usr.bin/systat/main.c stable/11/usr.bin/systat/netcmds.c stable/11/usr.bin/systat/netstat.c stable/11/usr.bin/systat/pigs.c stable/11/usr.bin/systat/swap.c stable/11/usr.bin/systat/systat.h stable/11/usr.bin/systat/tcp.c stable/11/usr.bin/systat/vmstat.c stable/11/usr.bin/tail/extern.h stable/11/usr.bin/tail/forward.c stable/11/usr.bin/tail/misc.c stable/11/usr.bin/tail/read.c stable/11/usr.bin/tail/reverse.c stable/11/usr.bin/tail/tail.c stable/11/usr.bin/talk/ctl.c stable/11/usr.bin/talk/ctl_transact.c stable/11/usr.bin/talk/display.c stable/11/usr.bin/talk/get_addrs.c stable/11/usr.bin/talk/get_names.c stable/11/usr.bin/talk/init_disp.c stable/11/usr.bin/talk/invite.c stable/11/usr.bin/talk/io.c stable/11/usr.bin/talk/look_up.c stable/11/usr.bin/talk/msgs.c stable/11/usr.bin/talk/talk.c stable/11/usr.bin/talk/talk.h stable/11/usr.bin/talk/talk_ctl.h stable/11/usr.bin/tcopy/tcopy.c stable/11/usr.bin/tee/tee.c stable/11/usr.bin/tftp/main.c stable/11/usr.bin/tftp/tftp.c stable/11/usr.bin/tftp/tftp.h stable/11/usr.bin/time/time.c stable/11/usr.bin/tip/libacu/biz22.c stable/11/usr.bin/tip/libacu/biz31.c stable/11/usr.bin/tip/libacu/courier.c stable/11/usr.bin/tip/libacu/df.c stable/11/usr.bin/tip/libacu/dn11.c stable/11/usr.bin/tip/libacu/hayes.c stable/11/usr.bin/tip/libacu/t3000.c stable/11/usr.bin/tip/libacu/v3451.c stable/11/usr.bin/tip/libacu/v831.c stable/11/usr.bin/tip/libacu/ventel.c stable/11/usr.bin/tip/tip/acu.c stable/11/usr.bin/tip/tip/acutab.c stable/11/usr.bin/tip/tip/cmds.c stable/11/usr.bin/tip/tip/cmdtab.c stable/11/usr.bin/tip/tip/cu.c stable/11/usr.bin/tip/tip/hunt.c stable/11/usr.bin/tip/tip/log.c stable/11/usr.bin/tip/tip/partab.c stable/11/usr.bin/tip/tip/pathnames.h stable/11/usr.bin/tip/tip/remote.c stable/11/usr.bin/tip/tip/tip.c stable/11/usr.bin/tip/tip/tip.h stable/11/usr.bin/tip/tip/tipout.c stable/11/usr.bin/tip/tip/uucplock.c stable/11/usr.bin/tip/tip/value.c stable/11/usr.bin/tip/tip/vars.c stable/11/usr.bin/touch/touch.c stable/11/usr.bin/tput/clear.sh stable/11/usr.bin/tput/tput.c stable/11/usr.bin/tr/extern.h stable/11/usr.bin/tr/str.c stable/11/usr.bin/tr/tr.c stable/11/usr.bin/true/true.c stable/11/usr.bin/truss/amd64-freebsd.c stable/11/usr.bin/truss/amd64-freebsd32.c stable/11/usr.bin/truss/amd64-linux.c stable/11/usr.bin/truss/amd64-linux32.c stable/11/usr.bin/truss/arm-freebsd.c stable/11/usr.bin/truss/extern.h stable/11/usr.bin/truss/i386-freebsd.c stable/11/usr.bin/truss/i386-linux.c stable/11/usr.bin/truss/main.c stable/11/usr.bin/truss/mips-freebsd.c stable/11/usr.bin/truss/setup.c stable/11/usr.bin/truss/sparc64-freebsd.c stable/11/usr.bin/truss/syscalls.c stable/11/usr.bin/tset/extern.h stable/11/usr.bin/tset/map.c stable/11/usr.bin/tset/misc.c stable/11/usr.bin/tset/set.c stable/11/usr.bin/tset/term.c stable/11/usr.bin/tset/tset.c stable/11/usr.bin/tset/wrterm.c stable/11/usr.bin/tsort/tsort.c stable/11/usr.bin/tty/tty.c stable/11/usr.bin/ul/ul.c stable/11/usr.bin/uname/uname.c stable/11/usr.bin/unexpand/unexpand.c stable/11/usr.bin/uniq/uniq.c stable/11/usr.bin/uudecode/uudecode.c stable/11/usr.bin/uuencode/uuencode.c stable/11/usr.bin/vgrind/extern.h stable/11/usr.bin/vgrind/pathnames.h stable/11/usr.bin/vgrind/regexp.c stable/11/usr.bin/vgrind/vfontedpr.c stable/11/usr.bin/vgrind/vgrind.sh stable/11/usr.bin/vmstat/vmstat.c stable/11/usr.bin/w/extern.h stable/11/usr.bin/w/pr_time.c stable/11/usr.bin/w/proc_compare.c stable/11/usr.bin/w/w.c stable/11/usr.bin/wall/ttymsg.c stable/11/usr.bin/wall/wall.c stable/11/usr.bin/wc/wc.c stable/11/usr.bin/what/what.c stable/11/usr.bin/whois/whois.c stable/11/usr.bin/write/write.c stable/11/usr.bin/xargs/pathnames.h stable/11/usr.bin/xargs/xargs.c stable/11/usr.bin/xinstall/xinstall.c stable/11/usr.bin/xstr/pathnames.h stable/11/usr.bin/xstr/xstr.c stable/11/usr.bin/yes/yes.c stable/11/usr.sbin/accton/accton.c stable/11/usr.sbin/ancontrol/ancontrol.c stable/11/usr.sbin/arp/arp.c stable/11/usr.sbin/chown/chown.c stable/11/usr.sbin/chroot/chroot.c stable/11/usr.sbin/config/config.h stable/11/usr.sbin/config/config.y stable/11/usr.sbin/config/lang.l stable/11/usr.sbin/config/main.c stable/11/usr.sbin/config/mkheaders.c stable/11/usr.sbin/config/mkmakefile.c stable/11/usr.sbin/config/mkoptions.c stable/11/usr.sbin/crashinfo/crashinfo.sh stable/11/usr.sbin/dconschat/dconschat.c stable/11/usr.sbin/edquota/edquota.c stable/11/usr.sbin/edquota/pathnames.h stable/11/usr.sbin/fwcontrol/fwcontrol.c stable/11/usr.sbin/fwcontrol/fwdv.c stable/11/usr.sbin/fwcontrol/fwmpegts.c stable/11/usr.sbin/ifmcstat/ifmcstat.c stable/11/usr.sbin/ifmcstat/printb.c stable/11/usr.sbin/inetd/inetd.c stable/11/usr.sbin/inetd/inetd.h stable/11/usr.sbin/inetd/pathnames.h stable/11/usr.sbin/iostat/iostat.c stable/11/usr.sbin/ip6addrctl/ip6addrctl.c stable/11/usr.sbin/kgmon/kgmon.c stable/11/usr.sbin/kldxref/ef.c stable/11/usr.sbin/kldxref/ef_obj.c stable/11/usr.sbin/kldxref/kldxref.c stable/11/usr.sbin/lpr/common_source/common.c stable/11/usr.sbin/lpr/common_source/displayq.c stable/11/usr.sbin/lpr/common_source/lp.h stable/11/usr.sbin/lpr/common_source/lp.local.h stable/11/usr.sbin/lpr/common_source/net.c stable/11/usr.sbin/lpr/common_source/pathnames.h stable/11/usr.sbin/lpr/common_source/printcap.c stable/11/usr.sbin/lpr/common_source/rmjob.c stable/11/usr.sbin/lpr/common_source/startdaemon.c stable/11/usr.sbin/lpr/filters/lpf.c stable/11/usr.sbin/lpr/lpc/cmds.c stable/11/usr.sbin/lpr/lpc/cmdtab.c stable/11/usr.sbin/lpr/lpc/extern.h stable/11/usr.sbin/lpr/lpc/lpc.c stable/11/usr.sbin/lpr/lpc/lpc.h stable/11/usr.sbin/lpr/lpd/extern.h stable/11/usr.sbin/lpr/lpd/lpd.c stable/11/usr.sbin/lpr/lpd/lpdchar.c stable/11/usr.sbin/lpr/lpd/modes.c stable/11/usr.sbin/lpr/lpd/printjob.c stable/11/usr.sbin/lpr/lpd/recvjob.c stable/11/usr.sbin/lpr/lpq/lpq.c stable/11/usr.sbin/lpr/lpr/lpr.c stable/11/usr.sbin/lpr/lprm/lprm.c stable/11/usr.sbin/lpr/lptest/lptest.c stable/11/usr.sbin/lpr/pac/pac.c stable/11/usr.sbin/makefs/ffs.c stable/11/usr.sbin/makefs/ffs/ffs_alloc.c stable/11/usr.sbin/makefs/ffs/ffs_balloc.c stable/11/usr.sbin/makefs/ffs/ffs_extern.h stable/11/usr.sbin/makefs/ffs/ffs_subr.c stable/11/usr.sbin/makefs/ffs/mkfs.c stable/11/usr.sbin/makefs/ffs/ufs_bmap.c stable/11/usr.sbin/makefs/ffs/ufs_inode.h stable/11/usr.sbin/manctl/manctl.sh stable/11/usr.sbin/mld6query/mld6.c stable/11/usr.sbin/mountd/mountd.c stable/11/usr.sbin/mountd/pathnames.h stable/11/usr.sbin/mptutil/mpt_cam.c stable/11/usr.sbin/mptutil/mpt_cmd.c stable/11/usr.sbin/mptutil/mpt_config.c stable/11/usr.sbin/mptutil/mpt_drive.c stable/11/usr.sbin/mptutil/mpt_evt.c stable/11/usr.sbin/mptutil/mpt_show.c stable/11/usr.sbin/mptutil/mpt_volume.c stable/11/usr.sbin/mptutil/mptutil.c stable/11/usr.sbin/mptutil/mptutil.h stable/11/usr.sbin/nandsim/nandsim_rcfile.c stable/11/usr.sbin/nandsim/nandsim_rcfile.h stable/11/usr.sbin/ndiscvt/inf-parse.y stable/11/usr.sbin/ndiscvt/inf-token.l stable/11/usr.sbin/ndiscvt/inf.c stable/11/usr.sbin/ndiscvt/ndiscvt.c stable/11/usr.sbin/ndiscvt/ndisgen.sh stable/11/usr.sbin/ndiscvt/windrv_stub.c stable/11/usr.sbin/ndp/ndp.c stable/11/usr.sbin/nfsd/nfsd.c stable/11/usr.sbin/pciconf/cap.c stable/11/usr.sbin/pciconf/pciconf.h stable/11/usr.sbin/ppp/slcompress.c stable/11/usr.sbin/ppp/slcompress.h stable/11/usr.sbin/pstat/pstat.c stable/11/usr.sbin/pwd_mkdb/pwd_mkdb.c stable/11/usr.sbin/quotaon/quotaon.c stable/11/usr.sbin/repquota/repquota.c stable/11/usr.sbin/rip6query/rip6query.c stable/11/usr.sbin/rmt/rmt.c stable/11/usr.sbin/route6d/misc/cksum.c stable/11/usr.sbin/route6d/route6d.c stable/11/usr.sbin/route6d/route6d.h stable/11/usr.sbin/rpc.lockd/lock_proc.c stable/11/usr.sbin/rpc.lockd/lockd.c stable/11/usr.sbin/rpc.lockd/lockd.h stable/11/usr.sbin/rpc.lockd/lockd_lock.c stable/11/usr.sbin/rpc.statd/file.c stable/11/usr.sbin/rpc.statd/procs.c stable/11/usr.sbin/rpc.statd/statd.c stable/11/usr.sbin/rpc.statd/statd.h stable/11/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h stable/11/usr.sbin/rpc.yppasswdd/yppasswdd_main.c stable/11/usr.sbin/rpc.yppasswdd/yppasswdd_server.c stable/11/usr.sbin/rpc.ypupdated/yp_dbdelete.c stable/11/usr.sbin/rpc.ypupdated/yp_dbupdate.c stable/11/usr.sbin/rpc.ypupdated/ypupdated_main.c stable/11/usr.sbin/rpc.ypupdated/ypupdated_server.c stable/11/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h stable/11/usr.sbin/rpc.ypxfrd/ypxfrd_main.c stable/11/usr.sbin/rpc.ypxfrd/ypxfrd_server.c stable/11/usr.sbin/rpcbind/check_bound.c stable/11/usr.sbin/rpcbind/pmap_svc.c stable/11/usr.sbin/rpcbind/rpcb_stat.c stable/11/usr.sbin/rpcbind/rpcb_svc.c stable/11/usr.sbin/rpcbind/rpcb_svc_4.c stable/11/usr.sbin/rpcbind/rpcb_svc_com.c stable/11/usr.sbin/rpcbind/rpcbind.c stable/11/usr.sbin/rpcbind/rpcbind.h stable/11/usr.sbin/rpcbind/warmstart.c stable/11/usr.sbin/rrenumd/lexer.l stable/11/usr.sbin/rrenumd/parser.y stable/11/usr.sbin/rrenumd/rrenumd.c stable/11/usr.sbin/rrenumd/rrenumd.h stable/11/usr.sbin/rtadvd/advcap.c stable/11/usr.sbin/rtadvd/config.c stable/11/usr.sbin/rtadvd/config.h stable/11/usr.sbin/rtadvd/if.c stable/11/usr.sbin/rtadvd/if.h stable/11/usr.sbin/rtadvd/rrenum.c stable/11/usr.sbin/rtadvd/rrenum.h stable/11/usr.sbin/rtadvd/rtadvd.c stable/11/usr.sbin/rtadvd/rtadvd.h stable/11/usr.sbin/rtadvd/timer.c stable/11/usr.sbin/rtadvd/timer.h stable/11/usr.sbin/rtadvd/timer_subr.c stable/11/usr.sbin/rtadvd/timer_subr.h stable/11/usr.sbin/rtsold/dump.c stable/11/usr.sbin/rtsold/if.c stable/11/usr.sbin/rtsold/probe.c stable/11/usr.sbin/rtsold/rtsock.c stable/11/usr.sbin/rtsold/rtsol.c stable/11/usr.sbin/rtsold/rtsold.c stable/11/usr.sbin/rtsold/rtsold.h stable/11/usr.sbin/rwhod/rwhod.c stable/11/usr.sbin/setfib/setfib.c stable/11/usr.sbin/syslogd/pathnames.h stable/11/usr.sbin/syslogd/syslogd.c stable/11/usr.sbin/timed/timed/acksend.c stable/11/usr.sbin/timed/timed/byteorder.c stable/11/usr.sbin/timed/timed/candidate.c stable/11/usr.sbin/timed/timed/cksum.c stable/11/usr.sbin/timed/timed/correct.c stable/11/usr.sbin/timed/timed/extern.h stable/11/usr.sbin/timed/timed/globals.h stable/11/usr.sbin/timed/timed/master.c stable/11/usr.sbin/timed/timed/measure.c stable/11/usr.sbin/timed/timed/networkdelta.c stable/11/usr.sbin/timed/timed/pathnames.h stable/11/usr.sbin/timed/timed/readmsg.c stable/11/usr.sbin/timed/timed/slave.c stable/11/usr.sbin/timed/timed/timed.c stable/11/usr.sbin/timed/timedc/cmds.c stable/11/usr.sbin/timed/timedc/cmdtab.c stable/11/usr.sbin/timed/timedc/extern.h stable/11/usr.sbin/timed/timedc/timedc.c stable/11/usr.sbin/timed/timedc/timedc.h stable/11/usr.sbin/traceroute6/traceroute6.c stable/11/usr.sbin/trpt/trpt.c stable/11/usr.sbin/vipw/vipw.c stable/11/usr.sbin/wpa/ndis_events/ndis_events.c stable/11/usr.sbin/wpa/wpa_supplicant/Packet32.c stable/11/usr.sbin/wpa/wpa_supplicant/Packet32.h stable/11/usr.sbin/yp_mkdb/yp_mkdb.c stable/11/usr.sbin/ypbind/yp_ping.c stable/11/usr.sbin/yppush/yppush_main.c stable/11/usr.sbin/ypserv/yp_access.c stable/11/usr.sbin/ypserv/yp_dblookup.c stable/11/usr.sbin/ypserv/yp_dnslookup.c stable/11/usr.sbin/ypserv/yp_error.c stable/11/usr.sbin/ypserv/yp_extern.h stable/11/usr.sbin/ypserv/yp_main.c stable/11/usr.sbin/ypserv/yp_server.c stable/11/usr.sbin/ypserv/yp_svc_udp.c Directory Properties: stable/11/ (props changed) Modified: stable/11/bin/cat/cat.c ============================================================================== --- stable/11/bin/cat/cat.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/cat/cat.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/chflags/chflags.c ============================================================================== --- stable/11/bin/chflags/chflags.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/chflags/chflags.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/chmod/chmod.c ============================================================================== --- stable/11/bin/chmod/chmod.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/chmod/chmod.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1989, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/cp/cp.c ============================================================================== --- stable/11/bin/cp/cp.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/cp/cp.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1988, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/cp/extern.h ============================================================================== --- stable/11/bin/cp/extern.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/cp/extern.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/cp/utils.c ============================================================================== --- stable/11/bin/cp/utils.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/cp/utils.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/date/date.c ============================================================================== --- stable/11/bin/date/date.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/date/date.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1985, 1987, 1988, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/date/extern.h ============================================================================== --- stable/11/bin/date/extern.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/date/extern.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/date/netdate.c ============================================================================== --- stable/11/bin/date/netdate.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/date/netdate.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/dd/args.c ============================================================================== --- stable/11/bin/dd/args.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/dd/args.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/dd/conv.c ============================================================================== --- stable/11/bin/dd/conv.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/dd/conv.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/dd/conv_tab.c ============================================================================== --- stable/11/bin/dd/conv_tab.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/dd/conv_tab.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/dd/dd.c ============================================================================== --- stable/11/bin/dd/dd.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/dd/dd.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/dd/dd.h ============================================================================== --- stable/11/bin/dd/dd.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/dd/dd.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/dd/extern.h ============================================================================== --- stable/11/bin/dd/extern.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/dd/extern.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/dd/misc.c ============================================================================== --- stable/11/bin/dd/misc.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/dd/misc.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/dd/position.c ============================================================================== --- stable/11/bin/dd/position.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/dd/position.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/df/df.c ============================================================================== --- stable/11/bin/df/df.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/df/df.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1980, 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. * (c) UNIX System Laboratories, Inc. Modified: stable/11/bin/domainname/domainname.c ============================================================================== --- stable/11/bin/domainname/domainname.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/domainname/domainname.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1988, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/echo/echo.c ============================================================================== --- stable/11/bin/echo/echo.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/echo/echo.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/ed/cbc.c ============================================================================== --- stable/11/bin/ed/cbc.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/ed/cbc.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,5 +1,7 @@ /* cbc.c: This file contains the encryption routines for the ed line editor */ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1993 The Regents of the University of California. * All rights reserved. * Modified: stable/11/bin/hostname/hostname.c ============================================================================== --- stable/11/bin/hostname/hostname.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/hostname/hostname.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1988, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/kill/kill.c ============================================================================== --- stable/11/bin/kill/kill.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/kill/kill.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1988, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/ln/ln.c ============================================================================== --- stable/11/bin/ln/ln.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/ln/ln.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1987, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/ls/cmp.c ============================================================================== --- stable/11/bin/ls/cmp.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/ls/cmp.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/ls/extern.h ============================================================================== --- stable/11/bin/ls/extern.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/ls/extern.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/ls/ls.c ============================================================================== --- stable/11/bin/ls/ls.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/ls/ls.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1989, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/ls/ls.h ============================================================================== --- stable/11/bin/ls/ls.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/ls/ls.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/ls/print.c ============================================================================== --- stable/11/bin/ls/print.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/ls/print.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1989, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/ls/util.c ============================================================================== --- stable/11/bin/ls/util.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/ls/util.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1989, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/mkdir/mkdir.c ============================================================================== --- stable/11/bin/mkdir/mkdir.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/mkdir/mkdir.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1983, 1992, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/mv/mv.c ============================================================================== --- stable/11/bin/mv/mv.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/mv/mv.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1989, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/pax/ar_io.c ============================================================================== --- stable/11/bin/pax/ar_io.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/ar_io.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/ar_subs.c ============================================================================== --- stable/11/bin/pax/ar_subs.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/ar_subs.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/buf_subs.c ============================================================================== --- stable/11/bin/pax/buf_subs.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/buf_subs.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/cache.c ============================================================================== --- stable/11/bin/pax/cache.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/cache.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/cache.h ============================================================================== --- stable/11/bin/pax/cache.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/cache.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/cpio.c ============================================================================== --- stable/11/bin/pax/cpio.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/cpio.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/cpio.h ============================================================================== --- stable/11/bin/pax/cpio.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/cpio.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/extern.h ============================================================================== --- stable/11/bin/pax/extern.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/extern.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/file_subs.c ============================================================================== --- stable/11/bin/pax/file_subs.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/file_subs.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/ftree.c ============================================================================== --- stable/11/bin/pax/ftree.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/ftree.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/ftree.h ============================================================================== --- stable/11/bin/pax/ftree.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/ftree.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/gen_subs.c ============================================================================== --- stable/11/bin/pax/gen_subs.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/gen_subs.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/options.c ============================================================================== --- stable/11/bin/pax/options.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/options.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/options.h ============================================================================== --- stable/11/bin/pax/options.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/options.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/pat_rep.c ============================================================================== --- stable/11/bin/pax/pat_rep.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/pat_rep.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/pat_rep.h ============================================================================== --- stable/11/bin/pax/pat_rep.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/pat_rep.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/pax.c ============================================================================== --- stable/11/bin/pax/pax.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/pax.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/pax.h ============================================================================== --- stable/11/bin/pax/pax.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/pax.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/sel_subs.c ============================================================================== --- stable/11/bin/pax/sel_subs.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/sel_subs.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/sel_subs.h ============================================================================== --- stable/11/bin/pax/sel_subs.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/sel_subs.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/tables.c ============================================================================== --- stable/11/bin/pax/tables.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/tables.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/tables.h ============================================================================== --- stable/11/bin/pax/tables.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/tables.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/tar.c ============================================================================== --- stable/11/bin/pax/tar.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/tar.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/tar.h ============================================================================== --- stable/11/bin/pax/tar.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/tar.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/pax/tty_subs.c ============================================================================== --- stable/11/bin/pax/tty_subs.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pax/tty_subs.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. Modified: stable/11/bin/ps/extern.h ============================================================================== --- stable/11/bin/ps/extern.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/ps/extern.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/ps/fmt.c ============================================================================== --- stable/11/bin/ps/fmt.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/ps/fmt.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/ps/keyword.c ============================================================================== --- stable/11/bin/ps/keyword.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/ps/keyword.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/ps/nlist.c ============================================================================== --- stable/11/bin/ps/nlist.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/ps/nlist.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/ps/print.c ============================================================================== --- stable/11/bin/ps/print.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/ps/print.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/ps/ps.c ============================================================================== --- stable/11/bin/ps/ps.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/ps/ps.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/ps/ps.h ============================================================================== --- stable/11/bin/ps/ps.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/ps/ps.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/pwd/pwd.c ============================================================================== --- stable/11/bin/pwd/pwd.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/pwd/pwd.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/realpath/realpath.c ============================================================================== --- stable/11/bin/realpath/realpath.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/realpath/realpath.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/rm/rm.c ============================================================================== --- stable/11/bin/rm/rm.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/rm/rm.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/rmdir/rmdir.c ============================================================================== --- stable/11/bin/rmdir/rmdir.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/rmdir/rmdir.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992, 1993, 1994 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/bltin/bltin.h ============================================================================== --- stable/11/bin/sh/bltin/bltin.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/bltin/bltin.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/bltin/echo.c ============================================================================== --- stable/11/bin/sh/bltin/echo.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/bltin/echo.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/mail.h ============================================================================== --- stable/11/bin/sh/mail.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/mail.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/main.c ============================================================================== --- stable/11/bin/sh/main.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/main.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/main.h ============================================================================== --- stable/11/bin/sh/main.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/main.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/memalloc.c ============================================================================== --- stable/11/bin/sh/memalloc.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/memalloc.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/memalloc.h ============================================================================== --- stable/11/bin/sh/memalloc.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/memalloc.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/miscbltin.c ============================================================================== --- stable/11/bin/sh/miscbltin.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/miscbltin.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/mknodes.c ============================================================================== --- stable/11/bin/sh/mknodes.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/mknodes.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/mksyntax.c ============================================================================== --- stable/11/bin/sh/mksyntax.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/mksyntax.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/myhistedit.h ============================================================================== --- stable/11/bin/sh/myhistedit.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/myhistedit.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/mystring.c ============================================================================== --- stable/11/bin/sh/mystring.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/mystring.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/mystring.h ============================================================================== --- stable/11/bin/sh/mystring.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/mystring.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/options.c ============================================================================== --- stable/11/bin/sh/options.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/options.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/options.h ============================================================================== --- stable/11/bin/sh/options.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/options.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/output.c ============================================================================== --- stable/11/bin/sh/output.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/output.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/output.h ============================================================================== --- stable/11/bin/sh/output.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/output.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/parser.c ============================================================================== --- stable/11/bin/sh/parser.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/parser.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/parser.h ============================================================================== --- stable/11/bin/sh/parser.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/parser.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/redir.c ============================================================================== --- stable/11/bin/sh/redir.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/redir.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/redir.h ============================================================================== --- stable/11/bin/sh/redir.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/redir.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/shell.h ============================================================================== --- stable/11/bin/sh/shell.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/shell.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/show.c ============================================================================== --- stable/11/bin/sh/show.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/show.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/show.h ============================================================================== --- stable/11/bin/sh/show.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/show.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1995 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/trap.c ============================================================================== --- stable/11/bin/sh/trap.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/trap.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/trap.h ============================================================================== --- stable/11/bin/sh/trap.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/trap.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/var.c ============================================================================== --- stable/11/bin/sh/var.c Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/var.c Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/bin/sh/var.h ============================================================================== --- stable/11/bin/sh/var.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/bin/sh/var.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/include/_ctype.h ============================================================================== --- stable/11/include/_ctype.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/include/_ctype.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. * (c) UNIX System Laboratories, Inc. Modified: stable/11/include/a.out.h ============================================================================== --- stable/11/include/a.out.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/include/a.out.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/include/ar.h ============================================================================== --- stable/11/include/ar.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/include/ar.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * (c) UNIX System Laboratories, Inc. Modified: stable/11/include/arpa/ftp.h ============================================================================== --- stable/11/include/arpa/ftp.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/include/arpa/ftp.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1983, 1989, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/include/arpa/inet.h ============================================================================== --- stable/11/include/arpa/inet.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/include/arpa/inet.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: BSD-3-Clause + * * ++Copyright++ 1983, 1993 * - * Copyright (c) 1983, 1993 Modified: stable/11/include/arpa/nameser.h ============================================================================== --- stable/11/include/arpa/nameser.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/include/arpa/nameser.h Wed Mar 14 03:19:51 2018 (r330897) @@ -15,7 +15,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* +/*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1983, 1989, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/include/arpa/nameser_compat.h ============================================================================== --- stable/11/include/arpa/nameser_compat.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/include/arpa/nameser_compat.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,7 @@ -/* Copyright (c) 1983, 1989 +/*- + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 1983, 1989 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: stable/11/include/arpa/telnet.h ============================================================================== --- stable/11/include/arpa/telnet.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/include/arpa/telnet.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/include/arpa/tftp.h ============================================================================== --- stable/11/include/arpa/tftp.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/include/arpa/tftp.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. * Modified: stable/11/include/assert.h ============================================================================== --- stable/11/include/assert.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/include/assert.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. * (c) UNIX System Laboratories, Inc. Modified: stable/11/include/bitstring.h ============================================================================== --- stable/11/include/bitstring.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/include/bitstring.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2003 Poul-Henning Kamp * All rights reserved. * Modified: stable/11/include/complex.h ============================================================================== --- stable/11/include/complex.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/include/complex.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2001-2011 The FreeBSD Project. * All rights reserved. * Modified: stable/11/include/cpio.h ============================================================================== --- stable/11/include/cpio.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/include/cpio.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2002 Mike Barcroft * All rights reserved. * Modified: stable/11/include/ctype.h ============================================================================== --- stable/11/include/ctype.h Wed Mar 14 03:09:47 2018 (r330896) +++ stable/11/include/ctype.h Wed Mar 14 03:19:51 2018 (r330897) @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: BSD-3-Clause + * *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable@freebsd.org Wed Mar 14 03:30:35 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A6F57F4B10F; Wed, 14 Mar 2018 03:30:35 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 566238640B; Wed, 14 Mar 2018 03:30:35 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 513C422A22; Wed, 14 Mar 2018 03:30:35 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E3UZck041221; Wed, 14 Mar 2018 03:30:35 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E3UYPo041214; Wed, 14 Mar 2018 03:30:34 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803140330.w2E3UYPo041214@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 14 Mar 2018 03:30: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: r330898 - stable/11/stand/libsa X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: stable/11/stand/libsa X-SVN-Commit-Revision: 330898 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 03:30:35 -0000 Author: kevans Date: Wed Mar 14 03:30:34 2018 New Revision: 330898 URL: https://svnweb.freebsd.org/changeset/base/330898 Log: MFC r329339: libsa: Consolidate tftp sendrecv into net.c sendrecv bootp/arp/rarp/rpc all use the sendrecv implementation in net.c. tftp has its own implementation because it passes an extra parameter into the recv callback for the received payload type to be held. These sendrecv implementations are otherwise equivalent, so consolidate them. The other users of sendrecv won't be using the extra argument to recv, but this gives us only one place to worry about respecting timeouts and one consistent timeout behavior. Modified: stable/11/stand/libsa/arp.c stable/11/stand/libsa/bootp.c stable/11/stand/libsa/net.c stable/11/stand/libsa/net.h stable/11/stand/libsa/rarp.c stable/11/stand/libsa/rpc.c stable/11/stand/libsa/tftp.c Directory Properties: stable/11/ (props changed) Modified: stable/11/stand/libsa/arp.c ============================================================================== --- stable/11/stand/libsa/arp.c Wed Mar 14 03:19:51 2018 (r330897) +++ stable/11/stand/libsa/arp.c Wed Mar 14 03:30:34 2018 (r330898) @@ -65,7 +65,7 @@ int arp_num = 1; /* Local forwards */ static ssize_t arpsend(struct iodesc *, void *, size_t); -static ssize_t arprecv(struct iodesc *, void **, void **, time_t); +static ssize_t arprecv(struct iodesc *, void **, void **, time_t, void *); /* Broadcast an ARP packet, asking who has addr on interface d */ u_char * @@ -118,7 +118,7 @@ arpwhohas(struct iodesc *d, struct in_addr addr) ah = NULL; i = sendrecv(d, arpsend, &wbuf.data, sizeof(wbuf.data), - arprecv, &pkt, (void **)&ah); + arprecv, &pkt, (void **)&ah, NULL); if (i == -1) { panic("arp: no response for %s\n", inet_ntoa(addr)); @@ -160,7 +160,7 @@ arpsend(struct iodesc *d, void *pkt, size_t len) * else -1 (and errno == 0) */ static ssize_t -arprecv(struct iodesc *d, void **pkt, void **payload, time_t tleft) +arprecv(struct iodesc *d, void **pkt, void **payload, time_t tleft, void *extra) { ssize_t n; struct ether_arp *ah; Modified: stable/11/stand/libsa/bootp.c ============================================================================== --- stable/11/stand/libsa/bootp.c Wed Mar 14 03:19:51 2018 (r330897) +++ stable/11/stand/libsa/bootp.c Wed Mar 14 03:30:34 2018 (r330898) @@ -73,7 +73,7 @@ static char vm_cmu[4] = VM_CMU; /* Local forwards */ static ssize_t bootpsend(struct iodesc *, void *, size_t); -static ssize_t bootprecv(struct iodesc *, void **, void **, time_t); +static ssize_t bootprecv(struct iodesc *, void **, void **, time_t, void *); static int vend_rfc1048(u_char *, u_int); #ifdef BOOTP_VEND_CMU static void vend_cmu(u_char *); @@ -183,7 +183,7 @@ bootp(int sock) if(sendrecv(d, bootpsend, bp, sizeof(*bp), - bootprecv, &pkt, (void **)&rbootp) == -1) { + bootprecv, &pkt, (void **)&rbootp, NULL) == -1) { printf("bootp: no reply\n"); return; } @@ -209,7 +209,7 @@ bootp(int sock) free(pkt); if(sendrecv(d, bootpsend, bp, sizeof(*bp), - bootprecv, &pkt, (void **)&rbootp) == -1) { + bootprecv, &pkt, (void **)&rbootp, NULL) == -1) { printf("DHCPREQUEST failed\n"); return; } @@ -286,7 +286,8 @@ bootpsend(struct iodesc *d, void *pkt, size_t len) } static ssize_t -bootprecv(struct iodesc *d, void **pkt, void **payload, time_t tleft) +bootprecv(struct iodesc *d, void **pkt, void **payload, time_t tleft, + void *extra) { ssize_t n; struct bootp *bp; Modified: stable/11/stand/libsa/net.c ============================================================================== --- stable/11/stand/libsa/net.c Wed Mar 14 03:19:51 2018 (r330897) +++ stable/11/stand/libsa/net.c Wed Mar 14 03:30:34 2018 (r330898) @@ -72,8 +72,8 @@ ssize_t sendrecv(struct iodesc *d, ssize_t (*sproc)(struct iodesc *, void *, size_t), void *sbuf, size_t ssize, - ssize_t (*rproc)(struct iodesc *, void **, void **, time_t), - void **pkt, void **payload) + ssize_t (*rproc)(struct iodesc *, void **, void **, time_t, void *), + void **pkt, void **payload, void *recv_extra) { ssize_t cc; time_t t, tmo, tlast; @@ -116,7 +116,7 @@ sendrecv(struct iodesc *d, } /* Try to get a packet and process it. */ - cc = (*rproc)(d, pkt, payload, tleft); + cc = (*rproc)(d, pkt, payload, tleft, recv_extra); /* Return on data, EOF or real error. */ if (cc != -1 || (errno != 0 && errno != ETIMEDOUT)) return (cc); Modified: stable/11/stand/libsa/net.h ============================================================================== --- stable/11/stand/libsa/net.h Wed Mar 14 03:19:51 2018 (r330897) +++ stable/11/stand/libsa/net.h Wed Mar 14 03:30:34 2018 (r330898) @@ -115,8 +115,9 @@ ssize_t readudp(struct iodesc *, void **, void **, tim ssize_t sendrecv(struct iodesc *, ssize_t (*)(struct iodesc *, void *, size_t), void *, size_t, - ssize_t (*)(struct iodesc *, void **, void **, time_t), - void **, void **); + ssize_t (*)(struct iodesc *, void **, void **, time_t, + void *), + void **, void **, void *); /* bootp/DHCP */ void bootp(int); Modified: stable/11/stand/libsa/rarp.c ============================================================================== --- stable/11/stand/libsa/rarp.c Wed Mar 14 03:19:51 2018 (r330897) +++ stable/11/stand/libsa/rarp.c Wed Mar 14 03:30:34 2018 (r330898) @@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$"); static ssize_t rarpsend(struct iodesc *, void *, size_t); -static ssize_t rarprecv(struct iodesc *, void **, void **, time_t); +static ssize_t rarprecv(struct iodesc *, void **, void **, time_t, void *); /* * Ethernet (Reverse) Address Resolution Protocol (see RFC 903, and 826). @@ -99,7 +99,7 @@ rarp_getipaddress(int sock) if (sendrecv(d, rarpsend, &wbuf.data, sizeof(wbuf.data), - rarprecv, &pkt, (void *)&ap) < 0) { + rarprecv, &pkt, (void *)&ap, NULL) < 0) { printf("No response for RARP request\n"); return (-1); } @@ -143,7 +143,8 @@ rarpsend(struct iodesc *d, void *pkt, size_t len) * else -1 (and errno == 0) */ static ssize_t -rarprecv(struct iodesc *d, void **pkt, void **payload, time_t tleft) +rarprecv(struct iodesc *d, void **pkt, void **payload, time_t tleft, + void *extra) { ssize_t n; struct ether_arp *ap; Modified: stable/11/stand/libsa/rpc.c ============================================================================== --- stable/11/stand/libsa/rpc.c Wed Mar 14 03:19:51 2018 (r330897) +++ stable/11/stand/libsa/rpc.c Wed Mar 14 03:30:34 2018 (r330898) @@ -97,7 +97,7 @@ struct rpc_reply { }; /* Local forwards */ -static ssize_t recvrpc(struct iodesc *, void **, void **, time_t); +static ssize_t recvrpc(struct iodesc *, void **, void **, time_t, void *); static int rpc_getport(struct iodesc *, n_long, n_long); int rpc_xid; @@ -167,7 +167,7 @@ rpc_call(struct iodesc *d, n_long prog, n_long vers, n ptr = NULL; cc = sendrecv(d, sendudp, send_head, send_tail - send_head, - recvrpc, &ptr, (void **)&reply); + recvrpc, &ptr, (void **)&reply, NULL); #ifdef RPC_DEBUG if (debug) @@ -217,7 +217,7 @@ rpc_call(struct iodesc *d, n_long prog, n_long vers, n * Remaining checks are done by callrpc */ static ssize_t -recvrpc(struct iodesc *d, void **pkt, void **payload, time_t tleft) +recvrpc(struct iodesc *d, void **pkt, void **payload, time_t tleft, void *extra) { void *ptr; struct rpc_reply *reply; Modified: stable/11/stand/libsa/tftp.c ============================================================================== --- stable/11/stand/libsa/tftp.c Wed Mar 14 03:19:51 2018 (r330897) +++ stable/11/stand/libsa/tftp.c Wed Mar 14 03:30:34 2018 (r330898) @@ -61,7 +61,10 @@ __FBSDID("$FreeBSD$"); #include "tftp.h" struct tftp_handle; +struct tftprecv_extra; +static ssize_t recvtftp(struct iodesc *d, void **pkt, void **payload, + time_t tleft, void *recv_extra); static int tftp_open(const char *path, struct open_file *f); static int tftp_close(struct open_file *f); static int tftp_parse_oack(struct tftp_handle *h, char *buf, size_t len); @@ -70,11 +73,6 @@ static int tftp_write(struct open_file *f, void *buf, static off_t tftp_seek(struct open_file *f, off_t offset, int where); static int tftp_set_blksize(struct tftp_handle *h, const char *str); static int tftp_stat(struct open_file *f, struct stat *sb); -static ssize_t sendrecv_tftp(struct tftp_handle *h, - ssize_t (*sproc)(struct iodesc *, void *, size_t), - void *sbuf, size_t ssize, - ssize_t (*rproc)(struct tftp_handle *h, void **, void **, time_t, unsigned short *), - void **, void **, unsigned short *rtype); struct fs_ops tftp_fsops = { "tftp", @@ -118,6 +116,11 @@ struct tftp_handle { struct tftphdr *tftp_hdr; }; +struct tftprecv_extra { + struct tftp_handle *tftp_handle; + unsigned short rtype; /* Received type */ +}; + #define TFTP_MAX_ERRCODE EOPTNEG static const int tftperrors[TFTP_MAX_ERRCODE + 1] = { 0, /* ??? */ @@ -178,15 +181,19 @@ tftp_sendack(struct tftp_handle *h) } static ssize_t -recvtftp(struct tftp_handle *h, void **pkt, void **payload, time_t tleft, - unsigned short *rtype) +recvtftp(struct iodesc *d, void **pkt, void **payload, time_t tleft, + void *recv_extra) { - struct iodesc *d = h->iodesc; + struct tftprecv_extra *extra; + struct tftp_handle *h; struct tftphdr *t; + unsigned short *rtype; void *ptr = NULL; ssize_t len; errno = 0; + extra = (struct tftprecv_extra *)recv_extra; + h = extra->tftp_handle; len = readudp(d, &ptr, (void **)&t, tleft); @@ -195,7 +202,7 @@ recvtftp(struct tftp_handle *h, void **pkt, void **pay return (-1); } - *rtype = ntohs(t->th_opcode); + extra->rtype = ntohs(t->th_opcode); switch (ntohs(t->th_opcode)) { case DATA: { int got; @@ -282,6 +289,7 @@ tftp_makereq(struct tftp_handle *h) struct tftphdr t; u_char space[FNAME_SIZE + 6]; } __packed __aligned(4) wbuf; + struct tftprecv_extra recv_extra; char *wtail; int l; ssize_t res; @@ -289,7 +297,6 @@ tftp_makereq(struct tftp_handle *h) struct tftphdr *t; char *tftp_blksize = NULL; int blksize_l; - unsigned short rtype = 0; /* * Allow overriding default TFTP block size by setting @@ -334,8 +341,9 @@ tftp_makereq(struct tftp_handle *h) h->validsize = 0; pkt = NULL; - res = sendrecv_tftp(h, &sendudp, &wbuf.t, wtail - (char *) &wbuf.t, - &recvtftp, &pkt, (void **)&t, &rtype); + recv_extra.tftp_handle = h; + res = sendrecv(h->iodesc, &sendudp, &wbuf.t, wtail - (char *) &wbuf.t, + (void *)&recvtftp, &pkt, (void **)&t, &recv_extra); if (res == -1) { free(pkt); return (errno); @@ -345,13 +353,13 @@ tftp_makereq(struct tftp_handle *h) h->pkt = pkt; h->tftp_hdr = t; - if (rtype == OACK) + if (recv_extra.rtype == OACK) return (tftp_getnextblock(h)); /* Server ignored our blksize request, revert to TFTP default. */ h->tftp_blksize = SEGSIZE; - switch (rtype) { + switch (recv_extra.rtype) { case DATA: { h->currblock = 1; h->validsize = res; @@ -377,11 +385,11 @@ tftp_getnextblock(struct tftp_handle *h) u_char header[HEADER_SIZE]; struct tftphdr t; } __packed __aligned(4) wbuf; + struct tftprecv_extra recv_extra; char *wtail; int res; void *pkt; struct tftphdr *t; - unsigned short rtype = 0; wbuf.t.th_opcode = htons((u_short) ACK); wtail = (char *) &wbuf.t.th_block; wbuf.t.th_block = htons((u_short) h->currblock); @@ -390,8 +398,9 @@ tftp_getnextblock(struct tftp_handle *h) h->iodesc->xid = h->currblock + 1; /* expected block */ pkt = NULL; - res = sendrecv_tftp(h, &sendudp, &wbuf.t, wtail - (char *) &wbuf.t, - &recvtftp, &pkt, (void **)&t, &rtype); + recv_extra.tftp_handle = h; + res = sendrecv(h->iodesc, &sendudp, &wbuf.t, wtail - (char *) &wbuf.t, + (void *)&recvtftp, &pkt, (void **)&t, &recv_extra); if (res == -1) { /* 0 is OK! */ free(pkt); @@ -603,67 +612,6 @@ tftp_seek(struct open_file *f, off_t offset, int where return (-1); } return (tftpfile->off); -} - -static ssize_t -sendrecv_tftp(struct tftp_handle *h, - ssize_t (*sproc)(struct iodesc *, void *, size_t), - void *sbuf, size_t ssize, - ssize_t (*rproc)(struct tftp_handle *, void **, void **, time_t, - unsigned short *), - void **pkt, void **payload, unsigned short *rtype) -{ - struct iodesc *d = h->iodesc; - ssize_t cc; - time_t t, t1, tleft; - -#ifdef TFTP_DEBUG - if (debug) - printf("sendrecv: called\n"); -#endif - - tleft = MINTMO; - t = t1 = getsecs(); - for (;;) { - if ((getsecs() - t) > MAXTMO) { - errno = ETIMEDOUT; - return -1; - } - - cc = (*sproc)(d, sbuf, ssize); - if (cc != -1 && cc < ssize) - panic("sendrecv: short write! (%zd < %zu)", - cc, ssize); - - if (cc == -1) { - /* Error on transmit; wait before retrying */ - while ((getsecs() - t1) < tleft); - t1 = getsecs(); - continue; - } - - t1 = getsecs(); -recvnext: - if ((getsecs() - t) > MAXTMO) { - errno = ETIMEDOUT; - return -1; - } - /* Try to get a packet and process it. */ - cc = (*rproc)(h, pkt, payload, tleft, rtype); - /* Return on data, EOF or real error. */ - if (cc != -1 || (errno != 0 && errno != ETIMEDOUT)) - return (cc); - if ((getsecs() - t1) < tleft) { - goto recvnext; - } - - /* Timed out or didn't get the packet we're waiting for */ - tleft += MINTMO; - if (tleft > (2 * MINTMO)) { - tleft = (2 * MINTMO); - } - t1 = getsecs(); - } } static int From owner-svn-src-stable@freebsd.org Wed Mar 14 03:36:28 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4F99EF4B84E; Wed, 14 Mar 2018 03:36:28 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F1760869CC; Wed, 14 Mar 2018 03:36:27 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC6D222B9D; Wed, 14 Mar 2018 03:36:27 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E3aRbS046134; Wed, 14 Mar 2018 03:36:27 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E3aRBU046133; Wed, 14 Mar 2018 03:36:27 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803140336.w2E3aRBU046133@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 14 Mar 2018 03:36: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: r330899 - stable/11/sys/dev/ofw X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: stable/11/sys/dev/ofw X-SVN-Commit-Revision: 330899 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 03:36:28 -0000 Author: kevans Date: Wed Mar 14 03:36:27 2018 New Revision: 330899 URL: https://svnweb.freebsd.org/changeset/base/330899 Log: MFC r317191, r317195: Don't ignore "disabled" CPUs r317191 (cognet): ePAPR states that any non-boot CPU will come in "disabled" state. So we should not consider a "disabled" cpu as a CPU we have to ignore, and we should use them if they provide a "enable-method". While I'm there, support "ok" as well as "okay", while ePAPR only accepts "okay", linux accepts "ok" too so we can expect it to be used. r317195 (cognet): Update comment ot reflect realilty, we know also take care of CPUs that provide a enable-method. Modified: stable/11/sys/dev/ofw/ofw_cpu.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/ofw/ofw_cpu.c ============================================================================== --- stable/11/sys/dev/ofw/ofw_cpu.c Wed Mar 14 03:30:34 2018 (r330898) +++ stable/11/sys/dev/ofw/ofw_cpu.c Wed Mar 14 03:36:27 2018 (r330899) @@ -315,13 +315,16 @@ ofw_cpu_early_foreach(ofw_cpu_foreach_cb callback, boo /* * If we are filtering by runnable then limit to only - * those that have been enabled. + * those that have been enabled, or do provide a method + * to enable them. */ if (only_runnable) { status[0] = '\0'; OF_getprop(child, "status", status, sizeof(status)); - if (status[0] != '\0' && strcmp(status, "okay") != 0) - continue; + if (status[0] != '\0' && strcmp(status, "okay") != 0 && + strcmp(status, "ok") != 0 && + !OF_hasprop(child, "enable-method")) + continue; } /* From owner-svn-src-stable@freebsd.org Wed Mar 14 03:37:37 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D9081F4BA0C; Wed, 14 Mar 2018 03:37:37 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 874C486B57; Wed, 14 Mar 2018 03:37:37 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8237622BA2; Wed, 14 Mar 2018 03:37:37 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E3bb9a046228; Wed, 14 Mar 2018 03:37:37 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E3bb5E046227; Wed, 14 Mar 2018 03:37:37 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803140337.w2E3bb5E046227@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 14 Mar 2018 03:37: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: r330900 - stable/11/sys/dev/ofw X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: stable/11/sys/dev/ofw X-SVN-Commit-Revision: 330900 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 03:37:38 -0000 Author: kevans Date: Wed Mar 14 03:37:37 2018 New Revision: 330900 URL: https://svnweb.freebsd.org/changeset/base/330900 Log: MFC r322287 (mw): Add support for "compatible" parameter in ofw_fdt_fixup Sometimes it's convenient to provide fixup to many boards that use the same SoC family (eg. Marvell Armada 38x). Instead of putting multiple entries in fdt_fixup_table, use one entry which refers to all boards with given SoC. Modified: stable/11/sys/dev/ofw/ofw_fdt.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/ofw/ofw_fdt.c ============================================================================== --- stable/11/sys/dev/ofw/ofw_fdt.c Wed Mar 14 03:36:27 2018 (r330899) +++ stable/11/sys/dev/ofw/ofw_fdt.c Wed Mar 14 03:37:37 2018 (r330900) @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include "ofw_if.h" @@ -431,7 +432,15 @@ ofw_fdt_fixup(ofw_t ofw) for (i = 0; fdt_fixup_table[i].model != NULL; i++) { if (strncmp(model, fdt_fixup_table[i].model, FDT_MODEL_LEN) != 0) - continue; + /* + * Sometimes it's convenient to provide one + * fixup entry that refers to many boards. + * To handle this case, simply check if model + * is compatible parameter + */ + if(!ofw_bus_node_is_compatible(root, + fdt_fixup_table[i].model)) + continue; if (fdt_fixup_table[i].handler != NULL) (*fdt_fixup_table[i].handler)(root); From owner-svn-src-stable@freebsd.org Wed Mar 14 03:39:32 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B587F4BC33; Wed, 14 Mar 2018 03:39:32 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0E6BC86D65; Wed, 14 Mar 2018 03:39:32 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0951022BA6; Wed, 14 Mar 2018 03:39:32 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E3dVu7046346; Wed, 14 Mar 2018 03:39:31 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E3dVfZ046345; Wed, 14 Mar 2018 03:39:31 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803140339.w2E3dVfZ046345@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 14 Mar 2018 03:39: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: r330901 - stable/11/sys/dev/ofw X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: stable/11/sys/dev/ofw X-SVN-Commit-Revision: 330901 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 03:39:32 -0000 Author: kevans Date: Wed Mar 14 03:39:31 2018 New Revision: 330901 URL: https://svnweb.freebsd.org/changeset/base/330901 Log: MFC r322289: Enable uing ofw_bus_find_compatible in early platform code Before this patch function ofw_bus_find_compatible was using memory allocations in order to find compatible node and the property's length. This way there was always a suited buffer for property, however this approach had also disadvantages - ofw_bus_find_compatible couldn't be used when malloc is not available, e.g. during fdt fixup stage. In order to remove the usage limitation of ofw_bus_find_compatible(), this patch modifies the function to use ofw_bus_node_is_compatible() (instead of the one without _int suffix), which uses a fixed buffer on stack instead of dynamic allocations. Modified: stable/11/sys/dev/ofw/ofw_bus_subr.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/ofw/ofw_bus_subr.c ============================================================================== --- stable/11/sys/dev/ofw/ofw_bus_subr.c Wed Mar 14 03:37:37 2018 (r330900) +++ stable/11/sys/dev/ofw/ofw_bus_subr.c Wed Mar 14 03:39:31 2018 (r330901) @@ -703,22 +703,14 @@ phandle_t ofw_bus_find_compatible(phandle_t node, const char *onecompat) { phandle_t child, ret; - void *compat; - int len; /* * Traverse all children of 'start' node, and find first with * matching 'compatible' property. */ for (child = OF_child(node); child != 0; child = OF_peer(child)) { - len = OF_getprop_alloc(child, "compatible", 1, &compat); - if (len >= 0) { - ret = ofw_bus_node_is_compatible_int(compat, len, - onecompat); - free(compat, M_OFWPROP); - if (ret != 0) - return (child); - } + if (ofw_bus_node_is_compatible(child, onecompat) != 0) + return (child); ret = ofw_bus_find_compatible(child, onecompat); if (ret != 0) From owner-svn-src-stable@freebsd.org Wed Mar 14 03:41:08 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07B53F4BE50; Wed, 14 Mar 2018 03:41:08 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B1E3286F89; Wed, 14 Mar 2018 03:41:07 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ACF8322BD2; Wed, 14 Mar 2018 03:41:07 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E3f7bA048080; Wed, 14 Mar 2018 03:41:07 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E3f7Kb048079; Wed, 14 Mar 2018 03:41:07 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803140341.w2E3f7Kb048079@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 14 Mar 2018 03:41:07 +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: r330902 - stable/11/sys/dev/ofw X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: stable/11/sys/dev/ofw X-SVN-Commit-Revision: 330902 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 03:41:08 -0000 Author: kevans Date: Wed Mar 14 03:41:07 2018 New Revision: 330902 URL: https://svnweb.freebsd.org/changeset/base/330902 Log: MFC r322359: Enable OF_setprop API function to add property in FDT This patch modifies function ofw_fdt_setprop (called by OF_setprop), so that it can add property, when replacing is not possible. Adding property is needed to fixup FDT's that have missing properties. Modified: stable/11/sys/dev/ofw/ofw_fdt.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/ofw/ofw_fdt.c ============================================================================== --- stable/11/sys/dev/ofw/ofw_fdt.c Wed Mar 14 03:39:31 2018 (r330901) +++ stable/11/sys/dev/ofw/ofw_fdt.c Wed Mar 14 03:41:07 2018 (r330902) @@ -362,7 +362,11 @@ ofw_fdt_setprop(ofw_t ofw, phandle_t package, const ch if (offset < 0) return (-1); - return (fdt_setprop_inplace(fdtp, offset, propname, buf, len)); + if (fdt_setprop_inplace(fdtp, offset, propname, buf, len) != 0) + /* Try to add property, when setting value inplace failed */ + return (fdt_setprop(fdtp, offset, propname, buf, len)); + + return (0); } /* Convert a device specifier to a fully qualified pathname. */ From owner-svn-src-stable@freebsd.org Wed Mar 14 03:43:49 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D9EC9F4C1EC; Wed, 14 Mar 2018 03:43:49 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8102687342; Wed, 14 Mar 2018 03:43:49 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A2E922D21; Wed, 14 Mar 2018 03:43:49 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E3hnxD051172; Wed, 14 Mar 2018 03:43:49 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E3hnxg051171; Wed, 14 Mar 2018 03:43:49 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803140343.w2E3hnxg051171@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 14 Mar 2018 03:43:49 +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: r330903 - stable/11/sys/dev/ofw X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: stable/11/sys/dev/ofw X-SVN-Commit-Revision: 330903 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 03:43:50 -0000 Author: kevans Date: Wed Mar 14 03:43:49 2018 New Revision: 330903 URL: https://svnweb.freebsd.org/changeset/base/330903 Log: MFC r326204: Do not bind to CPUs with SMT Do not bind to CPUs with SMT, which use a different CPU numbering convention that does not play well with this driver. Modified: stable/11/sys/dev/ofw/ofw_cpu.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/ofw/ofw_cpu.c ============================================================================== --- stable/11/sys/dev/ofw/ofw_cpu.c Wed Mar 14 03:41:07 2018 (r330902) +++ stable/11/sys/dev/ofw/ofw_cpu.c Wed Mar 14 03:43:49 2018 (r330903) @@ -191,6 +191,10 @@ ofw_cpu_probe(device_t dev) if (type == NULL || strcmp(type, "cpu") != 0) return (ENXIO); + /* Skip SMT CPUs, which we can't reasonably represent with this code */ + if (OF_hasprop(ofw_bus_get_node(dev), "ibm,ppc-interrupt-server#s")) + return (ENXIO); + device_set_desc(dev, "Open Firmware CPU"); return (0); } From owner-svn-src-stable@freebsd.org Wed Mar 14 03:45:33 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D57B7F4C3DD; Wed, 14 Mar 2018 03:45:33 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8ACAE875B4; Wed, 14 Mar 2018 03:45:33 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 853C422D26; Wed, 14 Mar 2018 03:45:33 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E3jXOg051431; Wed, 14 Mar 2018 03:45:33 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E3jXK1051429; Wed, 14 Mar 2018 03:45:33 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803140345.w2E3jXK1051429@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 14 Mar 2018 03:45: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: r330904 - in stable/11/sys: dev/ofw powerpc/ofw X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable/11/sys: dev/ofw powerpc/ofw X-SVN-Commit-Revision: 330904 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 03:45:34 -0000 Author: kevans Date: Wed Mar 14 03:45:33 2018 New Revision: 330904 URL: https://svnweb.freebsd.org/changeset/base/330904 Log: MFC r326310: Back out OF module installation in the event of failure. PS3 firmware gives some ancient FDT version (2) that fails the init check in OFW_FDT. It is still possible to make progress, but not while the OF layer is going crazy. Modified: stable/11/sys/dev/ofw/openfirm.c stable/11/sys/powerpc/ofw/ofw_machdep.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/ofw/openfirm.c ============================================================================== --- stable/11/sys/dev/ofw/openfirm.c Wed Mar 14 03:43:49 2018 (r330903) +++ stable/11/sys/dev/ofw/openfirm.c Wed Mar 14 03:45:33 2018 (r330904) @@ -201,6 +201,12 @@ OF_install(char *name, int prio) ofw_def_t *ofwp, **ofwpp; static int curr_prio = 0; + /* Allow OF layer to be uninstalled */ + if (name == NULL) { + ofw_def_impl = NULL; + return (FALSE); + } + /* * Try and locate the OFW kobj corresponding to the name. */ Modified: stable/11/sys/powerpc/ofw/ofw_machdep.c ============================================================================== --- stable/11/sys/powerpc/ofw/ofw_machdep.c Wed Mar 14 03:43:49 2018 (r330903) +++ stable/11/sys/powerpc/ofw/ofw_machdep.c Wed Mar 14 03:45:33 2018 (r330904) @@ -389,6 +389,7 @@ boolean_t OF_bootstrap() { boolean_t status = FALSE; + int err = 0; #ifdef AIM if (openfirmware_entry != NULL) { @@ -405,7 +406,7 @@ OF_bootstrap() if (status != TRUE) return status; - OF_init(openfirmware); + err = OF_init(openfirmware); } else #endif if (fdt != NULL) { @@ -414,9 +415,15 @@ OF_bootstrap() if (status != TRUE) return status; - OF_init(fdt); - OF_interpret("perform-fixup", 0); + err = OF_init(fdt); + if (err == 0) + OF_interpret("perform-fixup", 0); } + + if (err != 0) { + OF_install(NULL, 0); + status = FALSE; + } return (status); } From owner-svn-src-stable@freebsd.org Wed Mar 14 03:47:59 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5D459F4C6ED; Wed, 14 Mar 2018 03:47:59 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 08F3E877D1; Wed, 14 Mar 2018 03:47:59 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DCE1822D2A; Wed, 14 Mar 2018 03:47:58 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E3lwtG051569; Wed, 14 Mar 2018 03:47:58 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E3lwrg051568; Wed, 14 Mar 2018 03:47:58 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803140347.w2E3lwrg051568@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 14 Mar 2018 03:47: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: r330905 - stable/11/sys/dev/ofw X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: stable/11/sys/dev/ofw X-SVN-Commit-Revision: 330905 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 03:47:59 -0000 Author: kevans Date: Wed Mar 14 03:47:58 2018 New Revision: 330905 URL: https://svnweb.freebsd.org/changeset/base/330905 Log: MFC r327391: Avoid use of the fdt_get_property_*() API [It is] intrinsically incompatible with FDT versions < 16. This also simplifies the code a bit. Modified: stable/11/sys/dev/ofw/ofw_fdt.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/ofw/ofw_fdt.c ============================================================================== --- stable/11/sys/dev/ofw/ofw_fdt.c Wed Mar 14 03:45:33 2018 (r330904) +++ stable/11/sys/dev/ofw/ofw_fdt.c Wed Mar 14 03:47:58 2018 (r330905) @@ -227,7 +227,7 @@ ofw_fdt_instance_to_package(ofw_t ofw, ihandle_t insta static ssize_t ofw_fdt_getproplen(ofw_t ofw, phandle_t package, const char *propname) { - const struct fdt_property *prop; + const void *prop; int offset, len; offset = fdt_phandle_offset(package); @@ -235,7 +235,7 @@ ofw_fdt_getproplen(ofw_t ofw, phandle_t package, const return (-1); len = -1; - prop = fdt_get_property(fdtp, offset, propname, &len); + prop = fdt_getprop(fdtp, offset, propname, &len); if (prop == NULL && strcmp(propname, "name") == 0) { /* Emulate the 'name' property */ @@ -312,7 +312,7 @@ static int ofw_fdt_nextprop(ofw_t ofw, phandle_t package, const char *previous, char *buf, size_t size) { - const struct fdt_property *prop; + const void *prop; const char *name; int offset; @@ -327,7 +327,7 @@ ofw_fdt_nextprop(ofw_t ofw, phandle_t package, const c if (previous != NULL) { while (offset >= 0) { - prop = fdt_get_property_by_offset(fdtp, offset, NULL); + prop = fdt_getprop_by_offset(fdtp, offset, &name, NULL); if (prop == NULL) return (-1); /* Internal error */ @@ -336,17 +336,16 @@ ofw_fdt_nextprop(ofw_t ofw, phandle_t package, const c return (0); /* No more properties */ /* Check if the last one was the one we wanted */ - name = fdt_string(fdtp, fdt32_to_cpu(prop->nameoff)); if (strcmp(name, previous) == 0) break; } } - prop = fdt_get_property_by_offset(fdtp, offset, &offset); + prop = fdt_getprop_by_offset(fdtp, offset, &name, &offset); if (prop == NULL) return (-1); /* Internal error */ - strncpy(buf, fdt_string(fdtp, fdt32_to_cpu(prop->nameoff)), size); + strncpy(buf, name, size); return (1); } From owner-svn-src-stable@freebsd.org Wed Mar 14 03:49:16 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AB834F4C86E; Wed, 14 Mar 2018 03:49:16 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5BA6087934; Wed, 14 Mar 2018 03:49:16 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5504122D2D; Wed, 14 Mar 2018 03:49:16 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E3nG5V051673; Wed, 14 Mar 2018 03:49:16 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E3nGE4051671; Wed, 14 Mar 2018 03:49:16 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803140349.w2E3nGE4051671@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 14 Mar 2018 03:49:16 +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: r330906 - in stable/11/sys: dev/ofw powerpc/ofw X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable/11/sys: dev/ofw powerpc/ofw X-SVN-Commit-Revision: 330906 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 03:49:17 -0000 Author: kevans Date: Wed Mar 14 03:49:15 2018 New Revision: 330906 URL: https://svnweb.freebsd.org/changeset/base/330906 Log: MFC r329579: Set internal error returns [of some OF functions] to 0 Set internal error returns for OF_peer(), OF_child(), and OF_parent() to zero, matching the IEEE 1275 standard. Since these internal error paths have never, to my knowledge, been taken, behavior is unchanged. Modified: stable/11/sys/dev/ofw/ofw_standard.c stable/11/sys/powerpc/ofw/ofw_real.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/ofw/ofw_standard.c ============================================================================== --- stable/11/sys/dev/ofw/ofw_standard.c Wed Mar 14 03:47:58 2018 (r330905) +++ stable/11/sys/dev/ofw/ofw_standard.c Wed Mar 14 03:49:15 2018 (r330906) @@ -232,7 +232,7 @@ ofw_std_peer(ofw_t ofw, phandle_t node) args.node = node; if (openfirmware(&args) == -1) - return (-1); + return (0); return (args.next); } @@ -254,7 +254,7 @@ ofw_std_child(ofw_t ofw, phandle_t node) args.node = node; if (openfirmware(&args) == -1) - return (-1); + return (0); return (args.child); } @@ -276,7 +276,7 @@ ofw_std_parent(ofw_t ofw, phandle_t node) args.node = node; if (openfirmware(&args) == -1) - return (-1); + return (0); return (args.parent); } Modified: stable/11/sys/powerpc/ofw/ofw_real.c ============================================================================== --- stable/11/sys/powerpc/ofw/ofw_real.c Wed Mar 14 03:47:58 2018 (r330905) +++ stable/11/sys/powerpc/ofw/ofw_real.c Wed Mar 14 03:49:15 2018 (r330906) @@ -366,7 +366,7 @@ ofw_real_peer(ofw_t ofw, phandle_t node) argsptr = ofw_real_map(&args, sizeof(args)); if (openfirmware((void *)argsptr) == -1) { ofw_real_stop(); - return (-1); + return (0); } ofw_real_unmap(argsptr, &args, sizeof(args)); ofw_real_stop(); @@ -395,7 +395,7 @@ ofw_real_child(ofw_t ofw, phandle_t node) argsptr = ofw_real_map(&args, sizeof(args)); if (openfirmware((void *)argsptr) == -1) { ofw_real_stop(); - return (-1); + return (0); } ofw_real_unmap(argsptr, &args, sizeof(args)); ofw_real_stop(); @@ -424,7 +424,7 @@ ofw_real_parent(ofw_t ofw, phandle_t node) argsptr = ofw_real_map(&args, sizeof(args)); if (openfirmware((void *)argsptr) == -1) { ofw_real_stop(); - return (-1); + return (0); } ofw_real_unmap(argsptr, &args, sizeof(args)); ofw_real_stop(); From owner-svn-src-stable@freebsd.org Wed Mar 14 03:50:13 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EAEB6F4C9CB; Wed, 14 Mar 2018 03:50:12 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9E18E87AC5; Wed, 14 Mar 2018 03:50:12 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 94EF622D32; Wed, 14 Mar 2018 03:50:12 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E3oC32051789; Wed, 14 Mar 2018 03:50:12 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E3oCnY051788; Wed, 14 Mar 2018 03:50:12 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803140350.w2E3oCnY051788@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 14 Mar 2018 03:50: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: r330907 - stable/11/sys/dev/ofw X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: stable/11/sys/dev/ofw X-SVN-Commit-Revision: 330907 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 03:50:13 -0000 Author: kevans Date: Wed Mar 14 03:50:12 2018 New Revision: 330907 URL: https://svnweb.freebsd.org/changeset/base/330907 Log: MFC r330019: ofw_fdt: Simplify parts with new libfdt methods libfdt now provides methods to iterate through subnodes and properties in a convenient fashion. Replace our ofw_fdt_{peer,child} searches with calls to their corresponding libfdt methods. Rework ofw_fdt_nextprop to use the fdt_for_each_property_offset macro, making it even more obvious what it's doing. No functional change intended. Modified: stable/11/sys/dev/ofw/ofw_fdt.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/ofw/ofw_fdt.c ============================================================================== --- stable/11/sys/dev/ofw/ofw_fdt.c Wed Mar 14 03:49:15 2018 (r330906) +++ stable/11/sys/dev/ofw/ofw_fdt.c Wed Mar 14 03:50:12 2018 (r330907) @@ -153,7 +153,7 @@ fdt_phandle_offset(phandle_t p) static phandle_t ofw_fdt_peer(ofw_t ofw, phandle_t node) { - int depth, offset; + int offset; if (node == 0) { /* Find root node */ @@ -165,39 +165,21 @@ ofw_fdt_peer(ofw_t ofw, phandle_t node) offset = fdt_phandle_offset(node); if (offset < 0) return (0); - - for (depth = 1, offset = fdt_next_node(fdtp, offset, &depth); - offset >= 0; - offset = fdt_next_node(fdtp, offset, &depth)) { - if (depth < 0) - return (0); - if (depth == 1) - return (fdt_offset_phandle(offset)); - } - - return (0); + offset = fdt_next_subnode(fdtp, offset); + return (fdt_offset_phandle(offset)); } /* Return the first child of this node or 0. */ static phandle_t ofw_fdt_child(ofw_t ofw, phandle_t node) { - int depth, offset; + int offset; offset = fdt_phandle_offset(node); if (offset < 0) return (0); - - for (depth = 0, offset = fdt_next_node(fdtp, offset, &depth); - (offset >= 0) && (depth > 0); - offset = fdt_next_node(fdtp, offset, &depth)) { - if (depth < 0) - return (0); - if (depth == 1) - return (fdt_offset_phandle(offset)); - } - - return (0); + offset = fdt_first_subnode(fdtp, offset); + return (fdt_offset_phandle(offset)); } /* Return the parent of this node or 0. */ @@ -320,26 +302,24 @@ ofw_fdt_nextprop(ofw_t ofw, phandle_t package, const c if (offset < 0) return (-1); - /* Find the first prop in the node */ - offset = fdt_first_property_offset(fdtp, offset); - if (offset < 0) - return (0); /* No properties */ - - if (previous != NULL) { - while (offset >= 0) { + if (previous == NULL) + /* Find the first prop in the node */ + offset = fdt_first_property_offset(fdtp, offset); + else { + fdt_for_each_property_offset(offset, fdtp, offset) { prop = fdt_getprop_by_offset(fdtp, offset, &name, NULL); if (prop == NULL) return (-1); /* Internal error */ - + /* Skip until we find 'previous', then bail out */ + if (strcmp(name, previous) != 0) + continue; offset = fdt_next_property_offset(fdtp, offset); - if (offset < 0) - return (0); /* No more properties */ - - /* Check if the last one was the one we wanted */ - if (strcmp(name, previous) == 0) - break; + break; } } + + if (offset < 0) + return (0); /* No properties */ prop = fdt_getprop_by_offset(fdtp, offset, &name, &offset); if (prop == NULL) From owner-svn-src-stable@freebsd.org Wed Mar 14 07:08:02 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BF4D7F5A9E2; Wed, 14 Mar 2018 07:08:02 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 74C4C70CB4; Wed, 14 Mar 2018 07:08:02 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6F35924BEB; Wed, 14 Mar 2018 07:08:02 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E782cB052157; Wed, 14 Mar 2018 07:08:02 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E782ej052156; Wed, 14 Mar 2018 07:08:02 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140708.w2E782ej052156@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 07:08: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: r330909 - stable/11/sys/dev/syscons X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/syscons X-SVN-Commit-Revision: 330909 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 07:08:03 -0000 Author: eadler Date: Wed Mar 14 07:08:02 2018 New Revision: 330909 URL: https://svnweb.freebsd.org/changeset/base/330909 Log: MFC r305010: Add screen locking calls to sc cn grab and ungrab. The locking functions just use the same mutex locking as sc cn putc so they have the same defects. The locking calls to acquire the lock are actually in sc cn open and close. Ungrab has to unlock, although this opens a race window. Change the direct mutex lock calls in sc cn putc to the new locking functions via the open and close functions. Putc also has to unlock, but doesn't keep the screen open like grab. Screen open and close reduce to locking, except screen open for grab also attempts to switch the screen. Keyboard locking is more difficult and still null, even when keyboard input calls screen functions, except some of the functions have locks too deep to work right. This organization gives a single place to fix some of the locking. Modified: stable/11/sys/dev/syscons/syscons.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/syscons/syscons.c ============================================================================== --- stable/11/sys/dev/syscons/syscons.c Wed Mar 14 04:00:00 2018 (r330908) +++ stable/11/sys/dev/syscons/syscons.c Wed Mar 14 07:08:02 2018 (r330909) @@ -1651,8 +1651,22 @@ sc_cnterm(struct consdev *cp) static void sccnclose(sc_softc_t *sc, struct sc_cnstate *sp); static void sccnopen(sc_softc_t *sc, struct sc_cnstate *sp, int flags); +static void sccnscrlock(sc_softc_t *sc, struct sc_cnstate *sp); +static void sccnscrunlock(sc_softc_t *sc, struct sc_cnstate *sp); static void +sccnscrlock(sc_softc_t *sc, struct sc_cnstate *sp) +{ + SC_VIDEO_LOCK(sc); +} + +static void +sccnscrunlock(sc_softc_t *sc, struct sc_cnstate *sp) +{ + SC_VIDEO_UNLOCK(sc); +} + +static void sccnopen(sc_softc_t *sc, struct sc_cnstate *sp, int flags) { int kbd_mode; @@ -1682,6 +1696,7 @@ sccnopen(sc_softc_t *sc, struct sc_cnstate *sp, int fl over_keyboard: ; /* The screen is opened iff locking it succeeds. */ + sccnscrlock(sc, sp); sp->scr_opened = TRUE; /* The screen switch is optional. */ @@ -1700,6 +1715,7 @@ static void sccnclose(sc_softc_t *sc, struct sc_cnstate *sp) { sp->scr_opened = FALSE; + sccnscrunlock(sc, sp); if (!sp->kbd_opened) return; @@ -1733,8 +1749,10 @@ sc_cngrab(struct consdev *cp) sc = sc_console->sc; lev = atomic_fetchadd_int(&sc->grab_level, 1); - if (lev >= 0 && lev < 2) + if (lev >= 0 && lev < 2) { sccnopen(sc, &sc->grab_state[lev], 1 | 2); + sccnscrunlock(sc, &sc->grab_state[lev]); + } } static void @@ -1745,14 +1763,17 @@ sc_cnungrab(struct consdev *cp) sc = sc_console->sc; lev = atomic_load_acq_int(&sc->grab_level) - 1; - if (lev >= 0 && lev < 2) + if (lev >= 0 && lev < 2) { + sccnscrlock(sc, &sc->grab_state[lev]); sccnclose(sc, &sc->grab_state[lev]); + } atomic_add_int(&sc->grab_level, -1); } static void sc_cnputc(struct consdev *cd, int c) { + struct sc_cnstate st; u_char buf[1]; scr_stat *scp = sc_console; #ifndef SC_NO_HISTORY @@ -1764,7 +1785,7 @@ sc_cnputc(struct consdev *cd, int c) /* assert(sc_console != NULL) */ - SC_VIDEO_LOCK(scp->sc); + sccnopen(scp->sc, &st, 0); #ifndef SC_NO_HISTORY if (scp == scp->sc->cur_scp && scp->status & SLKED) { @@ -1799,7 +1820,7 @@ sc_cnputc(struct consdev *cd, int c) s = spltty(); /* block sckbdevent and scrn_timer */ sccnupdate(scp); splx(s); - SC_VIDEO_UNLOCK(scp->sc); + sccnclose(scp->sc, &st); } static int From owner-svn-src-stable@freebsd.org Wed Mar 14 07:08:46 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C8398F5AA91; Wed, 14 Mar 2018 07:08:46 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 79A6B70E0E; Wed, 14 Mar 2018 07:08:46 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 747D824BEC; Wed, 14 Mar 2018 07:08:46 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E78kH3052221; Wed, 14 Mar 2018 07:08:46 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E78ksI052220; Wed, 14 Mar 2018 07:08:46 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140708.w2E78ksI052220@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 07:08: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: r330910 - stable/11/sys/dev/syscons X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/syscons X-SVN-Commit-Revision: 330910 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 07:08:47 -0000 Author: eadler Date: Wed Mar 14 07:08:46 2018 New Revision: 330910 URL: https://svnweb.freebsd.org/changeset/base/330910 Log: MFC r305059: Start adding locking to sc_cngetc(). Restore an splx() lost in r228644. We aren't nearly ready to remove spl's. They give hints about missing locking. This lost one was misplaced. Dropping it early for convenience gave race windows for accesses to the fkey buffer. Giant locking accidentally fixed this for non-console cases. Put the spl's around the whole function. Since there are many returns that would need splx() just before them for a direct fix, split the function into a wrapper that does the spl's and a "locked" function that does the work. Return earlier when no keyboard is attached to match the ordering in a planned version. This breaks the dubious feature of returning keys from the fkey buffer after the keyboard has gone away. Losing the keys wouldn't matter, but we keep them too long now. Modified: stable/11/sys/dev/syscons/syscons.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/syscons/syscons.c ============================================================================== --- stable/11/sys/dev/syscons/syscons.c Wed Mar 14 07:08:02 2018 (r330909) +++ stable/11/sys/dev/syscons/syscons.c Wed Mar 14 07:08:46 2018 (r330910) @@ -1650,6 +1650,7 @@ sc_cnterm(struct consdev *cp) } static void sccnclose(sc_softc_t *sc, struct sc_cnstate *sp); +static int sc_cngetc_locked(struct sc_cnstate *sp); static void sccnopen(sc_softc_t *sc, struct sc_cnstate *sp, int flags); static void sccnscrlock(sc_softc_t *sc, struct sc_cnstate *sp); static void sccnscrunlock(sc_softc_t *sc, struct sc_cnstate *sp); @@ -1826,15 +1827,28 @@ sc_cnputc(struct consdev *cd, int c) static int sc_cngetc(struct consdev *cd) { + int c, s; + + /* assert(sc_console != NULL) */ + s = spltty(); /* block sckbdevent and scrn_timer while we poll */ + if (sc_console->sc->kbd == NULL) { + splx(s); + return -1; + } + c = sc_cngetc_locked(NULL); + splx(s); + return c; +} + +static int +sc_cngetc_locked(struct sc_cnstate *sp) +{ static struct fkeytab fkey; static int fkeycp; scr_stat *scp; const u_char *p; - int s = spltty(); /* block sckbdevent and scrn_timer while we poll */ int c; - /* assert(sc_console != NULL) */ - /* * Stop the screen saver and update the screen if necessary. * What if we have been running in the screen saver code... XXX @@ -1843,15 +1857,8 @@ sc_cngetc(struct consdev *cd) scp = sc_console->sc->cur_scp; /* XXX */ sccnupdate(scp); - if (fkeycp < fkey.len) { - splx(s); + if (fkeycp < fkey.len) return fkey.str[fkeycp++]; - } - - if (scp->sc->kbd == NULL) { - splx(s); - return -1; - } c = scgetc(scp->sc, SCGETC_CN | SCGETC_NONBLOCK, NULL); From owner-svn-src-stable@freebsd.org Wed Mar 14 07:11:34 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 69748F5AE72; Wed, 14 Mar 2018 07:11:34 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 17A46711FA; Wed, 14 Mar 2018 07:11:34 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC75C24D2D; Wed, 14 Mar 2018 07:11:33 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E7BXDU055371; Wed, 14 Mar 2018 07:11:33 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E7BXYO055370; Wed, 14 Mar 2018 07:11:33 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140711.w2E7BXYO055370@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 07:11: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: r330911 - stable/11/sys/dev/kbdmux X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/kbdmux X-SVN-Commit-Revision: 330911 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 07:11:34 -0000 Author: eadler Date: Wed Mar 14 07:11:33 2018 New Revision: 330911 URL: https://svnweb.freebsd.org/changeset/base/330911 Log: MFC r305060: Fix keyboard polling "on/off" to support recursion. vt depends on this, and sc will soon depend on it again. The on/off request is passed without modification to lower layers, so the bug was smaller in this layer than in in lower layers (the sequence on;on;off left polling off when it should be on, but the sequence on;on;off;on;off... doesn't allow the interrupt handler to eat the input after an "off" that should't turn off polled mode, provided lower layers don't have the bug, since this layer is virtual. The bug was small in lower layers too. Normally everything is Giant locked for keyboards, and this locks out the interrupt handler in on;on;off;on;off... sequences. However, PR 211884 says that fixing this bug in ukbd in r303765 apparently causes the eating-by-interrupt behaviour that the fix is to prevent. Modified: stable/11/sys/dev/kbdmux/kbdmux.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/kbdmux/kbdmux.c ============================================================================== --- stable/11/sys/dev/kbdmux/kbdmux.c Wed Mar 14 07:08:46 2018 (r330910) +++ stable/11/sys/dev/kbdmux/kbdmux.c Wed Mar 14 07:11:33 2018 (r330911) @@ -158,9 +158,9 @@ struct kbdmux_state int ks_flags; /* flags */ #define COMPOSE (1 << 0) /* compose char flag */ -#define POLLING (1 << 1) /* polling */ #define TASK (1 << 2) /* interrupt task queued */ + int ks_polling; /* poll nesting count */ int ks_mode; /* K_XLATE, K_RAW, K_CODE */ int ks_state; /* state */ int ks_accents; /* accent key index (> 0) */ @@ -717,7 +717,7 @@ next_code: /* see if there is something in the keyboard queue */ scancode = kbdmux_kbd_getc(state); if (scancode == -1) { - if (state->ks_flags & POLLING) { + if (state->ks_polling != 0) { kbdmux_kbd_t *k; SLIST_FOREACH(k, &state->ks_kbds, next) { @@ -1317,7 +1317,8 @@ kbdmux_clear_state_locked(kbdmux_state_t *state) { KBDMUX_LOCK_ASSERT(state, MA_OWNED); - state->ks_flags &= ~(COMPOSE|POLLING); + state->ks_flags &= ~COMPOSE; + state->ks_polling = 0; state->ks_state &= LOCK_MASK; /* preserve locking key state */ state->ks_accents = 0; state->ks_composed_char = 0; @@ -1377,9 +1378,9 @@ kbdmux_poll(keyboard_t *kbd, int on) KBDMUX_LOCK(state); if (on) - state->ks_flags |= POLLING; + state->ks_polling++; else - state->ks_flags &= ~POLLING; + state->ks_polling--; /* set poll on slave keyboards */ SLIST_FOREACH(k, &state->ks_kbds, next) From owner-svn-src-stable@freebsd.org Wed Mar 14 07:16:30 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 57EBCF5B26B; Wed, 14 Mar 2018 07:16:30 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0615B714EC; Wed, 14 Mar 2018 07:16:30 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 00E7024D76; Wed, 14 Mar 2018 07:16:30 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E7GTwO057169; Wed, 14 Mar 2018 07:16:29 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E7GT9T057167; Wed, 14 Mar 2018 07:16:29 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140716.w2E7GT9T057167@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 07:16: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: r330912 - stable/11/sys/dev/syscons X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/syscons X-SVN-Commit-Revision: 330912 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 07:16:30 -0000 Author: eadler Date: Wed Mar 14 07:16:29 2018 New Revision: 330912 URL: https://svnweb.freebsd.org/changeset/base/330912 Log: MFC r305121,r305231: Add some locking to sc_cngetc(). Keyboard input needs Giant locking, and that is not possible to do correctly here. Use mtx_trylock() and proceed unlocked as before if we can't acquire Giant (non-recursively), except in kdb mode don't even try to acquire Giant. Everything here is a hack, but it often works. Even if mtx_trylock() succeeds, this might be a LOR. Keyboard input also needs screen locking, to handle screen updates and switches. Add this, using the same simplistic screen locking as for sc_cnputc(). Giant must be acquired before the screen lock, and the screen lock must be dropped when calling the keyboard driver (else it would get a harmless LOR if it tries to acquire Giant). It was intended that sc cn open/close hide the locking calls, and they do for i/o functions functions except for this complication. Non-console keyboard input is still only Giant-locked, with screen locking in some called functions. This is correct for the keyboard parts only. When Giant cannot be acquired properly, atkbd and kbdmux tend to race and work (they assume that the caller acquired Giant properly and don't try to acquire it again or check that it has been acquired, and the races rarely matter), while ukbd tends to deadlock or panic (since it does the opposite, and has other usb threads to deadlock with). The keyboard (Giant) locking here does very little, but the screen locking completes screen locking for console mode except for not detecting or handling deadlock. The log message for the previous commit didn't mention the most the important detail that sc_cngetc() now opens and closes the keyboard on every call again. This was moved from sc_cngetc() to scn_cngrab/ ungrab() in r228644, but the change wasn't quite complete. After fixes for nesting in kbdd_poll() in ukbd and kbdmux, these opens and closes should have no significant effect if done while grabbed. They fix unusual cases when cngetc() is called while not grabbed. This commit is the main fix for screen locking in sc_cnputc(): detect deadlock or likely-deadlock and handle it by buffering the output atomically and printing it later if the deadlock condition clears (and sc_cnputc() is called). The most common deadlock is when the screen lock is held by ourself. Then it would be safe to acquire the lock recursively if the console driver is calling printf() in a safe context, but we don't know when that is. It is not safe to ignore the lock even in kdb or panic mode. But ignore it in panic mode. The only other known case of deadlock is when another thread holds the lock but is running on a stopped CPU. Detect that case approximately by using trylock and retrying for 1000 usec. On a 4 GHz CPU, 100 usec is almost long enough -- screen switches take slightly longer than that. Not retrying at all is good enough except for stress tests, and planned future versions will extend the timeout so that the stress tests work better. To see the behaviour when deadlock is detected, single step through sctty_outwakeup() (or sc_puts() to start with deadlock). Another (serial) console is needed to the buffered-only output, but the keyboard works in this context to continue or step out of the deadlocked region. The buffer is not large enough to hold all the output for this. Modified: stable/11/sys/dev/syscons/syscons.c stable/11/sys/dev/syscons/syscons.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/syscons/syscons.c ============================================================================== --- stable/11/sys/dev/syscons/syscons.c Wed Mar 14 07:11:33 2018 (r330911) +++ stable/11/sys/dev/syscons/syscons.c Wed Mar 14 07:16:29 2018 (r330912) @@ -1651,20 +1651,68 @@ sc_cnterm(struct consdev *cp) static void sccnclose(sc_softc_t *sc, struct sc_cnstate *sp); static int sc_cngetc_locked(struct sc_cnstate *sp); +static void sccnkbdlock(sc_softc_t *sc, struct sc_cnstate *sp); +static void sccnkbdunlock(sc_softc_t *sc, struct sc_cnstate *sp); static void sccnopen(sc_softc_t *sc, struct sc_cnstate *sp, int flags); static void sccnscrlock(sc_softc_t *sc, struct sc_cnstate *sp); static void sccnscrunlock(sc_softc_t *sc, struct sc_cnstate *sp); static void +sccnkbdlock(sc_softc_t *sc, struct sc_cnstate *sp) +{ + /* + * Locking method: hope for the best. + * The keyboard is supposed to be Giant locked. We can't handle that + * in general. The kdb_active case here is not safe, and we will + * proceed without the lock in all cases. + */ + sp->kbd_locked = !kdb_active && mtx_trylock(&Giant); +} + +static void +sccnkbdunlock(sc_softc_t *sc, struct sc_cnstate *sp) +{ + if (sp->kbd_locked) + mtx_unlock(&Giant); + sp->kbd_locked = FALSE; +} + +static void sccnscrlock(sc_softc_t *sc, struct sc_cnstate *sp) { - SC_VIDEO_LOCK(sc); + int retries; + + /** + * Locking method: + * - if kdb_active and video_mtx is not owned by anyone, then lock + * by kdb remaining active + * - if !kdb_active, try to acquire video_mtx without blocking or + * recursing; if we get it then it works normally. + * Note that video_mtx is especially unusable if we already own it, + * since then it is protecting something and syscons is not reentrant + * enough to ignore the protection even in the kdb_active case. + */ + if (kdb_active) { + sp->kdb_locked = sc->video_mtx.mtx_lock == MTX_UNOWNED || panicstr; + sp->mtx_locked = FALSE; + } else { + sp->kdb_locked = FALSE; + for (retries = 0; retries < 1000; retries++) { + sp->mtx_locked = mtx_trylock_spin_flags(&sc->video_mtx, + MTX_QUIET) != 0 || panicstr; + if (sp->mtx_locked) + break; + DELAY(1); + } + } } static void sccnscrunlock(sc_softc_t *sc, struct sc_cnstate *sp) { - SC_VIDEO_UNLOCK(sc); + if (sp->mtx_locked) + mtx_unlock_spin(&sc->video_mtx); + sp->mtx_locked = sp->kdb_locked = FALSE; } static void @@ -1676,11 +1724,14 @@ sccnopen(sc_softc_t *sc, struct sc_cnstate *sp, int fl sp->kbd_opened = FALSE; sp->scr_opened = FALSE; + sp->kbd_locked = FALSE; /* Opening the keyboard is optional. */ if (!(flags & 1) || sc->kbd == NULL) goto over_keyboard; + sccnkbdlock(sc, sp); + /* * Make sure the keyboard is accessible even when the kbd device * driver is disabled. @@ -1698,6 +1749,8 @@ over_keyboard: ; /* The screen is opened iff locking it succeeds. */ sccnscrlock(sc, sp); + if (!sp->kdb_locked && !sp->mtx_locked) + return; sp->scr_opened = TRUE; /* The screen switch is optional. */ @@ -1728,6 +1781,7 @@ sccnclose(sc_softc_t *sc, struct sc_cnstate *sp) kbdd_disable(sc->kbd); sp->kbd_opened = FALSE; + sccnkbdunlock(sc, sp); } /* @@ -1753,6 +1807,7 @@ sc_cngrab(struct consdev *cp) if (lev >= 0 && lev < 2) { sccnopen(sc, &sc->grab_state[lev], 1 | 2); sccnscrunlock(sc, &sc->grab_state[lev]); + sccnkbdunlock(sc, &sc->grab_state[lev]); } } @@ -1765,12 +1820,17 @@ sc_cnungrab(struct consdev *cp) sc = sc_console->sc; lev = atomic_load_acq_int(&sc->grab_level) - 1; if (lev >= 0 && lev < 2) { + sccnkbdlock(sc, &sc->grab_state[lev]); sccnscrlock(sc, &sc->grab_state[lev]); sccnclose(sc, &sc->grab_state[lev]); } atomic_add_int(&sc->grab_level, -1); } +static char sc_cnputc_log[0x1000]; +static u_int sc_cnputc_loghead; +static u_int sc_cnputc_logtail; + static void sc_cnputc(struct consdev *cd, int c) { @@ -1782,12 +1842,28 @@ sc_cnputc(struct consdev *cd, int c) struct tty *tp; #endif #endif /* !SC_NO_HISTORY */ + u_int head; int s; /* assert(sc_console != NULL) */ sccnopen(scp->sc, &st, 0); + /* + * Log the output. + * + * In the unlocked case, the logging is intentionally only + * perfectly atomic for the indexes. + */ + head = atomic_fetchadd_int(&sc_cnputc_loghead, 1); + sc_cnputc_log[head % sizeof(sc_cnputc_log)] = c; + + /* + * If we couldn't open, return to defer output. + */ + if (!st.scr_opened) + return; + #ifndef SC_NO_HISTORY if (scp == scp->sc->cur_scp && scp->status & SLKED) { scp->status &= ~SLKED; @@ -1815,8 +1891,14 @@ sc_cnputc(struct consdev *cd, int c) } #endif /* !SC_NO_HISTORY */ - buf[0] = c; - sc_puts(scp, buf, 1, 1); + /* Play any output still in the log (our char may already be done). */ + while (sc_cnputc_logtail != atomic_load_acq_int(&sc_cnputc_loghead)) { + buf[0] = sc_cnputc_log[sc_cnputc_logtail++ % sizeof(sc_cnputc_log)]; + if (atomic_load_acq_int(&sc_cnputc_loghead) - sc_cnputc_logtail >= + sizeof(sc_cnputc_log)) + continue; + sc_puts(scp, buf, 1, 1); + } s = spltty(); /* block sckbdevent and scrn_timer */ sccnupdate(scp); @@ -1827,16 +1909,20 @@ sc_cnputc(struct consdev *cd, int c) static int sc_cngetc(struct consdev *cd) { + struct sc_cnstate st; int c, s; /* assert(sc_console != NULL) */ + sccnopen(sc_console->sc, &st, 1); s = spltty(); /* block sckbdevent and scrn_timer while we poll */ - if (sc_console->sc->kbd == NULL) { + if (!st.kbd_opened) { splx(s); - return -1; + sccnclose(sc_console->sc, &st); + return -1; /* means no keyboard since we fudged the locking */ } - c = sc_cngetc_locked(NULL); + c = sc_cngetc_locked(&st); splx(s); + sccnclose(sc_console->sc, &st); return c; } @@ -1853,14 +1939,16 @@ sc_cngetc_locked(struct sc_cnstate *sp) * Stop the screen saver and update the screen if necessary. * What if we have been running in the screen saver code... XXX */ - sc_touch_scrn_saver(); + if (sp->scr_opened) + sc_touch_scrn_saver(); scp = sc_console->sc->cur_scp; /* XXX */ - sccnupdate(scp); + if (sp->scr_opened) + sccnupdate(scp); if (fkeycp < fkey.len) return fkey.str[fkeycp++]; - c = scgetc(scp->sc, SCGETC_CN | SCGETC_NONBLOCK, NULL); + c = scgetc(scp->sc, SCGETC_CN | SCGETC_NONBLOCK, sp); switch (KEYFLAGS(c)) { case 0: /* normal char */ @@ -3466,7 +3554,11 @@ next_code: scp = sc->cur_scp; /* first see if there is something in the keyboard port */ for (;;) { + if (flags & SCGETC_CN) + sccnscrunlock(sc, sp); c = kbdd_read_char(sc->kbd, !(flags & SCGETC_NONBLOCK)); + if (flags & SCGETC_CN) + sccnscrlock(sc, sp); if (c == ERRKEY) { if (!(flags & SCGETC_CN)) sc_bell(scp, bios_value.bell_pitch, BELL_DURATION); Modified: stable/11/sys/dev/syscons/syscons.h ============================================================================== --- stable/11/sys/dev/syscons/syscons.h Wed Mar 14 07:11:33 2018 (r330911) +++ stable/11/sys/dev/syscons/syscons.h Wed Mar 14 07:16:29 2018 (r330912) @@ -192,6 +192,9 @@ struct scr_stat; struct tty; struct sc_cnstate { + u_char kbd_locked; + u_char kdb_locked; + u_char mtx_locked; u_char kbd_opened; u_char scr_opened; }; From owner-svn-src-stable@freebsd.org Wed Mar 14 07:30:59 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EB196F5BED4; Wed, 14 Mar 2018 07:30:58 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A03F771D99; Wed, 14 Mar 2018 07:30:58 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9B37E24F27; Wed, 14 Mar 2018 07:30:58 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E7UwR7062315; Wed, 14 Mar 2018 07:30:58 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E7Uw8L062312; Wed, 14 Mar 2018 07:30:58 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140730.w2E7Uw8L062312@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 07:30: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: r330913 - stable/11/sys/dev/syscons X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/syscons X-SVN-Commit-Revision: 330913 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 07:30:59 -0000 Author: eadler Date: Wed Mar 14 07:30:58 2018 New Revision: 330913 URL: https://svnweb.freebsd.org/changeset/base/330913 Log: MFC r314641,r314646,r314997,r315390: 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. 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: stable/11/sys/dev/syscons/scterm-teken.c stable/11/sys/dev/syscons/syscons.c stable/11/sys/dev/syscons/syscons.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/syscons/scterm-teken.c ============================================================================== --- stable/11/sys/dev/syscons/scterm-teken.c Wed Mar 14 07:16:29 2018 (r330912) +++ stable/11/sys/dev/syscons/scterm-teken.c Wed Mar 14 07:30:58 2018 (r330913) @@ -178,7 +178,7 @@ scteken_puts(scr_stat *scp, u_char *buf, int len, int 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: stable/11/sys/dev/syscons/syscons.c ============================================================================== --- stable/11/sys/dev/syscons/syscons.c Wed Mar 14 07:16:29 2018 (r330912) +++ stable/11/sys/dev/syscons/syscons.c Wed Mar 14 07:30:58 2018 (r330913) @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -102,6 +103,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; @@ -143,6 +146,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"); @@ -263,6 +268,62 @@ static struct cdevsw consolectl_devsw = { .d_name = "consolectl", }; +/* ec -- emergency console. */ + +static u_int ec_scroffset; + +static void +ec_putc(int c) +{ + uintptr_t fb; + u_short *scrptr; + u_int ind; + int attr, column, mysize, width, xsize, yborder, ysize; + + if (c < 0 || c > 0xff || c == '\a') + return; + if (sc_console == NULL) { +#if !defined(__amd64__) && !defined(__i386__) + return; +#endif + /* + * This is enough for ec_putc() to work very early on x86 + * if the kernel starts in normal color text mode. + */ + fb = 0xb8000; + xsize = 80; + ysize = 25; + } else { + if (main_console.status & GRAPHICS_MODE) + return; + fb = main_console.sc->adp->va_window; + xsize = main_console.xsize; + ysize = main_console.ysize; + } + yborder = ysize / 5; + scrptr = (u_short *)(void *)fb + 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); +} + int sc_probe_unit(int unit, int flags) { @@ -1859,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) { @@ -3009,8 +3073,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; /* @@ -4024,6 +4096,12 @@ sc_bell(scr_stat *scp, int pitch, int duration) pitch *= 2; sysbeep(1193182 / pitch, duration); } +} + +int +sc_kattr(void) +{ + return (sc_kattrtab[PCPU_GET(cpuid) % nitems(sc_kattrtab)]); } static void Modified: stable/11/sys/dev/syscons/syscons.h ============================================================================== --- stable/11/sys/dev/syscons/syscons.h Wed Mar 14 07:16:29 2018 (r330912) +++ stable/11/sys/dev/syscons/syscons.h Wed Mar 14 07:30:58 2018 (r330913) @@ -591,6 +591,7 @@ void sc_paste(scr_stat *scp, const u_char *p, int cou 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-stable@freebsd.org Wed Mar 14 07:32:49 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7CC8E297; Wed, 14 Mar 2018 07:32:49 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2F3AE72178; Wed, 14 Mar 2018 07:32:49 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 29FAA25083; Wed, 14 Mar 2018 07:32:49 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E7WmfB066895; Wed, 14 Mar 2018 07:32:48 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E7WmtD066894; Wed, 14 Mar 2018 07:32:48 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140732.w2E7WmtD066894@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 07:32:48 +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: r330914 - stable/11/sys/dev/syscons X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/syscons X-SVN-Commit-Revision: 330914 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 07:32:49 -0000 Author: eadler Date: Wed Mar 14 07:32:48 2018 New Revision: 330914 URL: https://svnweb.freebsd.org/changeset/base/330914 Log: MFC r315000: Start fixing some bugs in attribute handling. This change just does cleanups missed in r56043 17 years ago. The default attributes were still stored in structs for the purpose of changing them and passing around pointers to the defaults, but r56043 added another layer that made the defaults invariant and only used for initialization and reset. Just use the defaults directly. This was already done for the kernel defaults. The defaults for reverse attributes aren't actually used, but are ignored in layers that no longer support them. Modified: stable/11/sys/dev/syscons/syscons.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/syscons/syscons.c ============================================================================== --- stable/11/sys/dev/syscons/syscons.c Wed Mar 14 07:30:58 2018 (r330913) +++ stable/11/sys/dev/syscons/syscons.c Wed Mar 14 07:32:48 2018 (r330914) @@ -93,16 +93,6 @@ __FBSDID("$FreeBSD$"); /* NULL-safe version of "tty_opened()" */ #define tty_opened_ns(tp) ((tp) != NULL && tty_opened(tp)) -typedef struct default_attr { - int std_color; /* normal hardware color */ - int rev_color; /* reverse hardware color */ -} default_attr; - -static default_attr user_default = { - SC_NORM_ATTR, - SC_NORM_REV_ATTR, -}; - static u_char sc_kattrtab[MAXCPU]; static int sc_console_unit = -1; @@ -3170,9 +3160,7 @@ scinit(int unit, int flags) if (sc_init_emulator(scp, SC_DFLT_TERM)) sc_init_emulator(scp, "*"); - (*scp->tsw->te_default_attr)(scp, - user_default.std_color, - user_default.rev_color); + (*scp->tsw->te_default_attr)(scp, SC_NORM_ATTR, SC_NORM_REV_ATTR); } else { /* assert(sc_malloc) */ sc->dev = malloc(sizeof(struct tty *)*sc->vtys, M_DEVBUF, @@ -3589,8 +3577,7 @@ sc_init_emulator(scr_stat *scp, char *name) scp->rndr = rndr; scp->rndr->init(scp); - /* XXX */ - (*sw->te_default_attr)(scp, user_default.std_color, user_default.rev_color); + (*sw->te_default_attr)(scp, SC_NORM_ATTR, SC_NORM_REV_ATTR); sc_clear_screen(scp); return 0; From owner-svn-src-stable@freebsd.org Wed Mar 14 07:39:29 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6AC39921; Wed, 14 Mar 2018 07:39:29 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1BD78724D4; Wed, 14 Mar 2018 07:39:29 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 120FD25087; Wed, 14 Mar 2018 07:39:29 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E7dSKS067187; Wed, 14 Mar 2018 07:39:28 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E7dSEl067184; Wed, 14 Mar 2018 07:39:28 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140739.w2E7dSEl067184@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 07:39: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: r330915 - stable/11/sys/dev/syscons X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/syscons X-SVN-Commit-Revision: 330915 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 07:39:29 -0000 Author: eadler Date: Wed Mar 14 07:39:28 2018 New Revision: 330915 URL: https://svnweb.freebsd.org/changeset/base/330915 Log: MFC r315003,r315065,r315066: Rename scteken_revattr() to scteken_sc_to_te_attr(). scteken_revattr() looked like it might handle reverse attributes, but it actually handles conversion of attributes in the direction indicated by the new name. Reverse attributes are just broken. Rename scteken_attr() to scteken_te_to_sc_attr(). scteken_attr() looked like it might give teken attributes, but it actually gives sc attributes. Change scteken_te_to_sc_attr() to return int instead of unsigned int. u_char would be enough, and it promotes to int, and syscons uses int or u_short for its attributes everywhere else (u_short holds a shifted form and it promotes to int too). Add a scteken_set_cursor() (sc to teken) method and use it to fix some cases of initialization and resetting of the teken cursor position. (This bad name is consistent with others, but it is too easy to confuse with scteken_cursor() which goes in the opposite direction.) The following cases were broken: - for booting without a syscons console, the teken and sc positions for ttyv0 were (0, 0), but are supposed to be somewhere in the middle of the screen (after carefully preserved BIOS and loader messages) (at least if there is no mode switch that loses the messages). - after mode switches, the screen is cleared and the cursor is supposed to be moved to (0, 0), but it was only moved there for sc. The following case was hacked to work: - for booting with a syscons console, it was arranged that scteken_init() for the console could see a nonzero cursor position and adjust, although this broke the sc seeing it in the non-console case above. Fix the attribute for scteken_clear() (change it back from the user user default normal attribute to the current attribute). This change only fixes a logic error. scterm_clear() used to be used for terminal reset, but teken uses a general fill function for that, leaving scterm_clear() only used for initialization and mode change, when using the user default attribute is correct. It is not really a terminal function, but needs to sync its changes with the terminal layer. Syncing of the attribute is currently broken for terminal reset, but works for initialization and mode change. Modified: stable/11/sys/dev/syscons/scterm-teken.c stable/11/sys/dev/syscons/syscons.c stable/11/sys/dev/syscons/syscons.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/syscons/scterm-teken.c ============================================================================== --- stable/11/sys/dev/syscons/scterm-teken.c Wed Mar 14 07:32:48 2018 (r330914) +++ stable/11/sys/dev/syscons/scterm-teken.c Wed Mar 14 07:39:28 2018 (r330915) @@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$"); #include -static void scteken_revattr(unsigned char, teken_attr_t *); -static unsigned int scteken_attr(const teken_attr_t *); +static void scteken_sc_to_te_attr(unsigned char, teken_attr_t *); +static int scteken_te_to_sc_attr(const teken_attr_t *); static sc_term_init_t scteken_init; static sc_term_term_t scteken_term; @@ -64,6 +64,7 @@ static sc_term_default_attr_t scteken_default_attr; static sc_term_clear_t scteken_clear; static sc_term_input_t scteken_input; static sc_term_fkeystr_t scteken_fkeystr; +static sc_term_set_cursor_t scteken_set_cursor; static void scteken_nop(void); typedef struct { @@ -90,6 +91,7 @@ static sc_term_sw_t sc_term_scteken = { (sc_term_notify_t *)scteken_nop, scteken_input, scteken_fkeystr, + scteken_set_cursor, }; SCTERM_MODULE(scteken, sc_term_scteken); @@ -142,13 +144,6 @@ scteken_init(scr_stat *scp, void **softc, int code) tp.tp_row = scp->ysize; tp.tp_col = scp->xsize; teken_set_winsize(&ts->ts_teken, &tp); - - if (scp->cursor_pos < scp->ysize * scp->xsize) { - /* Valid old cursor position. */ - tp.tp_row = scp->cursor_pos / scp->xsize; - tp.tp_col = scp->cursor_pos % scp->xsize; - teken_set_cursor(&ts->ts_teken, &tp); - } break; } @@ -178,7 +173,7 @@ scteken_puts(scr_stat *scp, u_char *buf, int len, int if (kernel) { /* Use special colors for kernel messages. */ backup = *teken_get_curattr(&ts->ts_teken); - scteken_revattr(sc_kattr(), &kattr); + scteken_sc_to_te_attr(sc_kattr(), &kattr); teken_set_curattr(&ts->ts_teken, &kattr); teken_input(&ts->ts_teken, buf, len); teken_set_curattr(&ts->ts_teken, &backup); @@ -195,19 +190,19 @@ scteken_ioctl(scr_stat *scp, struct tty *tp, u_long cm { teken_stat *ts = scp->ts; vid_info_t *vi; - unsigned int attr; + int attr; switch (cmd) { case GIO_ATTR: /* get current attributes */ *(int*)data = - scteken_attr(teken_get_curattr(&ts->ts_teken)); + scteken_te_to_sc_attr(teken_get_curattr(&ts->ts_teken)); return (0); case CONS_GETINFO: /* get current (virtual) console info */ vi = (vid_info_t *)data; if (vi->size != sizeof(struct vid_info)) return EINVAL; - attr = scteken_attr(teken_get_defattr(&ts->ts_teken)); + attr = scteken_te_to_sc_attr(teken_get_defattr(&ts->ts_teken)); vi->mv_norm.fore = attr & 0x0f; vi->mv_norm.back = (attr >> 4) & 0x0f; vi->mv_rev.fore = vi->mv_norm.back; @@ -227,16 +222,20 @@ scteken_default_attr(scr_stat *scp, int color, int rev teken_stat *ts = scp->ts; teken_attr_t ta; - scteken_revattr(color, &ta); + scteken_sc_to_te_attr(color, &ta); teken_set_defattr(&ts->ts_teken, &ta); } static void scteken_clear(scr_stat *scp) { + teken_stat *ts = scp->ts; sc_move_cursor(scp, 0, 0); - sc_vtb_clear(&scp->vtb, scp->sc->scr_map[0x20], SC_NORM_ATTR << 8); + scteken_set_cursor(scp, 0, 0); + sc_vtb_clear(&scp->vtb, scp->sc->scr_map[0x20], + scteken_te_to_sc_attr(teken_get_curattr(&ts->ts_teken)) + << 8); mark_all(scp); } @@ -298,6 +297,17 @@ scteken_fkeystr(scr_stat *scp, int c) } static void +scteken_set_cursor(scr_stat *scp, int col, int row) +{ + teken_stat *ts = scp->ts; + teken_pos_t tp; + + tp.tp_col = col; + tp.tp_row = row; + teken_set_cursor(&ts->ts_teken, &tp); +} + +static void scteken_nop(void) { @@ -323,7 +333,7 @@ static const unsigned char bgcolors[TC_NCOLORS] = { }; static void -scteken_revattr(unsigned char color, teken_attr_t *a) +scteken_sc_to_te_attr(unsigned char color, teken_attr_t *a) { teken_color_t fg, bg; @@ -362,10 +372,10 @@ scteken_revattr(unsigned char color, teken_attr_t *a) } } -static unsigned int -scteken_attr(const teken_attr_t *a) +static int +scteken_te_to_sc_attr(const teken_attr_t *a) { - unsigned int attr = 0; + int attr = 0; teken_color_t fg, bg; if (a->ta_format & TF_REVERSE) { @@ -560,7 +570,7 @@ scteken_putchar(void *arg, const teken_pos_t *tp, teke * characters. Simply print a space and assume that the left * hand side describes the entire character. */ - attr = scteken_attr(a) << 8; + attr = scteken_te_to_sc_attr(a) << 8; if (a->ta_format & TF_CJK_RIGHT) c = ' '; #ifdef TEKEN_UTF8 @@ -592,7 +602,7 @@ scteken_fill(void *arg, const teken_rect_t *r, teken_c unsigned int width; int attr, row; - attr = scteken_attr(a) << 8; + attr = scteken_te_to_sc_attr(a) << 8; #ifdef TEKEN_UTF8 scteken_get_cp437(&c, &attr); #endif /* TEKEN_UTF8 */ Modified: stable/11/sys/dev/syscons/syscons.c ============================================================================== --- stable/11/sys/dev/syscons/syscons.c Wed Mar 14 07:32:48 2018 (r330914) +++ stable/11/sys/dev/syscons/syscons.c Wed Mar 14 07:39:28 2018 (r330915) @@ -3148,16 +3148,6 @@ scinit(int unit, int flags) init_scp(sc, sc->first_vty, scp); sc_vtb_init(&scp->vtb, VTB_MEMORY, scp->xsize, scp->ysize, (void *)sc_buffer, FALSE); - - /* move cursors to the initial positions */ - if (col >= scp->xsize) - col = 0; - if (row >= scp->ysize) - row = scp->ysize - 1; - scp->xpos = col; - scp->ypos = row; - scp->cursor_pos = scp->cursor_oldpos = row*scp->xsize + col; - if (sc_init_emulator(scp, SC_DFLT_TERM)) sc_init_emulator(scp, "*"); (*scp->tsw->te_default_attr)(scp, SC_NORM_ATTR, SC_NORM_REV_ATTR); @@ -3179,6 +3169,17 @@ scinit(int unit, int flags) sc_vtb_copy(&scp->scr, 0, &scp->vtb, 0, scp->xsize*scp->ysize); #endif + /* Sync h/w cursor position to s/w (sc and teken). */ + if (col >= scp->xsize) + col = 0; + if (row >= scp->ysize) + row = scp->ysize - 1; + scp->xpos = col; + scp->ypos = row; + scp->cursor_pos = scp->cursor_oldpos = row*scp->xsize + col; + (*scp->tsw->te_set_cursor)(scp, col, row); + + /* Sync BIOS cursor shape to s/w (sc only). */ if (bios_value.cursor_end < scp->font_size) sc->dflt_curs_attr.base = scp->font_size - bios_value.cursor_end - 1; Modified: stable/11/sys/dev/syscons/syscons.h ============================================================================== --- stable/11/sys/dev/syscons/syscons.h Wed Mar 14 07:32:48 2018 (r330914) +++ stable/11/sys/dev/syscons/syscons.h Wed Mar 14 07:39:28 2018 (r330915) @@ -404,6 +404,7 @@ typedef void sc_term_notify_t(scr_stat *scp, int event #define SC_TE_NOTIFY_VTSWITCH_OUT 1 typedef int sc_term_input_t(scr_stat *scp, int c, struct tty *tp); typedef const char *sc_term_fkeystr_t(scr_stat *scp, int c); +typedef void sc_term_set_cursor_t(scr_stat *scp, int col, int row); typedef struct sc_term_sw { LIST_ENTRY(sc_term_sw) link; @@ -422,6 +423,7 @@ typedef struct sc_term_sw { sc_term_notify_t *te_notify; sc_term_input_t *te_input; sc_term_fkeystr_t *te_fkeystr; + sc_term_set_cursor_t *te_set_cursor; } sc_term_sw_t; #define SCTERM_MODULE(name, sw) \ From owner-svn-src-stable@freebsd.org Wed Mar 14 07:47:27 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9CE486134; Wed, 14 Mar 2018 07:47:27 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 395BD72A41; Wed, 14 Mar 2018 07:47:27 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2FF5E25217; Wed, 14 Mar 2018 07:47:27 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E7lRPR072354; Wed, 14 Mar 2018 07:47:27 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E7lQxb072344; Wed, 14 Mar 2018 07:47:26 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140747.w2E7lQxb072344@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 07:47: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: r330916 - in stable/11/sys: dev/syscons dev/vt kern teken teken/libteken X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: in stable/11/sys: dev/syscons dev/vt kern teken teken/libteken X-SVN-Commit-Revision: 330916 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 07:47:28 -0000 Author: eadler Date: Wed Mar 14 07:47:26 2018 New Revision: 330916 URL: https://svnweb.freebsd.org/changeset/base/330916 Log: MFC r315418,r315480,r316019: Add teken_256to16() to convert xterm-256 256-color codes to xterm 16-color codes. This will be used to fix bright colors. Improve teken_256to8(). Use a lookup table instead of calculations. The calculations were inaccurate since they used indexes into the xterm-256 6x6x6 color map instead of actual xterm colors. Also, change the threshold for converting to a primary color: require the primary's component to be 2 or more higher instead of just higher. This affects about 1/5 of the table entries and gives uniformly distributed colors in the 6x6x6 submap except for greys (35 entries each for red, green, blue, cyan, brown and magenta, instead of approx. only 15 each for the mixed colors). Even more mixed colors would be better for matching colors, but uniform distribution is best for preserving contrast. For teken_256to16(), bright colors are just the ones with luminosity >= 60%. These are actually light colors (more white instead of more saturation), while xterm bright colors except for white itself are actually saturated with no white, so have luminosity only 50%. These functions are layering violations. teken cannot do correct conversions since it shouldn't know the color maps of anything except xterm. Translating through xterm-16 colors loses information. This gives bugs like xterm-256 near-brown -> xterm-16 red -> VGA red. ------------------------------------------------------------------------ r315480 | bde | 2017-03-18 11:13:54 +0000 (Sat, 18 Mar 2017) | 51 lines Fix bright colors for syscons, and make them work for the first time for vt. Restore syscons' rendering of background (bg) brightness as foreground (fg) blinking and vice versa, and add rendering of blinking as background brightness to vt. Bright/saturated is conflated with light/white in the implementation and in this description. Bright colors were broken in all cases, but appeared to work in the only case shown by "vidcontrol show". A boldness hack was applied only in 1 layering-violation place (for some syscons sequences) where it made some cases seem to work but was undone by clearing bold using ANSI sequences, and more seriously was not undone when setting ANSI/xterm dark colors so left them bright. Move this hack to drivers. The boldness hack is only for fg brightness. Restore/add a similar hack for bg brightness rendered as fg blinking and vice versa. This works even better for vt, since vt changes the default text mode to give the more useful bg brightness instead of fg blinking. The brightness bit in colors was unnecessarily removed by the boldness hack. In other cases, it was lost later by teken_256to8(). Use teken_256to16() to not lose it. teken_256to8() was intended to be used for bg colors to allow finer or bg-specific control for the more difficult reduction to 8; however, since 16 bg colors actually work on VGA except in syscons text mode and the conversion isn't subtle enough to significantly in that mode, teken_256to8() is not used now. There are still bugs, especially in vidcontrol, if bright/blinking background colors are set. Restore XOR logic for bold/bright fg in syscons (don't change OR logic for vt). Remove broken ifdef on FG_UNDERLINE and its wrong or missing bit and restore the correct hard-coded bit. FG_UNDERLINE is only for mono mode which is not really supported. Restore XOR logic for blinking/bright bg in syscons (in vt, add OR logic and render as bright bg). Remove related broken ifdef on BG_BLINKING and its missing bit and restore the correct hard-coded bit. The same bit means blinking or bright bg depending on the mode, and we want to ignore the difference everywhere. Simplify conversions of attributes in syscons. Don't pretend to support bold fonts. Don't support unusual encodings of brightness. It is as good as possible to map 16 VGA colors to 16 xterm-16 colors. E.g., VGA brown -> xterm-16 Olive will be converted back to VGA brown, so we don't need to convert to xterm-256 Brown. Teken cons25 compatibility code already does the same, and duplicates some small tables. This is mostly for the sc -> te direction. The other direction uses teken_256to16() which is too generic. ------------------------------------------------------------------------ r316019 | bde | 2017-03-27 10:48:28 +0000 (Mon, 27 Mar 2017) | 30 lines Oops, my fix for bright colors broke bright black some more (in cases that used to work via the bold hack). Fix the table entry for bright black. Fix spelling of plain black in nearby table entries (use the macro for black everywhere everywhere). Fix the currently-unused non-bright color table to not have bright colors in entries 9-15. Improve nearby comments. Start converting to the xterm terminology and default rendering of "bright" instead of "light" for bright colors. Syscons wasn't affected by the bug since I optimized it a little by converting colors 0-15 directly. This also fixes the layering of the conversion for these colors. Apply the same optimization to vt (actually the layer above it). This also moves the conversion 1 closer to the correct layer for colors 0-15. The optimization of just avoiding 2 calls to a trivial function is worth about 10% for simple output to the virtual buffer with occasional rendering. The optimization is so large because the 2 calls are done on every character, so although there are too many other calls and other instructions per character, there are only about 10 times as many. Old versions of syscons were about 10 times faster for simple output, by using a fast path with about 12 instructions per character. Rendering to even slow hardware takes relatively little time provided it is rarely actually done. Modified: stable/11/sys/dev/syscons/scterm-teken.c stable/11/sys/dev/vt/vt_core.c stable/11/sys/kern/subr_terminal.c stable/11/sys/teken/libteken/teken.3 stable/11/sys/teken/teken.c stable/11/sys/teken/teken.h stable/11/sys/teken/teken_subr_compat.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/syscons/scterm-teken.c ============================================================================== --- stable/11/sys/dev/syscons/scterm-teken.c Wed Mar 14 07:39:28 2018 (r330915) +++ stable/11/sys/dev/syscons/scterm-teken.c Wed Mar 14 07:47:26 2018 (r330916) @@ -317,88 +317,57 @@ scteken_nop(void) * libteken routines. */ -static const unsigned char fgcolors_normal[TC_NCOLORS] = { - FG_BLACK, FG_RED, FG_GREEN, FG_BROWN, - FG_BLUE, FG_MAGENTA, FG_CYAN, FG_LIGHTGREY, +static const teken_color_t sc_to_te_color[] = { + TC_BLACK, TC_BLUE, TC_GREEN, TC_CYAN, + TC_RED, TC_MAGENTA, TC_BROWN, TC_WHITE, }; -static const unsigned char fgcolors_bold[TC_NCOLORS] = { - FG_DARKGREY, FG_LIGHTRED, FG_LIGHTGREEN, FG_YELLOW, - FG_LIGHTBLUE, FG_LIGHTMAGENTA, FG_LIGHTCYAN, FG_WHITE, +static const unsigned char te_to_sc_color[] = { + FG_BLACK, FG_RED, FG_GREEN, FG_BROWN, + FG_BLUE, FG_MAGENTA, FG_CYAN, FG_LIGHTGREY, }; -static const unsigned char bgcolors[TC_NCOLORS] = { - BG_BLACK, BG_RED, BG_GREEN, BG_BROWN, - BG_BLUE, BG_MAGENTA, BG_CYAN, BG_LIGHTGREY, -}; - static void scteken_sc_to_te_attr(unsigned char color, teken_attr_t *a) { - teken_color_t fg, bg; /* - * XXX: Reverse conversion of syscons to teken attributes. Not - * realiable. Maybe we should turn it into a 1:1 mapping one of - * these days? + * Conversions of attrs are not reversible. Since sc attrs are + * pure colors in the simplest mode (16-color graphics) and the + * API is too deficient to tell us the mode, always convert to + * pure colors. The conversion is essentially the identity except + * for reordering the non-brightness bits in the 2 color numbers. */ - a->ta_format = 0; - a->ta_fgcolor = TC_WHITE; - a->ta_bgcolor = TC_BLACK; - -#ifdef FG_BLINK - if (color & FG_BLINK) { - a->ta_format |= TF_BLINK; - color &= ~FG_BLINK; - } -#endif /* FG_BLINK */ - - for (fg = 0; fg < TC_NCOLORS; fg++) { - for (bg = 0; bg < TC_NCOLORS; bg++) { - if ((fgcolors_normal[fg] | bgcolors[bg]) == color) { - a->ta_fgcolor = fg; - a->ta_bgcolor = bg; - return; - } - - if ((fgcolors_bold[fg] | bgcolors[bg]) == color) { - a->ta_fgcolor = fg; - a->ta_bgcolor = bg; - a->ta_format |= TF_BOLD; - return; - } - } - } + a->ta_fgcolor = sc_to_te_color[color & 7] | (color & 8); + a->ta_bgcolor = sc_to_te_color[(color >> 4) & 7] | ((color >> 4) & 8); } static int scteken_te_to_sc_attr(const teken_attr_t *a) { - int attr = 0; + int attr; teken_color_t fg, bg; if (a->ta_format & TF_REVERSE) { - fg = teken_256to8(a->ta_bgcolor); - bg = teken_256to8(a->ta_fgcolor); + fg = a->ta_bgcolor; + bg = a->ta_fgcolor; } else { - fg = teken_256to8(a->ta_fgcolor); - bg = teken_256to8(a->ta_bgcolor); + fg = a->ta_fgcolor; + bg = a->ta_bgcolor; } - if (a->ta_format & TF_BOLD) - attr |= fgcolors_bold[fg]; - else - attr |= fgcolors_normal[fg]; - attr |= bgcolors[bg]; + if (fg >= 16) + fg = teken_256to16(fg); + if (bg >= 16) + bg = teken_256to16(bg); + attr = te_to_sc_color[fg & 7] | (fg & 8) | + ((te_to_sc_color[bg & 7] | (bg & 8)) << 4); -#ifdef FG_UNDERLINE - if (a->ta_format & TF_UNDERLINE) - attr |= FG_UNDERLINE; -#endif /* FG_UNDERLINE */ -#ifdef FG_BLINK + /* XXX: underline mapping for Hercules adapter can be better. */ + if (a->ta_format & (TF_BOLD | TF_UNDERLINE)) + attr ^= 8; if (a->ta_format & TF_BLINK) - attr |= FG_BLINK; -#endif /* FG_BLINK */ + attr ^= 0x80; return (attr); } Modified: stable/11/sys/dev/vt/vt_core.c ============================================================================== --- stable/11/sys/dev/vt/vt_core.c Wed Mar 14 07:39:28 2018 (r330915) +++ stable/11/sys/dev/vt/vt_core.c Wed Mar 14 07:47:26 2018 (r330916) @@ -1077,6 +1077,8 @@ vt_determine_colors(term_char_t c, int cursor, if (TCHAR_FORMAT(c) & TF_BOLD) *fg = TCOLOR_LIGHT(*fg); *bg = TCHAR_BGCOLOR(c); + if (TCHAR_FORMAT(c) & TF_BLINK) + *bg = TCOLOR_LIGHT(*bg); if (TCHAR_FORMAT(c) & TF_REVERSE) invert ^= 1; Modified: stable/11/sys/kern/subr_terminal.c ============================================================================== --- stable/11/sys/kern/subr_terminal.c Wed Mar 14 07:39:28 2018 (r330915) +++ stable/11/sys/kern/subr_terminal.c Wed Mar 14 07:47:26 2018 (r330916) @@ -130,9 +130,34 @@ static const teken_attr_t default_message = { .ta_format = TCHAR_FORMAT(TERMINAL_NORM_ATTR) }; +/* Fudge fg brightness as TF_BOLD (shifted). */ +#define TCOLOR_FG_FUDGED(color) __extension__ ({ \ + teken_color_t _c; \ + \ + _c = (color); \ + TCOLOR_FG(_c & 7) | ((_c & 8) << 18); \ +}) + +/* Fudge bg brightness as TF_BLINK (shifted). */ +#define TCOLOR_BG_FUDGED(color) __extension__ ({ \ + teken_color_t _c; \ + \ + _c = (color); \ + TCOLOR_BG(_c & 7) | ((_c & 8) << 20); \ +}) + +#define TCOLOR_256TO16(color) __extension__ ({ \ + teken_color_t _c; \ + \ + _c = (color); \ + if (_c >= 16) \ + _c = teken_256to16(_c); \ + _c; \ +}) + #define TCHAR_CREATE(c, a) ((c) | TFORMAT((a)->ta_format) | \ - TCOLOR_FG(teken_256to8((a)->ta_fgcolor)) | \ - TCOLOR_BG(teken_256to8((a)->ta_bgcolor))) + TCOLOR_FG_FUDGED(TCOLOR_256TO16((a)->ta_fgcolor)) | \ + TCOLOR_BG_FUDGED(TCOLOR_256TO16((a)->ta_bgcolor))) static void terminal_init(struct terminal *tm) Modified: stable/11/sys/teken/libteken/teken.3 ============================================================================== --- stable/11/sys/teken/libteken/teken.3 Wed Mar 14 07:39:28 2018 (r330915) +++ stable/11/sys/teken/libteken/teken.3 Wed Mar 14 07:47:26 2018 (r330916) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 9, 2011 +.Dd Mar 13, 2017 .Dt TEKEN 3 .Os .Sh NAME @@ -57,6 +57,8 @@ .Ft const char * .Fn teken_get_sequence "teken_t *t" "unsigned int id" .Ft teken_color_t +.Fn teken_256to16 "teken_color_t color" +.Ft teken_color_t .Fn teken_256to8 "teken_color_t color" .Ft void .Fn teken_get_defattr_cons25 "teken_t *t" "int *fg" "int *bg" @@ -163,10 +165,22 @@ This library also provides a set of functions that sho any modern applications. .Pp The +.Fn teken_256to16 +function converts an xterm-256 256-color code to an xterm 16-color code +whose color with default palettes is as similar as possible (not very +similar). +The lower 3 bits of the result are the ANSI color and the next lowest +bit is brightness. +Other layers (hardare and software) that only support 16 colors can use +this to avoid knowing the details of 256-color codes. +.Pp +The .Fn teken_256to8 -function converts a color code to one of the 8 primary colors, allowing -the terminal to be rendered on graphics hardware that only supports 8 or -16 colors (e.g. VGA). +function is similar to +.Fn teken_256to16 +except it converts to an ANSI 8-color code. +This is more accurate than discarding the brigtness bit in the result of +.Fn teken_256to16 . .Pp The .Fn teken_get_defattr_cons25 Modified: stable/11/sys/teken/teken.c ============================================================================== --- stable/11/sys/teken/teken.c Wed Mar 14 07:39:28 2018 (r330915) +++ stable/11/sys/teken/teken.c Wed Mar 14 07:47:26 2018 (r330916) @@ -452,55 +452,203 @@ teken_state_numbers(teken_t *t, teken_char_t c) return (0); } +#define k TC_BLACK +#define b TC_BLUE +#define y TC_BROWN +#define c TC_CYAN +#define g TC_GREEN +#define m TC_MAGENTA +#define r TC_RED +#define w TC_WHITE +#define K (TC_BLACK | TC_LIGHT) +#define B (TC_BLUE | TC_LIGHT) +#define Y (TC_BROWN | TC_LIGHT) +#define C (TC_CYAN | TC_LIGHT) +#define G (TC_GREEN | TC_LIGHT) +#define M (TC_MAGENTA | TC_LIGHT) +#define R (TC_RED | TC_LIGHT) +#define W (TC_WHITE | TC_LIGHT) + +/** + * The xterm-256 color map has steps of 0x28 (in the range 0-0xff), except + * for the first step which is 0x5f. Scale to the range 0-6 by dividing + * by 0x28 and rounding down. The range of 0-5 cannot represent the + * larger first step. + * + * This table is generated by the follow rules: + * - if all components are equal, the result is black for (0, 0, 0) and + * (2, 2, 2), else white; otherwise: + * - subtract the smallest component from all components + * - if this gives only one nonzero component, then that is the color + * - else if one component is 2 or more larger than the other nonzero one, + * then that component gives the color + * - else there are 2 nonzero components. The color is that of a small + * equal mixture of these components (cyan, yellow or magenta). E.g., + * (0, 5, 6) (Turquoise2) is a much purer cyan than (0, 2, 3) + * (DeepSkyBlue4), but we map both to cyan since we can't represent + * delicate shades of either blue or cyan and blue would be worse. + * Here it is important that components of 1 never occur. Blue would + * be twice as large as green in (0, 1, 2). + */ +static const teken_color_t teken_256to8tab[] = { + /* xterm normal colors: */ + k, r, g, y, b, m, c, w, + + /* xterm bright colors: */ + k, r, g, y, b, m, c, w, + + /* Red0 submap. */ + k, b, b, b, b, b, + g, c, c, b, b, b, + g, c, c, c, b, b, + g, g, c, c, c, b, + g, g, g, c, c, c, + g, g, g, g, c, c, + + /* Red2 submap. */ + r, m, m, b, b, b, + y, k, b, b, b, b, + y, g, c, c, b, b, + g, g, c, c, c, b, + g, g, g, c, c, c, + g, g, g, g, c, c, + + /* Red3 submap. */ + r, m, m, m, b, b, + y, r, m, m, b, b, + y, y, w, b, b, b, + y, y, g, c, c, b, + g, g, g, c, c, c, + g, g, g, g, c, c, + + /* Red4 submap. */ + r, r, m, m, m, b, + r, r, m, m, m, b, + y, y, r, m, m, b, + y, y, y, w, b, b, + y, y, y, g, c, c, + g, g, g, g, c, c, + + /* Red5 submap. */ + r, r, r, m, m, m, + r, r, r, m, m, m, + r, r, r, m, m, m, + y, y, y, r, m, m, + y, y, y, y, w, b, + y, y, y, y, g, c, + + /* Red6 submap. */ + r, r, r, r, m, m, + r, r, r, r, m, m, + r, r, r, r, m, m, + r, r, r, r, m, m, + y, y, y, y, r, m, + y, y, y, y, y, w, + + /* Grey submap. */ + k, k, k, k, k, k, + k, k, k, k, k, k, + w, w, w, w, w, w, + w, w, w, w, w, w, +}; + +/* + * This table is generated from the previous one by setting TC_LIGHT for + * entries whose luminosity in the xterm256 color map is 60% or larger. + * Thus the previous table is currently not really needed. It will be + * used for different fine tuning of the tables. + */ +static const teken_color_t teken_256to16tab[] = { + /* xterm normal colors: */ + k, r, g, y, b, m, c, w, + + /* xterm bright colors: */ + K, R, G, Y, B, M, C, W, + + /* Red0 submap. */ + k, b, b, b, b, b, + g, c, c, b, b, b, + g, c, c, c, b, b, + g, g, c, c, c, b, + g, g, g, c, c, c, + g, g, g, g, c, c, + + /* Red2 submap. */ + r, m, m, b, b, b, + y, K, b, b, B, B, + y, g, c, c, B, B, + g, g, c, c, C, B, + g, G, G, C, C, C, + g, G, G, G, C, C, + + /* Red3 submap. */ + r, m, m, m, b, b, + y, r, m, m, B, B, + y, y, w, B, B, B, + y, y, G, C, C, B, + g, G, G, C, C, C, + g, G, G, G, C, C, + + /* Red4 submap. */ + r, r, m, m, m, b, + r, r, m, m, M, B, + y, y, R, M, M, B, + y, y, Y, W, B, B, + y, Y, Y, G, C, C, + g, G, G, G, C, C, + + /* Red5 submap. */ + r, r, r, m, m, m, + r, R, R, M, M, M, + r, R, R, M, M, M, + y, Y, Y, R, M, M, + y, Y, Y, Y, W, B, + y, Y, Y, Y, G, C, + + /* Red6 submap. */ + r, r, r, r, m, m, + r, R, R, R, M, M, + r, R, R, R, M, M, + r, R, R, R, M, M, + y, Y, Y, Y, R, M, + y, Y, Y, Y, Y, W, + + /* Grey submap. */ + k, k, k, k, k, k, + K, K, K, K, K, K, + w, w, w, w, w, w, + W, W, W, W, W, W, +}; + +#undef k +#undef b +#undef y +#undef c +#undef g +#undef m +#undef r +#undef w +#undef K +#undef B +#undef Y +#undef C +#undef G +#undef M +#undef R +#undef W + teken_color_t teken_256to8(teken_color_t c) { - unsigned int r, g, b; - if (c < 16) { - /* Traditional color indices. */ - return (c % 8); - } else if (c >= 244) { - /* Upper grayscale colors. */ - return (TC_WHITE); - } else if (c >= 232) { - /* Lower grayscale colors. */ - return (TC_BLACK); - } + return (teken_256to8tab[c % 256]); +} - /* Convert to RGB. */ - c -= 16; - b = c % 6; - g = (c / 6) % 6; - r = c / 36; +teken_color_t +teken_256to16(teken_color_t c) +{ - if (r < g) { - /* Possibly green. */ - if (g < b) - return (TC_BLUE); - else if (g > b) - return (TC_GREEN); - else - return (TC_CYAN); - } else if (r > g) { - /* Possibly red. */ - if (r < b) - return (TC_BLUE); - else if (r > b) - return (TC_RED); - else - return (TC_MAGENTA); - } else { - /* Possibly brown. */ - if (g < b) - return (TC_BLUE); - else if (g > b) - return (TC_BROWN); - else if (r < 3) - return (TC_BLACK); - else - return (TC_WHITE); - } + return (teken_256to16tab[c % 256]); } static const char * const special_strings_cons25[] = { Modified: stable/11/sys/teken/teken.h ============================================================================== --- stable/11/sys/teken/teken.h Wed Mar 14 07:39:28 2018 (r330915) +++ stable/11/sys/teken/teken.h Wed Mar 14 07:47:26 2018 (r330916) @@ -56,6 +56,7 @@ typedef unsigned char teken_color_t; #define TC_CYAN 6 #define TC_WHITE 7 #define TC_NCOLORS 8 +#define TC_LIGHT 8 /* ORed with the others. */ typedef struct { teken_unit_t tp_row; @@ -203,6 +204,7 @@ void teken_set_8bit(teken_t *); void teken_set_cons25(teken_t *); /* Color conversion. */ +teken_color_t teken_256to16(teken_color_t); teken_color_t teken_256to8(teken_color_t); #endif /* !_TEKEN_H_ */ Modified: stable/11/sys/teken/teken_subr_compat.h ============================================================================== --- stable/11/sys/teken/teken_subr_compat.h Wed Mar 14 07:39:28 2018 (r330915) +++ stable/11/sys/teken/teken_subr_compat.h Wed Mar 14 07:47:26 2018 (r330916) @@ -40,23 +40,16 @@ static void teken_subr_cons25_set_adapter_background(teken_t *t, unsigned int c) { - t->t_defattr.ta_bgcolor = cons25_colors[c % 8]; - t->t_curattr.ta_bgcolor = cons25_colors[c % 8]; + t->t_defattr.ta_bgcolor = cons25_colors[c % 8] | (c & 8); + t->t_curattr.ta_bgcolor = cons25_colors[c % 8] | (c & 8); } static void teken_subr_cons25_set_adapter_foreground(teken_t *t, unsigned int c) { - t->t_defattr.ta_fgcolor = cons25_colors[c % 8]; - t->t_curattr.ta_fgcolor = cons25_colors[c % 8]; - if (c >= 8) { - t->t_defattr.ta_format |= TF_BOLD; - t->t_curattr.ta_format |= TF_BOLD; - } else { - t->t_defattr.ta_format &= ~TF_BOLD; - t->t_curattr.ta_format &= ~TF_BOLD; - } + t->t_defattr.ta_fgcolor = cons25_colors[c % 8] | (c & 8); + t->t_curattr.ta_fgcolor = cons25_colors[c % 8] | (c & 8); } static const teken_color_t cons25_revcolors[8] = { 0, 4, 2, 6, 1, 5, 3, 7 }; From owner-svn-src-stable@freebsd.org Wed Mar 14 07:51:34 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 87E83653E; Wed, 14 Mar 2018 07:51:34 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 353C272CFE; Wed, 14 Mar 2018 07:51:34 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3001B25354; Wed, 14 Mar 2018 07:51:34 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E7pXbX073274; Wed, 14 Mar 2018 07:51:33 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E7pXSH073273; Wed, 14 Mar 2018 07:51:33 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140751.w2E7pXSH073273@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 07:51: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: r330917 - stable/11/sys/dev/vt X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/vt X-SVN-Commit-Revision: 330917 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 07:51:34 -0000 Author: eadler Date: Wed Mar 14 07:51:33 2018 New Revision: 330917 URL: https://svnweb.freebsd.org/changeset/base/330917 Log: MFC r317174: Revert r316796. It is not necessary since r317173. Modified: stable/11/sys/dev/vt/vt_cpulogos.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/vt/vt_cpulogos.c ============================================================================== --- stable/11/sys/dev/vt/vt_cpulogos.c Wed Mar 14 07:47:26 2018 (r330916) +++ stable/11/sys/dev/vt/vt_cpulogos.c Wed Mar 14 07:51:33 2018 (r330917) @@ -153,7 +153,6 @@ vt_fini_logos(void *dummy __unused) struct winsize wsz; term_pos_t size; unsigned int i; - int row; if (!vt_draw_logo_cpus) return; @@ -171,7 +170,7 @@ vt_fini_logos(void *dummy __unused) vt_draw_logo_cpus = 0; VT_UNLOCK(vd); - for (i = row = 0; i < VT_MAXWINDOWS; i++) { + for (i = 0; i < VT_MAXWINDOWS; i++) { vw = vd->vd_windows[i]; if (vw == NULL) continue; @@ -194,16 +193,11 @@ vt_fini_logos(void *dummy __unused) vt_compute_drawable_area(vw); if (vd->vd_curwindow == vw) { - row = vw->vw_draw_area.tr_begin.tp_row; vd->vd_flags |= VDF_INVALID; vt_resume_flush_timer(vd, 0); } VT_UNLOCK(vd); } - - if (row > 0 && vd->vd_driver->vd_drawrect != NULL) - vd->vd_driver->vd_drawrect(vd, 0, 0, vd->vd_width, row - 1, - 1, TC_BLACK); } static void From owner-svn-src-stable@freebsd.org Wed Mar 14 07:55:31 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DB0DE69F5; Wed, 14 Mar 2018 07:55:30 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 86C9E7326C; Wed, 14 Mar 2018 07:55:30 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7E35D2539B; Wed, 14 Mar 2018 07:55:30 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E7tU12077720; Wed, 14 Mar 2018 07:55:30 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E7tUKB077717; Wed, 14 Mar 2018 07:55:30 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140755.w2E7tUKB077717@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 07:55: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: r330918 - stable/11/sys/dev/syscons X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/syscons X-SVN-Commit-Revision: 330918 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 07:55:31 -0000 Author: eadler Date: Wed Mar 14 07:55:29 2018 New Revision: 330918 URL: https://svnweb.freebsd.org/changeset/base/330918 Log: MFC r315984: Restore switching to a separate kernel terminal "input" state and extend it to a separate state for each CPU. Terminal "input" is user or kernel output. Its state includes the current parser state for escape sequences and multi-byte characters, and some results of previous parsing (mainly attributes), and in teken the cursor position, but not completed output. This state must be switched for kernel output since the kernel can preempt anything, including itself, and this must not affect the preempted state more than necessary. Since vty0 is shared, it is necessary to affect the frame buffer and cursor position and history, but escape sequences must not be affected and attributes for further output must not be affected. This used to work. The syscons terminal state contained mainly the parser state for escape sequences and attributes, but not the cursor position, and was switched. This was first broken by SMP and/or preemptive kernels. Then there should really be a separate state for each thread, and one more for ddb, or locking to prevent preemption. Serialization of printf() helps. But it is arcane that full syscons escape sequences mostly work in kernel printf(), and I have never seen them used except by me to test this fix. They worked perfectly except for the races, since "input" from the kernel was not special in any way. This was broken to use teken. The general switch was removed, and the kernel normal attribute was switched specially. The kernel reverse attribute (config option SC_CONS_REVERSE_ATTR) became unused, and is still unusable because teken doesn't support default reverse attributes (it used to only be used via the ANSI escape sequence to set reverse video). The only new difficulty for using teken seems to be that the cursor position is in the "input" state, so it must be updated in the active input state for each half of the switch. Do this to complete the restoration. The per-CPU state is mainly to make per-CPU coloring work cleanly, at a cost of some space. Each CPU gets its own full set of attribute (not just the current attribute) maintained in the usual way. This also reduces races from unserialized printf()s. However, this gives races for serialized printf()s that otherwise have none. Nothing prevents the CPU doing the a printf() changing in the middle of an escape sequence. Modified: stable/11/sys/dev/syscons/scterm-teken.c stable/11/sys/dev/syscons/syscons.c stable/11/sys/dev/syscons/syscons.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/syscons/scterm-teken.c ============================================================================== --- stable/11/sys/dev/syscons/scterm-teken.c Wed Mar 14 07:51:33 2018 (r330917) +++ stable/11/sys/dev/syscons/scterm-teken.c Wed Mar 14 07:55:29 2018 (r330918) @@ -164,23 +164,12 @@ scteken_term(scr_stat *scp, void **softc) } static void -scteken_puts(scr_stat *scp, u_char *buf, int len, int kernel) +scteken_puts(scr_stat *scp, u_char *buf, int len) { teken_stat *ts = scp->ts; - teken_attr_t backup, kattr; scp->sc->write_in_progress++; - if (kernel) { - /* Use special colors for kernel messages. */ - backup = *teken_get_curattr(&ts->ts_teken); - scteken_sc_to_te_attr(sc_kattr(), &kattr); - teken_set_curattr(&ts->ts_teken, &kattr); - teken_input(&ts->ts_teken, buf, len); - teken_set_curattr(&ts->ts_teken, &backup); - } else { - /* Print user messages with regular colors. */ - teken_input(&ts->ts_teken, buf, len); - } + teken_input(&ts->ts_teken, buf, len); scp->sc->write_in_progress--; } Modified: stable/11/sys/dev/syscons/syscons.c ============================================================================== --- stable/11/sys/dev/syscons/syscons.c Wed Mar 14 07:51:33 2018 (r330917) +++ stable/11/sys/dev/syscons/syscons.c Wed Mar 14 07:55:29 2018 (r330918) @@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -99,6 +100,7 @@ static int sc_console_unit = -1; static int sc_saver_keyb_only = 1; static scr_stat *sc_console; static struct consdev *sc_consptr; +static void *kernel_console_ts[MAXCPU]; static scr_stat main_console; static struct tty *main_devs[MAXCONS]; @@ -183,7 +185,7 @@ static void scshutdown(void *, int); static void scsuspend(void *); static void scresume(void *); static u_int scgetc(sc_softc_t *sc, u_int flags, struct sc_cnstate *sp); -static void sc_puts(scr_stat *scp, u_char *buf, int len, int kernel); +static void sc_puts(scr_stat *scp, u_char *buf, int len); #define SCGETC_CN 1 #define SCGETC_NONBLOCK 2 static void sccnupdate(scr_stat *scp); @@ -220,6 +222,7 @@ static void update_font(scr_stat *); static int save_kbd_state(scr_stat *scp); static int update_kbd_state(scr_stat *scp, int state, int mask); static int update_kbd_leds(scr_stat *scp, int which); +static int sc_kattr(void); static timeout_t blink_screen; static struct tty *sc_alloc_tty(int, int); @@ -397,7 +400,7 @@ sctty_outwakeup(struct tty *tp) if (len == 0) break; SC_VIDEO_LOCK(scp->sc); - sc_puts(scp, buf, len, 0); + sc_puts(scp, buf, len); SC_VIDEO_UNLOCK(scp->sc); } } @@ -544,7 +547,8 @@ sc_attach_unit(int unit, int flags) sc_softc_t *sc; scr_stat *scp; struct cdev *dev; - int vc; + void *oldts, *ts; + int i, vc; if (!vty_enabled(VTY_SC)) return ENXIO; @@ -559,8 +563,27 @@ sc_attach_unit(int unit, int flags) /* assert(sc_console != NULL) */ flags |= SC_KERNEL_CONSOLE; scmeminit(NULL); + + scinit(unit, flags); + + if (sc_console->tsw->te_size > 0) { + /* assert(sc_console->ts != NULL); */ + oldts = sc_console->ts; + for (i = 0; i <= mp_maxid; i++) { + ts = malloc(sc_console->tsw->te_size, M_DEVBUF, M_WAITOK); + bcopy(oldts, ts, sc_console->tsw->te_size); + sc_console->ts = ts; + (*sc_console->tsw->te_default_attr)(sc_console, sc_kattrtab[i], + SC_KERNEL_CONS_REV_ATTR); + kernel_console_ts[i] = ts; + } + sc_console->ts = oldts; + (*sc_console->tsw->te_default_attr)(sc_console, SC_NORM_ATTR, + SC_NORM_REV_ATTR); + } + } else { + scinit(unit, flags); } - scinit(unit, flags); sc = sc_get_softc(unit, flags & SC_KERNEL_CONSOLE); sc->config = flags; @@ -1888,6 +1911,7 @@ sc_cnputc(struct consdev *cd, int c) struct sc_cnstate st; u_char buf[1]; scr_stat *scp = sc_console; + void *oldts, *ts; #ifndef SC_NO_HISTORY #if 0 struct tty *tp; @@ -1951,7 +1975,16 @@ sc_cnputc(struct consdev *cd, int c) if (atomic_load_acq_int(&sc_cnputc_loghead) - sc_cnputc_logtail >= sizeof(sc_cnputc_log)) continue; - sc_puts(scp, buf, 1, 1); + /* Console output has a per-CPU "input" state. Switch for it. */ + oldts = scp->ts; + ts = kernel_console_ts[PCPU_GET(cpuid)]; + if (ts != NULL) { + scp->ts = ts; + (*scp->tsw->te_set_cursor)(scp, scp->xpos, scp->ypos); + } + sc_puts(scp, buf, 1); + scp->ts = oldts; + (*scp->tsw->te_set_cursor)(scp, scp->xpos, scp->ypos); } s = spltty(); /* block sckbdevent and scrn_timer */ @@ -2901,7 +2934,7 @@ exchange_scr(sc_softc_t *sc) } static void -sc_puts(scr_stat *scp, u_char *buf, int len, int kernel) +sc_puts(scr_stat *scp, u_char *buf, int len) { #ifdef DEV_SPLASH /* make screensaver happy */ @@ -2910,7 +2943,7 @@ sc_puts(scr_stat *scp, u_char *buf, int len, int kerne #endif if (scp->tsw) - (*scp->tsw->te_puts)(scp, buf, len, kernel); + (*scp->tsw->te_puts)(scp, buf, len); if (scp->sc->delayed_next_scr) sc_switch_scr(scp->sc, scp->sc->delayed_next_scr - 1); } @@ -3150,7 +3183,8 @@ scinit(int unit, int flags) (void *)sc_buffer, FALSE); if (sc_init_emulator(scp, SC_DFLT_TERM)) sc_init_emulator(scp, "*"); - (*scp->tsw->te_default_attr)(scp, SC_NORM_ATTR, SC_NORM_REV_ATTR); + (*scp->tsw->te_default_attr)(scp, SC_KERNEL_CONS_ATTR, + SC_KERNEL_CONS_REV_ATTR); } else { /* assert(sc_malloc) */ sc->dev = malloc(sizeof(struct tty *)*sc->vtys, M_DEVBUF, @@ -4086,9 +4120,11 @@ sc_bell(scr_stat *scp, int pitch, int duration) } } -int +static int sc_kattr(void) { + if (sc_console == NULL) + return (SC_KERNEL_CONS_ATTR); return (sc_kattrtab[PCPU_GET(cpuid) % nitems(sc_kattrtab)]); } Modified: stable/11/sys/dev/syscons/syscons.h ============================================================================== --- stable/11/sys/dev/syscons/syscons.h Wed Mar 14 07:51:33 2018 (r330917) +++ stable/11/sys/dev/syscons/syscons.h Wed Mar 14 07:55:29 2018 (r330918) @@ -391,7 +391,7 @@ typedef int sc_term_init_t(scr_stat *scp, void **tcp, #define SC_TE_COLD_INIT 0 #define SC_TE_WARM_INIT 1 typedef int sc_term_term_t(scr_stat *scp, void **tcp); -typedef void sc_term_puts_t(scr_stat *scp, u_char *buf, int len, int kernel); +typedef void sc_term_puts_t(scr_stat *scp, u_char *buf, int len); typedef int sc_term_ioctl_t(scr_stat *scp, struct tty *tp, u_long cmd, caddr_t data, struct thread *td); typedef int sc_term_reset_t(scr_stat *scp, int code); @@ -593,7 +593,6 @@ void sc_paste(scr_stat *scp, const u_char *p, int cou 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-stable@freebsd.org Wed Mar 14 07:58:12 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4DE5EF2B057; Wed, 14 Mar 2018 07:58:12 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EF1647345D; Wed, 14 Mar 2018 07:58:11 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E9EDC2539F; Wed, 14 Mar 2018 07:58:11 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E7wBhT077845; Wed, 14 Mar 2018 07:58:11 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E7wB2x077842; Wed, 14 Mar 2018 07:58:11 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140758.w2E7wB2x077842@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 07:58:11 +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: r330919 - stable/11/sys/dev/syscons X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/syscons X-SVN-Commit-Revision: 330919 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 07:58:12 -0000 Author: eadler Date: Wed Mar 14 07:58:11 2018 New Revision: 330919 URL: https://svnweb.freebsd.org/changeset/base/330919 Log: MFC r316136: The switch to kernel terminal context needs to update more than the cursor position. Especially the screen size, and potentially everything except the input state and attributes. Do this by changing the cursor position setting method to a general syncing method. Use proper constructors instead of copying to create kernel terminal contexts. We really want clones and not new instances, but there is no method for cloning and there is nothing in the active instance that needs to be cloned exactly. Add proper destructors for kernel terminal contexts. I doubt that the destructor code has every been reached, but if it was then it leaked the memory of the clones. Remove freeing of statically allocated memory for the non-kernel terminal context for the same terminal as the kernel. This is in the nearly unreachable code. This used to not happen because delicate context swapping made the user context use the dynamic memory and kernel context the static memory. I didn't restore this swapping since it would have been unnatural to have all kernel contexts except 1 dynamic. The constructor for terminal context has bad layering for reasons related to the bug. It has to return static memory early before malloc() works. Callers also can't allocate memory until after the first constructor selects an emulator and tells upper layers the size of its context. After that, the cloning hack required the cloning code to allocate the memory, but for all other constructors it would be better for the terminal layer to allocate and deallocate the memory in all cases. Zero the memory when allocating terminal contexts dynamically. Modified: stable/11/sys/dev/syscons/scterm-teken.c stable/11/sys/dev/syscons/syscons.c stable/11/sys/dev/syscons/syscons.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/syscons/scterm-teken.c ============================================================================== --- stable/11/sys/dev/syscons/scterm-teken.c Wed Mar 14 07:55:29 2018 (r330918) +++ stable/11/sys/dev/syscons/scterm-teken.c Wed Mar 14 07:58:11 2018 (r330919) @@ -64,7 +64,7 @@ static sc_term_default_attr_t scteken_default_attr; static sc_term_clear_t scteken_clear; static sc_term_input_t scteken_input; static sc_term_fkeystr_t scteken_fkeystr; -static sc_term_set_cursor_t scteken_set_cursor; +static sc_term_sync_t scteken_sync; static void scteken_nop(void); typedef struct { @@ -91,7 +91,7 @@ static sc_term_sw_t sc_term_scteken = { (sc_term_notify_t *)scteken_nop, scteken_input, scteken_fkeystr, - scteken_set_cursor, + scteken_sync, }; SCTERM_MODULE(scteken, sc_term_scteken); @@ -221,7 +221,7 @@ scteken_clear(scr_stat *scp) teken_stat *ts = scp->ts; sc_move_cursor(scp, 0, 0); - scteken_set_cursor(scp, 0, 0); + scteken_sync(scp); sc_vtb_clear(&scp->vtb, scp->sc->scr_map[0x20], scteken_te_to_sc_attr(teken_get_curattr(&ts->ts_teken)) << 8); @@ -286,13 +286,16 @@ scteken_fkeystr(scr_stat *scp, int c) } static void -scteken_set_cursor(scr_stat *scp, int col, int row) +scteken_sync(scr_stat *scp) { teken_stat *ts = scp->ts; teken_pos_t tp; - tp.tp_col = col; - tp.tp_row = row; + tp.tp_col = scp->xsize; + tp.tp_row = scp->ysize; + teken_set_winsize_noreset(&ts->ts_teken, &tp); + tp.tp_col = scp->xpos; + tp.tp_row = scp->ypos; teken_set_cursor(&ts->ts_teken, &tp); } Modified: stable/11/sys/dev/syscons/syscons.c ============================================================================== --- stable/11/sys/dev/syscons/syscons.c Wed Mar 14 07:55:29 2018 (r330918) +++ stable/11/sys/dev/syscons/syscons.c Wed Mar 14 07:58:11 2018 (r330919) @@ -570,8 +570,9 @@ sc_attach_unit(int unit, int flags) /* assert(sc_console->ts != NULL); */ oldts = sc_console->ts; for (i = 0; i <= mp_maxid; i++) { - ts = malloc(sc_console->tsw->te_size, M_DEVBUF, M_WAITOK); - bcopy(oldts, ts, sc_console->tsw->te_size); + ts = malloc(sc_console->tsw->te_size, M_DEVBUF, + M_WAITOK | M_ZERO); + (*sc_console->tsw->te_init)(sc_console, &ts, SC_TE_COLD_INIT); sc_console->ts = ts; (*sc_console->tsw->te_default_attr)(sc_console, sc_kattrtab[i], SC_KERNEL_CONS_REV_ATTR); @@ -1708,6 +1709,9 @@ sc_cninit(struct consdev *cp) static void sc_cnterm(struct consdev *cp) { + void *ts; + int i; + /* we are not the kernel console any more, release everything */ if (sc_console_unit < 0) @@ -1718,6 +1722,12 @@ sc_cnterm(struct consdev *cp) sccnupdate(sc_console); #endif + for (i = 0; i <= mp_maxid; i++) { + ts = kernel_console_ts[i]; + kernel_console_ts[i] = NULL; + (*sc_console->tsw->te_term)(sc_console, &ts); + free(ts, M_DEVBUF); + } scterm(sc_console_unit, SC_KERNEL_CONSOLE); sc_console_unit = -1; sc_console = NULL; @@ -1980,11 +1990,11 @@ sc_cnputc(struct consdev *cd, int c) ts = kernel_console_ts[PCPU_GET(cpuid)]; if (ts != NULL) { scp->ts = ts; - (*scp->tsw->te_set_cursor)(scp, scp->xpos, scp->ypos); + (*scp->tsw->te_sync)(scp); } sc_puts(scp, buf, 1); scp->ts = oldts; - (*scp->tsw->te_set_cursor)(scp, scp->xpos, scp->ypos); + (*scp->tsw->te_sync)(scp); } s = spltty(); /* block sckbdevent and scrn_timer */ @@ -3211,7 +3221,7 @@ scinit(int unit, int flags) scp->xpos = col; scp->ypos = row; scp->cursor_pos = scp->cursor_oldpos = row*scp->xsize + col; - (*scp->tsw->te_set_cursor)(scp, col, row); + (*scp->tsw->te_sync)(scp); /* Sync BIOS cursor shape to s/w (sc only). */ if (bios_value.cursor_end < scp->font_size) @@ -3330,12 +3340,11 @@ scterm(int unit, int flags) scp = sc_get_stat(sc->dev[0]); if (scp->tsw) (*scp->tsw->te_term)(scp, &scp->ts); - if (scp->ts != NULL) - free(scp->ts, M_DEVBUF); mtx_destroy(&sc->video_mtx); /* clear the structure */ if (!(flags & SC_KERNEL_CONSOLE)) { + free(scp->ts, M_DEVBUF); /* XXX: We need delete_dev() for this */ free(sc->dev, M_DEVBUF); #if 0 Modified: stable/11/sys/dev/syscons/syscons.h ============================================================================== --- stable/11/sys/dev/syscons/syscons.h Wed Mar 14 07:55:29 2018 (r330918) +++ stable/11/sys/dev/syscons/syscons.h Wed Mar 14 07:58:11 2018 (r330919) @@ -404,7 +404,7 @@ typedef void sc_term_notify_t(scr_stat *scp, int event #define SC_TE_NOTIFY_VTSWITCH_OUT 1 typedef int sc_term_input_t(scr_stat *scp, int c, struct tty *tp); typedef const char *sc_term_fkeystr_t(scr_stat *scp, int c); -typedef void sc_term_set_cursor_t(scr_stat *scp, int col, int row); +typedef void sc_term_sync_t(scr_stat *scp); typedef struct sc_term_sw { LIST_ENTRY(sc_term_sw) link; @@ -423,7 +423,7 @@ typedef struct sc_term_sw { sc_term_notify_t *te_notify; sc_term_input_t *te_input; sc_term_fkeystr_t *te_fkeystr; - sc_term_set_cursor_t *te_set_cursor; + sc_term_sync_t *te_sync; } sc_term_sw_t; #define SCTERM_MODULE(name, sw) \ From owner-svn-src-stable@freebsd.org Wed Mar 14 08:15:27 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0A76AF2D6BA; Wed, 14 Mar 2018 08:15:27 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B35B673F84; Wed, 14 Mar 2018 08:15:26 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ADFC9256B5; Wed, 14 Mar 2018 08:15:26 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E8FQJH087732; Wed, 14 Mar 2018 08:15:26 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E8FQKO087728; Wed, 14 Mar 2018 08:15:26 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140815.w2E8FQKO087728@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 08:15: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: r330920 - stable/11/sys/dev/syscons X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/syscons X-SVN-Commit-Revision: 330920 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 08:15:27 -0000 Author: eadler Date: Wed Mar 14 08:15:26 2018 New Revision: 330920 URL: https://svnweb.freebsd.org/changeset/base/330920 Log: MFC r316636,r316642,r316675,r316733,r316737,r316741,r316827,r316830,r316865,r316878: Fix removal of the keyboard cursor image in text mode, especially in the vga renderer. Removal used stale attributes and didn't try to merge with the current attribute for cut marking, so special rendering of cut marking was lost in many cases. The gfb renderer is too broken to support special rendering of cut marking at all, so this change is supposed to be just a style fix for it. Remove all traces of the saveunder method which was used to implement this bug. Fix drawing of the cursor image in text mode, only in the vga renderer. This used a stale attribute from the frame buffer instead of from the saveunder, but did merge with the current attribute for cut marking so it caused less obvious bugs (subtle misrendering for the character under the cursor). The saveunder method may be good in simpler drivers, but in syscons the 'under' is already saved in a better way in the vtb. Just redraw it from there, with visible complications for cut marking and invisible complications for mouse cursors. Almost all drawing requests are passed a flag 'flip' which currently means to flip to reverse video for characters in the cut marking region, but should mean that the the characters are in the cut marking regions so should be rendered specially, preferably using something better than reverse video. The gfb renderer always ignores this flag. The vga renderer ignored it for removal of the text cursor -- the saveunder gave the stale rendering at the time the cursor was drawn. Mouse cursors need even more complicated methods. They are handled by drawing them last and removing them first. Removing them usually redraws many other characters with the correct cut marking (but transiently loses the keyboard cursor, which is redrawn soon). This tended to hide the saveunder bug for forward motions of the keyboard cursor. But slow backward motions of the keyboard cursor always lost the cut marking, and fast backwards motions lost in for about 4 in every 5 characters, depending on races with the scrn_update() timeout handler. This is because the forward motions are usually into the region redrawn for the mouse cursor, while backwards motions rarely are. Text cursor drawing in the vga renderer used also used a possibly-stale copy of the character and its attribute. The vga render has the "optimization" of sometimes reading characters from the screen instead of from the vtb (this was not so good even in 1990 when main memory was only a few times faster than video RAM). Due to care in update orders, the character is never stale, but its attribute might be (just the cut marking part, again due to care in order). gfb doesn't have the scp->scr pointer used for the "optimization", and vga only uses this pointer for text mode. So most cases have to refresh from the vtb, and we can be sure that the ordering of vtb updates and drawing is as required for this to work. ------------------------------------------------------------------------ r316642 | bde | 2017-04-08 10:00:39 +0000 (Sat, 08 Apr 2017) | 36 lines Quick fix for removal of the mouse cursor in vga direct graphics modes (that is, in all supported 8, 15, 16 and 24-color modes). Moving the mouse cursor while holding down a button (giving cut marking) left a trail of garbage from misremoved mouse cursors (usually colored rectangles and not cursor shapes). Cases with a button not held down worked better and may even have worked. No renderer support for removing (software) mouse cursors is needed (and many renderers don't have any), since sc_remove_mouse_image() marks for update the region containing the image and usually much more. The mouse cursor can be (partially) over as many as 4 character cells, and removing it in only the 1-4 cells occupied by it would be best for efficiency and for avoiding flicker. However, sc_remove_mouse_image() can only mark a single linear region and usually marks a full row of cells and 1 more to be sure to cover the 4 cells. It always does this, so using the special rendering method just wastes even more time and gives even more flicker. The special methods will be removed soon. The general method always works. vga_pxlmouse_direct() appeared to defer to it by returning immediately if !on. However, vga_pxlmouse_direct() actually did foot-shooting using a disguised saveunder method. Normal order near a mouse move is: (1) remove the mouse cursor in the renderer (optional) (2) remove the mouse cursor again and refresh the screen over the mouse cursor and much more from the vtb. When the mouse has actually moved and a button is down, many attributes in this region are changed to be up to date with the new cut marking (3) draw the keyboard cursor again if it was clobbered by the update (4) draw the mouse cursor image in its new position. The bug was to remove the mouse cursor again in step (4), before the drawing it again in (4), using a saveunder that was valid in step (1) at best. The quick fix is to use the saveunder in step (1) and not in step (4). Using it in step (4) also used it before it was initialized, initially and after mode and screen switches. ------------------------------------------------------------------------ r316675 | bde | 2017-04-10 06:19:09 +0000 (Mon, 10 Apr 2017) | 29 lines Special rendering methods for removing mouse cursors cannot be removed like I hoped, since they are needed for removing parts over the border. Continue fixing bugs in them. In the vga planar mode renderer, remove removal of the part of the image over the text window. This was hard-coded for nearly 8x16 fonts and in practice didn't remove enough for 8x8 fonts. This used the wrong attribute over cutmarked regions. The caller refreshes with the correct attribute later, so the attribute bug only caused flicker. The caller uses the same hard-coding, so the refreshes fix up all the spots with the wrong attribute, but keep missing the missed spots. This still gives trails of bits of cursors for cursor motions in the affected configurations (mainly depth 4 modes with 8x8) fonts. 8x14 fonts barely escape the problem since although the cursor is drawn as 16x16, its active part is only 9x13 and the active part fits in the hard-coded 2x2 character cell window for 8x14 fonts. 8x8 fonts need a 2x3 window. In the fb non-sparc64 renderer, the buggy image removal was buggier and was already avoided by returning before it. Remove it completely and fix nearby style bugs. It was essentially the same as for the vga planar mode renderer (obfuscated by swapping x and y). This was buggier since fb should handle more types of hardware so the hard-coding is wronger. The remaining fb image removal is also buggier. It never supported software cursors drawn into the border, and the hardware cursor is probably broken by other bugs to be fixed soon. ------------------------------------------------------------------------ r316733 | bde | 2017-04-12 16:21:55 +0000 (Wed, 12 Apr 2017) | 45 lines Fix clobbering of the default attribute and the screen position in scteken_init(). Move the internals of scteken_sync() into a local function to help do this. scteken_init() reset or adjusted the default attribute and screen position at least 3 and 5 times, respectively. Warm init shouldn't do any more than reset the "input" state. (scterm-sc.c (which still works after minor editing), only resets the escape state and the saved cursor position, and then does a nearly-null sync of the current color.) This mainly broke mode changes, and was most noticeable when the background color is not teken's default (usually black). Then the screen gets cleared in the wrong color. vidcontrol restores the default normal attribute and tries to restore the default reverse attribute. vidcontrol doesn't clear the screen again after restoring the attribute(s), and it is too late to do it there without flicker. Now the default normal attribute is restored before the change affects the rendering. When the foreground color is not teken's default, clearing with the wrong attributes gave strange cursor colors for some cursor types. The default reverse attribute is not restored since it is unsupported. 2/3 of the clobbering was from 2 resetting window resizing calls. The second one is needed to restore the size, but must not reset. Window resizing also sanitizes the cursor position, and after the main reset resets the window size, the cursor row would often be adjusted from 24 to 23 if it were not already reset to 0. scteken_sync() is good for restoring the window size and the cursor position in the correct order, but was unusable at init time since scp->ts is not always initialized then. Adjust to use its internals. I didn't notice any problems from the cursor reset. The cursor should be reset, and a previous fix was to reset it consistently a little later. Doing nothing for warm init works almost as well, if not better. It is not very useful to reset the escape state for mode changes, since the reset is especially likely to be null then. The escape state is most likely to be non-initial and corrupted by its most normal uses -- sloppy non-atomic output where a context switch or just mixing stdout with stderr splits up escape sequences. ------------------------------------------------------------------------ r316737 | bde | 2017-04-12 18:52:06 +0000 (Wed, 12 Apr 2017) | 23 lines Fix removal of mouse image by the vga planar renderer in the right border in unusual cases. Optimize and significantly clean up removal in this renderer. Optimize removal in the vga direct renderer. Removal only needs to be done in the border (the part with pixels) in both cases. The planar renderer used the condition scp->xoff > 0 to test whether a right border exists. This actually tests for a left border, and when the total horizontal border is 8 pixels, rounding gives only a right border. This was the unusual broken case. An example is easy to configure using something like "vidcontrol -f 8x16 iso-8x16 -g 79x25 MODE_27". Optimize the planar case a little by only removing 9x13 active pixels out of 16x16. Optimize it a lot by not doing anything if there is no overlap with the border. Don't unroll the main loop or hard-code so many assumptions about font sizes in it. On my Haswell system, graphics memory and i/o accesses takes about 520 cycles each so optimizations from unrolling are in the noise. Optimize the direct case to not do anything if there is no overlap with the border. Do a sanity check on the saveunder's coordinates. This requires a previous change to pass non-rounded coordinates. ------------------------------------------------------------------------ r316741 | bde | 2017-04-12 20:18:38 +0000 (Wed, 12 Apr 2017) | 24 lines Improve drawing of the vga planar mode mouse image a little. Unobfuscate the method a lot. Reduce the AND mask to the complement of the cursor's frame, so that area inside the frame is not drawn first in black and then in lightwhite. The AND-OR method is only directly suitable for the text mouse image, since it doesn't go to the hardware there. Planar mode Mouse cursor drawing takes 10-20 usec on my Haswell system (approx. 100 graphics accesses at 130 nsec each), so the transient was not visible. The method used the fancy read mode 1 and its color compare and color don't care registers with value 0 in them so that all colors matched. All that this did was make byte reads of frame buffer memory return 0xff, so that the x86 case could obfuscate read+write as "and". The read must be done for its side effect on the graphics controller but is not used, except it must return 0xff to avoid affecting the write when the write is obfuscated as a read-modify-write "and". Perhaps that was a good optimization for 8088 CPUs where each extra instruction byte took as long as a byte memory access. Just use read+write after removing the fancy read mode. Remove x86 ifdefs that did the "and". After removing the "and" in the non-x86 part of the ifdefs, fix 4 of 6 cases where the shift was wrong. ------------------------------------------------------------------------ r316827 | bde | 2017-04-14 12:03:34 +0000 (Fri, 14 Apr 2017) | 19 lines Further unobfuscate the method of drawing the mouse cursor in vga planar mode. Don't manually unroll the 2 inner loops. On Haswell, doing so gave a speedup of about 0.5% (about 4 cycles per iteration out of 1400), but hard-coded a limit of width 9 and made better better optimizations harder to see. gcc-4.2.1 -O does the unrolling anyway, unless tricked with a volatile hack. gcc's unrolling is not very good and gives a a speedup of about half as much (about 2 cycles per iteration). (All timing on i386.) Manual unrolling was only feasible because the inner loop only iterates once or twice. Usually twice, but a dynamic check is needed to decide, and was not moved from the second-innermost loop manually or by gcc. This commit basically adds another dynamic check in the inner loop. Cursor widths of 10-17 require 3 iterations in the inner loop and this is not so easy to unroll -- even gcc stops at 2. ------------------------------------------------------------------------ r316830 | bde | 2017-04-14 14:00:13 +0000 (Fri, 14 Apr 2017) | 13 lines Optimize drawing of the mouse cursor in vga planar mode almost as much as possible, by avoiding null ANDs and ORs to the frame buffer. Mouse cursors are fairly sparse, especially for their frame. Pixels are written in groups of 8 in planar mode and the per-group sparseness is not as large, but it still averages about 40% with the current 9x13 mouse cursor. The average drawing time is reduced by about this amount (from 22 usec constant to 12.5 usec average on Haswell). This optimization is relatively larger with larger cursors. Width 10 requires 6 frame buffer accesses per line instead of 4 if not done sparsely, but rarely more than 4 if done sparsely. ------------------------------------------------------------------------ r316865 | bde | 2017-04-14 17:02:24 +0000 (Fri, 14 Apr 2017) | 10 lines Adjust shifting so that cursor widths up to 17 (was 9) work in vga planar mode. Direct mode always supported widths up to 32, except for its hard-coded 16s matching the pixmap size. Text mode is still limited to 9 its 2x2 character cell method and missing adjustments for the gap between characters, if any. Cursor heights can be almost anything in graphics modes. Modified: stable/11/sys/dev/syscons/scgfbrndr.c stable/11/sys/dev/syscons/scterm-teken.c stable/11/sys/dev/syscons/scvgarndr.c stable/11/sys/dev/syscons/syscons.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/syscons/scgfbrndr.c ============================================================================== --- stable/11/sys/dev/syscons/scgfbrndr.c Wed Mar 14 07:58:11 2018 (r330919) +++ stable/11/sys/dev/syscons/scgfbrndr.c Wed Mar 14 08:15:26 2018 (r330920) @@ -273,13 +273,11 @@ gfb_cursor(scr_stat *scp, int at, int blink, int on, i c = sc_vtb_getc(&scp->vtb, at); vidd_putc(scp->sc->adp, at, c, (a >> 4) | ((a & 0xf) << 4)); - scp->cursor_saveunder_attr = a; - scp->cursor_saveunder_char = c; } else { if (scp->status & VR_CURSOR_ON) vidd_putc(scp->sc->adp, at, - scp->cursor_saveunder_char, - scp->cursor_saveunder_attr); + sc_vtb_getc(&scp->vtb, at), + sc_vtb_geta(&scp->vtb, at) >> 8); scp->status &= ~VR_CURSOR_ON; } } @@ -339,28 +337,14 @@ static void gfb_mouse(scr_stat *scp, int x, int y, int on) { #ifdef __sparc64__ - vidd_putm(scp->sc->adp, x, y, mouse_pointer, - on ? 0xffffffff : 0x0, 22, 12); + vidd_putm(scp->sc->adp, x, y, mouse_pointer, + on ? 0xffffffff : 0x0, 22, 12); #else - int i, pos; - if (on) { - - /* Display the mouse pointer image... */ vidd_putm(scp->sc->adp, x, y, mouse_pointer, 0xffffffff, 16, 8); } else { - - /* - Erase the mouse cursor image by redrawing the text - underneath it... - */ - return; - pos = x*scp->xsize + y; - i = (y < scp->xsize - 1) ? 2 : 1; - (*scp->rndr->draw)(scp, pos, i, FALSE); - if (x < scp->ysize - 1) - (*scp->rndr->draw)(scp, pos + scp->xsize, i, FALSE); + /* XXX: removal is incomplete for h/w cursors and borders. */ } #endif } Modified: stable/11/sys/dev/syscons/scterm-teken.c ============================================================================== --- stable/11/sys/dev/syscons/scterm-teken.c Wed Mar 14 07:58:11 2018 (r330919) +++ stable/11/sys/dev/syscons/scterm-teken.c Wed Mar 14 08:15:26 2018 (r330920) @@ -74,6 +74,8 @@ typedef struct { static teken_stat reserved_teken_stat; +static void scteken_sync_internal(scr_stat *, teken_stat *); + static sc_term_sw_t sc_term_scteken = { { NULL, NULL }, "scteken", /* emulator name */ @@ -118,7 +120,7 @@ static int scteken_init(scr_stat *scp, void **softc, int code) { teken_stat *ts; - teken_pos_t tp; + teken_attr_t ta; if (*softc == NULL) { if (reserved_teken_stat.ts_busy) @@ -133,17 +135,16 @@ scteken_init(scr_stat *scp, void **softc, int code) ts->ts_busy = 1; /* FALLTHROUGH */ case SC_TE_WARM_INIT: + ta = *teken_get_defattr(&ts->ts_teken); teken_init(&ts->ts_teken, &scteken_funcs, scp); + teken_set_defattr(&ts->ts_teken, &ta); #ifndef TEKEN_UTF8 teken_set_8bit(&ts->ts_teken); #endif /* !TEKEN_UTF8 */ #ifdef TEKEN_CONS25 teken_set_cons25(&ts->ts_teken); #endif /* TEKEN_CONS25 */ - - tp.tp_row = scp->ysize; - tp.tp_col = scp->xsize; - teken_set_winsize(&ts->ts_teken, &tp); + scteken_sync_internal(scp, ts); break; } @@ -221,7 +222,7 @@ scteken_clear(scr_stat *scp) teken_stat *ts = scp->ts; sc_move_cursor(scp, 0, 0); - scteken_sync(scp); + scteken_sync_internal(scp, ts); sc_vtb_clear(&scp->vtb, scp->sc->scr_map[0x20], scteken_te_to_sc_attr(teken_get_curattr(&ts->ts_teken)) << 8); @@ -286,9 +287,8 @@ scteken_fkeystr(scr_stat *scp, int c) } static void -scteken_sync(scr_stat *scp) +scteken_sync_internal(scr_stat *scp, teken_stat *ts) { - teken_stat *ts = scp->ts; teken_pos_t tp; tp.tp_col = scp->xsize; @@ -297,6 +297,12 @@ scteken_sync(scr_stat *scp) tp.tp_col = scp->xpos; tp.tp_row = scp->ypos; teken_set_cursor(&ts->ts_teken, &tp); +} + +static void +scteken_sync(scr_stat *scp) +{ + scteken_sync_internal(scp, scp->ts); } static void Modified: stable/11/sys/dev/syscons/scvgarndr.c ============================================================================== --- stable/11/sys/dev/syscons/scvgarndr.c Wed Mar 14 07:58:11 2018 (r330919) +++ stable/11/sys/dev/syscons/scvgarndr.c Wed Mar 14 08:15:26 2018 (r330920) @@ -161,6 +161,8 @@ RENDERER_MODULE(vga, vga_set); #ifndef SC_NO_CUTPASTE #if !defined(SC_ALT_MOUSE_IMAGE) || defined(SC_PIXEL_MODE) +#define MOUSE_IMAGE_HEIGHT 13 +#define MOUSE_IMAGE_WIDTH 9 static u_short mouse_and_mask[16] = { 0xc000, 0xe000, 0xf000, 0xf800, 0xfc00, 0xfe00, 0xff00, 0xff80, 0xfe00, 0x1e00, 0x1f00, 0x0f00, 0x0f00, 0x0000, 0x0000, 0x0000 @@ -296,8 +298,6 @@ draw_txtcharcursor(scr_stat *scp, int at, u_short c, u sc_softc_t *sc; sc = scp->sc; - scp->cursor_saveunder_char = c; - scp->cursor_saveunder_attr = a; #ifndef SC_NO_FONT_LOADING if (scp->curs_attr.flags & CONS_CHAR_CURSOR) { @@ -374,18 +374,18 @@ vga_txtcursor(scr_stat *scp, int at, int blink, int on if (on) { scp->status |= VR_CURSOR_ON; draw_txtcharcursor(scp, at, - sc_vtb_getc(&scp->scr, at), - sc_vtb_geta(&scp->scr, at), + sc_vtb_getc(&scp->vtb, at), + sc_vtb_geta(&scp->vtb, at), flip); } else { - cursor_attr = scp->cursor_saveunder_attr; + cursor_attr = sc_vtb_geta(&scp->vtb, at); if (flip) cursor_attr = (cursor_attr & 0x8800) | ((cursor_attr & 0x7000) >> 4) | ((cursor_attr & 0x0700) << 4); if (scp->status & VR_CURSOR_ON) sc_vtb_putc(&scp->scr, at, - scp->cursor_saveunder_char, + sc_vtb_getc(&scp->vtb, at), cursor_attr); scp->status &= ~VR_CURSOR_ON; } @@ -1032,71 +1032,44 @@ draw_pxlmouse_planar(scr_stat *scp, int x, int y) int line_width; int xoff, yoff; int ymax; - u_short m; - int i, j; + uint32_t m; + int i, j, k; + uint8_t m1; line_width = scp->sc->adp->va_line_width; xoff = (x - scp->xoff*8)%8; yoff = y - rounddown(y, line_width); ymax = imin(y + 16, scp->ypixel); - outw(GDCIDX, 0x0805); /* read mode 1, write mode 0 */ + outw(GDCIDX, 0x0005); /* read mode 0, write mode 0 */ outw(GDCIDX, 0x0001); /* set/reset enable */ - outw(GDCIDX, 0x0002); /* color compare */ - outw(GDCIDX, 0x0007); /* color don't care */ outw(GDCIDX, 0xff08); /* bit mask */ outw(GDCIDX, 0x0803); /* data rotate/function select (and) */ p = scp->sc->adp->va_window + line_width*y + x/8; - if (x < scp->xpixel - 8) { - for (i = y, j = 0; i < ymax; ++i, ++j) { - m = ~(mouse_and_mask[j] >> xoff); -#if defined(__i386__) || defined(__amd64__) - *(u_char *)p &= m >> 8; - *(u_char *)(p + 1) &= m; -#else - writeb(p, readb(p) & (m >> 8)); - writeb(p + 1, readb(p + 1) & (m >> 8)); -#endif - p += line_width; + for (i = y, j = 0; i < ymax; ++i, ++j) { + m = ~((mouse_and_mask[j] & ~mouse_or_mask[j]) << 8 >> xoff); + for (k = 0; k < 3; ++k) { + m1 = m >> (8 * (2 - k)); + if (m1 != 0xff && x + 8 * k < scp->xpixel) { + readb(p + k); + writeb(p + k, m1); + } } - } else { - xoff += 8; - for (i = y, j = 0; i < ymax; ++i, ++j) { - m = ~(mouse_and_mask[j] >> xoff); -#if defined(__i386__) || defined(__amd64__) - *(u_char *)p &= m; -#else - writeb(p, readb(p) & (m >> 8)); -#endif - p += line_width; - } + p += line_width; } outw(GDCIDX, 0x1003); /* data rotate/function select (or) */ p = scp->sc->adp->va_window + line_width*y + x/8; - if (x < scp->xpixel - 8) { - for (i = y, j = 0; i < ymax; ++i, ++j) { - m = mouse_or_mask[j] >> xoff; -#if defined(__i386__) || defined(__amd64__) - *(u_char *)p &= m >> 8; - *(u_char *)(p + 1) &= m; -#else - writeb(p, readb(p) & (m >> 8)); - writeb(p + 1, readb(p + 1) & (m >> 8)); -#endif - p += line_width; + for (i = y, j = 0; i < ymax; ++i, ++j) { + m = mouse_or_mask[j] << 8 >> xoff; + for (k = 0; k < 3; ++k) { + m1 = m >> (8 * (2 - k)); + if (m1 != 0 && x + 8 * k < scp->xpixel) { + readb(p + k); + writeb(p + k, m1); + } } - } else { - for (i = y, j = 0; i < ymax; ++i, ++j) { - m = mouse_or_mask[j] >> xoff; -#if defined(__i386__) || defined(__amd64__) - *(u_char *)p &= m; -#else - writeb(p, readb(p) & (m >> 8)); -#endif - p += line_width; - } + p += line_width; } - outw(GDCIDX, 0x0005); /* read mode 0, write mode 0 */ outw(GDCIDX, 0x0003); /* data rotate/function select */ } @@ -1104,54 +1077,31 @@ static void remove_pxlmouse_planar(scr_stat *scp, int x, int y) { vm_offset_t p; - int col, row; - int pos; - int line_width; - int ymax; - int i; + int bx, by, i, line_width, xend, xoff, yend, yoff; - /* erase the mouse cursor image */ - col = x/8 - scp->xoff; - row = y/scp->font_size - scp->yoff; - pos = row*scp->xsize + col; - i = (col < scp->xsize - 1) ? 2 : 1; - (*scp->rndr->draw)(scp, pos, i, FALSE); - if (row < scp->ysize - 1) - (*scp->rndr->draw)(scp, pos + scp->xsize, i, FALSE); + /* + * It is only necessary to remove the mouse image where it overlaps + * the border. Determine the overlap, and do nothing if it is empty. + */ + bx = (scp->xoff + scp->xsize) * 8; + by = (scp->yoff + scp->ysize) * scp->font_size; + xend = imin(x + MOUSE_IMAGE_WIDTH, scp->xpixel); + yend = imin(y + MOUSE_IMAGE_HEIGHT, scp->ypixel); + if (xend <= bx && yend <= by) + return; - /* paint border if necessary */ + /* Repaint the non-empty overlap. */ line_width = scp->sc->adp->va_line_width; outw(GDCIDX, 0x0005); /* read mode 0, write mode 0 */ outw(GDCIDX, 0x0003); /* data rotate/function select */ outw(GDCIDX, 0x0f01); /* set/reset enable */ outw(GDCIDX, 0xff08); /* bit mask */ outw(GDCIDX, (scp->border << 8) | 0x00); /* set/reset */ - if (row == scp->ysize - 1) { - i = (scp->ysize + scp->yoff)*scp->font_size; - ymax = imin(i + scp->font_size, scp->ypixel); - p = scp->sc->adp->va_window + i*line_width + scp->xoff + col; - if (col < scp->xsize - 1) { - for (; i < ymax; ++i) { - writeb(p, 0); - writeb(p + 1, 0); - p += line_width; - } - } else { - for (; i < ymax; ++i) { - writeb(p, 0); - p += line_width; - } - } - } - if ((col == scp->xsize - 1) && (scp->xoff > 0)) { - i = (row + scp->yoff)*scp->font_size; - ymax = imin(i + scp->font_size*2, scp->ypixel); - p = scp->sc->adp->va_window + i*line_width - + scp->xoff + scp->xsize; - for (; i < ymax; ++i) { + for (i = x / 8, xoff = i * 8; xoff < xend; ++i, xoff += 8) { + yoff = (xoff >= bx) ? y : by; + p = scp->sc->adp->va_window + yoff * line_width + i; + for (; yoff < yend; ++yoff, p += line_width) writeb(p, 0); - p += line_width; - } } outw(GDCIDX, 0x0000); /* set/reset */ outw(GDCIDX, 0x0001); /* set/reset enable */ @@ -1171,7 +1121,14 @@ vga_pxlmouse_direct(scr_stat *scp, int x, int y, int o uint8_t *u8; int bpp; - if (!on) + /* + * Determine overlap with the border and then if removing, do nothing + * if the overlap is empty. + */ + xend = imin(x + 16, scp->xpixel); + yend = imin(y + 16, scp->ypixel); + if (!on && xend <= (scp->xoff + scp->xsize) * 8 && + yend <= (scp->yoff + scp->ysize) * scp->font_size) return; bpp = scp->sc->adp->va_info.vi_depth; @@ -1182,9 +1139,18 @@ vga_pxlmouse_direct(scr_stat *scp, int x, int y, int o line_width = scp->sc->adp->va_line_width; pixel_size = scp->sc->adp->va_info.vi_pixel_size; - xend = imin(x + 16, scp->xpixel); - yend = imin(y + 16, scp->ypixel); + if (on) + goto do_on; + /* + * Repaint overlap with the border and nearby. Unlike in the planar + * case, we kept track of everything under the cursor so can restore + * it all, but we don't completely trust the saved state to be still + * relevant, so do nothing if it is obviously stale. + */ + if (x != x_old || y != y_old || xend != xend_old || yend != yend_old) + return; + p = scp->sc->adp->va_window + y_old * line_width + x_old * pixel_size; for (i = 0; i < (yend_old - y_old); i++) { @@ -1209,7 +1175,9 @@ vga_pxlmouse_direct(scr_stat *scp, int x, int y, int o p += line_width; } + return; +do_on: p = scp->sc->adp->va_window + y * line_width + x * pixel_size; for (i = 0; i < (yend - y); i++) { Modified: stable/11/sys/dev/syscons/syscons.h ============================================================================== --- stable/11/sys/dev/syscons/syscons.h Wed Mar 14 07:58:11 2018 (r330919) +++ stable/11/sys/dev/syscons/syscons.h Wed Mar 14 08:15:26 2018 (r330920) @@ -322,8 +322,6 @@ typedef struct scr_stat { int cursor_pos; /* cursor buffer position */ int cursor_oldpos; /* cursor old buffer position */ - u_short cursor_saveunder_char; /* saved char under cursor */ - u_short cursor_saveunder_attr; /* saved attr under cursor */ struct cursor_attr dflt_curs_attr; struct cursor_attr curr_curs_attr; struct cursor_attr curs_attr; From owner-svn-src-stable@freebsd.org Wed Mar 14 08:27:06 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7B62EF2F6D2; Wed, 14 Mar 2018 08:27:06 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2CC4B748FB; Wed, 14 Mar 2018 08:27:06 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 27A8B25840; Wed, 14 Mar 2018 08:27:06 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E8R6Dk093162; Wed, 14 Mar 2018 08:27:06 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E8R6jq093161; Wed, 14 Mar 2018 08:27:06 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140827.w2E8R6jq093161@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 08:27:06 +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: r330921 - stable/11/sys/dev/vt/hw/vga X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/vt/hw/vga X-SVN-Commit-Revision: 330921 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 08:27:06 -0000 Author: eadler Date: Wed Mar 14 08:27:05 2018 New Revision: 330921 URL: https://svnweb.freebsd.org/changeset/base/330921 Log: MFC r330834: vt_vga: check if VGA is available from ACPI FADT table On x86 the IA-PC Boot Flags in the FADT can signal whether VGA is available or not. Modified: stable/11/sys/dev/vt/hw/vga/vt_vga.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/vt/hw/vga/vt_vga.c ============================================================================== --- stable/11/sys/dev/vt/hw/vga/vt_vga.c Wed Mar 14 08:15:26 2018 (r330920) +++ stable/11/sys/dev/vt/hw/vga/vt_vga.c Wed Mar 14 08:27:05 2018 (r330921) @@ -30,6 +30,8 @@ * SUCH DAMAGE. */ +#include "opt_acpi.h" + #include __FBSDID("$FreeBSD$"); @@ -46,6 +48,10 @@ __FBSDID("$FreeBSD$"); #include +#if ((defined(__amd64__) || defined(__i386__)) && defined(DEV_ACPI)) +#include +#endif + struct vga_softc { bus_space_tag_t vga_fb_tag; bus_space_handle_t vga_fb_handle; @@ -1196,11 +1202,39 @@ vga_initialize(struct vt_device *vd, int textmode) return (0); } +static bool +vga_acpi_disabled(void) +{ +#if ((defined(__amd64__) || defined(__i386__)) && defined(DEV_ACPI)) + ACPI_TABLE_FADT *fadt; + vm_paddr_t physaddr; + uint16_t flags; + + physaddr = acpi_find_table(ACPI_SIG_FADT); + if (physaddr == 0) + return (false); + + fadt = acpi_map_table(physaddr, ACPI_SIG_FADT); + if (fadt == NULL) { + printf("vt_vga: unable to map FADT ACPI table\n"); + return (false); + } + + flags = fadt->BootFlags; + acpi_unmap_table(fadt); + + if (flags & ACPI_FADT_NO_VGA) + return (true); +#endif + + return (false); +} + static int vga_probe(struct vt_device *vd) { - return (CN_INTERNAL); + return (vga_acpi_disabled() ? CN_DEAD : CN_INTERNAL); } static int From owner-svn-src-stable@freebsd.org Wed Mar 14 08:29:16 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B492CF2FB1C for ; Wed, 14 Mar 2018 08:29:16 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-yw0-x22d.google.com (mail-yw0-x22d.google.com [IPv6:2607:f8b0:4002:c05::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 5304C74BC8 for ; Wed, 14 Mar 2018 08:29:16 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yw0-x22d.google.com with SMTP id q184so1569138ywh.13 for ; Wed, 14 Mar 2018 01:29:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to; bh=yQroqdnfH6zi/wKMjFQzUi8k7AudIYu8OE+AzbXF9Es=; b=COe90MninELsqky5qQlqGYaaFF7F66+s33P5qt+LLbKfNqG4RHmiCohrILPB8vkpmr 7JDMVTexCGs9K+MsipemCH+Eax0x+jAZOvsRrygrOZlC6sD+WzQRJ0ltbd+5L2eqdds9 zauqit7BnjW0dR5LV9bYd5wZEjJM0s0H6DIwc= 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; bh=yQroqdnfH6zi/wKMjFQzUi8k7AudIYu8OE+AzbXF9Es=; b=n1yeVB3uV0R+qUq5Iu2MtTQxGJzMaSIclSHmDCGdD0ooBw9RHfC30iisgmS8csPxpY fXtJS1FcWsSrpjZDeu1me3qmEH6U+Vlv/z4c+3RVI0sEuGDgj2kgMFL+SsQcoc8dWpPC 51IYSlWQbiBv3vRvPitfyP2LOPHKx+Ns8rTfDpg25rJZBm1R2KEHymnbMO2xUNtA5/oT eavVIZvFajTEXOa5VEdUzYpqAJj+0l2Dlghh6ZHeLkUDyMpRfY1ydoacVpxVrLrEsE8q CWExC3zsb/sDupPhvvLrlXJ+zXwjyOYmUT9Df0SZPfhiGzwC2HzA0Fv6lwE7UJWp2dzi RAxg== X-Gm-Message-State: AElRT7EiaB4ghloaFKLuIeq08yc/tJ4XAM6mtziCJ+drklY7gCCGdZBy 3uA1fBozXaIvlKFKiOiq4MXhFzwtEs1ZbtOjGsOk0w== X-Google-Smtp-Source: AG47ELvCszSXIf+InoMgHAAK5AdGld0NNhyXZHwxfafqvuLRgvrjCUxwcI1HCmSWcqqzGbKU87yXb8S8qfU4iPdMLeY= X-Received: by 10.129.110.86 with SMTP id j83mr2611721ywc.19.1521016155583; Wed, 14 Mar 2018 01:29:15 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 2002:a25:23d2:0:0:0:0:0 with HTTP; Wed, 14 Mar 2018 01:28:45 -0700 (PDT) In-Reply-To: <201803140827.w2E8R6jq093161@repo.freebsd.org> References: <201803140827.w2E8R6jq093161@repo.freebsd.org> From: Eitan Adler Date: Wed, 14 Mar 2018 01:28:45 -0700 X-Google-Sender-Auth: p9jbByKqPJncxU_apmGcCpFQqD8 Message-ID: Subject: Re: svn commit: r330921 - stable/11/sys/dev/vt/hw/vga To: src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 08:29:16 -0000 On 14 March 2018 at 01:27, Eitan Adler wrote: > Author: eadler > Date: Wed Mar 14 08:27:05 2018 > New Revision: 330921 > URL: https://svnweb.freebsd.org/changeset/base/330921 > > Log: > MFC r330834: > > vt_vga: check if VGA is available from ACPI FADT table > > On x86 the IA-PC Boot Flags in the FADT can signal whether VGA is > available or not. Woops. This was a bit early, but I'm only going to revert if its discovered to cause problems. -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams From owner-svn-src-stable@freebsd.org Wed Mar 14 08:33:04 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9D851F30236; Wed, 14 Mar 2018 08:33:04 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 513DA75095; Wed, 14 Mar 2018 08:33:04 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4C25E259CA; Wed, 14 Mar 2018 08:33:04 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E8X4R8098001; Wed, 14 Mar 2018 08:33:04 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E8X4ZH098000; Wed, 14 Mar 2018 08:33:04 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140833.w2E8X4ZH098000@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 08:33: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: r330922 - stable/11/share/man/man4 X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/share/man/man4 X-SVN-Commit-Revision: 330922 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 08:33:04 -0000 Author: eadler Date: Wed Mar 14 08:33:03 2018 New Revision: 330922 URL: https://svnweb.freebsd.org/changeset/base/330922 Log: MFC r322663: Correct multicast address used in pfsync(4) As stated in src/sys/netinet/in.h L395, address used is 224.0.0.240. PR: 216885 Modified: stable/11/share/man/man4/pfsync.4 Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man4/pfsync.4 ============================================================================== --- stable/11/share/man/man4/pfsync.4 Wed Mar 14 08:27:05 2018 (r330921) +++ stable/11/share/man/man4/pfsync.4 Wed Mar 14 08:33:03 2018 (r330922) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 20, 2011 +.Dd August 18, 2017 .Dt PFSYNC 4 .Os .Sh NAME @@ -90,7 +90,7 @@ interface: .Ed .Pp By default, state change messages are sent out on the synchronisation -interface using IP multicast packets to the 244.0.0.240 group address. +interface using IP multicast packets to the 224.0.0.240 group address. An alternative destination address for .Nm packets can be specified using the From owner-svn-src-stable@freebsd.org Wed Mar 14 08:45:20 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5EA68F31185; Wed, 14 Mar 2018 08:45:20 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1098E758F3; Wed, 14 Mar 2018 08:45:20 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0B83E25B48; Wed, 14 Mar 2018 08:45:20 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E8jJpI003299; Wed, 14 Mar 2018 08:45:19 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E8jJgT003298; Wed, 14 Mar 2018 08:45:19 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140845.w2E8jJgT003298@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 08:45: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: r330923 - stable/11/sys/dev/bhnd/nvram X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/bhnd/nvram X-SVN-Commit-Revision: 330923 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 08:45:20 -0000 Author: eadler Date: Wed Mar 14 08:45:19 2018 New Revision: 330923 URL: https://svnweb.freebsd.org/changeset/base/330923 Log: MFC r302509: Fix heap overflow in bhnd(4) SPROM parsing. The bus_region_* APIs accept the number of data items to be read, while the code was passing the total number of bytes, resulting in an overflow of the SPROM parser's buffer. Modified: stable/11/sys/dev/bhnd/nvram/bhnd_sprom_subr.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/bhnd/nvram/bhnd_sprom_subr.c ============================================================================== --- stable/11/sys/dev/bhnd/nvram/bhnd_sprom_subr.c Wed Mar 14 08:33:03 2018 (r330922) +++ stable/11/sys/dev/bhnd/nvram/bhnd_sprom_subr.c Wed Mar 14 08:45:19 2018 (r330923) @@ -523,7 +523,8 @@ sprom_direct_read(struct bhnd_sprom *sc, size_t offset p = (uint16_t *)buf; res_offset = sc->sp_res_off + offset; - bhnd_bus_read_region_stream_2(sc->sp_res, res_offset, p, nbytes); + bhnd_bus_read_region_stream_2(sc->sp_res, res_offset, p, + (nbytes / sizeof(uint16_t))); *crc = bhnd_nvram_crc8(p, nbytes, *crc); return (0); From owner-svn-src-stable@freebsd.org Wed Mar 14 08:48:40 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BF324F314F6; Wed, 14 Mar 2018 08:48:40 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 74D9675B32; Wed, 14 Mar 2018 08:48:40 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6B57425B4A; Wed, 14 Mar 2018 08:48:40 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E8mexb003440; Wed, 14 Mar 2018 08:48:40 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E8menB003439; Wed, 14 Mar 2018 08:48:40 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803140848.w2E8menB003439@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 14 Mar 2018 08:48: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: r330924 - stable/11/tools/tools/sysbuild X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/tools/tools/sysbuild X-SVN-Commit-Revision: 330924 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 08:48:40 -0000 Author: eadler Date: Wed Mar 14 08:48:40 2018 New Revision: 330924 URL: https://svnweb.freebsd.org/changeset/base/330924 Log: MFC r302452: Add missing PORTS_OPTS to two make commands Modified: stable/11/tools/tools/sysbuild/sysbuild.sh Directory Properties: stable/11/ (props changed) Modified: stable/11/tools/tools/sysbuild/sysbuild.sh ============================================================================== --- stable/11/tools/tools/sysbuild/sysbuild.sh Wed Mar 14 08:45:19 2018 (r330923) +++ stable/11/tools/tools/sysbuild/sysbuild.sh Wed Mar 14 08:48:40 2018 (r330924) @@ -242,7 +242,7 @@ ports_build() ( do b=`echo $p | tr / _` t=`echo $p | sed "s,${pd},,"` - pn=`cd $p && make package-name` + pn=`cd $p && make package-name ${PORTS_OPTS}` if [ "x`basename $p`" == "xpkg" ] ; then log_it "Very Special: $t ($pn)" @@ -289,7 +289,7 @@ ports_build() ( else log_it FAIL build $p fi - make clean + make clean ${PORTS_OPTS} ) > _.$b 2>&1 < /dev/null done ) From owner-svn-src-stable@freebsd.org Wed Mar 14 09:57:59 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4C99AF3F9EF; Wed, 14 Mar 2018 09:57:59 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EE6947871D; Wed, 14 Mar 2018 09:57:58 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E94B926627; Wed, 14 Mar 2018 09:57:58 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2E9vweD038727; Wed, 14 Mar 2018 09:57:58 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2E9vwxO038725; Wed, 14 Mar 2018 09:57:58 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201803140957.w2E9vwxO038725@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Wed, 14 Mar 2018 09:57: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: r330926 - in stable/11/sys/cam: . scsi X-SVN-Group: stable-11 X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: in stable/11/sys/cam: . scsi X-SVN-Commit-Revision: 330926 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 09:57:59 -0000 Author: tijl Date: Wed Mar 14 09:57:58 2018 New Revision: 330926 URL: https://svnweb.freebsd.org/changeset/base/330926 Log: MFC r314624: 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 Modified: stable/11/sys/cam/cam_xpt.c stable/11/sys/cam/scsi/scsi_pass.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cam/cam_xpt.c ============================================================================== --- stable/11/sys/cam/cam_xpt.c Wed Mar 14 09:20:03 2018 (r330925) +++ stable/11/sys/cam/cam_xpt.c Wed Mar 14 09:57:58 2018 (r330926) @@ -414,6 +414,9 @@ xptdoioctl(struct cdev *dev, u_long cmd, caddr_t addr, inccb = (union ccb *)addr; + if (inccb->ccb_h.flags & CAM_UNLOCKED) + return (EINVAL); + bus = xpt_find_bus(inccb->ccb_h.path_id); if (bus == NULL) return (EINVAL); Modified: stable/11/sys/cam/scsi/scsi_pass.c ============================================================================== --- stable/11/sys/cam/scsi/scsi_pass.c Wed Mar 14 09:20:03 2018 (r330925) +++ stable/11/sys/cam/scsi/scsi_pass.c Wed Mar 14 09:57:58 2018 (r330926) @@ -1798,6 +1798,11 @@ passdoioctl(struct cdev *dev, u_long cmd, caddr_t addr inccb = (union ccb *)addr; + 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. @@ -1891,20 +1896,23 @@ passdoioctl(struct cdev *dev, u_long cmd, caddr_t addr 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 (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; } @@ -1916,10 +1924,8 @@ passdoioctl(struct cdev *dev, u_long cmd, caddr_t addr 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; } /* @@ -1966,11 +1972,8 @@ passdoioctl(struct cdev *dev, u_long cmd, caddr_t addr || (fc == XPT_DEV_ADVINFO) || (fc == XPT_NVME_ADMIN) || (fc == XPT_NVME_IO)) { 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; @@ -2014,6 +2017,11 @@ passdoioctl(struct cdev *dev, u_long cmd, caddr_t addr TAILQ_REMOVE(&softc->active_queue, io_req, links); 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-stable@freebsd.org Wed Mar 14 14:32:02 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F5C6F558EA; Wed, 14 Mar 2018 14:32:02 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D583D831CC; Wed, 14 Mar 2018 14:32:01 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D0729F68; Wed, 14 Mar 2018 14:32:01 +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 w2EEW10T077672; Wed, 14 Mar 2018 14:32:01 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2EEW194077671; Wed, 14 Mar 2018 14:32:01 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201803141432.w2EEW194077671@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 14 Mar 2018 14:32: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: r330928 - stable/11/release/doc/share/xml X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/share/xml X-SVN-Commit-Revision: 330928 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 14:32:02 -0000 Author: gjb Date: Wed Mar 14 14:32:01 2018 New Revision: 330928 URL: https://svnweb.freebsd.org/changeset/base/330928 Log: Document SA-18:03.speculative_execution. Sponsored by: The FreeBSD Foundation Modified: stable/11/release/doc/share/xml/security.xml Modified: stable/11/release/doc/share/xml/security.xml ============================================================================== --- stable/11/release/doc/share/xml/security.xml Wed Mar 14 13:20:36 2018 (r330927) +++ stable/11/release/doc/share/xml/security.xml Wed Mar 14 14:32:01 2018 (r330928) @@ -75,6 +75,22 @@ 07 March 2018 Multiple vulnerabilities + + + FreeBSD-SA-18:03.speculative_execution + 14 March 2018 + + Speculative Execution Vulnerabilities + + This advisory addresses the most significant issues + for &os; 11.1 on &arch.amd64; CPUs. We expect to + update this advisory to include 10.x for &arch.amd64; + CPUs. Future &os; releases will address this issue on + &arch.i386; and other CPUs. + + + From owner-svn-src-stable@freebsd.org Wed Mar 14 19:04:41 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 854FDF35D4A; Wed, 14 Mar 2018 19:04:41 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3711771617; Wed, 14 Mar 2018 19:04:41 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 320C83DEA; Wed, 14 Mar 2018 19:04:41 +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 w2EJ4fdQ017954; Wed, 14 Mar 2018 19:04:41 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2EJ4eRM017948; Wed, 14 Mar 2018 19:04:40 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201803141904.w2EJ4eRM017948@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 14 Mar 2018 19:04: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: r330938 - in stable/10/sys: dev/acpica dev/cardbus dev/pci powerpc/ofw sparc64/pci X-SVN-Group: stable-10 X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in stable/10/sys: dev/acpica dev/cardbus dev/pci powerpc/ofw sparc64/pci X-SVN-Commit-Revision: 330938 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 19:04:41 -0000 Author: jhb Date: Wed Mar 14 19:04:40 2018 New Revision: 330938 URL: https://svnweb.freebsd.org/changeset/base/330938 Log: Convert pci_delete_child() to a bus_child_deleted() method. Instead of providing a wrapper around device_delete_child() that the PCI bus and child bus drivers must call explicitly, move the bulk of the logic from pci_delete_child() into a bus_child_deleted() method (pci_child_deleted()). This allows PCI devices to be safely deleted via device_delete_child(). - Add a bus_child_deleted method to the ACPI PCI bus which clears the device_t associated with the corresponding ACPI handle in addition to the normal PCI bus cleanup. - Change cardbus_detach_card to call device_delete_children() and move CardBus-specific delete logic into a new cardbus_child_deleted() method. - Use device_delete_child() instead of pci_delete_child() in the SRIOV code. - Add a bus_child_deleted method to the OpenFirmware PCI bus drivers which frees the OpenFirmware device info for each PCI device. To preserve KBI, a pci_delete_child() function is left in place that just calls device_delete_child(). PR: 226562 Requested by: dexuan Modified: stable/10/sys/dev/acpica/acpi_pci.c stable/10/sys/dev/cardbus/cardbus.c stable/10/sys/dev/pci/pci.c stable/10/sys/dev/pci/pci_private.h stable/10/sys/powerpc/ofw/ofw_pcibus.c stable/10/sys/sparc64/pci/ofw_pcibus.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/acpica/acpi_pci.c ============================================================================== --- stable/10/sys/dev/acpica/acpi_pci.c Wed Mar 14 18:27:06 2018 (r330937) +++ stable/10/sys/dev/acpica/acpi_pci.c Wed Mar 14 19:04:40 2018 (r330938) @@ -70,6 +70,7 @@ CTASSERT(ACPI_STATE_D2 == PCI_POWERSTATE_D2); CTASSERT(ACPI_STATE_D3 == PCI_POWERSTATE_D3); static int acpi_pci_attach(device_t dev); +static void acpi_pci_child_deleted(device_t dev, device_t child); static int acpi_pci_child_location_str_method(device_t cbdev, device_t child, char *buf, size_t buflen); static int acpi_pci_probe(device_t dev); @@ -92,6 +93,7 @@ static device_method_t acpi_pci_methods[] = { /* Bus interface */ DEVMETHOD(bus_read_ivar, acpi_pci_read_ivar), DEVMETHOD(bus_write_ivar, acpi_pci_write_ivar), + DEVMETHOD(bus_child_deleted, acpi_pci_child_deleted), DEVMETHOD(bus_child_location_str, acpi_pci_child_location_str_method), DEVMETHOD(bus_get_dma_tag, acpi_pci_get_dma_tag), DEVMETHOD(bus_get_domain, acpi_get_domain), @@ -143,6 +145,16 @@ acpi_pci_write_ivar(device_t dev, device_t child, int return (0); } return (pci_write_ivar(dev, child, which, value)); +} + +static void +acpi_pci_child_deleted(device_t dev, device_t child) +{ + struct acpi_pci_devinfo *dinfo = device_get_ivars(child); + + if (acpi_get_device(dinfo->ap_handle) == child) + AcpiDetachData(dinfo->ap_handle, acpi_fake_objhandler); + pci_child_deleted(dev, child); } static int Modified: stable/10/sys/dev/cardbus/cardbus.c ============================================================================== --- stable/10/sys/dev/cardbus/cardbus.c Wed Mar 14 18:27:06 2018 (r330937) +++ stable/10/sys/dev/cardbus/cardbus.c Wed Mar 14 19:04:40 2018 (r330938) @@ -226,31 +226,30 @@ cardbus_attach_card(device_t cbdev) return (ENOENT); } +static void +cardbus_child_deleted(device_t cbdev, device_t child) +{ + struct cardbus_devinfo *dinfo = device_get_ivars(child); + + if (dinfo->pci.cfg.dev != child) + device_printf(cbdev, "devinfo dev mismatch\n"); + cardbus_device_destroy(dinfo); + pci_child_deleted(cbdev, child); +} + static int cardbus_detach_card(device_t cbdev) { - int numdevs; - device_t *devlist; - int tmp; int err = 0; - if (device_get_children(cbdev, &devlist, &numdevs) != 0) - return (ENOENT); - if (numdevs == 0) { - free(devlist, M_TEMP); - return (ENOENT); - } + err = bus_generic_detach(cbdev); + if (err) + return (err); + err = device_delete_children(cbdev); + if (err) + return (err); - for (tmp = 0; tmp < numdevs; tmp++) { - struct cardbus_devinfo *dinfo = device_get_ivars(devlist[tmp]); - - if (dinfo->pci.cfg.dev != devlist[tmp]) - device_printf(cbdev, "devinfo dev mismatch\n"); - cardbus_device_destroy(dinfo); - pci_delete_child(cbdev, devlist[tmp]); - } POWER_DISABLE_SOCKET(device_get_parent(cbdev), cbdev); - free(devlist, M_TEMP); return (err); } @@ -335,6 +334,7 @@ static device_method_t cardbus_methods[] = { DEVMETHOD(device_resume, cardbus_resume), /* Bus interface */ + DEVMETHOD(bus_child_deleted, cardbus_child_deleted), DEVMETHOD(bus_get_dma_tag, bus_generic_get_dma_tag), DEVMETHOD(bus_read_ivar, cardbus_read_ivar), DEVMETHOD(bus_driver_added, cardbus_driver_added), Modified: stable/10/sys/dev/pci/pci.c ============================================================================== --- stable/10/sys/dev/pci/pci.c Wed Mar 14 18:27:06 2018 (r330937) +++ stable/10/sys/dev/pci/pci.c Wed Mar 14 19:04:40 2018 (r330938) @@ -154,6 +154,7 @@ static device_method_t pci_methods[] = { DEVMETHOD(bus_release_resource, pci_release_resource), DEVMETHOD(bus_activate_resource, pci_activate_resource), DEVMETHOD(bus_deactivate_resource, pci_deactivate_resource), + DEVMETHOD(bus_child_deleted, pci_child_deleted), DEVMETHOD(bus_child_detached, pci_child_detached), DEVMETHOD(bus_child_pnpinfo_str, pci_child_pnpinfo_str_method), DEVMETHOD(bus_child_location_str, pci_child_location_str_method), @@ -4883,7 +4884,7 @@ pci_deactivate_resource(device_t dev, device_t child, } void -pci_delete_child(device_t dev, device_t child) +pci_child_deleted(device_t dev, device_t child) { struct resource_list_entry *rle; struct resource_list *rl; @@ -4892,13 +4893,14 @@ pci_delete_child(device_t dev, device_t child) dinfo = device_get_ivars(child); rl = &dinfo->resources; - if (device_is_attached(child)) - device_detach(child); - /* Turn off access to resources we're about to free */ - pci_write_config(child, PCIR_COMMAND, pci_read_config(child, - PCIR_COMMAND, 2) & ~(PCIM_CMD_MEMEN | PCIM_CMD_PORTEN), 2); + if (bus_child_present(child) != 0) { + pci_write_config(child, PCIR_COMMAND, pci_read_config(child, + PCIR_COMMAND, 2) & ~(PCIM_CMD_MEMEN | PCIM_CMD_PORTEN), 2); + pci_disable_busmaster(child); + } + /* Free all allocated resources */ STAILQ_FOREACH(rle, rl, link) { if (rle->res) { @@ -4918,8 +4920,17 @@ pci_delete_child(device_t dev, device_t child) } resource_list_free(rl); - device_delete_child(dev, child); pci_freecfg(dinfo); +} + +/* KBI compatability shim. */ +extern void pci_delete_child(device_t dev, device_t child); + +void +pci_delete_child(device_t dev, device_t child) +{ + + device_delete_child (dev, child); } void Modified: stable/10/sys/dev/pci/pci_private.h ============================================================================== --- stable/10/sys/dev/pci/pci_private.h Wed Mar 14 18:27:06 2018 (r330937) +++ stable/10/sys/dev/pci/pci_private.h Wed Mar 14 19:04:40 2018 (r330938) @@ -54,7 +54,6 @@ void pci_add_child(device_t bus, struct pci_devinfo * void pci_add_resources(device_t bus, device_t dev, int force, uint32_t prefetchmask); int pci_attach_common(device_t dev); -void pci_delete_child(device_t dev, device_t child); void pci_driver_added(device_t dev, driver_t *driver); int pci_print_child(device_t dev, device_t child); void pci_probe_nomatch(device_t dev, device_t child); @@ -118,6 +117,7 @@ struct pci_devinfo *pci_read_device(device_t pcib, int size_t size); void pci_print_verbose(struct pci_devinfo *dinfo); int pci_freecfg(struct pci_devinfo *dinfo); +void pci_child_deleted(device_t dev, device_t child); void pci_child_detached(device_t dev, device_t child); int pci_child_location_str_method(device_t cbdev, device_t child, char *buf, size_t buflen); Modified: stable/10/sys/powerpc/ofw/ofw_pcibus.c ============================================================================== --- stable/10/sys/powerpc/ofw/ofw_pcibus.c Wed Mar 14 18:27:06 2018 (r330937) +++ stable/10/sys/powerpc/ofw/ofw_pcibus.c Wed Mar 14 19:04:40 2018 (r330938) @@ -61,6 +61,7 @@ static device_probe_t ofw_pcibus_probe; static device_attach_t ofw_pcibus_attach; static pci_assign_interrupt_t ofw_pcibus_assign_interrupt; static ofw_bus_get_devinfo_t ofw_pcibus_get_devinfo; +static bus_child_deleted_t ofw_pcibus_child_deleted; static int ofw_pcibus_child_pnpinfo_str_method(device_t cbdev, device_t child, char *buf, size_t buflen); @@ -73,6 +74,7 @@ static device_method_t ofw_pcibus_methods[] = { DEVMETHOD(device_attach, ofw_pcibus_attach), /* Bus interface */ + DEVMETHOD(bus_child_deleted, ofw_pcibus_child_deleted), DEVMETHOD(bus_child_pnpinfo_str, ofw_pcibus_child_pnpinfo_str_method), /* PCI interface */ @@ -265,6 +267,16 @@ ofw_pcibus_enum_bus(device_t dev, u_int domain, u_int pci_add_child(dev, (struct pci_devinfo *)dinfo); } } +} + +static void +ofw_pcibus_child_deleted(device_t dev, device_t child) +{ + struct ofw_pcibus_devinfo *dinfo; + + dinfo = device_get_ivars(dev); + ofw_bus_gen_destroy_devinfo(&dinfo->opd_obdinfo); + pci_child_deleted(dev, child); } static int Modified: stable/10/sys/sparc64/pci/ofw_pcibus.c ============================================================================== --- stable/10/sys/sparc64/pci/ofw_pcibus.c Wed Mar 14 18:27:06 2018 (r330937) +++ stable/10/sys/sparc64/pci/ofw_pcibus.c Wed Mar 14 19:04:40 2018 (r330938) @@ -65,6 +65,7 @@ static void ofw_pcibus_setup_device(device_t bridge, u u_int busno, u_int slot, u_int func); /* Methods */ +static bus_child_deleted_t ofw_pcibus_child_deleted; static bus_child_pnpinfo_str_t ofw_pcibus_pnpinfo_str; static device_attach_t ofw_pcibus_attach; static device_probe_t ofw_pcibus_probe; @@ -77,6 +78,7 @@ static device_method_t ofw_pcibus_methods[] = { DEVMETHOD(device_attach, ofw_pcibus_attach), /* Bus interface */ + DEVMETHOD(bus_child_deleted, ofw_pcibus_child_deleted), DEVMETHOD(bus_child_pnpinfo_str, ofw_pcibus_pnpinfo_str), /* PCI interface */ @@ -325,6 +327,16 @@ ofw_pcibus_get_devinfo(device_t bus, device_t dev) dinfo = device_get_ivars(dev); return (&dinfo->opd_obdinfo); +} + +static void +ofw_pcibus_child_deleted(device_t dev, device_t child) +{ + struct ofw_pcibus_devinfo *dinfo; + + dinfo = device_get_ivars(dev); + ofw_bus_gen_destroy_devinfo(&dinfo->opd_obdinfo); + pci_child_deleted(dev, child); } static int From owner-svn-src-stable@freebsd.org Wed Mar 14 23:59:53 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E144EF53998; Wed, 14 Mar 2018 23:59:52 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 93D767EA31; Wed, 14 Mar 2018 23:59:52 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 74A646A7C; Wed, 14 Mar 2018 23:59:52 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2ENxqZR066054; Wed, 14 Mar 2018 23:59:52 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2ENxqO0066053; Wed, 14 Mar 2018 23:59:52 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201803142359.w2ENxqO0066053@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Wed, 14 Mar 2018 23:59:52 +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: r330959 - stable/10/sys/x86/x86 X-SVN-Group: stable-10 X-SVN-Commit-Author: marius X-SVN-Commit-Paths: stable/10/sys/x86/x86 X-SVN-Commit-Revision: 330959 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 23:59:53 -0000 Author: marius Date: Wed Mar 14 23:59:52 2018 New Revision: 330959 URL: https://svnweb.freebsd.org/changeset/base/330959 Log: MFC: 327314 With the advent of interrupt remapping, Intel has repurposed bit 11 (now: Interrupt_Index[15]) and assigned the previously reserved bits 55:48 (Interrupt_Index[14:0] goes into 63:49 while Destination Field used 63:56 and bit 48 now is Interrupt_Format) in the IO redirection tables (see the VT-d specification, "5.1.5.1 I/OxAPIC Programming"). Thus, when not using interrupt remapping, ensure that all previously reserved bits in the high part of the RTEs are zero instead of doing a read-modify-write for their Destination Field bits only. Otherwise, on machines based on Apollo Lake and its derivatives such as Denverton, typically some of the previously preserved bits remain set after boot when not employing interrupt remapping. The result is that INTx interrupts are not getting delivered. Note: With an AMD IOMMU, interrupt remapping apparently bypasses the IO APIC altogether. Submitted by: loos (modulo comment) Reviewed by: jhb (modulo comment) Modified: stable/10/sys/x86/x86/io_apic.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/x86/x86/io_apic.c ============================================================================== --- stable/10/sys/x86/x86/io_apic.c Wed Mar 14 23:59:50 2018 (r330958) +++ stable/10/sys/x86/x86/io_apic.c Wed Mar 14 23:59:52 2018 (r330959) @@ -252,7 +252,7 @@ static void ioapic_program_intpin(struct ioapic_intsrc *intpin) { struct ioapic *io = (struct ioapic *)intpin->io_intsrc.is_pic; - uint32_t low, high, value; + uint32_t low, high; /* * If a pin is completely invalid or if it is valid but hasn't @@ -270,7 +270,11 @@ ioapic_program_intpin(struct ioapic_intsrc *intpin) return; } - /* Set the destination. */ + /* + * Set the destination. Note that with Intel interrupt remapping, + * the previously reserved bits 55:48 now have a purpose so ensure + * these are zero. + */ low = IOART_DESTPHY; high = intpin->io_cpu << APIC_ID_SHIFT; @@ -308,10 +312,7 @@ ioapic_program_intpin(struct ioapic_intsrc *intpin) } /* Write the values to the APIC. */ - value = ioapic_read(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin)); - value &= ~IOART_DEST; - value |= high; - ioapic_write(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin), value); + ioapic_write(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin), high); intpin->io_lowreg = low; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), low); } From owner-svn-src-stable@freebsd.org Wed Mar 14 23:59:51 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A8F3EF5398F; Wed, 14 Mar 2018 23:59:51 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 56BDC7EA2E; Wed, 14 Mar 2018 23:59:51 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 519846A7B; Wed, 14 Mar 2018 23:59:51 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2ENxpEP066011; Wed, 14 Mar 2018 23:59:51 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2ENxpwO066010; Wed, 14 Mar 2018 23:59:51 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201803142359.w2ENxpwO066010@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Wed, 14 Mar 2018 23:59: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: r330958 - stable/11/sys/x86/x86 X-SVN-Group: stable-11 X-SVN-Commit-Author: marius X-SVN-Commit-Paths: stable/11/sys/x86/x86 X-SVN-Commit-Revision: 330958 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 23:59:51 -0000 Author: marius Date: Wed Mar 14 23:59:50 2018 New Revision: 330958 URL: https://svnweb.freebsd.org/changeset/base/330958 Log: MFC: 327314 With the advent of interrupt remapping, Intel has repurposed bit 11 (now: Interrupt_Index[15]) and assigned the previously reserved bits 55:48 (Interrupt_Index[14:0] goes into 63:49 while Destination Field used 63:56 and bit 48 now is Interrupt_Format) in the IO redirection tables (see the VT-d specification, "5.1.5.1 I/OxAPIC Programming"). Thus, when not using interrupt remapping, ensure that all previously reserved bits in the high part of the RTEs are zero instead of doing a read-modify-write for their Destination Field bits only. Otherwise, on machines based on Apollo Lake and its derivatives such as Denverton, typically some of the previously preserved bits remain set after boot when not employing interrupt remapping. The result is that INTx interrupts are not getting delivered. Note: With an AMD IOMMU, interrupt remapping apparently bypasses the IO APIC altogether. Submitted by: loos (modulo comment) Reviewed by: jhb (modulo comment) Modified: stable/11/sys/x86/x86/io_apic.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/x86/x86/io_apic.c ============================================================================== --- stable/11/sys/x86/x86/io_apic.c Wed Mar 14 23:45:48 2018 (r330957) +++ stable/11/sys/x86/x86/io_apic.c Wed Mar 14 23:59:50 2018 (r330958) @@ -306,7 +306,7 @@ static void ioapic_program_intpin(struct ioapic_intsrc *intpin) { struct ioapic *io = (struct ioapic *)intpin->io_intsrc.is_pic; - uint32_t low, high, value; + uint32_t low, high; #ifdef ACPI_DMAR int error; #endif @@ -352,7 +352,11 @@ ioapic_program_intpin(struct ioapic_intsrc *intpin) } #endif - /* Set the destination. */ + /* + * Set the destination. Note that with Intel interrupt remapping, + * the previously reserved bits 55:48 now have a purpose so ensure + * these are zero. + */ low = IOART_DESTPHY; high = intpin->io_cpu << APIC_ID_SHIFT; @@ -390,10 +394,7 @@ ioapic_program_intpin(struct ioapic_intsrc *intpin) } /* Write the values to the APIC. */ - value = ioapic_read(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin)); - value &= ~IOART_DEST; - value |= high; - ioapic_write(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin), value); + ioapic_write(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin), high); intpin->io_lowreg = low; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), low); } From owner-svn-src-stable@freebsd.org Thu Mar 15 00:43:26 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 599E0F55FF9; Thu, 15 Mar 2018 00:43:26 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0362F805BF; Thu, 15 Mar 2018 00:43:26 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EEC747211; Thu, 15 Mar 2018 00:43:25 +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 w2F0hPPH090897; Thu, 15 Mar 2018 00:43:25 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2F0hP0t090896; Thu, 15 Mar 2018 00:43:25 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201803150043.w2F0hP0t090896@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 15 Mar 2018 00:43: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: r330960 - stable/11/sys/dev/asmc X-SVN-Group: stable-11 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/11/sys/dev/asmc X-SVN-Commit-Revision: 330960 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 00:43:26 -0000 Author: emaste Date: Thu Mar 15 00:43:25 2018 New Revision: 330960 URL: https://svnweb.freebsd.org/changeset/base/330960 Log: MFC r330667: asmc: update temperature sensor name/description PR: 225911 Submitted by: Trev Modified: stable/11/sys/dev/asmc/asmcvar.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/asmc/asmcvar.h ============================================================================== --- stable/11/sys/dev/asmc/asmcvar.h Wed Mar 14 23:59:52 2018 (r330959) +++ stable/11/sys/dev/asmc/asmcvar.h Thu Mar 15 00:43:25 2018 (r330960) @@ -311,7 +311,7 @@ struct asmc_softc { "cpu0_proximity", "hdd_bay", \ "northbridge_die", \ "northbridge_proximity", \ - "wireless_module", } + "wireless_proximity", } #define ASMC_MM31_TEMPDESCS { "CPU0 Die Core Temperature", \ "CPU0 Heatsink Temperature", \ @@ -319,7 +319,7 @@ struct asmc_softc { "HDD Bay Temperature", \ "Northbridge Die Core Temperature", \ "Northbridge Proximity Temperature", \ - "Wireless Module Temperature", } + "Wireless Module Proximity Temperature", } #define ASMC_MP_TEMPS { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \ "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \ From owner-svn-src-stable@freebsd.org Thu Mar 15 00:44:35 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3C67FF5614A; Thu, 15 Mar 2018 00:44:35 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E1B7280752; Thu, 15 Mar 2018 00:44:34 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DC7697213; Thu, 15 Mar 2018 00:44:34 +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 w2F0iYLp091025; Thu, 15 Mar 2018 00:44:34 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2F0iYMG091024; Thu, 15 Mar 2018 00:44:34 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201803150044.w2F0iYMG091024@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 15 Mar 2018 00:44: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: r330961 - stable/10/sys/dev/asmc X-SVN-Group: stable-10 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/10/sys/dev/asmc X-SVN-Commit-Revision: 330961 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 00:44:35 -0000 Author: emaste Date: Thu Mar 15 00:44:34 2018 New Revision: 330961 URL: https://svnweb.freebsd.org/changeset/base/330961 Log: MFC r330667: asmc: update temperature sensor name/description PR: 225911 Submitted by: Trev Modified: stable/10/sys/dev/asmc/asmcvar.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/asmc/asmcvar.h ============================================================================== --- stable/10/sys/dev/asmc/asmcvar.h Thu Mar 15 00:43:25 2018 (r330960) +++ stable/10/sys/dev/asmc/asmcvar.h Thu Mar 15 00:44:34 2018 (r330961) @@ -241,7 +241,7 @@ struct asmc_softc { "cpu0_proximity", "hdd_bay", \ "northbridge_die", \ "northbridge_proximity", \ - "wireless_module", } + "wireless_proximity", } #define ASMC_MM31_TEMPDESCS { "CPU0 Die Core Temperature", \ "CPU0 Heatsink Temperature", \ @@ -249,7 +249,7 @@ struct asmc_softc { "HDD Bay Temperature", \ "Northbridge Die Core Temperature", \ "Northbridge Proximity Temperature", \ - "Wireless Module Temperature", } + "Wireless Module Proximity Temperature", } #define ASMC_MP_TEMPS { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \ "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \ From owner-svn-src-stable@freebsd.org Thu Mar 15 02:20:07 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8EB27F2C3C3; Thu, 15 Mar 2018 02:20:07 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 40FC084AC7; Thu, 15 Mar 2018 02:20:07 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3AD1B101C3; Thu, 15 Mar 2018 02:20:07 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2F2K7B6036530; Thu, 15 Mar 2018 02:20:07 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2F2K6ff036525; Thu, 15 Mar 2018 02:20:06 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803150220.w2F2K6ff036525@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Thu, 15 Mar 2018 02:20:06 +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: r330964 - in stable/11/sys: kern sys X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: in stable/11/sys: kern sys X-SVN-Commit-Revision: 330964 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 02:20:07 -0000 Author: eadler Date: Thu Mar 15 02:20:06 2018 New Revision: 330964 URL: https://svnweb.freebsd.org/changeset/base/330964 Log: MFC r302525,r302526: Do allow auditing of read(2) and write(2) system calls, by assigning those system calls audit event identifiers AUE_READ and AUE_WRITE. While auditing file-descriptor I/O is not required by the Common Criteria, in practice this proves useful for both live and forensic analysis. NB: freebsd32 already assigns AUE_READ and AUE_WRITE to read(2) and write(2). In process-descriptor close(2) and fstat(2), audit target process information. pgkill(2) already audits target process ID. Modified: stable/11/sys/kern/init_sysent.c stable/11/sys/kern/sys_procdesc.c stable/11/sys/kern/syscalls.master stable/11/sys/sys/sysproto.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/kern/init_sysent.c ============================================================================== --- stable/11/sys/kern/init_sysent.c Thu Mar 15 01:07:21 2018 (r330963) +++ stable/11/sys/kern/init_sysent.c Thu Mar 15 02:20:06 2018 (r330964) @@ -48,8 +48,8 @@ struct sysent sysent[] = { { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 0 = syscall */ { AS(sys_exit_args), (sy_call_t *)sys_sys_exit, AUE_EXIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 1 = exit */ { 0, (sy_call_t *)sys_fork, AUE_FORK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 2 = fork */ - { AS(read_args), (sy_call_t *)sys_read, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 3 = read */ - { AS(write_args), (sy_call_t *)sys_write, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 4 = write */ + { AS(read_args), (sy_call_t *)sys_read, AUE_READ, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 3 = read */ + { AS(write_args), (sy_call_t *)sys_write, AUE_WRITE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 4 = write */ { AS(open_args), (sy_call_t *)sys_open, AUE_OPEN_RWTC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 5 = open */ { AS(close_args), (sy_call_t *)sys_close, AUE_CLOSE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 6 = close */ { AS(wait4_args), (sy_call_t *)sys_wait4, AUE_WAIT4, NULL, 0, 0, 0, SY_THR_STATIC }, /* 7 = wait4 */ Modified: stable/11/sys/kern/sys_procdesc.c ============================================================================== --- stable/11/sys/kern/sys_procdesc.c Thu Mar 15 01:07:21 2018 (r330963) +++ stable/11/sys/kern/sys_procdesc.c Thu Mar 15 02:20:06 2018 (r330964) @@ -1,10 +1,15 @@ /*- - * Copyright (c) 2009 Robert N. M. Watson + * Copyright (c) 2009, 2016 Robert N. M. Watson * All rights reserved. * * This software was developed at the University of Cambridge Computer * Laboratory with support from a grant from Google, Inc. * + * Portions of this software were developed by BAE Systems, the University of + * Cambridge Computer Laboratory, and Memorial University under DARPA/AFRL + * contract FA8650-15-C-7558 ("CADETS"), as part of the DARPA Transparent + * Computing (TC) research program. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -383,6 +388,7 @@ procdesc_close(struct file *fp, struct thread *td) sx_xunlock(&proctree_lock); } else { PROC_LOCK(p); + AUDIT_ARG_PROCESS(p); if (p->p_state == PRS_ZOMBIE) { /* * If the process is already dead and just awaiting @@ -529,6 +535,7 @@ procdesc_stat(struct file *fp, struct stat *sb, struct sx_slock(&proctree_lock); if (pd->pd_proc != NULL) { PROC_LOCK(pd->pd_proc); + AUDIT_ARG_PROCESS(pd->pd_proc); /* Set birth and [acm] times to process start time. */ pstart = pd->pd_proc->p_stats->p_start; Modified: stable/11/sys/kern/syscalls.master ============================================================================== --- stable/11/sys/kern/syscalls.master Thu Mar 15 01:07:21 2018 (r330963) +++ stable/11/sys/kern/syscalls.master Thu Mar 15 02:20:06 2018 (r330964) @@ -62,9 +62,9 @@ 1 AUE_EXIT STD { void sys_exit(int rval); } exit \ sys_exit_args void 2 AUE_FORK STD { int fork(void); } -3 AUE_NULL STD { ssize_t read(int fd, void *buf, \ +3 AUE_READ STD { ssize_t read(int fd, void *buf, \ size_t nbyte); } -4 AUE_NULL STD { ssize_t write(int fd, const void *buf, \ +4 AUE_WRITE STD { ssize_t write(int fd, const void *buf, \ size_t nbyte); } 5 AUE_OPEN_RWTC STD { int open(char *path, int flags, int mode); } ; XXX should be { int open(const char *path, int flags, ...); } Modified: stable/11/sys/sys/sysproto.h ============================================================================== --- stable/11/sys/sys/sysproto.h Thu Mar 15 01:07:21 2018 (r330963) +++ stable/11/sys/sys/sysproto.h Thu Mar 15 02:20:06 2018 (r330964) @@ -2518,8 +2518,8 @@ int freebsd10_pipe(struct thread *, struct freebsd10_p #define SYS_AUE_syscall AUE_NULL #define SYS_AUE_exit AUE_EXIT #define SYS_AUE_fork AUE_FORK -#define SYS_AUE_read AUE_NULL -#define SYS_AUE_write AUE_NULL +#define SYS_AUE_read AUE_READ +#define SYS_AUE_write AUE_WRITE #define SYS_AUE_open AUE_OPEN_RWTC #define SYS_AUE_close AUE_CLOSE #define SYS_AUE_wait4 AUE_WAIT4 From owner-svn-src-stable@freebsd.org Thu Mar 15 02:25:29 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8B517F2CA74; Thu, 15 Mar 2018 02:25:29 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3CF8F84F66; Thu, 15 Mar 2018 02:25:29 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3613D10352; Thu, 15 Mar 2018 02:25:29 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2F2PSdb041312; Thu, 15 Mar 2018 02:25:28 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2F2PS5P041311; Thu, 15 Mar 2018 02:25:28 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803150225.w2F2PS5P041311@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Thu, 15 Mar 2018 02:25: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: r330965 - stable/11/usr.sbin/ypldap X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/usr.sbin/ypldap X-SVN-Commit-Revision: 330965 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 02:25:29 -0000 Author: eadler Date: Thu Mar 15 02:25:28 2018 New Revision: 330965 URL: https://svnweb.freebsd.org/changeset/base/330965 Log: MFC r302535: Do not allow whitespace in macro names. Modified: stable/11/usr.sbin/ypldap/parse.y Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/ypldap/parse.y ============================================================================== --- stable/11/usr.sbin/ypldap/parse.y Thu Mar 15 02:20:06 2018 (r330964) +++ stable/11/usr.sbin/ypldap/parse.y Thu Mar 15 02:25:28 2018 (r330965) @@ -144,6 +144,14 @@ include : INCLUDE STRING { ; varset : STRING '=' STRING { + char *s = $1; + while (*s++) { + if (isspace((unsigned char) *s)) { + yyerror("macro name cannot contain " + "whitespace"); + YYERROR; + } + } if (symset($1, $3, 0) == -1) fatal("cannot store variable"); free($1); From owner-svn-src-stable@freebsd.org Thu Mar 15 02:32:23 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 047BAF2D666; Thu, 15 Mar 2018 02:32:23 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ACEF485822; Thu, 15 Mar 2018 02:32:22 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A7DE8104E0; Thu, 15 Mar 2018 02:32:22 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2F2WMii046338; Thu, 15 Mar 2018 02:32:22 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2F2WM8N046337; Thu, 15 Mar 2018 02:32:22 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803150232.w2F2WM8N046337@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Thu, 15 Mar 2018 02:32: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: r330966 - stable/11/lib/libcompat/4.3 X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/lib/libcompat/4.3 X-SVN-Commit-Revision: 330966 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 02:32:23 -0000 Author: eadler Date: Thu Mar 15 02:32:22 2018 New Revision: 330966 URL: https://svnweb.freebsd.org/changeset/base/330966 Log: MFC r329102: libcompat: Use %hu for unsigned shorts. Modified: stable/11/lib/libcompat/4.3/rexec.c Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libcompat/4.3/rexec.c ============================================================================== --- stable/11/lib/libcompat/4.3/rexec.c Thu Mar 15 02:25:28 2018 (r330965) +++ stable/11/lib/libcompat/4.3/rexec.c Thu Mar 15 02:32:22 2018 (r330966) @@ -356,7 +356,7 @@ retry: goto bad; } port = ntohs((u_short)sin2.sin_port); - (void) sprintf(num, "%u", port); + (void) sprintf(num, "%hu", port); (void) write(s, num, strlen(num)+1); { int len = sizeof (from); s3 = accept(s2, (struct sockaddr *)&from, &len); From owner-svn-src-stable@freebsd.org Thu Mar 15 04:59:48 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C1A1F4C072; Thu, 15 Mar 2018 04:59:48 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 14AAC6BCEB; Thu, 15 Mar 2018 04:59:48 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0C58011C0A; Thu, 15 Mar 2018 04:59:48 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2F4xlWR018119; Thu, 15 Mar 2018 04:59:47 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2F4xl9X018118; Thu, 15 Mar 2018 04:59:47 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803150459.w2F4xl9X018118@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Thu, 15 Mar 2018 04:59:47 +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: r330967 - stable/11/usr.sbin/fwcontrol X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/usr.sbin/fwcontrol X-SVN-Commit-Revision: 330967 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 04:59:48 -0000 Author: eadler Date: Thu Mar 15 04:59:47 2018 New Revision: 330967 URL: https://svnweb.freebsd.org/changeset/base/330967 Log: MFC r327279,r327571: Close fd when we're done dv-sending the file. Modified: stable/11/usr.sbin/fwcontrol/fwdv.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/fwcontrol/fwdv.c ============================================================================== --- stable/11/usr.sbin/fwcontrol/fwdv.c Thu Mar 15 02:32:22 2018 (r330966) +++ stable/11/usr.sbin/fwcontrol/fwdv.c Thu Mar 15 04:59:47 2018 (r330967) @@ -409,7 +409,6 @@ again: err(1, "write failed"); } } - close(fd); fprintf(stderr, "\n"); send_end: gettimeofday(&end, NULL); @@ -417,4 +416,5 @@ send_end: + (end.tv_usec - start.tv_usec) * 1e-6; fprintf(stderr, "%d frames, %.2f secs, %.2f frames/sec\n", frames, rtime, frames/rtime); + close(fd); } From owner-svn-src-stable@freebsd.org Thu Mar 15 05:04:47 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 49CD2F4C746; Thu, 15 Mar 2018 05:04:47 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DF2246C192; Thu, 15 Mar 2018 05:04:46 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BB91211D9D; Thu, 15 Mar 2018 05:04:46 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2F54kr2022961; Thu, 15 Mar 2018 05:04:46 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2F54ks2022958; Thu, 15 Mar 2018 05:04:46 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803150504.w2F54ks2022958@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Thu, 15 Mar 2018 05:04: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: r330968 - in stable/11/usr.sbin: ifmcstat pciconf X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: in stable/11/usr.sbin: ifmcstat pciconf X-SVN-Commit-Revision: 330968 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 05:04:47 -0000 Author: eadler Date: Thu Mar 15 05:04:46 2018 New Revision: 330968 URL: https://svnweb.freebsd.org/changeset/base/330968 Log: MFC r327580,r327581: bits is never null when we call ot. Add an assert to that effect and remove test for NULL. Remove dead code (comma is either 0 or 1 for sure, no need to test). Close /dev/pci when we're done with it. Modified: stable/11/usr.sbin/ifmcstat/printb.c stable/11/usr.sbin/pciconf/cap.c stable/11/usr.sbin/pciconf/pciconf.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/ifmcstat/printb.c ============================================================================== --- stable/11/usr.sbin/ifmcstat/printb.c Thu Mar 15 04:59:47 2018 (r330967) +++ stable/11/usr.sbin/ifmcstat/printb.c Thu Mar 15 05:04:46 2018 (r330968) @@ -32,6 +32,7 @@ #include __FBSDID("$FreeBSD$"); +#include #include /* @@ -43,7 +44,8 @@ printb(const char *s, unsigned int v, const char *bits int i, any = 0; char c; - if (bits && *bits == 8) + assert(bits != NULL); + if (*bits == 8) printf("%s=%o", s, v); else printf("%s=%x", s, v); Modified: stable/11/usr.sbin/pciconf/cap.c ============================================================================== --- stable/11/usr.sbin/pciconf/cap.c Thu Mar 15 04:59:47 2018 (r330967) +++ stable/11/usr.sbin/pciconf/cap.c Thu Mar 15 05:04:46 2018 (r330968) @@ -161,7 +161,7 @@ cap_pcix(int fd, struct pci_conf *p, uint8_t ptr) printf("supports"); comma = 0; if (status & PCIXM_STATUS_133CAP) { - printf("%s 133MHz", comma ? "," : ""); + printf(" 133MHz"); comma = 1; } if (status & PCIXM_STATUS_266CAP) { @@ -351,10 +351,8 @@ cap_vendor(int fd, struct pci_conf *p, uint8_t ptr) printf("%s SATA RAID-0/1/10", comma ? "," : ""); comma = 1; } - if (fvec & (1 << 3)) { - printf("%s SATA AHCI", comma ? "," : ""); - comma = 1; - } + if (fvec & (1 << 3)) + printf(", SATA AHCI"); } } } Modified: stable/11/usr.sbin/pciconf/pciconf.c ============================================================================== --- stable/11/usr.sbin/pciconf/pciconf.c Thu Mar 15 04:59:47 2018 (r330967) +++ stable/11/usr.sbin/pciconf/pciconf.c Thu Mar 15 05:04:46 2018 (r330968) @@ -1001,6 +1001,7 @@ writeit(const char *name, const char *reg, const char if (ioctl(fd, PCIOCWRITE, &pi) < 0) err(1, "ioctl(PCIOCWRITE)"); + close(fd); } static void @@ -1020,4 +1021,5 @@ chkattached(const char *name) exitstatus = pi.pi_data ? 0 : 2; /* exit(2), if NOT attached */ printf("%s: %s%s\n", name, pi.pi_data == 0 ? "not " : "", "attached"); + close(fd); } From owner-svn-src-stable@freebsd.org Thu Mar 15 05:13:30 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3C6E4F4D315; Thu, 15 Mar 2018 05:13:30 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E1DD26C755; Thu, 15 Mar 2018 05:13:29 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DC2FE11F21; Thu, 15 Mar 2018 05:13:29 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2F5DTso028196; Thu, 15 Mar 2018 05:13:29 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2F5DTvO028195; Thu, 15 Mar 2018 05:13:29 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803150513.w2F5DTvO028195@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Thu, 15 Mar 2018 05:13: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: r330969 - stable/11/usr.bin/mail X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/usr.bin/mail X-SVN-Commit-Revision: 330969 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 05:13:30 -0000 Author: eadler Date: Thu Mar 15 05:13:29 2018 New Revision: 330969 URL: https://svnweb.freebsd.org/changeset/base/330969 Log: MFC r302533: mail(1): Fix a comment. Modified: stable/11/usr.bin/mail/collect.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/mail/collect.c ============================================================================== --- stable/11/usr.bin/mail/collect.c Thu Mar 15 05:04:46 2018 (r330968) +++ stable/11/usr.bin/mail/collect.c Thu Mar 15 05:13:29 2018 (r330969) @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); #include "extern.h" /* - * Read a message from standard output and return a read file to it + * Read a message from standard input and return a read file to it * or NULL on error. */ From owner-svn-src-stable@freebsd.org Thu Mar 15 08:30:06 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9D83AF586E9; Thu, 15 Mar 2018 08:30:06 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CE0273A0C; Thu, 15 Mar 2018 08:30:06 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2D8F913C61; Thu, 15 Mar 2018 08:30:06 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2F8U6If030363; Thu, 15 Mar 2018 08:30:06 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2F8U5q8030361; Thu, 15 Mar 2018 08:30:05 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803150830.w2F8U5q8030361@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Thu, 15 Mar 2018 08:30: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: r330972 - stable/11/share/misc X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/share/misc X-SVN-Commit-Revision: 330972 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 08:30:06 -0000 Author: eadler Date: Thu Mar 15 08:30:05 2018 New Revision: 330972 URL: https://svnweb.freebsd.org/changeset/base/330972 Log: MFC r303063,r311852,r311930,r317040,r320506,r321301,r325162,r326759,r329004,: Add myself (stevek) as a src committer and mentor (sjg) to committers-src.dot Approved by: sjg (mentor) ------------------------------------------------------------------------ r311852 | ler | 2017-01-10 04:31:56 +0000 (Tue, 10 Jan 2017) | 5 lines Add myself to committers-ports.dot Approved by: adamw (mentor) Differential Revision: https://reviews.freebsd.org/D9117 ------------------------------------------------------------------------ r311930 | dumbbell | 2017-01-11 19:29:28 +0000 (Wed, 11 Jan 2017) | 5 lines committers-ports.dot: Add myself Approved by: antoine (mentor) Differential Revision: https://reviews.freebsd.org/D9143 ------------------------------------------------------------------------ r317040 | ganbold | 2017-04-17 07:27:45 +0000 (Mon, 17 Apr 2017) | 2 lines Belatedly add myself to committers-src.dot file. ------------------------------------------------------------------------ r320506 | kevans | 2017-06-30 20:01:31 +0000 (Fri, 30 Jun 2017) | 5 lines Add myself to commiters-src.dot, emaste@ as mentor; sort his mentees while here Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D11429 ------------------------------------------------------------------------ r321301 | mjoras | 2017-07-20 18:14:27 +0000 (Thu, 20 Jul 2017) | 5 lines Add myself and mentor line to committers-src.dot. Approved by: rstone (mentor) Differential Revision: https://reviews.freebsd.org/D11672 ------------------------------------------------------------------------ r325162 | arichardson | 2017-10-30 18:17:02 +0000 (Mon, 30 Oct 2017) | 5 lines Add myself to committers-src.dot Reviewed by: jhb (mentor) Approved by: jhb (mentor) ------------------------------------------------------------------------ r326759 | chuck | 2017-12-11 04:40:25 +0000 (Mon, 11 Dec 2017) | 6 lines Add myself to committers-src.dot Reviewed by: ken, imp Approved by: ken (mentor), imp (mentor) Differential Revision: https://reviews.freebsd.org/D13406 ------------------------------------------------------------------------ r329004 | jeb | 2018-02-08 00:14:20 +0000 (Thu, 08 Feb 2018) | 5 lines Add myself to committers-src.dot Reviewed by: erj (mentor) Approved by: erj (mentor) Modified: stable/11/share/misc/committers-ports.dot stable/11/share/misc/committers-src.dot Directory Properties: stable/11/ (props changed) Modified: stable/11/share/misc/committers-ports.dot ============================================================================== --- stable/11/share/misc/committers-ports.dot Thu Mar 15 06:19:45 2018 (r330971) +++ stable/11/share/misc/committers-ports.dot Thu Mar 15 08:30:05 2018 (r330972) @@ -90,6 +90,7 @@ delphij [label="Xin Li\ndelphij@FreeBSD.org\n2006/05/0 demon [label="Dmitry Sivachenko\ndemon@FreeBSD.org\n2000/11/13"] dhn [label="Dennis Herrmann\ndhn@FreeBSD.org\n2009/03/03"] dryice [label="Dryice Dong Liu\ndryice@FreeBSD.org\n2006/12/25"] +dumbbell [label="Jean-Sebastien Pedron\ndumbbell@FreeBSD.org\n2017/01/10"] dvl [label="Dan Langille\ndvl@FreeBSD.org\n2014/08/10"] eadler [label="Eitan Adler\neadler@FreeBSD.org\n2011/08/17"] edwin [label="Edwin Groothuis\nedwin@FreeBSD.org\n2002/10/22"] @@ -143,6 +144,7 @@ laszlof [label="Frank Laszlo\nlaszlof@FreeBSD.org\n200 lawrance [label="Sam Lawrance\nlawrance@FreeBSD.org\n2005/04/11\n2007/02/21"] lbr [label="Lars Balker Rasmussen\nlbr@FreeBSD.org\n2006/04/30"] leeym [label="Yen-Ming Lee\nleeym@FreeBSD.org\n2002/08/14"] +ler [label="Larry Rosenman\nler@FreeBSD.org\n2017/01/09"] lev [label="Lev Serebryakov\nlev@FreeBSD.org\n2003/06/17"] linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2003/10/23"] lioux [label="Mario Sergio Fujikawa Ferriera\nlioux@FreeBSD.org\n2000/10/14"] @@ -248,6 +250,7 @@ znerd [label="Ernst de Haan\nznerd@FreeBSD.org\n2001/1 adamw -> ahze adamw -> jylefort +adamw -> ler adamw -> mezz adamw -> pav adamw -> woodsb02 @@ -257,6 +260,8 @@ ade -> jpaetzel ahze -> shaun ahze -> tmclaugh +antoine -> dumbbell + araujo -> lippe araujo -> pclin araujo -> pgollucci @@ -275,6 +280,7 @@ bdrewery -> trociny bapt -> bdrewery bapt -> bofh +bapt -> dumbbell bapt -> eadler bapt -> grembo bapt -> jbeich @@ -543,6 +549,7 @@ rene -> bar rene -> cmt rene -> crees rene -> jgh +rene -> ler rene -> olivierd rm -> koobs Modified: stable/11/share/misc/committers-src.dot ============================================================================== --- stable/11/share/misc/committers-src.dot Thu Mar 15 06:19:45 2018 (r330971) +++ stable/11/share/misc/committers-src.dot Thu Mar 15 08:30:05 2018 (r330972) @@ -114,6 +114,7 @@ andreast [label="Andreas Tobler\nandreast@FreeBSD.org\ andrew [label="Andrew Turner\nandrew@FreeBSD.org\n2010/07/19"] antoine [label="Antoine Brodin\nantoine@FreeBSD.org\n2008/02/03"] araujo [label="Marcelo Araujo\naraujo@FreeBSD.org\n2015/08/04"] +arichardson [label="Alex Richardson\narichardson@FreeBSD.org\n2017/10/30"] ariff [label="Ariff Abdullah\nariff@FreeBSD.org\n2005/11/14"] art [label="Artem Belevich\nart@FreeBSD.org\n2011/03/29"] arybchik [label="Andrew Rybchenko\narybchik@FreeBSD.org\n2014/10/12"] @@ -136,6 +137,7 @@ bryanv [label="Bryan Venteicher\nbryanv@FreeBSD.org\n2 bschmidt [label="Bernhard Schmidt\nbschmidt@FreeBSD.org\n2010/02/06"] bz [label="Bjoern A. Zeeb\nbz@FreeBSD.org\n2004/07/27"] cem [label="Conrad Meyer\ncem@FreeBSD.org\n2015/07/05"] +chuck [label="Chuck Tuffli\nchuck@FreeBSD.org\n2017/09/06"] cognet [label="Olivier Houchard\ncognet@FreeBSD.org\n2002/10/09"] cokane [label="Coleman Kane\ncokane@FreeBSD.org\n2000/06/19"] cperciva [label="Colin Percival\ncperciva@FreeBSD.org\n2004/01/20"] @@ -167,6 +169,7 @@ flz [label="Florent Thoumie\nflz@FreeBSD.org\n2006/03/ gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2010/02/02"] gad [label="Garance A. Drosehn\ngad@FreeBSD.org\n2000/10/27"] gallatin [label="Andrew Gallatin\ngallatin@FreeBSD.org\n1999/01/15"] +ganbold [label="Ganbold Tsagaankhuu\nganbold@FreeBSD.org\n2013/12/18"] gavin [label="Gavin Atkinson\ngavin@FreeBSD.org\n2009/12/07"] gibbs [label="Justin T. Gibbs\ngibbs@FreeBSD.org\n????/??/??"] gjb [label="Glen Barber\ngjb@FreeBSD.org\n2013/06/04"] @@ -190,6 +193,7 @@ jasone [label="Jason Evans\njasone@FreeBSD.org\n1999/0 jceel [label="Jakub Klama\njceel@FreeBSD.org\n2011/09/25"] jch [label="Julien Charbon\njch@FreeBSD.org\n2014/09/24"] jchandra [label="Jayachandran C.\njchandra@FreeBSD.org\n2010/05/19"] +jeb [label="Jeb Cramer\njeb@FreeBSD.org\n2018/01/25"] jeff [label="Jeff Roberson\njeff@FreeBSD.org\n2002/02/21"] jh [label="Jaakko Heinonen\njh@FreeBSD.org\n2009/10/02"] jhb [label="John Baldwin\njhb@FreeBSD.org\n1999/08/23"] @@ -216,6 +220,7 @@ kan [label="Alexander Kabaev\nkan@FreeBSD.org\n2002/07 karels [label="Mike Karels\nkarels@FreeBSD.org\n2016/06/09"] ken [label="Ken Merry\nken@FreeBSD.org\n1998/09/08"] kensmith [label="Ken Smith\nkensmith@FreeBSD.org\n2004/01/23"] +kevans [label="Kyle Evans\nkevans@FreeBSD.org\n2017/06/20"] kevlo [label="Kevin Lo\nkevlo@FreeBSD.org\n2006/07/23"] kib [label="Konstantin Belousov\nkib@FreeBSD.org\n2006/06/03"] kmacy [label="Kip Macy\nkmacy@FreeBSD.org\n2005/06/01"] @@ -239,6 +244,7 @@ mdodd [label="Matthew N. Dodd\nmdodd@FreeBSD.org\n1999 melifaro [label="Alexander V. Chernikov\nmelifaro@FreeBSD.org\n2011/10/04"] mjacob [label="Matt Jacob\nmjacob@FreeBSD.org\n1997/08/13"] mjg [label="Mateusz Guzik\nmjg@FreeBSD.org\n2012/06/04"] +mjoras [label="Matt Joras\nmjoras@FreeBSD.org\n2017/07/12"] mlaier [label="Max Laier\nmlaier@FreeBSD.org\n2004/02/10"] mmel [label="Michal Meloun\nmmel@FreeBSD.org\n2015/11/01"] monthadar [label="Monthadar Al Jaberi\nmonthadar@FreeBSD.org\n2012/04/02"] @@ -303,6 +309,7 @@ sobomax [label="Maxim Sobolev\nsobomax@FreeBSD.org\n20 sos [label="Soren Schmidt\nsos@FreeBSD.org\n????/??/??"] sson [label="Stacey Son\nsson@FreeBSD.org\n2008/07/08"] stas [label="Stanislav Sedov\nstas@FreeBSD.org\n2008/08/22"] +stevek [label="Stephen J. Kiernan\nstevek@FreeBSD.org\n2016/07/18"] suz [label="SUZUKI Shinsuke\nsuz@FreeBSD.org\n2002/03/26"] syrinx [label="Shteryana Shopova\nsyrinx@FreeBSD.org\n2006/10/07"] takawata [label="Takanori Watanabe\ntakawata@FreeBSD.org\n2000/07/06"] @@ -395,6 +402,7 @@ brian -> joe brooks -> bushman brooks -> jamie brooks -> theraven +brooks -> arichardson bz -> anchie bz -> jamie @@ -453,12 +461,15 @@ eivind -> des eivind -> rwatson emaste -> achim -emaste -> rstone emaste -> dteske +emaste -> kevans emaste -> markj +emaste -> rstone emax -> markus +erj -> jeb + fjoe -> versus gallatin -> ticso @@ -498,6 +509,7 @@ imp -> ambrisko imp -> andrew imp -> bmah imp -> bruno +imp -> chuck imp -> dmlb imp -> emax imp -> furuta @@ -542,6 +554,7 @@ jhb -> peterj jhb -> pfg jhb -> rnoland jhb -> rpokala +jhb -> arichardson jimharris -> carl @@ -586,6 +599,7 @@ julian -> mp kan -> kib ken -> asomers +ken -> chuck ken -> slm kib -> ae @@ -700,6 +714,7 @@ rrs -> jchandra rrs -> tuexen rstone -> markj +rstone -> mjoras ru -> ceri ru -> cjc @@ -734,6 +749,7 @@ sam -> benjsc sam -> sephe sbruno -> hiren +sbruno -> jeb sbruno -> jimharris schweikh -> dds @@ -754,8 +770,11 @@ shin -> ume simon -> benl sjg -> phil +sjg -> stevek sos -> marcel + +stas -> ganbold theraven -> phil From owner-svn-src-stable@freebsd.org Thu Mar 15 08:40:23 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 24A45F59167; Thu, 15 Mar 2018 08:40:23 +0000 (UTC) (envelope-from agapon@gmail.com) Received: from mail-lf0-f48.google.com (mail-lf0-f48.google.com [209.85.215.48]) (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 8E428740BE; Thu, 15 Mar 2018 08:40:22 +0000 (UTC) (envelope-from agapon@gmail.com) Received: by mail-lf0-f48.google.com with SMTP id q69-v6so8848931lfi.10; Thu, 15 Mar 2018 01:40:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=/AVBOGK3rBwsFZ1JNG2vHE1ITTT9loJVADMmlppik2s=; b=qLTMVhhAzZYqzaiN11XCiIdpBevQoahsRILf1amTlpttk3h3p1aO7dgHILIcaQ5jC4 jNn9N/duzLyDsgv4cZmwbugN47aEoU4R5NbXmq6rrxk2CsZT7+xzIWFMc9K4w6AXi3Cv OsDwMqaBfyZZ6g2/mu/zR550uiCnPgYyyF1iZUuJ6zo/tn4ipzyTVAgeL7r9RHZHNmxs ujVFbKxQp1YEScpPuvMi6llXDxcDSbxCTc4oRrbOl0U2vmyOUteEsuCoDox2R2IVsRM3 VtsNELy9uIb20UJG0q5gkt8EnNFplG00mjQ+I6lbviC2R6za+oi25SyxLchwgCJ9P78I F+Nw== X-Gm-Message-State: AElRT7H3AowmFgKj1bLX3PBE9YZlERIgbOVJyUPkg5fjR+/7BO6tK4Vg hMhcCrC5H3KcI3vs2N969lrXt5fYz7Y= X-Google-Smtp-Source: AG47ELsPo0ubmSNyoQEfaH4d3/Xbc+YL6qNiq/q8oBf5ggDH3RBlPIEaXK+gAKlYINnky5dAfhMmLA== X-Received: by 2002:a19:1754:: with SMTP id n81-v6mr4959895lfi.113.1521103214979; Thu, 15 Mar 2018 01:40:14 -0700 (PDT) Received: from [192.168.0.88] (east.meadow.volia.net. [93.72.151.96]) by smtp.googlemail.com with ESMTPSA id v8sm377032ljj.79.2018.03.15.01.40.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Mar 2018 01:40:14 -0700 (PDT) Subject: Re: svn commit: r330972 - stable/11/share/misc To: Eitan Adler , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org References: <201803150830.w2F8U5q8030361@repo.freebsd.org> From: Andriy Gapon Message-ID: Date: Thu, 15 Mar 2018 10:40:13 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <201803150830.w2F8U5q8030361@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 08:40:23 -0000 On 15/03/2018 10:30, Eitan Adler wrote: > Author: eadler > Date: Thu Mar 15 08:30:05 2018 > New Revision: 330972 > URL: https://svnweb.freebsd.org/changeset/base/330972 > > Log: > MFC r303063,r311852,r311930,r317040,r320506,r321301,r325162,r326759,r329004,: I have never seen things like these MFC-ed before... Should we be really doing them? > Add myself (stevek) as a src committer and mentor (sjg) to committers-src.dot > > Approved by: sjg (mentor) > > ------------------------------------------------------------------------ > r311852 | ler | 2017-01-10 04:31:56 +0000 (Tue, 10 Jan 2017) | 5 lines > > Add myself to committers-ports.dot > > Approved by: adamw (mentor) > Differential Revision: https://reviews.freebsd.org/D9117 > > ------------------------------------------------------------------------ > r311930 | dumbbell | 2017-01-11 19:29:28 +0000 (Wed, 11 Jan 2017) | 5 lines > > committers-ports.dot: Add myself > > Approved by: antoine (mentor) > Differential Revision: https://reviews.freebsd.org/D9143 > > ------------------------------------------------------------------------ > r317040 | ganbold | 2017-04-17 07:27:45 +0000 (Mon, 17 Apr 2017) | 2 lines > > Belatedly add myself to committers-src.dot file. > > ------------------------------------------------------------------------ > r320506 | kevans | 2017-06-30 20:01:31 +0000 (Fri, 30 Jun 2017) | 5 lines > > Add myself to commiters-src.dot, emaste@ as mentor; sort his mentees while here > > Approved by: emaste (mentor) > Differential Revision: https://reviews.freebsd.org/D11429 > > ------------------------------------------------------------------------ > r321301 | mjoras | 2017-07-20 18:14:27 +0000 (Thu, 20 Jul 2017) | 5 lines > > Add myself and mentor line to committers-src.dot. > > Approved by: rstone (mentor) > Differential Revision: https://reviews.freebsd.org/D11672 > > ------------------------------------------------------------------------ > r325162 | arichardson | 2017-10-30 18:17:02 +0000 (Mon, 30 Oct 2017) | 5 lines > > Add myself to committers-src.dot > > Reviewed by: jhb (mentor) > Approved by: jhb (mentor) > > ------------------------------------------------------------------------ > r326759 | chuck | 2017-12-11 04:40:25 +0000 (Mon, 11 Dec 2017) | 6 lines > > Add myself to committers-src.dot > > Reviewed by: ken, imp > Approved by: ken (mentor), imp (mentor) > Differential Revision: https://reviews.freebsd.org/D13406 > > ------------------------------------------------------------------------ > r329004 | jeb | 2018-02-08 00:14:20 +0000 (Thu, 08 Feb 2018) | 5 lines > > Add myself to committers-src.dot > > Reviewed by: erj (mentor) > Approved by: erj (mentor) > > Modified: > stable/11/share/misc/committers-ports.dot > stable/11/share/misc/committers-src.dot > Directory Properties: > stable/11/ (props changed) > -- Andriy Gapon From owner-svn-src-stable@freebsd.org Thu Mar 15 09:04:25 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5284EF5AF82; Thu, 15 Mar 2018 09:04:25 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ED01F75689; Thu, 15 Mar 2018 09:04:24 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E7B9814279; Thu, 15 Mar 2018 09:04:24 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2F94OQQ050373; Thu, 15 Mar 2018 09:04:24 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2F94OYZ050364; Thu, 15 Mar 2018 09:04:24 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803150904.w2F94OYZ050364@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Thu, 15 Mar 2018 09:04: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: r330976 - in stable/11/usr.sbin/makefs: . cd9660 ffs X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: in stable/11/usr.sbin/makefs: . cd9660 ffs X-SVN-Commit-Revision: 330976 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 09:04:25 -0000 Author: eadler Date: Thu Mar 15 09:04:23 2018 New Revision: 330976 URL: https://svnweb.freebsd.org/changeset/base/330976 Log: MFC r303036,r303038,r306822,r307923,: makefs: reorder 'usage' alphabetically From NetBSD, Mon Aug 15 14:45:01 2011 +0000 (wiz) Re-order `usage' alphabetically; rename option arguments in the manpage's `SYNOPSIS' section to match those from `usage' (not the other way around; the `usage'-line (and other parts of makefs.c) contain the correct names); minor punctuation improvements. From Snader_LB. makefs.8 1.36 makefs.c 1.30 Obtained from: NetBSD ------------------------------------------------------------------------ r303038 | emaste | 2016-07-19 18:40:54 +0000 (Tue, 19 Jul 2016) | 56 lines makefs: sync NetBSD IDs with upstream for changes that we already have May 22 21:51:39 2011 +0000 (christos): From Nathan Whitehorn (nwhitehorn at freebsd dot org): Add code to generate bootable ISOs on Powermac and CHRP systems. Synthesize some partition maps (APM and MBR, respectively) pointing to (a) the whole disk, and (b) relevant El Torito boot images that have been added by other code. These partition maps are a little bit funny looking, but they seem to work. FreeBSD has been using this successfully in their release generation on powerpc, as well as generating all non-SPARC install media. SPARC support could probably be added as an extension of this patch. makefs.8 1.33 Tue Aug 23 17:09:11 2011 +0000 (christos): PR/45285: Martin Matuska: makefs does not properly convert ISO level 1 and 2 filenames (buffer overflow) makefs does not properly verify the maximum filename length in the special "." case for both ISO level 1 and ISO level 2 filename conversion. This creates broken images or causes a buffer overflow (ISO level 2). ISO level 1: If a filename contains only dots or up to 8 characters followed by dots the 8+3 limit check doesn't work. ISO level 2: If a filename contains a dot in the first 30 characters and a dot on the 30th character, the length limit check doesn't work and the buffer is overflowed. $ mkdir level1 $ touch level1/12345............ $ makefs -t cd9660 -o isolevel=1 test.iso level1 $ mkdir level2 $ touch level2/1234567890.2345678901234567.....34567890123456789012345 $ makefs -t cd9660 -o isolevel=2 test.iso level2 cd9660.c 1.32 Sun Oct 9 21:33:43 2011 +0000 (christos): add support for setting the ufs label. (Nathan Whitehorn) ffs.c 1.45 ffs.h 1.2 mkfs.c 1.22 makefs.8 1.37 Obtained from: NetBSD ------------------------------------------------------------------------ r306822 | emaste | 2016-10-07 19:12:15 +0000 (Fri, 07 Oct 2016) | 4 lines makefs: diff reduction with NetBSD Obtained from: NetBSD usr.sbin/makefs/cd9660.c 1.33 ------------------------------------------------------------------------ r307923 | marcel | 2016-10-25 16:21:38 +0000 (Tue, 25 Oct 2016) | 7 lines Allow building makefs(8) from another Makefile (such as one in a seperate directory hierarchy used to build tools). This boils down to replacing the use of ${.CURDIR} with either ${SRCDIR} or ${SRCTOP}. SRCDIR is defined as the directory in which the Makefile lives that bmake(1) is currently reading. Use SRCTOP when reaching outside of makefs's directory. Modified: stable/11/usr.sbin/makefs/Makefile stable/11/usr.sbin/makefs/cd9660.c stable/11/usr.sbin/makefs/cd9660/Makefile.inc stable/11/usr.sbin/makefs/ffs.c stable/11/usr.sbin/makefs/ffs.h stable/11/usr.sbin/makefs/ffs/Makefile.inc stable/11/usr.sbin/makefs/ffs/mkfs.c stable/11/usr.sbin/makefs/makefs.8 stable/11/usr.sbin/makefs/makefs.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/makefs/Makefile ============================================================================== --- stable/11/usr.sbin/makefs/Makefile Thu Mar 15 08:52:49 2018 (r330975) +++ stable/11/usr.sbin/makefs/Makefile Thu Mar 15 09:04:23 2018 (r330976) @@ -1,10 +1,12 @@ # $FreeBSD$ +SRCDIR:=${.PARSEDIR:tA} + .include PROG= makefs -CFLAGS+=-I${.CURDIR} +CFLAGS+=-I${SRCDIR} SRCS= cd9660.c ffs.c \ makefs.c \ @@ -14,24 +16,24 @@ MAN= makefs.8 WARNS?= 2 -.include "${.CURDIR}/cd9660/Makefile.inc" -.include "${.CURDIR}/ffs/Makefile.inc" +.include "${SRCDIR}/cd9660/Makefile.inc" +.include "${SRCDIR}/ffs/Makefile.inc" CFLAGS+=-DHAVE_STRUCT_STAT_ST_FLAGS=1 CFLAGS+=-DHAVE_STRUCT_STAT_ST_GEN=1 -.PATH: ${.CURDIR}/../../contrib/mtree -CFLAGS+=-I${.CURDIR}/../../contrib/mtree +.PATH: ${SRCTOP}/contrib/mtree +CFLAGS+=-I${SRCTOP}/contrib/mtree SRCS+= getid.c misc.c spec.c -.PATH: ${.CURDIR}/../../contrib/mknod -CFLAGS+=-I${.CURDIR}/../../contrib/mknod +.PATH: ${SRCTOP}/contrib/mknod +CFLAGS+=-I${SRCTOP}/contrib/mknod SRCS+= pack_dev.c -.PATH: ${.CURDIR}/../../sys/ufs/ffs +.PATH: ${SRCTOP}/sys/ufs/ffs SRCS+= ffs_tables.c -CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd +CFLAGS+= -I${SRCTOP}/lib/libnetbsd LIBADD= netbsd util sbuf .if ${MK_TESTS} != "no" Modified: stable/11/usr.sbin/makefs/cd9660.c ============================================================================== --- stable/11/usr.sbin/makefs/cd9660.c Thu Mar 15 08:52:49 2018 (r330975) +++ stable/11/usr.sbin/makefs/cd9660.c Thu Mar 15 09:04:23 2018 (r330976) @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660.c,v 1.31 2011/08/06 23:25:19 christos Exp $ */ +/* $NetBSD: cd9660.c,v 1.32 2011/08/23 17:09:11 christos Exp $ */ /*- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause @@ -1624,6 +1624,7 @@ cd9660_level1_convert_filename(const char *oldname, ch if (diskStructure.archimedes_enabled && *oldname == ',' && strlen(oldname) == 4) break; + /* Enforce 12.3 / 8 */ if (namelen == 8 && !found_ext) break; @@ -1631,7 +1632,7 @@ cd9660_level1_convert_filename(const char *oldname, ch if (islower((unsigned char)*oldname)) *newname++ = toupper((unsigned char)*oldname); else if (isupper((unsigned char)*oldname) - || isdigit((unsigned char)*oldname)) + || isdigit((unsigned char)*oldname)) *newname++ = *oldname; else *newname++ = '_'; @@ -1641,7 +1642,7 @@ cd9660_level1_convert_filename(const char *oldname, ch else namelen++; } - oldname ++; + oldname++; } if (is_file) { if (!found_ext && !diskStructure.omit_trailing_period) Modified: stable/11/usr.sbin/makefs/cd9660/Makefile.inc ============================================================================== --- stable/11/usr.sbin/makefs/cd9660/Makefile.inc Thu Mar 15 08:52:49 2018 (r330975) +++ stable/11/usr.sbin/makefs/cd9660/Makefile.inc Thu Mar 15 09:04:23 2018 (r330976) @@ -1,9 +1,9 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/cd9660 ${.CURDIR}/../../sys/fs/cd9660/ +.PATH: ${SRCDIR}/cd9660 ${SRCTOP}/sys/fs/cd9660/ -CFLAGS+=-I${.CURDIR}/../../sys/fs/cd9660/ +CFLAGS+=-I${SRCTOP}/sys/fs/cd9660/ SRCS+= cd9660_strings.c cd9660_debug.c cd9660_eltorito.c \ cd9660_write.c cd9660_conversion.c iso9660_rrip.c cd9660_archimedes.c Modified: stable/11/usr.sbin/makefs/ffs.c ============================================================================== --- stable/11/usr.sbin/makefs/ffs.c Thu Mar 15 08:52:49 2018 (r330975) +++ stable/11/usr.sbin/makefs/ffs.c Thu Mar 15 09:04:23 2018 (r330976) @@ -1,4 +1,4 @@ -/* $NetBSD: ffs.c,v 1.44 2009/04/28 22:49:26 joerg Exp $ */ +/* $NetBSD: ffs.c,v 1.45 2011/10/09 22:49:26 christos Exp $ */ /*- * SPDX-License-Identifier: BSD-4-Clause Modified: stable/11/usr.sbin/makefs/ffs.h ============================================================================== --- stable/11/usr.sbin/makefs/ffs.h Thu Mar 15 08:52:49 2018 (r330975) +++ stable/11/usr.sbin/makefs/ffs.h Thu Mar 15 09:04:23 2018 (r330976) @@ -1,4 +1,4 @@ -/* $NetBSD: ffs.h,v 1.1 2004/12/20 20:51:42 jmc Exp $ */ +/* $NetBSD: ffs.h,v 1.2 2004/12/20 20:51:42 jmc Exp $ */ /*- * SPDX-License-Identifier: BSD-4-Clause Modified: stable/11/usr.sbin/makefs/ffs/Makefile.inc ============================================================================== --- stable/11/usr.sbin/makefs/ffs/Makefile.inc Thu Mar 15 08:52:49 2018 (r330975) +++ stable/11/usr.sbin/makefs/ffs/Makefile.inc Thu Mar 15 09:04:23 2018 (r330976) @@ -1,9 +1,9 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/ffs ${.CURDIR}/../../sys/ufs/ffs +.PATH: ${SRCDIR}/ffs ${SRCTOP}/sys/ufs/ffs -CFLAGS+= -I${.CURDIR}/../../sys/ufs/ffs +CFLAGS+= -I${SRCTOP}/sys/ufs/ffs SRCS+= ffs_alloc.c ffs_balloc.c ffs_bswap.c ffs_subr.c ufs_bmap.c SRCS+= buf.c mkfs.c Modified: stable/11/usr.sbin/makefs/ffs/mkfs.c ============================================================================== --- stable/11/usr.sbin/makefs/ffs/mkfs.c Thu Mar 15 08:52:49 2018 (r330975) +++ stable/11/usr.sbin/makefs/ffs/mkfs.c Thu Mar 15 09:04:23 2018 (r330976) @@ -1,4 +1,4 @@ -/* $NetBSD: mkfs.c,v 1.20 2004/06/24 22:30:13 lukem Exp $ */ +/* $NetBSD: mkfs.c,v 1.22 2011/10/09 22:30:13 christos Exp $ */ /*- * SPDX-License-Identifier: BSD-3-Clause Modified: stable/11/usr.sbin/makefs/makefs.8 ============================================================================== --- stable/11/usr.sbin/makefs/makefs.8 Thu Mar 15 08:52:49 2018 (r330975) +++ stable/11/usr.sbin/makefs/makefs.8 Thu Mar 15 09:04:23 2018 (r330976) @@ -1,4 +1,4 @@ -.\" $NetBSD: makefs.8,v 1.32 2009/01/20 20:47:25 bjh21 Exp $ +.\" $NetBSD: makefs.8,v 1.33 2011/05/22 21:51:39 christos Exp $ .\" .\" Copyright (c) 2001-2003 Wasabi Systems, Inc. .\" All rights reserved. @@ -407,7 +407,8 @@ The utility appeared in .Nx 1.6 . .Sh AUTHORS -.An Luke Mewburn Aq Mt lukem@NetBSD.org +.An Luke Mewburn +.Aq Mt lukem@NetBSD.org (original program), .An Daniel Watt , .An Walter Deignan , Modified: stable/11/usr.sbin/makefs/makefs.c ============================================================================== --- stable/11/usr.sbin/makefs/makefs.c Thu Mar 15 08:52:49 2018 (r330975) +++ stable/11/usr.sbin/makefs/makefs.c Thu Mar 15 09:04:23 2018 (r330976) @@ -405,10 +405,10 @@ usage(void) prog = getprogname(); fprintf(stderr, -"usage: %s [-t fs-type] [-o fs-options] [-d debug-mask] [-B endian]\n" -"\t[-S sector-size] [-M minimum-size] [-m maximum-size] [-R roundup-size]\n" -"\t[-s image-size] [-b free-blocks] [-f free-files] [-F mtree-specfile]\n" -"\t[-xZ] [-N userdb-dir] [-T ]\n" +"usage: %s [-xZ] [-B endian] [-b free-blocks] [-d debug-mask]\n" +"\t[-F mtree-specfile] [-f free-files] [-M minimum-size] [-m maximum-size]\n" +"\t[-N userdb-dir] [-o fs-options] [-R roundup-size] [-S sector-size]\n" +"\t[-s image-size] [-T ] [-t fs-type]\n" "\timage-file directory | manifest [extra-directory ...]\n", prog); exit(1); From owner-svn-src-stable@freebsd.org Thu Mar 15 09:07:01 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E1D3CF5B29F for ; Thu, 15 Mar 2018 09:07:01 +0000 (UTC) (envelope-from lists@eitanadler.com) 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 1B6E97587D for ; Thu, 15 Mar 2018 09:07:00 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yw0-x234.google.com with SMTP id l24so4093322ywk.6 for ; Thu, 15 Mar 2018 02:07:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=ddyqj9y2JsaoKLoYq9gR5crab6R24OTirTFCl4cFzVA=; b=rIGxK4UrKfDpJ31otQaNvko5oE7jN0ZMvsp/2E37uFPMMdlAx3zoBVJCCtQRSpPbLH neWbMufqO9cVaxa2qR4BIr0wEjIoP5llSNQqwMAefqYlSfDzYZnPZC1/D9NvBoqjTv23 xzhEkPDNtBMnGlXZDa+Vhj9L9a9FwVZnrr/Oo= 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=ddyqj9y2JsaoKLoYq9gR5crab6R24OTirTFCl4cFzVA=; b=cOs+ifXF1V87OplZbRtJ67SoS3qjhfGazTxbc+xZgyuwbaOs9/eU3DbQP6Te/8Do0v tMZU7dAurgNOXAiLmdLpmNGP0OHbXqdFLg1ZcCJPFa1GYL0LbSzdDeEiG3sCYTegY/RC osR34LEKuizko3ThJ3Sz8R6fc0eFnRaMrmI/YBm8QHHCOA83ptJijyDcyAmEkd9eahvO /wgUk9+o41J5qc6QZaDnGU3Ryi/8Ttz/h5If3IN9CP1S7KLq56lxy/+SVvtiNmSs6UYZ wSkFgRVkSUM8+J+4f6H0dAjRMKItofnPOlpxRN07+ti+u56UYI38i+V6sjiVgFfbJuOt prOQ== X-Gm-Message-State: AElRT7GBJcOp+9RAslUvhdGdajAASig/IMhJQftNUH6U54beKnKHLodz 1vHspK345tPbuqJYKLVwUJSVLys9NlQWk7uFh1pP5Q== X-Google-Smtp-Source: AG47ELsR8CUXDAbZSpOVLQ7t0+63wNBkxOKCiKGedD/ohdGDPyNcQ8kG7nWteIPGYENoStvEyUegJMh/2J5Hwsqi5W8= X-Received: by 10.129.4.3 with SMTP id 3mr3628466ywe.162.1521104820301; Thu, 15 Mar 2018 02:07:00 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 2002:a25:23d2:0:0:0:0:0 with HTTP; Thu, 15 Mar 2018 02:06:29 -0700 (PDT) In-Reply-To: References: <201803150830.w2F8U5q8030361@repo.freebsd.org> From: Eitan Adler Date: Thu, 15 Mar 2018 02:06:29 -0700 X-Google-Sender-Auth: 7WQT0qw39ETGRw2FXO4zJz6KTTc Message-ID: Subject: Re: svn commit: r330972 - stable/11/share/misc To: Andriy Gapon Cc: src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 09:07:02 -0000 On 15 March 2018 at 01:40, Andriy Gapon wrote: > On 15/03/2018 10:30, Eitan Adler wrote: >> Author: eadler >> Date: Thu Mar 15 08:30:05 2018 >> New Revision: 330972 >> URL: https://svnweb.freebsd.org/changeset/base/330972 >> >> Log: >> MFC r303063,r311852,r311930,r317040,r320506,r321301,r325162,r326759,r329004,: > > I have never seen things like these MFC-ed before... > Should we be really doing them? I don't see any reason not to. I don't expect people to do them, though it might be interesting to add it as a teaching tool. -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams From owner-svn-src-stable@freebsd.org Thu Mar 15 09:22:21 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 62102F5C4F0; Thu, 15 Mar 2018 09:22:21 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1294376589; Thu, 15 Mar 2018 09:22:21 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0D5B5145AC; Thu, 15 Mar 2018 09:22:21 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2F9MLmx060182; Thu, 15 Mar 2018 09:22:21 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2F9MKwQ060178; Thu, 15 Mar 2018 09:22:20 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803150922.w2F9MKwQ060178@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Thu, 15 Mar 2018 09:22:20 +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: r330978 - in stable/11: share/misc usr.bin/calendar/calendars X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: in stable/11: share/misc usr.bin/calendar/calendars X-SVN-Commit-Revision: 330978 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 09:22:21 -0000 Author: eadler Date: Thu Mar 15 09:22:20 2018 New Revision: 330978 URL: https://svnweb.freebsd.org/changeset/base/330978 Log: MFC r302485,r303203,r303341,r304025,r306133,r306518,r308576,r308686,r309019,r309059,r310024,r311853,r312793,r313033,r313577,r313741,r314692,r317772,r317939,r319674,r319923,r321392,r322979,r323222,r323222,r323398,r323502,r323602,r323767,r323767,r323958,r325220,r326172,r326253,r330652,r330761,r330762,r330763,r330765,: Misc. *.dot additions Modified: stable/11/share/misc/committers-doc.dot stable/11/share/misc/committers-ports.dot stable/11/share/misc/committers-src.dot stable/11/usr.bin/calendar/calendars/calendar.freebsd Directory Properties: stable/11/ (props changed) Modified: stable/11/share/misc/committers-doc.dot ============================================================================== --- stable/11/share/misc/committers-doc.dot Thu Mar 15 09:16:10 2018 (r330977) +++ stable/11/share/misc/committers-doc.dot Thu Mar 15 09:22:20 2018 (r330978) @@ -85,6 +85,7 @@ pluknet [label="Sergey Kandaurov\npluknet@FreeBSD.org\ remko [label="Remko Lodder\nremko@FreeBSD.org\n2004/10/16"] rene [label="Rene Ladan\nrene@FreeBSD.org\n2008/11/03"] ryusuke [label="Ryusuke Suzuki\nryusuke@FreeBSD.org\n2009/12/21"] +sevan [label="Sevan Janiyan\nsevan@FreeBSD.org\n2016/09/16"] simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2003/07/20"] skreuzer [label="Steven Kreuzer\nskreuzer@FreeBSD.org\n2014/01/15"] taras [label="Taras Korenko\ntaras@FreeBSD.org\n2010/06/25"] @@ -104,6 +105,7 @@ bcr -> crees bcr -> jgh bcr -> allanjude bcr -> bhd +bcr -> sevan blackend -> ale Modified: stable/11/share/misc/committers-ports.dot ============================================================================== --- stable/11/share/misc/committers-ports.dot Thu Mar 15 09:16:10 2018 (r330977) +++ stable/11/share/misc/committers-ports.dot Thu Mar 15 09:22:20 2018 (r330978) @@ -29,7 +29,6 @@ node [color=grey62, style=filled, bgcolor=black]; # Alumni go here.. Try to keep things sorted. -adamw [label="Adam Weinberger\nadamw@FreeBSD.org\n2002/10/16\n2006/09/25"] asami [label="Satoshi Asami\nasami@FreeBSD.org\n1994/11/18\n2001/09/11"] billf [label="Bill Fumerola\nbillf@FreeBSD.org\n1998/11/11\n2006/12/14"] jmallett [label="Juli Mallett\njmallett@FreeBSD.org\n2003/01/16\n2006/08/10"] @@ -43,6 +42,8 @@ node [color=lightblue2, style=filled, bgcolor=black]; ache [label="Andrey Chernov\nache@FreeBSD.org\n1994/11/15"] acm [label="Jose Alonso Cardenas Marquez\nacm@FreeBSD.org\n2006/07/18"] +adamw [label="Adam Weinberger\nadamw@FreeBSD.org\n2002/10/16"] +adridg [label="Adriaan de Groot\nadridg@FreeBSD.org\n2017/09/08"] ahze [label="Michael Johnson\nahze@FreeBSD.org\n2004/10/29"] ak [label="Alex Kozlov\nak@FreeBSD.org\n2012/02/29"] ale [label="Alex Dupre\nale@FreeBSD.org\n2004/01/12"] @@ -84,7 +85,9 @@ daichi [label="Daichi Goto\ndaichi@FreeBSD.org\n2002/1 danfe [label="Alexey Dokuchaev\ndanfe@FreeBSD.org\n2004/08/20"] danilo [label="Danilo E. Gondolfo\ndanilo@FreeBSD.org\n2013/09/23"] db [label="Diane Bruce\ndb@FreeBSD.org\n2007/01/18"] +dbaio [label="Danilo G. Baio\ndbaio@FreeBSD.org\n2017/05/03"] dbn [label="David Naylor\ndbn@FreeBSD.org\n2013/01/14"] +dch [label="Dave Cottlehuber\ndch@FreeBSD.org\n2017/09/09"] decke [label="Bernhard Froehlich\ndecke@FreeBSD.org\n2010/03/21"] delphij [label="Xin Li\ndelphij@FreeBSD.org\n2006/05/01"] demon [label="Dmitry Sivachenko\ndemon@FreeBSD.org\n2000/11/13"] @@ -97,8 +100,10 @@ edwin [label="Edwin Groothuis\nedwin@FreeBSD.org\n2002 ehaupt [label="Emanuel Haupt\nehaupt@FreeBSD.org\n2005/10/03"] eik [label="Oliver Eikemeier\neik@FreeBSD.org\n2003/11/12"] erwin [label="Erwin Lansing\nerwin@FreeBSD.org\n2003/06/04"] +eugen [label="Eugene Grosbein\neugen@FreeBSD.org\n2017/03/04"] farrokhi [label="Babak Farrokhi\nfarrokhi@FreeBSD.org\n2006/11/07"] feld [label="Mark Felder\nfeld@FreeBSD.org\n2013/06/25"] +fernape [label="Fernando Apesteguia\nfernape@FreeBSD.org\n2018/03/03"] fjoe [label="Max Khon\nfjoe@FreeBSD.org\n2001/08/06"] flo [label="Florian Smeets\nflo@FreeBSD.org\n2010/12/07"] fluffy [label="Dima Panov\nfluffy@FreeBSD.org\n2009/08/10"] @@ -126,6 +131,7 @@ jhale [label="Jason E. Hale\njhale@FreeBSD.org\n2012/0 jkim [label="Jung-uk Kim\njkim@FreeBSD.org\n2007/09/12"] jlaffaye [label="Julien Laffaye\njlaffaye@FreeBSD.org\n2011/06/06"] jmelo [label="Jean Milanez Melo\njmelo@FreeBSD.org\n2006/03/31"] +joneum [label="Jochen Neumeister\njoneum@FreeBSD.org\n2017/05/11"] joerg [label="Joerg Wunsch\njoerg@FreeBSD.org\n1994/08/22"] johans [label="Johan Selst\njohans@FreeBSD.org\n2006/04/01"] josef [label="Josef El-Rayes\njosef@FreeBSD.org\n2004/12/20"] @@ -145,7 +151,9 @@ lawrance [label="Sam Lawrance\nlawrance@FreeBSD.org\n2 lbr [label="Lars Balker Rasmussen\nlbr@FreeBSD.org\n2006/04/30"] leeym [label="Yen-Ming Lee\nleeym@FreeBSD.org\n2002/08/14"] ler [label="Larry Rosenman\nler@FreeBSD.org\n2017/01/09"] +leres [label="Craig Leres\nleres@FreeBSD.org\n2017/10/10"] lev [label="Lev Serebryakov\nlev@FreeBSD.org\n2003/06/17"] +lifanov [label="Nikolai Lifanov\nlifanov@FreeBSD.org\n2016/12/11"] linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2003/10/23"] lioux [label="Mario Sergio Fujikawa Ferriera\nlioux@FreeBSD.org\n2000/10/14"] lippe [label="Felippe de Meirelles Motta\nlippe@FreeBSD.org\n2008/03/08"] @@ -167,8 +175,10 @@ matthew [label="Matthew Seaman\nmatthew@FreeBSD.org\n2 mezz [label="Jeremy Messenger\nmezz@FreeBSD.org\n2004/04/30"] mharo [label="Michael Haro\nmharo@FreeBSD.org\n1999/04/13"] milki [label="Jonathan Chu\nmilki@FreeBSD.org\n2013/12/15"] +misha [label="Mikhail Pchelin\nmisha@FreeBSD.org\n2016/11/15"] miwi [label="Martin Wilke\nmiwi@FreeBSD.org\n2006/06/04"] mm [label="Martin Matuska\nmm@FreeBSD.org\n2007/04/04"] +mmokhi [label="Mahdi Mokhtari\nmmokhi@FreeBSD.org\n2017/02/09"] mnag [label="Marcus Alves Grando\nmnag@FreeBSD.org\n2005/09/15"] mva [label="Marcus von Appen\nmva@FreeBSD.org\n2009/02/16"] nemysis [label="Rusmir Dusko\nnemysis@FreeBSD.org\n2013/07/31"] @@ -189,9 +199,11 @@ pclin [label="Po-Chien Lin\npclin@FreeBSD.org\n2013/02 pgj [label="Gabor Pali\npgj@FreeBSD.org\n2009/04/12"] pgollucci [label="Philip M. Gollucci\npgollucci@FreeBSD.org\n2008/07/21"] philip [label="Philip Paeps\nphilip@FreeBSD.org\n2005/10/19"] +pizzamig [label="Luca Pizzamiglio\npizzamig@FreeBSD.org\n2017/08/25"] rafan [label="Rong-En Fan\nrafan@FreeBSD.org\n2006/06/23"] rakuco [label="Raphael Kubo da Costa\nrakuco@FreeBSD.org\n2011/08/22"] rene [label="Rene Ladan\nrene@FreeBSD.org\n2010/04/11"] +rezny [label="Matthew Rezny\nrezny@FreeBSD.org\n2017/01/09"] riggs [label="Thomas Zander\nriggs@FreeBSD.org\n2014/01/09"] rm [label="Ruslan Makhmatkhanov\nrm@FreeBSD.org\n2011/11/06"] rnoland [label="Robert Noland\nrnoland@FreeBSD.org\n2008/07/21"] @@ -207,6 +219,7 @@ scheidell [label="Michael Scheidell\nscheidell@FreeBSD sem [label="Sergey Matveychuk\nsem@FreeBSD.org\n2004/07/07"] sergei [label="Sergei Kolobov\nsergei@FreeBSD.org\n2003/10/21"] shaun [label="Shaun Amott\nshaun@FreeBSD.org\n2006/06/19"] +shurd [label="Stephen Hurd\nshurd@FreeBSD.org\n2014/06/14"] simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2005/01/08"] skreuzer [label="Steven Kreuzer\nskreuzer@FreeBSD.org\n2009/03/25"] sobomax[label="Maxim Sobolev\nsobomax@FreeBSD.org\n2000/05/17"] @@ -218,17 +231,20 @@ sunpoet [label="Po-Chuan Hsieh\nsunpoet@FreeBSD.org\n2 swills [label="Steve Wills\nswills@FreeBSD.org\n2010/09/03"] sylvio [label="Sylvio Cesar Teixeira\nsylvio@FreeBSD.org\n2009/10/29"] tabthorpe [label="Thomas Abthorpe\ntabthorpe@FreeBSD.org\n2007/08/20"] +tcberner [label="Tobias C. Berner\ntcberner@FreeBSD.org\n2016/07/06"] tdb [label="Tim Bishop\ntdb@FreeBSD.org\n2005/11/30"] thierry [label="Thierry Thomas\nthierry@FreeBSD.org\n2004/03/15"] tijl [label="Tijl Coosemans\ntijl@FreeBSD.org\n2013/03/27"] timur [label="Timur Bakeyev\ntimur@FreeBSD.org\n2007/06/07"] tj [label="Tom Judge\ntj@FreeBSD.org\n2012/05/28"] tmclaugh [label="Tom McLaughlin\ntmclaugh@FreeBSD.org\n2005/09/15"] +tobik [label="Tobias Kortkamp\ntobik@FreeBSD.org\n2017/02/08"] tota [label="TAKATSU Tomonari\ntota@FreeBSD.org\n2009/03/30"] trasz [label="Edward Tomasz Napierala\ntrasz@FreeBSD.org\n2007/04/12"] trhodes [label="Tom Rhodes\ntrhodes@FreeBSD.org\n2004/07/06"] trociny [label="Mikolaj Golub\ntrociny@FreeBSD.org\n2013/10/17"] tz [label="Torsten Zuehlsdorff\ntz@FreeBSD.org\n2016/06/04"] +ultima [label="Richard Gallamore\nultima@FreeBSD.org\n2017/06/07"] uqs [label="Ulrich Spoerlein\nuqs@FreeBSD.org\n2012/01/19"] vd [label="Vasil Dimov\nvd@FreeBSD.org\n2006/01/19"] vg [label="Veniamin Gvozdikov\nvg@FreeBSD.org\n2013/06/11"] @@ -239,6 +255,7 @@ woodsb02 [label="Ben Woods\nwoodsb02@FreeBSD.org\n2016 wxs [label="Wesley Shields\nwxs@FreeBSD.org\n2008/01/03"] xmj [label="Johannes Jost Meixner\nxmj@FreeBSD.org\n2014/04/07"] xride [label="Soeren Straarup\nxride@FreeBSD.org\n2006/09/27"] +yuri [label="Yuri Victorovich\nyuri@FreeBSD.org\n2017/10/30"] yzlin [label="Yi-Jheng Lin\nyzlin@FreeBSD.org\n2009/07/19"] zeising [label="Niclas Zeising\nzeising@FreeBSD.org\n2012/07/03"] zi [label="Ryan Steinmetz\nzi@FreeBSD.org\n2011/07/14"] @@ -274,6 +291,8 @@ asami -> obrien avilla -> jhale avilla -> rakuco +az -> eugen + bdrewery -> dbn bdrewery -> sbruno bdrewery -> trociny @@ -325,6 +344,7 @@ culot -> marino culot -> wg db -> tj +db -> shurd decke -> sperber @@ -364,6 +384,8 @@ erwin -> simon feld -> brnrd feld -> junovitch +feld -> mmokhi +feld -> rezny fjoe -> danfe fjoe -> flo @@ -380,6 +402,7 @@ flz -> johans flz -> laszlof flz -> romain +jpaetzel -> misha jpaetzel -> wg gabor -> lippe @@ -389,6 +412,7 @@ gabor -> scheidell garga -> acm garga -> alepulver +garga -> dbaio garga -> mandree garga -> mm garga -> rnoland @@ -420,6 +444,9 @@ jadawin -> wen joerg -> netchild +jrm -> dch +jrm -> jwb + junovitch -> tz knu -> daichi @@ -448,8 +475,15 @@ lawrance -> itetcu leeym -> clsung +ler -> leres + +lifanov -> ultima + lioux -> pat +lme -> pizzamig +lme -> tobik + lwhsu -> yzlin maho -> stephen @@ -471,9 +505,16 @@ makc -> rakuco mat -> bmah mat -> dvl mat -> gordon +mat -> mmokhi +mat -> tcberner mat -> thierry +mat -> tobik mat -> woodsb02 +matthew -> leres +matthew -> lifanov +matthew -> ultima + mezz -> tmclaugh miwi -> amdmi3 @@ -487,6 +528,7 @@ miwi -> dhn miwi -> farrokhi miwi -> fluffy miwi -> gahr +miwi -> joneum miwi -> kmoore miwi -> lme miwi -> makc @@ -518,6 +560,8 @@ novel -> rm obrien -> mharo obrien -> gerald +olivier -> pizzamig + osa -> vg pat -> adamw @@ -543,12 +587,15 @@ pi -> tz rafan -> chinsan +rakuco -> adridg rakuco -> alonso +rakuco -> tcberner rene -> bar rene -> cmt rene -> crees rene -> jgh +rene -> joneum rene -> ler rene -> olivierd @@ -569,6 +616,7 @@ shaun -> timur shaun -> matthew skreuzer -> gnn +skreuzer -> shurd sobomax -> demon sobomax -> glewis @@ -580,9 +628,11 @@ stas -> araujo steve -> netchild +swills -> dch swills -> feld swills -> milki swills -> pclin +swills -> rezny swills -> robak swills -> rpaulo swills -> tz @@ -604,12 +654,22 @@ tabthorpe -> rene tabthorpe -> zi tabthorpe -> gblach +tcberner -> adridg +tcberner -> joneum +tcberner -> yuri +tcberner -> fernape + thierry -> jadawin thierry -> riggs tmclaugh -> itetcu tmclaugh -> xride +tz -> joneum +tz -> fernape + +vsevolod -> eugen + wen -> cs wen -> culot wen -> pawel @@ -617,6 +677,7 @@ wen -> pawel wg -> alexey wg -> danilo wg -> dvl +wg -> misha wg -> nemysis will -> lioux Modified: stable/11/share/misc/committers-src.dot ============================================================================== --- stable/11/share/misc/committers-src.dot Thu Mar 15 09:16:10 2018 (r330977) +++ stable/11/share/misc/committers-src.dot Thu Mar 15 09:22:20 2018 (r330978) @@ -15,7 +15,7 @@ digraph src { # foo [label="Foo Bar\nfoo@FreeBSD.org\n????/??/??"] # # ????/??/?? is the date when the commit bit was obtained, usually the one you -# can find looking at svn logs for the svnadmin/access file. +# can find looking at svn logs for the svnadmin/conf/access file. # Use YYYY/MM/DD format. # # For returned commit bits, the node definition will follow this example: @@ -78,7 +78,6 @@ non [label="Noriaki Mitsnaga\nnon@FreeBSD.org\n2000/06 onoe [label="Atsushi Onoe\nonoe@FreeBSD.org\n2000/07/21\n2008/11/10"] rafan [label="Rong-En Fan\nrafan@FreeBSD.org\n2007/01/31\n2012/07/23"] randi [label="Randi Harper\nrandi@FreeBSD.org\n2010/04/20\n2012/05/10"] -rgrimes [label="Rod Grimes\nrgrimes@FreeBSD.org\n1993/06/12\n2003/03/08"] rink [label="Rink Springer\nrink@FreeBSD.org\n2006/01/16\n2010/11/04"] robert [label="Robert Drehmel\nrobert@FreeBSD.org\n2001/08/23\n2006/05/13"] sah [label="Sam Hopkins\nsah@FreeBSD.org\n2004/12/15\n2008/11/10"] @@ -142,11 +141,14 @@ cognet [label="Olivier Houchard\ncognet@FreeBSD.org\n2 cokane [label="Coleman Kane\ncokane@FreeBSD.org\n2000/06/19"] cperciva [label="Colin Percival\ncperciva@FreeBSD.org\n2004/01/20"] csjp [label="Christian S.J. Peron\ncsjp@FreeBSD.org\n2004/05/04"] +dab [label="David Bright\ndab@FreeBSD.org\n2016/10/24"] das [label="David Schultz\ndas@FreeBSD.org\n2003/02/21"] davide [label="Davide Italiano\ndavide@FreeBSD.org\n2012/01/27"] dchagin [label="Dmitry Chagin\ndchagin@FreeBSD.org\n2009/02/28"] +def [label="Konrad Witaszczyk\ndef@FreeBSD.org\n2016/11/02"] delphij [label="Xin Li\ndelphij@FreeBSD.org\n2004/09/14"] des [label="Dag-Erling Smorgrav\ndes@FreeBSD.org\n1998/04/03"] +dexuan [label="Dexuan Cui\ndexuan@FreeBSD.org\n2016/10/24"] dfr [label="Doug Rabson\ndfr@FreeBSD.org\n????/??/??"] dg [label="David Greenman\ndg@FreeBSD.org\n1993/06/14"] dim [label="Dimitry Andric\ndim@FreeBSD.org\n2010/08/30"] @@ -162,10 +164,12 @@ emaste [label="Ed Maste\nemaste@FreeBSD.org\n2005/10/0 emax [label="Maksim Yevmenkin\nemax@FreeBSD.org\n2003/10/12"] eri [label="Ermal Luci\neri@FreeBSD.org\n2008/06/11"] erj [label="Eric Joyner\nerj@FreeBSD.org\n2014/12/14"] +eugen [label="Eugene Grosbein\neugen@FreeBSD.org\n2017/09/19"] fabient [label="Fabien Thomas\nfabient@FreeBSD.org\n2009/03/16"] fanf [label="Tony Finch\nfanf@FreeBSD.org\n2002/05/05"] fjoe [label="Max Khon\nfjoe@FreeBSD.org\n2001/08/06"] flz [label="Florent Thoumie\nflz@FreeBSD.org\n2006/03/30"] +fsu [label="Fedor Uporov\nfsu@FreeBSD.org\n2017/08/28"] gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2010/02/02"] gad [label="Garance A. Drosehn\ngad@FreeBSD.org\n2000/10/27"] gallatin [label="Andrew Gallatin\ngallatin@FreeBSD.org\n1999/01/15"] @@ -183,6 +187,7 @@ gshapiro [label="Gregory Shapiro\ngshapiro@FreeBSD.org harti [label="Hartmut Brandt\nharti@FreeBSD.org\n2003/01/29"] hiren [label="Hiren Panchasara\nhiren@FreeBSD.org\n2013/04/12"] hmp [label="Hiten Pandya\nhmp@FreeBSD.org\n2004/03/23"] +hselasky [label="Hans Petter Selasky\nhselasky@FreeBSD.org\n"] ian [label="Ian Lepore\nian@FreeBSD.org\n2013/01/07"] iedowse [label="Ian Dowse\niedowse@FreeBSD.org\n2000/12/01"] imp [label="Warner Losh\nimp@FreeBSD.org\n1996/09/20"] @@ -223,6 +228,7 @@ kensmith [label="Ken Smith\nkensmith@FreeBSD.org\n2004 kevans [label="Kyle Evans\nkevans@FreeBSD.org\n2017/06/20"] kevlo [label="Kevin Lo\nkevlo@FreeBSD.org\n2006/07/23"] kib [label="Konstantin Belousov\nkib@FreeBSD.org\n2006/06/03"] +kibab [label="Ilya Bakulin\nkibab@FreeBSD.org\n2017/09/02"] kmacy [label="Kip Macy\nkmacy@FreeBSD.org\n2005/06/01"] kp [label="Kristof Provost\nkp@FreeBSD.org\n2015/03/22"] landonf [label="Landon Fuller\nlandonf@FreeBSD.org\n2016/05/31"] @@ -242,6 +248,7 @@ maxim [label="Maxim Konovalov\nmaxim@FreeBSD.org\n2002 mdf [label="Matthew Fleming\nmdf@FreeBSD.org\n2010/06/04"] mdodd [label="Matthew N. Dodd\nmdodd@FreeBSD.org\n1999/07/27"] melifaro [label="Alexander V. Chernikov\nmelifaro@FreeBSD.org\n2011/10/04"] +mizhka [label="Michael Zhilin\nmizhka@FreeBSD.org\n2016/07/19"] mjacob [label="Matt Jacob\nmjacob@FreeBSD.org\n1997/08/13"] mjg [label="Mateusz Guzik\nmjg@FreeBSD.org\n2012/06/04"] mjoras [label="Matt Joras\nmjoras@FreeBSD.org\n2017/07/12"] @@ -250,6 +257,7 @@ mmel [label="Michal Meloun\nmmel@FreeBSD.org\n2015/11/ monthadar [label="Monthadar Al Jaberi\nmonthadar@FreeBSD.org\n2012/04/02"] mp [label="Mark Peek\nmp@FreeBSD.org\n2001/07/27"] mr [label="Michael Reifenberger\nmr@FreeBSD.org\n2001/09/30"] +mw [label="Marcin Wojtas\nmw@FreeBSD.org\n2017/07/18"] neel [label="Neel Natu\nneel@FreeBSD.org\n2009/09/20"] netchild [label="Alexander Leidinger\nnetchild@FreeBSD.org\n2005/03/31"] ngie [label="Ngie Cooper\nngie@FreeBSD.org\n2014/07/27"] @@ -264,7 +272,7 @@ peadar [label="Peter Edwards\npeadar@FreeBSD.org\n2004 peter [label="Peter Wemm\npeter@FreeBSD.org\n1995/07/04"] peterj [label="Peter Jeremy\npeterj@FreeBSD.org\n2012/09/14"] pfg [label="Pedro Giffuni\npfg@FreeBSD.org\n2011/12/01"] -phil [label="Phil Shafer\nphil@FreeBSD.ogr\n2016/12/30"] +phil [label="Phil Shafer\nphil@FreeBSD.ogr\n2015/12/30"] philip [label="Philip Paeps\nphilip@FreeBSD.org\n2004/01/21"] phk [label="Poul-Henning Kamp\nphk@FreeBSD.org\n1994/02/21"] pho [label="Peter Holm\npho@FreeBSD.org\n2008/11/16"] @@ -276,7 +284,9 @@ qingli [label="Qing Li\nqingli@FreeBSD.org\n2005/04/13 ray [label="Aleksandr Rybalko\nray@FreeBSD.org\n2011/05/25"] rdivacky [label="Roman Divacky\nrdivacky@FreeBSD.org\n2008/03/13"] remko [label="Remko Lodder\nremko@FreeBSD.org\n2007/02/23"] +rgrimes [label="Rodney W. Grimes\nrgrimes@FreeBSD.org\n1993/06/12\n2017/03/03"] rik [label="Roman Kurakin\nrik@FreeBSD.org\n2003/12/18"] +rlibby [label="Ryan Libby\nrlibby@FreeBSD.org\n2017/06/07"] rmacklem [label="Rick Macklem\nrmacklem@FreeBSD.org\n2009/03/27"] rmh [label="Robert Millan\nrmh@FreeBSD.org\n2011/09/18"] rnoland [label="Robert Noland\nrnoland@FreeBSD.org\n2008/09/15"] @@ -300,9 +310,11 @@ se [label="Stefan Esser\nse@FreeBSD.org\n1994/08/26"] sephe [label="Sepherosa Ziehau\nsephe@FreeBSD.org\n2007/03/28"] sepotvin [label="Stephane E. Potvin\nsepotvin@FreeBSD.org\n2007/02/15"] sgalabov [label="Stanislav Galabov\nsgalabov@FreeBSD.org\n2016/02/24"] +shurd [label="Stephen Hurd\nshurd@FreeBSD.org\n2017/09/02"] simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2006/03/07"] sjg [label="Simon J. Gerraty\nsjg@FreeBSD.org\n2012/10/23"] skra [label="Svatopluk Kraus\nskra@FreeBSD.org\n2015/10/28"] +slavash [label="Slava Shwartsman\nslavash@FreeBSD.org\n2018/02/08"] slm [label="Stephen McConnell\nslm@FreeBSD.org\n2014/05/07"] smh [label="Steven Hartland\nsmh@FreeBSD.org\n2012/11/12"] sobomax [label="Maxim Sobolev\nsobomax@FreeBSD.org\n2001/07/25"] @@ -317,6 +329,7 @@ theraven [label="David Chisnall\ntheraven@FreeBSD.org\ thompsa [label="Andrew Thompson\nthompsa@FreeBSD.org\n2005/05/25"] ticso [label="Bernd Walter\nticso@FreeBSD.org\n2002/01/31"] tijl [label="Tijl Coosemans\ntijl@FreeBSD.org\n2010/07/16"] +tsoome [label="Toomas Soome\ntsoome@FreeBSD.org\n2016/08/10"] trasz [label="Edward Tomasz Napierala\ntrasz@FreeBSD.org\n2008/08/22"] trhodes [label="Tom Rhodes\ntrhodes@FreeBSD.org\n2002/05/28"] trociny [label="Mikolaj Golub\ntrociny@FreeBSD.org\n2011/03/10"] @@ -334,6 +347,7 @@ wkoszek [label="Wojciech A. Koszek\nwkoszek@FreeBSD.or wma [label="Wojciech Macek\nwma@FreeBSD.org\n2016/01/18"] wollman [label="Garrett Wollman\nwollman@FreeBSD.org\n????/??/??"] wsalamon [label="Wayne Salamon\nwsalamon@FreeBSD.org\n2005/06/25"] +wulf [label="Vladimir Kondratyev\nwulf@FreeBSD.org\n2017/04/27"] yongari [label="Pyun YongHyeon\nyongari@FreeBSD.org\n2004/08/01"] zbb [label="Zbigniew Bodek\nzbb@FreeBSD.org\n2013/09/02"] zec [label="Marko Zec\nzec@FreeBSD.org\n2008/06/22"] @@ -359,6 +373,7 @@ adrian -> jmcneill adrian -> landonf adrian -> lidl adrian -> loos +adrian -> mizhka adrian -> monthadar adrian -> ray adrian -> rmh @@ -367,6 +382,8 @@ adrian -> sgalabov ae -> melifaro +allanjude -> tsoome + alc -> davide andre -> qingli @@ -376,12 +393,14 @@ andrew -> manu anholt -> jkim avg -> art +avg -> eugen avg -> pluknet avg -> smh bapt -> allanjude bapt -> araujo bapt -> bdrewery +bapt -> wulf benno -> grehan @@ -413,6 +432,7 @@ cognet -> jceel cognet -> kevlo cognet -> ian cognet -> manu +cognet -> mw cognet -> wkoszek cognet -> wma cognet -> zbb @@ -497,13 +517,17 @@ gnn -> jtl gnn -> karels gonzo -> jmcneill +gonzo -> wulf grehan -> bryanv +grehan -> rgrimes grog -> edwin grog -> le grog -> peterj +hselasky -> slavash + imp -> akiyama imp -> ambrisko imp -> andrew @@ -516,6 +540,7 @@ imp -> furuta imp -> joe imp -> jon imp -> keichii +imp -> kibab imp -> mb imp -> mr imp -> neel @@ -529,6 +554,7 @@ imp -> sanpei imp -> shiba imp -> takawata imp -> toshi +imp -> tsoome imp -> uch jake -> bms @@ -618,6 +644,7 @@ kib -> rdivacky kib -> rmacklem kib -> rmh kib -> skra +kib -> slavash kib -> stas kib -> tijl kib -> trociny @@ -634,11 +661,13 @@ marcel -> nwhitehorn marcel -> sjg markj -> cem +markj -> rlibby markm -> jasone markm -> sheldonh mav -> ae +mav -> eugen mdf -> gleb @@ -676,6 +705,8 @@ obrien -> gshapiro obrien -> kan obrien -> sam +pfg -> fsu + peter -> asmodai peter -> jayanth peter -> ps @@ -690,6 +721,7 @@ philip -> kp phk -> jkoshy phk -> mux +pjd -> def pjd -> kib pjd -> lulf pjd -> oshogbo @@ -751,6 +783,7 @@ sam -> sephe sbruno -> hiren sbruno -> jeb sbruno -> jimharris +sbruno -> shurd schweikh -> dds @@ -762,6 +795,8 @@ scottl -> sbruno scottl -> slm scottl -> yongari +sephe -> dexuan + sheldonh -> dwmalone sheldonh -> iedowse @@ -789,6 +824,7 @@ ume -> suz ume -> tshiozak vangyzen -> badger +vangyzen -> dab wes -> scf Modified: stable/11/usr.bin/calendar/calendars/calendar.freebsd ============================================================================== --- stable/11/usr.bin/calendar/calendars/calendar.freebsd Thu Mar 15 09:16:10 2018 (r330977) +++ stable/11/usr.bin/calendar/calendars/calendar.freebsd Thu Mar 15 09:22:20 2018 (r330978) @@ -28,6 +28,7 @@ 01/19 Ruslan Ermilov born in Simferopol, USSR, 1974 01/19 Marcelo S. Araujo born in Joinville, Santa Catarina, Brazil, 1981 01/20 Poul-Henning Kamp born in Korsoer, Denmark, 1966 +01/21 Mahdi Mokhtari born in Tehran, Iran, 1995 01/22 Johann Visagie born in Cape Town, South Africa, 1970 01/23 Hideyuki KURASHINA born in Niigata, Japan, 1982 01/24 Fabien Thomas born in Avignon, France, 1971 @@ -113,6 +114,7 @@ 03/25 Andrew R. Reiter born in Springfield, Massachusetts, United States, 1980 03/27 Josef El-Rayes born in Linz, Austria, 1982 03/28 Sean C. Farley born in Indianapolis, Indiana, United States, 1970 +03/29 Dave Cottlehuber born in Christchurch, New Zealand, 1973 03/29 Thierry Thomas born in Luxeuil les Bains, France, 1961 03/30 Po-Chuan Hsieh born in Taipei, Taiwan, Republic of China, 1978 03/31 First quarter status reports are due on 04/15 @@ -140,10 +142,12 @@ 04/22 Joerg Wunsch born in Dresden, Sachsen, Germany, 1962 04/22 Jun Kuriyama born in Matsue, Shimane, Japan, 1973 04/22 Jakub Klama born in Blachownia, Silesia, Poland, 1989 +04/25 Richard Gallamore born in Kissimmee, Florida, United States, 1987 04/26 Rene Ladan born in Geldrop, the Netherlands, 1980 04/29 Adam Weinberger born in Berkeley, California, United States, 1980 04/29 Eric Anholt born in Portland, Oregon, United States, 1983 05/01 Randall Stewart born in Spokane, Washington, United States, 1959 +05/02 Danilo G. Baio born in Maringa, Parana, Brazil, 1986 05/02 Wojciech A. Koszek born in Czestochowa, Poland, 1987 05/03 Brian Dean born in Elkins, West Virginia, United States, 1966 05/03 Patrick Kelsey born in Freehold, New Jersey, United States, 1976 @@ -273,6 +277,7 @@ 08/19 Chin-San Huang born in Yi-Lan, Taiwan, Republic of China, 1979 08/19 Pav Lucistnik born in Kutna Hora, Czech Republic, 1980 08/20 Michael Heffner born in Cleona, Pennsylvania, United States, 1981 +08/22 Ilya Bakulin born in Tbilisi, USSR, 1986 08/24 Mark Linimon born in Houston, Texas, United States, 1955 08/24 Alexander Botero-Lowry died in San Francisco, California, United States, 2012 08/25 Beech Rintoul born in Oakland, California, United States, 1952 @@ -359,6 +364,7 @@ 11/21 Mark Johnston born in Toronto, Ontario, Canada, 1989 11/22 Frederic Culot born in Saint-Germain-En-Laye, France, 1976 11/23 Josef Lawrence Karthauser born in Pembury, Kent, United Kingdom, 1972 +11/23 Luca Pizzamiglio born in Casalpusterlengo, Italy, 1978 11/24 Andrey Zakhvatov born in Chelyabinsk, Russian Federation, 1974 11/24 Daniel Gerzo born in Bratislava, Slovakia, 1986 11/28 Nik Clayton born in Peterborough, United Kingdom, 1973 From owner-svn-src-stable@freebsd.org Thu Mar 15 09:30:39 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C2518F5CDB9; Thu, 15 Mar 2018 09:30:39 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6FCDA76C00; Thu, 15 Mar 2018 09:30:39 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6ABA9145C9; Thu, 15 Mar 2018 09:30:39 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2F9Ud9w060738; Thu, 15 Mar 2018 09:30:39 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2F9Udnc060737; Thu, 15 Mar 2018 09:30:39 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803150930.w2F9Udnc060737@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Thu, 15 Mar 2018 09:30:39 +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: r330980 - stable/11/usr.sbin/bsdinstall/scripts X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/usr.sbin/bsdinstall/scripts X-SVN-Commit-Revision: 330980 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 09:30:39 -0000 Author: eadler Date: Thu Mar 15 09:30:39 2018 New Revision: 330980 URL: https://svnweb.freebsd.org/changeset/base/330980 Log: MFC r327474: bsdinstall: inform users that typing will not be visible Some users, especially those that are new, might be confused when passwd does not echo anything. Inform users that the password will not be visible. PR: 196113 Modified: stable/11/usr.sbin/bsdinstall/scripts/rootpass Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/bsdinstall/scripts/rootpass ============================================================================== --- stable/11/usr.sbin/bsdinstall/scripts/rootpass Thu Mar 15 09:28:10 2018 (r330979) +++ stable/11/usr.sbin/bsdinstall/scripts/rootpass Thu Mar 15 09:30:39 2018 (r330980) @@ -32,5 +32,6 @@ echo "========================" echo echo "Please select a password for the system management account (root):" +echo "Typed characters will not be visible." chroot $BSDINSTALL_CHROOT passwd root 2>&1 From owner-svn-src-stable@freebsd.org Thu Mar 15 09:38:19 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 70A6DF5D860; Thu, 15 Mar 2018 09:38:19 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1D1BC773E2; Thu, 15 Mar 2018 09:38:19 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 10C8814740; Thu, 15 Mar 2018 09:38:19 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2F9cI58065826; Thu, 15 Mar 2018 09:38:18 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2F9cIHu065824; Thu, 15 Mar 2018 09:38:18 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803150938.w2F9cIHu065824@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Thu, 15 Mar 2018 09:38: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: r330981 - stable/11/usr.bin/morse X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/usr.bin/morse X-SVN-Commit-Revision: 330981 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 09:38:19 -0000 Author: eadler Date: Thu Mar 15 09:38:18 2018 New Revision: 330981 URL: https://svnweb.freebsd.org/changeset/base/330981 Log: MFC r327514,r327521,r327614,r327615,r327616,r327623: morse(6): several improvements - add ñ, ', and _ - remove lint support - add missing header for ioctl - fix two typod - Use `-r` for "reverse" mode and to match DragonFlyBSD. - Move defines around to clear up logic - use `errx` instead of `fprintf` and `exit` - Use copyright comment header - Make it easier to compile on !FreeBSD - Diff reduction against DragonFlyBSD - bump Dd - use 'r' instead of 'D' from the original submission PR: 35109 Modified: stable/11/usr.bin/morse/morse.6 stable/11/usr.bin/morse/morse.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/morse/morse.6 ============================================================================== --- stable/11/usr.bin/morse/morse.6 Thu Mar 15 09:30:39 2018 (r330980) +++ stable/11/usr.bin/morse/morse.6 Thu Mar 15 09:38:18 2018 (r330981) @@ -29,7 +29,7 @@ .\" @(#)bcd.6 8.1 (Berkeley) 5/31/93 .\" $FreeBSD$ .\" -.Dd June 7, 2005 +.Dd January 5, 2018 .Dt MORSE 6 .Os .Sh NAME @@ -37,7 +37,7 @@ .Nd reformat input as morse code .Sh SYNOPSIS .Nm -.Op Fl elps +.Op Fl elrps .Op Fl d Ar device .Op Fl w Ar speed .Op Fl c Ar speed @@ -85,13 +85,18 @@ Similar to .Fl p , but use the RTS line of .Ar device -(which must by a TTY device) +(which must be a TTY device) in order to emit the morse code. .It Fl e Echo each character before it is sent, used together with either .Fl p or .Fl d . +.It Fl r +Decode morse output consisting of dots and dashes (as generated by using +the +.Fl s +option). .El .Pp The Modified: stable/11/usr.bin/morse/morse.c ============================================================================== --- stable/11/usr.bin/morse/morse.c Thu Mar 15 09:30:39 2018 (r330980) +++ stable/11/usr.bin/morse/morse.c Thu Mar 15 09:38:18 2018 (r330981) @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1988, 1993 * The Regents of the University of California. All rights reserved. * @@ -32,23 +32,21 @@ * */ -#ifndef lint static const char copyright[] = "@(#) Copyright (c) 1988, 1993\n\ The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ -#ifndef lint #if 0 static char sccsid[] = "@(#)morse.c 8.1 (Berkeley) 5/31/93"; #endif static const char rcsid[] = "$FreeBSD$"; -#endif /* not lint */ #include +#include #include +#include #include #include #include @@ -59,9 +57,14 @@ static const char rcsid[] = #include #include +#ifdef __FreeBSD__ /* Always use the speaker, let the open fail if -p is selected */ #define SPEAKER "/dev/speaker" +#endif +#define WHITESPACE " \t\n" +#define DELIMITERS " \t" + #ifdef SPEAKER #include #endif @@ -132,6 +135,8 @@ static const struct morsetab mtab[] = { {'$', "...-..-"}, {'+', ".-.-."}, /* AR */ {'@', ".--.-."}, /* AC */ + {'_', "..--.-"}, + {'\'', ".----."}, /* prosigns without already assigned values */ @@ -156,6 +161,7 @@ static const struct morsetab iso8859_1tab[] = { {'\350', "..-.."}, /* è */ {'\351', "..-.."}, /* é */ {'\352', "-..-."}, /* ê */ + {'\361', "--.--"}, /* ñ */ {'\366', "---."}, /* ö */ {'\374', "..--"}, /* ü */ @@ -267,14 +273,11 @@ static const struct morsetab koi8rtab[] = { }; static void show(const char *), play(const char *), morse(char); +static void decode (char *), fdecode(FILE *); static void ttyout(const char *); static void sighandler(int); -#define GETOPTOPTS "c:d:ef:lsw:" -#define USAGE \ -"usage: morse [-els] [-d device] [-w speed] [-c speed] [-f frequency] [string ...]\n" - -static int pflag, lflag, sflag, eflag; +static int pflag, lflag, rflag, sflag, eflag; static int wpm = 20; /* effective words per minute */ static int cpm; /* effective words per minute between * characters */ @@ -293,17 +296,20 @@ static int olflags; #ifdef SPEAKER static tone_t sound; -#undef GETOPTOPTS -#define GETOPTOPTS "c:d:ef:lpsw:" -#undef USAGE +#define GETOPTOPTS "c:d:ef:lprsw:" #define USAGE \ -"usage: morse [-elps] [-d device] [-w speed] [-c speed] [-f frequency] [string ...]\n" +"usage: morse [-elprs] [-d device] [-w speed] [-c speed] [-f frequency] [string ...]\n" +#else +#define GETOPTOPTS "c:d:ef:lrsw:" +#define USAGE \ +"usage: morse [-elrs] [-d device] [-w speed] [-c speed] [-f frequency] [string ...]\n" + #endif static const struct morsetab *hightab; int -main(int argc, char **argv) +main(int argc, char *argv[]) { int ch, lflags; char *p, *codeset; @@ -331,6 +337,9 @@ main(int argc, char **argv) pflag = 1; break; #endif + case 'r': + rflag = 1; + break; case 's': sflag = 1; break; @@ -339,42 +348,36 @@ main(int argc, char **argv) break; case '?': default: - fputs(USAGE, stderr); - exit(1); + errx(1, USAGE); } - if (sflag && lflag) { - fputs("morse: only one of -l and -s allowed\n", stderr); - exit(1); + if ((sflag && lflag) || (sflag && rflag) || (lflag && rflag)) { + errx(1, "morse: only one of -l, -s, and -r allowed\n"); } if ((pflag || device) && (sflag || lflag)) { - fputs("morse: only one of -p, -d and -l, -s allowed\n", stderr); - exit(1); + errx(1, "morse: only one of -p, -d and -l, -s allowed\n"); } - if (cpm == 0) + if (cpm == 0) { cpm = wpm; + } if ((pflag || device) && ((wpm < 1) || (wpm > 60) || (cpm < 1) || (cpm > 60))) { - fputs("morse: insane speed\n", stderr); - exit(1); + errx(1, "morse: insane speed\n"); } - if ((pflag || device) && (freq == 0)) + if ((pflag || device) && (freq == 0)) { freq = FREQUENCY; - + } #ifdef SPEAKER if (pflag) { if ((spkr = open(SPEAKER, O_WRONLY, 0)) == -1) { - perror(SPEAKER); - exit(1); + err(1, SPEAKER); } } else #endif if (device) { if ((line = open(device, O_WRONLY | O_NONBLOCK)) == -1) { - perror("open tty line"); - exit(1); + err(1, "open tty line"); } if (tcgetattr(line, &otty) == -1) { - perror("tcgetattr() failed"); - exit(1); + err(1, "tcgetattr() failed"); } ntty = otty; ntty.c_cflag |= CLOCAL; @@ -419,9 +422,29 @@ main(int argc, char **argv) hightab = iso8859_7tab; } - if (lflag) + if (lflag) { printf("m"); - if (*argv) { + } + if (rflag) { + if (*argv) { + do { + p = strtok(*argv, DELIMITERS); + if (p == NULL) { + decode(*argv); + } + else { + while (p) { + decode(p); + p = strtok(NULL, DELIMITERS); + } + } + } while (*++argv); + putchar('\n'); + } else { + fdecode(stdin); + } + } + else if (*argv) { do { for (p = *argv; *p; ++p) { if (eflag) @@ -518,15 +541,13 @@ play(const char *s) } if (sound.duration) { if (ioctl(spkr, SPKRTONE, &sound) == -1) { - perror("ioctl play"); - exit(1); + err(1, "ioctl play"); } } sound.frequency = 0; sound.duration = dot_clock; if (ioctl(spkr, SPKRTONE, &sound) == -1) { - perror("ioctl rest"); - exit(1); + err(1, "ioctl rest"); } } sound.frequency = 0; @@ -575,6 +596,68 @@ ttyout(const char *s) } duration = cdot_clock * CHAR_SPACE * 10000; usleep(duration); +} + +void +fdecode(FILE *stream) +{ + char *n, *p, *s; + char buf[BUFSIZ]; + + s = buf; + while (fgets(s, BUFSIZ - (s - buf), stream)) { + p = buf; + + while (*p && isblank(*p)) { + p++; + } + while (*p && isspace(*p)) { + p++; + putchar (' '); + } + while (*p) { + n = strpbrk(p, WHITESPACE); + if (n == NULL) { + /* The token was interrupted at the end + * of the buffer. Shift it to the begin + * of the buffer. + */ + for (s = buf; *p; *s++ = *p++) + ; + } else { + *n = '\0'; + n++; + decode(p); + p = n; + } + } + } + putchar('\n'); +} + +void +decode(char *p) +{ + char c; + const struct morsetab *m; + + c = ' '; + for (m = mtab; m != NULL && m->inchar != '\0'; m++) { + if (strcmp(m->morse, p) == 0) { + c = m->inchar; + break; + } + } + + if (c == ' ') + for (m = hightab; m != NULL && m->inchar != '\0'; m++) { + if (strcmp(m->morse, p) == 0) { + c = m->inchar; + break; + } + } + + putchar(c); } static void From owner-svn-src-stable@freebsd.org Thu Mar 15 09:43:39 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A6FB2F5DF2F; Thu, 15 Mar 2018 09:43:39 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2B90C7796E; Thu, 15 Mar 2018 09:43:39 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 26984148B7; Thu, 15 Mar 2018 09:43:39 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2F9hd0q070637; Thu, 15 Mar 2018 09:43:39 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2F9hdPX070636; Thu, 15 Mar 2018 09:43:39 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803150943.w2F9hdPX070636@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Thu, 15 Mar 2018 09:43:39 +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: r330982 - stable/11/bin/df X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/bin/df X-SVN-Commit-Revision: 330982 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 09:43:39 -0000 Author: eadler Date: Thu Mar 15 09:43:38 2018 New Revision: 330982 URL: https://svnweb.freebsd.org/changeset/base/330982 Log: MFC r305139: df(1): Allow duplicate -l flags gracefully Rather than producing a misleading error message when duplicate -l flags are provided to df(1), simply ignore extra flags and proceed as if only one was specified. This seems most reasonable given the usage for -l: -l Only display information about locally-mounted file systems. l and t flags still conflict, as before. PR: 208169 Modified: stable/11/bin/df/df.c Directory Properties: stable/11/ (props changed) Modified: stable/11/bin/df/df.c ============================================================================== --- stable/11/bin/df/df.c Thu Mar 15 09:38:18 2018 (r330981) +++ stable/11/bin/df/df.c Thu Mar 15 09:43:38 2018 (r330982) @@ -193,6 +193,9 @@ main(int argc, char *argv[]) hflag = 0; break; case 'l': + /* Ignore duplicate -l */ + if (lflag) + break; if (vfslist != NULL) xo_errx(1, "-l and -t are mutually exclusive."); vfslist = makevfslist(makenetvfslist()); From owner-svn-src-stable@freebsd.org Thu Mar 15 09:49:24 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA0E3675; Thu, 15 Mar 2018 09:49:23 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 842A577D77; Thu, 15 Mar 2018 09:49:23 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 78BDF148BB; Thu, 15 Mar 2018 09:49:23 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2F9nNBk070898; Thu, 15 Mar 2018 09:49:23 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2F9nNjg070897; Thu, 15 Mar 2018 09:49:23 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803150949.w2F9nNjg070897@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Thu, 15 Mar 2018 09:49:23 +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: r330983 - stable/11/sbin/rcorder X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sbin/rcorder X-SVN-Commit-Revision: 330983 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 09:49:24 -0000 Author: eadler Date: Thu Mar 15 09:49:23 2018 New Revision: 330983 URL: https://svnweb.freebsd.org/changeset/base/330983 Log: MFC r305857,r305858,r305859: sbin/rcorder/rcorder.8: Amend HISTORY rcorder appeared in FreeBSD 5.0. Address issues raised by igor. PR: 212547 Submitted by: Sevan Janiyan ------------------------------------------------------------------------ r305858 | allanjude | 2016-09-16 04:11:04 +0000 (Fri, 16 Sep 2016) | 10 lines sbin/reboot/reboot.8: Amend HISTORY A standalone reboot utility showed up in 4.0BSD, in AT&T UNIX init has a case for reboot and is present in the version shipped with V5 either way, current entry is incorrect. PR: 212548 Submitted by: Sevan Janiyan ------------------------------------------------------------------------ r305859 | allanjude | 2016-09-16 04:12:32 +0000 (Fri, 16 Sep 2016) | 8 lines sbin/umount/umount.8: Amend HISTORY umount first appeared in V1, confirmed using TUHS archive http://minnie.tuhs.org/cgi-bin/utree.pl?file=V1/man/man1/umount.1 PR: 212554 Submitted by: Sevan Janiyan Modified: stable/11/sbin/rcorder/rcorder.8 Directory Properties: stable/11/ (props changed) Modified: stable/11/sbin/rcorder/rcorder.8 ============================================================================== --- stable/11/sbin/rcorder/rcorder.8 Thu Mar 15 09:43:38 2018 (r330982) +++ stable/11/sbin/rcorder/rcorder.8 Thu Mar 15 09:49:23 2018 (r330983) @@ -1,7 +1,7 @@ .\" $NetBSD: rcorder.8,v 1.3 2000/07/17 14:16:22 mrg Exp $ .\" .\" Copyright (c) 1998 -.\" Perry E. Metzger. All rights reserved. +.\" Perry E. Metzger. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 5, 2011 +.Dd September 10, 2016 .Dt RCORDER 8 .Os .Sh NAME @@ -160,8 +160,11 @@ processing the stated file. .Sh HISTORY The .Nm -utility first appeared in +utility appeared in .Nx 1.5 . +.Nm +utility first appeared in +.Fx 5.0 . .Sh AUTHORS .An -nosplit Written by @@ -172,7 +175,7 @@ and The .Dq Li REQUIRE keyword is misleading: -It doesn't describe which daemons have to be running before a script +It does not describe which daemons have to be running before a script will be started. It describes which scripts must be placed before it in the dependency ordering. From owner-svn-src-stable@freebsd.org Thu Mar 15 10:01:12 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7E5C66352; Thu, 15 Mar 2018 10:01:12 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 30B9F78524; Thu, 15 Mar 2018 10:01:12 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2B6C914A9F; Thu, 15 Mar 2018 10:01:12 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FA1Cns077259; Thu, 15 Mar 2018 10:01:12 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FA1CqW077258; Thu, 15 Mar 2018 10:01:12 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803151001.w2FA1CqW077258@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Thu, 15 Mar 2018 10:01: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: r330984 - stable/11/usr.bin/calendar/calendars X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/usr.bin/calendar/calendars X-SVN-Commit-Revision: 330984 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 10:01:12 -0000 Author: eadler Date: Thu Mar 15 10:01:11 2018 New Revision: 330984 URL: https://svnweb.freebsd.org/changeset/base/330984 Log: MFC r306135,r311859,r321763,r321764,r321766,r321767,r321768,r321769,r321771,r321774,r321776,r321783,r321784,r321785,r321786,r321787,r321788,r321789,r321793,r321796,r321797,r321801,r321802,r321804,r321814,r321817,r321818,r321834,r321835,r321853,r321857,r321860,r321866,r321885,r321886,r321889,r321890,r321892,r321893,r321897,r321939,r321966,r321974,r321982,r321989,r322035,r322093,r322108,r322314,r322330,r322335,r322350,r322353,r322365,r322416,r322471,r322484,r322638,r322649,r322881,r322886,r323972,r330768,: Misc calendar changes Modified: stable/11/usr.bin/calendar/calendars/calendar.freebsd Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/calendar/calendars/calendar.freebsd ============================================================================== --- stable/11/usr.bin/calendar/calendars/calendar.freebsd Thu Mar 15 09:49:23 2018 (r330983) +++ stable/11/usr.bin/calendar/calendars/calendar.freebsd Thu Mar 15 10:01:11 2018 (r330984) @@ -8,6 +8,7 @@ #define _calendar_freebsd_ 01/01 Dimitry Andric born in Utrecht, the Netherlands, 1969 +01/01 Lev Serebryakov born in Leningrad, USSR, 1979 01/01 Alexander Langer born in Duesseldorf, Nordrhein-Westfalen, Germany, 1981 01/02 Ion-Mihai "IOnut" Tetcu born in Bucharest, Romania, 1980 01/02 Patrick Li born in Beijing, People's Republic of China, 1985 @@ -18,7 +19,10 @@ 01/10 Jean-Yves Lefort born in Charleroi, Belgium, 1980 01/12 Yen-Ming Lee born in Taipei, Taiwan, Republic of China, 1977 01/12 Ying-Chieh Liao born in Taipei, Taiwan, Republic of China, 1979 +01/12 Kristof Provost born in Aalst, Belgium, 1983 +01/13 Ruslan Bukin born in Dudinka, Russian Federation, 1985 01/14 Yi-Jheng Lin born in Taichung, Taiwan, Republic of China, 1985 +01/15 Anne Dickison born in Madison, Indiana, United States, 1976 01/16 Ariff Abdullah born in Kuala Lumpur, Malaysia, 1978 01/16 Dmitry Sivachenko born in Moscow, USSR, 1978 01/16 Vanilla I. Shu born in Taipei, Taiwan, Republic of China, 1978 @@ -33,6 +37,7 @@ 01/23 Hideyuki KURASHINA born in Niigata, Japan, 1982 01/24 Fabien Thomas born in Avignon, France, 1971 01/24 Matteo Riondato born in Padova, Italy, 1986 +01/25 Nick Hibma born in Groningen, the Netherlands, 1972 01/25 Bernd Walter born in Moers, Nordrhein-Westfalen, Germany, 1974 01/26 Andrew Gallatin born in Buffalo, New York, United States, 1970 01/27 Nick Sayer born in San Diego, California, United States, 1968 @@ -50,14 +55,16 @@ 02/02 Michael W Lucas born in Detroit, Michigan, United States, 1967 02/02 Dmitry Chagin born in Stalingrad, USSR, 1976 02/02 Yoichi Nakayama born in Tsu, Mie, Japan, 1976 +02/02 Yoshihiro Takahashi born in Yokohama, Kanagawa, Japan, 1976 02/03 Jason Helfman born in Royal Oak, Michigan, United States, 1972 02/04 Eitan Adler born in West Hempstead, New York, United States, 1991 02/05 Frank Laszlo born in Howell, Michigan, United States, 1983 02/06 Julien Charbon born in Saint Etienne, Loire, France, 1978 +02/07 Bjoern Heidotting born in Uelsen, Germany, 1980 02/10 David Greenman born in Portland, Oregon, United States, 1968 02/10 Paul Richards born in Ammanford, Carmarthenshire, United Kingdom, 1968 02/10 Simon Barner born in Rosenheim, Bayern, Germany, 1980 -02/10 Jason E. Hale born in Pittsburgh, Pennsylvania, Unites States, 1982 +02/10 Jason E. Hale born in Pittsburgh, Pennsylvania, United States, 1982 02/13 Jesper Skriver born in Aarhus, Denmark, 1975 02/13 Steve Wills born in Lynchburg, Virginia, United States, 1975 02/13 Andrey Slusar born in Odessa, USSR, 1979 @@ -66,6 +73,9 @@ 02/14 Erwin Lansing born in 's-Hertogenbosch, the Netherlands, 1975 02/14 Martin Blapp born in Olten, Switzerland, 1976 02/15 Hiren Panchasara born in Ahmedabad, Gujarat, India, 1984 +02/16 Justin Hibbits born in Toledo, Ohio, United States, 1983 +02/16 Tobias Christian Berner born in Bern, Switzerland, 1985 +02/18 Christoph Moench-Tegeder born in Hannover, Niedersachsen, Germany, 1980 02/19 Murray Stokely born in Jacksonville, Florida, United States, 1979 02/20 Anders Nordby born in Oslo, Norway, 1976 02/21 Alexey Zelkin born in Simferopol, Ukraine, 1978 @@ -91,6 +101,8 @@ 03/07 Michael P. Pritchard born in Los Angeles, California, United States, 1964 03/07 Giorgos Keramidas born in Athens, Greece, 1976 03/10 Andreas Klemm born in Duesseldorf, Nordrhein-Westfalen, Germany, 1963 +03/10 Luiz Otavio O Souza born in Bauru, Sao Paulo, Brazil, 1978 +03/10 Nikolai Lifanov born in Moscow, Russian Federation, 1989 03/11 Soeren Straarup born in Andst, Denmark, 1978 03/12 Greg Lewis born in Adelaide, South Australia, Australia, 1969 03/13 Alexander Leidinger born in Neunkirchen, Saarland, Germany, 1976 @@ -112,6 +124,7 @@ 03/24 Marcel Moolenaar born in Hilversum, the Netherlands, 1968 03/24 Emanuel Haupt born in Zurich, Switzerland, 1979 03/25 Andrew R. Reiter born in Springfield, Massachusetts, United States, 1980 +03/26 Jonathan Anderson born in Ottawa, Ontario, Canada, 1983 03/27 Josef El-Rayes born in Linz, Austria, 1982 03/28 Sean C. Farley born in Indianapolis, Indiana, United States, 1970 03/29 Dave Cottlehuber born in Christchurch, New Zealand, 1973 @@ -119,6 +132,7 @@ 03/30 Po-Chuan Hsieh born in Taipei, Taiwan, Republic of China, 1978 03/31 First quarter status reports are due on 04/15 04/01 Matthew Jacob born in San Francisco, California, United States, 1958 +04/01 Alexander V. Chernikov born in Moscow, Russian Federation, 1984 04/01 Bill Fenner born in Bellefonte, Pennsylvania, United States, 1971 04/01 Peter Edwards born in Dublin, Ireland, 1973 04/03 Hellmuth Michaelis born in Kiel, Schleswig-Holstein, Germany, 1958 @@ -133,6 +147,7 @@ 04/11 Bruce A. Mah born in Fresno, California, United States, 1969 04/12 Patrick Gardella born in Columbus, Ohio, United States, 1967 04/12 Ed Schouten born in Oss, the Netherlands, 1986 +04/12 Ruey-Cherng Yu born in Keelung, Taiwan, 1978 04/13 Oliver Braun born in Nuremberg, Bavaria, Germany, 1972 04/14 Crist J. Clark born in Milwaukee, Wisconsin, United States, 1970 04/14 Glen J. Barber born in Wilkes-Barre, Pennsylvania, United States, 1981 @@ -144,6 +159,8 @@ 04/22 Jakub Klama born in Blachownia, Silesia, Poland, 1989 04/25 Richard Gallamore born in Kissimmee, Florida, United States, 1987 04/26 Rene Ladan born in Geldrop, the Netherlands, 1980 +04/28 Oleg Bulyzhin born in Kharkov, USSR, 1976 +04/28 Andriy Voskoboinyk born in Bila Tserkva, Ukraine, 1992 04/29 Adam Weinberger born in Berkeley, California, United States, 1980 04/29 Eric Anholt born in Portland, Oregon, United States, 1983 05/01 Randall Stewart born in Spokane, Washington, United States, 1959 @@ -161,12 +178,14 @@ 05/10 Markus Brueffer born in Gronau, Nordrhein-Westfalen, Germany, 1977 05/11 Kurt Lidl born in Rockville, Maryland, United States, 1968 05/11 Jesus Rodriguez born in Barcelona, Spain, 1972 +05/11 Marcin Wojtas born in Krakow, Poland, 1986 05/11 Roman Kurakin born in Moscow, USSR, 1979 05/11 Ulrich Spoerlein born in Schesslitz, Bayern, Germany, 1981 05/13 Pete Fritchman born in Lansdale, Pennsylvania, United States, 1983 05/14 Tatsumi Hosokawa born in Tokyo, Japan, 1968 05/14 Shigeyuku Fukushima born in Osaka, Japan, 1974 05/14 Bruce Cran born in Cambridge, United Kingdom, 1981 +05/15 Hans Petter Selasky born in Flekkefjord, Norway, 1982 05/16 Johann Kois born in Wolfsberg, Austria, 1975 05/16 Marcus Alves Grando born in Florianopolis, Santa Catarina, Brazil, 1979 05/17 Thomas Abthorpe born in Port Arthur, Ontario, Canada, 1968 @@ -175,6 +194,7 @@ 05/19 Sofian Brabez born in Toulouse, France, 1984 05/20 Dan Moschuk died in Burlington, Ontario, Canada, 2010 05/21 Kris Kennaway born in Winnipeg, Manitoba, Canada, 1978 +05/22 James Gritton born in San Francisco, California, United States, 1967 05/22 Clive Tong-I Lin born in Changhua, Taiwan, Republic of China, 1978 05/22 Michael Bushkov born in Rostov-on-Don, Russian Federation, 1985 05/22 Rui Paulo born in Evora, Portugal, 1986 @@ -182,6 +202,7 @@ 05/23 Munechika Sumikawa born in Osaka, Osaka, Japan, 1972 05/24 Duncan McLennan Barclay born in London, Middlesex, United Kingdom, 1970 05/24 Oliver Lehmann born in Karlsburg, Germany, 1981 +05/25 Pawel Pekala born in Swidnica, Poland, 1980 05/25 Tom Rhodes born in Ellwood City, Pennsylvania, United States, 1981 05/25 Roman Divacky born in Brno, Czech Republic, 1983 05/26 Jim Pirzyk born in Chicago, Illinois, United States, 1968 @@ -189,6 +210,7 @@ 05/27 Ollivier Robert born in Paris, France, 1967 05/29 Wilko Bulte born in Arnhem, the Netherlands, 1965 05/29 Seigo Tanimura born in Kitakyushu, Fukuoka, Japan, 1976 +05/30 Wen Heping born in Xiangxiang, Hunan, China, 1970 05/31 Ville Skytta born in Helsinki, Finland, 1974 06/02 Jean-Marc Zucconi born in Pontarlier, France, 1954 06/02 Alexander Botero-Lowry born in Austin, Texas, United States, 1986 @@ -205,6 +227,9 @@ 06/06 Alan Eldridge died in Denver, Colorado, United States, 2003 06/07 Jimmy Olgeni born in Milano, Italy, 1976 06/07 Benjamin Close born in Adelaide, Australia, 1978 +06/07 Roger Pau Monne born in Reus, Catalunya, Spain, 1986 +06/08 Ravi Pokala born in Royal Oak, Michigan, United States, 1980 +06/09 Stanislav Galabov born in Sofia, Bulgaria 1978 06/11 Alonso Cardenas Marquez born in Arequipa, Peru, 1979 06/14 Josh Paetzel born in Minneapolis, Minnesota, United States, 1973 06/17 Tilman Linneweh born in Weinheim, Baden-Wuerttemberg, Germany, 1978 @@ -218,12 +243,14 @@ 06/26 Brian Somers born in Dundrum, Dublin, Ireland, 1967 06/28 Mark Santcroos born in Rotterdam, the Netherlands, 1979 06/28 Xin Li born in Beijing, People's Republic of China, 1982 +06/28 Bradley T. Hughes born in Amarillo, Texas, United States, 1977 06/29 Wilfredo Sanchez Vega born in Majaguez, Puerto Rico, United States, 1972 06/29 Daniel Harris born in Lubbock, Texas, United States, 1985 06/29 Andrew Pantyukhin born in Moscow, Russian Federation, 1985 06/30 Guido van Rooij born in Best, Noord-Brabant, the Netherlands, 1965 06/30 Second quarter status reports are due on 07/15 07/01 Matthew Dillon born in San Francisco, California, United States, 1966 +07/01 Mateusz Guzik born in Nowy Targ, Poland, 1986 07/02 Mark Christopher Ovens born in Preston, Lancashire, United Kingdom, 1958 07/02 Vasil Venelinov Dimov born in Shumen, Bulgaria, 1982 07/04 Motoyuki Konno born in Musashino, Tokyo, Japan, 1969 @@ -238,6 +265,7 @@ 07/10 David Schultz born in Oakland, California, United States, 1982 07/10 Ben Woods born in Perth, Western Australia, Australia, 1984 07/11 Jesus R. Camou born in Hermosillo, Sonora, Mexico, 1983 +07/14 Fernando Apesteguia born in Madrid, Spain, 1981 07/15 Gary Jennejohn born in Rochester, New York, United States, 1950 07/16 Suleiman Souhlal born in Roma, Italy, 1983 07/16 Davide Italiano born in Milazzo, Italy, 1989 @@ -245,6 +273,7 @@ 07/19 Masafumi NAKANE born in Okazaki, Aichi, Japan, 1972 07/19 Simon L. Nielsen born in Copenhagen, Denmark, 1980 07/19 Gleb Smirnoff born in Kharkov, USSR, 1981 +07/20 Dru Lavigne born in Kingston, Ontario, Canada, 1965 07/20 Andrey V. Elsukov born in Kotelnich, Russian Federation, 1981 07/22 James Housley born in Chicago, Illinois, United States, 1965 07/22 Jens Schweikhardt born in Waiblingen, Baden-Wuerttemberg, Germany, 1967 @@ -273,6 +302,7 @@ 08/12 Joe Marcus Clarke born in Lakeland, Florida, United States, 1976 08/12 Max Brazhnikov born in Leningradskaya, Russian Federation, 1979 08/14 Stefan Esser born in Cologne, Nordrhein-Westfalen, Germany, 1961 +08/16 Andrey Chernov died in Moscow, Russian Federation, 2017 08/17 Olivier Houchard born in Nancy, France, 1980 08/19 Chin-San Huang born in Yi-Lan, Taiwan, Republic of China, 1979 08/19 Pav Lucistnik born in Kutna Hora, Czech Republic, 1980 @@ -282,6 +312,7 @@ 08/24 Alexander Botero-Lowry died in San Francisco, California, United States, 2012 08/25 Beech Rintoul born in Oakland, California, United States, 1952 08/25 Jean Milanez Melo born in Divinopolis, Minas Gerais, Brazil, 1982 +08/26 Scott Long born in Chicago, Illinois, United States, 1974 08/26 Dima Ruban born in Nalchik, USSR, 1970 08/26 Marc Fonvieille born in Avignon, France, 1972 08/26 Herve Quiroz born in Aix-en-Provence, France, 1977 @@ -299,10 +330,12 @@ 09/05 Mark Robert Vaughan Murray born in Harare, Mashonaland, Zimbabwe, 1961 09/05 Adrian Harold Chadd born in Perth, Western Australia, Australia, 1979 09/05 Rodrigo Osorio born in Montevideo, Uruguay, 1975 +09/06 Eric Joyner born in Fairfax, Virginia, United States, 1991 09/07 Tim Bishop born in Cornwall, United Kingdom, 1978 09/07 Chris Rees born in Kettering, United Kingdom, 1987 09/08 Boris Samorodov born in Krasnodar, Russian Federation, 1963 09/09 Yoshio Mita born in Hiroshima, Japan, 1972 +09/09 Steven Hartland born in Wordsley, United Kingdom, 1973 09/10 Wesley R. Peters born in Hartford, Alabama, United States, 1961 09/12 Weongyo Jeong born in Haman, Korea, 1980 09/12 Benedict Christopher Reuschling born in Darmstadt, Germany, 1981 @@ -310,11 +343,17 @@ 09/14 Matthew Seaman born in Bristol, United Kingdom, 1965 09/15 Aleksandr Rybalko born in Odessa, Ukraine, 1977 09/15 Dima Panov born in Khabarovsk, Russian Federation, 1978 +09/16 Maksim Yevmenkin born in Taganrog, USSR, 1974 09/17 Maxim Bolotin born in Rostov-on-Don, Russian Federation, 1976 09/18 Matthew Fleming born in Cleveland, Ohio, United States, 1975 09/20 Kevin Lo born in Taipei, Taiwan, Republic of China, 1972 +09/21 Alex Kozlov born in Bila Tserkva, Ukraine, 1970 09/21 Gleb Kurtsou born in Minsk, Belarus, 1984 +09/22 Alan Somers born in San Antonio, Texas, United States, 1982 09/22 Bryan Drewery born in San Diego, California, United States, 1984 +09/23 Martin Matuska born in Bratislava, Slovakia, 1979 +09/24 Larry Rosenman born in Queens, New York, United States, 1957 +09/27 Kyle Evans born in Oklahoma City, Oklahoma, United States, 1991 09/27 Neil Blakey-Milner born in Port Elizabeth, South Africa, 1978 09/27 Renato Botelho born in Araras, Sao Paulo, Brazil, 1979 09/28 Greg Lehey born in Melbourne, Victoria, Australia, 1948 @@ -328,25 +367,36 @@ 10/05 Hiroki Sato born in Yamagata, Japan, 1977 10/05 Chris Costello born in Houston, Texas, United States, 1985 10/09 Stefan Walter born in Werne, Nordrhein-Westfalen, Germany, 1978 +10/11 Rick Macklem born in Ontario, Canada, 1955 10/12 Pawel Jakub Dawidek born in Radzyn Podlaski, Poland, 1980 10/15 Maxim Konovalov born in Khabarovsk, USSR, 1973 +10/15 Eugene Grosbein born in Novokuznetsk, Russian Republic, USSR, 1976 10/16 Remko Lodder born in Rotterdam, the Netherlands, 1983 10/17 Maho NAKATA born in Osaka, Japan, 1974 10/18 Sheldon Hearn born in Cape Town, Western Cape, South Africa, 1974 +10/18 Vladimir Kondratyev born in Ryazan, USSR, 1975 10/19 Nicholas Souchu born in Suresnes, Hauts-de-Seine, France, 1972 10/19 Nick Barkas born in Longview, Washington, United States, 1981 +10/19 Pedro Giffuni born in Bogotá, Colombia, 1968 10/20 Joel Dahl born in Bitterna, Skaraborg, Sweden, 1983 10/20 Dmitry Marakasov born in Moscow, Russian Federation, 1984 10/21 Ben Smithurst born in Sheffield, South Yorkshire, United Kingdom, 1981 10/22 Jean-Sebastien Pedron born in Redon, Ille-et-Vilaine, France, 1980 10/23 Mario Sergio Fujikawa Ferreira born in Brasilia, Distrito Federal, Brazil, 1976 +10/23 Romain Tartière born in Clermont-Ferrand, France, 1984 10/25 Eric Melville born in Los Gatos, California, United States, 1980 10/25 Julien Laffaye born in Toulouse, France, 1988 10/25 Ashish SHUKLA born in Kanpur, India, 1985 +10/25 Toomas Soome born Estonia, 1971 10/26 Matthew Ahrens born in United States, 1979 10/26 Philip M. Gollucci born in Silver Spring, Maryland, United States, 1979 10/27 Takanori Watanabe born in Numazu, Shizuoka, Japan, 1972 +10/30 Olli Hauer born in Sindelfingen, Germany, 1968 +10/31 Taras Korenko born in Cherkasy region, Ukraine, 1980 +11/03 Ryan Stone born in Ottawa, Ontario, Canada, 1985 11/05 M. Warner Losh born in Kansas City, Kansas, United States, 1966 +11/06 Michael Zhilin born in Stary Oskol, USSR, 1985 +11/08 Joseph R. Mingrone born in Charlottetown, Prince Edward Island, Canada, 1976 11/09 Coleman Kane born in Cincinnati, Ohio, United States, 1980 11/09 Antoine Brodin born in Bagnolet, France, 1981 11/10 Gregory Neil Shapiro born in Providence, Rhode Island, United States, 1970 @@ -356,6 +406,7 @@ 11/15 Lars Engels born in Hilden, Nordrhein-Westfalen, Germany, 1980 11/15 Tijl Coosemans born in Duffel, Belgium, 1983 11/16 Jose Maria Alcaide Salinas born in Madrid, Spain, 1962 +11/16 Matt Joras born in Evanston, Illinois, United States, 1992 11/17 Ralf S. Engelschall born in Dachau, Bavaria, Germany, 1972 11/18 Thomas Quinot born in Paris, France, 1977 11/19 Konstantin Belousov born in Kiev, USSR, 1972 @@ -367,6 +418,7 @@ 11/23 Luca Pizzamiglio born in Casalpusterlengo, Italy, 1978 11/24 Andrey Zakhvatov born in Chelyabinsk, Russian Federation, 1974 11/24 Daniel Gerzo born in Bratislava, Slovakia, 1986 +11/25 Fedor Uporov born in Yalta, Crimea, USSR, 1988 11/28 Nik Clayton born in Peterborough, United Kingdom, 1973 11/28 Stanislav Sedov born in Chelyabinsk, USSR, 1985 12/01 Hajimu Umemoto born in Nara, Japan, 1961 @@ -376,6 +428,7 @@ 12/04 Mariusz Zaborski born in Skierniewice, Poland, 1990 12/05 Ivan Voras born in Slavonski Brod, Croatia, 1981 12/06 Stefan Farfeleder born in Wien, Austria, 1980 +12/08 Michael Tuexen born in Oldenburg, Germany, 1966 12/11 Ganael Laplanche born in Reims, France, 1980 12/15 James FitzGibbon born in Amersham, Buckinghamshire, United Kingdom, 1974 12/15 Timur I. Bakeyev born in Kazan, Republic of Tatarstan, USSR, 1974 @@ -386,9 +439,11 @@ 12/19 Stephen Hurd born in Estevan, Saskatchewan, Canada, 1975 12/20 Sean Bruno born in Monterey, California, United States, 1974 12/21 Rong-En Fan born in Taipei, Taiwan, Republic of China, 1982 +12/22 Alan L. Cox born in Warren, Ohio, United States, 1964 12/22 Maxim Sobolev born in Dnepropetrovsk, Ukraine, 1976 12/23 Sean Chittenden born in Seattle, Washington, United States, 1979 12/23 Alejandro Pulver born in Buenos Aires, Argentina, 1989 +12/24 Jochen Neumeister born in Heidenheim, Germany, 1975 12/24 Guido Falsi born in Firenze, Italy, 1978 12/25 Niclas Zeising born in Stockholm, Sweden, 1986 12/28 Soren Schmidt born in Maribo, Denmark, 1960 From owner-svn-src-stable@freebsd.org Thu Mar 15 10:13:26 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3615CF2D733; Thu, 15 Mar 2018 10:13:26 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DB0FB78E2A; Thu, 15 Mar 2018 10:13:25 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D539714D63; Thu, 15 Mar 2018 10:13:25 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FADPI1085478; Thu, 15 Mar 2018 10:13:25 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FADPDh085477; Thu, 15 Mar 2018 10:13:25 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803151013.w2FADPDh085477@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Thu, 15 Mar 2018 10:13: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: r330985 - stable/11/usr.sbin/freebsd-update X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/usr.sbin/freebsd-update X-SVN-Commit-Revision: 330985 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 10:13:26 -0000 Author: eadler Date: Thu Mar 15 10:13:25 2018 New Revision: 330985 URL: https://svnweb.freebsd.org/changeset/base/330985 Log: MFC r324441: Fix freebsd-update(8) erroneous message and exit status when "fetch install" used. PR: 190660 Modified: stable/11/usr.sbin/freebsd-update/freebsd-update.sh Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- stable/11/usr.sbin/freebsd-update/freebsd-update.sh Thu Mar 15 10:01:11 2018 (r330984) +++ stable/11/usr.sbin/freebsd-update/freebsd-update.sh Thu Mar 15 10:13:25 2018 (r330985) @@ -420,6 +420,9 @@ init_params () { # Run without a TTY NOTTYOK=0 + + # Fetched first in a chain of commands + ISFETCHED=0 } # Parse the command line @@ -785,8 +788,10 @@ install_check_params () { # Check that we have updates ready to install if ! [ -L ${BDHASH}-install ]; then echo "No updates are available to install." - echo "Run '$0 fetch' first." - exit 1 + if [ $ISFETCHED -eq 0 ]; then + echo "Run '$0 fetch' first." + fi + exit 0 fi if ! [ -f ${BDHASH}-install/INDEX-OLD ] || ! [ -f ${BDHASH}-install/INDEX-NEW ]; then @@ -3243,6 +3248,7 @@ cmd_fetch () { fi fetch_check_params fetch_run || exit 1 + ISFETCHED=1 } # Cron command. Make sure the parameters are sensible; wait From owner-svn-src-stable@freebsd.org Thu Mar 15 10:52:09 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2BADF3FE41; Thu, 15 Mar 2018 10:52:09 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 671DF7A48E; Thu, 15 Mar 2018 10:52: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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6202F15356; Thu, 15 Mar 2018 10:52:09 +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 w2FAq93e005396; Thu, 15 Mar 2018 10:52:09 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FAq8DU005391; Thu, 15 Mar 2018 10:52:08 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201803151052.w2FAq8DU005391@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 15 Mar 2018 10:52: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: r330986 - in stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys X-SVN-Group: stable-11 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: in stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys X-SVN-Commit-Revision: 330986 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 10:52:10 -0000 Author: avg Date: Thu Mar 15 10:52:08 2018 New Revision: 330986 URL: https://svnweb.freebsd.org/changeset/base/330986 Log: MFC r329717: MFV r329715: 8997 ztest assertion failure in zil_lwb_write_issue Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c Thu Mar 15 10:13:25 2018 (r330985) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c Thu Mar 15 10:52:08 2018 (r330986) @@ -858,7 +858,7 @@ dmu_tx_delay(dmu_tx_t *tx, uint64_t dirty) * decreasing performance. */ static int -dmu_tx_try_assign(dmu_tx_t *tx, txg_how_t txg_how) +dmu_tx_try_assign(dmu_tx_t *tx, uint64_t txg_how) { spa_t *spa = tx->tx_pool->dp_spa; @@ -878,13 +878,13 @@ dmu_tx_try_assign(dmu_tx_t *tx, txg_how_t txg_how) * of the failuremode setting. */ if (spa_get_failmode(spa) == ZIO_FAILURE_MODE_CONTINUE && - txg_how != TXG_WAIT) + !(txg_how & TXG_WAIT)) return (SET_ERROR(EIO)); return (SET_ERROR(ERESTART)); } - if (!tx->tx_waited && + if (!tx->tx_dirty_delayed && dsl_pool_need_dirty_delay(tx->tx_pool)) { tx->tx_wait_dirty = B_TRUE; return (SET_ERROR(ERESTART)); @@ -972,41 +972,44 @@ dmu_tx_unassign(dmu_tx_t *tx) } /* - * Assign tx to a transaction group. txg_how can be one of: + * Assign tx to a transaction group; txg_how is a bitmask: * - * (1) TXG_WAIT. If the current open txg is full, waits until there's - * a new one. This should be used when you're not holding locks. - * It will only fail if we're truly out of space (or over quota). + * If TXG_WAIT is set and the currently open txg is full, this function + * will wait until there's a new txg. This should be used when no locks + * are being held. With this bit set, this function will only fail if + * we're truly out of space (or over quota). * - * (2) TXG_NOWAIT. If we can't assign into the current open txg without - * blocking, returns immediately with ERESTART. This should be used - * whenever you're holding locks. On an ERESTART error, the caller - * should drop locks, do a dmu_tx_wait(tx), and try again. + * If TXG_WAIT is *not* set and we can't assign into the currently open + * txg without blocking, this function will return immediately with + * ERESTART. This should be used whenever locks are being held. On an + * ERESTART error, the caller should drop all locks, call dmu_tx_wait(), + * and try again. * - * (3) TXG_WAITED. Like TXG_NOWAIT, but indicates that dmu_tx_wait() - * has already been called on behalf of this operation (though - * most likely on a different tx). + * If TXG_NOTHROTTLE is set, this indicates that this tx should not be + * delayed due on the ZFS Write Throttle (see comments in dsl_pool.c for + * details on the throttle). This is used by the VFS operations, after + * they have already called dmu_tx_wait() (though most likely on a + * different tx). */ int -dmu_tx_assign(dmu_tx_t *tx, txg_how_t txg_how) +dmu_tx_assign(dmu_tx_t *tx, uint64_t txg_how) { int err; ASSERT(tx->tx_txg == 0); - ASSERT(txg_how == TXG_WAIT || txg_how == TXG_NOWAIT || - txg_how == TXG_WAITED); + ASSERT0(txg_how & ~(TXG_WAIT | TXG_NOTHROTTLE)); ASSERT(!dsl_pool_sync_context(tx->tx_pool)); /* If we might wait, we must not hold the config lock. */ - ASSERT(txg_how != TXG_WAIT || !dsl_pool_config_held(tx->tx_pool)); + IMPLY((txg_how & TXG_WAIT), !dsl_pool_config_held(tx->tx_pool)); - if (txg_how == TXG_WAITED) - tx->tx_waited = B_TRUE; + if ((txg_how & TXG_NOTHROTTLE)) + tx->tx_dirty_delayed = B_TRUE; while ((err = dmu_tx_try_assign(tx, txg_how)) != 0) { dmu_tx_unassign(tx); - if (err != ERESTART || txg_how != TXG_WAIT) + if (err != ERESTART || !(txg_how & TXG_WAIT)) return (err); dmu_tx_wait(tx); @@ -1043,12 +1046,12 @@ dmu_tx_wait(dmu_tx_t *tx) tx->tx_wait_dirty = B_FALSE; /* - * Note: setting tx_waited only has effect if the caller - * used TX_WAIT. Otherwise they are going to destroy - * this tx and try again. The common case, zfs_write(), - * uses TX_WAIT. + * Note: setting tx_dirty_delayed only has effect if the + * caller used TX_WAIT. Otherwise they are going to + * destroy this tx and try again. The common case, + * zfs_write(), uses TX_WAIT. */ - tx->tx_waited = B_TRUE; + tx->tx_dirty_delayed = B_TRUE; } else if (spa_suspended(spa) || tx->tx_lasttried_txg == 0) { /* * If the pool is suspended we need to wait until it Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h Thu Mar 15 10:13:25 2018 (r330985) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h Thu Mar 15 10:52:08 2018 (r330986) @@ -231,11 +231,14 @@ typedef enum dmu_object_type { DMU_OTN_ZAP_METADATA = DMU_OT(DMU_BSWAP_ZAP, B_TRUE), } dmu_object_type_t; -typedef enum txg_how { - TXG_WAIT = 1, - TXG_NOWAIT, - TXG_WAITED, -} txg_how_t; +/* + * These flags are intended to be used to specify the "txg_how" + * parameter when calling the dmu_tx_assign() function. See the comment + * above dmu_tx_assign() for more details on the meaning of these flags. + */ +#define TXG_NOWAIT (0ULL) +#define TXG_WAIT (1ULL<<0) +#define TXG_NOTHROTTLE (1ULL<<1) void byteswap_uint64_array(void *buf, size_t size); void byteswap_uint32_array(void *buf, size_t size); @@ -684,7 +687,7 @@ void dmu_tx_hold_spill(dmu_tx_t *tx, uint64_t object); void dmu_tx_hold_sa(dmu_tx_t *tx, struct sa_handle *hdl, boolean_t may_grow); void dmu_tx_hold_sa_create(dmu_tx_t *tx, int total_size); void dmu_tx_abort(dmu_tx_t *tx); -int dmu_tx_assign(dmu_tx_t *tx, enum txg_how txg_how); +int dmu_tx_assign(dmu_tx_t *tx, uint64_t txg_how); void dmu_tx_wait(dmu_tx_t *tx); void dmu_tx_commit(dmu_tx_t *tx); void dmu_tx_mark_netfree(dmu_tx_t *tx); Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h Thu Mar 15 10:13:25 2018 (r330985) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h Thu Mar 15 10:52:08 2018 (r330986) @@ -66,9 +66,6 @@ struct dmu_tx { /* placeholder for syncing context, doesn't need specific holds */ boolean_t tx_anyobj; - /* has this transaction already been delayed? */ - boolean_t tx_waited; - /* transaction is marked as being a "net free" of space */ boolean_t tx_netfree; @@ -78,6 +75,9 @@ struct dmu_tx { /* need to wait for sufficient dirty space */ boolean_t tx_wait_dirty; + /* has this transaction already been delayed? */ + boolean_t tx_dirty_delayed; + int tx_err; }; @@ -113,7 +113,7 @@ typedef struct dmu_tx_callback { * These routines are defined in dmu.h, and are called by the user. */ dmu_tx_t *dmu_tx_create(objset_t *dd); -int dmu_tx_assign(dmu_tx_t *tx, txg_how_t txg_how); +int dmu_tx_assign(dmu_tx_t *tx, uint64_t txg_how); void dmu_tx_commit(dmu_tx_t *tx); void dmu_tx_abort(dmu_tx_t *tx); uint64_t dmu_tx_get_txg(dmu_tx_t *tx); Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Thu Mar 15 10:13:25 2018 (r330985) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Thu Mar 15 10:52:08 2018 (r330986) @@ -127,7 +127,7 @@ * * If dmu_tx_assign() returns ERESTART and zfsvfs->z_assign is TXG_NOWAIT, * then drop all locks, call dmu_tx_wait(), and try again. On subsequent - * calls to dmu_tx_assign(), pass TXG_WAITED rather than TXG_NOWAIT, + * calls to dmu_tx_assign(), pass TXG_NOTHROTTLE in addition to TXG_NOWAIT, * to indicate that this operation has already called dmu_tx_wait(). * This will ensure that we don't retry forever, waiting a short bit * each time. @@ -152,7 +152,7 @@ * rw_enter(...); // grab any other locks you need * tx = dmu_tx_create(...); // get DMU tx * dmu_tx_hold_*(); // hold each object you might modify - * error = dmu_tx_assign(tx, waited ? TXG_WAITED : TXG_NOWAIT); + * error = dmu_tx_assign(tx, (waited ? TXG_NOTHROTTLE : 0) | TXG_NOWAIT); * if (error) { * rw_exit(...); // drop locks * zfs_dirent_unlock(dl); // unlock directory entry Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Thu Mar 15 10:13:25 2018 (r330985) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Thu Mar 15 10:52:08 2018 (r330986) @@ -1217,22 +1217,13 @@ zil_lwb_write_issue(zilog_t *zilog, lwb_t *lwb) tx = dmu_tx_create(zilog->zl_os); /* - * Since we are not going to create any new dirty data and we can even - * help with clearing the existing dirty data, we should not be subject - * to the dirty data based delays. - * We (ab)use TXG_WAITED to bypass the delay mechanism. - * One side effect from using TXG_WAITED is that dmu_tx_assign() can - * fail if the pool is suspended. Those are dramatic circumstances, - * so we return NULL to signal that the normal ZIL processing is not - * possible and txg_wait_synced() should be used to ensure that the data - * is on disk. + * Since we are not going to create any new dirty data, and we + * can even help with clearing the existing dirty data, we + * should not be subject to the dirty data based delays. We + * use TXG_NOTHROTTLE to bypass the delay mechanism. */ - error = dmu_tx_assign(tx, TXG_WAITED); - if (error != 0) { - ASSERT3S(error, ==, EIO); - dmu_tx_abort(tx); - return (NULL); - } + VERIFY0(dmu_tx_assign(tx, TXG_WAIT | TXG_NOTHROTTLE)); + dsl_dataset_dirty(dmu_objset_ds(zilog->zl_os), tx); txg = dmu_tx_get_txg(tx); From owner-svn-src-stable@freebsd.org Thu Mar 15 11:00:56 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6A085F419FC; Thu, 15 Mar 2018 11:00:56 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 17B5B7A92B; Thu, 15 Mar 2018 11:00:56 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1278315395; Thu, 15 Mar 2018 11:00:56 +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 w2FB0t9u006513; Thu, 15 Mar 2018 11:00:55 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FB0tZr006507; Thu, 15 Mar 2018 11:00:55 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201803151100.w2FB0tZr006507@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 15 Mar 2018 11:00:55 +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: r330987 - in stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys X-SVN-Group: stable-10 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: in stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys X-SVN-Commit-Revision: 330987 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 11:00:56 -0000 Author: avg Date: Thu Mar 15 11:00:55 2018 New Revision: 330987 URL: https://svnweb.freebsd.org/changeset/base/330987 Log: MFC r322245,r329717: MFV r322242: 8373 TXG_WAIT in ZIL commit path MFC r322245: MFV r322242: 8373 TXG_WAIT in ZIL commit path MFC r329717: MFV r329715: 8997 ztest assertion failure in zil_lwb_write_issue Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c Thu Mar 15 10:52:08 2018 (r330986) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c Thu Mar 15 11:00:55 2018 (r330987) @@ -1159,7 +1159,7 @@ dmu_tx_delay(dmu_tx_t *tx, uint64_t dirty) } static int -dmu_tx_try_assign(dmu_tx_t *tx, txg_how_t txg_how) +dmu_tx_try_assign(dmu_tx_t *tx, uint64_t txg_how) { dmu_tx_hold_t *txh; spa_t *spa = tx->tx_pool->dp_spa; @@ -1182,13 +1182,13 @@ dmu_tx_try_assign(dmu_tx_t *tx, txg_how_t txg_how) * of the failuremode setting. */ if (spa_get_failmode(spa) == ZIO_FAILURE_MODE_CONTINUE && - txg_how != TXG_WAIT) + !(txg_how & TXG_WAIT)) return (SET_ERROR(EIO)); return (SET_ERROR(ERESTART)); } - if (!tx->tx_waited && + if (!tx->tx_dirty_delayed && dsl_pool_need_dirty_delay(tx->tx_pool)) { tx->tx_wait_dirty = B_TRUE; return (SET_ERROR(ERESTART)); @@ -1308,41 +1308,44 @@ dmu_tx_unassign(dmu_tx_t *tx) } /* - * Assign tx to a transaction group. txg_how can be one of: + * Assign tx to a transaction group; txg_how is a bitmask: * - * (1) TXG_WAIT. If the current open txg is full, waits until there's - * a new one. This should be used when you're not holding locks. - * It will only fail if we're truly out of space (or over quota). + * If TXG_WAIT is set and the currently open txg is full, this function + * will wait until there's a new txg. This should be used when no locks + * are being held. With this bit set, this function will only fail if + * we're truly out of space (or over quota). * - * (2) TXG_NOWAIT. If we can't assign into the current open txg without - * blocking, returns immediately with ERESTART. This should be used - * whenever you're holding locks. On an ERESTART error, the caller - * should drop locks, do a dmu_tx_wait(tx), and try again. + * If TXG_WAIT is *not* set and we can't assign into the currently open + * txg without blocking, this function will return immediately with + * ERESTART. This should be used whenever locks are being held. On an + * ERESTART error, the caller should drop all locks, call dmu_tx_wait(), + * and try again. * - * (3) TXG_WAITED. Like TXG_NOWAIT, but indicates that dmu_tx_wait() - * has already been called on behalf of this operation (though - * most likely on a different tx). + * If TXG_NOTHROTTLE is set, this indicates that this tx should not be + * delayed due on the ZFS Write Throttle (see comments in dsl_pool.c for + * details on the throttle). This is used by the VFS operations, after + * they have already called dmu_tx_wait() (though most likely on a + * different tx). */ int -dmu_tx_assign(dmu_tx_t *tx, txg_how_t txg_how) +dmu_tx_assign(dmu_tx_t *tx, uint64_t txg_how) { int err; ASSERT(tx->tx_txg == 0); - ASSERT(txg_how == TXG_WAIT || txg_how == TXG_NOWAIT || - txg_how == TXG_WAITED); + ASSERT0(txg_how & ~(TXG_WAIT | TXG_NOTHROTTLE)); ASSERT(!dsl_pool_sync_context(tx->tx_pool)); /* If we might wait, we must not hold the config lock. */ - ASSERT(txg_how != TXG_WAIT || !dsl_pool_config_held(tx->tx_pool)); + IMPLY((txg_how & TXG_WAIT), !dsl_pool_config_held(tx->tx_pool)); - if (txg_how == TXG_WAITED) - tx->tx_waited = B_TRUE; + if ((txg_how & TXG_NOTHROTTLE)) + tx->tx_dirty_delayed = B_TRUE; while ((err = dmu_tx_try_assign(tx, txg_how)) != 0) { dmu_tx_unassign(tx); - if (err != ERESTART || txg_how != TXG_WAIT) + if (err != ERESTART || !(txg_how & TXG_WAIT)) return (err); dmu_tx_wait(tx); @@ -1379,12 +1382,12 @@ dmu_tx_wait(dmu_tx_t *tx) tx->tx_wait_dirty = B_FALSE; /* - * Note: setting tx_waited only has effect if the caller - * used TX_WAIT. Otherwise they are going to destroy - * this tx and try again. The common case, zfs_write(), - * uses TX_WAIT. + * Note: setting tx_dirty_delayed only has effect if the + * caller used TX_WAIT. Otherwise they are going to + * destroy this tx and try again. The common case, + * zfs_write(), uses TX_WAIT. */ - tx->tx_waited = B_TRUE; + tx->tx_dirty_delayed = B_TRUE; } else if (spa_suspended(spa) || tx->tx_lasttried_txg == 0) { /* * If the pool is suspended we need to wait until it Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h Thu Mar 15 10:52:08 2018 (r330986) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h Thu Mar 15 11:00:55 2018 (r330987) @@ -230,11 +230,14 @@ typedef enum dmu_object_type { DMU_OTN_ZAP_METADATA = DMU_OT(DMU_BSWAP_ZAP, B_TRUE), } dmu_object_type_t; -typedef enum txg_how { - TXG_WAIT = 1, - TXG_NOWAIT, - TXG_WAITED, -} txg_how_t; +/* + * These flags are intended to be used to specify the "txg_how" + * parameter when calling the dmu_tx_assign() function. See the comment + * above dmu_tx_assign() for more details on the meaning of these flags. + */ +#define TXG_NOWAIT (0ULL) +#define TXG_WAIT (1ULL<<0) +#define TXG_NOTHROTTLE (1ULL<<1) void byteswap_uint64_array(void *buf, size_t size); void byteswap_uint32_array(void *buf, size_t size); @@ -676,7 +679,7 @@ void dmu_tx_hold_spill(dmu_tx_t *tx, uint64_t object); void dmu_tx_hold_sa(dmu_tx_t *tx, struct sa_handle *hdl, boolean_t may_grow); void dmu_tx_hold_sa_create(dmu_tx_t *tx, int total_size); void dmu_tx_abort(dmu_tx_t *tx); -int dmu_tx_assign(dmu_tx_t *tx, enum txg_how txg_how); +int dmu_tx_assign(dmu_tx_t *tx, uint64_t txg_how); void dmu_tx_wait(dmu_tx_t *tx); void dmu_tx_commit(dmu_tx_t *tx); void dmu_tx_mark_netfree(dmu_tx_t *tx); Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h Thu Mar 15 10:52:08 2018 (r330986) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h Thu Mar 15 11:00:55 2018 (r330987) @@ -66,15 +66,15 @@ struct dmu_tx { /* placeholder for syncing context, doesn't need specific holds */ boolean_t tx_anyobj; - /* has this transaction already been delayed? */ - boolean_t tx_waited; - /* time this transaction was created */ hrtime_t tx_start; /* need to wait for sufficient dirty space */ boolean_t tx_wait_dirty; + /* has this transaction already been delayed? */ + boolean_t tx_dirty_delayed; + int tx_err; #ifdef ZFS_DEBUG uint64_t tx_space_towrite; @@ -124,7 +124,7 @@ typedef struct dmu_tx_callback { * These routines are defined in dmu.h, and are called by the user. */ dmu_tx_t *dmu_tx_create(objset_t *dd); -int dmu_tx_assign(dmu_tx_t *tx, txg_how_t txg_how); +int dmu_tx_assign(dmu_tx_t *tx, uint64_t txg_how); void dmu_tx_commit(dmu_tx_t *tx); void dmu_tx_abort(dmu_tx_t *tx); uint64_t dmu_tx_get_txg(dmu_tx_t *tx); Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Thu Mar 15 10:52:08 2018 (r330986) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Thu Mar 15 11:00:55 2018 (r330987) @@ -125,7 +125,7 @@ * * If dmu_tx_assign() returns ERESTART and zfsvfs->z_assign is TXG_NOWAIT, * then drop all locks, call dmu_tx_wait(), and try again. On subsequent - * calls to dmu_tx_assign(), pass TXG_WAITED rather than TXG_NOWAIT, + * calls to dmu_tx_assign(), pass TXG_NOTHROTTLE in addition to TXG_NOWAIT, * to indicate that this operation has already called dmu_tx_wait(). * This will ensure that we don't retry forever, waiting a short bit * each time. @@ -150,7 +150,7 @@ * rw_enter(...); // grab any other locks you need * tx = dmu_tx_create(...); // get DMU tx * dmu_tx_hold_*(); // hold each object you might modify - * error = dmu_tx_assign(tx, waited ? TXG_WAITED : TXG_NOWAIT); + * error = dmu_tx_assign(tx, (waited ? TXG_NOTHROTTLE : 0) | TXG_NOWAIT); * if (error) { * rw_exit(...); // drop locks * zfs_dirent_unlock(dl); // unlock directory entry Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Thu Mar 15 10:52:08 2018 (r330986) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Thu Mar 15 11:00:55 2018 (r330987) @@ -994,7 +994,15 @@ zil_lwb_write_start(zilog_t *zilog, lwb_t *lwb, boolea * to clean up in the event of allocation failure or I/O failure. */ tx = dmu_tx_create(zilog->zl_os); - VERIFY(dmu_tx_assign(tx, TXG_WAIT) == 0); + + /* + * Since we are not going to create any new dirty data, and we + * can even help with clearing the existing dirty data, we + * should not be subject to the dirty data based delays. We + * use TXG_NOTHROTTLE to bypass the delay mechanism. + */ + VERIFY0(dmu_tx_assign(tx, TXG_WAIT | TXG_NOTHROTTLE)); + dsl_dataset_dirty(dmu_objset_ds(zilog->zl_os), tx); txg = dmu_tx_get_txg(tx); From owner-svn-src-stable@freebsd.org Thu Mar 15 11:03:40 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 155D4F41F4E; Thu, 15 Mar 2018 11:03:40 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B40257AECC; Thu, 15 Mar 2018 11:03:39 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AED8B154EC; Thu, 15 Mar 2018 11: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 w2FB3d06010321; Thu, 15 Mar 2018 11:03:39 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FB3doo010320; Thu, 15 Mar 2018 11:03:39 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201803151103.w2FB3doo010320@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 15 Mar 2018 11:03:39 +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: r330988 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-11 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Commit-Revision: 330988 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 11:03:40 -0000 Author: avg Date: Thu Mar 15 11:03:39 2018 New Revision: 330988 URL: https://svnweb.freebsd.org/changeset/base/330988 Log: MFC r330057: add ZFS_ENTER protection to .zfs/snapshot vnode operations that need it Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c Thu Mar 15 11:00:55 2018 (r330987) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c Thu Mar 15 11:03:39 2018 (r330988) @@ -1071,6 +1071,7 @@ zfsctl_snapdir_readdir(ap) return (error); } + ZFS_ENTER(zfsvfs); for (;;) { uint64_t cookie; uint64_t id; @@ -1087,6 +1088,7 @@ zfsctl_snapdir_readdir(ap) *eofp = 1; error = 0; } + ZFS_EXIT(zfsvfs); return (error); } @@ -1099,6 +1101,7 @@ zfsctl_snapdir_readdir(ap) if (error != 0) { if (error == ENAMETOOLONG) error = 0; + ZFS_EXIT(zfsvfs); return (SET_ERROR(error)); } uio->uio_offset = cookie + dots_offset; @@ -1122,6 +1125,7 @@ zfsctl_snapdir_getattr(ap) uint64_t snap_count; int err; + ZFS_ENTER(zfsvfs); zfsctl_common_getattr(vp, vap); vap->va_ctime = dmu_objset_snap_cmtime(zfsvfs->z_os); vap->va_mtime = vap->va_ctime; @@ -1129,12 +1133,15 @@ zfsctl_snapdir_getattr(ap) if (dsl_dataset_phys(ds)->ds_snapnames_zapobj != 0) { err = zap_count(dmu_objset_pool(ds->ds_objset)->dp_meta_objset, dsl_dataset_phys(ds)->ds_snapnames_zapobj, &snap_count); - if (err != 0) + if (err != 0) { + ZFS_EXIT(zfsvfs); return (err); + } vap->va_nlink += snap_count; } vap->va_size = vap->va_nlink; + ZFS_EXIT(zfsvfs); return (0); } From owner-svn-src-stable@freebsd.org Thu Mar 15 11:04:31 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EDFACF43062; Thu, 15 Mar 2018 11:04:30 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9A86E7B02E; Thu, 15 Mar 2018 11:04: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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 95830154EE; Thu, 15 Mar 2018 11:04:30 +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 w2FB4Uwt010413; Thu, 15 Mar 2018 11:04:30 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FB4Uww010412; Thu, 15 Mar 2018 11:04:30 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201803151104.w2FB4Uww010412@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 15 Mar 2018 11:04:30 +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: r330989 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-10 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Commit-Revision: 330989 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 11:04:31 -0000 Author: avg Date: Thu Mar 15 11:04:30 2018 New Revision: 330989 URL: https://svnweb.freebsd.org/changeset/base/330989 Log: MFC r330057: add ZFS_ENTER protection to .zfs/snapshot vnode operations that need it Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c Thu Mar 15 11:03:39 2018 (r330988) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c Thu Mar 15 11:04:30 2018 (r330989) @@ -1071,6 +1071,7 @@ zfsctl_snapdir_readdir(ap) return (error); } + ZFS_ENTER(zfsvfs); for (;;) { uint64_t cookie; uint64_t id; @@ -1087,6 +1088,7 @@ zfsctl_snapdir_readdir(ap) *eofp = 1; error = 0; } + ZFS_EXIT(zfsvfs); return (error); } @@ -1099,6 +1101,7 @@ zfsctl_snapdir_readdir(ap) if (error != 0) { if (error == ENAMETOOLONG) error = 0; + ZFS_EXIT(zfsvfs); return (SET_ERROR(error)); } uio->uio_offset = cookie + dots_offset; @@ -1122,6 +1125,7 @@ zfsctl_snapdir_getattr(ap) uint64_t snap_count; int err; + ZFS_ENTER(zfsvfs); zfsctl_common_getattr(vp, vap); vap->va_ctime = dmu_objset_snap_cmtime(zfsvfs->z_os); vap->va_mtime = vap->va_ctime; @@ -1129,12 +1133,15 @@ zfsctl_snapdir_getattr(ap) if (dsl_dataset_phys(ds)->ds_snapnames_zapobj != 0) { err = zap_count(dmu_objset_pool(ds->ds_objset)->dp_meta_objset, dsl_dataset_phys(ds)->ds_snapnames_zapobj, &snap_count); - if (err != 0) + if (err != 0) { + ZFS_EXIT(zfsvfs); return (err); + } vap->va_nlink += snap_count; } vap->va_size = vap->va_nlink; + ZFS_EXIT(zfsvfs); return (0); } From owner-svn-src-stable@freebsd.org Thu Mar 15 11:06:05 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E95CDF43201; Thu, 15 Mar 2018 11:06:04 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9E2187B1B9; Thu, 15 Mar 2018 11:06:04 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 98CAA154F0; Thu, 15 Mar 2018 11:06:04 +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 w2FB64IY010542; Thu, 15 Mar 2018 11:06:04 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FB64kS010538; Thu, 15 Mar 2018 11:06:04 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201803151106.w2FB64kS010538@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 15 Mar 2018 11:06: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: r330990 - in stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys X-SVN-Group: stable-11 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: in stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys X-SVN-Commit-Revision: 330990 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 11:06:05 -0000 Author: avg Date: Thu Mar 15 11:06:04 2018 New Revision: 330990 URL: https://svnweb.freebsd.org/changeset/base/330990 Log: MFC r329823: another rework of getzfsvfs / getzfsvfs_impl code Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp_get.c stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h Thu Mar 15 11:04:30 2018 (r330989) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h Thu Mar 15 11:06:04 2018 (r330990) @@ -426,7 +426,11 @@ extern int zfs_secpolicy_destroy_perms(const char *, c extern int zfs_busy(void); extern void zfs_unmount_snap(const char *); extern void zfs_destroy_unmount_origin(const char *); +#ifdef illumos extern int getzfsvfs_impl(struct objset *, struct zfsvfs **); +#else +extern int getzfsvfs_impl(struct objset *, vfs_t **); +#endif extern int getzfsvfs(const char *, struct zfsvfs **); /* Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp_get.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp_get.c Thu Mar 15 11:04:30 2018 (r330989) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp_get.c Thu Mar 15 11:06:04 2018 (r330990) @@ -226,7 +226,9 @@ get_temporary_prop(dsl_dataset_t *ds, zfs_prop_t zfs_p return (0); #else int error; +#ifdef illumos zfsvfs_t *zfvp; +#endif vfs_t *vfsp; objset_t *os; uint64_t tmp = *val; @@ -235,12 +237,12 @@ get_temporary_prop(dsl_dataset_t *ds, zfs_prop_t zfs_p if (error != 0) return (error); - error = getzfsvfs_impl(os, &zfvp); + error = getzfsvfs_impl(os, &vfsp); if (error != 0) return (error); - +#ifdef illumos vfsp = zfvp->z_vfs; - +#endif switch (zfs_prop) { case ZFS_PROP_ATIME: if (vfs_optionisset(vfsp, MNTOPT_NOATIME, NULL)) Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Thu Mar 15 11:04:30 2018 (r330989) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Thu Mar 15 11:06:04 2018 (r330990) @@ -1438,9 +1438,9 @@ put_nvlist(zfs_cmd_t *zc, nvlist_t *nvl) } int -getzfsvfs_impl(objset_t *os, zfsvfs_t **zfvp) +getzfsvfs_impl(objset_t *os, vfs_t **vfsp) { - vfs_t *vfsp; + zfsvfs_t *zfvp; int error = 0; if (dmu_objset_type(os) != DMU_OST_ZFS) { @@ -1448,9 +1448,10 @@ getzfsvfs_impl(objset_t *os, zfsvfs_t **zfvp) } mutex_enter(&os->os_user_ptr_lock); - *zfvp = dmu_objset_get_user(os); - if (*zfvp) { - vfs_ref((*zfvp)->z_vfs); + zfvp = dmu_objset_get_user(os); + if (zfvp) { + *vfsp = zfvp->z_vfs; + vfs_ref(zfvp->z_vfs); } else { error = SET_ERROR(ESRCH); } @@ -1458,57 +1459,31 @@ getzfsvfs_impl(objset_t *os, zfsvfs_t **zfvp) return (error); } -#ifdef illumos int getzfsvfs(const char *dsname, zfsvfs_t **zfvp) { objset_t *os; + vfs_t *vfsp; int error; error = dmu_objset_hold(dsname, FTAG, &os); if (error != 0) return (error); - - error = getzfsvfs_impl(os, zfvp); + error = getzfsvfs_impl(os, &vfsp); dmu_objset_rele(os, FTAG); - return (error); -} - -#else - -static int -getzfsvfs_ref(const char *dsname, zfsvfs_t **zfvp) -{ - objset_t *os; - int error; - - error = dmu_objset_hold(dsname, FTAG, &os); if (error != 0) return (error); - error = getzfsvfs_impl(os, zfvp); - dmu_objset_rele(os, FTAG); - return (error); -} - -int -getzfsvfs(const char *dsname, zfsvfs_t **zfvp) -{ - objset_t *os; - int error; - - error = getzfsvfs_ref(dsname, zfvp); - if (error != 0) - return (error); - error = vfs_busy((*zfvp)->z_vfs, 0); - vfs_rel((*zfvp)->z_vfs); + error = vfs_busy(vfsp, 0); + vfs_rel(vfsp); if (error != 0) { *zfvp = NULL; error = SET_ERROR(ESRCH); + } else { + *zfvp = vfsp->vfs_data; } return (error); } -#endif /* * Find a zfsvfs_t for a mounted filesystem, or create our own, in which @@ -3572,7 +3547,7 @@ zfs_unmount_snap(const char *snapname) if (strchr(snapname, '@') == NULL) return; - int err = getzfsvfs_ref(snapname, &zfsvfs); + int err = getzfsvfs(snapname, &zfsvfs); if (err != 0) { ASSERT3P(zfsvfs, ==, NULL); return; @@ -3594,6 +3569,8 @@ zfs_unmount_snap(const char *snapname) #ifdef illumos (void) dounmount(vfsp, MS_FORCE, kcred); #else + vfs_ref(vfsp); + vfs_unbusy(vfsp); (void) dounmount(vfsp, MS_FORCE, curthread); #endif } From owner-svn-src-stable@freebsd.org Thu Mar 15 12:05:18 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB454F4C106; Thu, 15 Mar 2018 12:05:18 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6C41B7D53A; Thu, 15 Mar 2018 12: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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 62EDB15E08; Thu, 15 Mar 2018 12: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 w2FC5IHG040478; Thu, 15 Mar 2018 12:05:18 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FC5I0l040474; Thu, 15 Mar 2018 12:05:18 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201803151205.w2FC5I0l040474@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 15 Mar 2018 12:05: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: r330991 - in stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys X-SVN-Group: stable-11 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: in stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys X-SVN-Commit-Revision: 330991 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 12:05:19 -0000 Author: avg Date: Thu Mar 15 12:05:17 2018 New Revision: 330991 URL: https://svnweb.freebsd.org/changeset/base/330991 Log: MFC r329363: read-behind / read-ahead support for zfs_getpages() Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c Thu Mar 15 11:06:04 2018 (r330990) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c Thu Mar 15 12:05:17 2018 (r330991) @@ -1518,6 +1518,188 @@ dmu_write_pages(objset_t *os, uint64_t object, uint64_ dmu_buf_rele_array(dbp, numbufs, FTAG); return (err); } + +int +dmu_read_pages(objset_t *os, uint64_t object, vm_page_t *ma, int count, + int *rbehind, int *rahead, int last_size) +{ + struct sf_buf *sf; + vm_object_t vmobj; + vm_page_t m; + dmu_buf_t **dbp; + dmu_buf_t *db; + caddr_t va; + int numbufs, i; + int bufoff, pgoff, tocpy; + int mi, di; + int err; + + ASSERT3U(ma[0]->pindex + count - 1, ==, ma[count - 1]->pindex); + ASSERT(last_size <= PAGE_SIZE); + + err = dmu_buf_hold_array(os, object, IDX_TO_OFF(ma[0]->pindex), + IDX_TO_OFF(count - 1) + last_size, TRUE, FTAG, &numbufs, &dbp); + if (err != 0) + return (err); + +#ifdef DEBUG + IMPLY(last_size < PAGE_SIZE, *rahead == 0); + if (dbp[0]->db_offset != 0 || numbufs > 1) { + for (i = 0; i < numbufs; i++) { + ASSERT(ISP2(dbp[i]->db_size)); + ASSERT((dbp[i]->db_offset % dbp[i]->db_size) == 0); + ASSERT3U(dbp[i]->db_size, ==, dbp[0]->db_size); + } + } +#endif + + vmobj = ma[0]->object; + zfs_vmobject_wlock(vmobj); + + db = dbp[0]; + for (i = 0; i < *rbehind; i++) { + m = vm_page_grab(vmobj, ma[0]->pindex - 1 - i, + VM_ALLOC_NORMAL | VM_ALLOC_NOWAIT | VM_ALLOC_NOBUSY); + if (m == NULL) + break; + if (m->valid != 0) { + ASSERT3U(m->valid, ==, VM_PAGE_BITS_ALL); + break; + } + ASSERT(m->dirty == 0); + ASSERT(!pmap_page_is_mapped(m)); + + ASSERT(db->db_size > PAGE_SIZE); + bufoff = IDX_TO_OFF(m->pindex) % db->db_size; + va = zfs_map_page(m, &sf); + bcopy((char *)db->db_data + bufoff, va, PAGESIZE); + zfs_unmap_page(sf); + m->valid = VM_PAGE_BITS_ALL; + vm_page_lock(m); + if ((m->busy_lock & VPB_BIT_WAITERS) != 0) + vm_page_activate(m); + else + vm_page_deactivate(m); + vm_page_unlock(m); + } + *rbehind = i; + + bufoff = IDX_TO_OFF(ma[0]->pindex) % db->db_size; + pgoff = 0; + for (mi = 0, di = 0; mi < count && di < numbufs; ) { + if (pgoff == 0) { + m = ma[mi]; + vm_page_assert_xbusied(m); + ASSERT(m->valid == 0); + ASSERT(m->dirty == 0); + ASSERT(!pmap_page_is_mapped(m)); + va = zfs_map_page(m, &sf); + } + if (bufoff == 0) + db = dbp[di]; + + ASSERT3U(IDX_TO_OFF(m->pindex) + pgoff, ==, + db->db_offset + bufoff); + + /* + * We do not need to clamp the copy size by the file + * size as the last block is zero-filled beyond the + * end of file anyway. + */ + tocpy = MIN(db->db_size - bufoff, PAGESIZE - pgoff); + bcopy((char *)db->db_data + bufoff, va + pgoff, tocpy); + + pgoff += tocpy; + ASSERT(pgoff <= PAGESIZE); + if (pgoff == PAGESIZE) { + zfs_unmap_page(sf); + m->valid = VM_PAGE_BITS_ALL; + ASSERT(mi < count); + mi++; + pgoff = 0; + } + + bufoff += tocpy; + ASSERT(bufoff <= db->db_size); + if (bufoff == db->db_size) { + ASSERT(di < numbufs); + di++; + bufoff = 0; + } + } + +#ifdef DEBUG + /* + * Three possibilities: + * - last requested page ends at a buffer boundary and , thus, + * all pages and buffers have been iterated; + * - all requested pages are filled, but the last buffer + * has not been exhausted; + * the read-ahead is possible only in this case; + * - all buffers have been read, but the last page has not been + * fully filled; + * this is only possible if the file has only a single buffer + * with a size that is not a multiple of the page size. + */ + if (mi == count) { + ASSERT(di >= numbufs - 1); + IMPLY(*rahead != 0, di == numbufs - 1); + IMPLY(*rahead != 0, bufoff != 0); + ASSERT(pgoff == 0); + } + if (di == numbufs) { + ASSERT(mi >= count - 1); + ASSERT(*rahead == 0); + IMPLY(pgoff == 0, mi == count); + if (pgoff != 0) { + ASSERT(mi == count - 1); + ASSERT((dbp[0]->db_size & PAGE_MASK) != 0); + } + } +#endif + if (pgoff != 0) { + bzero(va + pgoff, PAGESIZE - pgoff); + zfs_unmap_page(sf); + m->valid = VM_PAGE_BITS_ALL; + } + + for (i = 0; i < *rahead; i++) { + m = vm_page_grab(vmobj, ma[count - 1]->pindex + 1 + i, + VM_ALLOC_NORMAL | VM_ALLOC_NOWAIT | VM_ALLOC_NOBUSY); + if (m == NULL) + break; + if (m->valid != 0) { + ASSERT3U(m->valid, ==, VM_PAGE_BITS_ALL); + break; + } + ASSERT(m->dirty == 0); + ASSERT(!pmap_page_is_mapped(m)); + + ASSERT(db->db_size > PAGE_SIZE); + bufoff = IDX_TO_OFF(m->pindex) % db->db_size; + tocpy = MIN(db->db_size - bufoff, PAGESIZE); + va = zfs_map_page(m, &sf); + bcopy((char *)db->db_data + bufoff, va, tocpy); + if (tocpy < PAGESIZE) { + ASSERT(i == *rahead - 1); + ASSERT((db->db_size & PAGE_MASK) != 0); + bzero(va + tocpy, PAGESIZE - tocpy); + } + zfs_unmap_page(sf); + m->valid = VM_PAGE_BITS_ALL; + vm_page_lock(m); + if ((m->busy_lock & VPB_BIT_WAITERS) != 0) + vm_page_activate(m); + else + vm_page_deactivate(m); + vm_page_unlock(m); + } + *rahead = i; + zfs_vmobject_wunlock(vmobj); + + dmu_buf_rele_array(dbp, numbufs, FTAG); + return (0); +} #endif /* illumos */ #endif /* _KERNEL */ Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h Thu Mar 15 11:06:04 2018 (r330990) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h Thu Mar 15 12:05:17 2018 (r330991) @@ -753,6 +753,8 @@ int dmu_write_pages(objset_t *os, uint64_t object, uin #else int dmu_write_pages(objset_t *os, uint64_t object, uint64_t offset, uint64_t size, struct vm_page **ppa, dmu_tx_t *tx); +int dmu_read_pages(objset_t *os, uint64_t object, vm_page_t *ma, int count, + int *rbehind, int *rahead, int last_size); #endif #endif struct arc_buf *dmu_request_arcbuf(dmu_buf_t *handle, int size); Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Thu Mar 15 11:06:04 2018 (r330990) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Thu Mar 15 12:05:17 2018 (r330991) @@ -4515,81 +4515,85 @@ zfs_setsecattr(vnode_t *vp, vsecattr_t *vsecp, int fla } static int -zfs_getpages(struct vnode *vp, vm_page_t *m, int count, int *rbehind, +zfs_getpages(struct vnode *vp, vm_page_t *ma, int count, int *rbehind, int *rahead) { znode_t *zp = VTOZ(vp); zfsvfs_t *zfsvfs = zp->z_zfsvfs; objset_t *os = zp->z_zfsvfs->z_os; - vm_page_t mlast; + rl_t *rl; vm_object_t object; - caddr_t va; - struct sf_buf *sf; - off_t startoff, endoff; - int i, error; - vm_pindex_t reqstart, reqend; - int lsize, size; + off_t start, end, obj_size; + uint_t blksz; + int pgsin_b, pgsin_a; + int error; - object = m[0]->object; - error = 0; - ZFS_ENTER(zfsvfs); ZFS_VERIFY_ZP(zp); - zfs_vmobject_wlock(object); - if (m[count - 1]->valid != 0 && --count == 0) { - zfs_vmobject_wunlock(object); - goto out; + start = IDX_TO_OFF(ma[0]->pindex); + end = IDX_TO_OFF(ma[count - 1]->pindex + 1); + + /* + * Lock a range covering all required and optional pages. + * Note that we need to handle the case of the block size growing. + */ + for (;;) { + blksz = zp->z_blksz; + rl = zfs_range_lock(zp, rounddown(start, blksz), + roundup(end, blksz) - rounddown(start, blksz), RL_READER); + if (blksz == zp->z_blksz) + break; + zfs_range_unlock(rl); } - mlast = m[count - 1]; - - if (IDX_TO_OFF(mlast->pindex) >= - object->un_pager.vnp.vnp_size) { - zfs_vmobject_wunlock(object); + object = ma[0]->object; + zfs_vmobject_wlock(object); + obj_size = object->un_pager.vnp.vnp_size; + zfs_vmobject_wunlock(object); + if (IDX_TO_OFF(ma[count - 1]->pindex) >= obj_size) { + zfs_range_unlock(rl); ZFS_EXIT(zfsvfs); return (zfs_vm_pagerret_bad); } - PCPU_INC(cnt.v_vnodein); - PCPU_ADD(cnt.v_vnodepgsin, count); + pgsin_b = 0; + if (rbehind != NULL) { + pgsin_b = OFF_TO_IDX(start - rounddown(start, blksz)); + pgsin_b = MIN(*rbehind, pgsin_b); + } - lsize = PAGE_SIZE; - if (IDX_TO_OFF(mlast->pindex) + lsize > object->un_pager.vnp.vnp_size) - lsize = object->un_pager.vnp.vnp_size - - IDX_TO_OFF(mlast->pindex); - zfs_vmobject_wunlock(object); - - for (i = 0; i < count; i++) { - size = PAGE_SIZE; - if (i == count - 1) - size = lsize; - va = zfs_map_page(m[i], &sf); - error = dmu_read(os, zp->z_id, IDX_TO_OFF(m[i]->pindex), - size, va, DMU_READ_PREFETCH); - if (size != PAGE_SIZE) - bzero(va + size, PAGE_SIZE - size); - zfs_unmap_page(sf); - if (error != 0) - goto out; + pgsin_a = 0; + if (rahead != NULL) { + pgsin_a = OFF_TO_IDX(roundup(end, blksz) - end); + if (end + IDX_TO_OFF(pgsin_a) >= obj_size) + pgsin_a = OFF_TO_IDX(round_page(obj_size) - end); + pgsin_a = MIN(*rahead, pgsin_a); } - zfs_vmobject_wlock(object); - for (i = 0; i < count; i++) - m[i]->valid = VM_PAGE_BITS_ALL; - zfs_vmobject_wunlock(object); + /* + * NB: we need to pass the exact byte size of the data that we expect + * to read after accounting for the file size. This is required because + * ZFS will panic if we request DMU to read beyond the end of the last + * allocated block. + */ + error = dmu_read_pages(os, zp->z_id, ma, count, &pgsin_b, &pgsin_a, + MIN(end, obj_size) - (end - PAGE_SIZE)); -out: + zfs_range_unlock(rl); ZFS_ACCESSTIME_STAMP(zfsvfs, zp); ZFS_EXIT(zfsvfs); - if (error == 0) { - if (rbehind) - *rbehind = 0; - if (rahead) - *rahead = 0; - return (zfs_vm_pagerret_ok); - } else + + if (error != 0) return (zfs_vm_pagerret_error); + + PCPU_INC(cnt.v_vnodein); + PCPU_ADD(cnt.v_vnodepgsin, count + pgsin_b + pgsin_a); + if (rbehind != NULL) + *rbehind = pgsin_b; + if (rahead != NULL) + *rahead = pgsin_a; + return (zfs_vm_pagerret_ok); } static int From owner-svn-src-stable@freebsd.org Thu Mar 15 12:56:25 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 11B78F4FB8E; Thu, 15 Mar 2018 12:56:25 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B02797F8A2; Thu, 15 Mar 2018 12:56:24 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8F513165A4; Thu, 15 Mar 2018 12:56:24 +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 w2FCuOJE065653; Thu, 15 Mar 2018 12:56:24 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FCuM6n065635; Thu, 15 Mar 2018 12:56:22 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201803151256.w2FCuM6n065635@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 15 Mar 2018 12:56: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: r330997 - in stable/11/sys: amd64/linux amd64/linux32 compat/linux i386/linux X-SVN-Group: stable-11 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in stable/11/sys: amd64/linux amd64/linux32 compat/linux i386/linux X-SVN-Commit-Revision: 330997 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 12:56:25 -0000 Author: emaste Date: Thu Mar 15 12:56:22 2018 New Revision: 330997 URL: https://svnweb.freebsd.org/changeset/base/330997 Log: MFC r329370, r330239: Rationalize license text on Linuxolator files Many licenses on Linuxolator files contained small variations from the standard FreeBSD license text. To avoid license proliferation switch to the standard 2-clause FreeBSD license for those files where I have permission from each of the listed copyright holders. Approved by: dchagin, kan, marcel, rdivacky, sos Sponsored by: The FreeBSD Foundation Modified: stable/11/sys/amd64/linux/linux.h stable/11/sys/amd64/linux/linux_dummy.c stable/11/sys/amd64/linux32/linux32_dummy.c stable/11/sys/compat/linux/linux_emul.c stable/11/sys/compat/linux/linux_emul.h stable/11/sys/compat/linux/linux_file.c stable/11/sys/compat/linux/linux_ioctl.c stable/11/sys/compat/linux/linux_ipc.c stable/11/sys/compat/linux/linux_mib.c stable/11/sys/compat/linux/linux_signal.c stable/11/sys/compat/linux/linux_socket.c stable/11/sys/compat/linux/linux_stats.c stable/11/sys/compat/linux/linux_sysctl.c stable/11/sys/i386/linux/imgact_linux.c stable/11/sys/i386/linux/linux_dummy.c stable/11/sys/i386/linux/linux_machdep.c stable/11/sys/i386/linux/linux_ptrace.c stable/11/sys/i386/linux/linux_sysvec.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/amd64/linux/linux.h ============================================================================== --- stable/11/sys/amd64/linux/linux.h Thu Mar 15 12:47:34 2018 (r330996) +++ stable/11/sys/amd64/linux/linux.h Thu Mar 15 12:56:22 2018 (r330997) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2013 Dmitry Chagin * Copyright (c) 1994-1996 Søren Schmidt * All rights reserved. @@ -7,24 +9,22 @@ * 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 - * in this position and unchanged. + * 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. 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 - * 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. + * 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$ */ Modified: stable/11/sys/amd64/linux/linux_dummy.c ============================================================================== --- stable/11/sys/amd64/linux/linux_dummy.c Thu Mar 15 12:47:34 2018 (r330996) +++ stable/11/sys/amd64/linux/linux_dummy.c Thu Mar 15 12:56:22 2018 (r330997) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2013 Dmitry Chagin * All rights reserved. * @@ -6,22 +8,22 @@ * 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 - * in this position and unchanged. + * 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. + * 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 Modified: stable/11/sys/amd64/linux32/linux32_dummy.c ============================================================================== --- stable/11/sys/amd64/linux32/linux32_dummy.c Thu Mar 15 12:47:34 2018 (r330996) +++ stable/11/sys/amd64/linux32/linux32_dummy.c Thu Mar 15 12:56:22 2018 (r330997) @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 1994-1995 Søren Schmidt * All rights reserved. @@ -8,24 +8,22 @@ * 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 - * in this position and unchanged. + * 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. 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 - * 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. + * 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 Modified: stable/11/sys/compat/linux/linux_emul.c ============================================================================== --- stable/11/sys/compat/linux/linux_emul.c Thu Mar 15 12:47:34 2018 (r330996) +++ stable/11/sys/compat/linux/linux_emul.c Thu Mar 15 12:56:22 2018 (r330997) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2006 Roman Divacky * Copyright (c) 2013 Dmitry Chagin * All rights reserved. @@ -7,24 +9,22 @@ * 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 - * in this position and unchanged. + * 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. 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 - * 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. + * 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 Modified: stable/11/sys/compat/linux/linux_emul.h ============================================================================== --- stable/11/sys/compat/linux/linux_emul.h Thu Mar 15 12:47:34 2018 (r330996) +++ stable/11/sys/compat/linux/linux_emul.h Thu Mar 15 12:56:22 2018 (r330997) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2006 Roman Divacky * Copyright (c) 2013 Dmitry Chagin * All rights reserved. @@ -7,24 +9,22 @@ * 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 - * in this position and unchanged. + * 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. 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 - * 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. + * 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$ */ Modified: stable/11/sys/compat/linux/linux_file.c ============================================================================== --- stable/11/sys/compat/linux/linux_file.c Thu Mar 15 12:47:34 2018 (r330996) +++ stable/11/sys/compat/linux/linux_file.c Thu Mar 15 12:56:22 2018 (r330997) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 1994-1995 Søren Schmidt * All rights reserved. * @@ -6,24 +8,22 @@ * 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 - * in this position and unchanged. + * 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. 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 - * 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. + * 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 Modified: stable/11/sys/compat/linux/linux_ioctl.c ============================================================================== --- stable/11/sys/compat/linux/linux_ioctl.c Thu Mar 15 12:47:34 2018 (r330996) +++ stable/11/sys/compat/linux/linux_ioctl.c Thu Mar 15 12:56:22 2018 (r330997) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 1994-1995 Søren Schmidt * All rights reserved. * @@ -6,24 +8,22 @@ * 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 - * in this position and unchanged. + * 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. 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 - * 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. + * 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 "opt_compat.h" Modified: stable/11/sys/compat/linux/linux_ipc.c ============================================================================== --- stable/11/sys/compat/linux/linux_ipc.c Thu Mar 15 12:47:34 2018 (r330996) +++ stable/11/sys/compat/linux/linux_ipc.c Thu Mar 15 12:56:22 2018 (r330997) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 1994-1995 Søren Schmidt * All rights reserved. * @@ -6,24 +8,22 @@ * 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 - * in this position and unchanged. + * 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. 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 - * 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. + * 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 Modified: stable/11/sys/compat/linux/linux_mib.c ============================================================================== --- stable/11/sys/compat/linux/linux_mib.c Thu Mar 15 12:47:34 2018 (r330996) +++ stable/11/sys/compat/linux/linux_mib.c Thu Mar 15 12:56:22 2018 (r330997) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 1999 Marcel Moolenaar * All rights reserved. * @@ -6,24 +8,22 @@ * 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 - * in this position and unchanged. + * 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. 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 - * 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. + * 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 Modified: stable/11/sys/compat/linux/linux_signal.c ============================================================================== --- stable/11/sys/compat/linux/linux_signal.c Thu Mar 15 12:47:34 2018 (r330996) +++ stable/11/sys/compat/linux/linux_signal.c Thu Mar 15 12:56:22 2018 (r330997) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 1994-1995 Søren Schmidt * All rights reserved. * @@ -6,24 +8,22 @@ * 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 - * in this position and unchanged. + * 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. 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 - * 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. + * 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 Modified: stable/11/sys/compat/linux/linux_socket.c ============================================================================== --- stable/11/sys/compat/linux/linux_socket.c Thu Mar 15 12:47:34 2018 (r330996) +++ stable/11/sys/compat/linux/linux_socket.c Thu Mar 15 12:56:22 2018 (r330997) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 1995 Søren Schmidt * All rights reserved. * @@ -6,24 +8,22 @@ * 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 - * in this position and unchanged. + * 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. 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 - * 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. + * 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 Modified: stable/11/sys/compat/linux/linux_stats.c ============================================================================== --- stable/11/sys/compat/linux/linux_stats.c Thu Mar 15 12:47:34 2018 (r330996) +++ stable/11/sys/compat/linux/linux_stats.c Thu Mar 15 12:56:22 2018 (r330997) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 1994-1995 Søren Schmidt * All rights reserved. * @@ -6,24 +8,22 @@ * 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 - * in this position and unchanged. + * 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. 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 - * 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. + * 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 Modified: stable/11/sys/compat/linux/linux_sysctl.c ============================================================================== --- stable/11/sys/compat/linux/linux_sysctl.c Thu Mar 15 12:47:34 2018 (r330996) +++ stable/11/sys/compat/linux/linux_sysctl.c Thu Mar 15 12:56:22 2018 (r330997) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2001 Marcel Moolenaar * All rights reserved. * @@ -6,24 +8,22 @@ * 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 - * in this position and unchanged. + * 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. 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 - * 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. + * 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 Modified: stable/11/sys/i386/linux/imgact_linux.c ============================================================================== --- stable/11/sys/i386/linux/imgact_linux.c Thu Mar 15 12:47:34 2018 (r330996) +++ stable/11/sys/i386/linux/imgact_linux.c Thu Mar 15 12:56:22 2018 (r330997) @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 1994-1996 Søren Schmidt * All rights reserved. @@ -11,24 +11,22 @@ * 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 - * in this position and unchanged. + * 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. 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 - * 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. + * 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 Modified: stable/11/sys/i386/linux/linux_dummy.c ============================================================================== --- stable/11/sys/i386/linux/linux_dummy.c Thu Mar 15 12:47:34 2018 (r330996) +++ stable/11/sys/i386/linux/linux_dummy.c Thu Mar 15 12:56:22 2018 (r330997) @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 1994-1995 Søren Schmidt * All rights reserved. @@ -8,24 +8,22 @@ * 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 - * in this position and unchanged. + * 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. 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 - * 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. + * 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 Modified: stable/11/sys/i386/linux/linux_machdep.c ============================================================================== --- stable/11/sys/i386/linux/linux_machdep.c Thu Mar 15 12:47:34 2018 (r330996) +++ stable/11/sys/i386/linux/linux_machdep.c Thu Mar 15 12:56:22 2018 (r330997) @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2000 Marcel Moolenaar * All rights reserved. @@ -8,24 +8,22 @@ * 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 - * in this position and unchanged. + * 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. 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 - * 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. + * 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 Modified: stable/11/sys/i386/linux/linux_ptrace.c ============================================================================== --- stable/11/sys/i386/linux/linux_ptrace.c Thu Mar 15 12:47:34 2018 (r330996) +++ stable/11/sys/i386/linux/linux_ptrace.c Thu Mar 15 12:56:22 2018 (r330997) @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2001 Alexander Kabaev * All rights reserved. @@ -8,24 +8,22 @@ * 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 - * in this position and unchanged. + * 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. 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 - * 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. + * 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 Modified: stable/11/sys/i386/linux/linux_sysvec.c ============================================================================== --- stable/11/sys/i386/linux/linux_sysvec.c Thu Mar 15 12:47:34 2018 (r330996) +++ stable/11/sys/i386/linux/linux_sysvec.c Thu Mar 15 12:56:22 2018 (r330997) @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 1994-1996 Søren Schmidt * All rights reserved. @@ -8,24 +8,22 @@ * 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 - * in this position and unchanged. + * 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. 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 - * 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. + * 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 From owner-svn-src-stable@freebsd.org Thu Mar 15 12:59:16 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 00FEDF4FE68; Thu, 15 Mar 2018 12:59:16 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A75287FAAA; Thu, 15 Mar 2018 12:59: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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A206F165A9; Thu, 15 Mar 2018 12:59: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 w2FCxFrG065799; Thu, 15 Mar 2018 12:59:15 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FCxF0H065798; Thu, 15 Mar 2018 12:59:15 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201803151259.w2FCxF0H065798@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 15 Mar 2018 12:59: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: r330998 - stable/11/share/man/man8 X-SVN-Group: stable-11 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/11/share/man/man8 X-SVN-Commit-Revision: 330998 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 12:59:16 -0000 Author: emaste Date: Thu Mar 15 12:59:15 2018 New Revision: 330998 URL: https://svnweb.freebsd.org/changeset/base/330998 Log: MFC r328395: Install uefi.8 also on arm64 Our standard boot method for arm64 is via UEFI, so install the man page that describes the boot process. Sponsored by: The FreeBSD Foundation Modified: stable/11/share/man/man8/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man8/Makefile ============================================================================== --- stable/11/share/man/man8/Makefile Thu Mar 15 12:56:22 2018 (r330997) +++ stable/11/share/man/man8/Makefile Thu Mar 15 12:59:15 2018 (r330998) @@ -35,7 +35,7 @@ MLINKS+=yp.8 NIS.8 \ yp.8 YP.8 .endif -.if ${MACHINE_CPUARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" _uefi.8= uefi.8 .endif From owner-svn-src-stable@freebsd.org Thu Mar 15 15:33:58 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D2EDFF5ADA4; Thu, 15 Mar 2018 15:33:58 +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 3AB7A86D74; Thu, 15 Mar 2018 15:33:57 +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 w2FFXmc0093663; Thu, 15 Mar 2018 08:33:48 -0700 (PDT) (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 w2FFXkS9093662; Thu, 15 Mar 2018 08:33:46 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201803151533.w2FFXkS9093662@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r330972 - stable/11/share/misc In-Reply-To: To: Andriy Gapon Date: Thu, 15 Mar 2018 08:33:46 -0700 (PDT) CC: Eitan Adler , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@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-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 15:33:59 -0000 > On 15/03/2018 10:30, Eitan Adler wrote: > > Author: eadler > > Date: Thu Mar 15 08:30:05 2018 > > New Revision: 330972 > > URL: https://svnweb.freebsd.org/changeset/base/330972 > > > > Log: > > MFC r303063,r311852,r311930,r317040,r320506,r321301,r325162,r326759,r329004,: > > I have never seen things like these MFC-ed before... > Should we be really doing them? Yes, imho. And the reasons may seem odd to sum, but here is my spin on this: It should not of been Eitan who did the MFC. Second, this simple document MFC is excellent training ground for a new commiter to learn how to do a MFC. Everyone should know how to do an MFC and it seems we have many (me included when I returned as my experiece was all with cvs, not svn) who do not know how to do this operation. If they mess up this simple text file it has a very low risk, and then they can learn how to do a revert and recommit! Maybe we should even add to the end of the commiters "these are the things you should do as a new committer" the merging of your info into to all supported/active releases. Which is a good opportunity for teaching how to do svn sparse checkouts as you really do not want to pull all of stable/10 out just to commit to 1 file. This file is an excellent opportunity for training, lets USE IT! Thanks, > > Add myself (stevek) as a src committer and mentor (sjg) to committers-src.dot > > > > Approved by: sjg (mentor) ... -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-stable@freebsd.org Thu Mar 15 15:40:08 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2DBC2F5B400; Thu, 15 Mar 2018 15:40:08 +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 515B3870AD; Thu, 15 Mar 2018 15:40:07 +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 w2FFe5ZL093684; Thu, 15 Mar 2018 08:40:05 -0700 (PDT) (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 w2FFe5tA093683; Thu, 15 Mar 2018 08:40:05 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201803151540.w2FFe5tA093683@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r330972 - stable/11/share/misc In-Reply-To: To: Eitan Adler Date: Thu, 15 Mar 2018 08:40:05 -0700 (PDT) CC: Andriy Gapon , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@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-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 15:40:08 -0000 > On 15 March 2018 at 01:40, Andriy Gapon wrote: > > On 15/03/2018 10:30, Eitan Adler wrote: > >> Author: eadler > >> Date: Thu Mar 15 08:30:05 2018 > >> New Revision: 330972 > >> URL: https://svnweb.freebsd.org/changeset/base/330972 > >> > >> Log: > >> MFC r303063,r311852,r311930,r317040,r320506,r321301,r325162,r326759,r329004,: > > > > I have never seen things like these MFC-ed before... > > Should we be really doing them? > > I don't see any reason not to. I don't expect people to do them, > though it might be interesting to add it as a teaching tool. I would very much like to see this. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-stable@freebsd.org Thu Mar 15 15:46:20 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 71DAFF5BD10 for ; Thu, 15 Mar 2018 15:46:20 +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 E82DA876B3 for ; Thu, 15 Mar 2018 15:46:19 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-User: de39461f-2867-11e8-b951-f99fef315fd9 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 67.177.211.60 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [67.177.211.60]) by outbound2.ore.mailhop.org (Halon) with ESMTPSA id de39461f-2867-11e8-b951-f99fef315fd9; Thu, 15 Mar 2018 15:45:21 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id w2FFkF4L025941; Thu, 15 Mar 2018 09:46:15 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1521128775.99081.34.camel@freebsd.org> Subject: Re: svn commit: r330972 - stable/11/share/misc From: Ian Lepore To: rgrimes@freebsd.org, Andriy Gapon Cc: Eitan Adler , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Date: Thu, 15 Mar 2018 09:46:15 -0600 In-Reply-To: <201803151533.w2FFXkS9093662@pdx.rh.CN85.dnsmgr.net> References: <201803151533.w2FFXkS9093662@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-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 15:46:20 -0000 On Thu, 2018-03-15 at 08:33 -0700, Rodney W. Grimes wrote: > > > > On 15/03/2018 10:30, Eitan Adler wrote: > > > > > > Author: eadler > > > Date: Thu Mar 15 08:30:05 2018 > > > New Revision: 330972 > > > URL: https://svnweb.freebsd.org/changeset/base/330972 > > > > > > Log: > > >   MFC r303063,r311852,r311930,r317040,r320506,r321301,r325162,r326759,r329004,: > > I have never seen things like these MFC-ed before... > > Should we be really doing them? > Yes, imho.  And the reasons may seem odd to sum, but here is my spin on this: > > It should not of been Eitan who did the MFC. > > Second, this simple document MFC is excellent training ground for a new > commiter to learn how to do a MFC.  Everyone should know how to do an MFC > and it seems we have many (me included when I returned as my experiece was > all with cvs, not svn) who do not know how to do this operation. > > If they mess up this simple text file it has a very low risk, and then > they can learn how to do a revert and recommit! > > Maybe we should even add to the end of the commiters "these are the > things you should do as a new committer" the merging of your info > into to all supported/active releases.  Which is a good opportunity > for teaching how to do svn sparse checkouts as you really do not > want to pull all of stable/10 out just to commit to 1 file. > > This file is an excellent opportunity for training, lets USE IT! > > Thanks, I agree completely with all of this. It bothers me how many committers have the attitude that handling MFCs is not part of being a committer. While I stop short of any kind of inflexible rule requiring all committers to attend to their own MFCs, anything we can do to encourage it and make it part of the culture is a good thing. -- Ian From owner-svn-src-stable@freebsd.org Thu Mar 15 15:52:24 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8A866F5C514; Thu, 15 Mar 2018 15:52:24 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: from mail-lf0-x242.google.com (mail-lf0-x242.google.com [IPv6:2a00:1450:4010:c07::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 F040287E12; Thu, 15 Mar 2018 15:52:23 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: by mail-lf0-x242.google.com with SMTP id w16-v6so10871811lfc.13; Thu, 15 Mar 2018 08:52:23 -0700 (PDT) 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=hZMPXlrF/l2Xn0Kw/3MKMmrbhZI9MJ8EkTqYJIaM7l4=; b=LjDWiaPx8+DQk242XiK95Xt8gwTn0+uYnMKskaBq5ZCqJABO+PocRLp3n9mmY+T4+T VJjbEnOBaR33uLuhimOkEOLaUg01DTwymFx4TG5LadY/ghgYdkNtLc5yzIMaGlt2AlTP 0cfe4atjTxvHMx7I05V+adQQ7ulCaXy5QYZ8HZhzFVavavGa7n4eMpgQna8fqOzONVhl 7g724VKccL1Hgijr3JhZ3rtueDK8OzTpFqlfZxHIxlK1jqjEBMlGOKMiFrIAwBiyVyI2 watUyYuOLELi/xtIrKEkrl1x5Fh630XtPfpDkIWsze4wlz3r2C17zM5Sss94/ejCOxFC FkPw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alumni-cwru-edu.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=hZMPXlrF/l2Xn0Kw/3MKMmrbhZI9MJ8EkTqYJIaM7l4=; b=HaLsoDBWJEgC05ug3sLKLg+C1bQgZFfWtPACXHuuDlIsAR3p+sikCsoA8eZ8naDCOH ta/QmjYIhe0goInkovgyGp2HRxtRz3ZOL4DNNOjP8GE4DyYugQqJPs7iKAqmmh9g1Qeb ux2MnGkKRiA7UDsRBXnPiZ9RsmGWB/ClttROEqv4ACg+fymbpli/JAvW/PHQvn3Kq+BJ y+cK2te3LSgNFO0iB9LNL+a8HnvyCiDI8xKOVXn+XpEMvvXYYMdoKTzEFSQNxWSgQAte 4BPNBXtRhOAz1rAbPXzlLlZ57Ns3n5l63koVfsQqU+ZfV2QkMZohriY3YHM1R6EBi8zx ZTZA== 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=hZMPXlrF/l2Xn0Kw/3MKMmrbhZI9MJ8EkTqYJIaM7l4=; b=SoIJXLtxPhFQnD7Go0hnygvHTRdkZR3Y4e1q8b0DFw9jp+lnLAQTswdsM3/OJ53tIL yZOJt4M7PLObN+noc3d2FU+Z0zuJ06/K/96lV0EyIX8PIctmQVfj9yL+XKK0JNIKKM2+ UxHptzkht3DBmN5y6wfYoGBqYYlIZZbtR1rhkGyA2poNhDMagl1/j4Ufy3WL8EvkQlsZ 0bD+JsJLqTcnE5JXvimq3lSLJEwbE51i/vzlZLdwzeE/6J2kHlz+eNG1FRm2Fwh+gHYy pnwaLieD2yGj/1WRrkxyoeup75bOBBsGxw95j9Ui28AfWRHweee/kScaW2dinO2sJqEa bA/g== X-Gm-Message-State: AElRT7FvdkOMuFAH9oLWSSU6ZrGOejCPdZllGt4q1ds1QaNLSQSyXigu LMv5njm+qjZH60b4SbXm2CKtnDG1qYx0uPyb9iPkwA== X-Google-Smtp-Source: AG47ELsBQtzlRqbiMJd2Og23GlaOFa9OCmhT2vUW+GQ5tX2L0A63FST7EMjMZxZSH+7Cv9pcQQM5zHgNbmuJ+tEzo6E= X-Received: by 2002:a19:114f:: with SMTP id g76-v6mr7043553lfi.0.1521129142118; Thu, 15 Mar 2018 08:52:22 -0700 (PDT) MIME-Version: 1.0 Sender: chmeeedalf@gmail.com Received: by 10.46.85.26 with HTTP; Thu, 15 Mar 2018 08:52:21 -0700 (PDT) In-Reply-To: <1521128775.99081.34.camel@freebsd.org> References: <201803151533.w2FFXkS9093662@pdx.rh.CN85.dnsmgr.net> <1521128775.99081.34.camel@freebsd.org> From: Justin Hibbits Date: Thu, 15 Mar 2018 10:52:21 -0500 X-Google-Sender-Auth: sK99jXz1sW4s2QeQxn-h5H_BOCo Message-ID: Subject: Re: svn commit: r330972 - stable/11/share/misc To: Ian Lepore Cc: rgrimes@freebsd.org, Andriy Gapon , Eitan Adler , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 15:52:24 -0000 On Thu, Mar 15, 2018 at 10:46 AM, Ian Lepore wrote: > I agree completely with all of this. It bothers me how many committers > have the attitude that handling MFCs is not part of being a committer. Never attribute to arrogance that which can adequately be explained by sheer laziness ;) - Justin (guilty of marking changes as MFC after, and ignoring them for far too long) From owner-svn-src-stable@freebsd.org Thu Mar 15 16:02:24 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1DC50F5D028 for ; Thu, 15 Mar 2018 16:02:24 +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 42A12686B6 for ; Thu, 15 Mar 2018 16:02:22 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-User: 2865a7b5-286a-11e8-bb8e-b35b57339d60 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 67.177.211.60 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [67.177.211.60]) by outbound1.ore.mailhop.org (Halon) with ESMTPSA id 2865a7b5-286a-11e8-bb8e-b35b57339d60; Thu, 15 Mar 2018 16:01:45 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id w2FG2Fce026008; Thu, 15 Mar 2018 10:02:15 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1521129735.99081.39.camel@freebsd.org> Subject: Re: svn commit: r330972 - stable/11/share/misc From: Ian Lepore To: Justin Hibbits Cc: rgrimes@freebsd.org, Andriy Gapon , Eitan Adler , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Date: Thu, 15 Mar 2018 10:02:15 -0600 In-Reply-To: References: <201803151533.w2FFXkS9093662@pdx.rh.CN85.dnsmgr.net> <1521128775.99081.34.camel@freebsd.org> 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-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 16:02:24 -0000 On Thu, 2018-03-15 at 10:52 -0500, Justin Hibbits wrote: > On Thu, Mar 15, 2018 at 10:46 AM, Ian Lepore wrote: > > > > I agree completely with all of this.  It bothers me how many > > committers > > have the attitude that handling MFCs is not part of being a > > committer. > Never attribute to arrogance that which can adequately be explained > by > sheer laziness ;) > > - Justin (guilty of marking changes as MFC after, and ignoring them > for far too long) > Laziness and procrastination I understand -- I own a lovely glass house in that neighborhood.  I tend to put off MFCs for way too long then every few months have to spend a whole weekend catching up. -- Ian From owner-svn-src-stable@freebsd.org Thu Mar 15 16:14:58 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 76CBAF5DF01; Thu, 15 Mar 2018 16:14:58 +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 C523569054; Thu, 15 Mar 2018 16:14:57 +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 w2FGEtg2093806; Thu, 15 Mar 2018 09:14:55 -0700 (PDT) (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 w2FGEttu093805; Thu, 15 Mar 2018 09:14:55 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201803151614.w2FGEttu093805@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r330972 - stable/11/share/misc In-Reply-To: <1521129735.99081.39.camel@freebsd.org> To: Ian Lepore Date: Thu, 15 Mar 2018 09:14:55 -0700 (PDT) CC: Justin Hibbits , rgrimes@freebsd.org, Andriy Gapon , Eitan Adler , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@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-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 16:14:58 -0000 > On Thu, 2018-03-15 at 10:52 -0500, Justin Hibbits wrote: > > On Thu, Mar 15, 2018 at 10:46 AM, Ian Lepore wrote: > > > > > > I agree completely with all of this.??It bothers me how many > > > committers > > > have the attitude that handling MFCs is not part of being a > > > committer. > > Never attribute to arrogance that which can adequately be explained > > by > > sheer laziness ;) > > > > - Justin (guilty of marking changes as MFC after, and ignoring them > > for far too long) > > > > Laziness and procrastination I understand -- I own a lovely glass house > in that neighborhood. ?I tend to put off MFCs for way too long then > every few months have to spend a whole weekend catching up. MFC: 1 week (by pool|self) #defaults to self if missing There is already a very nice tracking tool for outstanding MFC's, if we added a bit of smarts in its parser, and created a pool of MFC commiters (Eitan seems to have started one :-)) those who do not want to do there own MFC work could pass the hat. There is the issue that if sizeof(pool) gets to small things shall surely fall off the end. Perhaps at 2 x the timeout on the MFC send a reminder back to the orignal commiter stating the MFC has not happened and is now at 2x timeout? I am guessing, but not certain, eadler is working off a list from svn mergeinfo --show-revs eligible, having that list updated/annoted with "Do note merge: reason" would help the @pool above, and also help with when things are marked MFC, but found later they should not be. Also, I know it has pitfalls and mistakes are gona happen, but I feel a MFC: {never,breaks abi,ugly hack} marking would also help the project with some of this. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-stable@freebsd.org Thu Mar 15 16:20:31 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 34613F5E575 for ; Thu, 15 Mar 2018 16:20:31 +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 AFF0169634 for ; Thu, 15 Mar 2018 16:20:30 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-User: b3619877-286c-11e8-bb8e-b35b57339d60 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 67.177.211.60 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [67.177.211.60]) by outbound1.ore.mailhop.org (Halon) with ESMTPSA id b3619877-286c-11e8-bb8e-b35b57339d60; Thu, 15 Mar 2018 16:19:57 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id w2FGKRGP026047; Thu, 15 Mar 2018 10:20:27 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1521130827.99081.43.camel@freebsd.org> Subject: Re: svn commit: r330972 - stable/11/share/misc From: Ian Lepore To: rgrimes@freebsd.org Cc: Justin Hibbits , Andriy Gapon , Eitan Adler , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Date: Thu, 15 Mar 2018 10:20:27 -0600 In-Reply-To: <201803151614.w2FGEttu093805@pdx.rh.CN85.dnsmgr.net> References: <201803151614.w2FGEttu093805@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-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 16:20:31 -0000 On Thu, 2018-03-15 at 09:14 -0700, Rodney W. Grimes wrote: > > > > On Thu, 2018-03-15 at 10:52 -0500, Justin Hibbits wrote: > > > > > > On Thu, Mar 15, 2018 at 10:46 AM, Ian Lepore > > > wrote: > > > > > > > > > > > > I agree completely with all of this.??It bothers me how many > > > > committers > > > > have the attitude that handling MFCs is not part of being a > > > > committer. > > > Never attribute to arrogance that which can adequately be > > > explained > > > by > > > sheer laziness ;) > > > > > > - Justin (guilty of marking changes as MFC after, and ignoring > > > them > > > for far too long) > > > > > Laziness and procrastination I understand -- I own a lovely glass > > house > > in that neighborhood. ?I tend to put off MFCs for way too long then > > every few months have to spend a whole weekend catching up. > MFC: 1 week (by pool|self) #defaults to self if missing > > There is already a very nice tracking tool for outstanding MFC's, > if we added a bit of smarts in its parser, and created a pool of > MFC commiters (Eitan seems to have started one :-)) those who > do not want to do there own MFC work could pass the hat. If you're talking about the MFC after: field in commits, I don't use it. I have about zero tolerance for being nagged by anybody about anything, and that goes double for robots nagging me with spam mail. The MFC tool that works well for me is gonzo's MFCTracker site [*] that doesn't require extra markup in the commit messages. [*] https://mfc.kernelnomicon.org/6/ -- Ian From owner-svn-src-stable@freebsd.org Thu Mar 15 16:31:48 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4C604F5F249 for ; Thu, 15 Mar 2018 16:31:48 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::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 B04026A12E for ; Thu, 15 Mar 2018 16:31:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-wm0-x244.google.com with SMTP id q83so11688296wme.5 for ; Thu, 15 Mar 2018 09:31:47 -0700 (PDT) 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=Mx1qOvA1P73kXtoOC5mQE+whGK/Ju2xANEJDSIOi1bs=; b=D4F8ZWvJBTzyUVxK6HTSF1Y2+DEhnFH52o1XBZWqd+u2DlnBXJsKWD7PDaOsWvwhK2 4wu8e42HfybrcLcogq2tsAKn3WfLMM4CGV/OG0L0buQbdd9EXZMNh1u77m/wkmq9/qUz ce1Z1bw7TLJ+qEjWKXmG2vluByQsytJ0YA4D1W5bOmfrf8XUTBaxLoW95+tu8eybiS5b +KaDKPcBZRCYLbrMGG4alBMUqTfDc8iY/aZtqnqJzlDufG9DEAy/ggppQIeyMAMYzNGs 60cYwEbHtjFdA/qXvuSir1a9h1JBEQpoTh/XZBFroLZ9bYI13L+BRZlA5PsX25aSEHzn SvVQ== 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=Mx1qOvA1P73kXtoOC5mQE+whGK/Ju2xANEJDSIOi1bs=; b=hlChGiRQtWdxP4mdASng0z4cBGEzd1xJPvoGICNxj3vstM5noKQM+1KeN4FbUNAQ1U qitadV9h2+SDjoKWZ4tdIuXh3bwnyTQZ1TD7STjNgImu5t3H+fCfWN77TfGWvHE2ArgG uEsodVhpXfoKfkSD5lcM25jnn5aKU5JhEBaG8PKjkTrIILFe3yiGItvyN3nkLARUz+lh N5olEMACmpdMpoMu4GAf3ci1ZVxlz/3yo4dsHGA3BR4rq10zhiMk30nlepBq3CLfMeTK QQCx8MmVnBLxPn4I4p+6JL/cmjvXi2uTjrNP2eLLlg2PBFygYEsHVddXK35V2Ni48CUR tQLg== X-Gm-Message-State: AElRT7HrbG/yrS/8PXXMXTsRnYqEgNGe5+KRVcZJ3kEdiXJOvwtMO5EW zTSjezXn7XJclXSzlppz3J4mnYbcAKLsO8tmQBef7g== X-Google-Smtp-Source: AG47ELtS6rIWpwiEjmeOkWzSLFZ3kWeY8mDCjCHuAq5jAgJUrg2hEL5KZLmGCyyQV7TTpNtFd7HaSJc3ztPhQYwSVmU= X-Received: by 10.80.139.70 with SMTP id l64mr9760403edl.149.1521131506609; Thu, 15 Mar 2018 09:31:46 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.80.147.165 with HTTP; Thu, 15 Mar 2018 09:31:46 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:1052:acc7:f9de:2b6d] In-Reply-To: <1521130827.99081.43.camel@freebsd.org> References: <201803151614.w2FGEttu093805@pdx.rh.CN85.dnsmgr.net> <1521130827.99081.43.camel@freebsd.org> From: Warner Losh Date: Thu, 15 Mar 2018 10:31:46 -0600 X-Google-Sender-Auth: sfLzaG66ULsH8kbRDIzJBZcxLCk Message-ID: Subject: Re: svn commit: r330972 - stable/11/share/misc To: Ian Lepore Cc: "Rodney W. Grimes" , Justin Hibbits , Andriy Gapon , Eitan Adler , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 16:31:48 -0000 On Thu, Mar 15, 2018 at 10:20 AM, Ian Lepore wrote: > On Thu, 2018-03-15 at 09:14 -0700, Rodney W. Grimes wrote: > > > > > > On Thu, 2018-03-15 at 10:52 -0500, Justin Hibbits wrote: > > > > > > > > On Thu, Mar 15, 2018 at 10:46 AM, Ian Lepore > > > > wrote: > > > > > > > > > > > > > > > I agree completely with all of this.??It bothers me how many > > > > > committers > > > > > have the attitude that handling MFCs is not part of being a > > > > > committer. > > > > Never attribute to arrogance that which can adequately be > > > > explained > > > > by > > > > sheer laziness ;) > > > > > > > > - Justin (guilty of marking changes as MFC after, and ignoring > > > > them > > > > for far too long) > > > > > > > Laziness and procrastination I understand -- I own a lovely glass > > > house > > > in that neighborhood. ?I tend to put off MFCs for way too long then > > > every few months have to spend a whole weekend catching up. > > MFC: 1 week (by pool|self) #defaults to self if missing > > > > There is already a very nice tracking tool for outstanding MFC's, > > if we added a bit of smarts in its parser, and created a pool of > > MFC commiters (Eitan seems to have started one :-)) those who > > do not want to do there own MFC work could pass the hat. > > If you're talking about the MFC after: field in commits, I don't use > it. I have about zero tolerance for being nagged by anybody about > anything, and that goes double for robots nagging me with spam mail. > > The MFC tool that works well for me is gonzo's MFCTracker site [*] that > doesn't require extra markup in the commit messages. > I also have a MFC tool for git, but it's n From owner-svn-src-stable@freebsd.org Thu Mar 15 16:36:20 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4CE79F5F8D3 for ; Thu, 15 Mar 2018 16:36:20 +0000 (UTC) (envelope-from wlosh@bsdimp.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 547DE6A598 for ; Thu, 15 Mar 2018 16:36:19 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x22c.google.com with SMTP id z7-v6so7473832iti.1 for ; Thu, 15 Mar 2018 09:36:19 -0700 (PDT) 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=6k5fTZmJF1w4/Xnp3q5Yv57/T6w9kGFUBZqAwEfcNkI=; b=1QSWjh/F54XEjES5evUReNp7wbkT1g97mhpKAJLJ2ys/rvXVxoXP1RmVCHvURjkvwM St9uO8kM9n8jiryfCS7r7yHvTOo5RqCbAz8VL+2t8c8yk/ytDQ+iDufw5uWTFLIESHjW nB8oQSrgiufZh3E8ofahXE+UwjBIj7BkDKCXiAIRVaunyO2d6sfSiJVDgpLv3dsq3L8T noQWOKnW0650DCx0lgqsgAbjb3NByvex4Rc4tRlQqOYbWPSLBqRJNdtAmcGaprnUWod/ gsI9SCbAeX2KNxrCkik9HefxzfOYHxHTXNg0afYqbDTGGZeoElrJxKy/+5cScVWDGiG8 abaw== 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=6k5fTZmJF1w4/Xnp3q5Yv57/T6w9kGFUBZqAwEfcNkI=; b=YRmD5G2im2JxndnXNDQD7ZDtwJLgRK8b/Iq6Hdo+Kn3qCmY3KqAdchgzsLPxRG1f8b PB8oiBIVuqZkNCPJko3+HEOGdBA111jVLqSz/9GHoXnCpqpGFrGuRnJnZ5zULvpdx7Tn tjw4CouBpk7i53HLXfIK/Njoiblmdh13QjHlxL7RVPlrJXMybSX1XdWuUsDvtrUzM0TD 56qas05EBFeWXqGTJHj4kn77d1AAPNRUEH8Pxw4+GCij204g7rkJdH687uOS358O6uZ1 kwTafr1QISR+HdY0l/Zhn5avDc2Od02rPDeSoZKglOWsx1tEx7310Gg173Yfl5dAxlE/ kp5Q== X-Gm-Message-State: AElRT7H5RlwVhJziW9Ez1uzHxAqCb2vN9OeHg6BWuZsndIik/W6h57DM qV3xqvPuCP73NhXETiuojxpIoBok1GSPrTSKS1K8ZQ== X-Google-Smtp-Source: AG47ELuLeBE9ab7eCsnrxhrLVWI6IzanLSeBhJVh70/PTtkvRIg9B62XJm8ztdSf7mQ0KlKfUoP9LoKZQS2tC06vkWU= X-Received: by 2002:a24:6f04:: with SMTP id x4-v6mr960371itb.51.1521131778492; Thu, 15 Mar 2018 09:36:18 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.203.196 with HTTP; Thu, 15 Mar 2018 09:36:17 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:1052:acc7:f9de:2b6d] In-Reply-To: References: <201803151614.w2FGEttu093805@pdx.rh.CN85.dnsmgr.net> <1521130827.99081.43.camel@freebsd.org> From: Warner Losh Date: Thu, 15 Mar 2018 10:36:17 -0600 X-Google-Sender-Auth: 0WrTGQFRDFlpuiIYbENMKcIMmF8 Message-ID: Subject: Re: svn commit: r330972 - stable/11/share/misc To: Ian Lepore Cc: "Rodney W. Grimes" , Justin Hibbits , Andriy Gapon , Eitan Adler , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 16:36:20 -0000 On Thu, Mar 15, 2018 at 10:31 AM, Warner Losh wrote: > > > On Thu, Mar 15, 2018 at 10:20 AM, Ian Lepore wrote: > >> On Thu, 2018-03-15 at 09:14 -0700, Rodney W. Grimes wrote: >> > > >> > > On Thu, 2018-03-15 at 10:52 -0500, Justin Hibbits wrote: >> > > > >> > > > On Thu, Mar 15, 2018 at 10:46 AM, Ian Lepore >> > > > wrote: >> > > > > >> > > > > >> > > > > I agree completely with all of this.??It bothers me how many >> > > > > committers >> > > > > have the attitude that handling MFCs is not part of being a >> > > > > committer. >> > > > Never attribute to arrogance that which can adequately be >> > > > explained >> > > > by >> > > > sheer laziness ;) >> > > > >> > > > - Justin (guilty of marking changes as MFC after, and ignoring >> > > > them >> > > > for far too long) >> > > > >> > > Laziness and procrastination I understand -- I own a lovely glass >> > > house >> > > in that neighborhood. ?I tend to put off MFCs for way too long then >> > > every few months have to spend a whole weekend catching up. >> > MFC: 1 week (by pool|self) #defaults to self if missing >> > >> > There is already a very nice tracking tool for outstanding MFC's, >> > if we added a bit of smarts in its parser, and created a pool of >> > MFC commiters (Eitan seems to have started one :-)) those who >> > do not want to do there own MFC work could pass the hat. >> >> If you're talking about the MFC after: field in commits, I don't use >> it. I have about zero tolerance for being nagged by anybody about >> anything, and that goes double for robots nagging me with spam mail. >> >> The MFC tool that works well for me is gonzo's MFCTracker site [*] that >> doesn't require extra markup in the commit messages. >> > > I also have a MFC tool for git, but it's n > [[ stupid track pad and too easy button pushes... ]] but it's not ready for prime time. It's useful if you have a list of things you want to MFC for playing them onto the stable branch so you can test before committing to svn stable. It shows the big issues with moving to git as the source of truth, though. We have way too much traffic in the repo to have git cherry to produce any kind of reasonable output (too many changes, can't restrict to a subset of the tree, no way to check prior commits to files affected, etc), and the git cherry-pick command relies a bit too much on the merge magic, so it doesn't record merges (there is no merge-info in git). However, I could dust off the tool and fix up the rough edges if there's any interest at all. Kyle Evans used it to MFC my crazy src/stand stuff... Warner From owner-svn-src-stable@freebsd.org Thu Mar 15 16:54:42 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6EAB0F60E7D; Thu, 15 Mar 2018 16:54:42 +0000 (UTC) (envelope-from agapon@gmail.com) Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) (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 E50D56B4C6; Thu, 15 Mar 2018 16:54:41 +0000 (UTC) (envelope-from agapon@gmail.com) Received: by mail-lf0-f68.google.com with SMTP id t132-v6so11229331lfe.2; Thu, 15 Mar 2018 09:54:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=XEzKTrnYWBUPUgdvJQajh/uttlxWRKGHJbVZKLt2hRA=; b=aBG8418fjKTewKjs6ewQpfKatRASIM+CFqSfqdlYHeCY6pDrq7fIuTk1ewn7XXELqX O2HwCc8WzdmjFS3zqelx4jT9MKGAUKqRaNhT55cVZD7mLfaE0qVdwhxIljiaEni/pvR1 4MCG+QDT4dTKo67iLXImIkAQiCiX8PWcJh6k/+0/kzWLzxWOciEhacE1L/JFzG4wROVt msTOewBHnbIW/tx3ADUNNxceAlg9tj2kzgSkt5UbtANeyfVmGamtkQAZqhmTSWjBKp8o 7EJMzEdv7llFdlp8T+NSk0aSfy2yf8w2nNu3ph2QaDh2Ow4Evi7w/n+eKBO8vJnUBgxR C47A== X-Gm-Message-State: AElRT7FFfUdJXERnt4pEGUoqmUyPRyhszDr28xNOtxQmFwjFFiycsT3B W9g+Ezx3JqKA6lcWUXo3o3fpK2jGrCc= X-Google-Smtp-Source: AG47ELsi/lgCi4FniqLqI6eFEIPYE9pCsK3tWzadzWR4MFy59xY4D4iVEOLuAnApxP4Zk4DVoycWzw== X-Received: by 2002:a19:57c1:: with SMTP id l184-v6mr6597099lfb.2.1521131326601; Thu, 15 Mar 2018 09:28:46 -0700 (PDT) Received: from [192.168.0.88] (east.meadow.volia.net. [93.72.151.96]) by smtp.googlemail.com with ESMTPSA id g23sm1199504ljg.4.2018.03.15.09.28.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Mar 2018 09:28:45 -0700 (PDT) Subject: Re: svn commit: r330972 - stable/11/share/misc To: Ian Lepore , rgrimes@freebsd.org Cc: Justin Hibbits , Eitan Adler , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org References: <201803151614.w2FGEttu093805@pdx.rh.CN85.dnsmgr.net> <1521130827.99081.43.camel@freebsd.org> From: Andriy Gapon Message-ID: Date: Thu, 15 Mar 2018 18:28:44 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <1521130827.99081.43.camel@freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 16:54:42 -0000 On 15/03/2018 18:20, Ian Lepore wrote: > The MFC tool that works well for me is gonzo's MFCTracker site [*] that > doesn't require extra markup in the commit messages. > > [*] https://mfc.kernelnomicon.org/6/ But it's much more convenient to use with the "markup". Try it :-) P.S. > I have about zero tolerance for being nagged by anybody about anything That's a true spirit! P.P.S. I didn't intend this to be a thread about all things MFC. My comment was only about commiters*.dot files. -- Andriy Gapon From owner-svn-src-stable@freebsd.org Thu Mar 15 17:07:17 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2133BF61B9D for ; Thu, 15 Mar 2018 17:07:17 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) 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 AB8806BC98 for ; Thu, 15 Mar 2018 17:07:16 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-yw0-x234.google.com with SMTP id v68so2518608ywg.13 for ; Thu, 15 Mar 2018 10:07:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=l7fxNEd3HOQFnX5HCyI8s04AFz9z2LOsq8OoyAZK3zo=; b=W/wbAJxYpsHo0ANYRTEVOGMiSDZ1ivjaJHhAgEMxRW6C7luHdsvtp7jxWxiKPdP8sh K/XUsCrouxpNfXleFXvxl/BmHjdqKtbvMUJIkSHvNxPkkT/QKuarR5Xy6Ab/sHBeM13g Z+usECEuLmQAEvO8U9WhezQ/mOP1JSzdNCYCEk8aX6DhG7AskGViEvsicauivkKtF9oO hpBDsikXAuMi8KzeXxr8GIaAA2JabepHmrgnkSzfY5/diV2xS8bSHSN6NpmP1vQWokxC TOaeYpP8Q0HVDPjWAzRY4lP5KJrkkwamWtmk4qnJdjrInlfDBn71GE+l4jtV5bLSHbZn eOaA== 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=l7fxNEd3HOQFnX5HCyI8s04AFz9z2LOsq8OoyAZK3zo=; b=DFUak9+HmKDmbx1kI77zEiU3W2sKAwOWq1YuOltKmoyW/HoWsI++7afkxeY1+TTiUg noJYAw1SkLLsNexeq4JalfvdTtSnVqqpzemoQEcRFZasX7O1KmK/kx/WFW2bMRN6h8o5 GcQKStV1dIqPjVLDcPqRh6zlpDhqd/HHQRSgZzfL/yoklzmGldUIbrDD+m1ioYG+IjVr ONc2aGdes7gcAIv4DtbAkVZ/+1S3iccapZRDw+saHMLqodVoTjgLGLKn74MGE6VfvFDg 8qojJ6EFPt6jQUdikuaID9k3CL1UlItUE+ZAB5tj5WRoNJZ9z12B+JZXi5ElXEGVXjke tyIQ== X-Gm-Message-State: AElRT7FSiFe855ibTdH8o6Jl3GrP2Ia751rV3d3sfC07+udhf/bzdp9o 9kTyxKYboqdTDsEwC46paP/PWQ274ngHLggyVVJOyw== X-Google-Smtp-Source: AG47ELtpNx/O2x1Tu+U4gqw356LLeeO51rRt2KJYPZDhbD9rkdqvYIJWEpxwl3R2caY/h8b6k5FnKMfeurnmC3aC0v4= X-Received: by 2002:a25:5047:: with SMTP id e68-v6mr6284286ybb.165.1521133636160; Thu, 15 Mar 2018 10:07:16 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a25:3492:0:0:0:0:0 with HTTP; Thu, 15 Mar 2018 10:07:15 -0700 (PDT) In-Reply-To: References: <201803151614.w2FGEttu093805@pdx.rh.CN85.dnsmgr.net> <1521130827.99081.43.camel@freebsd.org> From: Oliver Pinter Date: Thu, 15 Mar 2018 18:07:15 +0100 Message-ID: Subject: Re: svn commit: r330972 - stable/11/share/misc To: Warner Losh Cc: Ian Lepore , src-committers , Eitan Adler , Justin Hibbits , "svn-src-stable@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-stable-11@freebsd.org" , Andriy Gapon , "Rodney W. Grimes" X-Mailman-Approved-At: Thu, 15 Mar 2018 17:25:33 +0000 Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 17:07:17 -0000 On Thursday, March 15, 2018, Warner Losh wrote: > On Thu, Mar 15, 2018 at 10:31 AM, Warner Losh wrote: > > > > > > > On Thu, Mar 15, 2018 at 10:20 AM, Ian Lepore wrote: > > > >> On Thu, 2018-03-15 at 09:14 -0700, Rodney W. Grimes wrote: > >> > > > >> > > On Thu, 2018-03-15 at 10:52 -0500, Justin Hibbits wrote: > >> > > > > >> > > > On Thu, Mar 15, 2018 at 10:46 AM, Ian Lepore > >> > > > wrote: > >> > > > > > >> > > > > > >> > > > > I agree completely with all of this.??It bothers me how many > >> > > > > committers > >> > > > > have the attitude that handling MFCs is not part of being a > >> > > > > committer. > >> > > > Never attribute to arrogance that which can adequately be > >> > > > explained > >> > > > by > >> > > > sheer laziness ;) > >> > > > > >> > > > - Justin (guilty of marking changes as MFC after, and ignoring > >> > > > them > >> > > > for far too long) > >> > > > > >> > > Laziness and procrastination I understand -- I own a lovely glass > >> > > house > >> > > in that neighborhood. ?I tend to put off MFCs for way too long then > >> > > every few months have to spend a whole weekend catching up. > >> > MFC: 1 week (by pool|self) #defaults to self if missing > >> > > >> > There is already a very nice tracking tool for outstanding MFC's, > >> > if we added a bit of smarts in its parser, and created a pool of > >> > MFC commiters (Eitan seems to have started one :-)) those who > >> > do not want to do there own MFC work could pass the hat. > >> > >> If you're talking about the MFC after: field in commits, I don't use > >> it. I have about zero tolerance for being nagged by anybody about > >> anything, and that goes double for robots nagging me with spam mail. > >> > >> The MFC tool that works well for me is gonzo's MFCTracker site [*] that > >> doesn't require extra markup in the commit messages. > >> > > > > I also have a MFC tool for git, but it's n > > > > [[ stupid track pad and too easy button pushes... ]] > > but it's not ready for prime time. It's useful if you have a list of things > you want to MFC for playing them onto the stable branch so you can test > before committing to svn stable. It shows the big issues with moving to git > as the source of truth, though. We have way too much traffic in the repo to > have git cherry to produce any kind of reasonable output (too many changes, > can't restrict to a subset of the tree, no way to check prior commits to > files affected, etc), and the git cherry-pick command relies a bit too much > on the merge magic, so it doesn't record merges (there is no merge-info in > git). > > However, I could dust off the tool and fix up the rough edges if there's > any interest at all. Kyle Evans used it to MFC my crazy src/stand stuff... > > I use this script to merge / cherry-pick changes from master: https://github.com/opntr/opBSD-ng-tools/blob/master/git/opBSD_mfc.sh > Warner > _______________________________________________ > 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" > From owner-svn-src-stable@freebsd.org Thu Mar 15 17:25:50 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D953F317 for ; Thu, 15 Mar 2018 17:25:49 +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 F16FD6CFD2 for ; Thu, 15 Mar 2018 17:25:48 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x22d.google.com with SMTP id e7so9503743ioj.1 for ; Thu, 15 Mar 2018 10:25:48 -0700 (PDT) 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=ezllr7eDiRUizNMTgjavroMASuo7yOtes/hxla0Sh7c=; b=dyTDfeSZ8uPTxRI//GN3qDij5aN1diUbXdmehOGIYl+39zLY8U7pWnDbT3nBpXOFMj kPB/uTyJun3hGxHx/t2mo2VUUIMeqgtg8jJasvircRa+ZN7IF94r7bbpCwk/3mnGextb yayndZRtEtQ4rpu2kUnnQcL/5WxJz7m1PioOtfumvS+ZKOhRtT0oDX5qx9P4flD3vUO3 jfZM2ykwkr7DT6+E6UaW1F6uG/wUc9seAwj5YkhLetyjQmraFeXr/eK+Y1EwYzTX+Tsr T8iMGRVAC+hDC1GbJ1TOiTNKorCEJAMTQFx1dhrI7LvxJz6mFJXMjKFeC6dmF27non2h p6xQ== 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=ezllr7eDiRUizNMTgjavroMASuo7yOtes/hxla0Sh7c=; b=UxoSHRIn3bQqETY9oafmoZa/e6F8i10+SDypRstS0xlmWfoDw6joWYwn0TzdEceKyB NiT0jQIBE/6UHGNshWrELKl3Q57Wc1T4ZQrywhguYOAJ4hnFmX70fHwOPP33pZgFGiFr SX/AzlPxSpXCtCMKagYQA3/cyAO+AkyRpnI0sj/O/IXmiDbPBr11DaI5J/xXUIlH3zTj oYvIFW2Uho205d8Jj7cGBo40LcZCjFikCs+mXNnrQwLk/ivgkFDvuIQj7H/CnS98kSHc IkQOABCrNmUDdjeGJOSqWh79tzcIyhmjSjX9PNhwV/bPfRE8c0K5uyZ3Mcg3k0NRIBfU jXXQ== X-Gm-Message-State: AElRT7F1LLByOyxMh7PN7QSRYdkFjnmILwYxKRlr7nBWKfHMQ0epSS2U m78vpt3AVWdnxbhkCAX+Qc0uoqvIng67VJOnqTC4HA== X-Google-Smtp-Source: AG47ELsyopP9E/nCFlhXl7ZrZg/77kUCQSom+4372/3BabOiJkmRZz7fa8ynmcZQt65x2sOxHmVIQDM5A4i7upnIoyk= X-Received: by 10.107.142.79 with SMTP id q76mr9729167iod.299.1521134748195; Thu, 15 Mar 2018 10:25:48 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.203.196 with HTTP; Thu, 15 Mar 2018 10:25:47 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:1052:acc7:f9de:2b6d] In-Reply-To: <201803151723.w2FHNJ5a094121@pdx.rh.CN85.dnsmgr.net> References: <201803151723.w2FHNJ5a094121@pdx.rh.CN85.dnsmgr.net> From: Warner Losh Date: Thu, 15 Mar 2018 11:25:47 -0600 X-Google-Sender-Auth: 7rUPyhDgdhxV6UwbdoDE9FWSxD0 Message-ID: Subject: Re: svn commit: r330972 - stable/11/share/misc To: "Rodney W. Grimes" Cc: Ian Lepore , Justin Hibbits , Andriy Gapon , Eitan Adler , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 17:25:50 -0000 On Thu, Mar 15, 2018 at 11:23 AM, Rodney W. Grimes < freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > > On Thu, Mar 15, 2018 at 10:31 AM, Warner Losh wrote: > > > > > > > > > > > On Thu, Mar 15, 2018 at 10:20 AM, Ian Lepore wrote: > > > > > >> On Thu, 2018-03-15 at 09:14 -0700, Rodney W. Grimes wrote: > > >> > > > > >> > > On Thu, 2018-03-15 at 10:52 -0500, Justin Hibbits wrote: > > >> > > > > > >> > > > On Thu, Mar 15, 2018 at 10:46 AM, Ian Lepore > > >> > > > wrote: > > >> > > > > > > >> > > > > > > >> > > > > I agree completely with all of this.??It bothers me how many > > >> > > > > committers > > >> > > > > have the attitude that handling MFCs is not part of being a > > >> > > > > committer. > > >> > > > Never attribute to arrogance that which can adequately be > > >> > > > explained > > >> > > > by > > >> > > > sheer laziness ;) > > >> > > > > > >> > > > - Justin (guilty of marking changes as MFC after, and ignoring > > >> > > > them > > >> > > > for far too long) > > >> > > > > > >> > > Laziness and procrastination I understand -- I own a lovely glass > > >> > > house > > >> > > in that neighborhood. ?I tend to put off MFCs for way too long > then > > >> > > every few months have to spend a whole weekend catching up. > > >> > MFC: 1 week (by pool|self) #defaults to self if missing > > >> > > > >> > There is already a very nice tracking tool for outstanding MFC's, > > >> > if we added a bit of smarts in its parser, and created a pool of > > >> > MFC commiters (Eitan seems to have started one :-)) those who > > >> > do not want to do there own MFC work could pass the hat. > > >> > > >> If you're talking about the MFC after: field in commits, I don't use > > >> it. I have about zero tolerance for being nagged by anybody about > > >> anything, and that goes double for robots nagging me with spam mail. > > >> > > >> The MFC tool that works well for me is gonzo's MFCTracker site [*] > that > > >> doesn't require extra markup in the commit messages. > > >> > > > > > > I also have a MFC tool for git, but it's n > > > > > > > [[ stupid track pad and too easy button pushes... ]] > > I close my lid and lay a standard 104 keyboard on top, and a nice > mouse beside and just ignore the bad HID that is a laptop. > > > but it's not ready for prime time. It's useful if you have a list of > things > > you want to MFC for playing them onto the stable branch so you can test > > before committing to svn stable. It shows the big issues with moving to > git > > as the source of truth, though. We have way too much traffic in the repo > to > > have git cherry to produce any kind of reasonable output (too many > changes, > > can't restrict to a subset of the tree, no way to check prior commits to > > files affected, etc), and the git cherry-pick command relies a bit too > much > > on the merge magic, so it doesn't record merges (there is no merge-info > in > > git). > > > > However, I could dust off the tool and fix up the rough edges if there's > > any interest at all. Kyle Evans used it to MFC my crazy src/stand > stuff... > > This tool might be interesting for use when things get complicted > like the stand code, or I think there was also a huge churn in > Adrians wifi code that it may be useful for, but it sounds like > it might be overkill for 90% of our needs. > > I shall ask, do you think it would be possible to re-implement > this tool around svn? > No. That makes no sense. Sorry. The whole point of doing it in git was so you could throw away all the failed attempts and use git's commit curation tools (eg git rebase -i) to preen whatever you're going to eventually commit. At most, it might make sense to create a script that would do the MFC as a patch + git merge --record-only. Warner From owner-svn-src-stable@freebsd.org Thu Mar 15 17:36:28 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3AACF6025; Thu, 15 Mar 2018 17:36:28 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.9]) (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 6155D6D861; Thu, 15 Mar 2018 17:36:26 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with ESMTPA id wWnYeZK8QXziTwWnZei9HL; Thu, 15 Mar 2018 11:36:19 -0600 X-Authority-Analysis: v=2.3 cv=X6B81lbe c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=v2DPQv5-lfwA:10 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=bv4Z-FHaAAAA:8 a=qQeljrTBNnxzgZAFw7cA:9 a=xIPd13a_dRHXZBvS:21 a=jPbXoLXlZ7r4KP9S:21 a=wPNLvfGTeEIA:10 a=1V1iMJZxNW4oD5Zb:21 a=rFk3XwGbeTd1j9CN:21 a=WnoPvAod8PKmeGBM:21 a=_W_S_7VecoQA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=1OByGr4bXvbdRoVEmkj7:22 Received: from [25.168.250.70] (S0106d4ca6d8943b0.gv.shawcable.net [70.66.132.207]) by spqr.komquats.com (Postfix) with ESMTPSA id DDF046F7; Thu, 15 Mar 2018 10:35:58 -0700 (PDT) MIME-Version: 1.0 From: Cy Schubert Subject: RE: svn commit: r330972 - stable/11/share/misc Date: Thu, 15 Mar 2018 10:36:05 -0700 To: Ian Lepore , "rgrimes@freebsd.org" CC: Justin Hibbits , Andriy Gapon , Eitan Adler , src-committers , "svn-src-all@freebsd.org" , "svn-src-stable@freebsd.org" , "svn-src-stable-11@freebsd.org" Message-Id: <20180315173558.DDF046F7@spqr.komquats.com> X-CMAE-Envelope: MS4wfCRJRAIt+J9yCQaGtO9qqtXyvhNEC1oQZfQBIsYjtB3kf8grRN9Fx/LtW0rbVldEkPKc/reNkg6/D0ayRk0TgQkuNeFngDNkqCvT2cbpmw4n3Lic25I8 +c8DWy/YX0gAhzH7KqZRkQ+dHTdRTicyt5FfuXHVW/+V+mnmwj9i/i9nQskrkpp1VdjXKxyjhQ1WvIzy0QVXa9f6lWF2vB7tWm91bHsqZY+fIxUJiv8lMjGZ CBw08wt5QNAP0HzI5C2YEnbRld8wnV3fzh8yS1B28oIvkbjlzHUw05dnA2V5NbC6GkGEtq8cK0KdR7cxFVCIq78VlwTNVjZD0utLalsQG61vXL8G+vdeFSUa LsCPULSz22sGewwZSUd5PGW65as9LYUayfOqGUP+eV22c2IrK9hCNuInWmHH0CUl6QbGnrv3R65VrW4AnHFBuqZGhWfAtPg7oaeL6ZHCBQAjEla8sVmQAVVq igj5RERw8efbUkE9R1QUcueCUipfjMWmQiBOaQ== Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 17:36:28 -0000 I happen to like Max's MFC emails. To visit some website on occasion to che= ck is a PITA. I've been through this many times at $JOB. Rather than receiv= e notifications in one place, my inbox, having to visit multiple websites t= o check work queues is pointless. I prefer receiving an interrupt rather th= an having to poll. Polling is inefficient use of my time. --- Sent using a tiny phone keyboard. Apologies for any typos and autocorrect. Also, this old phone only supports top post. Apologies. Cy Schubert or The need of the many outweighs the greed of the few. --- -----Original Message----- From: Ian Lepore Sent: 15/03/2018 09:20 To: rgrimes@freebsd.org Cc: Justin Hibbits; Andriy Gapon; Eitan Adler; src-committers; svn-src-all@= freebsd.org; svn-src-stable@freebsd.org; svn-src-stable-11@freebsd.org Subject: Re: svn commit: r330972 - stable/11/share/misc On Thu, 2018-03-15 at 09:14 -0700, Rodney W. Grimes wrote: > >=20 > > On Thu, 2018-03-15 at 10:52 -0500, Justin Hibbits wrote: > > >=20 > > > On Thu, Mar 15, 2018 at 10:46 AM, Ian Lepore > > > wrote: > > > >=20 > > > >=20 > > > > I agree completely with all of this.??It bothers me how many > > > > committers > > > > have the attitude that handling MFCs is not part of being a > > > > committer. > > > Never attribute to arrogance that which can adequately be > > > explained > > > by > > > sheer laziness ;) > > >=20 > > > - Justin (guilty of marking changes as MFC after, and ignoring > > > them > > > for far too long) > > >=20 > > Laziness and procrastination I understand -- I own a lovely glass > > house > > in that neighborhood. ?I tend to put off MFCs for way too long then > > every few months have to spend a whole weekend catching up. > MFC: 1 week (by pool|self) #defaults to self if missing >=20 > There is already a very nice tracking tool for outstanding MFC's, > if we added a bit of smarts in its parser, and created a pool of > MFC commiters (Eitan seems to have started one :-)) those who > do not want to do there own MFC work could pass the hat. If you're talking about the MFC after: field in commits, I don't use it. I have about zero tolerance for being nagged by anybody about anything, and that goes double for robots nagging me with spam mail. The MFC tool that works well for me is gonzo's MFCTracker site [*] that doesn't require extra markup in the commit messages. [*]=A0https://mfc.kernelnomicon.org/6/ -- Ian From owner-svn-src-stable@freebsd.org Thu Mar 15 17:23:27 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 52C79F62FAB; Thu, 15 Mar 2018 17:23:27 +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 DBEAC6CD39; Thu, 15 Mar 2018 17:23:26 +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 w2FHNKIH094122; Thu, 15 Mar 2018 10:23:20 -0700 (PDT) (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 w2FHNJ5a094121; Thu, 15 Mar 2018 10:23:19 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201803151723.w2FHNJ5a094121@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r330972 - stable/11/share/misc In-Reply-To: To: Warner Losh Date: Thu, 15 Mar 2018 10:23:19 -0700 (PDT) CC: Ian Lepore , "Rodney W. Grimes" , Justin Hibbits , Andriy Gapon , Eitan Adler , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@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-Mailman-Approved-At: Thu, 15 Mar 2018 19:06:57 +0000 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 17:23:27 -0000 > On Thu, Mar 15, 2018 at 10:31 AM, Warner Losh wrote: > > > > > > > On Thu, Mar 15, 2018 at 10:20 AM, Ian Lepore wrote: > > > >> On Thu, 2018-03-15 at 09:14 -0700, Rodney W. Grimes wrote: > >> > > > >> > > On Thu, 2018-03-15 at 10:52 -0500, Justin Hibbits wrote: > >> > > > > >> > > > On Thu, Mar 15, 2018 at 10:46 AM, Ian Lepore > >> > > > wrote: > >> > > > > > >> > > > > > >> > > > > I agree completely with all of this.??It bothers me how many > >> > > > > committers > >> > > > > have the attitude that handling MFCs is not part of being a > >> > > > > committer. > >> > > > Never attribute to arrogance that which can adequately be > >> > > > explained > >> > > > by > >> > > > sheer laziness ;) > >> > > > > >> > > > - Justin (guilty of marking changes as MFC after, and ignoring > >> > > > them > >> > > > for far too long) > >> > > > > >> > > Laziness and procrastination I understand -- I own a lovely glass > >> > > house > >> > > in that neighborhood. ?I tend to put off MFCs for way too long then > >> > > every few months have to spend a whole weekend catching up. > >> > MFC: 1 week (by pool|self) #defaults to self if missing > >> > > >> > There is already a very nice tracking tool for outstanding MFC's, > >> > if we added a bit of smarts in its parser, and created a pool of > >> > MFC commiters (Eitan seems to have started one :-)) those who > >> > do not want to do there own MFC work could pass the hat. > >> > >> If you're talking about the MFC after: field in commits, I don't use > >> it. I have about zero tolerance for being nagged by anybody about > >> anything, and that goes double for robots nagging me with spam mail. > >> > >> The MFC tool that works well for me is gonzo's MFCTracker site [*] that > >> doesn't require extra markup in the commit messages. > >> > > > > I also have a MFC tool for git, but it's n > > > > [[ stupid track pad and too easy button pushes... ]] I close my lid and lay a standard 104 keyboard on top, and a nice mouse beside and just ignore the bad HID that is a laptop. > but it's not ready for prime time. It's useful if you have a list of things > you want to MFC for playing them onto the stable branch so you can test > before committing to svn stable. It shows the big issues with moving to git > as the source of truth, though. We have way too much traffic in the repo to > have git cherry to produce any kind of reasonable output (too many changes, > can't restrict to a subset of the tree, no way to check prior commits to > files affected, etc), and the git cherry-pick command relies a bit too much > on the merge magic, so it doesn't record merges (there is no merge-info in > git). > > However, I could dust off the tool and fix up the rough edges if there's > any interest at all. Kyle Evans used it to MFC my crazy src/stand stuff... This tool might be interesting for use when things get complicted like the stand code, or I think there was also a huge churn in Adrians wifi code that it may be useful for, but it sounds like it might be overkill for 90% of our needs. I shall ask, do you think it would be possible to re-implement this tool around svn? -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-stable@freebsd.org Thu Mar 15 17:23:35 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 09BFF28 for ; Thu, 15 Mar 2018 17:23:35 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x22d.google.com (mail-it0-x22d.google.com [IPv6:2607:f8b0:4001:c0b::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 6F42C6CE1C for ; Thu, 15 Mar 2018 17:23:33 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x22d.google.com with SMTP id w3-v6so10034207itc.4 for ; Thu, 15 Mar 2018 10:23:33 -0700 (PDT) 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=CwV+qZjHw27uCHSzvj9+6K6a6eH6pjkAtY9bY+1MrpA=; b=P04QxGKtrJwuHS43j/mFpK+jBXZ4OTuMe7VBPqg95IBylTHzoKLMgOmZKCmcO2eNvh 7ACY2EzC7rEP/2lSoA1QErtD/VG+B9flnMxY8ZKBGabj1IpFK7P5hfTD/Bw15q2ySafa AQZ/viHH5p3ovtYt0rc3SAtyeseVwr0Ruh/laacc3mlAlzrZkkyMzAy3Yn2Tkcv9f7IF 4c+W9atJNniyA4xQieUIWEjfZ09l3jUXGeHcvjKghkIZbYma6utrWLPeWzxD292Vlrem UTkuQibd43ij4g5akFu84H9PvOoNiyIiZQQ70/QR3/G8UNIncj/wgzmWc6Bc5fWUub80 TUow== 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=CwV+qZjHw27uCHSzvj9+6K6a6eH6pjkAtY9bY+1MrpA=; b=eLGxHVCyCpDdo4SLgSMgYQxHnGEuyVEq8V2rShOBc0SnzAbM3oLml/W5vV1gKMcMPe TrGhC7tOnb0jfqGrOBRGRqbdIn4H7PBBqA0+JTaXoxCBv/i4NCdTIwWYc8GfN4tIGWU+ JeuYZkmTnSjEwwK0IyHECgt4w0OYvzKLAM7Epi4xWOap0/ahYDoMVawavsNgweuOgKGh PVN65IJJikx6drOQ4TXNNehyFqP/vsoHEKWYTwJQRryS1N6r9+YY4hCoTL0es0eYyOIl 9Bg1d8vHaIloxGVCV0R/pH8DkDTHigagZjmYOLrgfjO+osl+X6eqkGFs38QLEn4/0NJB 2uaQ== X-Gm-Message-State: AElRT7FaLqG0y7TkRWXj4aciOzcJgsL6iSTfqIRzkYbfF/HN5vQ5RDsw vDTjNDv63K8UiLICm9xm1XY4xXbSDMZdbEXjG90EVQ== X-Google-Smtp-Source: AG47ELsa74maVx/lFU5vLUa544SqfPNvPPyULhJfeEDzhWZfYs4dK/zzqIPp8ssCs4WvstzlUciQvGvwtCqDm955gQk= X-Received: by 10.36.66.134 with SMTP id i128mr2171393itb.73.1521134612742; Thu, 15 Mar 2018 10:23:32 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.203.196 with HTTP; Thu, 15 Mar 2018 10:23:31 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:1052:acc7:f9de:2b6d] In-Reply-To: References: <201803151614.w2FGEttu093805@pdx.rh.CN85.dnsmgr.net> <1521130827.99081.43.camel@freebsd.org> From: Warner Losh Date: Thu, 15 Mar 2018 11:23:31 -0600 X-Google-Sender-Auth: btlF0CUDO6ZcKUhFhxgPRKcqHpU Message-ID: Subject: Re: svn commit: r330972 - stable/11/share/misc To: Oliver Pinter Cc: Ian Lepore , src-committers , Eitan Adler , Justin Hibbits , "svn-src-stable@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-stable-11@freebsd.org" , Andriy Gapon , "Rodney W. Grimes" X-Mailman-Approved-At: Thu, 15 Mar 2018 19:07:41 +0000 Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 17:23:35 -0000 On Thu, Mar 15, 2018 at 11:07 AM, Oliver Pinter < oliver.pinter@hardenedbsd.org> wrote: > > > On Thursday, March 15, 2018, Warner Losh wrote: > >> On Thu, Mar 15, 2018 at 10:31 AM, Warner Losh wrote: >> >> > >> > >> > On Thu, Mar 15, 2018 at 10:20 AM, Ian Lepore wrote: >> > >> >> On Thu, 2018-03-15 at 09:14 -0700, Rodney W. Grimes wrote: >> >> > > >> >> > > On Thu, 2018-03-15 at 10:52 -0500, Justin Hibbits wrote: >> >> > > > >> >> > > > On Thu, Mar 15, 2018 at 10:46 AM, Ian Lepore >> >> > > > wrote: >> >> > > > > >> >> > > > > >> >> > > > > I agree completely with all of this.??It bothers me how many >> >> > > > > committers >> >> > > > > have the attitude that handling MFCs is not part of being a >> >> > > > > committer. >> >> > > > Never attribute to arrogance that which can adequately be >> >> > > > explained >> >> > > > by >> >> > > > sheer laziness ;) >> >> > > > >> >> > > > - Justin (guilty of marking changes as MFC after, and ignoring >> >> > > > them >> >> > > > for far too long) >> >> > > > >> >> > > Laziness and procrastination I understand -- I own a lovely glass >> >> > > house >> >> > > in that neighborhood. ?I tend to put off MFCs for way too long then >> >> > > every few months have to spend a whole weekend catching up. >> >> > MFC: 1 week (by pool|self) #defaults to self if missing >> >> > >> >> > There is already a very nice tracking tool for outstanding MFC's, >> >> > if we added a bit of smarts in its parser, and created a pool of >> >> > MFC commiters (Eitan seems to have started one :-)) those who >> >> > do not want to do there own MFC work could pass the hat. >> >> >> >> If you're talking about the MFC after: field in commits, I don't use >> >> it. I have about zero tolerance for being nagged by anybody about >> >> anything, and that goes double for robots nagging me with spam mail. >> >> >> >> The MFC tool that works well for me is gonzo's MFCTracker site [*] that >> >> doesn't require extra markup in the commit messages. >> >> >> > >> > I also have a MFC tool for git, but it's n >> > >> >> [[ stupid track pad and too easy button pushes... ]] >> >> but it's not ready for prime time. It's useful if you have a list of >> things >> you want to MFC for playing them onto the stable branch so you can test >> before committing to svn stable. It shows the big issues with moving to >> git >> as the source of truth, though. We have way too much traffic in the repo >> to >> have git cherry to produce any kind of reasonable output (too many >> changes, >> can't restrict to a subset of the tree, no way to check prior commits to >> files affected, etc), and the git cherry-pick command relies a bit too >> much >> on the merge magic, so it doesn't record merges (there is no merge-info in >> git). >> >> However, I could dust off the tool and fix up the rough edges if there's >> any interest at all. Kyle Evans used it to MFC my crazy src/stand stuff... >> >> > I use this script to merge / cherry-pick changes from master: > https://github.com/opntr/opBSD-ng-tools/blob/master/git/opBSD_mfc.sh > Nice. My own script is at https://people.freebsd.org/~imp/git-mfc though it could learn a thing or two from yours in some ways (mine is driven not by git has, but by svn #). Not, this is a quick-rehash of a script we use internally to cherry pick stuff to the Netflix oca firmware, so there's some stale comments in it that point to internal docs. I'll have to rework it with the git show trick. Warner From owner-svn-src-stable@freebsd.org Thu Mar 15 19:08:37 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BBBFDF4A276; Thu, 15 Mar 2018 19:08:37 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 64B5272667; Thu, 15 Mar 2018 19:08:37 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5F5FB19F25; Thu, 15 Mar 2018 19:08:37 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FJ8boe054647; Thu, 15 Mar 2018 19:08:37 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FJ8XWk054609; Thu, 15 Mar 2018 19:08:33 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803151908.w2FJ8XWk054609@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 15 Mar 2018 19:08: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: r331017 - in stable/11/sys: amd64/amd64 arm/arm arm64/arm64 cddl/compat/opensolaris/kern cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs dev/drm dev/drm2 fs/msdos... X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable/11/sys: amd64/amd64 arm/arm arm64/arm64 cddl/compat/opensolaris/kern cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs dev/drm dev/drm2 fs/msdosfs kern mips/include mips... X-SVN-Commit-Revision: 331017 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 19:08:38 -0000 Author: kevans Date: Thu Mar 15 19:08:33 2018 New Revision: 331017 URL: https://svnweb.freebsd.org/changeset/base/331017 Log: MFC r317055,r317056 (glebius): Include sys/vmmeter.h as included r317055: All these files need sys/vmmeter.h, but now they got it implicitly included via sys/pcpu.h. r317056: Typo! Modified: stable/11/sys/amd64/amd64/efirt.c stable/11/sys/amd64/amd64/minidump_machdep.c stable/11/sys/amd64/amd64/uma_machdep.c stable/11/sys/arm/arm/intr.c stable/11/sys/arm/arm/machdep.c stable/11/sys/arm/arm/trap-v4.c stable/11/sys/arm/arm/trap-v6.c stable/11/sys/arm/arm/undefined.c stable/11/sys/arm64/arm64/minidump_machdep.c stable/11/sys/arm64/arm64/uma_machdep.c stable/11/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c stable/11/sys/cddl/compat/opensolaris/sys/kmem.h stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c stable/11/sys/dev/drm/drmP.h stable/11/sys/dev/drm2/drmP.h stable/11/sys/fs/msdosfs/msdosfs_denode.c stable/11/sys/fs/msdosfs/msdosfs_vnops.c stable/11/sys/kern/kern_mib.c stable/11/sys/kern/kern_thread.c stable/11/sys/kern/subr_intr.c stable/11/sys/kern/subr_syscall.c stable/11/sys/mips/include/intr_machdep.h stable/11/sys/mips/mips/minidump_machdep.c stable/11/sys/mips/mips/uma_machdep.c stable/11/sys/ofed/drivers/infiniband/core/umem.c stable/11/sys/powerpc/powerpc/uma_machdep.c stable/11/sys/sparc64/sparc64/intr_machdep.c stable/11/sys/sparc64/sparc64/machdep.c stable/11/sys/sparc64/sparc64/mem.c stable/11/sys/ufs/ffs/ffs_balloc.c stable/11/sys/ufs/ffs/ffs_vfsops.c stable/11/sys/vm/device_pager.c stable/11/sys/vm/memguard.c stable/11/sys/vm/sg_pager.c stable/11/sys/vm/vm_reserv.c stable/11/sys/x86/x86/intr_machdep.c stable/11/sys/x86/xen/xenpv.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/amd64/amd64/efirt.c ============================================================================== --- stable/11/sys/amd64/amd64/efirt.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/amd64/amd64/efirt.c Thu Mar 15 19:08:33 2018 (r331017) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: stable/11/sys/amd64/amd64/minidump_machdep.c ============================================================================== --- stable/11/sys/amd64/amd64/minidump_machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/amd64/amd64/minidump_machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: stable/11/sys/amd64/amd64/uma_machdep.c ============================================================================== --- stable/11/sys/amd64/amd64/uma_machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/amd64/amd64/uma_machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: stable/11/sys/arm/arm/intr.c ============================================================================== --- stable/11/sys/arm/arm/intr.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/arm/arm/intr.c Thu Mar 15 19:08:33 2018 (r331017) @@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: stable/11/sys/arm/arm/machdep.c ============================================================================== --- stable/11/sys/arm/arm/machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/arm/arm/machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -71,6 +71,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: stable/11/sys/arm/arm/trap-v4.c ============================================================================== --- stable/11/sys/arm/arm/trap-v4.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/arm/arm/trap-v4.c Thu Mar 15 19:08:33 2018 (r331017) @@ -87,6 +87,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: stable/11/sys/arm/arm/trap-v6.c ============================================================================== --- stable/11/sys/arm/arm/trap-v6.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/arm/arm/trap-v6.c Thu Mar 15 19:08:33 2018 (r331017) @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef KTRACE #include #include Modified: stable/11/sys/arm/arm/undefined.c ============================================================================== --- stable/11/sys/arm/arm/undefined.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/arm/arm/undefined.c Thu Mar 15 19:08:33 2018 (r331017) @@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef KDB #include #endif Modified: stable/11/sys/arm64/arm64/minidump_machdep.c ============================================================================== --- stable/11/sys/arm64/arm64/minidump_machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/arm64/arm64/minidump_machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: stable/11/sys/arm64/arm64/uma_machdep.c ============================================================================== --- stable/11/sys/arm64/arm64/uma_machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/arm64/arm64/uma_machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: stable/11/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c ============================================================================== --- stable/11/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c Thu Mar 15 19:08:33 2018 (r331017) @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: stable/11/sys/cddl/compat/opensolaris/sys/kmem.h ============================================================================== --- stable/11/sys/cddl/compat/opensolaris/sys/kmem.h Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/cddl/compat/opensolaris/sys/kmem.h Thu Mar 15 19:08:33 2018 (r331017) @@ -33,6 +33,7 @@ #include #include #include +#include #include #include Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Thu Mar 15 19:08:33 2018 (r331017) @@ -74,6 +74,7 @@ #include #include #include +#include #include #include Modified: stable/11/sys/dev/drm/drmP.h ============================================================================== --- stable/11/sys/dev/drm/drmP.h Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/dev/drm/drmP.h Thu Mar 15 19:08:33 2018 (r331017) @@ -65,6 +65,7 @@ struct drm_file; #include #include #include +#include #include #include #include Modified: stable/11/sys/dev/drm2/drmP.h ============================================================================== --- stable/11/sys/dev/drm2/drmP.h Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/dev/drm2/drmP.h Thu Mar 15 19:08:33 2018 (r331017) @@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: stable/11/sys/fs/msdosfs/msdosfs_denode.c ============================================================================== --- stable/11/sys/fs/msdosfs/msdosfs_denode.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/fs/msdosfs/msdosfs_denode.c Thu Mar 15 19:08:33 2018 (r331017) @@ -55,6 +55,7 @@ #include #include #include +#include #include #include Modified: stable/11/sys/fs/msdosfs/msdosfs_vnops.c ============================================================================== --- stable/11/sys/fs/msdosfs/msdosfs_vnops.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/fs/msdosfs/msdosfs_vnops.c Thu Mar 15 19:08:33 2018 (r331017) @@ -64,6 +64,7 @@ #include #include #include +#include #include #include Modified: stable/11/sys/kern/kern_mib.c ============================================================================== --- stable/11/sys/kern/kern_mib.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/kern/kern_mib.c Thu Mar 15 19:08:33 2018 (r331017) @@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: stable/11/sys/kern/kern_thread.c ============================================================================== --- stable/11/sys/kern/kern_thread.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/kern/kern_thread.c Thu Mar 15 19:08:33 2018 (r331017) @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #ifdef HWPMC_HOOKS #include Modified: stable/11/sys/kern/subr_intr.c ============================================================================== --- stable/11/sys/kern/subr_intr.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/kern/subr_intr.c Thu Mar 15 19:08:33 2018 (r331017) @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef HWPMC_HOOKS #include #endif Modified: stable/11/sys/kern/subr_syscall.c ============================================================================== --- stable/11/sys/kern/subr_syscall.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/kern/subr_syscall.c Thu Mar 15 19:08:33 2018 (r331017) @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #ifdef KTRACE #include #include Modified: stable/11/sys/mips/include/intr_machdep.h ============================================================================== --- stable/11/sys/mips/include/intr_machdep.h Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/mips/include/intr_machdep.h Thu Mar 15 19:08:33 2018 (r331017) @@ -31,6 +31,7 @@ #ifndef _MACHINE_INTR_MACHDEP_H_ #define _MACHINE_INTR_MACHDEP_H_ +#include #include #if defined(CPU_RMI) || defined(CPU_NLM) Modified: stable/11/sys/mips/mips/minidump_machdep.c ============================================================================== --- stable/11/sys/mips/mips/minidump_machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/mips/mips/minidump_machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: stable/11/sys/mips/mips/uma_machdep.c ============================================================================== --- stable/11/sys/mips/mips/uma_machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/mips/mips/uma_machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: stable/11/sys/ofed/drivers/infiniband/core/umem.c ============================================================================== --- stable/11/sys/ofed/drivers/infiniband/core/umem.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/ofed/drivers/infiniband/core/umem.c Thu Mar 15 19:08:33 2018 (r331017) @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include "uverbs.h" Modified: stable/11/sys/powerpc/powerpc/uma_machdep.c ============================================================================== --- stable/11/sys/powerpc/powerpc/uma_machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/powerpc/powerpc/uma_machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: stable/11/sys/sparc64/sparc64/intr_machdep.c ============================================================================== --- stable/11/sys/sparc64/sparc64/intr_machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/sparc64/sparc64/intr_machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -75,6 +75,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: stable/11/sys/sparc64/sparc64/machdep.c ============================================================================== --- stable/11/sys/sparc64/sparc64/machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/sparc64/sparc64/machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -75,6 +75,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include Modified: stable/11/sys/sparc64/sparc64/mem.c ============================================================================== --- stable/11/sys/sparc64/sparc64/mem.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/sparc64/sparc64/mem.c Thu Mar 15 19:08:33 2018 (r331017) @@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: stable/11/sys/ufs/ffs/ffs_balloc.c ============================================================================== --- stable/11/sys/ufs/ffs/ffs_balloc.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/ufs/ffs/ffs_balloc.c Thu Mar 15 19:08:33 2018 (r331017) @@ -71,6 +71,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: stable/11/sys/ufs/ffs/ffs_vfsops.c ============================================================================== --- stable/11/sys/ufs/ffs/ffs_vfsops.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/ufs/ffs/ffs_vfsops.c Thu Mar 15 19:08:33 2018 (r331017) @@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include Modified: stable/11/sys/vm/device_pager.c ============================================================================== --- stable/11/sys/vm/device_pager.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/vm/device_pager.c Thu Mar 15 19:08:33 2018 (r331017) @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: stable/11/sys/vm/memguard.c ============================================================================== --- stable/11/sys/vm/memguard.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/vm/memguard.c Thu Mar 15 19:08:33 2018 (r331017) @@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: stable/11/sys/vm/sg_pager.c ============================================================================== --- stable/11/sys/vm/sg_pager.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/vm/sg_pager.c Thu Mar 15 19:08:33 2018 (r331017) @@ -38,6 +38,8 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include + #include #include #include Modified: stable/11/sys/vm/vm_reserv.c ============================================================================== --- stable/11/sys/vm/vm_reserv.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/vm/vm_reserv.c Thu Mar 15 19:08:33 2018 (r331017) @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: stable/11/sys/x86/x86/intr_machdep.c ============================================================================== --- stable/11/sys/x86/x86/intr_machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/x86/x86/intr_machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include Modified: stable/11/sys/x86/xen/xenpv.c ============================================================================== --- stable/11/sys/x86/xen/xenpv.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/x86/xen/xenpv.c Thu Mar 15 19:08:33 2018 (r331017) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include From owner-svn-src-stable@freebsd.org Thu Mar 15 19:31:40 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B8B33F4C026; Thu, 15 Mar 2018 19:31:40 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6A55F73A1E; Thu, 15 Mar 2018 19:31:40 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 64F581A37A; Thu, 15 Mar 2018 19:31:40 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FJVed2068707; Thu, 15 Mar 2018 19:31:40 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FJVdW4068699; Thu, 15 Mar 2018 19:31:39 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803151931.w2FJVdW4068699@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 15 Mar 2018 19:31:39 +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: r331019 - in stable/11/sys: amd64/amd64 amd64/include conf dev/efidev modules/efirt sys X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable/11/sys: amd64/amd64 amd64/include conf dev/efidev modules/efirt sys X-SVN-Commit-Revision: 331019 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 19:31:41 -0000 Author: kevans Date: Thu Mar 15 19:31:39 2018 New Revision: 331019 URL: https://svnweb.freebsd.org/changeset/base/331019 Log: MFC r322278,324177: EFIRT Improvements r322278 (imp): Fail to open efirt device when no EFI on system. libefivar expects opening /dev/efi to indicate if the we can make efi runtime calls. With a null routine, it was always succeeding leading efi_variables_supported() to return the wrong value. Only succeed if we have an efi_runtime table. Also, while I'm hear, out of an abundance of caution, add a likely redundant check to make sure efi_systbl is not NULL before dereferencing it. I know it can't be NULL if efi_cfgtbl is non-NULL, but the compiler doesn't. r324177 (andrew): To prepare for adding EFI runtime services support on arm64 move the machine independent parts of the existing code to a new file that can be shared between amd64 and arm64. Care has been taken to ensure that the MFC of r324177 did not clobber cherry-picked MFC's. Added: stable/11/sys/amd64/amd64/efirt_machdep.c (contents, props changed) - copied, changed from r324177, head/sys/amd64/amd64/efirt_machdep.c - copied unchanged from r324177, head/sys/dev/efidev/efirt.c Directory Properties: stable/11/sys/dev/efidev/efirt.c (props changed) Deleted: stable/11/sys/amd64/amd64/efirt.c Modified: stable/11/sys/amd64/include/efi.h stable/11/sys/conf/files stable/11/sys/conf/files.amd64 stable/11/sys/dev/efidev/efidev.c stable/11/sys/modules/efirt/Makefile stable/11/sys/sys/efi.h Directory Properties: stable/11/ (props changed) Copied and modified: stable/11/sys/amd64/amd64/efirt_machdep.c (from r324177, head/sys/amd64/amd64/efirt_machdep.c) ============================================================================== --- head/sys/amd64/amd64/efirt_machdep.c Sun Oct 1 19:52:47 2017 (r324177, copy source) +++ stable/11/sys/amd64/amd64/efirt_machdep.c Thu Mar 15 19:31:39 2018 (r331019) @@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$"); static pml4_entry_t *efi_pml4; static vm_object_t obj_1t1_pt; static vm_page_t efi_pml4_page; +static vm_pindex_t efi_1t1_idx; void efi_destroy_1t1_map(void) @@ -85,10 +86,10 @@ efi_destroy_1t1_map(void) } static vm_page_t -efi_1t1_page(vm_pindex_t idx) +efi_1t1_page(void) { - return (vm_page_grab(obj_1t1_pt, idx, VM_ALLOC_NOBUSY | + return (vm_page_grab(obj_1t1_pt, efi_1t1_idx++, VM_ALLOC_NOBUSY | VM_ALLOC_WIRED | VM_ALLOC_ZERO)); } @@ -106,7 +107,7 @@ efi_1t1_pte(vm_offset_t va) pml4_idx = pmap_pml4e_index(va); pml4e = &efi_pml4[pml4_idx]; if (*pml4e == 0) { - m = efi_1t1_page(1 + pml4_idx); + m = efi_1t1_page(); mphys = VM_PAGE_TO_PHYS(m); *pml4e = mphys | X86_PG_RW | X86_PG_V; } else { @@ -117,7 +118,7 @@ efi_1t1_pte(vm_offset_t va) pdp_idx = pmap_pdpe_index(va); pdpe += pdp_idx; if (*pdpe == 0) { - m = efi_1t1_page(1 + NPML4EPG + (pml4_idx + 1) * (pdp_idx + 1)); + m = efi_1t1_page(); mphys = VM_PAGE_TO_PHYS(m); *pdpe = mphys | X86_PG_RW | X86_PG_V; } else { @@ -128,8 +129,7 @@ efi_1t1_pte(vm_offset_t va) pd_idx = pmap_pde_index(va); pde += pd_idx; if (*pde == 0) { - m = efi_1t1_page(1 + NPML4EPG + NPML4EPG * NPDPEPG + - (pml4_idx + 1) * (pdp_idx + 1) * (pd_idx + 1)); + m = efi_1t1_page(); mphys = VM_PAGE_TO_PHYS(m); *pde = mphys | X86_PG_RW | X86_PG_V; } else { @@ -155,8 +155,9 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int obj_1t1_pt = vm_pager_allocate(OBJT_PHYS, NULL, ptoa(1 + NPML4EPG + NPML4EPG * NPDPEPG + NPML4EPG * NPDPEPG * NPDEPG), VM_PROT_ALL, 0, NULL); + efi_1t1_idx = 0; VM_OBJECT_WLOCK(obj_1t1_pt); - efi_pml4_page = efi_1t1_page(0); + efi_pml4_page = efi_1t1_page(); VM_OBJECT_WUNLOCK(obj_1t1_pt); efi_pml4 = (pml4_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(efi_pml4_page)); pmap_pinit_pml4(efi_pml4_page); Modified: stable/11/sys/amd64/include/efi.h ============================================================================== --- stable/11/sys/amd64/include/efi.h Thu Mar 15 19:23:07 2018 (r331018) +++ stable/11/sys/amd64/include/efi.h Thu Mar 15 19:31:39 2018 (r331019) @@ -32,6 +32,8 @@ #ifndef __AMD64_INCLUDE_EFI_H_ #define __AMD64_INCLUDE_EFI_H_ +#include + /* * XXX: from gcc 6.2 manual: * Note, the ms_abi attribute for Microsoft Windows 64-bit targets @@ -45,21 +47,8 @@ #define EFIABI_ATTR __attribute__((ms_abi)) #endif -#ifdef _KERNEL -struct uuid; -struct efi_tm; - -int efi_get_table(struct uuid *uuid, void **ptr); -int efi_get_time(struct efi_tm *tm); -int efi_get_time_locked(struct efi_tm *tm); -int efi_reset_system(void); -int efi_set_time(struct efi_tm *tm); -int efi_set_time_locked(struct efi_tm *tm); -int efi_var_get(uint16_t *name, struct uuid *vendor, uint32_t *attrib, - size_t *datasize, void *data); -int efi_var_nextname(size_t *namesize, uint16_t *name, struct uuid *vendor); -int efi_var_set(uint16_t *name, struct uuid *vendor, uint32_t attrib, - size_t datasize, void *data); -#endif +#define EFI_TIME_LOCK() mtx_lock(&atrtc_time_lock); +#define EFI_TIME_UNLOCK() mtx_unlock(&atrtc_time_lock); +#define EFI_TIME_OWNED() mtx_assert(&atrtc_time_lock, MA_OWNED); #endif /* __AMD64_INCLUDE_EFI_H_ */ Modified: stable/11/sys/conf/files ============================================================================== --- stable/11/sys/conf/files Thu Mar 15 19:23:07 2018 (r331018) +++ stable/11/sys/conf/files Thu Mar 15 19:31:39 2018 (r331019) @@ -1584,6 +1584,7 @@ dev/ed/if_ed_rtl80x9.c optional ed dev/ed/if_ed_pccard.c optional ed pccard dev/ed/if_ed_pci.c optional ed pci dev/efidev/efidev.c optional efirt +dev/efidev/efirt.c optional efirt dev/eisa/eisa_if.m standard dev/eisa/eisaconf.c optional eisa dev/e1000/if_em.c optional em \ Modified: stable/11/sys/conf/files.amd64 ============================================================================== --- stable/11/sys/conf/files.amd64 Thu Mar 15 19:23:07 2018 (r331018) +++ stable/11/sys/conf/files.amd64 Thu Mar 15 19:31:39 2018 (r331019) @@ -133,7 +133,7 @@ amd64/amd64/cpu_switch.S standard amd64/amd64/db_disasm.c optional ddb amd64/amd64/db_interface.c optional ddb amd64/amd64/db_trace.c optional ddb -amd64/amd64/efirt.c optional efirt +amd64/amd64/efirt_machdep.c optional efirt amd64/amd64/elf_machdep.c standard amd64/amd64/exception.S standard amd64/amd64/fpu.c standard Modified: stable/11/sys/dev/efidev/efidev.c ============================================================================== --- stable/11/sys/dev/efidev/efidev.c Thu Mar 15 19:23:07 2018 (r331018) +++ stable/11/sys/dev/efidev/efidev.c Thu Mar 15 19:31:39 2018 (r331019) @@ -39,14 +39,27 @@ __FBSDID("$FreeBSD$"); #include #include +static d_open_t efidev_open; static d_ioctl_t efidev_ioctl; static struct cdevsw efi_cdevsw = { .d_name = "efi", .d_version = D_VERSION, + .d_open = efidev_open, .d_ioctl = efidev_ioctl, }; +static int +efidev_open(struct cdev *dev __unused, int oflags __unused, + int devtype __unused, struct thread *td __unused) +{ + /* + * Only return success when we have an actual runtime to call. + */ + + return efi_rt_ok(); +} + static int efidev_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t addr, int flags __unused, struct thread *td __unused) Copied: stable/11/sys/dev/efidev/efirt.c (from r324177, head/sys/dev/efidev/efirt.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/sys/dev/efidev/efirt.c Thu Mar 15 19:31:39 2018 (r331019, copy of r324177, head/sys/dev/efidev/efirt.c) @@ -0,0 +1,388 @@ +/*- + * Copyright (c) 2004 Marcel Moolenaar + * Copyright (c) 2001 Doug Rabson + * Copyright (c) 2016 The FreeBSD Foundation + * All rights reserved. + * + * Portions of this software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include + +static struct efi_systbl *efi_systbl; +static struct efi_cfgtbl *efi_cfgtbl; +static struct efi_rt *efi_runtime; + +static int efi_status2err[25] = { + 0, /* EFI_SUCCESS */ + ENOEXEC, /* EFI_LOAD_ERROR */ + EINVAL, /* EFI_INVALID_PARAMETER */ + ENOSYS, /* EFI_UNSUPPORTED */ + EMSGSIZE, /* EFI_BAD_BUFFER_SIZE */ + EOVERFLOW, /* EFI_BUFFER_TOO_SMALL */ + EBUSY, /* EFI_NOT_READY */ + EIO, /* EFI_DEVICE_ERROR */ + EROFS, /* EFI_WRITE_PROTECTED */ + EAGAIN, /* EFI_OUT_OF_RESOURCES */ + EIO, /* EFI_VOLUME_CORRUPTED */ + ENOSPC, /* EFI_VOLUME_FULL */ + ENXIO, /* EFI_NO_MEDIA */ + ESTALE, /* EFI_MEDIA_CHANGED */ + ENOENT, /* EFI_NOT_FOUND */ + EACCES, /* EFI_ACCESS_DENIED */ + ETIMEDOUT, /* EFI_NO_RESPONSE */ + EADDRNOTAVAIL, /* EFI_NO_MAPPING */ + ETIMEDOUT, /* EFI_TIMEOUT */ + EDOOFUS, /* EFI_NOT_STARTED */ + EALREADY, /* EFI_ALREADY_STARTED */ + ECANCELED, /* EFI_ABORTED */ + EPROTO, /* EFI_ICMP_ERROR */ + EPROTO, /* EFI_TFTP_ERROR */ + EPROTO /* EFI_PROTOCOL_ERROR */ +}; + +static int +efi_status_to_errno(efi_status status) +{ + u_long code; + + code = status & 0x3ffffffffffffffful; + return (code < nitems(efi_status2err) ? efi_status2err[code] : EDOOFUS); +} + +static struct mtx efi_lock; + +static int +efi_init(void) +{ + struct efi_map_header *efihdr; + struct efi_md *map; + caddr_t kmdp; + size_t efisz; + + mtx_init(&efi_lock, "efi", NULL, MTX_DEF); + + if (efi_systbl_phys == 0) { + if (bootverbose) + printf("EFI systbl not available\n"); + return (0); + } + efi_systbl = (struct efi_systbl *)PHYS_TO_DMAP(efi_systbl_phys); + if (efi_systbl->st_hdr.th_sig != EFI_SYSTBL_SIG) { + efi_systbl = NULL; + if (bootverbose) + printf("EFI systbl signature invalid\n"); + return (0); + } + efi_cfgtbl = (efi_systbl->st_cfgtbl == 0) ? NULL : + (struct efi_cfgtbl *)efi_systbl->st_cfgtbl; + if (efi_cfgtbl == NULL) { + if (bootverbose) + printf("EFI config table is not present\n"); + } + + kmdp = preload_search_by_type("elf kernel"); + if (kmdp == NULL) + kmdp = preload_search_by_type("elf64 kernel"); + efihdr = (struct efi_map_header *)preload_search_info(kmdp, + MODINFO_METADATA | MODINFOMD_EFI_MAP); + if (efihdr == NULL) { + if (bootverbose) + printf("EFI map is not present\n"); + return (0); + } + efisz = (sizeof(struct efi_map_header) + 0xf) & ~0xf; + map = (struct efi_md *)((uint8_t *)efihdr + efisz); + if (efihdr->descriptor_size == 0) + return (ENOMEM); + + if (!efi_create_1t1_map(map, efihdr->memory_size / + efihdr->descriptor_size, efihdr->descriptor_size)) { + if (bootverbose) + printf("EFI cannot create runtime map\n"); + return (ENOMEM); + } + + efi_runtime = (efi_systbl->st_rt == 0) ? NULL : + (struct efi_rt *)efi_systbl->st_rt; + if (efi_runtime == NULL) { + if (bootverbose) + printf("EFI runtime services table is not present\n"); + efi_destroy_1t1_map(); + return (ENXIO); + } + + return (0); +} + +static void +efi_uninit(void) +{ + + efi_destroy_1t1_map(); + + efi_systbl = NULL; + efi_cfgtbl = NULL; + efi_runtime = NULL; + + mtx_destroy(&efi_lock); +} + +int +efi_rt_ok(void) +{ + + if (efi_runtime == NULL) + return (ENXIO); + return (0); +} + +static int +efi_enter(void) +{ + struct thread *td; + pmap_t curpmap; + int error; + + if (efi_runtime == NULL) + return (ENXIO); + td = curthread; + curpmap = &td->td_proc->p_vmspace->vm_pmap; + PMAP_LOCK(curpmap); + mtx_lock(&efi_lock); + error = fpu_kern_enter(td, NULL, FPU_KERN_NOCTX); + if (error != 0) { + PMAP_UNLOCK(curpmap); + return (error); + } + + return (efi_arch_enter()); +} + +static void +efi_leave(void) +{ + struct thread *td; + pmap_t curpmap; + + efi_arch_leave(); + + curpmap = &curproc->p_vmspace->vm_pmap; + td = curthread; + fpu_kern_leave(td, NULL); + mtx_unlock(&efi_lock); + PMAP_UNLOCK(curpmap); +} + +int +efi_get_table(struct uuid *uuid, void **ptr) +{ + struct efi_cfgtbl *ct; + u_long count; + + if (efi_cfgtbl == NULL || efi_systbl == NULL) + return (ENXIO); + count = efi_systbl->st_entries; + ct = efi_cfgtbl; + while (count--) { + if (!bcmp(&ct->ct_uuid, uuid, sizeof(*uuid))) { + *ptr = (void *)PHYS_TO_DMAP(ct->ct_data); + return (0); + } + ct++; + } + return (ENOENT); +} + +static int +efi_get_time_locked(struct efi_tm *tm) +{ + efi_status status; + int error; + + EFI_TIME_OWNED() + error = efi_enter(); + if (error != 0) + return (error); + status = efi_runtime->rt_gettime(tm, NULL); + efi_leave(); + error = efi_status_to_errno(status); + return (error); +} + +int +efi_get_time(struct efi_tm *tm) +{ + int error; + + if (efi_runtime == NULL) + return (ENXIO); + EFI_TIME_LOCK() + error = efi_get_time_locked(tm); + EFI_TIME_UNLOCK() + return (error); +} + +int +efi_reset_system(void) +{ + int error; + + error = efi_enter(); + if (error != 0) + return (error); + efi_runtime->rt_reset(EFI_RESET_WARM, 0, 0, NULL); + efi_leave(); + return (EIO); +} + +static int +efi_set_time_locked(struct efi_tm *tm) +{ + efi_status status; + int error; + + EFI_TIME_OWNED(); + error = efi_enter(); + if (error != 0) + return (error); + status = efi_runtime->rt_settime(tm); + efi_leave(); + error = efi_status_to_errno(status); + return (error); +} + +int +efi_set_time(struct efi_tm *tm) +{ + int error; + + if (efi_runtime == NULL) + return (ENXIO); + EFI_TIME_LOCK() + error = efi_set_time_locked(tm); + EFI_TIME_UNLOCK() + return (error); +} + +int +efi_var_get(efi_char *name, struct uuid *vendor, uint32_t *attrib, + size_t *datasize, void *data) +{ + efi_status status; + int error; + + error = efi_enter(); + if (error != 0) + return (error); + status = efi_runtime->rt_getvar(name, vendor, attrib, datasize, data); + efi_leave(); + error = efi_status_to_errno(status); + return (error); +} + +int +efi_var_nextname(size_t *namesize, efi_char *name, struct uuid *vendor) +{ + efi_status status; + int error; + + error = efi_enter(); + if (error != 0) + return (error); + status = efi_runtime->rt_scanvar(namesize, name, vendor); + efi_leave(); + error = efi_status_to_errno(status); + return (error); +} + +int +efi_var_set(efi_char *name, struct uuid *vendor, uint32_t attrib, + size_t datasize, void *data) +{ + efi_status status; + int error; + + error = efi_enter(); + if (error != 0) + return (error); + status = efi_runtime->rt_setvar(name, vendor, attrib, datasize, data); + efi_leave(); + error = efi_status_to_errno(status); + return (error); +} + +static int +efirt_modevents(module_t m, int event, void *arg __unused) +{ + + switch (event) { + case MOD_LOAD: + return (efi_init()); + + case MOD_UNLOAD: + efi_uninit(); + return (0); + + case MOD_SHUTDOWN: + return (0); + + default: + return (EOPNOTSUPP); + } +} + +static moduledata_t efirt_moddata = { + .name = "efirt", + .evhand = efirt_modevents, + .priv = NULL, +}; +DECLARE_MODULE(efirt, efirt_moddata, SI_SUB_VM_CONF, SI_ORDER_ANY); +MODULE_VERSION(efirt, 1); Modified: stable/11/sys/modules/efirt/Makefile ============================================================================== --- stable/11/sys/modules/efirt/Makefile Thu Mar 15 19:23:07 2018 (r331018) +++ stable/11/sys/modules/efirt/Makefile Thu Mar 15 19:31:39 2018 (r331019) @@ -4,7 +4,7 @@ .PATH: ${SRCTOP}/sys/dev/efidev KMOD= efirt -SRCS= efirt.c efidev.c +SRCS= efirt.c efirt_machdep.c efidev.c SRCS+= device_if.h bus_if.h .include Modified: stable/11/sys/sys/efi.h ============================================================================== --- stable/11/sys/sys/efi.h Thu Mar 15 19:23:07 2018 (r331018) +++ stable/11/sys/sys/efi.h Thu Mar 15 19:31:39 2018 (r331019) @@ -168,6 +168,25 @@ struct efi_systbl { }; extern vm_paddr_t efi_systbl_phys; + +/* Internal MD EFI functions */ +int efi_arch_enter(void); +void efi_arch_leave(void); +bool efi_create_1t1_map(struct efi_md *, int, int); +void efi_destroy_1t1_map(void); + +/* Public MI EFI functions */ +int efi_rt_ok(void); +int efi_get_table(struct uuid *uuid, void **ptr); +int efi_get_time(struct efi_tm *tm); +int efi_reset_system(void); +int efi_set_time(struct efi_tm *tm); +int efi_var_get(uint16_t *name, struct uuid *vendor, uint32_t *attrib, + size_t *datasize, void *data); +int efi_var_nextname(size_t *namesize, uint16_t *name, struct uuid *vendor); +int efi_var_set(uint16_t *name, struct uuid *vendor, uint32_t attrib, + size_t datasize, void *data); + #endif /* _KERNEL */ #endif /* _SYS_EFI_H_ */ From owner-svn-src-stable@freebsd.org Thu Mar 15 19:41:27 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A018F4CD01; Thu, 15 Mar 2018 19:41:27 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E0B5F74236; Thu, 15 Mar 2018 19:41:26 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB3791A4F6; Thu, 15 Mar 2018 19:41:26 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FJfQ2Q072994; Thu, 15 Mar 2018 19:41:26 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FJfQJd072993; Thu, 15 Mar 2018 19:41:26 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803151941.w2FJfQJd072993@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 15 Mar 2018 19: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: r331021 - stable/11/sys/dev/efidev X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: stable/11/sys/dev/efidev X-SVN-Commit-Revision: 331021 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 19:41:27 -0000 Author: kevans Date: Thu Mar 15 19:41:26 2018 New Revision: 331021 URL: https://svnweb.freebsd.org/changeset/base/331021 Log: r322279: Don't create /dev/efi without EFI runtime Turns out to be even simpler to just not create /dev/efi if we don't have a efi runtime. Modified: stable/11/sys/dev/efidev/efidev.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/efidev/efidev.c ============================================================================== --- stable/11/sys/dev/efidev/efidev.c Thu Mar 15 19:32:33 2018 (r331020) +++ stable/11/sys/dev/efidev/efidev.c Thu Mar 15 19:41:26 2018 (r331021) @@ -39,28 +39,15 @@ __FBSDID("$FreeBSD$"); #include #include -static d_open_t efidev_open; static d_ioctl_t efidev_ioctl; static struct cdevsw efi_cdevsw = { .d_name = "efi", .d_version = D_VERSION, - .d_open = efidev_open, .d_ioctl = efidev_ioctl, }; static int -efidev_open(struct cdev *dev __unused, int oflags __unused, - int devtype __unused, struct thread *td __unused) -{ - /* - * Only return success when we have an actual runtime to call. - */ - - return efi_rt_ok(); -} - -static int efidev_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t addr, int flags __unused, struct thread *td __unused) { @@ -195,6 +182,11 @@ efidev_modevents(module_t m, int event, void *arg __un switch (event) { case MOD_LOAD: + /* + * If we have no efi environment, then don't create the device. + */ + if (efi_rt_ok() != 0) + return (0); make_dev_args_init(&mda); mda.mda_flags = MAKEDEV_WAITOK | MAKEDEV_CHECKNAME; mda.mda_devsw = &efi_cdevsw; From owner-svn-src-stable@freebsd.org Thu Mar 15 19:56:45 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A4B72F4E282; Thu, 15 Mar 2018 19:56:45 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 56DC274F42; Thu, 15 Mar 2018 19:56:45 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 51A431A6D7; Thu, 15 Mar 2018 19:56:45 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FJujHc080205; Thu, 15 Mar 2018 19:56:45 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FJuiOU080199; Thu, 15 Mar 2018 19:56:44 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803151956.w2FJuiOU080199@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 15 Mar 2018 19:56: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: r331022 - in stable/11/sys: arm64/arm64 arm64/include conf modules X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable/11/sys: arm64/arm64 arm64/include conf modules X-SVN-Commit-Revision: 331022 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 19:56:45 -0000 Author: kevans Date: Thu Mar 15 19:56:44 2018 New Revision: 331022 URL: https://svnweb.freebsd.org/changeset/base/331022 Log: MFC r324495: Support the EFI Runtime Services on arm64. As with amd64 we use the 1:1 mapping. This uses the new common code shared with amd64. The RTC should only be accessed via EFI. There is no locking around it as the spec only has this as a requirement for the PC-AT CMOS device. NOTE: r326311's changes to arm64/efirt_machdep.c have been hand-applied to this import of efirt_machdep.c due to r326311 having already been merged. Added: stable/11/sys/arm64/arm64/efirt_machdep.c - copied, changed from r324495, head/sys/arm64/arm64/efirt_machdep.c Modified: stable/11/sys/arm64/arm64/machdep.c stable/11/sys/arm64/include/efi.h stable/11/sys/conf/files.arm64 stable/11/sys/conf/options.arm64 stable/11/sys/modules/Makefile Directory Properties: stable/11/ (props changed) Copied and modified: stable/11/sys/arm64/arm64/efirt_machdep.c (from r324495, head/sys/arm64/arm64/efirt_machdep.c) ============================================================================== --- head/sys/arm64/arm64/efirt_machdep.c Tue Oct 10 13:05:26 2017 (r324495, copy source) +++ stable/11/sys/arm64/arm64/efirt_machdep.c Thu Mar 15 19:56:44 2018 (r331022) @@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$"); static vm_object_t obj_1t1_pt; static vm_page_t efi_l0_page; static pd_entry_t *efi_l0; +static vm_pindex_t efi_1t1_idx; void efi_destroy_1t1_map(void) @@ -86,10 +87,10 @@ efi_destroy_1t1_map(void) } static vm_page_t -efi_1t1_page(vm_pindex_t idx) +efi_1t1_page(void) { - return (vm_page_grab(obj_1t1_pt, idx, VM_ALLOC_NOBUSY | + return (vm_page_grab(obj_1t1_pt, efi_1t1_idx++, VM_ALLOC_NOBUSY | VM_ALLOC_WIRED | VM_ALLOC_ZERO)); } @@ -105,7 +106,7 @@ efi_1t1_l3(vm_offset_t va) l0_idx = pmap_l0_index(va); l0 = &efi_l0[l0_idx]; if (*l0 == 0) { - m = efi_1t1_page(1 + l0_idx); + m = efi_1t1_page(); mphys = VM_PAGE_TO_PHYS(m); *l0 = mphys | L0_TABLE; } else { @@ -116,7 +117,7 @@ efi_1t1_l3(vm_offset_t va) l1_idx = pmap_l1_index(va); l1 += l1_idx; if (*l1 == 0) { - m = efi_1t1_page(1 + L0_ENTRIES + (l0_idx + 1) * (l1_idx + 1)); + m = efi_1t1_page(); mphys = VM_PAGE_TO_PHYS(m); *l1 = mphys | L1_TABLE; } else { @@ -127,8 +128,7 @@ efi_1t1_l3(vm_offset_t va) l2_idx = pmap_l2_index(va); l2 += l2_idx; if (*l2 == 0) { - m = efi_1t1_page(1 + L0_ENTRIES + L0_ENTRIES * Ln_ENTRIES + - (l0_idx + 1) * (l1_idx + 1) * (l2_idx + 1)); + m = efi_1t1_page(); mphys = VM_PAGE_TO_PHYS(m); *l2 = mphys | L2_TABLE; } else { @@ -160,7 +160,8 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int L0_ENTRIES * Ln_ENTRIES * Ln_ENTRIES * Ln_ENTRIES, VM_PROT_ALL, 0, NULL); VM_OBJECT_WLOCK(obj_1t1_pt); - efi_l0_page = efi_1t1_page(0); + efi_1t1_idx = 0; + efi_l0_page = efi_1t1_page(); VM_OBJECT_WUNLOCK(obj_1t1_pt); efi_l0 = (pd_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(efi_l0_page)); bzero(efi_l0, L0_ENTRIES * sizeof(*efi_l0)); Modified: stable/11/sys/arm64/arm64/machdep.c ============================================================================== --- stable/11/sys/arm64/arm64/machdep.c Thu Mar 15 19:41:26 2018 (r331021) +++ stable/11/sys/arm64/arm64/machdep.c Thu Mar 15 19:56:44 2018 (r331022) @@ -111,6 +111,12 @@ int64_t idcache_line_size; /* The minimum cache line s int64_t dczva_line_size; /* The size of cache line the dc zva zeroes */ int has_pan; +/* + * Physical address of the EFI System Table. Stashed from the metadata hints + * passed into the kernel and used by the EFI code to call runtime services. + */ +vm_paddr_t efi_systbl_phys; + /* pagezero_* implementations are provided in support.S */ void pagezero_simple(void *); void pagezero_cache(void *); @@ -910,6 +916,8 @@ initarm(struct arm64_bootparams *abp) #ifdef FDT try_load_dtb(kmdp); #endif + + efi_systbl_phys = MD_FETCH(kmdp, MODINFOMD_FW_HANDLE, vm_paddr_t); /* Find the address to start allocating from */ lastaddr = MD_FETCH(kmdp, MODINFOMD_KERNEND, vm_offset_t); Modified: stable/11/sys/arm64/include/efi.h ============================================================================== --- stable/11/sys/arm64/include/efi.h Thu Mar 15 19:41:26 2018 (r331021) +++ stable/11/sys/arm64/include/efi.h Thu Mar 15 19:56:44 2018 (r331022) @@ -1,6 +1,32 @@ /*- - * This file is in the public domain since it's just boilerplate. + * Copyright (c) 2017 Andrew Turner + * 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$ */ @@ -8,5 +34,11 @@ #define __ARM64_INCLUDE_EFI_H_ #define EFIABI_ATTR + +#ifdef _KERNEL +#define EFI_TIME_LOCK() +#define EFI_TIME_UNLOCK() +#define EFI_TIME_OWNED() +#endif #endif /* __ARM64_INCLUDE_EFI_H_ */ Modified: stable/11/sys/conf/files.arm64 ============================================================================== --- stable/11/sys/conf/files.arm64 Thu Mar 15 19:41:26 2018 (r331021) +++ stable/11/sys/conf/files.arm64 Thu Mar 15 19:56:44 2018 (r331022) @@ -35,6 +35,7 @@ arm64/arm64/db_trace.c optional ddb arm64/arm64/debug_monitor.c optional ddb arm64/arm64/disassem.c optional ddb arm64/arm64/dump_machdep.c standard +arm64/arm64/efirt_machdep.c optional efirt arm64/arm64/elf_machdep.c standard arm64/arm64/exception.S standard arm64/arm64/gicv3_its.c optional intrng Modified: stable/11/sys/conf/options.arm64 ============================================================================== --- stable/11/sys/conf/options.arm64 Thu Mar 15 19:41:26 2018 (r331021) +++ stable/11/sys/conf/options.arm64 Thu Mar 15 19:56:44 2018 (r331022) @@ -7,6 +7,10 @@ SOCDEV_VA opt_global.h THUNDERX_PASS_1_1_ERRATA opt_global.h VFP opt_global.h +# EFI Runtime services support +EFIRT opt_efirt.h + +# Devices DEV_PSCI opt_platform.h # SoC Support Modified: stable/11/sys/modules/Makefile ============================================================================== --- stable/11/sys/modules/Makefile Thu Mar 15 19:41:26 2018 (r331021) +++ stable/11/sys/modules/Makefile Thu Mar 15 19:56:44 2018 (r331022) @@ -560,6 +560,7 @@ _cxgb= cxgb .endif .if ${MACHINE_CPUARCH} == "aarch64" +_efirt= efirt _em= em _igb= igb .endif From owner-svn-src-stable@freebsd.org Thu Mar 15 19:58:16 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 895A7F4E4F2 for ; Thu, 15 Mar 2018 19:58:16 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-yw0-x22a.google.com (mail-yw0-x22a.google.com [IPv6:2607:f8b0:4002:c05::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 1D64975102 for ; Thu, 15 Mar 2018 19:58:16 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-yw0-x22a.google.com with SMTP id y23so5471663ywy.4 for ; Thu, 15 Mar 2018 12:58:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=+hW73opUtP+J1jMUz1VqsGdiFD7KPLYktSf73o1nk6M=; b=JH4nC21PvK6P0zMdYL9iNp+NgfXWjalSnEsGzC4Mtr8Gj/M/TEKlreKHkiDAfCxZkc 1TOJQ4DxosRX6usLqDs6lq/nf6JlLywkOUWNd6rDUt1FBmFaBlT+7eUUhe16ve9OPe4K H0YeK0hxaxgBeyDhb2pgZ7QqjuktK+5WJvklYchWvB5f+L/zkobqTo5UDQFvf82P+uPT +hbqK1M+kGElJE9OVVndUa1E7QUrmnuqaNbJEhTf0FUqa7lzLPxdZPJFAWgD3w1PVs3J E9XUsjOnPp4Qc1phS5zex7Ul7M67Vt9YVml8XGORY7J/tMjgE3m9racwGQY4sqvO4L9t Wrcg== 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=+hW73opUtP+J1jMUz1VqsGdiFD7KPLYktSf73o1nk6M=; b=gyQQJ3yML9MDY70H8QZCmahg27WXfzc/ooIhKj13hOiE/VL9fm421udK+diYNYwoN8 zBl2hJDSSnoecfI0voAc9eDyLVDzgx90tlS1cA22M4QD4OWXmmtdKwgOKxYpaptuxobh k09IlE+XZYmplBobtHqAIPAQ0O7gPdqvHX1lyxImVSI16pNYWYTnb+RADsNuYRWGLtC2 bfl53HgHWsNJD7XnmcYALDfCcxg16S42XqzYeH/bRD/uyd3CkjylOGG8MeF4OVTJ6MSU gX7EPlAFvnVT1MfKhjFhjbOvKRdw3acHg6FOPXeaRzyBGLQk7H6sC4TskdY9MblS883X Dt8g== X-Gm-Message-State: AElRT7EDhnWX8qAfHd36b0Zk02hG9ffOA75otzpuznfBWzpDS5SEjmMU rwElXjr0+lF+o75UaA1n6tHy8PfDhGxYNc/mOaSQGw== X-Google-Smtp-Source: AG47ELukw46aE76UoG72ZtrVwglc5S54d4cYrhUFpvLQy+7hTC3DtHxXe2UOD81Ok2ldmIEZ+R4CApJZgY+FpJSEPa0= X-Received: by 10.129.162.84 with SMTP id z81mr6710723ywg.377.1521143895485; Thu, 15 Mar 2018 12:58:15 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a25:3492:0:0:0:0:0 with HTTP; Thu, 15 Mar 2018 12:58:15 -0700 (PDT) In-Reply-To: <201803151941.w2FJfQJd072993@repo.freebsd.org> References: <201803151941.w2FJfQJd072993@repo.freebsd.org> From: Oliver Pinter Date: Thu, 15 Mar 2018 20:58:15 +0100 Message-ID: Subject: Re: svn commit: r331021 - stable/11/sys/dev/efidev To: Kyle Evans Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 19:58:16 -0000 On 3/15/18, Kyle Evans wrote: > Author: kevans > Date: Thu Mar 15 19:41:26 2018 > New Revision: 331021 > URL: https://svnweb.freebsd.org/changeset/base/331021 > > Log: > r322279: Don't create /dev/efi without EFI runtime Hi! Is this an MFC or a direct commit to 11-stable? > > Turns out to be even simpler to just not create /dev/efi if we don't > have a efi runtime. > > Modified: > stable/11/sys/dev/efidev/efidev.c > Directory Properties: > stable/11/ (props changed) > > Modified: stable/11/sys/dev/efidev/efidev.c > ============================================================================== > --- stable/11/sys/dev/efidev/efidev.c Thu Mar 15 19:32:33 2018 (r331020) > +++ stable/11/sys/dev/efidev/efidev.c Thu Mar 15 19:41:26 2018 (r331021) > @@ -39,28 +39,15 @@ __FBSDID("$FreeBSD$"); > #include > #include > > -static d_open_t efidev_open; > static d_ioctl_t efidev_ioctl; > > static struct cdevsw efi_cdevsw = { > .d_name = "efi", > .d_version = D_VERSION, > - .d_open = efidev_open, > .d_ioctl = efidev_ioctl, > }; > > static int > -efidev_open(struct cdev *dev __unused, int oflags __unused, > - int devtype __unused, struct thread *td __unused) > -{ > - /* > - * Only return success when we have an actual runtime to call. > - */ > - > - return efi_rt_ok(); > -} > - > -static int > efidev_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t addr, > int flags __unused, struct thread *td __unused) > { > @@ -195,6 +182,11 @@ efidev_modevents(module_t m, int event, void *arg __un > > switch (event) { > case MOD_LOAD: > + /* > + * If we have no efi environment, then don't create the device. > + */ > + if (efi_rt_ok() != 0) > + return (0); > make_dev_args_init(&mda); > mda.mda_flags = MAKEDEV_WAITOK | MAKEDEV_CHECKNAME; > mda.mda_devsw = &efi_cdevsw; > _______________________________________________ > 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" > From owner-svn-src-stable@freebsd.org Thu Mar 15 20:00:41 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D3485F4E76E; Thu, 15 Mar 2018 20:00:41 +0000 (UTC) (envelope-from byond.lenox@gmail.com) Received: from mail-lf0-f45.google.com (mail-lf0-f45.google.com [209.85.215.45]) (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 6164975323; Thu, 15 Mar 2018 20:00:41 +0000 (UTC) (envelope-from byond.lenox@gmail.com) Received: by mail-lf0-f45.google.com with SMTP id x205-v6so12055355lfa.0; Thu, 15 Mar 2018 13:00:41 -0700 (PDT) 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=z81zzIcCYKMF35JDsLA1p7Yq+i7uk7U8OUUZ8LaLw8M=; b=b50XDuZcoaryJBU2IKxAvvYsF8QGsNlCDihw/UGVK3JADcRay8VOnySbo3oGoG7P35 sU1nrFLgWUL9CibmAhh+re1JjHyNRtoWZ7sBqMfva7YvcEwhfbF288fKHHlH4Z6e5tzv pf53Mc1pJi1d5wxRWnNToy2X+zi//4PNVdi/OG0JxwU4QsfVETkfiTOnIRIzC14/7Cbt SMonIVw4ri34+Lq7LlPbZY7z46n5POBDYX8NLSDyWFBx0s6FDcHgB59yGZFGAk52YW4q l9gHXd1VEskJGlX7hiE8GqeD6I6p67wZI4CALko/6E84Oia/LDgYPfxdbtximfuBbIrt OV6Q== X-Gm-Message-State: AElRT7G41dbjWiNT26ExnOjp1Hqz30i1ZQJ9eyeybDqkkM+fugT/6H9f pLjnbzVbwg7bWk9/qItxgWLuXcFVFao= X-Google-Smtp-Source: AG47ELtlMr8KsGCzY/vVh+go4OCOd0xZj9g1hQl4TcJizl8Oeh7+cEFgyLu84nt9J1HZ2XtO0TvNHw== X-Received: by 10.46.46.8 with SMTP id u8mr3127899lju.110.1521144033325; Thu, 15 Mar 2018 13:00:33 -0700 (PDT) Received: from mail-lf0-f51.google.com (mail-lf0-f51.google.com. [209.85.215.51]) by smtp.gmail.com with ESMTPSA id b67-v6sm1357504lfh.26.2018.03.15.13.00.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Mar 2018 13:00:33 -0700 (PDT) Received: by mail-lf0-f51.google.com with SMTP id y19-v6so12052262lfd.4; Thu, 15 Mar 2018 13:00:33 -0700 (PDT) X-Received: by 10.46.83.87 with SMTP id t23mr7438244ljd.38.1521144032990; Thu, 15 Mar 2018 13:00:32 -0700 (PDT) MIME-Version: 1.0 Received: by 10.46.54.1 with HTTP; Thu, 15 Mar 2018 13:00:12 -0700 (PDT) In-Reply-To: References: <201803151941.w2FJfQJd072993@repo.freebsd.org> From: Kyle Evans Date: Thu, 15 Mar 2018 15:00:12 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r331021 - stable/11/sys/dev/efidev To: Oliver Pinter Cc: Kyle Evans , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 20:00:42 -0000 On Thu, Mar 15, 2018 at 2:58 PM, Oliver Pinter wrote: > On 3/15/18, Kyle Evans wrote: >> Author: kevans >> Date: Thu Mar 15 19:41:26 2018 >> New Revision: 331021 >> URL: https://svnweb.freebsd.org/changeset/base/331021 >> >> Log: >> r322279: Don't create /dev/efi without EFI runtime > Hi! > > Is this an MFC or a direct commit to 11-stable? > Whoops, sorry, I did indeed drop the MFC prefix. Should read: "MFC r322279: Don't create /dev/efi without EFI runtime" From owner-svn-src-stable@freebsd.org Thu Mar 15 20:09:26 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 26239F4F3AD; Thu, 15 Mar 2018 20:09:26 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CB4A575B97; Thu, 15 Mar 2018 20:09:25 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AC9291A858; Thu, 15 Mar 2018 20:09:25 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FK9Psw085214; Thu, 15 Mar 2018 20:09:25 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FK9PXg085209; Thu, 15 Mar 2018 20:09:25 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803152009.w2FK9PXg085209@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 15 Mar 2018 20:09: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: r331023 - in stable/11/sys: arm64/arm64 arm64/include conf modules X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable/11/sys: arm64/arm64 arm64/include conf modules X-SVN-Commit-Revision: 331023 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 20:09:26 -0000 Author: kevans Date: Thu Mar 15 20:09:24 2018 New Revision: 331023 URL: https://svnweb.freebsd.org/changeset/base/331023 Log: Revert r331022: MFC of EFI Runtime Service support on aarch64 Apologies; this is NOT an MFC'able change. It requires a good number of pcb changes that would break KBI. Pointy hat to: me Deleted: stable/11/sys/arm64/arm64/efirt_machdep.c Modified: stable/11/sys/arm64/arm64/machdep.c stable/11/sys/arm64/include/efi.h stable/11/sys/conf/files.arm64 stable/11/sys/conf/options.arm64 stable/11/sys/modules/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm64/arm64/machdep.c ============================================================================== --- stable/11/sys/arm64/arm64/machdep.c Thu Mar 15 19:56:44 2018 (r331022) +++ stable/11/sys/arm64/arm64/machdep.c Thu Mar 15 20:09:24 2018 (r331023) @@ -111,12 +111,6 @@ int64_t idcache_line_size; /* The minimum cache line s int64_t dczva_line_size; /* The size of cache line the dc zva zeroes */ int has_pan; -/* - * Physical address of the EFI System Table. Stashed from the metadata hints - * passed into the kernel and used by the EFI code to call runtime services. - */ -vm_paddr_t efi_systbl_phys; - /* pagezero_* implementations are provided in support.S */ void pagezero_simple(void *); void pagezero_cache(void *); @@ -916,8 +910,6 @@ initarm(struct arm64_bootparams *abp) #ifdef FDT try_load_dtb(kmdp); #endif - - efi_systbl_phys = MD_FETCH(kmdp, MODINFOMD_FW_HANDLE, vm_paddr_t); /* Find the address to start allocating from */ lastaddr = MD_FETCH(kmdp, MODINFOMD_KERNEND, vm_offset_t); Modified: stable/11/sys/arm64/include/efi.h ============================================================================== --- stable/11/sys/arm64/include/efi.h Thu Mar 15 19:56:44 2018 (r331022) +++ stable/11/sys/arm64/include/efi.h Thu Mar 15 20:09:24 2018 (r331023) @@ -1,32 +1,6 @@ /*- - * Copyright (c) 2017 Andrew Turner - * All rights reserved. + * This file is in the public domain since it's just boilerplate. * - * 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$ */ @@ -34,11 +8,5 @@ #define __ARM64_INCLUDE_EFI_H_ #define EFIABI_ATTR - -#ifdef _KERNEL -#define EFI_TIME_LOCK() -#define EFI_TIME_UNLOCK() -#define EFI_TIME_OWNED() -#endif #endif /* __ARM64_INCLUDE_EFI_H_ */ Modified: stable/11/sys/conf/files.arm64 ============================================================================== --- stable/11/sys/conf/files.arm64 Thu Mar 15 19:56:44 2018 (r331022) +++ stable/11/sys/conf/files.arm64 Thu Mar 15 20:09:24 2018 (r331023) @@ -35,7 +35,6 @@ arm64/arm64/db_trace.c optional ddb arm64/arm64/debug_monitor.c optional ddb arm64/arm64/disassem.c optional ddb arm64/arm64/dump_machdep.c standard -arm64/arm64/efirt_machdep.c optional efirt arm64/arm64/elf_machdep.c standard arm64/arm64/exception.S standard arm64/arm64/gicv3_its.c optional intrng Modified: stable/11/sys/conf/options.arm64 ============================================================================== --- stable/11/sys/conf/options.arm64 Thu Mar 15 19:56:44 2018 (r331022) +++ stable/11/sys/conf/options.arm64 Thu Mar 15 20:09:24 2018 (r331023) @@ -7,10 +7,6 @@ SOCDEV_VA opt_global.h THUNDERX_PASS_1_1_ERRATA opt_global.h VFP opt_global.h -# EFI Runtime services support -EFIRT opt_efirt.h - -# Devices DEV_PSCI opt_platform.h # SoC Support Modified: stable/11/sys/modules/Makefile ============================================================================== --- stable/11/sys/modules/Makefile Thu Mar 15 19:56:44 2018 (r331022) +++ stable/11/sys/modules/Makefile Thu Mar 15 20:09:24 2018 (r331023) @@ -560,7 +560,6 @@ _cxgb= cxgb .endif .if ${MACHINE_CPUARCH} == "aarch64" -_efirt= efirt _em= em _igb= igb .endif From owner-svn-src-stable@freebsd.org Thu Mar 15 20:29:49 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 42F84F50CB8; Thu, 15 Mar 2018 20:29:49 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E892C76A7B; Thu, 15 Mar 2018 20:29:48 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C95071AB82; Thu, 15 Mar 2018 20:29:48 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FKTmVc095398; Thu, 15 Mar 2018 20:29:48 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FKTmEG095395; Thu, 15 Mar 2018 20:29:48 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803152029.w2FKTmEG095395@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 15 Mar 2018 20:29:48 +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: r331025 - in stable/11/sys: conf dev/efidev modules/efirt X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable/11/sys: conf dev/efidev modules/efirt X-SVN-Commit-Revision: 331025 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 20:29:49 -0000 Author: kevans Date: Thu Mar 15 20:29:48 2018 New Revision: 331025 URL: https://svnweb.freebsd.org/changeset/base/331025 Log: MFC (partially) r326066, r326121: Add an EFI RTC Driver This is effectively a direct commit to stable/11 to avoid the arm64 bits, as those are unfortunately not able to MFC'd. MFC r326066: Add a driver for the EFI RTC. This uses the EFI Runtime Services to query the system time. MFC r326121: Zero struct efi_tm before setting the needed values. We don't use the dst or timezone fields so ensure these are set. Added: stable/11/sys/dev/efidev/efirtc.c - copied, changed from r326066, head/sys/dev/efidev/efirtc.c Modified: stable/11/sys/conf/files stable/11/sys/modules/efirt/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/conf/files ============================================================================== --- stable/11/sys/conf/files Thu Mar 15 20:25:06 2018 (r331024) +++ stable/11/sys/conf/files Thu Mar 15 20:29:48 2018 (r331025) @@ -1585,6 +1585,7 @@ dev/ed/if_ed_pccard.c optional ed pccard dev/ed/if_ed_pci.c optional ed pci dev/efidev/efidev.c optional efirt dev/efidev/efirt.c optional efirt +dev/efidev/efirtc.c optional efirt dev/eisa/eisa_if.m standard dev/eisa/eisaconf.c optional eisa dev/e1000/if_em.c optional em \ Copied and modified: stable/11/sys/dev/efidev/efirtc.c (from r326066, head/sys/dev/efidev/efirtc.c) ============================================================================== --- head/sys/dev/efidev/efirtc.c Tue Nov 21 17:23:16 2017 (r326066, copy source) +++ stable/11/sys/dev/efidev/efirtc.c Thu Mar 15 20:29:48 2018 (r331025) @@ -116,6 +116,7 @@ efirtc_settime(device_t dev, struct timespec *ts) clock_ts_to_ct(ts, &ct); + bzero(&tm, sizeof(tm)); tm.tm_sec = ct.sec; tm.tm_min = ct.min; tm.tm_hour = ct.hour; Modified: stable/11/sys/modules/efirt/Makefile ============================================================================== --- stable/11/sys/modules/efirt/Makefile Thu Mar 15 20:25:06 2018 (r331024) +++ stable/11/sys/modules/efirt/Makefile Thu Mar 15 20:29:48 2018 (r331025) @@ -5,6 +5,7 @@ KMOD= efirt SRCS= efirt.c efirt_machdep.c efidev.c -SRCS+= device_if.h bus_if.h +SRCS+= efirtc.c +SRCS+= device_if.h bus_if.h clock_if.h .include From owner-svn-src-stable@freebsd.org Thu Mar 15 20:40:28 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1CA36F51A5B; Thu, 15 Mar 2018 20:40:28 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C06D0773D9; Thu, 15 Mar 2018 20:40:27 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BB4571AD10; Thu, 15 Mar 2018 20:40:27 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FKeR7g000647; Thu, 15 Mar 2018 20:40:27 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FKeR82000646; Thu, 15 Mar 2018 20:40:27 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803152040.w2FKeR82000646@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 15 Mar 2018 20:40: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: r331026 - stable/11/sys/amd64/include X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: stable/11/sys/amd64/include X-SVN-Commit-Revision: 331026 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 20:40:28 -0000 Author: kevans Date: Thu Mar 15 20:40:27 2018 New Revision: 331026 URL: https://svnweb.freebsd.org/changeset/base/331026 Log: MFC r324191: Hide kernel stuff from userspace. Modified: stable/11/sys/amd64/include/efi.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/amd64/include/efi.h ============================================================================== --- stable/11/sys/amd64/include/efi.h Thu Mar 15 20:29:48 2018 (r331025) +++ stable/11/sys/amd64/include/efi.h Thu Mar 15 20:40:27 2018 (r331026) @@ -32,8 +32,6 @@ #ifndef __AMD64_INCLUDE_EFI_H_ #define __AMD64_INCLUDE_EFI_H_ -#include - /* * XXX: from gcc 6.2 manual: * Note, the ms_abi attribute for Microsoft Windows 64-bit targets @@ -47,8 +45,12 @@ #define EFIABI_ATTR __attribute__((ms_abi)) #endif +#ifdef _KERNEL +#include + #define EFI_TIME_LOCK() mtx_lock(&atrtc_time_lock); #define EFI_TIME_UNLOCK() mtx_unlock(&atrtc_time_lock); #define EFI_TIME_OWNED() mtx_assert(&atrtc_time_lock, MA_OWNED); +#endif #endif /* __AMD64_INCLUDE_EFI_H_ */ From owner-svn-src-stable@freebsd.org Thu Mar 15 20:43:22 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D23C7F51F22; Thu, 15 Mar 2018 20:43:22 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8502B77850; Thu, 15 Mar 2018 20:43:22 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7F7101AE89; Thu, 15 Mar 2018 20:43:22 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FKhM98005152; Thu, 15 Mar 2018 20:43:22 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FKhMjv005151; Thu, 15 Mar 2018 20:43:22 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803152043.w2FKhMjv005151@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 15 Mar 2018 20:43: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: r331027 - stable/11 X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: stable/11 X-SVN-Commit-Revision: 331027 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 20:43:23 -0000 Author: kevans Date: Thu Mar 15 20:43:22 2018 New Revision: 331027 URL: https://svnweb.freebsd.org/changeset/base/331027 Log: Record-only merge of r330780, r330783 r330780: Eliminate atrtc_time_lock, and use atrtc_lock for efirtc locking. r330783: Revert r330780, it was improperly tested and results in taking a spin mutex before acquiring sleep mutexes. Modified: Directory Properties: stable/11/ (props changed) From owner-svn-src-stable@freebsd.org Thu Mar 15 20:46:35 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4155AF52261; Thu, 15 Mar 2018 20:46:35 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E88A077A60; Thu, 15 Mar 2018 20:46:34 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E38101AE8F; Thu, 15 Mar 2018 20:46:34 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FKkY0V005360; Thu, 15 Mar 2018 20:46:34 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FKkYwl005358; Thu, 15 Mar 2018 20:46:34 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803152046.w2FKkYwl005358@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 15 Mar 2018 20:46: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: r331028 - in stable/11/sys: dev/efidev sys X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable/11/sys: dev/efidev sys X-SVN-Commit-Revision: 331028 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 20:46:35 -0000 Author: kevans Date: Thu Mar 15 20:46:34 2018 New Revision: 331028 URL: https://svnweb.freebsd.org/changeset/base/331028 Log: MFC r330257: Add a function to retrieve the EFI realtime clock capabilities. Modified: stable/11/sys/dev/efidev/efirt.c stable/11/sys/sys/efi.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/efidev/efirt.c ============================================================================== --- stable/11/sys/dev/efidev/efirt.c Thu Mar 15 20:43:22 2018 (r331027) +++ stable/11/sys/dev/efidev/efirt.c Thu Mar 15 20:46:34 2018 (r331028) @@ -242,7 +242,7 @@ efi_get_table(struct uuid *uuid, void **ptr) } static int -efi_get_time_locked(struct efi_tm *tm) +efi_get_time_locked(struct efi_tm *tm, struct efi_tmcap *tmcap) { efi_status status; int error; @@ -251,7 +251,7 @@ efi_get_time_locked(struct efi_tm *tm) error = efi_enter(); if (error != 0) return (error); - status = efi_runtime->rt_gettime(tm, NULL); + status = efi_runtime->rt_gettime(tm, tmcap); efi_leave(); error = efi_status_to_errno(status); return (error); @@ -265,7 +265,21 @@ efi_get_time(struct efi_tm *tm) if (efi_runtime == NULL) return (ENXIO); EFI_TIME_LOCK() - error = efi_get_time_locked(tm); + error = efi_get_time_locked(tm, NULL); + EFI_TIME_UNLOCK() + return (error); +} + +int +efi_get_time_capabilities(struct efi_tmcap *tmcap) +{ + struct efi_tm dummy; + int error; + + if (efi_runtime == NULL) + return (ENXIO); + EFI_TIME_LOCK() + error = efi_get_time_locked(&dummy, tmcap); EFI_TIME_UNLOCK() return (error); } Modified: stable/11/sys/sys/efi.h ============================================================================== --- stable/11/sys/sys/efi.h Thu Mar 15 20:43:22 2018 (r331027) +++ stable/11/sys/sys/efi.h Thu Mar 15 20:46:34 2018 (r331028) @@ -179,6 +179,7 @@ void efi_destroy_1t1_map(void); int efi_rt_ok(void); int efi_get_table(struct uuid *uuid, void **ptr); int efi_get_time(struct efi_tm *tm); +int efi_get_time_capabilities(struct efi_tmcap *tmcap); int efi_reset_system(void); int efi_set_time(struct efi_tm *tm); int efi_var_get(uint16_t *name, struct uuid *vendor, uint32_t *attrib, From owner-svn-src-stable@freebsd.org Thu Mar 15 22:42:29 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 798DEF5A960; Thu, 15 Mar 2018 22:42:29 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2BB487D230; Thu, 15 Mar 2018 22:42:29 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 269851C13B; Thu, 15 Mar 2018 22:42:29 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FMgTvm066852; Thu, 15 Mar 2018 22:42:29 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FMgTfW066851; Thu, 15 Mar 2018 22:42:29 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201803152242.w2FMgTfW066851@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Thu, 15 Mar 2018 22:42:29 +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: r331031 - stable/10 X-SVN-Group: stable-10 X-SVN-Commit-Author: marius X-SVN-Commit-Paths: stable/10 X-SVN-Commit-Revision: 331031 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 22:42:29 -0000 Author: marius Date: Thu Mar 15 22:42:28 2018 New Revision: 331031 URL: https://svnweb.freebsd.org/changeset/base/331031 Log: MFC: r287805 Unconditionally build CTF tools in the bootstrap-tools phase of the build. Stale CTF tools are a frequent source of DTrace issues, and they compile quickly enough that the increase in build time is negligible. Apart from what's described in the original commit message above, this change also fixes building GENERIC kernels, i. e. kernel configurations having "makeoptions WITH_CTF=1", when the host world has been built with WITHOUT_CDDL. Modified: stable/10/Makefile.inc1 Directory Properties: stable/10/ (props changed) Modified: stable/10/Makefile.inc1 ============================================================================== --- stable/10/Makefile.inc1 Thu Mar 15 21:42:49 2018 (r331030) +++ stable/10/Makefile.inc1 Thu Mar 15 22:42:28 2018 (r331031) @@ -1371,11 +1371,9 @@ ${_bt}-usr.bin/clang/clang-tblgen: ${_bt}-lib/clang/li ${_bt}-usr.bin/clang/tblgen: ${_bt}-lib/clang/libllvmtablegen ${_bt}-lib/clang/libllvmsupport .endif -# dtrace tools are required for older bootstrap env and cross-build -.if ${MK_CDDL} != "no" && \ - ((${BOOTSTRAPPING} < 1000034 && \ - !(${BOOTSTRAPPING} >= 901505 && ${BOOTSTRAPPING} < 999999)) \ - || (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH})) +# Rebuild ctfconvert and ctfmerge to avoid difficult-to-diagnose failures +# resulting from missing bug fixes or ELF Toolchain updates. +.if ${MK_CDDL} != "no" _dtrace_tools= cddl/lib/libctf lib/libelf \ lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge From owner-svn-src-stable@freebsd.org Thu Mar 15 22:51:11 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31493F5B25D; Thu, 15 Mar 2018 22:51:11 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D45617D74B; Thu, 15 Mar 2018 22:51:10 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CB2381C176; Thu, 15 Mar 2018 22:51:10 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FMpA7D068741; Thu, 15 Mar 2018 22:51:10 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FMpAuS068740; Thu, 15 Mar 2018 22:51:10 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201803152251.w2FMpAuS068740@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Thu, 15 Mar 2018 22:51: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: r331032 - stable/11/sys/dev/sdhci X-SVN-Group: stable-11 X-SVN-Commit-Author: marius X-SVN-Commit-Paths: stable/11/sys/dev/sdhci X-SVN-Commit-Revision: 331032 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 22:51:11 -0000 Author: marius Date: Thu Mar 15 22:51:10 2018 New Revision: 331032 URL: https://svnweb.freebsd.org/changeset/base/331032 Log: MFC: r327315 Add quirks for Intel Denverton eMMC 5.0 controllers. Modified: stable/11/sys/dev/sdhci/sdhci_pci.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/sdhci/sdhci_pci.c ============================================================================== --- stable/11/sys/dev/sdhci/sdhci_pci.c Thu Mar 15 22:42:28 2018 (r331031) +++ stable/11/sys/dev/sdhci/sdhci_pci.c Thu Mar 15 22:51:10 2018 (r331032) @@ -120,6 +120,12 @@ static const struct sdhci_device { SDHCI_QUIRK_MMC_DDR52 | SDHCI_QUIRK_CAPS_BIT63_FOR_MMC_HS400 | SDHCI_QUIRK_PRESET_VALUE_BROKEN }, + { 0x19db8086, 0xffff, "Intel Denverton eMMC 5.0 Controller", + SDHCI_QUIRK_INTEL_POWER_UP_RESET | + SDHCI_QUIRK_WAIT_WHILE_BUSY | + SDHCI_QUIRK_MMC_DDR52 | + SDHCI_QUIRK_CAPS_BIT63_FOR_MMC_HS400 | + SDHCI_QUIRK_PRESET_VALUE_BROKEN }, { 0x22948086, 0xffff, "Intel Braswell eMMC 4.5.1 Controller", SDHCI_QUIRK_DATA_TIMEOUT_1MHZ | SDHCI_QUIRK_INTEL_POWER_UP_RESET | From owner-svn-src-stable@freebsd.org Thu Mar 15 22:51:14 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1CCA2F5B2A3; Thu, 15 Mar 2018 22:51:14 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BFD5D7D755; Thu, 15 Mar 2018 22:51:13 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BAD5C1C17A; Thu, 15 Mar 2018 22:51:13 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FMpDaR068788; Thu, 15 Mar 2018 22:51:13 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FMpDG5068787; Thu, 15 Mar 2018 22:51:13 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201803152251.w2FMpDG5068787@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Thu, 15 Mar 2018 22:51:13 +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: r331033 - stable/10/sys/dev/sdhci X-SVN-Group: stable-10 X-SVN-Commit-Author: marius X-SVN-Commit-Paths: stable/10/sys/dev/sdhci X-SVN-Commit-Revision: 331033 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 22:51:14 -0000 Author: marius Date: Thu Mar 15 22:51:13 2018 New Revision: 331033 URL: https://svnweb.freebsd.org/changeset/base/331033 Log: MFC: r327315 Add quirks for Intel Denverton eMMC 5.0 controllers. Modified: stable/10/sys/dev/sdhci/sdhci_pci.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/sdhci/sdhci_pci.c ============================================================================== --- stable/10/sys/dev/sdhci/sdhci_pci.c Thu Mar 15 22:51:10 2018 (r331032) +++ stable/10/sys/dev/sdhci/sdhci_pci.c Thu Mar 15 22:51:13 2018 (r331033) @@ -118,6 +118,12 @@ static const struct sdhci_device { SDHCI_QUIRK_MMC_DDR52 | SDHCI_QUIRK_CAPS_BIT63_FOR_MMC_HS400 | SDHCI_QUIRK_PRESET_VALUE_BROKEN }, + { 0x19db8086, 0xffff, "Intel Denverton eMMC 5.0 Controller", + SDHCI_QUIRK_INTEL_POWER_UP_RESET | + SDHCI_QUIRK_WAIT_WHILE_BUSY | + SDHCI_QUIRK_MMC_DDR52 | + SDHCI_QUIRK_CAPS_BIT63_FOR_MMC_HS400 | + SDHCI_QUIRK_PRESET_VALUE_BROKEN }, { 0x22948086, 0xffff, "Intel Braswell eMMC 4.5.1 Controller", SDHCI_QUIRK_DATA_TIMEOUT_1MHZ | SDHCI_QUIRK_INTEL_POWER_UP_RESET | From owner-svn-src-stable@freebsd.org Thu Mar 15 22:58:31 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A3EDAF5BA3E; Thu, 15 Mar 2018 22:58:31 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 56E047DCBC; Thu, 15 Mar 2018 22:58:31 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 51A191C2CC; Thu, 15 Mar 2018 22:58:31 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FMwVwO071991; Thu, 15 Mar 2018 22:58:31 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FMwVms071990; Thu, 15 Mar 2018 22:58:31 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201803152258.w2FMwVms071990@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Thu, 15 Mar 2018 22:58: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: r331034 - stable/11/sys/dev/sdhci X-SVN-Group: stable-11 X-SVN-Commit-Author: marius X-SVN-Commit-Paths: stable/11/sys/dev/sdhci X-SVN-Commit-Revision: 331034 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 22:58:31 -0000 Author: marius Date: Thu Mar 15 22:58:31 2018 New Revision: 331034 URL: https://svnweb.freebsd.org/changeset/base/331034 Log: MFC: r327339, r327924 - There is no need to keep the tuning error and re-tuning interrupts enabled (though, no interrupt generation enabled for them) all the time as soon as (re-)tuning is supported; only enable them and let them generate interrupts when actually using (re-)tuning. - Also disable all interrupts except SDHCI_INT_DATA_AVAIL ones while executing tuning and not just their signaling. - Set the tuning error and re-tuning interrupt enable bits based on the SDHCI_TUNING_ENABLED rather than the SDHCI_TUNING_SUPPORTED flag, i. e. only when (re-)tuning is actually used. Currently, this change makes no net difference, though. Modified: stable/11/sys/dev/sdhci/sdhci.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/sdhci/sdhci.c ============================================================================== --- stable/11/sys/dev/sdhci/sdhci.c Thu Mar 15 22:51:13 2018 (r331033) +++ stable/11/sys/dev/sdhci/sdhci.c Thu Mar 15 22:58:31 2018 (r331034) @@ -255,7 +255,7 @@ sdhci_tuning_intmask(struct sdhci_slot *slot) uint32_t intmask; intmask = 0; - if (slot->opt & SDHCI_TUNING_SUPPORTED) { + if (slot->opt & SDHCI_TUNING_ENABLED) { intmask |= SDHCI_INT_TUNEERR; if (slot->retune_mode == SDHCI_RETUNE_MODE_2 || slot->retune_mode == SDHCI_RETUNE_MODE_3) @@ -283,7 +283,7 @@ sdhci_init(struct sdhci_slot *slot) slot->intmask |= SDHCI_INT_CARD_REMOVE | SDHCI_INT_CARD_INSERT; } - WR4(slot, SDHCI_INT_ENABLE, slot->intmask | sdhci_tuning_intmask(slot)); + WR4(slot, SDHCI_INT_ENABLE, slot->intmask); WR4(slot, SDHCI_SIGNAL_ENABLE, slot->intmask); } @@ -575,6 +575,7 @@ sdhci_card_task(void *arg, int pending __unused) d = slot->dev; slot->dev = NULL; slot->intmask &= ~sdhci_tuning_intmask(slot); + WR4(slot, SDHCI_INT_ENABLE, slot->intmask); WR4(slot, SDHCI_SIGNAL_ENABLE, slot->intmask); slot->opt &= ~SDHCI_TUNING_ENABLED; SDHCI_UNLOCK(slot); @@ -1251,6 +1252,7 @@ sdhci_generic_tune(device_t brdev __unused, device_t r if (err == 0) { slot->opt |= SDHCI_TUNING_ENABLED; slot->intmask |= sdhci_tuning_intmask(slot); + WR4(slot, SDHCI_INT_ENABLE, slot->intmask); WR4(slot, SDHCI_SIGNAL_ENABLE, slot->intmask); if (slot->retune_ticks) { callout_reset(&slot->retune_callout, slot->retune_ticks, @@ -1319,6 +1321,7 @@ sdhci_exec_tuning(struct sdhci_slot *slot, bool reset) */ intmask = slot->intmask; slot->intmask = SDHCI_INT_DATA_AVAIL; + WR4(slot, SDHCI_INT_ENABLE, SDHCI_INT_DATA_AVAIL); WR4(slot, SDHCI_SIGNAL_ENABLE, SDHCI_INT_DATA_AVAIL); hostctrl2 = RD2(slot, SDHCI_HOST_CONTROL2); @@ -1349,8 +1352,17 @@ sdhci_exec_tuning(struct sdhci_slot *slot, bool reset) DELAY(1000); } + /* + * Restore DMA usage and interrupts. + * Note that the interrupt aggregation code might have cleared + * SDHCI_INT_DMA_END and/or SDHCI_INT_RESPONSE in slot->intmask + * and SDHCI_SIGNAL_ENABLE respectively so ensure SDHCI_INT_ENABLE + * doesn't lose these. + */ slot->opt = opt; slot->intmask = intmask; + WR4(slot, SDHCI_INT_ENABLE, intmask | SDHCI_INT_DMA_END | + SDHCI_INT_RESPONSE); WR4(slot, SDHCI_SIGNAL_ENABLE, intmask); if ((hostctrl2 & (SDHCI_CTRL2_EXEC_TUNING | From owner-svn-src-stable@freebsd.org Thu Mar 15 22:58:34 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AEAC4F5BA6D; Thu, 15 Mar 2018 22:58:34 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 62B9B7DCC7; Thu, 15 Mar 2018 22:58:34 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5D9981C2CD; Thu, 15 Mar 2018 22:58:34 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FMwYjq072041; Thu, 15 Mar 2018 22:58:34 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FMwYP7072040; Thu, 15 Mar 2018 22:58:34 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201803152258.w2FMwYP7072040@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Thu, 15 Mar 2018 22:58: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: r331035 - stable/10/sys/dev/sdhci X-SVN-Group: stable-10 X-SVN-Commit-Author: marius X-SVN-Commit-Paths: stable/10/sys/dev/sdhci X-SVN-Commit-Revision: 331035 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 22:58:35 -0000 Author: marius Date: Thu Mar 15 22:58:34 2018 New Revision: 331035 URL: https://svnweb.freebsd.org/changeset/base/331035 Log: MFC: r327339, r327924 - There is no need to keep the tuning error and re-tuning interrupts enabled (though, no interrupt generation enabled for them) all the time as soon as (re-)tuning is supported; only enable them and let them generate interrupts when actually using (re-)tuning. - Also disable all interrupts except SDHCI_INT_DATA_AVAIL ones while executing tuning and not just their signaling. - Set the tuning error and re-tuning interrupt enable bits based on the SDHCI_TUNING_ENABLED rather than the SDHCI_TUNING_SUPPORTED flag, i. e. only when (re-)tuning is actually used. Currently, this change makes no net difference, though. Modified: stable/10/sys/dev/sdhci/sdhci.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/sdhci/sdhci.c ============================================================================== --- stable/10/sys/dev/sdhci/sdhci.c Thu Mar 15 22:58:31 2018 (r331034) +++ stable/10/sys/dev/sdhci/sdhci.c Thu Mar 15 22:58:34 2018 (r331035) @@ -254,7 +254,7 @@ sdhci_tuning_intmask(struct sdhci_slot *slot) uint32_t intmask; intmask = 0; - if (slot->opt & SDHCI_TUNING_SUPPORTED) { + if (slot->opt & SDHCI_TUNING_ENABLED) { intmask |= SDHCI_INT_TUNEERR; if (slot->retune_mode == SDHCI_RETUNE_MODE_2 || slot->retune_mode == SDHCI_RETUNE_MODE_3) @@ -282,7 +282,7 @@ sdhci_init(struct sdhci_slot *slot) slot->intmask |= SDHCI_INT_CARD_REMOVE | SDHCI_INT_CARD_INSERT; } - WR4(slot, SDHCI_INT_ENABLE, slot->intmask | sdhci_tuning_intmask(slot)); + WR4(slot, SDHCI_INT_ENABLE, slot->intmask); WR4(slot, SDHCI_SIGNAL_ENABLE, slot->intmask); } @@ -574,6 +574,7 @@ sdhci_card_task(void *arg, int pending __unused) d = slot->dev; slot->dev = NULL; slot->intmask &= ~sdhci_tuning_intmask(slot); + WR4(slot, SDHCI_INT_ENABLE, slot->intmask); WR4(slot, SDHCI_SIGNAL_ENABLE, slot->intmask); slot->opt &= ~SDHCI_TUNING_ENABLED; SDHCI_UNLOCK(slot); @@ -1250,6 +1251,7 @@ sdhci_generic_tune(device_t brdev __unused, device_t r if (err == 0) { slot->opt |= SDHCI_TUNING_ENABLED; slot->intmask |= sdhci_tuning_intmask(slot); + WR4(slot, SDHCI_INT_ENABLE, slot->intmask); WR4(slot, SDHCI_SIGNAL_ENABLE, slot->intmask); if (slot->retune_ticks) { callout_reset(&slot->retune_callout, slot->retune_ticks, @@ -1318,6 +1320,7 @@ sdhci_exec_tuning(struct sdhci_slot *slot, bool reset) */ intmask = slot->intmask; slot->intmask = SDHCI_INT_DATA_AVAIL; + WR4(slot, SDHCI_INT_ENABLE, SDHCI_INT_DATA_AVAIL); WR4(slot, SDHCI_SIGNAL_ENABLE, SDHCI_INT_DATA_AVAIL); hostctrl2 = RD2(slot, SDHCI_HOST_CONTROL2); @@ -1348,8 +1351,17 @@ sdhci_exec_tuning(struct sdhci_slot *slot, bool reset) DELAY(1000); } + /* + * Restore DMA usage and interrupts. + * Note that the interrupt aggregation code might have cleared + * SDHCI_INT_DMA_END and/or SDHCI_INT_RESPONSE in slot->intmask + * and SDHCI_SIGNAL_ENABLE respectively so ensure SDHCI_INT_ENABLE + * doesn't lose these. + */ slot->opt = opt; slot->intmask = intmask; + WR4(slot, SDHCI_INT_ENABLE, intmask | SDHCI_INT_DMA_END | + SDHCI_INT_RESPONSE); WR4(slot, SDHCI_SIGNAL_ENABLE, intmask); if ((hostctrl2 & (SDHCI_CTRL2_EXEC_TUNING | From owner-svn-src-stable@freebsd.org Thu Mar 15 23:01:01 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E1394F5BD8F; Thu, 15 Mar 2018 23:01:00 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 979D17E0EB; Thu, 15 Mar 2018 23:01:00 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9293D1C2F2; Thu, 15 Mar 2018 23:01:00 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FN100p072260; Thu, 15 Mar 2018 23:01:00 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FN101m072259; Thu, 15 Mar 2018 23:01:00 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201803152301.w2FN101m072259@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Thu, 15 Mar 2018 23:01:00 +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: r331036 - stable/11/sys/dev/mmc X-SVN-Group: stable-11 X-SVN-Commit-Author: marius X-SVN-Commit-Paths: stable/11/sys/dev/mmc X-SVN-Commit-Revision: 331036 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 23:01:01 -0000 Author: marius Date: Thu Mar 15 23:01:00 2018 New Revision: 331036 URL: https://svnweb.freebsd.org/changeset/base/331036 Log: MFC: r327355, r327926 - Don't allow userland to switch partitions; it's next to impossible to recover from that, especially when something goes wrong. - When userland changes EXT_CSD, update the kernel copy before using relevant EXT_CSD bits in mmcsd_switch_part(). Modified: stable/11/sys/dev/mmc/mmcsd.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/mmc/mmcsd.c ============================================================================== --- stable/11/sys/dev/mmc/mmcsd.c Thu Mar 15 22:58:34 2018 (r331035) +++ stable/11/sys/dev/mmc/mmcsd.c Thu Mar 15 23:01:00 2018 (r331036) @@ -916,6 +916,16 @@ mmcsd_ioctl_cmd(struct mmcsd_part *part, struct mmc_io default: break; } + /* + * No partition switching in userland; it's almost impossible + * to recover from that, especially if things go wrong. + */ + if (cmd.opcode == MMC_SWITCH_FUNC && dp != NULL && + (((uint8_t *)dp)[EXT_CSD_PART_CONFIG] & + EXT_CSD_PART_CONFIG_ACC_MASK) != part->type) { + err = EINVAL; + goto out; + } } dev = sc->dev; mmcbus = sc->mmcbus; @@ -936,7 +946,7 @@ mmcsd_ioctl_cmd(struct mmcsd_part *part, struct mmc_io if (part->type == EXT_CSD_PART_CONFIG_ACC_RPMB) { /* * If the request went to the RPMB partition, try to ensure - * that the command actually has completed ... + * that the command actually has completed. */ retries = MMCSD_CMD_RETRIES; do { @@ -948,13 +958,6 @@ mmcsd_ioctl_cmd(struct mmcsd_part *part, struct mmc_io break; DELAY(1000); } while (retries-- > 0); - -switch_back: - /* ... and always switch back to the default partition. */ - err = mmcsd_switch_part(mmcbus, dev, rca, - EXT_CSD_PART_CONFIG_ACC_DEFAULT); - if (err != MMC_ERR_NONE) - goto release; } /* * If EXT_CSD was changed, our copy is outdated now. Specifically, @@ -963,6 +966,17 @@ switch_back: */ if (cmd.opcode == MMC_SWITCH_FUNC) { err = mmc_send_ext_csd(mmcbus, dev, sc->ext_csd); + if (err != MMC_ERR_NONE) + goto release; + } +switch_back: + if (part->type == EXT_CSD_PART_CONFIG_ACC_RPMB) { + /* + * If the request went to the RPMB partition, always switch + * back to the default partition (see mmcsd_switch_part()). + */ + err = mmcsd_switch_part(mmcbus, dev, rca, + EXT_CSD_PART_CONFIG_ACC_DEFAULT); if (err != MMC_ERR_NONE) goto release; } From owner-svn-src-stable@freebsd.org Thu Mar 15 23:01:08 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EBB64F5BDC4; Thu, 15 Mar 2018 23:01:07 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 027467E13F; Thu, 15 Mar 2018 23:01:04 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BCF9B1C2F7; Thu, 15 Mar 2018 23:01:04 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FN14vq073094; Thu, 15 Mar 2018 23:01:04 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FN14Hs073093; Thu, 15 Mar 2018 23:01:04 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201803152301.w2FN14Hs073093@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Thu, 15 Mar 2018 23:01: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: r331037 - stable/10/sys/dev/mmc X-SVN-Group: stable-10 X-SVN-Commit-Author: marius X-SVN-Commit-Paths: stable/10/sys/dev/mmc X-SVN-Commit-Revision: 331037 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 23:01:08 -0000 Author: marius Date: Thu Mar 15 23:01:04 2018 New Revision: 331037 URL: https://svnweb.freebsd.org/changeset/base/331037 Log: MFC: r327355, r327926 - Don't allow userland to switch partitions; it's next to impossible to recover from that, especially when something goes wrong. - When userland changes EXT_CSD, update the kernel copy before using relevant EXT_CSD bits in mmcsd_switch_part(). Modified: stable/10/sys/dev/mmc/mmcsd.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/mmc/mmcsd.c ============================================================================== --- stable/10/sys/dev/mmc/mmcsd.c Thu Mar 15 23:01:00 2018 (r331036) +++ stable/10/sys/dev/mmc/mmcsd.c Thu Mar 15 23:01:04 2018 (r331037) @@ -914,6 +914,16 @@ mmcsd_ioctl_cmd(struct mmcsd_part *part, struct mmc_io default: break; } + /* + * No partition switching in userland; it's almost impossible + * to recover from that, especially if things go wrong. + */ + if (cmd.opcode == MMC_SWITCH_FUNC && dp != NULL && + (((uint8_t *)dp)[EXT_CSD_PART_CONFIG] & + EXT_CSD_PART_CONFIG_ACC_MASK) != part->type) { + err = EINVAL; + goto out; + } } dev = sc->dev; mmcbus = sc->mmcbus; @@ -934,7 +944,7 @@ mmcsd_ioctl_cmd(struct mmcsd_part *part, struct mmc_io if (part->type == EXT_CSD_PART_CONFIG_ACC_RPMB) { /* * If the request went to the RPMB partition, try to ensure - * that the command actually has completed ... + * that the command actually has completed. */ retries = MMCSD_CMD_RETRIES; do { @@ -946,13 +956,6 @@ mmcsd_ioctl_cmd(struct mmcsd_part *part, struct mmc_io break; DELAY(1000); } while (retries-- > 0); - -switch_back: - /* ... and always switch back to the default partition. */ - err = mmcsd_switch_part(mmcbus, dev, rca, - EXT_CSD_PART_CONFIG_ACC_DEFAULT); - if (err != MMC_ERR_NONE) - goto release; } /* * If EXT_CSD was changed, our copy is outdated now. Specifically, @@ -961,6 +964,17 @@ switch_back: */ if (cmd.opcode == MMC_SWITCH_FUNC) { err = mmc_send_ext_csd(mmcbus, dev, sc->ext_csd); + if (err != MMC_ERR_NONE) + goto release; + } +switch_back: + if (part->type == EXT_CSD_PART_CONFIG_ACC_RPMB) { + /* + * If the request went to the RPMB partition, always switch + * back to the default partition (see mmcsd_switch_part()). + */ + err = mmcsd_switch_part(mmcbus, dev, rca, + EXT_CSD_PART_CONFIG_ACC_DEFAULT); if (err != MMC_ERR_NONE) goto release; } From owner-svn-src-stable@freebsd.org Thu Mar 15 23:02:53 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1197BF5C163; Thu, 15 Mar 2018 23:02:53 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AB25C7E60F; Thu, 15 Mar 2018 23:02:52 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A3AE21C466; Thu, 15 Mar 2018 23:02:52 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FN2qDM076815; Thu, 15 Mar 2018 23:02:52 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FN2qBB076814; Thu, 15 Mar 2018 23:02:52 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201803152302.w2FN2qBB076814@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Thu, 15 Mar 2018 23:02:52 +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: r331039 - stable/10/sys/dev/mmc X-SVN-Group: stable-10 X-SVN-Commit-Author: marius X-SVN-Commit-Paths: stable/10/sys/dev/mmc X-SVN-Commit-Revision: 331039 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 23:02:53 -0000 Author: marius Date: Thu Mar 15 23:02:52 2018 New Revision: 331039 URL: https://svnweb.freebsd.org/changeset/base/331039 Log: MFC: r327929 Use the correct revision specifier (EXT_CSD revision rather than system specification version) for deciding whether the EXT_CSD register includes the EXT_CSD_GEN_CMD6_TIME field. Submitted by: Masanobu SAITOH Modified: stable/10/sys/dev/mmc/mmc.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/mmc/mmc.c ============================================================================== --- stable/10/sys/dev/mmc/mmc.c Thu Mar 15 23:02:49 2018 (r331038) +++ stable/10/sys/dev/mmc/mmc.c Thu Mar 15 23:02:52 2018 (r331039) @@ -1870,7 +1870,7 @@ mmc_discover_cards(struct mmc_softc *sc) * units of 10 ms), defaulting to 500 ms. */ ivar->cmd6_time = 500 * 1000; - if (ivar->csd.spec_vers >= 6) + if (ivar->raw_ext_csd[EXT_CSD_REV] >= 6) ivar->cmd6_time = 10 * ivar->raw_ext_csd[EXT_CSD_GEN_CMD6_TIME]; /* Handle HC erase sector size. */ From owner-svn-src-stable@freebsd.org Thu Mar 15 23:02:50 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0CD11F5C132; Thu, 15 Mar 2018 23:02:50 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B32487E5FB; Thu, 15 Mar 2018 23:02:49 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AE13B1C465; Thu, 15 Mar 2018 23:02:49 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FN2nUv076766; Thu, 15 Mar 2018 23:02:49 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FN2nn9076765; Thu, 15 Mar 2018 23:02:49 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201803152302.w2FN2nn9076765@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Thu, 15 Mar 2018 23:02:49 +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: r331038 - stable/11/sys/dev/mmc X-SVN-Group: stable-11 X-SVN-Commit-Author: marius X-SVN-Commit-Paths: stable/11/sys/dev/mmc X-SVN-Commit-Revision: 331038 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 23:02:50 -0000 Author: marius Date: Thu Mar 15 23:02:49 2018 New Revision: 331038 URL: https://svnweb.freebsd.org/changeset/base/331038 Log: MFC: r327929 Use the correct revision specifier (EXT_CSD revision rather than system specification version) for deciding whether the EXT_CSD register includes the EXT_CSD_GEN_CMD6_TIME field. Submitted by: Masanobu SAITOH Modified: stable/11/sys/dev/mmc/mmc.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/mmc/mmc.c ============================================================================== --- stable/11/sys/dev/mmc/mmc.c Thu Mar 15 23:01:04 2018 (r331037) +++ stable/11/sys/dev/mmc/mmc.c Thu Mar 15 23:02:49 2018 (r331038) @@ -1871,7 +1871,7 @@ mmc_discover_cards(struct mmc_softc *sc) * units of 10 ms), defaulting to 500 ms. */ ivar->cmd6_time = 500 * 1000; - if (ivar->csd.spec_vers >= 6) + if (ivar->raw_ext_csd[EXT_CSD_REV] >= 6) ivar->cmd6_time = 10 * ivar->raw_ext_csd[EXT_CSD_GEN_CMD6_TIME]; /* Handle HC erase sector size. */ From owner-svn-src-stable@freebsd.org Fri Mar 16 02:44:19 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C1E11F4371F; Fri, 16 Mar 2018 02:44:19 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7261686CE2; Fri, 16 Mar 2018 02:44:19 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 67D5B1E684; Fri, 16 Mar 2018 02:44:19 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2G2iJFn086184; Fri, 16 Mar 2018 02:44:19 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2G2iIfl086176; Fri, 16 Mar 2018 02:44:18 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803160244.w2G2iIfl086176@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Fri, 16 Mar 2018 02:44: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: r331044 - in stable/11/sys: cam/ata cam/scsi dev/bhnd/siba dev/sdhci dev/usb dev/usb/quirk X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: in stable/11/sys: cam/ata cam/scsi dev/bhnd/siba dev/sdhci dev/usb dev/usb/quirk X-SVN-Commit-Revision: 331044 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Mar 2018 02:44:20 -0000 Author: eadler Date: Fri Mar 16 02:44:18 2018 New Revision: 331044 URL: https://svnweb.freebsd.org/changeset/base/331044 Log: MFC r305373,r312344,r318095,r319117,r320948,r320953,r328528: siba(4): Add missing bhnd_device/bhnd_device_quirk table terminator entries. This resulted in an over-read on siba chipsets that failed to match the existing entries. r312344 | sbruno | 2017-01-17 14:52:48 +0000 (Tue, 17 Jan 2017) | 7 lines Add 4k quirk for Micron 5100 and Intel S3610 SSDs r318095 | loos | 2017-05-09 19:01:57 +0000 (Tue, 09 May 2017) | 9 lines Add a new SDHCI quirk, SDHCI_QUIRK_BROKEN_AUTO_STOP, to workaround controllers that do not support or have broken ACMD12 implementations. r319117 | wma | 2017-05-29 09:22:53 +0000 (Mon, 29 May 2017) | 16 lines Introduce Genesys GL3224 quirks The Genesys chip is failing when issueing READ_CAP(16) command. Force a quirk to disable it and use READ_CAP(10) instead. Also, depending on used firmware, GL3224 can be recognized either as 'storage device' or 'mass storage class' - enable both variants in scsi_quirk_table. r320948 | sbruno | 2017-07-13 15:33:08 +0000 (Thu, 13 Jul 2017) | 6 lines Add 4K quirks for Samsung 750 EVO SSD r320953 | sbruno | 2017-07-13 16:56:26 +0000 (Thu, 13 Jul 2017) | 5 lines Add 4k and NCQ_TRIM_BROKEN quirks for Samsung 845 SSDs. r328528 | ian | 2018-01-29 03:24:02 +0000 (Mon, 29 Jan 2018) | 3 lines Add a NO_GETMAXLUN quirk for the JMicron JMS567 USB to SATA bridge, to prevent lengthy timeout pauses while probing/attaching drives. Modified: stable/11/sys/cam/ata/ata_da.c stable/11/sys/cam/scsi/scsi_da.c stable/11/sys/cam/scsi/scsi_xpt.c stable/11/sys/dev/bhnd/siba/siba_bhndb.c stable/11/sys/dev/sdhci/sdhci.c stable/11/sys/dev/sdhci/sdhci.h stable/11/sys/dev/usb/quirk/usb_quirk.c stable/11/sys/dev/usb/usbdevs Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cam/ata/ata_da.c ============================================================================== --- stable/11/sys/cam/ata/ata_da.c Fri Mar 16 01:03:10 2018 (r331043) +++ stable/11/sys/cam/ata/ata_da.c Fri Mar 16 02:44:18 2018 (r331044) @@ -513,6 +513,14 @@ static struct ada_quirk_entry ada_quirk_table[] = }, { /* + * Intel S3610 Series SSDs + * 4k optimised & trim only works in 4k requests + 4k aligned + */ + { T_DIRECT, SIP_MEDIA_FIXED, "*", "INTEL SSDSC2BX*", "*" }, + /*quirks*/ADA_Q_4K + }, + { + /* * Intel X25-M Series SSDs * 4k optimised & trim only works in 4k requests + 4k aligned */ @@ -569,6 +577,14 @@ static struct ada_quirk_entry ada_quirk_table[] = }, { /* + * Micron 5100 SSDs + * 4k optimised & trim only works in 4k requests + 4k aligned + */ + { T_DIRECT, SIP_MEDIA_FIXED, "*", "Micron 5100 MTFDDAK*", "*" }, + /*quirks*/ADA_Q_4K + }, + { + /* * OCZ Agility 2 SSDs * 4k optimised & trim only works in 4k requests + 4k aligned */ @@ -617,6 +633,14 @@ static struct ada_quirk_entry ada_quirk_table[] = }, { /* + * Samsung 750 SSDs + * 4k optimised, NCQ TRIM seems to work + */ + { T_DIRECT, SIP_MEDIA_FIXED, "*", "Samsung SSD 750*", "*" }, + /*quirks*/ADA_Q_4K + }, + { + /* * Samsung 830 Series SSDs * 4k optimised, NCQ TRIM Broken (normal TRIM is fine) */ @@ -629,6 +653,14 @@ static struct ada_quirk_entry ada_quirk_table[] = * 4k optimised, NCQ TRIM Broken (normal TRIM is fine) */ { T_DIRECT, SIP_MEDIA_FIXED, "*", "Samsung SSD 840*", "*" }, + /*quirks*/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN + }, + { + /* + * Samsung 845 SSDs + * 4k optimised, NCQ TRIM Broken (normal TRIM is fine) + */ + { T_DIRECT, SIP_MEDIA_FIXED, "*", "Samsung SSD 845*", "*" }, /*quirks*/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN }, { Modified: stable/11/sys/cam/scsi/scsi_da.c ============================================================================== --- stable/11/sys/cam/scsi/scsi_da.c Fri Mar 16 01:03:10 2018 (r331043) +++ stable/11/sys/cam/scsi/scsi_da.c Fri Mar 16 02:44:18 2018 (r331044) @@ -682,6 +682,13 @@ static struct da_quirk_entry da_quirk_table[] = }, { /* + * Genesys GL3224 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "Generic*", "STORAGE DEVICE*", + "120?"}, /*quirks*/ DA_Q_NO_SYNC_CACHE | DA_Q_4K | DA_Q_NO_RC16 + }, + { + /* * Genesys 6-in-1 Card Reader * PR: usb/94647 */ @@ -836,6 +843,11 @@ static struct da_quirk_entry da_quirk_table[] = /*quirks*/DA_Q_4K }, { + /* Micron Advanced Format (4k) drives */ + { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Micron 5100 MTFDDAK*", "*" }, + /*quirks*/DA_Q_4K + }, + { /* Samsung Advanced Format (4k) drives */ { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "SAMSUNG HD155UI*", "*" }, /*quirks*/DA_Q_4K @@ -1158,6 +1170,14 @@ static struct da_quirk_entry da_quirk_table[] = }, { /* + * Intel S3610 Series SSDs + * 4k optimised & trim only works in 4k requests + 4k aligned + */ + { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "INTEL SSDSC2BX*", "*" }, + /*quirks*/DA_Q_4K + }, + { + /* * Intel X25-M Series SSDs * 4k optimised & trim only works in 4k requests + 4k aligned */ @@ -1238,6 +1258,14 @@ static struct da_quirk_entry da_quirk_table[] = }, { /* + * Samsung 750 Series SSDs + * 4k optimised & trim only works in 4k requests + 4k aligned + */ + { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Samsung SSD 750*", "*" }, + /*quirks*/DA_Q_4K + }, + { + /* * Samsung 830 Series SSDs * 4k optimised & trim only works in 4k requests + 4k aligned */ @@ -1250,6 +1278,14 @@ static struct da_quirk_entry da_quirk_table[] = * 4k optimised & trim only works in 4k requests + 4k aligned */ { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Samsung SSD 840*", "*" }, + /*quirks*/DA_Q_4K + }, + { + /* + * Samsung 845 SSDs + * 4k optimised & trim only works in 4k requests + 4k aligned + */ + { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Samsung SSD 845*", "*" }, /*quirks*/DA_Q_4K }, { Modified: stable/11/sys/cam/scsi/scsi_xpt.c ============================================================================== --- stable/11/sys/cam/scsi/scsi_xpt.c Fri Mar 16 01:03:10 2018 (r331043) +++ stable/11/sys/cam/scsi/scsi_xpt.c Fri Mar 16 02:44:18 2018 (r331044) @@ -547,6 +547,14 @@ static struct scsi_quirk_entry scsi_quirk_table[] = CAM_QUIRK_NORPTLUNS, /*mintags*/2, /*maxtags*/255 }, { + { T_DIRECT, SIP_MEDIA_REMOVABLE, "Generic", "STORAGE DEVICE*", "120?" }, + CAM_QUIRK_NORPTLUNS, /*mintags*/2, /*maxtags*/255 + }, + { + { T_DIRECT, SIP_MEDIA_REMOVABLE, "Generic", "MassStorageClass", "1533" }, + CAM_QUIRK_NORPTLUNS, /*mintags*/2, /*maxtags*/255 + }, + { /* Default tagged queuing parameters for all devices */ { T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED, Modified: stable/11/sys/dev/bhnd/siba/siba_bhndb.c ============================================================================== --- stable/11/sys/dev/bhnd/siba/siba_bhndb.c Fri Mar 16 01:03:10 2018 (r331043) +++ stable/11/sys/dev/bhnd/siba/siba_bhndb.c Fri Mar 16 02:44:18 2018 (r331044) @@ -71,10 +71,12 @@ enum { static struct bhnd_device_quirk bridge_quirks[] = { BHND_CHIP_QUIRK(4311, HWREV_EQ(2), SIBA_QUIRK_PCIE_D11_SB_TIMEOUT), BHND_CHIP_QUIRK(4312, HWREV_EQ(0), SIBA_QUIRK_PCIE_D11_SB_TIMEOUT), + BHND_DEVICE_QUIRK_END }; static struct bhnd_device bridge_devs[] = { BHND_DEVICE(BCM, PCI, NULL, bridge_quirks), + BHND_DEVICE_END }; static int Modified: stable/11/sys/dev/sdhci/sdhci.c ============================================================================== --- stable/11/sys/dev/sdhci/sdhci.c Fri Mar 16 01:03:10 2018 (r331043) +++ stable/11/sys/dev/sdhci/sdhci.c Fri Mar 16 02:44:18 2018 (r331044) @@ -1439,7 +1439,7 @@ sdhci_set_transfer_mode(struct sdhci_slot *slot, struc mode |= SDHCI_TRNS_MULTI; if (data->flags & MMC_DATA_READ) mode |= SDHCI_TRNS_READ; - if (slot->req->stop) + if (slot->req->stop && !(slot->quirks & SDHCI_QUIRK_BROKEN_AUTO_STOP)) mode |= SDHCI_TRNS_ACMD12; if (slot->flags & SDHCI_USE_DMA) mode |= SDHCI_TRNS_DMA; @@ -1695,7 +1695,8 @@ sdhci_finish_data(struct sdhci_slot *slot) slot->intmask |= SDHCI_INT_RESPONSE); } /* Unload rest of data from DMA buffer. */ - if (!slot->data_done && (slot->flags & SDHCI_USE_DMA)) { + if (!slot->data_done && (slot->flags & SDHCI_USE_DMA) && + slot->curcmd->data != NULL) { if (data->flags & MMC_DATA_READ) { left = data->len - slot->offset; bus_dmamap_sync(slot->dmatag, slot->dmamap, @@ -1735,17 +1736,18 @@ sdhci_start(struct sdhci_slot *slot) sdhci_start_command(slot, req->cmd); return; } -/* We don't need this until using Auto-CMD12 feature - if (!(slot->flags & STOP_STARTED) && req->stop) { + if ((slot->quirks & SDHCI_QUIRK_BROKEN_AUTO_STOP) && + !(slot->flags & STOP_STARTED) && req->stop) { slot->flags |= STOP_STARTED; sdhci_start_command(slot, req->stop); return; } -*/ if (__predict_false(sdhci_debug > 1)) slot_printf(slot, "result: %d\n", req->cmd->error); if (!req->cmd->error && - (slot->quirks & SDHCI_QUIRK_RESET_AFTER_REQUEST)) { + ((slot->curcmd == req->stop && + (slot->quirks & SDHCI_QUIRK_BROKEN_AUTO_STOP)) || + (slot->quirks & SDHCI_QUIRK_RESET_AFTER_REQUEST))) { sdhci_reset(slot, SDHCI_RESET_CMD); sdhci_reset(slot, SDHCI_RESET_DATA); } Modified: stable/11/sys/dev/sdhci/sdhci.h ============================================================================== --- stable/11/sys/dev/sdhci/sdhci.h Fri Mar 16 01:03:10 2018 (r331043) +++ stable/11/sys/dev/sdhci/sdhci.h Fri Mar 16 02:44:18 2018 (r331044) @@ -89,6 +89,8 @@ #define SDHCI_QUIRK_CAPS_BIT63_FOR_MMC_HS400 (1 << 26) /* Controller support for SDHCI_CTRL2_PRESET_VALUE is broken. */ #define SDHCI_QUIRK_PRESET_VALUE_BROKEN (1 << 27) +/* Controller does not support or the support for ACMD12 is broken. */ +#define SDHCI_QUIRK_BROKEN_AUTO_STOP (1 << 28) /* * Controller registers Modified: stable/11/sys/dev/usb/quirk/usb_quirk.c ============================================================================== --- stable/11/sys/dev/usb/quirk/usb_quirk.c Fri Mar 16 01:03:10 2018 (r331043) +++ stable/11/sys/dev/usb/quirk/usb_quirk.c Fri Mar 16 02:44:18 2018 (r331044) @@ -247,6 +247,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRK USB_QUIRK(IOMEGA, ZIP100, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_TEST_UNIT_READY), /* XXX ZIP drives can also use ATAPI */ + USB_QUIRK(JMICRON, JMS567, 0x0000, 0xffff, UQ_MSC_NO_GETMAXLUN), USB_QUIRK(JMICRON, JM20337, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_SYNC_CACHE), Modified: stable/11/sys/dev/usb/usbdevs ============================================================================== --- stable/11/sys/dev/usb/usbdevs Fri Mar 16 01:03:10 2018 (r331043) +++ stable/11/sys/dev/usb/usbdevs Fri Mar 16 02:44:18 2018 (r331044) @@ -2548,6 +2548,7 @@ product JATON EDA 0x5704 Ethernet product JETI SPC1201 0x04b2 FTDI compatible adapter /* JMicron products */ +product JMICRON JMS567 0x0567 USB to SATA 6.0Gb/s bridge product JMICRON JM20336 0x2336 USB to SATA Bridge product JMICRON JM20337 0x2338 USB to ATA/ATAPI Bridge From owner-svn-src-stable@freebsd.org Fri Mar 16 05:29:32 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D9754F521BD; Fri, 16 Mar 2018 05:29:31 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 877536C7EB; Fri, 16 Mar 2018 05:29:31 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7D75C1FF0F; Fri, 16 Mar 2018 05:29:31 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2G5TVPA066711; Fri, 16 Mar 2018 05:29:31 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2G5TVgh066709; Fri, 16 Mar 2018 05:29:31 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803160529.w2G5TVgh066709@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Fri, 16 Mar 2018 05:29: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: r331047 - stable/11/usr.bin/patch X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/usr.bin/patch X-SVN-Commit-Revision: 331047 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Mar 2018 05:29:32 -0000 Author: eadler Date: Fri Mar 16 05:29:30 2018 New Revision: 331047 URL: https://svnweb.freebsd.org/changeset/base/331047 Log: MFC r311106,r311109,r311110,r320579,r327063,r327064,: patch(1): replace strnlen() with a simpler strlen(). patch(1): add support for git generated diffs. patch: rejname[] is also -r option buffer, and should be PATH_MAX. patch: further cleanup to git-style diffs. Modified: stable/11/usr.bin/patch/patch.c stable/11/usr.bin/patch/pch.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/patch/patch.c ============================================================================== --- stable/11/usr.bin/patch/patch.c Fri Mar 16 05:23:48 2018 (r331046) +++ stable/11/usr.bin/patch/patch.c Fri Mar 16 05:29:30 2018 (r331047) @@ -112,7 +112,7 @@ static bool reverse_flag_specified = false; static bool Vflag = false; /* buffer holding the name of the rejected patch file. */ -static char rejname[NAME_MAX + 1]; +static char rejname[PATH_MAX]; /* how many input lines have been irretractibly output */ static LINENUM last_frozen_line = 0; @@ -749,10 +749,10 @@ rej_line(int ch, LINENUM i) size_t len; const char *line = pfetch(i); - len = strnlen(line, USHRT_MAX); + len = strlen(line); fprintf(rejfp, "%c%s", ch, line); - if (len == 0 || line[len-1] != '\n') { + if (len == 0 || line[len - 1] != '\n') { if (len >= USHRT_MAX) fprintf(rejfp, "\n\\ Line too long\n"); else Modified: stable/11/usr.bin/patch/pch.c ============================================================================== --- stable/11/usr.bin/patch/pch.c Fri Mar 16 05:23:48 2018 (r331046) +++ stable/11/usr.bin/patch/pch.c Fri Mar 16 05:29:30 2018 (r331047) @@ -264,6 +264,7 @@ intuit_diff_type(void) char *s, *t; int indent, retval; struct file_name names[MAX_FILE]; + int piece_of_git = 0; memset(names, 0, sizeof(names)); ok_to_create_file = false; @@ -308,14 +309,22 @@ intuit_diff_type(void) if (!stars_last_line && strnEQ(s, "*** ", 4)) names[OLD_FILE].path = fetchname(s + 4, &names[OLD_FILE].exists, strippath); - else if (strnEQ(s, "--- ", 4)) - names[NEW_FILE].path = fetchname(s + 4, + else if (strnEQ(s, "--- ", 4)) { + size_t off = 4; + if (piece_of_git && strippath == 957 && + strnEQ(s, "--- a/", 6)) + off = 6; + names[NEW_FILE].path = fetchname(s + off, &names[NEW_FILE].exists, strippath); - else if (strnEQ(s, "+++ ", 4)) + } else if (strnEQ(s, "+++ ", 4)) { /* pretend it is the old name */ - names[OLD_FILE].path = fetchname(s + 4, + size_t off = 4; + if (piece_of_git && strippath == 957 && + strnEQ(s, "+++ b/", 6)) + off = 6; + names[OLD_FILE].path = fetchname(s + off, &names[OLD_FILE].exists, strippath); - else if (strnEQ(s, "Index:", 6)) + } else if (strnEQ(s, "Index:", 6)) names[INDEX_FILE].path = fetchname(s + 6, &names[INDEX_FILE].exists, strippath); else if (strnEQ(s, "Prereq:", 7)) { @@ -330,6 +339,9 @@ intuit_diff_type(void) free(revision); revision = NULL; } + } else if (strnEQ(s, "diff --git a/", 13)) { + /* Git-style diffs. */ + piece_of_git = 1; } else if (strnEQ(s, "==== ", 5)) { /* Perforce-style diffs. */ if ((t = strstr(s + 5, " - ")) != NULL) From owner-svn-src-stable@freebsd.org Fri Mar 16 07:25:30 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6071DF56D83; Fri, 16 Mar 2018 07:25:30 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail104.syd.optusnet.com.au (mail104.syd.optusnet.com.au [211.29.132.246]) by mx1.freebsd.org (Postfix) with ESMTP id D6FDA70597; Fri, 16 Mar 2018 07:25:29 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from [192.168.0.102] (c110-21-101-228.carlnfd1.nsw.optusnet.com.au [110.21.101.228]) by mail104.syd.optusnet.com.au (Postfix) with ESMTPS id D9EA442CB97; Fri, 16 Mar 2018 18:25:21 +1100 (AEDT) Date: Fri, 16 Mar 2018 18:25:21 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: rgrimes@freebsd.org cc: Andriy Gapon , Eitan Adler , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r330972 - stable/11/share/misc In-Reply-To: <201803151533.w2FFXkS9093662@pdx.rh.CN85.dnsmgr.net> Message-ID: <20180316181800.B904@besplex.bde.org> References: <201803151533.w2FFXkS9093662@pdx.rh.CN85.dnsmgr.net> 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=cIaQihWN c=1 sm=1 tr=0 a=PalzARQSbocsUSjMRkwAPg==:117 a=PalzARQSbocsUSjMRkwAPg==:17 a=kj9zAlcOel0A:10 a=SU4yJ5IgCYpL9l0rCCQA:9 a=CjuIK1q_8ugA:10 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Mar 2018 07:25:30 -0000 On Thu, 15 Mar 2018, Rodney W. Grimes wrote: >> On 15/03/2018 10:30, Eitan Adler wrote: >>> ... >>> Log: >>> MFC r303063,r311852,r311930,r317040,r320506,r321301,r325162,r326759,r329004,: >> I have never seen things like these MFC-ed before... >> Should we be really doing them? > > Yes, imho. And the reasons may seem odd to sum, but here is my spin on this: > ... > Maybe we should even add to the end of the commiters "these are the > things you should do as a new committer" the merging of your info > into to all supported/active releases. Which is a good opportunity > for teaching how to do svn sparse checkouts as you really do not > want to pull all of stable/10 out just to commit to 1 file. Actually, it is necessary to check out everything to MFC to 1 file. Sparse checkouts only work for committing to head. They break mergeinfo for MFCs. Or so I was told when I MFCed with a sparse checkout. This is my excuse for not MFC'ing anything. Bruce From owner-svn-src-stable@freebsd.org Fri Mar 16 08:39:38 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C6E8F5B547; Fri, 16 Mar 2018 08:39:38 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1476972E98; Fri, 16 Mar 2018 08:39:38 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E39D421BAA; Fri, 16 Mar 2018 08:39:37 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2G8dbRm062704; Fri, 16 Mar 2018 08:39:37 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2G8dbm8062703; Fri, 16 Mar 2018 08:39:37 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803160839.w2G8dbm8062703@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Fri, 16 Mar 2018 08:39: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: r331050 - stable/11/share/misc X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/share/misc X-SVN-Commit-Revision: 331050 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Mar 2018 08:39:38 -0000 Author: eadler Date: Fri Mar 16 08:39:37 2018 New Revision: 331050 URL: https://svnweb.freebsd.org/changeset/base/331050 Log: MFC r303041,r303320,r305905,r310087,r310346,r319368,r321879,r321923,r321979,r327554,r329124,r329210,: organizations.dot - misc changes Modified: stable/11/share/misc/organization.dot Directory Properties: stable/11/ (props changed) Modified: stable/11/share/misc/organization.dot ============================================================================== --- stable/11/share/misc/organization.dot Fri Mar 16 07:11:53 2018 (r331049) +++ stable/11/share/misc/organization.dot Fri Mar 16 08:39:37 2018 (r331050) @@ -28,15 +28,15 @@ _misc [label="Miscellaneous Hats"] core [label="Core Team\ncore@FreeBSD.org\nallanjude, bapt, bcr,\nbenno, emaste, gnn,\nhrs, jhb, kmoore"] coresecretary [label="Core Team Secretary\ncore-secretary@FreeBSD.org\nmatthew"] doccommitters [label="Doc/www Committers\ndoc-committers@FreeBSD.org"] -doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\ngjb, blackend,\ngabor, hrs"] +doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\ngjb, blackend,\ngabor, hrs,\nwblock"] portscommitters [label="Ports Committers\nports-committers@FreeBSD.org"] -portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nantoine, bapt, bdrewery,\nerwin, mat, swills,\nmiwi"] +portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nadamw, antoine, bapt, bdrewery\nfeld, mat, rene, swills"] portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\nrene"] -re [label="Primary Release Engineering Team\nre@FreeBSD.org\nkib, blackend, jpaetzel, hrs, kensmith"] -secteam [label="Security Team\nsecteam@FreeBSD.org\ndelphij,\ndes, gavin, gjb,\nglebius, remko"] -portssecteam [label="Ports Security Team\nports-secteam@FreeBSD.org\ndelphij, eadler, feld, jgh, junovitch, miwi, rea, sbz, simon, swills, zi"] +re [label="Primary Release Engineering Team\nre@FreeBSD.org\ngjb, kib,\nbdrewery, blackend,\nrgrimes, delphij,\nhrs, glebius,\nmarius, rwatson"] +secteam [label="Security Team\nsecteam@FreeBSD.org\nbenno, delphij,\ndes, emaste,\ngjb, gordon,\nremko"] +portssecteam [label="Ports Security Team\nports-secteam@FreeBSD.org\ndelphij, amdmi3, eadler, feld, jgh, rea, riggs, sbz, simon, swills, zi"] secteamsecretary [label="Security Team Secretary\nsecteam-secretary@FreeBSD.org\nremko"] -securityofficer [label="Security Officer Team\nsecurity-officer@FreeBSD.org\ncperciva, simon, nectar"] +securityofficer [label="Security Officer Team\nsecurity-officer@FreeBSD.org\nbenno, delphij,\ndes, emaste,\ngjb, gordon,\nremko"] srccommitters [label="Src Committers\nsrc-committers@FreeBSD.org"] # Admin teams go here alphabetically sorted @@ -44,18 +44,18 @@ srccommitters [label="Src Committers\nsrc-committers@F accounts [label="Accounts Team\naccounts@FreeBSD.org\nmarkm, simon, kensmith,\ndhw"] backups [label="Backup Administrators\nbackups@FreeBSD.org\nsimon, kensmith,\ndhw"] bugmeister [label="Bugmeister Team\nbugmeister@FreeBSD.org\neadler, gavin, gonzo"] -clusteradm [label="Cluster Administrators\nclusteradm@FreeBSD.org\nbrd, simon, ps,\nkensmith, peter"] +clusteradm [label="Cluster Administrators\nclusteradm@FreeBSD.org\nallanjude, brd,\ndhw, gavin,\ngjb, peter,\nsbruno, simon,\nzi"] dnsadm [label="DNS Administrators\ndnsadm@FreeBSD.org\nbillf, dg, ps,\nkensmith, peter"] mirroradmin [label="FTP/WWW Mirror Site Coordinators\nmirror-admin@FreeBSD.org\nkuriyama, kensmith"] perforceadmin [label="Perforce Repository Administrators\nperforce-admin@FreeBSD.org\nscottl, kensmith, gordon,\nrwatson, peter, dhw"] -postmaster [label="Postmaster Team\npostmaster@FreeBSD.org\njmb, brd, sahil, dhw"] +postmaster [label="Postmaster Team\npostmaster@FreeBSD.org\ndhw, ler, pi, rea, remko, zi"] refadm [label="Reference Systems Administrators\nrefadm@FreeBSD.org\njake, billf, markm, simon,\nobrien, ps, kensmith,\npeter, dhw"] -webmaster [label="Webmaster Team\nwebmaster@FreeBSD.org\nnik, kuriyama, simon,\njesusr, wosch"] +webmaster [label="Webmaster Team\nwebmaster@FreeBSD.org\ngjb, wblock, blackend,\ngabor, hrs, wosch"] # Misc hats go here alphabetically sorted -donations [label="Donations Team\ndonations@FreeBSD.org\ngjb, wilko, gahr, pgolluci,\nobrien, trhodes, ds,\nrwatson"] -marketing [label="Marketing Team\nmarketing@FreeBSD.org\nSteven Beedle, Denise Ebery, deb,\njkoshy, Dru Lavigne, mwlucas, imp,\nKris Moore, murray, mattt,\nJeremy C. Reed, rwatson"] +donations [label="Donations Team\ndonations@FreeBSD.org\nwilko, gahr, pgolluci,\nobrien, trhodes, ds,\nrwatson"] +marketing [label="Marketing Team\nmarketing@FreeBSD.org\nSteven Beedle, Denise Ebery, deb,\njkoshy, dru, mwlucas, imp,\nKris Moore, murray, mattt,\nJeremy C. Reed, rwatson"] vendorrelations [label="Vendor Relations\nvendor-relations@FreeBSD.org\ncore, FreeBSD Foundation"] # Here are the team relationships. From owner-svn-src-stable@freebsd.org Fri Mar 16 08:44:44 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BECD3F5BADE; Fri, 16 Mar 2018 08:44:44 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7167F734C0; Fri, 16 Mar 2018 08:44:44 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 67DA921D36; Fri, 16 Mar 2018 08:44:44 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2G8iie3067445; Fri, 16 Mar 2018 08:44:44 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2G8iiu7067444; Fri, 16 Mar 2018 08:44:44 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803160844.w2G8iiu7067444@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Fri, 16 Mar 2018 08:44: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: r331051 - stable/11/share/misc X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/share/misc X-SVN-Commit-Revision: 331051 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Mar 2018 08:44:44 -0000 Author: eadler Date: Fri Mar 16 08:44:44 2018 New Revision: 331051 URL: https://svnweb.freebsd.org/changeset/base/331051 Log: MFC r327344: locale: add cnr (Montenegrin) See https://www.loc.gov/standards/iso639-2/php/code_changes.php Modified: stable/11/share/misc/iso639 Directory Properties: stable/11/ (props changed) Modified: stable/11/share/misc/iso639 ============================================================================== --- stable/11/share/misc/iso639 Fri Mar 16 08:39:37 2018 (r331050) +++ stable/11/share/misc/iso639 Fri Mar 16 08:44:44 2018 (r331051) @@ -127,6 +127,7 @@ cu chu chu Church Slavic; Old Slavonic; Church Slavoni cv chv chv Chuvash chy chy Cheyenne cmc cmc Chamic languages + cnr cnr Montenegrin cop cop Coptic kw cor cor Cornish co cos cos Corsican From owner-svn-src-stable@freebsd.org Fri Mar 16 08:45:29 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F4074F5BB7B; Fri, 16 Mar 2018 08:45:28 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A973B735F3; Fri, 16 Mar 2018 08:45:28 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A446621D37; Fri, 16 Mar 2018 08:45:28 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2G8jSod067523; Fri, 16 Mar 2018 08:45:28 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2G8jSeH067522; Fri, 16 Mar 2018 08:45:28 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803160845.w2G8jSeH067522@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Fri, 16 Mar 2018 08:45: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: r331052 - stable/11/share/misc X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/share/misc X-SVN-Commit-Revision: 331052 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Mar 2018 08:45:29 -0000 Author: eadler Date: Fri Mar 16 08:45:28 2018 New Revision: 331052 URL: https://svnweb.freebsd.org/changeset/base/331052 Log: MFC r330940: Update to 2018-03-06 Modified: stable/11/share/misc/pci_vendors Directory Properties: stable/11/ (props changed) Modified: stable/11/share/misc/pci_vendors ============================================================================== --- stable/11/share/misc/pci_vendors Fri Mar 16 08:44:44 2018 (r331051) +++ stable/11/share/misc/pci_vendors Fri Mar 16 08:45:28 2018 (r331052) @@ -1,9 +1,10 @@ # $FreeBSD$ +# # List of PCI ID's # -# Version: 2018.02.15 -# Date: 2018-02-15 03:15:01 +# Version: 2018.03.06 +# Date: 2018-03-06 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at http://pci-ids.ucw.cz/. @@ -26,6 +27,17 @@ 0010 Allied Telesis, Inc (Wrong ID) # This is a relabelled RTL-8139 8139 AT-2500TX V3 Ethernet +0014 Loongson Technology LLC + 7a02 APB (Advanced Peripheral Bus) Controller + 7a03 Gigabit Ethernet Controller + 7a04 OTG USB Controller + 7a05 Vivante GPU (Graphics Processing Unit) + 7a06 DC (Display Controller) + 7a07 HDA (High Definition Audio) Controller + 7a08 SATA AHCI Controller + 7a0f DMA (Direct Memory Access) Controller + 7a14 EHCI USB Controller + 7a24 OHCI USB Controller 001c PEAK-System Technik GmbH 0001 PCAN-PCI CAN-Bus controller 001c 0004 2 Channel CAN Bus SJC1000 @@ -753,7 +765,9 @@ 131b Kaveri [Radeon R4 Graphics] 131c Kaveri [Radeon R7 Graphics] 131d Kaveri [Radeon R6 Graphics] - 15dd Vega [Radeon Vega 8 Mobile] + 15dd Raven Ridge [Radeon Vega Series / Radeon Vega Mobile Series] + 103c 83c6 Radeon Vega 8 Mobile + 1458 d000 Radeon RX Vega 11 15ff Vega [Radeon Vega 28 Mobile] 1714 BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series] 103c 168b ProBook 4535s @@ -1601,10 +1615,12 @@ 103c 2100 FirePro M4100 6602 Mars 6603 Mars - 6604 Opal XT [Radeon R7 M265] + 6604 Opal XT [Radeon R7 M265/M365X/M465] 103c 8006 FirePro M4170 + 103c 814f Litho XT [Radeon R7 M365X] + 103c 82aa Litho XT [Radeon R7 M465] 17aa 3643 Radeon R7 A360 - 6605 Opal PRO [Radeon R7 M260] + 6605 Opal PRO [Radeon R7 M260X] 103c 2259 FirePro M4150 6606 Mars XTX [Radeon HD 8790M] 1028 0684 FirePro W4170M @@ -1679,6 +1695,7 @@ 103c 80be Radeon R5 M330 103c 8136 Radeon R5 M330 103c 8329 Radeon R7 M520 + 17aa 3633 Radeon R5 A330 17aa 3804 Radeon R5 M330 17aa 3809 Radeon R5 M330 17aa 381a Radeon R5 M430 @@ -2298,8 +2315,11 @@ 1043 04fb Radeon RX 480 1043 04fd Radeon RX 480 8GB 1458 22f0 Radeon RX 570 + 1458 22f7 Radeon RX 570 Gaming 4G 1462 3411 Radeon RX 470 1462 3413 Radeon RX 480 + 1462 3416 Radeon RX 570 + 1462 3418 Radeon RX 580 Armor 4G OC 148c 2372 Radeon RX 480 148c 2373 Radeon RX 470 1682 9470 Radeon RX 470 @@ -2334,7 +2354,14 @@ 106b 0179 Radeon Pro 560 1642 1727 Polaris 21 XL [Radeon RX 560D] 1682 956d Polaris 21 XL [Radeon RX 560D] - 67ff Baffin [Radeon RX 560] + 67ff Baffin [Radeon RX 550 640SP / RX 560] + 1002 0b04 Radeon RX 560 + 1043 04bc Radeon RX 560 + 1458 22ed Radeon RX 560 + 148c 2381 Radeon RX 560 + 1682 9560 Radeon RX 560 + 1da2 e348 Radeon RX 560 + 1da2 e367 Radeon RX 550 640SP 6800 Wimbledon XT [Radeon HD 7970M] 1002 0124 Radeon HD 7970M 8086 2110 Radeon HD 7970M @@ -2349,7 +2376,9 @@ 6808 Pitcairn XT GL [FirePro W7000] 1002 0310 FirePro S7000 1002 0420 Radeon Sky 500 + 103c 030c MED-X7000 13cc 3d25 MXRT-7500 + 15c3 030c MED-X7000 6809 Pitcairn LE GL [FirePro W5000] 13cc 3d23 MXRT-5500 13cc 3d24 MXRT-5550 @@ -2411,8 +2440,6 @@ 682d Chelsea XT GL [FirePro M4000] 682f Chelsea LP [Radeon HD 7730M] 103c 1851 Radeon HD 7750M - 6830 Cape Verde [Radeon HD 7800M Series] - 6831 Cape Verde [AMD Radeon HD 7700M Series] 6835 Cape Verde PRX [Radeon R9 255 OEM] 6837 Cape Verde LE [Radeon HD 7730/8730] 1462 2796 Radeon HD 8730 @@ -3026,6 +3053,7 @@ 103c 2269 Radeon R7 M260 103c 22c6 Radeon R7 M260 103c 22c8 Radeon R7 M260 + 103c 2b45 Radeon R7 A360 103c 808c Radeon R7 M260 103c 8099 Radeon R7 M360 103c 80b5 Radeon R7 M360 @@ -3062,7 +3090,8 @@ 148c 9380 Radeon R9 380 # Make naming scheme consistent 174b e308 Radeon R9 380 Nitro 4G D5 - 694c Vega [Radeon RX Vega M] + 694c Polaris 22 [Radeon RX Vega M GH] + 694e Polaris 22 [Radeon RX Vega M GL] 6980 Polaris12 6981 Polaris12 6985 Lexa XT [Radeon PRO WX 3100] @@ -3351,11 +3380,13 @@ 9553 RV710/M92 [Mobility Radeon HD 4530/4570/545v] 1025 015e Mobility Radeon HD 4570 1025 017d Mobility Radeon HD 4570 - 1025 0205 Mobility Radeon HD 4570 + 1025 0205 Mobility Radeon HD 4570 / 545v 1025 0206 Mobility Radeon HD 4570 1025 0237 Mobility Radeon HD 4570 - 1028 02be Mobility Radeon HD 4570 + 1028 02be Mobility Radeon HD 4570 / 545v 1028 02e8 Mobility Radeon HD 4530 + 103c 143c Mobility Radeon HD 545v + 103c 1446 Mobility Radeon HD 545v 103c 3624 Mobility Radeon HD 4530 103c 3628 Mobility Radeon HD 4530 103c 3636 Mobility Radeon HD 4530 @@ -3363,6 +3394,12 @@ 1043 1b42 Mobility Radeon HD 4570 104d 9056 Mobility Radeon HD 4570 1179 ff82 Satellite L505-13T GPU (Mobility Radeon HD 5145) + 144d c07f Mobility Radeon HD 545v + 144d c571 Mobility Radeon HD 545v + 1462 1006 Mobility Radeon HD 545v + 17aa 2129 Mobility Radeon HD 545v + 17aa 215b Mobility Radeon HD 545v + 17aa 21bb Mobility Radeon HD 545v 9555 RV710/M92 [Mobility Radeon HD 4350/4550] 103c 1411 ProBook 4720s GPU (Mobility Radeon HD 4350) 9557 RV711 GL [FirePro RG220] @@ -3409,7 +3446,7 @@ 95c6 RV620 LE [Radeon HD 3450 AGP] 95c9 RV620 LE [Radeon HD 3450 PCI] 95cc RV620 GL [FirePro V3700] - 95cd RV620 [FirePro 2450] + 95cd RV620 GL [FirePro 2450] 95cf RV620 GL [FirePro 2260] 960f RS780 HDMI Audio [Radeon 3000/3100 / HD 3200/3300] 9610 RS780 [Radeon HD 3200] @@ -3485,7 +3522,19 @@ 985d Mullins 985e Mullins 985f Mullins - 9874 Carrizo + 9874 Wani [Radeon R5/R6/R7 Graphics] + 1002 1871 Radeon R5 Graphics + 1002 1e20 Radeon R7 Graphics + 1028 06bd Radeon R6 Graphics + 103c 2b44 Radeon R6 Graphics + 103c 8221 Radeon R5 Graphics + 103c 8223 Radeon R5 Graphics + 103c 8238 Radeon R7 Graphics + 103c 8353 Radeon R7 Graphics + 1458 d000 Radeon R7 Graphics + 17aa 5113 Radeon R6 Graphics + 17aa 5116 Radeon R6 Graphics + 17aa 5118 Radeon R5 Graphics 9900 Trinity [Radeon HD 7660G] 103c 1985 Pavilion 17-e163sg Notebook PC # AMD A10-5800K CPU @@ -9871,7 +9920,7 @@ 0863 C79 [GeForce 9400M] 106b 00aa MacBook5,1 0864 C79 [GeForce 9300] - 0865 C79 [GeForce 9300/ION] + 0865 C79 [GeForce 9300 / ION] 0866 C79 [GeForce 9400M G] 106b 00b1 GeForce 9400M 0867 C79 [GeForce 9400] @@ -9895,12 +9944,12 @@ 1043 1c12 GeForce G102M 1043 1c52 GeForce G205M 0874 C79 [ION] - 0876 ION VGA [GeForce 9400M] + 0876 C79 [GeForce 9400M / ION] 087a C79 [GeForce 9400] - 087d ION VGA + 087d C79 [ION] 19da a123 IONITX-F-E - 087e ION LE VGA - 087f ION LE VGA + 087e C79 [ION LE] + 087f C79 [ION LE] 08a0 MCP89 [GeForce 320M] 08a2 MCP89 [GeForce 320M] 08a3 MCP89 [GeForce 320M] @@ -9931,6 +9980,7 @@ 0a64 GT218 [ION] 0a65 GT218 [GeForce 210] 1043 8334 EN210 SILENT + 1458 36a9 GV-N210D3-1GI (rev. 6.0/6.1) 1462 8094 N210 [Geforce 210] PCIe graphics adapter 0a66 GT218 [GeForce 310] 0a67 GT218 [GeForce 315] @@ -9941,7 +9991,7 @@ 1028 040b Latitude E6510 17aa 2142 ThinkPad T410 0a6e GT218M [GeForce 305M] - 0a6f GT218 [ION] + 0a6f GT218M [ION] 0a70 GT218M [GeForce 310M] 0a71 GT218M [GeForce 305M] 0a72 GT218M [GeForce 310M] @@ -9949,7 +9999,7 @@ 0a74 GT218M [GeForce G210M] 1b0a 903a GeForce G210 0a75 GT218M [GeForce 310M] - 0a76 GT218 [ION 2] + 0a76 GT218M [ION 2] 0a78 GT218GL [Quadro FX 380 LP] 0a7a GT218M [GeForce 315M] 104d 907e GeForce 315M @@ -10869,6 +10919,7 @@ 1288 GK208B [GeForce GT 720] 1289 GK208 [GeForce GT 710] 128b GK208B [GeForce GT 710] + 1043 85f7 GT710-SL-1GD5 1290 GK208M [GeForce GT 730M] 103c 2afa GeForce GT 730A 103c 2b04 GeForce GT 730A @@ -11040,6 +11091,7 @@ 1bb7 GP104GLM [Quadro P4000 Mobile] 1462 11e9 Quadro P4000 Max-Q 1bb8 GP104GLM [Quadro P3000 Mobile] + 1bbb GP104GLM [Quadro P3200 Mobile] 1bc7 GP104 [P104-101] 1be0 GP104M [GeForce GTX 1080 Mobile] 1028 07c0 GeForce GTX 1080 Max-Q @@ -11079,6 +11131,8 @@ 1cb6 GP107GL [Quadro P620] 1d01 GP108 [GeForce GT 1030] 1d10 GP108M [GeForce MX150] + 1d12 GP108M [GeForce MX150] + 1d72 1701 Mi Notebook Pro [GeForce MX150] 1d33 GP108GL [Quadro P500] 1d81 GV100 [TITAN V] 1db1 GV100GL [Tesla V100 SXM2] @@ -11424,6 +11478,7 @@ 8821 RTL8821AE 802.11ac PCIe Wireless Network Adapter b723 RTL8723BE PCIe Wireless Network Adapter 10ec 8739 Dell Wireless 1801 + b822 RTL8822BE 802.11a/b/g/n/ac WiFi adapter c821 RTL8821CE 802.11ac PCIe Wireless Network Adapter 10ed Ascii Corporation 7310 V7310 @@ -13354,6 +13409,7 @@ 0102 Extended IDE Controller 0103 EX-IDE Type-B 010f NVMe Controller + 0115 XG4 NVMe SSD Controller 0404 DVD Decoder card 0406 Tecra Video Capture device 0407 DVD Decoder card (Version 2) @@ -13482,6 +13538,7 @@ 1028 01d7 XPS M1210 1028 01f3 Inspiron 1420 1028 022f Inspiron 1525 + 103c 1521 HP EliteBook 8540w 103c 30b5 Presario V3242AU 103c 30b7 Presario V6133CL 103c 30cc Pavilion dv6700 @@ -13533,6 +13590,7 @@ 1028 01f5 Inspiron 1501 1028 024f Latitude e6500 103c 03b5 Presario V3242AU + 103c 1521 HP EliteBook 8540w 103c 30b7 Presario V6133CL 103c 30cf Pavilion dv9500/9600/9700 series 1183 0843 Alienware Aurora m9700 @@ -15032,7 +15090,7 @@ 12a2 Newgen Systems Corporation 12a3 Lucent Technologies 8105 T8105 H100 Digital Switch -12a4 NTT Electronics Technology Company +12a4 NTT Electronics Corporation 12a5 Vision Dynamics Ltd. 12a6 Scalable Networks, Inc. 12a7 AMO GmbH @@ -18684,6 +18742,7 @@ 15b3 0026 ConnectX-3 IB FDR Dual Port Mezzanine Card 15b3 0028 ConnectX-3 VPI Dual QSFP+ Port QDR Infiniband 40Gb/s or 10Gb Ethernet 15b3 0059 ConnectX-3 VPI IB FDR/40 GbE Single Port QSFP+ Mezzanine Card + 15b3 0064 ConnectX-3 EN 10/40 GbE Single Port QSFP+ Adapter (MCX313A-BCBT) 15b3 0065 ConnectX-3 VPI IB FDR/40 GbE Dual Port QSFP+ Adapter 15b3 0066 ConnectX-3 IB FDR10 Dual Port Mezzanine Card 15b3 0067 ConnectX-3 VPI IB FDR/40 GbE Single Port QSFP+ Adapter @@ -18731,9 +18790,10 @@ 15b3 0050 ConnectX-4 100 GbE Dual Port QSFP28 Adapter 1014 MT27700 Family [ConnectX-4 Virtual Function] 1015 MT27710 Family [ConnectX-4 Lx] + 15b3 0001 ConnectX-4 Lx EN network interface card, 25GbE single-port SFP28, PCIe3.0 x8, tall bracket, ROHS R6 + 15b3 0003 Stand-up ConnectX-4 Lx EN, 25GbE dual-port SFP28, PCIe3.0 x8, MCX4121A-ACAT 15b3 0004 ConnectX-4 Lx Stand-up dual-port 10GbE MCX4121A-XCAT 15b3 0005 Mellanox Technologies ConnectX-4 Lx Stand-up single-port 40GbE MCX4131A-BCAT - 15b3 0016 ConnectX-4 Lx 25 GbE Dual Port SFP28 Adapter 15b3 0020 MCX4411A-ACQN, ConnectX-4 Lx EN OCP, 1x25Gb 15b3 0021 MCX4421A-ACQN ConnectX-4 Lx EN OCP,2x25G 15b3 0025 ConnectX-4 Lx 25 GbE Dual Port SFP28 rNDC @@ -20665,6 +20725,7 @@ 5808 DDRdrive X8 dd52 DDRdrive X1-30 19e5 Huawei Technologies Co., Ltd. + 1710 iBMA Virtual Network Adapter 1711 Hi1710 [iBMC Intelligent Management system chip w/VGA support] 19e7 NET (Network Equipment Technologies) 1001 STIX DSP Card @@ -20717,12 +20778,15 @@ 0200 TILE-Gx processor 0201 TILE-Gx Processor Virtual Function 2000 TILE-Gx PCI Express Root Port -1a4a SLAC National Accelerator Lab PPA-REG +1a4a SLAC National Accelerator Lab TID-AIR 1000 MCOR Power Supply Controller 1010 AMC EVR - Stockholm Timing Board 2000 PGPCard - 4 Lane 2001 PGPCard - 8 Lane Plus EVR 2010 PCI-Express EVR +# PC-260-101-03 + 2020 PGP-GEN3 PCIe + 2030 data_dev 1a51 Hectronic AB 1a55 Rohde & Schwarz DVS GmbH 0010 SDStationOEM @@ -21246,6 +21310,7 @@ 100e AR-ARKA-FX1 [Arkville 64B DPDK Data Mover] 1d6c 2001 DPDK-Aware Virtual Function [Arkville VF] 4200 A5PL-E1-10GETI [10 GbE Ethernet Traffic Instrument] +1d72 Xiaomi 1d78 DERA 1d7c Aerotech, Inc. 1d87 Fuzhou Rockchip Electronics Co., Ltd From owner-svn-src-stable@freebsd.org Fri Mar 16 14:05:46 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8676DF51B11; Fri, 16 Mar 2018 14:05:46 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 38A8480193; Fri, 16 Mar 2018 14:05:46 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2EECF24E1F; Fri, 16 Mar 2018 14:05:46 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2GE5kNR028875; Fri, 16 Mar 2018 14:05:46 GMT (envelope-from ume@FreeBSD.org) Received: (from ume@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2GE5knH028874; Fri, 16 Mar 2018 14:05:46 GMT (envelope-from ume@FreeBSD.org) Message-Id: <201803161405.w2GE5knH028874@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org using -f From: Hajimu UMEMOTO Date: Fri, 16 Mar 2018 14: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: r331055 - stable/11/sys/fs/fdescfs X-SVN-Group: stable-11 X-SVN-Commit-Author: ume X-SVN-Commit-Paths: stable/11/sys/fs/fdescfs X-SVN-Commit-Revision: 331055 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Mar 2018 14:05:46 -0000 Author: ume Date: Fri Mar 16 14:05:45 2018 New Revision: 331055 URL: https://svnweb.freebsd.org/changeset/base/331055 Log: MFC r330681: Fix Bad file descriptor error. Modified: stable/11/sys/fs/fdescfs/fdesc_vnops.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/fs/fdescfs/fdesc_vnops.c ============================================================================== --- stable/11/sys/fs/fdescfs/fdesc_vnops.c Fri Mar 16 13:33:42 2018 (r331054) +++ stable/11/sys/fs/fdescfs/fdesc_vnops.c Fri Mar 16 14:05:45 2018 (r331055) @@ -415,6 +415,8 @@ fdesc_pathconf(struct vop_pathconf_args *ap) *ap->a_retval = 1; return (0); default: + if (VTOFDESC(vp)->fd_type == Froot) + return (vop_stdpathconf(ap)); vref(vp); VOP_UNLOCK(vp, 0); error = kern_fpathconf(curthread, VTOFDESC(vp)->fd_fd, From owner-svn-src-stable@freebsd.org Fri Mar 16 14:34:03 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 42112F53719; Fri, 16 Mar 2018 14:34:03 +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 BE8BB813ED; Fri, 16 Mar 2018 14:34:01 +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 w2GEXsrS098132; Fri, 16 Mar 2018 07:33:54 -0700 (PDT) (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 w2GEXsbP098131; Fri, 16 Mar 2018 07:33:54 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201803161433.w2GEXsbP098131@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r330972 - stable/11/share/misc In-Reply-To: <20180316181800.B904@besplex.bde.org> To: Bruce Evans Date: Fri, 16 Mar 2018 07:33:54 -0700 (PDT) CC: rgrimes@freebsd.org, Andriy Gapon , Eitan Adler , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@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-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Mar 2018 14:34:03 -0000 > On Thu, 15 Mar 2018, Rodney W. Grimes wrote: > > >> On 15/03/2018 10:30, Eitan Adler wrote: > >>> ... > >>> Log: > >>> MFC r303063,r311852,r311930,r317040,r320506,r321301,r325162,r326759,r329004,: > >> I have never seen things like these MFC-ed before... > >> Should we be really doing them? > > > > Yes, imho. And the reasons may seem odd to sum, but here is my spin on this: > > ... > > Maybe we should even add to the end of the commiters "these are the > > things you should do as a new committer" the merging of your info > > into to all supported/active releases. Which is a good opportunity > > for teaching how to do svn sparse checkouts as you really do not > > want to pull all of stable/10 out just to commit to 1 file. > > Actually, it is necessary to check out everything to MFC to 1 file. > Sparse checkouts only work for committing to head. They break mergeinfo > for MFCs. Or so I was told when I MFCed with a sparse checkout. This is > my excuse for not MFC'ing anything. The procedure for a branch is harder, you can do sparse, you just have to do the tree one level at a time in sparse mode until you get to the leaf you want to commit at. Then you do the merge at the top of the sparse tree, then commit: (Recent example done to help someone with there first MFC:) #!/bin/sh mkdir ~/svnwork.r328011 cd ~/svnwork.r328011 svn checkout svn+ssh://repo.freebsd.org/base --depth immediates cd base/stable && svn update --set-depth=immediates cd 11 && svn update --set-depth=immediates cd sys && svn update --set-depth=immediates cd amd64 && svn update --set-depth=infinity cd ~/svnwork.r328011/base/stable/11 svn merge -c r328011,r329162 ^/head svn diff >~/svnwork.r328011/diff.OUT You now no longer have that excuse :-) -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-stable@freebsd.org Fri Mar 16 15:04:14 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 64717F558E1; Fri, 16 Mar 2018 15:04:14 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 18161829E9; Fri, 16 Mar 2018 15:04:14 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0EC472577C; Fri, 16 Mar 2018 15:04:14 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2GF4EnJ059333; Fri, 16 Mar 2018 15:04:14 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2GF4Dhf059330; Fri, 16 Mar 2018 15:04:13 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201803161504.w2GF4Dhf059330@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Fri, 16 Mar 2018 15:04:13 +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: r331058 - in stable/11: share/man/man4 sys/netgraph X-SVN-Group: stable-11 X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: in stable/11: share/man/man4 sys/netgraph X-SVN-Commit-Revision: 331058 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Mar 2018 15:04:14 -0000 Author: eugen Date: Fri Mar 16 15:04:13 2018 New Revision: 331058 URL: https://svnweb.freebsd.org/changeset/base/331058 Log: MFC r329279: add support for user-supplied Host-Uniq tag to ng_pppoe(4). Submitted by: ale Approved by: avg (mentor), mav (mentor) Relnotes: yes Differential Revision: https://reviews.freebsd.org/D9270 Modified: stable/11/share/man/man4/ng_pppoe.4 stable/11/sys/netgraph/ng_pppoe.c stable/11/sys/netgraph/ng_pppoe.h Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man4/ng_pppoe.4 ============================================================================== --- stable/11/share/man/man4/ng_pppoe.4 Fri Mar 16 14:51:47 2018 (r331057) +++ stable/11/share/man/man4/ng_pppoe.4 Fri Mar 16 15:04:13 2018 (r331058) @@ -35,7 +35,7 @@ .\" $FreeBSD$ .\" $Whistle: ng_pppoe.8,v 1.1 1999/01/25 23:46:27 archie Exp $ .\" -.Dd September 15, 2015 +.Dd February 14, 2018 .Dt NG_PPPOE 4 .Os .Sh NAME @@ -104,12 +104,33 @@ the state machine as a client. It must be newly created and a service name can be given as an argument. It is legal to specify a zero-length service name, this is common on some DSL setups. -It is possible to request a connection to a specific -access concentrator by its name using the "AC-Name\\Service-Name" syntax. -A session request packet will be broadcasted on the Ethernet. +It is possible to request a connection to a specific access concentrator, +and/or set a specific Host-Uniq tag, required by some Internet providers, +using the +.Qq Li [AC-Name\\][Host-Uniq|]Service-Name +syntax. +To set a binary Host-Uniq, it must be encoded as a hexadecimal lowercase +string and prefixed with +.Qq Li 0x , +for example +.Qq Li 0x6d792d746167 +is equivalent to +.Qq Li my-tag . +A session request packet will be broadcast on the Ethernet. This command uses the .Dv ngpppoe_init_data structure shown below. +For example, this init data argument can be used to +connect to +.Qq Li my-isp +service with +.Qq Li my-host +uniq tag, accepting only +.Qq Li remote-ac +as access concentrator: +.Bd -literal -offset indent +"remote-ac\\my-host|my-isp" +.Ed .It Dv NGM_PPPOE_LISTEN Pq Ic pppoe_listen Tell a nominated newly created hook that its session should enter the state machine as a server listener. @@ -258,7 +279,41 @@ struct ngpppoe_maxp { uint16_t data; }; .Ed +.It Dv NGM_PPPOE_SEND_HURL Pq Ic send_hurl +Tell a nominated hook with an active session to send a PADM message with +a HURL tag. +The argument is the URL to be delivered to the client: +.Bd -literal -offset indent +ngctl msg fxp0:orphans send_hurl '{ hook="myHook" data="http://example.net/cpe" }' +.Ed +.It Dv NGM_PPPOE_SEND_MOTM Pq Ic send_motm +Tell a nominated hook with an active session to send a PADM message with +a MOTM tag. +The argument is the message to be delivered to the client: +.Bd -literal -offset indent +ngctl msg fxp0:orphans send_motm '{ hook="myHook" data="Welcome aboard" }' +.Ed .El +.Pp +The two commands above use the same ngpppoe_init_data structure described +above. +.Bl -tag -width 3n +.It Dv NGM_PPPOE_HURL +This command is sent to the node that started this session when a PADM +message with a HURL tag is received, and contains a URL that the host can +pass to a web browser for presentation to the user. +.It Dv NGM_PPPOE_MOTM +This command is sent to the node that started this session when a PADM +message with a MOTM tag is received, and contains a Message Of The +Minute that the host can display to the user. +.El +.Pp +The two commands above use a common data structure: +.Bd -literal -offset 4n +struct ngpppoe_padm { + char msg[PPPOE_PADM_VALUE_SIZE]; +}; +.Ed .Sh SHUTDOWN This node shuts down upon receipt of a .Dv NGM_SHUTDOWN Modified: stable/11/sys/netgraph/ng_pppoe.c ============================================================================== --- stable/11/sys/netgraph/ng_pppoe.c Fri Mar 16 14:51:47 2018 (r331057) +++ stable/11/sys/netgraph/ng_pppoe.c Fri Mar 16 15:04:13 2018 (r331058) @@ -175,6 +175,20 @@ static const struct ng_cmdlist ng_pppoe_cmds[] = { &ng_parse_uint16_type, NULL }, + { + NGM_PPPOE_COOKIE, + NGM_PPPOE_SEND_HURL, + "send_hurl", + &ngpppoe_init_data_state_type, + NULL + }, + { + NGM_PPPOE_COOKIE, + NGM_PPPOE_SEND_MOTM, + "send_motm", + &ngpppoe_init_data_state_type, + NULL + }, { 0 } }; @@ -226,9 +240,11 @@ struct sess_neg { const struct pppoe_tag *tags[NUMTAGS]; u_int service_len; u_int ac_name_len; + u_int host_uniq_len; struct datatag service; struct datatag ac_name; + struct datatag host_uniq; }; typedef struct sess_neg *negp; @@ -589,22 +605,47 @@ static hook_p pppoe_finduniq(node_p node, const struct pppoe_tag *tag) { hook_p hook = NULL; - union uniq uniq; + sessp sp; - bcopy(tag + 1, uniq.bytes, sizeof(void *)); /* Cycle through all known hooks. */ LIST_FOREACH(hook, &node->nd_hooks, hk_hooks) { /* Skip any nonsession hook. */ if (NG_HOOK_PRIVATE(hook) == NULL) continue; - if (uniq.pointer == NG_HOOK_PRIVATE(hook)) + sp = NG_HOOK_PRIVATE(hook); + /* Skip already connected sessions. */ + if (sp->neg == NULL) + continue; + if (sp->neg->host_uniq_len == ntohs(tag->tag_len) && + bcmp(sp->neg->host_uniq.data, (const char *)(tag + 1), + sp->neg->host_uniq_len) == 0) break; } - CTR3(KTR_NET, "%20s: matched %p for %p", __func__, hook, uniq.pointer); + CTR3(KTR_NET, "%20s: matched %p for %p", __func__, hook, sp); return (hook); } +static hook_p +pppoe_findcookie(node_p node, const struct pppoe_tag *tag) +{ + hook_p hook = NULL; + union uniq cookie; + + bcopy(tag + 1, cookie.bytes, sizeof(void *)); + /* Cycle through all known hooks. */ + LIST_FOREACH(hook, &node->nd_hooks, hk_hooks) { + /* Skip any nonsession hook. */ + if (NG_HOOK_PRIVATE(hook) == NULL) + continue; + if (cookie.pointer == NG_HOOK_PRIVATE(hook)) + break; + } + CTR3(KTR_NET, "%20s: matched %p for %p", __func__, hook, cookie.pointer); + + return (hook); +} + /************************************************************************** * Start of Netgraph entrypoints. * **************************************************************************/ @@ -744,17 +785,29 @@ ng_pppoe_rcvmsg(node_p node, item_p item, hook_p lasth case NGM_PPPOE_LISTEN: case NGM_PPPOE_OFFER: case NGM_PPPOE_SERVICE: + case NGM_PPPOE_SEND_HURL: + case NGM_PPPOE_SEND_MOTM: ourmsg = (struct ngpppoe_init_data *)msg->data; if (msg->header.arglen < sizeof(*ourmsg)) { log(LOG_ERR, "ng_pppoe[%x]: init data too " "small\n", node->nd_ID); LEAVE(EMSGSIZE); } - if (msg->header.arglen - sizeof(*ourmsg) > - PPPOE_SERVICE_NAME_SIZE) { - log(LOG_ERR, "ng_pppoe[%x]: service name " - "too big\n", node->nd_ID); - LEAVE(EMSGSIZE); + if (msg->header.cmd == NGM_PPPOE_SEND_HURL || + msg->header.cmd == NGM_PPPOE_SEND_MOTM) { + if (msg->header.arglen - sizeof(*ourmsg) > + PPPOE_PADM_VALUE_SIZE) { + log(LOG_ERR, "ng_pppoe[%x]: message " + "too big\n", node->nd_ID); + LEAVE(EMSGSIZE); + } + } else { + if (msg->header.arglen - sizeof(*ourmsg) > + PPPOE_SERVICE_NAME_SIZE) { + log(LOG_ERR, "ng_pppoe[%x]: service name " + "too big\n", node->nd_ID); + LEAVE(EMSGSIZE); + } } if (msg->header.arglen - sizeof(*ourmsg) < ourmsg->data_len) { @@ -794,6 +847,20 @@ ng_pppoe_rcvmsg(node_p node, item_p item, hook_p lasth if (msg->header.cmd == NGM_PPPOE_SERVICE) break; + /* + * PADM messages are set up on active sessions. + */ + if (msg->header.cmd == NGM_PPPOE_SEND_HURL || + msg->header.cmd == NGM_PPPOE_SEND_MOTM) { + if (sp->state != PPPOE_NEWCONNECTED && + sp->state != PPPOE_CONNECTED) { + log(LOG_NOTICE, "ng_pppoe[%x]: session is not " + "active\n", node->nd_ID); + LEAVE(EISCONN); + } + break; + } + if (sp->state != PPPOE_SNONE) { log(LOG_NOTICE, "ng_pppoe[%x]: Session already " "active\n", node->nd_ID); @@ -848,12 +915,15 @@ ng_pppoe_rcvmsg(node_p node, item_p item, hook_p lasth * Check the hook exists and is Uninitialised. * Send a PADI request, and start the timeout logic. * Store the originator of this message so we can send - * a success of fail message to them later. + * a success or fail message to them later. * Move the session to SINIT. * Set up the session to the correct state and * start it. */ - int i, acnlen = 0, acnsep = 0, srvlen; + int acnpos, acnlen = 0, acnsep = 0; + int hupos, hulen = 0, husep = 0; + int i, srvpos, srvlen; + acnpos = 0; for (i = 0; i < ourmsg->data_len; i++) { if (ourmsg->data[i] == '\\') { acnlen = i; @@ -861,15 +931,56 @@ ng_pppoe_rcvmsg(node_p node, item_p item, hook_p lasth break; } } - srvlen = ourmsg->data_len - acnlen - acnsep; + hupos = acnlen + acnsep; + for (i = hupos; i < ourmsg->data_len; i++) { + if (ourmsg->data[i] == '|') { + hulen = i - hupos; + husep = 1; + break; + } + } + srvpos = hupos + hulen + husep; + srvlen = ourmsg->data_len - srvpos; - bcopy(ourmsg->data, neg->ac_name.data, acnlen); + bcopy(ourmsg->data + acnpos, neg->ac_name.data, acnlen); neg->ac_name_len = acnlen; + neg->host_uniq.hdr.tag_type = PTT_HOST_UNIQ; + if (hulen == 0) { + /* Not provided, generate one */ + neg->host_uniq.hdr.tag_len = htons(sizeof(sp)); + bcopy(&sp, neg->host_uniq.data, sizeof(sp)); + neg->host_uniq_len = sizeof(sp); + } else if (hulen > 2 && ourmsg->data[hupos] == '0' && + ourmsg->data[hupos + 1] == 'x' && hulen % 2 == 0) { + /* Hex encoded */ + static const char hexdig[16] = "0123456789abcdef"; + int j; + + neg->host_uniq.hdr.tag_len = htons((uint16_t)(hulen / 2 - 1)); + for (i = 0; i < hulen - 2; i++) { + for (j = 0; + j < 16 && + ourmsg->data[hupos + 2 + i] != hexdig[j]; + j++); + if (j == 16) + LEAVE(EINVAL); + if (i % 2 == 0) + neg->host_uniq.data[i / 2] = j << 4; + else + neg->host_uniq.data[i / 2] |= j; + } + neg->host_uniq_len = hulen / 2 - 1; + } else { + /* Plain string */ + neg->host_uniq.hdr.tag_len = htons((uint16_t)hulen); + bcopy(ourmsg->data + hupos, neg->host_uniq.data, hulen); + neg->host_uniq_len = hulen; + } + neg->service.hdr.tag_type = PTT_SRV_NAME; neg->service.hdr.tag_len = htons((uint16_t)srvlen); - bcopy(ourmsg->data + acnlen + acnsep, - neg->service.data, srvlen); + bcopy(ourmsg->data + srvpos, neg->service.data, srvlen); neg->service_len = srvlen; pppoe_start(sp); break; @@ -879,7 +990,7 @@ ng_pppoe_rcvmsg(node_p node, item_p item, hook_p lasth * Check the hook exists and is Uninitialised. * Install the service matching string. * Store the originator of this message so we can send - * a success of fail message to them later. + * a success or fail message to them later. * Move the hook to 'LISTENING' */ neg->service.hdr.tag_type = PTT_SRV_NAME; @@ -1019,6 +1130,92 @@ ng_pppoe_rcvmsg(node_p node, item_p item, hook_p lasth privp->max_payload.hdr.tag_len = htons(sizeof(uint16_t)); privp->max_payload.data = htons(*((uint16_t *)msg->data)); break; + case NGM_PPPOE_SEND_HURL: + { + struct mbuf *m; + + /* Generate a packet of that type. */ + m = m_gethdr(M_NOWAIT, MT_DATA); + if (m == NULL) + log(LOG_NOTICE, "ng_pppoe[%x]: session out of " + "mbufs\n", node->nd_ID); + else { + struct pppoe_full_hdr *wh; + struct pppoe_tag *tag; + int error = 0; + + wh = mtod(m, struct pppoe_full_hdr *); + bcopy(&sp->pkt_hdr, wh, sizeof(*wh)); + + /* Revert the stored header to DISC/PADM mode. */ + wh->ph.code = PADM_CODE; + /* + * Configure ethertype depending on what + * was used during sessions stage. + */ + if (wh->eh.ether_type == + ETHERTYPE_PPPOE_3COM_SESS) + wh->eh.ether_type = ETHERTYPE_PPPOE_3COM_DISC; + else + wh->eh.ether_type = ETHERTYPE_PPPOE_DISC; + /* + * Add PADM message and adjust sizes. + */ + tag = (void *)(&wh->ph + 1); + tag->tag_type = PTT_HURL; + tag->tag_len = htons(ourmsg->data_len); + strncpy((char *)(tag + 1), ourmsg->data, ourmsg->data_len); + m->m_pkthdr.len = m->m_len = sizeof(*wh) + sizeof(*tag) + + ourmsg->data_len; + wh->ph.length = htons(sizeof(*tag) + ourmsg->data_len); + NG_SEND_DATA_ONLY(error, + privp->ethernet_hook, m); + } + break; + } + case NGM_PPPOE_SEND_MOTM: + { + struct mbuf *m; + + /* Generate a packet of that type. */ + m = m_gethdr(M_NOWAIT, MT_DATA); + if (m == NULL) + log(LOG_NOTICE, "ng_pppoe[%x]: session out of " + "mbufs\n", node->nd_ID); + else { + struct pppoe_full_hdr *wh; + struct pppoe_tag *tag; + int error = 0; + + wh = mtod(m, struct pppoe_full_hdr *); + bcopy(&sp->pkt_hdr, wh, sizeof(*wh)); + + /* Revert the stored header to DISC/PADM mode. */ + wh->ph.code = PADM_CODE; + /* + * Configure ethertype depending on what + * was used during sessions stage. + */ + if (wh->eh.ether_type == + ETHERTYPE_PPPOE_3COM_SESS) + wh->eh.ether_type = ETHERTYPE_PPPOE_3COM_DISC; + else + wh->eh.ether_type = ETHERTYPE_PPPOE_DISC; + /* + * Add PADM message and adjust sizes. + */ + tag = (void *)(&wh->ph + 1); + tag->tag_type = PTT_MOTM; + tag->tag_len = htons(ourmsg->data_len); + strncpy((char *)(tag + 1), ourmsg->data, ourmsg->data_len); + m->m_pkthdr.len = m->m_len = sizeof(*wh) + sizeof(*tag) + + ourmsg->data_len; + wh->ph.length = htons(sizeof(*tag) + ourmsg->data_len); + NG_SEND_DATA_ONLY(error, + privp->ethernet_hook, m); + } + break; + } default: LEAVE(EINVAL); } @@ -1061,10 +1258,6 @@ pppoe_start(sessp sp) node_p node = NG_HOOK_NODE(hook); priv_p privp = NG_NODE_PRIVATE(node); negp neg = sp->neg; - struct { - struct pppoe_tag hdr; - union uniq data; - } __packed uniqtag; struct mbuf *m0; int error; @@ -1080,11 +1273,8 @@ pppoe_start(sessp sp) memcpy((void *)&neg->pkt->pkt_header.eh, &privp->eh, sizeof(struct ether_header)); neg->pkt->pkt_header.ph.code = PADI_CODE; - uniqtag.hdr.tag_type = PTT_HOST_UNIQ; - uniqtag.hdr.tag_len = htons((u_int16_t)sizeof(uniqtag.data)); - uniqtag.data.pointer = sp; init_tags(sp); - insert_tag(sp, &uniqtag.hdr); + insert_tag(sp, &neg->host_uniq.hdr); insert_tag(sp, &neg->service.hdr); if (privp->max_payload.data != 0) insert_tag(sp, &privp->max_payload.hdr); @@ -1163,6 +1353,52 @@ send_maxp(sessp sp, const struct pppoe_tag *tag) return (error); } +static int +send_hurl(sessp sp, const struct pppoe_tag *tag) +{ + int error, tlen; + struct ng_mesg *msg; + struct ngpppoe_padm *padm; + + CTR2(KTR_NET, "%20s: called %d", __func__, sp->Session_ID); + + NG_MKMESSAGE(msg, NGM_PPPOE_COOKIE, NGM_PPPOE_HURL, + sizeof(struct ngpppoe_padm), M_NOWAIT); + if (msg == NULL) + return (ENOMEM); + + padm = (struct ngpppoe_padm *)msg->data; + tlen = min(PPPOE_PADM_VALUE_SIZE - 1, ntohs(tag->tag_len)); + strncpy(padm->msg, (const char *)(tag + 1), tlen); + padm->msg[tlen] = '\0'; + NG_SEND_MSG_ID(error, NG_HOOK_NODE(sp->hook), msg, sp->creator, 0); + + return (error); +} + +static int +send_motm(sessp sp, const struct pppoe_tag *tag) +{ + int error, tlen; + struct ng_mesg *msg; + struct ngpppoe_padm *padm; + + CTR2(KTR_NET, "%20s: called %d", __func__, sp->Session_ID); + + NG_MKMESSAGE(msg, NGM_PPPOE_COOKIE, NGM_PPPOE_MOTM, + sizeof(struct ngpppoe_padm), M_NOWAIT); + if (msg == NULL) + return (ENOMEM); + + padm = (struct ngpppoe_padm *)msg->data; + tlen = min(PPPOE_PADM_VALUE_SIZE - 1, ntohs(tag->tag_len)); + strncpy(padm->msg, (const char *)(tag + 1), tlen); + padm->msg[tlen] = '\0'; + NG_SEND_MSG_ID(error, NG_HOOK_NODE(sp->hook), msg, sp->creator, 0); + + return (error); +} + /* * Receive data from session hook and do something with it. */ @@ -1320,6 +1556,7 @@ ng_pppoe_rcvdata_ether(hook_p hook, item_p item) const priv_p privp = NG_NODE_PRIVATE(node); sessp sp; const struct pppoe_tag *utag = NULL, *tag = NULL; + const struct pppoe_tag sntag = { PTT_SRV_NAME, 0 }; const struct pppoe_full_hdr *wh; const struct pppoe_hdr *ph; negp neg = NULL; @@ -1409,11 +1646,8 @@ ng_pppoe_rcvdata_ether(hook_p hook, item_p item) * processing. */ tag = get_tag(ph, PTT_SRV_NAME); - if (tag == NULL) { - CTR1(KTR_NET, "%20s: PADI w/o Service-Name", - __func__); - LEAVE(ENETUNREACH); - } + if (tag == NULL) + tag = &sntag; /* * First, try to match Service-Name against our @@ -1438,8 +1672,7 @@ ng_pppoe_rcvdata_ether(hook_p hook, item_p item) * For now simply accept the first we receive. */ utag = get_tag(ph, PTT_HOST_UNIQ); - if ((utag == NULL) || - (ntohs(utag->tag_len) != sizeof(sp))) { + if (utag == NULL) { log(LOG_NOTICE, "ng_pppoe[%x]: no host " "unique field\n", node->nd_ID); LEAVE(ENETUNREACH); @@ -1529,7 +1762,7 @@ ng_pppoe_rcvdata_ether(hook_p hook, item_p item) LEAVE(ENETUNREACH); } - sendhook = pppoe_finduniq(node, utag); + sendhook = pppoe_findcookie(node, utag); if (sendhook == NULL) LEAVE(ENETUNREACH); @@ -1605,8 +1838,7 @@ ng_pppoe_rcvdata_ether(hook_p hook, item_p item) * set us into Session mode. */ utag = get_tag(ph, PTT_HOST_UNIQ); - if ((utag == NULL) || - (ntohs(utag->tag_len) != sizeof(sp))) { + if (utag == NULL) { LEAVE (ENETUNREACH); } sendhook = pppoe_finduniq(node, utag); @@ -1659,6 +1891,19 @@ ng_pppoe_rcvdata_ether(hook_p hook, item_p item) /* Disconnect that hook. */ ng_rmhook_self(sp->hook); break; + case PADM_CODE: + /* + * We are a client: + * find matching peer/session combination. + */ + sp = pppoe_findsession(privp, wh); + if (sp == NULL) + LEAVE (ENETUNREACH); + if ((tag = get_tag(ph, PTT_HURL))) + send_hurl(sp, tag); + if ((tag = get_tag(ph, PTT_MOTM))) + send_motm(sp, tag); + break; default: LEAVE(EPFNOSUPPORT); } @@ -1781,7 +2026,7 @@ ng_pppoe_disconnect(hook_p hook) struct mbuf *m; /* Generate a packet of that type. */ - MGETHDR(m, M_NOWAIT, MT_DATA); + m = m_gethdr(M_NOWAIT, MT_DATA); if (m == NULL) log(LOG_NOTICE, "ng_pppoe[%x]: session out of " "mbufs\n", node->nd_ID); @@ -1791,8 +2036,6 @@ ng_pppoe_disconnect(hook_p hook) int msglen = strlen(SIGNOFF); int error = 0; - m->m_pkthdr.rcvif = NULL; - m->m_pkthdr.len = m->m_len = sizeof(*wh); wh = mtod(m, struct pppoe_full_hdr *); bcopy(&sp->pkt_hdr, wh, sizeof(*wh)); @@ -1815,8 +2058,8 @@ ng_pppoe_disconnect(hook_p hook) tag->tag_type = PTT_GEN_ERR; tag->tag_len = htons((u_int16_t)msglen); strncpy((char *)(tag + 1), SIGNOFF, msglen); - m->m_pkthdr.len = (m->m_len += sizeof(*tag) + - msglen); + m->m_pkthdr.len = m->m_len = sizeof(*wh) + sizeof(*tag) + + msglen; wh->ph.length = htons(sizeof(*tag) + msglen); NG_SEND_DATA_ONLY(error, privp->ethernet_hook, m); @@ -1933,6 +2176,8 @@ scan_tags(sessp sp, const struct pppoe_hdr* ph) case PTT_SYS_ERR: case PTT_GEN_ERR: case PTT_MAX_PAYL: + case PTT_HURL: + case PTT_MOTM: break; } pt = (const struct pppoe_tag*)ptn; Modified: stable/11/sys/netgraph/ng_pppoe.h ============================================================================== --- stable/11/sys/netgraph/ng_pppoe.h Fri Mar 16 14:51:47 2018 (r331057) +++ stable/11/sys/netgraph/ng_pppoe.h Fri Mar 16 15:04:13 2018 (r331058) @@ -52,8 +52,10 @@ #define NGM_PPPOE_COOKIE 1089893072 #define NGM_PPPOE_SETMAXP_COOKIE 1441624322 +#define NGM_PPPOE_PADM_COOKIE 1488405822 #define PPPOE_SERVICE_NAME_SIZE 64 /* for now */ +#define PPPOE_PADM_VALUE_SIZE 128 /* for now */ /* Hook names */ #define NG_PPPOE_HOOK_ETHERNET "ethernet" @@ -84,7 +86,11 @@ enum cmd { NGM_PPPOE_SETMODE = 12, /* set to standard or compat modes */ NGM_PPPOE_GETMODE = 13, /* see current mode */ NGM_PPPOE_SETENADDR = 14, /* set Ethernet address */ - NGM_PPPOE_SETMAXP = 15 /* Set PPP-Max-Payload value */ + NGM_PPPOE_SETMAXP = 15, /* Set PPP-Max-Payload value */ + NGM_PPPOE_SEND_HURL = 16, /* Send PADM HURL message */ + NGM_PPPOE_HURL = 17, /* HURL for informational purposes */ + NGM_PPPOE_SEND_MOTM = 18, /* Send PADM MOTM message */ + NGM_PPPOE_MOTM = 19 /* MOTM for informational purposes */ }; /*********************** @@ -157,6 +163,13 @@ struct ngpppoe_maxp { uint16_t data; }; +/* + * This structure is used to send PADM messages from server to client. + */ +struct ngpppoe_padm { + char msg[PPPOE_PADM_VALUE_SIZE]; +}; + /******************************************************************** * Constants and definitions specific to pppoe ********************************************************************/ @@ -171,6 +184,7 @@ struct ngpppoe_maxp { #define PADR_CODE 0x19 #define PADS_CODE 0x65 #define PADT_CODE 0xa7 +#define PADM_CODE 0xd3 /* Tag identifiers */ #if BYTE_ORDER == BIG_ENDIAN @@ -181,6 +195,8 @@ struct ngpppoe_maxp { #define PTT_AC_COOKIE (0x0104) #define PTT_VENDOR (0x0105) #define PTT_RELAY_SID (0x0110) +#define PTT_HURL (0x0111) /* PPPoE Extensions (CARREL) */ +#define PTT_MOTM (0x0112) /* PPPoE Extensions (CARREL) */ #define PTT_MAX_PAYL (0x0120) /* PPP-Max-Payload (RFC4638) */ #define PTT_SRV_ERR (0x0201) #define PTT_SYS_ERR (0x0202) @@ -198,6 +214,8 @@ struct ngpppoe_maxp { #define PTT_AC_COOKIE (0x0401) #define PTT_VENDOR (0x0501) #define PTT_RELAY_SID (0x1001) +#define PTT_HURL (0x1101) /* PPPoE Extensions (CARREL) */ +#define PTT_MOTM (0x1201) /* PPPoE Extensions (CARREL) */ #define PTT_MAX_PAYL (0x2001) /* PPP-Max-Payload (RFC4638) */ #define PTT_SRV_ERR (0x0102) #define PTT_SYS_ERR (0x0202) From owner-svn-src-stable@freebsd.org Fri Mar 16 15:10:14 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 38D76F55EC8; Fri, 16 Mar 2018 15:10:14 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DA50582C79; Fri, 16 Mar 2018 15:10:13 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D0CF325781; Fri, 16 Mar 2018 15:10:13 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2GFADsW059599; Fri, 16 Mar 2018 15:10:13 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2GFADcC059596; Fri, 16 Mar 2018 15:10:13 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201803161510.w2GFADcC059596@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Fri, 16 Mar 2018 15:10:13 +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: r331059 - in stable/10: share/man/man4 sys/netgraph X-SVN-Group: stable-10 X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: in stable/10: share/man/man4 sys/netgraph X-SVN-Commit-Revision: 331059 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Mar 2018 15:10:14 -0000 Author: eugen Date: Fri Mar 16 15:10:13 2018 New Revision: 331059 URL: https://svnweb.freebsd.org/changeset/base/331059 Log: MFC r329279: add support for user-supplied Host-Uniq tag to ng_pppoe(4). Submitted by: ale Approved by: mav (mentor) Relnotes: yes Differential Revision: https://reviews.freebsd.org/D9270 Modified: stable/10/share/man/man4/ng_pppoe.4 stable/10/sys/netgraph/ng_pppoe.c stable/10/sys/netgraph/ng_pppoe.h Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/ng_pppoe.4 ============================================================================== --- stable/10/share/man/man4/ng_pppoe.4 Fri Mar 16 15:04:13 2018 (r331058) +++ stable/10/share/man/man4/ng_pppoe.4 Fri Mar 16 15:10:13 2018 (r331059) @@ -35,7 +35,7 @@ .\" $FreeBSD$ .\" $Whistle: ng_pppoe.8,v 1.1 1999/01/25 23:46:27 archie Exp $ .\" -.Dd September 15, 2015 +.Dd February 14, 2018 .Dt NG_PPPOE 4 .Os .Sh NAME @@ -104,12 +104,33 @@ the state machine as a client. It must be newly created and a service name can be given as an argument. It is legal to specify a zero-length service name, this is common on some DSL setups. -It is possible to request a connection to a specific -access concentrator by its name using the "AC-Name\\Service-Name" syntax. -A session request packet will be broadcasted on the Ethernet. +It is possible to request a connection to a specific access concentrator, +and/or set a specific Host-Uniq tag, required by some Internet providers, +using the +.Qq Li [AC-Name\\][Host-Uniq|]Service-Name +syntax. +To set a binary Host-Uniq, it must be encoded as a hexadecimal lowercase +string and prefixed with +.Qq Li 0x , +for example +.Qq Li 0x6d792d746167 +is equivalent to +.Qq Li my-tag . +A session request packet will be broadcast on the Ethernet. This command uses the .Dv ngpppoe_init_data structure shown below. +For example, this init data argument can be used to +connect to +.Qq Li my-isp +service with +.Qq Li my-host +uniq tag, accepting only +.Qq Li remote-ac +as access concentrator: +.Bd -literal -offset indent +"remote-ac\\my-host|my-isp" +.Ed .It Dv NGM_PPPOE_LISTEN Pq Ic pppoe_listen Tell a nominated newly created hook that its session should enter the state machine as a server listener. @@ -258,7 +279,41 @@ struct ngpppoe_maxp { uint16_t data; }; .Ed +.It Dv NGM_PPPOE_SEND_HURL Pq Ic send_hurl +Tell a nominated hook with an active session to send a PADM message with +a HURL tag. +The argument is the URL to be delivered to the client: +.Bd -literal -offset indent +ngctl msg fxp0:orphans send_hurl '{ hook="myHook" data="http://example.net/cpe" }' +.Ed +.It Dv NGM_PPPOE_SEND_MOTM Pq Ic send_motm +Tell a nominated hook with an active session to send a PADM message with +a MOTM tag. +The argument is the message to be delivered to the client: +.Bd -literal -offset indent +ngctl msg fxp0:orphans send_motm '{ hook="myHook" data="Welcome aboard" }' +.Ed .El +.Pp +The two commands above use the same ngpppoe_init_data structure described +above. +.Bl -tag -width 3n +.It Dv NGM_PPPOE_HURL +This command is sent to the node that started this session when a PADM +message with a HURL tag is received, and contains a URL that the host can +pass to a web browser for presentation to the user. +.It Dv NGM_PPPOE_MOTM +This command is sent to the node that started this session when a PADM +message with a MOTM tag is received, and contains a Message Of The +Minute that the host can display to the user. +.El +.Pp +The two commands above use a common data structure: +.Bd -literal -offset 4n +struct ngpppoe_padm { + char msg[PPPOE_PADM_VALUE_SIZE]; +}; +.Ed .Sh SHUTDOWN This node shuts down upon receipt of a .Dv NGM_SHUTDOWN Modified: stable/10/sys/netgraph/ng_pppoe.c ============================================================================== --- stable/10/sys/netgraph/ng_pppoe.c Fri Mar 16 15:04:13 2018 (r331058) +++ stable/10/sys/netgraph/ng_pppoe.c Fri Mar 16 15:10:13 2018 (r331059) @@ -175,6 +175,20 @@ static const struct ng_cmdlist ng_pppoe_cmds[] = { &ng_parse_uint16_type, NULL }, + { + NGM_PPPOE_COOKIE, + NGM_PPPOE_SEND_HURL, + "send_hurl", + &ngpppoe_init_data_state_type, + NULL + }, + { + NGM_PPPOE_COOKIE, + NGM_PPPOE_SEND_MOTM, + "send_motm", + &ngpppoe_init_data_state_type, + NULL + }, { 0 } }; @@ -226,9 +240,11 @@ struct sess_neg { const struct pppoe_tag *tags[NUMTAGS]; u_int service_len; u_int ac_name_len; + u_int host_uniq_len; struct datatag service; struct datatag ac_name; + struct datatag host_uniq; }; typedef struct sess_neg *negp; @@ -589,22 +605,47 @@ static hook_p pppoe_finduniq(node_p node, const struct pppoe_tag *tag) { hook_p hook = NULL; - union uniq uniq; + sessp sp; - bcopy(tag + 1, uniq.bytes, sizeof(void *)); /* Cycle through all known hooks. */ LIST_FOREACH(hook, &node->nd_hooks, hk_hooks) { /* Skip any nonsession hook. */ if (NG_HOOK_PRIVATE(hook) == NULL) continue; - if (uniq.pointer == NG_HOOK_PRIVATE(hook)) + sp = NG_HOOK_PRIVATE(hook); + /* Skip already connected sessions. */ + if (sp->neg == NULL) + continue; + if (sp->neg->host_uniq_len == ntohs(tag->tag_len) && + bcmp(sp->neg->host_uniq.data, (const char *)(tag + 1), + sp->neg->host_uniq_len) == 0) break; } - CTR3(KTR_NET, "%20s: matched %p for %p", __func__, hook, uniq.pointer); + CTR3(KTR_NET, "%20s: matched %p for %p", __func__, hook, sp); return (hook); } +static hook_p +pppoe_findcookie(node_p node, const struct pppoe_tag *tag) +{ + hook_p hook = NULL; + union uniq cookie; + + bcopy(tag + 1, cookie.bytes, sizeof(void *)); + /* Cycle through all known hooks. */ + LIST_FOREACH(hook, &node->nd_hooks, hk_hooks) { + /* Skip any nonsession hook. */ + if (NG_HOOK_PRIVATE(hook) == NULL) + continue; + if (cookie.pointer == NG_HOOK_PRIVATE(hook)) + break; + } + CTR3(KTR_NET, "%20s: matched %p for %p", __func__, hook, cookie.pointer); + + return (hook); +} + /************************************************************************** * Start of Netgraph entrypoints. * **************************************************************************/ @@ -744,17 +785,29 @@ ng_pppoe_rcvmsg(node_p node, item_p item, hook_p lasth case NGM_PPPOE_LISTEN: case NGM_PPPOE_OFFER: case NGM_PPPOE_SERVICE: + case NGM_PPPOE_SEND_HURL: + case NGM_PPPOE_SEND_MOTM: ourmsg = (struct ngpppoe_init_data *)msg->data; if (msg->header.arglen < sizeof(*ourmsg)) { log(LOG_ERR, "ng_pppoe[%x]: init data too " "small\n", node->nd_ID); LEAVE(EMSGSIZE); } - if (msg->header.arglen - sizeof(*ourmsg) > - PPPOE_SERVICE_NAME_SIZE) { - log(LOG_ERR, "ng_pppoe[%x]: service name " - "too big\n", node->nd_ID); - LEAVE(EMSGSIZE); + if (msg->header.cmd == NGM_PPPOE_SEND_HURL || + msg->header.cmd == NGM_PPPOE_SEND_MOTM) { + if (msg->header.arglen - sizeof(*ourmsg) > + PPPOE_PADM_VALUE_SIZE) { + log(LOG_ERR, "ng_pppoe[%x]: message " + "too big\n", node->nd_ID); + LEAVE(EMSGSIZE); + } + } else { + if (msg->header.arglen - sizeof(*ourmsg) > + PPPOE_SERVICE_NAME_SIZE) { + log(LOG_ERR, "ng_pppoe[%x]: service name " + "too big\n", node->nd_ID); + LEAVE(EMSGSIZE); + } } if (msg->header.arglen - sizeof(*ourmsg) < ourmsg->data_len) { @@ -794,6 +847,20 @@ ng_pppoe_rcvmsg(node_p node, item_p item, hook_p lasth if (msg->header.cmd == NGM_PPPOE_SERVICE) break; + /* + * PADM messages are set up on active sessions. + */ + if (msg->header.cmd == NGM_PPPOE_SEND_HURL || + msg->header.cmd == NGM_PPPOE_SEND_MOTM) { + if (sp->state != PPPOE_NEWCONNECTED && + sp->state != PPPOE_CONNECTED) { + log(LOG_NOTICE, "ng_pppoe[%x]: session is not " + "active\n", node->nd_ID); + LEAVE(EISCONN); + } + break; + } + if (sp->state != PPPOE_SNONE) { log(LOG_NOTICE, "ng_pppoe[%x]: Session already " "active\n", node->nd_ID); @@ -848,12 +915,15 @@ ng_pppoe_rcvmsg(node_p node, item_p item, hook_p lasth * Check the hook exists and is Uninitialised. * Send a PADI request, and start the timeout logic. * Store the originator of this message so we can send - * a success of fail message to them later. + * a success or fail message to them later. * Move the session to SINIT. * Set up the session to the correct state and * start it. */ - int i, acnlen = 0, acnsep = 0, srvlen; + int acnpos, acnlen = 0, acnsep = 0; + int hupos, hulen = 0, husep = 0; + int i, srvpos, srvlen; + acnpos = 0; for (i = 0; i < ourmsg->data_len; i++) { if (ourmsg->data[i] == '\\') { acnlen = i; @@ -861,15 +931,56 @@ ng_pppoe_rcvmsg(node_p node, item_p item, hook_p lasth break; } } - srvlen = ourmsg->data_len - acnlen - acnsep; + hupos = acnlen + acnsep; + for (i = hupos; i < ourmsg->data_len; i++) { + if (ourmsg->data[i] == '|') { + hulen = i - hupos; + husep = 1; + break; + } + } + srvpos = hupos + hulen + husep; + srvlen = ourmsg->data_len - srvpos; - bcopy(ourmsg->data, neg->ac_name.data, acnlen); + bcopy(ourmsg->data + acnpos, neg->ac_name.data, acnlen); neg->ac_name_len = acnlen; + neg->host_uniq.hdr.tag_type = PTT_HOST_UNIQ; + if (hulen == 0) { + /* Not provided, generate one */ + neg->host_uniq.hdr.tag_len = htons(sizeof(sp)); + bcopy(&sp, neg->host_uniq.data, sizeof(sp)); + neg->host_uniq_len = sizeof(sp); + } else if (hulen > 2 && ourmsg->data[hupos] == '0' && + ourmsg->data[hupos + 1] == 'x' && hulen % 2 == 0) { + /* Hex encoded */ + static const char hexdig[16] = "0123456789abcdef"; + int j; + + neg->host_uniq.hdr.tag_len = htons((uint16_t)(hulen / 2 - 1)); + for (i = 0; i < hulen - 2; i++) { + for (j = 0; + j < 16 && + ourmsg->data[hupos + 2 + i] != hexdig[j]; + j++); + if (j == 16) + LEAVE(EINVAL); + if (i % 2 == 0) + neg->host_uniq.data[i / 2] = j << 4; + else + neg->host_uniq.data[i / 2] |= j; + } + neg->host_uniq_len = hulen / 2 - 1; + } else { + /* Plain string */ + neg->host_uniq.hdr.tag_len = htons((uint16_t)hulen); + bcopy(ourmsg->data + hupos, neg->host_uniq.data, hulen); + neg->host_uniq_len = hulen; + } + neg->service.hdr.tag_type = PTT_SRV_NAME; neg->service.hdr.tag_len = htons((uint16_t)srvlen); - bcopy(ourmsg->data + acnlen + acnsep, - neg->service.data, srvlen); + bcopy(ourmsg->data + srvpos, neg->service.data, srvlen); neg->service_len = srvlen; pppoe_start(sp); break; @@ -879,7 +990,7 @@ ng_pppoe_rcvmsg(node_p node, item_p item, hook_p lasth * Check the hook exists and is Uninitialised. * Install the service matching string. * Store the originator of this message so we can send - * a success of fail message to them later. + * a success or fail message to them later. * Move the hook to 'LISTENING' */ neg->service.hdr.tag_type = PTT_SRV_NAME; @@ -1019,6 +1130,92 @@ ng_pppoe_rcvmsg(node_p node, item_p item, hook_p lasth privp->max_payload.hdr.tag_len = htons(sizeof(uint16_t)); privp->max_payload.data = htons(*((uint16_t *)msg->data)); break; + case NGM_PPPOE_SEND_HURL: + { + struct mbuf *m; + + /* Generate a packet of that type. */ + m = m_gethdr(M_NOWAIT, MT_DATA); + if (m == NULL) + log(LOG_NOTICE, "ng_pppoe[%x]: session out of " + "mbufs\n", node->nd_ID); + else { + struct pppoe_full_hdr *wh; + struct pppoe_tag *tag; + int error = 0; + + wh = mtod(m, struct pppoe_full_hdr *); + bcopy(&sp->pkt_hdr, wh, sizeof(*wh)); + + /* Revert the stored header to DISC/PADM mode. */ + wh->ph.code = PADM_CODE; + /* + * Configure ethertype depending on what + * was used during sessions stage. + */ + if (wh->eh.ether_type == + ETHERTYPE_PPPOE_3COM_SESS) + wh->eh.ether_type = ETHERTYPE_PPPOE_3COM_DISC; + else + wh->eh.ether_type = ETHERTYPE_PPPOE_DISC; + /* + * Add PADM message and adjust sizes. + */ + tag = (void *)(&wh->ph + 1); + tag->tag_type = PTT_HURL; + tag->tag_len = htons(ourmsg->data_len); + strncpy((char *)(tag + 1), ourmsg->data, ourmsg->data_len); + m->m_pkthdr.len = m->m_len = sizeof(*wh) + sizeof(*tag) + + ourmsg->data_len; + wh->ph.length = htons(sizeof(*tag) + ourmsg->data_len); + NG_SEND_DATA_ONLY(error, + privp->ethernet_hook, m); + } + break; + } + case NGM_PPPOE_SEND_MOTM: + { + struct mbuf *m; + + /* Generate a packet of that type. */ + m = m_gethdr(M_NOWAIT, MT_DATA); + if (m == NULL) + log(LOG_NOTICE, "ng_pppoe[%x]: session out of " + "mbufs\n", node->nd_ID); + else { + struct pppoe_full_hdr *wh; + struct pppoe_tag *tag; + int error = 0; + + wh = mtod(m, struct pppoe_full_hdr *); + bcopy(&sp->pkt_hdr, wh, sizeof(*wh)); + + /* Revert the stored header to DISC/PADM mode. */ + wh->ph.code = PADM_CODE; + /* + * Configure ethertype depending on what + * was used during sessions stage. + */ + if (wh->eh.ether_type == + ETHERTYPE_PPPOE_3COM_SESS) + wh->eh.ether_type = ETHERTYPE_PPPOE_3COM_DISC; + else + wh->eh.ether_type = ETHERTYPE_PPPOE_DISC; + /* + * Add PADM message and adjust sizes. + */ + tag = (void *)(&wh->ph + 1); + tag->tag_type = PTT_MOTM; + tag->tag_len = htons(ourmsg->data_len); + strncpy((char *)(tag + 1), ourmsg->data, ourmsg->data_len); + m->m_pkthdr.len = m->m_len = sizeof(*wh) + sizeof(*tag) + + ourmsg->data_len; + wh->ph.length = htons(sizeof(*tag) + ourmsg->data_len); + NG_SEND_DATA_ONLY(error, + privp->ethernet_hook, m); + } + break; + } default: LEAVE(EINVAL); } @@ -1061,10 +1258,6 @@ pppoe_start(sessp sp) node_p node = NG_HOOK_NODE(hook); priv_p privp = NG_NODE_PRIVATE(node); negp neg = sp->neg; - struct { - struct pppoe_tag hdr; - union uniq data; - } __packed uniqtag; struct mbuf *m0; int error; @@ -1080,11 +1273,8 @@ pppoe_start(sessp sp) memcpy((void *)&neg->pkt->pkt_header.eh, &privp->eh, sizeof(struct ether_header)); neg->pkt->pkt_header.ph.code = PADI_CODE; - uniqtag.hdr.tag_type = PTT_HOST_UNIQ; - uniqtag.hdr.tag_len = htons((u_int16_t)sizeof(uniqtag.data)); - uniqtag.data.pointer = sp; init_tags(sp); - insert_tag(sp, &uniqtag.hdr); + insert_tag(sp, &neg->host_uniq.hdr); insert_tag(sp, &neg->service.hdr); if (privp->max_payload.data != 0) insert_tag(sp, &privp->max_payload.hdr); @@ -1163,6 +1353,52 @@ send_maxp(sessp sp, const struct pppoe_tag *tag) return (error); } +static int +send_hurl(sessp sp, const struct pppoe_tag *tag) +{ + int error, tlen; + struct ng_mesg *msg; + struct ngpppoe_padm *padm; + + CTR2(KTR_NET, "%20s: called %d", __func__, sp->Session_ID); + + NG_MKMESSAGE(msg, NGM_PPPOE_COOKIE, NGM_PPPOE_HURL, + sizeof(struct ngpppoe_padm), M_NOWAIT); + if (msg == NULL) + return (ENOMEM); + + padm = (struct ngpppoe_padm *)msg->data; + tlen = min(PPPOE_PADM_VALUE_SIZE - 1, ntohs(tag->tag_len)); + strncpy(padm->msg, (const char *)(tag + 1), tlen); + padm->msg[tlen] = '\0'; + NG_SEND_MSG_ID(error, NG_HOOK_NODE(sp->hook), msg, sp->creator, 0); + + return (error); +} + +static int +send_motm(sessp sp, const struct pppoe_tag *tag) +{ + int error, tlen; + struct ng_mesg *msg; + struct ngpppoe_padm *padm; + + CTR2(KTR_NET, "%20s: called %d", __func__, sp->Session_ID); + + NG_MKMESSAGE(msg, NGM_PPPOE_COOKIE, NGM_PPPOE_MOTM, + sizeof(struct ngpppoe_padm), M_NOWAIT); + if (msg == NULL) + return (ENOMEM); + + padm = (struct ngpppoe_padm *)msg->data; + tlen = min(PPPOE_PADM_VALUE_SIZE - 1, ntohs(tag->tag_len)); + strncpy(padm->msg, (const char *)(tag + 1), tlen); + padm->msg[tlen] = '\0'; + NG_SEND_MSG_ID(error, NG_HOOK_NODE(sp->hook), msg, sp->creator, 0); + + return (error); +} + /* * Receive data from session hook and do something with it. */ @@ -1320,6 +1556,7 @@ ng_pppoe_rcvdata_ether(hook_p hook, item_p item) const priv_p privp = NG_NODE_PRIVATE(node); sessp sp; const struct pppoe_tag *utag = NULL, *tag = NULL; + const struct pppoe_tag sntag = { PTT_SRV_NAME, 0 }; const struct pppoe_full_hdr *wh; const struct pppoe_hdr *ph; negp neg = NULL; @@ -1409,11 +1646,8 @@ ng_pppoe_rcvdata_ether(hook_p hook, item_p item) * processing. */ tag = get_tag(ph, PTT_SRV_NAME); - if (tag == NULL) { - CTR1(KTR_NET, "%20s: PADI w/o Service-Name", - __func__); - LEAVE(ENETUNREACH); - } + if (tag == NULL) + tag = &sntag; /* * First, try to match Service-Name against our @@ -1438,8 +1672,7 @@ ng_pppoe_rcvdata_ether(hook_p hook, item_p item) * For now simply accept the first we receive. */ utag = get_tag(ph, PTT_HOST_UNIQ); - if ((utag == NULL) || - (ntohs(utag->tag_len) != sizeof(sp))) { + if (utag == NULL) { log(LOG_NOTICE, "ng_pppoe[%x]: no host " "unique field\n", node->nd_ID); LEAVE(ENETUNREACH); @@ -1529,7 +1762,7 @@ ng_pppoe_rcvdata_ether(hook_p hook, item_p item) LEAVE(ENETUNREACH); } - sendhook = pppoe_finduniq(node, utag); + sendhook = pppoe_findcookie(node, utag); if (sendhook == NULL) LEAVE(ENETUNREACH); @@ -1605,8 +1838,7 @@ ng_pppoe_rcvdata_ether(hook_p hook, item_p item) * set us into Session mode. */ utag = get_tag(ph, PTT_HOST_UNIQ); - if ((utag == NULL) || - (ntohs(utag->tag_len) != sizeof(sp))) { + if (utag == NULL) { LEAVE (ENETUNREACH); } sendhook = pppoe_finduniq(node, utag); @@ -1659,6 +1891,19 @@ ng_pppoe_rcvdata_ether(hook_p hook, item_p item) /* Disconnect that hook. */ ng_rmhook_self(sp->hook); break; + case PADM_CODE: + /* + * We are a client: + * find matching peer/session combination. + */ + sp = pppoe_findsession(privp, wh); + if (sp == NULL) + LEAVE (ENETUNREACH); + if ((tag = get_tag(ph, PTT_HURL))) + send_hurl(sp, tag); + if ((tag = get_tag(ph, PTT_MOTM))) + send_motm(sp, tag); + break; default: LEAVE(EPFNOSUPPORT); } @@ -1781,7 +2026,7 @@ ng_pppoe_disconnect(hook_p hook) struct mbuf *m; /* Generate a packet of that type. */ - MGETHDR(m, M_NOWAIT, MT_DATA); + m = m_gethdr(M_NOWAIT, MT_DATA); if (m == NULL) log(LOG_NOTICE, "ng_pppoe[%x]: session out of " "mbufs\n", node->nd_ID); @@ -1791,8 +2036,6 @@ ng_pppoe_disconnect(hook_p hook) int msglen = strlen(SIGNOFF); int error = 0; - m->m_pkthdr.rcvif = NULL; - m->m_pkthdr.len = m->m_len = sizeof(*wh); wh = mtod(m, struct pppoe_full_hdr *); bcopy(&sp->pkt_hdr, wh, sizeof(*wh)); @@ -1815,8 +2058,8 @@ ng_pppoe_disconnect(hook_p hook) tag->tag_type = PTT_GEN_ERR; tag->tag_len = htons((u_int16_t)msglen); strncpy((char *)(tag + 1), SIGNOFF, msglen); - m->m_pkthdr.len = (m->m_len += sizeof(*tag) + - msglen); + m->m_pkthdr.len = m->m_len = sizeof(*wh) + sizeof(*tag) + + msglen; wh->ph.length = htons(sizeof(*tag) + msglen); NG_SEND_DATA_ONLY(error, privp->ethernet_hook, m); @@ -1933,6 +2176,8 @@ scan_tags(sessp sp, const struct pppoe_hdr* ph) case PTT_SYS_ERR: case PTT_GEN_ERR: case PTT_MAX_PAYL: + case PTT_HURL: + case PTT_MOTM: break; } pt = (const struct pppoe_tag*)ptn; Modified: stable/10/sys/netgraph/ng_pppoe.h ============================================================================== --- stable/10/sys/netgraph/ng_pppoe.h Fri Mar 16 15:04:13 2018 (r331058) +++ stable/10/sys/netgraph/ng_pppoe.h Fri Mar 16 15:10:13 2018 (r331059) @@ -52,8 +52,10 @@ #define NGM_PPPOE_COOKIE 1089893072 #define NGM_PPPOE_SETMAXP_COOKIE 1441624322 +#define NGM_PPPOE_PADM_COOKIE 1488405822 #define PPPOE_SERVICE_NAME_SIZE 64 /* for now */ +#define PPPOE_PADM_VALUE_SIZE 128 /* for now */ /* Hook names */ #define NG_PPPOE_HOOK_ETHERNET "ethernet" @@ -84,7 +86,11 @@ enum cmd { NGM_PPPOE_SETMODE = 12, /* set to standard or compat modes */ NGM_PPPOE_GETMODE = 13, /* see current mode */ NGM_PPPOE_SETENADDR = 14, /* set Ethernet address */ - NGM_PPPOE_SETMAXP = 15 /* Set PPP-Max-Payload value */ + NGM_PPPOE_SETMAXP = 15, /* Set PPP-Max-Payload value */ + NGM_PPPOE_SEND_HURL = 16, /* Send PADM HURL message */ + NGM_PPPOE_HURL = 17, /* HURL for informational purposes */ + NGM_PPPOE_SEND_MOTM = 18, /* Send PADM MOTM message */ + NGM_PPPOE_MOTM = 19 /* MOTM for informational purposes */ }; /*********************** @@ -157,6 +163,13 @@ struct ngpppoe_maxp { uint16_t data; }; +/* + * This structure is used to send PADM messages from server to client. + */ +struct ngpppoe_padm { + char msg[PPPOE_PADM_VALUE_SIZE]; +}; + /******************************************************************** * Constants and definitions specific to pppoe ********************************************************************/ @@ -171,6 +184,7 @@ struct ngpppoe_maxp { #define PADR_CODE 0x19 #define PADS_CODE 0x65 #define PADT_CODE 0xa7 +#define PADM_CODE 0xd3 /* Tag identifiers */ #if BYTE_ORDER == BIG_ENDIAN @@ -181,6 +195,8 @@ struct ngpppoe_maxp { #define PTT_AC_COOKIE (0x0104) #define PTT_VENDOR (0x0105) #define PTT_RELAY_SID (0x0110) +#define PTT_HURL (0x0111) /* PPPoE Extensions (CARREL) */ +#define PTT_MOTM (0x0112) /* PPPoE Extensions (CARREL) */ #define PTT_MAX_PAYL (0x0120) /* PPP-Max-Payload (RFC4638) */ #define PTT_SRV_ERR (0x0201) #define PTT_SYS_ERR (0x0202) @@ -198,6 +214,8 @@ struct ngpppoe_maxp { #define PTT_AC_COOKIE (0x0401) #define PTT_VENDOR (0x0501) #define PTT_RELAY_SID (0x1001) +#define PTT_HURL (0x1101) /* PPPoE Extensions (CARREL) */ +#define PTT_MOTM (0x1201) /* PPPoE Extensions (CARREL) */ #define PTT_MAX_PAYL (0x2001) /* PPP-Max-Payload (RFC4638) */ #define PTT_SRV_ERR (0x0102) #define PTT_SYS_ERR (0x0202) From owner-svn-src-stable@freebsd.org Fri Mar 16 23:34:45 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6515BF56C88 for ; Fri, 16 Mar 2018 23:34:45 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-yw0-x22f.google.com (mail-yw0-x22f.google.com [IPv6:2607:f8b0:4002:c05::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 00D597A50A for ; Fri, 16 Mar 2018 23:34:44 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-yw0-x22f.google.com with SMTP id y23so8049498ywy.4 for ; Fri, 16 Mar 2018 16:34:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=N/xFMSRkY7StWcNKBv/8LYsrqkEU6kdqkLvZDosoN1U=; b=dmMl2e1SUzo2YgQIBQEcN0G/h7R0tSLrasHjCaz3AM82/IAObpsQsKZ9Fe1d++0sHN SUyv1aYzP3nM3yKuiwZafsF88XqXFekloi59fBOjPNRmrNPQrvjUMAHLJLvWmksKV9BD TbzeuCGjbZ8OjVvvDfcaSEpoy5sAzd6aLtaFOVIHG701CMiaUZ6j/SRwJ2ak3eAwioqJ LWQPMk5bCQHnmOIQlQTvrYG9CVz0Q7vhx45IEywDX6bmDNazlGUdTrMU83kDClgpvYIe fqwHvAdTTHIs9yYHTjetOKU9ebCxemUE8mKm13Dr1D+2dOYsSj0kRoEMMpj+pTIM6OF8 WaiQ== 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=N/xFMSRkY7StWcNKBv/8LYsrqkEU6kdqkLvZDosoN1U=; b=CJpSFlWhtLg6zd/vbN1V+RXwvryMOnvF+htXz/Von05fPwGtm4dN06DN96n/uf5+Oe DkBqrTFY6LljHx4BFcq73ikYA+gUUgqlI0ORoRqwAoQFNJnzfBlJs/Cxh5Ij4hJItW1S Q0clxlBqCtjeiE6o39pATUs1d02GbUlWx2KogcxCZPa4uaH/eaXu+/8lRQOfzRTnSg6R h7X9DW1cAQK1Q+MSCDQGNBXgyP/sMe+ElBjTXkTEtPJC+4315Pt0EnnB31YMJYWG4Uqq QIokBTAKWOGxirX1nWRYtJoKqRJAKR1URCGwUn51KVOBKlEXr0tfh5NDxVmSIGMQM9FF /DJw== X-Gm-Message-State: AElRT7GtrQ7oFUHfDLUvkspDikH4GEemgC4DiYqM32v3b9sc7tj+YzgS 9fpZ94ArJtId3qArwGXm2UI9oocC455wK1XAERJTmg== X-Google-Smtp-Source: AG47ELsHls/LbWx8ib3PRqz1qUHWC9QbofG/n/46X/N663DbNeqgy+FPPkav/JQ/n+ZJewhUMMDYQtUnIAveouCUH8g= X-Received: by 2002:a25:cb8b:: with SMTP id b133-v6mr2458390ybg.29.1521243284251; Fri, 16 Mar 2018 16:34:44 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a25:3492:0:0:0:0:0 with HTTP; Fri, 16 Mar 2018 16:34:43 -0700 (PDT) In-Reply-To: <201803161433.w2GEXsbP098131@pdx.rh.CN85.dnsmgr.net> References: <20180316181800.B904@besplex.bde.org> <201803161433.w2GEXsbP098131@pdx.rh.CN85.dnsmgr.net> From: Oliver Pinter Date: Sat, 17 Mar 2018 00:34:43 +0100 Message-ID: Subject: Re: svn commit: r330972 - stable/11/share/misc To: rgrimes@freebsd.org Cc: Bruce Evans , src-committers@freebsd.org, Eitan Adler , svn-src-stable@freebsd.org, svn-src-all@freebsd.org, svn-src-stable-11@freebsd.org, Andriy Gapon Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Mar 2018 23:34:45 -0000 On 3/16/18, Rodney W. Grimes wrote: >> On Thu, 15 Mar 2018, Rodney W. Grimes wrote: >> >> >> On 15/03/2018 10:30, Eitan Adler wrote: >> >>> ... >> >>> Log: >> >>> MFC >> >>> r303063,r311852,r311930,r317040,r320506,r321301,r325162,r326759,r329004,: >> >> I have never seen things like these MFC-ed before... >> >> Should we be really doing them? >> > >> > Yes, imho. And the reasons may seem odd to sum, but here is my spin on >> > this: >> > ... >> > Maybe we should even add to the end of the commiters "these are the >> > things you should do as a new committer" the merging of your info >> > into to all supported/active releases. Which is a good opportunity >> > for teaching how to do svn sparse checkouts as you really do not >> > want to pull all of stable/10 out just to commit to 1 file. >> >> Actually, it is necessary to check out everything to MFC to 1 file. >> Sparse checkouts only work for committing to head. They break mergeinfo >> for MFCs. Or so I was told when I MFCed with a sparse checkout. This is >> my excuse for not MFC'ing anything. > > The procedure for a branch is harder, you can do sparse, you just > have to do the tree one level at a time in sparse mode until you > get to the leaf you want to commit at. > > Then you do the merge at the top of the sparse tree, > then commit: > > (Recent example done to help someone with there first MFC:) > > #!/bin/sh > mkdir ~/svnwork.r328011 > cd ~/svnwork.r328011 > svn checkout svn+ssh://repo.freebsd.org/base --depth immediates > > cd base/stable && svn update --set-depth=immediates > cd 11 && svn update --set-depth=immediates > cd sys && svn update --set-depth=immediates > cd amd64 && svn update --set-depth=infinity > > cd ~/svnwork.r328011/base/stable/11 > svn merge -c r328011,r329162 ^/head > svn diff >~/svnwork.r328011/diff.OUT > > > You now no longer have that excuse :-) wow, this looks like a brutal overhead... :-\ If I want to pull up a specific file to a specific version with git, I have two options: a) a proper way a.0) git checkout target_branch a.1) git log origin_branch -- path/file a.2) collect the commit ids from the above command a.3) foreach i ( collected ids ) git cherry-pick $i b) the lazy mode b.0) git checkout target_branch b.1) git show target_branch:./path/file > ./path/file b.2) git commit -a the b.1) point will be a git show id:./path/file > ./path/file too, where the id is an exact git commit id > > -- > Rod Grimes > rgrimes@freebsd.org > _______________________________________________ > 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" > From owner-svn-src-stable@freebsd.org Fri Mar 16 23:34:45 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B34AF56C86; Fri, 16 Mar 2018 23:34:45 +0000 (UTC) (envelope-from lidl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0B6237A50F; Fri, 16 Mar 2018 23:34:45 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ED0FA250E; Fri, 16 Mar 2018 23:34:44 +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 w2GNYiZi018648; Fri, 16 Mar 2018 23:34:44 GMT (envelope-from lidl@FreeBSD.org) Received: (from lidl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2GNYiPu018645; Fri, 16 Mar 2018 23:34:44 GMT (envelope-from lidl@FreeBSD.org) Message-Id: <201803162334.w2GNYiPu018645@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lidl set sender to lidl@FreeBSD.org using -f From: Kurt Lidl Date: Fri, 16 Mar 2018 23:34: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: r331079 - in stable/11/contrib/blacklist: bin libexec X-SVN-Group: stable-11 X-SVN-Commit-Author: lidl X-SVN-Commit-Paths: in stable/11/contrib/blacklist: bin libexec X-SVN-Commit-Revision: 331079 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Mar 2018 23:34:45 -0000 Author: lidl Date: Fri Mar 16 23:34:44 2018 New Revision: 331079 URL: https://svnweb.freebsd.org/changeset/base/331079 Log: MFC r328861: improve blacklist-helper shell script Modified: stable/11/contrib/blacklist/bin/blacklistd.8 stable/11/contrib/blacklist/bin/blacklistd.c stable/11/contrib/blacklist/libexec/blacklistd-helper Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/blacklist/bin/blacklistd.8 ============================================================================== --- stable/11/contrib/blacklist/bin/blacklistd.8 Fri Mar 16 22:25:33 2018 (r331078) +++ stable/11/contrib/blacklist/bin/blacklistd.8 Fri Mar 16 23:34:44 2018 (r331079) @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 7, 2016 +.Dd Dec 6, 2017 .Dt BLACKLISTD 8 .Os .Sh NAME @@ -35,7 +35,7 @@ .Nd block and release ports on demand to avoid DoS abuse .Sh SYNOPSIS .Nm -.Op Fl dfrv +.Op Fl Bdfrv .Op Fl C Ar controlprog .Op Fl c Ar configfile .Op Fl D Ar dbfile @@ -154,6 +154,8 @@ The Berkeley DB file where .Nm stores its state, usually .Pa /var/run/blacklistd.db . +.It Fl B +Disable processing of bad-usernames. .It Fl d Normally, .Nm Modified: stable/11/contrib/blacklist/bin/blacklistd.c ============================================================================== --- stable/11/contrib/blacklist/bin/blacklistd.c Fri Mar 16 22:25:33 2018 (r331078) +++ stable/11/contrib/blacklist/bin/blacklistd.c Fri Mar 16 23:34:44 2018 (r331079) @@ -76,6 +76,7 @@ static DB *state; static const char *dbfile = _PATH_BLSTATE; static sig_atomic_t readconf; static sig_atomic_t done; +static int Bflag; static int vflag; static void @@ -164,12 +165,85 @@ getremoteaddress(bl_info_t *bi, struct sockaddr_storag return 0; } +static const char *badnames_email[] = { + "info", + "root", + "admin", + "support", + "webmaster", + "sales", + "postmaster", + "marketing", + "administrator", + "default", + "noreply", + "ftpuser", + "backup", + "webadmin", + "security", + NULL +}; + +static const char *badnames_ssh[] = { + "admin", + "support", + "pi", + "info", + "root", + "guest", + "webmaster", + "ubnt", + "abuse", + "default", + "apache", + "nginx", + "cisco", + "administrator", + "ftpuser", + "supervisor", + "mysql", + "postgres", + "oracle", + "security", + "nagios", + "webadmin", + "usuario", + "uucp", + "PlcmSpIp", + " 0101", + NULL +}; + +static int +lookup_username(int proto, int port, const char *username) +{ + int i; + const char **names; + + if (proto != IPPROTO_TCP) + return 0; + + if (port == 22) + names = badnames_ssh; + else if (port == 25 || port == 587) + names = badnames_email; + else + return 0; + + for (i = 0; names[i] != NULL; i++) { + if (strcmp(username, names[i]) == 0) + return 1; + } + return 0; +} + static void process(bl_t bl) { struct sockaddr_storage rss; socklen_t rsl; char rbuf[BUFSIZ]; + int runadd, rundelete; bl_info_t *bi; struct conf c; struct dbinfo dbi; @@ -213,59 +287,74 @@ process(bl_t bl) fmttime(b2, sizeof(b2), ts.tv_sec)); } + runadd = rundelete = 0; + switch (bi->bi_type) { case BL_ABUSE: /* * If the application has signaled abusive behavior, - * set the number of fails to be one less than the - * configured limit. Fallthrough to the normal BL_ADD - * processing, which will increment the failure count - * to the threshhold, and block the abusive address. + * set the number of fails to be the configured limit. */ if (c.c_nfail != -1) - dbi.count = c.c_nfail - 1; - /*FALLTHROUGH*/ - case BL_ADD: - dbi.count++; - dbi.last = ts.tv_sec; - if (dbi.id[0]) { - /* - * We should not be getting this since the rule - * should have blocked the address. A possible - * explanation is that someone removed that rule, - * and another would be that we got another attempt - * before we added the rule. In anycase, we remove - * and re-add the rule because we don't want to add - * it twice, because then we'd lose track of it. - */ - (*lfun)(LOG_DEBUG, "rule exists %s", dbi.id); - (void)run_change("rem", &c, dbi.id, 0); - dbi.id[0] = '\0'; - } - if (c.c_nfail != -1 && dbi.count >= c.c_nfail) { - int res = run_change("add", &c, dbi.id, sizeof(dbi.id)); - if (res == -1) - goto out; - sockaddr_snprintf(rbuf, sizeof(rbuf), "%a", - (void *)&rss); - (*lfun)(LOG_INFO, - "blocked %s/%d:%d for %d seconds", - rbuf, c.c_lmask, c.c_port, c.c_duration); - - } + dbi.count = c.c_nfail; + rundelete = 1; + runadd = 1; break; case BL_DELETE: if (dbi.last == 0) goto out; dbi.count = 0; dbi.last = 0; + rundelete = 1; break; case BL_BADUSER: - /* ignore for now */ + (*lfun)(LOG_DEBUG, "BL_BADUSER: username %s", bi->bi_msg); + dbi.count--; + if (Bflag == 0 && lookup_username(c.c_proto, c.c_port, bi->bi_msg) == 1) { + dbi.count = c.c_nfail - 1; + (*lfun)(LOG_DEBUG, "BL_BADUSER: found %s on list (port: %d)", bi->bi_msg, c.c_port); + } + /* FALLTHROUGH */ + case BL_ADD: + dbi.count++; + dbi.last = ts.tv_sec; + if (c.c_nfail != -1 && dbi.count >= c.c_nfail) { + rundelete = 1; + runadd = 1; + } break; default: (*lfun)(LOG_ERR, "unknown message %d", bi->bi_type); } + + if (rundelete && c.c_duration != -1) { + /* + * We should not be getting this since the rule + * should have blocked the address. A possible + * explanation is that someone removed that rule, + * and another would be that we got another attempt + * before we added the rule. In anycase, we remove + * and re-add the rule because we don't want to add + * it twice, because then we'd lose track of it. + */ + if (dbi.id[0]) { + (*lfun)(LOG_INFO, "rule exists %s", dbi.id); + (void)run_change("rem", &c, dbi.id, 0); + dbi.id[0] = '\0'; + } + } + if (runadd) { + int res = run_change("add", &c, dbi.id, sizeof(dbi.id)); + if (res == -1) + goto out; + sockaddr_snprintf(rbuf, sizeof(rbuf), "%a", + (void *)&rss); + (*lfun)(LOG_INFO, + "blocked %s/%d:%d for %d seconds", + rbuf, c.c_lmask, c.c_port, c.c_duration); + } + + /* persist the data */ state_put(state, &c, &dbi); out: @@ -404,13 +493,16 @@ rules_restore(void) struct conf c; struct dbinfo dbi; unsigned int f; + static int addremove; for (f = 1; state_iterate(state, &c, &dbi, f) == 1; f = 0) { if (dbi.id[0] == '\0') continue; (void)run_change("rem", &c, dbi.id, 0); (void)run_change("add", &c, dbi.id, sizeof(dbi.id)); + addremove++; } + (*lfun)(LOG_INFO, "removed and re-added %d addresses", addremove); } int @@ -429,8 +521,11 @@ main(int argc, char *argv[]) restore = 0; tout = 0; flags = O_RDWR|O_EXCL|O_CLOEXEC; - while ((c = getopt(argc, argv, "C:c:D:dfP:rR:s:t:v")) != -1) { + while ((c = getopt(argc, argv, "BC:c:D:dfP:rR:s:t:v")) != -1) { switch (c) { + case 'B': + Bflag++; + break; case 'C': controlprog = optarg; break; Modified: stable/11/contrib/blacklist/libexec/blacklistd-helper ============================================================================== --- stable/11/contrib/blacklist/libexec/blacklistd-helper Fri Mar 16 22:25:33 2018 (r331078) +++ stable/11/contrib/blacklist/libexec/blacklistd-helper Fri Mar 16 23:34:44 2018 (r331079) @@ -80,8 +80,8 @@ add) echo "block in quick $proto from to any $port" | \ /sbin/pfctl -a "$2/$6" -f - # insert $ip/$mask into per-protocol/port anchored table - /sbin/pfctl -a "$2/$6" -t "port$6" -T add "$addr/$mask" && \ - echo OK + /sbin/pfctl -qa "$2/$6" -t "port$6" -T add "$addr/$mask" && \ + /sbin/pfctl -q -k $addr && echo OK ;; esac ;; @@ -101,7 +101,7 @@ rem) /sbin/npfctl rule "$2" rem-id "$7" ;; pf) - /sbin/pfctl -a "$2/$6" -t "port$6" -T delete "$addr/$mask" && \ + /sbin/pfctl -qa "$2/$6" -t "port$6" -T delete "$addr/$mask" && \ echo OK ;; esac @@ -118,7 +118,13 @@ flush) /sbin/npfctl rule "$2" flush ;; pf) - /sbin/pfctl -a "$2/$6" -t "port$6" -T flush && echo OK + # dynamically determine which anchors exist + anchors=$(/sbin/pfctl -a $2 -s Anchors) + for anchor in $anchors; do + /sbin/pfctl -a $anchor -t "port${anchor##*/}" -T flush + /sbin/pfctl -a $anchor -F rules + done + echo OK ;; esac ;; From owner-svn-src-stable@freebsd.org Fri Mar 16 23:39:50 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9C8CF57109; Fri, 16 Mar 2018 23:39:50 +0000 (UTC) (envelope-from lidl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6ADDF7A870; Fri, 16 Mar 2018 23:39:50 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 56A862510; Fri, 16 Mar 2018 23:39:50 +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 w2GNdoi8018874; Fri, 16 Mar 2018 23:39:50 GMT (envelope-from lidl@FreeBSD.org) Received: (from lidl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2GNdnjd018871; Fri, 16 Mar 2018 23:39:49 GMT (envelope-from lidl@FreeBSD.org) Message-Id: <201803162339.w2GNdnjd018871@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lidl set sender to lidl@FreeBSD.org using -f From: Kurt Lidl Date: Fri, 16 Mar 2018 23:39:49 +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: r331080 - in stable/11/contrib/blacklist: bin libexec X-SVN-Group: stable-11 X-SVN-Commit-Author: lidl X-SVN-Commit-Paths: in stable/11/contrib/blacklist: bin libexec X-SVN-Commit-Revision: 331080 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Mar 2018 23:39:51 -0000 Author: lidl Date: Fri Mar 16 23:39:49 2018 New Revision: 331080 URL: https://svnweb.freebsd.org/changeset/base/331080 Log: Revert attempted MFC. It included unwanted changes. Modified: stable/11/contrib/blacklist/bin/blacklistd.8 stable/11/contrib/blacklist/bin/blacklistd.c stable/11/contrib/blacklist/libexec/blacklistd-helper Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/blacklist/bin/blacklistd.8 ============================================================================== --- stable/11/contrib/blacklist/bin/blacklistd.8 Fri Mar 16 23:34:44 2018 (r331079) +++ stable/11/contrib/blacklist/bin/blacklistd.8 Fri Mar 16 23:39:49 2018 (r331080) @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd Dec 6, 2017 +.Dd June 7, 2016 .Dt BLACKLISTD 8 .Os .Sh NAME @@ -35,7 +35,7 @@ .Nd block and release ports on demand to avoid DoS abuse .Sh SYNOPSIS .Nm -.Op Fl Bdfrv +.Op Fl dfrv .Op Fl C Ar controlprog .Op Fl c Ar configfile .Op Fl D Ar dbfile @@ -154,8 +154,6 @@ The Berkeley DB file where .Nm stores its state, usually .Pa /var/run/blacklistd.db . -.It Fl B -Disable processing of bad-usernames. .It Fl d Normally, .Nm Modified: stable/11/contrib/blacklist/bin/blacklistd.c ============================================================================== --- stable/11/contrib/blacklist/bin/blacklistd.c Fri Mar 16 23:34:44 2018 (r331079) +++ stable/11/contrib/blacklist/bin/blacklistd.c Fri Mar 16 23:39:49 2018 (r331080) @@ -76,7 +76,6 @@ static DB *state; static const char *dbfile = _PATH_BLSTATE; static sig_atomic_t readconf; static sig_atomic_t done; -static int Bflag; static int vflag; static void @@ -165,85 +164,12 @@ getremoteaddress(bl_info_t *bi, struct sockaddr_storag return 0; } -static const char *badnames_email[] = { - "info", - "root", - "admin", - "support", - "webmaster", - "sales", - "postmaster", - "marketing", - "administrator", - "default", - "noreply", - "ftpuser", - "backup", - "webadmin", - "security", - NULL -}; - -static const char *badnames_ssh[] = { - "admin", - "support", - "pi", - "info", - "root", - "guest", - "webmaster", - "ubnt", - "abuse", - "default", - "apache", - "nginx", - "cisco", - "administrator", - "ftpuser", - "supervisor", - "mysql", - "postgres", - "oracle", - "security", - "nagios", - "webadmin", - "usuario", - "uucp", - "PlcmSpIp", - " 0101", - NULL -}; - -static int -lookup_username(int proto, int port, const char *username) -{ - int i; - const char **names; - - if (proto != IPPROTO_TCP) - return 0; - - if (port == 22) - names = badnames_ssh; - else if (port == 25 || port == 587) - names = badnames_email; - else - return 0; - - for (i = 0; names[i] != NULL; i++) { - if (strcmp(username, names[i]) == 0) - return 1; - } - return 0; -} - static void process(bl_t bl) { struct sockaddr_storage rss; socklen_t rsl; char rbuf[BUFSIZ]; - int runadd, rundelete; bl_info_t *bi; struct conf c; struct dbinfo dbi; @@ -287,74 +213,59 @@ process(bl_t bl) fmttime(b2, sizeof(b2), ts.tv_sec)); } - runadd = rundelete = 0; - switch (bi->bi_type) { case BL_ABUSE: /* * If the application has signaled abusive behavior, - * set the number of fails to be the configured limit. + * set the number of fails to be one less than the + * configured limit. Fallthrough to the normal BL_ADD + * processing, which will increment the failure count + * to the threshhold, and block the abusive address. */ if (c.c_nfail != -1) - dbi.count = c.c_nfail; - rundelete = 1; - runadd = 1; + dbi.count = c.c_nfail - 1; + /*FALLTHROUGH*/ + case BL_ADD: + dbi.count++; + dbi.last = ts.tv_sec; + if (dbi.id[0]) { + /* + * We should not be getting this since the rule + * should have blocked the address. A possible + * explanation is that someone removed that rule, + * and another would be that we got another attempt + * before we added the rule. In anycase, we remove + * and re-add the rule because we don't want to add + * it twice, because then we'd lose track of it. + */ + (*lfun)(LOG_DEBUG, "rule exists %s", dbi.id); + (void)run_change("rem", &c, dbi.id, 0); + dbi.id[0] = '\0'; + } + if (c.c_nfail != -1 && dbi.count >= c.c_nfail) { + int res = run_change("add", &c, dbi.id, sizeof(dbi.id)); + if (res == -1) + goto out; + sockaddr_snprintf(rbuf, sizeof(rbuf), "%a", + (void *)&rss); + (*lfun)(LOG_INFO, + "blocked %s/%d:%d for %d seconds", + rbuf, c.c_lmask, c.c_port, c.c_duration); + + } break; case BL_DELETE: if (dbi.last == 0) goto out; dbi.count = 0; dbi.last = 0; - rundelete = 1; break; case BL_BADUSER: - (*lfun)(LOG_DEBUG, "BL_BADUSER: username %s", bi->bi_msg); - dbi.count--; - if (Bflag == 0 && lookup_username(c.c_proto, c.c_port, bi->bi_msg) == 1) { - dbi.count = c.c_nfail - 1; - (*lfun)(LOG_DEBUG, "BL_BADUSER: found %s on list (port: %d)", bi->bi_msg, c.c_port); - } - /* FALLTHROUGH */ - case BL_ADD: - dbi.count++; - dbi.last = ts.tv_sec; - if (c.c_nfail != -1 && dbi.count >= c.c_nfail) { - rundelete = 1; - runadd = 1; - } + /* ignore for now */ break; default: (*lfun)(LOG_ERR, "unknown message %d", bi->bi_type); } - - if (rundelete && c.c_duration != -1) { - /* - * We should not be getting this since the rule - * should have blocked the address. A possible - * explanation is that someone removed that rule, - * and another would be that we got another attempt - * before we added the rule. In anycase, we remove - * and re-add the rule because we don't want to add - * it twice, because then we'd lose track of it. - */ - if (dbi.id[0]) { - (*lfun)(LOG_INFO, "rule exists %s", dbi.id); - (void)run_change("rem", &c, dbi.id, 0); - dbi.id[0] = '\0'; - } - } - if (runadd) { - int res = run_change("add", &c, dbi.id, sizeof(dbi.id)); - if (res == -1) - goto out; - sockaddr_snprintf(rbuf, sizeof(rbuf), "%a", - (void *)&rss); - (*lfun)(LOG_INFO, - "blocked %s/%d:%d for %d seconds", - rbuf, c.c_lmask, c.c_port, c.c_duration); - } - - /* persist the data */ state_put(state, &c, &dbi); out: @@ -493,16 +404,13 @@ rules_restore(void) struct conf c; struct dbinfo dbi; unsigned int f; - static int addremove; for (f = 1; state_iterate(state, &c, &dbi, f) == 1; f = 0) { if (dbi.id[0] == '\0') continue; (void)run_change("rem", &c, dbi.id, 0); (void)run_change("add", &c, dbi.id, sizeof(dbi.id)); - addremove++; } - (*lfun)(LOG_INFO, "removed and re-added %d addresses", addremove); } int @@ -521,11 +429,8 @@ main(int argc, char *argv[]) restore = 0; tout = 0; flags = O_RDWR|O_EXCL|O_CLOEXEC; - while ((c = getopt(argc, argv, "BC:c:D:dfP:rR:s:t:v")) != -1) { + while ((c = getopt(argc, argv, "C:c:D:dfP:rR:s:t:v")) != -1) { switch (c) { - case 'B': - Bflag++; - break; case 'C': controlprog = optarg; break; Modified: stable/11/contrib/blacklist/libexec/blacklistd-helper ============================================================================== --- stable/11/contrib/blacklist/libexec/blacklistd-helper Fri Mar 16 23:34:44 2018 (r331079) +++ stable/11/contrib/blacklist/libexec/blacklistd-helper Fri Mar 16 23:39:49 2018 (r331080) @@ -80,8 +80,8 @@ add) echo "block in quick $proto from to any $port" | \ /sbin/pfctl -a "$2/$6" -f - # insert $ip/$mask into per-protocol/port anchored table - /sbin/pfctl -qa "$2/$6" -t "port$6" -T add "$addr/$mask" && \ - /sbin/pfctl -q -k $addr && echo OK + /sbin/pfctl -a "$2/$6" -t "port$6" -T add "$addr/$mask" && \ + echo OK ;; esac ;; @@ -101,7 +101,7 @@ rem) /sbin/npfctl rule "$2" rem-id "$7" ;; pf) - /sbin/pfctl -qa "$2/$6" -t "port$6" -T delete "$addr/$mask" && \ + /sbin/pfctl -a "$2/$6" -t "port$6" -T delete "$addr/$mask" && \ echo OK ;; esac @@ -118,13 +118,7 @@ flush) /sbin/npfctl rule "$2" flush ;; pf) - # dynamically determine which anchors exist - anchors=$(/sbin/pfctl -a $2 -s Anchors) - for anchor in $anchors; do - /sbin/pfctl -a $anchor -t "port${anchor##*/}" -T flush - /sbin/pfctl -a $anchor -F rules - done - echo OK + /sbin/pfctl -a "$2/$6" -t "port$6" -T flush && echo OK ;; esac ;; From owner-svn-src-stable@freebsd.org Sat Mar 17 00:19:40 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 151F0F5992C; Sat, 17 Mar 2018 00:19: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 5F8EC7BE44; Sat, 17 Mar 2018 00:19:38 +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 w2H05gER099919; Fri, 16 Mar 2018 17:05:42 -0700 (PDT) (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 w2H05gcV099918; Fri, 16 Mar 2018 17:05:42 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201803170005.w2H05gcV099918@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r330972 - stable/11/share/misc In-Reply-To: To: Oliver Pinter Date: Fri, 16 Mar 2018 17:05:42 -0700 (PDT) CC: rgrimes@freebsd.org, Bruce Evans , src-committers@freebsd.org, Eitan Adler , svn-src-stable@freebsd.org, svn-src-all@freebsd.org, svn-src-stable-11@freebsd.org, Andriy Gapon 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-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2018 00:19:40 -0000 > On 3/16/18, Rodney W. Grimes wrote: > >> On Thu, 15 Mar 2018, Rodney W. Grimes wrote: > >> > >> >> On 15/03/2018 10:30, Eitan Adler wrote: > >> >>> ... > >> >>> Log: > >> >>> MFC > >> >>> r303063,r311852,r311930,r317040,r320506,r321301,r325162,r326759,r329004,: > >> >> I have never seen things like these MFC-ed before... > >> >> Should we be really doing them? > >> > > >> > Yes, imho. And the reasons may seem odd to sum, but here is my spin on > >> > this: > >> > ... > >> > Maybe we should even add to the end of the commiters "these are the > >> > things you should do as a new committer" the merging of your info > >> > into to all supported/active releases. Which is a good opportunity > >> > for teaching how to do svn sparse checkouts as you really do not > >> > want to pull all of stable/10 out just to commit to 1 file. > >> > >> Actually, it is necessary to check out everything to MFC to 1 file. > >> Sparse checkouts only work for committing to head. They break mergeinfo > >> for MFCs. Or so I was told when I MFCed with a sparse checkout. This is > >> my excuse for not MFC'ing anything. > > > > The procedure for a branch is harder, you can do sparse, you just > > have to do the tree one level at a time in sparse mode until you > > get to the leaf you want to commit at. > > > > Then you do the merge at the top of the sparse tree, > > then commit: > > > > (Recent example done to help someone with there first MFC:) > > > > #!/bin/sh > > mkdir ~/svnwork.r328011 > > cd ~/svnwork.r328011 > > svn checkout svn+ssh://repo.freebsd.org/base --depth immediates > > > > cd base/stable && svn update --set-depth=immediates > > cd 11 && svn update --set-depth=immediates > > cd sys && svn update --set-depth=immediates > > cd amd64 && svn update --set-depth=infinity > > > > cd ~/svnwork.r328011/base/stable/11 > > svn merge -c r328011,r329162 ^/head > > svn diff >~/svnwork.r328011/diff.OUT > > > > > > You now no longer have that excuse :-) > > wow, this looks like a brutal overhead... :-\ > > If I want to pull up a specific file to a specific version with git, I > have two options: > a) a proper way > a.0) git checkout target_branch How long did this take, and how many files does find . -type f | wc -l return? > a.1) git log origin_branch -- path/file > a.2) collect the commit ids from the above command > a.3) foreach i ( collected ids ) git cherry-pick $i > > b) the lazy mode > b.0) git checkout target_branch How long did this take, and how many files does find . -type f | wc -l return? > b.1) git show target_branch:./path/file > ./path/file > b.2) git commit -a > > the b.1) point will be a git show id:./path/file > ./path/file too, > where the id is an exact git commit id The above "painful" method runs in a few seconds and produces only a handful of files in ~svwnwork.r328011 Have missed the sparseness aspect? -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-stable@freebsd.org Sat Mar 17 01:27:56 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D338F5DF8B; Sat, 17 Mar 2018 01:27:56 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 581E07E393; Sat, 17 Mar 2018 01:27:55 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AF720396A; Sat, 17 Mar 2018 01:27:54 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2H1RssK072822; Sat, 17 Mar 2018 01:27:54 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2H1RsmT072821; Sat, 17 Mar 2018 01:27:54 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803170127.w2H1RsmT072821@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sat, 17 Mar 2018 01:27: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: r331081 - stable/11 X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11 X-SVN-Commit-Revision: 331081 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2018 01:27:56 -0000 Author: eadler Date: Sat Mar 17 01:27:54 2018 New Revision: 331081 URL: https://svnweb.freebsd.org/changeset/base/331081 Log: MFC r326959: arc lint: ignore /tests/ in chmod shell scripts in scripts don't need to be chmod +x to work. In fact most are not. Of the tests I found from a simple search: 65 are chmod +x 84 are chmod -x simply disable the check for test shell scripts. Modified: stable/11/.arclint Directory Properties: stable/11/ (props changed) Modified: stable/11/.arclint ============================================================================== --- stable/11/.arclint Fri Mar 16 23:39:49 2018 (r331080) +++ stable/11/.arclint Sat Mar 17 01:27:54 2018 (r331081) @@ -9,7 +9,8 @@ "type": "spelling" }, "chmod": { - "type": "chmod" + "type": "chmod", + "exclude": "(/tests/)" }, "merge-conflict": { "type": "merge-conflict" From owner-svn-src-stable@freebsd.org Sat Mar 17 03:00:25 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0F583F63013; Sat, 17 Mar 2018 03:00:25 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B0BF181BDB; Sat, 17 Mar 2018 03:00:24 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A9DF44A54; Sat, 17 Mar 2018 03:00:24 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2H30ODX017784; Sat, 17 Mar 2018 03:00:24 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2H30OLP017783; Sat, 17 Mar 2018 03:00:24 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803170300.w2H30OLP017783@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sat, 17 Mar 2018 03:00: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: r331084 - stable/11/bin/dd X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/bin/dd X-SVN-Commit-Revision: 331084 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2018 03:00:25 -0000 Author: eadler Date: Sat Mar 17 03:00:24 2018 New Revision: 331084 URL: https://svnweb.freebsd.org/changeset/base/331084 Log: MFC r328427: dd(1): Use a local swapbytes() function. swab(3) has restrict qualifiers for src and dst. Avoid relying on undefined overlapping swab behavior. Obtained From: OpenBSD Modified: stable/11/bin/dd/dd.c Directory Properties: stable/11/ (props changed) Modified: stable/11/bin/dd/dd.c ============================================================================== --- stable/11/bin/dd/dd.c Sat Mar 17 01:48:27 2018 (r331083) +++ stable/11/bin/dd/dd.c Sat Mar 17 03:00:24 2018 (r331084) @@ -303,6 +303,21 @@ speed_limit(void) } static void +swapbytes(void *v, size_t len) +{ + unsigned char *p = v; + unsigned char t; + + while (len > 1) { + t = p[0]; + p[0] = p[1]; + p[1] = t; + p += 2; + len -= 2; + } +} + +static void dd_in(void) { ssize_t n; @@ -402,7 +417,7 @@ dd_in(void) ++st.swab; --n; } - swab(in.dbp, in.dbp, (size_t)n); + swapbytes(in.dbp, (size_t)n); } in.dbp += in.dbrcnt; From owner-svn-src-stable@freebsd.org Sat Mar 17 05:36:52 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8E863F41E45; Sat, 17 Mar 2018 05:36:52 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2FBD887D55; Sat, 17 Mar 2018 05:36:52 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 24E2164FD; Sat, 17 Mar 2018 05:36:52 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2H5aql3099181; Sat, 17 Mar 2018 05:36:52 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2H5aqSX099180; Sat, 17 Mar 2018 05:36:52 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803170536.w2H5aqSX099180@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sat, 17 Mar 2018 05:36: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: r331087 - stable/11/lib/libc/sys X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/lib/libc/sys X-SVN-Commit-Revision: 331087 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2018 05:36:52 -0000 Author: eadler Date: Sat Mar 17 05:36:51 2018 New Revision: 331087 URL: https://svnweb.freebsd.org/changeset/base/331087 Log: MFC r328959: fsync.2: Cross-reference fsync(1) Modified: stable/11/lib/libc/sys/fsync.2 Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libc/sys/fsync.2 ============================================================================== --- stable/11/lib/libc/sys/fsync.2 Sat Mar 17 05:04:38 2018 (r331086) +++ stable/11/lib/libc/sys/fsync.2 Sat Mar 17 05:36:51 2018 (r331087) @@ -34,7 +34,7 @@ .\" @(#)fsync.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd May 24, 2017 +.Dd February 6, 2018 .Dt FSYNC 2 .Os .Sh NAME @@ -108,6 +108,7 @@ refers to a socket, not to a file. An I/O error occurred while reading from or writing to the file system. .El .Sh SEE ALSO +.Xr fsync 1 , .Xr sync 2 , .Xr syncer 4 , .Xr sync 8 From owner-svn-src-stable@freebsd.org Sat Mar 17 05:43:26 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D2A7BF434BF; Sat, 17 Mar 2018 05:43:26 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7884268227; Sat, 17 Mar 2018 05:43:26 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 71371667B; Sat, 17 Mar 2018 05:43:26 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2H5hQQC004339; Sat, 17 Mar 2018 05:43:26 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2H5hQAa004338; Sat, 17 Mar 2018 05:43:26 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803170543.w2H5hQAa004338@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sat, 17 Mar 2018 05:43: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: r331088 - stable/11/usr.sbin/bsdinstall/scripts X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/usr.sbin/bsdinstall/scripts X-SVN-Commit-Revision: 331088 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2018 05:43:27 -0000 Author: eadler Date: Sat Mar 17 05:43:26 2018 New Revision: 331088 URL: https://svnweb.freebsd.org/changeset/base/331088 Log: MFC r328839: Add the ThinkPad X1 (sandybridge) to the bsdinstall blacklist Reviewed by: AllanJude (for mfc) Modified: stable/11/usr.sbin/bsdinstall/scripts/auto Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/bsdinstall/scripts/auto ============================================================================== --- stable/11/usr.sbin/bsdinstall/scripts/auto Sat Mar 17 05:36:51 2018 (r331087) +++ stable/11/usr.sbin/bsdinstall/scripts/auto Sat Mar 17 05:43:26 2018 (r331088) @@ -182,7 +182,7 @@ if f_interactive; then case "$sys_maker" in "LENOVO") case "$sys_version" in - "ThinkPad X220"|"ThinkPad T420"|"ThinkPad T520"|"ThinkPad W520") + "ThinkPad X220"|"ThinkPad T420"|"ThinkPad T520"|"ThinkPad W520"|"ThinkPad X1") dialog_workaround "$msg_lenovo_fix" retval=$? f_dprintf "lenovofix_prompt=[%s]" "$retval" From owner-svn-src-stable@freebsd.org Sat Mar 17 05:00:08 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 532CCF325E8; Sat, 17 Mar 2018 05:00:08 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 05D5686B0C; Sat, 17 Mar 2018 05:00:08 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 00BAA5EB2; Sat, 17 Mar 2018 05:00:08 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2H507lG079170; Sat, 17 Mar 2018 05:00:07 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2H507qv079168; Sat, 17 Mar 2018 05:00:07 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803170500.w2H507qv079168@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sat, 17 Mar 2018 05:00:07 +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: r331085 - stable/11/share/examples/kld/cdev/module X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/share/examples/kld/cdev/module X-SVN-Commit-Revision: 331085 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2018 05:00:08 -0000 Author: eadler Date: Sat Mar 17 05:00:07 2018 New Revision: 331085 URL: https://svnweb.freebsd.org/changeset/base/331085 Log: MFC r328428: example cdev: use make_dev_s Make use of make_dev_s in the example cdev. While here, fix warnings. Modified: stable/11/share/examples/kld/cdev/module/cdev.c stable/11/share/examples/kld/cdev/module/cdevmod.c Directory Properties: stable/11/ (props changed) Modified: stable/11/share/examples/kld/cdev/module/cdev.c ============================================================================== --- stable/11/share/examples/kld/cdev/module/cdev.c Sat Mar 17 03:00:24 2018 (r331084) +++ stable/11/share/examples/kld/cdev/module/cdev.c Sat Mar 17 05:00:07 2018 (r331085) @@ -102,7 +102,7 @@ mydev_open(struct cdev *dev, int flag, int otyp, struc { struct proc *procp = td->td_proc; - printf("mydev_open: dev_t=%d, flag=%x, otyp=%x, procp=%p\n", + printf("mydev_open: dev_t=%lu, flag=%x, otyp=%x, procp=%p\n", dev2udev(dev), flag, otyp, procp); memset(&buf, '\0', 513); len = 0; @@ -114,7 +114,7 @@ mydev_close(struct cdev *dev, int flag, int otyp, stru { struct proc *procp = td->td_proc; - printf("mydev_close: dev_t=%d, flag=%x, otyp=%x, procp=%p\n", + printf("mydev_close: dev_t=%lu, flag=%x, otyp=%x, procp=%p\n", dev2udev(dev), flag, otyp, procp); return (0); } @@ -126,7 +126,7 @@ mydev_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int error = 0; struct proc *procp = td->td_proc; - printf("mydev_ioctl: dev_t=%d, cmd=%lx, arg=%p, mode=%x procp=%p\n", + printf("mydev_ioctl: dev_t=%lu, cmd=%lx, arg=%p, mode=%x procp=%p\n", dev2udev(dev), cmd, arg, mode, procp); switch(cmd) { @@ -150,7 +150,7 @@ mydev_write(struct cdev *dev, struct uio *uio, int iof { int err = 0; - printf("mydev_write: dev_t=%d, uio=%p, ioflag=%d\n", + printf("mydev_write: dev_t=%lu, uio=%p, ioflag=%d\n", dev2udev(dev), uio, ioflag); err = copyinstr(uio->uio_iov->iov_base, &buf, 512, &len); @@ -170,7 +170,7 @@ mydev_read(struct cdev *dev, struct uio *uio, int iofl { int err = 0; - printf("mydev_read: dev_t=%d, uio=%p, ioflag=%d\n", + printf("mydev_read: dev_t=%lu, uio=%p, ioflag=%d\n", dev2udev(dev), uio, ioflag); if (len <= 0) { Modified: stable/11/share/examples/kld/cdev/module/cdevmod.c ============================================================================== --- stable/11/share/examples/kld/cdev/module/cdevmod.c Sat Mar 17 03:00:24 2018 (r331084) +++ stable/11/share/examples/kld/cdev/module/cdevmod.c Sat Mar 17 05:00:07 2018 (r331085) @@ -107,6 +107,7 @@ static int cdev_load(module_t mod, int cmd, void *arg) { int err = 0; + struct make_dev_args mda; switch (cmd) { case MOD_LOAD: @@ -118,8 +119,14 @@ cdev_load(module_t mod, int cmd, void *arg) printf("Copyright (c) 1998\n"); printf("Rajesh Vaidheeswarran\n"); printf("All rights reserved\n"); - sdev = make_dev(&my_devsw, 0, UID_ROOT, GID_WHEEL, 0600, "cdev"); - break; /* Success*/ + + make_dev_args_init(&mda); + mda.mda_devsw = &my_devsw; + mda.mda_uid = UID_ROOT; + mda.mda_gid = GID_WHEEL; + mda.mda_mode = 0600; + err = make_dev_s(&mda, &sdev, "cdev"); + break; case MOD_UNLOAD: printf("Unloaded kld character device driver\n"); From owner-svn-src-stable@freebsd.org Sat Mar 17 05:04:39 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7BABCF32875; Sat, 17 Mar 2018 05:04:39 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1FBA586E5F; Sat, 17 Mar 2018 05:04:39 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 14F96602B; Sat, 17 Mar 2018 05:04:39 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2H54cK5084124; Sat, 17 Mar 2018 05:04:38 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2H54cOJ084123; Sat, 17 Mar 2018 05:04:38 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803170504.w2H54cOJ084123@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sat, 17 Mar 2018 05:04:38 +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: r331086 - stable/11/sbin/devd X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sbin/devd X-SVN-Commit-Revision: 331086 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2018 05:04:39 -0000 Author: eadler Date: Sat Mar 17 05:04:38 2018 New Revision: 331086 URL: https://svnweb.freebsd.org/changeset/base/331086 Log: MFC r328430,r328431: devd: minor nits - mark usage as noreturn Modified: stable/11/sbin/devd/devd.cc Directory Properties: stable/11/ (props changed) Modified: stable/11/sbin/devd/devd.cc ============================================================================== --- stable/11/sbin/devd/devd.cc Sat Mar 17 05:00:07 2018 (r331085) +++ stable/11/sbin/devd/devd.cc Sat Mar 17 05:04:38 2018 (r331086) @@ -161,7 +161,7 @@ static const char *configfile = CF; static void devdlog(int priority, const char* message, ...) __printflike(2, 3); static void event_loop(void); -static void usage(void); +static void usage(void) __dead2; template void delete_and_clear(vector &v) From owner-svn-src-stable@freebsd.org Sat Mar 17 06:31:26 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1166DF49F02; Sat, 17 Mar 2018 06:31:26 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D336F69B26; Sat, 17 Mar 2018 06:31:24 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8A2B96D09; Sat, 17 Mar 2018 06:31:24 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2H6VO8B029831; Sat, 17 Mar 2018 06:31:24 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2H6VOwZ029829; Sat, 17 Mar 2018 06:31:24 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803170631.w2H6VOwZ029829@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sat, 17 Mar 2018 06:31: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: r331090 - stable/11/usr.sbin/timed/timed X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/usr.sbin/timed/timed X-SVN-Commit-Revision: 331090 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2018 06:31:26 -0000 Author: eadler Date: Sat Mar 17 06:31:24 2018 New Revision: 331090 URL: https://svnweb.freebsd.org/changeset/base/331090 Log: MFC r327941: timed: slave is an infinite loop, mark it as such Modified: stable/11/usr.sbin/timed/timed/extern.h stable/11/usr.sbin/timed/timed/slave.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/timed/timed/extern.h ============================================================================== --- stable/11/usr.sbin/timed/timed/extern.h Sat Mar 17 06:05:33 2018 (r331089) +++ stable/11/usr.sbin/timed/timed/extern.h Sat Mar 17 06:31:24 2018 (r331090) @@ -77,7 +77,7 @@ void print(struct tsp *, struct sockaddr_in *); void prthp(clock_t); void rmnetmachs(struct netinfo *); void setstatus(void); -int slave(void); +void slave(void) __dead2; void slaveack(void); void spreadtime(void); void suppress(struct sockaddr_in *, char *, struct netinfo *); Modified: stable/11/usr.sbin/timed/timed/slave.c ============================================================================== --- stable/11/usr.sbin/timed/timed/slave.c Sat Mar 17 06:05:33 2018 (r331089) +++ stable/11/usr.sbin/timed/timed/slave.c Sat Mar 17 06:31:24 2018 (r331090) @@ -56,7 +56,7 @@ static void schgdate(struct tsp *, char *); static void setmaster(struct tsp *); static void answerdelay(void); -int +void slave(void) { int tries; From owner-svn-src-stable@freebsd.org Sat Mar 17 06:05:34 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 17A1AF46B5E; Sat, 17 Mar 2018 06:05:34 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B1EA968E26; Sat, 17 Mar 2018 06:05:33 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A98C66996; Sat, 17 Mar 2018 06:05:33 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2H65XSN014019; Sat, 17 Mar 2018 06:05:33 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2H65X2X014018; Sat, 17 Mar 2018 06:05:33 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803170605.w2H65X2X014018@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sat, 17 Mar 2018 06:05: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: r331089 - stable/11/share/man/man3 X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/share/man/man3 X-SVN-Commit-Revision: 331089 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2018 06:05:34 -0000 Author: eadler Date: Sat Mar 17 06:05:33 2018 New Revision: 331089 URL: https://svnweb.freebsd.org/changeset/base/331089 Log: MFC r328831: pthread: adding missing header to man page Modified: stable/11/share/man/man3/pthread_join.3 Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man3/pthread_join.3 ============================================================================== --- stable/11/share/man/man3/pthread_join.3 Sat Mar 17 05:43:26 2018 (r331088) +++ stable/11/share/man/man3/pthread_join.3 Sat Mar 17 06:05:33 2018 (r331089) @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 23, 2010 +.Dd February 3, 2018 .Dt PTHREAD_JOIN 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .In pthread.h .Ft int .Fn pthread_join "pthread_t thread" "void **value_ptr" +.In pthread_np.h .Ft int .Fn pthread_timedjoin_np "pthread_t thread" "void **value_ptr" "const struct timespec *abstime" .Sh DESCRIPTION From owner-svn-src-stable@freebsd.org Sat Mar 17 06:44:39 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C5621F4ABBE; Sat, 17 Mar 2018 06:44:39 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 792A16A697; Sat, 17 Mar 2018 06:44:39 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7428E6FD2; Sat, 17 Mar 2018 06:44:39 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2H6idQv038517; Sat, 17 Mar 2018 06:44:39 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2H6idOH038516; Sat, 17 Mar 2018 06:44:39 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803170644.w2H6idOH038516@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sat, 17 Mar 2018 06:44:39 +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: r331092 - stable/11/sys/dev/flash X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/flash X-SVN-Commit-Revision: 331092 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2018 06:44:40 -0000 Author: eadler Date: Sat Mar 17 06:44:39 2018 New Revision: 331092 URL: https://svnweb.freebsd.org/changeset/base/331092 Log: MFC r317870: [mx25l] add new device ids. Modified: stable/11/sys/dev/flash/mx25l.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/flash/mx25l.c ============================================================================== --- stable/11/sys/dev/flash/mx25l.c Sat Mar 17 06:36:39 2018 (r331091) +++ stable/11/sys/dev/flash/mx25l.c Sat Mar 17 06:44:39 2018 (r331092) @@ -112,7 +112,9 @@ struct mx25l_flash_ident flash_devices[] = { { "en25f32", 0x1c, 0x3116, 64 * 1024, 64, FL_NONE }, { "en25p32", 0x1c, 0x2016, 64 * 1024, 64, FL_NONE }, { "en25p64", 0x1c, 0x2017, 64 * 1024, 128, FL_NONE }, + { "en25q32", 0x1c, 0x3016, 64 * 1024, 64, FL_NONE }, { "en25q64", 0x1c, 0x3017, 64 * 1024, 128, FL_ERASE_4K }, + { "m25p32", 0x20, 0x2016, 64 * 1024, 64, FL_NONE }, { "m25p64", 0x20, 0x2017, 64 * 1024, 128, FL_NONE }, { "mx25ll32", 0xc2, 0x2016, 64 * 1024, 64, FL_NONE }, { "mx25ll64", 0xc2, 0x2017, 64 * 1024, 128, FL_NONE }, From owner-svn-src-stable@freebsd.org Sat Mar 17 06:36:40 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9999DF4A450; Sat, 17 Mar 2018 06:36:40 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47C5669FF8; Sat, 17 Mar 2018 06:36:40 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 427EF6E56; Sat, 17 Mar 2018 06:36:40 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2H6aeIU032936; Sat, 17 Mar 2018 06:36:40 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2H6aehq032935; Sat, 17 Mar 2018 06:36:40 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803170636.w2H6aehq032935@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sat, 17 Mar 2018 06:36: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: r331091 - stable/11/sys/dev/ata/chipsets X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/dev/ata/chipsets X-SVN-Commit-Revision: 331091 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2018 06:36:40 -0000 Author: eadler Date: Sat Mar 17 06:36:39 2018 New Revision: 331091 URL: https://svnweb.freebsd.org/changeset/base/331091 Log: MFC r326387: Fix typo Modified: stable/11/sys/dev/ata/chipsets/ata-micron.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/ata/chipsets/ata-micron.c ============================================================================== --- stable/11/sys/dev/ata/chipsets/ata-micron.c Sat Mar 17 06:31:24 2018 (r331090) +++ stable/11/sys/dev/ata/chipsets/ata-micron.c Sat Mar 17 06:36:39 2018 (r331091) @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include /* - * Cenatek chipset support functions + * Micron chipset support functions */ static int ata_micron_probe(device_t dev) From owner-svn-src-stable@freebsd.org Sat Mar 17 07:04:42 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 41DF0F4BB52; Sat, 17 Mar 2018 07:04:42 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D16996B309; Sat, 17 Mar 2018 07:04:41 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C692972FB; Sat, 17 Mar 2018 07:04:41 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2H74fPK048430; Sat, 17 Mar 2018 07:04:41 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2H74fJj048429; Sat, 17 Mar 2018 07:04:41 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803170704.w2H74fJj048429@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sat, 17 Mar 2018 07:04: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: r331093 - stable/11/tools/tools X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/tools/tools X-SVN-Commit-Revision: 331093 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2018 07:04:42 -0000 Author: eadler Date: Sat Mar 17 07:04:41 2018 New Revision: 331093 URL: https://svnweb.freebsd.org/changeset/base/331093 Log: MFC r328509: tools: remove note about diffburst. Said tool was removed in 1999 in r51579 Modified: stable/11/tools/tools/README Directory Properties: stable/11/ (props changed) Modified: stable/11/tools/tools/README ============================================================================== --- stable/11/tools/tools/README Sat Mar 17 06:44:39 2018 (r331092) +++ stable/11/tools/tools/README Sat Mar 17 07:04:41 2018 (r331093) @@ -16,8 +16,6 @@ commitsdb A tool for reconstructing commit history usi crypto Test and exercise tools related to the crypto framework cxgbetool A tool for the cxgbe(4) driver. cxgbtool A tool for the cxgb(4) driver. -diffburst OBSOLETE: equivalent functionality is available via split -p. - For example: "split -p ^diff < patchfile". See split(1). drm Tools specific to the DRM/KMS device drivers. editing Editor modes and the like to help editing FreeBSD code. epfe Extract printing filter examples from printing.sgml. From owner-svn-src-stable@freebsd.org Sat Mar 17 18:55:48 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8D34FF6087D; Sat, 17 Mar 2018 18:55:47 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 23473699A9; Sat, 17 Mar 2018 18:55:47 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1B9F41628E; Sat, 17 Mar 2018 18:55: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 w2HItkLH010299; Sat, 17 Mar 2018 18:55:46 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2HItkpb010298; Sat, 17 Mar 2018 18:55:46 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201803171855.w2HItkpb010298@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 17 Mar 2018 18:55: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: r331107 - stable/11/sys/net X-SVN-Group: stable-11 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: stable/11/sys/net X-SVN-Commit-Revision: 331107 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2018 18:55:48 -0000 Author: dim Date: Sat Mar 17 18:55:46 2018 New Revision: 331107 URL: https://svnweb.freebsd.org/changeset/base/331107 Log: Repair obvious mismerge in r330897, resulting in misleading gcc error messages like "sys/net/if_fddisubr.c:1: error: expected '=', ',', ';', 'asm' or '__attribute__' before '-' token". Modified: stable/11/sys/net/if_fddisubr.c Modified: stable/11/sys/net/if_fddisubr.c ============================================================================== --- stable/11/sys/net/if_fddisubr.c Sat Mar 17 18:14:49 2018 (r331106) +++ stable/11/sys/net/if_fddisubr.c Sat Mar 17 18:55:46 2018 (r331107) @@ -1,6 +1,6 @@ +/*- * SPDX-License-Identifier: BSD-4-Clause * -/*- * Copyright (c) 1995, 1996 * Matt Thomas . All rights reserved. * Copyright (c) 1982, 1989, 1993 From owner-svn-src-stable@freebsd.org Sat Mar 17 19:04:36 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B6A75F6122E; Sat, 17 Mar 2018 19:04:36 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 683836A09E; Sat, 17 Mar 2018 19:04:36 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6323A1640D; Sat, 17 Mar 2018 19:04:36 +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 w2HJ4agS015159; Sat, 17 Mar 2018 19:04:36 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2HJ4aSX015158; Sat, 17 Mar 2018 19:04:36 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201803171904.w2HJ4aSX015158@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 17 Mar 2018 19:04: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: r331108 - stable/11/sys/net80211 X-SVN-Group: stable-11 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: stable/11/sys/net80211 X-SVN-Commit-Revision: 331108 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2018 19:04:36 -0000 Author: dim Date: Sat Mar 17 19:04:36 2018 New Revision: 331108 URL: https://svnweb.freebsd.org/changeset/base/331108 Log: Revert r330471 (MFC of r311861), since it results in compile errors like: sys/net80211/ieee80211_tdma.c:179: error: 'IEEE80211_MODE_VHT_2GHZ' undeclared (first use in this function) sys/net80211/ieee80211_tdma.c:180: error: 'IEEE80211_MODE_VHT_5GHZ' undeclared (first use in this function) The IEEE80211_MODE_VHT_2GHZ and IEEE80211_MODE_VHT_5GHZ enum values are defined in r310147, but that commit cannot be MFCd as-is, because it likely breaks ABI. Modified: stable/11/sys/net80211/ieee80211_tdma.c Modified: stable/11/sys/net80211/ieee80211_tdma.c ============================================================================== --- stable/11/sys/net80211/ieee80211_tdma.c Sat Mar 17 18:55:46 2018 (r331107) +++ stable/11/sys/net80211/ieee80211_tdma.c Sat Mar 17 19:04:36 2018 (r331108) @@ -176,8 +176,6 @@ ieee80211_tdma_vattach(struct ieee80211vap *vap) settxparms(vap, IEEE80211_MODE_11NG, TDMA_TXRATE_11NG_DEFAULT); settxparms(vap, IEEE80211_MODE_HALF, TDMA_TXRATE_HALF_DEFAULT); settxparms(vap, IEEE80211_MODE_QUARTER, TDMA_TXRATE_QUARTER_DEFAULT); - settxparms(vap, IEEE80211_MODE_VHT_2GHZ, TDMA_TXRATE_11NG_DEFAULT); - settxparms(vap, IEEE80211_MODE_VHT_5GHZ, TDMA_TXRATE_11NA_DEFAULT); setackpolicy(vap->iv_ic, 1); /* disable ACK's */ From owner-svn-src-stable@freebsd.org Sat Mar 17 20:17:36 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8AB22F65CA8; Sat, 17 Mar 2018 20:17:36 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 401196CCED; Sat, 17 Mar 2018 20:17:36 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2274016E97; Sat, 17 Mar 2018 20:17:36 +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 w2HKHaSq050221; Sat, 17 Mar 2018 20:17:36 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2HKHaFJ050220; Sat, 17 Mar 2018 20:17:36 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201803172017.w2HKHaFJ050220@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 17 Mar 2018 20:17: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: r331110 - stable/11 X-SVN-Group: stable-11 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: stable/11 X-SVN-Commit-Revision: 331110 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2018 20:17:36 -0000 Author: dim Date: Sat Mar 17 20:17:35 2018 New Revision: 331110 URL: https://svnweb.freebsd.org/changeset/base/331110 Log: Follow-up to r331108 by also recording the reversal of r311861 in svn:mergeinfo. Modified: Directory Properties: stable/11/ (props changed) From owner-svn-src-stable@freebsd.org Sat Mar 17 20:20:31 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3C4ACF65F12; Sat, 17 Mar 2018 20:20:31 +0000 (UTC) (envelope-from bryanv@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E186B6CED8; Sat, 17 Mar 2018 20:20:30 +0000 (UTC) (envelope-from bryanv@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB17816EAC; Sat, 17 Mar 2018 20:20:30 +0000 (UTC) (envelope-from bryanv@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2HKKUKG050408; Sat, 17 Mar 2018 20:20:30 GMT (envelope-from bryanv@FreeBSD.org) Received: (from bryanv@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2HKKU8Q050401; Sat, 17 Mar 2018 20:20:30 GMT (envelope-from bryanv@FreeBSD.org) Message-Id: <201803172020.w2HKKU8Q050401@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bryanv set sender to bryanv@FreeBSD.org using -f From: Bryan Venteicher Date: Sat, 17 Mar 2018 20:20: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: r331111 - in stable/11: share/man/man9 sys/dev/pci X-SVN-Group: stable-11 X-SVN-Commit-Author: bryanv X-SVN-Commit-Paths: in stable/11: share/man/man9 sys/dev/pci X-SVN-Commit-Revision: 331111 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2018 20:20:31 -0000 Author: bryanv Date: Sat Mar 17 20:20:29 2018 New Revision: 331111 URL: https://svnweb.freebsd.org/changeset/base/331111 Log: MFC r329598: Add PCI methods to iterate over the PCI capabilities VirtIO V1 provides configuration in multiple VENDOR capabilities so this allows all of the configuration to be discovered. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D14325 Modified: stable/11/share/man/man9/pci.9 stable/11/sys/dev/pci/hostb_pci.c stable/11/sys/dev/pci/pci.c stable/11/sys/dev/pci/pci_if.m stable/11/sys/dev/pci/pci_private.h stable/11/sys/dev/pci/pcivar.h stable/11/sys/dev/pci/vga_pci.c Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man9/pci.9 ============================================================================== --- stable/11/share/man/man9/pci.9 Sat Mar 17 20:17:35 2018 (r331110) +++ stable/11/share/man/man9/pci.9 Sat Mar 17 20:20:29 2018 (r331111) @@ -42,6 +42,9 @@ .Nm pci_find_device , .Nm pci_find_extcap , .Nm pci_find_htcap , +.Nm pci_find_next_cap , +.Nm pci_find_next_extcap , +.Nm pci_find_next_htcap , .Nm pci_find_pcie_root_port , .Nm pci_get_id , .Nm pci_get_max_payload , @@ -100,6 +103,12 @@ .Fn pci_find_extcap "device_t dev" "int capability" "int *capreg" .Ft int .Fn pci_find_htcap "device_t dev" "int capability" "int *capreg" +.Ft int +.Fn pci_find_next_cap "device_t dev" "int capability" "int start" "int *capreg" +.Ft int +.Fn pci_find_next_extcap "device_t dev" "int capability" "int start" "int *capreg" +.Ft int +.Fn pci_find_next_htcap "device_t dev" "int capability" "int start" "int *capreg" .Ft device_t .Fn pci_find_pcie_root_port "device_t dev" .Ft int @@ -330,6 +339,22 @@ returns zero. If the capability is not found or the device does not support capabilities, .Fn pci_find_cap returns an error. +The +.Fn pci_find_next_cap +function is used to locate the next instance of a PCI capability +register set for the device +.Fa dev . +The +.Fa start +should be the +.Fa *capreg +returned by a prior +.Fn pci_find_cap +or +.Fn pci_find_next_cap . +When no more instances are located +.Fn pci_find_next_cap +returns an error. .Pp The .Fn pci_find_extcap @@ -352,6 +377,22 @@ If the extended capability is not found or the device PCI-express device, .Fn pci_find_extcap returns an error. +The +.Fn pci_find_next_extcap +function is used to locate the next instance of a PCI-express +extended capability register set for the device +.Fa dev . +The +.Fa start +should be the +.Fa *capreg +returned by a prior +.Fn pci_find_extcap +or +.Fn pci_find_next_extcap . +When no more instances are located +.Fn pci_find_next_extcap +returns an error. .Pp The .Fn pci_find_htcap @@ -372,6 +413,22 @@ and returns zero. If the capability is not found or the device is not a HyperTransport device, .Fn pci_find_htcap +returns an error. +The +.Fn pci_find_next_htcap +function is used to locate the next instance of a HyperTransport capability +register set for the device +.Fa dev . +The +.Fa start +should be the +.Fa *capreg +returned by a prior +.Fn pci_find_htcap +or +.Fn pci_find_next_htcap . +When no more instances are located +.Fn pci_find_next_htcap returns an error. .Pp The Modified: stable/11/sys/dev/pci/hostb_pci.c ============================================================================== --- stable/11/sys/dev/pci/hostb_pci.c Sat Mar 17 20:17:35 2018 (r331110) +++ stable/11/sys/dev/pci/hostb_pci.c Sat Mar 17 20:20:29 2018 (r331111) @@ -207,6 +207,14 @@ pci_hostb_find_cap(device_t dev, device_t child, int c } static int +pci_hostb_find_next_cap(device_t dev, device_t child, int capability, + int start, int *capreg) +{ + + return (pci_find_next_cap(dev, capability, start, capreg)); +} + +static int pci_hostb_find_extcap(device_t dev, device_t child, int capability, int *capreg) { @@ -215,6 +223,14 @@ pci_hostb_find_extcap(device_t dev, device_t child, in } static int +pci_hostb_find_next_extcap(device_t dev, device_t child, int capability, + int start, int *capreg) +{ + + return (pci_find_next_extcap(dev, capability, start, capreg)); +} + +static int pci_hostb_find_htcap(device_t dev, device_t child, int capability, int *capreg) { @@ -222,6 +238,14 @@ pci_hostb_find_htcap(device_t dev, device_t child, int return (pci_find_htcap(dev, capability, capreg)); } +static int +pci_hostb_find_next_htcap(device_t dev, device_t child, int capability, + int start, int *capreg) +{ + + return (pci_find_next_htcap(dev, capability, start, capreg)); +} + static device_method_t pci_hostb_methods[] = { /* Device interface */ DEVMETHOD(device_probe, pci_hostb_probe), @@ -252,8 +276,11 @@ static device_method_t pci_hostb_methods[] = { DEVMETHOD(pci_set_powerstate, pci_hostb_set_powerstate), DEVMETHOD(pci_assign_interrupt, pci_hostb_assign_interrupt), DEVMETHOD(pci_find_cap, pci_hostb_find_cap), + DEVMETHOD(pci_find_next_cap, pci_hostb_find_next_cap), DEVMETHOD(pci_find_extcap, pci_hostb_find_extcap), + DEVMETHOD(pci_find_next_extcap, pci_hostb_find_next_extcap), DEVMETHOD(pci_find_htcap, pci_hostb_find_htcap), + DEVMETHOD(pci_find_next_htcap, pci_hostb_find_next_htcap), { 0, 0 } }; Modified: stable/11/sys/dev/pci/pci.c ============================================================================== --- stable/11/sys/dev/pci/pci.c Sat Mar 17 20:17:35 2018 (r331110) +++ stable/11/sys/dev/pci/pci.c Sat Mar 17 20:20:29 2018 (r331111) @@ -180,8 +180,11 @@ static device_method_t pci_methods[] = { DEVMETHOD(pci_set_powerstate, pci_set_powerstate_method), DEVMETHOD(pci_assign_interrupt, pci_assign_interrupt_method), DEVMETHOD(pci_find_cap, pci_find_cap_method), + DEVMETHOD(pci_find_next_cap, pci_find_next_cap_method), DEVMETHOD(pci_find_extcap, pci_find_extcap_method), + DEVMETHOD(pci_find_next_extcap, pci_find_next_extcap_method), DEVMETHOD(pci_find_htcap, pci_find_htcap_method), + DEVMETHOD(pci_find_next_htcap, pci_find_next_htcap_method), DEVMETHOD(pci_alloc_msi, pci_alloc_msi_method), DEVMETHOD(pci_alloc_msix, pci_alloc_msix_method), DEVMETHOD(pci_enable_msi, pci_enable_msi_method), @@ -1374,7 +1377,7 @@ pci_find_htcap_method(device_t dev, device_t child, in * Traverse the capabilities list checking each HT capability * to see if it matches the requested HT capability. */ - while (ptr != 0) { + for (;;) { val = pci_read_config(child, ptr + PCIR_HT_COMMAND, 2); if (capability == PCIM_HTCAP_SLAVE || capability == PCIM_HTCAP_HOST) @@ -1388,13 +1391,51 @@ pci_find_htcap_method(device_t dev, device_t child, in } /* Skip to the next HT capability. */ - while (ptr != 0) { - ptr = pci_read_config(child, ptr + PCICAP_NEXTPTR, 1); - if (pci_read_config(child, ptr + PCICAP_ID, 1) == - PCIY_HT) - break; + if (pci_find_next_cap(child, PCIY_HT, ptr, &ptr) != 0) + break; + } + + return (ENOENT); +} + +/* + * Find the next requested HyperTransport capability after start and return + * the offset in configuration space via the pointer provided. The function + * returns 0 on success and an error code otherwise. + */ +int +pci_find_next_htcap_method(device_t dev, device_t child, int capability, + int start, int *capreg) +{ + int ptr; + uint16_t val; + + KASSERT(pci_read_config(child, start + PCICAP_ID, 1) == PCIY_HT, + ("start capability is not HyperTransport capability")); + ptr = start; + + /* + * Traverse the capabilities list checking each HT capability + * to see if it matches the requested HT capability. + */ + for (;;) { + /* Skip to the next HT capability. */ + if (pci_find_next_cap(child, PCIY_HT, ptr, &ptr) != 0) + break; + + val = pci_read_config(child, ptr + PCIR_HT_COMMAND, 2); + if (capability == PCIM_HTCAP_SLAVE || + capability == PCIM_HTCAP_HOST) + val &= 0xe000; + else + val &= PCIM_HTCMD_CAP_MASK; + if (val == capability) { + if (capreg != NULL) + *capreg = ptr; + return (0); } } + return (ENOENT); } @@ -1409,8 +1450,8 @@ pci_find_cap_method(device_t dev, device_t child, int { struct pci_devinfo *dinfo = device_get_ivars(child); pcicfgregs *cfg = &dinfo->cfg; - u_int32_t status; - u_int8_t ptr; + uint32_t status; + uint8_t ptr; /* * Check the CAP_LIST bit of the PCI status register first. @@ -1452,6 +1493,33 @@ pci_find_cap_method(device_t dev, device_t child, int } /* + * Find the next requested capability after start and return the offset in + * configuration space via the pointer provided. The function returns + * 0 on success and an error code otherwise. + */ +int +pci_find_next_cap_method(device_t dev, device_t child, int capability, + int start, int *capreg) +{ + uint8_t ptr; + + KASSERT(pci_read_config(child, start + PCICAP_ID, 1) == capability, + ("start capability is not expected capability")); + + ptr = pci_read_config(child, start + PCICAP_NEXTPTR, 1); + while (ptr != 0) { + if (pci_read_config(child, ptr + PCICAP_ID, 1) == capability) { + if (capreg != NULL) + *capreg = ptr; + return (0); + } + ptr = pci_read_config(child, ptr + PCICAP_NEXTPTR, 1); + } + + return (ENOENT); +} + +/* * Find the requested extended capability and return the offset in * configuration space via the pointer provided. The function returns * 0 on success and an error code otherwise. @@ -1483,6 +1551,41 @@ pci_find_extcap_method(device_t dev, device_t child, i if (ptr == 0) break; ecap = pci_read_config(child, ptr, 4); + } + + return (ENOENT); +} + +/* + * Find the next requested extended capability after start and return the + * offset in configuration space via the pointer provided. The function + * returns 0 on success and an error code otherwise. + */ +int +pci_find_next_extcap_method(device_t dev, device_t child, int capability, + int start, int *capreg) +{ + struct pci_devinfo *dinfo = device_get_ivars(child); + pcicfgregs *cfg = &dinfo->cfg; + uint32_t ecap; + uint16_t ptr; + + /* Only supported for PCI-express devices. */ + if (cfg->pcie.pcie_location == 0) + return (ENXIO); + + ecap = pci_read_config(child, start, 4); + KASSERT(PCI_EXTCAP_ID(ecap) == capability, + ("start extended capability is not expected capability")); + ptr = PCI_EXTCAP_NEXTPTR(ecap); + while (ptr != 0) { + ecap = pci_read_config(child, ptr, 4); + if (PCI_EXTCAP_ID(ecap) == capability) { + if (capreg != NULL) + *capreg = ptr; + return (0); + } + ptr = PCI_EXTCAP_NEXTPTR(ecap); } return (ENOENT); Modified: stable/11/sys/dev/pci/pci_if.m ============================================================================== --- stable/11/sys/dev/pci/pci_if.m Sat Mar 17 20:17:35 2018 (r331110) +++ stable/11/sys/dev/pci/pci_if.m Sat Mar 17 20:20:29 2018 (r331111) @@ -144,6 +144,14 @@ METHOD int find_cap { int *capreg; }; +METHOD int find_next_cap { + device_t dev; + device_t child; + int capability; + int start; + int *capreg; +}; + METHOD int find_extcap { device_t dev; device_t child; @@ -151,10 +159,26 @@ METHOD int find_extcap { int *capreg; }; +METHOD int find_next_extcap { + device_t dev; + device_t child; + int capability; + int start; + int *capreg; +}; + METHOD int find_htcap { device_t dev; device_t child; int capability; + int *capreg; +}; + +METHOD int find_next_htcap { + device_t dev; + device_t child; + int capability; + int start; int *capreg; }; Modified: stable/11/sys/dev/pci/pci_private.h ============================================================================== --- stable/11/sys/dev/pci/pci_private.h Sat Mar 17 20:17:35 2018 (r331110) +++ stable/11/sys/dev/pci/pci_private.h Sat Mar 17 20:20:29 2018 (r331111) @@ -90,10 +90,16 @@ int pci_enable_io_method(device_t dev, device_t child int pci_disable_io_method(device_t dev, device_t child, int space); int pci_find_cap_method(device_t dev, device_t child, int capability, int *capreg); +int pci_find_next_cap_method(device_t dev, device_t child, + int capability, int start, int *capreg); int pci_find_extcap_method(device_t dev, device_t child, int capability, int *capreg); +int pci_find_next_extcap_method(device_t dev, device_t child, + int capability, int start, int *capreg); int pci_find_htcap_method(device_t dev, device_t child, int capability, int *capreg); +int pci_find_next_htcap_method(device_t dev, device_t child, + int capability, int start, int *capreg); int pci_alloc_msi_method(device_t dev, device_t child, int *count); int pci_alloc_msix_method(device_t dev, device_t child, int *count); void pci_enable_msi_method(device_t dev, device_t child, Modified: stable/11/sys/dev/pci/pcivar.h ============================================================================== --- stable/11/sys/dev/pci/pcivar.h Sat Mar 17 20:17:35 2018 (r331110) +++ stable/11/sys/dev/pci/pcivar.h Sat Mar 17 20:20:29 2018 (r331111) @@ -468,15 +468,36 @@ pci_find_cap(device_t dev, int capability, int *capreg } static __inline int +pci_find_next_cap(device_t dev, int capability, int start, int *capreg) +{ + return (PCI_FIND_NEXT_CAP(device_get_parent(dev), dev, capability, start, + capreg)); +} + +static __inline int pci_find_extcap(device_t dev, int capability, int *capreg) { return (PCI_FIND_EXTCAP(device_get_parent(dev), dev, capability, capreg)); } static __inline int +pci_find_next_extcap(device_t dev, int capability, int start, int *capreg) +{ + return (PCI_FIND_NEXT_EXTCAP(device_get_parent(dev), dev, capability, + start, capreg)); +} + +static __inline int pci_find_htcap(device_t dev, int capability, int *capreg) { return (PCI_FIND_HTCAP(device_get_parent(dev), dev, capability, capreg)); +} + +static __inline int +pci_find_next_htcap(device_t dev, int capability, int start, int *capreg) +{ + return (PCI_FIND_NEXT_HTCAP(device_get_parent(dev), dev, capability, + start, capreg)); } static __inline int Modified: stable/11/sys/dev/pci/vga_pci.c ============================================================================== --- stable/11/sys/dev/pci/vga_pci.c Sat Mar 17 20:17:35 2018 (r331110) +++ stable/11/sys/dev/pci/vga_pci.c Sat Mar 17 20:20:29 2018 (r331111) @@ -497,6 +497,14 @@ vga_pci_find_cap(device_t dev, device_t child, int cap } static int +vga_pci_find_next_cap(device_t dev, device_t child, int capability, + int start, int *capreg) +{ + + return (pci_find_next_cap(dev, capability, start, capreg)); +} + +static int vga_pci_find_extcap(device_t dev, device_t child, int capability, int *capreg) { @@ -505,6 +513,14 @@ vga_pci_find_extcap(device_t dev, device_t child, int } static int +vga_pci_find_next_extcap(device_t dev, device_t child, int capability, + int start, int *capreg) +{ + + return (pci_find_next_extcap(dev, capability, start, capreg)); +} + +static int vga_pci_find_htcap(device_t dev, device_t child, int capability, int *capreg) { @@ -513,6 +529,14 @@ vga_pci_find_htcap(device_t dev, device_t child, int c } static int +vga_pci_find_next_htcap(device_t dev, device_t child, int capability, + int start, int *capreg) +{ + + return (pci_find_next_htcap(dev, capability, start, capreg)); +} + +static int vga_pci_alloc_msi(device_t dev, device_t child, int *count) { struct vga_pci_softc *sc; @@ -622,8 +646,11 @@ static device_method_t vga_pci_methods[] = { DEVMETHOD(pci_set_powerstate, vga_pci_set_powerstate), DEVMETHOD(pci_assign_interrupt, vga_pci_assign_interrupt), DEVMETHOD(pci_find_cap, vga_pci_find_cap), + DEVMETHOD(pci_find_next_cap, vga_pci_find_next_cap), DEVMETHOD(pci_find_extcap, vga_pci_find_extcap), + DEVMETHOD(pci_find_next_extcap, vga_pci_find_next_extcap), DEVMETHOD(pci_find_htcap, vga_pci_find_htcap), + DEVMETHOD(pci_find_next_htcap, vga_pci_find_next_htcap), DEVMETHOD(pci_alloc_msi, vga_pci_alloc_msi), DEVMETHOD(pci_alloc_msix, vga_pci_alloc_msix), DEVMETHOD(pci_remap_msix, vga_pci_remap_msix), From owner-svn-src-stable@freebsd.org Sat Mar 17 20:37:03 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 44290F66F8D; Sat, 17 Mar 2018 20:37:03 +0000 (UTC) (envelope-from bryanv@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D98476D955; Sat, 17 Mar 2018 20:37:02 +0000 (UTC) (envelope-from bryanv@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CE6D2171C1; Sat, 17 Mar 2018 20:37:02 +0000 (UTC) (envelope-from bryanv@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2HKb2KT060526; Sat, 17 Mar 2018 20:37:02 GMT (envelope-from bryanv@FreeBSD.org) Received: (from bryanv@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2HKb2PG060520; Sat, 17 Mar 2018 20:37:02 GMT (envelope-from bryanv@FreeBSD.org) Message-Id: <201803172037.w2HKb2PG060520@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bryanv set sender to bryanv@FreeBSD.org using -f From: Bryan Venteicher Date: Sat, 17 Mar 2018 20:37: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: r331112 - stable/11/sys/dev/virtio X-SVN-Group: stable-11 X-SVN-Commit-Author: bryanv X-SVN-Commit-Paths: stable/11/sys/dev/virtio X-SVN-Commit-Revision: 331112 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2018 20:37:03 -0000 Author: bryanv Date: Sat Mar 17 20:37:01 2018 New Revision: 331112 URL: https://svnweb.freebsd.org/changeset/base/331112 Log: MFC r327958, r329601, r329602: Sync VirtIO IDs with Linux Add VirtIO bus config_generation method Add more virtqueue getter methods Modified: stable/11/sys/dev/virtio/virtio.c stable/11/sys/dev/virtio/virtio.h stable/11/sys/dev/virtio/virtio_bus_if.m stable/11/sys/dev/virtio/virtio_ids.h stable/11/sys/dev/virtio/virtqueue.c stable/11/sys/dev/virtio/virtqueue.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/virtio/virtio.c ============================================================================== --- stable/11/sys/dev/virtio/virtio.c Sat Mar 17 20:20:29 2018 (r331111) +++ stable/11/sys/dev/virtio/virtio.c Sat Mar 17 20:37:01 2018 (r331112) @@ -54,14 +54,21 @@ static struct virtio_ident { uint16_t devid; const char *name; } virtio_ident_table[] = { - { VIRTIO_ID_NETWORK, "Network" }, - { VIRTIO_ID_BLOCK, "Block" }, - { VIRTIO_ID_CONSOLE, "Console" }, - { VIRTIO_ID_ENTROPY, "Entropy" }, - { VIRTIO_ID_BALLOON, "Balloon" }, - { VIRTIO_ID_IOMEMORY, "IOMemory" }, - { VIRTIO_ID_SCSI, "SCSI" }, - { VIRTIO_ID_9P, "9P Transport" }, + { VIRTIO_ID_NETWORK, "Network" }, + { VIRTIO_ID_BLOCK, "Block" }, + { VIRTIO_ID_CONSOLE, "Console" }, + { VIRTIO_ID_ENTROPY, "Entropy" }, + { VIRTIO_ID_BALLOON, "Balloon" }, + { VIRTIO_ID_IOMEMORY, "IOMemory" }, + { VIRTIO_ID_RPMSG, "Remote Processor Messaging" }, + { VIRTIO_ID_SCSI, "SCSI" }, + { VIRTIO_ID_9P, "9P Transport" }, + { VIRTIO_ID_RPROC_SERIAL, "Remote Processor Serial" }, + { VIRTIO_ID_CAIF, "CAIF" }, + { VIRTIO_ID_GPU, "GPU" }, + { VIRTIO_ID_INPUT, "Input" }, + { VIRTIO_ID_VSOCK, "VSOCK Transport" }, + { VIRTIO_ID_CRYPTO, "Crypto" }, { 0, NULL } }; @@ -231,6 +238,13 @@ virtio_reinit_complete(device_t dev) { VIRTIO_BUS_REINIT_COMPLETE(device_get_parent(dev)); +} + +int +virtio_config_generation(device_t dev) +{ + + return (VIRTIO_BUS_CONFIG_GENERATION(device_get_parent(dev))); } void Modified: stable/11/sys/dev/virtio/virtio.h ============================================================================== --- stable/11/sys/dev/virtio/virtio.h Sat Mar 17 20:20:29 2018 (r331111) +++ stable/11/sys/dev/virtio/virtio.h Sat Mar 17 20:37:01 2018 (r331112) @@ -78,6 +78,7 @@ int virtio_alloc_virtqueues(device_t dev, int flags, int virtio_setup_intr(device_t dev, enum intr_type type); int virtio_with_feature(device_t dev, uint64_t feature); void virtio_stop(device_t dev); +int virtio_config_generation(device_t dev); int virtio_reinit(device_t dev, uint64_t features); void virtio_reinit_complete(device_t dev); Modified: stable/11/sys/dev/virtio/virtio_bus_if.m ============================================================================== --- stable/11/sys/dev/virtio/virtio_bus_if.m Sat Mar 17 20:20:29 2018 (r331111) +++ stable/11/sys/dev/virtio/virtio_bus_if.m Sat Mar 17 20:37:01 2018 (r331112) @@ -34,6 +34,14 @@ HEADER { struct vq_alloc_info; }; +CODE { + static int + virtio_bus_default_config_generation(device_t dev) + { + return (0); + } +}; + METHOD uint64_t negotiate_features { device_t dev; uint64_t child_features; @@ -73,6 +81,10 @@ METHOD void notify_vq { device_t dev; uint16_t queue; }; + +METHOD int config_generation { + device_t dev; +} DEFAULT virtio_bus_default_config_generation; METHOD void read_device_config { device_t dev; Modified: stable/11/sys/dev/virtio/virtio_ids.h ============================================================================== --- stable/11/sys/dev/virtio/virtio_ids.h Sat Mar 17 20:20:29 2018 (r331111) +++ stable/11/sys/dev/virtio/virtio_ids.h Sat Mar 17 20:37:01 2018 (r331112) @@ -32,13 +32,20 @@ #define _VIRTIO_IDS_H_ /* VirtIO device IDs. */ -#define VIRTIO_ID_NETWORK 0x01 -#define VIRTIO_ID_BLOCK 0x02 -#define VIRTIO_ID_CONSOLE 0x03 -#define VIRTIO_ID_ENTROPY 0x04 -#define VIRTIO_ID_BALLOON 0x05 -#define VIRTIO_ID_IOMEMORY 0x06 -#define VIRTIO_ID_SCSI 0x08 -#define VIRTIO_ID_9P 0x09 +#define VIRTIO_ID_NETWORK 1 +#define VIRTIO_ID_BLOCK 2 +#define VIRTIO_ID_CONSOLE 3 +#define VIRTIO_ID_ENTROPY 4 +#define VIRTIO_ID_BALLOON 5 +#define VIRTIO_ID_IOMEMORY 6 +#define VIRTIO_ID_RPMSG 7 +#define VIRTIO_ID_SCSI 8 +#define VIRTIO_ID_9P 9 +#define VIRTIO_ID_RPROC_SERIAL 11 +#define VIRTIO_ID_CAIF 12 +#define VIRTIO_ID_GPU 16 +#define VIRTIO_ID_INPUT 18 +#define VIRTIO_ID_VSOCK 19 +#define VIRTIO_ID_CRYPTO 20 #endif /* _VIRTIO_IDS_H_ */ Modified: stable/11/sys/dev/virtio/virtqueue.c ============================================================================== --- stable/11/sys/dev/virtio/virtqueue.c Sat Mar 17 20:20:29 2018 (r331111) +++ stable/11/sys/dev/virtio/virtqueue.c Sat Mar 17 20:37:01 2018 (r331112) @@ -369,6 +369,33 @@ virtqueue_paddr(struct virtqueue *vq) return (vtophys(vq->vq_ring_mem)); } +vm_paddr_t +virtqueue_desc_paddr(struct virtqueue *vq) +{ + + return (vtophys(vq->vq_ring.desc)); +} + +vm_paddr_t +virtqueue_avail_paddr(struct virtqueue *vq) +{ + + return (vtophys(vq->vq_ring.avail)); +} + +vm_paddr_t +virtqueue_used_paddr(struct virtqueue *vq) +{ + + return (vtophys(vq->vq_ring.used)); +} + +uint16_t +virtqueue_index(struct virtqueue *vq) +{ + return (vq->vq_queue_index); +} + int virtqueue_size(struct virtqueue *vq) { Modified: stable/11/sys/dev/virtio/virtqueue.h ============================================================================== --- stable/11/sys/dev/virtio/virtqueue.h Sat Mar 17 20:20:29 2018 (r331111) +++ stable/11/sys/dev/virtio/virtqueue.h Sat Mar 17 20:37:01 2018 (r331112) @@ -84,7 +84,11 @@ void virtqueue_disable_intr(struct virtqueue *vq); /* Get physical address of the virtqueue ring. */ vm_paddr_t virtqueue_paddr(struct virtqueue *vq); +vm_paddr_t virtqueue_desc_paddr(struct virtqueue *vq); +vm_paddr_t virtqueue_avail_paddr(struct virtqueue *vq); +vm_paddr_t virtqueue_used_paddr(struct virtqueue *vq); +uint16_t virtqueue_index(struct virtqueue *vq); int virtqueue_full(struct virtqueue *vq); int virtqueue_empty(struct virtqueue *vq); int virtqueue_size(struct virtqueue *vq);