From owner-svn-src-head@freebsd.org Sun Mar 5 00:16:51 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 88003CF9E93 for ; Sun, 5 Mar 2017 00:16:51 +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 4E0A915B0 for ; Sun, 5 Mar 2017 00:16:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x22d.google.com with SMTP id h10so32033943ith.1 for ; Sat, 04 Mar 2017 16:16:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=ZMYt84Xd/X+M1A9keEW1VKxszrdgRAYN+oEdcestnjw=; b=kZL9TPtvn6/1eVI03dyMXQmpLeyPS5QAHkD7smXJJJwhyXMbSd1hflBTsxvKCxx6tJ 9Zn4uzBOLKvr/6VDdgcympskGh1ZieiBfytv0BNnWHLtRbHSJ6ElfGgnxw1BNJ86tl15 maDSyU8+6j3byuDfIydmumN9eLz5V48sxqY3iOoOfrOMG0J2MjENdeXFCxAdlBq6UWKV WbaUSB9vETujjmakFKniUkWIvYxJvH9fGvbIem982Xrtk72nkHM4NEjzCgrlNWyDbKcL Z9vrHVnMT2kU9J3j9fggGpWWK3s8iC1vp2kEUIMCUA7yhNmgKk3VDxKk80khxw+nK5CM t7dA== 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=ZMYt84Xd/X+M1A9keEW1VKxszrdgRAYN+oEdcestnjw=; b=oLYjAftLmg5xsZt6cFzTd7oncrzw0Mha1nJYL0FY9HMGjTVFisB1vELkDzoHMCwrn5 I024MzhgY+l00oiHRMQOrGrEATER1PAKnQ5dU4s+Wm+aitG2r1C0kyJmkOgxawOMfqza 7tPQP57+GieOU6jNOzjqwHMgd9+pgv91nsq9iZjVhGdZUvrk2NGGqd8kWPXhedhZAe8+ iTxTxUQXhWWM03fULOHQr2JyJPIYs5s+nRAgowcPTgxDuFGU4WaimNbt2GhmFJ2ommMp qoDRNZA84j0jU0SVokuTNGNekdH2zOqwWENxiOpA31Hsxg2DaMtqvShdHrpSD0d3l3vU qHyA== X-Gm-Message-State: AMke39lPDKfgl4FzPTX9W/VNGNpxRqtKgrKrhHeizJdnYhhYDgc7v7UMwiFIPL6P+4MBwQbjeoJbPdsPd46kHg== X-Received: by 10.36.147.71 with SMTP id y68mr8868469itd.85.1488673010329; Sat, 04 Mar 2017 16:16:50 -0800 (PST) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.134.129 with HTTP; Sat, 4 Mar 2017 16:16:49 -0800 (PST) X-Originating-IP: [69.53.245.200] In-Reply-To: <201703042232.v24MW9jt079229@pdx.rh.CN85.dnsmgr.net> References: <201703042232.v24MW9jt079229@pdx.rh.CN85.dnsmgr.net> From: Warner Losh Date: Sat, 4 Mar 2017 17:16:49 -0700 X-Google-Sender-Auth: N-rbKWn82lX7-Cp7z3WVj3pDtc0 Message-ID: Subject: Re: svn commit: r314657 - in head/kerberos5: . lib/libgssapi_krb5 lib/libgssapi_ntlm lib/libgssapi_spnego lib/libhdb lib/libkafs5 lib/libkrb5 libexec/hprop libexec/kpasswdd tools/asn1_compile tools/slc To: rgrimes@freebsd.org Cc: Ngie Cooper , Bryan Drewery , Ngie Cooper , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 00:16:51 -0000 On Sat, Mar 4, 2017 at 3:32 PM, Rodney W. Grimes wrote: >> >> > On Mar 4, 2017, at 13:43, Warner Losh wrote: >> > >> >> On Sat, Mar 4, 2017 at 1:25 PM, Bryan Drewery wrote: >> >>> On 3/4/2017 12:20 PM, Rodney W. Grimes wrote: >> >>> -- Start of PGP signed section. >> >>> [ Charset windows-1252 unsupported, converting... ] >> >>>>> On 3/4/2017 7:34 AM, Rodney W. Grimes wrote: >> >>>>> What is ${.CURDIR:H:H} ????? Yes that seems to work but now we are obscuring >> >>>>> ../.. into makefile syntax magic, probably not a grand idea. >> >>>> It just trims off the last directory component. This both reduces >> >>>> namecache lookups, lessens the amount of data in a log, and makes >> >>>> debugging a log simpler by not having a crazy path like: >> >>>> /home/bdrewery/big/git/buildserver/sys/modules/usb/template/../../../dev/usb/template/usb_template.c >> >>>> >> >>>> It's far simpler to understand and work with: >> >>>> /home/bdrewery/big/git/buildserver/sys/dev/usb/template/usb_template.c >> >>>> >> >>>> The only downside is it is slightly more obscure in a Makefile, but once >> >>>> you know what :H is then it's not a problem. This is why SRCTOP is even >> >>>> better than this as it is far more clear than even :H and avoids the >> >>>> ../../ problems. >> >>> Lets do one or the other, but not both ${SRCTOP} and :H:H:H. It appears >> >>> that we now have a mix and mashed up some one way others the other. >> >> >> >> That I can agree with. I would prefer to standardize on SRCTOP as :H is >> >> too obscure without learning about make details. >> > >> > :H is insane in 90% of the cases I've seen it used. Let's roll with >> > SRCTOP everywhere we can. That's safer from directory motion anyway... >> >> Ok, I have 3 votes for SRCTOP, so I'll implement the remaining change using SRCTOP (for usr.bin), and reimplement the previous changes using SRCTOP. > > And that some how over rides the 3 votes for not doing any of these changes? > Slow down please. We dont need a bike shed, but I think we need a clear > target and a consense larger than 3+ 3- and less than a 6 hour wall clock > of discussion. > > It would also be best if it was this change and only this change committed > in very large (preferably about 20) commits. We've had about 200-300 commits in the build system in the past year. There's no real need to slow down. It's a real mess (though a lot less of one thanks to Bryan) and SRCTOP is a definite cleanup. Warner From owner-svn-src-head@freebsd.org Sun Mar 5 00:35:30 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4B322CEC4BF; Sun, 5 Mar 2017 00:35:30 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail109.syd.optusnet.com.au (mail109.syd.optusnet.com.au [211.29.132.80]) by mx1.freebsd.org (Postfix) with ESMTP id EBAED11F7; Sun, 5 Mar 2017 00:35:29 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from besplex.bde.org (c122-106-153-191.carlnfd1.nsw.optusnet.com.au [122.106.153.191]) by mail109.syd.optusnet.com.au (Postfix) with ESMTPS id 7D6F8D64ED0; Sun, 5 Mar 2017 11:35:27 +1100 (AEDT) Date: Sun, 5 Mar 2017 11:35:26 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Konstantin Belousov cc: John Baldwin , Pedro Giffuni , Slawa Olhovchenkov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314669 - head/sys/i386/conf In-Reply-To: <20170304231822.GA30979@kib.kiev.ua> Message-ID: <20170305111842.K1472@besplex.bde.org> References: <201703041504.v24F4HMh023937@repo.freebsd.org> <20170304211611.GW2092@kib.kiev.ua> <1951800.W2d2k3eamI@ralph.baldwin.cx> <20170304231822.GA30979@kib.kiev.ua> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.2 cv=VbSHBBh9 c=1 sm=1 tr=0 a=Tj3pCpwHnMupdyZSltBt7Q==:117 a=Tj3pCpwHnMupdyZSltBt7Q==:17 a=kj9zAlcOel0A:10 a=NQkPwhnM_KHT0HcVA2YA:9 a=cB3OLWhqKwzjs8TJ:21 a=NSmHd3I7PG6UZQw2:21 a=CjuIK1q_8ugA:10 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 00:35:30 -0000 On Sun, 5 Mar 2017, Konstantin Belousov wrote: > On Sat, Mar 04, 2017 at 02:54:56PM -0800, John Baldwin wrote: >> On Saturday, March 04, 2017 11:16:11 PM Konstantin Belousov wrote: >>> On Sat, Mar 04, 2017 at 03:49:52PM -0500, Pedro Giffuni wrote: >>>> The number came out from an old posting involving buildworld times, which I can???t find now :(. >>>> Things seem to have changed a lot: it was surely using GCC back then, I don???t believe clang does much distinction about 486 at all. >>>> >>>> BTW, does it make sense to keep i586 in the configuration still? Both i486 and i586 were once removed but later re-instated in r205336. >>>> >>> What did make significant impact on 32bit shared libraries some time ago >>> was to compile them with -mtune=i686. Default PIC prologue effectively >>> neutered return stack predictor, adding uneccessary overhead to already >>> expensive PIC code. I think that this is even measureable, i.e. it might >>> give >= 5% of difference. I now use -mtune=athlon-xp (and no other -m CFLAGS) to get the same effect with minor additional optimizations/pessimizations for athlon-xp. I forget if I switched to this before or after getting jhb to not use -mtune=pentiumpro. Maybe we didn't know at the time that the pentiumpro optimizations affected little more than this PIC problem. >>> I did not rechecked modern compilers WRT the generated PIC code, but I doubt >>> that the thing changed recently. >>> >>> Several notes: -mtune is not -march, i.e. the code would be still targeted >>> for 486 instruction set, but scheduling is optimized for more modern CPUs. >>> Also, recent gcc puts specific meaning into -mtune=i686, interpreting it >>> as request for scheduling for generic modern CPUs. We already compile >>> 32bit compat libs on amd64 with -march=i686. >>> >>> Working on this stuff would be much more useful than tweaking kernel config >>> for CPU detection. >> >> Hmm, I originally wanted to use -mtune=i686 (spelled as -mcpu=pentiumpro) on >> i386 builds for this reason, but I removed it at bde@'s request in r125252. >> I would be happy to go back to adding -mtune for i386 when CPUTYPE isn't >> specified. > > I just rechecked. > gcc, at least 4.9 and 6.3, generate 'right' prologue, i.e. > call __x86.get_pc_thunk.cx (ecx or whatever register > which is used to address GOT) > __x86.get_pc_thunk.cx: > movl (%esp), %ecx > ret > even when compiling for -march=i486. > > OTOH, clang 3.9.1 uses > calll .L0 > .L0: popl %eax > to get the base even for native nehalem and newer CPUs. > > So indeed there is no reason to bother. gcc become too good to require any > tuning, and clang generates unoptimal code even when hinted. I did not > checked 4.0. The old method might actually be best for the original i386. It is 1 byte larger per call, but 1 instruction shorter by dynamic count. Original i386 has poor instruction fetch bandwidth and no caches and to help or harm. Even the (%esp) address mode can cost a cycle on original i386, and setting up a frame pointer to access the stack would be much worse, while on modern x86 the frame pointer might cost nothing since it can be done in parallel. Maybe some newer CPUs have better return address predictors so the old method is best for them too. It is only clear that generic optimizations should use the new method, since CPU manufacturers won't pessimize it since it looks like a normal function call. Bruce From owner-svn-src-head@freebsd.org Sun Mar 5 00:36:28 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 09FC5CEC544; Sun, 5 Mar 2017 00:36:28 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BE40A1358; Sun, 5 Mar 2017 00:36:27 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by freefall.freebsd.org (Postfix, from userid 1235) id 1C87E4752; Sun, 5 Mar 2017 00:36:27 +0000 (UTC) Date: Sun, 5 Mar 2017 01:36:26 +0100 From: Baptiste Daroussin To: Warner Losh Cc: rgrimes@freebsd.org, Ngie Cooper , Bryan Drewery , Ngie Cooper , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r314657 - in head/kerberos5: . lib/libgssapi_krb5 lib/libgssapi_ntlm lib/libgssapi_spnego lib/libhdb lib/libkafs5 lib/libkrb5 libexec/hprop libexec/kpasswdd tools/asn1_compile tools/slc Message-ID: <20170305003626.dvdp4msi36pyqxbn@ivaldir.net> References: <201703042232.v24MW9jt079229@pdx.rh.CN85.dnsmgr.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="mfviljg5nubnmw4n" Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20170225 (1.8.0) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 00:36:28 -0000 --mfviljg5nubnmw4n Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Mar 04, 2017 at 05:16:49PM -0700, Warner Losh wrote: > On Sat, Mar 4, 2017 at 3:32 PM, Rodney W. Grimes > wrote: > >> > >> > On Mar 4, 2017, at 13:43, Warner Losh wrote: > >> > > >> >> On Sat, Mar 4, 2017 at 1:25 PM, Bryan Drewery wrote: > >> >>> On 3/4/2017 12:20 PM, Rodney W. Grimes wrote: > >> >>> -- Start of PGP signed section. > >> >>> [ Charset windows-1252 unsupported, converting... ] > >> >>>>> On 3/4/2017 7:34 AM, Rodney W. Grimes wrote: > >> >>>>> What is ${.CURDIR:H:H} ????? Yes that seems to work but now we = are obscuring > >> >>>>> ../.. into makefile syntax magic, probably not a grand idea. > >> >>>> It just trims off the last directory component. This both reduces > >> >>>> namecache lookups, lessens the amount of data in a log, and makes > >> >>>> debugging a log simpler by not having a crazy path like: > >> >>>> /home/bdrewery/big/git/buildserver/sys/modules/usb/template/../..= /../dev/usb/template/usb_template.c > >> >>>> > >> >>>> It's far simpler to understand and work with: > >> >>>> /home/bdrewery/big/git/buildserver/sys/dev/usb/template/usb_templ= ate.c > >> >>>> > >> >>>> The only downside is it is slightly more obscure in a Makefile, b= ut once > >> >>>> you know what :H is then it's not a problem. This is why SRCTOP = is even > >> >>>> better than this as it is far more clear than even :H and avoids = the > >> >>>> ../../ problems. > >> >>> Lets do one or the other, but not both ${SRCTOP} and :H:H:H. It a= ppears > >> >>> that we now have a mix and mashed up some one way others the other. > >> >> > >> >> That I can agree with. I would prefer to standardize on SRCTOP as := H is > >> >> too obscure without learning about make details. > >> > > >> > :H is insane in 90% of the cases I've seen it used. Let's roll with > >> > SRCTOP everywhere we can. That's safer from directory motion anyway.= =2E. > >> > >> Ok, I have 3 votes for SRCTOP, so I'll implement the remaining change = using SRCTOP (for usr.bin), and reimplement the previous changes using SRCT= OP. > > > > And that some how over rides the 3 votes for not doing any of these cha= nges? > > Slow down please. We dont need a bike shed, but I think we need a clear > > target and a consense larger than 3+ 3- and less than a 6 hour wall clo= ck > > of discussion. > > > > It would also be best if it was this change and only this change commit= ted > > in very large (preferably about 20) commits. >=20 > We've had about 200-300 commits in the build system in the past year. > There's no real need to slow down. It's a real mess (though a lot less > of one thanks to Bryan) and SRCTOP is a definite cleanup. >=20 I totally agree with Warner on all points :) Bapt --mfviljg5nubnmw4n Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAli7XYcACgkQY4mL3PG3 Ploulw/+KuNFRCf56PLnuiUPRPfxOM8smmIoUbGESdW6B4kuwqRHhyL8H7O/zg54 xk4zWvfkRN/g8gXmTsDqU41ohDroCIQc6E9Kc5h9OEVherUFsLgtZKD56kemKvLU tHkRU9wdALm0I7NtS1ETBvu3z0h9kRYIEHrYxa/l9qodhBJlhdlG2GUiQD+mwdlJ zW8FdmuiE+h+cv5rMvNyNIfdzcOV6TJATQbQATn2X619tq+JjSWELtaYbpBlW1ny U/WgJFPpv1KCaHpxPOn144KtkSTnPg9r7W6q+QvHNo+YmlFjC9haBtkn3IV64MKv U+uwC710zMhMPfbK/ZfurAa7TYBlQF+rqrbPDI4UmNaptkrEa+DYO4LiCNyb6WOl H9yf85z3ovlrKymS/Ne/ZFMEo+fn8Z7AsDwbzqH6xioLjhn6rbeviBNGRXgW4iwX +sRkG5rpZcDbt7CBN/iV2nE0Kr2qZ85HfxCvVPzT7cYgt6e8CGobyAFFtvj6HGmG V/b7NSty2gyW7O+XQHTKz/gAGF1ZsHDnpNBL1A/AY8dhPRgs8ihH/aYgBclLL3NH SJjbeuO5sHwA/0rnkD0xGoH7FIdRB0I/bYM1HpAcrdJzbktyrOGytII9uhBE34t1 jSizhy0v5OWStXM16f5K0JGmqBzgeseNvZhWXOiPMlKfc3PvCyI= =/+nM -----END PGP SIGNATURE----- --mfviljg5nubnmw4n-- From owner-svn-src-head@freebsd.org Sun Mar 5 00:37:12 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 40049CEC5E2; Sun, 5 Mar 2017 00:37:12 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-wr0-x22b.google.com (mail-wr0-x22b.google.com [IPv6:2a00:1450:400c:c0c::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ED9261511; Sun, 5 Mar 2017 00:37:11 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by mail-wr0-x22b.google.com with SMTP id u48so95092092wrc.0; Sat, 04 Mar 2017 16:37:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=IZN0hnERqnoQURy9R8vu8MjzqGBx5685HGKeezNMSjM=; b=ksCGqPdco5fP5yJkBl16FwWH+m05srYFoVSHzRerZKwzUI1hnZEtcbe9tKcBqjZQjB 6WBAnauGTs12R+tEgh0WuAMS65TbuwB8uDXfoJLr9IP/k3DaK3JwgPuYA4VNuFflaj+2 Nxkdp3HEm33uzIOx7kp6lei7cddXzEMIBO3vFW+hMSzHuVrzxLYvVhov1ea9B0+sqUpO +lF3DA4Xx++1xtSOb6b3EdGTpeVSS9DQaBB3Hk2esWO6jfbt7ExTS2P+LhZGxexXFc9h SEm5WnYNL+uikKkTYV+uhAmvwN42i5SyxUuhxfp/yGUvAk+6/1FJXtXQIlQmZji97PPo hagw== 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=IZN0hnERqnoQURy9R8vu8MjzqGBx5685HGKeezNMSjM=; b=CqClfcTlcFBuKjodBI1dYZA3W1Qp9I8KwL/QFMRSqFZjGY20hiujqUAsDvd8Y7lUMU pkJMgIB7KTmlSXyz2hQF3iCsr8VVvzDVexNYW3p+MPBR+aPUIpx/pEEXp9tHHuDmilJZ h3tCetCDhtkpu5/FTP2F4L5yyvkw4nCCQolLS+NEIF9LAqgOg2k/A/GVCcZe9OYLTG78 yrSJBmL+c4mzqiRegxQU2XW195JgGVtN+GhAxE6OvshQ6Ovy4oKy2IwGmGS/aIIe8XUa /Gu4v41QE2U3PCGED5j5pF9Pkzm1RmQB8usTUyrKmDCe3SkGz0fg0sDfsvmlXpopDJhn 0SPQ== X-Gm-Message-State: AMke39mmC0aF528Ww3tUoE+rkayXrsk5RgxX9TUS3mBCbnYErNjNlE5j9aVgHdvqFQ+xAcI8cHCEHXOQ5suXzg== X-Received: by 10.223.183.6 with SMTP id l6mr8211065wre.60.1488674229884; Sat, 04 Mar 2017 16:37:09 -0800 (PST) MIME-Version: 1.0 Received: by 10.28.128.133 with HTTP; Sat, 4 Mar 2017 16:37:09 -0800 (PST) In-Reply-To: <201703042307.v24N7sSx021021@repo.freebsd.org> References: <201703042307.v24N7sSx021021@repo.freebsd.org> From: Adrian Chadd Date: Sat, 4 Mar 2017 16:37:09 -0800 Message-ID: Subject: Re: svn commit: r314687 - head/sys/dev/iwn To: Andriy Voskoboinyk Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 00:37:12 -0000 hihi! So the eventualy-ish attention is that if someone wanted to finish p2p/tdls support they could use this function for either context. But it don't think the feature was ever finished, because we don't have p2p/tdls support yet. Well, yet. It's coming. :) -adrian On 4 March 2017 at 15:07, Andriy Voskoboinyk wrote: > Author: avos > Date: Sat Mar 4 23:07:54 2017 > New Revision: 314687 > URL: https://svnweb.freebsd.org/changeset/base/314687 > > Log: > iwn: drop 'channel' parameter from iwn*_set_txpower() > > For 4965 just extract 'is_chan_5ghz' flag from the RXON structure > (like it was done in r281287); for others it was never used. > > Tested with Intel 6205, STA mode. > > Modified: > head/sys/dev/iwn/if_iwn.c > head/sys/dev/iwn/if_iwnvar.h > > Modified: head/sys/dev/iwn/if_iwn.c > ============================================================================== > --- head/sys/dev/iwn/if_iwn.c Sat Mar 4 22:58:34 2017 (r314686) > +++ head/sys/dev/iwn/if_iwn.c Sat Mar 4 23:07:54 2017 (r314687) > @@ -254,10 +254,8 @@ static void iwn_set_led(struct iwn_softc > static int iwn_set_critical_temp(struct iwn_softc *); > static int iwn_set_timing(struct iwn_softc *, struct ieee80211_node *); > static void iwn4965_power_calibration(struct iwn_softc *, int); > -static int iwn4965_set_txpower(struct iwn_softc *, > - struct ieee80211_channel *, int); > -static int iwn5000_set_txpower(struct iwn_softc *, > - struct ieee80211_channel *, int); > +static int iwn4965_set_txpower(struct iwn_softc *, int); > +static int iwn5000_set_txpower(struct iwn_softc *, int); > static int iwn4965_get_rssi(struct iwn_softc *, struct iwn_rx_stat *); > static int iwn5000_get_rssi(struct iwn_softc *, struct iwn_rx_stat *); > static int iwn_get_noise(const struct iwn_rx_general_stats *); > @@ -5510,7 +5508,6 @@ iwn_set_timing(struct iwn_softc *sc, str > static void > iwn4965_power_calibration(struct iwn_softc *sc, int temp) > { > - struct ieee80211com *ic = &sc->sc_ic; > > DPRINTF(sc, IWN_DEBUG_TRACE, "->Doing %s\n", __func__); > > @@ -5520,7 +5517,7 @@ iwn4965_power_calibration(struct iwn_sof > if (abs(temp - sc->temp) >= 3) { > /* Record temperature of last calibration. */ > sc->temp = temp; > - (void)iwn4965_set_txpower(sc, ic->ic_bsschan, 1); > + (void)iwn4965_set_txpower(sc, 1); > } > } > > @@ -5530,8 +5527,7 @@ iwn4965_power_calibration(struct iwn_sof > * the current temperature and the current voltage. > */ > static int > -iwn4965_set_txpower(struct iwn_softc *sc, struct ieee80211_channel *ch, > - int async) > +iwn4965_set_txpower(struct iwn_softc *sc, int async) > { > /* Fixed-point arithmetic division using a n-bit fractional part. */ > #define fdivround(a, b, n) \ > @@ -5546,20 +5542,21 @@ iwn4965_set_txpower(struct iwn_softc *sc > struct iwn4965_eeprom_chan_samples *chans; > const uint8_t *rf_gain, *dsp_gain; > int32_t vdiff, tdiff; > - int i, c, grp, maxpwr; > + int i, is_chan_5ghz, c, grp, maxpwr; > uint8_t chan; > > sc->rxon = &sc->rx_on[IWN_RXON_BSS_CTX]; > /* Retrieve current channel from last RXON. */ > chan = sc->rxon->chan; > + is_chan_5ghz = (sc->rxon->flags & htole32(IWN_RXON_24GHZ)) == 0; > DPRINTF(sc, IWN_DEBUG_RESET, "setting TX power for channel %d\n", > chan); > > memset(&cmd, 0, sizeof cmd); > - cmd.band = IEEE80211_IS_CHAN_5GHZ(ch) ? 0 : 1; > + cmd.band = is_chan_5ghz ? 0 : 1; > cmd.chan = chan; > > - if (IEEE80211_IS_CHAN_5GHZ(ch)) { > + if (is_chan_5ghz) { > maxpwr = sc->maxpwr5GHz; > rf_gain = iwn4965_rf_gain_5ghz; > dsp_gain = iwn4965_dsp_gain_5ghz; > @@ -5681,8 +5678,7 @@ iwn4965_set_txpower(struct iwn_softc *sc > } > > static int > -iwn5000_set_txpower(struct iwn_softc *sc, struct ieee80211_channel *ch, > - int async) > +iwn5000_set_txpower(struct iwn_softc *sc, int async) > { > struct iwn5000_cmd_txpower cmd; > int cmdid; > @@ -6693,7 +6689,7 @@ iwn_config(struct iwn_softc *sc) > } > > /* Configuration has changed, set TX power accordingly. */ > - if ((error = ops->set_txpower(sc, ic->ic_curchan, 0)) != 0) { > + if ((error = ops->set_txpower(sc, 0)) != 0) { > device_printf(sc->sc_dev, "%s: could not set TX power\n", > __func__); > return error; > @@ -7096,7 +7092,7 @@ iwn_auth(struct iwn_softc *sc, struct ie > } > > /* Configuration has changed, set TX power accordingly. */ > - if ((error = ops->set_txpower(sc, ni->ni_chan, 1)) != 0) { > + if ((error = ops->set_txpower(sc, 1)) != 0) { > device_printf(sc->sc_dev, > "%s: could not set TX power, error %d\n", __func__, error); > return error; > @@ -7180,7 +7176,7 @@ iwn_run(struct iwn_softc *sc, struct iee > } > > /* Configuration has changed, set TX power accordingly. */ > - if ((error = ops->set_txpower(sc, ni->ni_chan, 1)) != 0) { > + if ((error = ops->set_txpower(sc, 1)) != 0) { > device_printf(sc->sc_dev, > "%s: could not set TX power, error %d\n", __func__, error); > return error; > > Modified: head/sys/dev/iwn/if_iwnvar.h > ============================================================================== > --- head/sys/dev/iwn/if_iwnvar.h Sat Mar 4 22:58:34 2017 (r314686) > +++ head/sys/dev/iwn/if_iwnvar.h Sat Mar 4 23:07:54 2017 (r314687) > @@ -206,8 +206,7 @@ struct iwn_ops { > uint16_t); > int (*get_temperature)(struct iwn_softc *); > int (*get_rssi)(struct iwn_softc *, struct iwn_rx_stat *); > - int (*set_txpower)(struct iwn_softc *, > - struct ieee80211_channel *, int); > + int (*set_txpower)(struct iwn_softc *, int); > int (*init_gains)(struct iwn_softc *); > int (*set_gains)(struct iwn_softc *); > int (*add_node)(struct iwn_softc *, struct iwn_node_info *, > From owner-svn-src-head@freebsd.org Sun Mar 5 01:11:23 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A3CDFCED2DC for ; Sun, 5 Mar 2017 01:11:23 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm7-vm0.bullet.mail.ne1.yahoo.com (nm7-vm0.bullet.mail.ne1.yahoo.com [98.138.91.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 779941A11 for ; Sun, 5 Mar 2017 01:11:23 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1488676276; bh=wTftmwh+mcCjfko6CtrMZh3vvrUzdxz/w7gZxVagS+Q=; h=Subject:To:References:Cc:From:Date:In-Reply-To:From:Subject; b=YSkZo5x3xFceJGAzWy/Q0h7iThKFzbXrz2w7C2p5Zxt+GzqqhdPARPttjZAYzdOoK4M4F/Ay2MTrYaL0bv7Ab3MU/buDgIeutZ+PR7iycMsGFQoZSj5EAd5MVw2L9biwaasEZiN+Ni7VFK6tsGc5YBloLdeJCYIIOMjH0BMGwX/cISprYeOMknbs9zVaKsVasfpkX1IJld1J5WiijNDBlxV6O3zEtGY0cXrYICuWUNhu2v+4UUe8I8dbK5Jzp5UWdk++i6IhaJYQ4MsU5Z/sZeG53vZOXN+qTTIVRwk96oNFMrp/nzrvfwg0lWzH10O7vurRbdP4uXp1N9kwmCfnjw== Received: from [98.138.100.112] by nm7.bullet.mail.ne1.yahoo.com with NNFMP; 05 Mar 2017 01:11:16 -0000 Received: from [98.138.226.58] by tm103.bullet.mail.ne1.yahoo.com with NNFMP; 05 Mar 2017 01:11:16 -0000 Received: from [127.0.0.1] by smtp209.mail.ne1.yahoo.com with NNFMP; 05 Mar 2017 01:11:16 -0000 X-Yahoo-Newman-Id: 423128.36055.bm@smtp209.mail.ne1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: a.PFEqoVM1lXCHmtCT6KEGTRkQkLpKXma13hz3BlacseJ5o m.2fJPomCFAaXfmL1e3.0JX2ReBiDZ9az4di4kJaNSfICbifUiFGkyUF4bBS 7Mj2Rf.Swf1S7XgwDr6gvbKscPzi5ALDd58s32NsuOEkoS_VNk40SGjT3Cuh SMaEtm8UnHeYidS6OmvPJQYaVi4g19e3Y4SToM9_4hkzcnWdYWebWwiKr3om 2rrJlcq6ozQP1Pl.iMT4ZlMtveUAs1tVzHjxOgZibR.K8NFlUIo6fjyJCqc6 wRQh65rcCQ8FKSqhCZh8BNjJhIv6aV5hR1GIs7FwfH78sv6hFwfpdNf.CwhI l7y45Yxgatpf9qnCaRKT4T3X8UebHnq576s6ZR3ZpjVTeXPk6QC5wMHdUYwF E03GhZbGjaRi.Xr2m382JkCZw48qWTz5OYa53Vkzo3qyRazXjrBM7pBVrGkH UcYW6AC08yWtbdR.atb_Cl44caffMNk11DCrfWe1SrlVKEl08DWkUUcP.uPX R8k5F6tSZ8IoyAkIj9Y3mpdtrB9k9pvjtqWsRFvzILS6OlYs- X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Subject: Re: svn commit: r314669 - head/sys/i386/conf To: John Baldwin References: <201703041504.v24F4HMh023937@repo.freebsd.org> <2368011.hGEX4V32U5@ralph.baldwin.cx> <7873439.f6BlOXHt6g@ralph.baldwin.cx> Cc: Slawa Olhovchenkov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Pedro Giffuni Message-ID: Date: Sat, 4 Mar 2017 20:14:11 -0500 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <7873439.f6BlOXHt6g@ralph.baldwin.cx> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 01:11:23 -0000 On 3/4/2017 5:51 PM, John Baldwin wrote: > On Saturday, March 04, 2017 03:49:52 PM Pedro Giffuni wrote: >>> Il giorno 04 mar 2017, alle ore 14:43, John Baldwin ha scritto: >>> >>> On Saturday, March 04, 2017 10:52:46 AM Pedro Giffuni wrote: >>>> On 03/04/17 10:32, Slawa Olhovchenkov wrote: >>>>> On Sat, Mar 04, 2017 at 03:04:17PM +0000, Pedro F. Giffuni wrote: >>>>> >>>>>> Author: pfg >>>>>> Date: Sat Mar 4 15:04:17 2017 >>>>>> New Revision: 314669 >>>>>> URL: https://svnweb.freebsd.org/changeset/base/314669 >>>>>> >>>>>> Log: >>>>>> Drop i486 from the default i386 GENERIC kernel configuration. >>>>>> >>>>>> 80486 production was stopped by Intel on September 2007. Dropping the 486 >>>>>> configuration option from the GENERIC kernel improves performance >>>>>> slightly. >>>>>> >>>>>> Removing I486_CPU is consistent at this time: we don't support any >>>>>> processor without a FPU and the PC-98 arch, which frequently involved i486 >>>>>> CPUs, is also gone so we don't test such platforms anymore. >>>>> What is realy mean? >>>> This means we don't do work-arounds that would be required for raw 486. >>>> Instead we will use the 586 instructions by default. >>> This doesn't change that. The kernel already has runtime tests in place >>> for new things on 486 and later via cpuid. >>> >> Hmm ..then I am wondering if I effectively changed anything? > The only change is a 486 now panics on boot when it used to work fine. :-/ > > Nothing for other CPUs has changed. Not much has been lost then. FWIW, I have a "Pentium overdrive" somewhere in the basement which could theoretically boot FreeBSD 12 but last I remember just rebuilding a kernel was painful and the memory and HD limitations really make it a no-go. > >> The number came out from an old posting involving buildworld times, which I can’t find now :(. >> Things seem to have changed a lot: it was surely using GCC back then, I don’t believe clang does much distinction about 486 at all. >> >> BTW, does it make sense to keep i586 in the configuration still? Both i486 and i586 were once removed but later re-instated in r205336. > If anything I'd probably say we should do what bde@ suggested and just > remove CPU class entirely (and act as if 486, 586, and 686 are always > defined). > In any case ... I won't MFC the change and if someone asks me to revert it I will (I'd love to see a dmesg first ;) ). Pedro. From owner-svn-src-head@freebsd.org Sun Mar 5 02:34:13 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1AEFFCF7A5A; Sun, 5 Mar 2017 02:34:13 +0000 (UTC) (envelope-from andriyvos@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 A1E771ED2; Sun, 5 Mar 2017 02:34:12 +0000 (UTC) (envelope-from andriyvos@gmail.com) Received: by mail-lf0-f68.google.com with SMTP id g70so9545208lfh.3; Sat, 04 Mar 2017 18:34:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:subject:references:date:mime-version :content-transfer-encoding:from:message-id:in-reply-to:user-agent; bh=OyVHTf6Rb5nCJvtDt+cJXgjtDVkmQFrNSRojxWCeuMk=; b=L6hHE/7SFSJvfQyt/B0bZoqO+8wEkP1Oqu2vf4k3Yo2sTEBzznemZc+mwDiIcAviE0 aRoK+RW+Bjr4GDUYUW3yMk9kzII3axOBTFgLoDwjvuvWe3kTJdMMwDiCsR+1syj9yXTx s81pb6/nUzqzX2+NeBWGL4rTaosmkDOQkJM55OUVhvCgrEvPwgZNHIeePK5NXtE3ZA3A R9rwqvwiY3ulNnoXTsjYR+4M/HNfuYda0p61uTc79qXvga/4VWAZEgCTluqA5l+M8NGn 6U+7EvqQe5I6PxeTmA5x0g155eOiymYaEJP8zjt1ayEDAMD976Smis6BIf/KvsUmb9P+ 2SzA== X-Gm-Message-State: AMke39mBjEfDEm95vWHDXSxn7lream66SnajdIk8TB3ZfQX5ZhmYONWUfBYQIItRcbKWFg== X-Received: by 10.25.25.80 with SMTP id 77mr2785554lfz.64.1488679525786; Sat, 04 Mar 2017 18:05:25 -0800 (PST) Received: from thinkpad-x220 (host-176-37-109-22.la.net.ua. [176.37.109.22]) by smtp.gmail.com with ESMTPSA id 1sm3215804ljo.43.2017.03.04.18.05.24 (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 04 Mar 2017 18:05:25 -0800 (PST) Content-Type: text/plain; charset=utf-8; format=flowed; delsp=yes To: "Adrian Chadd" Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r314687 - head/sys/dev/iwn References: <201703042307.v24N7sSx021021@repo.freebsd.org> Date: Sun, 05 Mar 2017 04:05:20 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: Quoted-Printable From: "Andriy Voskoboinyk" Message-ID: In-Reply-To: User-Agent: Opera Mail/12.16 (FreeBSD) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 02:34:13 -0000 Sun, 05 Mar 2017 02:37:09 +0200 =D0=B1=D1=83=D0=BB=D0=BE =D0=BD=D0=B0=D0= =BF=D0=B8=D1=81=D0=B0=D0=BD=D0=BE Adrian Chadd = : Hi! Actually, the intention is simpler - redo all the work for wpi(4) here to bring in everything what it can - ad-hoc, hostap, aes-ccm etc > hihi! > > So the eventualy-ish attention is that if someone wanted to finish > p2p/tdls support they could use this function for either context. But > it don't think the feature was ever finished, because we don't have > p2p/tdls support yet. > > Well, yet. It's coming. :) > > > > -adrian > > > On 4 March 2017 at 15:07, Andriy Voskoboinyk wrote:= >> Author: avos >> Date: Sat Mar 4 23:07:54 2017 >> New Revision: 314687 >> URL: https://svnweb.freebsd.org/changeset/base/314687 >> >> Log: >> iwn: drop 'channel' parameter from iwn*_set_txpower() >> >> For 4965 just extract 'is_chan_5ghz' flag from the RXON structure >> (like it was done in r281287); for others it was never used. >> >> Tested with Intel 6205, STA mode. >> >> Modified: >> head/sys/dev/iwn/if_iwn.c >> head/sys/dev/iwn/if_iwnvar.h >> >> Modified: head/sys/dev/iwn/if_iwn.c >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D >> --- head/sys/dev/iwn/if_iwn.c Sat Mar 4 22:58:34 2017 = >> (r314686) >> +++ head/sys/dev/iwn/if_iwn.c Sat Mar 4 23:07:54 2017 = >> (r314687) >> @@ -254,10 +254,8 @@ static void iwn_set_led(struct iwn_softc >> static int iwn_set_critical_temp(struct iwn_softc *); >> static int iwn_set_timing(struct iwn_softc *, struct = >> ieee80211_node *); >> static void iwn4965_power_calibration(struct iwn_softc *, int); >> -static int iwn4965_set_txpower(struct iwn_softc *, >> - struct ieee80211_channel *, int); >> -static int iwn5000_set_txpower(struct iwn_softc *, >> - struct ieee80211_channel *, int); >> +static int iwn4965_set_txpower(struct iwn_softc *, int); >> +static int iwn5000_set_txpower(struct iwn_softc *, int); >> static int iwn4965_get_rssi(struct iwn_softc *, struct iwn_rx_st= at = >> *); >> static int iwn5000_get_rssi(struct iwn_softc *, struct iwn_rx_st= at = >> *); >> static int iwn_get_noise(const struct iwn_rx_general_stats *); >> @@ -5510,7 +5508,6 @@ iwn_set_timing(struct iwn_softc *sc, str >> static void >> iwn4965_power_calibration(struct iwn_softc *sc, int temp) >> { >> - struct ieee80211com *ic =3D &sc->sc_ic; >> >> DPRINTF(sc, IWN_DEBUG_TRACE, "->Doing %s\n", __func__); >> >> @@ -5520,7 +5517,7 @@ iwn4965_power_calibration(struct iwn_sof >> if (abs(temp - sc->temp) >=3D 3) { >> /* Record temperature of last calibration. */ >> sc->temp =3D temp; >> - (void)iwn4965_set_txpower(sc, ic->ic_bsschan, 1); >> + (void)iwn4965_set_txpower(sc, 1); >> } >> } >> >> @@ -5530,8 +5527,7 @@ iwn4965_power_calibration(struct iwn_sof >> * the current temperature and the current voltage. >> */ >> static int >> -iwn4965_set_txpower(struct iwn_softc *sc, struct ieee80211_channel *= ch, >> - int async) >> +iwn4965_set_txpower(struct iwn_softc *sc, int async) >> { >> /* Fixed-point arithmetic division using a n-bit fractional part. */= >> #define fdivround(a, b, n) \ >> @@ -5546,20 +5542,21 @@ iwn4965_set_txpower(struct iwn_softc *sc >> struct iwn4965_eeprom_chan_samples *chans; >> const uint8_t *rf_gain, *dsp_gain; >> int32_t vdiff, tdiff; >> - int i, c, grp, maxpwr; >> + int i, is_chan_5ghz, c, grp, maxpwr; >> uint8_t chan; >> >> sc->rxon =3D &sc->rx_on[IWN_RXON_BSS_CTX]; >> /* Retrieve current channel from last RXON. */ >> chan =3D sc->rxon->chan; >> + is_chan_5ghz =3D (sc->rxon->flags & htole32(IWN_RXON_24GHZ)) = =3D=3D 0; >> DPRINTF(sc, IWN_DEBUG_RESET, "setting TX power for channel = >> %d\n", >> chan); >> >> memset(&cmd, 0, sizeof cmd); >> - cmd.band =3D IEEE80211_IS_CHAN_5GHZ(ch) ? 0 : 1; >> + cmd.band =3D is_chan_5ghz ? 0 : 1; >> cmd.chan =3D chan; >> >> - if (IEEE80211_IS_CHAN_5GHZ(ch)) { >> + if (is_chan_5ghz) { >> maxpwr =3D sc->maxpwr5GHz; >> rf_gain =3D iwn4965_rf_gain_5ghz; >> dsp_gain =3D iwn4965_dsp_gain_5ghz; >> @@ -5681,8 +5678,7 @@ iwn4965_set_txpower(struct iwn_softc *sc >> } >> >> static int >> -iwn5000_set_txpower(struct iwn_softc *sc, struct ieee80211_channel *= ch, >> - int async) >> +iwn5000_set_txpower(struct iwn_softc *sc, int async) >> { >> struct iwn5000_cmd_txpower cmd; >> int cmdid; >> @@ -6693,7 +6689,7 @@ iwn_config(struct iwn_softc *sc) >> } >> >> /* Configuration has changed, set TX power accordingly. */ >> - if ((error =3D ops->set_txpower(sc, ic->ic_curchan, 0)) !=3D = 0) { >> + if ((error =3D ops->set_txpower(sc, 0)) !=3D 0) { >> device_printf(sc->sc_dev, "%s: could not set TX = >> power\n", >> __func__); >> return error; >> @@ -7096,7 +7092,7 @@ iwn_auth(struct iwn_softc *sc, struct ie >> } >> >> /* Configuration has changed, set TX power accordingly. */ >> - if ((error =3D ops->set_txpower(sc, ni->ni_chan, 1)) !=3D 0) = { >> + if ((error =3D ops->set_txpower(sc, 1)) !=3D 0) { >> device_printf(sc->sc_dev, >> "%s: could not set TX power, error %d\n", __func_= _, = >> error); >> return error; >> @@ -7180,7 +7176,7 @@ iwn_run(struct iwn_softc *sc, struct iee >> } >> >> /* Configuration has changed, set TX power accordingly. */ >> - if ((error =3D ops->set_txpower(sc, ni->ni_chan, 1)) !=3D 0) = { >> + if ((error =3D ops->set_txpower(sc, 1)) !=3D 0) { >> device_printf(sc->sc_dev, >> "%s: could not set TX power, error %d\n", __func_= _, = >> error); >> return error; >> >> Modified: head/sys/dev/iwn/if_iwnvar.h >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D >> --- head/sys/dev/iwn/if_iwnvar.h Sat Mar 4 22:58:34 2017 = = >> (r314686) >> +++ head/sys/dev/iwn/if_iwnvar.h Sat Mar 4 23:07:54 2017 = = >> (r314687) >> @@ -206,8 +206,7 @@ struct iwn_ops { >> uint16_t); >> int (*get_temperature)(struct iwn_softc *); >> int (*get_rssi)(struct iwn_softc *, struct = >> iwn_rx_stat *); >> - int (*set_txpower)(struct iwn_softc *, >> - struct ieee80211_channel *, int); >> + int (*set_txpower)(struct iwn_softc *, int); >> int (*init_gains)(struct iwn_softc *); >> int (*set_gains)(struct iwn_softc *); >> int (*add_node)(struct iwn_softc *, struct = >> iwn_node_info *, From owner-svn-src-head@freebsd.org Sun Mar 5 03:05:26 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 661DECED70B; Sun, 5 Mar 2017 03:05:26 +0000 (UTC) (envelope-from badger@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3DDB71F36; Sun, 5 Mar 2017 03:05:26 +0000 (UTC) (envelope-from badger@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2535PUw020992; Sun, 5 Mar 2017 03:05:25 GMT (envelope-from badger@FreeBSD.org) Received: (from badger@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2535OYk020986; Sun, 5 Mar 2017 03:05:24 GMT (envelope-from badger@FreeBSD.org) Message-Id: <201703050305.v2535OYk020986@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: badger set sender to badger@FreeBSD.org using -f From: Eric Badger Date: Sun, 5 Mar 2017 03:05:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314690 - in head: share/man/man5 sys/conf sys/fs/procfs sys/modules/procfs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 03:05:26 -0000 Author: badger Date: Sun Mar 5 03:05:24 2017 New Revision: 314690 URL: https://svnweb.freebsd.org/changeset/base/314690 Log: remove procfs ctl interface This interface has no in-tree consumers and has been more or less non-functional for several releases. Remove manpage note that the procfs special file 'mem' is grouped to kmem. This hasn't been true since r81107. Remove procfs' README file. It is an out of date duplication of the manpage (quoth the README: "since the bsd kernel is single-processor..."). Reviewed by: vangyzen, bcr (manpage) Approved by: des (procfs maintainer), vangyzen (mentor) Differential Revision: https://reviews.freebsd.org/D9802 Deleted: head/sys/fs/procfs/README head/sys/fs/procfs/procfs_ctl.c Modified: head/share/man/man5/procfs.5 head/sys/conf/files head/sys/fs/procfs/procfs.c head/sys/fs/procfs/procfs.h head/sys/modules/procfs/Makefile Modified: head/share/man/man5/procfs.5 ============================================================================== --- head/share/man/man5/procfs.5 Sun Mar 5 00:37:23 2017 (r314689) +++ head/share/man/man5/procfs.5 Sun Mar 5 03:05:24 2017 (r314690) @@ -2,7 +2,7 @@ .\" Written by Garrett Wollman .\" This file is in the public domain. .\" -.Dd December 26, 2015 +.Dd March 4, 2017 .Dt PROCFS 5 .Os .Sh NAME @@ -33,48 +33,7 @@ special node called which always refers to the process making the lookup request. .Pp Each node is a directory which contains the following entries: -.Pp -Each directory contains several files: .Bl -tag -width status -.It Pa ctl -a write-only file which supports a variety -of control operations. -Control commands are written as strings to the -.Pa ctl -file. -The control commands are: -.Bl -tag -width detach -compact -.It attach -stops the target process and arranges for the sending -process to become the debug control process. -.It detach -continue execution of the target process and -remove it from control by the debug process (which -need not be the sending process). -.It run -continue running the target process until -a signal is delivered, a breakpoint is hit, or the -target process exits. -.It step -single step the target process, with no signal delivery. -.It wait -wait for the target process to come to a steady -state ready for debugging. -The target process must be in this state before -any of the other commands are allowed. -.El -.Pp -The string can also be the name of a signal, lower case -and without the -.Dv SIG -prefix, -in which case that signal is delivered to the process -(see -.Xr sigaction 2 ) . -.Pp -The -.Xr procctl 8 -utility can be used to clear tracepoints in a stuck process. .It Pa dbregs The debug registers as defined by .Dv "struct dbregs" @@ -188,30 +147,8 @@ to indicate that the process is not runn .El .El .Pp -In a normal debugging environment, -where the target is fork/exec'd by the debugger, -the debugger should fork and the child should stop -itself (with a self-inflicted -.Dv SIGSTOP -for example). -The parent should issue a -.Dv wait -and then an -.Dv attach -command via the appropriate -.Pa ctl -file. -The child process will receive a -.Dv SIGTRAP -immediately after the call to exec (see -.Xr execve 2 ) . -.Pp Each node is owned by the process's user, and belongs to that user's -primary group, except for the -.Pa mem -node, which belongs to the -.Li kmem -group. +primary group. .Sh FILES .Bl -tag -width /proc/curproc/XXXXXXX -compact .It Pa /proc @@ -224,8 +161,6 @@ directory containing process information directory containing process information for the current process .It Pa /proc/curproc/cmdline the process executable name -.It Pa /proc/curproc/ctl -used to send control messages to the process .It Pa /proc/curproc/etype executable type .It Pa /proc/curproc/file Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Sun Mar 5 00:37:23 2017 (r314689) +++ head/sys/conf/files Sun Mar 5 03:05:24 2017 (r314690) @@ -3384,7 +3384,6 @@ fs/nullfs/null_subr.c optional nullfs fs/nullfs/null_vfsops.c optional nullfs fs/nullfs/null_vnops.c optional nullfs fs/procfs/procfs.c optional procfs -fs/procfs/procfs_ctl.c optional procfs fs/procfs/procfs_dbregs.c optional procfs fs/procfs/procfs_fpregs.c optional procfs fs/procfs/procfs_ioctl.c optional procfs Modified: head/sys/fs/procfs/procfs.c ============================================================================== --- head/sys/fs/procfs/procfs.c Sun Mar 5 00:37:23 2017 (r314689) +++ head/sys/fs/procfs/procfs.c Sun Mar 5 03:05:24 2017 (r314690) @@ -104,8 +104,7 @@ procfs_attr(PFS_ATTR_ARGS) { /* XXX inefficient, split into separate functions */ - if (strcmp(pn->pn_name, "ctl") == 0 || - strcmp(pn->pn_name, "note") == 0 || + if (strcmp(pn->pn_name, "note") == 0 || strcmp(pn->pn_name, "notepg") == 0) vap->va_mode = 0200; else if (strcmp(pn->pn_name, "mem") == 0 || @@ -166,8 +165,6 @@ procfs_init(PFS_INIT_ARGS) procfs_attr, NULL, NULL, PFS_PROCDEP); pfs_create_file(dir, "cmdline", procfs_doproccmdline, NULL, NULL, NULL, PFS_RD); - pfs_create_file(dir, "ctl", procfs_doprocctl, - procfs_attr, NULL, NULL, PFS_WR); pfs_create_file(dir, "dbregs", procfs_doprocdbregs, procfs_attr, procfs_candebug, NULL, PFS_RDWR|PFS_RAW); pfs_create_file(dir, "etype", procfs_doproctype, Modified: head/sys/fs/procfs/procfs.h ============================================================================== --- head/sys/fs/procfs/procfs.h Sun Mar 5 00:37:23 2017 (r314689) +++ head/sys/fs/procfs/procfs.h Sun Mar 5 03:05:24 2017 (r314690) @@ -41,7 +41,6 @@ int procfs_docurproc(PFS_FILL_ARGS); int procfs_doosrel(PFS_FILL_ARGS); int procfs_doproccmdline(PFS_FILL_ARGS); -int procfs_doprocctl(PFS_FILL_ARGS); int procfs_doprocdbregs(PFS_FILL_ARGS); int procfs_doprocfile(PFS_FILL_ARGS); int procfs_doprocfpregs(PFS_FILL_ARGS); Modified: head/sys/modules/procfs/Makefile ============================================================================== --- head/sys/modules/procfs/Makefile Sun Mar 5 00:37:23 2017 (r314689) +++ head/sys/modules/procfs/Makefile Sun Mar 5 03:05:24 2017 (r314690) @@ -6,7 +6,6 @@ KMOD= procfs SRCS= SRCS+= opt_compat.h SRCS+= vnode_if.h -SRCS+= procfs_ctl.c SRCS+= procfs_dbregs.c SRCS+= procfs_fpregs.c SRCS+= procfs_ioctl.c From owner-svn-src-head@freebsd.org Sun Mar 5 03:16:13 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4BB0CCEDA28; Sun, 5 Mar 2017 03:16:13 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail105.syd.optusnet.com.au (mail105.syd.optusnet.com.au [211.29.132.249]) by mx1.freebsd.org (Postfix) with ESMTP id EB71F17D2; Sun, 5 Mar 2017 03:16:12 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from besplex.bde.org (c122-106-153-191.carlnfd1.nsw.optusnet.com.au [122.106.153.191]) by mail105.syd.optusnet.com.au (Postfix) with ESMTPS id D75DB1045F0F; Sun, 5 Mar 2017 13:50:26 +1100 (AEDT) Date: Sun, 5 Mar 2017 13:50:26 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Conrad Meyer cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314685 - head/bin/ps In-Reply-To: <201703042238.v24McAD8008837@repo.freebsd.org> Message-ID: <20170305115437.R1556@besplex.bde.org> References: <201703042238.v24McAD8008837@repo.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.2 cv=VbSHBBh9 c=1 sm=1 tr=0 a=Tj3pCpwHnMupdyZSltBt7Q==:117 a=Tj3pCpwHnMupdyZSltBt7Q==:17 a=kj9zAlcOel0A:10 a=6I5d2MoRAAAA:8 a=t-IPkPogAAAA:8 a=pGLkceISAAAA:8 a=JNNbXLwdEY8w7fO0ZvQA:9 a=PP53H4lZ8oNyuVHU:21 a=xCfBdVL8ZxdAqr7M:21 a=CjuIK1q_8ugA:10 a=OSekkM7Z7ioA:10 a=IjZwj45LgO3ly-622nXo:22 a=TwOW_m0CY6OjrxjWeTv9:22 a=6kGIvZw6iX1k4Y-7sg4_:22 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 03:16:13 -0000 On Sat, 4 Mar 2017, Conrad Meyer wrote: > Author: cem > Date: Sat Mar 4 22:38:10 2017 > New Revision: 314685 > URL: https://svnweb.freebsd.org/changeset/base/314685 > > Log: > ps(1): Only detect terminal width if stdout is a tty > > If stdout isn't a tty, use unlimited width output rather than truncating to > 79 characters. This is helpful for shell scripts or e.g., 'ps | grep foo'. This breaks many interactive uses, e.g., 'ps l | less', to work around a user error. If the user wants an unlimited width, then they should have asked for it using -ww (-w only increases the width to 131 if it was smaller). Shell scripts should be especially careful to use the right options... > This hardcoded width has some history: In The Beginning of History[0], the > width of ps was hardcoded as 80 bytes. In 1985, Bloom@ added detection > using TIOCGWINSZ on stdin.[1] In 1986, Kirk merged a change to check > stdout's window size instead. In 1990, the fallback checks to stderr and > stdin's TIOCGWINSZ were added by Marc@, with the commit message "new > version."[2] > > OS X Darwin has a very similar modification to ps(1), which simply sets > UNLIMITED for all non-tty outputs.[3] I've chosen to respect COLUMNS > instead of behaving identically to Darwin here, but I don't feel strongly > about that. We could match OS X for parity if that is desired. Ignoring COLUMNS would break it completely. COLUMNS is the only way to control the width. Interactive use normally wants the width of the current terminal, but shell scripts might want to create a file to be read on a different terminal, or just back on the same terminal where the script cannout know about the current terminal because it is purely non-interactive (see comments below about checking all 3 std fd's consistently). > [0]: https://svnweb.freebsd.org/csrg/bin/ps/ps.c?annotate=1065 > [1]: https://svnweb.freebsd.org/csrg/bin/ps/ps.c?r1=18105&r2=18106 > [2]: > https://svnweb.freebsd.org/csrg/bin/ps/ps.c?r1=40675&r2=40674&pathrev=40675 > [3]: > https://opensource.apple.com/source/adv_cmds/adv_cmds-168/ps/ps.c.auto.html > > PR: 217159 > Reported by: Deepak Nagaraj > > Modified: > head/bin/ps/ps.c > > Modified: head/bin/ps/ps.c > ============================================================================== > --- head/bin/ps/ps.c Sat Mar 4 22:23:59 2017 (r314684) > +++ head/bin/ps/ps.c Sat Mar 4 22:38:10 2017 (r314685) > @@ -194,6 +194,8 @@ main(int argc, char *argv[]) > > if ((cols = getenv("COLUMNS")) != NULL && *cols != '\0') > termwidth = atoi(cols); > + else if (!isatty(STDOUT_FILENO)) > + termwidth = UNLIMITED; > else if ((ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&ws) == -1 && > ioctl(STDERR_FILENO, TIOCGWINSZ, (char *)&ws) == -1 && > ioctl(STDIN_FILENO, TIOCGWINSZ, (char *)&ws) == -1) || For use in shell scripts, the user should know too much about COLUMNS. COLUMNS is set automatically by some shells, but not exported, so it is not normally set here. But shell scripts should worry about the effects of environment variables. Hard-coded -ww would cancel the setting of termwidth here. This is the easiest way to blow away the user's setting of COLUMNS. Security-related scripts should do this. But most scripts should honor the setting. The use might actually want the setting to affect ps in the script. It is probably wrong to check only stdout. ps is only clearly not associated with a terminal if all 3 std fd's are not terminals. If there was a bug in the old version, then it was that the default is chosen too magically, so no one can remember how to control it. (Even simple use of isatty() gives that problem, and causes a larger problem in practice -- stdio gives line-buffered output which is best for interactive use, but as soon as you pipe the output though less it becomes fully buffered and is often delayed too long. Some utilities have an option to give line-buffered output (e.g., -l for tcpdump), but most don't, and I can rarely remember if they do.) The problem is not really different for shell scripts. ps in a shell script still uses the terminal width if the script outputs to a terminal. But if you pipe through less so that you can actually read the output before it scrolls off, then it magically becomes wide, unless you remember the COLUMNS variable, and export it, and the script honors it. This shows why it is indeed wrong to not check all 3 std fd's. Both 'ps | less' and 'script-doing-ps | less' are interactive uses if they are started on a terminal, since stdin is still a terminal and so is stderr since you forgot to pipe it to less. The width should not change in this case. (stdio only does isatty() on the fd of the current stream to set the default for line buffering. It would be too magical for it to check other fd's, especially when the current fd is not a std one. I think the unwanted full buffering for most utilities when they are piped through less to a terminal results from this. They just use stdio, and it doesn't know the context, so it correctly doesn't adjust the magic. Then most utilities don't know about using setvbuf() to adjust the magic to their context, and they really shouldn't know if the output is a pipe...) top(1) has a related non-problem with the default length. For the non- interactive use 'top >file', you normally want to see more lines than fit on the terminal and a probably doing this to see them. But the length doesn't change by default. It is a user error to not use the option to change it. Bruce From owner-svn-src-head@freebsd.org Sun Mar 5 03:32:08 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD5AACF80B4; Sun, 5 Mar 2017 03:32:08 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) (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 6E940165D; Sun, 5 Mar 2017 03:32:07 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-wm0-f52.google.com with SMTP id n11so40948184wma.0; Sat, 04 Mar 2017 19:32:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=uEc6se7Z1A1HeThyUoZKTaK4LcnxxATCNy7qvB9fEBc=; b=oJ6FAAJqg87otQI2rL/2MSf16GYWnzcxJLuFPHQX/nazV73n5EnAjx6gZJ3f11ADYi BOos4mZeih+Py9O8C4GkJn94rV8/ELqjl0jEjk8aGQu7QFkS5sKCNkByFnpZQGm2bTHy cHJa+938/UffW7wx4YzsuDGNDXZTRtrh3ieeofYGUdqq/qKoHPUX3+Ifmw7oKu5iaAiP C6g8dV5mzgluPiaajqImkFDE8l/WlEE82O7ne4Zy53prCkWuscFNsLiEqGBO3mk9dKaE eDf+RWdYM4LKzyxqGVg8mboDFcx/QTgZjGzZ12ROvNog9ON16hK2KfhR/xfJPqaWZIUy o5Kg== X-Gm-Message-State: AMke39n2rm5LQUUNSwZPay4ZR/G7hsTidVorw5Ta+EB73/4V/nBR0JZLXehfjI/asaCJtQ== X-Received: by 10.28.23.140 with SMTP id 134mr8311525wmx.23.1488684250075; Sat, 04 Mar 2017 19:24:10 -0800 (PST) Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com. [74.125.82.49]) by smtp.gmail.com with ESMTPSA id c2sm4895117wre.55.2017.03.04.19.24.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Mar 2017 19:24:09 -0800 (PST) Received: by mail-wm0-f49.google.com with SMTP id n11so40703760wma.1; Sat, 04 Mar 2017 19:24:09 -0800 (PST) X-Received: by 10.28.174.14 with SMTP id x14mr8454281wme.75.1488684249796; Sat, 04 Mar 2017 19:24:09 -0800 (PST) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 10.80.169.4 with HTTP; Sat, 4 Mar 2017 19:24:09 -0800 (PST) In-Reply-To: <20170305115437.R1556@besplex.bde.org> References: <201703042238.v24McAD8008837@repo.freebsd.org> <20170305115437.R1556@besplex.bde.org> From: Conrad Meyer Date: Sat, 4 Mar 2017 19:24:09 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r314685 - head/bin/ps To: Bruce Evans Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 03:32:08 -0000 On Sat, Mar 4, 2017 at 6:50 PM, Bruce Evans wrote: >> Author: cem >> Date: Sat Mar 4 22:38:10 2017 >> New Revision: 314685 >> URL: https://svnweb.freebsd.org/changeset/base/314685 >> >> Log: >> ps(1): Only detect terminal width if stdout is a tty >> >> If stdout isn't a tty, use unlimited width output rather than truncating >> to >> 79 characters. This is helpful for shell scripts or e.g., 'ps | grep >> foo'. > > This breaks many interactive uses, e.g., 'ps l | less', to work around a > user error. Hi Bruce, Can you illustrate what breaks here? less(1) doesn't wrap lines and instead supports side-to-side scrolling with left/right arrow keys. The user should get basically the same output with 'ps l | less' as with 'ps l', aside from ability to scroll up/down and left/right. Thanks, Conrad From owner-svn-src-head@freebsd.org Sun Mar 5 03:58:58 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AE93BCF8BB8; Sun, 5 Mar 2017 03:58:58 +0000 (UTC) (envelope-from rgrimes@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 77F3A1692; Sun, 5 Mar 2017 03:58:58 +0000 (UTC) (envelope-from rgrimes@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v253wvH0044253; Sun, 5 Mar 2017 03:58:57 GMT (envelope-from rgrimes@FreeBSD.org) Received: (from rgrimes@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v253wvCI044252; Sun, 5 Mar 2017 03:58:57 GMT (envelope-from rgrimes@FreeBSD.org) Message-Id: <201703050358.v253wvCI044252@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rgrimes set sender to rgrimes@FreeBSD.org using -f From: "Rodney W. Grimes" Date: Sun, 5 Mar 2017 03:58:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314691 - head/share/man/man7 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 03:58:58 -0000 Author: rgrimes Date: Sun Mar 5 03:58:57 2017 New Revision: 314691 URL: https://svnweb.freebsd.org/changeset/base/314691 Log: Document 3 more src/ directories Approved by: grehan(mentor) MFC after: 1 week Verified by: igor (same errors before and after) Modified: head/share/man/man7/hier.7 Modified: head/share/man/man7/hier.7 ============================================================================== --- head/share/man/man7/hier.7 Sun Mar 5 03:05:24 2017 (r314690) +++ head/share/man/man7/hier.7 Sun Mar 5 03:58:57 2017 (r314691) @@ -28,7 +28,7 @@ .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd March 15, 2016 +.Dd March 2, 2017 .Dt HIER 7 .Os .Sh NAME @@ -704,6 +704,9 @@ source code for files in files required to produce a .Fx release +.It Pa rescue/ +source code for files in +.Pa /rescue .It Pa sbin/ source code for files in .Pa /sbin @@ -715,6 +718,11 @@ source for files in .Pa /usr/share .It Pa sys/ kernel source code +.It Pa targets/ +support for experimental DIRDEPS_BUILD +.It Pa tests/ +source code for files in +.Pa /usr/tests .It Pa tools/ tools used for maintenance and testing of .Fx From owner-svn-src-head@freebsd.org Sun Mar 5 04:02:48 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE737CF8EC6; Sun, 5 Mar 2017 04:02:48 +0000 (UTC) (envelope-from rgrimes@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8DE121D2F; Sun, 5 Mar 2017 04:02:48 +0000 (UTC) (envelope-from rgrimes@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2542lDT048254; Sun, 5 Mar 2017 04:02:47 GMT (envelope-from rgrimes@FreeBSD.org) Received: (from rgrimes@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2542lTY048253; Sun, 5 Mar 2017 04:02:47 GMT (envelope-from rgrimes@FreeBSD.org) Message-Id: <201703050402.v2542lTY048253@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rgrimes set sender to rgrimes@FreeBSD.org using -f From: "Rodney W. Grimes" Date: Sun, 5 Mar 2017 04:02:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314692 - head/share/misc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 04:02:48 -0000 Author: rgrimes Date: Sun Mar 5 04:02:47 2017 New Revision: 314692 URL: https://svnweb.freebsd.org/changeset/base/314692 Log: Move me from Alumni to active src committer. Promote Peter Grehan to a brother of day1 by adding Peter Grehan (grehan) as my mentor. Reviewed by: gjb Approved by: grehan Verified by: dot to make sure it produces output and no cycles occur Modified: head/share/misc/committers-src.dot Modified: head/share/misc/committers-src.dot ============================================================================== --- head/share/misc/committers-src.dot Sun Mar 5 03:58:57 2017 (r314691) +++ head/share/misc/committers-src.dot Sun Mar 5 04:02:47 2017 (r314692) @@ -78,7 +78,6 @@ non [label="Noriaki Mitsnaga\nnon@FreeBS 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"] @@ -274,6 +273,7 @@ qingli [label="Qing Li\nqingli@FreeBSD.o 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"] rmacklem [label="Rick Macklem\nrmacklem@FreeBSD.org\n2009/03/27"] rmh [label="Robert Millan\nrmh@FreeBSD.org\n2011/09/18"] @@ -497,6 +497,7 @@ gnn -> karels gonzo -> jmcneill grehan -> bryanv +grehan -> rgrimes grog -> edwin grog -> le From owner-svn-src-head@freebsd.org Sun Mar 5 04:09:20 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0BDBCCF8FDC; Sun, 5 Mar 2017 04:09:20 +0000 (UTC) (envelope-from rgrimes@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CCDD61ED5; Sun, 5 Mar 2017 04:09:19 +0000 (UTC) (envelope-from rgrimes@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2549I4M048767; Sun, 5 Mar 2017 04:09:18 GMT (envelope-from rgrimes@FreeBSD.org) Received: (from rgrimes@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2549IwK048766; Sun, 5 Mar 2017 04:09:18 GMT (envelope-from rgrimes@FreeBSD.org) Message-Id: <201703050409.v2549IwK048766@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rgrimes set sender to rgrimes@FreeBSD.org using -f From: "Rodney W. Grimes" Date: Sun, 5 Mar 2017 04:09:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314693 - head/usr.sbin/rmt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 04:09:20 -0000 Author: rgrimes Date: Sun Mar 5 04:09:18 2017 New Revision: 314693 URL: https://svnweb.freebsd.org/changeset/base/314693 Log: Change /etc/rmt symlink from absolute to relative path, correcting the mistake made in r6499 Approved by: grehan MFC after: 1 week Modified: head/usr.sbin/rmt/Makefile Modified: head/usr.sbin/rmt/Makefile ============================================================================== --- head/usr.sbin/rmt/Makefile Sun Mar 5 04:02:47 2017 (r314692) +++ head/usr.sbin/rmt/Makefile Sun Mar 5 04:09:18 2017 (r314693) @@ -7,6 +7,6 @@ MAN= rmt.8 # called from /usr/src/etc/Makefile etc-rmt: rm -f ${DESTDIR}/etc/rmt - ln -s ${BINDIR}/rmt ${DESTDIR}/etc/rmt + ln -s ..${BINDIR}/rmt ${DESTDIR}/etc/rmt .include From owner-svn-src-head@freebsd.org Sun Mar 5 04:57:32 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2A76ACFA105; Sun, 5 Mar 2017 04:57:32 +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 CF1D8160C; Sun, 5 Mar 2017 04:57:31 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from besplex.bde.org (c122-106-153-191.carlnfd1.nsw.optusnet.com.au [122.106.153.191]) by mail104.syd.optusnet.com.au (Postfix) with ESMTPS id 36493427A46; Sun, 5 Mar 2017 15:57:29 +1100 (AEDT) Date: Sun, 5 Mar 2017 15:57:28 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Conrad Meyer cc: Bruce Evans , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314685 - head/bin/ps In-Reply-To: Message-ID: <20170305150734.K2493@besplex.bde.org> References: <201703042238.v24McAD8008837@repo.freebsd.org> <20170305115437.R1556@besplex.bde.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.2 cv=KeqiiUQD c=1 sm=1 tr=0 a=Tj3pCpwHnMupdyZSltBt7Q==:117 a=Tj3pCpwHnMupdyZSltBt7Q==:17 a=kj9zAlcOel0A:10 a=PO7r1zJSAAAA:8 a=6I5d2MoRAAAA:8 a=D_tafSauxoz0-rkh7v0A:9 a=CjuIK1q_8ugA:10 a=Oa0T6EYmKFNB-xRHvYM1:22 a=IjZwj45LgO3ly-622nXo:22 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 04:57:32 -0000 On Sat, 4 Mar 2017, Conrad Meyer wrote: > On Sat, Mar 4, 2017 at 6:50 PM, Bruce Evans wrote: >>> Author: cem >>> Date: Sat Mar 4 22:38:10 2017 >>> New Revision: 314685 >>> URL: https://svnweb.freebsd.org/changeset/base/314685 >>> >>> Log: >>> ps(1): Only detect terminal width if stdout is a tty >>> >>> If stdout isn't a tty, use unlimited width output rather than truncating >>> to >>> 79 characters. This is helpful for shell scripts or e.g., 'ps | grep >>> foo'. >> >> This breaks many interactive uses, e.g., 'ps l | less', to work around a >> user error. > > Can you illustrate what breaks here? less(1) doesn't wrap lines and > instead supports side-to-side scrolling with left/right arrow keys. less does wrap long lines. However, it has an option -S to cause long lines to be chopped. Also, if you use side-to-side scrolling then it switches to -S mode except at the leftmost column. Thus, less acts like you say if started with -S. If not started with -S, it makes a mess of the leftmost screen. Other display utilities might not have the sideways scrolling. I normally use an old version of less that doesn't have it, and sometimes vi to just read things. It does have -S. vi doesn't have it or even truncation AFAIK. I often use the display method of dropping large output into the terminal's history buffer and scrolling back using the terminal's scroll keys. This works better than less for many purposes. It doesn't do sideways scrolling. With syscons, some of the history survives a frame buffer geometry change but the history is raw so line breaks cannot be recovered, and the current screen is cleared together with its history instead of redrawn. With xterm, there is no bogus clearing but the line breaks are not recovered. Another broken use is ps l | grep where the output is sent to the screen. It is now wide, so hard to read without piping it further through a viewer with sideways scrolling. Sideways scrolling is not too bad for tabular formats like ps's where you often want to look at 1 column at a time, but I don't like it for general use and prefer truncation. less in an xterm can be resized with recoverable line breaks but I rarely use X. Truncation by the viewer is not as good as truncation by the producer. ps should expand leading field widths so as to truncates leading fields less if the output is wide. This would move important later fields into the truncated region if the viewer truncates. > The user should get basically the same output with 'ps l | less' as > with 'ps l', aside from ability to scroll up/down and left/right. This takes a nonstandard version of less (perhaps an alias). So some users would notice this change more than others. It is interesting that ps -ww doesn't work as an alias for ps for users who are used to typing ps args without a '-'. ps -ww -l works, but ps -ww l is a syntax error. Bruce From owner-svn-src-head@freebsd.org Sun Mar 5 05:02:15 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 52134CFA2E6; Sun, 5 Mar 2017 05:02:15 +0000 (UTC) (envelope-from rgrimes@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1EBC61A3C; Sun, 5 Mar 2017 05:02:15 +0000 (UTC) (envelope-from rgrimes@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2552Evm074340; Sun, 5 Mar 2017 05:02:14 GMT (envelope-from rgrimes@FreeBSD.org) Received: (from rgrimes@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2552EUi074339; Sun, 5 Mar 2017 05:02:14 GMT (envelope-from rgrimes@FreeBSD.org) Message-Id: <201703050502.v2552EUi074339@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rgrimes set sender to rgrimes@FreeBSD.org using -f From: "Rodney W. Grimes" Date: Sun, 5 Mar 2017 05:02:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314694 - head/share/examples/bhyve X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 05:02:15 -0000 Author: rgrimes Date: Sun Mar 5 05:02:13 2017 New Revision: 314694 URL: https://svnweb.freebsd.org/changeset/base/314694 Log: Make vmrun.sh passthrough -u and -w to bhybe PR: 214273 Submitted by: Martin Birgmeier Approved by: grehan MFC after: 1 week Modified: head/share/examples/bhyve/vmrun.sh Modified: head/share/examples/bhyve/vmrun.sh ============================================================================== --- head/share/examples/bhyve/vmrun.sh Sun Mar 5 04:09:18 2017 (r314693) +++ head/share/examples/bhyve/vmrun.sh Sun Mar 5 05:02:13 2017 (r314694) @@ -65,6 +65,8 @@ usage() { echo " -m: memory size (default is ${DEFAULT_MEMSIZE})" echo " -p: pass-through a host PCI device at bus/slot/func (e.g. 10/0/0)" echo " -t: tap device for virtio-net (default is $DEFAULT_TAPDEV)" + echo " -u: RTC keeps UTC time" + echo " -w: ignore unimplemented MSRs" echo "" [ -n "$msg" ] && errmsg "$msg" exit 1 @@ -93,7 +95,7 @@ loader_opt="" bhyverun_opt="-H -A -P" pass_total=0 -while getopts ac:C:d:e:g:hH:iI:l:m:p:t: c ; do +while getopts ac:C:d:e:g:hH:iI:l:m:p:t:uw c ; do case $c in a) bhyverun_opt="${bhyverun_opt} -a" @@ -140,6 +142,12 @@ while getopts ac:C:d:e:g:hH:iI:l:m:p:t: eval "tap_dev${tap_total}=\"${OPTARG}\"" tap_total=$(($tap_total + 1)) ;; + u) + bhyverun_opt="${bhyverun_opt} -u" + ;; + w) + bhyverun_opt="${bhyverun_opt} -w" + ;; *) usage ;; From owner-svn-src-head@freebsd.org Sun Mar 5 07:13:30 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 75397CFA292; Sun, 5 Mar 2017 07:13:30 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FCB51286; Sun, 5 Mar 2017 07:13:30 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v257DT6W028604; Sun, 5 Mar 2017 07:13:29 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v257DT3s028601; Sun, 5 Mar 2017 07:13:29 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201703050713.v257DT3s028601@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Sun, 5 Mar 2017 07:13:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314699 - in head/sys: dev/extres/clk kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 07:13:30 -0000 Author: manu Date: Sun Mar 5 07:13:29 2017 New Revision: 314699 URL: https://svnweb.freebsd.org/changeset/base/314699 Log: Export a sysctl dev...clocks for each clock domain containing all the clocks that they provide. Each clocks are exported under the node 'clock.' and have the following children nodes : - frequency - parent (The selected parent, if any) - parents (The list of parents, if any) - childrens (The list of childrens, if any) - enable_cnt (The enabled counter) This give us the possibility to examine clocks at runtime and make graph of the clock flow. Reviewed by: mmel MFC after: 2 month Differential Revision: https://reviews.freebsd.org/D9833 Modified: head/sys/dev/extres/clk/clk.c head/sys/kern/kern_mib.c head/sys/sys/sysctl.h Modified: head/sys/dev/extres/clk/clk.c ============================================================================== --- head/sys/dev/extres/clk/clk.c Sun Mar 5 05:17:36 2017 (r314698) +++ head/sys/dev/extres/clk/clk.c Sun Mar 5 07:13:29 2017 (r314699) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -118,6 +119,8 @@ struct clknode { /* Cached values. */ uint64_t freq; /* Actual frequency */ + + struct sysctl_ctx_list sysctl_ctx; }; /* @@ -175,6 +178,15 @@ SX_SYSINIT(clock_topology, &clk_topo_loc static void clknode_adjust_parent(struct clknode *clknode, int idx); +enum clknode_sysctl_type { + CLKNODE_SYSCTL_PARENT, + CLKNODE_SYSCTL_PARENTS_LIST, + CLKNODE_SYSCTL_CHILDREN_LIST, +}; + +static int clknode_sysctl(SYSCTL_HANDLER_ARGS); +static int clkdom_sysctl(SYSCTL_HANDLER_ARGS); + /* * Default clock methods for base class. */ @@ -382,6 +394,14 @@ clkdom_create(device_t dev) clkdom->ofw_mapper = clknode_default_ofw_map; #endif + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), + OID_AUTO, "clocks", + CTLTYPE_STRING | CTLFLAG_RD, + clkdom, 0, clkdom_sysctl, + "A", + "Clock list for the domain"); + return (clkdom); } @@ -503,6 +523,7 @@ clknode_create(struct clkdom * clkdom, c const struct clknode_init_def *def) { struct clknode *clknode; + struct sysctl_oid *clknode_oid; KASSERT(def->name != NULL, ("clock name is NULL")); KASSERT(def->name[0] != '\0', ("clock name is empty")); @@ -547,6 +568,42 @@ clknode_create(struct clkdom * clkdom, c clknode->parent_idx = CLKNODE_IDX_NONE; TAILQ_INIT(&clknode->children); + sysctl_ctx_init(&clknode->sysctl_ctx); + clknode_oid = SYSCTL_ADD_NODE(&clknode->sysctl_ctx, + SYSCTL_STATIC_CHILDREN(_clock), + OID_AUTO, clknode->name, + CTLFLAG_RD, 0, "A clock node"); + + SYSCTL_ADD_U64(&clknode->sysctl_ctx, + SYSCTL_CHILDREN(clknode_oid), + OID_AUTO, "frequency", + CTLFLAG_RD, &clknode->freq, 0, "The clock frequency"); + SYSCTL_ADD_PROC(&clknode->sysctl_ctx, + SYSCTL_CHILDREN(clknode_oid), + OID_AUTO, "parent", + CTLTYPE_STRING | CTLFLAG_RD, + clknode, CLKNODE_SYSCTL_PARENT, clknode_sysctl, + "A", + "The clock parent"); + SYSCTL_ADD_PROC(&clknode->sysctl_ctx, + SYSCTL_CHILDREN(clknode_oid), + OID_AUTO, "parents", + CTLTYPE_STRING | CTLFLAG_RD, + clknode, CLKNODE_SYSCTL_PARENTS_LIST, clknode_sysctl, + "A", + "The clock parents list"); + SYSCTL_ADD_PROC(&clknode->sysctl_ctx, + SYSCTL_CHILDREN(clknode_oid), + OID_AUTO, "childrens", + CTLTYPE_STRING | CTLFLAG_RD, + clknode, CLKNODE_SYSCTL_CHILDREN_LIST, clknode_sysctl, + "A", + "The clock childrens list"); + SYSCTL_ADD_INT(&clknode->sysctl_ctx, + SYSCTL_CHILDREN(clknode_oid), + OID_AUTO, "enable_cnt", + CTLFLAG_RD, &clknode->enable_cnt, 0, "The clock enable counter"); + return (clknode); } @@ -1385,3 +1442,64 @@ clk_parse_ofw_clk_name(device_t dev, pha return (0); } #endif + +static int +clkdom_sysctl(SYSCTL_HANDLER_ARGS) +{ + struct clkdom *clkdom = arg1; + struct clknode *clknode; + struct sbuf *sb; + int ret; + + sb = sbuf_new_for_sysctl(NULL, NULL, 4096, req); + if (sb == NULL) + return (ENOMEM); + + CLK_TOPO_SLOCK(); + TAILQ_FOREACH(clknode, &clkdom->clknode_list, clkdom_link) { + sbuf_printf(sb, "%s ", clknode->name); + } + CLK_TOPO_UNLOCK(); + + ret = sbuf_finish(sb); + sbuf_delete(sb); + return (ret); +} + +static int +clknode_sysctl(SYSCTL_HANDLER_ARGS) +{ + struct clknode *clknode, *children; + enum clknode_sysctl_type type = arg2; + struct sbuf *sb; + const char **parent_names; + int ret, i; + + clknode = arg1; + sb = sbuf_new_for_sysctl(NULL, NULL, 512, req); + if (sb == NULL) + return (ENOMEM); + + CLK_TOPO_SLOCK(); + switch (type) { + case CLKNODE_SYSCTL_PARENT: + if (clknode->parent) + sbuf_printf(sb, "%s", clknode->parent->name); + break; + case CLKNODE_SYSCTL_PARENTS_LIST: + parent_names = clknode_get_parent_names(clknode); + for (i = 0; i < clknode->parent_cnt; i++) + sbuf_printf(sb, "%s ", parent_names[i]); + break; + case CLKNODE_SYSCTL_CHILDREN_LIST: + TAILQ_FOREACH(children, &(clknode->children), sibling_link) { + sbuf_printf(sb, "%s ", children->name); + } + break; + } + CLK_TOPO_UNLOCK(); + + ret = sbuf_finish(sb); + sbuf_delete(sb); + return (ret); +} Modified: head/sys/kern/kern_mib.c ============================================================================== --- head/sys/kern/kern_mib.c Sun Mar 5 05:17:36 2017 (r314698) +++ head/sys/kern/kern_mib.c Sun Mar 5 07:13:29 2017 (r314699) @@ -88,6 +88,11 @@ SYSCTL_ROOT_NODE(OID_AUTO, regression, C "Regression test MIB"); #endif +#ifdef EXT_RESOURCES +SYSCTL_ROOT_NODE(OID_AUTO, clock, CTLFLAG_RW, 0, + "Clocks"); +#endif + SYSCTL_STRING(_kern, OID_AUTO, ident, CTLFLAG_RD|CTLFLAG_MPSAFE, kern_ident, 0, "Kernel identifier"); Modified: head/sys/sys/sysctl.h ============================================================================== --- head/sys/sys/sysctl.h Sun Mar 5 05:17:36 2017 (r314698) +++ head/sys/sys/sysctl.h Sun Mar 5 07:13:29 2017 (r314699) @@ -1004,6 +1004,9 @@ SYSCTL_DECL(_compat); SYSCTL_DECL(_regression); SYSCTL_DECL(_security); SYSCTL_DECL(_security_bsd); +#ifdef EXT_RESOURCES +SYSCTL_DECL(_clock); +#endif extern char machine[]; extern char osrelease[]; From owner-svn-src-head@freebsd.org Sun Mar 5 07:46:50 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4D85CCFA7A4; Sun, 5 Mar 2017 07:46:50 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EB4561F07; Sun, 5 Mar 2017 07:46:49 +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 v257knI3040682; Sun, 5 Mar 2017 07:46:49 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v257knU2040681; Sun, 5 Mar 2017 07:46:49 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703050746.v257knU2040681@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Sun, 5 Mar 2017 07:46:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314700 - head/sys/x86/x86 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 07:46:50 -0000 Author: avg Date: Sun Mar 5 07:46:48 2017 New Revision: 314700 URL: https://svnweb.freebsd.org/changeset/base/314700 Log: mca: fix up couple of issues introduced with amd thresholding in r314636 1. There a was a typo in one place where the processor family is checked (16 vs 0x16). Now the checks are consolidated in a single function. 2. Instead of an array of struct amd_et_state objects the code allocated an array of pointers. That was no problem on amd64 where the sizes are the same, but could be a problem on i386. Reported by: tuexen and others Tested by: tuexen (earlier version of the fix) Pointyhat to: avg MFC after: 5 days X-MFC with: r314636 Modified: head/sys/x86/x86/mca.c Modified: head/sys/x86/x86/mca.c ============================================================================== --- head/sys/x86/x86/mca.c Sun Mar 5 07:13:29 2017 (r314699) +++ head/sys/x86/x86/mca.c Sun Mar 5 07:46:48 2017 (r314700) @@ -128,6 +128,13 @@ static struct amd_et_state *amd_et_state static int cmc_throttle = 60; /* Time in seconds to throttle CMCI. */ static int amd_elvt = -1; + +static inline bool +amd_thresholding_supported(void) +{ + return (cpu_vendor_id == CPU_VENDOR_AMD && + CPUID_TO_FAMILY(cpu_id) >= 0x10 && CPUID_TO_FAMILY(cpu_id) <= 0x16); +} #endif static int @@ -809,7 +816,7 @@ static void amd_thresholding_setup(void) { - amd_et_state = malloc((mp_maxid + 1) * sizeof(struct amd_et_state *), + amd_et_state = malloc((mp_maxid + 1) * sizeof(struct amd_et_state), M_MCA, M_WAITOK | M_ZERO); SYSCTL_ADD_PROC(NULL, SYSCTL_STATIC_CHILDREN(_hw_mca), OID_AUTO, "cmc_throttle", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, @@ -854,8 +861,7 @@ mca_setup(uint64_t mcg_cap) #ifdef DEV_APIC if (mcg_cap & MCG_CAP_CMCI_P) cmci_setup(); - else if (cpu_vendor_id == CPU_VENDOR_AMD && - CPUID_TO_FAMILY(cpu_id) >= 0x10 && CPUID_TO_FAMILY(cpu_id) <= 16) + else if (amd_thresholding_supported()) amd_thresholding_setup(); #endif } @@ -1095,9 +1101,7 @@ _mca_init(int boot) * At the moment only the DRAM Error Threshold Group is * supported. */ - if (cpu_vendor_id == CPU_VENDOR_AMD && - CPUID_TO_FAMILY(cpu_id) >= 0x10 && - CPUID_TO_FAMILY(cpu_id) <= 0x16 && + if (amd_thresholding_supported() && (mcg_cap & MCG_CAP_COUNT) >= 4) { if (boot) amd_thresholding_init(); From owner-svn-src-head@freebsd.org Sun Mar 5 10:15:18 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A0B13CF9BD3; Sun, 5 Mar 2017 10:15:18 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 80FDC12E9; Sun, 5 Mar 2017 10:15:18 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by freefall.freebsd.org (Postfix, from userid 1235) id D2C46301B; Sun, 5 Mar 2017 10:15:17 +0000 (UTC) Date: Sun, 5 Mar 2017 11:15:17 +0100 From: Baptiste Daroussin To: "Rodney W. Grimes" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314693 - head/usr.sbin/rmt Message-ID: <20170305101517.abhgspc47mrdbdwb@ivaldir.net> References: <201703050409.v2549IwK048766@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="cz4gnhkzd6qmtyk7" Content-Disposition: inline In-Reply-To: <201703050409.v2549IwK048766@repo.freebsd.org> User-Agent: NeoMutt/20170225 (1.8.0) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 10:15:18 -0000 --cz4gnhkzd6qmtyk7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Mar 05, 2017 at 04:09:18AM +0000, Rodney W. Grimes wrote: > Author: rgrimes > Date: Sun Mar 5 04:09:18 2017 > New Revision: 314693 > URL: https://svnweb.freebsd.org/changeset/base/314693 >=20 > Log: > Change /etc/rmt symlink from absolute to relative path, > correcting the mistake made in r6499 > =20 > Approved by: grehan > MFC after: 1 week >=20 > Modified: > head/usr.sbin/rmt/Makefile >=20 > Modified: head/usr.sbin/rmt/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/usr.sbin/rmt/Makefile Sun Mar 5 04:02:47 2017 (r314692) > +++ head/usr.sbin/rmt/Makefile Sun Mar 5 04:09:18 2017 (r314693) > @@ -7,6 +7,6 @@ MAN=3D rmt.8 > # called from /usr/src/etc/Makefile > etc-rmt: > rm -f ${DESTDIR}/etc/rmt > - ln -s ${BINDIR}/rmt ${DESTDIR}/etc/rmt > + ln -s ..${BINDIR}/rmt ${DESTDIR}/etc/rmt I think this should be ${INSTALL_RSYMLINK} ${BINDIR}/rmt ${DESTDIR}/etc/rmt The rm -f before can then be removed, the symlink will be relative and the METALOG will be respected=20 Best regards, Bapt --cz4gnhkzd6qmtyk7 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAli75TMACgkQY4mL3PG3 PlpthA//cSvBLkecIA1zXbBUam+mWJcHzzlosaSkrfbzIE7DaEwMh1IbbZp4q2vW SoCux2DDySi1zoBioXg2bYCviSM9KFldC5BYslDlJGhK0V9ykpVKjt2IlVLBFpng GLdlNjtKrNRFdvAHvqn/UNlWNgKln0DB8bUgPfZS/NlbMEnx/NFBVraV6e2DbZmY nnDe/zeR/iC4ga9mJmXMgJ1NDbXOHX49oTTkC8OQx/unJ1CCsesbrZEBHz0Figys XnHMjC2lFi+n8GysanTqJz5wzSip3wOxdWG8q+yOCvAfa2PB56ur71jiMRUzBLGn tSIDBUK1W3ffy+tqPhyIKp62KpLcI+f6Cbd3i1trO5ZFz7PFMy+KPkcEva1KrCJS N05Cq/ECKEQs9apn86HV6sOO+pHFp9K8w4PmkIfQspIFZxTnJhnhFg6g8ORaVN43 LQMkzr222vFboZJ7U4vYLDvJlDhyl28x53vO9KMd9z+RLhP+18ZKu2b8YOg/tIXM aBS1asLYztf/QP1Nsa8iO5GIS+vz1h79w5+wYe1puMQUOEPDOKoOxt2tvsm6TrrA 9+WbeVIyc9v1RDPwTkd4WzpIcN9463gQXlrbEYJm2VjTW1nDukfpCS8+sCdIkUr5 yY2FcS8QmIUwOI7rNByvF7HEgSJHKBCFyHBsnVXycvxGEJFBCLk= =vtsa -----END PGP SIGNATURE----- --cz4gnhkzd6qmtyk7-- From owner-svn-src-head@freebsd.org Sun Mar 5 12:06:47 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3248ECFA938; Sun, 5 Mar 2017 12:06:47 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F34CA137A; Sun, 5 Mar 2017 12:06:46 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v25C6kWb047950; Sun, 5 Mar 2017 12:06:46 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v25C6kU7047949; Sun, 5 Mar 2017 12:06:46 GMT (envelope-from des@FreeBSD.org) Message-Id: <201703051206.v25C6kU7047949@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Sun, 5 Mar 2017 12:06:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314701 - head/lib/libfetch X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 12:06:47 -0000 Author: des Date: Sun Mar 5 12:06:45 2017 New Revision: 314701 URL: https://svnweb.freebsd.org/changeset/base/314701 Log: Fix partial requests (used by fetch -r) when the requested file is already complete. Since 416 is an error code, any Content-Range header in the response would refer to the error message, not the requested document, so relying on the value of size when we know we got a 416 is wrong. Instead, just verify that offset == 0 and assume that we've reached the end of the document (if offset > 0, we did not request a range, and the server is screwing with us). Note that we cannot distinguish between reaching the end and going past it, but that is a flaw in the protocol, not in the code, so we just have to assume that the caller knows what it's doing. A smart caller would request an offset slightly before what it believes is the end and compare the result to what is already in the file. PR: 212065 Reported by: mandree MFC after: 3 weeks Modified: head/lib/libfetch/http.c Modified: head/lib/libfetch/http.c ============================================================================== --- head/lib/libfetch/http.c Sun Mar 5 07:46:48 2017 (r314700) +++ head/lib/libfetch/http.c Sun Mar 5 12:06:45 2017 (r314701) @@ -1925,7 +1925,7 @@ http_request_body(struct url *URL, const /* requested range not satisfiable */ if (conn->err == HTTP_BAD_RANGE) { - if (url->offset == size && url->length == 0) { + if (url->offset > 0 && url->length == 0) { /* asked for 0 bytes; fake it */ offset = url->offset; clength = -1; From owner-svn-src-head@freebsd.org Sun Mar 5 13:19:31 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DC337CF9103; Sun, 5 Mar 2017 13:19:31 +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 222C316DC; Sun, 5 Mar 2017 13:19:31 +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 v25DJSkt082917; Sun, 5 Mar 2017 05:19:29 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v25DJSGt082916; Sun, 5 Mar 2017 05:19:28 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201703051319.v25DJSGt082916@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314693 - head/usr.sbin/rmt In-Reply-To: <20170305101517.abhgspc47mrdbdwb@ivaldir.net> To: Baptiste Daroussin Date: Sun, 5 Mar 2017 05:19:28 -0800 (PST) CC: "Rodney W. Grimes" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 13:19:32 -0000 -- Start of PGP signed section. > On Sun, Mar 05, 2017 at 04:09:18AM +0000, Rodney W. Grimes wrote: > > Author: rgrimes > > Date: Sun Mar 5 04:09:18 2017 > > New Revision: 314693 > > URL: https://svnweb.freebsd.org/changeset/base/314693 > > > > Log: > > Change /etc/rmt symlink from absolute to relative path, > > correcting the mistake made in r6499 > > > > Approved by: grehan > > MFC after: 1 week > > > > Modified: > > head/usr.sbin/rmt/Makefile > > > > Modified: head/usr.sbin/rmt/Makefile > > ============================================================================== > > --- head/usr.sbin/rmt/Makefile Sun Mar 5 04:02:47 2017 (r314692) > > +++ head/usr.sbin/rmt/Makefile Sun Mar 5 04:09:18 2017 (r314693) > > @@ -7,6 +7,6 @@ MAN= rmt.8 > > # called from /usr/src/etc/Makefile > > etc-rmt: > > rm -f ${DESTDIR}/etc/rmt > > - ln -s ${BINDIR}/rmt ${DESTDIR}/etc/rmt > > + ln -s ..${BINDIR}/rmt ${DESTDIR}/etc/rmt > > I think this should be ${INSTALL_RSYMLINK} ${BINDIR}/rmt ${DESTDIR}/etc/rmt find /usr/src | xargs grep INSTALL_RSYM (no results) Sorry, no prior work does this, perhaps once I get done sweeping the absolutes out of the tree (about 10 or 15 IIRC) a pass can be made to sweep all ln -s out and propage this internal bsd.lib.mk function out to the rest of the source tree? find /usr/share/mk/ | xargs grep INSTALL_RSYM /usr/share/mk/bsd.own.mk:INSTALL_RSYMLINK?= ${INSTALL} ${RSYMLINK} /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ This is called from within bsd.lib.mk only, do we want to use this for all symbolics links in the source tree? If so I would of though the person adding this functionality to the .mk files would of made a tree sweeping looking for that and making those changes as well. > The rm -f before can then be removed, the symlink will be relative and the > METALOG will be respected METALOG? The only documentation I can find on this seems to be part of src/tootls/tools/makeroot.8. It appears that something in Makefile.inc uses it and there are references to it in etc/Makefile. Where is this METALOG documented? > Best regards, > Bapt -- End of PGP section, PGP failed! -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Sun Mar 5 13:36:39 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 861C3CF962F; Sun, 5 Mar 2017 13:36:39 +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 3EC1F10E5; Sun, 5 Mar 2017 13:36: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 v25DabCu083004; Sun, 5 Mar 2017 05:36:37 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v25DabUu083003; Sun, 5 Mar 2017 05:36:37 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201703051336.v25DabUu083003@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314693 - head/usr.sbin/rmt In-Reply-To: <201703051319.v25DJSGt082916@pdx.rh.CN85.dnsmgr.net> To: rgrimes@freebsd.org Date: Sun, 5 Mar 2017 05:36:37 -0800 (PST) CC: Baptiste Daroussin , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 13:36:39 -0000 > -- Start of PGP signed section. > > On Sun, Mar 05, 2017 at 04:09:18AM +0000, Rodney W. Grimes wrote: > > > Author: rgrimes > > > Date: Sun Mar 5 04:09:18 2017 > > > New Revision: 314693 > > > URL: https://svnweb.freebsd.org/changeset/base/314693 > > > > > > Log: > > > Change /etc/rmt symlink from absolute to relative path, > > > correcting the mistake made in r6499 > > > > > > Approved by: grehan > > > MFC after: 1 week > > > > > > Modified: > > > head/usr.sbin/rmt/Makefile > > > > > > Modified: head/usr.sbin/rmt/Makefile > > > ============================================================================== > > > --- head/usr.sbin/rmt/Makefile Sun Mar 5 04:02:47 2017 (r314692) > > > +++ head/usr.sbin/rmt/Makefile Sun Mar 5 04:09:18 2017 (r314693) > > > @@ -7,6 +7,6 @@ MAN= rmt.8 > > > # called from /usr/src/etc/Makefile > > > etc-rmt: > > > rm -f ${DESTDIR}/etc/rmt > > > - ln -s ${BINDIR}/rmt ${DESTDIR}/etc/rmt > > > + ln -s ..${BINDIR}/rmt ${DESTDIR}/etc/rmt > > > > I think this should be ${INSTALL_RSYMLINK} ${BINDIR}/rmt ${DESTDIR}/etc/rmt > > find /usr/src | xargs grep INSTALL_RSYM > (no results) Error in actual command here, that was actually find /usr/src -name Makefile | xargs grep INSTALL_RSYM > > Sorry, no prior work does this, perhaps once I get done sweeping the > absolutes out of the tree (about 10 or 15 IIRC) a pass can be made to > sweep all ln -s out and propage this internal bsd.lib.mk function out > to the rest of the source tree? > > find /usr/share/mk/ | xargs grep INSTALL_RSYM > /usr/share/mk/bsd.own.mk:INSTALL_RSYMLINK?= ${INSTALL} ${RSYMLINK} > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ > > This is called from within bsd.lib.mk only, do we want to use this for > all symbolics links in the source tree? If so I would of though the > person adding this functionality to the .mk files would of made > a tree sweeping looking for that and making those changes as well. > > > The rm -f before can then be removed, the symlink will be relative and the > > METALOG will be respected > > METALOG? The only documentation I can find on this seems to be part of > src/tootls/tools/makeroot.8. > > It appears that something in Makefile.inc uses it and there are references > to it in etc/Makefile. > > Where is this METALOG documented? > > > Best regards, > > Bapt > -- End of PGP section, PGP failed! > > -- > Rod Grimes rgrimes@freebsd.org > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Sun Mar 5 13:42:27 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 824EBCF9994; Sun, 5 Mar 2017 13:42:27 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 623C41696; Sun, 5 Mar 2017 13:42:27 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1235) id B40CC5430; Sun, 5 Mar 2017 13:42:26 +0000 (UTC) Date: Sun, 5 Mar 2017 14:42:26 +0100 From: Baptiste Daroussin To: rgrimes@freebsd.org Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314693 - head/usr.sbin/rmt Message-ID: <20170305134226.px4ivdtjjppbgiyf@ivaldir.net> References: <20170305101517.abhgspc47mrdbdwb@ivaldir.net> <201703051319.v25DJSGt082916@pdx.rh.CN85.dnsmgr.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="rtnlwvdgxtcumpss" Content-Disposition: inline In-Reply-To: <201703051319.v25DJSGt082916@pdx.rh.CN85.dnsmgr.net> User-Agent: NeoMutt/20170225 (1.8.0) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 13:42:27 -0000 --rtnlwvdgxtcumpss Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Mar 05, 2017 at 05:19:28AM -0800, Rodney W. Grimes wrote: > -- Start of PGP signed section. > > On Sun, Mar 05, 2017 at 04:09:18AM +0000, Rodney W. Grimes wrote: > > > Author: rgrimes > > > Date: Sun Mar 5 04:09:18 2017 > > > New Revision: 314693 > > > URL: https://svnweb.freebsd.org/changeset/base/314693 > > >=20 > > > Log: > > > Change /etc/rmt symlink from absolute to relative path, > > > correcting the mistake made in r6499 > > > =20 > > > Approved by: grehan > > > MFC after: 1 week > > >=20 > > > Modified: > > > head/usr.sbin/rmt/Makefile > > >=20 > > > Modified: head/usr.sbin/rmt/Makefile > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > > --- head/usr.sbin/rmt/Makefile Sun Mar 5 04:02:47 2017 (r314692) > > > +++ head/usr.sbin/rmt/Makefile Sun Mar 5 04:09:18 2017 (r314693) > > > @@ -7,6 +7,6 @@ MAN=3D rmt.8 > > > # called from /usr/src/etc/Makefile > > > etc-rmt: > > > rm -f ${DESTDIR}/etc/rmt > > > - ln -s ${BINDIR}/rmt ${DESTDIR}/etc/rmt > > > + ln -s ..${BINDIR}/rmt ${DESTDIR}/etc/rmt > >=20 > > I think this should be ${INSTALL_RSYMLINK} ${BINDIR}/rmt ${DESTDIR}/etc= /rmt >=20 > find /usr/src | xargs grep INSTALL_RSYM > (no results) >=20 > Sorry, no prior work does this, perhaps once I get done sweeping the > absolutes out of the tree (about 10 or 15 IIRC) a pass can be made to > sweep all ln -s out and propage this internal bsd.lib.mk function out > to the rest of the source tree? There is also no Makefiles that do ls -sf directly beside that one. INSTALL_RSYMLINK has exactly be done to be use everywhere it is needed. (I = wrote it for that exact reason :)) >=20 > find /usr/share/mk/ | xargs grep INSTALL_RSYM > /usr/share/mk/bsd.own.mk:INSTALL_RSYMLINK?=3D ${INSTALL} ${RSYMLINK} > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARG= S},development} ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR= }${_SHLIBDIR}/${SHLIB_NAME} \ > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARG= S},development} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR= }${_SHLIBDIR}/${SHLIB_NAME} \ >=20 > This is called from within bsd.lib.mk only, do we want to use this for > all symbolics links in the source tree? If so I would of though the > person adding this functionality to the .mk files would of made > a tree sweeping looking for that and making those changes as well. When I did it only bsd.lib.mk was using it iirc >=20 > > The rm -f before can then be removed, the symlink will be relative and = the > > METALOG will be respected=20 >=20 > METALOG? The only documentation I can find on this seems to be part of > src/tootls/tools/makeroot.8. >=20 > It appears that something in Makefile.inc uses it and there are references > to it in etc/Makefile. >=20 > Where is this METALOG documented? =20 It is really badly documented and should be :( it is a mtree file that is generated when built is done via -DNO_ROOT for the purpose of being able to generate disk with makefs as a user I have reused it for packaging base. This was designed IIRC by adrian and brooks iirc. Embedded people relies a lot on it. Everything not going though the install(1) command is not tracked that is w= hy this is an issue. Best regards, Bapt --rtnlwvdgxtcumpss Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAli8Fb4ACgkQY4mL3PG3 PlovAg/+INkPWSrdYXoGOdJYa656PoAyL0B8KCGQXIzG6HUFbu9DDcBAsNT9DhQ6 0m5vOY1YrUbCwYpp1Sm2XYyC4viugSjxYRqTGH+pQwXysnT0pdcm/zjIsW3/M15R mKMPgGWjX2ZBv6m60JBgqXGxT9J3/E6dRfCn3xKUMN8cvgs51ZkFW1drJlZkH5OD ZXepw2792z3XqJ+dlIlfzSDUDEYbrawwY75gjLPersNactnvYMZVwcAoB9EvRLiA UIk04piNT1hLwz+yaXBERTSAYXSJvlIm5wX7c1lTJsiYzKNR1AzwH/eUZT9FwqWT WJfICUih07AvKuvDyal3NcCJzesM2kUOeGMMBmR2odY2UrdjERklKT3B28EmeLNk OhrkLQGmBI7/tWQQDsGsaXeGxnqR6T+2D3dKmqKX4XgwozCa9Hyor1sZe+NSRJkc aTii6o8RjMKBXPqHyrZ/BJMenabjIxjYrxstPG13ICqBy3S+j+oSa1Cp0fApEpQ6 ZFxC7tqduC0txlZpJYppuNuU+807nq2ejvNxKhVGUIHmtvmS95ZWrV1USjOf6Hf1 WKA9J0Fc/Je+rodWXe94o1mZUTD4kkTsS+mrBAVfd5bDmHjxXuMn/Zt8YvXygQrT Z/XnqVyms7elH4Rf1NpO0e82itLNqcgS7OxB8rAXasEbvONegcg= =thav -----END PGP SIGNATURE----- --rtnlwvdgxtcumpss-- From owner-svn-src-head@freebsd.org Sun Mar 5 14:40:57 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 15B8BCFA965; Sun, 5 Mar 2017 14:40:57 +0000 (UTC) (envelope-from jilles@stack.nl) Received: from mailout.stack.nl (mailout05.stack.nl [IPv6:2001:610:1108:5010::202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mailout.stack.nl", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id BAA291516; Sun, 5 Mar 2017 14:40:56 +0000 (UTC) (envelope-from jilles@stack.nl) Received: from snail.stack.nl (snail.stack.nl [IPv6:2001:610:1108:5010::131]) by mailout.stack.nl (Postfix) with ESMTP id A707536; Sun, 5 Mar 2017 15:40:45 +0100 (CET) Received: by snail.stack.nl (Postfix, from userid 1677) id 941A528497; Sun, 5 Mar 2017 15:40:45 +0100 (CET) Date: Sun, 5 Mar 2017 15:40:45 +0100 From: Jilles Tjoelker To: Bruce Evans Cc: Konstantin Belousov , John Baldwin , Pedro Giffuni , Slawa Olhovchenkov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314669 - head/sys/i386/conf Message-ID: <20170305144045.GA15347@stack.nl> References: <201703041504.v24F4HMh023937@repo.freebsd.org> <20170304211611.GW2092@kib.kiev.ua> <1951800.W2d2k3eamI@ralph.baldwin.cx> <20170304231822.GA30979@kib.kiev.ua> <20170305111842.K1472@besplex.bde.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170305111842.K1472@besplex.bde.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 14:40:57 -0000 On Sun, Mar 05, 2017 at 11:35:26AM +1100, Bruce Evans wrote: > On Sun, 5 Mar 2017, Konstantin Belousov wrote: > > On Sat, Mar 04, 2017 at 02:54:56PM -0800, John Baldwin wrote: > >> On Saturday, March 04, 2017 11:16:11 PM Konstantin Belousov wrote: > >>> On Sat, Mar 04, 2017 at 03:49:52PM -0500, Pedro Giffuni wrote: > >>>> The number came out from an old posting involving buildworld times, which I can???t find now :(. > >>>> Things seem to have changed a lot: it was surely using GCC back then, I don???t believe clang does much distinction about 486 at all. > >>>> > >>>> BTW, does it make sense to keep i586 in the configuration still? Both i486 and i586 were once removed but later re-instated in r205336. > >>>> > >>> What did make significant impact on 32bit shared libraries some time ago > >>> was to compile them with -mtune=i686. Default PIC prologue effectively > >>> neutered return stack predictor, adding uneccessary overhead to already > >>> expensive PIC code. I think that this is even measureable, i.e. it might > >>> give >= 5% of difference. > I now use -mtune=athlon-xp (and no other -m CFLAGS) to get the same effect > with minor additional optimizations/pessimizations for athlon-xp. I forget > if I switched to this before or after getting jhb to not use > -mtune=pentiumpro. Maybe we didn't know at the time that the pentiumpro > optimizations affected little more than this PIC problem. > >>> I did not rechecked modern compilers WRT the generated PIC code, > >>> but I doubt that the thing changed recently. > >>> Several notes: -mtune is not -march, i.e. the code would be still targeted > >>> for 486 instruction set, but scheduling is optimized for more modern CPUs. > >>> Also, recent gcc puts specific meaning into -mtune=i686, interpreting it > >>> as request for scheduling for generic modern CPUs. We already compile > >>> 32bit compat libs on amd64 with -march=i686. > >>> Working on this stuff would be much more useful than tweaking > >>> kernel config for CPU detection. > >> Hmm, I originally wanted to use -mtune=i686 (spelled as > >> -mcpu=pentiumpro) on i386 builds for this reason, but I removed it > >> at bde@'s request in r125252. I would be happy to go back to adding > >> -mtune for i386 when CPUTYPE isn't specified. > > I just rechecked. > > gcc, at least 4.9 and 6.3, generate 'right' prologue, i.e. > > call __x86.get_pc_thunk.cx (ecx or whatever register > > which is used to address GOT) > > __x86.get_pc_thunk.cx: > > movl (%esp), %ecx > > ret > > even when compiling for -march=i486. > > OTOH, clang 3.9.1 uses > > calll .L0 > > .L0: popl %eax > > to get the base even for native nehalem and newer CPUs. > > So indeed there is no reason to bother. gcc become too good to require any > > tuning, and clang generates unoptimal code even when hinted. I did not > > checked 4.0. > The old method might actually be best for the original i386. It is > 1 byte larger per call, but 1 instruction shorter by dynamic count. > Original i386 has poor instruction fetch bandwidth and no caches and > to help or harm. Even the (%esp) address mode can cost a cycle on > original i386, and setting up a frame pointer to access the stack would > be much worse, while on modern x86 the frame pointer might cost nothing > since it can be done in parallel. > Maybe some newer CPUs have better return address predictors so the old > method is best for them too. > It is only clear that generic optimizations should use the new method, > since CPU manufacturers won't pessimize it since it looks like a normal > function call. I tried a naive benchmark of a million iterations on a CPU: Intel(R) Core(TM) i5-3330 CPU @ 3.00GHz (2993.26-MHz K8-class CPU) Origin="GenuineIntel" Id=0x306a9 Family=0x6 Model=0x3a Stepping=9 and a subroutine containing the old method is almost as fast as an empty subroutine (3.8ns including loop overhead), while a subroutine containing the new method is slower (6.3 ns including loop overhead). Apparently this CPU knows that a call to the next instruction will not be returned to. Likewise, the old method is faster on a hw.model: Intel(R) Xeon(R) CPU X5675 @ 3.07GHz On the other hand, the old method is slower on an old hw.model: Intel(R) Core(TM)2 CPU 6400 @ 2.13GHz Apparently, LLVM has decided to trade considerably worse performance on CPUs such as Core2 for better performance on newer and older CPUs. What is somewhat surprising is that there is no way to use the GCC method. Then again, LLVM does not support bypassing the PLT either (loading the address from the GOT directly). Given that the old method is quite commonly used, it does not seem very likely that CPU manufacturers will pessimize it in future. -- Jilles Tjoelker From owner-svn-src-head@freebsd.org Sun Mar 5 15:11:48 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53356CF92A3; Sun, 5 Mar 2017 15:11:48 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "vps1.elischer.org", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 21D7F1566; Sun, 5 Mar 2017 15:11:47 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from Julian-MBP3.local (106-68-109-205.dyn.iinet.net.au [106.68.109.205]) (authenticated bits=0) by vps1.elischer.org (8.15.2/8.15.2) with ESMTPSA id v25FBf6X043253 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sun, 5 Mar 2017 07:11:44 -0800 (PST) (envelope-from julian@freebsd.org) Subject: Re: svn commit: r314693 - head/usr.sbin/rmt To: rgrimes@freebsd.org, Baptiste Daroussin References: <201703051319.v25DJSGt082916@pdx.rh.CN85.dnsmgr.net> Cc: svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Julian Elischer Message-ID: <761e6ecf-89aa-6356-4650-08f3c5c9d6a8@freebsd.org> Date: Sun, 5 Mar 2017 23:11:35 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <201703051319.v25DJSGt082916@pdx.rh.CN85.dnsmgr.net> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 15:11:48 -0000 On 5/3/17 9:19 pm, Rodney W. Grimes wrote: > -- Start of PGP signed section. >> On Sun, Mar 05, 2017 at 04:09:18AM +0000, Rodney W. Grimes wrote: >>> Author: rgrimes >>> Date: Sun Mar 5 04:09:18 2017 >>> New Revision: 314693 >>> URL: https://svnweb.freebsd.org/changeset/base/314693 >>> >>> Log: >>> Change /etc/rmt symlink from absolute to relative path, >>> correcting the mistake made in r6499 >>> >>> Approved by: grehan >>> MFC after: 1 week >>> >>> Modified: >>> head/usr.sbin/rmt/Makefile >>> >>> Modified: head/usr.sbin/rmt/Makefile >>> ============================================================================== >>> --- head/usr.sbin/rmt/Makefile Sun Mar 5 04:02:47 2017 (r314692) >>> +++ head/usr.sbin/rmt/Makefile Sun Mar 5 04:09:18 2017 (r314693) >>> @@ -7,6 +7,6 @@ MAN= rmt.8 >>> # called from /usr/src/etc/Makefile >>> etc-rmt: >>> rm -f ${DESTDIR}/etc/rmt >>> - ln -s ${BINDIR}/rmt ${DESTDIR}/etc/rmt >>> + ln -s ..${BINDIR}/rmt ${DESTDIR}/etc/rmt >> I think this should be ${INSTALL_RSYMLINK} ${BINDIR}/rmt ${DESTDIR}/etc/rmt > find /usr/src | xargs grep INSTALL_RSYM > (no results) > > Sorry, no prior work does this, perhaps once I get done sweeping the > absolutes out of the tree (about 10 or 15 IIRC) a pass can be made to > sweep all ln -s out and propage this internal bsd.lib.mk function out > to the rest of the source tree? > > find /usr/share/mk/ | xargs grep INSTALL_RSYM > /usr/share/mk/bsd.own.mk:INSTALL_RSYMLINK?= ${INSTALL} ${RSYMLINK} > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ > > This is called from within bsd.lib.mk only, do we want to use this for > all symbolics links in the source tree? If so I would of though the > person adding this functionality to the .mk files would of made > a tree sweeping looking for that and making those changes as well. I've been playing around with libpathconv which converts abs paths to relative paths etc. I'w working on the patch to ln to add the -a and -r options that some other versions have. you can specify an absolute path but ln -r (abspath) will generate a relative link. my target was the exact absolute symlinks that you are targeting. Work commitments have made me lay down tools but this reminds me to pick it up again. (libpathconv is in the tree at /lib/libpathconv, but I got interrupted half way through.. I'll do the other half.. >> The rm -f before can then be removed, the symlink will be relative and the >> METALOG will be respected > METALOG? The only documentation I can find on this seems to be part of > src/tootls/tools/makeroot.8. > > It appears that something in Makefile.inc uses it and there are references > to it in etc/Makefile. > > Where is this METALOG documented? > >> Best regards, >> Bapt > -- End of PGP section, PGP failed! > From owner-svn-src-head@freebsd.org Sun Mar 5 15:20:49 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7DF4DCF95DD; Sun, 5 Mar 2017 15:20:49 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5D98A180A; Sun, 5 Mar 2017 15:20:49 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1235) id AF9CF655D; Sun, 5 Mar 2017 15:20:48 +0000 (UTC) Date: Sun, 5 Mar 2017 16:20:48 +0100 From: Baptiste Daroussin To: Julian Elischer Cc: rgrimes@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314693 - head/usr.sbin/rmt Message-ID: <20170305152048.gyilvy7qscqg45hr@ivaldir.net> References: <201703051319.v25DJSGt082916@pdx.rh.CN85.dnsmgr.net> <761e6ecf-89aa-6356-4650-08f3c5c9d6a8@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="37dy46wovsinn4rj" Content-Disposition: inline In-Reply-To: <761e6ecf-89aa-6356-4650-08f3c5c9d6a8@freebsd.org> User-Agent: NeoMutt/20170225 (1.8.0) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 15:20:49 -0000 --37dy46wovsinn4rj Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Mar 05, 2017 at 11:11:35PM +0800, Julian Elischer wrote: > On 5/3/17 9:19 pm, Rodney W. Grimes wrote: > > -- Start of PGP signed section. > > > On Sun, Mar 05, 2017 at 04:09:18AM +0000, Rodney W. Grimes wrote: > > > > Author: rgrimes > > > > Date: Sun Mar 5 04:09:18 2017 > > > > New Revision: 314693 > > > > URL: https://svnweb.freebsd.org/changeset/base/314693 > > > >=20 > > > > Log: > > > > Change /etc/rmt symlink from absolute to relative path, > > > > correcting the mistake made in r6499 > > > > Approved by: grehan > > > > MFC after: 1 week > > > >=20 > > > > Modified: > > > > head/usr.sbin/rmt/Makefile > > > >=20 > > > > Modified: head/usr.sbin/rmt/Makefile > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D > > > > --- head/usr.sbin/rmt/Makefile Sun Mar 5 04:02:47 2017 (r314692) > > > > +++ head/usr.sbin/rmt/Makefile Sun Mar 5 04:09:18 2017 (r314693) > > > > @@ -7,6 +7,6 @@ MAN=3D rmt.8 > > > > # called from /usr/src/etc/Makefile > > > > etc-rmt: > > > > rm -f ${DESTDIR}/etc/rmt > > > > - ln -s ${BINDIR}/rmt ${DESTDIR}/etc/rmt > > > > + ln -s ..${BINDIR}/rmt ${DESTDIR}/etc/rmt > > > I think this should be ${INSTALL_RSYMLINK} ${BINDIR}/rmt ${DESTDIR}/e= tc/rmt > > find /usr/src | xargs grep INSTALL_RSYM > > (no results) > >=20 > > Sorry, no prior work does this, perhaps once I get done sweeping the > > absolutes out of the tree (about 10 or 15 IIRC) a pass can be made to > > sweep all ln -s out and propage this internal bsd.lib.mk function out > > to the rest of the source tree? > >=20 > > find /usr/share/mk/ | xargs grep INSTALL_RSYM > > /usr/share/mk/bsd.own.mk:INSTALL_RSYMLINK?=3D ${INSTALL} ${RSYMLINK} > > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_A= RGS},development} ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} > > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTD= IR}${_SHLIBDIR}/${SHLIB_NAME} \ > > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_A= RGS},development} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ > > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTD= IR}${_SHLIBDIR}/${SHLIB_NAME} \ > >=20 > > This is called from within bsd.lib.mk only, do we want to use this for > > all symbolics links in the source tree? If so I would of though the > > person adding this functionality to the .mk files would of made > > a tree sweeping looking for that and making those changes as well. >=20 > I've been playing around with libpathconv which converts abs paths to > relative paths etc. > I'w working on the patch to ln to add the -a and -r options that some oth= er > versions have. >=20 > you can specify an absolute path but ln -r (abspath) will generate a > relative link. > my target was the exact absolute symlinks that you are targeting. >=20 > Work commitments have made me lay down tools but this reminds me to pick = it > up again. > (libpathconv is in the tree at /lib/libpathconv, but I got interrupted ha= lf > way through.. > I'll do the other half.. But install -l rs does exactly that, why adding a new mechanism? and install works with metalog as stated earlier so for the build system it might be be= tter. Which reminds me multiple people have asked you if it won't be a good idea = to merge your libpathconv into libutil rather that having a new library for ju= st 2 functions. DSO has a price and you haven't replied, will you consider mergi= ng it? Best regards, Bapt --37dy46wovsinn4rj Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAli8LMwACgkQY4mL3PG3 PlpC+BAAzrjbq9gfY3hD228mnJgMuhJhrmRnJ5usffY1FxkEDD40O+S5aJIUuKEi 8lU5jCW4wI7B34aTQczH1Sd/Q7zOxl88pxBlL6gJlvPcx++mYFD0cPRpiJqWetms MZsQYc1ENT2QxpSUK8NJNAUhJSV0T85ywunF3tcckQu2nFGCnapUjc8pytFa9RCg TNOL1e7PSS2EPW7A2IpKFq9syQ7L7YQ0+seg1RU8t1f5VYJQ1S+eCic/WAwLT56l RmTt0kj75sQ3+B8gxD7yNt3SHBBJFhnI5LGXIbV3h4KdPXs4gnQstOl+dAUbwuvS FNexpssui827iKhRKz/LtaaRXIjIIBVKyQr7eWtAvtpdFUJuDZx5KTUfRQnZe8iq 6qjLog2iSC3Qwd7BrfCbPKCBFRcoV6rk3s9Q9wCi0YHBGGO/7xBeyvXHesT97ZAp BpMG+2sZqEPS/GihOd4+/Rblf2x+n2KR6ZiJrPZYPz1eKGIi9iIWDGcby3++wjxu uVEOQJhC1GlGVuEi4R3Gu13WmcFpHAaBsxjmtlfC5qVtvDcMosaSxfJ5GTF5+y4m TDZKCpe/auBISZQliE16UOB76oDYIJk3I6UTqnX2si9h1zEzRw27EqEX137I3Z84 ItLoGVYfDZZB8/lzXhKUwjWC8Xpban0kdzFA0+BoTpTOjBlPTBo= =8ugM -----END PGP SIGNATURE----- --37dy46wovsinn4rj-- From owner-svn-src-head@freebsd.org Sun Mar 5 15:30:48 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0AE67CF9A5E; Sun, 5 Mar 2017 15:30:48 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "vps1.elischer.org", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D91C1E44; Sun, 5 Mar 2017 15:30:47 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from Julian-MBP3.local (106-68-109-205.dyn.iinet.net.au [106.68.109.205]) (authenticated bits=0) by vps1.elischer.org (8.15.2/8.15.2) with ESMTPSA id v25FUf8B043312 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sun, 5 Mar 2017 07:30:45 -0800 (PST) (envelope-from julian@freebsd.org) Subject: Re: svn commit: r314693 - head/usr.sbin/rmt To: Baptiste Daroussin References: <201703051319.v25DJSGt082916@pdx.rh.CN85.dnsmgr.net> <761e6ecf-89aa-6356-4650-08f3c5c9d6a8@freebsd.org> <20170305152048.gyilvy7qscqg45hr@ivaldir.net> Cc: rgrimes@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Julian Elischer Message-ID: Date: Sun, 5 Mar 2017 23:30:36 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <20170305152048.gyilvy7qscqg45hr@ivaldir.net> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 15:30:48 -0000 On 5/3/17 11:20 pm, Baptiste Daroussin wrote: > On Sun, Mar 05, 2017 at 11:11:35PM +0800, Julian Elischer wrote: >> On 5/3/17 9:19 pm, Rodney W. Grimes wrote: >>> -- Start of PGP signed section. >>>> On Sun, Mar 05, 2017 at 04:09:18AM +0000, Rodney W. Grimes wrote: >>>>> Author: rgrimes >>>>> Date: Sun Mar 5 04:09:18 2017 >>>>> New Revision: 314693 >>>>> URL: https://svnweb.freebsd.org/changeset/base/314693 >>>>> >>>>> Log: >>>>> Change /etc/rmt symlink from absolute to relative path, >>>>> correcting the mistake made in r6499 >>>>> Approved by: grehan >>>>> MFC after: 1 week >>>>> >>>>> Modified: >>>>> head/usr.sbin/rmt/Makefile >>>>> >>>>> Modified: head/usr.sbin/rmt/Makefile >>>>> ============================================================================== >>>>> --- head/usr.sbin/rmt/Makefile Sun Mar 5 04:02:47 2017 (r314692) >>>>> +++ head/usr.sbin/rmt/Makefile Sun Mar 5 04:09:18 2017 (r314693) >>>>> @@ -7,6 +7,6 @@ MAN= rmt.8 >>>>> # called from /usr/src/etc/Makefile >>>>> etc-rmt: >>>>> rm -f ${DESTDIR}/etc/rmt >>>>> - ln -s ${BINDIR}/rmt ${DESTDIR}/etc/rmt >>>>> + ln -s ..${BINDIR}/rmt ${DESTDIR}/etc/rmt >>>> I think this should be ${INSTALL_RSYMLINK} ${BINDIR}/rmt ${DESTDIR}/etc/rmt >>> find /usr/src | xargs grep INSTALL_RSYM >>> (no results) >>> >>> Sorry, no prior work does this, perhaps once I get done sweeping the >>> absolutes out of the tree (about 10 or 15 IIRC) a pass can be made to >>> sweep all ln -s out and propage this internal bsd.lib.mk function out >>> to the rest of the source tree? >>> >>> find /usr/share/mk/ | xargs grep INSTALL_RSYM >>> /usr/share/mk/bsd.own.mk:INSTALL_RSYMLINK?= ${INSTALL} ${RSYMLINK} >>> /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} >>> /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ >>> /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ >>> /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ >>> >>> This is called from within bsd.lib.mk only, do we want to use this for >>> all symbolics links in the source tree? If so I would of though the >>> person adding this functionality to the .mk files would of made >>> a tree sweeping looking for that and making those changes as well. >> I've been playing around with libpathconv which converts abs paths to >> relative paths etc. >> I'w working on the patch to ln to add the -a and -r options that some other >> versions have. >> >> you can specify an absolute path but ln -r (abspath) will generate a >> relative link. >> my target was the exact absolute symlinks that you are targeting. >> >> Work commitments have made me lay down tools but this reminds me to pick it >> up again. >> (libpathconv is in the tree at /lib/libpathconv, but I got interrupted half >> way through.. >> I'll do the other half.. > But install -l rs does exactly that, why adding a new mechanism? and install > works with metalog as stated earlier so for the build system it might be better. > > Which reminds me multiple people have asked you if it won't be a good idea to > merge your libpathconv into libutil rather that having a new library for just 2 > functions. DSO has a price and you haven't replied, will you consider merging > it? > > Best regards, > Bapt I will put it in libutil, but don't want to thrash too much so I'll do that with the ln patch. I hadn't thought that was a possibility originally. I need the ln patch myself and there are other systems that have it so I'm happy to do the work. if install can do that I'm happy to hear it. Nice to learn about it.. Does that mean that libpathconv is already somewhere in our system as install is of the programs that was changed in hte initial pathconv release many years ago. From owner-svn-src-head@freebsd.org Sun Mar 5 15:34:34 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0478FCF9C0A; Sun, 5 Mar 2017 15:34:34 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C5BA61026; Sun, 5 Mar 2017 15:34:33 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v25FYW6u033243; Sun, 5 Mar 2017 15:34:32 GMT (envelope-from mmel@FreeBSD.org) Received: (from mmel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v25FYWUj033242; Sun, 5 Mar 2017 15:34:32 GMT (envelope-from mmel@FreeBSD.org) Message-Id: <201703051534.v25FYWUj033242@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmel set sender to mmel@FreeBSD.org using -f From: Michal Meloun Date: Sun, 5 Mar 2017 15:34:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314703 - head/sys/arm/nvidia X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 15:34:34 -0000 Author: mmel Date: Sun Mar 5 15:34:32 2017 New Revision: 314703 URL: https://svnweb.freebsd.org/changeset/base/314703 Log: Add support for card detect and write protect gpio pins to Tegra SDHCI. Modified: head/sys/arm/nvidia/tegra_sdhci.c Modified: head/sys/arm/nvidia/tegra_sdhci.c ============================================================================== --- head/sys/arm/nvidia/tegra_sdhci.c Sun Mar 5 13:14:18 2017 (r314702) +++ head/sys/arm/nvidia/tegra_sdhci.c Sun Mar 5 15:34:32 2017 (r314703) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -60,6 +61,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include "sdhci_if.h" @@ -107,9 +109,8 @@ struct tegra_sdhci_softc { uint32_t max_clk; /* Max possible freq */ clk_t clk; hwreset_t reset; - gpio_pin_t gpio_cd; - gpio_pin_t gpio_wp; gpio_pin_t gpio_power; + struct sdhci_fdt_gpio *gpio; int force_card_present; struct sdhci_slot slot; @@ -215,10 +216,19 @@ tegra_sdhci_intr(void *arg) } static int -tegra_generic_get_ro(device_t brdev, device_t reqdev) +tegra_sdhci_get_ro(device_t brdev, device_t reqdev) { + struct tegra_sdhci_softc *sc = device_get_softc(brdev); - return (0); + return (sdhci_fdt_gpio_get_readonly(sc->gpio)); +} + +static bool +tegra_sdhci_get_card_present(device_t dev, struct sdhci_slot *slot) +{ + struct tegra_sdhci_softc *sc = device_get_softc(dev); + + return (sdhci_fdt_gpio_get_present(sc->gpio)); } static int @@ -300,9 +310,7 @@ tegra_sdhci_attach(device_t dev) goto fail; } - gpio_pin_get_by_ofw_property(sc->dev, node, "cd-gpios", &sc->gpio_cd); gpio_pin_get_by_ofw_property(sc->dev, node, "power-gpios", &sc->gpio_power); - gpio_pin_get_by_ofw_property(sc->dev, node, "wp-gpios", &sc->gpio_wp); rv = clk_get_by_ofw_index(dev, 0, 0, &sc->clk); if (rv != 0) { @@ -374,6 +382,8 @@ tegra_sdhci_attach(device_t dev) goto fail; } + sc->gpio = sdhci_fdt_gpio_setup(sc->dev, &sc->slot); + bus_generic_probe(dev); bus_generic_attach(dev); @@ -382,18 +392,16 @@ tegra_sdhci_attach(device_t dev) return (0); fail: - if (sc->gpio_cd != NULL) - gpio_pin_release(sc->gpio_cd); - if (sc->gpio_wp != NULL) - gpio_pin_release(sc->gpio_wp); + if (sc->gpio != NULL) + sdhci_fdt_gpio_teardown(sc->gpio); + if (sc->intr_cookie != NULL) + bus_teardown_intr(dev, sc->irq_res, sc->intr_cookie); if (sc->gpio_power != NULL) gpio_pin_release(sc->gpio_power); if (sc->clk != NULL) clk_release(sc->clk); if (sc->reset != NULL) hwreset_release(sc->reset); - if (sc->intr_cookie != NULL) - bus_teardown_intr(dev, sc->irq_res, sc->intr_cookie); if (sc->irq_res != NULL) bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq_res); if (sc->mem_res != NULL) @@ -409,6 +417,7 @@ tegra_sdhci_detach(device_t dev) struct sdhci_slot *slot = &sc->slot; bus_generic_detach(dev); + sdhci_fdt_gpio_teardown(sc->gpio); clk_release(sc->clk); bus_teardown_intr(dev, sc->irq_res, sc->intr_cookie); bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->irq_res), @@ -434,7 +443,7 @@ static device_method_t tegra_sdhci_metho /* MMC bridge interface */ DEVMETHOD(mmcbr_update_ios, sdhci_generic_update_ios), DEVMETHOD(mmcbr_request, sdhci_generic_request), - DEVMETHOD(mmcbr_get_ro, tegra_generic_get_ro), + DEVMETHOD(mmcbr_get_ro, tegra_sdhci_get_ro), DEVMETHOD(mmcbr_acquire_host, sdhci_generic_acquire_host), DEVMETHOD(mmcbr_release_host, sdhci_generic_release_host), @@ -447,6 +456,7 @@ static device_method_t tegra_sdhci_metho DEVMETHOD(sdhci_write_2, tegra_sdhci_write_2), DEVMETHOD(sdhci_write_4, tegra_sdhci_write_4), DEVMETHOD(sdhci_write_multi_4, tegra_sdhci_write_multi_4), + DEVMETHOD(sdhci_get_card_present, tegra_sdhci_get_card_present), DEVMETHOD_END }; From owner-svn-src-head@freebsd.org Sun Mar 5 15:34:51 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B5463CF9C5C; Sun, 5 Mar 2017 15:34:51 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 940EA116F; Sun, 5 Mar 2017 15:34:51 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1235) id D189B6827; Sun, 5 Mar 2017 15:34:48 +0000 (UTC) Date: Sun, 5 Mar 2017 16:34:48 +0100 From: Baptiste Daroussin To: Julian Elischer Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, rgrimes@freebsd.org Subject: Re: svn commit: r314693 - head/usr.sbin/rmt Message-ID: <20170305153448.6trjgu7u3yj6phjm@ivaldir.net> References: <201703051319.v25DJSGt082916@pdx.rh.CN85.dnsmgr.net> <761e6ecf-89aa-6356-4650-08f3c5c9d6a8@freebsd.org> <20170305152048.gyilvy7qscqg45hr@ivaldir.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="d7s6w52qr5svyvle" Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20170225 (1.8.0) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 15:34:51 -0000 --d7s6w52qr5svyvle Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Mar 05, 2017 at 11:30:36PM +0800, Julian Elischer wrote: > On 5/3/17 11:20 pm, Baptiste Daroussin wrote: > > On Sun, Mar 05, 2017 at 11:11:35PM +0800, Julian Elischer wrote: > > > On 5/3/17 9:19 pm, Rodney W. Grimes wrote: > > > > -- Start of PGP signed section. > > > > > On Sun, Mar 05, 2017 at 04:09:18AM +0000, Rodney W. Grimes wrote: > > > > > > Author: rgrimes > > > > > > Date: Sun Mar 5 04:09:18 2017 > > > > > > New Revision: 314693 > > > > > > URL: https://svnweb.freebsd.org/changeset/base/314693 > > > > > >=20 > > > > > > Log: > > > > > > Change /etc/rmt symlink from absolute to relative path, > > > > > > correcting the mistake made in r6499 > > > > > > Approved by: grehan > > > > > > MFC after: 1 week > > > > > >=20 > > > > > > Modified: > > > > > > head/usr.sbin/rmt/Makefile > > > > > >=20 > > > > > > Modified: head/usr.sbin/rmt/Makefile > > > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D > > > > > > --- head/usr.sbin/rmt/Makefile Sun Mar 5 04:02:47 2017 (r31469= 2) > > > > > > +++ head/usr.sbin/rmt/Makefile Sun Mar 5 04:09:18 2017 (r31469= 3) > > > > > > @@ -7,6 +7,6 @@ MAN=3D rmt.8 > > > > > > # called from /usr/src/etc/Makefile > > > > > > etc-rmt: > > > > > > rm -f ${DESTDIR}/etc/rmt > > > > > > - ln -s ${BINDIR}/rmt ${DESTDIR}/etc/rmt > > > > > > + ln -s ..${BINDIR}/rmt ${DESTDIR}/etc/rmt > > > > > I think this should be ${INSTALL_RSYMLINK} ${BINDIR}/rmt ${DESTDI= R}/etc/rmt > > > > find /usr/src | xargs grep INSTALL_RSYM > > > > (no results) > > > >=20 > > > > Sorry, no prior work does this, perhaps once I get done sweeping the > > > > absolutes out of the tree (about 10 or 15 IIRC) a pass can be made = to > > > > sweep all ln -s out and propage this internal bsd.lib.mk function o= ut > > > > to the rest of the source tree? > > > >=20 > > > > find /usr/share/mk/ | xargs grep INSTALL_RSYM > > > > /usr/share/mk/bsd.own.mk:INSTALL_RSYMLINK?=3D ${INSTALL} ${RSYM= LINK} > > > > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS:D${T= AG_ARGS},development} ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} > > > > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS} ${D= ESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ > > > > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS:D${T= AG_ARGS},development} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ > > > > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS} ${D= ESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ > > > >=20 > > > > This is called from within bsd.lib.mk only, do we want to use this = for > > > > all symbolics links in the source tree? If so I would of though the > > > > person adding this functionality to the .mk files would of made > > > > a tree sweeping looking for that and making those changes as well. > > > I've been playing around with libpathconv which converts abs paths to > > > relative paths etc. > > > I'w working on the patch to ln to add the -a and -r options that some= other > > > versions have. > > >=20 > > > you can specify an absolute path but ln -r (abspath) will generate a > > > relative link. > > > my target was the exact absolute symlinks that you are targeting. > > >=20 > > > Work commitments have made me lay down tools but this reminds me to p= ick it > > > up again. > > > (libpathconv is in the tree at /lib/libpathconv, but I got interrupte= d half > > > way through.. > > > I'll do the other half.. > > But install -l rs does exactly that, why adding a new mechanism? and in= stall > > works with metalog as stated earlier so for the build system it might b= e better. > >=20 > > Which reminds me multiple people have asked you if it won't be a good i= dea to > > merge your libpathconv into libutil rather that having a new library fo= r just 2 > > functions. DSO has a price and you haven't replied, will you consider m= erging > > it? > >=20 > > Best regards, > > Bapt >=20 > I will put it in libutil, but don't want to thrash too much so I'll do th= at > with the ln patch. Thank you >=20 > I hadn't thought that was a possibility originally. >=20 > I need the ln patch myself and there are other systems that have it so I'm > happy to do the work. >=20 > if install can do that I'm happy to hear it. Nice to learn about it.. >=20 > Does that mean that libpathconv is already somewhere in our system as > install is of the programs that was changed in hte initial pathconv relea= se > many years ago. To be clear I'm happy with ln(1) growing with such functionality. I'm just saying that in this specific case install -l rs is more appropriated :) Best regards, Bapt --d7s6w52qr5svyvle Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAli8MBAACgkQY4mL3PG3 Plo5DxAArciZwtZBw84eDUxraNRKzZExpWrRb0mnwKHgwAaL12Y+P+eUN5qS0J/W 4PcY9hbAvnGEc1YU1FHx+8fu7BSImvj7RZwMGz009JoUF7cbBftoMxEeYry3mvrM QI9fTPF4jG19RngI4T4IPRE/ed0erD5JCT103I9DD60O8zFqnFWnD9XV9UlLYXYR xWqTkzDIlLwgZx05fBc/aT3qlLB+nCISdfmjZpGN8DxMWFTKAvvPIArHz6YqPL41 1SMzIu8wZZjT/Lu/Co3Aa0kBzh7UatRawMcT34BnGBLODpkyLPark0CUrvvC31uJ /EFe7R40U8gJmHmVqw+sdjsawX1sgAYI9TRw/vWUkToGZmKvJXqTDmJJTHzUFH10 w/Oajmih049hG/JUfbkZoE2/b4oWilCNtjkzFSMKJYEfMCBGd9puuLbDDlUNE7ZK ZhHg8Vxp3yyyfwj6WzMFfRQTpLfDikvMt0Bx0ClQV8un+moDlHOI+HWcawHz6z8y kkSJBi9IkXJH9zbjnP4Yt9mEJ8pvjrLcciyfQGYb9h+t2vFCD5e49i5l8cki5E/M 1mab4v2oOmwsqXKrwDPjtZrQG8BGGcQTM3vmlsPUQkifz/K/L+bG78aVAJDkVnej 66NUuzEbt5py+o9cRRnEPQND5YDRmYUKh4oNQWlDtMR4fgOlRyc= =9VyL -----END PGP SIGNATURE----- --d7s6w52qr5svyvle-- From owner-svn-src-head@freebsd.org Sun Mar 5 16:10:37 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D8982CFA58F; Sun, 5 Mar 2017 16:10:37 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B32AD1F1E; Sun, 5 Mar 2017 16:10:37 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v25GAa93045359; Sun, 5 Mar 2017 16:10:36 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v25GAaUO045351; Sun, 5 Mar 2017 16:10:36 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201703051610.v25GAaUO045351@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sun, 5 Mar 2017 16:10:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314704 - in head/usr.bin: bc dc patch X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 16:10:38 -0000 Author: pfg Date: Sun Mar 5 16:10:35 2017 New Revision: 314704 URL: https://svnweb.freebsd.org/changeset/base/314704 Log: bc/dc/patch: make some use of reallocarray(3). reallocarray(3) is a non portable extension from OpenBSD. Given that it is already in FreeBSD, make easier future merges by adopting in some cases where the code has some shared heritage with OpenBSD. Obtained from: OpenBSD Modified: head/usr.bin/bc/bc.y head/usr.bin/dc/bcode.c head/usr.bin/dc/extern.h head/usr.bin/dc/inout.c head/usr.bin/dc/mem.c head/usr.bin/dc/stack.c head/usr.bin/patch/inp.c Modified: head/usr.bin/bc/bc.y ============================================================================== --- head/usr.bin/bc/bc.y Sun Mar 5 15:34:32 2017 (r314703) +++ head/usr.bin/bc/bc.y Sun Mar 5 16:10:35 2017 (r314704) @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: bc.y,v 1.44 2013/11/20 21:33:54 deraadt Exp $ */ +/* $OpenBSD: bc.y,v 1.46 2014/10/14 15:35:18 deraadt Exp $ */ /* * Copyright (c) 2003, Otto Moerbeek @@ -771,7 +771,7 @@ grow(void) if (current == instr_sz) { newsize = instr_sz * 2 + 1; - p = realloc(instructions, newsize * sizeof(*p)); + p = reallocarray(instructions, newsize, sizeof(*p)); if (p == NULL) { free(instructions); err(1, NULL); @@ -1132,7 +1132,7 @@ main(int argc, char *argv[]) init(); setvbuf(stdout, NULL, _IOLBF, 0); - sargv = malloc(argc * sizeof(char *)); + sargv = reallocarray(NULL, argc, sizeof(char *)); if (sargv == NULL) err(1, NULL); Modified: head/usr.bin/dc/bcode.c ============================================================================== --- head/usr.bin/dc/bcode.c Sun Mar 5 15:34:32 2017 (r314703) +++ head/usr.bin/dc/bcode.c Sun Mar 5 16:10:35 2017 (r314704) @@ -1,4 +1,4 @@ -/* $OpenBSD: bcode.c,v 1.45 2012/11/07 11:06:14 otto Exp $ */ +/* $OpenBSD: bcode.c,v 1.46 2014/10/08 03:59:56 doug Exp $ */ /* * Copyright (c) 2003, Otto Moerbeek @@ -1709,7 +1709,7 @@ eval_string(char *p) if (bmachine.readsp == bmachine.readstack_sz - 1) { size_t newsz = bmachine.readstack_sz * 2; struct source *stack; - stack = realloc(bmachine.readstack, newsz * + stack = reallocarray(bmachine.readstack, newsz, sizeof(struct source)); if (stack == NULL) err(1, "recursion too deep"); Modified: head/usr.bin/dc/extern.h ============================================================================== --- head/usr.bin/dc/extern.h Sun Mar 5 15:34:32 2017 (r314703) +++ head/usr.bin/dc/extern.h Sun Mar 5 16:10:35 2017 (r314704) @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* $OpenBSD: extern.h,v 1.3 2006/01/16 08:09:25 otto Exp $ */ +/* $OpenBSD: extern.h,v 1.4 2014/12/01 13:13:00 deraadt Exp $ */ /* * Copyright (c) 2003, Otto Moerbeek @@ -35,7 +35,7 @@ struct number *new_number(void); void free_number(struct number *); struct number *dup_number(const struct number *); void *bmalloc(size_t); -void *brealloc(void *, size_t); +void *breallocarray(void *, size_t, size_t); char *bstrdup(const char *p); void bn_check(int); void bn_checkp(const void *); Modified: head/usr.bin/dc/inout.c ============================================================================== --- head/usr.bin/dc/inout.c Sun Mar 5 15:34:32 2017 (r314703) +++ head/usr.bin/dc/inout.c Sun Mar 5 16:10:35 2017 (r314704) @@ -1,4 +1,4 @@ -/* $OpenBSD: inout.c,v 1.17 2012/11/07 11:06:14 otto Exp $ */ +/* $OpenBSD: inout.c,v 1.18 2014/12/01 13:13:00 deraadt Exp $ */ /* * Copyright (c) 2003, Otto Moerbeek @@ -261,7 +261,7 @@ read_string(struct source *src) escape = false; if (i == sz) { new_sz = sz * 2; - p = brealloc(p, new_sz + 1); + p = breallocarray(p, 1, new_sz + 1); sz = new_sz; } p[i++] = ch; Modified: head/usr.bin/dc/mem.c ============================================================================== --- head/usr.bin/dc/mem.c Sun Mar 5 15:34:32 2017 (r314703) +++ head/usr.bin/dc/mem.c Sun Mar 5 16:10:35 2017 (r314704) @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.5 2009/10/27 23:59:37 deraadt Exp $ */ +/* $OpenBSD: mem.c,v 1.6 2014/12/01 13:13:00 deraadt Exp $ */ /* * Copyright (c) 2003, Otto Moerbeek @@ -72,11 +72,11 @@ bmalloc(size_t sz) } void * -brealloc(void *p, size_t sz) +breallocarray(void *p, size_t nmemb, size_t size) { void *q; - q = realloc(p, sz); + q = reallocarray(p, nmemb, size); if (q == NULL) err(1, NULL); return (q); Modified: head/usr.bin/dc/stack.c ============================================================================== --- head/usr.bin/dc/stack.c Sun Mar 5 15:34:32 2017 (r314703) +++ head/usr.bin/dc/stack.c Sun Mar 5 16:10:35 2017 (r314704) @@ -1,4 +1,4 @@ -/* $OpenBSD: stack.c,v 1.12 2014/11/26 15:05:51 otto Exp $ */ +/* $OpenBSD: stack.c,v 1.13 2014/12/01 13:13:00 deraadt Exp $ */ /* * Copyright (c) 2003, Otto Moerbeek @@ -139,8 +139,8 @@ stack_grow(struct stack *stack) if (++stack->sp == stack->size) { new_size = stack->size * 2 + 1; - stack->stack = brealloc(stack->stack, - new_size * sizeof(*stack->stack)); + stack->stack = breallocarray(stack->stack, + new_size, sizeof(*stack->stack)); stack->size = new_size; } } @@ -313,7 +313,7 @@ array_grow(struct array *array, size_t n { size_t i; - array->data = brealloc(array->data, newsize * sizeof(*array->data)); + array->data = breallocarray(array->data, newsize, sizeof(*array->data)); for (i = array->size; i < newsize; i++) { array->data[i].type = BCODE_NONE; array->data[i].array = NULL; Modified: head/usr.bin/patch/inp.c ============================================================================== --- head/usr.bin/patch/inp.c Sun Mar 5 15:34:32 2017 (r314703) +++ head/usr.bin/patch/inp.c Sun Mar 5 16:10:35 2017 (r314704) @@ -23,7 +23,7 @@ * -C option added in 1998, original code by Marc Espie, based on FreeBSD * behaviour * - * $OpenBSD: inp.c,v 1.36 2012/04/10 14:46:34 ajacoutot Exp $ + * $OpenBSD: inp.c,v 1.44 2015/07/26 14:32:19 millert Exp $ * $FreeBSD$ */ @@ -118,7 +118,7 @@ reallocate_lines(size_t *lines_allocated size_t new_size; new_size = *lines_allocated * 3 / 2; - p = realloc(i_ptr, (new_size + 2) * sizeof(char *)); + p = reallocarray(i_ptr, new_size + 2, sizeof(char *)); if (p == NULL) { /* shucks, it was a near thing */ munmap(i_womp, i_size); i_womp = NULL; From owner-svn-src-head@freebsd.org Sun Mar 5 16:48:15 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0F57CFA357; Sun, 5 Mar 2017 16:48:15 +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 mx1.freebsd.org (Postfix) with ESMTPS id 7E0581C00; Sun, 5 Mar 2017 16:48:15 +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 v25GmEbS062773; Sun, 5 Mar 2017 16:48:14 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v25GmETD062772; Sun, 5 Mar 2017 16:48:14 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201703051648.v25GmETD062772@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sun, 5 Mar 2017 16:48:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314705 - head/share/misc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 16:48:15 -0000 Author: eadler Date: Sun Mar 5 16:48:14 2017 New Revision: 314705 URL: https://svnweb.freebsd.org/changeset/base/314705 Log: Add macOS 10.12 Modified: head/share/misc/bsd-family-tree Modified: head/share/misc/bsd-family-tree ============================================================================== --- head/share/misc/bsd-family-tree Sun Mar 5 16:10:35 2017 (r314704) +++ head/share/misc/bsd-family-tree Sun Mar 5 16:48:14 2017 (r314705) @@ -346,8 +346,8 @@ FreeBSD 5.2 | | | 10.3 | | | | | | NetBSD 7.0.1 | | | | | | DragonFly 4.6.0 - *--FreeBSD | | OpenBSD 6.0 | - | 11.0 | | | | + *--FreeBSD macOS | OpenBSD 6.0 | + | 11.0 10.12 | | | | | | | | | | | | | FreeBSD 12 -current | NetBSD -current OpenBSD -current DragonFly -current From owner-svn-src-head@freebsd.org Sun Mar 5 16:26:38 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 164ACCFABED; Sun, 5 Mar 2017 16:26:38 +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 8624A1CE7; Sun, 5 Mar 2017 16:26:37 +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 v25GQYli083562; Sun, 5 Mar 2017 08:26:34 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v25GQWNd083561; Sun, 5 Mar 2017 08:26:32 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201703051626.v25GQWNd083561@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314693 - head/usr.sbin/rmt In-Reply-To: <20170305134226.px4ivdtjjppbgiyf@ivaldir.net> To: Baptiste Daroussin Date: Sun, 5 Mar 2017 08:26:32 -0800 (PST) CC: freebsd-hackers@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: Sun, 05 Mar 2017 17:39:03 +0000 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 16:26:38 -0000 Moved thread to -hackers for a quick discussion. > On Sun, Mar 05, 2017 at 05:19:28AM -0800, Rodney W. Grimes wrote: > > -- Start of PGP signed section. > > > On Sun, Mar 05, 2017 at 04:09:18AM +0000, Rodney W. Grimes wrote: > > > > Author: rgrimes > > > > Date: Sun Mar 5 04:09:18 2017 > > > > New Revision: 314693 > > > > URL: https://svnweb.freebsd.org/changeset/base/314693 > > > > > > > > Log: > > > > Change /etc/rmt symlink from absolute to relative path, > > > > correcting the mistake made in r6499 > > > > > > > > Approved by: grehan > > > > MFC after: 1 week > > > > > > > > Modified: > > > > head/usr.sbin/rmt/Makefile > > > > > > > > Modified: head/usr.sbin/rmt/Makefile > > > > ============================================================================== > > > > --- head/usr.sbin/rmt/Makefile Sun Mar 5 04:02:47 2017 (r314692) > > > > +++ head/usr.sbin/rmt/Makefile Sun Mar 5 04:09:18 2017 (r314693) > > > > @@ -7,6 +7,6 @@ MAN= rmt.8 > > > > # called from /usr/src/etc/Makefile > > > > etc-rmt: > > > > rm -f ${DESTDIR}/etc/rmt > > > > - ln -s ${BINDIR}/rmt ${DESTDIR}/etc/rmt > > > > + ln -s ..${BINDIR}/rmt ${DESTDIR}/etc/rmt > > > > > > I think this should be ${INSTALL_RSYMLINK} ${BINDIR}/rmt ${DESTDIR}/etc/rmt > > > > find /usr/src | xargs grep INSTALL_RSYM > > (no results) > > > > Sorry, no prior work does this, perhaps once I get done sweeping the > > absolutes out of the tree (about 10 or 15 IIRC) a pass can be made to > > sweep all ln -s out and propage this internal bsd.lib.mk function out > > to the rest of the source tree? > > There is also no Makefiles that do ls -sf directly beside that one. Unless I have missed a commit: ./crypto/openssh/contrib/cygwin/Makefile: cd $(DESTDIR)$(mandir)/man1 && ln -s ssh.1.gz slogin.1.gz ./usr.sbin/sendmail/Makefile: ln -sf ${.ALLSRC} ${.TARGET} ./usr.sbin/rmt/Makefile: ln -s ${BINDIR}/rmt ${DESTDIR}/etc/rmt ... A summary is there are 50 instances of ln -sf, 28 other variants of ln -s, and 5 ln -fs. I did not search for other permutaions of ln and s f options. > INSTALL_RSYMLINK has exactly be done to be use everywhere it is needed. (I wrote > it for that exact reason :)) Wonderful!! I'll investigate a sweep to finish implementing this tree wide in my spare time.... I notice that SYMLINKS= is hard coded to use INSTALL_SYMLINKS so that can't be used to fix some of these. How would you propose I proceed in that area?? And investigation into using INSTALL_RSYMLINK in SYMLINKS= should be done, I can not think of a reason when you DONT want a relative link installed, but I may be missing some new odd use for symlinks by the FreeBSD base system. > > > > find /usr/share/mk/ | xargs grep INSTALL_RSYM > > /usr/share/mk/bsd.own.mk:INSTALL_RSYMLINK?= ${INSTALL} ${RSYMLINK} > > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} > > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ > > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ > > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ > > > > This is called from within bsd.lib.mk only, do we want to use this for > > all symbolics links in the source tree? If so I would of though the > > person adding this functionality to the .mk files would of made > > a tree sweeping looking for that and making those changes as well. > > When I did it only bsd.lib.mk was using it iirc And that appears to still be the case. > > > The rm -f before can then be removed, the symlink will be relative and the > > > METALOG will be respected > > > > METALOG? The only documentation I can find on this seems to be part of > > src/tootls/tools/makeroot.8. > > > > It appears that something in Makefile.inc uses it and there are references > > to it in etc/Makefile. > > > > Where is this METALOG documented? > > It is really badly documented and should be :( it is a mtree file that is > generated when built is done via -DNO_ROOT for the purpose of being able to > generate disk with makefs as a user > > I have reused it for packaging base. > > This was designed IIRC by adrian and brooks iirc. > > Embedded people relies a lot on it. > Everything not going though the install(1) command is not tracked that is why > this is an issue. I guess then that these 83 things I have found are not so important to them? Lets take this to -hackers, discuss it where it should be, and get it fixed. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Sun Mar 5 18:00:54 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 14789CFA66E; Sun, 5 Mar 2017 18:00:54 +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 mx1.freebsd.org (Postfix) with ESMTPS id D64F21D07; Sun, 5 Mar 2017 18:00:53 +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 v25I0qcL093133; Sun, 5 Mar 2017 18:00:52 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v25I0qvQ093131; Sun, 5 Mar 2017 18:00:52 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201703051800.v25I0qvQ093131@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sun, 5 Mar 2017 18:00:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314706 - in head/share: man/man4 mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 18:00:54 -0000 Author: eadler Date: Sun Mar 5 18:00:52 2017 New Revision: 314706 URL: https://svnweb.freebsd.org/changeset/base/314706 Log: remove the the duplicate words from share/ Modified: head/share/man/man4/isp.4 head/share/mk/dirdeps.mk Modified: head/share/man/man4/isp.4 ============================================================================== --- head/share/man/man4/isp.4 Sun Mar 5 16:48:14 2017 (r314705) +++ head/share/man/man4/isp.4 Sun Mar 5 18:00:52 2017 (r314706) @@ -68,7 +68,7 @@ and Fabric connections. FC-Tape is supported on 4Gb (2400) and newer controllers. FC-Tape is highly recommended for connections to tape drives that support it. -It encompasses four elements from the the T-10 FCP-4 specification: +It encompasses four elements from the T-10 FCP-4 specification: .Bl -bullet -offset indent .It Precise Delivery of Commands Modified: head/share/mk/dirdeps.mk ============================================================================== --- head/share/mk/dirdeps.mk Sun Mar 5 16:48:14 2017 (r314705) +++ head/share/mk/dirdeps.mk Sun Mar 5 18:00:52 2017 (r314706) @@ -58,7 +58,7 @@ # distinguish them from others. # # Before each Makefile.depend file is read, we set -# DEP_RELDIR to be the the RELDIR (path relative to SRCTOP) for +# DEP_RELDIR to be the RELDIR (path relative to SRCTOP) for # its directory, and DEP_MACHINE etc according to the . # represented by the suffix of the corresponding target. # From owner-svn-src-head@freebsd.org Sun Mar 5 18:37:26 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8CA2FCFAFD6; Sun, 5 Mar 2017 18:37:26 +0000 (UTC) (envelope-from jmg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4EDE61EE2; Sun, 5 Mar 2017 18:37:26 +0000 (UTC) (envelope-from jmg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v25IbP8e006912; Sun, 5 Mar 2017 18:37:25 GMT (envelope-from jmg@FreeBSD.org) Received: (from jmg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v25IbPW1006911; Sun, 5 Mar 2017 18:37:25 GMT (envelope-from jmg@FreeBSD.org) Message-Id: <201703051837.v25IbPW1006911@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jmg set sender to jmg@FreeBSD.org using -f From: John-Mark Gurney Date: Sun, 5 Mar 2017 18:37:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314707 - head/share/man/man9 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 18:37:26 -0000 Author: jmg Date: Sun Mar 5 18:37:25 2017 New Revision: 314707 URL: https://svnweb.freebsd.org/changeset/base/314707 Log: add missing MLINKS for functions that this man page documents. This page should be renamed to eliminate an unneeded inode. Forgotten by: markm Modified: head/share/man/man9/Makefile Modified: head/share/man/man9/Makefile ============================================================================== --- head/share/man/man9/Makefile Sun Mar 5 18:00:52 2017 (r314706) +++ head/share/man/man9/Makefile Sun Mar 5 18:37:25 2017 (r314707) @@ -1425,6 +1425,9 @@ MLINKS+=random.9 arc4rand.9 \ random.9 read_random.9 \ random.9 read_random_uio.9 \ random.9 srandom.9 +MLINKS+=random_harvest.9 random_harvest_direct.9 \ + random_harvest.9 random_harvest_fast.9 \ + random_harvest.9 random_harvest_queue.9 MLINKS+=refcount.9 refcount_acquire.9 \ refcount.9 refcount_init.9 \ refcount.9 refcount_release.9 From owner-svn-src-head@freebsd.org Sun Mar 5 19:56:21 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 851DFCFA259; Sun, 5 Mar 2017 19:56:21 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 470DA12BB; Sun, 5 Mar 2017 19:56:21 +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 v25JuK8G039507; Sun, 5 Mar 2017 19:56:20 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v25JuKoO039506; Sun, 5 Mar 2017 19:56:20 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201703051956.v25JuKoO039506@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 5 Mar 2017 19:56:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314708 - head/contrib/llvm/lib/Analysis X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 19:56:21 -0000 Author: dim Date: Sun Mar 5 19:56:20 2017 New Revision: 314708 URL: https://svnweb.freebsd.org/changeset/base/314708 Log: For now, revert r287232 from upstream llvm trunk (by Daniil Fukalov): [SCEV] limit recursion depth of CompareSCEVComplexity Summary: CompareSCEVComplexity goes too deep (50+ on a quite a big unrolled loop) and runs almost infinite time. Added cache of "equal" SCEV pairs to earlier cutoff of further estimation. Recursion depth limit was also introduced as a parameter. Reviewers: sanjoy Subscribers: mzolotukhin, tstellarAMD, llvm-commits Differential Revision: https://reviews.llvm.org/D26389 This commit is the cause of excessive compile times on skein_block.c (and possibly other files) during kernel builds on amd64. We never saw the problematic behavior described in this upstream commit, so for now it is better to revert it. An upstream bug has been filed here: https://bugs.llvm.org/show_bug.cgi?id=32142 Reported by: mjg Modified: head/contrib/llvm/lib/Analysis/ScalarEvolution.cpp Modified: head/contrib/llvm/lib/Analysis/ScalarEvolution.cpp ============================================================================== --- head/contrib/llvm/lib/Analysis/ScalarEvolution.cpp Sun Mar 5 18:37:25 2017 (r314707) +++ head/contrib/llvm/lib/Analysis/ScalarEvolution.cpp Sun Mar 5 19:56:20 2017 (r314708) @@ -127,11 +127,6 @@ static cl::opt MulOpsInlineThr cl::desc("Threshold for inlining multiplication operands into a SCEV"), cl::init(1000)); -static cl::opt - MaxCompareDepth("scalar-evolution-max-compare-depth", cl::Hidden, - cl::desc("Maximum depth of recursive compare complexity"), - cl::init(32)); - //===----------------------------------------------------------------------===// // SCEV class definitions //===----------------------------------------------------------------------===// @@ -480,8 +475,8 @@ bool SCEVUnknown::isOffsetOf(Type *&CTy, static int CompareValueComplexity(SmallSet, 8> &EqCache, const LoopInfo *const LI, Value *LV, Value *RV, - unsigned Depth) { - if (Depth > MaxCompareDepth || EqCache.count({LV, RV})) + unsigned DepthLeft = 2) { + if (DepthLeft == 0 || EqCache.count({LV, RV})) return 0; // Order pointer values after integer values. This helps SCEVExpander form @@ -542,23 +537,21 @@ CompareValueComplexity(SmallSetgetOperand(Idx), - RInst->getOperand(Idx), Depth + 1); + RInst->getOperand(Idx), DepthLeft - 1); if (Result != 0) return Result; + EqCache.insert({LV, RV}); } } - EqCache.insert({LV, RV}); return 0; } // Return negative, zero, or positive, if LHS is less than, equal to, or greater // than RHS, respectively. A three-way result allows recursive comparisons to be // more efficient. -static int CompareSCEVComplexity( - SmallSet, 8> &EqCacheSCEV, - const LoopInfo *const LI, const SCEV *LHS, const SCEV *RHS, - unsigned Depth = 0) { +static int CompareSCEVComplexity(const LoopInfo *const LI, const SCEV *LHS, + const SCEV *RHS) { // Fast-path: SCEVs are uniqued so we can do a quick equality check. if (LHS == RHS) return 0; @@ -568,8 +561,6 @@ static int CompareSCEVComplexity( if (LType != RType) return (int)LType - (int)RType; - if (Depth > MaxCompareDepth || EqCacheSCEV.count({LHS, RHS})) - return 0; // Aside from the getSCEVType() ordering, the particular ordering // isn't very important except that it's beneficial to be consistent, // so that (a + b) and (b + a) don't end up as different expressions. @@ -579,11 +570,7 @@ static int CompareSCEVComplexity( const SCEVUnknown *RU = cast(RHS); SmallSet, 8> EqCache; - int X = CompareValueComplexity(EqCache, LI, LU->getValue(), RU->getValue(), - Depth + 1); - if (X == 0) - EqCacheSCEV.insert({LHS, RHS}); - return X; + return CompareValueComplexity(EqCache, LI, LU->getValue(), RU->getValue()); } case scConstant: { @@ -618,12 +605,11 @@ static int CompareSCEVComplexity( // Lexicographically compare. for (unsigned i = 0; i != LNumOps; ++i) { - int X = CompareSCEVComplexity(EqCacheSCEV, LI, LA->getOperand(i), - RA->getOperand(i), Depth + 1); + long X = CompareSCEVComplexity(LI, LA->getOperand(i), RA->getOperand(i)); if (X != 0) return X; } - EqCacheSCEV.insert({LHS, RHS}); + return 0; } @@ -642,13 +628,11 @@ static int CompareSCEVComplexity( for (unsigned i = 0; i != LNumOps; ++i) { if (i >= RNumOps) return 1; - int X = CompareSCEVComplexity(EqCacheSCEV, LI, LC->getOperand(i), - RC->getOperand(i), Depth + 1); + long X = CompareSCEVComplexity(LI, LC->getOperand(i), RC->getOperand(i)); if (X != 0) return X; } - EqCacheSCEV.insert({LHS, RHS}); - return 0; + return (int)LNumOps - (int)RNumOps; } case scUDivExpr: { @@ -656,15 +640,10 @@ static int CompareSCEVComplexity( const SCEVUDivExpr *RC = cast(RHS); // Lexicographically compare udiv expressions. - int X = CompareSCEVComplexity(EqCacheSCEV, LI, LC->getLHS(), RC->getLHS(), - Depth + 1); + long X = CompareSCEVComplexity(LI, LC->getLHS(), RC->getLHS()); if (X != 0) return X; - X = CompareSCEVComplexity(EqCacheSCEV, LI, LC->getRHS(), RC->getRHS(), - Depth + 1); - if (X == 0) - EqCacheSCEV.insert({LHS, RHS}); - return X; + return CompareSCEVComplexity(LI, LC->getRHS(), RC->getRHS()); } case scTruncate: @@ -674,11 +653,7 @@ static int CompareSCEVComplexity( const SCEVCastExpr *RC = cast(RHS); // Compare cast expressions by operand. - int X = CompareSCEVComplexity(EqCacheSCEV, LI, LC->getOperand(), - RC->getOperand(), Depth + 1); - if (X == 0) - EqCacheSCEV.insert({LHS, RHS}); - return X; + return CompareSCEVComplexity(LI, LC->getOperand(), RC->getOperand()); } case scCouldNotCompute: @@ -700,21 +675,19 @@ static int CompareSCEVComplexity( static void GroupByComplexity(SmallVectorImpl &Ops, LoopInfo *LI) { if (Ops.size() < 2) return; // Noop - - SmallSet, 8> EqCache; if (Ops.size() == 2) { // This is the common case, which also happens to be trivially simple. // Special case it. const SCEV *&LHS = Ops[0], *&RHS = Ops[1]; - if (CompareSCEVComplexity(EqCache, LI, RHS, LHS) < 0) + if (CompareSCEVComplexity(LI, RHS, LHS) < 0) std::swap(LHS, RHS); return; } // Do the rough sort by complexity. std::stable_sort(Ops.begin(), Ops.end(), - [&EqCache, LI](const SCEV *LHS, const SCEV *RHS) { - return CompareSCEVComplexity(EqCache, LI, LHS, RHS) < 0; + [LI](const SCEV *LHS, const SCEV *RHS) { + return CompareSCEVComplexity(LI, LHS, RHS) < 0; }); // Now that we are sorted by complexity, group elements of the same From owner-svn-src-head@freebsd.org Sun Mar 5 20:19:33 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F696CFAAAF for ; Sun, 5 Mar 2017 20:19:33 +0000 (UTC) (envelope-from ed@nuxi.nl) 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 2FC0C116A for ; Sun, 5 Mar 2017 20:19:33 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: by mail-yw0-x22a.google.com with SMTP id p77so108022712ywg.1 for ; Sun, 05 Mar 2017 12:19:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuxi-nl.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=IkvlfS0oX8UBYNHPlOJFXuG2FccafzIsFDy8S6FxT3c=; b=GrxrRolbUUER2e7Ds0tsQb4IB8BOvZwjRun7KTtki2rkV6+kUV2naJFCLoFkMCFJO7 DLY+Z4qghdsN3338xlxRq8X9ulmbd5nm8Sa8Tg0W9Vvz1Z6nFqnFQxWKxkNHgZS0+T7O SdiGq5FXkdMPCPJTsF/5Ht/fB8KqEctpwUVSiQkwWA5410bnep+Oi51wjLrkf9KLT174 wTP7R7rSgwgvAHfVKd+ynEtwq2IeQls43VesRlss3nPvfPuD3B3a7QInvGgQzcKmEZbD j1z/MtrMT/Qd1P3ANk/FKy+AaT+KyTApbd05v5+V0vgon5Pqru/KzqftBizLS2kwvJ85 wXsQ== 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=IkvlfS0oX8UBYNHPlOJFXuG2FccafzIsFDy8S6FxT3c=; b=cCleecpP3Sl61UQ/sRhm3hniYqldIHmNKgRFwtnYtZAGfSl1r8hqNjRBxsPkn7e3HI x9r4NX/R7wVJDeAGBqyy/RuwyFpVAjN/EKiPut/UMLOG9L1nRD0SBSrYG35vdet1AkVF ROwvHW7qUTso+VPs3MHfmrbm+XMn1X3PFlerzLIIeAJ1tMjEOyXpirnF+uHNNB1bHeTV 34PxQHd2+3HNPz1VSVED5DRDamNEUAxmdbd4s1pI0NiE2hpvTWCffFuiE8Yv2sL8t9+/ 5Sa68KKniq46GH6Jth8+9oV1Db+hmXGGs+BOO6/lp7w+PhLaEx0av8O/tox8QAiFbGhA W4pA== X-Gm-Message-State: AMke39mZthwYJ8QOXnPIYIbyFIJNp+fhb1V1FCoUg6A01znYw1xdRnRCF6QO1jFKGLOE2+k+nUTkq6oqvF0iiw== X-Received: by 10.13.220.65 with SMTP id f62mr8863290ywe.6.1488745172102; Sun, 05 Mar 2017 12:19:32 -0800 (PST) MIME-Version: 1.0 Received: by 10.129.51.198 with HTTP; Sun, 5 Mar 2017 12:19:01 -0800 (PST) In-Reply-To: References: <201703042238.v24McAD8008837@repo.freebsd.org> From: Ed Schouten Date: Sun, 5 Mar 2017 21:19:01 +0100 Message-ID: Subject: Re: svn commit: r314685 - head/bin/ps To: "Conrad E. Meyer" Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 20:19:33 -0000 Hi Conrad, 2017-03-05 0:08 GMT+01:00 Conrad Meyer : >> - If something is a TTY, then our implementation of the TTY layer >> guarantees that TIOCGWINSZ always works. > > Do you know if it did in 1990 too? It's hard to tell why Marc@ made > this change way back then. I wasn't sure so I left it alone. I can't tell. :-) >> - If we're only interested in testing stdout whether it's a TTY, I >> think it makes little sense to check TIOCGWINSZ on stdin, stderr. >> >> I think there would therefore be very little harm to use something like this: >> >> | if ((cols = getenv("COLUMNS")) != NULL && *cols != '\0') >> | termwidth = atoi(cols); >> | else if ((ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&ws) == >> -1 && ws.ws_row == 0) > > Shouldn't this remain || ws.ws_row == 0? Err, yes. ||, not &&. -- Ed Schouten Nuxi, 's-Hertogenbosch, the Netherlands KvK-nr.: 62051717 From owner-svn-src-head@freebsd.org Sun Mar 5 21:16:51 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5148BCFA3D2; Sun, 5 Mar 2017 21:16:51 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2052C1671; Sun, 5 Mar 2017 21:16:51 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v25LGoXm072415; Sun, 5 Mar 2017 21:16:50 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v25LGoEv072414; Sun, 5 Mar 2017 21:16:50 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201703052116.v25LGoEv072414@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 5 Mar 2017 21:16:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314709 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 21:16:51 -0000 Author: bdrewery Date: Sun Mar 5 21:16:50 2017 New Revision: 314709 URL: https://svnweb.freebsd.org/changeset/base/314709 Log: Fix bootstrapping mtree after r313404 for older systems. r313404 made libnetbsd require sha384.h from libmd. Libmd added it in r292782. Update BOOTSTRAPPING to account for this. Reported by: bde Reviewed by: ngie Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Mar 5 19:56:20 2017 (r314708) +++ head/Makefile.inc1 Sun Mar 5 21:16:50 2017 (r314709) @@ -1618,10 +1618,12 @@ ${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd ${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4 .endif -.if ${BOOTSTRAPPING} < 1000026 -_nmtree= lib/libnetbsd \ +.if ${BOOTSTRAPPING} < 1100093 +_nmtree= lib/libmd \ + lib/libnetbsd \ usr.sbin/nmtree +${_bt}-lib/libnetbsd: ${_bt}-lib/libmd ${_bt}-usr.sbin/nmtree: ${_bt}-lib/libnetbsd .endif From owner-svn-src-head@freebsd.org Sun Mar 5 21:56:05 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3DA6CFAFEF; Sun, 5 Mar 2017 21:56:05 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 836751F86; Sun, 5 Mar 2017 21:56:05 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v25Lu43d088687; Sun, 5 Mar 2017 21:56:04 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v25Lu42r088686; Sun, 5 Mar 2017 21:56:04 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201703052156.v25Lu42r088686@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 5 Mar 2017 21:56:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314714 - head/bin/kill X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 21:56:05 -0000 Author: bdrewery Date: Sun Mar 5 21:56:04 2017 New Revision: 314714 URL: https://svnweb.freebsd.org/changeset/base/314714 Log: Don't kill pid -1 on overflow from strtol(3). Store the result in a proper long and then compare to the proper pid_t for overflow, so that no MD assumptions are made. Reviewed by: jilles MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D9887 Modified: head/bin/kill/kill.c Modified: head/bin/kill/kill.c ============================================================================== --- head/bin/kill/kill.c Sun Mar 5 21:44:29 2017 (r314713) +++ head/bin/kill/kill.c Sun Mar 5 21:56:04 2017 (r314714) @@ -66,7 +66,9 @@ static void usage(void); int main(int argc, char *argv[]) { - int errors, numsig, pid, ret; + long pidl; + pid_t pid; + int errors, numsig, ret; char *ep; if (argc < 2) @@ -137,8 +139,10 @@ main(int argc, char *argv[]) else #endif { - pid = strtol(*argv, &ep, 10); - if (!**argv || *ep) + pidl = strtol(*argv, &ep, 10); + /* Check for overflow of pid_t. */ + pid = (pid_t)pidl; + if (!**argv || *ep || pid != pidl) errx(2, "illegal process id: %s", *argv); ret = kill(pid, numsig); } From owner-svn-src-head@freebsd.org Sun Mar 5 22:19:44 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7FA5DCFAA48; Sun, 5 Mar 2017 22:19:44 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4F55B1BA6; Sun, 5 Mar 2017 22:19:44 +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 v25MJh7x096984; Sun, 5 Mar 2017 22:19:43 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v25MJhrq096983; Sun, 5 Mar 2017 22:19:43 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201703052219.v25MJhrq096983@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Sun, 5 Mar 2017 22:19:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314715 - head/sys/netpfil/ipfw X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 22:19:44 -0000 Author: ae Date: Sun Mar 5 22:19:43 2017 New Revision: 314715 URL: https://svnweb.freebsd.org/changeset/base/314715 Log: Reject invalid object types that can not be used with specific opcodes. When we doing reference counting of named objects in the new rule, for existing objects check that opcode references to correct object, otherwise return EINVAL. PR: 217391 MFC after: 1 week Sponsored by: Yandex LLC Modified: head/sys/netpfil/ipfw/ip_fw_sockopt.c Modified: head/sys/netpfil/ipfw/ip_fw_sockopt.c ============================================================================== --- head/sys/netpfil/ipfw/ip_fw_sockopt.c Sun Mar 5 21:56:04 2017 (r314714) +++ head/sys/netpfil/ipfw/ip_fw_sockopt.c Sun Mar 5 22:19:43 2017 (r314715) @@ -2669,7 +2669,14 @@ ref_opcode_object(struct ip_fw_chain *ch return (0); } - /* Found. Bump refcount and update kidx. */ + /* + * Object is already exist. + * Its subtype should match with expected value. + */ + if (ti->type != no->subtype) + return (EINVAL); + + /* Bump refcount and update kidx. */ no->refcnt++; rw->update(cmd, no->kidx); return (0); From owner-svn-src-head@freebsd.org Sun Mar 5 23:41:16 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF5BDCFBF04 for ; Sun, 5 Mar 2017 23:41:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x22c.google.com (mail-io0-x22c.google.com [IPv6:2607:f8b0:4001:c06::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 A1DAB1212 for ; Sun, 5 Mar 2017 23:41:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x22c.google.com with SMTP id l7so103290886ioe.3 for ; Sun, 05 Mar 2017 15:41:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=CQ8NCCHn25kPCaLoKgJscPLbYPWoy7hZjSczm+15FHg=; b=lMM3HBcSqNuZXXH5kqDPl6gpglSgBOw2BSkzFJfl5ylEawPHQ9x10cX8PJbI89Wn0V UNQ/EzDiQTpcEbUZWQD2MOxe7ceL0mEewutli4dSfiypTV+xFhHqJae6xpQeWVcJGeHV LaYCQ1fZ6II2bWIS9lYLuf7zk9/yIEy7HfUqhHP9SqhSTUNRXDafvoOtcSkK9+NqjUHa /9Dutpce7sI40p4C8FzWa1zoD05IdrOho3lFHEPzhGPN+E1jlXSxsXRVO7rYqC7aGz/W 5rUSSr92sK96u2gn7ytdkMidl8c0dWFk75F1YAFEIJdk5eaXv82TsLWl6b6uY/B4Nc89 bAbQ== 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=CQ8NCCHn25kPCaLoKgJscPLbYPWoy7hZjSczm+15FHg=; b=JGqx5SlZwJbwNZ62Cg1gdveJZfTsYd9nuv6N3WQ/Bw+2L21CWIDqk1vh9cixcDuIqC cKRxyQCUQbJPKSAqbhskzs2VxYG2XhTzRoS6VUEU3McWZLJ51lAuD/4lFrZmeryDK9Ym HAV240WIIUsROy0zm6w/M6T3qtce3ls5Pw5TsdkTSHnZS/3z6jVdp+7rk8xITcM+kNAD w0CdApDP8J7x704nimISOpHRON7Mb6ISsnhbIzYxef/zGgJyYvqCGLj+MXu6sE331vCA 1568D/AhJbUYk267elpjbfzIjio2dH2foGyCKEdx14j6DNSDTYUOjIiya3GlvugVud8G jlHQ== X-Gm-Message-State: AMke39k+KumsjH6CKbqC7JLyz/kC/WLdiBE+bkUNyBm6W/NJY18TO8O6e3jx5eGIOzIwZ+/wP+GL6g2eA2ZQwA== X-Received: by 10.107.198.193 with SMTP id w184mr12234519iof.19.1488757275537; Sun, 05 Mar 2017 15:41:15 -0800 (PST) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.134.129 with HTTP; Sun, 5 Mar 2017 15:41:15 -0800 (PST) X-Originating-IP: [69.53.245.200] In-Reply-To: <201703052116.v25LGoEv072414@repo.freebsd.org> References: <201703052116.v25LGoEv072414@repo.freebsd.org> From: Warner Losh Date: Sun, 5 Mar 2017 16:41:15 -0700 X-Google-Sender-Auth: euayF483Kmv_iemNG73Mcv623Wc Message-ID: Subject: Re: svn commit: r314709 - head To: Bryan Drewery Cc: src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 23:41:16 -0000 On Sun, Mar 5, 2017 at 2:16 PM, Bryan Drewery wrote: > Author: bdrewery > Date: Sun Mar 5 21:16:50 2017 > New Revision: 314709 > URL: https://svnweb.freebsd.org/changeset/base/314709 > > Log: > Fix bootstrapping mtree after r313404 for older systems. > > r313404 made libnetbsd require sha384.h from libmd. Libmd added it in > r292782. Update BOOTSTRAPPING to account for this. > > Reported by: bde > Reviewed by: ngie > > Modified: > head/Makefile.inc1 > > Modified: head/Makefile.inc1 > ============================================================================== > --- head/Makefile.inc1 Sun Mar 5 19:56:20 2017 (r314708) > +++ head/Makefile.inc1 Sun Mar 5 21:16:50 2017 (r314709) > @@ -1618,10 +1618,12 @@ ${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd > ${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4 > .endif > > -.if ${BOOTSTRAPPING} < 1000026 > -_nmtree= lib/libnetbsd \ I've been trying to document the bootstrapping stuff inline like # r313404 made libnetbsd require libmd so we know why things are the way they are. Sure, I can chase down a dozen things in the svn logs, but a quick shortcut like that saves a lot of time. Any chance you could do that as well? Warner > +.if ${BOOTSTRAPPING} < 1100093 > +_nmtree= lib/libmd \ > + lib/libnetbsd \ > usr.sbin/nmtree > > +${_bt}-lib/libnetbsd: ${_bt}-lib/libmd > ${_bt}-usr.sbin/nmtree: ${_bt}-lib/libnetbsd > .endif > > From owner-svn-src-head@freebsd.org Sun Mar 5 23:48:25 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C2E1FCFBF91; Sun, 5 Mar 2017 23:48:25 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 818E914B3; Sun, 5 Mar 2017 23:48:25 +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 v25NmOPc032566; Sun, 5 Mar 2017 23:48:24 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v25NmOI1032562; Sun, 5 Mar 2017 23:48:24 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201703052348.v25NmOI1032562@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Sun, 5 Mar 2017 23:48:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314716 - head/sys/netpfil/ipfw X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 23:48:25 -0000 Author: ae Date: Sun Mar 5 23:48:24 2017 New Revision: 314716 URL: https://svnweb.freebsd.org/changeset/base/314716 Log: Add IPv6 support to O_IP_DST_LOOKUP opcode. o check the size of O_IP_SRC_LOOKUP opcode, it can not exceed the size of ipfw_insn_u32; o rename ipfw_lookup_table_extended() function into ipfw_lookup_table() and remove old ipfw_lookup_table(); o use args->f_id.flow_id6 that is in host byte order to get DSCP value; o add SCTP ports support to 'lookup src/dst-port' opcode; o add IPv6 support to 'lookup src/dst-ip' opcode. PR: 217292 Reviewed by: melifaro MFC after: 2 weeks Sponsored by: Yandex LLC Differential Revision: https://reviews.freebsd.org/D9873 Modified: head/sys/netpfil/ipfw/ip_fw2.c head/sys/netpfil/ipfw/ip_fw_private.h head/sys/netpfil/ipfw/ip_fw_sockopt.c head/sys/netpfil/ipfw/ip_fw_table.c Modified: head/sys/netpfil/ipfw/ip_fw2.c ============================================================================== --- head/sys/netpfil/ipfw/ip_fw2.c Sun Mar 5 22:19:43 2017 (r314715) +++ head/sys/netpfil/ipfw/ip_fw2.c Sun Mar 5 23:48:24 2017 (r314716) @@ -382,8 +382,8 @@ iface_match(struct ifnet *ifp, ipfw_insn /* Check by name or by IP address */ if (cmd->name[0] != '\0') { /* match by name */ if (cmd->name[0] == '\1') /* use tablearg to match */ - return ipfw_lookup_table_extended(chain, cmd->p.kidx, 0, - &ifp->if_index, tablearg); + return ipfw_lookup_table(chain, cmd->p.kidx, 0, + &ifp->if_index, tablearg); /* Check name */ if (cmd->p.glob) { if (fnmatch(cmd->name, ifp->if_xname, 0) == 0) @@ -1455,86 +1455,130 @@ do { \ src_ip.s_addr); break; - case O_IP_SRC_LOOKUP: case O_IP_DST_LOOKUP: - if (is_ipv4) { - uint32_t key = - (cmd->opcode == O_IP_DST_LOOKUP) ? - dst_ip.s_addr : src_ip.s_addr; - uint32_t v = 0; - - if (cmdlen > F_INSN_SIZE(ipfw_insn_u32)) { - /* generic lookup. The key must be - * in 32bit big-endian format. - */ - v = ((ipfw_insn_u32 *)cmd)->d[1]; - if (v == 0) - key = dst_ip.s_addr; - else if (v == 1) - key = src_ip.s_addr; - else if (v == 6) /* dscp */ - key = (ip->ip_tos >> 2) & 0x3f; - else if (offset != 0) - break; - else if (proto != IPPROTO_TCP && - proto != IPPROTO_UDP) - break; - else if (v == 2) - key = dst_port; - else if (v == 3) - key = src_port; + { + void *pkey; + uint32_t vidx, key; + uint16_t keylen; + + if (cmdlen > F_INSN_SIZE(ipfw_insn_u32)) { + /* Determine lookup key type */ + vidx = ((ipfw_insn_u32 *)cmd)->d[1]; + if (vidx != 4 /* uid */ && + vidx != 5 /* jail */ && + is_ipv6 == 0 && is_ipv4 == 0) + break; + /* Determine key length */ + if (vidx == 0 /* dst-ip */ || + vidx == 1 /* src-ip */) + keylen = is_ipv6 ? + sizeof(struct in6_addr): + sizeof(in_addr_t); + else { + keylen = sizeof(key); + pkey = &key; + } + if (vidx == 0 /* dst-ip */) + pkey = is_ipv4 ? (void *)&dst_ip: + (void *)&args->f_id.dst_ip6; + else if (vidx == 1 /* src-ip */) + pkey = is_ipv4 ? (void *)&src_ip: + (void *)&args->f_id.src_ip6; + else if (vidx == 6 /* dscp */) { + if (is_ipv4) + key = ip->ip_tos >> 2; + else { + key = args->f_id.flow_id6; + key = (key & 0x0f) << 2 | + (key & 0xf000) >> 14; + } + key &= 0x3f; + } else if (vidx == 2 /* dst-port */ || + vidx == 3 /* src-port */) { + /* Skip fragments */ + if (offset != 0) + break; + /* Skip proto without ports */ + if (proto != IPPROTO_TCP && + proto != IPPROTO_UDP && + proto != IPPROTO_SCTP) + break; + if (vidx == 2 /* dst-port */) + key = dst_port; + else + key = src_port; + } #ifndef USERSPACE - else if (v == 4 || v == 5) { - check_uidgid( - (ipfw_insn_u32 *)cmd, - args, &ucred_lookup, + else if (vidx == 4 /* uid */ || + vidx == 5 /* jail */) { + check_uidgid( + (ipfw_insn_u32 *)cmd, + args, &ucred_lookup, #ifdef __FreeBSD__ - &ucred_cache); - if (v == 4 /* O_UID */) - key = ucred_cache->cr_uid; - else if (v == 5 /* O_JAIL */) - key = ucred_cache->cr_prison->pr_id; + &ucred_cache); + if (vidx == 4 /* uid */) + key = ucred_cache->cr_uid; + else if (vidx == 5 /* jail */) + key = ucred_cache->cr_prison->pr_id; #else /* !__FreeBSD__ */ - (void *)&ucred_cache); - if (v ==4 /* O_UID */) - key = ucred_cache.uid; - else if (v == 5 /* O_JAIL */) - key = ucred_cache.xid; + (void *)&ucred_cache); + if (vidx == 4 /* uid */) + key = ucred_cache.uid; + else if (vidx == 5 /* jail */) + key = ucred_cache.xid; #endif /* !__FreeBSD__ */ } #endif /* !USERSPACE */ else - break; - } - match = ipfw_lookup_table(chain, - cmd->arg1, key, &v); - if (!match) + break; + match = ipfw_lookup_table(chain, + cmd->arg1, keylen, pkey, &vidx); + if (!match) + break; + tablearg = vidx; break; - if (cmdlen == F_INSN_SIZE(ipfw_insn_u32)) - match = ((ipfw_insn_u32 *)cmd)->d[0] == - TARG_VAL(chain, v, tag); - else - tablearg = v; + } + /* cmdlen =< F_INSN_SIZE(ipfw_insn_u32) */ + /* FALLTHROUGH */ + } + case O_IP_SRC_LOOKUP: + { + void *pkey; + uint32_t vidx; + uint16_t keylen; + + if (is_ipv4) { + keylen = sizeof(in_addr_t); + if (cmd->opcode == O_IP_DST_LOOKUP) + pkey = &dst_ip; + else + pkey = &src_ip; } else if (is_ipv6) { - uint32_t v = 0; - void *pkey = (cmd->opcode == O_IP_DST_LOOKUP) ? - &args->f_id.dst_ip6: &args->f_id.src_ip6; - match = ipfw_lookup_table_extended(chain, - cmd->arg1, - sizeof(struct in6_addr), - pkey, &v); - if (cmdlen == F_INSN_SIZE(ipfw_insn_u32)) - match = ((ipfw_insn_u32 *)cmd)->d[0] == - TARG_VAL(chain, v, tag); - if (match) - tablearg = v; + keylen = sizeof(struct in6_addr); + if (cmd->opcode == O_IP_DST_LOOKUP) + pkey = &args->f_id.dst_ip6; + else + pkey = &args->f_id.src_ip6; + } else + break; + match = ipfw_lookup_table(chain, cmd->arg1, + keylen, pkey, &vidx); + if (!match) + break; + if (cmdlen == F_INSN_SIZE(ipfw_insn_u32)) { + match = ((ipfw_insn_u32 *)cmd)->d[0] == + TARG_VAL(chain, vidx, tag); + if (!match) + break; } + tablearg = vidx; break; + } case O_IP_FLOW_LOOKUP: { uint32_t v = 0; - match = ipfw_lookup_table_extended(chain, + match = ipfw_lookup_table(chain, cmd->arg1, 0, &args->f_id, &v); if (cmdlen == F_INSN_SIZE(ipfw_insn_u32)) match = ((ipfw_insn_u32 *)cmd)->d[0] == Modified: head/sys/netpfil/ipfw/ip_fw_private.h ============================================================================== --- head/sys/netpfil/ipfw/ip_fw_private.h Sun Mar 5 22:19:43 2017 (r314715) +++ head/sys/netpfil/ipfw/ip_fw_private.h Sun Mar 5 23:48:24 2017 (r314716) @@ -741,10 +741,8 @@ struct table_info; typedef int (table_lookup_t)(struct table_info *ti, void *key, uint32_t keylen, uint32_t *val); -int ipfw_lookup_table(struct ip_fw_chain *ch, uint16_t tbl, in_addr_t addr, - uint32_t *val); -int ipfw_lookup_table_extended(struct ip_fw_chain *ch, uint16_t tbl, - uint16_t plen, void *paddr, uint32_t *val); +int ipfw_lookup_table(struct ip_fw_chain *ch, uint16_t tbl, uint16_t plen, + void *paddr, uint32_t *val); struct named_object *ipfw_objhash_lookup_table_kidx(struct ip_fw_chain *ch, uint16_t kidx); int ipfw_ref_table(struct ip_fw_chain *ch, ipfw_obj_ntlv *ntlv, uint16_t *kidx); Modified: head/sys/netpfil/ipfw/ip_fw_sockopt.c ============================================================================== --- head/sys/netpfil/ipfw/ip_fw_sockopt.c Sun Mar 5 22:19:43 2017 (r314715) +++ head/sys/netpfil/ipfw/ip_fw_sockopt.c Sun Mar 5 23:48:24 2017 (r314716) @@ -1826,6 +1826,8 @@ check_ipfw_rule_body(ipfw_insn *cmd, int break; case O_IP_SRC_LOOKUP: + if (cmdlen > F_INSN_SIZE(ipfw_insn_u32)) + goto bad_size; case O_IP_DST_LOOKUP: if (cmd->arg1 >= V_fw_tables_max) { printf("ipfw: invalid table number %d\n", Modified: head/sys/netpfil/ipfw/ip_fw_table.c ============================================================================== --- head/sys/netpfil/ipfw/ip_fw_table.c Sun Mar 5 22:19:43 2017 (r314715) +++ head/sys/netpfil/ipfw/ip_fw_table.c Sun Mar 5 23:48:24 2017 (r314716) @@ -1657,30 +1657,13 @@ ipfw_unref_table(struct ip_fw_chain *ch, } /* - * Lookup an IP @addr in table @tbl. - * Stores found value in @val. - * - * Returns 1 if @addr was found. - */ -int -ipfw_lookup_table(struct ip_fw_chain *ch, uint16_t tbl, in_addr_t addr, - uint32_t *val) -{ - struct table_info *ti; - - ti = KIDX_TO_TI(ch, tbl); - - return (ti->lookup(ti, &addr, sizeof(in_addr_t), val)); -} - -/* * Lookup an arbtrary key @paddr of legth @plen in table @tbl. * Stores found value in @val. * * Returns 1 if key was found. */ int -ipfw_lookup_table_extended(struct ip_fw_chain *ch, uint16_t tbl, uint16_t plen, +ipfw_lookup_table(struct ip_fw_chain *ch, uint16_t tbl, uint16_t plen, void *paddr, uint32_t *val) { struct table_info *ti; From owner-svn-src-head@freebsd.org Sun Mar 5 23:59:05 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9C716CFA48E; Sun, 5 Mar 2017 23:59:05 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6C4B919C6; Sun, 5 Mar 2017 23:59:05 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v25Nx419036666; Sun, 5 Mar 2017 23:59:04 GMT (envelope-from alc@FreeBSD.org) Received: (from alc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v25Nx41P036665; Sun, 5 Mar 2017 23:59:04 GMT (envelope-from alc@FreeBSD.org) Message-Id: <201703052359.v25Nx41P036665@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org using -f From: Alan Cox Date: Sun, 5 Mar 2017 23:59:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314717 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 23:59:05 -0000 Author: alc Date: Sun Mar 5 23:59:04 2017 New Revision: 314717 URL: https://svnweb.freebsd.org/changeset/base/314717 Log: Style and punctuation fixes. Reviewed by: kib MFC after: 3 days Modified: head/sys/kern/imgact_elf.c Modified: head/sys/kern/imgact_elf.c ============================================================================== --- head/sys/kern/imgact_elf.c Sun Mar 5 23:48:24 2017 (r314716) +++ head/sys/kern/imgact_elf.c Sun Mar 5 23:59:04 2017 (r314717) @@ -405,7 +405,7 @@ __elfN(map_partial)(vm_map_t map, vm_obj /* * Find the page from the underlying object. */ - if (object) { + if (object != NULL) { sf = vm_imgact_map_page(object, offset); if (sf == NULL) return (KERN_FAILURE); @@ -433,7 +433,7 @@ __elfN(map_insert)(struct image_params * if (start != trunc_page(start)) { rv = __elfN(map_partial)(map, object, offset, start, round_page(start), prot); - if (rv) + if (rv != KERN_SUCCESS) return (rv); offset += round_page(start) - start; start = round_page(start); @@ -441,7 +441,7 @@ __elfN(map_insert)(struct image_params * if (end != round_page(end)) { rv = __elfN(map_partial)(map, object, offset + trunc_page(end) - start, trunc_page(end), end, prot); - if (rv) + if (rv != KERN_SUCCESS) return (rv); end = trunc_page(end); } @@ -531,7 +531,7 @@ __elfN(load_section)(struct image_params * We have two choices. We can either clear the data in the last page * of an oversized mapping, or we can start the anon mapping a page * early and copy the initialized data into that first page. We - * choose the second.. + * choose the second. */ if (memsz > filsz) map_len = trunc_page_ps(offset + filsz, pagesize) - file_addr; From owner-svn-src-head@freebsd.org Mon Mar 6 00:26:50 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 04DB3CFAC7F; Mon, 6 Mar 2017 00:26:50 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-wm0-x22c.google.com (mail-wm0-x22c.google.com [IPv6:2a00:1450:400c:c09::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 8EBDC185C; Mon, 6 Mar 2017 00:26:49 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by mail-wm0-x22c.google.com with SMTP id n11so52258474wma.0; Sun, 05 Mar 2017 16:26:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=tkDxyB/6S+DwAmmqeA48+fURT5QuQm8Yagx9RFvP3Q4=; b=ds5J3ss4hHtRV8mr8iX1bBsfcgbUYJkDDdd5q4o+VSLbyvYlUKgkGDibi6rTwuNiTa LpGkzr3IL539H/b/Xbyh5jOoBIAKAksP051MpPSR2hh/XB52sEGbJCVSx3c9bBsCF28x wC7U2oacuww7e3dtUujV50lfCRx/m4xshJsG+w1vIU6YqZGGo38uBh52yG61UzDSoH/1 7KWRFS5fMr+XKv1BWEK9byqeETaCASt+4W+w87BNDXj5d4n8+STOn59tEVD61YrZ9VqH 2v/buFYyqGpD2YzlnUQRj0CAgsH1oJ96RuoIjdiw/f1HAg2ovYaF2J4Rg//71bd09VMK IKFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=tkDxyB/6S+DwAmmqeA48+fURT5QuQm8Yagx9RFvP3Q4=; b=q1M0aKagmaY5xiyTgpvJ4pPRkjYFWIFvxbZ+vC1XuCXUUrUxgtR+49SeTARVN034dA Su36gx/HhI9B2Lz1chyynN+x3jCp98DPgOtY15+cZhq98f5MNlLNwaJm/0M+lz0B46mj J6q5qUPEihcedkXXUSUbhQmsxVLhKsiRIDslv9jyatohbSBAsGWo26uMgC0YTCQro0Z7 RXw4CkB3m8C9wwrsX887qFl4pQhKyJKw98HYxqMhGF9JYDSlemntZNKN+g4ZucGiAM3U hY9XUpiDXQ5jXVBbmVaZQI6dlt3b4VpWhcisxUun2fB5F22dNHY6kcBBAd7vac+4jqyT CivQ== X-Gm-Message-State: AMke39mbKTjjvsm6/Gc+IUN4uq47cZO64fznS3ahXweYEL8mGGBc3kCJseeyODbJWPy7z8gL/sXXPsEfJas5ag== X-Received: by 10.28.21.81 with SMTP id 78mr10413104wmv.138.1488760005632; Sun, 05 Mar 2017 16:26:45 -0800 (PST) MIME-Version: 1.0 Received: by 10.28.128.133 with HTTP; Sun, 5 Mar 2017 16:26:45 -0800 (PST) In-Reply-To: References: <201703042307.v24N7sSx021021@repo.freebsd.org> From: Adrian Chadd Date: Sun, 5 Mar 2017 16:26:45 -0800 Message-ID: Subject: Re: svn commit: r314687 - head/sys/dev/iwn To: Andriy Voskoboinyk Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Mar 2017 00:26:50 -0000 Yeah. I mean, iwn and wpi are almost the same damned firmware API and hardware... kinda silly isn't it? :) I kinda wonder whether we should just unify them. -adrian On 4 March 2017 at 18:05, Andriy Voskoboinyk wrote: > Sun, 05 Mar 2017 02:37:09 +0200 =D0=B1=D1=83=D0=BB=D0=BE =D0=BD=D0=B0=D0= =BF=D0=B8=D1=81=D0=B0=D0=BD=D0=BE Adrian Chadd > : > > Hi! > > Actually, the intention is simpler - redo all the work for wpi(4) here > to bring in everything what it can - ad-hoc, hostap, aes-ccm etc > > >> hihi! >> >> So the eventualy-ish attention is that if someone wanted to finish >> p2p/tdls support they could use this function for either context. But >> it don't think the feature was ever finished, because we don't have >> p2p/tdls support yet. >> >> Well, yet. It's coming. :) >> >> >> >> -adrian >> >> >> On 4 March 2017 at 15:07, Andriy Voskoboinyk wrote: >>> >>> Author: avos >>> Date: Sat Mar 4 23:07:54 2017 >>> New Revision: 314687 >>> URL: https://svnweb.freebsd.org/changeset/base/314687 >>> >>> Log: >>> iwn: drop 'channel' parameter from iwn*_set_txpower() >>> >>> For 4965 just extract 'is_chan_5ghz' flag from the RXON structure >>> (like it was done in r281287); for others it was never used. >>> >>> Tested with Intel 6205, STA mode. >>> >>> Modified: >>> head/sys/dev/iwn/if_iwn.c >>> head/sys/dev/iwn/if_iwnvar.h >>> >>> Modified: head/sys/dev/iwn/if_iwn.c >>> >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- head/sys/dev/iwn/if_iwn.c Sat Mar 4 22:58:34 2017 (r31468= 6) >>> +++ head/sys/dev/iwn/if_iwn.c Sat Mar 4 23:07:54 2017 (r31468= 7) >>> @@ -254,10 +254,8 @@ static void iwn_set_led(struct iwn_softc >>> static int iwn_set_critical_temp(struct iwn_softc *); >>> static int iwn_set_timing(struct iwn_softc *, struct ieee80211_nod= e >>> *); >>> static void iwn4965_power_calibration(struct iwn_softc *, int); >>> -static int iwn4965_set_txpower(struct iwn_softc *, >>> - struct ieee80211_channel *, int); >>> -static int iwn5000_set_txpower(struct iwn_softc *, >>> - struct ieee80211_channel *, int); >>> +static int iwn4965_set_txpower(struct iwn_softc *, int); >>> +static int iwn5000_set_txpower(struct iwn_softc *, int); >>> static int iwn4965_get_rssi(struct iwn_softc *, struct iwn_rx_stat >>> *); >>> static int iwn5000_get_rssi(struct iwn_softc *, struct iwn_rx_stat >>> *); >>> static int iwn_get_noise(const struct iwn_rx_general_stats *); >>> @@ -5510,7 +5508,6 @@ iwn_set_timing(struct iwn_softc *sc, str >>> static void >>> iwn4965_power_calibration(struct iwn_softc *sc, int temp) >>> { >>> - struct ieee80211com *ic =3D &sc->sc_ic; >>> >>> DPRINTF(sc, IWN_DEBUG_TRACE, "->Doing %s\n", __func__); >>> >>> @@ -5520,7 +5517,7 @@ iwn4965_power_calibration(struct iwn_sof >>> if (abs(temp - sc->temp) >=3D 3) { >>> /* Record temperature of last calibration. */ >>> sc->temp =3D temp; >>> - (void)iwn4965_set_txpower(sc, ic->ic_bsschan, 1); >>> + (void)iwn4965_set_txpower(sc, 1); >>> } >>> } >>> >>> @@ -5530,8 +5527,7 @@ iwn4965_power_calibration(struct iwn_sof >>> * the current temperature and the current voltage. >>> */ >>> static int >>> -iwn4965_set_txpower(struct iwn_softc *sc, struct ieee80211_channel *ch= , >>> - int async) >>> +iwn4965_set_txpower(struct iwn_softc *sc, int async) >>> { >>> /* Fixed-point arithmetic division using a n-bit fractional part. */ >>> #define fdivround(a, b, n) \ >>> @@ -5546,20 +5542,21 @@ iwn4965_set_txpower(struct iwn_softc *sc >>> struct iwn4965_eeprom_chan_samples *chans; >>> const uint8_t *rf_gain, *dsp_gain; >>> int32_t vdiff, tdiff; >>> - int i, c, grp, maxpwr; >>> + int i, is_chan_5ghz, c, grp, maxpwr; >>> uint8_t chan; >>> >>> sc->rxon =3D &sc->rx_on[IWN_RXON_BSS_CTX]; >>> /* Retrieve current channel from last RXON. */ >>> chan =3D sc->rxon->chan; >>> + is_chan_5ghz =3D (sc->rxon->flags & htole32(IWN_RXON_24GHZ)) = =3D=3D 0; >>> DPRINTF(sc, IWN_DEBUG_RESET, "setting TX power for channel %d\n= ", >>> chan); >>> >>> memset(&cmd, 0, sizeof cmd); >>> - cmd.band =3D IEEE80211_IS_CHAN_5GHZ(ch) ? 0 : 1; >>> + cmd.band =3D is_chan_5ghz ? 0 : 1; >>> cmd.chan =3D chan; >>> >>> - if (IEEE80211_IS_CHAN_5GHZ(ch)) { >>> + if (is_chan_5ghz) { >>> maxpwr =3D sc->maxpwr5GHz; >>> rf_gain =3D iwn4965_rf_gain_5ghz; >>> dsp_gain =3D iwn4965_dsp_gain_5ghz; >>> @@ -5681,8 +5678,7 @@ iwn4965_set_txpower(struct iwn_softc *sc >>> } >>> >>> static int >>> -iwn5000_set_txpower(struct iwn_softc *sc, struct ieee80211_channel *ch= , >>> - int async) >>> +iwn5000_set_txpower(struct iwn_softc *sc, int async) >>> { >>> struct iwn5000_cmd_txpower cmd; >>> int cmdid; >>> @@ -6693,7 +6689,7 @@ iwn_config(struct iwn_softc *sc) >>> } >>> >>> /* Configuration has changed, set TX power accordingly. */ >>> - if ((error =3D ops->set_txpower(sc, ic->ic_curchan, 0)) !=3D 0)= { >>> + if ((error =3D ops->set_txpower(sc, 0)) !=3D 0) { >>> device_printf(sc->sc_dev, "%s: could not set TX power\n= ", >>> __func__); >>> return error; >>> @@ -7096,7 +7092,7 @@ iwn_auth(struct iwn_softc *sc, struct ie >>> } >>> >>> /* Configuration has changed, set TX power accordingly. */ >>> - if ((error =3D ops->set_txpower(sc, ni->ni_chan, 1)) !=3D 0) { >>> + if ((error =3D ops->set_txpower(sc, 1)) !=3D 0) { >>> device_printf(sc->sc_dev, >>> "%s: could not set TX power, error %d\n", __func__, >>> error); >>> return error; >>> @@ -7180,7 +7176,7 @@ iwn_run(struct iwn_softc *sc, struct iee >>> } >>> >>> /* Configuration has changed, set TX power accordingly. */ >>> - if ((error =3D ops->set_txpower(sc, ni->ni_chan, 1)) !=3D 0) { >>> + if ((error =3D ops->set_txpower(sc, 1)) !=3D 0) { >>> device_printf(sc->sc_dev, >>> "%s: could not set TX power, error %d\n", __func__, >>> error); >>> return error; >>> >>> Modified: head/sys/dev/iwn/if_iwnvar.h >>> >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- head/sys/dev/iwn/if_iwnvar.h Sat Mar 4 22:58:34 2017 >>> (r314686) >>> +++ head/sys/dev/iwn/if_iwnvar.h Sat Mar 4 23:07:54 2017 >>> (r314687) >>> @@ -206,8 +206,7 @@ struct iwn_ops { >>> uint16_t); >>> int (*get_temperature)(struct iwn_softc *); >>> int (*get_rssi)(struct iwn_softc *, struct >>> iwn_rx_stat *); >>> - int (*set_txpower)(struct iwn_softc *, >>> - struct ieee80211_channel *, int); >>> + int (*set_txpower)(struct iwn_softc *, int); >>> int (*init_gains)(struct iwn_softc *); >>> int (*set_gains)(struct iwn_softc *); >>> int (*add_node)(struct iwn_softc *, struct >>> iwn_node_info *, From owner-svn-src-head@freebsd.org Mon Mar 6 00:34:34 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DC757CFAFD4; Mon, 6 Mar 2017 00:34:34 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.139]) (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 92BC21E76; Mon, 6 Mar 2017 00:34:33 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id kgbZcJKKzC3JIkgbacRa7j; Sun, 05 Mar 2017 17:34:26 -0700 X-Authority-Analysis: v=2.2 cv=XbT59Mx5 c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=6Iz7jQTuP9IA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=vAimRkpKBPmu871xdtAA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id C44C7F0; Sun, 5 Mar 2017 16:34:24 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id v260YOaN028788; Sun, 5 Mar 2017 16:34:24 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201703060034.v260YOaN028788@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: "Andrey V. Elsukov" cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314716 - head/sys/netpfil/ipfw In-Reply-To: Message from "Andrey V. Elsukov" of "Sun, 05 Mar 2017 23:48:24 +0000." <201703052348.v25NmOI1032562@repo.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sun, 05 Mar 2017 16:34:24 -0800 X-CMAE-Envelope: MS4wfNgFh8FyjcN0UilmoWq9IF6mqw04q+Grk908Uq5LQC4t0lytE2wq/ugp33Uz5L5q5Yl28gfwe0VAZeC5EXYCe4SpQl/CCkvDUM6RrCPBi/itDrzXjpCY Y8b3TqJbp/5IyTIPyoE9JY3HVkUMg+fbuIIcxr33hozPBpGuUVVyhkG2ndqAGslWIlyFhyw1+74FPyGCnxuGA5lXYwkLxVpWlKhCYxqXYY4c6C7+3iqYaIFN Vv+D7ctsy5LMGLCmwEti6ZTGyzBX3Ij1T6hAjQYp1Y0KpoEqpkqTnObj983V5Rhz X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Mar 2017 00:34:35 -0000 In message <201703052348.v25NmOI1032562@repo.freebsd.org>, "Andrey V. Elsukov" writes: > Author: ae > Date: Sun Mar 5 23:48:24 2017 > New Revision: 314716 > URL: https://svnweb.freebsd.org/changeset/base/314716 > > Log: > Add IPv6 support to O_IP_DST_LOOKUP opcode. > > o check the size of O_IP_SRC_LOOKUP opcode, it can not exceed the size of > ipfw_insn_u32; > o rename ipfw_lookup_table_extended() function into ipfw_lookup_table() and > remove old ipfw_lookup_table(); > o use args->f_id.flow_id6 that is in host byte order to get DSCP value; > o add SCTP ports support to 'lookup src/dst-port' opcode; > o add IPv6 support to 'lookup src/dst-ip' opcode. > > PR: 217292 > Reviewed by: melifaro > MFC after: 2 weeks > Sponsored by: Yandex LLC > Differential Revision: https://reviews.freebsd.org/D9873 > > Modified: > head/sys/netpfil/ipfw/ip_fw2.c > head/sys/netpfil/ipfw/ip_fw_private.h > head/sys/netpfil/ipfw/ip_fw_sockopt.c > head/sys/netpfil/ipfw/ip_fw_table.c I seem to bad luck this week. This broke the build in a couple of places next to each other. Does this look good? Index: nat64/nat64stl.c =================================================================== --- nat64/nat64stl.c (revision 314717) +++ nat64/nat64stl.c (working copy) @@ -184,7 +184,7 @@ * IPv4 mapped address. */ ip6i = mtodo(m, hlen); - if (ipfw_lookup_table_extended(chain, cfg->map64, + if (ipfw_lookup_table(chain, cfg->map64, sizeof(struct in6_addr), &ip6i->ip6_dst, &tablearg) == 0) { m_freem(m); return (NAT64RETURN); @@ -220,10 +220,10 @@ switch (args->f_id.addr_type) { case 4: ret = ipfw_lookup_table(chain, cfg->map46, - htonl(args->f_id.dst_ip), &tablearg); + sizeof(dst_ip), htonl(args->f_id.dst_ip), &tablearg); break; case 6: - ret = ipfw_lookup_table_extended(chain, cfg->map64, + ret = ipfw_lookup_table(chain, cfg->map64, sizeof(struct in6_addr), &args->f_id.src_ip6, &tablearg); break; default: -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. From owner-svn-src-head@freebsd.org Mon Mar 6 00:41:36 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 24268CF79EB; Mon, 6 Mar 2017 00:41:36 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 02EC417B2; Mon, 6 Mar 2017 00:41:36 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net [73.231.226.104]) by mail.baldwin.cx (Postfix) with ESMTPSA id 13EBC10A7FA; Sun, 5 Mar 2017 19:41:34 -0500 (EST) From: John Baldwin To: Pedro Giffuni Cc: Slawa Olhovchenkov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314669 - head/sys/i386/conf Date: Sun, 05 Mar 2017 15:24:59 -0800 Message-ID: <1537596.qhqdTsTLLF@ralph.baldwin.cx> User-Agent: KMail/4.14.10 (FreeBSD/11.0-STABLE; KDE/4.14.10; amd64; ; ) In-Reply-To: References: <201703041504.v24F4HMh023937@repo.freebsd.org> <7873439.f6BlOXHt6g@ralph.baldwin.cx> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Sun, 05 Mar 2017 19:41:34 -0500 (EST) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Mar 2017 00:41:36 -0000 On Saturday, March 04, 2017 08:14:11 PM Pedro Giffuni wrote: > > On 3/4/2017 5:51 PM, John Baldwin wrote: > > On Saturday, March 04, 2017 03:49:52 PM Pedro Giffuni wrote: > >>> Il giorno 04 mar 2017, alle ore 14:43, John Baldwin ha scritto: > >>> > >>> On Saturday, March 04, 2017 10:52:46 AM Pedro Giffuni wrote: > >>>> On 03/04/17 10:32, Slawa Olhovchenkov wrote: > >>>>> On Sat, Mar 04, 2017 at 03:04:17PM +0000, Pedro F. Giffuni wrote: > >>>>> > >>>>>> Author: pfg > >>>>>> Date: Sat Mar 4 15:04:17 2017 > >>>>>> New Revision: 314669 > >>>>>> URL: https://svnweb.freebsd.org/changeset/base/314669 > >>>>>> > >>>>>> Log: > >>>>>> Drop i486 from the default i386 GENERIC kernel configuration. > >>>>>> > >>>>>> 80486 production was stopped by Intel on September 2007. Dropping the 486 > >>>>>> configuration option from the GENERIC kernel improves performance > >>>>>> slightly. > >>>>>> > >>>>>> Removing I486_CPU is consistent at this time: we don't support any > >>>>>> processor without a FPU and the PC-98 arch, which frequently involved i486 > >>>>>> CPUs, is also gone so we don't test such platforms anymore. > >>>>> What is realy mean? > >>>> This means we don't do work-arounds that would be required for raw 486. > >>>> Instead we will use the 586 instructions by default. > >>> This doesn't change that. The kernel already has runtime tests in place > >>> for new things on 486 and later via cpuid. > >>> > >> Hmm ..then I am wondering if I effectively changed anything? > > The only change is a 486 now panics on boot when it used to work fine. :-/ > > > > Nothing for other CPUs has changed. > > Not much has been lost then. > FWIW, I have a "Pentium overdrive" somewhere in the basement which could > theoretically boot FreeBSD 12 but last I remember just rebuilding a > kernel was painful and the memory and HD limitations really make it a no-go. So I would rather support 486 in GENERIC or not support it at all. It doesn't cost anything for it to be in GENERIC, so if we have it, I think we should ship it. Also, the original justification for this commit of a 4% performance gain doesn't seem to have any basis in fact. The one gain I can think of is de-cluttering some things like identcpu.c and initcpu.c which can only happen if we remove code entirely, not from removing an option in GENERIC. -- John Baldwin From owner-svn-src-head@freebsd.org Mon Mar 6 00:41:38 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD9F0CF7A23; Mon, 6 Mar 2017 00:41:38 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.139]) (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 8311D17E3; Mon, 6 Mar 2017 00:41:38 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id kgiWcJMTJC3JIkgiXcRbIw; Sun, 05 Mar 2017 17:41:37 -0700 X-Authority-Analysis: v=2.2 cv=XbT59Mx5 c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=6Iz7jQTuP9IA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=VKfOjvUPJFuBEwFil5AA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 4B70411A; Sun, 5 Mar 2017 16:41:36 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id v260fa9C078041; Sun, 5 Mar 2017 16:41:36 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201703060041.v260fa9C078041@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Cy Schubert cc: "Andrey V. Elsukov" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314716 -