From pyunyh at gmail.com Wed Jul 1 00:57:19 2009 From: pyunyh at gmail.com (Pyun YongHyeon) Date: Wed Jul 1 00:57:26 2009 Subject: svn commit: r195200 - in head/usr.sbin: . wake In-Reply-To: <200906301851.n5UIpNJQ089171@svn.freebsd.org> References: <200906301851.n5UIpNJQ089171@svn.freebsd.org> Message-ID: <20090701005459.GC13137@michelle.cdnetworks.co.kr> On Tue, Jun 30, 2009 at 06:51:23PM +0000, Martin Blapp wrote: > Author: mbr > Date: Tue Jun 30 18:51:22 2009 > New Revision: 195200 > URL: http://svn.freebsd.org/changeset/base/195200 > > Log: > Add wake, a tool to send Wake on LAN frames to hosts on a local Ethernet network > > Submitted by: Marc Balmer > Reviewed by: rwatson > Approved by: re > Nice! I guess I can now remove installed net/wol ports which does not work as expected when system have multiple interfaces. And I didn't understand why it requires perl to build such a simple utility. From kensmith at cse.Buffalo.EDU Wed Jul 1 01:56:56 2009 From: kensmith at cse.Buffalo.EDU (Ken Smith) Date: Wed Jul 1 01:57:03 2009 Subject: svn commit: r195200 - in head/usr.sbin: . wake In-Reply-To: <20090630.164009.2130804684.imp@bsdimp.com> References: <0E6D4FB2-A485-40ED-A856-ACC311A90EFE@msys.ch> <20090630.141340.289711551.imp@bsdimp.com> <7B9C309F-63E3-4CB8-9871-DE2DEE010096@msys.ch> <20090630.164009.2130804684.imp@bsdimp.com> Message-ID: <1246413402.70460.23.camel@bauer.cse.buffalo.edu> On Tue, 2009-06-30 at 16:40 -0600, M. Warner Losh wrote: > I hate to be blunt, but this leaves a bad taste in everybody's mouth, > even if at the end of the day you get your way. Translation: I did it again. I hate it when that happens... :-( Two things happened here that were a bit unfortunate, and Marc/Martin (most likely unintentionally) tripped over it. The first thing that left a bad taste in some peoples' mouth is this new thing got approved past the point I had said many times was to be the end of new things getting added. But people complained the warnings I had given were buried in messages that had too much other information in them instead of short and to-the-point messages. So deadlines for a few things got extended in short and to-the-point messages yesterday and this pending request fell into one of those categories. The second thing that left a bad taste in some peoples' mouth is that this apparently (strictly judging by the fallout discussions) didn't get as much peer review as some people would have liked. Normally some level of discussion happens on some public mailing lists (not private email among a few potentially interested parties). And even after that happens and the commit gets made there is some time for fallout discussions to happen. Depending on the results of those potentially lengthy discussions it might wind up being backed out. But because of the stage of the release cycle we're in me having approved this can be viewed as short-circuiting the normal public review because odds are it will wind up staying despite some peoples' opinions due to the stage of the release cycle we're in. That second thing is one of the things that I think we're stuck with as part of the release process, but I really need help from you folks on. It's very much like the rant I made about the commit requests. And like I said above I fell for this before, during the 7.0 release cycle. During that release cycle it resulted in a rant with the subject line "I'm not Head Dictator In Charge". People complain if we lock out *all* new additions, even ones as relatively simple as a new command, too early in the release cycle. So we *consider* allowing new stuff that truly shouldn't impact the stability of the pending release until right around now in the release cycle. But we need to be able to trust that if you send in a commit request for something new like this that you've already done the peer review type stuff. RE approval for something like this doesn't trump normal peer review. The alternative is to flat out lock out *all* new stuff no matter how seemingly simple it is earlier in the release cycle just to avoid the problem that maybe someone will try to sneak something through without sufficient peer review. Thanks... -- Ken Smith - From there to here, from here to | kensmith@cse.buffalo.edu there, funny things are everywhere. | - Theodore Geisel | -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 195 bytes Desc: This is a digitally signed message part Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20090701/a8c372b6/attachment.pgp From gad at FreeBSD.org Wed Jul 1 02:29:58 2009 From: gad at FreeBSD.org (Garance A Drosehn) Date: Wed Jul 1 02:30:04 2009 Subject: svn commit: r195200 - in head/usr.sbin: . wake In-Reply-To: <4A4A7F0B.1010001@freebsd.org> References: <200906301851.n5UIpNJQ089171@svn.freebsd.org> <4A4A626A.4080801@freebsd.org> <5A796102-063B-4032-92C9-EC97AF2E5D5B@msys.ch> <4A4A7F0B.1010001@freebsd.org> Message-ID: At 2:09 PM -0700 6/30/09, Sam Leffler wrote: > >I have yet to hear a compelling argument for why wake was chosen >over an existing tool that's been successfully used for a while. >OTOH this isn't something that'll keep me up at night; it just seems >like an ill-advised rush job that completely violates the intent of >the 8.0 code freeze.. > > Sam I agree completely with what Sam is saying here. I don't see why this had to be done at the time it was done (WRT a code freeze), and without any discussion about adding it to FreeBSD. I also agree that it won't be keeping me up at night, because I'm about to go on vacation for 10-12 days here. But as Warner noted, "this leaves a bad taste in everybody's mouth, even if at the end of the day you get your way" -- Garance Alistair Drosehn = drosehn@rpi.edu Senior Systems Programmer or gad@FreeBSD.org Rensselaer Polytechnic Institute; Troy, NY; USA From brooks at FreeBSD.org Wed Jul 1 02:47:36 2009 From: brooks at FreeBSD.org (Brooks Davis) Date: Wed Jul 1 02:47:47 2009 Subject: svn commit: r195200 - in head/usr.sbin: . wake In-Reply-To: <1246413402.70460.23.camel@bauer.cse.buffalo.edu> References: <0E6D4FB2-A485-40ED-A856-ACC311A90EFE@msys.ch> <20090630.141340.289711551.imp@bsdimp.com> <7B9C309F-63E3-4CB8-9871-DE2DEE010096@msys.ch> <20090630.164009.2130804684.imp@bsdimp.com> <1246413402.70460.23.camel@bauer.cse.buffalo.edu> Message-ID: <20090701022257.GA9820@lor.one-eyed-alien.net> On Tue, Jun 30, 2009 at 09:56:42PM -0400, Ken Smith wrote: > On Tue, 2009-06-30 at 16:40 -0600, M. Warner Losh wrote: > > I hate to be blunt, but this leaves a bad taste in everybody's mouth, > > even if at the end of the day you get your way. > > The second thing that left a bad taste in some peoples' mouth is that > this apparently (strictly judging by the fallout discussions) didn't get > as much peer review as some people would have liked. Normally some > level of discussion happens on some public mailing lists (not private > email among a few potentially interested parties). And even after that > happens and the commit gets made there is some time for fallout > discussions to happen. Depending on the results of those potentially > lengthy discussions it might wind up being backed out. But because of > the stage of the release cycle we're in me having approved this can be > viewed as short-circuiting the normal public review because odds are it > will wind up staying despite some peoples' opinions due to the stage of > the release cycle we're in. Given that it doesn't make any significant difference if it makes it into the base for 8.0 (especially given that ports are still open). I'd say the only right course of action is to back it out. I personally wouldn't be surprised if some form of it made it in to a future release, but basically nothing was right with this commit (zero prior discussion, contained trivial bugs, last minute addition). -- Brooks -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 187 bytes Desc: not available Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20090701/aa587ac1/attachment.pgp From rnoland at FreeBSD.org Wed Jul 1 04:02:03 2009 From: rnoland at FreeBSD.org (Robert Noland) Date: Wed Jul 1 04:02:10 2009 Subject: svn commit: r195200 - in head/usr.sbin: . wake In-Reply-To: <1246413402.70460.23.camel@bauer.cse.buffalo.edu> References: <0E6D4FB2-A485-40ED-A856-ACC311A90EFE@msys.ch> <20090630.141340.289711551.imp@bsdimp.com> <7B9C309F-63E3-4CB8-9871-DE2DEE010096@msys.ch> <20090630.164009.2130804684.imp@bsdimp.com> <1246413402.70460.23.camel@bauer.cse.buffalo.edu> Message-ID: <1246420905.1855.19.camel@balrog.2hip.net> On Tue, 2009-06-30 at 21:56 -0400, Ken Smith wrote: > On Tue, 2009-06-30 at 16:40 -0600, M. Warner Losh wrote: > > I hate to be blunt, but this leaves a bad taste in everybody's mouth, > > even if at the end of the day you get your way. > > Translation: I did it again. I hate it when that happens... :-( > > Two things happened here that were a bit unfortunate, and Marc/Martin > (most likely unintentionally) tripped over it. > > The first thing that left a bad taste in some peoples' mouth is this new > thing got approved past the point I had said many times was to be the > end of new things getting added. But people complained the warnings I > had given were buried in messages that had too much other information in > them instead of short and to-the-point messages. So deadlines for a few > things got extended in short and to-the-point messages yesterday and > this pending request fell into one of those categories. If you missed the deadline because you chose to skim messages from the release manager, then so be it... If people have work that they want to get into the release, then they should be paying attention to mail from re@. I know that I have work that I would have liked to gotten in, but complications arose which made it obvious that resolving them within the remaining time before the freeze was not practical. > The second thing that left a bad taste in some peoples' mouth is that > this apparently (strictly judging by the fallout discussions) didn't get > as much peer review as some people would have liked. Normally some > level of discussion happens on some public mailing lists (not private > email among a few potentially interested parties). And even after that > happens and the commit gets made there is some time for fallout > discussions to happen. Depending on the results of those potentially > lengthy discussions it might wind up being backed out. But because of > the stage of the release cycle we're in me having approved this can be > viewed as short-circuiting the normal public review because odds are it > will wind up staying despite some peoples' opinions due to the stage of > the release cycle we're in. > > That second thing is one of the things that I think we're stuck with as > part of the release process, but I really need help from you folks on. > It's very much like the rant I made about the commit requests. And like > I said above I fell for this before, during the 7.0 release cycle. > During that release cycle it resulted in a rant with the subject line > "I'm not Head Dictator In Charge". People complain if we lock out *all* > new additions, even ones as relatively simple as a new command, too > early in the release cycle. So we *consider* allowing new stuff that > truly shouldn't impact the stability of the pending release until right > around now in the release cycle. But we need to be able to trust that > if you send in a commit request for something new like this that you've > already done the peer review type stuff. RE approval for something like > this doesn't trump normal peer review. The alternative is to flat out > lock out *all* new stuff no matter how seemingly simple it is earlier in > the release cycle just to avoid the problem that maybe someone will try > to sneak something through without sufficient peer review. A feature freeze in my mind is exactly that. re@ should be approving bug fixes only. No new work should be allowed beyond the freeze date. There is always the next release. That or people should have been paying attention and gotten things into the tree on time with appropriate review. robert. > Thanks... -- Robert Noland FreeBSD -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 196 bytes Desc: This is a digitally signed message part Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20090701/e8624081/attachment.pgp From doconnor at gsoft.com.au Wed Jul 1 03:34:03 2009 From: doconnor at gsoft.com.au (Daniel O'Connor) Date: Wed Jul 1 04:47:38 2009 Subject: svn commit: r194628 - head/lib/ncurses/ncurses In-Reply-To: <9bbcef730906301432i13e283e0lb955fecc590f25de@mail.gmail.com> References: <20090630.094632.195416436.imp@bsdimp.com> <20090630.150658.1306326527.imp@bsdimp.com> <9bbcef730906301432i13e283e0lb955fecc590f25de@mail.gmail.com> Message-ID: <200907011303.28877.doconnor@gsoft.com.au> On Wed, 1 Jul 2009, Ivan Voras wrote: > > Looks like "setenv LESS -X" or "export LESS=-X" would do the same > > thing, no? ?And work for "more" too... > > Would it be possible to set it by default in /etc/csh.login (or > wherever is more appropriate) if the termcap change goes in? How about vi? Can that be fixed (if it needs it)? About the only use for clearing the screen is when you logout IMO, it is so frustrating otherwise (IMO of course :) -- Daniel O'Connor software and network engineer for Genesis Software - http://www.gsoft.com.au "The nice thing about standards is that there are so many of them to choose from." -- Andrew Tanenbaum GPG Fingerprint - 5596 B766 97C0 0E94 4347 295E E593 DC20 7B3F CE8C -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 188 bytes Desc: This is a digitally signed message part. Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20090701/c2b6ae8a/attachment.pgp From joel at FreeBSD.org Wed Jul 1 04:52:08 2009 From: joel at FreeBSD.org (Joel Dahl) Date: Wed Jul 1 04:52:14 2009 Subject: svn commit: r195200 - in head/usr.sbin: . wake In-Reply-To: <200906301851.n5UIpNJQ089171@svn.freebsd.org> References: <200906301851.n5UIpNJQ089171@svn.freebsd.org> Message-ID: <4A4AEB75.9070109@FreeBSD.org> Martin Blapp skrev: > Author: mbr > Date: Tue Jun 30 18:51:22 2009 > New Revision: 195200 > URL: http://svn.freebsd.org/changeset/base/195200 > > Log: > Add wake, a tool to send Wake on LAN frames to hosts on a local Ethernet network Nice. Now I can finally nuke net/wol from my systems. -- Joel From Martin.Blapp at t-systems.ch Wed Jul 1 05:15:40 2009 From: Martin.Blapp at t-systems.ch (Blapp, Martin) Date: Wed Jul 1 05:15:47 2009 Subject: AW: svn commit: r195200 - in head/usr.sbin: . wake In-Reply-To: <1246413402.70460.23.camel@bauer.cse.buffalo.edu> References: <0E6D4FB2-A485-40ED-A856-ACC311A90EFE@msys.ch> <20090630.141340.289711551.imp@bsdimp.com> <7B9C309F-63E3-4CB8-9871-DE2DEE010096@msys.ch> <20090630.164009.2130804684.imp@bsdimp.com>, <1246413402.70460.23.camel@bauer.cse.buffalo.edu> Message-ID: <509A7CA1EA3EA046B1A5BA2FCFDB3C8EECC53324B6@TSS-EXCH01.t-systems.ch> Hi folks, I really was not my or Marcs intention to skip any discussions. Rwatson told us that if we like to see it in 8.0, we need to approve it by RE and commit it before the 1. of july, and that's what I've done. Sorry if I've upset anyone. Personally I think the tool is quite handy, better than net/wol (which doesn't seem to work with different interfaces), wake doesn't need any strange libaries as dependencies and it just a very short one (4k) If the concensus is to back it out, I'll back it out. -- Martin From edwin at mavetju.org Wed Jul 1 05:42:15 2009 From: edwin at mavetju.org (Edwin Groothuis) Date: Wed Jul 1 05:42:28 2009 Subject: svn commit: r195200 - in head/usr.sbin: . wake In-Reply-To: <20090701005459.GC13137@michelle.cdnetworks.co.kr> References: <200906301851.n5UIpNJQ089171@svn.freebsd.org> <20090701005459.GC13137@michelle.cdnetworks.co.kr> Message-ID: <20090701054213.GA52751@mavetju.org> > Nice! I guess I can now remove installed net/wol ports which does > not work as expected when system have multiple interfaces. And I > didn't understand why it requires perl to build such a simple > utility. Have a look at the build process and you see exactly why it needs perl. The question should have been: Why didn't they write it in a .pod in the first place! :-P Edwin -- Edwin Groothuis Website: http://www.mavetju.org/ edwin@mavetju.org Weblog: http://www.mavetju.org/weblog/ From marc at msys.ch Wed Jul 1 06:13:18 2009 From: marc at msys.ch (Marc Balmer) Date: Wed Jul 1 06:13:26 2009 Subject: AW: svn commit: r195200 - in head/usr.sbin: . wake In-Reply-To: <509A7CA1EA3EA046B1A5BA2FCFDB3C8EECC53324B6@TSS-EXCH01.t-systems.ch> References: <0E6D4FB2-A485-40ED-A856-ACC311A90EFE@msys.ch> <20090630.141340.289711551.imp@bsdimp.com> <7B9C309F-63E3-4CB8-9871-DE2DEE010096@msys.ch> <20090630.164009.2130804684.imp@bsdimp.com>, <1246413402.70460.23.camel@bauer.cse.buffalo.edu> <509A7CA1EA3EA046B1A5BA2FCFDB3C8EECC53324B6@TSS-EXCH01.t-systems.ch> Message-ID: <8F849918-CCA3-4979-8138-A86529850E38@msys.ch> Am 01.07.2009 um 07:04 schrieb Blapp, Martin: > Hi folks, > > I really was not my or Marcs intention to skip any discussions. > Rwatson told us that > if we like to see it in 8.0, we need to approve it by RE and commit > it before the 1. of july, > and that's what I've done. Sorry if I've upset anyone. > > Personally I think the tool is quite handy, better than net/wol > (which doesn't seem to > work with different interfaces), wake doesn't need any strange > libaries as dependencies > and it just a very short one (4k) > > If the concensus is to back it out, I'll back it out. The only thing I can say is that this code has been around since quite some time and is in use at many places without any problems. This is nothing big, actually really small, but it is really useful. And since Wake-on-LAN is now in almost all computers I think having a tool to use it is justified. This little command can not make your computer crash, nor cause any problems, so I really do not fully understand why all the fuss around it (e.g. I find that some people are exaggerating a little bit, given how small of an addition wake(8) actually is). From marc at msys.ch Wed Jul 1 06:23:23 2009 From: marc at msys.ch (Marc Balmer) Date: Wed Jul 1 06:23:30 2009 Subject: AW: svn commit: r195200 - in head/usr.sbin: . wake In-Reply-To: <509A7CA1EA3EA046B1A5BA2FCFDB3C8EECC53324B6@TSS-EXCH01.t-systems.ch> References: <0E6D4FB2-A485-40ED-A856-ACC311A90EFE@msys.ch> <20090630.141340.289711551.imp@bsdimp.com> <7B9C309F-63E3-4CB8-9871-DE2DEE010096@msys.ch> <20090630.164009.2130804684.imp@bsdimp.com>, <1246413402.70460.23.camel@bauer.cse.buffalo.edu> <509A7CA1EA3EA046B1A5BA2FCFDB3C8EECC53324B6@TSS-EXCH01.t-systems.ch> Message-ID: <19D06995-BE7C-41EC-83B3-DB694398CE2B@msys.ch> Am 01.07.2009 um 07:04 schrieb Blapp, Martin: > > If the concensus is to back it out, I'll back it out. That would be sad. After all there were very positive reactions from folks that actually looked at the tool, the negative replies came from folks that saw some process violated, iirc.... but hey, after all the committ was approved by the _release_ engineers. I was under the impression that the _release_ folks can give such approval. It was not rush something very in new in, the code is proven and wherever it show up, people immediately see the use of it. The point is that I submittet this in an arbitrary point of my timeline, not being aware of any dates at all, because starting with FreeBSD 8.0 we want to switch a lot of POS terminals/servers to FreeBSD starting with 8.0, and for them we need wake(8). So I yes, I submited this to have it in 8.0, but no, I was not really aware that this was close to a timeline. Now that re@ approved it, where is the sense of removing it from 8.0, just to add then for 9.0? (other that it means I will have to wait for one more release cycle). From brian at Awfulhak.org Wed Jul 1 07:25:30 2009 From: brian at Awfulhak.org (Brian Somers) Date: Wed Jul 1 07:25:37 2009 Subject: svn commit: r195200 - in head/usr.sbin: . wake In-Reply-To: <20090701014553.32117b64.stas@FreeBSD.org> References: <200906301851.n5UIpNJQ089171@svn.freebsd.org> <20090701014553.32117b64.stas@FreeBSD.org> Message-ID: <20090630235624.13a526dc@dev.lan.Awfulhak.org> On Wed, 1 Jul 2009 01:45:53 +0400 Stanislav Sedov wrote: > > + p = (u_char *)&pkt; > > + len = sizeof(pkt); > > + bw = 0; > > + while (len) { > > + if ((bw = write(bpf, &pkt, sizeof(pkt))) == -1) > > + return -1; > > + len -= bw; > > + p += bw; > > + } > > + return 0; > > +} > > What the "p" pointer is used here for? I don't see any usage for it besides > incrementing it in the loop. Am I missing something? The write() has two bugs. It should be write(bpf, p, len). -- Brian Somers Don't _EVER_ lose your sense of humour ! -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 306 bytes Desc: not available Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20090701/e8623adc/signature.pgp From dfr at FreeBSD.org Wed Jul 1 07:34:29 2009 From: dfr at FreeBSD.org (Doug Rabson) Date: Wed Jul 1 07:34:35 2009 Subject: svn commit: r195228 - head/sys/amd64/amd64 Message-ID: <200907010734.n617YS3P005059@svn.freebsd.org> Author: dfr Date: Wed Jul 1 07:34:28 2009 New Revision: 195228 URL: http://svn.freebsd.org/changeset/base/195228 Log: Don't include rpcv2.h - it has been removed. Submitted by: ed@ Approved by: re Modified: head/sys/amd64/amd64/genassym.c Modified: head/sys/amd64/amd64/genassym.c ============================================================================== --- head/sys/amd64/amd64/genassym.c Wed Jul 1 01:35:37 2009 (r195227) +++ head/sys/amd64/amd64/genassym.c Wed Jul 1 07:34:28 2009 (r195228) @@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include From dfr at FreeBSD.org Wed Jul 1 07:35:57 2009 From: dfr at FreeBSD.org (Doug Rabson) Date: Wed Jul 1 07:36:04 2009 Subject: svn commit: r195229 - head Message-ID: <200907010735.n617Zva4005128@svn.freebsd.org> Author: dfr Date: Wed Jul 1 07:35:57 2009 New Revision: 195229 URL: http://svn.freebsd.org/changeset/base/195229 Log: Add an entry documenting removal of the NFS_LEGACYRPC option. Submitted by: Steve Kargl Approved by: re Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Jul 1 07:34:28 2009 (r195228) +++ head/UPDATING Wed Jul 1 07:35:57 2009 (r195229) @@ -22,6 +22,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090630: + Remove the old kernel RPC implementation and the NFS_LEGACYRPC + option. Kernel configurations may need to be adjusted. + 20090629: The network interface device nodes at /dev/net/ have been removed. All ioctl operations can be performed the normal From dfr at FreeBSD.org Wed Jul 1 07:37:22 2009 From: dfr at FreeBSD.org (Doug Rabson) Date: Wed Jul 1 07:37:29 2009 Subject: svn commit: r195230 - head Message-ID: <200907010737.n617bLLA005192@svn.freebsd.org> Author: dfr Date: Wed Jul 1 07:37:21 2009 New Revision: 195230 URL: http://svn.freebsd.org/changeset/base/195230 Log: Add usr/include/nfs/rpcv2.h Submitted by: pluknet at gmail dot com Approved by: re Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Wed Jul 1 07:35:57 2009 (r195229) +++ head/ObsoleteFiles.inc Wed Jul 1 07:37:21 2009 (r195230) @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090630: old kernel RPC implementation removal +OLD_FILES+=usr/include/nfs/rpcv2.h # 20090624: update usbdi(9) OLD_FILES+=usr/share/man/man9/usbd_abort_default_pipe.9.gz OLD_FILES+=usr/share/man/man9/usbd_abort_pipe.9.gz From mav at FreeBSD.org Wed Jul 1 08:08:57 2009 From: mav at FreeBSD.org (Alexander Motin) Date: Wed Jul 1 08:09:08 2009 Subject: svn commit: r195231 - head/sys/netgraph Message-ID: <200907010808.n6188u1q005872@svn.freebsd.org> Author: mav Date: Wed Jul 1 08:08:56 2009 New Revision: 195231 URL: http://svn.freebsd.org/changeset/base/195231 Log: Fix infinite loop in ng_iface, that happens when packet passes out via two different ng interfaces sequentially due to tunnelling. PR: kern/134557 Submitted by: Mikolaj Golub Approved by: re (kensmith) MFC after: 3 days Modified: head/sys/netgraph/ng_iface.c Modified: head/sys/netgraph/ng_iface.c ============================================================================== --- head/sys/netgraph/ng_iface.c Wed Jul 1 07:37:21 2009 (r195230) +++ head/sys/netgraph/ng_iface.c Wed Jul 1 08:08:56 2009 (r195231) @@ -382,7 +382,8 @@ ng_iface_output(struct ifnet *ifp, struc } /* Protect from deadly infinite recursion. */ - while ((mtag = m_tag_locate(m, MTAG_NGIF, MTAG_NGIF_CALLED, NULL))) { + mtag = NULL; + while ((mtag = m_tag_locate(m, MTAG_NGIF, MTAG_NGIF_CALLED, mtag))) { if (*(struct ifnet **)(mtag + 1) == ifp) { log(LOG_NOTICE, "Loop detected on %s\n", ifp->if_xname); m_freem(m); From mav at FreeBSD.org Wed Jul 1 08:43:06 2009 From: mav at FreeBSD.org (Alexander Motin) Date: Wed Jul 1 08:43:14 2009 Subject: svn commit: r195232 - in stable/7/sys: . contrib/pf netgraph Message-ID: <200907010843.n618h5Xm006670@svn.freebsd.org> Author: mav Date: Wed Jul 1 08:43:05 2009 New Revision: 195232 URL: http://svn.freebsd.org/changeset/base/195232 Log: MFC rev.194699: Mark ng_ether node hooks as HI_STACK. It is usually the last point when netgraph may unroll the call stack, and I have found that in some cases 2K guarantied there for i386 may be not enough for NIC driver and BPF. Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/netgraph/ng_ether.c Modified: stable/7/sys/netgraph/ng_ether.c ============================================================================== --- stable/7/sys/netgraph/ng_ether.c Wed Jul 1 08:08:56 2009 (r195231) +++ stable/7/sys/netgraph/ng_ether.c Wed Jul 1 08:43:05 2009 (r195232) @@ -403,7 +403,7 @@ ng_ether_newhook(node_p node, hook_p hoo /* Disable hardware checksums while 'upper' hook is connected */ if (hookptr == &priv->upper) priv->ifp->if_hwassist = 0; - + NG_HOOK_HI_STACK(hook); /* OK */ *hookptr = hook; return (0); From stas at FreeBSD.org Wed Jul 1 08:48:33 2009 From: stas at FreeBSD.org (Stanislav Sedov) Date: Wed Jul 1 08:48:39 2009 Subject: svn commit: r195213 - head/usr.sbin/wake In-Reply-To: <200906302209.n5UM9lBM093495@svn.freebsd.org> References: <200906302209.n5UM9lBM093495@svn.freebsd.org> Message-ID: <20090701124825.af0d205e.stas@FreeBSD.org> On Tue, 30 Jun 2009 22:09:47 +0000 (UTC) Martin Blapp mentioned: > Author: mbr > Date: Tue Jun 30 22:09:47 2009 > New Revision: 195213 > URL: http://svn.freebsd.org/changeset/base/195213 > > Log: > Compiles without higher warn level > > MAN= wake.8 > > -WARNS?= 2 > - I believe you wanted something like WARNS?=6 probably? Now you disabled any warnings-related compiler flags entirely. -- Stanislav Sedov ST4096-RIPE -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 801 bytes Desc: not available Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20090701/37869c7c/attachment.pgp From ed at 80386.nl Wed Jul 1 08:53:58 2009 From: ed at 80386.nl (Ed Schouten) Date: Wed Jul 1 08:54:05 2009 Subject: svn commit: r195230 - head In-Reply-To: <200907010737.n617bLLA005192@svn.freebsd.org> References: <200907010737.n617bLLA005192@svn.freebsd.org> Message-ID: <20090701085356.GE48776@hoeg.nl> Hi Doug, * Doug Rabson wrote: > Author: dfr > Date: Wed Jul 1 07:37:21 2009 > New Revision: 195230 > URL: http://svn.freebsd.org/changeset/base/195230 > > Log: > Add usr/include/nfs/rpcv2.h > > Submitted by: pluknet at gmail dot com > Approved by: re Not sure, but I think there were multiple header files that were removed yesterday. -- Ed Schouten WWW: http://80386.nl/ -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 195 bytes Desc: not available Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20090701/32fdb879/attachment.pgp From ed at 80386.nl Wed Jul 1 08:56:34 2009 From: ed at 80386.nl (Ed Schouten) Date: Wed Jul 1 08:56:45 2009 Subject: svn commit: r195230 - head In-Reply-To: <20090701085356.GE48776@hoeg.nl> References: <200907010737.n617bLLA005192@svn.freebsd.org> <20090701085356.GE48776@hoeg.nl> Message-ID: <20090701085632.GF48776@hoeg.nl> * Ed Schouten wrote: > Not sure, but I think there were multiple header files that were > removed yesterday. Never mind. They were modified, not removed. Sorry for the noise! -- Ed Schouten WWW: http://80386.nl/ -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 195 bytes Desc: not available Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20090701/30b73b52/attachment.pgp From rwatson at FreeBSD.org Wed Jul 1 08:58:57 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Wed Jul 1 08:59:09 2009 Subject: AW: svn commit: r195200 - in head/usr.sbin: . wake In-Reply-To: <509A7CA1EA3EA046B1A5BA2FCFDB3C8EECC53324B6@TSS-EXCH01.t-systems.ch> References: <0E6D4FB2-A485-40ED-A856-ACC311A90EFE@msys.ch> <20090630.141340.289711551.imp@bsdimp.com> <7B9C309F-63E3-4CB8-9871-DE2DEE010096@msys.ch> <20090630.164009.2130804684.imp@bsdimp.com>, <1246413402.70460.23.camel@bauer.cse.buffalo.edu> <509A7CA1EA3EA046B1A5BA2FCFDB3C8EECC53324B6@TSS-EXCH01.t-systems.ch> Message-ID: On Wed, 1 Jul 2009, Blapp, Martin wrote: > I really was not my or Marcs intention to skip any discussions. Rwatson told > us that if we like to see it in 8.0, we need to approve it by RE and commit > it before the 1. of july, and that's what I've done. Sorry if I've upset > anyone. > > Personally I think the tool is quite handy, better than net/wol (which > doesn't seem to work with different interfaces), wake doesn't need any > strange libaries as dependencies and it just a very short one (4k) > > If the concensus is to back it out, I'll back it out. FWIW, I think having a wake-on-lan tool in the base system is pretty valuable -- it's compact, useful, etc. Making sure we get the right tool, that it has the right name, right license, no odd script dependencies, etc, are all reasonable concerns, and could have been handled better by addressing them on the lists before, rather than after, the commit (Marc's tool meets some but not all of these requirements on face value). That said, I am caught a bit by surprise at the level of my response, and was not aware of the NetBSD-side discussion... Robert N M Watson Computer Laboratory University of Cambridge From maxim at macomnet.ru Wed Jul 1 11:25:39 2009 From: maxim at macomnet.ru (Maxim Konovalov) Date: Wed Jul 1 11:25:51 2009 Subject: svn commit: r194681 - head/usr.sbin/wpa/ndis_events In-Reply-To: <86ljn923dw.fsf@ds4.des.no> References: <200906230555.n5N5tubJ065618@svn.freebsd.org> <20090623080015.GK48776@hoeg.nl> <20090623125125.F1156@mp2.macomnet.net> <86ljn923dw.fsf@ds4.des.no> Message-ID: <20090701152300.N96900@mp2.macomnet.net> On Tue, 30 Jun 2009, 16:38+0200, Dag-Erling Smrgrav wrote: > Maxim Konovalov writes: > > fixed, thanks. > > It still says > > static void > usage() > > I know this is allowed by C99, but it's not allowed by style(9). > >From style(9): static void usage() { /* Insert an empty line if the function has no local variables. */ ... Apart from the empty line, what's wrong? -- Maxim Konovalov From brde at optusnet.com.au Wed Jul 1 11:44:24 2009 From: brde at optusnet.com.au (Bruce Evans) Date: Wed Jul 1 11:44:35 2009 Subject: svn commit: r194538 - head/sys/sys In-Reply-To: <86hbxx2341.fsf@ds4.des.no> References: <200906201639.n5KGdPhO081114@svn.freebsd.org> <20090620174158.GG2884@deviant.kiev.zoral.com.ua> <20090623221248.GA5445@zim.MIT.EDU> <20090623221053.GT2884@deviant.kiev.zoral.com.ua> <20090623234549.GA6076@zim.MIT.EDU> <20090625151849.W33864@delplex.bde.org> <86hbxx2341.fsf@ds4.des.no> Message-ID: <20090701213032.Q39158@delplex.bde.org> On Tue, 30 Jun 2009, [utf-8] Dag-Erling Smørgrav wrote: > Bruce Evans writes: >> Freestanding reserves fewer symbols for the implementation. > > IIRC, freestanding implementations are only required to provide > and , and everything else is available to the > application. Also , , , and . However, _FOO and __foo don't seem to be reserved -- these seem to only be reserved in section 7 (library), and freestanding specifically doesn't require anything in section 7 except the above headers. The complete list seems to be just the standard contents of the above headers, plus things like __STDC__, at least if the application doesn't #undef these things before using them. Bruce From brde at optusnet.com.au Wed Jul 1 12:21:40 2009 From: brde at optusnet.com.au (Bruce Evans) Date: Wed Jul 1 12:21:46 2009 Subject: svn commit: r194789 - head/usr.bin/usbhidctl In-Reply-To: <8663ed2265.fsf@ds4.des.no> References: <200906232316.n5NNG1iT094289@svn.freebsd.org> <20090625154007.H33864@delplex.bde.org> <4A43B727.7010204@delphij.net> <20090627033608.P35379@delplex.bde.org> <8663ed2265.fsf@ds4.des.no> Message-ID: <20090701214927.V39172@delplex.bde.org> On Tue, 30 Jun 2009, [utf-8] Dag-Erling Smørgrav wrote: > Bruce Evans writes: >> Actually, it is OK to use it in FreeBSD iff the system supports the >> same program having different names, like reboot/halt/etc. > > I don't see the point - you would still need different usage messages > for each version. Using your example: > > % reboot -h > reboot: illegal option -- h > usage: reboot [-dlnpq] [-k kernel] > % halt -h > halt: illegal option -- h > usage: halt [-lnpq] [-k kernel] > > The code that implements this is needlessly complicated: > > static void > usage() > { > (void)fprintf(stderr, "usage: %s [-%slnpq] [-k kernel]\n", > getprogname(), dohalt ? "" : "d"); > exit(1); > } Yes, I missed that. I had only looked at an old version which was just broken -- it always printed -[dnpq] (was also missing -l). > The following is far more readable: > > static void > usage(void) > { > > (void)fprintf(stderr, dohalt ? > "usage: halt [-lnpq] [-k kernel]\n" : > "usage: reboot [-dlnpq] [-k kernel]\n"); > exit(1); > } However, this is broken since it doesn't handle the program being named fasthalt or fastboot. The dohalt condition in the current version barely works for these since fasthalt takes the same args as halt, etc. I like using the `? :' operator in sub-expressions, but it only works well for simpler statements than the above. reboot in Lite2 uses it instead of getprogname(). reboot in Lite2 also has a home-made err() with another ?: instead of getprogname(). It uses "dohalt ? :", and this is actually correct since Lite2 doesn't have fasthalt or fastboot, at least in reboot's own Makefile. > BTW, there are numerous style issues in sbin/reboot/reboot.c. Really? According to knfom, it is 94.772% knf (up from 94.520% in ~5.2 and 92.896% in Lite2). It is a small program so it is easy to get right, but anything above 90% is a nice colour. (94.520% is due to 7 lines fixed by indent(1) and 5 lines broken by indent(1)). Bruce From joerg at britannica.bec.de Wed Jul 1 12:29:44 2009 From: joerg at britannica.bec.de (Joerg Sonnenberger) Date: Wed Jul 1 12:29:51 2009 Subject: svn commit: r194681 - head/usr.sbin/wpa/ndis_events In-Reply-To: <20090701152300.N96900@mp2.macomnet.net> References: <200906230555.n5N5tubJ065618@svn.freebsd.org> <20090623080015.GK48776@hoeg.nl> <20090623125125.F1156@mp2.macomnet.net> <86ljn923dw.fsf@ds4.des.no> <20090701152300.N96900@mp2.macomnet.net> Message-ID: <20090701122952.GA14519@britannica.bec.de> On Wed, Jul 01, 2009 at 03:25:33PM +0400, Maxim Konovalov wrote: > static void > usage() > { > /* Insert an empty line if the function has no local variables. */ > ... > > Apart from the empty line, what's wrong? It is K&R style. It should be static void usage(void) { ... Joerg From rwatson at FreeBSD.org Wed Jul 1 12:36:11 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Wed Jul 1 12:36:23 2009 Subject: svn commit: r195235 - in head/sys: kern security/audit Message-ID: <200907011236.n61CaA9g012734@svn.freebsd.org> Author: rwatson Date: Wed Jul 1 12:36:10 2009 New Revision: 195235 URL: http://svn.freebsd.org/changeset/base/195235 Log: udit the 'options' argument to wait4(2). Approved by: re (kib) MFC after: 3 days Modified: head/sys/kern/kern_exit.c head/sys/security/audit/audit_bsm.c Modified: head/sys/kern/kern_exit.c ============================================================================== --- head/sys/kern/kern_exit.c Wed Jul 1 10:16:10 2009 (r195234) +++ head/sys/kern/kern_exit.c Wed Jul 1 12:36:10 2009 (r195235) @@ -804,6 +804,7 @@ kern_wait(struct thread *td, pid_t pid, int error, nfound; AUDIT_ARG_PID(pid); + AUDIT_ARG_VALUE(options); q = td->td_proc; if (pid == 0) { Modified: head/sys/security/audit/audit_bsm.c ============================================================================== --- head/sys/security/audit/audit_bsm.c Wed Jul 1 10:16:10 2009 (r195234) +++ head/sys/security/audit/audit_bsm.c Wed Jul 1 12:36:10 2009 (r195235) @@ -1498,6 +1498,10 @@ kaudit_to_bsm(struct kaudit_record *kar, tok = au_to_arg32(0, "pid", ar->ar_arg_pid); kau_write(rec, tok); } + if (ARG_IS_VALID(kar, ARG_VALUE)) { + tok = au_to_arg32(0, "options", ar->ar_arg_value); + kau_write(rec, tok); + } break; case AUE_NULL: From avg at FreeBSD.org Wed Jul 1 12:44:24 2009 From: avg at FreeBSD.org (Andriy Gapon) Date: Wed Jul 1 12:44:35 2009 Subject: svn commit: r195236 - in stable/7/sys: . contrib/pf nfsserver Message-ID: <200907011244.n61CiNVH012914@svn.freebsd.org> Author: avg Date: Wed Jul 1 12:44:23 2009 New Revision: 195236 URL: http://svn.freebsd.org/changeset/base/195236 Log: MFC 185586 (kan): Change nfsserver slightly so that it does not trip over the timestamp validation code on ZFS. This should fix O_CREAT|O_EXCL open on NFS where a server is 64-bit with v13 ZFS code. PR: kern/135412 Pointed out by: Jaakko Heinonen Tested by: Jaakko Heinonen, Danny Braniss Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/nfsserver/nfs_serv.c Modified: stable/7/sys/nfsserver/nfs_serv.c ============================================================================== --- stable/7/sys/nfsserver/nfs_serv.c Wed Jul 1 12:36:10 2009 (r195235) +++ stable/7/sys/nfsserver/nfs_serv.c Wed Jul 1 12:44:23 2009 (r195236) @@ -1656,13 +1656,12 @@ nfsrv_create(struct nfsrv_descript *nfsd caddr_t bpos; int error = 0, rdev, len, tsize, dirfor_ret = 1, diraft_ret = 1; int v3 = (nfsd->nd_flag & ND_NFSV3), how, exclusive_flag = 0; - caddr_t cp; struct mbuf *mb, *mreq; struct vnode *dirp = NULL; nfsfh_t nfh; fhandle_t *fhp; u_quad_t tempsize; - u_char cverf[NFSX_V3CREATEVERF]; + struct timespec cverf; struct mount *mp = NULL; int tvfslocked; int vfslocked; @@ -1741,8 +1740,11 @@ nfsrv_create(struct nfsrv_descript *nfsd nfsm_srvsattr(vap); break; case NFSV3CREATE_EXCLUSIVE: - cp = nfsm_dissect_nonblock(caddr_t, NFSX_V3CREATEVERF); - bcopy(cp, cverf, NFSX_V3CREATEVERF); + tl = nfsm_dissect_nonblock(u_int32_t *, + NFSX_V3CREATEVERF); + /* Unique bytes, endianness is not important. */ + cverf.tv_sec = tl[0]; + cverf.tv_nsec = tl[1]; exclusive_flag = 1; break; }; @@ -1788,8 +1790,7 @@ nfsrv_create(struct nfsrv_descript *nfsd if (exclusive_flag) { exclusive_flag = 0; VATTR_NULL(vap); - bcopy(cverf, (caddr_t)&vap->va_atime, - NFSX_V3CREATEVERF); + vap->va_atime = cverf; error = VOP_SETATTR(nd.ni_vp, vap, cred, td); } @@ -1873,7 +1874,7 @@ nfsrv_create(struct nfsrv_descript *nfsd } if (v3) { if (exclusive_flag && !error && - bcmp(cverf, (caddr_t)&vap->va_atime, NFSX_V3CREATEVERF)) + bcmp(&cverf, &vap->va_atime, sizeof (cverf))) error = EEXIST; if (dirp == nd.ni_dvp) diraft_ret = VOP_GETATTR(dirp, &diraft, cred, td); From stas at FreeBSD.org Wed Jul 1 13:07:03 2009 From: stas at FreeBSD.org (Stanislav Sedov) Date: Wed Jul 1 13:07:14 2009 Subject: svn commit: r195237 - head/usr.sbin/wake Message-ID: <200907011307.n61D72ma013392@svn.freebsd.org> Author: stas Date: Wed Jul 1 13:07:02 2009 New Revision: 195237 URL: http://svn.freebsd.org/changeset/base/195237 Log: - Fix the bug in write(2) called with incorrect parameters resulting in writes always started from the start of the packet. - Fix usage string (multiple addresses can be specified). - Make the source more style(9) compliant. - Improve error reporting (do not silently fail if something goes wrong). - Make functions static. - Use warns level 6. Approved by: re (kib) Discussed with: Marc Balmer , brian, mbr Modified: head/usr.sbin/wake/Makefile head/usr.sbin/wake/wake.c Modified: head/usr.sbin/wake/Makefile ============================================================================== --- head/usr.sbin/wake/Makefile Wed Jul 1 12:44:23 2009 (r195236) +++ head/usr.sbin/wake/Makefile Wed Jul 1 13:07:02 2009 (r195237) @@ -2,5 +2,6 @@ PROG= wake MAN= wake.8 +WARNS?= 6 .include Modified: head/usr.sbin/wake/wake.c ============================================================================== --- head/usr.sbin/wake/wake.c Wed Jul 1 12:44:23 2009 (r195236) +++ head/usr.sbin/wake/wake.c Wed Jul 1 13:07:02 2009 (r195237) @@ -27,18 +27,6 @@ #include __FBSDID("$FreeBSD$"); -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - #include #include #include @@ -50,70 +38,89 @@ __FBSDID("$FreeBSD$"); #include #include -#define _PATH_BPF "/dev/bpf" +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#define _PATH_BPF "/dev/bpf" #ifndef SYNC_LEN -#define SYNC_LEN 6 +#define SYNC_LEN 6 #endif #ifndef DESTADDR_COUNT -#define DESTADDR_COUNT 16 +#define DESTADDR_COUNT 16 #endif -void usage(void); +static void usage(void); +static int wake(const char *iface, const char *host); +static int bind_if_to_bpf(char const *ifname, int bpf); +static int get_ether(char const *text, struct ether_addr *addr); +static int send_wakeup(int bpf, struct ether_addr const *addr); -int wake(const char *iface, const char *host); -int bind_if_to_bpf(char const *ifname, int bpf); -int get_ether(char const *text, struct ether_addr *addr); -int send_wakeup(int bpf, struct ether_addr const *addr); - -void +static void usage(void) { - (void)fprintf(stderr, "usage: wake interface lladdr\n"); + + (void)fprintf(stderr, "usage: wake interface lladdr...\n"); exit(0); } -int +static int wake(const char *iface, const char *host) { - int res, bpf; struct ether_addr macaddr; + int bpf, res; bpf = open(_PATH_BPF, O_RDWR); if (bpf == -1) { - printf("no bpf\n"); - return -1; + warn("no bpf"); + return (-1); } if (bind_if_to_bpf(iface, bpf) == -1 || get_ether(host, &macaddr) == -1) { (void)close(bpf); - return -1; + return (-1); } res = send_wakeup(bpf, &macaddr); (void)close(bpf); - return res; + return (res); } -int +static int bind_if_to_bpf(char const *ifname, int bpf) { struct ifreq ifr; u_int dlt; if (strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)) >= - sizeof(ifr.ifr_name)) - return -1; - if (ioctl(bpf, BIOCSETIF, &ifr) == -1) - return -1; - if (ioctl(bpf, BIOCGDLT, &dlt) == -1) - return -1; - if (dlt != DLT_EN10MB) - return -1; - return 0; + sizeof(ifr.ifr_name)) { + warnx("interface name too long: %s", ifname); + return (-1); + } + if (ioctl(bpf, BIOCSETIF, &ifr) == -1) { + warn("ioctl(%s)", "BIOCSETIF"); + return (-1); + } + if (ioctl(bpf, BIOCGDLT, &dlt) == -1) { + warn("ioctl(%s)", "BIOCGDLT"); + return (-1); + } + if (dlt != DLT_EN10MB) { + warnx("incompatible media"); + return (-1); + } + return (0); } -int +static int get_ether(char const *text, struct ether_addr *addr) { struct ether_addr *paddr; @@ -121,24 +128,26 @@ get_ether(char const *text, struct ether paddr = ether_aton(text); if (paddr != NULL) { *addr = *paddr; - return 0; + return (0); } - if (ether_hostton(text, addr)) - return -1; - return 0; + if (ether_hostton(text, addr)) { + warnx("no match for host %s found", text); + return (-1); + } + return (0); } -int +static int send_wakeup(int bpf, struct ether_addr const *addr) { struct { struct ether_header hdr; u_char data[SYNC_LEN + ETHER_ADDR_LEN * DESTADDR_COUNT]; - } pkt; - u_char *p; - int i; + } __packed pkt; ssize_t bw; ssize_t len; + int i; + u_char *p; (void)memset(pkt.hdr.ether_dhost, 0xff, sizeof(pkt.hdr.ether_dhost)); pkt.hdr.ether_type = htons(0); @@ -150,12 +159,14 @@ send_wakeup(int bpf, struct ether_addr c len = sizeof(pkt); bw = 0; while (len) { - if ((bw = write(bpf, &pkt, sizeof(pkt))) == -1) - return -1; + if ((bw = write(bpf, p, len)) == -1) { + warn("write()"); + return (-1); + } len -= bw; p += bw; } - return 0; + return (0); } int @@ -170,5 +181,5 @@ main(int argc, char *argv[]) if (wake(argv[1], argv[n])) warnx("error sending Wake on LAN frame over %s to %s", argv[1], argv[n]); - return 0; + return (0); } From brde at optusnet.com.au Wed Jul 1 13:15:36 2009 From: brde at optusnet.com.au (Bruce Evans) Date: Wed Jul 1 13:15:42 2009 Subject: svn commit: r195213 - head/usr.sbin/wake In-Reply-To: <20090701124825.af0d205e.stas@FreeBSD.org> References: <200906302209.n5UM9lBM093495@svn.freebsd.org> <20090701124825.af0d205e.stas@FreeBSD.org> Message-ID: <20090701223719.L39215@delplex.bde.org> On Wed, 1 Jul 2009, Stanislav Sedov wrote: > On Tue, 30 Jun 2009 22:09:47 +0000 (UTC) > Martin Blapp mentioned: >> Log: >> Compiles without higher warn level >> >> MAN= wake.8 >> >> -WARNS?= 2 >> - > > I believe you wanted something like WARNS?=6 probably? Now you disabled > any warnings-related compiler flags entirely. WARNS should only be set in near-top-level Makefile.inc's. Setting it elsewhere is either a style bug to increase the warning level or a hack to decrease the warning level. However, setting of WARNS in near-top- level Makefile.inc's stalled several years ago at the same time as its excessive setting in individual Makefiles. It is still not set at all in usr.sbin/Makefile.inc, while in usr.bin its setting is commented out "temporarily". Only the relatively simple bin directory has been handled well -- bin/Makefile.inc and most files under it started uniformly at WARNS=2, and bin/Makefile.inc has now reached WARNS=6, with only the following bugs and hacks in leaf Makefiles: % ./rmail/Makefile:WARNS?= 0 Apparently, sendmail isn't written in C yet. % ./cat/Makefile:WARNS?= 6 Bogus override of the default to the same value. cat compiled happily with the default WARNS of 6 for 6 years before this bug was committed in 2009, after being fixed in 2001 to not set WARNS, so that it automatically picked up the change of the default from 2 to 6 in 2003. % ./csh/Makefile:WARNS?= 0 Csh was never written in C :-). % ./ed/Makefile:WARNS?= 2 % ./pax/Makefile:WARNS?= 3 % ./pkill/Makefile:WARNS?= 5 % ./sh/Makefile:WARNS?= 2 Assorted hacks. % ./uuidgen/Makefile:WARNS?= 6 Another bogus override of the default. In usr.sbin, WARNS has never been turned on globally, and slightly more than half of the makefiles don't set it locally either. Bruce From rwatson at FreeBSD.org Wed Jul 1 13:22:09 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Wed Jul 1 13:22:15 2009 Subject: svn commit: r195238 - head/sys/kern Message-ID: <200907011322.n61DM8fg013756@svn.freebsd.org> Author: rwatson Date: Wed Jul 1 13:22:08 2009 New Revision: 195238 URL: http://svn.freebsd.org/changeset/base/195238 Log: Fix link(2) auditing: use the second audit record path for the new object name. Approved by: re (kib) MFC after: 3 days Modified: head/sys/kern/vfs_syscalls.c Modified: head/sys/kern/vfs_syscalls.c ============================================================================== --- head/sys/kern/vfs_syscalls.c Wed Jul 1 13:07:02 2009 (r195237) +++ head/sys/kern/vfs_syscalls.c Wed Jul 1 13:22:08 2009 (r195238) @@ -1583,7 +1583,7 @@ kern_linkat(struct thread *td, int fd1, VFS_UNLOCK_GIANT(vfslocked); return (error); } - NDINIT_AT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, + NDINIT_AT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE2, segflg, path2, fd2, td); if ((error = namei(&nd)) == 0) { lvfslocked = NDHASGIANT(&nd); From brde at optusnet.com.au Wed Jul 1 13:58:07 2009 From: brde at optusnet.com.au (Bruce Evans) Date: Wed Jul 1 13:58:14 2009 Subject: svn commit: r194681 - head/usr.sbin/wpa/ndis_events In-Reply-To: <20090701152300.N96900@mp2.macomnet.net> References: <200906230555.n5N5tubJ065618@svn.freebsd.org> <20090623080015.GK48776@hoeg.nl> <20090623125125.F1156@mp2.macomnet.net> <86ljn923dw.fsf@ds4.des.no> <20090701152300.N96900@mp2.macomnet.net> Message-ID: <20090701234518.E2035@besplex.bde.org> On Wed, 1 Jul 2009, Maxim Konovalov wrote: > On Tue, 30 Jun 2009, 16:38+0200, Dag-Erling Smrgrav wrote: > >> Maxim Konovalov writes: >>> fixed, thanks. >> >> It still says >> >> static void >> usage() >> >> I know this is allowed by C99, but it's not allowed by style(9). >> > From style(9): > > static void > usage() > { > /* Insert an empty line if the function has no local variables. */ > ... > > Apart from the empty line, what's wrong? style(9) hasn't been converted to its own religion yet :-). This isn't exactly a bug, since an old-style Standard C function definition is still Normal for usage(). Normal file order is a prototype for usage(), then main() calling usage(), then usage(), so a separate prototype for usage() is Normal. Then usage an old-style definition for usage() breaks K&R support without affecting Standard C support. Bruce From des at des.no Wed Jul 1 14:08:44 2009 From: des at des.no (=?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?=) Date: Wed Jul 1 14:08:56 2009 Subject: svn commit: r194628 - head/lib/ncurses/ncurses In-Reply-To: <20090630193712.GA5446@roadrunner.spoerlein.net> ("Ulrich =?utf-8?Q?Sp=C3=B6rlein=22's?= message of "Tue, 30 Jun 2009 21:37:12 +0200") References: <86prcl23k8.fsf@ds4.des.no> <20090630.085955.63054488.imp@bsdimp.com> <20090630.094632.195416436.imp@bsdimp.com> <20090630193712.GA5446@roadrunner.spoerlein.net> Message-ID: <86vdmca42d.fsf@ds4.des.no> Ulrich Sp?rlein writes: > Btw, I do like the current behaviour, but if $PAGER can be coerced into > not clearing screen after exit, I think more people could be persuaded. cat >~/.termcap my-xterm:\ ti@:te@:tc=xterm ^D DES -- Dag-Erling Sm?rgrav - des@des.no From des at des.no Wed Jul 1 14:56:40 2009 From: des at des.no (=?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?=) Date: Wed Jul 1 14:56:51 2009 Subject: svn commit: r194681 - head/usr.sbin/wpa/ndis_events In-Reply-To: <20090701152300.N96900@mp2.macomnet.net> (Maxim Konovalov's message of "Wed, 1 Jul 2009 15:25:33 +0400 (MSD)") References: <200906230555.n5N5tubJ065618@svn.freebsd.org> <20090623080015.GK48776@hoeg.nl> <20090623125125.F1156@mp2.macomnet.net> <86ljn923dw.fsf@ds4.des.no> <20090701152300.N96900@mp2.macomnet.net> Message-ID: <86my7oa1uh.fsf@ds4.des.no> Maxim Konovalov writes: > From style(9): > > static void > usage() > ... > > Apart from the empty line, what's wrong? Missing void. I wasn't aware that style(9) was incorrect in that respect. DES -- Dag-Erling Sm?rgrav - des@des.no From des at des.no Wed Jul 1 15:05:13 2009 From: des at des.no (=?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?=) Date: Wed Jul 1 15:05:19 2009 Subject: svn commit: r194789 - head/usr.bin/usbhidctl In-Reply-To: <20090701214927.V39172@delplex.bde.org> (Bruce Evans's message of "Wed, 1 Jul 2009 22:19:58 +1000 (EST)") References: <200906232316.n5NNG1iT094289@svn.freebsd.org> <20090625154007.H33864@delplex.bde.org> <4A43B727.7010204@delphij.net> <20090627033608.P35379@delplex.bde.org> <8663ed2265.fsf@ds4.des.no> <20090701214927.V39172@delplex.bde.org> Message-ID: <86iqica1g8.fsf@ds4.des.no> Bruce Evans writes: > "Dag-Erling Sm?rgrav" writes: > > BTW, there are numerous style issues in sbin/reboot/reboot.c. > Really? According to knfom, it is 94.772% knf (up from 94.520% in > ~5.2 and 92.896% in Lite2). It is a small program so it is easy to > get right, but anything above 90% is a nice colour. (94.520% is due > to 7 lines fixed by indent(1) and 5 lines broken by indent(1)). I guess it depends on your definition of "numerous". The most obvious ones (since I was looking at usage()) were the missing void in the definition of usage() and the missing blank line at the top of the function. Other than that: #include directives are unordered, local variables in main() are declared in the wrong order, geteuid() is used as a predicate, and the required parentheses around the return value in get_pageins() are missing. I would also use fopen(3) and fprintf(3) instead of open(2) and write(2) to write nextboot.conf, and I would check that argc is 0 after the getopt(3) loop. DES -- Dag-Erling Sm?rgrav - des@des.no From des at des.no Wed Jul 1 15:09:59 2009 From: des at des.no (=?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?=) Date: Wed Jul 1 15:10:05 2009 Subject: svn commit: r194628 - head/lib/ncurses/ncurses In-Reply-To: <86vdmca42d.fsf@ds4.des.no> ("Dag-Erling =?utf-8?Q?Sm=C3=B8rg?= =?utf-8?Q?rav=22's?= message of "Wed, 01 Jul 2009 16:08:42 +0200") References: <86prcl23k8.fsf@ds4.des.no> <20090630.085955.63054488.imp@bsdimp.com> <20090630.094632.195416436.imp@bsdimp.com> <20090630193712.GA5446@roadrunner.spoerlein.net> <86vdmca42d.fsf@ds4.des.no> Message-ID: <86eit0a18a.fsf@ds4.des.no> better yet: if [ $TERM = xterm ] ; then export TERMCAP=myterm:ti@:te@:tc=xterm: export TERM=myterm fi DES -- Dag-Erling Sm?rgrav - des@des.no From rwatson at FreeBSD.org Wed Jul 1 15:37:24 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Wed Jul 1 15:37:30 2009 Subject: svn commit: r195242 - in head/sys: kern security/audit Message-ID: <200907011537.n61FbN8P016707@svn.freebsd.org> Author: rwatson Date: Wed Jul 1 15:37:23 2009 New Revision: 195242 URL: http://svn.freebsd.org/changeset/base/195242 Log: Audit the file descriptor number passed to lseek(2). Approved by: re (kib) MFC after: 3 days Modified: head/sys/kern/vfs_syscalls.c head/sys/security/audit/audit_bsm.c Modified: head/sys/kern/vfs_syscalls.c ============================================================================== --- head/sys/kern/vfs_syscalls.c Wed Jul 1 15:11:23 2009 (r195241) +++ head/sys/kern/vfs_syscalls.c Wed Jul 1 15:37:23 2009 (r195242) @@ -1924,6 +1924,7 @@ lseek(td, uap) int error, noneg; int vfslocked; + AUDIT_ARG_FD(uap->fd); if ((error = fget(td, uap->fd, &fp)) != 0) return (error); if (!(fp->f_ops->fo_flags & DFLAG_SEEKABLE)) { Modified: head/sys/security/audit/audit_bsm.c ============================================================================== --- head/sys/security/audit/audit_bsm.c Wed Jul 1 15:11:23 2009 (r195241) +++ head/sys/security/audit/audit_bsm.c Wed Jul 1 15:37:23 2009 (r195242) @@ -679,7 +679,6 @@ kaudit_to_bsm(struct kaudit_record *kar, case AUE_GETRESUID: case AUE_GETRESGID: case AUE_KQUEUE: - case AUE_LSEEK: case AUE_MODLOAD: case AUE_MODUNLOAD: case AUE_MSGSYS: @@ -870,6 +869,7 @@ kaudit_to_bsm(struct kaudit_record *kar, case AUE_FUTIMES: case AUE_GETDIRENTRIES: case AUE_GETDIRENTRIESATTR: + case AUE_LSEEK: case AUE_POLL: case AUE_READ: case AUE_READV: From trasz at FreeBSD.org Wed Jul 1 15:52:20 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Wed Jul 1 15:52:37 2009 Subject: svn commit: r195243 - head/bin/chmod Message-ID: <200907011552.n61FqJL5016996@svn.freebsd.org> Author: trasz Date: Wed Jul 1 15:52:19 2009 New Revision: 195243 URL: http://svn.freebsd.org/changeset/base/195243 Log: With NFSv4 ACLs, it is possible that applying a mode to an ACL which is identical to the mode computed from that ACL will modify the ACL. For example, mode computed from the following ACL is 0600: user:kamila:rwx--------C--:------:allow owner@:--x-----------:------:deny owner@:rw-p---A-W-Co-:------:allow group@:rwxp----------:------:deny group@:--------------:------:allow everyone@:rwxp---A-W-Co-:------:deny everyone@:------a-R-c--s:------:allow However, applying that mode (chmod 0600) changes the ACL into this: user:kamila:rwx-----------:------:deny user:kamila:rwx--------C--:------:allow owner@:--x-----------:------:deny owner@:rw-p---A-W-Co-:------:allow group@:rwxp----------:------:deny group@:--------------:------:allow everyone@:rwxp---A-W-Co-:------:deny everyone@:------a-R-c--s:------:allow In chmod(1) utility, there is an optimisation, which makes it not call chmod(2) if the mode of the file is the same as the new mode. Disable that optimisation for files which may have NFSv4 ACLs. Reviewed by: rwatson Approved by: re (kib) Modified: head/bin/chmod/chmod.c Modified: head/bin/chmod/chmod.c ============================================================================== --- head/bin/chmod/chmod.c Wed Jul 1 15:37:23 2009 (r195242) +++ head/bin/chmod/chmod.c Wed Jul 1 15:52:19 2009 (r195243) @@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$"); #include static void usage(void); +static int may_have_nfs4acl(const FTSENT *ent); int main(int argc, char *argv[]) @@ -180,8 +181,14 @@ done: argv += optind; break; } newmode = getmode(set, p->fts_statp->st_mode); - if ((newmode & ALLPERMS) == (p->fts_statp->st_mode & ALLPERMS)) - continue; + /* + * With NFSv4 ACLs, it is possible that applying a mode + * identical to the one computed from an ACL will change + * that ACL. + */ + if (may_have_nfs4acl(p) == 0 && + (newmode & ALLPERMS) == (p->fts_statp->st_mode & ALLPERMS)) + continue; if ((*change_mode)(p->fts_accpath, newmode) && !fflag) { warn("%s", p->fts_path); rval = 1; @@ -219,3 +226,24 @@ usage(void) "usage: chmod [-fhv] [-R [-H | -L | -P]] mode file ...\n"); exit(1); } + +static int +may_have_nfs4acl(const FTSENT *ent) +{ + int ret; + static dev_t previous_dev = (dev_t)-1; + static int supports_acls = -1; + + if (previous_dev != ent->fts_statp->st_dev) { + previous_dev = ent->fts_statp->st_dev; + supports_acls = 0; + + ret = pathconf(ent->fts_accpath, _PC_ACL_NFS4); + if (ret > 0) + supports_acls = 1; + else if (ret < 0 && errno != EINVAL) + warn("%s", ent->fts_path); + } + + return (supports_acls); +} From jhb at FreeBSD.org Wed Jul 1 15:52:29 2009 From: jhb at FreeBSD.org (John Baldwin) Date: Wed Jul 1 15:52:37 2009 Subject: svn commit: r195181 - in head/sys: nfsclient nfsserver In-Reply-To: <20090630144904.GA41936@troutmask.apl.washington.edu> References: <200906300318.n5U3Ipr4066645@svn.freebsd.org> <20090630051641.T22887@maildrop.int.zabbadoz.net> <20090630144904.GA41936@troutmask.apl.washington.edu> Message-ID: <4A4B863A.7090304@FreeBSD.org> Steve Kargl wrote: > On Tue, Jun 30, 2009 at 05:17:48AM +0000, bz0fbd@zabbadoz.net wrote: >> On Tue, 30 Jun 2009, John Baldwin wrote: >> >>> Author: jhb >>> Date: Tue Jun 30 03:18:51 2009 >>> New Revision: 195181 >>> URL: http://svn.freebsd.org/changeset/base/195181 >>> >>> Log: >>> Fix build with NFS_LEGACYRPC enabled after the socket upcall locking >>> changes. >> is this really a good idea, considering that NFS_LEGACYRPC is on the >> "removal list" for 8.0? > > Yes. > > 1) This option definitely worked on April 18th. > 2) The option was broken by a commit that was never tested! If anything > this should remind committers to either get a code review or test > their patch. That isn't a completely fair assessment. The patch was most certainly tested with NFS in the default configuration (!NFS_LEGACYRPC). It is also a good idea to fix the option until such time as it is formally removed, however. -- John Baldwin From jfv at FreeBSD.org Wed Jul 1 16:13:02 2009 From: jfv at FreeBSD.org (Jack F Vogel) Date: Wed Jul 1 16:13:08 2009 Subject: svn commit: r195244 - head/sys/dev/ixgbe Message-ID: <200907011613.n61GD1Um017439@svn.freebsd.org> Author: jfv Date: Wed Jul 1 16:13:01 2009 New Revision: 195244 URL: http://svn.freebsd.org/changeset/base/195244 Log: Multiqueue RX is not correctly enabled on the new 82599 adapter, the SRRCTL register needs to be setup per queue. Approved by: re Modified: head/sys/dev/ixgbe/ixgbe.c Modified: head/sys/dev/ixgbe/ixgbe.c ============================================================================== --- head/sys/dev/ixgbe/ixgbe.c Wed Jul 1 15:52:19 2009 (r195243) +++ head/sys/dev/ixgbe/ixgbe.c Wed Jul 1 16:13:01 2009 (r195244) @@ -46,7 +46,7 @@ int ixgbe_display_debug_stat /********************************************************************* * Driver version *********************************************************************/ -char ixgbe_driver_version[] = "1.8.7"; +char ixgbe_driver_version[] = "1.8.8"; /********************************************************************* * PCI Device ID Table @@ -452,7 +452,7 @@ ixgbe_attach(device_t dev) ** system mbuf allocation. Tuning nmbclusters ** can alleviate this. */ - if ((adapter->num_queues > 1) && (nmbclusters > 0 )){ + if (nmbclusters > 0 ) { int s; /* Calculate the total RX mbuf needs */ s = (ixgbe_rxd * adapter->num_queues) * ixgbe_total_ports; @@ -3629,7 +3629,7 @@ ixgbe_initialize_receive_units(struct ad struct rx_ring *rxr = adapter->rx_rings; struct ixgbe_hw *hw = &adapter->hw; struct ifnet *ifp = adapter->ifp; - u32 rxctrl, fctrl, srrctl, rxcsum; + u32 bufsz, rxctrl, fctrl, srrctl, rxcsum; u32 reta, mrqc = 0, hlreg, random[10]; @@ -3648,45 +3648,20 @@ ixgbe_initialize_receive_units(struct ad fctrl |= IXGBE_FCTRL_PMCF; IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl); - srrctl = IXGBE_READ_REG(hw, IXGBE_SRRCTL(0)); - srrctl &= ~IXGBE_SRRCTL_BSIZEHDR_MASK; - srrctl &= ~IXGBE_SRRCTL_BSIZEPKT_MASK; - - hlreg = IXGBE_READ_REG(hw, IXGBE_HLREG0); /* Set for Jumbo Frames? */ + hlreg = IXGBE_READ_REG(hw, IXGBE_HLREG0); if (ifp->if_mtu > ETHERMTU) { hlreg |= IXGBE_HLREG0_JUMBOEN; - srrctl |= 4096 >> IXGBE_SRRCTL_BSIZEPKT_SHIFT; + bufsz = 4096 >> IXGBE_SRRCTL_BSIZEPKT_SHIFT; } else { hlreg &= ~IXGBE_HLREG0_JUMBOEN; - srrctl |= 2048 >> IXGBE_SRRCTL_BSIZEPKT_SHIFT; + bufsz = 2048 >> IXGBE_SRRCTL_BSIZEPKT_SHIFT; } IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hlreg); - if (rxr->hdr_split) { - /* Use a standard mbuf for the header */ - srrctl |= ((IXGBE_RX_HDR << IXGBE_SRRCTL_BSIZEHDRSIZE_SHIFT) - & IXGBE_SRRCTL_BSIZEHDR_MASK); - srrctl |= IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS; - if (adapter->hw.mac.type == ixgbe_mac_82599EB) { - /* PSRTYPE must be initialized in 82599 */ - u32 psrtype = IXGBE_PSRTYPE_TCPHDR | - IXGBE_PSRTYPE_UDPHDR | - IXGBE_PSRTYPE_IPV4HDR | - IXGBE_PSRTYPE_IPV6HDR; - psrtype |= (7 << 29); - IXGBE_WRITE_REG(hw, IXGBE_PSRTYPE(0), psrtype); - } - } else - srrctl |= IXGBE_SRRCTL_DESCTYPE_ADV_ONEBUF; - - if (adapter->hw.mac.type == ixgbe_mac_82599EB) - srrctl |= IXGBE_SRRCTL_DROP_EN; - - IXGBE_WRITE_REG(hw, IXGBE_SRRCTL(0), srrctl); - for (int i = 0; i < adapter->num_queues; i++, rxr++) { u64 rdba = rxr->rxdma.dma_paddr; + /* Setup the Base and Length of the Rx Descriptor Ring */ IXGBE_WRITE_REG(hw, IXGBE_RDBAL(i), (rdba & 0x00000000ffffffffULL)); @@ -3694,6 +3669,29 @@ ixgbe_initialize_receive_units(struct ad IXGBE_WRITE_REG(hw, IXGBE_RDLEN(i), adapter->num_rx_desc * sizeof(union ixgbe_adv_rx_desc)); + /* Set up the SRRCTL register */ + srrctl = IXGBE_READ_REG(hw, IXGBE_SRRCTL(i)); + srrctl &= ~IXGBE_SRRCTL_BSIZEHDR_MASK; + srrctl &= ~IXGBE_SRRCTL_BSIZEPKT_MASK; + srrctl |= bufsz; + if (rxr->hdr_split) { + /* Use a standard mbuf for the header */ + srrctl |= ((IXGBE_RX_HDR << + IXGBE_SRRCTL_BSIZEHDRSIZE_SHIFT) + & IXGBE_SRRCTL_BSIZEHDR_MASK); + srrctl |= IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS; + if (adapter->hw.mac.type == ixgbe_mac_82599EB) { + /* PSRTYPE must be initialized in 82599 */ + u32 psrtype = IXGBE_PSRTYPE_TCPHDR | + IXGBE_PSRTYPE_UDPHDR | + IXGBE_PSRTYPE_IPV4HDR | + IXGBE_PSRTYPE_IPV6HDR; + IXGBE_WRITE_REG(hw, IXGBE_PSRTYPE(0), psrtype); + } + } else + srrctl |= IXGBE_SRRCTL_DESCTYPE_ADV_ONEBUF; + IXGBE_WRITE_REG(hw, IXGBE_SRRCTL(i), srrctl); + /* Setup the HW Rx Head and Tail Descriptor Pointers */ IXGBE_WRITE_REG(hw, IXGBE_RDH(i), 0); IXGBE_WRITE_REG(hw, IXGBE_RDT(i), 0); @@ -3722,10 +3720,7 @@ ixgbe_initialize_receive_units(struct ad IXGBE_WRITE_REG(hw, IXGBE_RSSRK(i), random[i]); /* Perform hash on these packet types */ - if (adapter->hw.mac.type == ixgbe_mac_82599EB) - mrqc = IXGBE_MRQC_VMDQRSS32EN; - - mrqc |= IXGBE_MRQC_RSSEN + mrqc = IXGBE_MRQC_RSSEN | IXGBE_MRQC_RSS_FIELD_IPV4 | IXGBE_MRQC_RSS_FIELD_IPV4_TCP | IXGBE_MRQC_RSS_FIELD_IPV4_UDP From rmacklem at FreeBSD.org Wed Jul 1 16:38:19 2009 From: rmacklem at FreeBSD.org (Rick Macklem) Date: Wed Jul 1 16:38:31 2009 Subject: svn commit: r195245 - head/sys/rpc Message-ID: <200907011638.n61GcIUM017951@svn.freebsd.org> Author: rmacklem Date: Wed Jul 1 16:38:18 2009 New Revision: 195245 URL: http://svn.freebsd.org/changeset/base/195245 Log: Make sure that cr_error is set to ESHUTDOWN when closing the connection. This is normally done by a loop in clnt_dg_close(), but requests that aren't in the pending queue at the time of closing, don't get set. This avoids a panic in xdrmbuf_create() when it is called with a NULL cr_mrep if cr_error doesn't get set to ESHUTDOWN while closing. Reviewed by: dfr Approved by: re (Ken Smith), kib (mentor) Modified: head/sys/rpc/clnt_dg.c Modified: head/sys/rpc/clnt_dg.c ============================================================================== --- head/sys/rpc/clnt_dg.c Wed Jul 1 16:13:01 2009 (r195244) +++ head/sys/rpc/clnt_dg.c Wed Jul 1 16:38:18 2009 (r195245) @@ -547,11 +547,13 @@ get_reply: tv -= time_waited; if (tv > 0) { - if (cu->cu_closing || cu->cu_closed) + if (cu->cu_closing || cu->cu_closed) { error = 0; - else + cr->cr_error = ESHUTDOWN; + } else { error = msleep(cr, &cs->cs_lock, cu->cu_waitflag, cu->cu_waitchan, tv); + } } else { error = EWOULDBLOCK; } From rmacklem at FreeBSD.org Wed Jul 1 16:42:04 2009 From: rmacklem at FreeBSD.org (Rick Macklem) Date: Wed Jul 1 16:42:10 2009 Subject: svn commit: r195246 - head/sys/rpc/rpcsec_gss Message-ID: <200907011642.n61Gg3oi018130@svn.freebsd.org> Author: rmacklem Date: Wed Jul 1 16:42:03 2009 New Revision: 195246 URL: http://svn.freebsd.org/changeset/base/195246 Log: When unmounting an NFS mount using sec=krb5[ip], the umount system call could get hung sleeping on "gsssta" if the credentials for a user that had been accessing the mount point have expired. This happened because rpc_gss_destroy_context() would end up calling itself when the "destroy context" RPC was attempted, trying to refresh the credentials. This patch just checks for this case in rpc_gss_refresh() and returns without attempting the refresh, which avoids the recursive call to rpc_gss_destroy_context() and the subsequent hang. Reviewed by: dfr Approved by: re (Ken Smith), kib (mentor) Modified: head/sys/rpc/rpcsec_gss/rpcsec_gss.c Modified: head/sys/rpc/rpcsec_gss/rpcsec_gss.c ============================================================================== --- head/sys/rpc/rpcsec_gss/rpcsec_gss.c Wed Jul 1 16:38:18 2009 (r195245) +++ head/sys/rpc/rpcsec_gss/rpcsec_gss.c Wed Jul 1 16:42:03 2009 (r195246) @@ -929,6 +929,20 @@ rpc_gss_refresh(AUTH *auth, void *msg) { struct rpc_msg *reply = (struct rpc_msg *) msg; rpc_gss_options_ret_t options; + struct rpc_gss_data *gd; + + gd = AUTH_PRIVATE(auth); + + /* + * If the context is in DESTROYING state, then just return, since + * there is no point in refreshing the credentials. + */ + mtx_lock(&gd->gd_lock); + if (gd->gd_state == RPCSEC_GSS_DESTROYING) { + mtx_unlock(&gd->gd_lock); + return (FALSE); + } + mtx_unlock(&gd->gd_lock); /* * If the error was RPCSEC_GSS_CREDPROBLEM of From rwatson at FreeBSD.org Wed Jul 1 16:56:57 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Wed Jul 1 16:57:03 2009 Subject: svn commit: r195247 - in head/sys: kern security/audit Message-ID: <200907011656.n61Guuii018456@svn.freebsd.org> Author: rwatson Date: Wed Jul 1 16:56:56 2009 New Revision: 195247 URL: http://svn.freebsd.org/changeset/base/195247 Log: When auditing unmount(2), capture FSID arguments as regular text strings rather than as paths, which would lead to them being treated as relative pathnames and hence confusingly converted into absolute pathnames. Capture flags to unmount(2) via an argument token. Approved by: re (audit argument blanket) MFC after: 3 days Modified: head/sys/kern/vfs_mount.c head/sys/security/audit/audit_bsm.c Modified: head/sys/kern/vfs_mount.c ============================================================================== --- head/sys/kern/vfs_mount.c Wed Jul 1 16:42:03 2009 (r195246) +++ head/sys/kern/vfs_mount.c Wed Jul 1 16:56:56 2009 (r195247) @@ -1113,6 +1113,7 @@ unmount(td, uap) char *pathbuf; int error, id0, id1; + AUDIT_ARG_VALUE(uap->flags); if (jailed(td->td_ucred) || usermount == 0) { error = priv_check(td, PRIV_VFS_UNMOUNT); if (error) @@ -1125,9 +1126,9 @@ unmount(td, uap) free(pathbuf, M_TEMP); return (error); } - AUDIT_ARG_UPATH(td, pathbuf, ARG_UPATH1); mtx_lock(&Giant); if (uap->flags & MNT_BYFSID) { + AUDIT_ARG_TEXT(pathbuf); /* Decode the filesystem ID. */ if (sscanf(pathbuf, "FSID:%d:%d", &id0, &id1) != 2) { mtx_unlock(&Giant); @@ -1143,6 +1144,7 @@ unmount(td, uap) } mtx_unlock(&mountlist_mtx); } else { + AUDIT_ARG_UPATH(td, pathbuf, ARG_UPATH1); mtx_lock(&mountlist_mtx); TAILQ_FOREACH_REVERSE(mp, &mountlist, mntlist, mnt_list) { if (strcmp(mp->mnt_stat.f_mntonname, pathbuf) == 0) Modified: head/sys/security/audit/audit_bsm.c ============================================================================== --- head/sys/security/audit/audit_bsm.c Wed Jul 1 16:42:03 2009 (r195246) +++ head/sys/security/audit/audit_bsm.c Wed Jul 1 16:56:56 2009 (r195247) @@ -1070,7 +1070,15 @@ kaudit_to_bsm(struct kaudit_record *kar, break; case AUE_UMOUNT: + if (ARG_IS_VALID(kar, ARG_VALUE)) { + tok = au_to_arg32(1, "flags", ar->ar_arg_value); + kau_write(rec, tok); + } UPATH1_VNODE1_TOKENS; + if (ARG_IS_VALID(kar, ARG_TEXT)) { + tok = au_to_text(ar->ar_arg_text); + kau_write(rec, tok); + } break; case AUE_MSGCTL: From jhb at FreeBSD.org Wed Jul 1 17:20:08 2009 From: jhb at FreeBSD.org (John Baldwin) Date: Wed Jul 1 17:20:21 2009 Subject: svn commit: r195249 - in head/sys: amd64/amd64 amd64/include amd64/isa i386/i386 i386/include i386/isa kern sys Message-ID: <200907011720.n61HK7c1018977@svn.freebsd.org> Author: jhb Date: Wed Jul 1 17:20:07 2009 New Revision: 195249 URL: http://svn.freebsd.org/changeset/base/195249 Log: Improve the handling of cpuset with interrupts. - For x86, change the interrupt source method to assign an interrupt source to a specific CPU to return an error value instead of void, thus allowing it to fail. - If moving an interrupt to a CPU fails due to a lack of IDT vectors in the destination CPU, fail the request with ENOSPC rather than panicing. - For MSI interrupts on x86 (but not MSI-X), only allow cpuset to be used on the first interrupt in a group. Moving the first interrupt in a group moves the entire group. - Use the icu_lock to protect intr_next_cpu() on x86 instead of the intr_table_lock to fix a LOR introduced in the last set of MSI changes. - Add a new privilege PRIV_SCHED_CPUSET_INTR for using cpuset with interrupts. Previously, binding an interrupt to a CPU only performed a privilege check if the interrupt had an interrupt thread. Interrupts without a thread could be bound by non-root users as a result. - If an interrupt event's assign_cpu method fails, then restore the original cpuset mask for the associated interrupt thread. Approved by: re (kib) Modified: head/sys/amd64/amd64/intr_machdep.c head/sys/amd64/amd64/io_apic.c head/sys/amd64/amd64/local_apic.c head/sys/amd64/amd64/msi.c head/sys/amd64/include/intr_machdep.h head/sys/amd64/isa/atpic.c head/sys/i386/i386/intr_machdep.c head/sys/i386/i386/io_apic.c head/sys/i386/i386/local_apic.c head/sys/i386/i386/msi.c head/sys/i386/include/intr_machdep.h head/sys/i386/isa/atpic.c head/sys/kern/kern_intr.c head/sys/sys/priv.h Modified: head/sys/amd64/amd64/intr_machdep.c ============================================================================== --- head/sys/amd64/amd64/intr_machdep.c Wed Jul 1 17:06:56 2009 (r195248) +++ head/sys/amd64/amd64/intr_machdep.c Wed Jul 1 17:20:07 2009 (r195249) @@ -163,8 +163,8 @@ intr_lookup_source(int vector) } int -intr_add_handler(const char *name, int vector, driver_filter_t filter, - driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep) +intr_add_handler(const char *name, int vector, driver_filter_t filter, + driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep) { struct intsrc *isrc; int error; @@ -302,7 +302,8 @@ static int intr_assign_cpu(void *arg, u_char cpu) { #ifdef SMP - struct intsrc *isrc; + struct intsrc *isrc; + int error; /* * Don't do anything during early boot. We will pick up the @@ -311,10 +312,11 @@ intr_assign_cpu(void *arg, u_char cpu) if (assign_cpu && cpu != NOCPU) { isrc = arg; mtx_lock(&intr_table_lock); - isrc->is_pic->pic_assign_cpu(isrc, cpu_apic_ids[cpu]); + error = isrc->is_pic->pic_assign_cpu(isrc, cpu_apic_ids[cpu]); mtx_unlock(&intr_table_lock); - } - return (0); + } else + error = 0; + return (error); #else return (EOPNOTSUPP); #endif @@ -371,7 +373,7 @@ intr_init(void *dummy __unused) intrcnt_setname("???", 0); intrcnt_index = 1; STAILQ_INIT(&pics); - mtx_init(&intr_table_lock, "intr sources", NULL, MTX_DEF | MTX_RECURSE); + mtx_init(&intr_table_lock, "intr sources", NULL, MTX_DEF); mtx_init(&intrcnt_lock, "intrcnt", NULL, MTX_SPIN); } SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL); @@ -441,14 +443,14 @@ intr_next_cpu(void) if (!assign_cpu) return (cpu_apic_ids[0]); - mtx_lock(&intr_table_lock); + mtx_lock_spin(&icu_lock); apic_id = cpu_apic_ids[current_cpu]; do { current_cpu++; if (current_cpu > mp_maxid) current_cpu = 0; } while (!(intr_cpus & (1 << current_cpu))); - mtx_unlock(&intr_table_lock); + mtx_unlock_spin(&icu_lock); return (apic_id); } @@ -489,7 +491,6 @@ static void intr_shuffle_irqs(void *arg __unused) { struct intsrc *isrc; - u_int apic_id; int i; /* Don't bother on UP. */ @@ -505,13 +506,17 @@ intr_shuffle_irqs(void *arg __unused) /* * If this event is already bound to a CPU, * then assign the source to that CPU instead - * of picking one via round-robin. + * of picking one via round-robin. Note that + * this is careful to only advance the + * round-robin if the CPU assignment succeeds. */ if (isrc->is_event->ie_cpu != NOCPU) - apic_id = isrc->is_event->ie_cpu; - else - apic_id = intr_next_cpu(); - isrc->is_pic->pic_assign_cpu(isrc, apic_id); + (void)isrc->is_pic->pic_assign_cpu(isrc, + isrc->is_event->ie_cpu); + else if (isrc->is_pic->pic_assign_cpu(isrc, + cpu_apic_ids[current_cpu]) == 0) + (void)intr_next_cpu(); + } } mtx_unlock(&intr_table_lock); Modified: head/sys/amd64/amd64/io_apic.c ============================================================================== --- head/sys/amd64/amd64/io_apic.c Wed Jul 1 17:06:56 2009 (r195248) +++ head/sys/amd64/amd64/io_apic.c Wed Jul 1 17:20:07 2009 (r195249) @@ -120,7 +120,7 @@ static int ioapic_source_pending(struct static int ioapic_config_intr(struct intsrc *isrc, enum intr_trigger trig, enum intr_polarity pol); static void ioapic_resume(struct pic *pic); -static void ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id); +static int ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id); static void ioapic_program_intpin(struct ioapic_intsrc *intpin); static STAILQ_HEAD(,ioapic) ioapic_list = STAILQ_HEAD_INITIALIZER(ioapic_list); @@ -322,7 +322,7 @@ ioapic_program_intpin(struct ioapic_ints mtx_unlock_spin(&icu_lock); } -static void +static int ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id) { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; @@ -342,7 +342,7 @@ ioapic_assign_cpu(struct intsrc *isrc, u old_vector = intpin->io_vector; old_id = intpin->io_cpu; if (old_vector && apic_id == old_id) - return; + return (0); /* * Allocate an APIC vector for this interrupt pin. Once @@ -350,6 +350,9 @@ ioapic_assign_cpu(struct intsrc *isrc, u */ intpin->io_cpu = apic_id; intpin->io_vector = apic_alloc_vector(apic_id, intpin->io_irq); + if (intpin->io_vector == 0) + return (ENOSPC); + if (bootverbose) { printf("ioapic%u: routing intpin %u (", io->io_id, intpin->io_intpin); @@ -364,6 +367,7 @@ ioapic_assign_cpu(struct intsrc *isrc, u */ if (old_vector) apic_free_vector(old_id, old_vector, intpin->io_irq); + return (0); } static void @@ -372,7 +376,9 @@ ioapic_enable_intr(struct intsrc *isrc) struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; if (intpin->io_vector == 0) - ioapic_assign_cpu(isrc, intr_next_cpu()); + if (ioapic_assign_cpu(isrc, intr_next_cpu()) != 0) + panic("Couldn't find an APIC vector for IRQ %d", + intpin->io_irq); apic_enable_vector(intpin->io_cpu, intpin->io_vector); } @@ -496,7 +502,7 @@ ioapic_create(vm_paddr_t addr, int32_t a io->io_pic = ioapic_template; mtx_lock_spin(&icu_lock); io->io_id = next_id++; - io->io_apic_id = ioapic_read(apic, IOAPIC_ID) >> APIC_ID_SHIFT; + io->io_apic_id = ioapic_read(apic, IOAPIC_ID) >> APIC_ID_SHIFT; if (apic_id != -1 && io->io_apic_id != apic_id) { ioapic_write(apic, IOAPIC_ID, apic_id << APIC_ID_SHIFT); mtx_unlock_spin(&icu_lock); @@ -730,7 +736,7 @@ ioapic_set_triggermode(void *cookie, u_i if (pin >= io->io_numintr || trigger == INTR_TRIGGER_CONFORM) return (EINVAL); if (io->io_pins[pin].io_irq >= NUM_IO_INTS) - return (EINVAL); + return (EINVAL); edgetrigger = (trigger == INTR_TRIGGER_EDGE); if (io->io_pins[pin].io_edgetrigger == edgetrigger) return (0); Modified: head/sys/amd64/amd64/local_apic.c ============================================================================== --- head/sys/amd64/amd64/local_apic.c Wed Jul 1 17:06:56 2009 (r195248) +++ head/sys/amd64/amd64/local_apic.c Wed Jul 1 17:20:07 2009 (r195249) @@ -139,7 +139,7 @@ static inthand_t *ioint_handlers[] = { }; -static u_int32_t lapic_timer_divisors[] = { +static u_int32_t lapic_timer_divisors[] = { APIC_TDCR_1, APIC_TDCR_2, APIC_TDCR_4, APIC_TDCR_8, APIC_TDCR_16, APIC_TDCR_32, APIC_TDCR_64, APIC_TDCR_128 }; @@ -797,7 +797,7 @@ apic_alloc_vector(u_int apic_id, u_int i return (vector + APIC_IO_INTS); } mtx_unlock_spin(&icu_lock); - panic("Couldn't find an APIC vector for IRQ %u", irq); + return (0); } /* @@ -1058,7 +1058,7 @@ DB_SHOW_COMMAND(lapic, db_show_lapic) static SLIST_HEAD(, apic_enumerator) enumerators = SLIST_HEAD_INITIALIZER(enumerators); static struct apic_enumerator *best_enum; - + void apic_register_enumerator(struct apic_enumerator *enumerator) { Modified: head/sys/amd64/amd64/msi.c ============================================================================== --- head/sys/amd64/amd64/msi.c Wed Jul 1 17:06:56 2009 (r195248) +++ head/sys/amd64/amd64/msi.c Wed Jul 1 17:20:07 2009 (r195249) @@ -113,6 +113,8 @@ struct msi_intsrc { u_int msi_vector:8; /* IDT vector. */ u_int msi_cpu:8; /* Local APIC ID. (g) */ u_int msi_count:8; /* Messages in this group. (g) */ + u_int msi_maxcount:8; /* Alignment for this group. (g) */ + int *msi_irqs; /* Group's IRQ list. (g) */ }; static void msi_create_source(void); @@ -125,7 +127,7 @@ static int msi_vector(struct intsrc *isr static int msi_source_pending(struct intsrc *isrc); static int msi_config_intr(struct intsrc *isrc, enum intr_trigger trig, enum intr_polarity pol); -static void msi_assign_cpu(struct intsrc *isrc, u_int apic_id); +static int msi_assign_cpu(struct intsrc *isrc, u_int apic_id); struct pic msi_pic = { msi_enable_source, msi_disable_source, msi_eoi_source, msi_enable_intr, msi_disable_intr, msi_vector, @@ -195,32 +197,52 @@ msi_config_intr(struct intsrc *isrc, enu return (ENODEV); } -static void +static int msi_assign_cpu(struct intsrc *isrc, u_int apic_id) { - struct msi_intsrc *msi = (struct msi_intsrc *)isrc; + struct msi_intsrc *sib, *msi = (struct msi_intsrc *)isrc; int old_vector; u_int old_id; - int vector; + int i, vector; + + /* + * Only allow CPUs to be assigned to the first message for an + * MSI group. + */ + if (msi->msi_first != msi) + return (EINVAL); /* Store information to free existing irq. */ old_vector = msi->msi_vector; old_id = msi->msi_cpu; if (old_id == apic_id) - return; - if (!msi->msi_msix && msi->msi_first->msi_count > 1) - return; + return (0); - /* Allocate IDT vector on this cpu. */ - vector = apic_alloc_vector(apic_id, msi->msi_irq); + /* Allocate IDT vectors on this cpu. */ + if (msi->msi_count > 1) { + KASSERT(msi->msi_msix == 0, ("MSI-X message group")); + vector = apic_alloc_vectors(apic_id, msi->msi_irqs, + msi->msi_count, msi->msi_maxcount); + } else + vector = apic_alloc_vector(apic_id, msi->msi_irq); if (vector == 0) - return; /* XXX alloc_vector panics on failure. */ + return (ENOSPC); + msi->msi_cpu = apic_id; msi->msi_vector = vector; if (bootverbose) printf("msi: Assigning %s IRQ %d to local APIC %u vector %u\n", msi->msi_msix ? "MSI-X" : "MSI", msi->msi_irq, msi->msi_cpu, msi->msi_vector); + for (i = 1; i < msi->msi_count; i++) { + sib = (struct msi_intsrc *)intr_lookup_source(msi->msi_irqs[i]); + sib->msi_cpu = apic_id; + sib->msi_vector = vector + i; + if (bootverbose) + printf( + "msi: Assigning MSI IRQ %d to local APIC %u vector %u\n", + sib->msi_irq, sib->msi_cpu, sib->msi_vector); + } pci_remap_msi_irq(msi->msi_dev, msi->msi_irq); /* @@ -228,6 +250,9 @@ msi_assign_cpu(struct intsrc *isrc, u_in * to prevent races where we could miss an interrupt. */ apic_free_vector(old_id, old_vector, msi->msi_irq); + for (i = 1; i < msi->msi_count; i++) + apic_free_vector(old_id, old_vector + i, msi->msi_irqs[i]); + return (0); } void @@ -268,7 +293,7 @@ msi_create_source(void) msi_last_irq++; mtx_unlock(&msi_lock); - msi = malloc(sizeof(struct msi_intsrc), M_MSI, M_WAITOK | M_ZERO); + msi = malloc(sizeof(struct msi_intsrc), M_MSI, M_WAITOK | M_ZERO); msi->msi_intsrc.is_pic = &msi_pic; msi->msi_irq = irq; intr_register_source(&msi->msi_intsrc); @@ -276,21 +301,22 @@ msi_create_source(void) } /* - * Try to allocate 'count' interrupt sources with contiguous IDT values. If - * we allocate any new sources, then their IRQ values will be at the end of - * the irqs[] array, with *newirq being the index of the first new IRQ value - * and *newcount being the number of new IRQ values added. + * Try to allocate 'count' interrupt sources with contiguous IDT values. */ int msi_alloc(device_t dev, int count, int maxcount, int *irqs) { struct msi_intsrc *msi, *fsrc; u_int cpu; - int cnt, i, vector; + int cnt, i, *mirqs, vector; if (!msi_enabled) return (ENXIO); + if (count > 1) + mirqs = malloc(count * sizeof(*mirqs), M_MSI, M_WAITOK); + else + mirqs = NULL; again: mtx_lock(&msi_lock); @@ -317,6 +343,7 @@ again: /* If we would exceed the max, give up. */ if (i + (count - cnt) > FIRST_MSI_INT + NUM_MSI_INTS) { mtx_unlock(&msi_lock); + free(mirqs, M_MSI); return (ENXIO); } mtx_unlock(&msi_lock); @@ -337,6 +364,7 @@ again: vector = apic_alloc_vectors(cpu, irqs, count, maxcount); if (vector == 0) { mtx_unlock(&msi_lock); + free(mirqs, M_MSI); return (ENOSPC); } @@ -356,6 +384,10 @@ again: ("dead MSI has handlers")); } fsrc->msi_count = count; + fsrc->msi_maxcount = maxcount; + if (count > 1) + bcopy(irqs, mirqs, count * sizeof(*mirqs)); + fsrc->msi_irqs = mirqs; mtx_unlock(&msi_lock); return (0); @@ -413,6 +445,9 @@ msi_release(int *irqs, int count) apic_free_vector(first->msi_cpu, first->msi_vector, first->msi_irq); first->msi_vector = 0; first->msi_count = 0; + first->msi_maxcount = 0; + free(first->msi_irqs, M_MSI); + first->msi_irqs = NULL; mtx_unlock(&msi_lock); return (0); @@ -498,15 +533,23 @@ again: /* Allocate an IDT vector. */ cpu = intr_next_cpu(); vector = apic_alloc_vector(cpu, i); + if (vector == 0) { + mtx_unlock(&msi_lock); + return (ENOSPC); + } if (bootverbose) printf("msi: routing MSI-X IRQ %d to local APIC %u vector %u\n", msi->msi_irq, cpu, vector); - + /* Setup source. */ msi->msi_cpu = cpu; msi->msi_dev = dev; + msi->msi_first = msi; msi->msi_vector = vector; msi->msi_msix = 1; + msi->msi_count = 1; + msi->msi_maxcount = 1; + msi->msi_irqs = NULL; KASSERT(msi->msi_intsrc.is_handlers == 0, ("dead MSI-X has handlers")); mtx_unlock(&msi_lock); @@ -536,10 +579,13 @@ msix_release(int irq) KASSERT(msi->msi_dev != NULL, ("unowned message")); /* Clear out the message. */ + msi->msi_first = NULL; msi->msi_dev = NULL; apic_free_vector(msi->msi_cpu, msi->msi_vector, msi->msi_irq); msi->msi_vector = 0; msi->msi_msix = 0; + msi->msi_count = 0; + msi->msi_maxcount = 0; mtx_unlock(&msi_lock); return (0); Modified: head/sys/amd64/include/intr_machdep.h ============================================================================== --- head/sys/amd64/include/intr_machdep.h Wed Jul 1 17:06:56 2009 (r195248) +++ head/sys/amd64/include/intr_machdep.h Wed Jul 1 17:20:07 2009 (r195249) @@ -93,7 +93,7 @@ struct pic { void (*pic_resume)(struct pic *); int (*pic_config_intr)(struct intsrc *, enum intr_trigger, enum intr_polarity); - void (*pic_assign_cpu)(struct intsrc *, u_int apic_id); + int (*pic_assign_cpu)(struct intsrc *, u_int apic_id); STAILQ_ENTRY(pic) pics; }; Modified: head/sys/amd64/isa/atpic.c ============================================================================== --- head/sys/amd64/isa/atpic.c Wed Jul 1 17:06:56 2009 (r195248) +++ head/sys/amd64/isa/atpic.c Wed Jul 1 17:20:07 2009 (r195249) @@ -143,7 +143,7 @@ static void atpic_resume(struct pic *pic static int atpic_source_pending(struct intsrc *isrc); static int atpic_config_intr(struct intsrc *isrc, enum intr_trigger trig, enum intr_polarity pol); -static void atpic_assign_cpu(struct intsrc *isrc, u_int apic_id); +static int atpic_assign_cpu(struct intsrc *isrc, u_int apic_id); static void i8259_init(struct atpic *pic, int slave); static struct atpic atpics[] = { @@ -357,7 +357,7 @@ atpic_config_intr(struct intsrc *isrc, e return (0); } -static void +static int atpic_assign_cpu(struct intsrc *isrc, u_int apic_id) { Modified: head/sys/i386/i386/intr_machdep.c ============================================================================== --- head/sys/i386/i386/intr_machdep.c Wed Jul 1 17:06:56 2009 (r195248) +++ head/sys/i386/i386/intr_machdep.c Wed Jul 1 17:20:07 2009 (r195249) @@ -290,7 +290,8 @@ static int intr_assign_cpu(void *arg, u_char cpu) { #ifdef SMP - struct intsrc *isrc; + struct intsrc *isrc; + int error; /* * Don't do anything during early boot. We will pick up the @@ -299,10 +300,11 @@ intr_assign_cpu(void *arg, u_char cpu) if (assign_cpu && cpu != NOCPU) { isrc = arg; mtx_lock(&intr_table_lock); - isrc->is_pic->pic_assign_cpu(isrc, cpu_apic_ids[cpu]); + error = isrc->is_pic->pic_assign_cpu(isrc, cpu_apic_ids[cpu]); mtx_unlock(&intr_table_lock); - } - return (0); + } else + error = 0; + return (error); #else return (EOPNOTSUPP); #endif @@ -359,7 +361,7 @@ intr_init(void *dummy __unused) intrcnt_setname("???", 0); intrcnt_index = 1; STAILQ_INIT(&pics); - mtx_init(&intr_table_lock, "intr sources", NULL, MTX_DEF | MTX_RECURSE); + mtx_init(&intr_table_lock, "intr sources", NULL, MTX_DEF); mtx_init(&intrcnt_lock, "intrcnt", NULL, MTX_SPIN); } SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL); @@ -407,14 +409,14 @@ intr_next_cpu(void) if (!assign_cpu) return (cpu_apic_ids[0]); - mtx_lock(&intr_table_lock); + mtx_lock_spin(&icu_lock); apic_id = cpu_apic_ids[current_cpu]; do { current_cpu++; if (current_cpu > mp_maxid) current_cpu = 0; } while (!(intr_cpus & (1 << current_cpu))); - mtx_unlock(&intr_table_lock); + mtx_unlock_spin(&icu_lock); return (apic_id); } @@ -455,7 +457,6 @@ static void intr_shuffle_irqs(void *arg __unused) { struct intsrc *isrc; - u_int apic_id; int i; #ifdef XEN @@ -463,8 +464,8 @@ intr_shuffle_irqs(void *arg __unused) * Doesn't work yet */ return; -#endif - +#endif + /* Don't bother on UP. */ if (mp_ncpus == 1) return; @@ -478,13 +479,17 @@ intr_shuffle_irqs(void *arg __unused) /* * If this event is already bound to a CPU, * then assign the source to that CPU instead - * of picking one via round-robin. + * of picking one via round-robin. Note that + * this is careful to only advance the + * round-robin if the CPU assignment succeeds. */ if (isrc->is_event->ie_cpu != NOCPU) - apic_id = isrc->is_event->ie_cpu; - else - apic_id = intr_next_cpu(); - isrc->is_pic->pic_assign_cpu(isrc, apic_id); + (void)isrc->is_pic->pic_assign_cpu(isrc, + isrc->is_event->ie_cpu); + else if (isrc->is_pic->pic_assign_cpu(isrc, + cpu_apic_ids[current_cpu]) == 0) + (void)intr_next_cpu(); + } } mtx_unlock(&intr_table_lock); Modified: head/sys/i386/i386/io_apic.c ============================================================================== --- head/sys/i386/i386/io_apic.c Wed Jul 1 17:06:56 2009 (r195248) +++ head/sys/i386/i386/io_apic.c Wed Jul 1 17:20:07 2009 (r195249) @@ -120,7 +120,7 @@ static int ioapic_source_pending(struct static int ioapic_config_intr(struct intsrc *isrc, enum intr_trigger trig, enum intr_polarity pol); static void ioapic_resume(struct pic *pic); -static void ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id); +static int ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id); static void ioapic_program_intpin(struct ioapic_intsrc *intpin); static STAILQ_HEAD(,ioapic) ioapic_list = STAILQ_HEAD_INITIALIZER(ioapic_list); @@ -322,7 +322,7 @@ ioapic_program_intpin(struct ioapic_ints mtx_unlock_spin(&icu_lock); } -static void +static int ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id) { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; @@ -342,7 +342,7 @@ ioapic_assign_cpu(struct intsrc *isrc, u old_vector = intpin->io_vector; old_id = intpin->io_cpu; if (old_vector && apic_id == old_id) - return; + return (0); /* * Allocate an APIC vector for this interrupt pin. Once @@ -350,6 +350,9 @@ ioapic_assign_cpu(struct intsrc *isrc, u */ intpin->io_cpu = apic_id; intpin->io_vector = apic_alloc_vector(apic_id, intpin->io_irq); + if (intpin->io_vector == 0) + return (ENOSPC); + if (bootverbose) { printf("ioapic%u: routing intpin %u (", io->io_id, intpin->io_intpin); @@ -364,6 +367,7 @@ ioapic_assign_cpu(struct intsrc *isrc, u */ if (old_vector) apic_free_vector(old_id, old_vector, intpin->io_irq); + return (0); } static void @@ -372,7 +376,9 @@ ioapic_enable_intr(struct intsrc *isrc) struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; if (intpin->io_vector == 0) - ioapic_assign_cpu(isrc, intr_next_cpu()); + if (ioapic_assign_cpu(isrc, intr_next_cpu()) != 0) + panic("Couldn't find an APIC vector for IRQ %d", + intpin->io_irq); apic_enable_vector(intpin->io_cpu, intpin->io_vector); } @@ -496,7 +502,7 @@ ioapic_create(vm_paddr_t addr, int32_t a io->io_pic = ioapic_template; mtx_lock_spin(&icu_lock); io->io_id = next_id++; - io->io_apic_id = ioapic_read(apic, IOAPIC_ID) >> APIC_ID_SHIFT; + io->io_apic_id = ioapic_read(apic, IOAPIC_ID) >> APIC_ID_SHIFT; if (apic_id != -1 && io->io_apic_id != apic_id) { ioapic_write(apic, IOAPIC_ID, apic_id << APIC_ID_SHIFT); mtx_unlock_spin(&icu_lock); Modified: head/sys/i386/i386/local_apic.c ============================================================================== --- head/sys/i386/i386/local_apic.c Wed Jul 1 17:06:56 2009 (r195248) +++ head/sys/i386/i386/local_apic.c Wed Jul 1 17:20:07 2009 (r195249) @@ -139,7 +139,7 @@ static inthand_t *ioint_handlers[] = { }; -static u_int32_t lapic_timer_divisors[] = { +static u_int32_t lapic_timer_divisors[] = { APIC_TDCR_1, APIC_TDCR_2, APIC_TDCR_4, APIC_TDCR_8, APIC_TDCR_16, APIC_TDCR_32, APIC_TDCR_64, APIC_TDCR_128 }; @@ -799,7 +799,7 @@ apic_alloc_vector(u_int apic_id, u_int i return (vector + APIC_IO_INTS); } mtx_unlock_spin(&icu_lock); - panic("Couldn't find an APIC vector for IRQ %u", irq); + return (0); } /* @@ -1062,7 +1062,7 @@ DB_SHOW_COMMAND(lapic, db_show_lapic) static SLIST_HEAD(, apic_enumerator) enumerators = SLIST_HEAD_INITIALIZER(enumerators); static struct apic_enumerator *best_enum; - + void apic_register_enumerator(struct apic_enumerator *enumerator) { Modified: head/sys/i386/i386/msi.c ============================================================================== --- head/sys/i386/i386/msi.c Wed Jul 1 17:06:56 2009 (r195248) +++ head/sys/i386/i386/msi.c Wed Jul 1 17:20:07 2009 (r195249) @@ -113,6 +113,8 @@ struct msi_intsrc { u_int msi_vector:8; /* IDT vector. */ u_int msi_cpu:8; /* Local APIC ID. (g) */ u_int msi_count:8; /* Messages in this group. (g) */ + u_int msi_maxcount:8; /* Alignment for this group. (g) */ + int *msi_irqs; /* Group's IRQ list. (g) */ }; static void msi_create_source(void); @@ -125,7 +127,7 @@ static int msi_vector(struct intsrc *isr static int msi_source_pending(struct intsrc *isrc); static int msi_config_intr(struct intsrc *isrc, enum intr_trigger trig, enum intr_polarity pol); -static void msi_assign_cpu(struct intsrc *isrc, u_int apic_id); +static int msi_assign_cpu(struct intsrc *isrc, u_int apic_id); struct pic msi_pic = { msi_enable_source, msi_disable_source, msi_eoi_source, msi_enable_intr, msi_disable_intr, msi_vector, @@ -195,32 +197,52 @@ msi_config_intr(struct intsrc *isrc, enu return (ENODEV); } -static void +static int msi_assign_cpu(struct intsrc *isrc, u_int apic_id) { - struct msi_intsrc *msi = (struct msi_intsrc *)isrc; + struct msi_intsrc *sib, *msi = (struct msi_intsrc *)isrc; int old_vector; u_int old_id; - int vector; + int i, vector; + + /* + * Only allow CPUs to be assigned to the first message for an + * MSI group. + */ + if (msi->msi_first != msi) + return (EINVAL); /* Store information to free existing irq. */ old_vector = msi->msi_vector; old_id = msi->msi_cpu; if (old_id == apic_id) - return; - if (!msi->msi_msix && msi->msi_first->msi_count > 1) - return; + return (0); - /* Allocate IDT vector on this cpu. */ - vector = apic_alloc_vector(apic_id, msi->msi_irq); + /* Allocate IDT vectors on this cpu. */ + if (msi->msi_count > 1) { + KASSERT(msi->msi_msix == 0, ("MSI-X message group")); + vector = apic_alloc_vectors(apic_id, msi->msi_irqs, + msi->msi_count, msi->msi_maxcount); + } else + vector = apic_alloc_vector(apic_id, msi->msi_irq); if (vector == 0) - return; /* XXX alloc_vector panics on failure. */ + return (ENOSPC); + msi->msi_cpu = apic_id; msi->msi_vector = vector; if (bootverbose) printf("msi: Assigning %s IRQ %d to local APIC %u vector %u\n", msi->msi_msix ? "MSI-X" : "MSI", msi->msi_irq, msi->msi_cpu, msi->msi_vector); + for (i = 1; i < msi->msi_count; i++) { + sib = (struct msi_intsrc *)intr_lookup_source(msi->msi_irqs[i]); + sib->msi_cpu = apic_id; + sib->msi_vector = vector + i; + if (bootverbose) + printf( + "msi: Assigning MSI IRQ %d to local APIC %u vector %u\n", + sib->msi_irq, sib->msi_cpu, sib->msi_vector); + } pci_remap_msi_irq(msi->msi_dev, msi->msi_irq); /* @@ -228,6 +250,9 @@ msi_assign_cpu(struct intsrc *isrc, u_in * to prevent races where we could miss an interrupt. */ apic_free_vector(old_id, old_vector, msi->msi_irq); + for (i = 1; i < msi->msi_count; i++) + apic_free_vector(old_id, old_vector + i, msi->msi_irqs[i]); + return (0); } void @@ -268,7 +293,7 @@ msi_create_source(void) msi_last_irq++; mtx_unlock(&msi_lock); - msi = malloc(sizeof(struct msi_intsrc), M_MSI, M_WAITOK | M_ZERO); + msi = malloc(sizeof(struct msi_intsrc), M_MSI, M_WAITOK | M_ZERO); msi->msi_intsrc.is_pic = &msi_pic; msi->msi_irq = irq; intr_register_source(&msi->msi_intsrc); @@ -276,21 +301,22 @@ msi_create_source(void) } /* - * Try to allocate 'count' interrupt sources with contiguous IDT values. If - * we allocate any new sources, then their IRQ values will be at the end of - * the irqs[] array, with *newirq being the index of the first new IRQ value - * and *newcount being the number of new IRQ values added. + * Try to allocate 'count' interrupt sources with contiguous IDT values. */ int msi_alloc(device_t dev, int count, int maxcount, int *irqs) { struct msi_intsrc *msi, *fsrc; u_int cpu; - int cnt, i, vector; + int cnt, i, *mirqs, vector; if (!msi_enabled) return (ENXIO); + if (count > 1) + mirqs = malloc(count * sizeof(*mirqs), M_MSI, M_WAITOK); + else + mirqs = NULL; again: mtx_lock(&msi_lock); @@ -317,6 +343,7 @@ again: /* If we would exceed the max, give up. */ if (i + (count - cnt) > FIRST_MSI_INT + NUM_MSI_INTS) { mtx_unlock(&msi_lock); + free(mirqs, M_MSI); return (ENXIO); } mtx_unlock(&msi_lock); @@ -337,6 +364,7 @@ again: vector = apic_alloc_vectors(cpu, irqs, count, maxcount); if (vector == 0) { mtx_unlock(&msi_lock); + free(mirqs, M_MSI); return (ENOSPC); } @@ -356,6 +384,10 @@ again: ("dead MSI has handlers")); } fsrc->msi_count = count; + fsrc->msi_maxcount = maxcount; + if (count > 1) + bcopy(irqs, mirqs, count * sizeof(*mirqs)); + fsrc->msi_irqs = mirqs; mtx_unlock(&msi_lock); return (0); @@ -413,6 +445,9 @@ msi_release(int *irqs, int count) apic_free_vector(first->msi_cpu, first->msi_vector, first->msi_irq); first->msi_vector = 0; first->msi_count = 0; + first->msi_maxcount = 0; + free(first->msi_irqs, M_MSI); + first->msi_irqs = NULL; mtx_unlock(&msi_lock); return (0); @@ -498,15 +533,23 @@ again: /* Allocate an IDT vector. */ cpu = intr_next_cpu(); vector = apic_alloc_vector(cpu, i); + if (vector == 0) { + mtx_unlock(&msi_lock); + return (ENOSPC); + } if (bootverbose) printf("msi: routing MSI-X IRQ %d to local APIC %u vector %u\n", msi->msi_irq, cpu, vector); - + /* Setup source. */ msi->msi_cpu = cpu; msi->msi_dev = dev; + msi->msi_first = msi; msi->msi_vector = vector; msi->msi_msix = 1; + msi->msi_count = 1; + msi->msi_maxcount = 1; + msi->msi_irqs = NULL; KASSERT(msi->msi_intsrc.is_handlers == 0, ("dead MSI-X has handlers")); mtx_unlock(&msi_lock); @@ -536,10 +579,13 @@ msix_release(int irq) KASSERT(msi->msi_dev != NULL, ("unowned message")); /* Clear out the message. */ + msi->msi_first = NULL; msi->msi_dev = NULL; apic_free_vector(msi->msi_cpu, msi->msi_vector, msi->msi_irq); msi->msi_vector = 0; msi->msi_msix = 0; + msi->msi_count = 0; + msi->msi_maxcount = 0; mtx_unlock(&msi_lock); return (0); Modified: head/sys/i386/include/intr_machdep.h ============================================================================== --- head/sys/i386/include/intr_machdep.h Wed Jul 1 17:06:56 2009 (r195248) +++ head/sys/i386/include/intr_machdep.h Wed Jul 1 17:20:07 2009 (r195249) @@ -93,7 +93,7 @@ struct pic { void (*pic_resume)(struct pic *); int (*pic_config_intr)(struct intsrc *, enum intr_trigger, enum intr_polarity); - void (*pic_assign_cpu)(struct intsrc *, u_int apic_id); + int (*pic_assign_cpu)(struct intsrc *, u_int apic_id); STAILQ_ENTRY(pic) pics; }; Modified: head/sys/i386/isa/atpic.c ============================================================================== --- head/sys/i386/isa/atpic.c Wed Jul 1 17:06:56 2009 (r195248) +++ head/sys/i386/isa/atpic.c Wed Jul 1 17:20:07 2009 (r195249) @@ -161,7 +161,7 @@ static void atpic_resume(struct pic *pic static int atpic_source_pending(struct intsrc *isrc); static int atpic_config_intr(struct intsrc *isrc, enum intr_trigger trig, enum intr_polarity pol); -static void atpic_assign_cpu(struct intsrc *isrc, u_int apic_id); +static int atpic_assign_cpu(struct intsrc *isrc, u_int apic_id); static void i8259_init(struct atpic *pic, int slave); static struct atpic atpics[] = { @@ -389,7 +389,7 @@ atpic_config_intr(struct intsrc *isrc, e #endif /* PC98 */ } -static void +static int atpic_assign_cpu(struct intsrc *isrc, u_int apic_id) { Modified: head/sys/kern/kern_intr.c ============================================================================== --- head/sys/kern/kern_intr.c Wed Jul 1 17:06:56 2009 (r195248) +++ head/sys/kern/kern_intr.c Wed Jul 1 17:20:07 2009 (r195249) @@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -304,9 +305,14 @@ intr_event_bind(struct intr_event *ie, u if (ie->ie_assign_cpu == NULL) return (EOPNOTSUPP); + + error = priv_check(curthread, PRIV_SCHED_CPUSET_INTR); + if (error) + return (error); + /* - * If we have any ithreads try to set their mask first since this - * can fail. + * If we have any ithreads try to set their mask first to verify + * permissions, etc. */ mtx_lock(&ie->ie_lock); if (ie->ie_thread != NULL) { @@ -323,8 +329,22 @@ intr_event_bind(struct intr_event *ie, u } else mtx_unlock(&ie->ie_lock); error = ie->ie_assign_cpu(ie->ie_source, cpu); - if (error) + if (error) { + mtx_lock(&ie->ie_lock); + if (ie->ie_thread != NULL) { + CPU_ZERO(&mask); + if (ie->ie_cpu == NOCPU) + CPU_COPY(cpuset_root, &mask); + else + CPU_SET(cpu, &mask); + id = ie->ie_thread->it_thread->td_tid; + mtx_unlock(&ie->ie_lock); + (void)cpuset_setthread(id, &mask); + } else + mtx_unlock(&ie->ie_lock); return (error); + } + mtx_lock(&ie->ie_lock); ie->ie_cpu = cpu; mtx_unlock(&ie->ie_lock); Modified: head/sys/sys/priv.h ============================================================================== --- head/sys/sys/priv.h Wed Jul 1 17:06:56 2009 (r195248) +++ head/sys/sys/priv.h Wed Jul 1 17:20:07 2009 (r195249) @@ -185,6 +185,7 @@ #define PRIV_SCHED_SET 204 /* Can set thread scheduler. */ #define PRIV_SCHED_SETPARAM 205 /* Can set thread scheduler params. */ #define PRIV_SCHED_CPUSET 206 /* Can manipulate cpusets. */ +#define PRIV_SCHED_CPUSET_INTR 207 /* Can adjust IRQ to CPU binding. */ /* * POSIX semaphore privileges. From np at FreeBSD.org Wed Jul 1 17:51:00 2009 From: np at FreeBSD.org (Navdeep Parhar) Date: Wed Jul 1 17:51:16 2009 Subject: svn commit: r195250 - stable/7/sys/dev/cxgb Message-ID: <200907011750.n61HoxPr019738@svn.freebsd.org> Author: np Date: Wed Jul 1 17:50:59 2009 New Revision: 195250 URL: http://svn.freebsd.org/changeset/base/195250 Log: Fix cxgb's version checks in stable. This makes it select the correct buffer size for freelist1. Approved by: gnn (mentor) Modified: stable/7/sys/dev/cxgb/cxgb_sge.c Modified: stable/7/sys/dev/cxgb/cxgb_sge.c ============================================================================== --- stable/7/sys/dev/cxgb/cxgb_sge.c Wed Jul 1 17:20:07 2009 (r195249) +++ stable/7/sys/dev/cxgb/cxgb_sge.c Wed Jul 1 17:50:59 2009 (r195250) @@ -375,7 +375,7 @@ t3_sge_prep(adapter_t *adap, struct sge_ while (!powerof2(fl_q_size)) fl_q_size--; -#if __FreeBSD_version > 700000 +#if __FreeBSD_version >= 700111 if (cxgb_use_16k_clusters) jumbo_q_size = min(nmbjumbo16/(3*nqsets), JUMBO_Q_SIZE); else @@ -2377,7 +2377,7 @@ t3_sge_alloc_qset(adapter_t *sc, u_int i q->fl[0].buf_size = (MCLBYTES - header_size); q->fl[0].zone = zone_clust; q->fl[0].type = EXT_CLUSTER; -#if __FreeBSD_version > 800000 +#if __FreeBSD_version >= 700111 if (cxgb_use_16k_clusters) { q->fl[1].buf_size = MJUM16BYTES - header_size; q->fl[1].zone = zone_jumbo16; From dfr at FreeBSD.org Wed Jul 1 18:12:51 2009 From: dfr at FreeBSD.org (Doug Rabson) Date: Wed Jul 1 18:12:57 2009 Subject: svn commit: r195251 - head Message-ID: <200907011812.n61ICoiG020256@svn.freebsd.org> Author: dfr Date: Wed Jul 1 18:12:50 2009 New Revision: 195251 URL: http://svn.freebsd.org/changeset/base/195251 Log: Clarify the node about removing NFS_LEGACYRPC Approved by: re Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Jul 1 17:50:59 2009 (r195250) +++ head/UPDATING Wed Jul 1 18:12:50 2009 (r195251) @@ -23,8 +23,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. ln -s aj /etc/malloc.conf.) 20090630: - Remove the old kernel RPC implementation and the NFS_LEGACYRPC - option. Kernel configurations may need to be adjusted. + The NFS_LEGACYRPC option has been removed along with the old + kernel RPC implementation that this option selected. Kernel + configurations may need to be adjusted. 20090629: The network interface device nodes at /dev/net/ have From rwatson at FreeBSD.org Wed Jul 1 18:54:51 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Wed Jul 1 18:55:05 2009 Subject: svn commit: r195252 - in head/sys: kern security/audit Message-ID: <200907011854.n61IsnaF021004@svn.freebsd.org> Author: rwatson Date: Wed Jul 1 18:54:49 2009 New Revision: 195252 URL: http://svn.freebsd.org/changeset/base/195252 Log: Define missing audit argument macro AUDIT_ARG_SOCKET(), and capture the domain, type, and protocol arguments to socket(2) and socketpair(2). Approved by: re (audit argument blanket) MFC after: 3 days Modified: head/sys/kern/uipc_syscalls.c head/sys/security/audit/audit.h Modified: head/sys/kern/uipc_syscalls.c ============================================================================== --- head/sys/kern/uipc_syscalls.c Wed Jul 1 18:12:50 2009 (r195251) +++ head/sys/kern/uipc_syscalls.c Wed Jul 1 18:54:49 2009 (r195252) @@ -70,6 +70,7 @@ __FBSDID("$FreeBSD$"); #include #endif +#include #include #include @@ -161,6 +162,7 @@ socket(td, uap) struct file *fp; int fd, error; + AUDIT_ARG_SOCKET(uap->domain, uap->type, uap->protocol); #ifdef MAC error = mac_socket_check_create(td->td_ucred, uap->domain, uap->type, uap->protocol); @@ -586,6 +588,7 @@ kern_socketpair(struct thread *td, int d struct socket *so1, *so2; int fd, error; + AUDIT_ARG_SOCKET(domain, type, protocol); #ifdef MAC /* We might want to have a separate check for socket pairs. */ error = mac_socket_check_create(td->td_ucred, domain, type, Modified: head/sys/security/audit/audit.h ============================================================================== --- head/sys/security/audit/audit.h Wed Jul 1 18:12:50 2009 (r195251) +++ head/sys/security/audit/audit.h Wed Jul 1 18:54:49 2009 (r195252) @@ -297,6 +297,11 @@ void audit_thread_free(struct thread *t audit_arg_sgid((sgid)); \ } while (0) +#define AUDIT_ARG_SOCKET(sodomain, sotype, soprotocol) do { \ + if (AUDITING_TD(curthread)) \ + audit_arg_socket((sodomain), (sotype), (soprotocol)); \ +} while (0) + #define AUDIT_ARG_SUID(suid) do { \ if (AUDITING_TD(curthread)) \ audit_arg_suid((suid)); \ @@ -375,6 +380,7 @@ void audit_thread_free(struct thread *t #define AUDIT_ARG_RUID(ruid) #define AUDIT_ARG_SIGNUM(signum) #define AUDIT_ARG_SGID(sgid) +#define AUDIT_ARG_SOCKET(sodomain, sotype, soprotocol) #define AUDIT_ARG_SUID(suid) #define AUDIT_ARG_TEXT(text) #define AUDIT_ARG_UID(uid) From rwatson at FreeBSD.org Wed Jul 1 19:55:12 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Wed Jul 1 19:55:21 2009 Subject: svn commit: r195255 - head/sys/kern Message-ID: <200907011955.n61JtBah022305@svn.freebsd.org> Author: rwatson Date: Wed Jul 1 19:55:11 2009 New Revision: 195255 URL: http://svn.freebsd.org/changeset/base/195255 Log: Audit file descriptor numbers for various socket-related system calls. Approved by: re (audit argument blanket) MFC after: 3 days Modified: head/sys/kern/uipc_syscalls.c Modified: head/sys/kern/uipc_syscalls.c ============================================================================== --- head/sys/kern/uipc_syscalls.c Wed Jul 1 19:55:07 2009 (r195254) +++ head/sys/kern/uipc_syscalls.c Wed Jul 1 19:55:11 2009 (r195255) @@ -217,6 +217,7 @@ kern_bind(td, fd, sa) struct file *fp; int error; + AUDIT_ARG_FD(fd); error = getsock(td->td_proc->p_fd, fd, &fp, NULL); if (error) return (error); @@ -247,6 +248,7 @@ listen(td, uap) struct file *fp; int error; + AUDIT_ARG_FD(uap->s); error = getsock(td->td_proc->p_fd, uap->s, &fp, NULL); if (error == 0) { so = fp->f_data; @@ -340,6 +342,7 @@ kern_accept(struct thread *td, int s, st return (EINVAL); } + AUDIT_ARG_FD(s); fdp = td->td_proc->p_fd; error = getsock(fdp, s, &headfp, &fflag); if (error) @@ -530,6 +533,7 @@ kern_connect(td, fd, sa) int error; int interrupted = 0; + AUDIT_ARG_FD(fd); error = getsock(td->td_proc->p_fd, fd, &fp, NULL); if (error) return (error); @@ -738,6 +742,7 @@ kern_sendit(td, s, mp, flags, control, s struct uio *ktruio = NULL; #endif + AUDIT_ARG_FD(s); error = getsock(td->td_proc->p_fd, s, &fp, NULL); if (error) return (error); @@ -937,6 +942,7 @@ kern_recvit(td, s, mp, fromseg, controlp if(controlp != NULL) *controlp = 0; + AUDIT_ARG_FD(s); error = getsock(td->td_proc->p_fd, s, &fp, NULL); if (error) return (error); @@ -1252,6 +1258,7 @@ shutdown(td, uap) struct file *fp; int error; + AUDIT_ARG_FD(uap->s); error = getsock(td->td_proc->p_fd, uap->s, &fp, NULL); if (error == 0) { so = fp->f_data; @@ -1314,6 +1321,7 @@ kern_setsockopt(td, s, level, name, val, panic("kern_setsockopt called with bad valseg"); } + AUDIT_ARG_FD(s); error = getsock(td->td_proc->p_fd, s, &fp, NULL); if (error == 0) { so = fp->f_data; @@ -1394,6 +1402,7 @@ kern_getsockopt(td, s, level, name, val, panic("kern_getsockopt called with bad valseg"); } + AUDIT_ARG_FD(s); error = getsock(td->td_proc->p_fd, s, &fp, NULL); if (error == 0) { so = fp->f_data; @@ -1457,6 +1466,7 @@ kern_getsockname(struct thread *td, int if (*alen < 0) return (EINVAL); + AUDIT_ARG_FD(fd); error = getsock(td->td_proc->p_fd, fd, &fp, NULL); if (error) return (error); @@ -1556,6 +1566,7 @@ kern_getpeername(struct thread *td, int if (*alen < 0) return (EINVAL); + AUDIT_ARG_FD(fd); error = getsock(td->td_proc->p_fd, fd, &fp, NULL); if (error) return (error); @@ -1811,6 +1822,7 @@ kern_sendfile(struct thread *td, struct * File offset must be positive. If it goes beyond EOF * we send only the header/trailer and no payload data. */ + AUDIT_ARG_FD(uap->fd); if ((error = fgetvp_read(td, uap->fd, &vp)) != 0) goto out; vfslocked = VFS_LOCK_GIANT(vp->v_mount); @@ -2285,6 +2297,7 @@ sctp_peeloff(td, uap) u_int fflag; fdp = td->td_proc->p_fd; + AUDIT_ARG_FD(uap->sd); error = fgetsock(td, uap->sd, &head, &fflag); if (error) goto done2; @@ -2392,6 +2405,7 @@ sctp_generic_sendmsg (td, uap) } } + AUDIT_ARG_FD(uap->sd); error = getsock(td->td_proc->p_fd, uap->sd, &fp, NULL); if (error) goto sctp_bad; @@ -2493,6 +2507,7 @@ sctp_generic_sendmsg_iov(td, uap) } } + AUDIT_ARG_FD(uap->sd); error = getsock(td->td_proc->p_fd, uap->sd, &fp, NULL); if (error) goto sctp_bad1; @@ -2591,6 +2606,8 @@ sctp_generic_recvmsg(td, uap) #ifdef KTRACE struct uio *ktruio = NULL; #endif + + AUDIT_ARG_FD(uap->sd); error = getsock(td->td_proc->p_fd, uap->sd, &fp, NULL); if (error) { return (error); From raj at FreeBSD.org Wed Jul 1 20:07:45 2009 From: raj at FreeBSD.org (Rafal Jaworowski) Date: Wed Jul 1 20:07:53 2009 Subject: svn commit: r195256 - in head/sys/arm: at91 mv sa11x0 Message-ID: <200907012007.n61K7ick022628@svn.freebsd.org> Author: raj Date: Wed Jul 1 20:07:44 2009 New Revision: 195256 URL: http://svn.freebsd.org/changeset/base/195256 Log: Map DPCPU pages into ARM kernel VA space. DPCPU area was not properly mapped into kernel VA space, which caused page fault on the first DPCPU access. This patch fixes the problem by mapping DPCPU area into kernel VA space. Submitted by: Michal Hajduk, Piotr Ziecik Reviewed by: cognet, stas Approved by: re (kib) Obtained from: Semihalf Modified: head/sys/arm/at91/at91_machdep.c head/sys/arm/mv/mv_machdep.c head/sys/arm/sa11x0/assabet_machdep.c Modified: head/sys/arm/at91/at91_machdep.c ============================================================================== --- head/sys/arm/at91/at91_machdep.c Wed Jul 1 19:55:11 2009 (r195255) +++ head/sys/arm/at91/at91_machdep.c Wed Jul 1 20:07:44 2009 (r195256) @@ -301,6 +301,11 @@ initarm(void *arg, void *arg2) /* Map the vector page. */ pmap_map_entry(l1pagetable, ARM_VECTORS_HIGH, systempage.pv_pa, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); + + /* Map the DPCPU pages */ + pmap_map_chunk(l1pagetable, dpcpu.pv_va, dpcpu.pv_pa, DPCPU_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); + /* Map the stack pages */ pmap_map_chunk(l1pagetable, irqstack.pv_va, irqstack.pv_pa, IRQ_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); Modified: head/sys/arm/mv/mv_machdep.c ============================================================================== --- head/sys/arm/mv/mv_machdep.c Wed Jul 1 19:55:11 2009 (r195255) +++ head/sys/arm/mv/mv_machdep.c Wed Jul 1 20:07:44 2009 (r195256) @@ -528,9 +528,9 @@ initarm(void *mdp, void *unused __unused L2_TABLE_SIZE_REAL * l2size, VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE); - /* Map allocated stacks and msgbuf */ - pmap_map_chunk(l1pagetable, irqstack.pv_va, irqstack.pv_pa, - freemempos - irqstack.pv_va, + /* Map allocated DPCPU, stacks and msgbuf */ + pmap_map_chunk(l1pagetable, dpcpu.pv_va, dpcpu.pv_pa, + freemempos - dpcpu.pv_va, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); /* Link and map the vector page */ Modified: head/sys/arm/sa11x0/assabet_machdep.c ============================================================================== --- head/sys/arm/sa11x0/assabet_machdep.c Wed Jul 1 19:55:11 2009 (r195255) +++ head/sys/arm/sa11x0/assabet_machdep.c Wed Jul 1 20:07:44 2009 (r195256) @@ -313,6 +313,9 @@ initarm(void *arg, void *arg2) pmap_map_chunk(l1pagetable, KERNBASE, KERNBASE, ((uint32_t)lastaddr - KERNBASE), VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); + /* Map the DPCPU pages */ + pmap_map_chunk(l1pagetable, dpcpu.pv_va, dpcpu.pv_pa, DPCPU_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); /* Map the stack pages */ pmap_map_chunk(l1pagetable, irqstack.pv_va, irqstack.pv_pa, IRQ_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); From trasz at FreeBSD.org Wed Jul 1 20:16:30 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Wed Jul 1 20:16:41 2009 Subject: svn commit: r195257 - head/sys/geom Message-ID: <200907012016.n61KGTSe022828@svn.freebsd.org> Author: trasz Date: Wed Jul 1 20:16:29 2009 New Revision: 195257 URL: http://svn.freebsd.org/changeset/base/195257 Log: Fix a panic which (reportedly) can happen when unmounting a filesystem with I/O requests in flight on kernels compiled with "options INVARIANTS". Also, make it obvious it's not right to call g_valid_obj() (and macros using it, e.g. G_VALID_CONSUMER()) without topology lock held. Approved by: re (kib) Reported by: pho Modified: head/sys/geom/geom_subr.c head/sys/geom/geom_vfs.c Modified: head/sys/geom/geom_subr.c ============================================================================== --- head/sys/geom/geom_subr.c Wed Jul 1 20:07:44 2009 (r195256) +++ head/sys/geom/geom_subr.c Wed Jul 1 20:16:29 2009 (r195257) @@ -1025,6 +1025,8 @@ g_valid_obj(void const *ptr) struct g_consumer *cp; struct g_provider *pp; + g_topology_assert(); + LIST_FOREACH(mp, &g_classes, class) { if (ptr == mp) return (1); Modified: head/sys/geom/geom_vfs.c ============================================================================== --- head/sys/geom/geom_vfs.c Wed Jul 1 20:07:44 2009 (r195256) +++ head/sys/geom/geom_vfs.c Wed Jul 1 20:16:29 2009 (r195257) @@ -106,7 +106,7 @@ g_vfs_strategy(struct bufobj *bo, struct int vfslocked; cp = bo->bo_private; - G_VALID_CONSUMER(cp); + /* G_VALID_CONSUMER(cp); We likely lack topology lock */ /* * If the the provider has orphaned us, just return EXIO. From jeff at FreeBSD.org Wed Jul 1 20:43:47 2009 From: jeff at FreeBSD.org (Jeff Roberson) Date: Wed Jul 1 20:43:59 2009 Subject: svn commit: r195259 - head/sys/kern Message-ID: <200907012043.n61Khkb2023448@svn.freebsd.org> Author: jeff Date: Wed Jul 1 20:43:46 2009 New Revision: 195259 URL: http://svn.freebsd.org/changeset/base/195259 Log: - Use fd_lastfile + 1 as the upper bound on nd. This is more correct than using the size of the descriptor array. - A lock is not needed to fetch fd_lastfile. The results are stale the instant it is dropped. - Use a private mutex pool for select since the pool mutex is not used as a leaf. - Fetch the si_mtx pointer first before resorting to hashing to compute the mutex address. Reviewed by: McKusick Approved by: re (kib) Modified: head/sys/kern/sys_generic.c Modified: head/sys/kern/sys_generic.c ============================================================================== --- head/sys/kern/sys_generic.c Wed Jul 1 20:42:17 2009 (r195258) +++ head/sys/kern/sys_generic.c Wed Jul 1 20:43:46 2009 (r195259) @@ -124,6 +124,7 @@ struct selfd { }; static uma_zone_t selfd_zone; +static struct mtx_pool *mtxpool_select; #ifndef _SYS_SYSPROTO_H_ struct read_args { @@ -794,11 +795,8 @@ kern_select(struct thread *td, int nd, f if (nd < 0) return (EINVAL); fdp = td->td_proc->p_fd; - - FILEDESC_SLOCK(fdp); - if (nd > td->td_proc->p_fd->fd_nfiles) - nd = td->td_proc->p_fd->fd_nfiles; /* forgiving; slightly wrong */ - FILEDESC_SUNLOCK(fdp); + if (nd > fdp->fd_lastfile + 1) + nd = fdp->fd_lastfile + 1; /* * Allocate just enough bits for the non-null fd_sets. Use the @@ -1373,7 +1371,9 @@ selrecord(selector, sip) stp->st_free2 = NULL; else panic("selrecord: No free selfd on selq"); - mtxp = mtx_pool_find(mtxpool_sleep, sip); + mtxp = sip->si_mtx; + if (mtxp == NULL) + mtxp = mtx_pool_find(mtxpool_select, sip); /* * Initialize the sfp and queue it in the thread. */ @@ -1529,6 +1529,8 @@ SYSINIT(select, SI_SUB_SYSCALLS, SI_ORDE static void selectinit(void *dummy __unused) { + selfd_zone = uma_zcreate("selfd", sizeof(struct selfd), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + mtxpool_select = mtx_pool_create("select mtxpool", 128, MTX_DEF); } From gad at FreeBSD.org Wed Jul 1 22:01:44 2009 From: gad at FreeBSD.org (Garance A Drosehn) Date: Wed Jul 1 22:01:50 2009 Subject: AW: svn commit: r195200 - in head/usr.sbin: . wake In-Reply-To: <509A7CA1EA3EA046B1A5BA2FCFDB3C8EECC53324B6@TSS-EXCH01.t-systems.ch> References: <0E6D4FB2-A485-40ED-A856-ACC311A90EFE@msys.ch> <20090630.141340.289711551.imp@bsdimp.com> <7B9C309F-63E3-4CB8-9871-DE2DEE010096@msys.ch> <20090630.164009.2130804684.imp@bsdimp.com>, <1246413402.70460.23.camel@bau er.cse.buffalo.edu> <509A7CA1EA3EA046B1A5BA2FCFDB3C8EECC53324B6@TSS-EXCH01.t-systems.ch> Message-ID: At 7:04 AM +0200 7/1/09, Blapp, Martin wrote: >Hi folks, > >I really was not my or Marcs intention to skip any discussions. Rwatson >told us that if we like to see it in 8.0, we need to approve it by RE >and commit it before the 1. of july, and that's what I've done. Sorry >if I've upset anyone. > >Personally I think the tool is quite handy, better than net/wol (which >doesn't seem to work with different interfaces), wake doesn't need any >strange libaries as dependencies and it just a very short one (4k) > >If the concensus is to back it out, I'll back it out. I have no strong opinion on the program itself, and it would be fine with me if it is added after some decent code review, and after 8.0 is done. It sounds like this does have some advantages over 'wol', but I see no urgent reason that this *must* be in 8.0-release. For me, this is not a question of whether the utility is "nice", or what the name of it should be. It's a question of whether it means anything to announce a code freeze if we're constantly going to make exceptions to it. And whether it's fair to rush in a command just under the wire, which then means we'd have to go into an even bigger debate to justify pulling the command out of the base system after we've shipped an official stable-release with it in the system. This is not a utility which is needed to install freebsd, or which is needed before a new install of freebsd gets to the point where it can install things via ports or packages. Please note that I'm not trying to debate the wonderfulness of 'wake' itself. I'm trying to come up with good guidelines which would be used for *any* command which is shows up on the day before an already-announced code freeze. -- Garance Alistair Drosehn = drosehn@rpi.edu Senior Systems Programmer or gad@FreeBSD.org Rensselaer Polytechnic Institute; Troy, NY; USA From stas at FreeBSD.org Wed Jul 1 22:23:27 2009 From: stas at FreeBSD.org (Stanislav Sedov) Date: Wed Jul 1 22:23:39 2009 Subject: svn commit: r195264 - head/usr.sbin/wake Message-ID: <200907012223.n61MNQO2025697@svn.freebsd.org> Author: stas Date: Wed Jul 1 22:23:26 2009 New Revision: 195264 URL: http://svn.freebsd.org/changeset/base/195264 Log: - Properly order headers, local variables and prototypes. [1] - Remove unneeded headers. - Return non-zero error code in usage(). Approved by: re (kib) Suggested by: bde [1] Modified: head/usr.sbin/wake/wake.c Modified: head/usr.sbin/wake/wake.c ============================================================================== --- head/usr.sbin/wake/wake.c Wed Jul 1 22:20:44 2009 (r195263) +++ head/usr.sbin/wake/wake.c Wed Jul 1 22:23:26 2009 (r195264) @@ -27,28 +27,21 @@ #include __FBSDID("$FreeBSD$"); -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include #include #include #include #include #include - #include #include +#include +#include +#include +#include +#include +#include + #define _PATH_BPF "/dev/bpf" #ifndef SYNC_LEN @@ -59,18 +52,18 @@ __FBSDID("$FreeBSD$"); #define DESTADDR_COUNT 16 #endif -static void usage(void); -static int wake(const char *iface, const char *host); static int bind_if_to_bpf(char const *ifname, int bpf); static int get_ether(char const *text, struct ether_addr *addr); static int send_wakeup(int bpf, struct ether_addr const *addr); +static void usage(void); +static int wake(const char *iface, const char *host); static void usage(void) { (void)fprintf(stderr, "usage: wake interface lladdr...\n"); - exit(0); + exit(1); } static int @@ -144,10 +137,10 @@ send_wakeup(int bpf, struct ether_addr c struct ether_header hdr; u_char data[SYNC_LEN + ETHER_ADDR_LEN * DESTADDR_COUNT]; } __packed pkt; + u_char *p; ssize_t bw; ssize_t len; int i; - u_char *p; (void)memset(pkt.hdr.ether_dhost, 0xff, sizeof(pkt.hdr.ether_dhost)); pkt.hdr.ether_type = htons(0); From trasz at FreeBSD.org Wed Jul 1 22:30:37 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Wed Jul 1 22:30:49 2009 Subject: svn commit: r195265 - head/sys/ufs/ffs Message-ID: <200907012230.n61MUaHn025853@svn.freebsd.org> Author: trasz Date: Wed Jul 1 22:30:36 2009 New Revision: 195265 URL: http://svn.freebsd.org/changeset/base/195265 Log: Don't panic on attempt to set ACL on a block device file. This is just a part of kern/125613. PR: kern/125613 Submitted by: Jaakko Heinonen Reviewed by: rwatson Approved by: re (kib) Modified: head/sys/ufs/ffs/ffs_vnops.c Modified: head/sys/ufs/ffs/ffs_vnops.c ============================================================================== --- head/sys/ufs/ffs/ffs_vnops.c Wed Jul 1 22:23:26 2009 (r195264) +++ head/sys/ufs/ffs/ffs_vnops.c Wed Jul 1 22:30:36 2009 (r195265) @@ -1401,7 +1401,7 @@ struct vop_openextattr_args { ip = VTOI(ap->a_vp); fs = ip->i_fs; - if (ap->a_vp->v_type == VCHR) + if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK) return (EOPNOTSUPP); return (ffs_open_ea(ap->a_vp, ap->a_cred, ap->a_td)); @@ -1429,7 +1429,7 @@ struct vop_closeextattr_args { ip = VTOI(ap->a_vp); fs = ip->i_fs; - if (ap->a_vp->v_type == VCHR) + if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK) return (EOPNOTSUPP); if (ap->a_commit && (ap->a_vp->v_mount->mnt_flag & MNT_RDONLY)) @@ -1462,7 +1462,7 @@ vop_deleteextattr { ip = VTOI(ap->a_vp); fs = ip->i_fs; - if (ap->a_vp->v_type == VCHR) + if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK) return (EOPNOTSUPP); if (strlen(ap->a_name) == 0) @@ -1549,7 +1549,7 @@ vop_getextattr { ip = VTOI(ap->a_vp); fs = ip->i_fs; - if (ap->a_vp->v_type == VCHR) + if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK) return (EOPNOTSUPP); error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace, @@ -1605,7 +1605,7 @@ vop_listextattr { ip = VTOI(ap->a_vp); fs = ip->i_fs; - if (ap->a_vp->v_type == VCHR) + if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK) return (EOPNOTSUPP); error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace, @@ -1668,7 +1668,7 @@ vop_setextattr { ip = VTOI(ap->a_vp); fs = ip->i_fs; - if (ap->a_vp->v_type == VCHR) + if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK) return (EOPNOTSUPP); if (strlen(ap->a_name) == 0) From rwatson at FreeBSD.org Wed Jul 1 22:47:47 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Wed Jul 1 22:47:54 2009 Subject: svn commit: r195267 - in head/sys: kern security/audit Message-ID: <200907012247.n61Mljwl026219@svn.freebsd.org> Author: rwatson Date: Wed Jul 1 22:47:45 2009 New Revision: 195267 URL: http://svn.freebsd.org/changeset/base/195267 Log: For access(2) and eaccess(2), audit the requested access mode. Approved by: re (audit argument blanket) MFC after: 3 days Modified: head/sys/kern/vfs_syscalls.c head/sys/security/audit/audit_bsm.c Modified: head/sys/kern/vfs_syscalls.c ============================================================================== --- head/sys/kern/vfs_syscalls.c Wed Jul 1 22:45:19 2009 (r195266) +++ head/sys/kern/vfs_syscalls.c Wed Jul 1 22:47:45 2009 (r195267) @@ -2133,6 +2133,7 @@ kern_accessat(struct thread *td, int fd, td->td_ucred = tmpcred; } else cred = tmpcred = td->td_ucred; + AUDIT_ARG_VALUE(mode); NDINIT_AT(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, fd, td); if ((error = namei(&nd)) != 0) Modified: head/sys/security/audit/audit_bsm.c ============================================================================== --- head/sys/security/audit/audit_bsm.c Wed Jul 1 22:45:19 2009 (r195266) +++ head/sys/security/audit/audit_bsm.c Wed Jul 1 22:47:45 2009 (r195267) @@ -706,10 +706,8 @@ kaudit_to_bsm(struct kaudit_record *kar, } /* FALLTHROUGH */ - case AUE_ACCESS: case AUE_CHDIR: case AUE_CHROOT: - case AUE_EACCESS: case AUE_GETATTRLIST: case AUE_JAIL: case AUE_LUTIMES: @@ -732,6 +730,15 @@ kaudit_to_bsm(struct kaudit_record *kar, UPATH1_VNODE1_TOKENS; break; + case AUE_ACCESS: + case AUE_EACCESS: + UPATH1_VNODE1_TOKENS; + if (ARG_IS_VALID(kar, ARG_VALUE)) { + tok = au_to_arg32(1, "mode", ar->ar_arg_value); + kau_write(rec, tok); + } + break; + case AUE_FHSTATFS: case AUE_FHOPEN: case AUE_FHSTAT: From delphij at FreeBSD.org Thu Jul 2 00:36:01 2009 From: delphij at FreeBSD.org (Xin LI) Date: Thu Jul 2 00:36:08 2009 Subject: svn commit: r195272 - in stable/7/usr.sbin/sysinstall: . help Message-ID: <200907020036.n620a06g028508@svn.freebsd.org> Author: delphij Date: Thu Jul 2 00:36:00 2009 New Revision: 195272 URL: http://svn.freebsd.org/changeset/base/195272 Log: MFC r180208 (peter): Set magic fbsd:nokeywords property that allows files to bypass keyword expansion. (file-specific replacement for CVSROOT/exclude) Modified: stable/7/usr.sbin/sysinstall/ (props changed) stable/7/usr.sbin/sysinstall/help/anonftp.hlp (props changed) stable/7/usr.sbin/sysinstall/help/configure.hlp (props changed) stable/7/usr.sbin/sysinstall/help/distributions.hlp (props changed) stable/7/usr.sbin/sysinstall/help/drives.hlp (props changed) stable/7/usr.sbin/sysinstall/help/fixit.hlp (props changed) stable/7/usr.sbin/sysinstall/help/html.hlp (props changed) stable/7/usr.sbin/sysinstall/help/media.hlp (props changed) stable/7/usr.sbin/sysinstall/help/network_device.hlp (props changed) stable/7/usr.sbin/sysinstall/help/options.hlp (props changed) stable/7/usr.sbin/sysinstall/help/partition.hlp (props changed) stable/7/usr.sbin/sysinstall/help/securelevel.hlp (props changed) stable/7/usr.sbin/sysinstall/help/shortcuts.hlp (props changed) stable/7/usr.sbin/sysinstall/help/slice.hlp (props changed) stable/7/usr.sbin/sysinstall/help/tcp.hlp (props changed) stable/7/usr.sbin/sysinstall/help/usage.hlp (props changed) stable/7/usr.sbin/sysinstall/help/usermgmt.hlp (props changed) From delphij at FreeBSD.org Thu Jul 2 00:39:26 2009 From: delphij at FreeBSD.org (Xin LI) Date: Thu Jul 2 00:39:32 2009 Subject: svn commit: r195273 - in stable/7/usr.sbin/sysinstall: . help Message-ID: <200907020039.n620dPMp028673@svn.freebsd.org> Author: delphij Date: Thu Jul 2 00:39:25 2009 New Revision: 195273 URL: http://svn.freebsd.org/changeset/base/195273 Log: MFC r195012: Correct a typo (which you can use to in order -> which you can use in order to). PR: bin/136040 Submitted by: "Vikentii L. Karabin" Modified: stable/7/usr.sbin/sysinstall/ (props changed) stable/7/usr.sbin/sysinstall/help/usage.hlp Modified: stable/7/usr.sbin/sysinstall/help/usage.hlp ============================================================================== --- stable/7/usr.sbin/sysinstall/help/usage.hlp Thu Jul 2 00:36:00 2009 (r195272) +++ stable/7/usr.sbin/sysinstall/help/usage.hlp Thu Jul 2 00:39:25 2009 (r195273) @@ -56,7 +56,7 @@ it's also useful when dealing with sub-s that don't use menus and tend to scroll their output off the top of the screen. -FreeBSD also supports multiple "virtual consoles" which you can use to +FreeBSD also supports multiple "virtual consoles" which you can use in order to have several active sessions at once. Use ALT-F to switch between screens, where `F' is the function key corresponding to the screen you wish to see. By default, the system comes with 8 From delphij at FreeBSD.org Thu Jul 2 00:41:37 2009 From: delphij at FreeBSD.org (Xin LI) Date: Thu Jul 2 00:41:49 2009 Subject: svn commit: r195274 - head/sys/dev/mpt Message-ID: <200907020041.n620fbCI028759@svn.freebsd.org> Author: delphij Date: Thu Jul 2 00:41:37 2009 New Revision: 195274 URL: http://svn.freebsd.org/changeset/base/195274 Log: Change explicit maximium numbers to the defined macro MPT_MAX_LUNS. Approved by: re (kensmith) Modified: head/sys/dev/mpt/mpt_cam.c Modified: head/sys/dev/mpt/mpt_cam.c ============================================================================== --- head/sys/dev/mpt/mpt_cam.c Thu Jul 2 00:39:25 2009 (r195273) +++ head/sys/dev/mpt/mpt_cam.c Thu Jul 2 00:41:37 2009 (r195274) @@ -2152,7 +2152,7 @@ mpt_start(struct cam_sim *sim, union ccb mpt_req->TargetID = tgt; /* We assume a single level LUN type */ - if (ccb->ccb_h.target_lun >= 256) { + if (ccb->ccb_h.target_lun >= MPT_MAX_LUNS) { mpt_req->LUN[0] = 0x40 | ((ccb->ccb_h.target_lun >> 8) & 0x3f); mpt_req->LUN[1] = ccb->ccb_h.target_lun & 0xff; } else { @@ -4025,7 +4025,7 @@ mpt_scsi_send_tmf(struct mpt_softc *mpt, tmf_req->MsgFlags = flags; tmf_req->MsgContext = htole32(mpt->tmf_req->index | scsi_tmf_handler_id); - if (lun > 256) { + if (lun > MPT_MAX_LUNS) { tmf_req->LUN[0] = 0x40 | ((lun >> 8) & 0x3f); tmf_req->LUN[1] = lun & 0xff; } else { @@ -4499,7 +4499,7 @@ mpt_target_start_io(struct mpt_softc *mp ta->Function = MPI_FUNCTION_TARGET_ASSIST; ta->MsgContext = htole32(req->index | mpt->scsi_tgt_handler_id); ta->ReplyWord = htole32(tgt->reply_desc); - if (csio->ccb_h.target_lun > 256) { + if (csio->ccb_h.target_lun > MPT_MAX_LUNS) { ta->LUN[0] = 0x40 | ((csio->ccb_h.target_lun >> 8) & 0x3f); ta->LUN[1] = csio->ccb_h.target_lun & 0xff; @@ -4651,7 +4651,7 @@ mpt_scsi_tgt_local(struct mpt_softc *mpt ta->Function = MPI_FUNCTION_TARGET_ASSIST; ta->MsgContext = htole32(req->index | mpt->scsi_tgt_handler_id); ta->ReplyWord = htole32(tgt->reply_desc); - if (lun > 256) { + if (lun > MPT_MAX_LUNS) { ta->LUN[0] = 0x40 | ((lun >> 8) & 0x3f); ta->LUN[1] = lun & 0xff; } else { From delphij at FreeBSD.org Thu Jul 2 00:43:11 2009 From: delphij at FreeBSD.org (Xin LI) Date: Thu Jul 2 00:43:18 2009 Subject: svn commit: r195275 - head/sys/dev/mpt Message-ID: <200907020043.n620hBFS028827@svn.freebsd.org> Author: delphij Date: Thu Jul 2 00:43:10 2009 New Revision: 195275 URL: http://svn.freebsd.org/changeset/base/195275 Log: Use MPT_MAX_LUNS as maximium number of LUNs, not 7, for SAS and FC cases. This matches Linux driver behavior. Discussed with: scottl Approved by: re (kensmith) MFC after: 1 month Modified: head/sys/dev/mpt/mpt_cam.c Modified: head/sys/dev/mpt/mpt_cam.c ============================================================================== --- head/sys/dev/mpt/mpt_cam.c Thu Jul 2 00:41:37 2009 (r195274) +++ head/sys/dev/mpt/mpt_cam.c Thu Jul 2 00:43:10 2009 (r195275) @@ -3588,7 +3588,10 @@ mpt_action(struct cam_sim *sim, union cc if (mpt->is_spi && cpi->max_target > 15) { cpi->max_target = 15; } - cpi->max_lun = 7; + if (mpt->is_spi) + cpi->max_lun = 7; + else + cpi->max_lun = MPT_MAX_LUNS; cpi->initiator_id = mpt->mpt_ini_id; cpi->bus_id = cam_sim_bus(sim); From delphij at FreeBSD.org Thu Jul 2 00:44:22 2009 From: delphij at FreeBSD.org (Xin LI) Date: Thu Jul 2 00:44:28 2009 Subject: svn commit: r195276 - in stable/6/usr.sbin/sysinstall: . help Message-ID: <200907020044.n620iLoD028934@svn.freebsd.org> Author: delphij Date: Thu Jul 2 00:44:21 2009 New Revision: 195276 URL: http://svn.freebsd.org/changeset/base/195276 Log: MFC r180208 (peter): Set magic fbsd:nokeywords property that allows files to bypass keyword expansion. (file-specific replacement for CVSROOT/exclude) Modified: stable/6/usr.sbin/sysinstall/ (props changed) stable/6/usr.sbin/sysinstall/help/anonftp.hlp (props changed) stable/6/usr.sbin/sysinstall/help/configure.hlp (props changed) stable/6/usr.sbin/sysinstall/help/distributions.hlp (props changed) stable/6/usr.sbin/sysinstall/help/drives.hlp (props changed) stable/6/usr.sbin/sysinstall/help/fixit.hlp (props changed) stable/6/usr.sbin/sysinstall/help/html.hlp (props changed) stable/6/usr.sbin/sysinstall/help/media.hlp (props changed) stable/6/usr.sbin/sysinstall/help/network_device.hlp (props changed) stable/6/usr.sbin/sysinstall/help/options.hlp (props changed) stable/6/usr.sbin/sysinstall/help/partition.hlp (props changed) stable/6/usr.sbin/sysinstall/help/securelevel.hlp (props changed) stable/6/usr.sbin/sysinstall/help/shortcuts.hlp (props changed) stable/6/usr.sbin/sysinstall/help/slice.hlp (props changed) stable/6/usr.sbin/sysinstall/help/tcp.hlp (props changed) stable/6/usr.sbin/sysinstall/help/usage.hlp (props changed) stable/6/usr.sbin/sysinstall/help/usermgmt.hlp (props changed) From delphij at FreeBSD.org Thu Jul 2 00:45:30 2009 From: delphij at FreeBSD.org (Xin LI) Date: Thu Jul 2 00:45:46 2009 Subject: svn commit: r195277 - in stable/6/usr.sbin/sysinstall: . help Message-ID: <200907020045.n620jSi6029008@svn.freebsd.org> Author: delphij Date: Thu Jul 2 00:45:28 2009 New Revision: 195277 URL: http://svn.freebsd.org/changeset/base/195277 Log: MFC r195012: Correct a typo (which you can use to in order -> which you can use in order to). PR: bin/136040 Submitted by: "Vikentii L. Karabin" Modified: stable/6/usr.sbin/sysinstall/ (props changed) stable/6/usr.sbin/sysinstall/help/usage.hlp Modified: stable/6/usr.sbin/sysinstall/help/usage.hlp ============================================================================== --- stable/6/usr.sbin/sysinstall/help/usage.hlp Thu Jul 2 00:44:21 2009 (r195276) +++ stable/6/usr.sbin/sysinstall/help/usage.hlp Thu Jul 2 00:45:28 2009 (r195277) @@ -56,7 +56,7 @@ it's also useful when dealing with sub-s that don't use menus and tend to scroll their output off the top of the screen. -FreeBSD also supports multiple "virtual consoles" which you can use to +FreeBSD also supports multiple "virtual consoles" which you can use in order to have several active sessions at once. Use ALT-F to switch between screens, where `F' is the function key corresponding to the screen you wish to see. By default, the system comes with 8 From bf1783 at googlemail.com Thu Jul 2 09:05:08 2009 From: bf1783 at googlemail.com (b. f.) Date: Thu Jul 2 09:05:15 2009 Subject: svn commit: r195230 - head Message-ID: >Ed Schouten wrote: >> Ed Schouten wrote: >> Not sure, but I think there were multiple header files that were >> removed yesterday. >Never mind. They were modified, not removed. Sorry for the noise! There are at least three that I think may need to be _removed_ from ObsoleteFiles.inc: previously removed from system in usb changes four months ago and added to ObsoleteFiles.inc in r188948 by thompsa@ , re-added to base by thompsa@ a few days ago in r194677 reshuffling: /usr/include/dev/usb/usbdi.h /usr/include/dev/usb/usbdi_util.h previously removed from base and added to ObsoleteFiles.inc in Nov. 2006 (r164619); re-added a few days ago by thompsa@ (r194676): /usr/include/libusb.h Regards, From dimitry at andric.com Thu Jul 2 09:10:54 2009 From: dimitry at andric.com (Dimitry Andric) Date: Thu Jul 2 09:11:01 2009 Subject: svn commit: r195230 - head In-Reply-To: References: Message-ID: <4A4C799A.4070803@andric.com> On 2009-07-02 10:37, b. f. wrote: > previously removed from system in usb changes four months ago and > added to ObsoleteFiles.inc in r188948 by thompsa@ , re-added to base > by thompsa@ a few days ago in r194677 reshuffling: > > /usr/include/dev/usb/usbdi.h > /usr/include/dev/usb/usbdi_util.h > > previously removed from base and added to ObsoleteFiles.inc in Nov. > 2006 (r164619); re-added a few days ago by thompsa@ (r194676): > > /usr/include/libusb.h Indeed, it looks like every time after a 'make installworld', these files re-appear, only to be deleted later by 'make delete-old'. :) From rwatson at FreeBSD.org Thu Jul 2 09:15:31 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Thu Jul 2 09:15:43 2009 Subject: svn commit: r195280 - in head/sys: kern security/audit Message-ID: <200907020915.n629FUSc038910@svn.freebsd.org> Author: rwatson Date: Thu Jul 2 09:15:30 2009 New Revision: 195280 URL: http://svn.freebsd.org/changeset/base/195280 Log: Clean up a number of aspects of token generation from audit arguments to system calls: - Centralize generation of argument tokens for VM addresses in a macro, ADDR_TOKEN(), and properly encode 64-bit addresses in 64-bit arguments. - Fix up argument numbers across a large number of syscalls so that they match the numeric argument into the system call. - Don't audit the address argument to ioctl(2) or ptrace(2), but do keep generating tokens for mmap(2), minherit(2), since they relate to passing object access across execve(2). Approved by: re (audit argument blanket) Obtained from: TrustedBSD Project MFC after: 1 week Modified: head/sys/kern/sys_process.c head/sys/security/audit/audit_bsm.c Modified: head/sys/kern/sys_process.c ============================================================================== --- head/sys/kern/sys_process.c Thu Jul 2 04:56:11 2009 (r195279) +++ head/sys/kern/sys_process.c Thu Jul 2 09:15:30 2009 (r195280) @@ -402,7 +402,6 @@ ptrace(struct thread *td, struct ptrace_ #endif AUDIT_ARG_PID(uap->pid); AUDIT_ARG_CMD(uap->req); - AUDIT_ARG_ADDR(uap->addr); AUDIT_ARG_VALUE(uap->data); addr = &r; switch (uap->req) { Modified: head/sys/security/audit/audit_bsm.c ============================================================================== --- head/sys/security/audit/audit_bsm.c Thu Jul 2 04:56:11 2009 (r195279) +++ head/sys/security/audit/audit_bsm.c Thu Jul 2 09:15:30 2009 (r195280) @@ -253,7 +253,7 @@ kau_free(struct au_record *rec) } \ } while (0) -#define EXTATTR_TOKENS do { \ +#define EXTATTR_TOKENS(namespace_argnum) do { \ if (ARG_IS_VALID(kar, ARG_VALUE)) { \ switch (ar->ar_arg_value) { \ case EXTATTR_NAMESPACE_USER: \ @@ -263,8 +263,8 @@ kau_free(struct au_record *rec) tok = au_to_text(EXTATTR_NAMESPACE_SYSTEM_STRING);\ break; \ default: \ - tok = au_to_arg32(3, "attrnamespace", \ - ar->ar_arg_value); \ + tok = au_to_arg32((namespace_argnum), \ + "attrnamespace", ar->ar_arg_value); \ break; \ } \ kau_write(rec, tok); \ @@ -277,6 +277,24 @@ kau_free(struct au_record *rec) } while (0) /* + * Not all pointer arguments to system calls are of interest, but in some + * cases they reflect delegation of rights, such as mmap(2) falled by + * minherit(2) before execve(2), so do the best we can. + */ +#define ADDR_TOKEN(argnum, argname) do { \ + if (ARG_IS_VALID(kar, ARG_ADDR)) { \ + if (sizeof(void *) == sizeof(uint32_t)) \ + tok = au_to_arg32((argnum), (argname), \ + (uint32_t)(uintptr_t)ar->ar_arg_addr); \ + else \ + tok = au_to_arg64((argnum), (argname), \ + (uint64_t)(uintptr_t)ar->ar_arg_addr); \ + kau_write(rec, tok); \ + } \ +} while (0) + + +/* * Implement auditing for the auditon() system call. The audit tokens that * are generated depend on the command that was sent into the auditon() * system call. @@ -286,21 +304,20 @@ audit_sys_auditon(struct audit_record *a { struct au_token *tok; + tok = au_to_arg32(3, "length", ar->ar_arg_len); + kau_write(rec, tok); switch (ar->ar_arg_cmd) { case A_OLDSETPOLICY: if ((size_t)ar->ar_arg_len == sizeof(int64_t)) { - tok = au_to_arg32(3, "length", ar->ar_arg_len); - kau_write(rec, tok); tok = au_to_arg64(2, "policy", ar->ar_arg_auditon.au_policy64); kau_write(rec, tok); break; } /* FALLTHROUGH */ + case A_SETPOLICY: - tok = au_to_arg32(3, "length", ar->ar_arg_len); - kau_write(rec, tok); - tok = au_to_arg32(1, "policy", ar->ar_arg_auditon.au_policy); + tok = au_to_arg32(2, "policy", ar->ar_arg_auditon.au_policy); kau_write(rec, tok); break; @@ -315,8 +332,6 @@ audit_sys_auditon(struct audit_record *a case A_OLDSETQCTRL: if ((size_t)ar->ar_arg_len == sizeof(au_qctrl64_t)) { - tok = au_to_arg32(3, "length", ar->ar_arg_len); - kau_write(rec, tok); tok = au_to_arg64(2, "setqctrl:aq_hiwater", ar->ar_arg_auditon.au_qctrl64.aq64_hiwater); kau_write(rec, tok); @@ -335,8 +350,9 @@ audit_sys_auditon(struct audit_record *a break; } /* FALLTHROUGH */ + case A_SETQCTRL: - tok = au_to_arg32(3, "setqctrl:aq_hiwater", + tok = au_to_arg32(2, "setqctrl:aq_hiwater", ar->ar_arg_auditon.au_qctrl.aq_hiwater); kau_write(rec, tok); tok = au_to_arg32(2, "setqctrl:aq_lowater", @@ -354,17 +370,15 @@ audit_sys_auditon(struct audit_record *a break; case A_SETUMASK: - tok = au_to_arg32(3, "setumask:as_success", + tok = au_to_arg32(2, "setumask:as_success", ar->ar_arg_auditon.au_auinfo.ai_mask.am_success); kau_write(rec, tok); - tok = au_to_arg32(3, "setumask:as_failure", + tok = au_to_arg32(2, "setumask:as_failure", ar->ar_arg_auditon.au_auinfo.ai_mask.am_failure); kau_write(rec, tok); break; case A_SETSMASK: - tok = au_to_arg32(3, "length", ar->ar_arg_len); - kau_write(rec, tok); tok = au_to_arg32(2, "setsmask:as_success", ar->ar_arg_auditon.au_auinfo.ai_mask.am_success); kau_write(rec, tok); @@ -375,23 +389,19 @@ audit_sys_auditon(struct audit_record *a case A_OLDSETCOND: if ((size_t)ar->ar_arg_len == sizeof(int64_t)) { - tok = au_to_arg32(3, "length", ar->ar_arg_len); - kau_write(rec, tok); tok = au_to_arg64(2, "setcond", ar->ar_arg_auditon.au_cond64); kau_write(rec, tok); break; } /* FALLTHROUGH */ + case A_SETCOND: - tok = au_to_arg32(3, "length", ar->ar_arg_len); - kau_write(rec, tok); - tok = au_to_arg32(3, "setcond", ar->ar_arg_auditon.au_cond); + tok = au_to_arg32(2, "setcond", ar->ar_arg_auditon.au_cond); kau_write(rec, tok); break; case A_SETCLASS: - tok = au_to_arg32(3, "length", ar->ar_arg_len); kau_write(rec, tok); tok = au_to_arg32(2, "setclass:ec_event", ar->ar_arg_auditon.au_evclass.ec_number); @@ -402,8 +412,6 @@ audit_sys_auditon(struct audit_record *a break; case A_SETPMASK: - tok = au_to_arg32(3, "length", ar->ar_arg_len); - kau_write(rec, tok); tok = au_to_arg32(2, "setpmask:as_success", ar->ar_arg_auditon.au_aupinfo.ap_mask.am_success); kau_write(rec, tok); @@ -413,8 +421,6 @@ audit_sys_auditon(struct audit_record *a break; case A_SETFSIZE: - tok = au_to_arg32(3, "length", ar->ar_arg_len); - kau_write(rec, tok); tok = au_to_arg32(2, "setfsize:filesize", ar->ar_arg_auditon.au_fstat.af_filesz); kau_write(rec, tok); @@ -530,13 +536,13 @@ kaudit_to_bsm(struct kaudit_record *kar, case AUE_SOCKET: case AUE_SOCKETPAIR: if (ARG_IS_VALID(kar, ARG_SOCKINFO)) { - tok = au_to_arg32(1,"domain", + tok = au_to_arg32(1, "domain", ar->ar_arg_sockinfo.so_domain); kau_write(rec, tok); - tok = au_to_arg32(2,"type", + tok = au_to_arg32(2, "type", ar->ar_arg_sockinfo.so_type); kau_write(rec, tok); - tok = au_to_arg32(3,"protocol", + tok = au_to_arg32(3, "protocol", ar->ar_arg_sockinfo.so_protocol); kau_write(rec, tok); } @@ -734,7 +740,7 @@ kaudit_to_bsm(struct kaudit_record *kar, case AUE_EACCESS: UPATH1_VNODE1_TOKENS; if (ARG_IS_VALID(kar, ARG_VALUE)) { - tok = au_to_arg32(1, "mode", ar->ar_arg_value); + tok = au_to_arg32(2, "mode", ar->ar_arg_value); kau_write(rec, tok); } break; @@ -784,7 +790,7 @@ kaudit_to_bsm(struct kaudit_record *kar, case AUE_CLOSE: if (ARG_IS_VALID(kar, ARG_FD)) { - tok = au_to_arg32(2, "fd", ar->ar_arg_fd); + tok = au_to_arg32(1, "fd", ar->ar_arg_fd); kau_write(rec, tok); } UPATH1_VNODE1_TOKENS; @@ -792,7 +798,7 @@ kaudit_to_bsm(struct kaudit_record *kar, case AUE_CORE: if (ARG_IS_VALID(kar, ARG_SIGNUM)) { - tok = au_to_arg32(0, "signal", ar->ar_arg_signum); + tok = au_to_arg32(1, "signal", ar->ar_arg_signum); kau_write(rec, tok); } UPATH1_VNODE1_TOKENS; @@ -807,7 +813,7 @@ kaudit_to_bsm(struct kaudit_record *kar, /* extattrctl(2) filename parameter is in upath2/vnode2 */ UPATH2_TOKENS; VNODE2_TOKENS; - EXTATTR_TOKENS; + EXTATTR_TOKENS(4); break; case AUE_EXTATTR_GET_FILE: @@ -819,7 +825,7 @@ kaudit_to_bsm(struct kaudit_record *kar, case AUE_EXTATTR_LIST_LINK: case AUE_EXTATTR_DELETE_LINK: UPATH1_VNODE1_TOKENS; - EXTATTR_TOKENS; + EXTATTR_TOKENS(2); break; case AUE_EXTATTR_GET_FD: @@ -830,7 +836,7 @@ kaudit_to_bsm(struct kaudit_record *kar, tok = au_to_arg32(2, "fd", ar->ar_arg_fd); kau_write(rec, tok); } - EXTATTR_TOKENS; + EXTATTR_TOKENS(2); break; case AUE_FEXECVE: @@ -945,11 +951,6 @@ kaudit_to_bsm(struct kaudit_record *kar, tok = au_to_arg32(2, "cmd", ar->ar_arg_cmd); kau_write(rec, tok); } - if (ARG_IS_VALID(kar, ARG_ADDR)) { - tok = au_to_arg32(1, "arg", - (u_int32_t)(uintptr_t)ar->ar_arg_addr); - kau_write(rec, tok); - } if (ARG_IS_VALID(kar, ARG_VNODE1)) FD_VNODE1_TOKENS; else { @@ -995,11 +996,7 @@ kaudit_to_bsm(struct kaudit_record *kar, break; case AUE_LOADSHFILE: - if (ARG_IS_VALID(kar, ARG_ADDR)) { - tok = au_to_arg32(4, "base addr", - (u_int32_t)(uintptr_t)ar->ar_arg_addr); - kau_write(rec, tok); - } + ADDR_TOKEN(4, "base addr"); UPATH1_VNODE1_TOKENS; break; @@ -1029,11 +1026,7 @@ kaudit_to_bsm(struct kaudit_record *kar, case AUE_MLOCK: case AUE_MUNLOCK: case AUE_MINHERIT: - if (ARG_IS_VALID(kar, ARG_ADDR)) { - tok = au_to_arg32(1, "addr", - (u_int32_t)(uintptr_t)ar->ar_arg_addr); - kau_write(rec, tok); - } + ADDR_TOKEN(1, "addr"); if (ARG_IS_VALID(kar, ARG_LEN)) { tok = au_to_arg32(2, "len", ar->ar_arg_len); kau_write(rec, tok); @@ -1071,14 +1064,14 @@ kaudit_to_bsm(struct kaudit_record *kar, case AUE_NFS_SVC: if (ARG_IS_VALID(kar, ARG_CMD)) { - tok = au_to_arg32(1, "request", ar->ar_arg_cmd); + tok = au_to_arg32(1, "flags", ar->ar_arg_cmd); kau_write(rec, tok); } break; case AUE_UMOUNT: if (ARG_IS_VALID(kar, ARG_VALUE)) { - tok = au_to_arg32(1, "flags", ar->ar_arg_value); + tok = au_to_arg32(2, "flags", ar->ar_arg_value); kau_write(rec, tok); } UPATH1_VNODE1_TOKENS; @@ -1113,11 +1106,7 @@ kaudit_to_bsm(struct kaudit_record *kar, break; case AUE_RESETSHFILE: - if (ARG_IS_VALID(kar, ARG_ADDR)) { - tok = au_to_arg32(1, "base addr", - (u_int32_t)(uintptr_t)ar->ar_arg_addr); - kau_write(rec, tok); - } + ADDR_TOKEN(1, "base addr"); break; case AUE_OPEN_RC: @@ -1151,11 +1140,6 @@ kaudit_to_bsm(struct kaudit_record *kar, tok = au_to_arg32(1, "request", ar->ar_arg_cmd); kau_write(rec, tok); } - if (ARG_IS_VALID(kar, ARG_ADDR)) { - tok = au_to_arg32(3, "addr", - (u_int32_t)(uintptr_t)ar->ar_arg_addr); - kau_write(rec, tok); - } if (ARG_IS_VALID(kar, ARG_VALUE)) { tok = au_to_arg32(4, "data", ar->ar_arg_value); kau_write(rec, tok); @@ -1172,6 +1156,10 @@ kaudit_to_bsm(struct kaudit_record *kar, tok = au_to_arg32(3, "uid", ar->ar_arg_uid); kau_write(rec, tok); } + if (ARG_IS_VALID(kar, ARG_GID)) { + tok = au_to_arg32(3, "gid", ar->ar_arg_gid); + kau_write(rec, tok); + } UPATH1_VNODE1_TOKENS; break; @@ -1210,14 +1198,14 @@ kaudit_to_bsm(struct kaudit_record *kar, case AUE_SETEGID: if (ARG_IS_VALID(kar, ARG_EGID)) { - tok = au_to_arg32(1, "gid", ar->ar_arg_egid); + tok = au_to_arg32(1, "egid", ar->ar_arg_egid); kau_write(rec, tok); } break; case AUE_SETEUID: if (ARG_IS_VALID(kar, ARG_EUID)) { - tok = au_to_arg32(1, "uid", ar->ar_arg_euid); + tok = au_to_arg32(1, "euid", ar->ar_arg_euid); kau_write(rec, tok); } break; @@ -1315,8 +1303,9 @@ kaudit_to_bsm(struct kaudit_record *kar, tok = au_to_arg32(2, "who", ar->ar_arg_uid); kau_write(rec, tok); } + PROCESS_PID_TOKENS(2); if (ARG_IS_VALID(kar, ARG_VALUE)) { - tok = au_to_arg32(2, "priority", ar->ar_arg_value); + tok = au_to_arg32(3, "priority", ar->ar_arg_value); kau_write(rec, tok); } break; @@ -1509,12 +1498,9 @@ kaudit_to_bsm(struct kaudit_record *kar, break; case AUE_WAIT4: - if (ARG_IS_VALID(kar, ARG_PID)) { - tok = au_to_arg32(0, "pid", ar->ar_arg_pid); - kau_write(rec, tok); - } + PROCESS_PID_TOKENS(1); if (ARG_IS_VALID(kar, ARG_VALUE)) { - tok = au_to_arg32(0, "options", ar->ar_arg_value); + tok = au_to_arg32(3, "options", ar->ar_arg_value); kau_write(rec, tok); } break; From rwatson at FreeBSD.org Thu Jul 2 09:16:25 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Thu Jul 2 09:16:32 2009 Subject: svn commit: r195281 - head/sys/kern Message-ID: <200907020916.n629GPJB038971@svn.freebsd.org> Author: rwatson Date: Thu Jul 2 09:16:25 2009 New Revision: 195281 URL: http://svn.freebsd.org/changeset/base/195281 Log: Audit file descriptor and command arguments to ioctl(2). Approved by: re (audit argument blanket) MFC after: 1 week Modified: head/sys/kern/sys_generic.c Modified: head/sys/kern/sys_generic.c ============================================================================== --- head/sys/kern/sys_generic.c Thu Jul 2 09:15:30 2009 (r195280) +++ head/sys/kern/sys_generic.c Thu Jul 2 09:16:25 2009 (r195281) @@ -693,6 +693,8 @@ kern_ioctl(struct thread *td, int fd, u_ int error; int tmp; + AUDIT_ARG_FD(fd); + AUDIT_ARG_CMD(com); if ((error = fget(td, fd, &fp)) != 0) return (error); if ((fp->f_flag & (FREAD | FWRITE)) == 0) { From rwatson at FreeBSD.org Thu Jul 2 09:50:15 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Thu Jul 2 09:50:26 2009 Subject: svn commit: r195282 - head/sys/security/audit Message-ID: <200907020950.n629oE35039790@svn.freebsd.org> Author: rwatson Date: Thu Jul 2 09:50:13 2009 New Revision: 195282 URL: http://svn.freebsd.org/changeset/base/195282 Log: Fix comment misthink. Submitted by: b. f. Approved by: re (audit argument blanket) MFC after: 1 week Modified: head/sys/security/audit/audit_bsm.c Modified: head/sys/security/audit/audit_bsm.c ============================================================================== --- head/sys/security/audit/audit_bsm.c Thu Jul 2 09:16:25 2009 (r195281) +++ head/sys/security/audit/audit_bsm.c Thu Jul 2 09:50:13 2009 (r195282) @@ -278,7 +278,7 @@ kau_free(struct au_record *rec) /* * Not all pointer arguments to system calls are of interest, but in some - * cases they reflect delegation of rights, such as mmap(2) falled by + * cases they reflect delegation of rights, such as mmap(2) followed by * minherit(2) before execve(2), so do the best we can. */ #define ADDR_TOKEN(argnum, argname) do { \ From ariff at FreeBSD.org Thu Jul 2 10:02:11 2009 From: ariff at FreeBSD.org (Ariff Abdullah) Date: Thu Jul 2 10:02:19 2009 Subject: svn commit: r195283 - head/sys/tools/sound Message-ID: <200907021002.n62A2A7t040106@svn.freebsd.org> Author: ariff Date: Thu Jul 2 10:02:10 2009 New Revision: 195283 URL: http://svn.freebsd.org/changeset/base/195283 Log: Slightly increase amount of bandwidth of resampling filter for feeder_rate_quality=3. This have the benefit of reducing aliasing artifacts due to alias masking. Spectrogram analysis: o Old preset (100:36:0.90) http://people.freebsd.org/~ariff/z_comparison/z_q3_old.png o New preset (100:36:0.92): http://people.freebsd.org/~ariff/z_comparison/z_q3_new.png Approved by: re (kib) Modified: head/sys/tools/sound/feeder_rate_mkfilter.awk Modified: head/sys/tools/sound/feeder_rate_mkfilter.awk ============================================================================== --- head/sys/tools/sound/feeder_rate_mkfilter.awk Thu Jul 2 09:50:13 2009 (r195282) +++ head/sys/tools/sound/feeder_rate_mkfilter.awk Thu Jul 2 10:02:10 2009 (r195283) @@ -592,7 +592,7 @@ BEGIN { if (ARGC < 2) { ARGC = 1; ARGV[ARGC++] = "100:8:0.85"; - ARGV[ARGC++] = "100:36:0.90"; + ARGV[ARGC++] = "100:36:0.92"; ARGV[ARGC++] = "100:164:0.97"; #ARGV[ARGC++] = "100:8"; #ARGV[ARGC++] = "100:16"; From jamie at FreeBSD.org Thu Jul 2 14:19:34 2009 From: jamie at FreeBSD.org (Jamie Gritton) Date: Thu Jul 2 14:19:41 2009 Subject: svn commit: r195285 - head/sys/kern Message-ID: <200907021419.n62EJXMe046649@svn.freebsd.org> Author: jamie Date: Thu Jul 2 14:19:33 2009 New Revision: 195285 URL: http://svn.freebsd.org/changeset/base/195285 Log: Call prison_check from vfs_suser rather than re-implementing it. Approved by: re (kib), bz (mentor) Modified: head/sys/kern/vfs_subr.c Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Thu Jul 2 12:41:21 2009 (r195284) +++ head/sys/kern/vfs_subr.c Thu Jul 2 14:19:33 2009 (r195285) @@ -461,8 +461,7 @@ vfs_suser(struct mount *mp, struct threa * If the file system was mounted outside the jail of the calling * thread, deny immediately. */ - if (mp->mnt_cred->cr_prison != td->td_ucred->cr_prison && - !prison_ischild(td->td_ucred->cr_prison, mp->mnt_cred->cr_prison)) + if (prison_check(td->td_ucred, mp->mnt_cred) != 0) return (EPERM); /* From rwatson at FreeBSD.org Thu Jul 2 16:33:40 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Thu Jul 2 16:33:51 2009 Subject: svn commit: r195291 - head/sys/security/audit Message-ID: <200907021633.n62GXdLq049282@svn.freebsd.org> Author: rwatson Date: Thu Jul 2 16:33:38 2009 New Revision: 195291 URL: http://svn.freebsd.org/changeset/base/195291 Log: Create audit records for AUE_POSIX_OPENPT, currently w/o arguments. Approved by: re (audit argument blanket) Modified: head/sys/security/audit/audit_bsm.c Modified: head/sys/security/audit/audit_bsm.c ============================================================================== --- head/sys/security/audit/audit_bsm.c Thu Jul 2 15:59:32 2009 (r195290) +++ head/sys/security/audit/audit_bsm.c Thu Jul 2 16:33:38 2009 (r195291) @@ -690,6 +690,7 @@ kaudit_to_bsm(struct kaudit_record *kar, case AUE_MSGSYS: case AUE_NTP_ADJTIME: case AUE_PIPE: + case AUE_POSIX_OPENPT: case AUE_PROFILE: case AUE_RTPRIO: case AUE_SEMSYS: From kib at FreeBSD.org Thu Jul 2 18:02:57 2009 From: kib at FreeBSD.org (Konstantin Belousov) Date: Thu Jul 2 18:03:08 2009 Subject: svn commit: r195294 - in head/sys: fs/cd9660 kern nfsclient ufs/ffs Message-ID: <200907021802.n62I2tR1051178@svn.freebsd.org> Author: kib Date: Thu Jul 2 18:02:55 2009 New Revision: 195294 URL: http://svn.freebsd.org/changeset/base/195294 Log: In vn_vget_ino() and their inline equivalents, mnt_ref() the mount point around the sequence that drop vnode lock and then busies the mount point. Not having vlocked node or direct reference to the mp allows for the forced unmount to proceed, making mp unmounted or reused. Tested by: pho Reviewed by: jeff Approved by: re (kensmith) MFC after: 2 weeks Modified: head/sys/fs/cd9660/cd9660_lookup.c head/sys/kern/vfs_vnops.c head/sys/nfsclient/nfs_vnops.c head/sys/ufs/ffs/ffs_softdep.c Modified: head/sys/fs/cd9660/cd9660_lookup.c ============================================================================== --- head/sys/fs/cd9660/cd9660_lookup.c Thu Jul 2 16:41:46 2009 (r195293) +++ head/sys/fs/cd9660/cd9660_lookup.c Thu Jul 2 18:02:55 2009 (r195294) @@ -376,9 +376,11 @@ found: ltype = VOP_ISLOCKED(pdp); error = vfs_busy(mp, MBF_NOWAIT); if (error != 0) { + vfs_ref(mp); VOP_UNLOCK(pdp, 0); error = vfs_busy(mp, 0); vn_lock(pdp, ltype | LK_RETRY); + vfs_rel(mp); if (error) return (ENOENT); if (pdp->v_iflag & VI_DOOMED) { Modified: head/sys/kern/vfs_vnops.c ============================================================================== --- head/sys/kern/vfs_vnops.c Thu Jul 2 16:41:46 2009 (r195293) +++ head/sys/kern/vfs_vnops.c Thu Jul 2 18:02:55 2009 (r195294) @@ -1307,9 +1307,11 @@ vn_vget_ino(struct vnode *vp, ino_t ino, ("vn_vget_ino: vp not locked")); error = vfs_busy(mp, MBF_NOWAIT); if (error != 0) { + vfs_ref(mp); VOP_UNLOCK(vp, 0); error = vfs_busy(mp, 0); vn_lock(vp, ltype | LK_RETRY); + vfs_rel(mp); if (error != 0) return (ENOENT); if (vp->v_iflag & VI_DOOMED) { Modified: head/sys/nfsclient/nfs_vnops.c ============================================================================== --- head/sys/nfsclient/nfs_vnops.c Thu Jul 2 16:41:46 2009 (r195293) +++ head/sys/nfsclient/nfs_vnops.c Thu Jul 2 18:02:55 2009 (r195294) @@ -1043,9 +1043,11 @@ nfs_lookup(struct vop_lookup_args *ap) ltype = VOP_ISLOCKED(dvp); error = vfs_busy(mp, MBF_NOWAIT); if (error != 0) { + vfs_ref(mp); VOP_UNLOCK(dvp, 0); error = vfs_busy(mp, 0); vn_lock(dvp, ltype | LK_RETRY); + vfs_rel(mp); if (error == 0 && (dvp->v_iflag & VI_DOOMED)) { vfs_unbusy(mp); error = ENOENT; Modified: head/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- head/sys/ufs/ffs/ffs_softdep.c Thu Jul 2 16:41:46 2009 (r195293) +++ head/sys/ufs/ffs/ffs_softdep.c Thu Jul 2 18:02:55 2009 (r195294) @@ -5104,9 +5104,11 @@ softdep_fsync(vp) FFSV_FORCEINSMQ)) { error = vfs_busy(mp, MBF_NOWAIT); if (error != 0) { + vfs_ref(mp); VOP_UNLOCK(vp, 0); error = vfs_busy(mp, 0); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); + vfs_rel(mp); if (error != 0) return (ENOENT); if (vp->v_iflag & VI_DOOMED) { From ed at FreeBSD.org Thu Jul 2 18:24:38 2009 From: ed at FreeBSD.org (Ed Schouten) Date: Thu Jul 2 18:24:45 2009 Subject: svn commit: r195295 - in head/sys: amd64/conf i386/conf ia64/conf pc98/conf powerpc/conf sparc64/conf sun4v/conf Message-ID: <200907021824.n62IObWJ051643@svn.freebsd.org> Author: ed Date: Thu Jul 2 18:24:37 2009 New Revision: 195295 URL: http://svn.freebsd.org/changeset/base/195295 Log: Enable POSIX semaphores on all non-embedded architectures by default. More applications (including Firefox) seem to depend on this nowadays, so not having this enabled by default is a bad idea. Proposed by: miwi Patch by: Florian Smeets Approved by: re (kib) Modified: head/sys/amd64/conf/GENERIC head/sys/i386/conf/GENERIC head/sys/ia64/conf/GENERIC head/sys/pc98/conf/GENERIC head/sys/powerpc/conf/GENERIC head/sys/sparc64/conf/GENERIC head/sys/sun4v/conf/GENERIC Modified: head/sys/amd64/conf/GENERIC ============================================================================== --- head/sys/amd64/conf/GENERIC Thu Jul 2 18:02:55 2009 (r195294) +++ head/sys/amd64/conf/GENERIC Thu Jul 2 18:24:37 2009 (r195295) @@ -65,6 +65,7 @@ options STACK # stack(9) support options SYSVSHM # SYSV-style shared memory options SYSVMSG # SYSV-style message queues options SYSVSEM # SYSV-style semaphores +options P1003_1B_SEMAPHORES # POSIX-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. options KBD_INSTALL_CDEV # install a CDEV entry in /dev Modified: head/sys/i386/conf/GENERIC ============================================================================== --- head/sys/i386/conf/GENERIC Thu Jul 2 18:02:55 2009 (r195294) +++ head/sys/i386/conf/GENERIC Thu Jul 2 18:24:37 2009 (r195295) @@ -66,6 +66,7 @@ options STACK # stack(9) support options SYSVSHM # SYSV-style shared memory options SYSVMSG # SYSV-style message queues options SYSVSEM # SYSV-style semaphores +options P1003_1B_SEMAPHORES # POSIX-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. options KBD_INSTALL_CDEV # install a CDEV entry in /dev Modified: head/sys/ia64/conf/GENERIC ============================================================================== --- head/sys/ia64/conf/GENERIC Thu Jul 2 18:02:55 2009 (r195294) +++ head/sys/ia64/conf/GENERIC Thu Jul 2 18:24:37 2009 (r195295) @@ -58,6 +58,7 @@ options STACK # stack(9) support options SYSVMSG # SYSV-style message queues options SYSVSEM # SYSV-style semaphores options SYSVSHM # SYSV-style shared memory +options P1003_1B_SEMAPHORES # POSIX-style semaphores options UFS_ACL # Support for access control lists options UFS_DIRHASH # Hash-based directory lookup scheme options UFS_GJOURNAL # Enable gjournal-based UFS journaling Modified: head/sys/pc98/conf/GENERIC ============================================================================== --- head/sys/pc98/conf/GENERIC Thu Jul 2 18:02:55 2009 (r195294) +++ head/sys/pc98/conf/GENERIC Thu Jul 2 18:24:37 2009 (r195295) @@ -69,6 +69,7 @@ options STACK # stack(9) support #options SYSVSHM # SYSV-style shared memory #options SYSVMSG # SYSV-style message queues #options SYSVSEM # SYSV-style semaphores +options P1003_1B_SEMAPHORES # POSIX-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) Modified: head/sys/powerpc/conf/GENERIC ============================================================================== --- head/sys/powerpc/conf/GENERIC Thu Jul 2 18:02:55 2009 (r195294) +++ head/sys/powerpc/conf/GENERIC Thu Jul 2 18:24:37 2009 (r195295) @@ -61,6 +61,7 @@ options STACK #stack(9) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores +options P1003_1B_SEMAPHORES # POSIX-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing Modified: head/sys/sparc64/conf/GENERIC ============================================================================== --- head/sys/sparc64/conf/GENERIC Thu Jul 2 18:02:55 2009 (r195294) +++ head/sys/sparc64/conf/GENERIC Thu Jul 2 18:24:37 2009 (r195295) @@ -66,6 +66,7 @@ options STACK # stack(9) support options SYSVSHM # SYSV-style shared memory options SYSVMSG # SYSV-style message queues options SYSVSEM # SYSV-style semaphores +options P1003_1B_SEMAPHORES # POSIX-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing Modified: head/sys/sun4v/conf/GENERIC ============================================================================== --- head/sys/sun4v/conf/GENERIC Thu Jul 2 18:02:55 2009 (r195294) +++ head/sys/sun4v/conf/GENERIC Thu Jul 2 18:24:37 2009 (r195295) @@ -58,6 +58,7 @@ options STACK # stack(9) support options SYSVSHM # SYSV-style shared memory options SYSVMSG # SYSV-style message queues options SYSVSEM # SYSV-style semaphores +options P1003_1B_SEMAPHORES # POSIX-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options AHC_REG_PRETTY_PRINT # Print register bitfields in debug # output. Adds ~128k to driver. From ed at 80386.nl Thu Jul 2 18:48:54 2009 From: ed at 80386.nl (Ed Schouten) Date: Thu Jul 2 18:49:05 2009 Subject: svn commit: r195295 - in head/sys: amd64/conf i386/conf ia64/conf pc98/conf powerpc/conf sparc64/conf sun4v/conf In-Reply-To: <200907021824.n62IObWJ051643@svn.freebsd.org> References: <200907021824.n62IObWJ051643@svn.freebsd.org> Message-ID: <20090702184852.GO48776@hoeg.nl> * Ed Schouten wrote: > Log: > Enable POSIX semaphores on all non-embedded architectures by default. > > More applications (including Firefox) seem to depend on this nowadays, > so not having this enabled by default is a bad idea. > > Proposed by: miwi > Patch by: Florian Smeets > Approved by: re (kib) MFC after: 2 weeks -- Ed Schouten WWW: http://80386.nl/ -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 195 bytes Desc: not available Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20090702/d0b3cfcf/attachment.pgp From brian at Awfulhak.org Thu Jul 2 19:01:02 2009 From: brian at Awfulhak.org (Brian Somers) Date: Thu Jul 2 19:01:29 2009 Subject: svn commit: r195295 - in head/sys: amd64/conf i386/conf ia64/conf pc98/conf powerpc/conf sparc64/conf sun4v/conf In-Reply-To: <200907021824.n62IObWJ051643@svn.freebsd.org> References: <200907021824.n62IObWJ051643@svn.freebsd.org> Message-ID: <20090702113215.38b4ece6@Awfulhak.org> On Thu, 2 Jul 2009 18:24:37 +0000 (UTC), Ed Schouten wrote: > Author: ed > Date: Thu Jul 2 18:24:37 2009 > New Revision: 195295 > URL: http://svn.freebsd.org/changeset/base/195295 > > Log: > Enable POSIX semaphores on all non-embedded architectures by default. > > More applications (including Firefox) seem to depend on this nowadays, > so not having this enabled by default is a bad idea. > > Proposed by: miwi > Patch by: Florian Smeets > Approved by: re (kib) > > Modified: > head/sys/amd64/conf/GENERIC > head/sys/i386/conf/GENERIC > head/sys/ia64/conf/GENERIC > head/sys/pc98/conf/GENERIC > head/sys/powerpc/conf/GENERIC > head/sys/sparc64/conf/GENERIC > head/sys/sun4v/conf/GENERIC Do you plan to MFC this? I can see it irritating quite a few 7.2^H3 users... Cheers. -- Brian Somers Don't _EVER_ lose your sense of humour ! From ed at 80386.nl Thu Jul 2 19:12:29 2009 From: ed at 80386.nl (Ed Schouten) Date: Thu Jul 2 19:12:40 2009 Subject: svn commit: r195295 - in head/sys: amd64/conf i386/conf ia64/conf pc98/conf powerpc/conf sparc64/conf sun4v/conf In-Reply-To: <20090702113215.38b4ece6@Awfulhak.org> References: <200907021824.n62IObWJ051643@svn.freebsd.org> <20090702113215.38b4ece6@Awfulhak.org> Message-ID: <20090702191227.GQ48776@hoeg.nl> * Brian Somers wrote: > Do you plan to MFC this? I can see it irritating quite a few > 7.2^H3 users... Yes. I forgot to mention it in the commit message, but I will. -- Ed Schouten WWW: http://80386.nl/ -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 195 bytes Desc: not available Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20090702/49304f37/attachment.pgp From bf1783 at googlemail.com Thu Jul 2 19:39:02 2009 From: bf1783 at googlemail.com (b. f.) Date: Thu Jul 2 19:39:08 2009 Subject: svn commit: r195295 - in head/sys: amd64/conf i386/conf ia64/conf pc98/conf powerpc/conf sparc64/conf sun4v/conf Message-ID: > Enable POSIX semaphores on all non-embedded architectures by default. Are you claiming, then, that the warning regarding this option in src/sys/conf/NOTES is outdated and no longer accurate? If so, shouldn't the warning be removed? Or are there still reasons for caution? b. From trasz at FreeBSD.org Thu Jul 2 20:05:22 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Thu Jul 2 20:05:37 2009 Subject: svn commit: r195296 - in head: sys/ufs/ufs tools/regression/acltools Message-ID: <200907022005.n62K5LXo053614@svn.freebsd.org> Author: trasz Date: Thu Jul 2 20:05:21 2009 New Revision: 195296 URL: http://svn.freebsd.org/changeset/base/195296 Log: Fix fpathconf(3) on fifos, in effect making ls(1) properly display '+' on them. Taken from kern/125613, with cosmetic changes. PR: kern/125613 Submitted by: Jaakko Heinonen Approved by: re (kib) Modified: head/sys/ufs/ufs/ufs_vnops.c head/tools/regression/acltools/tools-posix.test Modified: head/sys/ufs/ufs/ufs_vnops.c ============================================================================== --- head/sys/ufs/ufs/ufs_vnops.c Thu Jul 2 18:24:37 2009 (r195295) +++ head/sys/ufs/ufs/ufs_vnops.c Thu Jul 2 20:05:21 2009 (r195296) @@ -112,6 +112,7 @@ static vop_symlink_t ufs_symlink; static vop_whiteout_t ufs_whiteout; static vop_close_t ufsfifo_close; static vop_kqfilter_t ufsfifo_kqfilter; +static vop_pathconf_t ufsfifo_pathconf; /* * A virgin directory (no blushing please). @@ -2101,6 +2102,29 @@ ufsfifo_kqfilter(ap) } /* + * Return POSIX pathconf information applicable to fifos. + */ +static int +ufsfifo_pathconf(ap) + struct vop_pathconf_args /* { + struct vnode *a_vp; + int a_name; + int *a_retval; + } */ *ap; +{ + + switch (ap->a_name) { + case _PC_ACL_EXTENDED: + case _PC_ACL_PATH_MAX: + case _PC_MAC_PRESENT: + return (ufs_pathconf(ap)); + default: + return (fifo_specops.vop_pathconf(ap)); + } + /* NOTREACHED */ +} + +/* * Return POSIX pathconf information applicable to ufs filesystems. */ static int @@ -2520,6 +2544,7 @@ struct vop_vector ufs_fifoops = { .vop_inactive = ufs_inactive, .vop_kqfilter = ufsfifo_kqfilter, .vop_markatime = ufs_markatime, + .vop_pathconf = ufsfifo_pathconf, .vop_print = ufs_print, .vop_read = VOP_PANIC, .vop_reclaim = ufs_reclaim, Modified: head/tools/regression/acltools/tools-posix.test ============================================================================== --- head/tools/regression/acltools/tools-posix.test Thu Jul 2 18:24:37 2009 (r195295) +++ head/tools/regression/acltools/tools-posix.test Thu Jul 2 20:05:21 2009 (r195296) @@ -353,3 +353,37 @@ $ rmdir ddd/ddd $ rm ddd/xxx $ rmdir ddd +# Test if we deal properly with fifos. +$ mkfifo fff +$ ls -l fff | cut -d' ' -f1 +> prw-r--r-- + +$ setfacl -m u:42:r,g:43:w fff +$ getfacl fff +> # file: fff +> # owner: root +> # group: wheel +> user::rw- +> user:42:r-- +> group::r-- +> group:43:-w- +> mask::rw- +> other::r-- + +$ ls -l fff | cut -d' ' -f1 +> prw-rw-r--+ + +$ setfacl -bn fff +$ getfacl fff +> # file: fff +> # owner: root +> # group: wheel +> user::rw- +> group::r-- +> other::r-- + +$ ls -l fff | cut -d' ' -f1 +> prw-r--r-- + +$ rm fff + From jilles at stack.nl Fri Jul 3 14:23:36 2009 From: jilles at stack.nl (Jilles Tjoelker) Date: Fri Jul 3 14:23:55 2009 Subject: svn commit: r195243 - head/bin/chmod In-Reply-To: <200907011552.n61FqJL5016996@svn.freebsd.org> References: <200907011552.n61FqJL5016996@svn.freebsd.org> Message-ID: <20090703142334.GA53614@stack.nl> On Wed, Jul 01, 2009 at 03:52:19PM +0000, Edward Tomasz Napierala wrote: > + ret = pathconf(ent->fts_accpath, _PC_ACL_NFS4); There doesn't seem to be anything like lpathconf() or fpathconfat(AT_SYMLINK_NOFOLLOW), so this may not work properly for symlinks (chmod -h). -- Jilles Tjoelker From kientzle at FreeBSD.org Fri Jul 3 17:54:34 2009 From: kientzle at FreeBSD.org (Tim Kientzle) Date: Fri Jul 3 17:54:40 2009 Subject: svn commit: r195318 - head/usr.bin/cpio Message-ID: <200907031754.n63HsXRn084493@svn.freebsd.org> Author: kientzle Date: Fri Jul 3 17:54:33 2009 New Revision: 195318 URL: http://svn.freebsd.org/changeset/base/195318 Log: This fixes bsdcpio's -R option to accept numeric user or group Ids as well as user or group names. In particular, this fixes freesbie2, which uses -R 0:0 to copy a bunch of files so that the result will be owned by root. Also fixes a related bug that mixed-up the uid and gid specified by -R when in passthrough mode. Thanks to Dominique Goncalves for reporting this regression. Approved by: re (kib) Modified: head/usr.bin/cpio/cmdline.c head/usr.bin/cpio/cpio.c Modified: head/usr.bin/cpio/cmdline.c ============================================================================== --- head/usr.bin/cpio/cmdline.c Fri Jul 3 16:33:42 2009 (r195317) +++ head/usr.bin/cpio/cmdline.c Fri Jul 3 17:54:33 2009 (r195318) @@ -268,16 +268,36 @@ cpio_getopt(struct cpio *cpio) * Parse the argument to the -R or --owner flag. * * The format is one of the following: - * - Override user but not group - * : - Override both, group is user's default group - * : - Override both - * : - Override group but not user + * - Override user but not group + * : - Override both, group is user's default group + * : - Override user but not group + * : - Override both + * : - Override group but not user + * + * Where uid/gid are decimal representations and groupname/username + * are names to be looked up in system database. Note that + * uid/gid parsing takes priority over username/groupname lookup, + * so this won't do a lookup for usernames or group names that + * consist entirely of digits. * * A period can be used instead of the colon. * - * Sets uid/gid as appropriate, -1 indicates uid/gid not specified. + * Sets uid/gid return as appropriate, -1 indicates uid/gid not specified. * */ +static int +decimal_parse(const char *p) +{ + /* TODO: guard against overflow. */ + int n = 0; + for (; *p != '\0'; ++p) { + if (*p < '0' || *p > '9') + return (-1); + n = n * 10 + *p - '0'; + } + return (n); +} + int owner_parse(const char *spec, int *uid, int *gid) { @@ -318,24 +338,34 @@ owner_parse(const char *spec, int *uid, } memcpy(user, u, ue - u); user[ue - u] = '\0'; - pwent = getpwnam(user); - if (pwent == NULL) { - cpio_warnc(errno, "Couldn't lookup user ``%s''", user); - return (1); + *uid = decimal_parse(user); + if (*uid < 0) { + /* Couldn't parse as integer, try username lookup. */ + pwent = getpwnam(user); + if (pwent == NULL) { + cpio_warnc(errno, + "Couldn't lookup user ``%s''", user); + return (1); + } + *uid = pwent->pw_uid; + if (*ue != '\0' && *g == '\0') + *gid = pwent->pw_gid; } free(user); - *uid = pwent->pw_uid; - if (*ue != '\0' && *g == '\0') - *gid = pwent->pw_gid; } if (*g != '\0') { - struct group *grp; - grp = getgrnam(g); - if (grp != NULL) - *gid = grp->gr_gid; - else { - cpio_warnc(errno, "Couldn't look up group ``%s''", g); - return (1); + *gid = decimal_parse(g); + if (*gid < 0) { + /* Couldn't parse int, try group name lookup. */ + struct group *grp; + grp = getgrnam(g); + if (grp != NULL) + *gid = grp->gr_gid; + else { + cpio_warnc(errno, + "Couldn't look up group ``%s''", g); + return (1); + } } } return (0); Modified: head/usr.bin/cpio/cpio.c ============================================================================== --- head/usr.bin/cpio/cpio.c Fri Jul 3 16:33:42 2009 (r195317) +++ head/usr.bin/cpio/cpio.c Fri Jul 3 17:54:33 2009 (r195318) @@ -575,7 +575,7 @@ file_to_archive(struct cpio *cpio, const if (cpio->uid_override >= 0) st.st_uid = cpio->uid_override; if (cpio->gid_override >= 0) - st.st_gid = cpio->uid_override; + st.st_gid = cpio->gid_override; archive_entry_copy_stat(entry, &st); #if !defined(_WIN32) || defined(__CYGWIN__) From brooks at FreeBSD.org Fri Jul 3 18:37:14 2009 From: brooks at FreeBSD.org (Brooks Davis) Date: Fri Jul 3 18:37:20 2009 Subject: svn commit: r195318 - head/usr.bin/cpio In-Reply-To: <200907031754.n63HsXRn084493@svn.freebsd.org> References: <200907031754.n63HsXRn084493@svn.freebsd.org> Message-ID: <20090703183609.GA45185@lor.one-eyed-alien.net> On Fri, Jul 03, 2009 at 05:54:33PM +0000, Tim Kientzle wrote: > Modified: head/usr.bin/cpio/cmdline.c > ============================================================================== > --- head/usr.bin/cpio/cmdline.c Fri Jul 3 16:33:42 2009 (r195317) > +++ head/usr.bin/cpio/cmdline.c Fri Jul 3 17:54:33 2009 (r195318) > @@ -268,16 +268,36 @@ cpio_getopt(struct cpio *cpio) > * Parse the argument to the -R or --owner flag. > * > * The format is one of the following: > - * - Override user but not group > - * : - Override both, group is user's default group > - * : - Override both > - * : - Override group but not user > + * - Override user but not group > + * : - Override both, group is user's default group > + * : - Override user but not group > + * : - Override both > + * : - Override group but not user > + * > + * Where uid/gid are decimal representations and groupname/username > + * are names to be looked up in system database. Note that > + * uid/gid parsing takes priority over username/groupname lookup, > + * so this won't do a lookup for usernames or group names that > + * consist entirely of digits. Is this behavior specified somewhere? It is counter to the usual rule that the system should attempt to resolve all strings as a name first. For example, the following is from the chown manpage in POSIX.1-2008 If a numeric owner operand exists in the user database as a user name, the user ID number associated with that user name shall be used as the user ID. Numeric usernames are a disaster, especially if they can't match the uid for some reason, but following this rule consistently at least makes things more sane if you're stuck with them. -- Brooks -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 187 bytes Desc: not available Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20090703/d3e15e54/attachment.pgp From danfe at FreeBSD.org Fri Jul 3 19:17:53 2009 From: danfe at FreeBSD.org (Alexey Dokuchaev) Date: Fri Jul 3 19:18:04 2009 Subject: svn commit: r195318 - head/usr.bin/cpio In-Reply-To: <200907031754.n63HsXRn084493@svn.freebsd.org> References: <200907031754.n63HsXRn084493@svn.freebsd.org> Message-ID: <20090703191753.GA48087@FreeBSD.org> Tim Kientzle wrote: > Author: kientzle > Date: Fri Jul 3 17:54:33 2009 > New Revision: 195318 > URL: http://svn.freebsd.org/changeset/base/195318 > > + * Where uid/gid are decimal representations and groupname/username > + * are names to be looked up in system database. Note that ^^^^^^^ Bad indentation: "uid/gid" occupies seven characters, so wrap is premature here (there are exactly seven ^ marks above). > + * uid/gid parsing takes priority over username/groupname lookup, > + * so this won't do a lookup for usernames or group names that > + * consist entirely of digits. > * > * A period can be used instead of the colon. > * > - * Sets uid/gid as appropriate, -1 indicates uid/gid not specified. > + * Sets uid/gid return as appropriate, -1 indicates uid/gid not specified. > * > */ > +static int > +decimal_parse(const char *p) > +{ > + /* TODO: guard against overflow. */ > + int n = 0; > + for (; *p != '\0'; ++p) { > + if (*p < '0' || *p > '9') > + return (-1); > + n = n * 10 + *p - '0'; > + } > + return (n); > +} Roll own your own strtoul(3)? What kind of NIH is this? :-) > + > int > owner_parse(const char *spec, int *uid, int *gid) > { > @@ -318,24 +338,34 @@ owner_parse(const char *spec, int *uid, > } > memcpy(user, u, ue - u); > user[ue - u] = '\0'; > - pwent = getpwnam(user); > - if (pwent == NULL) { > - cpio_warnc(errno, "Couldn't lookup user ``%s''", user); > - return (1); > + *uid = decimal_parse(user); > + if (*uid < 0) { > + /* Couldn't parse as integer, try username lookup. */ > + pwent = getpwnam(user); > + if (pwent == NULL) { > + cpio_warnc(errno, > + "Couldn't lookup user ``%s''", user); > + return (1); > + } > + *uid = pwent->pw_uid; > + if (*ue != '\0' && *g == '\0') > + *gid = pwent->pw_gid; Why not something simple like this: if ((pwent = getpwnam(user)) != NULL) uid = pwent->pw_uid; else { errno = 0; uid = strtoul(user, &ep, 10); if (errno || user[0] == '\0' || *ep != '\0') cpio_warnc("invalid user: %s", user); } ./danfe From rpaulo at FreeBSD.org Fri Jul 3 21:12:38 2009 From: rpaulo at FreeBSD.org (Rui Paulo) Date: Fri Jul 3 21:12:45 2009 Subject: svn commit: r195325 - in head: share/man/man4 sys/dev/acpi_support Message-ID: <200907032112.n63LCcWv088541@svn.freebsd.org> Author: rpaulo Date: Fri Jul 3 21:12:37 2009 New Revision: 195325 URL: http://svn.freebsd.org/changeset/base/195325 Log: acpi_hp.c: - sysctl dev.acpi_hp.0.verbose to toggle debug output - A modification so this can deal with different array lengths when reading the CMI BIOS - now it works ok on HP Compaq nx7300 as well. - Change behaviour to query only max_instance-1 CMI BIOS instances, because all HPs seen so far are broken in that respect (or there is a fundamental misunderstanding on my side, possible as well). This way a disturbing ACPI Error Field exceeds Buffer message is avoided. - New bit to set on dev.acpi_hp.0.cmi_detail (0x8) to also query the highest guid instance of CMI bios acpi_hp.4: - Document dev.acpi_hp.0.verbose sysctl in man page - Document new bit for dev.acpi_hp.0.cmi_detail - Add a section to manpage about hardware that has been reported to work ok Submitted by: Michael Gmelin Approved by: re (kib) MFC after: 2 weeks Modified: head/share/man/man4/acpi_hp.4 head/share/man/man4/acpi_wmi.4 head/sys/dev/acpi_support/acpi_hp.c Modified: head/share/man/man4/acpi_hp.4 ============================================================================== --- head/share/man/man4/acpi_hp.4 Fri Jul 3 21:09:55 2009 (r195324) +++ head/share/man/man4/acpi_hp.4 Fri Jul 3 21:12:37 2009 (r195325) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 21, 2009 +.Dd June 30, 2009 .Dt ACPI_HP 4 i386 .Os .Sh NAME @@ -92,8 +92,8 @@ WWAN on air status changed to 0 (not on WWAN on air status changed to 1 (on air) .El .Ss Xr devfs 8 Ss Device -You can read /dev/hpcmi to see your current BIOS settings. The detail level -can be adjusted by setting the sysctl +You can read /dev/hpcmi to see your current BIOS settings. +The detail level can be adjusted by setting the sysctl .Va cmi_detail as described below. .Sh SYSCTL VARIABLES @@ -166,13 +166,29 @@ Show a list of valid options for the BIO .It Li 0x04 Show additional flags of BIOS setting (ReadOnly etc.) .It Li 0x08 -Query highest BIOS entry instance. This is broken on many HP models and -therefore disabled by default. +Query highest BIOS entry instance. +This is broken on many HP models and therefore disabled by default. .El +.It Va dev.acpi_hp.0.verbose +(read-only) +Set verbosity level .El .Pp Defaults for these sysctls can be set in .Xr sysctl.conf 5 . +.Sh HARDWARE +The +.Nm +driver has been reported to support the following hardware: +.Pp +.Bl -bullet -compact +.It +HP Compaq 8510p +.It +HP Compaq nx7300 +.El +.Pp +It should work on most HP laptops that feature a WMI enabled BIOS. .Sh FILES .Bl -tag -width ".Pa /dev/hpcmi" .It Pa /dev/hpcmi @@ -248,7 +264,7 @@ The driver was written by .An Michael Gmelin Aq freebsd@grem.de .Pp -It has been inspired by hp-wmi driver, which implements a subset of these +It has been inspired by hp-wmi driver, which implements a subset of these features (hotkeys) on Linux. .Pp .Bl -tag -width indent Modified: head/share/man/man4/acpi_wmi.4 ============================================================================== --- head/share/man/man4/acpi_wmi.4 Fri Jul 3 21:09:55 2009 (r195324) +++ head/share/man/man4/acpi_wmi.4 Fri Jul 3 21:12:37 2009 (r195325) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 21, 2009 +.Dd June 30, 2009 .Dt ACPI_WMI 4 i386 .Os .Sh NAME @@ -48,7 +48,8 @@ acpi_wmi_load="YES" The .Nm driver provides an interface for vendor specific WMI implementations -(e.g. HP and Acer laptops). It creates /dev/wmistat, which can be read to get +(e.g. HP and Acer laptops). +It creates /dev/wmistat, which can be read to get information about GUIDs found in the system. .Sh FILES .Bl -tag -width /dev/wmistat -compact Modified: head/sys/dev/acpi_support/acpi_hp.c ============================================================================== --- head/sys/dev/acpi_support/acpi_hp.c Fri Jul 3 21:09:55 2009 (r195324) +++ head/sys/dev/acpi_support/acpi_hp.c Fri Jul 3 21:12:37 2009 (r195325) @@ -92,6 +92,7 @@ ACPI_MODULE_NAME("HP") #define ACPI_HP_METHOD_HDDTEMP 18 #define ACPI_HP_METHOD_DOCK 19 #define ACPI_HP_METHOD_CMI_DETAIL 20 +#define ACPI_HP_METHOD_VERBOSE 21 #define HP_MASK_WWAN_ON_AIR 0x1000000 #define HP_MASK_BLUETOOTH_ON_AIR 0x10000 @@ -121,6 +122,7 @@ struct acpi_hp_softc { int has_cmi; /* CMI GUID found */ int cmi_detail; /* CMI detail level (set by sysctl) */ + int verbose; /* add debug output */ int wlan_enable_if_radio_on; /* set by sysctl */ int wlan_disable_if_radio_off; /* set by sysctl */ int bluetooth_enable_if_radio_on; /* set by sysctl */ @@ -275,6 +277,12 @@ static struct { "(cat /dev/hpcmi)", .access = CTLTYPE_INT | CTLFLAG_RW }, + { + .name = "verbose", + .method = ACPI_HP_METHOD_VERBOSE, + .description = "Verbosity level", + .access = CTLTYPE_INT | CTLFLAG_RW + }, { NULL, 0, NULL, 0 } }; @@ -334,10 +342,10 @@ MODULE_DEPEND(acpi_hp, acpi, 1, 1, 1); static void acpi_hp_evaluate_auto_on_off(struct acpi_hp_softc *sc) { - int wireless; - int new_wlan_status; - int new_bluetooth_status; - int new_wwan_status; + int wireless; + int new_wlan_status; + int new_bluetooth_status; + int new_wwan_status; wireless = acpi_hp_exec_wmi_command(sc->wmi_dev, ACPI_HP_WMI_WIRELESS_COMMAND, 0, 0); @@ -345,7 +353,8 @@ acpi_hp_evaluate_auto_on_off(struct acpi new_bluetooth_status = -1; new_wwan_status = -1; - device_printf(sc->wmi_dev, "Wireless status is %x\n", wireless); + if (sc->verbose) + device_printf(sc->wmi_dev, "Wireless status is %x\n", wireless); if (sc->wlan_disable_if_radio_off && !(wireless & HP_MASK_WLAN_RADIO) && (wireless & HP_MASK_WLAN_ENABLED)) { acpi_hp_exec_wmi_command(sc->wmi_dev, @@ -391,10 +400,11 @@ acpi_hp_evaluate_auto_on_off(struct acpi new_wlan_status = (wireless & HP_MASK_WLAN_ON_AIR); if ((new_wlan_status?1:0) != sc->was_wlan_on_air) { sc->was_wlan_on_air = sc->was_wlan_on_air?0:1; - device_printf(sc->wmi_dev, - "WLAN on air changed to %i " - "(new_wlan_status is %i)\n", - sc->was_wlan_on_air, new_wlan_status); + if (sc->verbose) + device_printf(sc->wmi_dev, + "WLAN on air changed to %i " + "(new_wlan_status is %i)\n", + sc->was_wlan_on_air, new_wlan_status); acpi_UserNotify("HP", sc->handle, 0xc0+sc->was_wlan_on_air); } @@ -404,9 +414,12 @@ acpi_hp_evaluate_auto_on_off(struct acpi if ((new_bluetooth_status?1:0) != sc->was_bluetooth_on_air) { sc->was_bluetooth_on_air = sc->was_bluetooth_on_air? 0:1; - device_printf(sc->wmi_dev, "BLUETOOTH on air changed" - " to %i (new_bluetooth_status is %i)\n", - sc->was_bluetooth_on_air, new_bluetooth_status); + if (sc->verbose) + device_printf(sc->wmi_dev, + "BLUETOOTH on air changed" + " to %i (new_bluetooth_status is %i)\n", + sc->was_bluetooth_on_air, + new_bluetooth_status); acpi_UserNotify("HP", sc->handle, 0xd0+sc->was_bluetooth_on_air); } @@ -415,9 +428,11 @@ acpi_hp_evaluate_auto_on_off(struct acpi new_wwan_status = (wireless & HP_MASK_WWAN_ON_AIR); if ((new_wwan_status?1:0) != sc->was_wwan_on_air) { sc->was_wwan_on_air = sc->was_wwan_on_air?0:1; - device_printf(sc->wmi_dev, "WWAN on air changed to %i" - " (new_wwan_status is %i)\n", - sc->was_wwan_on_air, new_wwan_status); + if (sc->verbose) + device_printf(sc->wmi_dev, + "WWAN on air changed to %i" + " (new_wwan_status is %i)\n", + sc->was_wwan_on_air, new_wwan_status); acpi_UserNotify("HP", sc->handle, 0xe0+sc->was_wwan_on_air); } @@ -440,7 +455,7 @@ acpi_hp_attach(device_t dev) struct acpi_hp_softc *sc; struct acpi_softc *acpi_sc; devclass_t wmi_devclass; - int arg; + int arg; ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); @@ -460,6 +475,7 @@ acpi_hp_attach(device_t dev) sc->was_wwan_on_air = 0; sc->cmi_detail = 0; sc->cmi_order_size = -1; + sc->verbose = 0; memset(sc->cmi_order, 0, sizeof(sc->cmi_order)); acpi_sc = acpi_device_get_parent_softc(dev); @@ -553,7 +569,7 @@ acpi_hp_attach(device_t dev) static int acpi_hp_detach(device_t dev) { - int ret; + int ret; ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); struct acpi_hp_softc *sc = device_get_softc(dev); @@ -580,12 +596,12 @@ acpi_hp_detach(device_t dev) static int acpi_hp_sysctl(SYSCTL_HANDLER_ARGS) { - struct acpi_hp_softc *sc; - int arg; - int oldarg; - int error = 0; - int function; - int method; + struct acpi_hp_softc *sc; + int arg; + int oldarg; + int error = 0; + int function; + int method; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -608,7 +624,7 @@ acpi_hp_sysctl(SYSCTL_HANDLER_ARGS) static int acpi_hp_sysctl_get(struct acpi_hp_softc *sc, int method) { - int val = 0; + int val = 0; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_SERIAL_ASSERT(hp); @@ -696,6 +712,9 @@ acpi_hp_sysctl_get(struct acpi_hp_softc case ACPI_HP_METHOD_CMI_DETAIL: val = sc->cmi_detail; break; + case ACPI_HP_METHOD_VERBOSE: + val = sc->verbose; + break; } return (val); @@ -707,7 +726,8 @@ acpi_hp_sysctl_set(struct acpi_hp_softc ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_SERIAL_ASSERT(hp); - if (method != ACPI_HP_METHOD_CMI_DETAIL) + if (method != ACPI_HP_METHOD_CMI_DETAIL && + method != ACPI_HP_METHOD_VERBOSE) arg = arg?1:0; if (arg != oldarg) { @@ -759,6 +779,9 @@ acpi_hp_sysctl_set(struct acpi_hp_softc sc->cmi_order_size = -1; } break; + case ACPI_HP_METHOD_VERBOSE: + sc->verbose = arg; + break; } } @@ -794,15 +817,15 @@ acpi_hp_notify(ACPI_HANDLE h, UINT32 not static int acpi_hp_exec_wmi_command(device_t wmi_dev, int command, int is_write, int val) { - UINT32 params[5] = { 0x55434553, - is_write?2:1, - command, - is_write?4:0, - val}; - UINT32* result; - ACPI_OBJECT *obj; - ACPI_BUFFER in = { sizeof(params), ¶ms }; - ACPI_BUFFER out = { ACPI_ALLOCATE_BUFFER, NULL }; + UINT32 params[5] = { 0x55434553, + is_write?2:1, + command, + is_write?4:0, + val}; + UINT32* result; + ACPI_OBJECT *obj; + ACPI_BUFFER in = { sizeof(params), ¶ms }; + ACPI_BUFFER out = { ACPI_ALLOCATE_BUFFER, NULL }; int retval; if (ACPI_FAILURE(ACPI_WMI_EVALUATE_CALL(wmi_dev, ACPI_HP_WMI_BIOS_GUID, @@ -827,7 +850,8 @@ acpi_hp_exec_wmi_command(device_t wmi_de static __inline char* acpi_hp_get_string_from_object(ACPI_OBJECT* obj, char* dst, size_t size) { - int length; + int length; + dst[0] = 0; if (obj->Type == ACPI_TYPE_STRING) { length = obj->String.Length+1; @@ -847,33 +871,32 @@ acpi_hp_get_string_from_object(ACPI_OBJE * The block returned is ACPI_TYPE_PACKAGE which should contain the following * elements: * Index Meaning - * 0 Setting Name [string] - * 1 Value (comma separated, asterisk marks the current value) [string] - * 2 Path within the bios hierarchy [string] - * 3 IsReadOnly [int] - * 4 DisplayInUI [int] - * 5 RequiresPhysicalPresence [int] - * 6 Sequence for ordering within the bios settings (absolute) [int] - * 7 Length of prerequisites array [int] - * 8 Prerequisite1 [string] - * 9 Prerequisite2 [string] - * 10 Prerequisite3 [string] - * 11 Current value (in case of enum) [string] / Array length [int] - * 12 Enum length [int] / Array values - * 13ff Enum value at index x [string] + * 0 Setting Name [string] + * 1 Value (comma separated, asterisk marks the current value) [string] + * 2 Path within the bios hierarchy [string] + * 3 IsReadOnly [int] + * 4 DisplayInUI [int] + * 5 RequiresPhysicalPresence [int] + * 6 Sequence for ordering within the bios settings (absolute) [int] + * 7 Length of prerequisites array [int] + * 8..8+[7] PrerequisiteN [string] + * 9+[7] Current value (in case of enum) [string] / Array length [int] + * 10+[7] Enum length [int] / Array values + * 11+[7]ff Enum value at index x [string] */ static int acpi_hp_get_cmi_block(device_t wmi_dev, const char* guid, UINT8 instance, char* outbuf, size_t outsize, UINT32* sequence, int detail) { - ACPI_OBJECT *obj; - ACPI_BUFFER out = { ACPI_ALLOCATE_BUFFER, NULL }; - int i; - int outlen; - int size = 255; - int has_enums = 0; - char string_buffer[size]; - int enumbase; + ACPI_OBJECT *obj; + ACPI_BUFFER out = { ACPI_ALLOCATE_BUFFER, NULL }; + int i; + int outlen; + int size = 255; + int has_enums = 0; + int valuebase = 0; + char string_buffer[size]; + int enumbase; outlen = 0; outbuf[0] = 0; @@ -887,8 +910,13 @@ acpi_hp_get_cmi_block(device_t wmi_dev, return (-EINVAL); } + if (obj->Package.Count >= 8 && + obj->Package.Elements[7].Type == ACPI_TYPE_INTEGER) { + valuebase = 8 + obj->Package.Elements[7].Integer.Value; + } + /* check if this matches our expectations based on limited knowledge */ - if (obj->Package.Count >= 13 && + if (valuebase > 7 && obj->Package.Count > valuebase + 1 && obj->Package.Elements[0].Type == ACPI_TYPE_STRING && obj->Package.Elements[1].Type == ACPI_TYPE_STRING && obj->Package.Elements[2].Type == ACPI_TYPE_STRING && @@ -896,20 +924,12 @@ acpi_hp_get_cmi_block(device_t wmi_dev, obj->Package.Elements[4].Type == ACPI_TYPE_INTEGER && obj->Package.Elements[5].Type == ACPI_TYPE_INTEGER && obj->Package.Elements[6].Type == ACPI_TYPE_INTEGER && - obj->Package.Elements[7].Type == ACPI_TYPE_INTEGER && - obj->Package.Elements[8].Type == ACPI_TYPE_STRING && - obj->Package.Elements[9].Type == ACPI_TYPE_STRING && - obj->Package.Elements[10].Type == ACPI_TYPE_STRING && - ((obj->Package.Elements[11].Type == ACPI_TYPE_STRING && - obj->Package.Elements[12].Type == ACPI_TYPE_INTEGER && - obj->Package.Count >= - 13+obj->Package.Elements[12].Integer.Value) || - (obj->Package.Elements[11].Type == ACPI_TYPE_INTEGER && - obj->Package.Count >= - 12+obj->Package.Elements[11].Integer.Value)) - ) { - enumbase = obj->Package.Elements[11].Type == ACPI_TYPE_STRING? - 12:11; + obj->Package.Elements[valuebase].Type == ACPI_TYPE_STRING && + obj->Package.Elements[valuebase+1].Type == ACPI_TYPE_INTEGER && + obj->Package.Count > valuebase + + obj->Package.Elements[valuebase+1].Integer.Value + ) { + enumbase = valuebase + 1; if (detail & ACPI_HP_CMI_DETAIL_PATHS) { strlcat(outbuf, acpi_hp_get_string_from_object( &obj->Package.Elements[2], string_buffer, size), @@ -924,11 +944,10 @@ acpi_hp_get_cmi_block(device_t wmi_dev, outlen += 43; while (strlen(outbuf) < outlen) strlcat(outbuf, " ", outsize); - if (enumbase == 12) - strlcat(outbuf, acpi_hp_get_string_from_object( - &obj->Package.Elements[11], - string_buffer, size), - outsize); + strlcat(outbuf, acpi_hp_get_string_from_object( + &obj->Package.Elements[valuebase], string_buffer, + size), + outsize); outlen += 21; while (strlen(outbuf) < outlen) strlcat(outbuf, " ", outsize); @@ -936,7 +955,7 @@ acpi_hp_get_cmi_block(device_t wmi_dev, if (outbuf[i] == '\\') outbuf[i] = '/'; if (detail & ACPI_HP_CMI_DETAIL_ENUMS) { - for (i = enumbase+1; i < enumbase + 1 + + for (i = enumbase + 1; i < enumbase + 1 + obj->Package.Elements[enumbase].Integer.Value; ++i) { acpi_hp_get_string_from_object( @@ -980,8 +999,8 @@ acpi_hp_get_cmi_block(device_t wmi_dev, */ static __inline int acpi_hp_hex_to_int(const UINT8 *hexin, UINT8 *byteout) { - unsigned int hi; - unsigned int lo; + unsigned int hi; + unsigned int lo; hi = hexin[0]; lo = hexin[1]; @@ -1010,10 +1029,10 @@ static __inline int acpi_hp_hex_to_int(c static void acpi_hp_hex_decode(char* buffer) { - int i; - int length = strlen(buffer); - UINT8 *uin; - UINT8 uout; + int i; + int length = strlen(buffer); + UINT8 *uin; + UINT8 uout; if (((int)length/2)*2 == length || length < 10) return; @@ -1044,8 +1063,8 @@ acpi_hp_hex_decode(char* buffer) static int acpi_hp_hpcmi_open(struct cdev* dev, int flags, int mode, struct thread *td) { - struct acpi_hp_softc *sc; - int ret; + struct acpi_hp_softc *sc; + int ret; if (dev == NULL || dev->si_drv1 == NULL) return (EBADF); @@ -1076,8 +1095,8 @@ acpi_hp_hpcmi_open(struct cdev* dev, int static int acpi_hp_hpcmi_close(struct cdev* dev, int flags, int mode, struct thread *td) { - struct acpi_hp_softc *sc; - int ret; + struct acpi_hp_softc *sc; + int ret; if (dev == NULL || dev->si_drv1 == NULL) return (EBADF); @@ -1106,13 +1125,13 @@ acpi_hp_hpcmi_close(struct cdev* dev, in static int acpi_hp_hpcmi_read(struct cdev *dev, struct uio *buf, int flag) { - struct acpi_hp_softc *sc; - int pos, i, l, ret; - UINT8 instance; - UINT8 maxInstance; - UINT32 sequence; - int linesize = 1025; - char line[linesize]; + struct acpi_hp_softc *sc; + int pos, i, l, ret; + UINT8 instance; + UINT8 maxInstance; + UINT32 sequence; + int linesize = 1025; + char line[linesize]; if (dev == NULL || dev->si_drv1 == NULL) return (EBADF); From kib at FreeBSD.org Fri Jul 3 22:17:38 2009 From: kib at FreeBSD.org (Konstantin Belousov) Date: Fri Jul 3 22:17:44 2009 Subject: svn commit: r195329 - head/sys/vm Message-ID: <200907032217.n63MHbUI090027@svn.freebsd.org> Author: kib Date: Fri Jul 3 22:17:37 2009 New Revision: 195329 URL: http://svn.freebsd.org/changeset/base/195329 Log: When forking a vm space that has wired map entries, do not forget to charge the objects created by vm_fault_copy_entry. The object charge was set, but reserve not incremented. Reported by: Greg Rivers Reviewed by: alc (previous version) Approved by: re (kensmith) Modified: head/sys/vm/vm_extern.h head/sys/vm/vm_fault.c head/sys/vm/vm_map.c Modified: head/sys/vm/vm_extern.h ============================================================================== --- head/sys/vm/vm_extern.h Fri Jul 3 21:51:44 2009 (r195328) +++ head/sys/vm/vm_extern.h Fri Jul 3 22:17:37 2009 (r195329) @@ -55,7 +55,8 @@ vm_map_t kmem_suballoc(vm_map_t, vm_offs void swapout_procs(int); int useracc(void *, int, int); int vm_fault(vm_map_t, vm_offset_t, vm_prot_t, int); -void vm_fault_copy_entry(vm_map_t, vm_map_t, vm_map_entry_t, vm_map_entry_t); +void vm_fault_copy_entry(vm_map_t, vm_map_t, vm_map_entry_t, vm_map_entry_t, + vm_ooffset_t *); void vm_fault_unwire(vm_map_t, vm_offset_t, vm_offset_t, boolean_t); int vm_fault_wire(vm_map_t, vm_offset_t, vm_offset_t, boolean_t, boolean_t); int vm_forkproc(struct thread *, struct proc *, struct thread *, struct vmspace *, int); Modified: head/sys/vm/vm_fault.c ============================================================================== --- head/sys/vm/vm_fault.c Fri Jul 3 21:51:44 2009 (r195328) +++ head/sys/vm/vm_fault.c Fri Jul 3 22:17:37 2009 (r195329) @@ -1126,11 +1126,9 @@ vm_fault_unwire(vm_map_t map, vm_offset_ * entry corresponding to a main map entry that is wired down). */ void -vm_fault_copy_entry(dst_map, src_map, dst_entry, src_entry) - vm_map_t dst_map; - vm_map_t src_map; - vm_map_entry_t dst_entry; - vm_map_entry_t src_entry; +vm_fault_copy_entry(vm_map_t dst_map, vm_map_t src_map, + vm_map_entry_t dst_entry, vm_map_entry_t src_entry, + vm_ooffset_t *fork_charge) { vm_object_t backing_object, dst_object, object; vm_object_t src_object; @@ -1161,13 +1159,16 @@ vm_fault_copy_entry(dst_map, src_map, ds #endif VM_OBJECT_LOCK(dst_object); + KASSERT(dst_entry->object.vm_object == NULL, + ("vm_fault_copy_entry: vm_object not NULL")); dst_entry->object.vm_object = dst_object; dst_entry->offset = 0; - if (dst_entry->uip != NULL) { - dst_object->uip = dst_entry->uip; - dst_object->charge = dst_entry->end - dst_entry->start; - dst_entry->uip = NULL; - } + dst_object->uip = curthread->td_ucred->cr_ruidinfo; + uihold(dst_object->uip); + dst_object->charge = dst_entry->end - dst_entry->start; + KASSERT(dst_entry->uip == NULL, + ("vm_fault_copy_entry: leaked swp charge")); + *fork_charge += dst_object->charge; prot = dst_entry->max_protection; /* Modified: head/sys/vm/vm_map.c ============================================================================== --- head/sys/vm/vm_map.c Fri Jul 3 21:51:44 2009 (r195328) +++ head/sys/vm/vm_map.c Fri Jul 3 22:17:37 2009 (r195329) @@ -2909,7 +2909,8 @@ vm_map_copy_entry( * Cause wired pages to be copied into the new map by * simulating faults (the new pages are pageable) */ - vm_fault_copy_entry(dst_map, src_map, dst_entry, src_entry); + vm_fault_copy_entry(dst_map, src_map, dst_entry, src_entry, + fork_charge); } } @@ -3073,6 +3074,7 @@ vmspace_fork(struct vmspace *vm1, vm_oof MAP_ENTRY_IN_TRANSITION); new_entry->wired_count = 0; new_entry->object.vm_object = NULL; + new_entry->uip = NULL; vm_map_entry_link(new_map, new_map->header.prev, new_entry); vmspace_map_entry_forked(vm1, vm2, new_entry); From mav at FreeBSD.org Sat Jul 4 06:00:58 2009 From: mav at FreeBSD.org (Alexander Motin) Date: Sat Jul 4 06:01:12 2009 Subject: svn commit: r195336 - in stable/7/sys: . contrib/pf netgraph Message-ID: <200907040600.n6460vaU000179@svn.freebsd.org> Author: mav Date: Sat Jul 4 06:00:57 2009 New Revision: 195336 URL: http://svn.freebsd.org/changeset/base/195336 Log: MFC rev.195335: Fix infinite loop in ng_iface, that happens when packet passes out via two different ng interfaces sequentially due to tunnelling. PR: kern/134557 Submitted by: Mikolaj Golub Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/netgraph/ng_iface.c Modified: stable/7/sys/netgraph/ng_iface.c ============================================================================== --- stable/7/sys/netgraph/ng_iface.c Sat Jul 4 05:07:52 2009 (r195335) +++ stable/7/sys/netgraph/ng_iface.c Sat Jul 4 06:00:57 2009 (r195336) @@ -365,7 +365,8 @@ ng_iface_output(struct ifnet *ifp, struc } /* Protect from deadly infinite recursion. */ - while ((mtag = m_tag_locate(m, MTAG_NGIF, MTAG_NGIF_CALLED, NULL))) { + mtag = NULL; + while ((mtag = m_tag_locate(m, MTAG_NGIF, MTAG_NGIF_CALLED, mtag))) { if (*(struct ifnet **)(mtag + 1) == ifp) { log(LOG_NOTICE, "Loop detected on %s\n", ifp->if_xname); m_freem(m); From bms at incunabulum.net Sat Jul 4 09:45:25 2009 From: bms at incunabulum.net (Bruce Simpson) Date: Sat Jul 4 09:45:31 2009 Subject: svn commit: r195295 - in head/sys: amd64/conf i386/conf ia64/conf pc98/conf powerpc/conf sparc64/conf sun4v/conf In-Reply-To: <200907021824.n62IObWJ051643@svn.freebsd.org> References: <200907021824.n62IObWJ051643@svn.freebsd.org> Message-ID: <4A4F24AF.3080900@incunabulum.net> Ed Schouten wrote: > Author: ed > Date: Thu Jul 2 18:24:37 2009 > New Revision: 195295 > URL: http://svn.freebsd.org/changeset/base/195295 > > Log: > Enable POSIX semaphores on all non-embedded architectures by default. > > More applications (including Firefox) seem to depend on this nowadays, > so not having this enabled by default is a bad idea. > Thank you. I didn't do this as normally we're pretty conservative about this sort of change, but now they are fixed, it just plain makes sense. I suspect Boost.Interprocess doesn't work on FreeBSD yet -- it needs sem_t's shared between processes. Does anybody have work in progress for this? We are in 8.0 freeze right now and it would be great to be able to sort this out, IF someone has it up their sleeve. This was recently bashed around on -STABLE. cheers BMS From attilio at FreeBSD.org Sat Jul 4 11:11:22 2009 From: attilio at FreeBSD.org (Attilio Rao) Date: Sat Jul 4 11:11:33 2009 Subject: svn commit: r195339 - head/usr.sbin/tzsetup Message-ID: <200907041111.n64BBLH6011263@svn.freebsd.org> Author: attilio Date: Sat Jul 4 11:11:21 2009 New Revision: 195339 URL: http://svn.freebsd.org/changeset/base/195339 Log: Add a new options (-s) that, when specified, skips the question about adjusting the clock to UTC. That avoids to write on /etc/wall_cmos_clock which is useful in some cases (example: host user in a jail). Sponsored by: Sandvine Incorporated Initially submitted by: Matt Koivisto Approved by: re (kib) Modified: head/usr.sbin/tzsetup/tzsetup.8 head/usr.sbin/tzsetup/tzsetup.c Modified: head/usr.sbin/tzsetup/tzsetup.8 ============================================================================== --- head/usr.sbin/tzsetup/tzsetup.8 Sat Jul 4 10:15:01 2009 (r195338) +++ head/usr.sbin/tzsetup/tzsetup.8 Sat Jul 4 11:11:21 2009 (r195339) @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd January 24, 1996 +.Dd July 4, 2009 .Dt TZSETUP 8 .Os .Sh NAME @@ -31,7 +31,7 @@ .Nd set local timezone .Sh SYNOPSIS .Nm -.Op Fl n +.Op Fl ns .Op Ar default .Sh DESCRIPTION The @@ -51,6 +51,9 @@ The following option is available: .Bl -tag -offset indent -width Fl .It Fl n Do not create or copy files. +.It Fl s +Skip the initial question about adjusting the clock if not set to +.Tn UTC . .El .Pp It is possible to short-circuit the menu system by specifying a Modified: head/usr.sbin/tzsetup/tzsetup.c ============================================================================== --- head/usr.sbin/tzsetup/tzsetup.c Sat Jul 4 10:15:01 2009 (r195338) +++ head/usr.sbin/tzsetup/tzsetup.c Sat Jul 4 11:11:21 2009 (r195339) @@ -652,7 +652,7 @@ static void usage(void) { - fprintf(stderr, "usage: tzsetup [-n]\n"); + fprintf(stderr, "usage: tzsetup [-ns]\n"); exit(1); } @@ -666,14 +666,17 @@ int main(int argc, char **argv) { char title[64], prompt[128]; - int c, fd; + int c, fd, skiputc; - while ((c = getopt(argc, argv, "n")) != -1) { + skiputc = 0; + while ((c = getopt(argc, argv, "ns")) != -1) { switch(c) { case 'n': reallydoit = 0; break; - + case 's': + skiputc = 1; + break; default: usage(); } @@ -690,27 +693,30 @@ main(int argc, char **argv) sort_countries(); make_menus(); - snprintf(title, sizeof(title), - "Select local or UTC (Greenwich Mean Time) clock"); - snprintf(prompt, sizeof(prompt), - "Is this machine's CMOS clock set to UTC? " - "If it is set to local time,\n" - "or you don't know, please choose NO here!"); init_dialog(); - if (!DIALOG_UTC(title, prompt, 7, 72)) { - if (reallydoit) - unlink(_PATH_WALL_CMOS_CLOCK); - } else { - if (reallydoit) { - fd = open(_PATH_WALL_CMOS_CLOCK, - O_WRONLY | O_CREAT | O_TRUNC, - S_IRUSR | S_IRGRP | S_IROTH); - if (fd < 0) - err(1, "create %s", _PATH_WALL_CMOS_CLOCK); - close(fd); + if (skiputc == 0) { + snprintf(title, sizeof(title), + "Select local or UTC (Greenwich Mean Time) clock"); + snprintf(prompt, sizeof(prompt), + "Is this machine's CMOS clock set to UTC? " + "If it is set to local time,\n" + "or you don't know, please choose NO here!"); + if (!DIALOG_UTC(title, prompt, 7, 72)) { + if (reallydoit) + unlink(_PATH_WALL_CMOS_CLOCK); + } else { + if (reallydoit) { + fd = open(_PATH_WALL_CMOS_CLOCK, + O_WRONLY | O_CREAT | O_TRUNC, + S_IRUSR | S_IRGRP | S_IROTH); + if (fd < 0) + err(1, "create %s", + _PATH_WALL_CMOS_CLOCK); + close(fd); + } } + dialog_clear_norefresh(); } - dialog_clear_norefresh(); if (optind == argc - 1) { snprintf(title, sizeof(title), "Default timezone provided"); snprintf(prompt, sizeof(prompt), From ed at FreeBSD.org Sat Jul 4 13:58:27 2009 From: ed at FreeBSD.org (Ed Schouten) Date: Sat Jul 4 13:58:36 2009 Subject: svn commit: r195340 - in vendor/llvm/dist: . autoconf cmake docs examples/BrainF examples/Fibonacci examples/HowToUseJIT examples/Kaleidoscope examples/ModuleMaker examples/ParallelJIT include/llvm... Message-ID: <200907041358.n64DwQFg014366@svn.freebsd.org> Author: ed Date: Sat Jul 4 13:58:26 2009 New Revision: 195340 URL: http://svn.freebsd.org/changeset/base/195340 Log: Import LLVM 74788. Added: vendor/llvm/dist/include/llvm/LLVMContext.h vendor/llvm/dist/include/llvm/System/Errno.h vendor/llvm/dist/include/llvm/Transforms/Utils/SSI.h vendor/llvm/dist/lib/CompilerDriver/BuiltinOptions.cpp vendor/llvm/dist/lib/CompilerDriver/Main.cpp vendor/llvm/dist/lib/System/Errno.cpp vendor/llvm/dist/lib/Target/ARM/Thumb1InstrInfo.cpp vendor/llvm/dist/lib/Target/ARM/Thumb1InstrInfo.h vendor/llvm/dist/lib/Target/ARM/Thumb1RegisterInfo.cpp vendor/llvm/dist/lib/Target/ARM/Thumb1RegisterInfo.h vendor/llvm/dist/lib/Target/ARM/Thumb2InstrInfo.cpp vendor/llvm/dist/lib/Target/ARM/Thumb2InstrInfo.h vendor/llvm/dist/lib/Target/ARM/Thumb2RegisterInfo.cpp vendor/llvm/dist/lib/Target/ARM/Thumb2RegisterInfo.h vendor/llvm/dist/lib/Transforms/Utils/SSI.cpp vendor/llvm/dist/lib/VMCore/LLVMContext.cpp vendor/llvm/dist/lib/VMCore/LLVMContextImpl.h vendor/llvm/dist/test/Analysis/LoopDependenceAnalysis/ vendor/llvm/dist/test/Analysis/LoopDependenceAnalysis/dg.exp vendor/llvm/dist/test/Analysis/LoopDependenceAnalysis/local-array.ll vendor/llvm/dist/test/Analysis/LoopDependenceAnalysis/no-array.ll vendor/llvm/dist/test/Analysis/LoopDependenceAnalysis/siv-strong1.ll vendor/llvm/dist/test/Analysis/LoopDependenceAnalysis/siv-strong2.ll vendor/llvm/dist/test/Analysis/LoopDependenceAnalysis/ziv1.ll vendor/llvm/dist/test/Analysis/LoopDependenceAnalysis/ziv2.ll vendor/llvm/dist/test/CodeGen/ARM/2009-06-30-RegScavengerAssert.ll vendor/llvm/dist/test/CodeGen/ARM/2009-06-30-RegScavengerAssert2.ll vendor/llvm/dist/test/CodeGen/ARM/2009-06-30-RegScavengerAssert3.ll vendor/llvm/dist/test/CodeGen/ARM/2009-06-30-RegScavengerAssert4.ll vendor/llvm/dist/test/CodeGen/ARM/2009-06-30-RegScavengerAssert5.ll vendor/llvm/dist/test/CodeGen/ARM/2009-07-01-CommuteBug.ll vendor/llvm/dist/test/CodeGen/PowerPC/available-externally.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-cmn.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-jumptbl.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-ldr.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-ldr_ext.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-ldr_post.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-ldr_pre.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-ldrb.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-ldrh.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-sbc2.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-str.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-str_post.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-str_pre.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-strb.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-strh.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-sub.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-sub2.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-sub4.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-sub5.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-sxt_rot.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-teq.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-teq2.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-tst.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-tst2.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-uxt_rot.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-uxtb.ll vendor/llvm/dist/test/CodeGen/Thumb2/tls1.ll vendor/llvm/dist/test/CodeGen/Thumb2/tls2.ll vendor/llvm/dist/test/CodeGen/X86/fast-isel-constpool.ll vendor/llvm/dist/test/CodeGen/X86/fast-isel-gv.ll vendor/llvm/dist/test/CodeGen/X86/inline-asm-fpstack3.ll vendor/llvm/dist/test/CodeGen/X86/inline-asm-fpstack4.ll vendor/llvm/dist/test/CodeGen/X86/inline-asm-fpstack5.ll vendor/llvm/dist/test/Feature/mdnode2.ll vendor/llvm/dist/test/Feature/mdnode3.ll vendor/llvm/dist/test/FrontendC++/2009-06-30-ByrefBlock.cpp vendor/llvm/dist/test/MC/AsmParser/directive_align.s vendor/llvm/dist/test/MC/AsmParser/directive_symbol_attrs.s vendor/llvm/dist/test/MC/AsmParser/exprs.s vendor/llvm/dist/test/MC/AsmParser/x86_operands.s vendor/llvm/dist/test/TableGen/ListArgs.td vendor/llvm/dist/test/TableGen/ListArgsSimple.td vendor/llvm/dist/test/Transforms/IndVarSimplify/loop_evaluate9.ll vendor/llvm/dist/test/Transforms/InstCombine/2009-07-02-MaskedIntVector.ll vendor/llvm/dist/test/Transforms/InstCombine/bitcast-scalar-to-vector.ll vendor/llvm/dist/test/Transforms/LoopIndexSplit/non-iv-cmp-operand.ll vendor/llvm/dist/test/Transforms/LoopSimplify/merge-exits.ll vendor/llvm/dist/tools/llvm-mc/AsmExpr.cpp vendor/llvm/dist/tools/llvm-mc/AsmExpr.h vendor/llvm/dist/unittests/VMCore/PassManagerTest.cpp vendor/llvm/dist/utils/crosstool/ARM/README Deleted: vendor/llvm/dist/lib/Target/ARM/ThumbInstrInfo.cpp vendor/llvm/dist/lib/Target/ARM/ThumbInstrInfo.h Modified: vendor/llvm/dist/Makefile.config.in vendor/llvm/dist/Makefile.rules vendor/llvm/dist/autoconf/configure.ac vendor/llvm/dist/cmake/config-ix.cmake vendor/llvm/dist/configure vendor/llvm/dist/docs/CodingStandards.html vendor/llvm/dist/docs/CompilerDriver.html vendor/llvm/dist/docs/FAQ.html vendor/llvm/dist/docs/ReleaseNotes-2.6.html vendor/llvm/dist/docs/TableGenFundamentals.html vendor/llvm/dist/docs/WritingAnLLVMPass.html vendor/llvm/dist/examples/BrainF/BrainF.cpp vendor/llvm/dist/examples/BrainF/BrainF.h vendor/llvm/dist/examples/BrainF/BrainFDriver.cpp vendor/llvm/dist/examples/Fibonacci/fibonacci.cpp vendor/llvm/dist/examples/HowToUseJIT/HowToUseJIT.cpp vendor/llvm/dist/examples/Kaleidoscope/toy.cpp vendor/llvm/dist/examples/ModuleMaker/ModuleMaker.cpp vendor/llvm/dist/examples/ParallelJIT/ParallelJIT.cpp vendor/llvm/dist/include/llvm-c/BitReader.h vendor/llvm/dist/include/llvm-c/Core.h vendor/llvm/dist/include/llvm-c/lto.h vendor/llvm/dist/include/llvm/ADT/APInt.h vendor/llvm/dist/include/llvm/ADT/FoldingSet.h vendor/llvm/dist/include/llvm/ADT/PointerUnion.h vendor/llvm/dist/include/llvm/ADT/Statistic.h vendor/llvm/dist/include/llvm/ADT/Triple.h vendor/llvm/dist/include/llvm/Analysis/DebugInfo.h vendor/llvm/dist/include/llvm/Analysis/Dominators.h vendor/llvm/dist/include/llvm/Analysis/IVUsers.h vendor/llvm/dist/include/llvm/Analysis/LoopDependenceAnalysis.h vendor/llvm/dist/include/llvm/Analysis/LoopInfo.h vendor/llvm/dist/include/llvm/Analysis/ScalarEvolution.h vendor/llvm/dist/include/llvm/Analysis/ScalarEvolutionExpander.h vendor/llvm/dist/include/llvm/Analysis/ScalarEvolutionExpressions.h vendor/llvm/dist/include/llvm/Assembly/Parser.h vendor/llvm/dist/include/llvm/Bitcode/Archive.h vendor/llvm/dist/include/llvm/Bitcode/BitstreamReader.h vendor/llvm/dist/include/llvm/Bitcode/ReaderWriter.h vendor/llvm/dist/include/llvm/CodeGen/AsmPrinter.h vendor/llvm/dist/include/llvm/CodeGen/BinaryObject.h vendor/llvm/dist/include/llvm/CodeGen/LiveIntervalAnalysis.h vendor/llvm/dist/include/llvm/CodeGen/MachineFunction.h vendor/llvm/dist/include/llvm/CodeGen/MachineInstrBuilder.h vendor/llvm/dist/include/llvm/CodeGen/MachineLoopInfo.h vendor/llvm/dist/include/llvm/CodeGen/MachineOperand.h vendor/llvm/dist/include/llvm/CodeGen/RegisterScavenging.h vendor/llvm/dist/include/llvm/CodeGen/SelectionDAG.h vendor/llvm/dist/include/llvm/CodeGen/SelectionDAGNodes.h vendor/llvm/dist/include/llvm/CodeGen/ValueTypes.h vendor/llvm/dist/include/llvm/CodeGen/ValueTypes.td vendor/llvm/dist/include/llvm/CompilerDriver/Main.inc vendor/llvm/dist/include/llvm/Config/config.h.cmake vendor/llvm/dist/include/llvm/Config/config.h.in vendor/llvm/dist/include/llvm/Debugger/Debugger.h vendor/llvm/dist/include/llvm/DerivedTypes.h vendor/llvm/dist/include/llvm/Function.h vendor/llvm/dist/include/llvm/Intrinsics.td vendor/llvm/dist/include/llvm/LinkAllPasses.h vendor/llvm/dist/include/llvm/LinkAllVMCore.h vendor/llvm/dist/include/llvm/Linker.h vendor/llvm/dist/include/llvm/MC/MCContext.h vendor/llvm/dist/include/llvm/MC/MCInst.h vendor/llvm/dist/include/llvm/MC/MCSection.h vendor/llvm/dist/include/llvm/MC/MCStreamer.h vendor/llvm/dist/include/llvm/MC/MCSymbol.h vendor/llvm/dist/include/llvm/MC/MCValue.h vendor/llvm/dist/include/llvm/Module.h vendor/llvm/dist/include/llvm/Pass.h vendor/llvm/dist/include/llvm/Support/SourceMgr.h vendor/llvm/dist/include/llvm/Support/TypeBuilder.h vendor/llvm/dist/include/llvm/Target/TargetCallingConv.td vendor/llvm/dist/include/llvm/Target/TargetELFWriterInfo.h vendor/llvm/dist/include/llvm/Target/TargetLowering.h vendor/llvm/dist/include/llvm/Transforms/Scalar.h vendor/llvm/dist/include/llvm/Transforms/Utils/Cloning.h vendor/llvm/dist/include/llvm/Transforms/Utils/Local.h vendor/llvm/dist/lib/Analysis/DebugInfo.cpp vendor/llvm/dist/lib/Analysis/IPA/Andersens.cpp vendor/llvm/dist/lib/Analysis/LoopDependenceAnalysis.cpp vendor/llvm/dist/lib/Analysis/LoopInfo.cpp vendor/llvm/dist/lib/Analysis/LoopPass.cpp vendor/llvm/dist/lib/Analysis/ScalarEvolution.cpp vendor/llvm/dist/lib/Analysis/ScalarEvolutionExpander.cpp vendor/llvm/dist/lib/Analysis/ValueTracking.cpp vendor/llvm/dist/lib/Archive/Archive.cpp vendor/llvm/dist/lib/Archive/ArchiveInternals.h vendor/llvm/dist/lib/Archive/ArchiveReader.cpp vendor/llvm/dist/lib/Archive/ArchiveWriter.cpp vendor/llvm/dist/lib/AsmParser/LLLexer.cpp vendor/llvm/dist/lib/AsmParser/LLLexer.h vendor/llvm/dist/lib/AsmParser/LLParser.cpp vendor/llvm/dist/lib/AsmParser/LLParser.h vendor/llvm/dist/lib/AsmParser/Parser.cpp vendor/llvm/dist/lib/Bitcode/Reader/BitReader.cpp vendor/llvm/dist/lib/Bitcode/Reader/BitcodeReader.cpp vendor/llvm/dist/lib/Bitcode/Reader/BitcodeReader.h vendor/llvm/dist/lib/CodeGen/AsmPrinter/AsmPrinter.cpp vendor/llvm/dist/lib/CodeGen/AsmPrinter/DwarfDebug.cpp vendor/llvm/dist/lib/CodeGen/AsmPrinter/DwarfDebug.h vendor/llvm/dist/lib/CodeGen/CMakeLists.txt vendor/llvm/dist/lib/CodeGen/ELF.h vendor/llvm/dist/lib/CodeGen/ELFCodeEmitter.cpp vendor/llvm/dist/lib/CodeGen/ELFCodeEmitter.h vendor/llvm/dist/lib/CodeGen/ELFWriter.cpp vendor/llvm/dist/lib/CodeGen/ELFWriter.h vendor/llvm/dist/lib/CodeGen/LiveIntervalAnalysis.cpp vendor/llvm/dist/lib/CodeGen/MachineFunction.cpp vendor/llvm/dist/lib/CodeGen/MachineInstr.cpp vendor/llvm/dist/lib/CodeGen/MachineLoopInfo.cpp vendor/llvm/dist/lib/CodeGen/RegAllocLinearScan.cpp vendor/llvm/dist/lib/CodeGen/RegisterScavenging.cpp vendor/llvm/dist/lib/CodeGen/SelectionDAG/CMakeLists.txt vendor/llvm/dist/lib/CodeGen/SelectionDAG/FastISel.cpp vendor/llvm/dist/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp vendor/llvm/dist/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp vendor/llvm/dist/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodesEmit.cpp vendor/llvm/dist/lib/CodeGen/SelectionDAG/SelectionDAG.cpp vendor/llvm/dist/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp vendor/llvm/dist/lib/CodeGen/SimpleRegisterCoalescing.cpp vendor/llvm/dist/lib/CodeGen/TargetInstrInfoImpl.cpp vendor/llvm/dist/lib/CodeGen/VirtRegRewriter.cpp vendor/llvm/dist/lib/CompilerDriver/Action.cpp vendor/llvm/dist/lib/CompilerDriver/CompilationGraph.cpp vendor/llvm/dist/lib/CompilerDriver/Makefile vendor/llvm/dist/lib/CompilerDriver/Tool.cpp vendor/llvm/dist/lib/Debugger/Debugger.cpp vendor/llvm/dist/lib/Debugger/ProgramInfo.cpp vendor/llvm/dist/lib/ExecutionEngine/JIT/JIT.cpp vendor/llvm/dist/lib/Linker/LinkArchives.cpp vendor/llvm/dist/lib/Linker/LinkItems.cpp vendor/llvm/dist/lib/Linker/Linker.cpp vendor/llvm/dist/lib/MC/MCAsmStreamer.cpp vendor/llvm/dist/lib/Makefile vendor/llvm/dist/lib/Support/APInt.cpp vendor/llvm/dist/lib/Support/Annotation.cpp vendor/llvm/dist/lib/Support/SourceMgr.cpp vendor/llvm/dist/lib/Support/SystemUtils.cpp vendor/llvm/dist/lib/Support/Triple.cpp vendor/llvm/dist/lib/System/CMakeLists.txt vendor/llvm/dist/lib/System/ThreadLocal.cpp vendor/llvm/dist/lib/System/Unix/Unix.h vendor/llvm/dist/lib/System/Win32/ThreadLocal.inc vendor/llvm/dist/lib/Target/ARM/ARM.h vendor/llvm/dist/lib/Target/ARM/ARMAddressingModes.h vendor/llvm/dist/lib/Target/ARM/ARMCodeEmitter.cpp vendor/llvm/dist/lib/Target/ARM/ARMConstantIslandPass.cpp vendor/llvm/dist/lib/Target/ARM/ARMISelDAGToDAG.cpp vendor/llvm/dist/lib/Target/ARM/ARMISelLowering.cpp vendor/llvm/dist/lib/Target/ARM/ARMISelLowering.h vendor/llvm/dist/lib/Target/ARM/ARMInstrFormats.td vendor/llvm/dist/lib/Target/ARM/ARMInstrInfo.cpp vendor/llvm/dist/lib/Target/ARM/ARMInstrInfo.h vendor/llvm/dist/lib/Target/ARM/ARMInstrInfo.td vendor/llvm/dist/lib/Target/ARM/ARMInstrThumb.td vendor/llvm/dist/lib/Target/ARM/ARMInstrThumb2.td vendor/llvm/dist/lib/Target/ARM/ARMMachineFunctionInfo.h vendor/llvm/dist/lib/Target/ARM/ARMRegisterInfo.cpp vendor/llvm/dist/lib/Target/ARM/ARMRegisterInfo.h vendor/llvm/dist/lib/Target/ARM/ARMSubtarget.h vendor/llvm/dist/lib/Target/ARM/ARMTargetMachine.cpp vendor/llvm/dist/lib/Target/ARM/ARMTargetMachine.h vendor/llvm/dist/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp vendor/llvm/dist/lib/Target/ARM/CMakeLists.txt vendor/llvm/dist/lib/Target/ARM/README.txt vendor/llvm/dist/lib/Target/Alpha/Alpha.h vendor/llvm/dist/lib/Target/Alpha/AlphaISelLowering.cpp vendor/llvm/dist/lib/Target/Alpha/AlphaISelLowering.h vendor/llvm/dist/lib/Target/Alpha/AlphaInstrInfo.cpp vendor/llvm/dist/lib/Target/Alpha/AlphaTargetMachine.cpp vendor/llvm/dist/lib/Target/Alpha/AlphaTargetMachine.h vendor/llvm/dist/lib/Target/Alpha/AsmPrinter/AlphaAsmPrinter.cpp vendor/llvm/dist/lib/Target/Alpha/CMakeLists.txt vendor/llvm/dist/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp vendor/llvm/dist/lib/Target/CellSPU/CMakeLists.txt vendor/llvm/dist/lib/Target/CellSPU/SPU.h vendor/llvm/dist/lib/Target/CellSPU/SPUISelLowering.cpp vendor/llvm/dist/lib/Target/CellSPU/SPUISelLowering.h vendor/llvm/dist/lib/Target/CellSPU/SPUInstrInfo.cpp vendor/llvm/dist/lib/Target/CellSPU/SPUTargetMachine.cpp vendor/llvm/dist/lib/Target/CellSPU/SPUTargetMachine.h vendor/llvm/dist/lib/Target/IA64/AsmPrinter/IA64AsmPrinter.cpp vendor/llvm/dist/lib/Target/IA64/CMakeLists.txt vendor/llvm/dist/lib/Target/IA64/IA64.h vendor/llvm/dist/lib/Target/IA64/IA64ISelLowering.cpp vendor/llvm/dist/lib/Target/IA64/IA64ISelLowering.h vendor/llvm/dist/lib/Target/IA64/IA64TargetMachine.cpp vendor/llvm/dist/lib/Target/IA64/IA64TargetMachine.h vendor/llvm/dist/lib/Target/MSP430/MSP430.h vendor/llvm/dist/lib/Target/MSP430/MSP430AsmPrinter.cpp vendor/llvm/dist/lib/Target/MSP430/MSP430ISelLowering.cpp vendor/llvm/dist/lib/Target/MSP430/MSP430ISelLowering.h vendor/llvm/dist/lib/Target/MSP430/MSP430RegisterInfo.cpp vendor/llvm/dist/lib/Target/MSP430/MSP430TargetMachine.cpp vendor/llvm/dist/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp vendor/llvm/dist/lib/Target/Mips/CMakeLists.txt vendor/llvm/dist/lib/Target/Mips/Mips.h vendor/llvm/dist/lib/Target/Mips/MipsISelLowering.cpp vendor/llvm/dist/lib/Target/Mips/MipsISelLowering.h vendor/llvm/dist/lib/Target/Mips/MipsInstrInfo.cpp vendor/llvm/dist/lib/Target/Mips/MipsTargetMachine.cpp vendor/llvm/dist/lib/Target/Mips/MipsTargetMachine.h vendor/llvm/dist/lib/Target/PIC16/PIC16.h vendor/llvm/dist/lib/Target/PIC16/PIC16AsmPrinter.cpp vendor/llvm/dist/lib/Target/PIC16/PIC16AsmPrinter.h vendor/llvm/dist/lib/Target/PIC16/PIC16ISelLowering.cpp vendor/llvm/dist/lib/Target/PIC16/PIC16ISelLowering.h vendor/llvm/dist/lib/Target/PIC16/PIC16InstrInfo.td vendor/llvm/dist/lib/Target/PIC16/PIC16TargetMachine.cpp vendor/llvm/dist/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp vendor/llvm/dist/lib/Target/PowerPC/CMakeLists.txt vendor/llvm/dist/lib/Target/PowerPC/PPC.h vendor/llvm/dist/lib/Target/PowerPC/PPCCallingConv.td vendor/llvm/dist/lib/Target/PowerPC/PPCCodeEmitter.cpp vendor/llvm/dist/lib/Target/PowerPC/PPCFrameInfo.h vendor/llvm/dist/lib/Target/PowerPC/PPCHazardRecognizers.cpp vendor/llvm/dist/lib/Target/PowerPC/PPCISelLowering.cpp vendor/llvm/dist/lib/Target/PowerPC/PPCISelLowering.h vendor/llvm/dist/lib/Target/PowerPC/PPCInstr64Bit.td vendor/llvm/dist/lib/Target/PowerPC/PPCInstrInfo.cpp vendor/llvm/dist/lib/Target/PowerPC/PPCInstrInfo.td vendor/llvm/dist/lib/Target/PowerPC/PPCJITInfo.cpp vendor/llvm/dist/lib/Target/PowerPC/PPCRegisterInfo.cpp vendor/llvm/dist/lib/Target/PowerPC/PPCRegisterInfo.h vendor/llvm/dist/lib/Target/PowerPC/PPCRegisterInfo.td vendor/llvm/dist/lib/Target/PowerPC/PPCSubtarget.h vendor/llvm/dist/lib/Target/PowerPC/PPCTargetMachine.cpp vendor/llvm/dist/lib/Target/PowerPC/PPCTargetMachine.h vendor/llvm/dist/lib/Target/PowerPC/README.txt vendor/llvm/dist/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp vendor/llvm/dist/lib/Target/Sparc/CMakeLists.txt vendor/llvm/dist/lib/Target/Sparc/Sparc.h vendor/llvm/dist/lib/Target/Sparc/SparcISelLowering.cpp vendor/llvm/dist/lib/Target/Sparc/SparcISelLowering.h vendor/llvm/dist/lib/Target/Sparc/SparcInstrInfo.cpp vendor/llvm/dist/lib/Target/Sparc/SparcTargetMachine.cpp vendor/llvm/dist/lib/Target/Sparc/SparcTargetMachine.h vendor/llvm/dist/lib/Target/TargetELFWriterInfo.cpp vendor/llvm/dist/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp vendor/llvm/dist/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h vendor/llvm/dist/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp vendor/llvm/dist/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp vendor/llvm/dist/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h vendor/llvm/dist/lib/Target/X86/CMakeLists.txt vendor/llvm/dist/lib/Target/X86/X86.h vendor/llvm/dist/lib/Target/X86/X86.td vendor/llvm/dist/lib/Target/X86/X86ELFWriterInfo.cpp vendor/llvm/dist/lib/Target/X86/X86ELFWriterInfo.h vendor/llvm/dist/lib/Target/X86/X86FastISel.cpp vendor/llvm/dist/lib/Target/X86/X86FloatingPoint.cpp vendor/llvm/dist/lib/Target/X86/X86ISelLowering.cpp vendor/llvm/dist/lib/Target/X86/X86ISelLowering.h vendor/llvm/dist/lib/Target/X86/X86InstrBuilder.h vendor/llvm/dist/lib/Target/X86/X86InstrInfo.cpp vendor/llvm/dist/lib/Target/X86/X86InstrInfo.td vendor/llvm/dist/lib/Target/X86/X86RegisterInfo.td vendor/llvm/dist/lib/Target/X86/X86Subtarget.h vendor/llvm/dist/lib/Target/X86/X86TargetMachine.cpp vendor/llvm/dist/lib/Target/X86/X86TargetMachine.h vendor/llvm/dist/lib/Target/XCore/XCore.h vendor/llvm/dist/lib/Target/XCore/XCoreAsmPrinter.cpp vendor/llvm/dist/lib/Target/XCore/XCoreISelLowering.cpp vendor/llvm/dist/lib/Target/XCore/XCoreISelLowering.h vendor/llvm/dist/lib/Target/XCore/XCoreTargetMachine.cpp vendor/llvm/dist/lib/Transforms/IPO/GlobalOpt.cpp vendor/llvm/dist/lib/Transforms/IPO/PartialInlining.cpp vendor/llvm/dist/lib/Transforms/IPO/RaiseAllocations.cpp vendor/llvm/dist/lib/Transforms/Scalar/CodeGenPrepare.cpp vendor/llvm/dist/lib/Transforms/Scalar/GVN.cpp vendor/llvm/dist/lib/Transforms/Scalar/IndVarSimplify.cpp vendor/llvm/dist/lib/Transforms/Scalar/InstructionCombining.cpp vendor/llvm/dist/lib/Transforms/Scalar/JumpThreading.cpp vendor/llvm/dist/lib/Transforms/Scalar/LICM.cpp vendor/llvm/dist/lib/Transforms/Scalar/LoopIndexSplit.cpp vendor/llvm/dist/lib/Transforms/Scalar/LoopRotation.cpp vendor/llvm/dist/lib/Transforms/Scalar/LoopStrengthReduce.cpp vendor/llvm/dist/lib/Transforms/Scalar/LoopUnswitch.cpp vendor/llvm/dist/lib/Transforms/Scalar/MemCpyOptimizer.cpp vendor/llvm/dist/lib/Transforms/Scalar/Reassociate.cpp vendor/llvm/dist/lib/Transforms/Scalar/Reg2Mem.cpp vendor/llvm/dist/lib/Transforms/Scalar/SCCP.cpp vendor/llvm/dist/lib/Transforms/Scalar/ScalarReplAggregates.cpp vendor/llvm/dist/lib/Transforms/Scalar/SimplifyCFGPass.cpp vendor/llvm/dist/lib/Transforms/Scalar/SimplifyLibCalls.cpp vendor/llvm/dist/lib/Transforms/Scalar/TailDuplication.cpp vendor/llvm/dist/lib/Transforms/Utils/CMakeLists.txt vendor/llvm/dist/lib/Transforms/Utils/CloneModule.cpp vendor/llvm/dist/lib/Transforms/Utils/LoopSimplify.cpp vendor/llvm/dist/lib/Transforms/Utils/LowerAllocations.cpp vendor/llvm/dist/lib/Transforms/Utils/SimplifyCFG.cpp vendor/llvm/dist/lib/VMCore/AsmWriter.cpp vendor/llvm/dist/lib/VMCore/CMakeLists.txt vendor/llvm/dist/lib/VMCore/Core.cpp vendor/llvm/dist/lib/VMCore/Function.cpp vendor/llvm/dist/lib/VMCore/Module.cpp vendor/llvm/dist/lib/VMCore/PassManager.cpp vendor/llvm/dist/lib/VMCore/Type.cpp vendor/llvm/dist/lib/VMCore/ValueTypes.cpp vendor/llvm/dist/test/CodeGen/ARM/ldr.ll vendor/llvm/dist/test/CodeGen/ARM/sxt_rot.ll vendor/llvm/dist/test/CodeGen/Thumb2/load-global.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-adc.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-add2.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-add5.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-and.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-bic.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-cmp.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-cmp2.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-eor.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-mvn2.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-orn.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-orr.ll vendor/llvm/dist/test/CodeGen/Thumb2/thumb2-rsb.ll vendor/llvm/dist/tools/Makefile vendor/llvm/dist/tools/bugpoint/BugDriver.cpp vendor/llvm/dist/tools/bugpoint/BugDriver.h vendor/llvm/dist/tools/bugpoint/CrashDebugger.cpp vendor/llvm/dist/tools/bugpoint/Miscompilation.cpp vendor/llvm/dist/tools/bugpoint/OptimizerDriver.cpp vendor/llvm/dist/tools/bugpoint/bugpoint.cpp vendor/llvm/dist/tools/gold/gold-plugin.cpp vendor/llvm/dist/tools/llc/llc.cpp vendor/llvm/dist/tools/lli/lli.cpp vendor/llvm/dist/tools/llvm-ar/llvm-ar.cpp vendor/llvm/dist/tools/llvm-as/llvm-as.cpp vendor/llvm/dist/tools/llvm-db/CLIDebugger.cpp vendor/llvm/dist/tools/llvm-db/CLIDebugger.h vendor/llvm/dist/tools/llvm-db/Commands.cpp vendor/llvm/dist/tools/llvm-db/llvm-db.cpp vendor/llvm/dist/tools/llvm-dis/llvm-dis.cpp vendor/llvm/dist/tools/llvm-extract/llvm-extract.cpp vendor/llvm/dist/tools/llvm-ld/llvm-ld.cpp vendor/llvm/dist/tools/llvm-link/llvm-link.cpp vendor/llvm/dist/tools/llvm-mc/AsmLexer.cpp vendor/llvm/dist/tools/llvm-mc/AsmLexer.h vendor/llvm/dist/tools/llvm-mc/AsmParser.cpp vendor/llvm/dist/tools/llvm-mc/AsmParser.h vendor/llvm/dist/tools/llvm-mc/CMakeLists.txt vendor/llvm/dist/tools/llvm-mc/MC-X86Specific.cpp vendor/llvm/dist/tools/llvm-mc/llvm-mc.cpp vendor/llvm/dist/tools/llvm-nm/llvm-nm.cpp vendor/llvm/dist/tools/llvm-prof/llvm-prof.cpp vendor/llvm/dist/tools/llvm-ranlib/llvm-ranlib.cpp vendor/llvm/dist/tools/llvmc/doc/LLVMC-Reference.rst vendor/llvm/dist/tools/llvmc/example/mcc16/plugins/PIC16Base/PIC16Base.td vendor/llvm/dist/tools/llvmc/example/mcc16/plugins/PIC16Base/PluginMain.cpp vendor/llvm/dist/tools/lto/LTOCodeGenerator.cpp vendor/llvm/dist/tools/lto/LTOCodeGenerator.h vendor/llvm/dist/tools/lto/LTOModule.cpp vendor/llvm/dist/tools/lto/LTOModule.h vendor/llvm/dist/tools/lto/Makefile vendor/llvm/dist/tools/lto/lto.cpp vendor/llvm/dist/tools/opt/opt.cpp vendor/llvm/dist/unittests/ADT/APIntTest.cpp vendor/llvm/dist/unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp vendor/llvm/dist/unittests/MC/AsmStreamerTest.cpp vendor/llvm/dist/unittests/VMCore/Makefile vendor/llvm/dist/utils/NewNightlyTest.pl vendor/llvm/dist/utils/TableGen/AsmWriterEmitter.cpp vendor/llvm/dist/utils/TableGen/AsmWriterEmitter.h vendor/llvm/dist/utils/TableGen/CallingConvEmitter.cpp vendor/llvm/dist/utils/TableGen/CallingConvEmitter.h vendor/llvm/dist/utils/TableGen/ClangDiagnosticsEmitter.cpp vendor/llvm/dist/utils/TableGen/ClangDiagnosticsEmitter.h vendor/llvm/dist/utils/TableGen/CodeEmitterGen.cpp vendor/llvm/dist/utils/TableGen/CodeEmitterGen.h vendor/llvm/dist/utils/TableGen/CodeGenDAGPatterns.cpp vendor/llvm/dist/utils/TableGen/CodeGenDAGPatterns.h vendor/llvm/dist/utils/TableGen/CodeGenTarget.cpp vendor/llvm/dist/utils/TableGen/CodeGenTarget.h vendor/llvm/dist/utils/TableGen/DAGISelEmitter.cpp vendor/llvm/dist/utils/TableGen/DAGISelEmitter.h vendor/llvm/dist/utils/TableGen/FastISelEmitter.cpp vendor/llvm/dist/utils/TableGen/FastISelEmitter.h vendor/llvm/dist/utils/TableGen/InstrEnumEmitter.cpp vendor/llvm/dist/utils/TableGen/InstrEnumEmitter.h vendor/llvm/dist/utils/TableGen/InstrInfoEmitter.cpp vendor/llvm/dist/utils/TableGen/InstrInfoEmitter.h vendor/llvm/dist/utils/TableGen/IntrinsicEmitter.cpp vendor/llvm/dist/utils/TableGen/IntrinsicEmitter.h vendor/llvm/dist/utils/TableGen/LLVMCConfigurationEmitter.cpp vendor/llvm/dist/utils/TableGen/LLVMCConfigurationEmitter.h vendor/llvm/dist/utils/TableGen/Record.cpp vendor/llvm/dist/utils/TableGen/Record.h vendor/llvm/dist/utils/TableGen/RegisterInfoEmitter.cpp vendor/llvm/dist/utils/TableGen/RegisterInfoEmitter.h vendor/llvm/dist/utils/TableGen/SubtargetEmitter.cpp vendor/llvm/dist/utils/TableGen/SubtargetEmitter.h vendor/llvm/dist/utils/TableGen/TGLexer.cpp vendor/llvm/dist/utils/TableGen/TGParser.cpp vendor/llvm/dist/utils/TableGen/TGValueTypes.cpp vendor/llvm/dist/utils/TableGen/TableGen.cpp vendor/llvm/dist/utils/TableGen/TableGenBackend.cpp vendor/llvm/dist/utils/TableGen/TableGenBackend.h Modified: vendor/llvm/dist/Makefile.config.in ============================================================================== --- vendor/llvm/dist/Makefile.config.in Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/Makefile.config.in Sat Jul 4 13:58:26 2009 (r195340) @@ -223,7 +223,7 @@ RDYNAMIC := @RDYNAMIC@ #ENABLE_PROFILING = 1 @ENABLE_PROFILING@ -# When DISABLE_ASSERTIONS is enabled, builds of all of the LLVM code will +# When DISABLE_ASSERTIONS is enabled, builds of all of the LLVM code will # exclude assertion checks, otherwise they are included. #DISABLE_ASSERTIONS = 1 @DISABLE_ASSERTIONS@ @@ -297,3 +297,14 @@ endif # Location of the plugin header file for gold. BINUTILS_INCDIR := @BINUTILS_INCDIR@ + +# When ENABLE_LLVMC_DYNAMIC is enabled, LLVMC will link libCompilerDriver +# dynamically. This is needed to make dynamic plugins work on some targets +# (Windows). +ENABLE_LLVMC_DYNAMIC = 0 +#@ENABLE_LLVMC_DYNAMIC@ + +# When ENABLE_LLVMC_DYNAMIC_PLUGINS is enabled, LLVMC will have dynamic plugin +# support (via the -load option). +ENABLE_LLVMC_DYNAMIC_PLUGINS = 1 +#@ENABLE_LLVMC_DYNAMIC_PLUGINS@ Modified: vendor/llvm/dist/Makefile.rules ============================================================================== --- vendor/llvm/dist/Makefile.rules Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/Makefile.rules Sat Jul 4 13:58:26 2009 (r195340) @@ -201,15 +201,19 @@ LIBRARYNAME := $(patsubst %,plugin_llvmc CPP.Flags += -DLLVMC_PLUGIN_NAME=$(LLVMC_PLUGIN) REQUIRES_EH := 1 +ifeq ($(ENABLE_LLVMC_DYNAMIC),1) + LD.Flags += -lCompilerDriver +endif + # Build a dynamic library if the user runs `make` directly from the plugin # directory. ifndef LLVMC_BUILTIN_PLUGIN -LOADABLE_MODULE = 1 + LOADABLE_MODULE = 1 endif # TableGen stuff... ifneq ($(BUILT_SOURCES),) -LLVMC_BUILD_AUTOGENERATED_INC=1 + LLVMC_BUILD_AUTOGENERATED_INC=1 endif endif # LLVMC_PLUGIN @@ -217,10 +221,16 @@ endif # LLVMC_PLUGIN ifdef LLVMC_BASED_DRIVER TOOLNAME = $(LLVMC_BASED_DRIVER) -LLVMLIBS = CompilerDriver.a -LINK_COMPONENTS = support system + REQUIRES_EH := 1 +ifeq ($(ENABLE_LLVMC_DYNAMIC),1) + LD.Flags += -lCompilerDriver +else + LLVMLIBS = CompilerDriver.a + LINK_COMPONENTS = support system +endif + # Preprocessor magic that generates references to static variables in built-in # plugins. ifneq ($(LLVMC_BUILTIN_PLUGINS),) @@ -502,8 +512,7 @@ ifeq ($(OS),Darwin) else ifeq ($(OS),Cygwin) SharedLinkOptions=-shared -nostdlib -Wl,--export-all-symbols \ - -Wl,--enable-auto-import -Wl,--enable-auto-image-base \ - -Wl,--enable-runtime-pseudo-relocs + -Wl,--enable-auto-import -Wl,--enable-auto-image-base else SharedLinkOptions=-shared endif Modified: vendor/llvm/dist/autoconf/configure.ac ============================================================================== --- vendor/llvm/dist/autoconf/configure.ac Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/autoconf/configure.ac Sat Jul 4 13:58:26 2009 (r195340) @@ -240,7 +240,7 @@ case "$llvm_cv_target_arch" in x86_64) LLVM_NATIVE_ARCH="X86" ;; *) LLVM_NATIVE_ARCH="$llvm_cv_target_arch" ;; esac - + dnl Define a substitution, ARCH, for the target architecture AC_SUBST(ARCH,$llvm_cv_target_arch) @@ -453,7 +453,7 @@ for a_target in $TARGETS_TO_BUILD; do fi done -# Build the LLVM_TARGET and LLVM_ASM_PRINTER macro uses for +# Build the LLVM_TARGET and LLVM_ASM_PRINTER macro uses for # Targets.def and AsmPrinters.def. LLVM_ENUM_TARGETS="" LLVM_ENUM_ASM_PRINTERS="" @@ -593,6 +593,35 @@ case "$enableval" in *) AC_MSG_ERROR([Invalid setting for --enable-libffi. Use "yes" or "no"]) ;; esac +dnl Only Windows needs dynamic libCompilerDriver to support plugins. +if test "$llvm_cv_os_type" = "Win32" ; then + llvmc_dynamic="yes" +else + llvmc_dynamic="no" +fi + +dnl --enable-llvmc-dynamic : should LLVMC link libCompilerDriver dynamically? +AC_ARG_ENABLE(llvmc-dynamic,AS_HELP_STRING( +--enable-llvmc-dynamic, +[Link LLVMC dynamically (default is NO, unless on Win32)]),, +enableval=$llvmc_dynamic) +if test ${enableval} = "yes" && test "$ENABLE_PIC" -eq 1 ; then + AC_SUBST(ENABLE_LLVMC_DYNAMIC,[[ENABLE_LLVMC_DYNAMIC=1]]) +else + AC_SUBST(ENABLE_LLVMC_DYNAMIC,[[]]) +fi + +dnl --enable-llvmc-dynamic-plugins : should LLVMC support dynamic plugins? +AC_ARG_ENABLE(llvmc-dynamic-plugins,AS_HELP_STRING( +--enable-llvmc-dynamic-plugins, +[Enable dynamic LLVMC plugins (default is YES)]),, +enableval=yes) +if test ${enableval} = "yes" ; then + AC_SUBST(ENABLE_LLVMC_DYNAMIC_PLUGINS,[[ENABLE_LLVMC_DYNAMIC_PLUGINS=1]]) +else + AC_SUBST(ENABLE_LLVMC_DYNAMIC_PLUGINS,[[]]) +fi + dnl===-----------------------------------------------------------------------=== dnl=== dnl=== SECTION 4: Check for programs we need and that they are the right version @@ -914,7 +943,8 @@ AC_CHECK_FUNCS([backtrace ceilf floorf r AC_CHECK_FUNCS([powf fmodf strtof round ]) AC_CHECK_FUNCS([getpagesize getrusage getrlimit setrlimit gettimeofday ]) AC_CHECK_FUNCS([isatty mkdtemp mkstemp ]) -AC_CHECK_FUNCS([mktemp realpath sbrk setrlimit strdup strerror strerror_r ]) +AC_CHECK_FUNCS([mktemp realpath sbrk setrlimit strdup ]) +AC_CHECK_FUNCS([strerror strerror_r strerror_s ]) AC_CHECK_FUNCS([strtoll strtoq sysconf malloc_zone_statistics ]) AC_CHECK_FUNCS([setjmp longjmp sigsetjmp siglongjmp]) AC_C_PRINTF_A @@ -951,7 +981,7 @@ dnl atomic builtins are required for thr AC_MSG_CHECKING(for GCC atomic builtins) AC_LINK_IFELSE( AC_LANG_SOURCE( - [[int main() { + [[int main() { volatile unsigned long val = 1; __sync_synchronize(); __sync_val_compare_and_swap(&val, 1, 0); Modified: vendor/llvm/dist/cmake/config-ix.cmake ============================================================================== --- vendor/llvm/dist/cmake/config-ix.cmake Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/cmake/config-ix.cmake Sat Jul 4 13:58:26 2009 (r195340) @@ -44,6 +44,8 @@ check_include_file(windows.h HAVE_WINDOW # library checks include(CheckLibraryExists) check_library_exists(pthread pthread_create "" HAVE_LIBPTHREAD) +check_library_exists(pthread pthread_getspecific "" HAVE_PTHREAD_GETSPECIFIC) +check_library_exists(pthread pthread_rwlock_init "" HAVE_PTHREAD_RWLOCK_INIT) check_library_exists(dl dlopen "" HAVE_LIBDL) # function checks @@ -64,9 +66,10 @@ check_symbol_exists(mallinfo malloc.h HA check_symbol_exists(malloc_zone_statistics malloc/malloc.h HAVE_MALLOC_ZONE_STATISTICS) check_symbol_exists(pthread_mutex_lock pthread.h HAVE_PTHREAD_MUTEX_LOCK) -check_symbol_exists(pthread_rwlock_init pthread.h HAVE_PTHREAD_RWLOCK_INIT) -check_symbol_exists(pthread_getspecific pthread.h HAVE_PTHREAD_GETSPECIFIC) check_symbol_exists(strtoll stdlib.h HAVE_STRTOLL) +check_symbol_exists(strerror string.h HAVE_STRERROR) +check_symbol_exists(strerror_r string.h HAVE_STRERROR_R) +check_symbol_exists(strerror_s string.h HAVE_STRERROR_S) check_symbol_exists(__GLIBC__ stdio.h LLVM_USING_GLIBC) if( LLVM_USING_GLIBC ) Modified: vendor/llvm/dist/configure ============================================================================== --- vendor/llvm/dist/configure Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/configure Sat Jul 4 13:58:26 2009 (r195340) @@ -31356,9 +31356,119 @@ done +for ac_func in mktemp realpath sbrk setrlimit strdup +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + -for ac_func in mktemp realpath sbrk setrlimit strdup strerror strerror_r +for ac_func in strerror strerror_r strerror_s do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 Modified: vendor/llvm/dist/docs/CodingStandards.html ============================================================================== --- vendor/llvm/dist/docs/CodingStandards.html Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/docs/CodingStandards.html Sat Jul 4 13:58:26 2009 (r195340) @@ -50,6 +50,8 @@
  • Do not use 'using namespace std'
  • Provide a virtual method anchor for classes in headers
    • +
  • Don't evaluate end() every time through a + loop
  • Prefer Preincrement
  • Avoid std::endl
    • @@ -661,6 +663,67 @@ increasing link times.

    + +
    + Don't evaluate end() every time through a loop +
    + +
    + +

    Because C++ doesn't have a standard "foreach" loop (though it can be emulated +with macros and may be coming in C++'0x) we end up writing a lot of loops that +manually iterate from begin to end on a variety of containers or through other +data structures. One common mistake is to write a loop in this style:

    + +
    +
    +  BasicBlock *BB = ...
+  for (BasicBlock::iterator I = BB->begin(); I != BB->end(); ++I)
+     ... use I ...
+
    +
    + +

    The problem with this construct is that it evaluates "BB->end()" +every time through the loop. Instead of writing the loop like this, we strongly +prefer loops to be written so that they evaluate it once before the loop starts. +A convenient way to do this is like so:

    + +
    +
    +  BasicBlock *BB = ...
+  for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I)
+     ... use I ...
+
    +
    + +

    The observant may quickly point out that these two loops may have different +semantics: if the container (a basic block in this case) is being mutated, then +"BB->end()" may change its value every time through the loop and the +second loop may not in fact be correct. If you actually do depend on this +behavior, please write the loop in the first form and add a comment indicating +that you did it intentionally.

    + +

    Why do we prefer the second form (when correct)? Writing the loop in the +first form has two problems: First it may be less efficient than evaluating it +at the start of the loop. In this case, the cost is probably minor: a few extra +loads every time through the loop. However, if the base expression is more +complex, then the cost can rise quickly. I've seen loops where the end +expression was actually something like: "SomeMap[x]->end()" and map +lookups really aren't cheap. By writing it in the second form consistently, you +eliminate the issue entirely and don't even have to think about it.

    + +

    The second (even bigger) issue is that writing the loop in the first form +hints to the reader that the loop is mutating the container (a fact that a +comment would handily confirm!). If you write the loop in the second form, it +is immediately obvious without even looking at the body of the loop that the +container isn't being modified, which makes it easier to read the code and +understand what it does.

    + +

    While the second form of the loop is a few extra keystrokes, we do strongly +prefer it.

    + +
    +
    @@ -744,7 +807,7 @@ something.

    Chris Lattner
    LLVM Compiler Infrastructure
    - Last modified: $Date: 2009-03-23 05:53:34 +0100 (Mon, 23 Mar 2009) $ + Last modified: $Date: 2009-06-30 08:27:54 +0200 (Tue, 30 Jun 2009) $ Modified: vendor/llvm/dist/docs/CompilerDriver.html ============================================================================== --- vendor/llvm/dist/docs/CompilerDriver.html Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/docs/CompilerDriver.html Sat Jul 4 13:58:26 2009 (r195340) @@ -37,6 +37,7 @@ The ReST source lives in the directory '
  • Hooks and environment variables
  • How plugins are loaded
  • Debugging
    • +
  • Conditioning on the executable name
    • @@ -94,9 +95,8 @@ $ llvmc --linker=c++ hello.o $ ./a.out hello -

    By default, LLVMC uses llvm-gcc to compile the source code. It is -also possible to choose the work-in-progress clang compiler with -the -clang option.

    +

    By default, LLVMC uses llvm-gcc to compile the source code. It is also +possible to choose the clang compiler with the -clang option.

    Predefined options

    @@ -633,6 +633,27 @@ be performed at compile-time because the dynamically. When invoked with --check-graph, llvmc doesn't perform any compilation tasks and returns the number of encountered errors as its status code.

    +
    +
    +

    Conditioning on the executable name

    +

    For now, the executable name (the value passed to the driver in argv[0]) is +accessible only in the C++ code (i.e. hooks). Use the following code:

    +
    +namespace llvmc {
+extern const char* ProgramName;
+}
+
+std::string MyHook() {
+//...
+if (strcmp(ProgramName, "mydriver") == 0) {
+   //...
+
+}
+
    +

    In general, you're encouraged not to make the behaviour dependent on the +executable file name, and use command-line switches instead. See for example how +the Base plugin behaves when it needs to choose the correct linker options +(think g++ vs. gcc).

    @@ -645,7 +666,7 @@ errors as its status code.

    Mikhail Glushenkov
    LLVM Compiler Infrastructure
    -Last modified: $Date: 2009-06-25 20:21:10 +0200 (Thu, 25 Jun 2009) $ +Last modified: $Date: 2009-06-30 02:16:43 +0200 (Tue, 30 Jun 2009) $
    Modified: vendor/llvm/dist/docs/FAQ.html ============================================================================== --- vendor/llvm/dist/docs/FAQ.html Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/docs/FAQ.html Sat Jul 4 13:58:26 2009 (r195340) @@ -124,6 +124,10 @@
  • What is this "undef" thing that shows up in my code?
    • + +
  • Why does instcombine + simplifycfg turn + a call to a function with a mismatched calling convention into "unreachable"? + Why not make the verifier reject it?
    • @@ -780,6 +784,143 @@ int X() { int i; return i; } value specified for it.

    + + +
    +

    Why does instcombine + simplifycfg turn + a call to a function with a mismatched calling convention into "unreachable"? + Why not make the verifier reject it?

    +
    + +
    +

    This is a common problem run into by authors of front-ends that are using +custom calling conventions: you need to make sure to set the right calling +convention on both the function and on each call to the function. For example, +this code:

    + +
    +define fastcc void @foo() {
+        ret void
+}
+define void @bar() {
+        call void @foo( )
+        ret void
+}
+
    + +

    Is optimized to:

    + +
    +define fastcc void @foo() {
+	ret void
+}
+define void @bar() {
+	unreachable
+}
+
    + +

    ... with "opt -instcombine -simplifycfg". This often bites people because +"all their code disappears". Setting the calling convention on the caller and +callee is required for indirect calls to work, so people often ask why not make +the verifier reject this sort of thing.

    + +

    The answer is that this code has undefined behavior, but it is not illegal. +If we made it illegal, then every transformation that could potentially create +this would have to ensure that it doesn't, and there is valid code that can +create this sort of construct (in dead code). The sorts of things that can +cause this to happen are fairly contrived, but we still need to accept them. +Here's an example:

    + +
    +define fastcc void @foo() {
+        ret void
+}
+define internal void @bar(void()* %FP, i1 %cond) {
+        br i1 %cond, label %T, label %F
+T:  
+        call void %FP()
+        ret void
+F:
+        call fastcc void %FP()
+        ret void
+}
+define void @test() {
+        %X = or i1 false, false
+        call void @bar(void()* @foo, i1 %X)
+        ret void
+} 
+
    + +

    In this example, "test" always passes @foo/false into bar, which ensures that + it is dynamically called with the right calling conv (thus, the code is + perfectly well defined). If you run this through the inliner, you get this + (the explicit "or" is there so that the inliner doesn't dead code eliminate + a bunch of stuff): +

    + +
    +define fastcc void @foo() {
+	ret void
+}
+define void @test() {
+	%X = or i1 false, false
+	br i1 %X, label %T.i, label %F.i
+T.i:
+	call void @foo()
+	br label %bar.exit
+F.i:
+	call fastcc void @foo()
+	br label %bar.exit
+bar.exit:
+	ret void
+}
+
    + +

    Here you can see that the inlining pass made an undefined call to @foo with + the wrong calling convention. We really don't want to make the inliner have + to know about this sort of thing, so it needs to be valid code. In this case, + dead code elimination can trivially remove the undefined code. However, if %X + was an input argument to @test, the inliner would produce this: +

    + +
    +define fastcc void @foo() {
+	ret void
+}
+
+define void @test(i1 %X) {
+	br i1 %X, label %T.i, label %F.i
+T.i:
+	call void @foo()
+	br label %bar.exit
+F.i:
+	call fastcc void @foo()
+	br label %bar.exit
+bar.exit:
+	ret void
+}
+
    + +

    The interesting thing about this is that %X must be false for the +code to be well-defined, but no amount of dead code elimination will be able to +delete the broken call as unreachable. However, since instcombine/simplifycfg +turns the undefined call into unreachable, we end up with a branch on a +condition that goes to unreachable: a branch to unreachable can never happen, so +"-inline -instcombine -simplifycfg" is able to produce:

    + +
    +define fastcc void @foo() {
+	ret void
+}
+define void @test(i1 %X) {
+F.i:
+	call fastcc void @foo()
+	ret void
+}
+
    + +
    +
    @@ -790,7 +931,7 @@ int X() { int i; return i; } src="http://www.w3.org/Icons/valid-html401-blue" alt="Valid HTML 4.01"> LLVM Compiler Infrastructure
    - Last modified: $Date: 2009-04-10 22:48:27 +0200 (Fri, 10 Apr 2009) $ + Last modified: $Date: 2009-06-30 19:10:19 +0200 (Tue, 30 Jun 2009) $ Modified: vendor/llvm/dist/docs/ReleaseNotes-2.6.html ============================================================================== --- vendor/llvm/dist/docs/ReleaseNotes-2.6.html Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/docs/ReleaseNotes-2.6.html Sat Jul 4 13:58:26 2009 (r195340) @@ -419,7 +419,7 @@ it run faster:

    If you're already an LLVM user or developer with out-of-tree changes based -on LLVM 2.4, this section lists some "gotchas" that you may run into upgrading +on LLVM 2.5, this section lists some "gotchas" that you may run into upgrading from the previous release.

      @@ -433,6 +433,13 @@ from the previous release.

      API changes are:

        +
      • LLVM's global uniquing tables for Types and Constants have + been privatized into members of an LLVMContext. A number of APIs + now take an LLVMContext as a parameter. To smooth the transition + for clients that will only ever use a single context, the new + getGlobalContext() API can be used to access a default global + context which can be passed in any and all cases where a context is + required.
      • The getABITypeSize methods are now called getAllocSize.
      @@ -770,7 +777,7 @@ lists.

      src="http://www.w3.org/Icons/valid-html401-blue" alt="Valid HTML 4.01"> LLVM Compiler Infrastructure
      - Last modified: $Date: 2009-06-24 23:26:42 +0200 (Wed, 24 Jun 2009) $ + Last modified: $Date: 2009-07-02 18:48:38 +0200 (Thu, 02 Jul 2009) $ Modified: vendor/llvm/dist/docs/TableGenFundamentals.html ============================================================================== --- vendor/llvm/dist/docs/TableGenFundamentals.html Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/docs/TableGenFundamentals.html Sat Jul 4 13:58:26 2009 (r195340) @@ -411,7 +411,8 @@ which case the user must specify it expl
      !cast(a)
      A symbol of type type obtained by looking up the string 'a' in the symbol table. If the type of 'a' does not match type, TableGen -aborts with an error.
      +aborts with an error. !cast is a special case in that the argument must +be an object defined by a 'def' construct.
      !nameconcat<type>(a, b)
      Shorthand for !cast(!strconcat(a, b))
      !subst(a, b, c)
      @@ -781,7 +782,7 @@ This should highlight the APIs in Ta Chris Lattner
      LLVM Compiler Infrastructure
      - Last modified: $Date: 2009-06-09 20:31:17 +0200 (Tue, 09 Jun 2009) $ + Last modified: $Date: 2009-06-29 22:05:29 +0200 (Mon, 29 Jun 2009) $ Modified: vendor/llvm/dist/docs/WritingAnLLVMPass.html ============================================================================== --- vendor/llvm/dist/docs/WritingAnLLVMPass.html Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/docs/WritingAnLLVMPass.html Sat Jul 4 13:58:26 2009 (r195340) @@ -491,10 +491,15 @@ class is the most general of all supercl ModulePass indicates that your pass uses the entire program as a unit, refering to function bodies in no predictable order, or adding and removing functions. Because nothing is known about the behavior of ModulePass -subclasses, no optimization can be done for their execution. A module pass -can use function level passes (e.g. dominators) using getAnalysis interface - getAnalysis<DominatorTree>(Function), if the function pass -does not require any module passes.

      +subclasses, no optimization can be done for their execution.

      + +

      A module pass can use function level passes (e.g. dominators) using +the getAnalysis interface +getAnalysis<DominatorTree>(llvm::Function *) to provide the +function to retrieve analysis result for, if the function pass does not require +any module passes. Note that this can only be done for functions for which the +analysis ran, e.g. in the case of dominators you should only ask for the +DominatorTree for function definitions, not declarations.

      To write a correct ModulePass subclass, derive from ModulePass and overload the runOnModule method with the @@ -1821,7 +1826,7 @@ Despite that, we have kept the LLVM pass Chris Lattner
      The LLVM Compiler Infrastructure
      - Last modified: $Date: 2009-06-15 18:22:49 +0000 (Mon, 15 Jun 2009) $ + Last modified: $Date: 2009-07-02 01:38:44 +0200 (Thu, 02 Jul 2009) $ Modified: vendor/llvm/dist/examples/BrainF/BrainF.cpp ============================================================================== --- vendor/llvm/dist/examples/BrainF/BrainF.cpp Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/examples/BrainF/BrainF.cpp Sat Jul 4 13:58:26 2009 (r195340) @@ -36,19 +36,20 @@ const char *BrainF::headreg = "head"; const char *BrainF::label = "brainf"; const char *BrainF::testreg = "test"; -Module *BrainF::parse(std::istream *in1, int mem, CompileFlags cf) { +Module *BrainF::parse(std::istream *in1, int mem, CompileFlags cf, + LLVMContext& Context) { in = in1; memtotal = mem; comflag = cf; - header(); + header(Context); readloop(0, 0, 0); delete builder; return module; } -void BrainF::header() { - module = new Module("BrainF"); +void BrainF::header(LLVMContext& C) { + module = new Module("BrainF", C); //Function prototypes Modified: vendor/llvm/dist/examples/BrainF/BrainF.h ============================================================================== --- vendor/llvm/dist/examples/BrainF/BrainF.h Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/examples/BrainF/BrainF.h Sat Jul 4 13:58:26 2009 (r195340) @@ -15,6 +15,7 @@ #ifndef BRAINF_H #define BRAINF_H +#include "llvm/LLVMContext.h" #include "llvm/Module.h" #include "llvm/Support/IRBuilder.h" @@ -38,7 +39,8 @@ class BrainF { /// containing the resulting code. /// On error, it calls abort. /// The caller must delete the returned module. - Module *parse(std::istream *in1, int mem, CompileFlags cf); + Module *parse(std::istream *in1, int mem, CompileFlags cf, + LLVMContext& C); protected: /// The different symbols in the BrainF language @@ -64,7 +66,7 @@ class BrainF { static const char *testreg; /// Put the brainf function preamble and other fixed pieces of code - void header(); + void header(LLVMContext& C); /// The main loop for parsing. It calls itself recursively /// to handle the depth of nesting of "[]". Modified: vendor/llvm/dist/examples/BrainF/BrainFDriver.cpp ============================================================================== --- vendor/llvm/dist/examples/BrainF/BrainFDriver.cpp Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/examples/BrainF/BrainFDriver.cpp Sat Jul 4 13:58:26 2009 (r195340) @@ -86,6 +86,8 @@ void addMainFunction(Module *mod) { int main(int argc, char **argv) { cl::ParseCommandLineOptions(argc, argv, " BrainF compiler\n"); + LLVMContext Context; + if (InputFilename == "") { std::cerr<<"Error: You must specify the filename of the program to " "be compiled. Use --help to see the options.\n"; @@ -124,7 +126,7 @@ int main(int argc, char **argv) { //Read the BrainF program BrainF bf; - Module *mod = bf.parse(in, 65536, cf); //64 KiB + Module *mod = bf.parse(in, 65536, cf, Context); //64 KiB if (in != &std::cin) {delete in;} addMainFunction(mod); Modified: vendor/llvm/dist/examples/Fibonacci/fibonacci.cpp ============================================================================== --- vendor/llvm/dist/examples/Fibonacci/fibonacci.cpp Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/examples/Fibonacci/fibonacci.cpp Sat Jul 4 13:58:26 2009 (r195340) @@ -23,6 +23,7 @@ // //===----------------------------------------------------------------------===// +#include "llvm/LLVMContext.h" #include "llvm/Module.h" #include "llvm/DerivedTypes.h" #include "llvm/Constants.h" @@ -90,8 +91,10 @@ static Function *CreateFibFunction(Modul int main(int argc, char **argv) { int n = argc > 1 ? atol(argv[1]) : 24; + LLVMContext Context; + // Create some module to put our function into it. - Module *M = new Module("test"); + Module *M = new Module("test", Context); // We are about to create the "fib" function: Function *FibF = CreateFibFunction(M); Modified: vendor/llvm/dist/examples/HowToUseJIT/HowToUseJIT.cpp ============================================================================== --- vendor/llvm/dist/examples/HowToUseJIT/HowToUseJIT.cpp Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/examples/HowToUseJIT/HowToUseJIT.cpp Sat Jul 4 13:58:26 2009 (r195340) @@ -34,6 +34,7 @@ // //===----------------------------------------------------------------------===// +#include "llvm/LLVMContext.h" #include "llvm/Module.h" #include "llvm/Constants.h" #include "llvm/DerivedTypes.h" @@ -50,9 +51,11 @@ using namespace llvm; int main() { InitializeNativeTarget(); + + LLVMContext Context; // Create some module to put our function into it. - Module *M = new Module("test"); + Module *M = new Module("test", Context); // Create the add1 function entry and insert this entry into module M. The // function will have a return type of "int" and take an argument of "int". Modified: vendor/llvm/dist/examples/Kaleidoscope/toy.cpp ============================================================================== --- vendor/llvm/dist/examples/Kaleidoscope/toy.cpp Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/examples/Kaleidoscope/toy.cpp Sat Jul 4 13:58:26 2009 (r195340) @@ -1,5 +1,6 @@ #include "llvm/DerivedTypes.h" #include "llvm/ExecutionEngine/ExecutionEngine.h" +#include "llvm/LLVMContext.h" #include "llvm/Module.h" #include "llvm/ModuleProvider.h" #include "llvm/PassManager.h" @@ -1083,6 +1084,7 @@ double printd(double X) { int main() { InitializeNativeTarget(); + LLVMContext Context; // Install standard binary operators. // 1 is lowest precedence. @@ -1097,7 +1099,7 @@ int main() { getNextToken(); // Make the module, which holds all the code. - TheModule = new Module("my cool jit"); + TheModule = new Module("my cool jit", Context); // Create the JIT. TheExecutionEngine = ExecutionEngine::create(TheModule); Modified: vendor/llvm/dist/examples/ModuleMaker/ModuleMaker.cpp ============================================================================== --- vendor/llvm/dist/examples/ModuleMaker/ModuleMaker.cpp Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/examples/ModuleMaker/ModuleMaker.cpp Sat Jul 4 13:58:26 2009 (r195340) @@ -13,6 +13,7 @@ // //===----------------------------------------------------------------------===// +#include "llvm/LLVMContext.h" #include "llvm/Module.h" #include "llvm/DerivedTypes.h" #include "llvm/Constants.h" @@ -22,13 +23,14 @@ using namespace llvm; int main() { + LLVMContext Context; + // Create the "module" or "program" or "translation unit" to hold the // function - Module *M = new Module("test"); + Module *M = new Module("test", Context); // Create the main function: first create the type 'int ()' - FunctionType *FT = FunctionType::get(Type::Int32Ty, std::vector(), - /*not vararg*/false); + FunctionType *FT = FunctionType::get(Type::Int32Ty, /*not vararg*/false); // By passing a module as the last parameter to the Function constructor, // it automatically gets appended to the Module. Modified: vendor/llvm/dist/examples/ParallelJIT/ParallelJIT.cpp ============================================================================== --- vendor/llvm/dist/examples/ParallelJIT/ParallelJIT.cpp Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/examples/ParallelJIT/ParallelJIT.cpp Sat Jul 4 13:58:26 2009 (r195340) @@ -18,6 +18,7 @@ // same time). This test had assertion errors until I got the locking right. #include +#include "llvm/LLVMContext.h" #include "llvm/Module.h" #include "llvm/Constants.h" #include "llvm/DerivedTypes.h" @@ -232,9 +233,10 @@ void* callFunc( void* param ) int main() { InitializeNativeTarget(); + LLVMContext Context; // Create some module to put our function into it. - Module *M = new Module("test"); + Module *M = new Module("test", Context); Function* add1F = createAdd1( M ); Function* fibF = CreateFibFunction( M ); Modified: vendor/llvm/dist/include/llvm-c/BitReader.h ============================================================================== --- vendor/llvm/dist/include/llvm-c/BitReader.h Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/include/llvm-c/BitReader.h Sat Jul 4 13:58:26 2009 (r195340) @@ -32,6 +32,10 @@ extern "C" { int LLVMParseBitcode(LLVMMemoryBufferRef MemBuf, LLVMModuleRef *OutModule, char **OutMessage); +int LLVMParseBitcodeInContext(LLVMMemoryBufferRef MemBuf, + LLVMContextRef ContextRef, + LLVMModuleRef *OutModule, char **OutMessage); + /* Reads a module from the specified path, returning via the OutMP parameter a module provider which performs lazy deserialization. Returns 0 on success. Optionally returns a human-readable error message via OutMessage. */ @@ -39,6 +43,11 @@ int LLVMGetBitcodeModuleProvider(LLVMMem LLVMModuleProviderRef *OutMP, char **OutMessage); +int LLVMGetBitcodeModuleProviderInContext(LLVMMemoryBufferRef MemBuf, + LLVMContextRef ContextRef, + LLVMModuleProviderRef *OutMP, + char **OutMessage); + #ifdef __cplusplus } Modified: vendor/llvm/dist/include/llvm-c/Core.h ============================================================================== --- vendor/llvm/dist/include/llvm-c/Core.h Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/include/llvm-c/Core.h Sat Jul 4 13:58:26 2009 (r195340) @@ -47,6 +47,11 @@ extern "C" { /* Opaque types. */ /** + * The top-level container for all LLVM global data. See the LLVMContext class. + */ +typedef struct LLVMCtxt *LLVMContextRef; + +/** * The top-level container for all other LLVM Intermediate Representation (IR) * objects. See the llvm::Module class. */ @@ -188,9 +193,16 @@ void LLVMDisposeMessage(char *Message); /*===-- Modules -----------------------------------------------------------===*/ +/* Create and destroy contexts. */ +LLVMContextRef LLVMContextCreate(); +LLVMContextRef LLVMGetGlobalContext(); +void LLVMContextDispose(LLVMContextRef C); + /* Create and destroy modules. */ /** See llvm::Module::Module. */ LLVMModuleRef LLVMModuleCreateWithName(const char *ModuleID); +LLVMModuleRef LLVMModuleCreateWithNameInContext(const char *ModuleID, + LLVMContextRef C); /** See llvm::Module::~Module. */ void LLVMDisposeModule(LLVMModuleRef M); @@ -815,6 +827,7 @@ namespace llvm { DEFINE_SIMPLE_CONVERSION_FUNCTIONS(PATypeHolder, LLVMTypeHandleRef ) DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ModuleProvider, LLVMModuleProviderRef) DEFINE_SIMPLE_CONVERSION_FUNCTIONS(MemoryBuffer, LLVMMemoryBufferRef ) + DEFINE_SIMPLE_CONVERSION_FUNCTIONS(LLVMContext, LLVMContextRef ) DEFINE_STDCXX_CONVERSION_FUNCTIONS(PassManagerBase, LLVMPassManagerRef ) #undef DEFINE_STDCXX_CONVERSION_FUNCTIONS Modified: vendor/llvm/dist/include/llvm-c/lto.h ============================================================================== --- vendor/llvm/dist/include/llvm-c/lto.h Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/include/llvm-c/lto.h Sat Jul 4 13:58:26 2009 (r195340) @@ -16,6 +16,7 @@ #ifndef LTO_H #define LTO_H 1 +#include "llvm-c/Core.h" #include #include @@ -58,7 +59,6 @@ typedef struct LTOModule* lto_mo /** opaque reference to a code generator */ typedef struct LTOCodeGenerator* lto_code_gen_t; - #ifdef __cplusplus extern "C" { #endif @@ -76,7 +76,6 @@ lto_get_version(void); extern const char* lto_get_error_message(void); - /** * Checks if a file is a loadable object file. */ Modified: vendor/llvm/dist/include/llvm/ADT/APInt.h ============================================================================== --- vendor/llvm/dist/include/llvm/ADT/APInt.h Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/include/llvm/ADT/APInt.h Sat Jul 4 13:58:26 2009 (r195340) @@ -1426,6 +1426,8 @@ inline raw_ostream &operator<<(raw_ostre return OS; } +std::ostream &operator<<(std::ostream &o, const APInt &I); + namespace APIntOps { /// @brief Determine the smaller of two APInts considered to be signed. Modified: vendor/llvm/dist/include/llvm/ADT/FoldingSet.h ============================================================================== --- vendor/llvm/dist/include/llvm/ADT/FoldingSet.h Sat Jul 4 11:11:21 2009 (r195339) +++ vendor/llvm/dist/include/llvm/ADT/FoldingSet.h Sat Jul 4 13:58:26 2009 (r195340) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From ed at FreeBSD.org Sat Jul 4 13:58:55 2009 From: ed at FreeBSD.org (Ed Schouten) Date: Sat Jul 4 13:59:03 2009 Subject: svn commit: r195341 - in vendor/clang/dist: include/clang/AST include/clang/Analysis/PathSensitive include/clang/Basic include/clang/CodeGen include/clang/Driver include/clang/Frontend include/clan... Message-ID: <200907041358.n64DwsCL014431@svn.freebsd.org> Author: ed Date: Sat Jul 4 13:58:54 2009 New Revision: 195341 URL: http://svn.freebsd.org/changeset/base/195341 Log: Import Clang r74788. Added: vendor/clang/dist/test/Analysis/concrete-address.c vendor/clang/dist/test/CXX/temp/temp.fct.spec/temp.arg.explicit/p1.cpp vendor/clang/dist/test/CXX/temp/temp.fct.spec/temp.arg.explicit/p3.cpp vendor/clang/dist/test/CXX/temp/temp.fct.spec/temp.deduct/sfinae-1.cpp vendor/clang/dist/test/CodeGen/stack-protector.c vendor/clang/dist/test/CodeGenCXX/function-template-specialization.cpp vendor/clang/dist/test/Driver/openbsd.c vendor/clang/dist/test/Index/comments.c vendor/clang/dist/test/PCH/pr4489.c vendor/clang/dist/test/Parser/offsetof.c vendor/clang/dist/test/Sema/format-attr-pr4470.c vendor/clang/dist/test/SemaCXX/class-base-member-init.cpp vendor/clang/dist/test/SemaCXX/decltype-overloaded-functions.cpp vendor/clang/dist/test/SemaTemplate/class-template-ctor-initializer.cpp vendor/clang/dist/test/SemaTemplate/recursive-template-instantiation.cpp Modified: vendor/clang/dist/include/clang/AST/ASTContext.h vendor/clang/dist/include/clang/AST/CFG.h vendor/clang/dist/include/clang/AST/Decl.h vendor/clang/dist/include/clang/AST/DeclBase.h vendor/clang/dist/include/clang/AST/DeclCXX.h vendor/clang/dist/include/clang/AST/DeclObjC.h vendor/clang/dist/include/clang/AST/DeclTemplate.h vendor/clang/dist/include/clang/AST/Expr.h vendor/clang/dist/include/clang/AST/ExprCXX.h vendor/clang/dist/include/clang/AST/ExternalASTSource.h vendor/clang/dist/include/clang/AST/NestedNameSpecifier.h vendor/clang/dist/include/clang/AST/PrettyPrinter.h vendor/clang/dist/include/clang/AST/Stmt.h vendor/clang/dist/include/clang/AST/StmtNodes.def vendor/clang/dist/include/clang/AST/Type.h vendor/clang/dist/include/clang/Analysis/PathSensitive/MemRegion.h vendor/clang/dist/include/clang/Analysis/PathSensitive/SVals.h vendor/clang/dist/include/clang/Analysis/PathSensitive/ValueManager.h vendor/clang/dist/include/clang/Basic/DiagnosticDriverKinds.td vendor/clang/dist/include/clang/Basic/DiagnosticSemaKinds.td vendor/clang/dist/include/clang/Basic/LangOptions.h vendor/clang/dist/include/clang/Basic/TargetInfo.h vendor/clang/dist/include/clang/Basic/TokenKinds.def vendor/clang/dist/include/clang/CodeGen/ModuleBuilder.h vendor/clang/dist/include/clang/Driver/Action.h vendor/clang/dist/include/clang/Driver/ArgList.h vendor/clang/dist/include/clang/Driver/Compilation.h vendor/clang/dist/include/clang/Driver/Driver.h vendor/clang/dist/include/clang/Driver/HostInfo.h vendor/clang/dist/include/clang/Driver/Job.h vendor/clang/dist/include/clang/Driver/Options.def vendor/clang/dist/include/clang/Frontend/ASTConsumers.h vendor/clang/dist/include/clang/Frontend/PCHBitCodes.h vendor/clang/dist/include/clang/Frontend/PCHReader.h vendor/clang/dist/include/clang/Frontend/PCHWriter.h vendor/clang/dist/include/clang/Lex/Preprocessor.h vendor/clang/dist/include/clang/Parse/Action.h vendor/clang/dist/include/clang/Parse/Ownership.h vendor/clang/dist/include/clang/Parse/Parser.h vendor/clang/dist/lib/AST/ASTContext.cpp vendor/clang/dist/lib/AST/CFG.cpp vendor/clang/dist/lib/AST/Decl.cpp vendor/clang/dist/lib/AST/DeclBase.cpp vendor/clang/dist/lib/AST/DeclCXX.cpp vendor/clang/dist/lib/AST/DeclObjC.cpp vendor/clang/dist/lib/AST/DeclPrinter.cpp vendor/clang/dist/lib/AST/DeclTemplate.cpp vendor/clang/dist/lib/AST/Expr.cpp vendor/clang/dist/lib/AST/ExprCXX.cpp vendor/clang/dist/lib/AST/ExprConstant.cpp vendor/clang/dist/lib/AST/NestedNameSpecifier.cpp vendor/clang/dist/lib/AST/StmtDumper.cpp vendor/clang/dist/lib/AST/StmtPrinter.cpp vendor/clang/dist/lib/AST/TemplateName.cpp vendor/clang/dist/lib/AST/Type.cpp vendor/clang/dist/lib/Analysis/BasicStore.cpp vendor/clang/dist/lib/Analysis/BugReporter.cpp vendor/clang/dist/lib/Analysis/CFRefCount.cpp vendor/clang/dist/lib/Analysis/CheckDeadStores.cpp vendor/clang/dist/lib/Analysis/CheckObjCDealloc.cpp vendor/clang/dist/lib/Analysis/CheckObjCInstMethSignature.cpp vendor/clang/dist/lib/Analysis/CheckObjCUnusedIVars.cpp vendor/clang/dist/lib/Analysis/Environment.cpp vendor/clang/dist/lib/Analysis/GRExprEngine.cpp vendor/clang/dist/lib/Analysis/GRExprEngineInternalChecks.cpp vendor/clang/dist/lib/Analysis/GRState.cpp vendor/clang/dist/lib/Analysis/LiveVariables.cpp vendor/clang/dist/lib/Analysis/MemRegion.cpp vendor/clang/dist/lib/Analysis/RegionStore.cpp vendor/clang/dist/lib/Analysis/SVals.cpp vendor/clang/dist/lib/Analysis/Store.cpp vendor/clang/dist/lib/Basic/IdentifierTable.cpp vendor/clang/dist/lib/Basic/TargetInfo.cpp vendor/clang/dist/lib/Basic/Targets.cpp vendor/clang/dist/lib/CodeGen/CGBuiltin.cpp vendor/clang/dist/lib/CodeGen/CGCXX.cpp vendor/clang/dist/lib/CodeGen/CGCall.cpp vendor/clang/dist/lib/CodeGen/CGDebugInfo.cpp vendor/clang/dist/lib/CodeGen/CGDecl.cpp vendor/clang/dist/lib/CodeGen/CGExpr.cpp vendor/clang/dist/lib/CodeGen/CGExprAgg.cpp vendor/clang/dist/lib/CodeGen/CGExprConstant.cpp vendor/clang/dist/lib/CodeGen/CGObjC.cpp vendor/clang/dist/lib/CodeGen/CGObjCGNU.cpp vendor/clang/dist/lib/CodeGen/CGObjCMac.cpp vendor/clang/dist/lib/CodeGen/CodeGenFunction.cpp vendor/clang/dist/lib/CodeGen/CodeGenModule.cpp vendor/clang/dist/lib/CodeGen/CodeGenModule.h vendor/clang/dist/lib/CodeGen/CodeGenTypes.cpp vendor/clang/dist/lib/CodeGen/Mangle.cpp vendor/clang/dist/lib/CodeGen/ModuleBuilder.cpp vendor/clang/dist/lib/CodeGen/TargetABIInfo.cpp vendor/clang/dist/lib/Driver/ArgList.cpp vendor/clang/dist/lib/Driver/Compilation.cpp vendor/clang/dist/lib/Driver/Driver.cpp vendor/clang/dist/lib/Driver/HostInfo.cpp vendor/clang/dist/lib/Driver/Job.cpp vendor/clang/dist/lib/Driver/ToolChains.cpp vendor/clang/dist/lib/Driver/ToolChains.h vendor/clang/dist/lib/Driver/Tools.cpp vendor/clang/dist/lib/Driver/Tools.h vendor/clang/dist/lib/Frontend/ASTConsumers.cpp vendor/clang/dist/lib/Frontend/AnalysisConsumer.cpp vendor/clang/dist/lib/Frontend/Backend.cpp vendor/clang/dist/lib/Frontend/DeclXML.cpp vendor/clang/dist/lib/Frontend/InitHeaderSearch.cpp vendor/clang/dist/lib/Frontend/InitPreprocessor.cpp vendor/clang/dist/lib/Frontend/PCHReader.cpp vendor/clang/dist/lib/Frontend/PCHReaderDecl.cpp vendor/clang/dist/lib/Frontend/PCHReaderStmt.cpp vendor/clang/dist/lib/Frontend/PCHWriter.cpp vendor/clang/dist/lib/Frontend/PCHWriterDecl.cpp vendor/clang/dist/lib/Frontend/PCHWriterStmt.cpp vendor/clang/dist/lib/Frontend/ResolveLocation.cpp vendor/clang/dist/lib/Frontend/RewriteBlocks.cpp vendor/clang/dist/lib/Frontend/RewriteObjC.cpp vendor/clang/dist/lib/Lex/Lexer.cpp vendor/clang/dist/lib/Lex/Pragma.cpp vendor/clang/dist/lib/Lex/Preprocessor.cpp vendor/clang/dist/lib/Parse/ParseDecl.cpp vendor/clang/dist/lib/Parse/ParseDeclCXX.cpp vendor/clang/dist/lib/Parse/ParseExpr.cpp vendor/clang/dist/lib/Parse/ParseExprCXX.cpp vendor/clang/dist/lib/Parse/Parser.cpp vendor/clang/dist/lib/Rewrite/Rewriter.cpp vendor/clang/dist/lib/Sema/JumpDiagnostics.cpp vendor/clang/dist/lib/Sema/Sema.cpp vendor/clang/dist/lib/Sema/Sema.h vendor/clang/dist/lib/Sema/SemaAttr.cpp vendor/clang/dist/lib/Sema/SemaChecking.cpp vendor/clang/dist/lib/Sema/SemaDecl.cpp vendor/clang/dist/lib/Sema/SemaDeclAttr.cpp vendor/clang/dist/lib/Sema/SemaDeclCXX.cpp vendor/clang/dist/lib/Sema/SemaDeclObjC.cpp vendor/clang/dist/lib/Sema/SemaExpr.cpp vendor/clang/dist/lib/Sema/SemaExprCXX.cpp vendor/clang/dist/lib/Sema/SemaExprObjC.cpp vendor/clang/dist/lib/Sema/SemaInherit.cpp vendor/clang/dist/lib/Sema/SemaInit.cpp vendor/clang/dist/lib/Sema/SemaLookup.cpp vendor/clang/dist/lib/Sema/SemaOverload.cpp vendor/clang/dist/lib/Sema/SemaStmt.cpp vendor/clang/dist/lib/Sema/SemaTemplate.cpp vendor/clang/dist/lib/Sema/SemaTemplateDeduction.cpp vendor/clang/dist/lib/Sema/SemaTemplateInstantiate.cpp vendor/clang/dist/lib/Sema/SemaTemplateInstantiateDecl.cpp vendor/clang/dist/lib/Sema/SemaTemplateInstantiateExpr.cpp vendor/clang/dist/lib/Sema/SemaType.cpp vendor/clang/dist/test/Analysis/array-struct.c vendor/clang/dist/test/Analysis/misc-ps.m vendor/clang/dist/test/Analysis/stack-addr-ps.c vendor/clang/dist/test/Analysis/xfail_regionstore_wine_crash.c vendor/clang/dist/test/CMakeLists.txt vendor/clang/dist/test/CXX/basic/basic.def.odr/p2-typeid.cpp vendor/clang/dist/test/CodeGen/attributes.c vendor/clang/dist/test/CodeGen/unwind-attr.c vendor/clang/dist/test/Sema/compare.c vendor/clang/dist/test/Sema/ext_vector_casts.c vendor/clang/dist/test/SemaCXX/constructor-initializer.cpp vendor/clang/dist/test/SemaCXX/exception-spec.cpp vendor/clang/dist/test/SemaCXX/member-pointer.cpp vendor/clang/dist/test/SemaTemplate/operator-template.cpp vendor/clang/dist/test/cxx-sections.data vendor/clang/dist/tools/clang-cc/clang-cc.cpp vendor/clang/dist/tools/driver/driver.cpp vendor/clang/dist/tools/index-test/index-test.cpp vendor/clang/dist/utils/test/TestRunner.py vendor/clang/dist/www/analyzer/latest_checker.html.incl vendor/clang/dist/www/cxx_status.html Modified: vendor/clang/dist/include/clang/AST/ASTContext.h ============================================================================== --- vendor/clang/dist/include/clang/AST/ASTContext.h Sat Jul 4 13:58:26 2009 (r195340) +++ vendor/clang/dist/include/clang/AST/ASTContext.h Sat Jul 4 13:58:54 2009 (r195341) @@ -141,10 +141,19 @@ class ASTContext { /// this ASTContext object. LangOptions LangOpts; + /// \brief Whether we have already loaded comment source ranges from an + /// external source. + bool LoadedExternalComments; + /// MallocAlloc/BumpAlloc - The allocator objects used to create AST objects. bool FreeMemory; llvm::MallocAllocator MallocAlloc; llvm::BumpPtrAllocator BumpAlloc; + + /// \brief Mapping from declarations to their comments, once we have + /// already looked up the comment associated with a given declaration. + llvm::DenseMap DeclComments; + public: TargetInfo &Target; IdentifierTable &Idents; @@ -154,6 +163,10 @@ public: llvm::OwningPtr ExternalSource; clang::PrintingPolicy PrintingPolicy; + /// \brief Source ranges for all of the comments in the source file, + /// sorted in order of appearance in the translation unit. + std::vector Comments; + SourceManager& getSourceManager() { return SourceMgr; } const SourceManager& getSourceManager() const { return SourceMgr; } void *Allocate(unsigned Size, unsigned Align = 8) { @@ -178,7 +191,8 @@ public: TranslationUnitDecl *getTranslationUnitDecl() const { return TUDecl; } - + const char *getCommentForDecl(const Decl *D); + // Builtin Types. QualType VoidTy; QualType BoolTy; @@ -351,12 +365,6 @@ public: ObjCProtocolDecl **ProtocolList, unsigned NumProtocols); - /// getObjCQualifiedIdType - Return an ObjCQualifiedIdType for a - /// given 'id' and conforming protocol list. - QualType getObjCQualifiedIdType(ObjCProtocolDecl **ProtocolList, - unsigned NumProtocols); - - /// getTypeOfType - GCC extension. QualType getTypeOfExprType(Expr *e); QualType getTypeOfType(QualType t); Modified: vendor/clang/dist/include/clang/AST/CFG.h ============================================================================== --- vendor/clang/dist/include/clang/AST/CFG.h Sat Jul 4 13:58:26 2009 (r195340) +++ vendor/clang/dist/include/clang/AST/CFG.h Sat Jul 4 13:58:54 2009 (r195341) @@ -17,17 +17,20 @@ #include "llvm/ADT/GraphTraits.h" #include "llvm/Support/Allocator.h" -#include "llvm/Support/raw_ostream.h" #include #include #include +namespace llvm { + class raw_ostream; +} namespace clang { class Stmt; class Expr; class CFG; class PrinterHelper; class BlockEdge; + class LangOptions; /// CFGBlock - Represents a single basic block in a source-level CFG. /// It consists of: @@ -181,9 +184,9 @@ public: unsigned getBlockID() const { return BlockID; } - void dump(const CFG* cfg) const; - void print(llvm::raw_ostream& OS, const CFG* cfg) const; - void printTerminator(llvm::raw_ostream& OS) const; + void dump(const CFG *cfg, const LangOptions &LO) const; + void print(llvm::raw_ostream &OS, const CFG* cfg, const LangOptions &LO) const; + void printTerminator(llvm::raw_ostream &OS, const LangOptions &LO) const; }; @@ -283,9 +286,9 @@ public: // CFG Debugging: Pretty-Printing and Visualization. //===--------------------------------------------------------------------===// - void viewCFG() const; - void print(llvm::raw_ostream& OS) const; - void dump() const; + void viewCFG(const LangOptions &LO) const; + void print(llvm::raw_ostream& OS, const LangOptions &LO) const; + void dump(const LangOptions &LO) const; //===--------------------------------------------------------------------===// // Internal: constructors and data. Modified: vendor/clang/dist/include/clang/AST/Decl.h ============================================================================== --- vendor/clang/dist/include/clang/AST/Decl.h Sat Jul 4 13:58:26 2009 (r195340) +++ vendor/clang/dist/include/clang/AST/Decl.h Sat Jul 4 13:58:54 2009 (r195341) @@ -26,13 +26,19 @@ class Stmt; class CompoundStmt; class StringLiteral; class TemplateArgumentList; +class FunctionTemplateSpecializationInfo; /// TranslationUnitDecl - The top declaration context. class TranslationUnitDecl : public Decl, public DeclContext { - TranslationUnitDecl() + ASTContext &Ctx; + + explicit TranslationUnitDecl(ASTContext &ctx) : Decl(TranslationUnit, 0, SourceLocation()), - DeclContext(TranslationUnit) {} + DeclContext(TranslationUnit), + Ctx(ctx) {} public: + ASTContext &getASTContext() const { return Ctx; } + static TranslationUnitDecl *Create(ASTContext &C); // Implement isa/cast/dyncast/etc. static bool classof(const Decl *D) { return D->getKind() == TranslationUnit; } @@ -621,15 +627,8 @@ public: enum StorageClass { None, Extern, Static, PrivateExtern }; -private: - /// \brief Provides information about a function template specialization, - /// which is a FunctionDecl that has been explicitly specialization or - /// instantiated from a function template. - struct TemplateSpecializationInfo { - FunctionTemplateDecl *Template; - const TemplateArgumentList *TemplateArguments; - }; +private: /// ParamInfo - new[]'d array of pointers to VarDecls for the formal /// parameters of this function. This is null if a prototype or if there are /// no formals. @@ -684,7 +683,8 @@ private: /// the template being specialized and the template arguments involved in /// that specialization. llvm::PointerUnion3 TemplateOrSpecialization; + FunctionTemplateSpecializationInfo*> + TemplateOrSpecialization; protected: FunctionDecl(Kind DK, DeclContext *DC, SourceLocation L, @@ -724,11 +724,11 @@ public: /// function. The variant that accepts a FunctionDecl pointer will /// set that function declaration to the actual declaration /// containing the body (if there is one). - Stmt *getBody(ASTContext &Context, const FunctionDecl *&Definition) const; + Stmt *getBody(const FunctionDecl *&Definition) const; - virtual Stmt *getBody(ASTContext &Context) const { + virtual Stmt *getBody() const { const FunctionDecl* Definition; - return getBody(Context, Definition); + return getBody(Definition); } /// \brief If the function has a body that is immediately available, @@ -809,9 +809,7 @@ public: return PreviousDeclaration; } - void setPreviousDeclaration(FunctionDecl * PrevDecl) { - PreviousDeclaration = PrevDecl; - } + void setPreviousDeclaration(FunctionDecl * PrevDecl); unsigned getBuiltinID(ASTContext &Context) const; @@ -940,27 +938,14 @@ public: /// /// If this function declaration is not a function template specialization, /// returns NULL. - FunctionTemplateDecl *getPrimaryTemplate() const { - if (TemplateSpecializationInfo *Info - = TemplateOrSpecialization.dyn_cast()) { - return Info->Template; - } - return 0; - } + FunctionTemplateDecl *getPrimaryTemplate() const; /// \brief Retrieve the template arguments used to produce this function /// template specialization from the primary template. /// /// If this function declaration is not a function template specialization, /// returns NULL. - const TemplateArgumentList *getTemplateSpecializationArgs() const { - if (TemplateSpecializationInfo *Info - = TemplateOrSpecialization.dyn_cast()) { - return Info->TemplateArguments; - } - return 0; - } - + const TemplateArgumentList *getTemplateSpecializationArgs() const; /// \brief Specify that this function declaration is actually a function /// template specialization. @@ -974,8 +959,17 @@ public: /// function template specialization from the template. void setFunctionTemplateSpecialization(ASTContext &Context, FunctionTemplateDecl *Template, - const TemplateArgumentList *TemplateArgs); - + const TemplateArgumentList *TemplateArgs, + void *InsertPos); + + /// \brief Determine whether this is an explicit specialization of a + /// function template or a member function of a class template. + bool isExplicitSpecialization() const; + + /// \brief Note that this is an explicit specialization of a function template + /// or a member function of a class template. + void setExplicitSpecialization(bool ES); + // Implement isa/cast/dyncast/etc. static bool classof(const Decl *D) { return D->getKind() >= FunctionFirst && D->getKind() <= FunctionLast; @@ -1268,12 +1262,12 @@ public: // enumeration. typedef specific_decl_iterator enumerator_iterator; - enumerator_iterator enumerator_begin(ASTContext &Context) const { - return enumerator_iterator(this->decls_begin(Context)); + enumerator_iterator enumerator_begin() const { + return enumerator_iterator(this->decls_begin()); } - enumerator_iterator enumerator_end(ASTContext &Context) const { - return enumerator_iterator(this->decls_end(Context)); + enumerator_iterator enumerator_end() const { + return enumerator_iterator(this->decls_end()); } /// getIntegerType - Return the integer type this enum decl corresponds to. @@ -1376,17 +1370,17 @@ public: // data members, functions, constructors, destructors, etc. typedef specific_decl_iterator field_iterator; - field_iterator field_begin(ASTContext &Context) const { - return field_iterator(decls_begin(Context)); + field_iterator field_begin() const { + return field_iterator(decls_begin()); } - field_iterator field_end(ASTContext &Context) const { - return field_iterator(decls_end(Context)); + field_iterator field_end() const { + return field_iterator(decls_end()); } // field_empty - Whether there are any fields (non-static data // members) in this record. - bool field_empty(ASTContext &Context) const { - return field_begin(Context) == field_end(Context); + bool field_empty() const { + return field_begin() == field_end(); } /// completeDefinition - Notes that the definition of this type is @@ -1448,8 +1442,8 @@ public: bool IsVariadic() const { return isVariadic; } void setIsVariadic(bool value) { isVariadic = value; } - CompoundStmt *getBody() const { return (CompoundStmt*) Body; } - Stmt *getBody(ASTContext &C) const { return (Stmt*) Body; } + CompoundStmt *getCompoundBody() const { return (CompoundStmt*) Body; } + Stmt *getBody() const { return (Stmt*) Body; } void setBody(CompoundStmt *B) { Body = (Stmt*) B; } // Iterator access to formal parameters. Modified: vendor/clang/dist/include/clang/AST/DeclBase.h ============================================================================== --- vendor/clang/dist/include/clang/AST/DeclBase.h Sat Jul 4 13:58:26 2009 (r195340) +++ vendor/clang/dist/include/clang/AST/DeclBase.h Sat Jul 4 13:58:54 2009 (r195341) @@ -213,6 +213,13 @@ public: const DeclContext *getDeclContext() const { return const_cast(this)->getDeclContext(); } + + TranslationUnitDecl *getTranslationUnitDecl(); + const TranslationUnitDecl *getTranslationUnitDecl() const { + return const_cast(this)->getTranslationUnitDecl(); + } + + ASTContext &getASTContext() const; void setAccess(AccessSpecifier AS) { Access = AS; @@ -225,23 +232,23 @@ public: } bool hasAttrs() const { return HasAttrs; } - void addAttr(ASTContext &Context, Attr *attr); - const Attr *getAttrs(ASTContext &Context) const { + void addAttr(Attr *attr); + const Attr *getAttrs() const { if (!HasAttrs) return 0; // common case, no attributes. - return getAttrsImpl(Context); // Uncommon case, out of line hash lookup. + return getAttrsImpl(); // Uncommon case, out of line hash lookup. } - void swapAttrs(ASTContext &Context, Decl *D); - void invalidateAttrs(ASTContext &Context); + void swapAttrs(Decl *D); + void invalidateAttrs(); - template const T *getAttr(ASTContext &Context) const { - for (const Attr *attr = getAttrs(Context); attr; attr = attr->getNext()) + template const T *getAttr() const { + for (const Attr *attr = getAttrs(); attr; attr = attr->getNext()) if (const T *V = dyn_cast(attr)) return V; return 0; } - template bool hasAttr(ASTContext &Context) const { - return getAttr(Context) != 0; + template bool hasAttr() const { + return getAttr() != 0; } /// setInvalidDecl - Indicates the Decl had a semantic error. This @@ -307,14 +314,14 @@ public: /// getBody - If this Decl represents a declaration for a body of code, /// such as a function or method definition, this method returns the /// top-level Stmt* of that body. Otherwise this method returns null. - virtual Stmt* getBody(ASTContext &Context) const { return 0; } + virtual Stmt* getBody() const { return 0; } /// getCompoundBody - Returns getBody(), dyn_casted to a CompoundStmt. - CompoundStmt* getCompoundBody(ASTContext &Context) const; + CompoundStmt* getCompoundBody() const; /// getBodyRBrace - Gets the right brace of the body, if a body exists. /// This works whether the body is a CompoundStmt or a CXXTryStmt. - SourceLocation getBodyRBrace(ASTContext &Context) const; + SourceLocation getBodyRBrace() const; // global temp stats (until we have a per-module visitor) static void addDeclKind(Kind k); @@ -340,18 +347,16 @@ public: /// Destroy - Call destructors and release memory. virtual void Destroy(ASTContext& C); - void print(llvm::raw_ostream &Out, ASTContext &Context, + void print(llvm::raw_ostream &Out, unsigned Indentation = 0); + void print(llvm::raw_ostream &Out, const PrintingPolicy &Policy, unsigned Indentation = 0); - void print(llvm::raw_ostream &Out, ASTContext &Context, - const PrintingPolicy &Policy, unsigned Indentation = 0); static void printGroup(Decl** Begin, unsigned NumDecls, - llvm::raw_ostream &Out, ASTContext &Context, - const PrintingPolicy &Policy, + llvm::raw_ostream &Out, const PrintingPolicy &Policy, unsigned Indentation = 0); - void dump(ASTContext &Context); + void dump(); private: - const Attr *getAttrsImpl(ASTContext &Context) const; + const Attr *getAttrsImpl() const; }; @@ -454,7 +459,11 @@ public: const DeclContext *getLexicalParent() const { return const_cast(this)->getLexicalParent(); } - + + ASTContext &getParentASTContext() const { + return cast(this)->getASTContext(); + } + bool isFunctionOrMethod() const { switch (DeclKind) { case Decl::Block: @@ -592,9 +601,9 @@ public: /// decls_begin/decls_end - Iterate over the declarations stored in /// this context. - decl_iterator decls_begin(ASTContext &Context) const; - decl_iterator decls_end(ASTContext &Context) const; - bool decls_empty(ASTContext &Context) const; + decl_iterator decls_begin() const; + decl_iterator decls_end() const; + bool decls_empty() const; /// specific_decl_iterator - Iterates over a subrange of /// declarations stored in a DeclContext, providing only those that @@ -750,7 +759,7 @@ public: /// /// If D is also a NamedDecl, it will be made visible within its /// semantic context via makeDeclVisibleInContext. - void addDecl(ASTContext &Context, Decl *D); + void addDecl(Decl *D); /// lookup_iterator - An iterator that provides access to the results /// of looking up a name within this context. @@ -769,8 +778,8 @@ public: /// the declarations with this name, with object, function, member, /// and enumerator names preceding any tag name. Note that this /// routine will not look into parent contexts. - lookup_result lookup(ASTContext &Context, DeclarationName Name); - lookup_const_result lookup(ASTContext &Context, DeclarationName Name) const; + lookup_result lookup(DeclarationName Name); + lookup_const_result lookup(DeclarationName Name) const; /// @brief Makes a declaration visible within this context. /// @@ -786,7 +795,7 @@ public: /// visible from this context, as determined by /// NamedDecl::declarationReplaces, the previous declaration will be /// replaced with D. - void makeDeclVisibleInContext(ASTContext &Context, NamedDecl *D); + void makeDeclVisibleInContext(NamedDecl *D); /// udir_iterator - Iterates through the using-directives stored /// within this context. @@ -794,14 +803,14 @@ public: typedef std::pair udir_iterator_range; - udir_iterator_range getUsingDirectives(ASTContext &Context) const; + udir_iterator_range getUsingDirectives() const; - udir_iterator using_directives_begin(ASTContext &Context) const { - return getUsingDirectives(Context).first; + udir_iterator using_directives_begin() const { + return getUsingDirectives().first; } - udir_iterator using_directives_end(ASTContext &Context) const { - return getUsingDirectives(Context).second; + udir_iterator using_directives_end() const { + return getUsingDirectives().second; } // Low-level accessors @@ -836,11 +845,11 @@ public: #include "clang/AST/DeclNodes.def" private: - void LoadLexicalDeclsFromExternalStorage(ASTContext &Context) const; - void LoadVisibleDeclsFromExternalStorage(ASTContext &Context) const; + void LoadLexicalDeclsFromExternalStorage() const; + void LoadVisibleDeclsFromExternalStorage() const; - void buildLookup(ASTContext &Context, DeclContext *DCtx); - void makeDeclVisibleInContextImpl(ASTContext &Context, NamedDecl *D); + void buildLookup(DeclContext *DCtx); + void makeDeclVisibleInContextImpl(NamedDecl *D); }; inline bool Decl::isTemplateParameter() const { Modified: vendor/clang/dist/include/clang/AST/DeclCXX.h ============================================================================== --- vendor/clang/dist/include/clang/AST/DeclCXX.h Sat Jul 4 13:58:26 2009 (r195340) +++ vendor/clang/dist/include/clang/AST/DeclCXX.h Sat Jul 4 13:58:54 2009 (r195341) @@ -32,6 +32,8 @@ class ClassTemplateSpecializationDecl; class AnyFunctionDecl { NamedDecl *Function; + AnyFunctionDecl(NamedDecl *ND) : Function(ND) { } + public: AnyFunctionDecl(FunctionDecl *FD) : Function(FD) { } AnyFunctionDecl(FunctionTemplateDecl *FTD); @@ -42,6 +44,10 @@ public: /// \brief Retrieve the underlying function or function template. NamedDecl *get() const { return Function; } + + static AnyFunctionDecl getFromNamedDecl(NamedDecl *ND) { + return AnyFunctionDecl(ND); + } }; } // end namespace clang @@ -57,6 +63,22 @@ namespace llvm { }; template<> struct simplify_type< ::clang::AnyFunctionDecl> : public simplify_type {}; + + // Provide PointerLikeTypeTraits for non-cvr pointers. + template<> + class PointerLikeTypeTraits< ::clang::AnyFunctionDecl> { + public: + static inline void *getAsVoidPointer(::clang::AnyFunctionDecl F) { + return F.get(); + } + static inline ::clang::AnyFunctionDecl getFromVoidPointer(void *P) { + return ::clang::AnyFunctionDecl::getFromNamedDecl( + static_cast< ::clang::NamedDecl*>(P)); + } + + enum { NumLowBitsAvailable = 2 }; + }; + } // end namespace llvm namespace clang { @@ -91,24 +113,10 @@ public: static OverloadedFunctionDecl *Create(ASTContext &C, DeclContext *DC, DeclarationName N); - /// addOverload - Add an overloaded function FD to this set of - /// overloaded functions. - void addOverload(FunctionDecl *FD) { - assert((FD->getDeclName() == getDeclName() || - isa(FD) || isa(FD)) && - "Overloaded functions must have the same name"); - Functions.push_back(FD); - - // An overloaded function declaration always has the location of - // the most-recently-added function declaration. - if (FD->getLocation().isValid()) - this->setLocation(FD->getLocation()); - } - - /// addOverload - Add an overloaded function template FTD to this set of - /// overloaded functions. - void addOverload(FunctionTemplateDecl *FTD); - + /// \brief Add a new overloaded function or function template to the set + /// of overloaded function templates. + void addOverload(AnyFunctionDecl F); + function_iterator function_begin() { return Functions.begin(); } function_iterator function_end() { return Functions.end(); } function_const_iterator function_begin() const { return Functions.begin(); } @@ -289,8 +297,11 @@ public: CXXRecordDecl* PrevDecl=0, bool DelayTypeCreation = false); + virtual void Destroy(ASTContext& C); + /// setBases - Sets the base classes of this struct or class. - void setBases(CXXBaseSpecifier const * const *Bases, unsigned NumBases); + void setBases(ASTContext &C, + CXXBaseSpecifier const * const *Bases, unsigned NumBases); /// getNumBases - Retrieves the number of base classes of this /// class. @@ -580,15 +591,20 @@ class CXXBaseOrMemberInitializer { /// Args - The arguments used to initialize the base or member. Expr **Args; unsigned NumArgs; + + /// IdLoc - Location of the id in ctor-initializer list. + SourceLocation IdLoc; public: /// CXXBaseOrMemberInitializer - Creates a new base-class initializer. explicit - CXXBaseOrMemberInitializer(QualType BaseType, Expr **Args, unsigned NumArgs); + CXXBaseOrMemberInitializer(QualType BaseType, Expr **Args, unsigned NumArgs, + SourceLocation L); /// CXXBaseOrMemberInitializer - Creates a new member initializer. explicit - CXXBaseOrMemberInitializer(FieldDecl *Member, Expr **Args, unsigned NumArgs); + CXXBaseOrMemberInitializer(FieldDecl *Member, Expr **Args, unsigned NumArgs, + SourceLocation L); /// ~CXXBaseOrMemberInitializer - Destroy the base or member initializer. ~CXXBaseOrMemberInitializer(); @@ -601,6 +617,10 @@ public: /// arguments. typedef Expr * const * arg_const_iterator; + /// getBaseOrMember - get the generic 'member' representing either the field + /// or a base class. + void* getBaseOrMember() const { return reinterpret_cast(BaseOrMember); } + /// isBaseInitializer - Returns true when this initializer is /// initializing a base class. bool isBaseInitializer() const { return (BaseOrMember & 0x1) != 0; } @@ -641,6 +661,8 @@ public: return 0; } + SourceLocation getSourceLocation() const { return IdLoc; } + /// begin() - Retrieve an iterator to the first initializer argument. arg_iterator begin() { return Args; } /// begin() - Retrieve an iterator to the first initializer argument. @@ -677,16 +699,22 @@ class CXXConstructorDecl : public CXXMet /// @c !Implicit && ImplicitlyDefined. bool ImplicitlyDefined : 1; - /// FIXME: Add support for base and member initializers. - + /// Support for base and member initializers. + /// BaseOrMemberInitializers - The arguments used to initialize the base + /// or member. + CXXBaseOrMemberInitializer **BaseOrMemberInitializers; + unsigned NumBaseOrMemberInitializers; + CXXConstructorDecl(CXXRecordDecl *RD, SourceLocation L, DeclarationName N, QualType T, bool isExplicit, bool isInline, bool isImplicitlyDeclared) : CXXMethodDecl(CXXConstructor, RD, L, N, T, false, isInline), - Explicit(isExplicit), ImplicitlyDefined(false) { + Explicit(isExplicit), ImplicitlyDefined(false), + BaseOrMemberInitializers(0), NumBaseOrMemberInitializers(0) { setImplicit(isImplicitlyDeclared); } - + virtual void Destroy(ASTContext& C); + public: static CXXConstructorDecl *Create(ASTContext &C, CXXRecordDecl *RD, SourceLocation L, DeclarationName N, @@ -702,7 +730,8 @@ public: /// already been defined. bool isImplicitlyDefined(ASTContext &C) const { assert(isThisDeclarationADefinition() && - "Can only get the implicit-definition flag once the constructor has been defined"); + "Can only get the implicit-definition flag once the " + "constructor has been defined"); return ImplicitlyDefined; } @@ -710,10 +739,41 @@ public: /// implicitly defined or not. void setImplicitlyDefined(bool ID) { assert(isThisDeclarationADefinition() && - "Can only set the implicit-definition flag once the constructor has been defined"); + "Can only set the implicit-definition flag once the constructor " + "has been defined"); ImplicitlyDefined = ID; } + /// init_iterator - Iterates through the member/base initializer list. + typedef CXXBaseOrMemberInitializer **init_iterator; + + /// init_const_iterator - Iterates through the memberbase initializer list. + typedef CXXBaseOrMemberInitializer * const * init_const_iterator; + + /// begin() - Retrieve an iterator to the first initializer. + init_iterator begin() { return BaseOrMemberInitializers; } + /// begin() - Retrieve an iterator to the first initializer. + init_const_iterator begin() const { return BaseOrMemberInitializers; } + + /// end() - Retrieve an iterator past the last initializer. + init_iterator end() { + return BaseOrMemberInitializers + NumBaseOrMemberInitializers; + } + /// end() - Retrieve an iterator past the last initializer. + init_const_iterator end() const { + return BaseOrMemberInitializers + NumBaseOrMemberInitializers; + } + + /// getNumArgs - Determine the number of arguments used to + /// initialize the member or base. + unsigned getNumBaseOrMemberInitializers() const { + return NumBaseOrMemberInitializers; + } + + void setBaseOrMemberInitializers(ASTContext &C, + CXXBaseOrMemberInitializer **Initializers, + unsigned NumInitializers); + /// isDefaultConstructor - Whether this constructor is a default /// constructor (C++ [class.ctor]p5), which can be used to /// default-initialize a class of this type. Modified: vendor/clang/dist/include/clang/AST/DeclObjC.h ============================================================================== --- vendor/clang/dist/include/clang/AST/DeclObjC.h Sat Jul 4 13:58:26 2009 (r195340) +++ vendor/clang/dist/include/clang/AST/DeclObjC.h Sat Jul 4 13:58:54 2009 (r195341) @@ -242,10 +242,10 @@ public: return ImplementationControl(DeclImplementation); } - virtual Stmt *getBody(ASTContext &C) const { + virtual Stmt *getBody() const { return (Stmt*) Body; } - CompoundStmt *getBody() { return (CompoundStmt*)Body; } + CompoundStmt *getCompoundBody() { return (CompoundStmt*)Body; } void setBody(Stmt *B) { Body = B; } // Implement isa/cast/dyncast/etc. @@ -291,55 +291,52 @@ public: // Iterator access to properties. typedef specific_decl_iterator prop_iterator; - prop_iterator prop_begin(ASTContext &Context) const { - return prop_iterator(decls_begin(Context)); + prop_iterator prop_begin() const { + return prop_iterator(decls_begin()); } - prop_iterator prop_end(ASTContext &Context) const { - return prop_iterator(decls_end(Context)); + prop_iterator prop_end() const { + return prop_iterator(decls_end()); } // Iterator access to instance/class methods. typedef specific_decl_iterator method_iterator; - method_iterator meth_begin(ASTContext &Context) const { - return method_iterator(decls_begin(Context)); + method_iterator meth_begin() const { + return method_iterator(decls_begin()); } - method_iterator meth_end(ASTContext &Context) const { - return method_iterator(decls_end(Context)); + method_iterator meth_end() const { + return method_iterator(decls_end()); } typedef filtered_decl_iterator instmeth_iterator; - instmeth_iterator instmeth_begin(ASTContext &Context) const { - return instmeth_iterator(decls_begin(Context)); + instmeth_iterator instmeth_begin() const { + return instmeth_iterator(decls_begin()); } - instmeth_iterator instmeth_end(ASTContext &Context) const { - return instmeth_iterator(decls_end(Context)); + instmeth_iterator instmeth_end() const { + return instmeth_iterator(decls_end()); } typedef filtered_decl_iterator classmeth_iterator; - classmeth_iterator classmeth_begin(ASTContext &Context) const { - return classmeth_iterator(decls_begin(Context)); + classmeth_iterator classmeth_begin() const { + return classmeth_iterator(decls_begin()); } - classmeth_iterator classmeth_end(ASTContext &Context) const { - return classmeth_iterator(decls_end(Context)); + classmeth_iterator classmeth_end() const { + return classmeth_iterator(decls_end()); } // Get the local instance/class method declared in this interface. - ObjCMethodDecl *getInstanceMethod(ASTContext &Context, Selector Sel) const; - ObjCMethodDecl *getClassMethod(ASTContext &Context, Selector Sel) const; - ObjCIvarDecl *getIvarDecl(ASTContext &Context, IdentifierInfo *Id) const; - - ObjCMethodDecl * - getMethod(ASTContext &Context, Selector Sel, bool isInstance) const { - return isInstance ? getInstanceMethod(Context, Sel) - : getClassMethod(Context, Sel); + ObjCMethodDecl *getInstanceMethod(Selector Sel) const; + ObjCMethodDecl *getClassMethod(Selector Sel) const; + ObjCIvarDecl *getIvarDecl(IdentifierInfo *Id) const; + + ObjCMethodDecl *getMethod(Selector Sel, bool isInstance) const { + return isInstance ? getInstanceMethod(Sel) : getClassMethod(Sel); } - ObjCPropertyDecl *FindPropertyDeclaration(ASTContext &Context, - IdentifierInfo *PropertyId) const; + ObjCPropertyDecl *FindPropertyDeclaration(IdentifierInfo *PropertyId) const; // Marks the end of the container. SourceLocation getAtEndLoc() const { return AtEndLoc; } @@ -474,19 +471,17 @@ public: return false; } - ObjCIvarDecl *lookupInstanceVariable(ASTContext &Context, - IdentifierInfo *IVarName, + ObjCIvarDecl *lookupInstanceVariable(IdentifierInfo *IVarName, ObjCInterfaceDecl *&ClassDeclared); - ObjCIvarDecl *lookupInstanceVariable(ASTContext &Context, - IdentifierInfo *IVarName) { + ObjCIvarDecl *lookupInstanceVariable(IdentifierInfo *IVarName) { ObjCInterfaceDecl *ClassDeclared; - return lookupInstanceVariable(Context, IVarName, ClassDeclared); + return lookupInstanceVariable(IVarName, ClassDeclared); } // Lookup a method. First, we search locally. If a method isn't // found, we search referenced protocols and class categories. - ObjCMethodDecl *lookupInstanceMethod(ASTContext &Context, Selector Sel); - ObjCMethodDecl *lookupClassMethod(ASTContext &Context, Selector Sel); + ObjCMethodDecl *lookupInstanceMethod(Selector Sel); + ObjCMethodDecl *lookupClassMethod(Selector Sel); ObjCInterfaceDecl *lookupInheritedClass(const IdentifierInfo *ICName); // Location information, modeled after the Stmt API. @@ -648,8 +643,8 @@ public: // Lookup a method. First, we search locally. If a method isn't // found, we search referenced protocols and class categories. - ObjCMethodDecl *lookupInstanceMethod(ASTContext &Context, Selector Sel); - ObjCMethodDecl *lookupClassMethod(ASTContext &Context, Selector Sel); + ObjCMethodDecl *lookupInstanceMethod(Selector Sel); + ObjCMethodDecl *lookupClassMethod(Selector Sel); bool isForwardDecl() const { return isForwardProtoDecl; } void setForwardDecl(bool val) { isForwardProtoDecl = val; } @@ -831,61 +826,57 @@ public: ObjCInterfaceDecl *getClassInterface() { return ClassInterface; } void setClassInterface(ObjCInterfaceDecl *IFace) { ClassInterface = IFace; } - void addInstanceMethod(ASTContext &Context, ObjCMethodDecl *method) { + void addInstanceMethod(ObjCMethodDecl *method) { // FIXME: Context should be set correctly before we get here. method->setLexicalDeclContext(this); - addDecl(Context, method); + addDecl(method); } - void addClassMethod(ASTContext &Context, ObjCMethodDecl *method) { + void addClassMethod(ObjCMethodDecl *method) { // FIXME: Context should be set correctly before we get here. method->setLexicalDeclContext(this); - addDecl(Context, method); + addDecl(method); } // Get the local instance/class method declared in this interface. - ObjCMethodDecl *getInstanceMethod(ASTContext &Context, Selector Sel) const; - ObjCMethodDecl *getClassMethod(ASTContext &Context, Selector Sel) const; - ObjCMethodDecl *getMethod(ASTContext &Context, Selector Sel, - bool isInstance) const { - return isInstance ? getInstanceMethod(Context, Sel) - : getClassMethod(Context, Sel); + ObjCMethodDecl *getInstanceMethod(Selector Sel) const; + ObjCMethodDecl *getClassMethod(Selector Sel) const; + ObjCMethodDecl *getMethod(Selector Sel, bool isInstance) const { + return isInstance ? getInstanceMethod(Sel) + : getClassMethod(Sel); } - void addPropertyImplementation(ASTContext &Context, - ObjCPropertyImplDecl *property); - - ObjCPropertyImplDecl *FindPropertyImplDecl(ASTContext &Context, - IdentifierInfo *propertyId) const; - ObjCPropertyImplDecl *FindPropertyImplIvarDecl(ASTContext &Context, - IdentifierInfo *ivarId) const; + void addPropertyImplementation(ObjCPropertyImplDecl *property); + + ObjCPropertyImplDecl *FindPropertyImplDecl(IdentifierInfo *propertyId) const; + ObjCPropertyImplDecl *FindPropertyImplIvarDecl(IdentifierInfo *ivarId) const; // Iterator access to properties. typedef specific_decl_iterator propimpl_iterator; - propimpl_iterator propimpl_begin(ASTContext &Context) const { - return propimpl_iterator(decls_begin(Context)); + propimpl_iterator propimpl_begin() const { + return propimpl_iterator(decls_begin()); } - propimpl_iterator propimpl_end(ASTContext &Context) const { - return propimpl_iterator(decls_end(Context)); + propimpl_iterator propimpl_end() const { + return propimpl_iterator(decls_end()); } typedef filtered_decl_iterator instmeth_iterator; - instmeth_iterator instmeth_begin(ASTContext &Context) const { - return instmeth_iterator(decls_begin(Context)); + instmeth_iterator instmeth_begin() const { + return instmeth_iterator(decls_begin()); } - instmeth_iterator instmeth_end(ASTContext &Context) const { - return instmeth_iterator(decls_end(Context)); + instmeth_iterator instmeth_end() const { + return instmeth_iterator(decls_end()); } typedef filtered_decl_iterator classmeth_iterator; - classmeth_iterator classmeth_begin(ASTContext &Context) const { - return classmeth_iterator(decls_begin(Context)); + classmeth_iterator classmeth_begin() const { + return classmeth_iterator(decls_begin()); } - classmeth_iterator classmeth_end(ASTContext &Context) const { - return classmeth_iterator(decls_end(Context)); + classmeth_iterator classmeth_end() const { + return classmeth_iterator(decls_end()); } // Location information, modeled after the Stmt API. @@ -1002,17 +993,17 @@ public: void setSuperClass(ObjCInterfaceDecl * superCls) { SuperClass = superCls; } typedef specific_decl_iterator ivar_iterator; - ivar_iterator ivar_begin(ASTContext &Context) const { - return ivar_iterator(decls_begin(Context)); + ivar_iterator ivar_begin() const { + return ivar_iterator(decls_begin()); } - ivar_iterator ivar_end(ASTContext &Context) const { - return ivar_iterator(decls_end(Context)); + ivar_iterator ivar_end() const { + return ivar_iterator(decls_end()); } - unsigned ivar_size(ASTContext &Context) const { - return std::distance(ivar_begin(Context), ivar_end(Context)); + unsigned ivar_size() const { + return std::distance(ivar_begin(), ivar_end()); } - bool ivar_empty(ASTContext &Context) const { - return ivar_begin(Context) == ivar_end(Context); + bool ivar_empty() const { + return ivar_begin() == ivar_end(); } static bool classof(const Decl *D) { Modified: vendor/clang/dist/include/clang/AST/DeclTemplate.h ============================================================================== --- vendor/clang/dist/include/clang/AST/DeclTemplate.h Sat Jul 4 13:58:26 2009 (r195340) +++ vendor/clang/dist/include/clang/AST/DeclTemplate.h Sat Jul 4 13:58:54 2009 (r195341) @@ -100,6 +100,352 @@ public: } }; +/// \brief Represents a template argument within a class template +/// specialization. +class TemplateArgument { + union { + uintptr_t TypeOrValue; + struct { + char Value[sizeof(llvm::APSInt)]; + void *Type; + } Integer; + struct { + TemplateArgument *Args; + unsigned NumArgs; + bool CopyArgs; + } Args; + }; + + /// \brief Location of the beginning of this template argument. + SourceLocation StartLoc; + +public: + /// \brief The type of template argument we're storing. + enum ArgKind { + Null = 0, + /// The template argument is a type. Its value is stored in the + /// TypeOrValue field. + Type = 1, + /// The template argument is a declaration + Declaration = 2, + /// The template argument is an integral value stored in an llvm::APSInt. + Integral = 3, + /// The template argument is a value- or type-dependent expression + /// stored in an Expr*. + Expression = 4, + + /// The template argument is actually a parameter pack. Arguments are stored + /// in the Args struct. + Pack = 5 + } Kind; + + /// \brief Construct an empty, invalid template argument. + TemplateArgument() : TypeOrValue(0), StartLoc(), Kind(Null) { } + + /// \brief Construct a template type argument. + TemplateArgument(SourceLocation Loc, QualType T) : Kind(Type) { + TypeOrValue = reinterpret_cast(T.getAsOpaquePtr()); + StartLoc = Loc; + } + + /// \brief Construct a template argument that refers to a + /// declaration, which is either an external declaration or a + /// template declaration. + TemplateArgument(SourceLocation Loc, Decl *D) : Kind(Declaration) { + // FIXME: Need to be sure we have the "canonical" declaration! + TypeOrValue = reinterpret_cast(D); + StartLoc = Loc; + } + + /// \brief Construct an integral constant template argument. + TemplateArgument(SourceLocation Loc, const llvm::APSInt &Value, + QualType Type) + : Kind(Integral) { + new (Integer.Value) llvm::APSInt(Value); + Integer.Type = Type.getAsOpaquePtr(); + StartLoc = Loc; + } + + /// \brief Construct a template argument that is an expression. + /// + /// This form of template argument only occurs in template argument + /// lists used for dependent types and for expression; it will not + /// occur in a non-dependent, canonical template argument list. + TemplateArgument(Expr *E); + + /// \brief Copy constructor for a template argument. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From ed at FreeBSD.org Sat Jul 4 13:59:23 2009 From: ed at FreeBSD.org (Ed Schouten) Date: Sat Jul 4 13:59:33 2009 Subject: svn commit: r195342 - vendor/llvm/llvm-r74788 Message-ID: <200907041359.n64DxMiL014490@svn.freebsd.org> Author: ed Date: Sat Jul 4 13:59:22 2009 New Revision: 195342 URL: http://svn.freebsd.org/changeset/base/195342 Log: Tag LLVM r74788. Added: vendor/llvm/llvm-r74788/ - copied from r195341, vendor/llvm/dist/ From ed at FreeBSD.org Sat Jul 4 13:59:44 2009 From: ed at FreeBSD.org (Ed Schouten) Date: Sat Jul 4 13:59:55 2009 Subject: svn commit: r195343 - vendor/clang/clang-r74788 Message-ID: <200907041359.n64Dxhx8014534@svn.freebsd.org> Author: ed Date: Sat Jul 4 13:59:43 2009 New Revision: 195343 URL: http://svn.freebsd.org/changeset/base/195343 Log: Tag Clang r74788. Added: vendor/clang/clang-r74788/ - copied from r195342, vendor/clang/dist/ From brian at FreeBSD.org Sun Jul 5 06:15:00 2009 From: brian at FreeBSD.org (Brian Somers) Date: Sun Jul 5 06:15:06 2009 Subject: svn commit: r195346 - head/usr.sbin/pkg_install/add Message-ID: <200907050614.n656Exou038758@svn.freebsd.org> Author: brian Date: Sun Jul 5 06:14:59 2009 New Revision: 195346 URL: http://svn.freebsd.org/changeset/base/195346 Log: Disable r194497 for now. It doesn't work well with ports-mgmt/tinderbox. Approved by: re (ken) Modified: head/usr.sbin/pkg_install/add/perform.c Modified: head/usr.sbin/pkg_install/add/perform.c ============================================================================== --- head/usr.sbin/pkg_install/add/perform.c Sun Jul 5 01:36:24 2009 (r195345) +++ head/usr.sbin/pkg_install/add/perform.c Sun Jul 5 06:14:59 2009 (r195346) @@ -278,6 +278,7 @@ pkg_do(char *pkg) warnx("-f specified; proceeding anyway"); } +#if ENSURE_THAT_ALL_REQUIREMENTS_ARE_MET /* * Before attempting to do the slave mode bit, ensure that we've * downloaded & processed everything we need. @@ -313,6 +314,7 @@ pkg_do(char *pkg) } } } +#endif /* Now check the packing list for dependencies */ for (p = Plist.head; p ; p = p->next) { From brian at FreeBSD.org Sun Jul 5 06:24:07 2009 From: brian at FreeBSD.org (Brian Somers) Date: Sun Jul 5 06:24:14 2009 Subject: svn commit: r195347 - in stable/7/gnu/usr.bin/man: . apropos Message-ID: <200907050624.n656O6MF038991@svn.freebsd.org> Author: brian Date: Sun Jul 5 06:24:06 2009 New Revision: 195347 URL: http://svn.freebsd.org/changeset/base/195347 Log: MFC: Don't set $PATH - if the caller doesn't have /bin and /usr/bin in their PATH then they can expect things to break. PR: 135417 Modified: stable/7/gnu/usr.bin/man/ (props changed) stable/7/gnu/usr.bin/man/apropos/apropos.sh Modified: stable/7/gnu/usr.bin/man/apropos/apropos.sh ============================================================================== --- stable/7/gnu/usr.bin/man/apropos/apropos.sh Sun Jul 5 06:14:59 2009 (r195346) +++ stable/7/gnu/usr.bin/man/apropos/apropos.sh Sun Jul 5 06:24:06 2009 (r195347) @@ -18,7 +18,6 @@ # $FreeBSD$ -PATH=/bin:/usr/bin:$PATH db=whatis # name of whatis data base grepopt='' From brian at FreeBSD.org Sun Jul 5 06:28:24 2009 From: brian at FreeBSD.org (Brian Somers) Date: Sun Jul 5 06:28:36 2009 Subject: svn commit: r195348 - stable/7/etc Message-ID: <200907050628.n656SNch039124@svn.freebsd.org> Author: brian Date: Sun Jul 5 06:28:23 2009 New Revision: 195348 URL: http://svn.freebsd.org/changeset/base/195348 Log: MFC: Remove HOME= PR: 132135 Modified: stable/7/etc/ (props changed) stable/7/etc/crontab Modified: stable/7/etc/crontab ============================================================================== --- stable/7/etc/crontab Sun Jul 5 06:24:06 2009 (r195347) +++ stable/7/etc/crontab Sun Jul 5 06:28:23 2009 (r195348) @@ -4,7 +4,6 @@ # SHELL=/bin/sh PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin -HOME=/var/log # #minute hour mday month wday who command # From brian at FreeBSD.org Sun Jul 5 06:32:11 2009 From: brian at FreeBSD.org (Brian Somers) Date: Sun Jul 5 06:32:28 2009 Subject: svn commit: r195349 - in stable/7/usr.sbin/lpr: . lp Message-ID: <200907050632.n656WAYV039325@svn.freebsd.org> Author: brian Date: Sun Jul 5 06:32:10 2009 New Revision: 195349 URL: http://svn.freebsd.org/changeset/base/195349 Log: MFC: Add -m and -t options. PR: 129554 Modified: stable/7/usr.sbin/lpr/ (props changed) stable/7/usr.sbin/lpr/lp/lp.1 stable/7/usr.sbin/lpr/lp/lp.sh Modified: stable/7/usr.sbin/lpr/lp/lp.1 ============================================================================== --- stable/7/usr.sbin/lpr/lp/lp.1 Sun Jul 5 06:28:23 2009 (r195348) +++ stable/7/usr.sbin/lpr/lp/lp.1 Sun Jul 5 06:32:10 2009 (r195349) @@ -78,6 +78,8 @@ or .Ev PRINTER (with this precedence) are taken as the destination printer. +.It Fl m +Send mail upon completion. .It Fl n Ar num Specify that .Ar num @@ -91,6 +93,9 @@ Silent operation. Not supported, provided only as a compatibility option for .St -susv2 . +.It Fl t Ar title +Set the job title to +.Ar title . .El .Sh ENVIRONMENT As described above, the variables Modified: stable/7/usr.sbin/lpr/lp/lp.sh ============================================================================== --- stable/7/usr.sbin/lpr/lp/lp.sh Sun Jul 5 06:28:23 2009 (r195348) +++ stable/7/usr.sbin/lpr/lp/lp.sh Sun Jul 5 06:32:10 2009 (r195349) @@ -41,6 +41,8 @@ ncopies="" symlink="-s" +mailafter="" +title="" # Posix says LPDEST gets precedence over PRINTER dest=${LPDEST:-${PRINTER:-lp}} @@ -51,7 +53,7 @@ dest=${LPDEST:-${PRINTER:-lp}} # XXX We include the -s flag as a dummy. SUSv2 requires it, # although we do not yet emit the affected messages. # -while getopts "cd:n:o:s" option +while getopts "cd:mn:o:st:" option do case $option in @@ -59,12 +61,16 @@ do symlink="";; d) # destination dest="${OPTARG}";; + m) # mail after job + mailafter="-m";; n) # number of copies ncopies="-#${OPTARG}";; o) # (printer option) : ;; s) # (silent option) : ;; + t) # title for banner page + title="-J${OPTARG}";; *) # (error msg printed by getopts) exit 2;; esac @@ -72,4 +78,4 @@ done shift $(($OPTIND - 1)) -exec /usr/bin/lpr "-P${dest}" ${symlink} ${ncopies} "$@" +exec /usr/bin/lpr "-P${dest}" ${symlink} ${ncopies} ${mailafter} "${title}" "$@" From jilles at FreeBSD.org Sun Jul 5 13:17:19 2009 From: jilles at FreeBSD.org (Jilles Tjoelker) Date: Sun Jul 5 13:17:26 2009 Subject: svn commit: r195361 - stable/7/usr.bin/ipcs Message-ID: <200907051317.n65DHIk6050159@svn.freebsd.org> Author: jilles Date: Sun Jul 5 13:17:18 2009 New Revision: 195361 URL: http://svn.freebsd.org/changeset/base/195361 Log: MFC ipcs(1) part of r189283 by kib This fixes display of shared memory segment sizes greater than 2 GB in ipcs -b. PR: kern/136226 Approved by: ed (mentor) Modified: stable/7/usr.bin/ipcs/ (props changed) stable/7/usr.bin/ipcs/ipcs.c Modified: stable/7/usr.bin/ipcs/ipcs.c ============================================================================== --- stable/7/usr.bin/ipcs/ipcs.c Sun Jul 5 08:40:26 2009 (r195360) +++ stable/7/usr.bin/ipcs/ipcs.c Sun Jul 5 13:17:18 2009 (r195361) @@ -452,8 +452,8 @@ print_kshmptr(int i, int option, struct kshmptr->u.shm_nattch); if (option & BIGGEST) - printf(" %12d", - kshmptr->u.shm_segsz); + printf(" %12zu", + kshmptr->shm_bsegsz); if (option & PID) printf(" %12d %12d", From ivoras at FreeBSD.org Sun Jul 5 14:03:42 2009 From: ivoras at FreeBSD.org (Ivan Voras) Date: Sun Jul 5 14:03:48 2009 Subject: svn commit: r195362 - head/sys/modules/geom/geom_label Message-ID: <200907051403.n65E3fOp051072@svn.freebsd.org> Author: ivoras Date: Sun Jul 5 14:03:41 2009 New Revision: 195362 URL: http://svn.freebsd.org/changeset/base/195362 Log: Add missing reference to GPT support. Submitted by: Paul B. Mahol onemda at gmail.com Approved by: re (kib) Modified: head/sys/modules/geom/geom_label/Makefile Modified: head/sys/modules/geom/geom_label/Makefile ============================================================================== --- head/sys/modules/geom/geom_label/Makefile Sun Jul 5 13:17:18 2009 (r195361) +++ head/sys/modules/geom/geom_label/Makefile Sun Jul 5 14:03:41 2009 (r195362) @@ -5,6 +5,7 @@ KMOD= geom_label SRCS= g_label.c SRCS+= g_label_ext2fs.c +SRCS+= g_label_gpt.c SRCS+= g_label_iso9660.c SRCS+= g_label_msdosfs.c SRCS+= g_label_ntfs.c From mav at FreeBSD.org Sun Jul 5 14:50:46 2009 From: mav at FreeBSD.org (Alexander Motin) Date: Sun Jul 5 14:50:52 2009 Subject: svn commit: r195363 - in head/sys: conf dev/ata/chipsets Message-ID: <200907051450.n65EojI1052093@svn.freebsd.org> Author: mav Date: Sun Jul 5 14:50:45 2009 New Revision: 195363 URL: http://svn.freebsd.org/changeset/base/195363 Log: Mark atanvidia depending on ataahci since rev.188846. Approved by: re (kib) Modified: head/sys/conf/files head/sys/dev/ata/chipsets/ata-nvidia.c Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Sun Jul 5 14:03:41 2009 (r195362) +++ head/sys/conf/files Sun Jul 5 14:50:45 2009 (r195363) @@ -498,7 +498,8 @@ dev/ata/ata-cbus.c optional ata pc98 | dev/ata/ata-isa.c optional ata isa | ataisa dev/ata/ata-pci.c optional ata pci | atapci dev/ata/chipsets/ata-ahci.c optional ata pci | ataahci | ataacerlabs | \ - ataati | ataintel | atajmicron | atavia + ataati | ataintel | atajmicron | \ + atavia | atanvidia dev/ata/chipsets/ata-acard.c optional ata pci | ataacard dev/ata/chipsets/ata-acerlabs.c optional ata pci | ataacerlabs dev/ata/chipsets/ata-adaptec.c optional ata pci | ataadaptec Modified: head/sys/dev/ata/chipsets/ata-nvidia.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-nvidia.c Sun Jul 5 14:03:41 2009 (r195362) +++ head/sys/dev/ata/chipsets/ata-nvidia.c Sun Jul 5 14:50:45 2009 (r195363) @@ -287,3 +287,4 @@ ata_nvidia_setmode(device_t dev, int mod } ATA_DECLARE_DRIVER(ata_nvidia); +MODULE_DEPEND(ata_nvidia, ata_ahci, 1, 1, 1); From trasz at FreeBSD.org Sun Jul 5 15:25:03 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Sun Jul 5 15:25:14 2009 Subject: svn commit: r195374 - head/sys/modules Message-ID: <200907051525.n65FP2UL053144@svn.freebsd.org> Author: trasz Date: Sun Jul 5 15:25:02 2009 New Revision: 195374 URL: http://svn.freebsd.org/changeset/base/195374 Log: When the kernel is configured without "options FFS", build UFS as a module without requiring any special build flags. Approved by: re (kib) Modified: head/sys/modules/Makefile Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Sun Jul 5 15:23:54 2009 (r195373) +++ head/sys/modules/Makefile Sun Jul 5 15:25:02 2009 (r195374) @@ -271,7 +271,7 @@ SUBDIR= ${_3dfx} \ ubsec \ udf \ udf_iconv \ - ${_ufs} \ + ufs \ unionfs \ usb \ utopia \ @@ -304,10 +304,6 @@ _syscons= syscons _vpo= vpo .endif -.if defined(ALL_MODULES) -_ufs= ufs -.endif - .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) .if exists(${.CURDIR}/../opencrypto) _crypto= crypto From brian at FreeBSD.org Sun Jul 5 16:55:57 2009 From: brian at FreeBSD.org (Brian Somers) Date: Sun Jul 5 16:56:10 2009 Subject: svn commit: r195375 - head/usr.sbin/ppp Message-ID: <200907051655.n65GtvS9054801@svn.freebsd.org> Author: brian Date: Sun Jul 5 16:55:57 2009 New Revision: 195375 URL: http://svn.freebsd.org/changeset/base/195375 Log: Add a missing phrase. Submitted by: Jason McIntyre jmc at kerhand dot co dot uk Approved by: re (kib) Obtained from: OpenBSD MFC after: 3 weeks Modified: head/usr.sbin/ppp/ppp.8.m4 Modified: head/usr.sbin/ppp/ppp.8.m4 ============================================================================== --- head/usr.sbin/ppp/ppp.8.m4 Sun Jul 5 15:25:02 2009 (r195374) +++ head/usr.sbin/ppp/ppp.8.m4 Sun Jul 5 16:55:57 2009 (r195375) @@ -5456,7 +5456,7 @@ keywords. .It RAD_FRAMED_IPV6_PREFIX If this attribute is supplied, the value is substituted for IPV6PREFIX in a command. -You may pass it to such as DHCPv6 for delegating an +You may pass it to an upper layer protocol such as DHCPv6 for delegating an IPv6 prefix to a peer. .It RAD_FRAMED_IPV6_ROUTE The received string is expected to be in the format From sam at FreeBSD.org Sun Jul 5 17:45:49 2009 From: sam at FreeBSD.org (Sam Leffler) Date: Sun Jul 5 17:46:01 2009 Subject: svn commit: r195376 - in head/sys: amd64/include arm/include i386/include ia64/include mips/include powerpc/include sparc64/include sun4v/include Message-ID: <200907051745.n65Hjmdi055792@svn.freebsd.org> Author: sam Date: Sun Jul 5 17:45:48 2009 New Revision: 195376 URL: http://svn.freebsd.org/changeset/base/195376 Log: Cleanup ALIGNED_POINTER: o add to platforms where it was missing (arm, i386, powerpc, sparc64, sun4v) o define as "1" on amd64 and i386 where there is no restriction o make the type returned consistent with ALIGN o remove _ALIGNED_POINTER o make associated comments consistent Reviewed by: bde, imp, marcel Approved by: re (kensmith) Modified: head/sys/amd64/include/param.h head/sys/arm/include/param.h head/sys/i386/include/param.h head/sys/ia64/include/param.h head/sys/mips/include/param.h head/sys/powerpc/include/param.h head/sys/sparc64/include/param.h head/sys/sun4v/include/param.h Modified: head/sys/amd64/include/param.h ============================================================================== --- head/sys/amd64/include/param.h Sun Jul 5 16:55:57 2009 (r195375) +++ head/sys/amd64/include/param.h Sun Jul 5 17:45:48 2009 (r195376) @@ -47,12 +47,6 @@ * Round p (pointer or byte index) up to a correctly-aligned value * for all data types (int, long, ...). The result is u_long and * must be cast to any desired pointer type. - * - * ALIGNED_POINTER is a boolean macro that checks whether an address - * is valid to fetch data elements of type t from on this architecture. - * This does not reflect the optimal alignment, just the possibility - * (within reasonable limits). - * */ #ifndef _ALIGNBYTES #define _ALIGNBYTES (sizeof(long) - 1) @@ -60,9 +54,6 @@ #ifndef _ALIGN #define _ALIGN(p) (((u_long)(p) + _ALIGNBYTES) &~ _ALIGNBYTES) #endif -#ifndef _ALIGNED_POINTER -#define _ALIGNED_POINTER(p,t) ((((u_long)(p)) & (sizeof(t)-1)) == 0) -#endif #ifndef _NO_NAMESPACE_POLLUTION @@ -87,7 +78,13 @@ #define ALIGNBYTES _ALIGNBYTES #define ALIGN(p) _ALIGN(p) -#define ALIGNED_POINTER(p,t) _ALIGNED_POINTER(p,t) +/* + * ALIGNED_POINTER is a boolean macro that checks whether an address + * is valid to fetch data elements of type t from on this architecture. + * This does not reflect the optimal alignment, just the possibility + * (within reasonable limits). + */ +#define ALIGNED_POINTER(p, t) 1 /* * CACHE_LINE_SIZE is the compile-time maximum cache line size for an Modified: head/sys/arm/include/param.h ============================================================================== --- head/sys/arm/include/param.h Sun Jul 5 16:55:57 2009 (r195375) +++ head/sys/arm/include/param.h Sun Jul 5 17:45:48 2009 (r195376) @@ -80,6 +80,13 @@ #define ALIGNBYTES _ALIGNBYTES #define ALIGN(p) _ALIGN(p) +/* + * ALIGNED_POINTER is a boolean macro that checks whether an address + * is valid to fetch data elements of type t from on this architecture. + * This does not reflect the optimal alignment, just the possibility + * (within reasonable limits). + */ +#define ALIGNED_POINTER(p, t) ((((unsigned)(p)) & (sizeof(t)-1)) == 0) /* * CACHE_LINE_SIZE is the compile-time maximum cache line size for an Modified: head/sys/i386/include/param.h ============================================================================== --- head/sys/i386/include/param.h Sun Jul 5 16:55:57 2009 (r195375) +++ head/sys/i386/include/param.h Sun Jul 5 17:45:48 2009 (r195376) @@ -73,6 +73,13 @@ #define ALIGNBYTES _ALIGNBYTES #define ALIGN(p) _ALIGN(p) +/* + * ALIGNED_POINTER is a boolean macro that checks whether an address + * is valid to fetch data elements of type t from on this architecture. + * This does not reflect the optimal alignment, just the possibility + * (within reasonable limits). + */ +#define ALIGNED_POINTER(p, t) 1 /* * CACHE_LINE_SIZE is the compile-time maximum cache line size for an Modified: head/sys/ia64/include/param.h ============================================================================== --- head/sys/ia64/include/param.h Sun Jul 5 16:55:57 2009 (r195375) +++ head/sys/ia64/include/param.h Sun Jul 5 17:45:48 2009 (r195376) @@ -46,12 +46,6 @@ * Round p (pointer or byte index) up to a correctly-aligned value for all * data types (int, long, ...). The result is u_long and must be cast to * any desired pointer type. - * - * ALIGNED_POINTER is a boolean macro that checks whether an address - * is valid to fetch data elements of type t from on this architecture. - * This does not reflect the optimal alignment, just the possibility - * (within reasonable limits). - * */ #ifndef _ALIGNBYTES #define _ALIGNBYTES 15 @@ -59,9 +53,6 @@ #ifndef _ALIGN #define _ALIGN(p) (((u_long)(p) + _ALIGNBYTES) &~ _ALIGNBYTES) #endif -#ifndef _ALIGNED_POINTER -#define _ALIGNED_POINTER(p,t) ((((u_long)(p)) & (sizeof(t)-1)) == 0) -#endif #ifndef _NO_NAMESPACE_POLLUTION @@ -84,20 +75,15 @@ #define MAXCPU 1 #endif +#define ALIGNBYTES _ALIGNBYTES +#define ALIGN(p) _ALIGN(p) /* - * Round p (pointer or byte index) up to a correctly-aligned value for all - * data types (int, long, ...). The result is u_long and must be cast to - * any desired pointer type. - * * ALIGNED_POINTER is a boolean macro that checks whether an address * is valid to fetch data elements of type t from on this architecture. * This does not reflect the optimal alignment, just the possibility * (within reasonable limits). - * */ -#define ALIGNBYTES _ALIGNBYTES -#define ALIGN(p) _ALIGN(p) -#define ALIGNED_POINTER(p,t) _ALIGNED_POINTER(p,t) +#define ALIGNED_POINTER(p,t) ((((u_long)(p)) & (sizeof(t)-1)) == 0) /* * CACHE_LINE_SIZE is the compile-time maximum cache line size for an Modified: head/sys/mips/include/param.h ============================================================================== --- head/sys/mips/include/param.h Sun Jul 5 16:55:57 2009 (r195375) +++ head/sys/mips/include/param.h Sun Jul 5 17:45:48 2009 (r195376) @@ -84,10 +84,16 @@ */ #define _ALIGNBYTES 7 #define _ALIGN(p) (((u_int)(p) + _ALIGNBYTES) &~ _ALIGNBYTES) -#define ALIGNED_POINTER(p, t) ((((u_int32_t)(p)) & (sizeof (t) - 1)) == 0) #define ALIGNBYTES _ALIGNBYTES #define ALIGN(p) _ALIGN(p) +/* + * ALIGNED_POINTER is a boolean macro that checks whether an address + * is valid to fetch data elements of type t from on this architecture. + * This does not reflect the optimal alignment, just the possibility + * (within reasonable limits). + */ +#define ALIGNED_POINTER(p, t) ((((unsigned)(p)) & (sizeof (t) - 1)) == 0) /* * CACHE_LINE_SIZE is the compile-time maximum cache line size for an Modified: head/sys/powerpc/include/param.h ============================================================================== --- head/sys/powerpc/include/param.h Sun Jul 5 16:55:57 2009 (r195375) +++ head/sys/powerpc/include/param.h Sun Jul 5 17:45:48 2009 (r195376) @@ -78,6 +78,13 @@ #define ALIGNBYTES _ALIGNBYTES #define ALIGN(p) _ALIGN(p) +/* + * ALIGNED_POINTER is a boolean macro that checks whether an address + * is valid to fetch data elements of type t from on this architecture. + * This does not reflect the optimal alignment, just the possibility + * (within reasonable limits). + */ +#define ALIGNED_POINTER(p, t) ((((unsigned)(p)) & (sizeof (t) - 1)) == 0) /* * CACHE_LINE_SIZE is the compile-time maximum cache line size for an Modified: head/sys/sparc64/include/param.h ============================================================================== --- head/sys/sparc64/include/param.h Sun Jul 5 16:55:57 2009 (r195375) +++ head/sys/sparc64/include/param.h Sun Jul 5 17:45:48 2009 (r195376) @@ -70,6 +70,13 @@ #define ALIGNBYTES _ALIGNBYTES #define ALIGN(p) _ALIGN(p) +/* + * ALIGNED_POINTER is a boolean macro that checks whether an address + * is valid to fetch data elements of type t from on this architecture. + * This does not reflect the optimal alignment, just the possibility + * (within reasonable limits). + */ +#define ALIGNED_POINTER(p, t) ((((u_long)(p)) & (sizeof (t) - 1)) == 0) /* * CACHE_LINE_SIZE is the compile-time maximum cache line size for an Modified: head/sys/sun4v/include/param.h ============================================================================== --- head/sys/sun4v/include/param.h Sun Jul 5 16:55:57 2009 (r195375) +++ head/sys/sun4v/include/param.h Sun Jul 5 17:45:48 2009 (r195376) @@ -70,6 +70,13 @@ #define ALIGNBYTES _ALIGNBYTES #define ALIGN(p) _ALIGN(p) +/* + * ALIGNED_POINTER is a boolean macro that checks whether an address + * is valid to fetch data elements of type t from on this architecture. + * This does not reflect the optimal alignment, just the possibility + * (within reasonable limits). + */ +#define ALIGNED_POINTER(p, t) ((((u_long)(p)) & (sizeof (t) - 1)) == 0) /* * CACHE_LINE_SIZE is the compile-time maximum cache line size for an From sam at FreeBSD.org Sun Jul 5 17:59:20 2009 From: sam at FreeBSD.org (Sam Leffler) Date: Sun Jul 5 17:59:26 2009 Subject: svn commit: r195377 - in head/sys: conf dev/mwl net80211 Message-ID: <200907051759.n65HxJ3v056078@svn.freebsd.org> Author: sam Date: Sun Jul 5 17:59:19 2009 New Revision: 195377 URL: http://svn.freebsd.org/changeset/base/195377 Log: Revamp 802.11 action frame handling: o add a new facility for components to register send+recv handlers o ieee80211_send_action and ieee80211_recv_action now use the registered handlers to dispatch operations o rev ieee80211_send_action api to enable passing arbitrary data o rev ieee80211_recv_action api to pass the 802.11 frame header as it may be difficult to locate o update existing IEEE80211_ACTION_CAT_BA and IEEE80211_ACTION_CAT_HT handling o update mwl for api rev Reviewed by: rpaulo Approved by: re (kensmith) Added: head/sys/net80211/ieee80211_action.c (contents, props changed) head/sys/net80211/ieee80211_action.h (contents, props changed) Modified: head/sys/conf/files head/sys/dev/mwl/if_mwl.c head/sys/dev/mwl/if_mwlvar.h head/sys/net80211/ieee80211_adhoc.c head/sys/net80211/ieee80211_hostap.c head/sys/net80211/ieee80211_ht.c head/sys/net80211/ieee80211_ht.h head/sys/net80211/ieee80211_sta.c head/sys/net80211/ieee80211_var.h head/sys/net80211/ieee80211_wds.c Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Sun Jul 5 17:45:48 2009 (r195376) +++ head/sys/conf/files Sun Jul 5 17:59:19 2009 (r195377) @@ -2231,6 +2231,7 @@ net/zlib.c optional crypto | geom_uzip ddb_ctf net80211/ieee80211.c optional wlan net80211/ieee80211_acl.c optional wlan wlan_acl +net80211/ieee80211_action.c optional wlan net80211/ieee80211_adhoc.c optional wlan net80211/ieee80211_amrr.c optional wlan wlan_amrr net80211/ieee80211_crypto.c optional wlan Modified: head/sys/dev/mwl/if_mwl.c ============================================================================== --- head/sys/dev/mwl/if_mwl.c Sun Jul 5 17:45:48 2009 (r195376) +++ head/sys/dev/mwl/if_mwl.c Sun Jul 5 17:59:19 2009 (r195377) @@ -144,7 +144,8 @@ static void mwl_tx_proc(void *, int); static int mwl_chan_set(struct mwl_softc *, struct ieee80211_channel *); static void mwl_draintxq(struct mwl_softc *); static void mwl_cleartxq(struct mwl_softc *, struct ieee80211vap *); -static void mwl_recv_action(struct ieee80211_node *, +static int mwl_recv_action(struct ieee80211_node *, + const struct ieee80211_frame *, const uint8_t *, const uint8_t *); static int mwl_addba_request(struct ieee80211_node *, struct ieee80211_tx_ampdu *, int dialogtoken, @@ -3656,8 +3657,9 @@ mwl_cleartxq(struct mwl_softc *sc, struc } } -static void -mwl_recv_action(struct ieee80211_node *ni, const uint8_t *frm, const uint8_t *efrm) +static int +mwl_recv_action(struct ieee80211_node *ni, const struct ieee80211_frame *wh, + const uint8_t *frm, const uint8_t *efrm) { struct mwl_softc *sc = ni->ni_ic->ic_ifp->if_softc; const struct ieee80211_action *ia; @@ -3671,8 +3673,9 @@ mwl_recv_action(struct ieee80211_node *n mwl_hal_setmimops(sc->sc_mh, ni->ni_macaddr, mps->am_control & IEEE80211_A_HT_MIMOPWRSAVE_ENA, MS(mps->am_control, IEEE80211_A_HT_MIMOPWRSAVE_MODE)); + return 0; } else - sc->sc_recv_action(ni, frm, efrm); + return sc->sc_recv_action(ni, wh, frm, efrm); } static int Modified: head/sys/dev/mwl/if_mwlvar.h ============================================================================== --- head/sys/dev/mwl/if_mwlvar.h Sun Jul 5 17:45:48 2009 (r195376) +++ head/sys/dev/mwl/if_mwlvar.h Sun Jul 5 17:59:19 2009 (r195377) @@ -289,7 +289,8 @@ struct mwl_softc { enum ieee80211_state, int); void (*sc_node_cleanup)(struct ieee80211_node *); void (*sc_node_drain)(struct ieee80211_node *); - void (*sc_recv_action)(struct ieee80211_node *, + int (*sc_recv_action)(struct ieee80211_node *, + const struct ieee80211_frame *, const uint8_t *, const uint8_t *); int (*sc_addba_request)(struct ieee80211_node *, struct ieee80211_tx_ampdu *, Added: head/sys/net80211/ieee80211_action.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/net80211/ieee80211_action.c Sun Jul 5 17:59:19 2009 (r195377) @@ -0,0 +1,291 @@ +/*- + * Copyright (c) 2009 Sam Leffler, Errno Consulting + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#ifdef __FreeBSD__ +__FBSDID("$FreeBSD$"); +#endif + +/* + * IEEE 802.11 send/recv action frame support. + */ + +#include "opt_inet.h" +#include "opt_wlan.h" + +#include +#include +#include + +#include + +#include +#include +#include + +#include +#include + +static int +send_inval(struct ieee80211_node *ni, int cat, int act, void *sa) +{ + return EINVAL; +} + +static ieee80211_send_action_func *ba_send_action[8] = { + send_inval, send_inval, send_inval, send_inval, + send_inval, send_inval, send_inval, send_inval, +}; +static ieee80211_send_action_func *ht_send_action[8] = { + send_inval, send_inval, send_inval, send_inval, + send_inval, send_inval, send_inval, send_inval, +}; +/* NB: temporary until 802.11s support is added */ +#ifdef IEEE80211_ACTION_CAT_MESHPEERING +static ieee80211_send_action_func *meshpl_send_action[8] = { + send_inval, send_inval, send_inval, send_inval, + send_inval, send_inval, send_inval, send_inval, +}; +static ieee80211_send_action_func *meshlm_send_action[4] = { + send_inval, send_inval, send_inval, send_inval, +}; +static ieee80211_send_action_func *hwmp_send_action[8] = { + send_inval, send_inval, send_inval, send_inval, + send_inval, send_inval, send_inval, send_inval, +}; +#endif +static ieee80211_send_action_func *vendor_send_action[8] = { + send_inval, send_inval, send_inval, send_inval, + send_inval, send_inval, send_inval, send_inval, +}; + +int +ieee80211_send_action_register(int cat, int act, ieee80211_send_action_func *f) +{ +#define N(a) (sizeof(a) / sizeof(a[0])) + switch (cat) { + case IEEE80211_ACTION_CAT_BA: + if (act >= N(ba_send_action)) + break; + ba_send_action[act] = f; + return 0; + case IEEE80211_ACTION_CAT_HT: + if (act >= N(ht_send_action)) + break; + ht_send_action[act] = f; + return 0; +#ifdef IEEE80211_ACTION_CAT_MESHPEERING + case IEEE80211_ACTION_CAT_MESHPEERING: + if (act >= N(meshpl_send_action)) + break; + meshpl_send_action[act] = f; + return 0; + case IEEE80211_ACTION_CAT_MESHLMETRIC: + if (act >= N(meshlm_send_action)) + break; + meshlm_send_action[act] = f; + return 0; + case IEEE80211_ACTION_CAT_MESHPATH: + if (act > N(hwmp_send_action)) + break; + hwmp_send_action[act] = f; + return 0; +#endif + case IEEE80211_ACTION_CAT_VENDOR: + if (act >= N(vendor_send_action)) + break; + vendor_send_action[act] = f; + return 0; + } + return EINVAL; +#undef N +} + +void +ieee80211_send_action_unregister(int cat, int act) +{ + ieee80211_send_action_register(cat, act, send_inval); +} + +int +ieee80211_send_action(struct ieee80211_node *ni, int cat, int act, void *sa) +{ +#define N(a) (sizeof(a) / sizeof(a[0])) + ieee80211_send_action_func *f = send_inval; + + switch (cat) { + case IEEE80211_ACTION_CAT_BA: + if (act < N(ba_send_action)) + f = ba_send_action[act]; + break; + case IEEE80211_ACTION_CAT_HT: + if (act < N(ht_send_action)) + f = ht_send_action[act]; + break; +#ifdef IEEE80211_ACTION_CAT_MESHPEERING + case IEEE80211_ACTION_CAT_MESHPEERING: + if (act < N(meshpl_send_action)) + f = meshpl_send_action[act]; + break; + case IEEE80211_ACTION_CAT_MESHLMETRIC: + if (act < N(meshlm_send_action)) + f = meshlm_send_action[act]; + break; + case IEEE80211_ACTION_CAT_MESHPATH: + if (act < N(hwmp_send_action)) + f = hwmp_send_action[act]; + break; +#endif + case IEEE80211_ACTION_CAT_VENDOR: + if (act < N(vendor_send_action)) + f = vendor_send_action[act]; + break; + } + return f(ni, cat, act, sa); +#undef N +} + +static int +recv_inval(struct ieee80211_node *ni, const struct ieee80211_frame *wh, + const uint8_t *frm, const uint8_t *efrm) +{ + return EINVAL; +} + +static ieee80211_recv_action_func *ba_recv_action[8] = { + recv_inval, recv_inval, recv_inval, recv_inval, + recv_inval, recv_inval, recv_inval, recv_inval, +}; +static ieee80211_recv_action_func *ht_recv_action[8] = { + recv_inval, recv_inval, recv_inval, recv_inval, + recv_inval, recv_inval, recv_inval, recv_inval, +}; +#ifdef IEEE80211_ACTION_CAT_MESHPEERING +static ieee80211_recv_action_func *meshpl_recv_action[8] = { + recv_inval, recv_inval, recv_inval, recv_inval, + recv_inval, recv_inval, recv_inval, recv_inval, +}; +static ieee80211_recv_action_func *meshlm_recv_action[4] = { + recv_inval, recv_inval, recv_inval, recv_inval, +}; +static ieee80211_recv_action_func *hwmp_recv_action[8] = { + recv_inval, recv_inval, recv_inval, recv_inval, + recv_inval, recv_inval, recv_inval, recv_inval, +}; +#endif +static ieee80211_recv_action_func *vendor_recv_action[8] = { + recv_inval, recv_inval, recv_inval, recv_inval, + recv_inval, recv_inval, recv_inval, recv_inval, +}; + +int +ieee80211_recv_action_register(int cat, int act, ieee80211_recv_action_func *f) +{ +#define N(a) (sizeof(a) / sizeof(a[0])) + switch (cat) { + case IEEE80211_ACTION_CAT_BA: + if (act >= N(ba_recv_action)) + break; + ba_recv_action[act] = f; + return 0; + case IEEE80211_ACTION_CAT_HT: + if (act >= N(ht_recv_action)) + break; + ht_recv_action[act] = f; + return 0; +#ifdef IEEE80211_ACTION_CAT_MESHPEERING + case IEEE80211_ACTION_CAT_MESHPEERING: + if (act >= N(meshpl_recv_action)) + break; + meshpl_recv_action[act] = f; + return 0; + case IEEE80211_ACTION_CAT_MESHLMETRIC: + if (act >= N(meshlm_recv_action)) + break; + meshlm_recv_action[act] = f; + return 0; + case IEEE80211_ACTION_CAT_MESHPATH: + if (act >= N(hwmp_recv_action)) + break; + hwmp_recv_action[act] = f; + return 0; +#endif + case IEEE80211_ACTION_CAT_VENDOR: + if (act >= N(vendor_recv_action)) + break; + vendor_recv_action[act] = f; + return 0; + } + return EINVAL; +#undef N +} + +void +ieee80211_recv_action_unregister(int cat, int act) +{ + ieee80211_recv_action_register(cat, act, recv_inval); +} + +int +ieee80211_recv_action(struct ieee80211_node *ni, + const struct ieee80211_frame *wh, + const uint8_t *frm, const uint8_t *efrm) +{ +#define N(a) (sizeof(a) / sizeof(a[0])) + ieee80211_recv_action_func *f = recv_inval; + const struct ieee80211_action *ia = + (const struct ieee80211_action *) frm; + + switch (ia->ia_category) { + case IEEE80211_ACTION_CAT_BA: + if (ia->ia_action < N(ba_recv_action)) + f = ba_recv_action[ia->ia_action]; + break; + case IEEE80211_ACTION_CAT_HT: + if (ia->ia_action < N(ht_recv_action)) + f = ht_recv_action[ia->ia_action]; + break; +#ifdef IEEE80211_ACTION_CAT_MESHPEERING + case IEEE80211_ACTION_CAT_MESHPEERING: + if (ia->ia_action < N(meshpl_recv_action)) + f = meshpl_recv_action[ia->ia_action]; + break; + case IEEE80211_ACTION_CAT_MESHLMETRIC: + if (ia->ia_action < N(meshlm_recv_action)) + f = meshlm_recv_action[ia->ia_action]; + break; + case IEEE80211_ACTION_CAT_MESHPATH: + if (ia->ia_action < N(hwmp_recv_action)) + f = hwmp_recv_action[ia->ia_action]; + break; +#endif + case IEEE80211_ACTION_CAT_VENDOR: + if (ia->ia_action < N(vendor_recv_action)) + f = vendor_recv_action[ia->ia_action]; + break; + } + return f(ni, wh, frm, efrm); +#undef N +} Added: head/sys/net80211/ieee80211_action.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/net80211/ieee80211_action.h Sun Jul 5 17:59:19 2009 (r195377) @@ -0,0 +1,52 @@ +/*- + * Copyright (c) 2009 Sam Leffler, Errno Consulting + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ + */ +#ifndef _NET80211_IEEE80211_ACTION_H_ +#define _NET80211_IEEE80211_ACTION_H_ + +/* + * 802.11 send/recv action frame support. + */ + +struct ieee80211_node; +struct ieee80211_frame; + +typedef int ieee80211_send_action_func(struct ieee80211_node *, + int, int, void *); +int ieee80211_send_action_register(int cat, int act, + ieee80211_send_action_func *f); +void ieee80211_send_action_unregister(int cat, int act); +int ieee80211_send_action(struct ieee80211_node *, int, int, void *); + +typedef int ieee80211_recv_action_func(struct ieee80211_node *, + const struct ieee80211_frame *, const uint8_t *, const uint8_t *); +int ieee80211_recv_action_register(int cat, int act, + ieee80211_recv_action_func *); +void ieee80211_recv_action_unregister(int cat, int act); +int ieee80211_recv_action(struct ieee80211_node *, + const struct ieee80211_frame *, + const uint8_t *, const uint8_t *); +#endif /* _NET80211_IEEE80211_ACTION_H_ */ Modified: head/sys/net80211/ieee80211_adhoc.c ============================================================================== --- head/sys/net80211/ieee80211_adhoc.c Sun Jul 5 17:45:48 2009 (r195376) +++ head/sys/net80211/ieee80211_adhoc.c Sun Jul 5 17:59:19 2009 (r195377) @@ -879,7 +879,7 @@ adhoc_recv_mgmt(struct ieee80211_node *n } break; } - ic->ic_recv_action(ni, frm, efrm); + ic->ic_recv_action(ni, wh, frm, efrm); break; } Modified: head/sys/net80211/ieee80211_hostap.c ============================================================================== --- head/sys/net80211/ieee80211_hostap.c Sun Jul 5 17:45:48 2009 (r195376) +++ head/sys/net80211/ieee80211_hostap.c Sun Jul 5 17:59:19 2009 (r195377) @@ -2189,7 +2189,7 @@ hostap_recv_mgmt(struct ieee80211_node * case IEEE80211_FC0_SUBTYPE_ACTION: if (vap->iv_state == IEEE80211_S_RUN) { if (ieee80211_parse_action(ni, m0) == 0) - ic->ic_recv_action(ni, frm, efrm); + ic->ic_recv_action(ni, wh, frm, efrm); } else vap->iv_stats.is_rx_mgtdiscard++; break; Modified: head/sys/net80211/ieee80211_ht.c ============================================================================== --- head/sys/net80211/ieee80211_ht.c Sun Jul 5 17:45:48 2009 (r195376) +++ head/sys/net80211/ieee80211_ht.c Sun Jul 5 17:59:19 2009 (r195377) @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include /* define here, used throughout file */ @@ -104,20 +105,52 @@ SYSCTL_INT(_net_wlan, OID_AUTO, addba_ma static int ieee80211_bar_timeout = -1; /* timeout waiting for BAR response */ static int ieee80211_bar_maxtries = 50;/* max BAR requests before DELBA */ -/* - * Setup HT parameters that depends on the clock frequency. - */ +static ieee80211_recv_action_func ht_recv_action_ba_addba_request; +static ieee80211_recv_action_func ht_recv_action_ba_addba_response; +static ieee80211_recv_action_func ht_recv_action_ba_delba; +static ieee80211_recv_action_func ht_recv_action_ht_mimopwrsave; +static ieee80211_recv_action_func ht_recv_action_ht_txchwidth; + +static ieee80211_send_action_func ht_send_action_ba_addba; +static ieee80211_send_action_func ht_send_action_ba_delba; +static ieee80211_send_action_func ht_send_action_ht_txchwidth; + static void -ieee80211_ht_setup(void) +ieee80211_ht_init(void) { + /* + * Setup HT parameters that depends on the clock frequency. + */ #ifdef IEEE80211_AMPDU_AGE ieee80211_ampdu_age = msecs_to_ticks(500); #endif ieee80211_addba_timeout = msecs_to_ticks(250); ieee80211_addba_backoff = msecs_to_ticks(10*1000); ieee80211_bar_timeout = msecs_to_ticks(250); + /* + * Register action frame handlers. + */ + ieee80211_recv_action_register(IEEE80211_ACTION_CAT_BA, + IEEE80211_ACTION_BA_ADDBA_REQUEST, ht_recv_action_ba_addba_request); + ieee80211_recv_action_register(IEEE80211_ACTION_CAT_BA, + IEEE80211_ACTION_BA_ADDBA_RESPONSE, ht_recv_action_ba_addba_response); + ieee80211_recv_action_register(IEEE80211_ACTION_CAT_BA, + IEEE80211_ACTION_BA_DELBA, ht_recv_action_ba_delba); + ieee80211_recv_action_register(IEEE80211_ACTION_CAT_HT, + IEEE80211_ACTION_HT_MIMOPWRSAVE, ht_recv_action_ht_mimopwrsave); + ieee80211_recv_action_register(IEEE80211_ACTION_CAT_HT, + IEEE80211_ACTION_HT_TXCHWIDTH, ht_recv_action_ht_txchwidth); + + ieee80211_send_action_register(IEEE80211_ACTION_CAT_BA, + IEEE80211_ACTION_BA_ADDBA_REQUEST, ht_send_action_ba_addba); + ieee80211_send_action_register(IEEE80211_ACTION_CAT_BA, + IEEE80211_ACTION_BA_ADDBA_RESPONSE, ht_send_action_ba_addba); + ieee80211_send_action_register(IEEE80211_ACTION_CAT_BA, + IEEE80211_ACTION_BA_DELBA, ht_send_action_ba_delba); + ieee80211_send_action_register(IEEE80211_ACTION_CAT_HT, + IEEE80211_ACTION_HT_TXCHWIDTH, ht_send_action_ht_txchwidth); } -SYSINIT(wlan_ht, SI_SUB_DRIVERS, SI_ORDER_FIRST, ieee80211_ht_setup, NULL); +SYSINIT(wlan_ht, SI_SUB_DRIVERS, SI_ORDER_FIRST, ieee80211_ht_init, NULL); static int ieee80211_ampdu_enable(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap); @@ -129,8 +162,6 @@ static int ieee80211_addba_response(stru int code, int baparamset, int batimeout); static void ieee80211_addba_stop(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap); -static void ieee80211_aggr_recv_action(struct ieee80211_node *ni, - const uint8_t *frm, const uint8_t *efrm); static void ieee80211_bar_response(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap, int status); static void ampdu_tx_stop(struct ieee80211_tx_ampdu *tap); @@ -143,7 +174,7 @@ void ieee80211_ht_attach(struct ieee80211com *ic) { /* setup default aggregation policy */ - ic->ic_recv_action = ieee80211_aggr_recv_action; + ic->ic_recv_action = ieee80211_recv_action; ic->ic_send_action = ieee80211_send_action; ic->ic_ampdu_enable = ieee80211_ampdu_enable; ic->ic_addba_request = ieee80211_addba_request; @@ -1580,247 +1611,221 @@ ieee80211_addba_stop(struct ieee80211_no * update our aggregation state. All other frames are passed up * for processing by ieee80211_recv_action. */ -static void -ieee80211_aggr_recv_action(struct ieee80211_node *ni, +static int +ht_recv_action_ba_addba_request(struct ieee80211_node *ni, + const struct ieee80211_frame *wh, const uint8_t *frm, const uint8_t *efrm) { struct ieee80211com *ic = ni->ni_ic; struct ieee80211vap *vap = ni->ni_vap; - const struct ieee80211_action *ia; struct ieee80211_rx_ampdu *rap; - struct ieee80211_tx_ampdu *tap; - uint8_t dialogtoken, policy; - uint16_t baparamset, batimeout, baseqctl, code; + uint8_t dialogtoken; + uint16_t baparamset, batimeout, baseqctl; uint16_t args[4]; - int tid, ac, bufsiz; + int tid; - ia = (const struct ieee80211_action *) frm; - switch (ia->ia_category) { - case IEEE80211_ACTION_CAT_BA: - switch (ia->ia_action) { - case IEEE80211_ACTION_BA_ADDBA_REQUEST: - dialogtoken = frm[2]; - baparamset = LE_READ_2(frm+3); - batimeout = LE_READ_2(frm+5); - baseqctl = LE_READ_2(frm+7); + dialogtoken = frm[2]; + baparamset = LE_READ_2(frm+3); + batimeout = LE_READ_2(frm+5); + baseqctl = LE_READ_2(frm+7); + + tid = MS(baparamset, IEEE80211_BAPS_TID); + + IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, + "recv ADDBA request: dialogtoken %u baparamset 0x%x " + "(tid %d bufsiz %d) batimeout %d baseqctl %d:%d", + dialogtoken, baparamset, + tid, MS(baparamset, IEEE80211_BAPS_BUFSIZ), + batimeout, + MS(baseqctl, IEEE80211_BASEQ_START), + MS(baseqctl, IEEE80211_BASEQ_FRAG)); - tid = MS(baparamset, IEEE80211_BAPS_TID); + rap = &ni->ni_rx_ampdu[tid]; - IEEE80211_NOTE(vap, - IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, - "recv ADDBA request: dialogtoken %u " - "baparamset 0x%x (tid %d bufsiz %d) batimeout %d " - "baseqctl %d:%d", - dialogtoken, baparamset, - tid, MS(baparamset, IEEE80211_BAPS_BUFSIZ), - batimeout, - MS(baseqctl, IEEE80211_BASEQ_START), - MS(baseqctl, IEEE80211_BASEQ_FRAG)); + /* Send ADDBA response */ + args[0] = dialogtoken; + /* + * NB: We ack only if the sta associated with HT and + * the ap is configured to do AMPDU rx (the latter + * violates the 11n spec and is mostly for testing). + */ + if ((ni->ni_flags & IEEE80211_NODE_AMPDU_RX) && + (vap->iv_flags_ht & IEEE80211_FHT_AMPDU_RX)) { + /* XXX handle ampdu_rx_start failure */ + ic->ic_ampdu_rx_start(ni, rap, + baparamset, batimeout, baseqctl); - rap = &ni->ni_rx_ampdu[tid]; + args[1] = IEEE80211_STATUS_SUCCESS; + } else { + IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, + ni, "reject ADDBA request: %s", + ni->ni_flags & IEEE80211_NODE_AMPDU_RX ? + "administratively disabled" : + "not negotiated for station"); + vap->iv_stats.is_addba_reject++; + args[1] = IEEE80211_STATUS_UNSPECIFIED; + } + /* XXX honor rap flags? */ + args[2] = IEEE80211_BAPS_POLICY_IMMEDIATE + | SM(tid, IEEE80211_BAPS_TID) + | SM(rap->rxa_wnd, IEEE80211_BAPS_BUFSIZ) + ; + args[3] = 0; + ic->ic_send_action(ni, IEEE80211_ACTION_CAT_BA, + IEEE80211_ACTION_BA_ADDBA_RESPONSE, args); + return 0; +} - /* Send ADDBA response */ - args[0] = dialogtoken; - /* - * NB: We ack only if the sta associated with HT and - * the ap is configured to do AMPDU rx (the latter - * violates the 11n spec and is mostly for testing). - */ - if ((ni->ni_flags & IEEE80211_NODE_AMPDU_RX) && - (vap->iv_flags_ht & IEEE80211_FHT_AMPDU_RX)) { - /* XXX handle ampdu_rx_start failure */ - ic->ic_ampdu_rx_start(ni, rap, - baparamset, batimeout, baseqctl); +static int +ht_recv_action_ba_addba_response(struct ieee80211_node *ni, + const struct ieee80211_frame *wh, + const uint8_t *frm, const uint8_t *efrm) +{ + struct ieee80211com *ic = ni->ni_ic; + struct ieee80211vap *vap = ni->ni_vap; + struct ieee80211_tx_ampdu *tap; + uint8_t dialogtoken, policy; + uint16_t baparamset, batimeout, code; + int tid, ac, bufsiz; - args[1] = IEEE80211_STATUS_SUCCESS; - } else { - IEEE80211_NOTE(vap, - IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, - ni, "reject ADDBA request: %s", - ni->ni_flags & IEEE80211_NODE_AMPDU_RX ? - "administratively disabled" : - "not negotiated for station"); - vap->iv_stats.is_addba_reject++; - args[1] = IEEE80211_STATUS_UNSPECIFIED; - } - /* XXX honor rap flags? */ - args[2] = IEEE80211_BAPS_POLICY_IMMEDIATE - | SM(tid, IEEE80211_BAPS_TID) - | SM(rap->rxa_wnd, IEEE80211_BAPS_BUFSIZ) - ; - args[3] = 0; - ic->ic_send_action(ni, IEEE80211_ACTION_CAT_BA, - IEEE80211_ACTION_BA_ADDBA_RESPONSE, args); - return; - - case IEEE80211_ACTION_BA_ADDBA_RESPONSE: - dialogtoken = frm[2]; - code = LE_READ_2(frm+3); - baparamset = LE_READ_2(frm+5); - tid = MS(baparamset, IEEE80211_BAPS_TID); - bufsiz = MS(baparamset, IEEE80211_BAPS_BUFSIZ); - policy = MS(baparamset, IEEE80211_BAPS_POLICY); - batimeout = LE_READ_2(frm+7); - - ac = TID_TO_WME_AC(tid); - tap = &ni->ni_tx_ampdu[ac]; - if ((tap->txa_flags & IEEE80211_AGGR_XCHGPEND) == 0) { - IEEE80211_DISCARD_MAC(vap, - IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, - ni->ni_macaddr, "ADDBA response", - "no pending ADDBA, tid %d dialogtoken %u " - "code %d", tid, dialogtoken, code); - vap->iv_stats.is_addba_norequest++; - return; - } - if (dialogtoken != tap->txa_token) { - IEEE80211_DISCARD_MAC(vap, - IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, - ni->ni_macaddr, "ADDBA response", - "dialogtoken mismatch: waiting for %d, " - "received %d, tid %d code %d", - tap->txa_token, dialogtoken, tid, code); - vap->iv_stats.is_addba_badtoken++; - return; - } - /* NB: assumes IEEE80211_AGGR_IMMEDIATE is 1 */ - if (policy != (tap->txa_flags & IEEE80211_AGGR_IMMEDIATE)) { - IEEE80211_DISCARD_MAC(vap, - IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, - ni->ni_macaddr, "ADDBA response", - "policy mismatch: expecting %s, " - "received %s, tid %d code %d", - tap->txa_flags & IEEE80211_AGGR_IMMEDIATE, - policy, tid, code); - vap->iv_stats.is_addba_badpolicy++; - return; - } + dialogtoken = frm[2]; + code = LE_READ_2(frm+3); + baparamset = LE_READ_2(frm+5); + tid = MS(baparamset, IEEE80211_BAPS_TID); + bufsiz = MS(baparamset, IEEE80211_BAPS_BUFSIZ); + policy = MS(baparamset, IEEE80211_BAPS_POLICY); + batimeout = LE_READ_2(frm+7); + + ac = TID_TO_WME_AC(tid); + tap = &ni->ni_tx_ampdu[ac]; + if ((tap->txa_flags & IEEE80211_AGGR_XCHGPEND) == 0) { + IEEE80211_DISCARD_MAC(vap, + IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, + ni->ni_macaddr, "ADDBA response", + "no pending ADDBA, tid %d dialogtoken %u " + "code %d", tid, dialogtoken, code); + vap->iv_stats.is_addba_norequest++; + return 0; + } + if (dialogtoken != tap->txa_token) { + IEEE80211_DISCARD_MAC(vap, + IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, + ni->ni_macaddr, "ADDBA response", + "dialogtoken mismatch: waiting for %d, " + "received %d, tid %d code %d", + tap->txa_token, dialogtoken, tid, code); + vap->iv_stats.is_addba_badtoken++; + return 0; + } + /* NB: assumes IEEE80211_AGGR_IMMEDIATE is 1 */ + if (policy != (tap->txa_flags & IEEE80211_AGGR_IMMEDIATE)) { + IEEE80211_DISCARD_MAC(vap, + IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, + ni->ni_macaddr, "ADDBA response", + "policy mismatch: expecting %s, " + "received %s, tid %d code %d", + tap->txa_flags & IEEE80211_AGGR_IMMEDIATE, + policy, tid, code); + vap->iv_stats.is_addba_badpolicy++; + return 0; + } #if 0 - /* XXX we take MIN in ieee80211_addba_response */ - if (bufsiz > IEEE80211_AGGR_BAWMAX) { - IEEE80211_DISCARD_MAC(vap, - IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, - ni->ni_macaddr, "ADDBA response", - "BA window too large: max %d, " - "received %d, tid %d code %d", - bufsiz, IEEE80211_AGGR_BAWMAX, tid, code); - vap->iv_stats.is_addba_badbawinsize++; - return; - } + /* XXX we take MIN in ieee80211_addba_response */ + if (bufsiz > IEEE80211_AGGR_BAWMAX) { + IEEE80211_DISCARD_MAC(vap, + IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, + ni->ni_macaddr, "ADDBA response", + "BA window too large: max %d, " + "received %d, tid %d code %d", + bufsiz, IEEE80211_AGGR_BAWMAX, tid, code); + vap->iv_stats.is_addba_badbawinsize++; + return 0; + } #endif - IEEE80211_NOTE(vap, - IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, - "recv ADDBA response: dialogtoken %u code %d " - "baparamset 0x%x (tid %d bufsiz %d) batimeout %d", - dialogtoken, code, baparamset, tid, bufsiz, - batimeout); - ic->ic_addba_response(ni, tap, - code, baparamset, batimeout); - return; - - case IEEE80211_ACTION_BA_DELBA: - baparamset = LE_READ_2(frm+2); - code = LE_READ_2(frm+4); + IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, + "recv ADDBA response: dialogtoken %u code %d " + "baparamset 0x%x (tid %d bufsiz %d) batimeout %d", + dialogtoken, code, baparamset, tid, bufsiz, + batimeout); + ic->ic_addba_response(ni, tap, code, baparamset, batimeout); + return 0; +} - tid = MS(baparamset, IEEE80211_DELBAPS_TID); +static int +ht_recv_action_ba_delba(struct ieee80211_node *ni, + const struct ieee80211_frame *wh, + const uint8_t *frm, const uint8_t *efrm) +{ + struct ieee80211com *ic = ni->ni_ic; + struct ieee80211_rx_ampdu *rap; + struct ieee80211_tx_ampdu *tap; + uint16_t baparamset, code; + int tid, ac; - IEEE80211_NOTE(vap, - IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, - "recv DELBA: baparamset 0x%x (tid %d initiator %d) " - "code %d", baparamset, tid, - MS(baparamset, IEEE80211_DELBAPS_INIT), code); - - if ((baparamset & IEEE80211_DELBAPS_INIT) == 0) { - ac = TID_TO_WME_AC(tid); - tap = &ni->ni_tx_ampdu[ac]; - ic->ic_addba_stop(ni, tap); - } else { - rap = &ni->ni_rx_ampdu[tid]; - ic->ic_ampdu_rx_stop(ni, rap); - } - return; - } - break; + baparamset = LE_READ_2(frm+2); + code = LE_READ_2(frm+4); + + tid = MS(baparamset, IEEE80211_DELBAPS_TID); + + IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, + "recv DELBA: baparamset 0x%x (tid %d initiator %d) " + "code %d", baparamset, tid, + MS(baparamset, IEEE80211_DELBAPS_INIT), code); + + if ((baparamset & IEEE80211_DELBAPS_INIT) == 0) { + ac = TID_TO_WME_AC(tid); + tap = &ni->ni_tx_ampdu[ac]; + ic->ic_addba_stop(ni, tap); + } else { + rap = &ni->ni_rx_ampdu[tid]; + ic->ic_ampdu_rx_stop(ni, rap); } - ieee80211_recv_action(ni, frm, efrm); + return 0; } -/* - * Process a received 802.11n action frame. - * Aggregation-related frames are assumed to be handled - * already; we handle any other frames we can, otherwise - * complain about being unsupported (with debugging). - */ -void -ieee80211_recv_action(struct ieee80211_node *ni, +static int +ht_recv_action_ht_txchwidth(struct ieee80211_node *ni, + const struct ieee80211_frame *wh, const uint8_t *frm, const uint8_t *efrm) { - struct ieee80211vap *vap = ni->ni_vap; - const struct ieee80211_action *ia; int chw; - ia = (const struct ieee80211_action *) frm; - switch (ia->ia_category) { - case IEEE80211_ACTION_CAT_BA: - IEEE80211_NOTE(vap, - IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, - "%s: BA action %d not implemented", __func__, - ia->ia_action); - vap->iv_stats.is_rx_mgtdiscard++; - break; - case IEEE80211_ACTION_CAT_HT: - switch (ia->ia_action) { - case IEEE80211_ACTION_HT_TXCHWIDTH: - chw = frm[2] == IEEE80211_A_HT_TXCHWIDTH_2040 ? 40 : 20; - IEEE80211_NOTE(vap, - IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, - "%s: HT txchwidth, width %d%s", - __func__, chw, ni->ni_chw != chw ? "*" : ""); - if (chw != ni->ni_chw) { - ni->ni_chw = chw; - /* XXX notify on change */ - } - break; - case IEEE80211_ACTION_HT_MIMOPWRSAVE: { - const struct ieee80211_action_ht_mimopowersave *mps = - (const struct ieee80211_action_ht_mimopowersave *) ia; - /* XXX check iv_htcaps */ - if (mps->am_control & IEEE80211_A_HT_MIMOPWRSAVE_ENA) - ni->ni_flags |= IEEE80211_NODE_MIMO_PS; - else - ni->ni_flags &= ~IEEE80211_NODE_MIMO_PS; - if (mps->am_control & IEEE80211_A_HT_MIMOPWRSAVE_MODE) - ni->ni_flags |= IEEE80211_NODE_MIMO_RTS; - else - ni->ni_flags &= ~IEEE80211_NODE_MIMO_RTS; - /* XXX notify on change */ - IEEE80211_NOTE(vap, - IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, - "%s: HT MIMO PS (%s%s)", __func__, - (ni->ni_flags & IEEE80211_NODE_MIMO_PS) ? - "on" : "off", - (ni->ni_flags & IEEE80211_NODE_MIMO_RTS) ? - "+rts" : "" - ); - break; - } - default: - IEEE80211_NOTE(vap, - IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, - "%s: HT action %d not implemented", __func__, - ia->ia_action); - vap->iv_stats.is_rx_mgtdiscard++; - break; - } - break; - default: - IEEE80211_NOTE(vap, - IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, - "%s: category %d not implemented", __func__, - ia->ia_category); - vap->iv_stats.is_rx_mgtdiscard++; - break; + chw = (frm[2] == IEEE80211_A_HT_TXCHWIDTH_2040) ? 40 : 20; + + IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, + "%s: HT txchwidth, width %d%s", + __func__, chw, ni->ni_chw != chw ? "*" : ""); + if (chw != ni->ni_chw) { + ni->ni_chw = chw; + /* XXX notify on change */ } + return 0; +} + +static int +ht_recv_action_ht_mimopwrsave(struct ieee80211_node *ni, + const struct ieee80211_frame *wh, + const uint8_t *frm, const uint8_t *efrm) +{ + const struct ieee80211_action_ht_mimopowersave *mps = + (const struct ieee80211_action_ht_mimopowersave *) frm; + + /* XXX check iv_htcaps */ + if (mps->am_control & IEEE80211_A_HT_MIMOPWRSAVE_ENA) + ni->ni_flags |= IEEE80211_NODE_MIMO_PS; + else + ni->ni_flags &= ~IEEE80211_NODE_MIMO_PS; + if (mps->am_control & IEEE80211_A_HT_MIMOPWRSAVE_MODE) + ni->ni_flags |= IEEE80211_NODE_MIMO_RTS; + else + ni->ni_flags &= ~IEEE80211_NODE_MIMO_RTS; + /* XXX notify on change */ + IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, + "%s: HT MIMO PS (%s%s)", __func__, + (ni->ni_flags & IEEE80211_NODE_MIMO_PS) ? "on" : "off", + (ni->ni_flags & IEEE80211_NODE_MIMO_RTS) ? "+rts" : "" + ); + return 0; } /* @@ -1937,7 +1942,7 @@ ieee80211_ampdu_stop(struct ieee80211_no args[0] = WME_AC_TO_TID(tap->txa_ac); args[1] = IEEE80211_DELBAPS_INIT; args[2] = reason; /* XXX reason code */ - ieee80211_send_action(ni, IEEE80211_ACTION_CAT_BA, + ic->ic_send_action(ni, IEEE80211_ACTION_CAT_BA, IEEE80211_ACTION_BA_DELBA, args); } else { IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, @@ -2115,143 +2120,160 @@ bad: #undef senderr } -/* - * Send an action management frame. The arguments are stuff - * into a frame without inspection; the caller is assumed to - * prepare them carefully (e.g. based on the aggregation state). - */ -int -ieee80211_send_action(struct ieee80211_node *ni, - int category, int action, uint16_t args[4]) +static int +ht_action_output(struct ieee80211_node *ni, struct mbuf *m) { -#define senderr(_x, _v) do { vap->iv_stats._v++; ret = _x; goto bad; } while (0) + struct ieee80211_bpf_params params; + + memset(¶ms, 0, sizeof(params)); + params.ibp_pri = WME_AC_VO; + params.ibp_rate0 = ni->ni_txparms->mgmtrate; + /* NB: we know all frames are unicast */ + params.ibp_try0 = ni->ni_txparms->maxretry; + params.ibp_power = ni->ni_txpower; + return ieee80211_mgmt_output(ni, m, IEEE80211_FC0_SUBTYPE_ACTION, + ¶ms); +} + #define ADDSHORT(frm, v) do { \ frm[0] = (v) & 0xff; \ frm[1] = (v) >> 8; \ frm += 2; \ } while (0) + +/* + * Send an action management frame. The arguments are stuff + * into a frame without inspection; the caller is assumed to + * prepare them carefully (e.g. based on the aggregation state). *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From ariff at FreeBSD.org Sun Jul 5 18:15:06 2009 From: ariff at FreeBSD.org (Ariff Abdullah) Date: Sun Jul 5 18:15:19 2009 Subject: svn commit: r195378 - in head/sys: dev/sound/pcm tools/sound Message-ID: <200907051815.n65IF6k3056426@svn.freebsd.org> Author: ariff Date: Sun Jul 5 18:15:06 2009 New Revision: 195378 URL: http://svn.freebsd.org/changeset/base/195378 Log: - Increase dynamic range of filter coefficients from 28bit to 30bit. This cause dramatic effect in overall precision and conversion quality by pushing down most aliasing artifacts around -180 dB. Spectrogram analysis/comparison: http://people.freebsd.org/~ariff/z_comparison/z_28vs30/ - Guard against possible 64bit overflow during accumulation process by slightly normalize and saturate sample and coefficient multiplication, possible during extreme 32bit downsampling (eg. 380KHz -> 8KHz) with custom preset that require more than ~7000 taps filter (which is overkill). - Add knobs through FEEDER_RATE_PRESETS to set dynamic range of filter coefficients/accumulator and prefered polynomial interpolator: COEFFICIENT_BIT:X (where 1 <= X <= 30, default: 30) ACCUMULATOR_BIT:X (where 32 <= X <=64, default: 58) INTERPOLATOR:I (where I = ZOH, LINEAR, QUADRATIC, HERMITE, BSPLINE, OPT32X, OPT16X, OPT8X, OPT4X, OPT2X) Approved by: re (kib) Modified: head/sys/dev/sound/pcm/feeder_rate.c head/sys/tools/sound/feeder_rate_mkfilter.awk Modified: head/sys/dev/sound/pcm/feeder_rate.c ============================================================================== --- head/sys/dev/sound/pcm/feeder_rate.c Sun Jul 5 17:59:19 2009 (r195377) +++ head/sys/dev/sound/pcm/feeder_rate.c Sun Jul 5 18:15:06 2009 (r195378) @@ -527,7 +527,7 @@ z_feed_linear_##SIGN##BIT##ENDIAN(struct z &= Z_MASK; \ coeff = Z_COEFF_INTERPOLATE(z, z_coeff[c], z_dcoeff[c]); \ x = _PCM_READ_##SIGN##BIT##_##ENDIAN(p); \ - v += (intpcm64_t)x * coeff; \ + v += Z_NORM_##BIT((intpcm64_t)x * coeff); \ z += info->z_dy; \ p adv##= info->channels * PCM_##BIT##_BPS @@ -582,7 +582,7 @@ z_feed_sinc_##SIGN##BIT##ENDIAN(struct z if (info->z_scale != Z_ONE) \ v = Z_SCALE_##BIT(v, info->z_scale); \ else \ - v >>= Z_COEFF_SHIFT; \ + v >>= Z_COEFF_SHIFT - Z_GUARD_BIT_##BIT; \ Z_CLIP_CHECK(v, BIT); \ _PCM_WRITE_##SIGN##BIT##_##ENDIAN(dst, Z_CLAMP(v, BIT)); \ } while (ch != 0); \ @@ -610,18 +610,18 @@ z_feed_sinc_polyphase_##SIGN##BIT##ENDIA ((info->z_alpha * info->z_size) << 1); \ for (i = info->z_size; i != 0; i--) { \ x = _PCM_READ_##SIGN##BIT##_##ENDIAN(p); \ - v += (intpcm64_t)x * *z_pcoeff; \ + v += Z_NORM_##BIT((intpcm64_t)x * *z_pcoeff); \ z_pcoeff++; \ p += info->channels * PCM_##BIT##_BPS; \ x = _PCM_READ_##SIGN##BIT##_##ENDIAN(p); \ - v += (intpcm64_t)x * *z_pcoeff; \ + v += Z_NORM_##BIT((intpcm64_t)x * *z_pcoeff); \ z_pcoeff++; \ p += info->channels * PCM_##BIT##_BPS; \ } \ if (info->z_scale != Z_ONE) \ v = Z_SCALE_##BIT(v, info->z_scale); \ else \ - v >>= Z_COEFF_SHIFT; \ + v >>= Z_COEFF_SHIFT - Z_GUARD_BIT_##BIT; \ Z_CLIP_CHECK(v, BIT); \ _PCM_WRITE_##SIGN##BIT##_##ENDIAN(dst, Z_CLAMP(v, BIT)); \ } while (ch != 0); \ @@ -882,7 +882,7 @@ z_coeff_interpolate(int32_t z, int32_t * zoo2 = z_coeff[2] - z_coeff[-1]; zoo3 = z_coeff[3] - z_coeff[-2]; - zoc0 = (((0x1ac2260dLL * zoe1)) >> 30) + + zoc0 = ((0x1ac2260dLL * zoe1) >> 30) + ((0x0526cdcaLL * zoe2) >> 30) + ((0x00170c29LL * zoe3) >> 30); zoc1 = ((0x14f8a49aLL * zoo1) >> 30) + ((0x0d6d1109LL * zoo2) >> 30) + ((0x008cd4dcLL * zoo3) >> 30); @@ -911,7 +911,7 @@ z_coeff_interpolate(int32_t z, int32_t * zoo2 = z_coeff[2] - z_coeff[-1]; zoo3 = z_coeff[3] - z_coeff[-2]; - zoc0 = (((0x1ac2260dLL * zoe1)) >> 30) + + zoc0 = ((0x1ac2260dLL * zoe1) >> 30) + ((0x0526cdcaLL * zoe2) >> 30) + ((0x00170c29LL * zoe3) >> 30); zoc1 = ((0x14f8a49aLL * zoo1) >> 30) + ((0x0d6d1109LL * zoo2) >> 30) + ((0x008cd4dcLL * zoo3) >> 30); @@ -940,7 +940,7 @@ z_coeff_interpolate(int32_t z, int32_t * zoo2 = z_coeff[2] - z_coeff[-1]; zoo3 = z_coeff[3] - z_coeff[-2]; - zoc0 = (((0x1aa9b47dLL * zoe1)) >> 30) + + zoc0 = ((0x1aa9b47dLL * zoe1) >> 30) + ((0x053d9944LL * zoe2) >> 30) + ((0x0018b23fLL * zoe3) >> 30); zoc1 = ((0x14a104d1LL * zoo1) >> 30) + ((0x0d7d2504LL * zoo2) >> 30) + ((0x0094b599LL * zoo3) >> 30); @@ -969,7 +969,7 @@ z_coeff_interpolate(int32_t z, int32_t * zoo2 = z_coeff[2] - z_coeff[-1]; zoo3 = z_coeff[3] - z_coeff[-2]; - zoc0 = (((0x1a8eda43LL * zoe1)) >> 30) + + zoc0 = ((0x1a8eda43LL * zoe1) >> 30) + ((0x0556ee38LL * zoe2) >> 30) + ((0x001a3784LL * zoe3) >> 30); zoc1 = ((0x143d863eLL * zoo1) >> 30) + ((0x0d910e36LL * zoo2) >> 30) + ((0x009ca889LL * zoo3) >> 30); @@ -998,7 +998,7 @@ z_coeff_interpolate(int32_t z, int32_t * zoo2 = z_coeff[2] - z_coeff[-1]; zoo3 = z_coeff[3] - z_coeff[-2]; - zoc0 = (((0x19edb6fdLL * zoe1)) >> 30) + + zoc0 = ((0x19edb6fdLL * zoe1) >> 30) + ((0x05ebd062LL * zoe2) >> 30) + ((0x00267881LL * zoe3) >> 30); zoc1 = ((0x1223af76LL * zoo1) >> 30) + ((0x0de3dd6bLL * zoo2) >> 30) + ((0x00d683cdLL * zoo3) >> 30); Modified: head/sys/tools/sound/feeder_rate_mkfilter.awk ============================================================================== --- head/sys/tools/sound/feeder_rate_mkfilter.awk Sun Jul 5 17:59:19 2009 (r195377) +++ head/sys/tools/sound/feeder_rate_mkfilter.awk Sun Jul 5 18:15:06 2009 (r195378) @@ -386,6 +386,27 @@ function filter_parse(s, a, i, attn, ale return (-1); } + if (alen > 0 && a[1] == "COEFFICIENT_BIT") { + if (alen != 2) + return (-1); + init_coeff_bit(floor(a[2])); + return (-1); + } + + if (alen > 0 && a[1] == "ACCUMULATOR_BIT") { + if (alen != 2) + return (-1); + init_accum_bit(floor(a[2])); + return (-1); + } + + if (alen > 0 && a[1] == "INTERPOLATOR") { + if (alen != 2) + return (-1); + init_coeff_interpolator(toupper(a[2])); + return (-1); + } + if (alen == 1 || alen == 2) { if (a[1] == "NYQUIST_HOVER") { i = 1.0 * a[2]; @@ -448,7 +469,12 @@ function filter_parse(s, a, i, attn, ale function genscale(bit, s1, s2, scale) { - s1 = Z_COEFF_SHIFT - (32 - bit); + if ((bit + Z_COEFF_SHIFT) > Z_ACCUMULATOR_BIT) + s1 = Z_COEFF_SHIFT - \ + (32 - (Z_ACCUMULATOR_BIT - Z_COEFF_SHIFT)); + else + s1 = Z_COEFF_SHIFT - (32 - bit); + s2 = Z_SHIFT + (32 - bit); if (s1 == 0) @@ -527,6 +553,62 @@ function init_drift(drift, xdrift) Z_MASK = Z_ONE - 1; } +function init_coeff_bit(cbit, xcbit) +{ + xcbit = floor(cbit); + + if (Z_COEFF_SHIFT != 0) { + if (xcbit != Z_COEFF_SHIFT) + printf("#error Z_COEFF_SHIFT reinitialize!\n"); + return; + } + + # + # Initialize dynamic range of coefficients. + # + if (xcbit < 1) + xcbit = 1; + else if (xcbit > 30) + xcbit = 30; + + Z_COEFF_SHIFT = xcbit; + Z_COEFF_ONE = shl(1, Z_COEFF_SHIFT); +} + +function init_accum_bit(accbit, xaccbit) +{ + xaccbit = floor(accbit); + + if (Z_ACCUMULATOR_BIT != 0) { + if (xaccbit != Z_ACCUMULATOR_BIT) + printf("#error Z_ACCUMULATOR_BIT reinitialize!\n"); + return; + } + + # + # Initialize dynamic range of accumulator. + # + if (xaccbit > 64) + xaccbit = 64; + else if (xaccbit < 32) + xaccbit = 32; + + Z_ACCUMULATOR_BIT = xaccbit; +} + +function init_coeff_interpolator(interp) +{ + # + # Validate interpolator type. + # + if (interp == "ZOH" || interp == "LINEAR" || \ + interp == "QUADRATIC" || interp == "HERMITE" || \ + interp == "BSPLINE" || interp == "OPT32X" || \ + interp == "OPT16X" || interp == "OPT8X" || \ + interp == "OPT4X" || interp == "OPT2X") + Z_COEFF_INTERPOLATOR = interp; +} + BEGIN { I0_EPSILON = 1e-21; M_PI = atan2(0.0, -1.0); @@ -536,11 +618,17 @@ BEGIN { Z_COEFF_OFFSET = 5; + Z_ACCUMULATOR_BIT_DEFAULT = 58; + Z_ACCUMULATOR_BIT = 0; + Z_FULL_SHIFT = 30; Z_FULL_ONE = shl(1, Z_FULL_SHIFT); - Z_COEFF_SHIFT = 28; - Z_COEFF_ONE = shl(1, Z_COEFF_SHIFT); + Z_COEFF_SHIFT_DEFAULT = 30; + Z_COEFF_SHIFT = 0; + Z_COEFF_ONE = 0; + + Z_COEFF_INTERPOLATOR = 0; Z_INTERP_COEFF_SHIFT = 24; Z_INTERP_COEFF_ONE = shl(1, Z_INTERP_COEFF_SHIFT); @@ -620,6 +708,10 @@ BEGIN { rolloff = Popts["rolloff"]; if (Z_DRIFT_SHIFT == -1) init_drift(Z_DRIFT_SHIFT_DEFAULT); + if (Z_COEFF_SHIFT == 0) + init_coeff_bit(Z_COEFF_SHIFT_DEFAULT); + if (Z_ACCUMULATOR_BIT == 0) + init_accum_bit(Z_ACCUMULATOR_BIT_DEFAULT); ztab[imp["quality"] - 2] = \ mkfilter(imp, nmult, rolloff, beta, Z_DRIFT_ONE); imp["quality"]++; @@ -751,6 +843,18 @@ BEGIN { genscale(24); genscale(32); printf("\n"); + printf("#define Z_ACCUMULATOR_BIT\t%d\n\n", Z_ACCUMULATOR_BIT) + for (i = 8; i <= 32; i += 8) { + gbit = ((i + Z_COEFF_SHIFT) > Z_ACCUMULATOR_BIT) ? \ + (i - (Z_ACCUMULATOR_BIT - Z_COEFF_SHIFT)) : 0; + printf("#define Z_GUARD_BIT_%d\t\t%d\n", i, gbit); + if (gbit == 0) + printf("#define Z_NORM_%d(v)\t\t(v)\n\n", i); + else + printf("#define Z_NORM_%d(v)\t\t" \ + "((v) >> Z_GUARD_BIT_%d)\n\n", i, i); + } + printf("\n"); printf("#define Z_LINEAR_FULL_ONE\t0x%08xU\n", Z_LINEAR_FULL_ONE); printf("#define Z_LINEAR_SHIFT\t\t%d\n", Z_LINEAR_SHIFT); printf("#define Z_LINEAR_UNSHIFT\t%d\n", Z_LINEAR_UNSHIFT); @@ -775,6 +879,9 @@ BEGIN { printf("\n"); printf("#define Z_QUALITY_MIN\t\t0\n"); printf("#define Z_QUALITY_MAX\t\t%d\n", length(ztab) + 1); + if (Z_COEFF_INTERPOLATOR != 0) + printf("\n#define Z_COEFF_INTERP_%s\t1\n", \ + Z_COEFF_INTERPOLATOR); printf("\n/*\n * smallest: %.32f\n * largest: %.32f\n *\n", \ smallest, largest); printf(" * z_unshift=%d, z_interp_shift=%d\n *\n", \ From sam at FreeBSD.org Sun Jul 5 18:17:38 2009 From: sam at FreeBSD.org (Sam Leffler) Date: Sun Jul 5 18:17:50 2009 Subject: svn commit: r195379 - head/sys/net80211 Message-ID: <200907051817.n65IHbwq056567@svn.freebsd.org> Author: sam Date: Sun Jul 5 18:17:37 2009 New Revision: 195379 URL: http://svn.freebsd.org/changeset/base/195379 Log: Add ieee80211_ageq; a facility for staging packets that require long-term work before they can be serviced. Packets are tagged and assigned an age (in seconds) at the point they are added to the queue. If a packet is not retrieved before it's age expires it is reclaimed. Tagging can take two forms: a reference to an ieee80211_node (as happens in the tx path) or an opaque token in cases where there is no reference or the node structure is not stable (i.e. it's going to be destroyed). o add ic_stageq to replace the per-node wds staging queue used for dynamic wds o add ieee80211_mac_hash for building ageq tokens; this computes a 32-bit hash from an 802.11 mac address (copied from the bridge) o while here fix a stray ';' noticed in IEEE80211_PSQ_INIT Reviewed by: rpaulo Approved by: re (kensmith) Added: head/sys/net80211/ieee80211_ageq.c (contents, props changed) head/sys/net80211/ieee80211_ageq.h (contents, props changed) Modified: head/sys/net80211/ieee80211.c head/sys/net80211/ieee80211_freebsd.h head/sys/net80211/ieee80211_node.c head/sys/net80211/ieee80211_node.h head/sys/net80211/ieee80211_var.h head/sys/net80211/ieee80211_wds.c Modified: head/sys/net80211/ieee80211.c ============================================================================== --- head/sys/net80211/ieee80211.c Sun Jul 5 18:15:06 2009 (r195378) +++ head/sys/net80211/ieee80211.c Sun Jul 5 18:17:37 2009 (r195379) @@ -268,6 +268,7 @@ ieee80211_ifattach(struct ieee80211com * ic->ic_update_mcast = null_update_mcast; ic->ic_update_promisc = null_update_promisc; + ic->ic_hash_key = arc4random(); ic->ic_bintval = IEEE80211_BINTVAL_DEFAULT; ic->ic_lintval = ic->ic_bintval; ic->ic_txpowlimit = IEEE80211_TXPOWER_MAX; @@ -1568,3 +1569,39 @@ ieee80211_media2rate(int mword) ieeerates[IFM_SUBTYPE(mword)] : 0; #undef N } + +/* + * The following hash function is adapted from "Hash Functions" by Bob Jenkins + * ("Algorithm Alley", Dr. Dobbs Journal, September 1997). + */ +#define mix(a, b, c) \ +do { \ + a -= b; a -= c; a ^= (c >> 13); \ + b -= c; b -= a; b ^= (a << 8); \ + c -= a; c -= b; c ^= (b >> 13); \ + a -= b; a -= c; a ^= (c >> 12); \ + b -= c; b -= a; b ^= (a << 16); \ + c -= a; c -= b; c ^= (b >> 5); \ + a -= b; a -= c; a ^= (c >> 3); \ + b -= c; b -= a; b ^= (a << 10); \ + c -= a; c -= b; c ^= (b >> 15); \ +} while (/*CONSTCOND*/0) + +uint32_t +ieee80211_mac_hash(const struct ieee80211com *ic, + const uint8_t addr[IEEE80211_ADDR_LEN]) +{ + uint32_t a = 0x9e3779b9, b = 0x9e3779b9, c = ic->ic_hash_key; + + b += addr[5] << 8; + b += addr[4]; + a += addr[3] << 24; + a += addr[2] << 16; + a += addr[1] << 8; + a += addr[0]; + + mix(a, b, c); + + return c; +} +#undef mix Added: head/sys/net80211/ieee80211_ageq.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/net80211/ieee80211_ageq.c Sun Jul 5 18:17:37 2009 (r195379) @@ -0,0 +1,236 @@ +/*- + * Copyright (c) 2009 Sam Leffler, Errno Consulting + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +/* + * IEEE 802.11 age queue support. + */ +#include "opt_wlan.h" + +#include +#include +#include + +#include + +#include +#include +#include + +#include + +/* + * Initialize an ageq. + */ +void +ieee80211_ageq_init(struct ieee80211_ageq *aq, int maxlen, const char *name) +{ + memset(aq, 0, sizeof(aq)); + aq->aq_maxlen = maxlen; + IEEE80211_AGEQ_INIT(aq, name); /* OS-dependent setup */ +} + +/* + * Cleanup an ageq initialized with ieee80211_ageq_init. Note + * the queue is assumed empty; this can be done with ieee80211_ageq_drain. + */ +void +ieee80211_ageq_cleanup(struct ieee80211_ageq *aq) +{ + KASSERT(aq->aq_len == 0, ("%d frames on ageq", aq->aq_len)); + IEEE80211_AGEQ_DESTROY(aq); /* OS-dependent cleanup */ +} + +/* + * Free an mbuf according to ageq rules: if marked as holding + * and 802.11 frame then also reclaim a node reference from + * the packet header; this handles packets q'd in the tx path. + */ +static void +ageq_mfree(struct mbuf *m) +{ + if (m->m_flags & M_ENCAP) { + struct ieee80211_node *ni = (void *) m->m_pkthdr.rcvif; + ieee80211_free_node(ni); + } + m->m_nextpkt = NULL; + m_freem(m); +} + +/* + * Free a list of mbufs using ageq rules (see above). + */ +void +ieee80211_ageq_mfree(struct mbuf *m) +{ + struct mbuf *next; + + for (; m != NULL; m = next) { + next = m->m_nextpkt; + ageq_mfree(m); + } +} + +/* + * Append an mbuf to the ageq and mark it with the specified max age + * If the frame is not removed before the age (in seconds) expires + * then it is reclaimed (along with any node reference). + */ +int +ieee80211_ageq_append(struct ieee80211_ageq *aq, struct mbuf *m, int age) +{ + IEEE80211_AGEQ_LOCK(aq); + if (__predict_true(aq->aq_len < aq->aq_maxlen)) { + if (aq->aq_tail == NULL) { + aq->aq_head = m; + } else { + aq->aq_tail->m_nextpkt = m; + age -= M_AGE_GET(aq->aq_head); + } + KASSERT(age >= 0, ("age %d", age)); + M_AGE_SET(m, age); + m->m_nextpkt = NULL; + aq->aq_tail = m; + aq->aq_len++; + IEEE80211_AGEQ_UNLOCK(aq); + return 0; + } else { + /* + * No space, drop and cleanup references. + */ + aq->aq_drops++; + IEEE80211_AGEQ_UNLOCK(aq); + /* XXX tail drop? */ + ageq_mfree(m); + return ENOSPC; + } +} + +/* + * Drain/reclaim all frames from an ageq. + */ +void +ieee80211_ageq_drain(struct ieee80211_ageq *aq) +{ + ieee80211_ageq_mfree(ieee80211_ageq_remove(aq, NULL)); +} + +/* + * Drain/reclaim frames associated with a specific node from an ageq. + */ +void +ieee80211_ageq_drain_node(struct ieee80211_ageq *aq, + struct ieee80211_node *ni) +{ + ieee80211_ageq_mfree(ieee80211_ageq_remove(aq, ni)); +} + +/* + * Age frames on the age queue. Ages are stored as time + * deltas (in seconds) relative to the head so we can check + * and/or adjust only the head of the list. If a frame's age + * exceeds the time quanta then remove it. The list of removed + * frames is is returned to the caller joined by m_nextpkt. + */ +struct mbuf * +ieee80211_ageq_age(struct ieee80211_ageq *aq, int quanta) +{ + struct mbuf *head, **phead; + struct mbuf *m; + + phead = &head; + if (aq->aq_len != 0) { + IEEE80211_AGEQ_LOCK(aq); + while ((m = aq->aq_head) != NULL && M_AGE_GET(m) < quanta) { + if ((aq->aq_head = m->m_nextpkt) == NULL) + aq->aq_tail = NULL; + KASSERT(aq->aq_len > 0, ("aq len %d", aq->aq_len)); + aq->aq_len--; + /* add to private list for return */ + *phead = m; + phead = &m->m_nextpkt; + } + if (m != NULL) + M_AGE_SUB(m, quanta); + IEEE80211_AGEQ_UNLOCK(aq); + } + *phead = NULL; + return head; +} + +/* + * Remove all frames matching the specified node identifier + * (NULL matches all). Frames are returned as a list joined + * by m_nextpkt. + */ +struct mbuf * +ieee80211_ageq_remove(struct ieee80211_ageq *aq, + struct ieee80211_node *match) +{ + struct mbuf *m, **prev, *ohead; + struct mbuf *head, **phead; + + IEEE80211_AGEQ_LOCK(aq); + ohead = aq->aq_head; + prev = &aq->aq_head; + phead = &head; + while ((m = *prev) != NULL) { + if (match != NULL && m->m_pkthdr.rcvif != (void *) match) { + prev = &m->m_nextpkt; + continue; + } + /* + * Adjust q length. + */ + KASSERT(aq->aq_len > 0, ("aq len %d", aq->aq_len)); + aq->aq_len--; + /* + * Remove from forward list; tail pointer is harder. + */ + *prev = m->m_nextpkt; + if (aq->aq_tail == m) { + KASSERT(m->m_nextpkt == NULL, ("not last")); + if (aq->aq_head == m) { /* list empty */ + KASSERT(aq->aq_len == 0, + ("not empty, len %d", aq->aq_len)); + aq->aq_tail = NULL; + } else { /* must be one before */ + aq->aq_tail = (struct mbuf *)((uintptr_t)prev - + offsetof(struct mbuf, m_nextpkt)); + } + } + /* add to private list for return */ + *phead = m; + phead = &m->m_nextpkt; + } + if (head == ohead && aq->aq_head != NULL) /* correct age */ + M_AGE_SET(aq->aq_head, M_AGE_GET(head)); + IEEE80211_AGEQ_UNLOCK(aq); + + *phead = NULL; + return head; +} Added: head/sys/net80211/ieee80211_ageq.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/net80211/ieee80211_ageq.h Sun Jul 5 18:17:37 2009 (r195379) @@ -0,0 +1,54 @@ +/*- + * Copyright (c) 2009 Sam Leffler, Errno Consulting + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ + */ +#ifndef _NET80211_IEEE80211_STAGEQ_H_ +#define _NET80211_IEEE80211_STAGEQ_H_ + +struct ieee80211_node; +struct mbuf; + +struct ieee80211_ageq { + ieee80211_ageq_lock_t aq_lock; + int aq_len; /* # items on queue */ + int aq_maxlen; /* max queue length */ + int aq_drops; /* frames dropped */ + struct mbuf *aq_head; /* frames linked w/ m_nextpkt */ + struct mbuf *aq_tail; /* last frame in queue */ +}; + +void ieee80211_ageq_init(struct ieee80211_ageq *, int maxlen, + const char *name); +void ieee80211_ageq_cleanup(struct ieee80211_ageq *); +void ieee80211_ageq_mfree(struct mbuf *); +int ieee80211_ageq_append(struct ieee80211_ageq *, struct mbuf *, + int age); +void ieee80211_ageq_drain(struct ieee80211_ageq *); +void ieee80211_ageq_drain_node(struct ieee80211_ageq *, + struct ieee80211_node *); +struct mbuf *ieee80211_ageq_age(struct ieee80211_ageq *, int quanta); +struct mbuf *ieee80211_ageq_remove(struct ieee80211_ageq *, + struct ieee80211_node *match); +#endif /* _NET80211_IEEE80211_STAGEQ_H_ */ Modified: head/sys/net80211/ieee80211_freebsd.h ============================================================================== --- head/sys/net80211/ieee80211_freebsd.h Sun Jul 5 18:15:06 2009 (r195378) +++ head/sys/net80211/ieee80211_freebsd.h Sun Jul 5 18:17:37 2009 (r195379) @@ -100,25 +100,12 @@ typedef struct { #define IEEE80211_NODE_ITERATE_UNLOCK(_nt) \ mtx_unlock(IEEE80211_NODE_ITERATE_LOCK_OBJ(_nt)) -#define _AGEQ_ENQUEUE(_ifq, _m, _qlen, _age) do { \ - (_m)->m_nextpkt = NULL; \ - if ((_ifq)->ifq_tail != NULL) { \ - _age -= M_AGE_GET((_ifq)->ifq_head); \ - (_ifq)->ifq_tail->m_nextpkt = (_m); \ - } else { \ - (_ifq)->ifq_head = (_m); \ - } \ - M_AGE_SET(_m, _age); \ - (_ifq)->ifq_tail = (_m); \ - (_qlen) = ++(_ifq)->ifq_len; \ -} while (0) - /* * Power-save queue definitions. */ typedef struct mtx ieee80211_psq_lock_t; #define IEEE80211_PSQ_INIT(_psq, _name) \ - mtx_init(&(_psq)->psq_lock, _name, "802.11 ps q", MTX_DEF); + mtx_init(&(_psq)->psq_lock, _name, "802.11 ps q", MTX_DEF) #define IEEE80211_PSQ_DESTROY(_psq) mtx_destroy(&(_psq)->psq_lock) #define IEEE80211_PSQ_LOCK(_psq) mtx_lock(&(_psq)->psq_lock) #define IEEE80211_PSQ_UNLOCK(_psq) mtx_unlock(&(_psq)->psq_lock) @@ -137,24 +124,16 @@ typedef struct mtx ieee80211_psq_lock_t; IF_UNLOCK(ifq); \ } while (0) #endif /* IF_PREPEND_LIST */ - -/* XXX temporary */ -#define IEEE80211_NODE_WDSQ_INIT(_ni, _name) do { \ - mtx_init(&(_ni)->ni_wdsq.ifq_mtx, _name, "802.11 wds queue", MTX_DEF);\ - (_ni)->ni_wdsq.ifq_maxlen = IEEE80211_PS_MAX_QUEUE; \ -} while (0) -#define IEEE80211_NODE_WDSQ_DESTROY(_ni) do { \ - mtx_destroy(&(_ni)->ni_wdsq.ifq_mtx); \ -} while (0) -#define IEEE80211_NODE_WDSQ_QLEN(_ni) _IF_QLEN(&(_ni)->ni_wdsq) -#define IEEE80211_NODE_WDSQ_LOCK(_ni) IF_LOCK(&(_ni)->ni_wdsq) -#define IEEE80211_NODE_WDSQ_UNLOCK(_ni) IF_UNLOCK(&(_ni)->ni_wdsq) -#define _IEEE80211_NODE_WDSQ_DEQUEUE_HEAD(_ni, _m) do { \ - _IF_DEQUEUE(&(_ni)->ni_wdsq, m); \ -} while (0) -#define _IEEE80211_NODE_WDSQ_ENQUEUE(_ni, _m, _qlen, _age) do { \ - _AGEQ_ENQUEUE(&ni->ni_wdsq, _m, _qlen, _age); \ -} while (0) + +/* + * Age queue definitions. + */ +typedef struct mtx ieee80211_ageq_lock_t; +#define IEEE80211_AGEQ_INIT(_aq, _name) \ + mtx_init(&(_aq)->aq_lock, _name, "802.11 age q", MTX_DEF) +#define IEEE80211_AGEQ_DESTROY(_aq) mtx_destroy(&(_aq)->aq_lock) +#define IEEE80211_AGEQ_LOCK(_aq) mtx_lock(&(_aq)->aq_lock) +#define IEEE80211_AGEQ_UNLOCK(_aq) mtx_unlock(&(_aq)->aq_lock) /* * 802.1x MAC ACL database locking definitions. Modified: head/sys/net80211/ieee80211_node.c ============================================================================== --- head/sys/net80211/ieee80211_node.c Sun Jul 5 18:15:06 2009 (r195378) +++ head/sys/net80211/ieee80211_node.c Sun Jul 5 18:17:37 2009 (r195379) @@ -99,6 +99,9 @@ MALLOC_DEFINE(M_80211_NODE_IE, "80211nod void ieee80211_node_attach(struct ieee80211com *ic) { + /* XXX really want maxlen enforced per-sta */ + ieee80211_ageq_init(&ic->ic_stageq, ic->ic_max_keyix * 8, + "802.11 staging q"); ieee80211_node_table_init(ic, &ic->ic_sta, "station", IEEE80211_INACT_INIT, ic->ic_max_keyix); callout_init(&ic->ic_inact, CALLOUT_MPSAFE); @@ -127,6 +130,7 @@ ieee80211_node_detach(struct ieee80211co callout_drain(&ic->ic_inact); ieee80211_node_table_cleanup(&ic->ic_sta); + ieee80211_ageq_cleanup(&ic->ic_stageq); } void @@ -927,6 +931,7 @@ node_cleanup(struct ieee80211_node *ni) { #define N(a) (sizeof(a)/sizeof(a[0])) struct ieee80211vap *vap = ni->ni_vap; + struct ieee80211com *ic = ni->ni_ic; int i; /* NB: preserve ni_table */ @@ -947,6 +952,11 @@ node_cleanup(struct ieee80211_node *ni) ieee80211_ff_node_cleanup(ni); #endif /* + * Clear any staging queue entries. + */ + ieee80211_ageq_drain_node(&ic->ic_stageq, ni); + + /* * Clear AREF flag that marks the authorization refcnt bump * has happened. This is probably not needed as the node * should always be removed from the table so not found but @@ -999,7 +1009,6 @@ node_free(struct ieee80211_node *ni) ic->ic_node_cleanup(ni); ieee80211_ies_cleanup(&ni->ni_ies); ieee80211_psq_cleanup(&ni->ni_psq); - IEEE80211_NODE_WDSQ_DESTROY(ni); free(ni, M_80211_NODE); } @@ -1017,11 +1026,6 @@ node_age(struct ieee80211_node *ni) ni->ni_psq.psq_len == 0 && vap->iv_set_tim != NULL) vap->iv_set_tim(ni, 0); /* - * Age frames on the wds pending queue. - */ - if (IEEE80211_NODE_WDSQ_QLEN(ni) != 0) - ieee80211_node_wdsq_age(ni); - /* * Age out HT resources (e.g. frames on the * A-MPDU reorder queues). */ @@ -1086,7 +1090,6 @@ ieee80211_alloc_node(struct ieee80211_no ni->ni_inact = ni->ni_inact_reload; ni->ni_ath_defkeyix = 0x7fff; ieee80211_psq_init(&ni->ni_psq, "unknown"); - IEEE80211_NODE_WDSQ_INIT(ni, "unknown"); IEEE80211_NODE_LOCK(nt); TAILQ_INSERT_TAIL(&nt->nt_node, ni, ni_list); @@ -1136,7 +1139,6 @@ ieee80211_tmp_node(struct ieee80211vap * ni->ni_txpower = bss->ni_txpower; /* XXX optimize away */ ieee80211_psq_init(&ni->ni_psq, "unknown"); - IEEE80211_NODE_WDSQ_INIT(ni, "unknown"); } else { /* XXX msg */ vap->iv_stats.is_rx_nodealloc++; @@ -2075,6 +2077,7 @@ ieee80211_node_timeout(void *arg) if ((ic->ic_flags & IEEE80211_F_CSAPENDING) == 0) { ieee80211_scan_timeout(ic); ieee80211_timeout_stations(ic); + ieee80211_ageq_age(&ic->ic_stageq, IEEE80211_INACT_WAIT); IEEE80211_LOCK(ic); ieee80211_erp_timeout(ic); Modified: head/sys/net80211/ieee80211_node.h ============================================================================== --- head/sys/net80211/ieee80211_node.h Sun Jul 5 18:15:06 2009 (r195378) +++ head/sys/net80211/ieee80211_node.h Sun Jul 5 18:17:37 2009 (r195379) @@ -193,8 +193,6 @@ struct ieee80211_node { struct ieee80211_nodestats ni_stats; /* per-node statistics */ struct ieee80211vap *ni_wdsvap; /* associated WDS vap */ - /* XXX move to vap? */ - struct ifqueue ni_wdsq; /* wds pending queue */ uint64_t ni_spare[4]; }; MALLOC_DECLARE(M_80211_NODE); Modified: head/sys/net80211/ieee80211_var.h ============================================================================== --- head/sys/net80211/ieee80211_var.h Sun Jul 5 18:15:06 2009 (r195378) +++ head/sys/net80211/ieee80211_var.h Sun Jul 5 18:17:37 2009 (r195379) @@ -44,6 +44,7 @@ #include #include +#include #include #include #include /* for ieee80211_stats */ @@ -194,6 +195,8 @@ struct ieee80211com { /* NB: this is the union of all vap stations/neighbors */ int ic_max_keyix; /* max h/w key index */ struct ieee80211_node_table ic_sta; /* stations/neighbors */ + struct ieee80211_ageq ic_stageq; /* frame staging queue */ + uint32_t ic_hash_key; /* random key for mac hash */ /* XXX multi-bss: split out common/vap parts */ struct ieee80211_wme_state ic_wme; /* WME/WMM state */ @@ -659,6 +662,8 @@ struct ieee80211_channel *ieee80211_find int ieee, int flags); int ieee80211_setmode(struct ieee80211com *, enum ieee80211_phymode); enum ieee80211_phymode ieee80211_chan2mode(const struct ieee80211_channel *); +uint32_t ieee80211_mac_hash(const struct ieee80211com *, + const uint8_t addr[IEEE80211_ADDR_LEN]); void ieee80211_radiotap_attach(struct ieee80211com *, struct ieee80211_radiotap_header *th, int tlen, Modified: head/sys/net80211/ieee80211_wds.c ============================================================================== --- head/sys/net80211/ieee80211_wds.c Sun Jul 5 18:15:06 2009 (r195378) +++ head/sys/net80211/ieee80211_wds.c Sun Jul 5 18:17:37 2009 (r195379) @@ -97,6 +97,28 @@ wds_vattach(struct ieee80211vap *vap) vap->iv_opdetach = wds_vdetach; } +static void +wds_flush(struct ieee80211_node *ni) +{ + struct ieee80211com *ic = ni->ni_ic; + struct mbuf *m, *next; + int8_t rssi, nf; + + m = ieee80211_ageq_remove(&ic->ic_stageq, + (void *)(uintptr_t) ieee80211_mac_hash(ic, ni->ni_macaddr)); + if (m == NULL) + return; + + IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_WDS, ni, + "%s", "flush wds queue"); + ic->ic_node_getsignal(ni, &rssi, &nf); + for (; m != NULL; m = next) { + next = m->m_nextpkt; + m->m_nextpkt = NULL; + ieee80211_input(ni, m, rssi, nf); + } +} + static int ieee80211_create_wds(struct ieee80211vap *vap, struct ieee80211_channel *chan) { @@ -195,26 +217,10 @@ ieee80211_create_wds(struct ieee80211vap } /* - * Flush pending frames now that were setup. + * Flush any pending frames now that were setup. */ - if (ni != NULL && IEEE80211_NODE_WDSQ_QLEN(ni) != 0) { - int8_t rssi, nf; - - IEEE80211_NOTE(vap, IEEE80211_MSG_WDS, ni, - "flush wds queue, %u packets queued", - IEEE80211_NODE_WDSQ_QLEN(ni)); - ic->ic_node_getsignal(ni, &rssi, &nf); - for (;;) { - struct mbuf *m; - - IEEE80211_NODE_WDSQ_LOCK(ni); - _IEEE80211_NODE_WDSQ_DEQUEUE_HEAD(ni, m); - IEEE80211_NODE_WDSQ_UNLOCK(ni); - if (m == NULL) - break; - ieee80211_input(ni, m, rssi, nf); - } - } + if (ni != NULL) + wds_flush(ni); return (ni == NULL ? ENOENT : 0); } @@ -310,91 +316,24 @@ ieee80211_dwds_mcast(struct ieee80211vap void ieee80211_dwds_discover(struct ieee80211_node *ni, struct mbuf *m) { - struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; - int qlen, age; - - IEEE80211_NODE_WDSQ_LOCK(ni); - if (!_IF_QFULL(&ni->ni_wdsq)) { - /* - * Tag the frame with it's expiry time and insert - * it in the queue. The aging interval is 4 times - * the listen interval specified by the station. - * Frames that sit around too long are reclaimed - * using this information. - */ - /* XXX handle overflow? */ - /* XXX per/vap beacon interval? */ - /* NB: TU -> secs */ - age = ((ni->ni_intval * ic->ic_lintval) << 2) / 1024; - _IEEE80211_NODE_WDSQ_ENQUEUE(ni, m, qlen, age); - IEEE80211_NODE_WDSQ_UNLOCK(ni); - IEEE80211_NOTE(vap, IEEE80211_MSG_WDS, ni, - "save frame, %u now queued", qlen); - } else { - vap->iv_stats.is_dwds_qdrop++; - _IF_DROP(&ni->ni_wdsq); - IEEE80211_NODE_WDSQ_UNLOCK(ni); - - IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT | IEEE80211_MSG_WDS, - mtod(m, struct ieee80211_frame *), "wds data", - "pending q overflow, drops %d (len %d)", - ni->ni_wdsq.ifq_drops, ni->ni_wdsq.ifq_len); - -#ifdef IEEE80211_DEBUG - if (ieee80211_msg_dumppkts(vap)) - ieee80211_dump_pkt(ic, mtod(m, caddr_t), - m->m_len, -1, -1); -#endif - /* XXX tail drop? */ - m_freem(m); - } + /* + * Save the frame with an aging interval 4 times + * the listen interval specified by the station. + * Frames that sit around too long are reclaimed + * using this information. + * XXX handle overflow? + * XXX per/vap beacon interval? + */ + m->m_pkthdr.rcvif = (void *)(uintptr_t) + ieee80211_mac_hash(ic, ni->ni_macaddr); + (void) ieee80211_ageq_append(&ic->ic_stageq, m, + ((ni->ni_intval * ic->ic_lintval) << 2) / 1024); ieee80211_notify_wds_discover(ni); } /* - * Age frames on the WDS pending queue. The aging interval is - * 4 times the listen interval specified by the station. This - * number is factored into the age calculations when the frame - * is placed on the queue. We store ages as time differences - * so we can check and/or adjust only the head of the list. - * If a frame's age exceeds the threshold then discard it. - * The number of frames discarded is returned to the caller. - */ -int -ieee80211_node_wdsq_age(struct ieee80211_node *ni) -{ -#ifdef IEEE80211_DEBUG - struct ieee80211vap *vap = ni->ni_vap; -#endif - struct mbuf *m; - int discard = 0; - - IEEE80211_NODE_WDSQ_LOCK(ni); - while (_IF_POLL(&ni->ni_wdsq, m) != NULL && - M_AGE_GET(m) < IEEE80211_INACT_WAIT) { - IEEE80211_NOTE(vap, IEEE80211_MSG_WDS, ni, - "discard frame, age %u", M_AGE_GET(m)); - - /* XXX could be optimized */ - _IEEE80211_NODE_WDSQ_DEQUEUE_HEAD(ni, m); - m_freem(m); - discard++; - } - if (m != NULL) - M_AGE_SUB(m, IEEE80211_INACT_WAIT); - IEEE80211_NODE_WDSQ_UNLOCK(ni); - - IEEE80211_NOTE(vap, IEEE80211_MSG_WDS, ni, - "discard %u frames for age", discard); -#if 0 - IEEE80211_NODE_STAT_ADD(ni, wds_discard, discard); -#endif - return discard; -} - -/* * IEEE80211_M_WDS vap state machine handler. */ static int From pjd at FreeBSD.org Sun Jul 5 20:20:10 2009 From: pjd at FreeBSD.org (Pawel Jakub Dawidek) Date: Sun Jul 5 20:20:21 2009 Subject: svn commit: r195380 - head/lib/libc/sys Message-ID: <200907052020.n65KK9Cs058765@svn.freebsd.org> Author: pjd Date: Sun Jul 5 20:20:09 2009 New Revision: 195380 URL: http://svn.freebsd.org/changeset/base/195380 Log: - Don't suggest opening file for writing in preparation for fexecve(2). - execve(2)/fexecve(2) won't return ETXTBSY if file is open for reading. Approved by: re (kib) Modified: head/lib/libc/sys/execve.2 Modified: head/lib/libc/sys/execve.2 ============================================================================== --- head/lib/libc/sys/execve.2 Sun Jul 5 18:17:37 2009 (r195379) +++ head/lib/libc/sys/execve.2 Sun Jul 5 20:20:09 2009 (r195380) @@ -220,13 +220,11 @@ Since execute permission is checked by .Fn fexecve , the file descriptor .Fa fd -need not have been -opened with the +need not have been opened with the .Dv O_EXEC flag. -However, if the file to be executed denies read and write -permission for the process preparing to do the exec, the only way to -provide the +However, if the file to be executed denies read permission for the process +preparing to do the exec, the only way to provide the .Fa fd to .Fn fexecve @@ -234,6 +232,7 @@ is to use the .Dv O_EXEC flag when opening .Fa fd . +Note that the file to be executed can not be open for writing. .Sh RETURN VALUES As the .Fn execve @@ -277,7 +276,7 @@ The new process file has the appropriate permission, but has an invalid magic number in its header. .It Bq Er ETXTBSY The new process file is a pure procedure (shared text) -file that is currently open for writing or reading by some process. +file that is currently open for writing by some process. .It Bq Er ENOMEM The new process requires more virtual memory than is allowed by the imposed maximum From sam at FreeBSD.org Sun Jul 5 20:44:51 2009 From: sam at FreeBSD.org (Sam Leffler) Date: Sun Jul 5 20:44:57 2009 Subject: svn commit: r195381 - head/sys/conf Message-ID: <200907052044.n65KioCU059288@svn.freebsd.org> Author: sam Date: Sun Jul 5 20:44:50 2009 New Revision: 195381 URL: http://svn.freebsd.org/changeset/base/195381 Log: add missing bit of r195379 Approved by: re (kensmith) Modified: head/sys/conf/files Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Sun Jul 5 20:20:09 2009 (r195380) +++ head/sys/conf/files Sun Jul 5 20:44:50 2009 (r195381) @@ -2232,6 +2232,7 @@ net/zlib.c optional crypto | geom_uzip net80211/ieee80211.c optional wlan net80211/ieee80211_acl.c optional wlan wlan_acl net80211/ieee80211_action.c optional wlan +net80211/ieee80211_ageq.c optional wlan net80211/ieee80211_adhoc.c optional wlan net80211/ieee80211_amrr.c optional wlan wlan_amrr net80211/ieee80211_crypto.c optional wlan From sam at FreeBSD.org Sun Jul 5 21:19:13 2009 From: sam at FreeBSD.org (Sam Leffler) Date: Sun Jul 5 21:19:25 2009 Subject: svn commit: r195383 - head/sys/modules/wlan Message-ID: <200907052119.n65LJB9A059974@svn.freebsd.org> Author: sam Date: Sun Jul 5 21:19:10 2009 New Revision: 195383 URL: http://svn.freebsd.org/changeset/base/195383 Log: catchup with action+ageq additions Submitted by: "Paul B. Mahol" Approved by: re (implicit) Modified: head/sys/modules/wlan/Makefile Modified: head/sys/modules/wlan/Makefile ============================================================================== --- head/sys/modules/wlan/Makefile Sun Jul 5 21:16:26 2009 (r195382) +++ head/sys/modules/wlan/Makefile Sun Jul 5 21:19:10 2009 (r195383) @@ -3,7 +3,8 @@ .PATH: ${.CURDIR}/../../net80211 KMOD= wlan -SRCS= ieee80211.c ieee80211_crypto.c ieee80211_crypto_none.c ieee80211_dfs.c \ +SRCS= ieee80211.c ieee80211_action.c ieee80211_ageq.c \ + ieee80211_crypto.c ieee80211_crypto_none.c ieee80211_dfs.c \ ieee80211_freebsd.c ieee80211_input.c ieee80211_ioctl.c \ ieee80211_node.c ieee80211_output.c ieee80211_phy.c ieee80211_power.c \ ieee80211_proto.c ieee80211_scan.c ieee80211_scan_sta.c \ From alc at FreeBSD.org Sun Jul 5 21:40:22 2009 From: alc at FreeBSD.org (Alan Cox) Date: Sun Jul 5 21:41:21 2009 Subject: svn commit: r195385 - in head/sys/i386: i386 xen Message-ID: <200907052140.n65LeLoW060444@svn.freebsd.org> Author: alc Date: Sun Jul 5 21:40:21 2009 New Revision: 195385 URL: http://svn.freebsd.org/changeset/base/195385 Log: PAE adds another level to the i386 page table. This level is a small 4-entry table that must be located within the first 4GB of RAM. This requirement is met by defining an UMA zone with a custom back-end allocator function. This revision makes two changes to this back-end allocator function: (1) It replaces the use of contigmalloc() with the use of kmem_alloc_contig(). This eliminates "double accounting", i.e., accounting by both the UMA zone and malloc tags. (I made the same change for the same reason to the zones supporting jumbo frames a week ago.) (2) It passes through the "wait" parameter, i.e., M_WAITOK, M_ZERO, etc. to kmem_alloc_contig() rather than ignoring it. pmap_init() calls uma_zalloc() with both M_WAITOK and M_ZERO. At the moment, this is harmless only because the default behavior of contigmalloc()/kmem_alloc_contig() is to wait and because pmap_init() doesn't really depend on the memory being zeroed. The back-end allocator function in the Xen pmap is dead code. I am changing it nonetheless because I don't want to leave any "bad examples" in the source tree for someone to copy at a later date. Approved by: re (kib) Modified: head/sys/i386/i386/pmap.c head/sys/i386/xen/pmap.c Modified: head/sys/i386/i386/pmap.c ============================================================================== --- head/sys/i386/i386/pmap.c Sun Jul 5 21:35:05 2009 (r195384) +++ head/sys/i386/i386/pmap.c Sun Jul 5 21:40:21 2009 (r195385) @@ -562,17 +562,14 @@ pmap_page_init(vm_page_t m) } #ifdef PAE - -static MALLOC_DEFINE(M_PMAPPDPT, "pmap", "pmap pdpt"); - static void * pmap_pdpt_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) { /* Inform UMA that this allocator uses kernel_map/object. */ *flags = UMA_SLAB_KERNEL; - return (contigmalloc(PAGE_SIZE, M_PMAPPDPT, 0, 0x0ULL, 0xffffffffULL, - 1, 0)); + return ((void *)kmem_alloc_contig(kernel_map, bytes, wait, 0x0ULL, + 0xffffffffULL, 1, 0, VM_CACHE_DEFAULT)); } #endif Modified: head/sys/i386/xen/pmap.c ============================================================================== --- head/sys/i386/xen/pmap.c Sun Jul 5 21:35:05 2009 (r195384) +++ head/sys/i386/xen/pmap.c Sun Jul 5 21:40:21 2009 (r195385) @@ -608,15 +608,14 @@ pmap_page_init(vm_page_t m) } #if defined(PAE) && !defined(XEN) - -static MALLOC_DEFINE(M_PMAPPDPT, "pmap", "pmap pdpt"); - static void * pmap_pdpt_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) { - *flags = UMA_SLAB_PRIV; - return (contigmalloc(PAGE_SIZE, M_PMAPPDPT, 0, 0x0ULL, 0xffffffffULL, - 1, 0)); + + /* Inform UMA that this allocator uses kernel_map/object. */ + *flags = UMA_SLAB_KERNEL; + return ((void *)kmem_alloc_contig(kernel_map, bytes, wait, 0x0ULL, + 0xffffffffULL, 1, 0, VM_CACHE_DEFAULT)); } #endif From yongari at FreeBSD.org Mon Jul 6 01:04:46 2009 From: yongari at FreeBSD.org (Pyun YongHyeon) Date: Mon Jul 6 01:04:53 2009 Subject: svn commit: r195387 - in stable/7/sys: . contrib/pf dev/ale Message-ID: <200907060104.n6614jfk064205@svn.freebsd.org> Author: yongari Date: Mon Jul 6 01:04:45 2009 New Revision: 195387 URL: http://svn.freebsd.org/changeset/base/195387 Log: MFC r195153: Disable Rx checksum offload until I find more clue why it breaks under certain environments. However give users chance to override it when he/she surely knows his/her hardware works with Rx checksum offload. Reported by: Ulrich Spoerlein ( uqs <> spoerlein dot net ) Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ale/if_ale.c Modified: stable/7/sys/dev/ale/if_ale.c ============================================================================== --- stable/7/sys/dev/ale/if_ale.c Sun Jul 5 21:47:39 2009 (r195386) +++ stable/7/sys/dev/ale/if_ale.c Mon Jul 6 01:04:45 2009 (r195387) @@ -620,6 +620,14 @@ ale_attach(device_t dev) ifp->if_capabilities |= IFCAP_VLAN_MTU; ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_HWCSUM; ifp->if_capenable = ifp->if_capabilities; + /* + * Even though controllers supported by ale(3) have Rx checksum + * offload bug the workaround for fragmented frames seemed to + * work so far. However it seems Rx checksum offload does not + * work under certain conditions. So disable Rx checksum offload + * until I find more clue about it but allow users to override it. + */ + ifp->if_capenable &= ~IFCAP_RXCSUM; /* Tell the upper layer(s) we support long frames. */ ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header); From brooks at FreeBSD.org Mon Jul 6 01:32:31 2009 From: brooks at FreeBSD.org (Brooks Davis) Date: Mon Jul 6 01:32:47 2009 Subject: svn commit: r195388 - stable/7/usr.bin/catman Message-ID: <200907060132.n661WT0L064915@svn.freebsd.org> Author: brooks Date: Mon Jul 6 01:32:29 2009 New Revision: 195388 URL: http://svn.freebsd.org/changeset/base/195388 Log: MFC r194493 and r194548 When checking if we can write to a file, use access() instead of a manual permission check based on stat output. Also, get rid of the executability check since it is not used. Modified: stable/7/usr.bin/catman/ (props changed) stable/7/usr.bin/catman/catman.c Modified: stable/7/usr.bin/catman/catman.c ============================================================================== --- stable/7/usr.bin/catman/catman.c Mon Jul 6 01:04:45 2009 (r195387) +++ stable/7/usr.bin/catman/catman.c Mon Jul 6 01:32:29 2009 (r195388) @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #define TEST_FILE 0x04 #define TEST_READABLE 0x08 #define TEST_WRITABLE 0x10 -#define TEST_EXECUTABLE 0x20 static int verbose; /* -v flag: be verbose with warnings */ static int pretend; /* -n, -p flags: print out what would be done @@ -93,8 +92,6 @@ static const char *locale_device[] = { enum Ziptype {NONE, BZIP, GZIP}; static uid_t uid; -static gid_t gids[NGROUPS_MAX]; -static int ngids; static int starting_dir; static char tmp_file[MAXPATHLEN]; struct stat test_st; @@ -320,23 +317,10 @@ test_path(char *name, time_t *mod_time) result |= TEST_DIR; else if (S_ISREG(test_st.st_mode)) result |= TEST_FILE; - if (test_st.st_uid == uid) { - test_st.st_mode >>= 6; - } else { - int i; - for (i = 0; i < ngids; i++) { - if (test_st.st_gid == gids[i]) { - test_st.st_mode >>= 3; - break; - } - } - } - if (test_st.st_mode & S_IROTH) + if (access(name, R_OK)) result |= TEST_READABLE; - if (test_st.st_mode & S_IWOTH) + if (access(name, W_OK)) result |= TEST_WRITABLE; - if (test_st.st_mode & S_IXOTH) - result |= TEST_EXECUTABLE; return result; } @@ -789,7 +773,6 @@ main(int argc, char **argv) /* NOTREACHED */ } } - ngids = getgroups(NGROUPS_MAX, gids); if ((starting_dir = open(".", 0)) < 0) { err(1, "."); } From kientzle at FreeBSD.org Mon Jul 6 02:02:47 2009 From: kientzle at FreeBSD.org (Tim Kientzle) Date: Mon Jul 6 02:02:59 2009 Subject: svn commit: r195389 - in head/usr.bin/cpio: . test Message-ID: <200907060202.n6622jw9065554@svn.freebsd.org> Author: kientzle Date: Mon Jul 6 02:02:45 2009 New Revision: 195389 URL: http://svn.freebsd.org/changeset/base/195389 Log: This addresses some issues with my earlier -R fix that were pointed out by Brooks Davis and Alexey Dokuchaev: * It now tries to lookup arguments as names first, then tries to parse them as numbers. In particular, this makes the behavior consistent with POSIX conventions when usernames consist entirely of digits. * It now uses strtoul() for the numeric parsing. Finally, I've included an update to the test harness to exercise the new numeric cases for -R. Approved by: re (kib) Modified: head/usr.bin/cpio/cmdline.c head/usr.bin/cpio/test/test_owner_parse.c Modified: head/usr.bin/cpio/cmdline.c ============================================================================== --- head/usr.bin/cpio/cmdline.c Mon Jul 6 01:32:29 2009 (r195388) +++ head/usr.bin/cpio/cmdline.c Mon Jul 6 02:02:45 2009 (r195389) @@ -275,29 +275,14 @@ cpio_getopt(struct cpio *cpio) * : - Override group but not user * * Where uid/gid are decimal representations and groupname/username - * are names to be looked up in system database. Note that - * uid/gid parsing takes priority over username/groupname lookup, - * so this won't do a lookup for usernames or group names that - * consist entirely of digits. + * are names to be looked up in system database. Note that we try + * to look up an argument as a name first, then try numeric parsing. * * A period can be used instead of the colon. * * Sets uid/gid return as appropriate, -1 indicates uid/gid not specified. * */ -static int -decimal_parse(const char *p) -{ - /* TODO: guard against overflow. */ - int n = 0; - for (; *p != '\0'; ++p) { - if (*p < '0' || *p > '9') - return (-1); - n = n * 10 + *p - '0'; - } - return (n); -} - int owner_parse(const char *spec, int *uid, int *gid) { @@ -306,6 +291,9 @@ owner_parse(const char *spec, int *uid, *uid = -1; *gid = -1; + if (spec[0] == '\0') + return (1); + /* * Split spec into [user][:.][group] * u -> first char of username, NULL if no username @@ -338,32 +326,34 @@ owner_parse(const char *spec, int *uid, } memcpy(user, u, ue - u); user[ue - u] = '\0'; - *uid = decimal_parse(user); - if (*uid < 0) { - /* Couldn't parse as integer, try username lookup. */ - pwent = getpwnam(user); - if (pwent == NULL) { + if ((pwent = getpwnam(user)) != NULL) { + *uid = pwent->pw_uid; + if (*ue != '\0') + *gid = pwent->pw_gid; + } else { + char *end; + errno = 0; + *uid = strtoul(user, &end, 10); + if (errno || *end != '\0') { cpio_warnc(errno, "Couldn't lookup user ``%s''", user); return (1); } - *uid = pwent->pw_uid; - if (*ue != '\0' && *g == '\0') - *gid = pwent->pw_gid; } free(user); } + if (*g != '\0') { - *gid = decimal_parse(g); - if (*gid < 0) { - /* Couldn't parse int, try group name lookup. */ - struct group *grp; - grp = getgrnam(g); - if (grp != NULL) - *gid = grp->gr_gid; - else { + struct group *grp; + if ((grp = getgrnam(g)) != NULL) { + *gid = grp->gr_gid; + } else { + char *end; + errno = 0; + *gid = strtoul(g, &end, 10); + if (errno || *end != '\0') { cpio_warnc(errno, - "Couldn't look up group ``%s''", g); + "Couldn't lookup group ``%s''", g); return (1); } } Modified: head/usr.bin/cpio/test/test_owner_parse.c ============================================================================== --- head/usr.bin/cpio/test/test_owner_parse.c Mon Jul 6 01:32:29 2009 (r195388) +++ head/usr.bin/cpio/test/test_owner_parse.c Mon Jul 6 02:02:45 2009 (r195389) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003-2007 Tim Kientzle + * Copyright (c) 2003-2009 Tim Kientzle * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,6 +26,7 @@ __FBSDID("$FreeBSD$"); #include "../cpio.h" +#include "err.h" #if defined(__CYGWIN__) /* On cygwin, the Administrator user most likely exists (unless @@ -37,16 +38,23 @@ __FBSDID("$FreeBSD$"); * Use CreateWellKnownSID() and LookupAccountName()? */ #define ROOT "Administrator" -#define ROOT_UID 500 -#define ROOT_GID1 513 -#define ROOT_GID2 545 -#define ROOT_GID3 544 +static int root_uids[] = { 500 }; +static int root_gids[] = { 513, 545, 544 }; #else #define ROOT "root" -#define ROOT_UID 0 -#define ROOT_GID 0 +static int root_uids[] = { 0 }; +static int root_gids[] = { 0 }; #endif +static int +int_in_list(int i, int *l, size_t n) +{ + while (n-- > 0) + if (*l++ == i) + return (1); + failure("%d", i); + return (0); +} DEFINE_TEST(test_owner_parse) { @@ -56,38 +64,47 @@ DEFINE_TEST(test_owner_parse) #else int uid, gid; - cpio_progname = "Ignore this message"; - assertEqualInt(0, owner_parse(ROOT, &uid, &gid)); - assertEqualInt(ROOT_UID, uid); + assert(int_in_list(uid, root_uids, + sizeof(root_uids)/sizeof(root_uids[0]))); assertEqualInt(-1, gid); assertEqualInt(0, owner_parse(ROOT ":", &uid, &gid)); - assertEqualInt(ROOT_UID, uid); -#if defined(__CYGWIN__) - { - int gidIsOneOf = (ROOT_GID1 == gid) - || (ROOT_GID2 == gid) - || (ROOT_GID3 == gid); - assertEqualInt(1, gidIsOneOf); - } -#else - assertEqualInt(ROOT_GID, gid); -#endif + assert(int_in_list(uid, root_uids, + sizeof(root_uids)/sizeof(root_uids[0]))); + assert(int_in_list(gid, root_gids, + sizeof(root_gids)/sizeof(root_gids[0]))); assertEqualInt(0, owner_parse(ROOT ".", &uid, &gid)); - assertEqualInt(ROOT_UID, uid); -#if defined(__CYGWIN__) - { - int gidIsOneOf = (ROOT_GID1 == gid) - || (ROOT_GID2 == gid) - || (ROOT_GID3 == gid); - assertEqualInt(1, gidIsOneOf); - } -#else - assertEqualInt(ROOT_GID, gid); -#endif + assert(int_in_list(uid, root_uids, + sizeof(root_uids)/sizeof(root_uids[0]))); + assert(int_in_list(gid, root_gids, + sizeof(root_gids)/sizeof(root_gids[0]))); + + assertEqualInt(0, owner_parse("111", &uid, &gid)); + assertEqualInt(111, uid); + assertEqualInt(-1, gid); + + assertEqualInt(0, owner_parse("112:", &uid, &gid)); + assertEqualInt(112, uid); + /* Can't assert gid, since we don't know gid for user #112. */ + + assertEqualInt(0, owner_parse("113.", &uid, &gid)); + assertEqualInt(113, uid); + /* Can't assert gid, since we don't know gid for user #113. */ + + assertEqualInt(0, owner_parse(":114", &uid, &gid)); + assertEqualInt(-1, uid); + assertEqualInt(114, gid); + + assertEqualInt(0, owner_parse(".115", &uid, &gid)); + assertEqualInt(-1, uid); + assertEqualInt(115, gid); + + assertEqualInt(0, owner_parse("116:117", &uid, &gid)); + assertEqualInt(116, uid); + assertEqualInt(117, gid); /* * TODO: Lookup current user/group name, build strings and @@ -104,6 +121,7 @@ DEFINE_TEST(test_owner_parse) * Alternatively, redirect stderr temporarily to suppress the output. */ + cpio_progname = "Ignore this message"; assertEqualInt(1, owner_parse(":nonexistentgroup", &uid, &gid)); assertEqualInt(1, owner_parse(ROOT ":nonexistentgroup", &uid, &gid)); assertEqualInt(1, From n_hibma at FreeBSD.org Mon Jul 6 09:07:36 2009 From: n_hibma at FreeBSD.org (Nick Hibma) Date: Mon Jul 6 09:07:43 2009 Subject: svn commit: r195402 - stable/7/sys/dev/usb Message-ID: <200907060907.n6697a22074004@svn.freebsd.org> Author: n_hibma Date: Mon Jul 6 09:07:35 2009 New Revision: 195402 URL: http://svn.freebsd.org/changeset/base/195402 Log: bugfix: Clear the out endpoint on a stall on the written endpoint, not *in*. Modified: stable/7/sys/dev/usb/ucom.c Modified: stable/7/sys/dev/usb/ucom.c ============================================================================== --- stable/7/sys/dev/usb/ucom.c Mon Jul 6 08:16:25 2009 (r195401) +++ stable/7/sys/dev/usb/ucom.c Mon Jul 6 09:07:35 2009 (r195402) @@ -693,7 +693,7 @@ ucomwritecb(usbd_xfer_handle xfer, usbd_ printf("%s: ucomwritecb: %s\n", device_get_nameunit(sc->sc_dev), usbd_errstr(status)); if (status == USBD_STALLED) - usbd_clear_endpoint_stall_async(sc->sc_bulkin_pipe); + usbd_clear_endpoint_stall_async(sc->sc_bulkout_pipe); /* XXX we should restart after some delay. */ goto error; } From attilio at FreeBSD.org Mon Jul 6 09:31:05 2009 From: attilio at FreeBSD.org (Attilio Rao) Date: Mon Jul 6 09:31:11 2009 Subject: svn commit: r195403 - head/lib/libthr/thread Message-ID: <200907060931.n669V4Zc074488@svn.freebsd.org> Author: attilio Date: Mon Jul 6 09:31:04 2009 New Revision: 195403 URL: http://svn.freebsd.org/changeset/base/195403 Log: In the current code, rdlock_count is not correctly handled for some cases. The most notable is that it is not bumped in rwlock_rdlock_common() when the hard path (__thr_rwlock_rdlock()) returns successfully. This can lead to deadlocks in libthr when rwlocks recursion in read mode happens. Fix the interested parts by correctly handling rdlock_count. PR: threads/136345 Reported by: rink Tested by: rink Reviewed by: jeff Approved by: re (kib) MFC: 2 weeks Modified: head/lib/libthr/thread/thr_rtld.c head/lib/libthr/thread/thr_rwlock.c Modified: head/lib/libthr/thread/thr_rtld.c ============================================================================== --- head/lib/libthr/thread/thr_rtld.c Mon Jul 6 09:07:35 2009 (r195402) +++ head/lib/libthr/thread/thr_rtld.c Mon Jul 6 09:31:04 2009 (r195403) @@ -114,6 +114,7 @@ _thr_rtld_rlock_acquire(void *lock) THR_CRITICAL_ENTER(curthread); while (_thr_rwlock_rdlock(&l->lock, 0, NULL) != 0) ; + curthread->rdlock_count++; RESTORE_ERRNO(); } @@ -148,6 +149,7 @@ _thr_rtld_lock_release(void *lock) state = l->lock.rw_state; if (_thr_rwlock_unlock(&l->lock) == 0) { + curthread->rdlock_count--; if ((state & URWLOCK_WRITE_OWNER) == 0) { THR_CRITICAL_LEAVE(curthread); } else { Modified: head/lib/libthr/thread/thr_rwlock.c ============================================================================== --- head/lib/libthr/thread/thr_rwlock.c Mon Jul 6 09:07:35 2009 (r195402) +++ head/lib/libthr/thread/thr_rwlock.c Mon Jul 6 09:31:04 2009 (r195403) @@ -177,10 +177,11 @@ rwlock_rdlock_common(pthread_rwlock_t *r /* if interrupted, try to lock it in userland again. */ if (_thr_rwlock_tryrdlock(&prwlock->lock, flags) == 0) { ret = 0; - curthread->rdlock_count++; break; } } + if (ret == 0) + curthread->rdlock_count++; return (ret); } From des at des.no Mon Jul 6 11:45:37 2009 From: des at des.no (=?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?=) Date: Mon Jul 6 11:45:48 2009 Subject: svn commit: r195295 - in head/sys: amd64/conf i386/conf ia64/conf pc98/conf powerpc/conf sparc64/conf sun4v/conf In-Reply-To: <4A4F24AF.3080900@incunabulum.net> (Bruce Simpson's message of "Sat, 04 Jul 2009 10:45:19 +0100") References: <200907021824.n62IObWJ051643@svn.freebsd.org> <4A4F24AF.3080900@incunabulum.net> Message-ID: <86y6r2ghlt.fsf@ds4.des.no> Bruce Simpson writes: > Ed Schouten writes: > > Enable POSIX semaphores on all non-embedded architectures by default. > Thank you. I didn't do this as normally we're pretty conservative > about this sort of change, but now they are fixed, it just plain makes > sense. They aren't fixed, they're just broken in a different way. The previous implementation used the filesystem namespace, so you could (to a certain degree) apply filesystem access control semantics, including letting processes in separate jails use the same semaphore names without stepping on each others toes. The current implementation uses its own flat namespace with no access control whatsoever and is not jailable. At some point, somebody is going to have to fix it all over again. DES -- Dag-Erling Sm?rgrav - des@des.no From flz at FreeBSD.org Mon Jul 6 11:46:20 2009 From: flz at FreeBSD.org (Florent Thoumie) Date: Mon Jul 6 11:46:32 2009 Subject: svn commit: r195405 - head Message-ID: <200907061146.n66BkJDt081098@svn.freebsd.org> Author: flz Date: Mon Jul 6 11:46:18 2009 New Revision: 195405 URL: http://svn.freebsd.org/changeset/base/195405 Log: - pkg_install is maintained by portmgr. - BSD.x11{,-4}.dist aren't used anymore and BSD.local.dist now lives in ports/Templates/. Most people apparently missed that move and still commit to the src copy, so I'll have to remove it eventually but for now, the MAINTAINERS line can go. Approved by: re (kib) Modified: head/MAINTAINERS Modified: head/MAINTAINERS ============================================================================== --- head/MAINTAINERS Mon Jul 6 10:40:46 2009 (r195404) +++ head/MAINTAINERS Mon Jul 6 11:46:18 2009 (r195405) @@ -111,7 +111,7 @@ truss alfred Will be happy to review co rpc alfred Pre-commit review requested. xfs kan@FreeBSD.org,rodrigc@FreeBSD.org,cattelan@xfs.org Pre-commit review preferred. -pkg_install krion Pre-commit review or approval from portmgr@ requested. +pkg_install portmgr Pre-commit review or approval from portmgr@ requested. linux emul emulation Please discuss changes here. bs{diff,patch} cperciva Pre-commit review requested. portsnap cperciva Pre-commit review requested. @@ -123,7 +123,6 @@ lib/libsdp emax Pre-commit review prefe usr.bin/bluetooth emax Pre-commit review preferred. usr.sbin/bluetooth emax Pre-commit review preferred. gnu/usr.bin/send-pr bugmaster Pre-commit review requested. -BSD.{local,x11*}.dist portmgr Pre-commit review requested, since these files interface with ports. ncurses rafan Heads-up appreciated, try not to break it. Following are the entries from the Makefiles, and a few other sources. From des at des.no Mon Jul 6 11:57:34 2009 From: des at des.no (=?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?=) Date: Mon Jul 6 11:58:59 2009 Subject: svn commit: r195295 - in head/sys: amd64/conf i386/conf ia64/conf pc98/conf powerpc/conf sparc64/conf sun4v/conf In-Reply-To: <86y6r2ghlt.fsf@ds4.des.no> ("Dag-Erling =?utf-8?Q?Sm=C3=B8rg?= =?utf-8?Q?rav=22's?= message of "Mon, 06 Jul 2009 13:45:34 +0200") References: <200907021824.n62IObWJ051643@svn.freebsd.org> <4A4F24AF.3080900@incunabulum.net> <86y6r2ghlt.fsf@ds4.des.no> Message-ID: <86prcegh1v.fsf@ds4.des.no> Dag-Erling Sm?rgrav writes: > They aren't fixed, they're just broken in a different way. The previous > implementation used the filesystem namespace, Bah, it didn't. Please ignore me. DES -- Dag-Erling Sm?rgrav - des@des.no From rink at FreeBSD.org Mon Jul 6 12:58:33 2009 From: rink at FreeBSD.org (Rink Springer) Date: Mon Jul 6 12:58:39 2009 Subject: svn commit: r195403 - head/lib/libthr/thread In-Reply-To: <200907060931.n669V4Zc074488@svn.freebsd.org> References: <200907060931.n669V4Zc074488@svn.freebsd.org> Message-ID: <20090706123957.GA76863@rink.nu> On Mon, Jul 06, 2009 at 09:31:04AM +0000, Attilio Rao wrote: > Log: > In the current code, rdlock_count is not correctly handled for some cases. > The most notable is that it is not bumped in rwlock_rdlock_common() when > the hard path (__thr_rwlock_rdlock()) returns successfully. > This can lead to deadlocks in libthr when rwlocks recursion in read mode > happens. > Fix the interested parts by correctly handling rdlock_count. > > PR: threads/136345 > Reported by: rink > Tested by: rink > Reviewed by: jeff > Approved by: re (kib) > MFC: 2 weeks Thanks! -- Rink P.W. Springer - http://rink.nu "Doom, gloom and despair. I like it!" - Tiresias From jfv at FreeBSD.org Mon Jul 6 17:23:49 2009 From: jfv at FreeBSD.org (Jack F Vogel) Date: Mon Jul 6 17:23:55 2009 Subject: svn commit: r195409 - head/sys/dev/e1000 Message-ID: <200907061723.n66HNnbn087652@svn.freebsd.org> Author: jfv Date: Mon Jul 6 17:23:48 2009 New Revision: 195409 URL: http://svn.freebsd.org/changeset/base/195409 Log: The new method of reading the mac address from the RAR(0) register does not work on this old adapter, provide a local routine that does it the older way. Approved by: re Modified: head/sys/dev/e1000/e1000_82542.c Modified: head/sys/dev/e1000/e1000_82542.c ============================================================================== --- head/sys/dev/e1000/e1000_82542.c Mon Jul 6 14:15:12 2009 (r195408) +++ head/sys/dev/e1000/e1000_82542.c Mon Jul 6 17:23:48 2009 (r195409) @@ -1,6 +1,6 @@ /****************************************************************************** - Copyright (c) 2001-2008, Intel Corporation + Copyright (c) 2001-2009, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without @@ -49,6 +49,8 @@ static s32 e1000_led_on_82542(struct e1 static s32 e1000_led_off_82542(struct e1000_hw *hw); static void e1000_rar_set_82542(struct e1000_hw *hw, u8 *addr, u32 index); static void e1000_clear_hw_cntrs_82542(struct e1000_hw *hw); +static s32 e1000_read_mac_addr_82542(struct e1000_hw *hw); + /** * e1000_init_phy_params_82542 - Init PHY func ptrs. @@ -134,6 +136,8 @@ static s32 e1000_init_mac_params_82542(s mac->ops.clear_vfta = e1000_clear_vfta_generic; /* setting MTA */ mac->ops.mta_set = e1000_mta_set_generic; + /* read mac address */ + mac->ops.read_mac_addr = e1000_read_mac_addr_82542; /* set RAR */ mac->ops.rar_set = e1000_rar_set_82542; /* turn on/off LED */ @@ -554,3 +558,34 @@ static void e1000_clear_hw_cntrs_82542(s E1000_READ_REG(hw, E1000_PTC1023); E1000_READ_REG(hw, E1000_PTC1522); } + +/** + * e1000_read_mac_addr_82542 - Read device MAC address + * @hw: pointer to the HW structure + * + * Reads the device MAC address from the EEPROM and stores the value. + **/ +static s32 e1000_read_mac_addr_82542(struct e1000_hw *hw) +{ + s32 ret_val = E1000_SUCCESS; + u16 offset, nvm_data, i; + + DEBUGFUNC("e1000_read_mac_addr"); + + for (i = 0; i < ETH_ADDR_LEN; i += 2) { + offset = i >> 1; + ret_val = hw->nvm.ops.read(hw, offset, 1, &nvm_data); + if (ret_val) { + DEBUGOUT("NVM Read Error\n"); + goto out; + } + hw->mac.perm_addr[i] = (u8)(nvm_data & 0xFF); + hw->mac.perm_addr[i+1] = (u8)(nvm_data >> 8); + } + + for (i = 0; i < ETH_ADDR_LEN; i++) + hw->mac.addr[i] = hw->mac.perm_addr[i]; + +out: + return ret_val; +} From jhb at FreeBSD.org Mon Jul 6 18:10:28 2009 From: jhb at FreeBSD.org (John Baldwin) Date: Mon Jul 6 18:10:39 2009 Subject: svn commit: r195410 - head/sys/amd64/amd64 Message-ID: <200907061810.n66IARQJ088646@svn.freebsd.org> Author: jhb Date: Mon Jul 6 18:10:27 2009 New Revision: 195410 URL: http://svn.freebsd.org/changeset/base/195410 Log: MFi386: Add a 'show idt' command to DDB to display the non-default function pointers in the interrupt descriptor table. Approved by: re (kensmith) Modified: head/sys/amd64/amd64/machdep.c Modified: head/sys/amd64/amd64/machdep.c ============================================================================== --- head/sys/amd64/amd64/machdep.c Mon Jul 6 17:23:48 2009 (r195409) +++ head/sys/amd64/amd64/machdep.c Mon Jul 6 18:10:27 2009 (r195410) @@ -100,8 +100,9 @@ __FBSDID("$FreeBSD$"); #ifndef KDB #error KDB must be enabled in order for DDB to work! #endif -#endif #include +#include +#endif #include @@ -1083,6 +1084,30 @@ extern inthand_t IDTVEC(xmm), IDTVEC(dblfault), IDTVEC(fast_syscall), IDTVEC(fast_syscall32); +#ifdef DDB +/* + * Display the index and function name of any IDT entries that don't use + * the default 'rsvd' entry point. + */ +DB_SHOW_COMMAND(idt, db_show_idt) +{ + struct gate_descriptor *ip; + int idx; + uintptr_t func; + + ip = idt; + for (idx = 0; idx < NIDT && !db_pager_quit; idx++) { + func = ((long)ip->gd_hioffset << 16 | ip->gd_looffset); + if (func != (uintptr_t)&IDTVEC(rsvd)) { + db_printf("%3d\t", idx); + db_printsym(func, DB_STGY_PROC); + db_printf("\n"); + } + ip++; + } +} +#endif + void sdtossd(sd, ssd) struct user_segment_descriptor *sd; From jhb at FreeBSD.org Mon Jul 6 18:23:02 2009 From: jhb at FreeBSD.org (John Baldwin) Date: Mon Jul 6 18:23:13 2009 Subject: svn commit: r195415 - in head/sys: amd64/amd64 i386/i386 Message-ID: <200907061823.n66IN1up089082@svn.freebsd.org> Author: jhb Date: Mon Jul 6 18:23:00 2009 New Revision: 195415 URL: http://svn.freebsd.org/changeset/base/195415 Log: After the per-CPU IDT changes, the IDT vector of an interrupt could change when the interrupt was moved from one CPU to another. If the interrupt was enabled, then the old IDT vector needs to be disabled and the new IDT vector needs to be enabled. This was mostly masked prior to the recent MSI changes since in the older code almost all allocated IDT vectors were already enabled and the enabled vectors on the BSP during boot covered enough of the IDT range. However, after the MSI changes, MSI interrupts that were allocated but not enabled (e.g. DRM with MSI) during boot could result in an allocated IDT vector that wasn't enabled. The round-robin at the end of boot could place another interrupt at the same IDT vector without enabling the IDT vector causing trap 30 faults. Fix this by explicitly disabling/enabling the old and new IDT vectors for enabled interrupt sources when moving an interrupt between CPUs via the pic_assign_cpu() method. While here, fix a bug in my earlier changes so that an I/O APIC interrupt pin is left unchanged if ioapic_assign_cpu() fails to allocate a new IDT vector and returns ENOSPC. Approved by: re (kensmith) Modified: head/sys/amd64/amd64/io_apic.c head/sys/amd64/amd64/msi.c head/sys/i386/i386/io_apic.c head/sys/i386/i386/msi.c Modified: head/sys/amd64/amd64/io_apic.c ============================================================================== --- head/sys/amd64/amd64/io_apic.c Mon Jul 6 18:18:27 2009 (r195414) +++ head/sys/amd64/amd64/io_apic.c Mon Jul 6 18:23:00 2009 (r195415) @@ -327,7 +327,7 @@ ioapic_assign_cpu(struct intsrc *isrc, u { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; struct ioapic *io = (struct ioapic *)isrc->is_pic; - u_int old_vector; + u_int old_vector, new_vector; u_int old_id; /* @@ -348,11 +348,14 @@ ioapic_assign_cpu(struct intsrc *isrc, u * Allocate an APIC vector for this interrupt pin. Once * we have a vector we program the interrupt pin. */ - intpin->io_cpu = apic_id; - intpin->io_vector = apic_alloc_vector(apic_id, intpin->io_irq); - if (intpin->io_vector == 0) + new_vector = apic_alloc_vector(apic_id, intpin->io_irq); + if (new_vector == 0) return (ENOSPC); + intpin->io_cpu = apic_id; + intpin->io_vector = new_vector; + if (isrc->is_handlers > 0) + apic_enable_vector(intpin->io_cpu, intpin->io_vector); if (bootverbose) { printf("ioapic%u: routing intpin %u (", io->io_id, intpin->io_intpin); @@ -365,8 +368,11 @@ ioapic_assign_cpu(struct intsrc *isrc, u * Free the old vector after the new one is established. This is done * to prevent races where we could miss an interrupt. */ - if (old_vector) + if (old_vector) { + if (isrc->is_handlers > 0) + apic_disable_vector(old_id, old_vector); apic_free_vector(old_id, old_vector, intpin->io_irq); + } return (0); } Modified: head/sys/amd64/amd64/msi.c ============================================================================== --- head/sys/amd64/amd64/msi.c Mon Jul 6 18:18:27 2009 (r195414) +++ head/sys/amd64/amd64/msi.c Mon Jul 6 18:23:00 2009 (r195415) @@ -230,6 +230,8 @@ msi_assign_cpu(struct intsrc *isrc, u_in msi->msi_cpu = apic_id; msi->msi_vector = vector; + if (msi->msi_intsrc.is_handlers > 0) + apic_enable_vector(msi->msi_cpu, msi->msi_vector); if (bootverbose) printf("msi: Assigning %s IRQ %d to local APIC %u vector %u\n", msi->msi_msix ? "MSI-X" : "MSI", msi->msi_irq, @@ -238,6 +240,8 @@ msi_assign_cpu(struct intsrc *isrc, u_in sib = (struct msi_intsrc *)intr_lookup_source(msi->msi_irqs[i]); sib->msi_cpu = apic_id; sib->msi_vector = vector + i; + if (sib->msi_intsrc.is_handlers > 0) + apic_enable_vector(sib->msi_cpu, sib->msi_vector); if (bootverbose) printf( "msi: Assigning MSI IRQ %d to local APIC %u vector %u\n", @@ -249,9 +253,15 @@ msi_assign_cpu(struct intsrc *isrc, u_in * Free the old vector after the new one is established. This is done * to prevent races where we could miss an interrupt. */ + if (msi->msi_intsrc.is_handlers > 0) + apic_disable_vector(old_id, old_vector); apic_free_vector(old_id, old_vector, msi->msi_irq); - for (i = 1; i < msi->msi_count; i++) + for (i = 1; i < msi->msi_count; i++) { + sib = (struct msi_intsrc *)intr_lookup_source(msi->msi_irqs[i]); + if (sib->msi_intsrc.is_handlers > 0) + apic_disable_vector(old_id, old_vector + i); apic_free_vector(old_id, old_vector + i, msi->msi_irqs[i]); + } return (0); } Modified: head/sys/i386/i386/io_apic.c ============================================================================== --- head/sys/i386/i386/io_apic.c Mon Jul 6 18:18:27 2009 (r195414) +++ head/sys/i386/i386/io_apic.c Mon Jul 6 18:23:00 2009 (r195415) @@ -327,7 +327,7 @@ ioapic_assign_cpu(struct intsrc *isrc, u { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; struct ioapic *io = (struct ioapic *)isrc->is_pic; - u_int old_vector; + u_int old_vector, new_vector; u_int old_id; /* @@ -348,11 +348,14 @@ ioapic_assign_cpu(struct intsrc *isrc, u * Allocate an APIC vector for this interrupt pin. Once * we have a vector we program the interrupt pin. */ - intpin->io_cpu = apic_id; - intpin->io_vector = apic_alloc_vector(apic_id, intpin->io_irq); - if (intpin->io_vector == 0) + new_vector = apic_alloc_vector(apic_id, intpin->io_irq); + if (new_vector == 0) return (ENOSPC); + intpin->io_cpu = apic_id; + intpin->io_vector = new_vector; + if (isrc->is_handlers > 0) + apic_enable_vector(intpin->io_cpu, intpin->io_vector); if (bootverbose) { printf("ioapic%u: routing intpin %u (", io->io_id, intpin->io_intpin); @@ -365,8 +368,11 @@ ioapic_assign_cpu(struct intsrc *isrc, u * Free the old vector after the new one is established. This is done * to prevent races where we could miss an interrupt. */ - if (old_vector) + if (old_vector) { + if (isrc->is_handlers > 0) + apic_disable_vector(old_id, old_vector); apic_free_vector(old_id, old_vector, intpin->io_irq); + } return (0); } Modified: head/sys/i386/i386/msi.c ============================================================================== --- head/sys/i386/i386/msi.c Mon Jul 6 18:18:27 2009 (r195414) +++ head/sys/i386/i386/msi.c Mon Jul 6 18:23:00 2009 (r195415) @@ -230,6 +230,8 @@ msi_assign_cpu(struct intsrc *isrc, u_in msi->msi_cpu = apic_id; msi->msi_vector = vector; + if (msi->msi_intsrc.is_handlers > 0) + apic_enable_vector(msi->msi_cpu, msi->msi_vector); if (bootverbose) printf("msi: Assigning %s IRQ %d to local APIC %u vector %u\n", msi->msi_msix ? "MSI-X" : "MSI", msi->msi_irq, @@ -238,6 +240,8 @@ msi_assign_cpu(struct intsrc *isrc, u_in sib = (struct msi_intsrc *)intr_lookup_source(msi->msi_irqs[i]); sib->msi_cpu = apic_id; sib->msi_vector = vector + i; + if (sib->msi_intsrc.is_handlers > 0) + apic_enable_vector(sib->msi_cpu, sib->msi_vector); if (bootverbose) printf( "msi: Assigning MSI IRQ %d to local APIC %u vector %u\n", @@ -249,9 +253,15 @@ msi_assign_cpu(struct intsrc *isrc, u_in * Free the old vector after the new one is established. This is done * to prevent races where we could miss an interrupt. */ + if (msi->msi_intsrc.is_handlers > 0) + apic_disable_vector(old_id, old_vector); apic_free_vector(old_id, old_vector, msi->msi_irq); - for (i = 1; i < msi->msi_count; i++) + for (i = 1; i < msi->msi_count; i++) { + sib = (struct msi_intsrc *)intr_lookup_source(msi->msi_irqs[i]); + if (sib->msi_intsrc.is_handlers > 0) + apic_disable_vector(old_id, old_vector + i); apic_free_vector(old_id, old_vector + i, msi->msi_irqs[i]); + } return (0); } From alc at FreeBSD.org Mon Jul 6 18:43:43 2009 From: alc at FreeBSD.org (Alan Cox) Date: Mon Jul 6 18:43:55 2009 Subject: svn commit: r195416 - head/sys/amd64/amd64 Message-ID: <200907061843.n66IhgmM089541@svn.freebsd.org> Author: alc Date: Mon Jul 6 18:43:42 2009 New Revision: 195416 URL: http://svn.freebsd.org/changeset/base/195416 Log: When pmap_change_attr() changes the PAT setting on a kernel mapping, it has to simultaneously change the PAT setting for the same pages within the direct map region. This may require the demotion of a 2MB page mapping and the allocation of a page table page. This revision gives the highest possible priority (VM_ALLOC_INTERRUPT) to this page allocation, so that pmap_change_attr() is less likely to fail. (In general, kernel page table page allocations have the highest priority, so this is not creating a new precedent.) (Demotion of 1GB page mappings within the direct map already specifies VM_ALLOC_INTERRUPT to vm_page_alloc(), so only pmap_demote_pde() must be changed.) Approved by: re (kib) Modified: head/sys/amd64/amd64/pmap.c Modified: head/sys/amd64/amd64/pmap.c ============================================================================== --- head/sys/amd64/amd64/pmap.c Mon Jul 6 18:23:00 2009 (r195415) +++ head/sys/amd64/amd64/pmap.c Mon Jul 6 18:43:42 2009 (r195416) @@ -2218,11 +2218,19 @@ pmap_demote_pde(pmap_t pmap, pd_entry_t /* * Invalidate the 2MB page mapping and return "failure" if the * mapping was never accessed or the allocation of the new - * page table page fails. + * page table page fails. If the 2MB page mapping belongs to + * the direct map region of the kernel's address space, then + * the page allocation request specifies the highest possible + * priority (VM_ALLOC_INTERRUPT). Otherwise, the priority is + * normal. Page table pages are preallocated for every other + * part of the kernel address space, so the direct map region + * is the only part of the kernel address space that must be + * handled here. */ if ((oldpde & PG_A) == 0 || (mpte = vm_page_alloc(NULL, - pmap_pde_pindex(va), VM_ALLOC_NOOBJ | VM_ALLOC_NORMAL | - VM_ALLOC_WIRED)) == NULL) { + pmap_pde_pindex(va), (va >= DMAP_MIN_ADDRESS && va < + DMAP_MAX_ADDRESS ? VM_ALLOC_INTERRUPT : VM_ALLOC_NORMAL) | + VM_ALLOC_NOOBJ | VM_ALLOC_WIRED)) == NULL) { free = NULL; pmap_remove_pde(pmap, pde, trunc_2mpage(va), &free); pmap_invalidate_page(pmap, trunc_2mpage(va)); From joel at FreeBSD.org Mon Jul 6 19:32:14 2009 From: joel at FreeBSD.org (Joel Dahl) Date: Mon Jul 6 19:32:25 2009 Subject: svn commit: r195417 - head/share/man/man4 Message-ID: <200907061932.n66JWD41090516@svn.freebsd.org> Author: joel (doc committer) Date: Mon Jul 6 19:32:13 2009 New Revision: 195417 URL: http://svn.freebsd.org/changeset/base/195417 Log: Document the new EQ and VPC features along with a few loader tunables. Reviewed by: ariff Approved by: re (blanket) Modified: head/share/man/man4/pcm.4 Modified: head/share/man/man4/pcm.4 ============================================================================== --- head/share/man/man4/pcm.4 Mon Jul 6 18:43:42 2009 (r195416) +++ head/share/man/man4/pcm.4 Mon Jul 6 19:32:13 2009 (r195417) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 23, 2009 +.Dd July 6, 2009 .Dt SOUND 4 .Os .Sh NAME @@ -141,6 +141,15 @@ To define default values for the differe set the channel to the preferred value using hints, e.g.: .Va hint.pcm.0.line Ns = Ns Qq Li 0 . This will mute the input channel per default. +.Ss EQ +The Parametric Software Equlizer (EQ) enables the use of +.Dq tone +controls (bass and treble). +Commonly used for ear-candy or frequency compensation due to the vast +difference in hardware quality. +EQ is disabled by default, but can be enabled with the +.Va hint.pcm. Ns Ao Ar X Ac Ns Va .eq +tunable. .Ss VCHANs Each device can optionally support more playback and recording channels than physical hardware provides by using @@ -151,15 +160,55 @@ or options can be configured via the .Xr sysctl 8 interface but can only be manipulated while the device is inactive. +.Ss VPC +FreeBSD supports independent and individual volume controls for each active +application, without touching the master +.Nm +volume. +This is sometimes referred to as Volume Per Channel (VPC). +The +.Tn VPC +feature is enabled by default. +.Ss Loader Tunables +The following loader tunables are used to set driver configuration at the +.Xr loader 8 +prompt before booting the kernel, or they can be stored in +.Pa /boot/loader.conf +in order to automatically set them before booting the kernel. +It is also possible to use +.Xr kenv 1 +to change these tunables before loading the +.Nm +driver. +The following tunables can not be changed during runtime using +.Xr sysctl 8 . +.Bl -tag -width indent +.It Va hint.pcm. Ns Ao Ar X Ac Ns Va .eq +Set to 1 or 0 to explicitly enable (1) or disable (0) the equalizer. +Requires a driver reload if changed. +Enabling this will make bass and treble controls appear in mixer applications. +This tunable is undefined by default. +Equalizing is disabled by default. +.It Va hint.pcm. Ns Ao Ar X Ac Ns Va .vpc +Set to 1 or 0 to explicitly enable (1) or disable (0) the +.Tn VPC +feature. +This tunable is undefined by default. +.Tn VPC +is however enabled by default. +.El .Ss Runtime Configuration There are a number of .Xr sysctl 8 -variables available. +variables available which can be modified during runtime. +These values can also be stored in +.Pa /etc/sysctl.conf +in order to automatically set them during the boot process. .Va hw.snd.* -tunables are global settings and +are global settings and .Va dev.pcm.* are device specific. -.Bl -tag -width ".Va hw.snd.report_soft_formats" -offset indent +.Bl -tag -width indent .It Va hw.snd.compat_linux_mmap Enable to allow PROT_EXEC page mappings. All Linux applications using sound and @@ -299,7 +348,9 @@ This means that any changes to the volum Enabling this will preserve the volume, at the cost of possible confusion when applications tries to re-open the same device. .It Va hw.snd.vpc_mixer_bypass -The recommended way to use the vpc feature is to teach applications to use +The recommended way to use the +.Tn VPC +feature is to teach applications to use the correct .Fn ioctl : .Dv SNDCTL_DSP_GETPLAYVOL, SNDCTL_DSP_SETPLAYVOL, From sam at FreeBSD.org Mon Jul 6 20:51:55 2009 From: sam at FreeBSD.org (Sam Leffler) Date: Mon Jul 6 20:52:07 2009 Subject: svn commit: r195418 - head/sys/dev/ath Message-ID: <200907062051.n66KpsEc091984@svn.freebsd.org> Author: sam Date: Mon Jul 6 20:51:54 2009 New Revision: 195418 URL: http://svn.freebsd.org/changeset/base/195418 Log: Fix AR5416 and later parts when building with AH_DEBUG or similar defined: always define OS_REG_UNSWAPPED and use it in ath_hal_reg_{read,write}. Approved by: re (kib) Modified: head/sys/dev/ath/ah_osdep.c head/sys/dev/ath/ah_osdep.h Modified: head/sys/dev/ath/ah_osdep.c ============================================================================== --- head/sys/dev/ath/ah_osdep.c Mon Jul 6 19:32:13 2009 (r195417) +++ head/sys/dev/ath/ah_osdep.c Mon Jul 6 20:51:54 2009 (r195418) @@ -254,7 +254,7 @@ ath_hal_reg_write(struct ath_hal *ah, u_ } } #if _BYTE_ORDER == _BIG_ENDIAN - if (reg >= 0x4000 && reg < 0x5000) + if (OS_REG_UNSWAPPED(reg)) bus_space_write_4(tag, h, reg, val); else #endif @@ -269,7 +269,7 @@ ath_hal_reg_read(struct ath_hal *ah, u_i u_int32_t val; #if _BYTE_ORDER == _BIG_ENDIAN - if (reg >= 0x4000 && reg < 0x5000) + if (OS_REG_UNSWAPPED(reg)) val = bus_space_read_4(tag, h, reg); else #endif @@ -320,7 +320,7 @@ ath_hal_reg_write(struct ath_hal *ah, u_ bus_space_handle_t h = ah->ah_sh; #if _BYTE_ORDER == _BIG_ENDIAN - if (reg >= 0x4000 && reg < 0x5000) + if (OS_REG_UNSWAPPED(reg)) bus_space_write_4(tag, h, reg, val); else #endif @@ -335,7 +335,7 @@ ath_hal_reg_read(struct ath_hal *ah, u_i u_int32_t val; #if _BYTE_ORDER == _BIG_ENDIAN - if (reg >= 0x4000 && reg < 0x5000) + if (OS_REG_UNSWAPPED(reg)) val = bus_space_read_4(tag, h, reg); else #endif Modified: head/sys/dev/ath/ah_osdep.h ============================================================================== --- head/sys/dev/ath/ah_osdep.h Mon Jul 6 19:32:13 2009 (r195417) +++ head/sys/dev/ath/ah_osdep.h Mon Jul 6 20:51:54 2009 (r195418) @@ -69,14 +69,26 @@ typedef bus_space_handle_t HAL_BUS_HANDL struct ath_hal; /* + * The hardware registers are native little-endian byte order. + * Big-endian hosts are handled by enabling hardware byte-swap + * of register reads and writes at reset. But the PCI clock + * domain registers are not byte swapped! Thus, on big-endian + * platforms we have to explicitly byte-swap those registers. + * OS_REG_UNSWAPPED identifies the registers that need special handling. + */ +#if _BYTE_ORDER == _BIG_ENDIAN +#define OS_REG_UNSWAPPED(_reg) \ + (((_reg) >= 0x4000 && (_reg) < 0x5000) || \ + ((_reg) >= 0x7000 && (_reg) < 0x8000)) +#else /* _BYTE_ORDER == _LITTLE_ENDIAN */ +#define OS_REG_UNSWAPPED(_reg) (0) +#endif /* _BYTE_ORDER */ + +/* * Register read/write operations are either handled through * platform-dependent routines (or when debugging is enabled * with AH_DEBUG); or they are inline expanded using the macros - * defined below. For public builds we inline expand only for - * platforms where it is certain what the requirements are to - * read/write registers--typically they are memory-mapped and - * no explicit synchronization or memory invalidation operations - * are required (e.g. i386). + * defined below. */ #if defined(AH_DEBUG) || defined(AH_REGOPS_FUNC) || defined(AH_DEBUG_ALQ) #define OS_REG_WRITE(_ah, _reg, _val) ath_hal_reg_write(_ah, _reg, _val) @@ -94,13 +106,7 @@ extern u_int32_t ath_hal_reg_read(struct * Most of this code is collapsed at compile time because the * register values are constants. */ -#define AH_LITTLE_ENDIAN 1234 -#define AH_BIG_ENDIAN 4321 - #if _BYTE_ORDER == _BIG_ENDIAN -#define OS_REG_UNSWAPPED(_reg) \ - (((_reg) >= 0x4000 && (_reg) < 0x5000) || \ - ((_reg) >= 0x7000 && (_reg) < 0x8000)) #define OS_REG_WRITE(_ah, _reg, _val) do { \ if (OS_REG_UNSWAPPED(_reg)) \ bus_space_write_4((bus_space_tag_t)(_ah)->ah_st, \ @@ -116,7 +122,6 @@ extern u_int32_t ath_hal_reg_read(struct bus_space_read_stream_4((bus_space_tag_t)(_ah)->ah_st, \ (bus_space_handle_t)(_ah)->ah_sh, (_reg))) #else /* _BYTE_ORDER == _LITTLE_ENDIAN */ -#define OS_REG_UNSWAPPED(_reg) (0) #define OS_REG_WRITE(_ah, _reg, _val) \ bus_space_write_4((bus_space_tag_t)(_ah)->ah_st, \ (bus_space_handle_t)(_ah)->ah_sh, (_reg), (_val)) From kensmith at FreeBSD.org Tue Jul 7 00:02:27 2009 From: kensmith at FreeBSD.org (Ken Smith) Date: Tue Jul 7 00:02:34 2009 Subject: svn commit: r195422 - head/sys/conf Message-ID: <200907070002.n6702Q4s096121@svn.freebsd.org> Author: kensmith Date: Tue Jul 7 00:02:26 2009 New Revision: 195422 URL: http://svn.freebsd.org/changeset/base/195422 Log: Bump for BETA1. Approved by: re (implicit) Modified: head/sys/conf/newvers.sh Modified: head/sys/conf/newvers.sh ============================================================================== --- head/sys/conf/newvers.sh Mon Jul 6 23:34:02 2009 (r195421) +++ head/sys/conf/newvers.sh Tue Jul 7 00:02:26 2009 (r195422) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="8.0" -BRANCH="CURRENT" +BRANCH="BETA1" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi From kib at FreeBSD.org Tue Jul 7 09:43:45 2009 From: kib at FreeBSD.org (Konstantin Belousov) Date: Tue Jul 7 09:43:57 2009 Subject: svn commit: r195423 - in head/sys: fs/fifofs kern sys Message-ID: <200907070943.n679hin1008696@svn.freebsd.org> Author: kib Date: Tue Jul 7 09:43:44 2009 New Revision: 195423 URL: http://svn.freebsd.org/changeset/base/195423 Log: Fix poll(2) and select(2) for named pipes to return "ready for read" when all writers, observed by reader, exited. Use writer generation counter for fifo, and store the snapshot of the fifo generation in the f_seqcount field of struct file, that is otherwise unused for fifos. Set FreeBSD-undocumented POLLINIGNEOF flag only when file f_seqcount is equal to fifo' fi_wgen, and revert r89376. Fix POLLINIGNEOF for sockets and pipes, and return POLLHUP for them. Note that the patch does not fix not returning POLLHUP for fifos. PR: kern/94772 Submitted by: bde (original version) Reviewed by: rwatson, jilles Approved by: re (kensmith) MFC after: 6 weeks (might be) Modified: head/sys/fs/fifofs/fifo_vnops.c head/sys/kern/sys_pipe.c head/sys/kern/uipc_socket.c head/sys/sys/socketvar.h Modified: head/sys/fs/fifofs/fifo_vnops.c ============================================================================== --- head/sys/fs/fifofs/fifo_vnops.c Tue Jul 7 00:02:26 2009 (r195422) +++ head/sys/fs/fifofs/fifo_vnops.c Tue Jul 7 09:43:44 2009 (r195423) @@ -84,6 +84,7 @@ struct fifoinfo { struct socket *fi_writesock; long fi_readers; long fi_writers; + int fi_wgen; }; static vop_print_t fifo_print; @@ -232,6 +233,7 @@ fail1: sowwakeup(fip->fi_writesock); } } + fp->f_seqcount = fip->fi_wgen - fip->fi_writers; } if (ap->a_mode & FWRITE) { if ((ap->a_mode & O_NONBLOCK) && fip->fi_readers == 0) { @@ -279,6 +281,9 @@ fail1: fip->fi_writers--; if (fip->fi_writers == 0) { socantrcvmore(fip->fi_readsock); + mtx_lock(&fifo_mtx); + fip->fi_wgen++; + mtx_unlock(&fifo_mtx); fifo_cleanup(vp); } return (error); @@ -395,8 +400,12 @@ fifo_close(ap) } if (ap->a_fflag & FWRITE) { fip->fi_writers--; - if (fip->fi_writers == 0) + if (fip->fi_writers == 0) { socantrcvmore(fip->fi_readsock); + mtx_lock(&fifo_mtx); + fip->fi_wgen++; + mtx_unlock(&fifo_mtx); + } } fifo_cleanup(vp); return (0); @@ -634,28 +643,13 @@ fifo_poll_f(struct file *fp, int events, levents = events & (POLLIN | POLLINIGNEOF | POLLPRI | POLLRDNORM | POLLRDBAND); if ((fp->f_flag & FREAD) && levents) { - /* - * If POLLIN or POLLRDNORM is requested and POLLINIGNEOF is - * not, then convert the first two to the last one. This - * tells the socket poll function to ignore EOF so that we - * block if there is no writer (and no data). Callers can - * set POLLINIGNEOF to get non-blocking behavior. - */ - if (levents & (POLLIN | POLLRDNORM) && - !(levents & POLLINIGNEOF)) { - levents &= ~(POLLIN | POLLRDNORM); - levents |= POLLINIGNEOF; - } - filetmp.f_data = fip->fi_readsock; filetmp.f_cred = cred; + mtx_lock(&fifo_mtx); + if (fp->f_seqcount == fip->fi_wgen) + levents |= POLLINIGNEOF; + mtx_unlock(&fifo_mtx); revents |= soo_poll(&filetmp, levents, cred, td); - - /* Reverse the above conversion. */ - if ((revents & POLLINIGNEOF) && !(events & POLLINIGNEOF)) { - revents |= (events & (POLLIN | POLLRDNORM)); - revents &= ~POLLINIGNEOF; - } } levents = events & (POLLOUT | POLLWRNORM | POLLWRBAND); if ((fp->f_flag & FWRITE) && levents) { Modified: head/sys/kern/sys_pipe.c ============================================================================== --- head/sys/kern/sys_pipe.c Tue Jul 7 00:02:26 2009 (r195422) +++ head/sys/kern/sys_pipe.c Tue Jul 7 09:43:44 2009 (r195423) @@ -1353,8 +1353,7 @@ pipe_poll(fp, events, active_cred, td) #endif if (events & (POLLIN | POLLRDNORM)) if ((rpipe->pipe_state & PIPE_DIRECTW) || - (rpipe->pipe_buffer.cnt > 0) || - (rpipe->pipe_state & PIPE_EOF)) + (rpipe->pipe_buffer.cnt > 0)) revents |= events & (POLLIN | POLLRDNORM); if (events & (POLLOUT | POLLWRNORM)) @@ -1364,10 +1363,14 @@ pipe_poll(fp, events, active_cred, td) (wpipe->pipe_buffer.size - wpipe->pipe_buffer.cnt) >= PIPE_BUF)) revents |= events & (POLLOUT | POLLWRNORM); - if ((rpipe->pipe_state & PIPE_EOF) || - wpipe->pipe_present != PIPE_ACTIVE || - (wpipe->pipe_state & PIPE_EOF)) - revents |= POLLHUP; + if ((events & POLLINIGNEOF) == 0) { + if (rpipe->pipe_state & PIPE_EOF) { + revents |= (events & (POLLIN | POLLRDNORM)); + if (wpipe->pipe_present != PIPE_ACTIVE || + (wpipe->pipe_state & PIPE_EOF)) + revents |= POLLHUP; + } + } if (revents == 0) { if (events & (POLLIN | POLLRDNORM)) { Modified: head/sys/kern/uipc_socket.c ============================================================================== --- head/sys/kern/uipc_socket.c Tue Jul 7 00:02:26 2009 (r195422) +++ head/sys/kern/uipc_socket.c Tue Jul 7 09:43:44 2009 (r195423) @@ -2885,14 +2885,9 @@ sopoll_generic(struct socket *so, int ev SOCKBUF_LOCK(&so->so_snd); SOCKBUF_LOCK(&so->so_rcv); if (events & (POLLIN | POLLRDNORM)) - if (soreadable(so)) + if (soreadabledata(so)) revents |= events & (POLLIN | POLLRDNORM); - if (events & POLLINIGNEOF) - if (so->so_rcv.sb_cc >= so->so_rcv.sb_lowat || - !TAILQ_EMPTY(&so->so_comp) || so->so_error) - revents |= POLLINIGNEOF; - if (events & (POLLOUT | POLLWRNORM)) if (sowriteable(so)) revents |= events & (POLLOUT | POLLWRNORM); @@ -2901,10 +2896,16 @@ sopoll_generic(struct socket *so, int ev if (so->so_oobmark || (so->so_rcv.sb_state & SBS_RCVATMARK)) revents |= events & (POLLPRI | POLLRDBAND); + if ((events & POLLINIGNEOF) == 0) { + if (so->so_rcv.sb_state & SBS_CANTRCVMORE) { + revents |= events & (POLLIN | POLLRDNORM); + if (so->so_snd.sb_state & SBS_CANTSENDMORE) + revents |= POLLHUP; + } + } + if (revents == 0) { - if (events & - (POLLIN | POLLINIGNEOF | POLLPRI | POLLRDNORM | - POLLRDBAND)) { + if (events & (POLLIN | POLLPRI | POLLRDNORM | POLLRDBAND)) { selrecord(td, &so->so_rcv.sb_sel); so->so_rcv.sb_flags |= SB_SEL; } Modified: head/sys/sys/socketvar.h ============================================================================== --- head/sys/sys/socketvar.h Tue Jul 7 00:02:26 2009 (r195422) +++ head/sys/sys/socketvar.h Tue Jul 7 09:43:44 2009 (r195423) @@ -197,10 +197,11 @@ struct xsocket { ((so)->so_proto->pr_flags & PR_ATOMIC) /* can we read something from so? */ -#define soreadable(so) \ +#define soreadabledata(so) \ ((so)->so_rcv.sb_cc >= (so)->so_rcv.sb_lowat || \ - ((so)->so_rcv.sb_state & SBS_CANTRCVMORE) || \ !TAILQ_EMPTY(&(so)->so_comp) || (so)->so_error) +#define soreadable(so) \ + (soreadabledata(so) || ((so)->so_rcv.sb_state & SBS_CANTRCVMORE)) /* can we write something to so? */ #define sowriteable(so) \ From trasz at FreeBSD.org Tue Jul 7 13:28:06 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Tue Jul 7 13:29:31 2009 Subject: svn commit: r195243 - head/bin/chmod In-Reply-To: <20090703142334.GA53614@stack.nl> References: <200907011552.n61FqJL5016996@svn.freebsd.org> <20090703142334.GA53614@stack.nl> Message-ID: <20090707131314.GB31722@pin.if.uz.zgora.pl> On 0703T1623, Jilles Tjoelker wrote: > On Wed, Jul 01, 2009 at 03:52:19PM +0000, Edward Tomasz Napierala wrote: > > + ret = pathconf(ent->fts_accpath, _PC_ACL_NFS4); > > There doesn't seem to be anything like lpathconf() or > fpathconfat(AT_SYMLINK_NOFOLLOW), so this may not work properly for > symlinks (chmod -h). Working on it. I think the cleanest way to solve it is to add lpathconf(2). -- If you cut off my head, what would I say? Me and my head, or me and my body? From joel at FreeBSD.org Tue Jul 7 13:58:48 2009 From: joel at FreeBSD.org (Joel Dahl) Date: Tue Jul 7 13:59:00 2009 Subject: svn commit: r195424 - head/share/man/man4 Message-ID: <200907071358.n67DwlV0020438@svn.freebsd.org> Author: joel (doc committer) Date: Tue Jul 7 13:58:47 2009 New Revision: 195424 URL: http://svn.freebsd.org/changeset/base/195424 Log: Fix two typos and sort sysctls. PR: docs/136408 Approved by: re (blanket) Modified: head/share/man/man4/pcm.4 Modified: head/share/man/man4/pcm.4 ============================================================================== --- head/share/man/man4/pcm.4 Tue Jul 7 09:43:44 2009 (r195423) +++ head/share/man/man4/pcm.4 Tue Jul 7 13:58:47 2009 (r195424) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 6, 2009 +.Dd July 7, 2009 .Dt SOUND 4 .Os .Sh NAME @@ -237,19 +237,13 @@ rates. Maximum allowable sample rate. .It Va hw.snd.feeder_rate_min Minimum allowable sample rate. -.It Va hw.snd.feeder_rate_round -Sample rate rounding threshold, to avoid large prime division at the -cost of accuracy. -All requested sample rates will be rounded to the nearest threshold value. -Possible values range between 0 (disabled) and 500. -Default is 25. -.It Va hw.snd.feeder_polyphase_max +.It Va hw.snd.feeder_rate_polyphase_max Adjust to set the maximum number of allowed polyphase entries during the process of building resampling filters. Only applicable when the SINC interpolator is used. Default value is 183040. Set to 0 to disable polyphase resampling. -.It Va hw.snd.feeder_quality +.It Va hw.snd.feeder_rate_quality Sample rate converter quality. Default value is 1, linear interpolation. Available options include: @@ -277,6 +271,12 @@ taps and 90% bandwidth as quality values Continuation of the bandlimited SINC inteprolator, with 100dB stopband, 164 taps and 97% bandwidth as quality values. .El +.It Va hw.snd.feeder_rate_round +Sample rate rounding threshold, to avoid large prime division at the +cost of accuracy. +All requested sample rates will be rounded to the nearest threshold value. +Possible values range between 0 (disabled) and 500. +Default is 25. .It Va hw.snd.latency Configure the buffering latency. Only affects applications that do not explicitly request From sam at FreeBSD.org Tue Jul 7 18:11:06 2009 From: sam at FreeBSD.org (Sam Leffler) Date: Tue Jul 7 18:11:12 2009 Subject: svn commit: r195426 - head/sys/dev/ath/ath_hal/ar5416 Message-ID: <200907071811.n67IB5eg025408@svn.freebsd.org> Author: sam Date: Tue Jul 7 18:11:05 2009 New Revision: 195426 URL: http://svn.freebsd.org/changeset/base/195426 Log: Fix ar5416 and later parts on big-endian platforms: setup the h/w byte swizzler using the same technique used everywhere else. Approved by: re (kib) Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Tue Jul 7 16:10:53 2009 (r195425) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Tue Jul 7 18:11:05 2009 (r195426) @@ -1045,7 +1045,7 @@ ar5416SetResetPowerOn(struct ath_hal *ah static HAL_BOOL ar5416SetReset(struct ath_hal *ah, int type) { - uint32_t tmpReg; + uint32_t tmpReg, mask; /* * Force wake @@ -1091,23 +1091,22 @@ ar5416SetReset(struct ath_hal *ah, int t /* Clear AHB reset */ OS_REG_WRITE(ah, AR_RC, 0); - /* Set register and descriptor swapping on - * Bigendian platforms on cold reset - */ -#ifdef __BIG_ENDIAN__ - if (type == HAL_RESET_COLD) { - uint32_t mask; - - HALDEBUG(ah, HAL_DEBUG_RESET, - "%s Applying descriptor swap\n", __func__); - - mask = INIT_CONFIG_STATUS | AR_CFG_SWRD | AR_CFG_SWRG; + if (type == HAL_RESET_COLD) { + if (isBigEndian()) { + /* + * Set CFG, little-endian for register + * and descriptor accesses. + */ + mask = INIT_CONFIG_STATUS | AR_CFG_SWRD | AR_CFG_SWRG; #ifndef AH_NEED_DESC_SWAP - mask |= AR_CFG_SWTD; + mask |= AR_CFG_SWTD; #endif - OS_REG_WRITE(ah, AR_CFG, LE_READ_4(&mask)); + HALDEBUG(ah, HAL_DEBUG_RESET, + "%s Applying descriptor swap\n", __func__); + OS_REG_WRITE(ah, AR_CFG, LE_READ_4(&mask)); + } else + OS_REG_WRITE(ah, AR_CFG, INIT_CONFIG_STATUS); } -#endif ar5416InitPLL(ah, AH_NULL); From silby at FreeBSD.org Wed Jul 8 01:09:14 2009 From: silby at FreeBSD.org (Mike Silbersack) Date: Wed Jul 8 01:09:25 2009 Subject: svn commit: r195430 - head/sys/kern Message-ID: <200907080109.n6819CEn033840@svn.freebsd.org> Author: silby Date: Wed Jul 8 01:09:12 2009 New Revision: 195430 URL: http://svn.freebsd.org/changeset/base/195430 Log: Increase HZ_VM from 10 to 100. While 10 hz saves cpu time under VM environments, it's too slow for FreeBSD to work properly. For example, ping at 10hz pings about every 600ms instead of about every second. Approved by: re (kib) Modified: head/sys/kern/subr_param.c Modified: head/sys/kern/subr_param.c ============================================================================== --- head/sys/kern/subr_param.c Tue Jul 7 19:55:09 2009 (r195429) +++ head/sys/kern/subr_param.c Wed Jul 8 01:09:12 2009 (r195430) @@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$"); # define HZ 100 # endif # ifndef HZ_VM -# define HZ_VM 10 +# define HZ_VM 100 # endif #else # ifndef HZ_VM From delphij at FreeBSD.org Wed Jul 8 01:41:42 2009 From: delphij at FreeBSD.org (Xin LI) Date: Wed Jul 8 01:41:54 2009 Subject: svn commit: r195431 - in stable/7/lib/libc: . rpc Message-ID: <200907080141.n681ffiI034575@svn.freebsd.org> Author: delphij Date: Wed Jul 8 01:41:41 2009 New Revision: 195431 URL: http://svn.freebsd.org/changeset/base/195431 Log: MFC r194932 Lock around access to nc_file and netconfig_info ("ni"). The RPC part of libc is still not thread safe but this would at least reduce the problems we have. PR: threads/118544 Submitted by: Changming Sun Modified: stable/7/lib/libc/ (props changed) stable/7/lib/libc/rpc/getnetconfig.c Modified: stable/7/lib/libc/rpc/getnetconfig.c ============================================================================== --- stable/7/lib/libc/rpc/getnetconfig.c Wed Jul 8 01:09:12 2009 (r195430) +++ stable/7/lib/libc/rpc/getnetconfig.c Wed Jul 8 01:41:41 2009 (r195431) @@ -130,7 +130,11 @@ static struct netconfig *dup_ncp(struct static FILE *nc_file; /* for netconfig db */ +static pthread_mutex_t nc_file_lock = PTHREAD_MUTEX_INITIALIZER; + static struct netconfig_info ni = { 0, 0, NULL, NULL}; +static pthread_mutex_t ni_lock = PTHREAD_MUTEX_INITIALIZER; + #define MAXNETCONFIGLINE 1000 @@ -204,14 +208,24 @@ setnetconfig() * For multiple calls, i.e. nc_file is not NULL, we just return the * handle without reopening the netconfig db. */ + mutex_lock(&ni_lock); ni.ref++; + mutex_unlock(&ni_lock); + + mutex_lock(&nc_file_lock); if ((nc_file != NULL) || (nc_file = fopen(NETCONFIG, "r")) != NULL) { nc_vars->valid = NC_VALID; nc_vars->flag = 0; nc_vars->nc_configs = ni.head; + mutex_unlock(&nc_file_lock); return ((void *)nc_vars); } + mutex_unlock(&nc_file_lock); + + mutex_lock(&ni_lock); ni.ref--; + mutex_unlock(&ni_lock); + nc_error = NC_NONETCONFIG; free(nc_vars); return (NULL); @@ -234,14 +248,18 @@ void *handlep; char *stringp; /* tmp string pointer */ struct netconfig_list *list; struct netconfig *np; + struct netconfig *result; /* * Verify that handle is valid */ + mutex_lock(&nc_file_lock); if (ncp == NULL || nc_file == NULL) { nc_error = NC_NOTINIT; + mutex_unlock(&nc_file_lock); return (NULL); } + mutex_unlock(&nc_file_lock); switch (ncp->valid) { case NC_VALID: @@ -255,7 +273,9 @@ void *handlep; */ if (ncp->flag == 0) { /* first time */ ncp->flag = 1; + mutex_lock(&ni_lock); ncp->nc_configs = ni.head; + mutex_unlock(&ni_lock); if (ncp->nc_configs != NULL) /* entry already exist */ return(ncp->nc_configs->ncp); } @@ -268,7 +288,13 @@ void *handlep; * If we cannot find the entry in the list and is end of file, * we give up. */ - if (ni.eof == 1) return(NULL); + mutex_lock(&ni_lock); + if (ni.eof == 1) { + mutex_unlock(&ni_lock); + return(NULL); + } + mutex_unlock(&ni_lock); + break; default: nc_error = NC_NOTINIT; @@ -289,13 +315,18 @@ void *handlep; /* * Read a line from netconfig file. */ + mutex_lock(&nc_file_lock); do { if (fgets(stringp, MAXNETCONFIGLINE, nc_file) == NULL) { free(stringp); + mutex_lock(&ni_lock); ni.eof = 1; + mutex_unlock(&ni_lock); + mutex_unlock(&nc_file_lock); return (NULL); } } while (*stringp == '#'); + mutex_unlock(&nc_file_lock); list = (struct netconfig_list *) malloc(sizeof (struct netconfig_list)); if (list == NULL) { @@ -325,6 +356,7 @@ void *handlep; * Reposition the current pointer of the handle to the last entry * in the list. */ + mutex_lock(&ni_lock); if (ni.head == NULL) { /* first entry */ ni.head = ni.tail = list; } @@ -333,7 +365,9 @@ void *handlep; ni.tail = ni.tail->next; } ncp->nc_configs = ni.tail; - return(ni.tail->ncp); + result = ni.tail->ncp; + mutex_unlock(&ni_lock); + return(result); } } @@ -367,7 +401,9 @@ void *handlep; nc_handlep->valid = NC_INVALID; nc_handlep->flag = 0; nc_handlep->nc_configs = NULL; + mutex_lock(&ni_lock); if (--ni.ref > 0) { + mutex_unlock(&ni_lock); free(nc_handlep); return(0); } @@ -380,6 +416,8 @@ void *handlep; ni.eof = ni.ref = 0; ni.head = NULL; ni.tail = NULL; + mutex_unlock(&ni_lock); + while (q) { p = q->next; if (q->ncp->nc_lookups != NULL) free(q->ncp->nc_lookups); @@ -390,8 +428,11 @@ void *handlep; } free(nc_handlep); + mutex_lock(&nc_file_lock); fclose(nc_file); nc_file = NULL; + mutex_unlock(&nc_file_lock); + return (0); } @@ -439,15 +480,20 @@ getnetconfigent(netid) * If all the netconfig db has been read and placed into the list and * there is no match for the netid, return NULL. */ + mutex_lock(&ni_lock); if (ni.head != NULL) { for (list = ni.head; list; list = list->next) { if (strcmp(list->ncp->nc_netid, netid) == 0) { + mutex_unlock(&ni_lock); return(dup_ncp(list->ncp)); } } - if (ni.eof == 1) /* that's all the entries */ + if (ni.eof == 1) { /* that's all the entries */ + mutex_unlock(&ni_lock); return(NULL); + } } + mutex_unlock(&ni_lock); if ((file = fopen(NETCONFIG, "r")) == NULL) { From delphij at FreeBSD.org Wed Jul 8 01:43:48 2009 From: delphij at FreeBSD.org (Xin LI) Date: Wed Jul 8 01:44:05 2009 Subject: svn commit: r195432 - in stable/6/lib/libc: . rpc Message-ID: <200907080143.n681hl1M034673@svn.freebsd.org> Author: delphij Date: Wed Jul 8 01:43:47 2009 New Revision: 195432 URL: http://svn.freebsd.org/changeset/base/195432 Log: MFC r194932 Lock around access to nc_file and netconfig_info ("ni"). The RPC part of libc is still not thread safe but this would at least reduce the problems we have. PR: threads/118544 Submitted by: Changming Sun Modified: stable/6/lib/libc/ (props changed) stable/6/lib/libc/rpc/getnetconfig.c Modified: stable/6/lib/libc/rpc/getnetconfig.c ============================================================================== --- stable/6/lib/libc/rpc/getnetconfig.c Wed Jul 8 01:41:41 2009 (r195431) +++ stable/6/lib/libc/rpc/getnetconfig.c Wed Jul 8 01:43:47 2009 (r195432) @@ -130,7 +130,11 @@ static struct netconfig *dup_ncp(struct static FILE *nc_file; /* for netconfig db */ +static pthread_mutex_t nc_file_lock = PTHREAD_MUTEX_INITIALIZER; + static struct netconfig_info ni = { 0, 0, NULL, NULL}; +static pthread_mutex_t ni_lock = PTHREAD_MUTEX_INITIALIZER; + #define MAXNETCONFIGLINE 1000 @@ -204,14 +208,24 @@ setnetconfig() * For multiple calls, i.e. nc_file is not NULL, we just return the * handle without reopening the netconfig db. */ + mutex_lock(&ni_lock); ni.ref++; + mutex_unlock(&ni_lock); + + mutex_lock(&nc_file_lock); if ((nc_file != NULL) || (nc_file = fopen(NETCONFIG, "r")) != NULL) { nc_vars->valid = NC_VALID; nc_vars->flag = 0; nc_vars->nc_configs = ni.head; + mutex_unlock(&nc_file_lock); return ((void *)nc_vars); } + mutex_unlock(&nc_file_lock); + + mutex_lock(&ni_lock); ni.ref--; + mutex_unlock(&ni_lock); + nc_error = NC_NONETCONFIG; free(nc_vars); return (NULL); @@ -234,14 +248,18 @@ void *handlep; char *stringp; /* tmp string pointer */ struct netconfig_list *list; struct netconfig *np; + struct netconfig *result; /* * Verify that handle is valid */ + mutex_lock(&nc_file_lock); if (ncp == NULL || nc_file == NULL) { nc_error = NC_NOTINIT; + mutex_unlock(&nc_file_lock); return (NULL); } + mutex_unlock(&nc_file_lock); switch (ncp->valid) { case NC_VALID: @@ -255,7 +273,9 @@ void *handlep; */ if (ncp->flag == 0) { /* first time */ ncp->flag = 1; + mutex_lock(&ni_lock); ncp->nc_configs = ni.head; + mutex_unlock(&ni_lock); if (ncp->nc_configs != NULL) /* entry already exist */ return(ncp->nc_configs->ncp); } @@ -268,7 +288,13 @@ void *handlep; * If we cannot find the entry in the list and is end of file, * we give up. */ - if (ni.eof == 1) return(NULL); + mutex_lock(&ni_lock); + if (ni.eof == 1) { + mutex_unlock(&ni_lock); + return(NULL); + } + mutex_unlock(&ni_lock); + break; default: nc_error = NC_NOTINIT; @@ -289,13 +315,18 @@ void *handlep; /* * Read a line from netconfig file. */ + mutex_lock(&nc_file_lock); do { if (fgets(stringp, MAXNETCONFIGLINE, nc_file) == NULL) { free(stringp); + mutex_lock(&ni_lock); ni.eof = 1; + mutex_unlock(&ni_lock); + mutex_unlock(&nc_file_lock); return (NULL); } } while (*stringp == '#'); + mutex_unlock(&nc_file_lock); list = (struct netconfig_list *) malloc(sizeof (struct netconfig_list)); if (list == NULL) { @@ -325,6 +356,7 @@ void *handlep; * Reposition the current pointer of the handle to the last entry * in the list. */ + mutex_lock(&ni_lock); if (ni.head == NULL) { /* first entry */ ni.head = ni.tail = list; } @@ -333,7 +365,9 @@ void *handlep; ni.tail = ni.tail->next; } ncp->nc_configs = ni.tail; - return(ni.tail->ncp); + result = ni.tail->ncp; + mutex_unlock(&ni_lock); + return(result); } } @@ -367,7 +401,9 @@ void *handlep; nc_handlep->valid = NC_INVALID; nc_handlep->flag = 0; nc_handlep->nc_configs = NULL; + mutex_lock(&ni_lock); if (--ni.ref > 0) { + mutex_unlock(&ni_lock); free(nc_handlep); return(0); } @@ -380,6 +416,8 @@ void *handlep; ni.eof = ni.ref = 0; ni.head = NULL; ni.tail = NULL; + mutex_unlock(&ni_lock); + while (q) { p = q->next; if (q->ncp->nc_lookups != NULL) free(q->ncp->nc_lookups); @@ -390,8 +428,11 @@ void *handlep; } free(nc_handlep); + mutex_lock(&nc_file_lock); fclose(nc_file); nc_file = NULL; + mutex_unlock(&nc_file_lock); + return (0); } @@ -439,15 +480,20 @@ getnetconfigent(netid) * If all the netconfig db has been read and placed into the list and * there is no match for the netid, return NULL. */ + mutex_lock(&ni_lock); if (ni.head != NULL) { for (list = ni.head; list; list = list->next) { if (strcmp(list->ncp->nc_netid, netid) == 0) { + mutex_unlock(&ni_lock); return(dup_ncp(list->ncp)); } } - if (ni.eof == 1) /* that's all the entries */ + if (ni.eof == 1) { /* that's all the entries */ + mutex_unlock(&ni_lock); return(NULL); + } } + mutex_unlock(&ni_lock); if ((file = fopen(NETCONFIG, "r")) == NULL) { From marcel at FreeBSD.org Wed Jul 8 05:56:15 2009 From: marcel at FreeBSD.org (Marcel Moolenaar) Date: Wed Jul 8 05:56:22 2009 Subject: svn commit: r195436 - in head/sys: dev/ata geom geom/part sys Message-ID: <200907080556.n685uFsn040044@svn.freebsd.org> Author: marcel Date: Wed Jul 8 05:56:14 2009 New Revision: 195436 URL: http://svn.freebsd.org/changeset/base/195436 Log: Revert revisions 188839 and 188868. Use of the ioctl in geom_dev.c is invalid because the ioctl happens without prior open. The ioctl got introduced to provide backward compatibility for extended partitions, but it ended up not being used because it didn't work as expected. Since there are no consumers of the ioctl and the implementation is broken, the best fix is to remove the code entirely. Spotted by: phk Approved by: re (kensmith) Modified: head/sys/dev/ata/atapi-cd.c head/sys/geom/geom_dev.c head/sys/geom/part/g_part.c head/sys/geom/part/g_part_if.m head/sys/sys/disk.h Modified: head/sys/dev/ata/atapi-cd.c ============================================================================== --- head/sys/dev/ata/atapi-cd.c Wed Jul 8 02:31:35 2009 (r195435) +++ head/sys/dev/ata/atapi-cd.c Wed Jul 8 05:56:14 2009 (r195436) @@ -219,10 +219,7 @@ acd_geom_ioctl(struct g_provider *pp, u_ case CDIOCRESET: acd_test_ready(dev); break; - - case DIOCGPROVIDERALIAS: - break; - + default: acd_read_toc(dev); acd_prevent_allow(dev, 1); Modified: head/sys/geom/geom_dev.c ============================================================================== --- head/sys/geom/geom_dev.c Wed Jul 8 02:31:35 2009 (r195435) +++ head/sys/geom/geom_dev.c Wed Jul 8 05:56:14 2009 (r195436) @@ -113,7 +113,6 @@ g_dev_taste(struct g_class *mp, struct g { struct g_geom *gp; struct g_consumer *cp; - char *alias; int error; struct cdev *dev; @@ -135,17 +134,6 @@ g_dev_taste(struct g_class *mp, struct g gp->softc = dev; dev->si_drv1 = gp; dev->si_drv2 = cp; - - g_topology_unlock(); - - alias = g_malloc(MAXPATHLEN, M_WAITOK | M_ZERO); - error = (pp->geom->ioctl == NULL) ? ENODEV : - pp->geom->ioctl(pp, DIOCGPROVIDERALIAS, alias, 0, curthread); - if (!error && alias[0] != '\0') - make_dev_alias(dev, "%s", alias); - g_free(alias); - - g_topology_lock(); return (gp); } Modified: head/sys/geom/part/g_part.c ============================================================================== --- head/sys/geom/part/g_part.c Wed Jul 8 02:31:35 2009 (r195435) +++ head/sys/geom/part/g_part.c Wed Jul 8 05:56:14 2009 (r195436) @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include @@ -92,7 +91,6 @@ static g_taste_t g_part_taste; static g_access_t g_part_access; static g_dumpconf_t g_part_dumpconf; -static g_ioctl_t g_part_ioctl; static g_orphan_t g_part_orphan; static g_spoiled_t g_part_spoiled; static g_start_t g_part_start; @@ -109,7 +107,6 @@ static struct g_class g_part_class = { /* Geom methods. */ .access = g_part_access, .dumpconf = g_part_dumpconf, - .ioctl = g_part_ioctl, .orphan = g_part_orphan, .spoiled = g_part_spoiled, .start = g_part_start, @@ -1611,31 +1608,6 @@ g_part_dumpconf(struct sbuf *sb, const c } } -static int -g_part_ioctl(struct g_provider *pp, u_long cmd, void *data, int fflag, - struct thread *td) -{ - struct g_geom *gp; - struct g_part_table *table; - struct g_part_entry *entry; - int error; - - gp = pp->geom; - table = gp->softc; - entry = pp->private; - - switch (cmd) { - case DIOCGPROVIDERALIAS: - error = G_PART_DEVALIAS(table, entry, data, MAXPATHLEN); - break; - default: - error = ENOTTY; - break; - } - - return (error); -} - static void g_part_orphan(struct g_consumer *cp) { Modified: head/sys/geom/part/g_part_if.m ============================================================================== --- head/sys/geom/part/g_part_if.m Wed Jul 8 02:31:35 2009 (r195435) +++ head/sys/geom/part/g_part_if.m Wed Jul 8 05:56:14 2009 (r195436) @@ -85,15 +85,6 @@ METHOD int destroy { struct g_part_parms *gpp; }; -# devalias() - return the name (if any) to be used as an alias for -# the device special file created for the partition entry. -METHOD int devalias { - struct g_part_table *table; - struct g_part_entry *entry; - char *buf; - size_t bufsz; -}; - # dumpconf() METHOD void dumpconf { struct g_part_table *table; Modified: head/sys/sys/disk.h ============================================================================== --- head/sys/sys/disk.h Wed Jul 8 02:31:35 2009 (r195435) +++ head/sys/sys/disk.h Wed Jul 8 05:56:14 2009 (r195436) @@ -104,10 +104,4 @@ void disk_err(struct bio *bp, const char * must be at least MAXPATHLEN bytes long. */ -#define DIOCGPROVIDERALIAS _IOR('d', 139, char[MAXPATHLEN]) - /*- - * Store the provider alias, if present, in a buffer. The buffer must - * be at least MAXPATHLEN bytes long. - */ - #endif /* _SYS_DISK_H_ */ From mav at FreeBSD.org Wed Jul 8 06:00:21 2009 From: mav at FreeBSD.org (Alexander Motin) Date: Wed Jul 8 06:00:35 2009 Subject: svn commit: r195439 - head/sys/dev/ata/chipsets Message-ID: <200907080600.n6860L9D040261@svn.freebsd.org> Author: mav Date: Wed Jul 8 06:00:21 2009 New Revision: 195439 URL: http://svn.freebsd.org/changeset/base/195439 Log: Fix kernel panic, when ataahci driver is used on system with increased MAXPHYS. Current ataahci driver memory allocation scheme includes only 64 items in DMA S/G table, and so not guarantied to support transactions with more then 252K data. Approved by: re (kensmith) MFC after: 2 weeks Modified: head/sys/dev/ata/chipsets/ata-ahci.c Modified: head/sys/dev/ata/chipsets/ata-ahci.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-ahci.c Wed Jul 8 06:00:18 2009 (r195438) +++ head/sys/dev/ata/chipsets/ata-ahci.c Wed Jul 8 06:00:21 2009 (r195439) @@ -914,7 +914,7 @@ ata_ahci_dmainit(device_t dev) ata_dmainit(dev); /* note start and stop are not used here */ ch->dma.setprd = ata_ahci_dmasetprd; - ch->dma.max_iosize = 8192 * DEV_BSIZE; + ch->dma.max_iosize = (ATA_AHCI_DMA_ENTRIES - 1) * PAGE_SIZE; if (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_CAP_64BIT) ch->dma.max_address = BUS_SPACE_MAXADDR; } From cperciva at FreeBSD.org Wed Jul 8 06:07:24 2009 From: cperciva at FreeBSD.org (Colin Percival) Date: Wed Jul 8 06:07:30 2009 Subject: svn commit: r195441 - head/usr.sbin/sysinstall Message-ID: <200907080607.n6867NqU040467@svn.freebsd.org> Author: cperciva Date: Wed Jul 8 06:07:23 2009 New Revision: 195441 URL: http://svn.freebsd.org/changeset/base/195441 Log: Refactor code from installFixitCDROM into a new function, fixit_livefs_common. While doing so, improve style and reword some comments. This should not result in any functional changes, but the fixit_livefs_common function will be used by future code. Submitted by: randi Approved by: re (kensmith) Modified: head/usr.sbin/sysinstall/install.c Modified: head/usr.sbin/sysinstall/install.c ============================================================================== --- head/usr.sbin/sysinstall/install.c Wed Jul 8 06:01:37 2009 (r195440) +++ head/usr.sbin/sysinstall/install.c Wed Jul 8 06:07:23 2009 (r195441) @@ -65,6 +65,7 @@ int NCpus; static void create_termcap(void); static void fixit_common(void); +int fixit_livefs_common(dialogMenuItem *self); #define TERMCAP_FILE "/usr/share/misc/termcap" @@ -336,9 +337,6 @@ installFixitCDROM(dialogMenuItem *self) return DITEM_SUCCESS; variable_set2(SYSTEM_STATE, "fixit", 0); - (void)unlink("/mnt2"); - (void)rmdir("/mnt2"); - need_eject = 0; CDROMInitQuiet = 1; while (1) { @@ -363,53 +361,9 @@ installFixitCDROM(dialogMenuItem *self) } CDROMInitQuiet = 0; - /* Since the fixit code expects everything to be in /mnt2, and the CDROM mounting stuff /dist, do - * a little kludge dance here.. - */ - if (symlink("/dist", "/mnt2")) { - msgConfirm("Unable to symlink /mnt2 to the disc mount point. Please report this\n" - "unexpected failure to freebsd-bugs@FreeBSD.org."); - return DITEM_FAILURE; - } - - /* - * If /tmp points to /mnt2/tmp from a previous fixit floppy session, it's - * not very good for us if we point it to the CDROM now. Rather make it - * a directory in the root MFS then. Experienced admins will still be - * able to mount their disk's /tmp over this if they need. - */ - if (lstat("/tmp", &sb) == 0 && (sb.st_mode & S_IFMT) == S_IFLNK) - (void)unlink("/tmp"); - Mkdir("/tmp"); - - /* - * Since setuid binaries ignore LD_LIBRARY_PATH, we indeed need the - * ld.so.hints file. Fortunately, it's fairly small (~ 3 KB). - */ - if (!file_readable("/var/run/ld.so.hints")) { - Mkdir("/var/run"); - if (vsystem("/mnt2/rescue/ldconfig -s /mnt2/lib /mnt2/usr/lib")) { - msgConfirm("Warning: ldconfig could not create the ld.so hints file.\n" - "Dynamic executables from the disc likely won't work."); - } - } + if (DITEM_STATUS(fixit_livefs_common(self)) == DITEM_FAILURE) + return (DITEM_FAILURE); - /* Yet more iggly hardcoded pathnames. */ - Mkdir("/libexec"); - if (!file_readable("/libexec/ld.so") && file_readable("/mnt2/libexec/ld.so")) { - if (symlink("/mnt2/libexec/ld.so", "/libexec/ld.so")) - msgDebug("Couldn't link to ld.so - not necessarily a problem for ELF\n"); - } - if (!file_readable("/libexec/ld-elf.so.1")) { - if (symlink("/mnt2/libexec/ld-elf.so.1", "/libexec/ld-elf.so.1")) { - msgConfirm("Warning: could not create the symlink for ld-elf.so.1\n" - "Dynamic executables from the disc likely won't work."); - } - } - /* optional nicety */ - if (!file_readable("/usr/bin/vi")) - symlink("/mnt2/usr/bin/vi", "/usr/bin/vi"); - fixit_common(); mediaClose(); if (need_eject) msgConfirm("Please remove the FreeBSD fixit CDROM/DVD now."); @@ -552,6 +506,73 @@ fixit_common(void) dialog_clear(); } +/* + * Some path/lib setup is required for the livefs fixit image. Since there's + * more than one media type for livefs now, this has been broken off into it's + * own function. + */ +int +fixit_livefs_common(dialogMenuItem *self) +{ + struct stat sb; + + /* + * USB and CDROM media get mounted to /dist, but fixit code looks in + * /mnt2. + */ + unlink("/mnt2"); + rmdir("/mnt2"); + + if (symlink("/dist", "/mnt2")) { + msgConfirm("Unable to symlink /mnt2 to the disc mount point."); + return (DITEM_FAILURE); + } + + /* + * If /tmp points to /mnt2/tmp from a previous fixit floppy session, + * recreate it. + */ + if (lstat("/tmp", &sb) == 0 && (sb.st_mode & S_IFMT) == S_IFLNK) + unlink("/tmp"); + Mkdir("/tmp"); + + /* Generate a new ld.so.hints */ + if (!file_readable("/var/run/ld.so.hints")) { + Mkdir("/var/run"); + if (vsystem("/mnt2/rescue/ldconfig -s /mnt2/lib " + "/mnt2/usr/lib")) { + msgConfirm("Warning: ldconfig could not create the " + "ld.so hints file.\nDynamic executables from the " + "disc likely won't work."); + } + } + + /* Create required libexec symlinks. */ + Mkdir("/libexec"); + if (!file_readable("/libexec/ld.so") && + file_readable("/mnt2/libexec/ld.so")) { + if (symlink("/mnt2/libexec/ld.so", "/libexec/ld.so")) + msgDebug("Couldn't link to ld.so\n"); + } + + if (!file_readable("/libexec/ld-elf.so.1")) { + if (symlink("/mnt2/libexec/ld-elf.so.1", + "/libexec/ld-elf.so.1")) { + msgConfirm("Warning: could not create the symlink for " + "ld-elf.so.1\nDynamic executables from the disc " + "likely won't work."); + } + } + + /* $PATH doesn't include /mnt2 by default. Create convenient symlink. */ + if (!file_readable("/usr/bin/vi")) + symlink("/mnt2/usr/bin/vi", "/usr/bin/vi"); + + /* Shared code used by all fixit types. */ + fixit_common(); + + return (DITEM_SUCCESS); +} int installExpress(dialogMenuItem *self) From cperciva at FreeBSD.org Wed Jul 8 06:07:52 2009 From: cperciva at FreeBSD.org (Colin Percival) Date: Wed Jul 8 06:08:03 2009 Subject: svn commit: r195442 - head/usr.sbin/sysinstall Message-ID: <200907080607.n6867pZ6040509@svn.freebsd.org> Author: cperciva Date: Wed Jul 8 06:07:51 2009 New Revision: 195442 URL: http://svn.freebsd.org/changeset/base/195442 Log: Add support for using a livefs from a USB disk. Submitted by: randi Approved by: re (kensmith) Modified: head/usr.sbin/sysinstall/dispatch.c head/usr.sbin/sysinstall/install.c head/usr.sbin/sysinstall/menus.c head/usr.sbin/sysinstall/sysinstall.h Modified: head/usr.sbin/sysinstall/dispatch.c ============================================================================== --- head/usr.sbin/sysinstall/dispatch.c Wed Jul 8 06:07:23 2009 (r195441) +++ head/usr.sbin/sysinstall/dispatch.c Wed Jul 8 06:07:51 2009 (r195442) @@ -86,6 +86,7 @@ static struct _word { { "installFixupBase", installFixupBase }, { "installFixitHoloShell", installFixitHoloShell }, { "installFixitCDROM", installFixitCDROM }, + { "installFixitUSB", installFixitUSB }, { "installFixitFloppy", installFixitFloppy }, { "installFilesystems", installFilesystems }, { "installVarDefaults", installVarDefaults }, Modified: head/usr.sbin/sysinstall/install.c ============================================================================== --- head/usr.sbin/sysinstall/install.c Wed Jul 8 06:07:23 2009 (r195441) +++ head/usr.sbin/sysinstall/install.c Wed Jul 8 06:07:51 2009 (r195442) @@ -327,6 +327,33 @@ installFixitHoloShell(dialogMenuItem *se return DITEM_SUCCESS; } +/* + * Load the live filesystem from USB media. + */ +int +installFixitUSB(dialogMenuItem *self) +{ + if (!RunningAsInit) + return (DITEM_SUCCESS); + + variable_set2(SYSTEM_STATE, "fixit", 0); + + if (DITEM_STATUS(mediaSetUSB(NULL)) != DITEM_SUCCESS || + !DEVICE_INIT(mediaDevice)) { + msgConfirm("No USB devices found!"); + return (DITEM_FAILURE); + } else if (!file_readable("/dist/rescue/ldconfig")) { + msgConfirm("Unable to find a FreeBSD live filesystem."); + return (DITEM_FAILURE); + } + + if (DITEM_STATUS(fixit_livefs_common(self)) == DITEM_FAILURE) + return (DITEM_FAILURE); + + mediaClose(); + return (DITEM_SUCCESS); +} + int installFixitCDROM(dialogMenuItem *self) { Modified: head/usr.sbin/sysinstall/menus.c ============================================================================== --- head/usr.sbin/sysinstall/menus.c Wed Jul 8 06:07:23 2009 (r195441) +++ head/usr.sbin/sysinstall/menus.c Wed Jul 8 06:07:51 2009 (r195442) @@ -2173,8 +2173,9 @@ DMenu MenuFixit = { "Press F1 for more detailed repair instructions", "fixit", { { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, - { "2 CDROM/DVD", "Use the \"live\" filesystem CDROM/DVD", NULL, installFixitCDROM }, - { "3 Floppy", "Use a floppy generated from the fixit image", NULL, installFixitFloppy }, - { "4 Shell", "Start an Emergency Holographic Shell", NULL, installFixitHoloShell }, + { "2 CDROM/DVD", "Use the live filesystem CDROM/DVD", NULL, installFixitCDROM }, + { "3 USB", "Use the live filesystem from a USB drive", NULL, installFixitUSB }, + { "4 Floppy", "Use a floppy generated from the fixit image", NULL, installFixitFloppy }, + { "5 Shell", "Start an Emergency Holographic Shell", NULL, installFixitHoloShell }, { NULL } }, }; Modified: head/usr.sbin/sysinstall/sysinstall.h ============================================================================== --- head/usr.sbin/sysinstall/sysinstall.h Wed Jul 8 06:07:23 2009 (r195441) +++ head/usr.sbin/sysinstall/sysinstall.h Wed Jul 8 06:07:51 2009 (r195442) @@ -680,6 +680,7 @@ extern int installExpress(dialogMenuItem extern int installStandard(dialogMenuItem *self); extern int installFixitHoloShell(dialogMenuItem *self); extern int installFixitCDROM(dialogMenuItem *self); +extern int installFixitUSB(dialogMenuItem *self); extern int installFixitFloppy(dialogMenuItem *self); extern int installFixupBase(dialogMenuItem *self); extern int installFixupKernel(dialogMenuItem *self, int dists); From makc at issp.ac.ru Wed Jul 8 07:29:33 2009 From: makc at issp.ac.ru (Max Brazhnikov) Date: Wed Jul 8 07:29:40 2009 Subject: svn commit: r195197 - in stable/7/sys: . amd64/amd64 amd64/include contrib/pf dev/coretemp dev/hwpmc i386/cpufreq i386/i386 i386/include In-Reply-To: <200906301710.n5UHA8b0086710@svn.freebsd.org> References: <200906301710.n5UHA8b0086710@svn.freebsd.org> Message-ID: <200907081104.29163.makc@issp.ac.ru> On Tue, 30 Jun 2009 17:10:08 +0000 (UTC)Tue Jun 30 17:10:08 2009, Andriy Gapon wrote: > Author: avg > Date: Tue Jun 30 17:10:08 2009 > New Revision: 195197 > URL: http://svn.freebsd.org/changeset/base/195197 > > Log: > MFC 185295, 185341, 185343: cpu identification improvements > > Goal of this MFC is to minimize unnecessary code differences between > head and the branch, and to improve/fix invariant TSC detection for > a wide range of CPUs. > > 185295 by takawata: Honor AMDPM_TSC_INVARIANT for Intel CPUs (i386 only) > 185341 by jkim: Introduce cpu_vendor_id... > 185343 by jkim: Use newly introduced cpu_vendor_id... > > These revision are bundled together because all intermediate revisions > have one or more of the following deficiencies: > o AMDPM_TSC_INVARIANT bit (CPUID.0x80000007.EDX[8]) is not honored for > Intel CPUs; > o AMD-specific CPU model/revision checks are performed on Intel CPUs. > > Nod from: jkim > > Modified: > stable/7/sys/ (props changed) > stable/7/sys/amd64/amd64/amd64_mem.c > stable/7/sys/amd64/amd64/identcpu.c > stable/7/sys/amd64/amd64/initcpu.c > stable/7/sys/amd64/amd64/local_apic.c > stable/7/sys/amd64/amd64/mp_machdep.c > stable/7/sys/amd64/amd64/msi.c > stable/7/sys/amd64/include/cputypes.h > stable/7/sys/amd64/include/md_var.h > stable/7/sys/amd64/include/specialreg.h > stable/7/sys/contrib/pf/ (props changed) > stable/7/sys/dev/coretemp/coretemp.c > stable/7/sys/dev/hwpmc/hwpmc_intel.c > stable/7/sys/dev/hwpmc/hwpmc_piv.c > stable/7/sys/dev/hwpmc/hwpmc_ppro.c > stable/7/sys/dev/hwpmc/hwpmc_x86.c > stable/7/sys/i386/cpufreq/est.c > stable/7/sys/i386/i386/i686_mem.c > stable/7/sys/i386/i386/identcpu.c > stable/7/sys/i386/i386/initcpu.c > stable/7/sys/i386/i386/k6_mem.c > stable/7/sys/i386/i386/local_apic.c > stable/7/sys/i386/i386/longrun.c > stable/7/sys/i386/i386/mp_machdep.c > stable/7/sys/i386/i386/msi.c > stable/7/sys/i386/include/cputypes.h > stable/7/sys/i386/include/md_var.h > stable/7/sys/i386/include/specialreg.h > > Modified: stable/7/sys/amd64/amd64/amd64_mem.c > =========================================================================== >=== --- stable/7/sys/amd64/amd64/amd64_mem.c Tue Jun 30 15:23:16 > 2009 (r195196) +++ stable/7/sys/amd64/amd64/amd64_mem.c Tue Jun 30 17:10:08 > 2009 (r195197) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > > +#include > #include > #include > > @@ -677,8 +678,8 @@ amd64_mem_drvinit(void *unused) > return; > if ((cpu_id & 0xf00) != 0x600 && (cpu_id & 0xf00) != 0xf00) > return; > - if ((strcmp(cpu_vendor, "GenuineIntel") != 0) && > - (strcmp(cpu_vendor, "AuthenticAMD") != 0)) > + if (cpu_vendor_id != CPU_VENDOR_INTEL && > + cpu_vendor_id != CPU_VENDOR_AMD) > return; > mem_range_softc.mr_op = &amd64_mrops; > } > > Modified: stable/7/sys/amd64/amd64/identcpu.c > =========================================================================== >=== --- stable/7/sys/amd64/amd64/identcpu.c Tue Jun 30 15:23:16 > 2009 (r195196) +++ stable/7/sys/amd64/amd64/identcpu.c Tue Jun 30 17:10:08 > 2009 (r195197) @@ -69,6 +69,7 @@ void identify_cpu(void); > void earlysetcpuclass(void); > void panicifcpuunsupported(void); > > +static u_int find_cpu_vendor_id(void); > static void print_AMD_info(void); > static void print_AMD_assoc(int i); > > @@ -95,6 +96,14 @@ static struct { > { "Sledgehammer", CPUCLASS_K8 }, /* CPU_SLEDGEHAMMER */ > }; > > +static struct { > + char *vendor; > + u_int vendor_id; > +} cpu_vendors[] = { > + { INTEL_VENDOR_ID, CPU_VENDOR_INTEL }, /* GenuineIntel */ > + { AMD_VENDOR_ID, CPU_VENDOR_AMD }, /* AuthenticAMD */ > +}; > + > void > printcpuinfo(void) > { > @@ -115,10 +124,10 @@ printcpuinfo(void) > } > } > > - if (strcmp(cpu_vendor, "GenuineIntel") == 0) { > + if (cpu_vendor_id == CPU_VENDOR_INTEL) { > /* Please make up your mind folks! */ > strcat(cpu_model, "EM64T"); > - } else if (strcmp(cpu_vendor, "AuthenticAMD") == 0) { > + } else if (cpu_vendor_id == CPU_VENDOR_AMD) { > /* > * Values taken from AMD Processor Recognition > * http://www.amd.com/K6/k6docs/pdf/20734g.pdf > @@ -158,13 +167,13 @@ printcpuinfo(void) > printf("Unknown"); /* will panic below... */ > } > printf("-class CPU)\n"); > - if(*cpu_vendor) > - printf(" Origin = \"%s\"",cpu_vendor); > - if(cpu_id) > + if (*cpu_vendor) > + printf(" Origin = \"%s\"", cpu_vendor); > + if (cpu_id) > printf(" Id = 0x%x", cpu_id); > > - if (strcmp(cpu_vendor, "GenuineIntel") == 0 || > - strcmp(cpu_vendor, "AuthenticAMD") == 0) { > + if (cpu_vendor_id == CPU_VENDOR_INTEL || > + cpu_vendor_id == CPU_VENDOR_AMD) { > printf(" Stepping = %u", cpu_id & 0xf); > if (cpu_high > 0) { > u_int cmp = 1, htt = 1; > @@ -336,22 +345,28 @@ printcpuinfo(void) > ); > } > > - if (cpu_feature & CPUID_HTT && strcmp(cpu_vendor, > - "AuthenticAMD") == 0) > + if ((cpu_feature & CPUID_HTT) && > + cpu_vendor_id == CPU_VENDOR_AMD) > cpu_feature &= ~CPUID_HTT; > > /* > * If this CPU supports P-state invariant TSC then > * mention the capability. > */ > - if (!tsc_is_invariant && > - (strcmp(cpu_vendor, "AuthenticAMD") == 0 && > - ((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 || > - AMD64_CPU_FAMILY(cpu_id) >= 0x10 || > - cpu_id == 0x60fb2))) { > - tsc_is_invariant = 1; > - printf("\n TSC: P-state invariant"); > + switch (cpu_vendor_id) { > + case CPU_VENDOR_AMD: > + if ((amd_pminfo & AMDPM_TSC_INVARIANT) || > + AMD64_CPU_FAMILY(cpu_id) >= 0x10 || > + cpu_id == 0x60fb2) > + tsc_is_invariant = 1; > + break; > + case CPU_VENDOR_INTEL: > + if (amd_pminfo & AMDPM_TSC_INVARIANT) > + tsc_is_invariant = 1; > + break; > } > + if (tsc_is_invariant) > + printf("\n TSC: P-state invariant"); > > /* > * If this CPU supports HTT or CMP then mention the > @@ -359,10 +374,10 @@ printcpuinfo(void) > */ > if (cpu_feature & CPUID_HTT) > htt = (cpu_procinfo & CPUID_HTT_CORES) >> 16; > - if (strcmp(cpu_vendor, "AuthenticAMD") == 0 && > + if (cpu_vendor_id == CPU_VENDOR_AMD && > (amd_feature2 & AMDID2_CMP)) > cmp = (cpu_procinfo2 & AMDID_CMP_CORES) + 1; > - else if (strcmp(cpu_vendor, "GenuineIntel") == 0 && > + else if (cpu_vendor_id == CPU_VENDOR_INTEL && > (cpu_high >= 4)) { > cpuid_count(4, 0, regs); > if ((regs[0] & 0x1f) != 0) > @@ -382,7 +397,7 @@ printcpuinfo(void) > if (!bootverbose) > return; > > - if (strcmp(cpu_vendor, "AuthenticAMD") == 0) > + if (cpu_vendor_id == CPU_VENDOR_AMD) > print_AMD_info(); > } > > @@ -441,6 +456,7 @@ identify_cpu(void) > ((u_int *)&cpu_vendor)[1] = regs[3]; > ((u_int *)&cpu_vendor)[2] = regs[2]; > cpu_vendor[12] = '\0'; > + cpu_vendor_id = find_cpu_vendor_id(); > > do_cpuid(1, regs); > cpu_id = regs[0]; > @@ -448,8 +464,8 @@ identify_cpu(void) > cpu_feature = regs[3]; > cpu_feature2 = regs[2]; > > - if (strcmp(cpu_vendor, "GenuineIntel") == 0 || > - strcmp(cpu_vendor, "AuthenticAMD") == 0) { > + if (cpu_vendor_id == CPU_VENDOR_INTEL || > + cpu_vendor_id == CPU_VENDOR_AMD) { > do_cpuid(0x80000000, regs); > cpu_exthigh = regs[0]; > } > @@ -471,6 +487,17 @@ identify_cpu(void) > cpu = CPU_CLAWHAMMER; > } > > +static u_int > +find_cpu_vendor_id(void) > +{ > + int i; > + > + for (i = 0; i < sizeof(cpu_vendors) / sizeof(cpu_vendors[0]); i++) > + if (strcmp(cpu_vendor, cpu_vendors[i].vendor) == 0) > + return (cpu_vendors[i].vendor_id); > + return (0); > +} > + > static void > print_AMD_assoc(int i) > { > > Modified: stable/7/sys/amd64/amd64/initcpu.c > =========================================================================== >=== --- stable/7/sys/amd64/amd64/initcpu.c Tue Jun 30 15:23:16 > 2009 (r195196) +++ stable/7/sys/amd64/amd64/initcpu.c Tue Jun 30 17:10:08 > 2009 (r195197) @@ -60,6 +60,7 @@ u_int cpu_id; /* Stepping ID */ > u_int cpu_procinfo; /* HyperThreading Info / Brand Index / CLFUSH */ > u_int cpu_procinfo2; /* Multicore info */ > char cpu_vendor[20]; /* CPU Origin code */ > +u_int cpu_vendor_id; /* CPU vendor ID */ > u_int cpu_fxsr; /* SSE enabled */ > u_int cpu_mxcsr_mask; /* Valid bits in mxcsr */ > > > Modified: stable/7/sys/amd64/amd64/local_apic.c > =========================================================================== >=== --- stable/7/sys/amd64/amd64/local_apic.c Tue Jun 30 15:23:16 > 2009 (r195196) +++ stable/7/sys/amd64/amd64/local_apic.c Tue Jun 30 > 17:10:08 2009 (r195197) @@ -323,7 +323,7 @@ lapic_setup(int boot) > > /* XXX: Error and thermal LVTs */ > > - if (strcmp(cpu_vendor, "AuthenticAMD") == 0) { > + if (cpu_vendor_id == CPU_VENDOR_AMD) { > /* > * Detect the presence of C1E capability mostly on latest > * dual-cores (or future) k8 family. This feature renders > > Modified: stable/7/sys/amd64/amd64/mp_machdep.c > =========================================================================== >=== --- stable/7/sys/amd64/amd64/mp_machdep.c Tue Jun 30 15:23:16 > 2009 (r195196) +++ stable/7/sys/amd64/amd64/mp_machdep.c Tue Jun 30 > 17:10:08 2009 (r195197) @@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$"); > #include > > #include > +#include > #include > #include > #include > @@ -376,8 +377,7 @@ cpu_mp_start(void) > * First determine if this is an Intel processor which claims > * to have hyperthreading support. > */ > - if ((cpu_feature & CPUID_HTT) && > - (strcmp(cpu_vendor, "GenuineIntel") == 0)) { > + if ((cpu_feature & CPUID_HTT) && cpu_vendor_id == CPU_VENDOR_INTEL) { > /* > * If the "deterministic cache parameters" cpuid calls > * are available, use them. > > Modified: stable/7/sys/amd64/amd64/msi.c > =========================================================================== >=== --- stable/7/sys/amd64/amd64/msi.c Tue Jun 30 15:23:16 2009 (r195196) > +++ stable/7/sys/amd64/amd64/msi.c Tue Jun 30 17:10:08 2009 (r195197) @@ > -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > #include > #include > #include > @@ -211,8 +212,8 @@ msi_init(void) > { > > /* Check if we have a supported CPU. */ > - if (!(strcmp(cpu_vendor, "GenuineIntel") == 0 || > - strcmp(cpu_vendor, "AuthenticAMD") == 0)) > + if (!(cpu_vendor_id == CPU_VENDOR_INTEL || > + cpu_vendor_id == CPU_VENDOR_AMD)) > return; > > msi_enabled = 1; > > Modified: stable/7/sys/amd64/include/cputypes.h > =========================================================================== >=== --- stable/7/sys/amd64/include/cputypes.h Tue Jun 30 15:23:16 > 2009 (r195196) +++ stable/7/sys/amd64/include/cputypes.h Tue Jun 30 > 17:10:08 2009 (r195197) @@ -33,15 +33,21 @@ > /* > * Classes of processor. > */ > -#define CPUCLASS_X86 0 /* X86 */ > -#define CPUCLASS_K8 1 /* K8 AMD64 class */ > +#define CPUCLASS_X86 0 /* X86 */ > +#define CPUCLASS_K8 1 /* K8 AMD64 class */ > > /* > * Kinds of processor. > */ > -#define CPU_X86 0 /* Intel */ > -#define CPU_CLAWHAMMER 1 /* AMD Clawhammer */ > -#define CPU_SLEDGEHAMMER 2 /* AMD Sledgehammer */ > +#define CPU_X86 0 /* Intel */ > +#define CPU_CLAWHAMMER 1 /* AMD Clawhammer */ > +#define CPU_SLEDGEHAMMER 2 /* AMD Sledgehammer */ > + > +/* > + * Vendors of processor. > + */ > +#define CPU_VENDOR_AMD 0x1022 /* AMD */ > +#define CPU_VENDOR_INTEL 0x8086 /* Intel */ > > #ifndef LOCORE > extern int cpu; > > Modified: stable/7/sys/amd64/include/md_var.h > =========================================================================== >=== --- stable/7/sys/amd64/include/md_var.h Tue Jun 30 15:23:16 > 2009 (r195196) +++ stable/7/sys/amd64/include/md_var.h Tue Jun 30 17:10:08 > 2009 (r195197) @@ -52,6 +52,7 @@ extern u_int cpu_mxcsr_mask; > extern u_int cpu_procinfo; > extern u_int cpu_procinfo2; > extern char cpu_vendor[]; > +extern u_int cpu_vendor_id; > extern char kstack[]; > extern char sigcode[]; > extern int szsigcode; > > Modified: stable/7/sys/amd64/include/specialreg.h > =========================================================================== >=== --- stable/7/sys/amd64/include/specialreg.h Tue Jun 30 15:23:16 > 2009 (r195196) +++ stable/7/sys/amd64/include/specialreg.h Tue Jun 30 > 17:10:08 2009 (r195197) @@ -204,8 +204,8 @@ > /* > * CPUID manufacturers identifiers > */ > -#define INTEL_VENDOR_ID "GenuineIntel" > -#define AMD_VENDOR_ID "AuthenticAMD" > +#define AMD_VENDOR_ID "AuthenticAMD" > +#define INTEL_VENDOR_ID "GenuineIntel" > > /* > * Model-specific registers for the i386 family > > Modified: stable/7/sys/dev/coretemp/coretemp.c > =========================================================================== >=== --- stable/7/sys/dev/coretemp/coretemp.c Tue Jun 30 15:23:16 > 2009 (r195196) +++ stable/7/sys/dev/coretemp/coretemp.c Tue Jun 30 17:10:08 > 2009 (r195197) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); > > #include > #include > +#include > #include > > struct coretemp_softc { > @@ -94,7 +95,7 @@ coretemp_identify(driver_t *driver, devi > return; > > /* Check that CPUID 0x06 is supported and the vendor is Intel.*/ > - if (cpu_high < 6 || strcmp(cpu_vendor, "GenuineIntel")) > + if (cpu_high < 6 || cpu_vendor_id != CPU_VENDOR_INTEL) > return; > /* > * CPUID 0x06 returns 1 if the processor has on-die thermal > > Modified: stable/7/sys/dev/hwpmc/hwpmc_intel.c > =========================================================================== >=== --- stable/7/sys/dev/hwpmc/hwpmc_intel.c Tue Jun 30 15:23:16 > 2009 (r195196) +++ stable/7/sys/dev/hwpmc/hwpmc_intel.c Tue Jun 30 17:10:08 > 2009 (r195197) @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); > #include > > #include > +#include > #include > #include > > @@ -79,7 +80,7 @@ pmc_intel_initialize(void) > enum pmc_cputype cputype; > int error, model, nclasses, ncpus; > > - KASSERT(strcmp(cpu_vendor, "GenuineIntel") == 0, > + KASSERT(cpu_vendor_id == CPU_VENDOR_INTEL, > ("[intel,%d] Initializing non-intel processor", __LINE__)); > > PMCDBG(MDP,INI,0, "intel-initialize cpuid=0x%x", cpu_id); > > Modified: stable/7/sys/dev/hwpmc/hwpmc_piv.c > =========================================================================== >=== --- stable/7/sys/dev/hwpmc/hwpmc_piv.c Tue Jun 30 15:23:16 > 2009 (r195196) +++ stable/7/sys/dev/hwpmc/hwpmc_piv.c Tue Jun 30 17:10:08 > 2009 (r195197) @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); > > #include > #include > +#include > #include > #include > > @@ -1610,7 +1611,7 @@ pmc_p4_initialize(struct pmc_mdep *md, i > struct p4_event_descr *pe; > > KASSERT(md != NULL, ("[p4,%d] md is NULL", __LINE__)); > - KASSERT(strcmp(cpu_vendor, "GenuineIntel") == 0, > + KASSERT(cpu_vendor_id == CPU_VENDOR_INTEL, > ("[p4,%d] Initializing non-intel processor", __LINE__)); > > PMCDBG(MDP,INI,1, "%s", "p4-initialize"); > > Modified: stable/7/sys/dev/hwpmc/hwpmc_ppro.c > =========================================================================== >=== --- stable/7/sys/dev/hwpmc/hwpmc_ppro.c Tue Jun 30 15:23:16 > 2009 (r195196) +++ stable/7/sys/dev/hwpmc/hwpmc_ppro.c Tue Jun 30 17:10:08 > 2009 (r195197) @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); > > #include > #include > +#include > #include > #include > #include > @@ -781,7 +782,7 @@ pmc_p6_initialize(struct pmc_mdep *md, i > { > struct pmc_classdep *pcd; > > - KASSERT(strcmp(cpu_vendor, "GenuineIntel") == 0, > + KASSERT(cpu_vendor_id == CPU_VENDOR_INTEL, > ("[p6,%d] Initializing non-intel processor", __LINE__)); > > PMCDBG(MDP,INI,1, "%s", "p6-initialize"); > > Modified: stable/7/sys/dev/hwpmc/hwpmc_x86.c > =========================================================================== >=== --- stable/7/sys/dev/hwpmc/hwpmc_x86.c Tue Jun 30 15:23:16 > 2009 (r195196) +++ stable/7/sys/dev/hwpmc/hwpmc_x86.c Tue Jun 30 17:10:08 > 2009 (r195197) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); > #include > > #include > +#include > #include > #include > #include > @@ -252,9 +253,9 @@ pmc_md_initialize() > > /* determine the CPU kind */ > md = NULL; > - if (strcmp(cpu_vendor, "AuthenticAMD") == 0) > + if (cpu_vendor_id == CPU_VENDOR_AMD) > md = pmc_amd_initialize(); > - else if (strcmp(cpu_vendor, "GenuineIntel") == 0) > + else if (cpu_vendor_id == CPU_VENDOR_INTEL) > md = pmc_intel_initialize(); > else > KASSERT(0, ("[x86,%d] Unknown vendor", __LINE__)); > @@ -270,9 +271,9 @@ pmc_md_initialize() > void > pmc_md_finalize(struct pmc_mdep *md) > { > - if (strcmp(cpu_vendor, "AuthenticAMD") == 0) > + if (cpu_vendor_id == CPU_VENDOR_AMD) > pmc_amd_finalize(md); > - else if (strcmp(cpu_vendor, "GenuineIntel") == 0) > + else if (cpu_vendor_id == CPU_VENDOR_INTEL) > pmc_intel_finalize(md); > else > KASSERT(0, ("[x86,%d] Unknown vendor", __LINE__)); > > Modified: stable/7/sys/i386/cpufreq/est.c > =========================================================================== >=== --- stable/7/sys/i386/cpufreq/est.c Tue Jun 30 15:23:16 2009 (r195196) > +++ stable/7/sys/i386/cpufreq/est.c Tue Jun 30 17:10:08 2009 (r195197) @@ > -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); > > #include "cpufreq_if.h" > #include > +#include > #include > #include > > @@ -54,6 +55,10 @@ __FBSDID("$FreeBSD$"); > #define MSR_MISC_ENABLE 0x1a0 > #define MSR_SS_ENABLE (1<<16) > > +#ifndef CPU_VENDOR_CENTAUR > +#define CPU_VENDOR_CENTAUR 0x111d > +#endif > + > /* Frequency and MSR control values. */ > typedef struct { > uint16_t freq; > @@ -64,7 +69,7 @@ typedef struct { > > /* Identifying characteristics of a processor and supported frequencies. > */ typedef struct { > - const char *vendor; > + const u_int vendor_id; > uint32_t id32; > freq_info *freqtab; > } cpu_info; > @@ -88,12 +93,10 @@ struct est_softc { > #define FREQ_INFO(MHz, mV, bus_clk) \ > FREQ_INFO_PWR(MHz, mV, bus_clk, CPUFREQ_VAL_UNKNOWN) > #define INTEL(tab, zhi, vhi, zlo, vlo, bus_clk) \ > - { intel_id, ID32(zhi, vhi, zlo, vlo, bus_clk), tab } > + { CPU_VENDOR_INTEL, ID32(zhi, vhi, zlo, vlo, bus_clk), tab } > #define CENTAUR(tab, zhi, vhi, zlo, vlo, bus_clk) \ > - { centaur_id, ID32(zhi, vhi, zlo, vlo, bus_clk), tab } > + { CPU_VENDOR_CENTAUR, ID32(zhi, vhi, zlo, vlo, bus_clk), tab } > > -const char intel_id[] = "GenuineIntel"; > -const char centaur_id[] = "CentaurHauls"; > static int msr_info_enabled = 0; > TUNABLE_INT("hw.est.msr_info", &msr_info_enabled); > > @@ -891,7 +894,7 @@ static cpu_info ESTprocs[] = { > CENTAUR(C7M_772_ULV, 1200, 844, 400, 796, 100), > CENTAUR(C7M_779_ULV, 1000, 796, 400, 796, 100), > CENTAUR(C7M_770_ULV, 1000, 844, 400, 796, 100), > - { NULL, 0, NULL }, > + { 0, 0, NULL }, > }; > > static void est_identify(driver_t *driver, device_t parent); > @@ -958,8 +961,8 @@ est_identify(driver_t *driver, device_t > return; > > /* Check that CPUID is supported and the vendor is Intel.*/ > - if (cpu_high == 0 || (strcmp(cpu_vendor, intel_id) != 0 && > - strcmp(cpu_vendor, centaur_id) != 0)) > + if (cpu_high == 0 || (cpu_vendor_id != CPU_VENDOR_INTEL && > + cpu_vendor_id != CPU_VENDOR_CENTAUR)) > return; > > /* > @@ -1159,7 +1162,7 @@ est_table_info(device_t dev, uint64_t ms > /* Find a table which matches (vendor, id32). */ > id = msr >> 32; > for (p = ESTprocs; p->id32 != 0; p++) { > - if (strcmp(p->vendor, cpu_vendor) == 0 && p->id32 == id) > + if (p->vendor_id == cpu_vendor_id && p->id32 == id) > break; > } > if (p->id32 == 0) > > Modified: stable/7/sys/i386/i386/i686_mem.c > =========================================================================== >=== --- stable/7/sys/i386/i386/i686_mem.c Tue Jun 30 15:23:16 2009 (r195196) > +++ stable/7/sys/i386/i386/i686_mem.c Tue Jun 30 17:10:08 2009 (r195197) @@ > -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > > +#include > #include > #include > > @@ -677,8 +678,8 @@ i686_mem_drvinit(void *unused) > return; > if ((cpu_id & 0xf00) != 0x600 && (cpu_id & 0xf00) != 0xf00) > return; > - if ((strcmp(cpu_vendor, "GenuineIntel") != 0) && > - (strcmp(cpu_vendor, "AuthenticAMD") != 0)) > + if (cpu_vendor_id != CPU_VENDOR_INTEL && > + cpu_vendor_id != CPU_VENDOR_AMD) > return; > mem_range_softc.mr_op = &i686_mrops; > } > > Modified: stable/7/sys/i386/i386/identcpu.c > =========================================================================== >=== --- stable/7/sys/i386/i386/identcpu.c Tue Jun 30 15:23:16 2009 (r195196) > +++ stable/7/sys/i386/i386/identcpu.c Tue Jun 30 17:10:08 2009 (r195197) @@ > -77,6 +77,7 @@ void panicifcpuunsupported(void); > > static void identifycyrix(void); > static void init_exthigh(void); > +static u_int find_cpu_vendor_id(void); > static void print_AMD_info(void); > static void print_INTEL_info(void); > static void print_INTEL_TLB(u_int data); > @@ -138,6 +139,26 @@ static struct { > { "Pentium 4", CPUCLASS_686 }, /* CPU_P4 */ > }; > > +static struct { > + char *vendor; > + u_int vendor_id; > +} cpu_vendors[] = { > + { INTEL_VENDOR_ID, CPU_VENDOR_INTEL }, /* GenuineIntel */ > + { AMD_VENDOR_ID, CPU_VENDOR_AMD }, /* AuthenticAMD */ > + { CENTAUR_VENDOR_ID, CPU_VENDOR_CENTAUR }, /* CentaurHauls */ > + { NSC_VENDOR_ID, CPU_VENDOR_NSC }, /* Geode by NSC */ > + { CYRIX_VENDOR_ID, CPU_VENDOR_CYRIX }, /* CyrixInstead */ > + { TRANSMETA_VENDOR_ID, CPU_VENDOR_TRANSMETA }, /* GenuineTMx86 */ > + { SIS_VENDOR_ID, CPU_VENDOR_SIS }, /* SiS SiS SiS */ > + { UMC_VENDOR_ID, CPU_VENDOR_UMC }, /* UMC UMC UMC */ > + { NEXGEN_VENDOR_ID, CPU_VENDOR_NEXGEN }, /* NexGenDriven */ > + { RISE_VENDOR_ID, CPU_VENDOR_RISE }, /* RiseRiseRise */ > +#if 0 > + /* XXX CPUID 8000_0000h and 8086_0000h, not 0000_0000h */ > + { "TransmetaCPU", CPU_VENDOR_TRANSMETA }, > +#endif > +}; > + > #if defined(I586_CPU) && !defined(NO_F00F_HACK) > int has_f00f_bug = 0; /* Initialized so that it can be patched. */ > #endif > @@ -150,12 +171,11 @@ init_exthigh(void) > > if (done == 0) { > if (cpu_high > 0 && > - (strcmp(cpu_vendor, "GenuineIntel") == 0 || > - strcmp(cpu_vendor, "AuthenticAMD") == 0 || > - strcmp(cpu_vendor, "GenuineTMx86") == 0 || > - strcmp(cpu_vendor, "TransmetaCPU") == 0 || > - strcmp(cpu_vendor, "CentaurHauls") == 0 || > - strcmp(cpu_vendor, "Geode by NSC") == 0)) { > + (cpu_vendor_id == CPU_VENDOR_INTEL || > + cpu_vendor_id == CPU_VENDOR_AMD || > + cpu_vendor_id == CPU_VENDOR_TRANSMETA || > + cpu_vendor_id == CPU_VENDOR_CENTAUR || > + cpu_vendor_id == CPU_VENDOR_NSC)) { > do_cpuid(0x80000000, regs); > if (regs[0] >= 0x80000000) > cpu_exthigh = regs[0]; > @@ -186,7 +206,7 @@ printcpuinfo(void) > } > } > > - if (strcmp(cpu_vendor, "GenuineIntel") == 0) { > + if (cpu_vendor_id == CPU_VENDOR_INTEL) { > if ((cpu_id & 0xf00) > 0x300) { > u_int brand_index; > u_int model; > @@ -330,7 +350,7 @@ printcpuinfo(void) > cpu_brandtable[brand_index]); > } > } > - } else if (strcmp(cpu_vendor, "AuthenticAMD") == 0) { > + } else if (cpu_vendor_id == CPU_VENDOR_AMD) { > /* > * Values taken from AMD Processor Recognition > * http://www.amd.com/K6/k6docs/pdf/20734g.pdf > @@ -410,7 +430,7 @@ printcpuinfo(void) > enable_K6_wt_alloc(); > } > #endif > - } else if (strcmp(cpu_vendor, "CyrixInstead") == 0) { > + } else if (cpu_vendor_id == CPU_VENDOR_CYRIX) { > strcpy(cpu_model, "Cyrix "); > switch (cpu_id & 0xff0) { > case 0x440: > @@ -546,7 +566,7 @@ printcpuinfo(void) > } > break; > } > - } else if (strcmp(cpu_vendor, "RiseRiseRise") == 0) { > + } else if (cpu_vendor_id == CPU_VENDOR_RISE) { > strcpy(cpu_model, "Rise "); > switch (cpu_id & 0xff0) { > case 0x500: > @@ -555,7 +575,7 @@ printcpuinfo(void) > default: > strcat(cpu_model, "Unknown"); > } > - } else if (strcmp(cpu_vendor, "CentaurHauls") == 0) { > + } else if (cpu_vendor_id == CPU_VENDOR_CENTAUR) { > switch (cpu_id & 0xff0) { > case 0x540: > strcpy(cpu_model, "IDT WinChip C6"); > @@ -586,9 +606,9 @@ printcpuinfo(void) > default: > strcpy(cpu_model, "VIA/IDT Unknown"); > } > - } else if (strcmp(cpu_vendor, "IBM") == 0) { > + } else if (cpu_vendor_id == CPU_VENDOR_IBM) { > strcpy(cpu_model, "Blue Lightning CPU"); > - } else if (strcmp(cpu_vendor, "Geode by NSC") == 0) { > + } else if (cpu_vendor_id == CPU_VENDOR_NSC) { > switch (cpu_id & 0xfff) { > case 0x540: > strcpy(cpu_model, "Geode SC1100"); > @@ -652,17 +672,16 @@ printcpuinfo(void) > if(cpu_id) > printf(" Id = 0x%x", cpu_id); > > - if (strcmp(cpu_vendor, "GenuineIntel") == 0 || > - strcmp(cpu_vendor, "AuthenticAMD") == 0 || > - strcmp(cpu_vendor, "GenuineTMx86") == 0 || > - strcmp(cpu_vendor, "TransmetaCPU") == 0 || > - strcmp(cpu_vendor, "RiseRiseRise") == 0 || > - strcmp(cpu_vendor, "CentaurHauls") == 0 || > - strcmp(cpu_vendor, "Geode by NSC") == 0 || > - ((strcmp(cpu_vendor, "CyrixInstead") == 0) && > + if (cpu_vendor_id == CPU_VENDOR_INTEL || > + cpu_vendor_id == CPU_VENDOR_AMD || > + cpu_vendor_id == CPU_VENDOR_TRANSMETA || > + cpu_vendor_id == CPU_VENDOR_RISE || > + cpu_vendor_id == CPU_VENDOR_CENTAUR || > + cpu_vendor_id == CPU_VENDOR_NSC || > + (cpu_vendor_id == CPU_VENDOR_CYRIX && > ((cpu_id & 0xf00) > 0x500))) { > printf(" Stepping = %u", cpu_id & 0xf); > - if (strcmp(cpu_vendor, "CyrixInstead") == 0) > + if (cpu_vendor_id == CPU_VENDOR_CYRIX) > printf(" DIR=0x%04x", cyrix_did); > if (cpu_high > 0) { > u_int cmp = 1, htt = 1; > @@ -834,22 +853,28 @@ printcpuinfo(void) > ); > } > > - if (cpu_feature & CPUID_HTT && strcmp(cpu_vendor, > - "AuthenticAMD") == 0) > + if ((cpu_feature & CPUID_HTT) && > + cpu_vendor_id == CPU_VENDOR_AMD) > cpu_feature &= ~CPUID_HTT; > > /* > * If this CPU supports P-state invariant TSC then > * mention the capability. > */ > - if (!tsc_is_invariant && > - (strcmp(cpu_vendor, "AuthenticAMD") == 0 && > - ((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 || > - I386_CPU_FAMILY(cpu_id) >= 0x10 || > - cpu_id == 0x60fb2))) { > - tsc_is_invariant = 1; > - printf("\n TSC: P-state invariant"); > + switch (cpu_vendor_id) { > + case CPU_VENDOR_AMD: > + if ((amd_pminfo & AMDPM_TSC_INVARIANT) || > + I386_CPU_FAMILY(cpu_id) >= 0x10 || > + cpu_id == 0x60fb2) > + tsc_is_invariant = 1; > + break; > + case CPU_VENDOR_INTEL: > + if (amd_pminfo & AMDPM_TSC_INVARIANT) > + tsc_is_invariant = 1; > + break; > } > + if (tsc_is_invariant) > + printf("\n TSC: P-state invariant"); > > /* > * If this CPU supports HTT or CMP then mention the > @@ -857,10 +882,10 @@ printcpuinfo(void) > */ > if (cpu_feature & CPUID_HTT) > htt = (cpu_procinfo & CPUID_HTT_CORES) >> 16; > - if (strcmp(cpu_vendor, "AuthenticAMD") == 0 && > + if (cpu_vendor_id == CPU_VENDOR_AMD && > (amd_feature2 & AMDID2_CMP)) > cmp = (cpu_procinfo2 & AMDID_CMP_CORES) + 1; > - else if (strcmp(cpu_vendor, "GenuineIntel") == 0 && > + else if (cpu_vendor_id == CPU_VENDOR_INTEL && > (cpu_high >= 4)) { > cpuid_count(4, 0, regs); > if ((regs[0] & 0x1f) != 0) > @@ -872,7 +897,7 @@ printcpuinfo(void) > printf("\n Logical CPUs per core: %d", > htt / cmp); > } > - } else if (strcmp(cpu_vendor, "CyrixInstead") == 0) { > + } else if (cpu_vendor_id == CPU_VENDOR_CYRIX) { > printf(" DIR=0x%04x", cyrix_did); > printf(" Stepping=%u", (cyrix_did & 0xf000) >> 12); > printf(" Revision=%u", (cyrix_did & 0x0f00) >> 8); > @@ -881,7 +906,7 @@ printcpuinfo(void) > printf("\n CPU cache: write-through mode"); > #endif > } > - if (strcmp(cpu_vendor, "CentaurHauls") == 0) > + if (cpu_vendor_id == CPU_VENDOR_CENTAUR) > print_via_padlock_info(); > > /* Avoid ugly blank lines: only print newline when we have to. */ > @@ -891,12 +916,11 @@ printcpuinfo(void) > if (!bootverbose) > return; > > - if (strcmp(cpu_vendor, "AuthenticAMD") == 0) > + if (cpu_vendor_id == CPU_VENDOR_AMD) > print_AMD_info(); > - else if (strcmp(cpu_vendor, "GenuineIntel") == 0) > + else if (cpu_vendor_id == CPU_VENDOR_INTEL) > print_INTEL_info(); > - else if (strcmp(cpu_vendor, "GenuineTMx86") == 0 || > - strcmp(cpu_vendor, "TransmetaCPU") == 0) > + else if (cpu_vendor_id == CPU_VENDOR_TRANSMETA) > print_transmeta_info(); > } > > @@ -1091,9 +1115,11 @@ finishidentcpu(void) > u_char ccr3; > u_int regs[4]; > > + cpu_vendor_id = find_cpu_vendor_id(); > + > /* Detect AMD features (PTE no-execute bit, 3dnow, 64 bit mode etc) */ > - if (strcmp(cpu_vendor, "GenuineIntel") == 0 || > - strcmp(cpu_vendor, "AuthenticAMD") == 0) { > + if (cpu_vendor_id == CPU_VENDOR_INTEL || > + cpu_vendor_id == CPU_VENDOR_AMD) { > init_exthigh(); > if (cpu_exthigh >= 0x80000001) { > do_cpuid(0x80000001, regs); > @@ -1108,7 +1134,7 @@ finishidentcpu(void) > do_cpuid(0x80000008, regs); > cpu_procinfo2 = regs[2]; > } > - } else if (strcmp(cpu_vendor, "CyrixInstead") == 0) { > + } else if (cpu_vendor_id == CPU_VENDOR_CYRIX) { > if (cpu == CPU_486) { > /* > * These conditions are equivalent to: > @@ -1118,6 +1144,7 @@ finishidentcpu(void) > isblue = identblue(); > if (isblue == IDENTBLUE_IBMCPU) { > strcpy(cpu_vendor, "IBM"); > + cpu_vendor_id = CPU_VENDOR_IBM; > cpu = CPU_BLUE; > return; > } > @@ -1191,12 +1218,24 @@ finishidentcpu(void) > isblue = identblue(); > if (isblue == IDENTBLUE_IBMCPU) { > strcpy(cpu_vendor, "IBM"); > + cpu_vendor_id = CPU_VENDOR_IBM; > cpu = CPU_BLUE; > return; > } > } > } > > +static u_int > +find_cpu_vendor_id(void) > +{ > + int i; > + > + for (i = 0; i < sizeof(cpu_vendors) / sizeof(cpu_vendors[0]); i++) > + if (strcmp(cpu_vendor, cpu_vendors[i].vendor) == 0) > + return (cpu_vendors[i].vendor_id); > + return (0); > +} > + > static void > print_AMD_assoc(int i) > { > > Modified: stable/7/sys/i386/i386/initcpu.c > =========================================================================== >=== --- stable/7/sys/i386/i386/initcpu.c Tue Jun 30 15:23:16 2009 (r195196) > +++ stable/7/sys/i386/i386/initcpu.c Tue Jun 30 17:10:08 2009 (r195197) @@ > -90,6 +90,7 @@ u_int cpu_id = 0; /* Stepping ID */ > u_int cpu_procinfo = 0; /* HyperThreading Info / Brand Index / CLFUSH */ > u_int cpu_procinfo2 = 0; /* Multicore info */ > char cpu_vendor[20] = ""; /* CPU Origin code */ > +u_int cpu_vendor_id = 0; /* CPU vendor ID */ > > SYSCTL_UINT(_hw, OID_AUTO, via_feature_rng, CTLFLAG_RD, > &via_feature_rng, 0, "VIA C3/C7 RNG feature available in CPU"); > > Modified: stable/7/sys/i386/i386/k6_mem.c > =========================================================================== >=== --- stable/7/sys/i386/i386/k6_mem.c Tue Jun 30 15:23:16 2009 (r195196) > +++ stable/7/sys/i386/i386/k6_mem.c Tue Jun 30 17:10:08 2009 (r195197) @@ > -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > > +#include > #include > #include > > @@ -175,7 +176,7 @@ static void > k6_mem_drvinit(void *unused) > { > > - if (strcmp(cpu_vendor, "AuthenticAMD") != 0) > + if (cpu_vendor_id != CPU_VENDOR_AMD) > return; > if ((cpu_id & 0xf00) != 0x500) > return; > > Modified: stable/7/sys/i386/i386/local_apic.c > =========================================================================== >=== --- stable/7/sys/i386/i386/local_apic.c Tue Jun 30 15:23:16 > 2009 (r195196) +++ stable/7/sys/i386/i386/local_apic.c Tue Jun 30 17:10:08 > 2009 (r195197) @@ -325,7 +325,7 @@ lapic_setup(int boot) > > /* XXX: Error and thermal LVTs */ > > - if (strcmp(cpu_vendor, "AuthenticAMD") == 0) { > + if (cpu_vendor_id == CPU_VENDOR_AMD) { > /* > * Detect the presence of C1E capability mostly on latest > * dual-cores (or future) k8 family. This feature renders > @@ -1073,7 +1073,7 @@ apic_init(void *dummy __unused) > * CPUs during early startup. We need to turn the local APIC back > * on on such CPUs now. > */ > - if (cpu == CPU_686 && strcmp(cpu_vendor, "GenuineIntel") == 0 && > + if (cpu == CPU_686 && cpu_vendor_id == CPU_VENDOR_INTEL && > (cpu_id & 0xff0) == 0x610) { > apic_base = rdmsr(MSR_APICBASE); > apic_base |= APICBASE_ENABLED; > > Modified: stable/7/sys/i386/i386/longrun.c > =========================================================================== >=== --- stable/7/sys/i386/i386/longrun.c Tue Jun 30 15:23:16 2009 (r195196) > +++ stable/7/sys/i386/i386/longrun.c Tue Jun 30 17:10:08 2009 (r195197) @@ > -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > > +#include > #include > #include > > @@ -262,8 +263,8 @@ tmx86_longrun_profile_sysctl(SYSCTL_HAND > static void > setup_tmx86_longrun(void *dummy __unused) > { > - if (strcmp(cpu_vendor, "GenuineTMx86") != 0 && > - strcmp(cpu_vendor, "TransmetaCPU") != 0) > + > + if (cpu_vendor_id != CPU_VENDOR_TRANSMETA) > return; > > crusoe_longrun = tmx86_get_longrun_mode(); > > Modified: stable/7/sys/i386/i386/mp_machdep.c > =========================================================================== >=== --- stable/7/sys/i386/i386/mp_machdep.c Tue Jun 30 15:23:16 > 2009 (r195196) +++ stable/7/sys/i386/i386/mp_machdep.c Tue Jun 30 17:10:08 > 2009 (r195197) @@ -72,6 +72,7 @@ __FBSDID("$FreeBSD$"); > #include > > #include > +#include > #include > #include > #include > @@ -425,8 +426,7 @@ cpu_mp_start(void) > * First determine if this is an Intel processor which claims > * to have hyperthreading support. > */ > - if ((cpu_feature & CPUID_HTT) && > - (strcmp(cpu_vendor, "GenuineIntel") == 0)) { > + if ((cpu_feature & CPUID_HTT) && cpu_vendor_id == CPU_VENDOR_INTEL) { > /* > * If the "deterministic cache parameters" cpuid calls > * are available, use them. > > Modified: stable/7/sys/i386/i386/msi.c > =========================================================================== >=== --- stable/7/sys/i386/i386/msi.c Tue Jun 30 15:23:16 2009 (r195196) +++ > stable/7/sys/i386/i386/msi.c Tue Jun 30 17:10:08 2009 (r195197) @@ -46,6 > +46,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > #include > #include > #include > @@ -211,8 +212,8 @@ msi_init(void) > { > > /* Check if we have a supported CPU. */ > - if (!(strcmp(cpu_vendor, "GenuineIntel") == 0 || > - strcmp(cpu_vendor, "AuthenticAMD") == 0)) > + if (!(cpu_vendor_id == CPU_VENDOR_INTEL || > + cpu_vendor_id == CPU_VENDOR_AMD)) > return; > > msi_enabled = 1; > > Modified: stable/7/sys/i386/include/cputypes.h > =========================================================================== >=== --- stable/7/sys/i386/include/cputypes.h Tue Jun 30 15:23:16 > 2009 (r195196) +++ stable/7/sys/i386/include/cputypes.h Tue Jun 30 17:10:08 > 2009 (r195197) @@ -33,33 +33,49 @@ > /* > * Classes of processor. > */ > -#define CPUCLASS_286 0 > -#define CPUCLASS_386 1 > -#define CPUCLASS_486 2 > -#define CPUCLASS_586 3 > -#define CPUCLASS_686 4 > +#define CPUCLASS_286 0 > +#define CPUCLASS_386 1 > +#define CPUCLASS_486 2 > +#define CPUCLASS_586 3 > +#define CPUCLASS_686 4 > > /* > * Kinds of processor. > */ > -#define CPU_286 0 /* Intel 80286 */ > -#define CPU_386SX 1 /* Intel 80386SX */ > -#define CPU_386 2 /* Intel 80386DX */ > -#define CPU_486SX 3 /* Intel 80486SX */ > -#define CPU_486 4 /* Intel 80486DX */ > -#define CPU_586 5 /* Intel P.....m (I hate lawyers; it's TM) */ > -#define CPU_486DLC 6 /* Cyrix 486DLC */ > -#define CPU_686 7 /* Pentium Pro */ > -#define CPU_M1SC 8 /* Cyrix M1sc (aka 5x86) */ > -#define CPU_M1 9 /* Cyrix M1 (aka 6x86) */ > -#define CPU_BLUE 10 /* IBM BlueLighting CPU */ > -#define CPU_M2 11 /* Cyrix M2 (aka enhanced 6x86 with MMX */ > -#define CPU_NX586 12 /* NexGen (now AMD) 586 */ > -#define CPU_CY486DX 13 /* Cyrix 486S/DX/DX2/DX4 */ > -#define CPU_PII 14 /* Intel Pentium II */ > -#define CPU_PIII 15 /* Intel Pentium III */ > -#define CPU_P4 16 /* Intel Pentium 4 */ > -#define CPU_GEODE1100 17 /* NS Geode SC1100 */ > +#define CPU_286 0 /* Intel 80286 */ > +#define CPU_386SX 1 /* Intel 80386SX */ > +#define CPU_386 2 /* Intel 80386DX */ > +#define CPU_486SX 3 /* Intel 80486SX */ > +#define CPU_486 4 /* Intel 80486DX */ > +#define CPU_586 5 /* Intel Pentium */ > +#define CPU_486DLC 6 /* Cyrix 486DLC */ > +#define CPU_686 7 /* Pentium Pro */ > +#define CPU_M1SC 8 /* Cyrix M1sc (aka 5x86) */ > +#define CPU_M1 9 /* Cyrix M1 (aka 6x86) */ > +#define CPU_BLUE 10 /* IBM BlueLighting CPU */ > +#define CPU_M2 11 /* Cyrix M2 (enhanced 6x86 with MMX) */ > +#define CPU_NX586 12 /* NexGen (now AMD) 586 */ > +#define CPU_CY486DX 13 /* Cyrix 486S/DX/DX2/DX4 */ > +#define CPU_PII 14 /* Intel Pentium II */ > +#define CPU_PIII 15 /* Intel Pentium III */ > +#define CPU_P4 16 /* Intel Pentium 4 */ > +#define CPU_GEODE1100 17 /* NS Geode SC1100 */ > + > +/* > + * Vendors of processor. > + */ > +#define CPU_VENDOR_NSC 0x100b /* NSC */ > +#define CPU_VENDOR_IBM 0x1014 /* IBM */ > +#define CPU_VENDOR_AMD 0x1022 /* AMD */ > +#define CPU_VENDOR_SIS 0x1039 /* SiS */ > +#define CPU_VENDOR_UMC 0x1060 /* UMC */ > +#define CPU_VENDOR_NEXGEN 0x1074 /* Nexgen */ > +#define CPU_VENDOR_CYRIX 0x1078 /* Cyrix */ > +#define CPU_VENDOR_IDT 0x111d /* Centaur/IDT/VIA */ > +#define CPU_VENDOR_TRANSMETA 0x1279 /* Transmeta */ > +#define CPU_VENDOR_INTEL 0x8086 /* Intel */ > +#define CPU_VENDOR_RISE 0xdead2bad /* Rise */ > +#define CPU_VENDOR_CENTAUR CPU_VENDOR_IDT > > #ifndef LOCORE > extern int cpu; > > Modified: stable/7/sys/i386/include/md_var.h > =========================================================================== >=== --- stable/7/sys/i386/include/md_var.h Tue Jun 30 15:23:16 > 2009 (r195196) +++ stable/7/sys/i386/include/md_var.h Tue Jun 30 17:10:08 > 2009 (r195197) @@ -59,6 +59,7 @@ extern u_int cpu_mxcsr_mask; > extern u_int cpu_procinfo; > extern u_int cpu_procinfo2; > extern char cpu_vendor[]; > +extern u_int cpu_vendor_id; > extern u_int cyrix_did; > extern char kstack[]; > extern char sigcode[]; > > Modified: stable/7/sys/i386/include/specialreg.h > =========================================================================== >=== --- stable/7/sys/i386/include/specialreg.h Tue Jun 30 15:23:16 > 2009 (r195196) +++ stable/7/sys/i386/include/specialreg.h Tue Jun 30 > 17:10:08 2009 (r195197) @@ -203,8 +203,16 @@ > /* > * CPUID manufacturers identifiers > */ > -#define INTEL_VENDOR_ID "GenuineIntel" > -#define AMD_VENDOR_ID "AuthenticAMD" > +#define AMD_VENDOR_ID "AuthenticAMD" > +#define CENTAUR_VENDOR_ID "CentaurHauls" > +#define CYRIX_VENDOR_ID "CyrixInstead" > +#define INTEL_VENDOR_ID "GenuineIntel" > +#define NEXGEN_VENDOR_ID "NexGenDriven" > +#define NSC_VENDOR_ID "Geode by NSC" > +#define RISE_VENDOR_ID "RiseRiseRise" > +#define SIS_VENDOR_ID "SiS SiS SiS " > +#define TRANSMETA_VENDOR_ID "GenuineTMx86" > +#define UMC_VENDOR_ID "UMC UMC UMC " > > /* > * Model-specific registers for the i386 family buildkernel fails for me with latest stable: ===> coretemp (all) cc -O2 -fno-strict-aliasing -pipe -march=prescott -D_KERNEL -DKLD_MODULE - std=c99 -nostdinc -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/LQC/opt_global.h -I. -I@ -I@/contrib/altq -finline- limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 - fno-common -g -I/usr/obj/usr/src/sys/LQC -mno-align-long-strings -mpreferred- stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 - ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes - Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno- pointer-sign -fformat-extensions -c /usr/src/sys/modules/coretemp/../../dev/coretemp/coretemp.c /usr/src/sys/modules/coretemp/../../dev/coretemp/coretemp.c: In function 'coretemp_identify': /usr/src/sys/modules/coretemp/../../dev/coretemp/coretemp.c:98: error: 'cpu_vendor_id' undeclared (first use in this function) /usr/src/sys/modules/coretemp/../../dev/coretemp/coretemp.c:98: error: (Each undeclared identifier is reported only once /usr/src/sys/modules/coretemp/../../dev/coretemp/coretemp.c:98: error: for each function it appears in.) /usr/src/sys/modules/coretemp/../../dev/coretemp/coretemp.c:98: error: 'CPU_VENDOR_INTEL' undeclared (first use in this function) *** Error code 1 Stop in /usr/src/sys/modules/coretemp. *** Error code 1 Stop in /usr/src/sys/modules. *** Error code 1 Stop in /usr/obj/usr/src/sys/LQC. *** Error code 1 Stop in /usr/src. *** Error code 1 Stop in /usr/src. From phk at phk.freebsd.dk Wed Jul 8 08:16:31 2009 From: phk at phk.freebsd.dk (Poul-Henning Kamp) Date: Wed Jul 8 08:16:37 2009 Subject: svn commit: r195436 - in head/sys: dev/ata geom geom/part sys In-Reply-To: Your message of "Wed, 08 Jul 2009 05:56:14 GMT." <200907080556.n685uFsn040044@svn.freebsd.org> Message-ID: <92653.1247039900@critter.freebsd.dk> In message <200907080556.n685uFsn040044@svn.freebsd.org>, Marcel Moolenaar writ es: >Log: > Revert revisions 188839 and 188868. Use of the ioctl in geom_dev.c > is invalid because the ioctl happens without prior open. The ioctl > got introduced to provide backward compatibility for extended > partitions, but it ended up not being used because it didn't work > as expected. Since there are no consumers of the ioctl and the > implementation is broken, the best fix is to remove the code > entirely. > > Spotted by: phk For the record Really spotted by: scottl -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. From avg at freebsd.org Wed Jul 8 08:27:59 2009 From: avg at freebsd.org (Andriy Gapon) Date: Wed Jul 8 08:28:06 2009 Subject: svn commit: r195197 - in stable/7/sys: . amd64/amd64 amd64/include contrib/pf dev/coretemp dev/hwpmc i386/cpufreq i386/i386 i386/include In-Reply-To: <200907081104.29163.makc@issp.ac.ru> References: <200906301710.n5UHA8b0086710@svn.freebsd.org> <200907081104.29163.makc@issp.ac.ru> Message-ID: <4A545875.1080401@freebsd.org> on 08/07/2009 10:04 Max Brazhnikov said the following: > > buildkernel fails for me with latest stable: I almost missed your message - so much of the original commit message you quoted :-) I can not reproduce this build failure here. What arch is this (I assumed i386)? What method of obtaining/updating sources? What non-standard/non-default flags? > ===> coretemp (all) > cc -O2 -fno-strict-aliasing -pipe -march=prescott -D_KERNEL -DKLD_MODULE - > std=c99 -nostdinc -DHAVE_KERNEL_OPTION_HEADERS -include > /usr/obj/usr/src/sys/LQC/opt_global.h -I. -I@ -I@/contrib/altq -finline- > limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 - > fno-common -g -I/usr/obj/usr/src/sys/LQC -mno-align-long-strings -mpreferred- > stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 - > ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes - > Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno- > pointer-sign -fformat-extensions -c > /usr/src/sys/modules/coretemp/../../dev/coretemp/coretemp.c > /usr/src/sys/modules/coretemp/../../dev/coretemp/coretemp.c: In function > 'coretemp_identify': > /usr/src/sys/modules/coretemp/../../dev/coretemp/coretemp.c:98: error: > 'cpu_vendor_id' undeclared (first use in this function) > /usr/src/sys/modules/coretemp/../../dev/coretemp/coretemp.c:98: error: (Each > undeclared identifier is reported only once > /usr/src/sys/modules/coretemp/../../dev/coretemp/coretemp.c:98: error: for > each function it appears in.) > /usr/src/sys/modules/coretemp/../../dev/coretemp/coretemp.c:98: error: > 'CPU_VENDOR_INTEL' undeclared (first use in this function) > *** Error code 1 > > Stop in /usr/src/sys/modules/coretemp. > *** Error code 1 -- Andriy Gapon From makc at issp.ac.ru Wed Jul 8 10:03:46 2009 From: makc at issp.ac.ru (Max Brazhnikov) Date: Wed Jul 8 10:03:58 2009 Subject: svn commit: r195197 - in stable/7/sys: . amd64/amd64 amd64/include contrib/pf dev/coretemp dev/hwpmc i386/cpufreq i386/i386 i386/include In-Reply-To: <4A545875.1080401@freebsd.org> References: <200906301710.n5UHA8b0086710@svn.freebsd.org> <200907081104.29163.makc@issp.ac.ru> <4A545875.1080401@freebsd.org> Message-ID: <200907081403.44169.makc@issp.ac.ru> On Wed, 08 Jul 2009 11:27:33 +0300, Andriy Gapon wrote: > on 08/07/2009 10:04 Max Brazhnikov said the following: > > buildkernel fails for me with latest stable: > > I almost missed your message - so much of the original commit message you > quoted :-) I can not reproduce this build failure here. > > What arch is this (I assumed i386)? FreeBSD lqc.issp.ac.ru 7.2-STABLE FreeBSD 7.2-STABLE #2: Fri May 8 13:35:40 MSD 2009 root@lqc.issp.ac.ru:/usr/obj/usr/src/sys/LQC i386 > What method of obtaining/updating sources? via cvsup7.ru.FreeBSD.org > What non-standard/non-default flags? only CPUTYPE?=core2, however GENERIC fails also even without CPUTYPE: ===> coretemp (all) cc -O2 -fno-strict-aliasing -pipe -D_KERNEL -DKLD_MODULE -std=c99 -nostdinc -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/GENERIC/opt_global.h -I. -I@ -I@/contrib/altq -finline- limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 - fno-common -g -I/usr/obj/usr/src/sys/GENERIC -mno-align-long-strings - mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes - Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno- pointer-sign -fformat-extensions -c /usr/src/sys/modules/coretemp/../../dev/coretemp/coretemp.c /usr/src/sys/modules/coretemp/../../dev/coretemp/coretemp.c: In function 'coretemp_identify': /usr/src/sys/modules/coretemp/../../dev/coretemp/coretemp.c:98: error: 'cpu_vendor_id' undeclared (first use in this function) /usr/src/sys/modules/coretemp/../../dev/coretemp/coretemp.c:98: error: (Each undeclared identifier is reported only once /usr/src/sys/modules/coretemp/../../dev/coretemp/coretemp.c:98: error: for each function it appears in.) /usr/src/sys/modules/coretemp/../../dev/coretemp/coretemp.c:98: error: 'CPU_VENDOR_INTEL' undeclared (first use in this function) *** Error code 1 1 error From brian at FreeBSD.org Wed Jul 8 10:16:17 2009 From: brian at FreeBSD.org (Brian Somers) Date: Wed Jul 8 10:16:31 2009 Subject: svn commit: r195443 - in head: tools/regression/usr.bin/jot usr.bin/jot Message-ID: <200907081016.n68AGGH7045455@svn.freebsd.org> Author: brian Date: Wed Jul 8 10:16:16 2009 New Revision: 195443 URL: http://svn.freebsd.org/changeset/base/195443 Log: Fix some uninitialise variables. PR: 136383 Submitted by: Ulrich Spoerlein - uqs at spoerlein dot net Approved by: re (kib) MFC after: 3 weeks Added: head/tools/regression/usr.bin/jot/regress.dddd.out (contents, props changed) Modified: head/tools/regression/usr.bin/jot/regress.sh head/usr.bin/jot/jot.c Added: head/tools/regression/usr.bin/jot/regress.dddd.out ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/jot/regress.dddd.out Wed Jul 8 10:16:16 2009 (r195443) @@ -0,0 +1,100 @@ +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 +49 +50 +51 +52 +53 +54 +55 +56 +57 +58 +59 +60 +61 +62 +63 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 +82 +83 +84 +85 +86 +87 +88 +89 +90 +91 +92 +93 +94 +95 +96 +97 +98 +99 +100 Modified: head/tools/regression/usr.bin/jot/regress.sh ============================================================================== --- head/tools/regression/usr.bin/jot/regress.sh Wed Jul 8 06:07:51 2009 (r195442) +++ head/tools/regression/usr.bin/jot/regress.sh Wed Jul 8 10:16:16 2009 (r195443) @@ -1,6 +1,6 @@ # $FreeBSD$ -echo 1..56 +echo 1..57 REGRESSION_START($1) @@ -20,6 +20,7 @@ REGRESSION_TEST(`dhdd', `jot - 20 - -') REGRESSION_TEST(`ddhh', `jot - - 120 2') REGRESSION_TEST(`ddhd', `jot - - 120 -') REGRESSION_TEST(`dddh', `jot - - - 2') +REGRESSION_TEST(`dddd', `jot - - - -') REGRESSION_TEST(`hhhh2', `jot 30 20 160 2') REGRESSION_TEST(`hhhd2', `jot 30 20 160 -') REGRESSION_TEST(`hhdh2', `jot 30 20 - 2') Modified: head/usr.bin/jot/jot.c ============================================================================== --- head/usr.bin/jot/jot.c Wed Jul 8 06:07:51 2009 (r195442) +++ head/usr.bin/jot/jot.c Wed Jul 8 10:16:16 2009 (r195443) @@ -101,13 +101,13 @@ main(int argc, char **argv) int ch; int mask = 0; int n = 0; - double begin; + double begin = BEGIN_DEF; double divisor; - double ender; - double s; + double ender = ENDER_DEF; + double s = STEP_DEF; double x, y; long i; - long reps; + long reps = REPS_DEF; while ((ch = getopt(argc, argv, "b:cnp:rs:w:")) != -1) switch (ch) { From ed at FreeBSD.org Wed Jul 8 10:21:53 2009 From: ed at FreeBSD.org (Ed Schouten) Date: Wed Jul 8 10:22:05 2009 Subject: svn commit: r195444 - head/sys/kern Message-ID: <200907081021.n68ALqsa045650@svn.freebsd.org> Author: ed Date: Wed Jul 8 10:21:52 2009 New Revision: 195444 URL: http://svn.freebsd.org/changeset/base/195444 Log: Fix regressions in return events of poll() on TTYs. As pointed out, POLLHUP should be generated, even if it hasn't been specified on input. It is also not allowed to return both POLLOUT and POLLHUP at the same time. Reported by: jilles Approved by: re (kib) Modified: head/sys/kern/tty.c head/sys/kern/tty_pts.c Modified: head/sys/kern/tty.c ============================================================================== --- head/sys/kern/tty.c Wed Jul 8 10:16:16 2009 (r195443) +++ head/sys/kern/tty.c Wed Jul 8 10:21:52 2009 (r195444) @@ -536,25 +536,23 @@ ttydev_poll(struct cdev *dev, int events int error, revents = 0; error = ttydev_enter(tp); - if (error) { - /* Don't return the error here, but the event mask. */ - return (events & - (POLLHUP|POLLIN|POLLRDNORM|POLLOUT|POLLWRNORM)); - } + if (error) + return ((events & (POLLIN|POLLRDNORM)) | POLLHUP); if (events & (POLLIN|POLLRDNORM)) { /* See if we can read something. */ if (ttydisc_read_poll(tp) > 0) revents |= events & (POLLIN|POLLRDNORM); } - if (events & (POLLOUT|POLLWRNORM)) { + + if (tp->t_flags & TF_ZOMBIE) { + /* Hangup flag on zombie state. */ + revents |= POLLHUP; + } else if (events & (POLLOUT|POLLWRNORM)) { /* See if we can write something. */ if (ttydisc_write_poll(tp) > 0) revents |= events & (POLLOUT|POLLWRNORM); } - if (tp->t_flags & TF_ZOMBIE) - /* Hangup flag on zombie state. */ - revents |= events & POLLHUP; if (revents == 0) { if (events & (POLLIN|POLLRDNORM)) Modified: head/sys/kern/tty_pts.c ============================================================================== --- head/sys/kern/tty_pts.c Wed Jul 8 10:16:16 2009 (r195443) +++ head/sys/kern/tty_pts.c Wed Jul 8 10:21:52 2009 (r195444) @@ -409,8 +409,7 @@ ptsdev_poll(struct file *fp, int events, if (psc->pts_flags & PTS_FINISHED) { /* Slave device is not opened. */ tty_unlock(tp); - return (events & - (POLLHUP|POLLIN|POLLRDNORM|POLLOUT|POLLWRNORM)); + return ((events & (POLLIN|POLLRDNORM)) | POLLHUP); } if (events & (POLLIN|POLLRDNORM)) { From avg at freebsd.org Wed Jul 8 10:35:38 2009 From: avg at freebsd.org (Andriy Gapon) Date: Wed Jul 8 10:35:50 2009 Subject: svn commit: r195197 - in stable/7/sys: . amd64/amd64 amd64/include contrib/pf dev/coretemp dev/hwpmc i386/cpufreq i386/i386 i386/include In-Reply-To: <200907081403.44169.makc@issp.ac.ru> References: <200906301710.n5UHA8b0086710@svn.freebsd.org> <200907081104.29163.makc@issp.ac.ru> <4A545875.1080401@freebsd.org> <200907081403.44169.makc@issp.ac.ru> Message-ID: <4A547660.4060600@freebsd.org> on 08/07/2009 13:03 Max Brazhnikov said the following: > On Wed, 08 Jul 2009 11:27:33 +0300, Andriy Gapon wrote: >> on 08/07/2009 10:04 Max Brazhnikov said the following: >>> buildkernel fails for me with latest stable: >> I almost missed your message - so much of the original commit message you >> quoted :-) I can not reproduce this build failure here. >> >> What arch is this (I assumed i386)? > FreeBSD lqc.issp.ac.ru 7.2-STABLE FreeBSD 7.2-STABLE #2: Fri May 8 13:35:40 > MSD 2009 root@lqc.issp.ac.ru:/usr/obj/usr/src/sys/LQC i386 > >> What method of obtaining/updating sources? > via cvsup7.ru.FreeBSD.org I haven't checked but I guess that there is either some issue with svn-cvs bridge or this cvsup server. I built pristine GENERIC with all modules and did not get this error. Tinderbox is silent too. I realize advantages of cvsup approach, but it seems that recently people using it had more troubles than those who use svn. -- Andriy Gapon From makc at issp.ac.ru Wed Jul 8 12:07:25 2009 From: makc at issp.ac.ru (Max Brazhnikov) Date: Wed Jul 8 12:08:27 2009 Subject: svn commit: r195197 - in stable/7/sys: . amd64/amd64 amd64/include contrib/pf dev/coretemp dev/hwpmc i386/cpufreq i386/i386 i386/include In-Reply-To: <4A547660.4060600@freebsd.org> References: <200906301710.n5UHA8b0086710@svn.freebsd.org> <200907081403.44169.makc@issp.ac.ru> <4A547660.4060600@freebsd.org> Message-ID: <200907081607.19834.makc@issp.ac.ru> On Wed, 08 Jul 2009 13:35:12 +0300, Andriy Gapon wrote: > on 08/07/2009 13:03 Max Brazhnikov said the following: > > On Wed, 08 Jul 2009 11:27:33 +0300, Andriy Gapon wrote: > >> on 08/07/2009 10:04 Max Brazhnikov said the following: > >>> buildkernel fails for me with latest stable: > >> > >> I almost missed your message - so much of the original commit message > >> you quoted :-) I can not reproduce this build failure here. > >> > >> What arch is this (I assumed i386)? > > > > FreeBSD lqc.issp.ac.ru 7.2-STABLE FreeBSD 7.2-STABLE #2: Fri May 8 > > 13:35:40 MSD 2009 root@lqc.issp.ac.ru:/usr/obj/usr/src/sys/LQC i386 > > > >> What method of obtaining/updating sources? > > > > via cvsup7.ru.FreeBSD.org > > I haven't checked but I guess that there is either some issue with svn-cvs > bridge or this cvsup server. I built pristine GENERIC with all modules and > did not get this error. > Tinderbox is silent too. > > I realize advantages of cvsup approach, but it seems that recently people > using it had more troubles than those who use svn. it seems cvsup7.ru.FreeBSD.org is out of sync. I've switched to another server, kernel builds fine now. From trasz at FreeBSD.org Wed Jul 8 15:23:19 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Wed Jul 8 15:23:26 2009 Subject: svn commit: r195458 - in head: include lib/libc/sys sys/bsm sys/compat/freebsd32 sys/compat/svr4 sys/i386/ibcs2 sys/kern sys/sys Message-ID: <200907081523.n68FNIpi055036@svn.freebsd.org> Author: trasz Date: Wed Jul 8 15:23:18 2009 New Revision: 195458 URL: http://svn.freebsd.org/changeset/base/195458 Log: There is an optimization in chmod(1), that makes it not to call chmod(2) if the new file mode is the same as it was before; however, this optimization must be disabled for filesystems that support NFSv4 ACLs. Chmod uses pathconf(2) to determine whether this is the case - however, pathconf(2) always follows symbolic links, while the 'chmod -h' doesn't. This change adds lpathconf(3) to make it possible to solve that problem in a clean way. Reviewed by: rwatson (earlier version) Approved by: re (kib) Modified: head/include/unistd.h head/lib/libc/sys/Makefile.inc head/lib/libc/sys/Symbol.map head/lib/libc/sys/pathconf.2 head/sys/bsm/audit_kevents.h head/sys/compat/freebsd32/syscalls.master head/sys/compat/svr4/svr4_stat.c head/sys/i386/ibcs2/ibcs2_misc.c head/sys/kern/syscalls.master head/sys/kern/vfs_syscalls.c head/sys/sys/syscallsubr.h Modified: head/include/unistd.h ============================================================================== --- head/include/unistd.h Wed Jul 8 15:02:56 2009 (r195457) +++ head/include/unistd.h Wed Jul 8 15:23:18 2009 (r195458) @@ -513,6 +513,7 @@ int initgroups(const char *, gid_t); int iruserok(unsigned long, int, const char *, const char *); int iruserok_sa(const void *, int, int, const char *, const char *); int issetugid(void); +long lpathconf(const char *, int); #ifndef _MKDTEMP_DECLARED char *mkdtemp(char *); #define _MKDTEMP_DECLARED Modified: head/lib/libc/sys/Makefile.inc ============================================================================== --- head/lib/libc/sys/Makefile.inc Wed Jul 8 15:02:56 2009 (r195457) +++ head/lib/libc/sys/Makefile.inc Wed Jul 8 15:23:18 2009 (r195458) @@ -159,6 +159,7 @@ MLINKS+=mq_send.2 mq_timedsend.2 MLINKS+=ntp_adjtime.2 ntp_gettime.2 MLINKS+=open.2 openat.2 MLINKS+=pathconf.2 fpathconf.2 +MLINKS+=pathconf.2 lpathconf.2 MLINKS+=read.2 pread.2 read.2 preadv.2 read.2 readv.2 MLINKS+=readlink.2 readlinkat.2 MLINKS+=recv.2 recvfrom.2 recv.2 recvmsg.2 Modified: head/lib/libc/sys/Symbol.map ============================================================================== --- head/lib/libc/sys/Symbol.map Wed Jul 8 15:02:56 2009 (r195457) +++ head/lib/libc/sys/Symbol.map Wed Jul 8 15:23:18 2009 (r195458) @@ -346,6 +346,7 @@ FBSD_1.1 { jail_set; jail_remove; linkat; + lpathconf; mkdirat; mkfifoat; mknodat; Modified: head/lib/libc/sys/pathconf.2 ============================================================================== --- head/lib/libc/sys/pathconf.2 Wed Jul 8 15:02:56 2009 (r195457) +++ head/lib/libc/sys/pathconf.2 Wed Jul 8 15:23:18 2009 (r195458) @@ -28,11 +28,12 @@ .\" @(#)pathconf.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd June 25, 2009 +.Dd July 7, 2009 .Dt PATHCONF 2 .Os .Sh NAME .Nm pathconf , +.Nm lpathconf , .Nm fpathconf .Nd get configurable pathname variables .Sh LIBRARY @@ -42,10 +43,13 @@ .Ft long .Fn pathconf "const char *path" "int name" .Ft long +.Fn lpathconf "const char *path" "int name" +.Ft long .Fn fpathconf "int fd" "int name" .Sh DESCRIPTION The -.Fn pathconf +.Fn pathconf , +.Fn lpathconf and .Fn fpathconf system calls provide a method for applications to determine the current @@ -53,7 +57,9 @@ value of a configurable system limit or with a pathname or file descriptor. .Pp For -.Fn pathconf , +.Fn pathconf +and +.Fn lpathconf , the .Fa path argument is the name of a file or directory. @@ -68,6 +74,18 @@ argument specifies the system variable t Symbolic constants for each name value are found in the include file .Li . .Pp +The +.Fn lpathconf +system call is like +.Fn pathconf +except in the case where the named file is a symbolic link, +in which case +.Fn lpathconf +returns information about the link, +while +.Fn pathconf +returns information about the file the link references. +.Pp The available values are as follows: .Pp .Bl -tag -width 6n @@ -239,3 +257,7 @@ and .Fn fpathconf system calls first appeared in .Bx 4.4 . +The +.Fn lpathconf +system call first appeared in +.Fx 8.0 . Modified: head/sys/bsm/audit_kevents.h ============================================================================== --- head/sys/bsm/audit_kevents.h Wed Jul 8 15:02:56 2009 (r195457) +++ head/sys/bsm/audit_kevents.h Wed Jul 8 15:23:18 2009 (r195458) @@ -597,6 +597,7 @@ #define AUE_PWRITE 43193 /* Darwin/FreeBSD. */ #define AUE_FSCTL 43194 /* Darwin. */ #define AUE_FFSCTL 43195 /* Darwin. */ +#define AUE_LPATHCONF 43196 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the Modified: head/sys/compat/freebsd32/syscalls.master ============================================================================== --- head/sys/compat/freebsd32/syscalls.master Wed Jul 8 15:02:56 2009 (r195457) +++ head/sys/compat/freebsd32/syscalls.master Wed Jul 8 15:23:18 2009 (r195458) @@ -900,3 +900,4 @@ struct msqid_ds32 *buf); } 512 AUE_SHMCTL STD { int freebsd32_shmctl(int shmid, int cmd, \ struct shmid_ds32 *buf); } +513 AUE_LPATHCONF STD { int lpathconf(char *path, int name); } Modified: head/sys/compat/svr4/svr4_stat.c ============================================================================== --- head/sys/compat/svr4/svr4_stat.c Wed Jul 8 15:02:56 2009 (r195457) +++ head/sys/compat/svr4/svr4_stat.c Wed Jul 8 15:23:18 2009 (r195458) @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -669,7 +670,7 @@ svr4_sys_pathconf(td, uap) return (0); default: CHECKALTEXIST(td, uap->path, &path); - error = kern_pathconf(td, path, UIO_SYSSPACE, name); + error = kern_pathconf(td, path, UIO_SYSSPACE, name, FOLLOW); free(path, M_TEMP); return (error); } Modified: head/sys/i386/ibcs2/ibcs2_misc.c ============================================================================== --- head/sys/i386/ibcs2/ibcs2_misc.c Wed Jul 8 15:02:56 2009 (r195457) +++ head/sys/i386/ibcs2/ibcs2_misc.c Wed Jul 8 15:23:18 2009 (r195458) @@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$"); #include #include /* Must come after sys/malloc.h */ #include +#include #include #include #include @@ -763,7 +764,7 @@ ibcs2_pathconf(td, uap) CHECKALTEXIST(td, uap->path, &path); uap->name++; /* iBCS2 _PC_* defines are offset by one */ - error = kern_pathconf(td, path, UIO_SYSSPACE, uap->name); + error = kern_pathconf(td, path, UIO_SYSSPACE, uap->name, FOLLOW); free(path, M_TEMP); return (error); } Modified: head/sys/kern/syscalls.master ============================================================================== --- head/sys/kern/syscalls.master Wed Jul 8 15:02:56 2009 (r195457) +++ head/sys/kern/syscalls.master Wed Jul 8 15:23:18 2009 (r195458) @@ -910,5 +910,6 @@ struct msqid_ds *buf); } 512 AUE_SHMCTL NOSTD { int shmctl(int shmid, int cmd, \ struct shmid_ds *buf); } +513 AUE_LPATHCONF STD { int lpathconf(char *path, int name); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master Modified: head/sys/kern/vfs_syscalls.c ============================================================================== --- head/sys/kern/vfs_syscalls.c Wed Jul 8 15:02:56 2009 (r195457) +++ head/sys/kern/vfs_syscalls.c Wed Jul 8 15:23:18 2009 (r195458) @@ -2506,17 +2506,36 @@ pathconf(td, uap) } */ *uap; { - return (kern_pathconf(td, uap->path, UIO_USERSPACE, uap->name)); + return (kern_pathconf(td, uap->path, UIO_USERSPACE, uap->name, FOLLOW)); +} + +#ifndef _SYS_SYSPROTO_H_ +struct lpathconf_args { + char *path; + int name; +}; +#endif +int +lpathconf(td, uap) + struct thread *td; + register struct lpathconf_args /* { + char *path; + int name; + } */ *uap; +{ + + return (kern_pathconf(td, uap->path, UIO_USERSPACE, uap->name, NOFOLLOW)); } int -kern_pathconf(struct thread *td, char *path, enum uio_seg pathseg, int name) +kern_pathconf(struct thread *td, char *path, enum uio_seg pathseg, int name, + u_long flags) { struct nameidata nd; int error, vfslocked; - NDINIT(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | MPSAFE | - AUDITVNODE1, pathseg, path, td); + NDINIT(&nd, LOOKUP, LOCKSHARED | LOCKLEAF | MPSAFE | AUDITVNODE1 | + flags, pathseg, path, td); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); Modified: head/sys/sys/syscallsubr.h ============================================================================== --- head/sys/sys/syscallsubr.h Wed Jul 8 15:02:56 2009 (r195457) +++ head/sys/sys/syscallsubr.h Wed Jul 8 15:23:18 2009 (r195458) @@ -145,7 +145,7 @@ int kern_open(struct thread *td, char *p int kern_openat(struct thread *td, int fd, char *path, enum uio_seg pathseg, int flags, int mode); int kern_pathconf(struct thread *td, char *path, enum uio_seg pathseg, - int name); + int name, u_long flags); int kern_pipe(struct thread *td, int fildes[2]); int kern_preadv(struct thread *td, int fd, struct uio *auio, off_t offset); int kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, From trasz at FreeBSD.org Wed Jul 8 15:25:28 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Wed Jul 8 15:25:34 2009 Subject: svn commit: r195459 - in head/sys: kern sys Message-ID: <200907081525.n68FPR0U055120@svn.freebsd.org> Author: trasz Date: Wed Jul 8 15:25:27 2009 New Revision: 195459 URL: http://svn.freebsd.org/changeset/base/195459 Log: Regenerate after lpathconf(2) addition. Approved by: re (kib) Modified: head/sys/kern/init_sysent.c head/sys/kern/syscalls.c head/sys/kern/systrace_args.c head/sys/sys/syscall.h head/sys/sys/syscall.mk head/sys/sys/sysproto.h Modified: head/sys/kern/init_sysent.c ============================================================================== --- head/sys/kern/init_sysent.c Wed Jul 8 15:23:18 2009 (r195458) +++ head/sys/kern/init_sysent.c Wed Jul 8 15:25:27 2009 (r195459) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 194910 2009-06-24 21:10:52Z jhb + * created from FreeBSD: head/sys/kern/syscalls.master 195458 2009-07-08 15:23:18Z trasz */ #include "opt_compat.h" @@ -547,4 +547,5 @@ struct sysent sysent[] = { { AS(__semctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 510 = __semctl */ { AS(msgctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 511 = msgctl */ { AS(shmctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 512 = shmctl */ + { AS(lpathconf_args), (sy_call_t *)lpathconf, AUE_LPATHCONF, NULL, 0, 0, 0 }, /* 513 = lpathconf */ }; Modified: head/sys/kern/syscalls.c ============================================================================== --- head/sys/kern/syscalls.c Wed Jul 8 15:23:18 2009 (r195458) +++ head/sys/kern/syscalls.c Wed Jul 8 15:25:27 2009 (r195459) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 194910 2009-06-24 21:10:52Z jhb + * created from FreeBSD: head/sys/kern/syscalls.master 195458 2009-07-08 15:23:18Z trasz */ const char *syscallnames[] = { @@ -520,4 +520,5 @@ const char *syscallnames[] = { "__semctl", /* 510 = __semctl */ "msgctl", /* 511 = msgctl */ "shmctl", /* 512 = shmctl */ + "lpathconf", /* 513 = lpathconf */ }; Modified: head/sys/kern/systrace_args.c ============================================================================== --- head/sys/kern/systrace_args.c Wed Jul 8 15:23:18 2009 (r195458) +++ head/sys/kern/systrace_args.c Wed Jul 8 15:25:27 2009 (r195459) @@ -3064,6 +3064,14 @@ systrace_args(int sysnum, void *params, *n_args = 3; break; } + /* lpathconf */ + case 513: { + struct lpathconf_args *p = params; + uarg[0] = (intptr_t) p->path; /* char * */ + iarg[1] = p->name; /* int */ + *n_args = 2; + break; + } default: *n_args = 0; break; @@ -8133,6 +8141,19 @@ systrace_setargdesc(int sysnum, int ndx, break; }; break; + /* lpathconf */ + case 513: + switch(ndx) { + case 0: + p = "char *"; + break; + case 1: + p = "int"; + break; + default: + break; + }; + break; default: break; }; Modified: head/sys/sys/syscall.h ============================================================================== --- head/sys/sys/syscall.h Wed Jul 8 15:23:18 2009 (r195458) +++ head/sys/sys/syscall.h Wed Jul 8 15:25:27 2009 (r195459) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 194910 2009-06-24 21:10:52Z jhb + * created from FreeBSD: head/sys/kern/syscalls.master 195458 2009-07-08 15:23:18Z trasz */ #define SYS_syscall 0 @@ -427,4 +427,5 @@ #define SYS___semctl 510 #define SYS_msgctl 511 #define SYS_shmctl 512 -#define SYS_MAXSYSCALL 513 +#define SYS_lpathconf 513 +#define SYS_MAXSYSCALL 514 Modified: head/sys/sys/syscall.mk ============================================================================== --- head/sys/sys/syscall.mk Wed Jul 8 15:23:18 2009 (r195458) +++ head/sys/sys/syscall.mk Wed Jul 8 15:25:27 2009 (r195459) @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. # $FreeBSD$ -# created from FreeBSD: head/sys/kern/syscalls.master 194910 2009-06-24 21:10:52Z jhb +# created from FreeBSD: head/sys/kern/syscalls.master 195458 2009-07-08 15:23:18Z trasz MIASM = \ syscall.o \ exit.o \ @@ -375,4 +375,5 @@ MIASM = \ closefrom.o \ __semctl.o \ msgctl.o \ - shmctl.o + shmctl.o \ + lpathconf.o Modified: head/sys/sys/sysproto.h ============================================================================== --- head/sys/sys/sysproto.h Wed Jul 8 15:23:18 2009 (r195458) +++ head/sys/sys/sysproto.h Wed Jul 8 15:25:27 2009 (r195459) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 194910 2009-06-24 21:10:52Z jhb + * created from FreeBSD: head/sys/kern/syscalls.master 195458 2009-07-08 15:23:18Z trasz */ #ifndef _SYS_SYSPROTO_H_ @@ -1637,6 +1637,10 @@ struct shmctl_args { char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; char buf_l_[PADL_(struct shmid_ds *)]; struct shmid_ds * buf; char buf_r_[PADR_(struct shmid_ds *)]; }; +struct lpathconf_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char name_l_[PADL_(int)]; int name; char name_r_[PADR_(int)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1994,6 +1998,7 @@ int closefrom(struct thread *, struct cl int __semctl(struct thread *, struct __semctl_args *); int msgctl(struct thread *, struct msgctl_args *); int shmctl(struct thread *, struct shmctl_args *); +int lpathconf(struct thread *, struct lpathconf_args *); #ifdef COMPAT_43 @@ -2665,6 +2670,7 @@ int freebsd7_shmctl(struct thread *, str #define SYS_AUE___semctl AUE_SEMCTL #define SYS_AUE_msgctl AUE_MSGCTL #define SYS_AUE_shmctl AUE_SHMCTL +#define SYS_AUE_lpathconf AUE_LPATHCONF #undef PAD_ #undef PADL_ From jamie at FreeBSD.org Wed Jul 8 15:46:30 2009 From: jamie at FreeBSD.org (Jamie Gritton) Date: Wed Jul 8 15:46:36 2009 Subject: svn commit: r195461 - head/usr.sbin/jail Message-ID: <200907081546.n68FkTej055615@svn.freebsd.org> Author: jamie Date: Wed Jul 8 15:46:29 2009 New Revision: 195461 URL: http://svn.freebsd.org/changeset/base/195461 Log: Fix a typo in the examples. Approved by: re (kib), bz (mentor) Modified: head/usr.sbin/jail/jail.8 Modified: head/usr.sbin/jail/jail.8 ============================================================================== --- head/usr.sbin/jail/jail.8 Wed Jul 8 15:26:34 2009 (r195460) +++ head/usr.sbin/jail/jail.8 Wed Jul 8 15:46:29 2009 (r195461) @@ -34,7 +34,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 23, 2009 +.Dd July 8, 2009 .Dt JAIL 8 .Os .Sh NAME @@ -619,7 +619,7 @@ script from within the jail. ifconfig ed0 inet alias 192.0.2.100/32 mount -t procfs proc /data/jail/192.0.2.100/proc jail path=/data/jail/192.0.2.100 host.hostname=testhostname \\ - ip4=addr.192.0.2.100 command=/bin/sh /etc/rc + ip4.addr=192.0.2.100 command=/bin/sh /etc/rc .Ed .Pp A few warnings will be produced, because most From jamie at FreeBSD.org Wed Jul 8 15:57:23 2009 From: jamie at FreeBSD.org (Jamie Gritton) Date: Wed Jul 8 15:57:30 2009 Subject: svn commit: r195462 - head/usr.sbin/jls Message-ID: <200907081557.n68FvMFk055868@svn.freebsd.org> Author: jamie Date: Wed Jul 8 15:57:22 2009 New Revision: 195462 URL: http://svn.freebsd.org/changeset/base/195462 Log: Give a more expected behavior to -[hns] options, defaulting to all parameters instead of ignoring the options and giving the old-style default output. Approved by: re (kib), bz (mentor) Modified: head/usr.sbin/jls/jls.8 head/usr.sbin/jls/jls.c Modified: head/usr.sbin/jls/jls.8 ============================================================================== --- head/usr.sbin/jls/jls.8 Wed Jul 8 15:46:29 2009 (r195461) +++ head/usr.sbin/jls/jls.8 Wed Jul 8 15:57:22 2009 (r195462) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 27, 2009 +.Dd July 8, 2009 .Dt JLS 8 .Os .Sh NAME @@ -54,6 +54,8 @@ for a description of some core parameter .Pp If no .Ar parameters +or any of the options +.Fl hns are given, the following four columns will be printed: jail identifier (jid), IP address (ip4.addr), hostname (host.hostname), and path (path). @@ -66,17 +68,20 @@ List as well as active jails. .It Fl h Print a header line containing the parameters listed. -If no parameters are given on the command line, the default output always -contains a header. +If no parameters are given on the command line, +.Va all +is assumed. .It Fl n Print parameters in .Dq name=value format, where each parameter is preceded by its name. -This option is ignored for the default four-column output. +If no parameters are given on the command line, +.Va all +is assumed. .It Fl q Put quotes around parameters if they contain spaces or quotes, or are the empty string. -.It Fl c +.It Fl s Print parameters suitable for passing to .Xr jail 8 , skipping read-only and unused parameters. Modified: head/usr.sbin/jls/jls.c ============================================================================== --- head/usr.sbin/jls/jls.c Wed Jul 8 15:46:29 2009 (r195461) +++ head/usr.sbin/jls/jls.c Wed Jul 8 15:57:22 2009 (r195462) @@ -88,7 +88,8 @@ main(int argc, char **argv) jname = optarg; break; case 'h': - pflags = (pflags & ~PRINT_SKIP) | PRINT_HEADER; + pflags = (pflags & ~(PRINT_SKIP | PRINT_VERBOSE)) | + PRINT_HEADER; break; case 'n': pflags = (pflags & ~PRINT_VERBOSE) | PRINT_NAMEVAL; @@ -101,7 +102,8 @@ main(int argc, char **argv) PRINT_NAMEVAL | PRINT_QUOTED | PRINT_SKIP; break; case 'v': - pflags = (pflags & ~(PRINT_NAMEVAL | PRINT_SKIP)) | + pflags = (pflags & + ~(PRINT_HEADER | PRINT_NAMEVAL | PRINT_SKIP)) | PRINT_VERBOSE; break; default: @@ -110,7 +112,9 @@ main(int argc, char **argv) /* Add the parameters to print. */ if (optind == argc) { - if (pflags & PRINT_VERBOSE) { + if (pflags & (PRINT_HEADER | PRINT_NAMEVAL)) + add_param("all", NULL, (size_t)0, NULL, JP_USER); + else if (pflags & PRINT_VERBOSE) { add_param("jid", NULL, (size_t)0, NULL, JP_USER); add_param("host.hostname", NULL, (size_t)0, NULL, JP_USER); @@ -122,9 +126,7 @@ main(int argc, char **argv) add_param("ip6.addr", NULL, (size_t)0, NULL, JP_USER | JP_OPT); } else { - pflags = (pflags & - ~(PRINT_NAMEVAL | PRINT_SKIP | PRINT_VERBOSE)) | - PRINT_DEFAULT; + pflags |= PRINT_DEFAULT; add_param("jid", NULL, (size_t)0, NULL, JP_USER); add_param("ip4.addr", NULL, (size_t)0, NULL, JP_USER); add_param("host.hostname", NULL, (size_t)0, NULL, From trasz at FreeBSD.org Wed Jul 8 16:26:44 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Wed Jul 8 16:26:56 2009 Subject: svn commit: r195468 - head/sys/compat/freebsd32 Message-ID: <200907081626.n68GQhC3056685@svn.freebsd.org> Author: trasz Date: Wed Jul 8 16:26:43 2009 New Revision: 195468 URL: http://svn.freebsd.org/changeset/base/195468 Log: Fix freebsd32 version of lpathconf(2). Approved by: re (kib) Modified: head/sys/compat/freebsd32/syscalls.master Modified: head/sys/compat/freebsd32/syscalls.master ============================================================================== --- head/sys/compat/freebsd32/syscalls.master Wed Jul 8 16:25:47 2009 (r195467) +++ head/sys/compat/freebsd32/syscalls.master Wed Jul 8 16:26:43 2009 (r195468) @@ -900,4 +900,4 @@ struct msqid_ds32 *buf); } 512 AUE_SHMCTL STD { int freebsd32_shmctl(int shmid, int cmd, \ struct shmid_ds32 *buf); } -513 AUE_LPATHCONF STD { int lpathconf(char *path, int name); } +513 AUE_LPATHCONF NOPROTO { int lpathconf(char *path, int name); } From trasz at FreeBSD.org Wed Jul 8 16:30:34 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Wed Jul 8 16:30:46 2009 Subject: svn commit: r195469 - head/sys/compat/freebsd32 Message-ID: <200907081630.n68GUYf1056786@svn.freebsd.org> Author: trasz Date: Wed Jul 8 16:30:34 2009 New Revision: 195469 URL: http://svn.freebsd.org/changeset/base/195469 Log: Regen the freebsd32 parts. Approved by: re (kib) Modified: head/sys/compat/freebsd32/freebsd32_proto.h head/sys/compat/freebsd32/freebsd32_syscall.h head/sys/compat/freebsd32/freebsd32_syscalls.c head/sys/compat/freebsd32/freebsd32_sysent.c Modified: head/sys/compat/freebsd32/freebsd32_proto.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_proto.h Wed Jul 8 16:26:43 2009 (r195468) +++ head/sys/compat/freebsd32/freebsd32_proto.h Wed Jul 8 16:30:34 2009 (r195469) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 194910 2009-06-24 21:10:52Z jhb + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 195468 2009-07-08 16:26:43Z trasz */ #ifndef _FREEBSD32_SYSPROTO_H_ Modified: head/sys/compat/freebsd32/freebsd32_syscall.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_syscall.h Wed Jul 8 16:26:43 2009 (r195468) +++ head/sys/compat/freebsd32/freebsd32_syscall.h Wed Jul 8 16:30:34 2009 (r195469) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 194910 2009-06-24 21:10:52Z jhb + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 195468 2009-07-08 16:26:43Z trasz */ #define FREEBSD32_SYS_syscall 0 @@ -381,4 +381,5 @@ #define FREEBSD32_SYS_freebsd32_semctl 510 #define FREEBSD32_SYS_freebsd32_msgctl 511 #define FREEBSD32_SYS_freebsd32_shmctl 512 -#define FREEBSD32_SYS_MAXSYSCALL 513 +#define FREEBSD32_SYS_lpathconf 513 +#define FREEBSD32_SYS_MAXSYSCALL 514 Modified: head/sys/compat/freebsd32/freebsd32_syscalls.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_syscalls.c Wed Jul 8 16:26:43 2009 (r195468) +++ head/sys/compat/freebsd32/freebsd32_syscalls.c Wed Jul 8 16:30:34 2009 (r195469) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 194910 2009-06-24 21:10:52Z jhb + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 195468 2009-07-08 16:26:43Z trasz */ const char *freebsd32_syscallnames[] = { @@ -520,4 +520,5 @@ const char *freebsd32_syscallnames[] = { "freebsd32_semctl", /* 510 = freebsd32_semctl */ "freebsd32_msgctl", /* 511 = freebsd32_msgctl */ "freebsd32_shmctl", /* 512 = freebsd32_shmctl */ + "lpathconf", /* 513 = lpathconf */ }; Modified: head/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_sysent.c Wed Jul 8 16:26:43 2009 (r195468) +++ head/sys/compat/freebsd32/freebsd32_sysent.c Wed Jul 8 16:30:34 2009 (r195469) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 194910 2009-06-24 21:10:52Z jhb + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 195468 2009-07-08 16:26:43Z trasz */ #include "opt_compat.h" @@ -557,4 +557,5 @@ struct sysent freebsd32_sysent[] = { { AS(freebsd32_semctl_args), (sy_call_t *)freebsd32_semctl, AUE_SEMCTL, NULL, 0, 0, 0 }, /* 510 = freebsd32_semctl */ { AS(freebsd32_msgctl_args), (sy_call_t *)freebsd32_msgctl, AUE_MSGCTL, NULL, 0, 0, 0 }, /* 511 = freebsd32_msgctl */ { AS(freebsd32_shmctl_args), (sy_call_t *)freebsd32_shmctl, AUE_SHMCTL, NULL, 0, 0, 0 }, /* 512 = freebsd32_shmctl */ + { AS(lpathconf_args), (sy_call_t *)lpathconf, AUE_LPATHCONF, NULL, 0, 0, 0 }, /* 513 = lpathconf */ }; From brde at optusnet.com.au Wed Jul 8 19:47:04 2009 From: brde at optusnet.com.au (Bruce Evans) Date: Wed Jul 8 19:47:16 2009 Subject: svn commit: r195430 - head/sys/kern In-Reply-To: <200907080109.n6819CEn033840@svn.freebsd.org> References: <200907080109.n6819CEn033840@svn.freebsd.org> Message-ID: <20090709045726.A46151@delplex.bde.org> On Wed, 8 Jul 2009, Mike Silbersack wrote: > Log: > Increase HZ_VM from 10 to 100. While 10 hz saves cpu time > under VM environments, it's too slow for FreeBSD to work > properly. For example, ping at 10hz pings about every 600ms > instead of about every second. It shouldn't be that bad -- the error should be at most 2 ticks in the worst case, and only 1/2 a tick on average. I thought that only the worst case is normal for ping. Apparently the 2-tick error gets doubled somewhere (maybe internally in select(2) and again in ping). I use a modified ping that makes ping attempt to send a packet at every multiple of the specified interval, instead of waiting for the specified interval "between" sending each packet as documented. All sleeps and timeouts in FreeBSD except ones generated by periodic itimers give an interval that is at least as large as the specified interval (unless interrupted by a signal). ping uses select(2) timeouts, so (HZ) timer granularity necessarily gives intervals of between 0 and 1 ticks too long (average half a tick too long), and due to misimplementation details they are up to 2 ticks too long (average 1.5 ticks too long?). ping doesn't try to compensate for this and probably shouldn't, since it couldn't do better than the implementation while maintaining the minimum interval. It could use periodic itimers. My version still uses select(), but checks timestamps so as to determine how much to reduce the interval to recover from previous intervals being too long. IIRC, it does this without using extra syscalls. However, a periodic itimer could do it with fewer than the normal number of syscalls. It would restore the use of SIGALRM, and avoiding SIGALRM is an important optimization by fenner, but I think using periodic itimers would make using SIGALRM best again. I should also use a modified ping that makes ping -f actually flood. A flood ping would send packets as fast as possible. ping -f only sends them when they come back, or 100 times per second, whichever is more. 100 times per second may have been a high rate in 1980 but it isn't now, but with your HZ = 10, 100 times per second is 20 times higher than is done. With HZ = 100, 100 times per second is only 2 times higher than is done. ping -i allows setting a smaller interval than ping -f (down to ping's internal bogus granularity of 1 ms), but small intervals won't actually work unless HZ is large, due to external timer granularity. Bruce From jamie at FreeBSD.org Wed Jul 8 21:45:48 2009 From: jamie at FreeBSD.org (Jamie Gritton) Date: Wed Jul 8 21:46:00 2009 Subject: svn commit: r195477 - head/sys/kern Message-ID: <200907082145.n68LjmP0063252@svn.freebsd.org> Author: jamie Date: Wed Jul 8 21:45:48 2009 New Revision: 195477 URL: http://svn.freebsd.org/changeset/base/195477 Log: Remove crcopy call from seteuid now that it calls crcopysafe. Reviewed by: brooks Approved by: re (kib), bz (mentor) Modified: head/sys/kern/kern_prot.c Modified: head/sys/kern/kern_prot.c ============================================================================== --- head/sys/kern/kern_prot.c Wed Jul 8 18:37:05 2009 (r195476) +++ head/sys/kern/kern_prot.c Wed Jul 8 21:45:48 2009 (r195477) @@ -623,7 +623,6 @@ seteuid(struct thread *td, struct seteui /* * Everything's okay, do it. */ - crcopy(newcred, oldcred); if (oldcred->cr_uid != euid) { change_euid(newcred, euip); setsugid(p); From yongari at FreeBSD.org Thu Jul 9 01:59:00 2009 From: yongari at FreeBSD.org (Pyun YongHyeon) Date: Thu Jul 9 01:59:07 2009 Subject: svn commit: r195484 - head/sys/dev/xl Message-ID: <200907090159.n691x0DT068418@svn.freebsd.org> Author: yongari Date: Thu Jul 9 01:58:59 2009 New Revision: 195484 URL: http://svn.freebsd.org/changeset/base/195484 Log: Make xl(4) build with Tx checksum offload. PR: kern/136409 Approved by: re (kib) Modified: head/sys/dev/xl/if_xl.c Modified: head/sys/dev/xl/if_xl.c ============================================================================== --- head/sys/dev/xl/if_xl.c Thu Jul 9 00:39:56 2009 (r195483) +++ head/sys/dev/xl/if_xl.c Thu Jul 9 01:58:59 2009 (r195484) @@ -2471,12 +2471,12 @@ xl_encap(struct xl_softc *sc, struct xl_ status = XL_TXSTAT_RND_DEFEAT; #ifndef XL905B_TXCSUM_BROKEN - if (m_head->m_pkthdr.csum_flags) { - if (m_head->m_pkthdr.csum_flags & CSUM_IP) + if ((*m_head)->m_pkthdr.csum_flags) { + if ((*m_head)->m_pkthdr.csum_flags & CSUM_IP) status |= XL_TXSTAT_IPCKSUM; - if (m_head->m_pkthdr.csum_flags & CSUM_TCP) + if ((*m_head)->m_pkthdr.csum_flags & CSUM_TCP) status |= XL_TXSTAT_TCPCKSUM; - if (m_head->m_pkthdr.csum_flags & CSUM_UDP) + if ((*m_head)->m_pkthdr.csum_flags & CSUM_UDP) status |= XL_TXSTAT_UDPCKSUM; } #endif From kib at FreeBSD.org Thu Jul 9 09:12:22 2009 From: kib at FreeBSD.org (Konstantin Belousov) Date: Thu Jul 9 09:12:28 2009 Subject: svn commit: r195485 - in stable/7/sys: . contrib/pf kern Message-ID: <200907090912.n699CGx0077581@svn.freebsd.org> Author: kib Date: Thu Jul 9 09:12:16 2009 New Revision: 195485 URL: http://svn.freebsd.org/changeset/base/195485 Log: MFC r194993: In lf_iteratelocks_vnode, increment state->ls_threads around iterating of the vnode advisory lock list. This prevents deallocation of state while inside the loop. Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/kern/kern_lockf.c Modified: stable/7/sys/kern/kern_lockf.c ============================================================================== --- stable/7/sys/kern/kern_lockf.c Thu Jul 9 01:58:59 2009 (r195484) +++ stable/7/sys/kern/kern_lockf.c Thu Jul 9 09:12:16 2009 (r195485) @@ -1937,9 +1937,14 @@ lf_iteratelocks_vnode(struct vnode *vp, * make sure it doesn't go away before we are finished. */ STAILQ_INIT(&locks); + VI_LOCK(vp); ls = vp->v_lockf; - if (!ls) + if (!ls) { + VI_UNLOCK(vp); return (0); + } + ls->ls_threads++; + VI_UNLOCK(vp); sx_xlock(&ls->ls_lock); LIST_FOREACH(lf, &ls->ls_active, lf_link) { @@ -1960,6 +1965,10 @@ lf_iteratelocks_vnode(struct vnode *vp, STAILQ_INSERT_TAIL(&locks, ldesc, link); } sx_xunlock(&ls->ls_lock); + VI_LOCK(vp); + ls->ls_threads--; + wakeup(ls); + VI_UNLOCK(vp); /* * Call the iterator function for each lock in turn. If the From kib at FreeBSD.org Thu Jul 9 09:34:12 2009 From: kib at FreeBSD.org (Konstantin Belousov) Date: Thu Jul 9 09:34:24 2009 Subject: svn commit: r195486 - in head/sys/amd64: amd64 ia32 include linux32 Message-ID: <200907090934.n699YBb4078107@svn.freebsd.org> Author: kib Date: Thu Jul 9 09:34:11 2009 New Revision: 195486 URL: http://svn.freebsd.org/changeset/base/195486 Log: Restore the segment registers and segment base MSRs for amd64 syscall return path only when neither thread was context switched while executing syscall code nor syscall explicitely modified LDT or MSRs. Save segment registers in trap handlers before interrupts are enabled, to not allow context switches to happen before registers are saved. Use separated byte in pcb for indication of fast/full return, since pcb_flags are not synchronized with context switches. The change puts back syscall microbenchmark numbers that were slowed down after commit of the support for LDT on amd64. Reviewed by: jeff Tested (and tested, and tested ...) by: pho Approved by: re (kensmith) Modified: head/sys/amd64/amd64/cpu_switch.S head/sys/amd64/amd64/exception.S head/sys/amd64/amd64/genassym.c head/sys/amd64/amd64/machdep.c head/sys/amd64/amd64/sys_machdep.c head/sys/amd64/amd64/vm_machdep.c head/sys/amd64/ia32/ia32_exception.S head/sys/amd64/ia32/ia32_reg.c head/sys/amd64/ia32/ia32_signal.c head/sys/amd64/include/pcb.h head/sys/amd64/linux32/linux32_sysvec.c Modified: head/sys/amd64/amd64/cpu_switch.S ============================================================================== --- head/sys/amd64/amd64/cpu_switch.S Thu Jul 9 09:12:16 2009 (r195485) +++ head/sys/amd64/amd64/cpu_switch.S Thu Jul 9 09:34:11 2009 (r195486) @@ -97,6 +97,7 @@ END(cpu_throw) ENTRY(cpu_switch) /* Switch to new thread. First, save context. */ movq TD_PCB(%rdi),%r8 + movb $1,PCB_FULL_IRET(%r8) movq (%rsp),%rax /* Hardware registers */ movq %r15,PCB_R15(%r8) Modified: head/sys/amd64/amd64/exception.S ============================================================================== --- head/sys/amd64/amd64/exception.S Thu Jul 9 09:12:16 2009 (r195485) +++ head/sys/amd64/amd64/exception.S Thu Jul 9 09:34:11 2009 (r195486) @@ -162,19 +162,20 @@ IDTVEC(align) .globl alltraps .type alltraps,@function alltraps: + movq %rdi,TF_RDI(%rsp) testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz alltraps_testi /* already running with kernel GS.base */ swapgs + movq PCPU(CURPCB),%rdi + movb $0,PCB_FULL_IRET(%rdi) movw %fs,TF_FS(%rsp) movw %gs,TF_GS(%rsp) movw %es,TF_ES(%rsp) movw %ds,TF_DS(%rsp) alltraps_testi: testl $PSL_I,TF_RFLAGS(%rsp) - jz alltraps_pushregs + jz alltraps_pushregs_no_rdi sti -alltraps_pushregs: - movq %rdi,TF_RDI(%rsp) alltraps_pushregs_no_rdi: movq %rsi,TF_RSI(%rsp) movq %rdx,TF_RDX(%rsp) @@ -233,14 +234,17 @@ calltrap: .globl alltraps_noen .type alltraps_noen,@function alltraps_noen: + movq %rdi,TF_RDI(%rsp) testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 1f /* already running with kernel GS.base */ swapgs + movq PCPU(CURPCB),%rdi + movb $0,PCB_FULL_IRET(%rdi) 1: movw %fs,TF_FS(%rsp) movw %gs,TF_GS(%rsp) movw %es,TF_ES(%rsp) movw %ds,TF_DS(%rsp) - jmp alltraps_pushregs + jmp alltraps_pushregs_no_rdi IDTVEC(dblfault) subq $TF_ERR,%rsp @@ -278,12 +282,13 @@ IDTVEC(dblfault) IDTVEC(page) subq $TF_ERR,%rsp movl $T_PAGEFLT,TF_TRAPNO(%rsp) + movq %rdi,TF_RDI(%rsp) /* free up a GP register */ testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 1f /* already running with kernel GS.base */ swapgs -1: - movq %rdi,TF_RDI(%rsp) /* free up a GP register */ - movq %cr2,%rdi /* preserve %cr2 before .. */ + movq PCPU(CURPCB),%rdi + movb $0,PCB_FULL_IRET(%rdi) +1: movq %cr2,%rdi /* preserve %cr2 before .. */ movq %rdi,TF_ADDR(%rsp) /* enabling interrupts. */ movw %fs,TF_FS(%rsp) movw %gs,TF_GS(%rsp) @@ -311,7 +316,9 @@ IDTVEC(prot) testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 2f /* already running with kernel GS.base */ 1: swapgs -2: movw %fs,TF_FS(%rsp) +2: movq PCPU(CURPCB),%rdi + movb $1,PCB_FULL_IRET(%rdi) /* always full iret from GPF */ + movw %fs,TF_FS(%rsp) movw %gs,TF_GS(%rsp) movw %es,TF_ES(%rsp) movw %ds,TF_DS(%rsp) @@ -341,6 +348,8 @@ IDTVEC(fast_syscall) movw %gs,TF_GS(%rsp) movw %es,TF_ES(%rsp) movw %ds,TF_DS(%rsp) + movq PCPU(CURPCB),%r11 + movb $0,PCB_FULL_IRET(%r11) sti movq $KUDSEL,TF_SS(%rsp) movq $KUCSEL,TF_CS(%rsp) @@ -644,7 +653,8 @@ doreti_exit: */ testb $SEL_RPL_MASK,TF_CS(%rsp) jz ld_regs - + cmpb $0,PCB_FULL_IRET(%r8) + je ld_regs testl $TF_HASSEGS,TF_FLAGS(%rsp) je set_segs Modified: head/sys/amd64/amd64/genassym.c ============================================================================== --- head/sys/amd64/amd64/genassym.c Thu Jul 9 09:12:16 2009 (r195485) +++ head/sys/amd64/amd64/genassym.c Thu Jul 9 09:34:11 2009 (r195486) @@ -141,6 +141,7 @@ ASSYM(PCB_DR3, offsetof(struct pcb, pcb_ ASSYM(PCB_DR6, offsetof(struct pcb, pcb_dr6)); ASSYM(PCB_DR7, offsetof(struct pcb, pcb_dr7)); ASSYM(PCB_TSSP, offsetof(struct pcb, pcb_tssp)); +ASSYM(PCB_FULL_IRET, offsetof(struct pcb, pcb_full_iret)); ASSYM(PCB_DBREGS, PCB_DBREGS); ASSYM(PCB_32BIT, PCB_32BIT); ASSYM(PCB_GS32BIT, PCB_GS32BIT); Modified: head/sys/amd64/amd64/machdep.c ============================================================================== --- head/sys/amd64/amd64/machdep.c Thu Jul 9 09:12:16 2009 (r195485) +++ head/sys/amd64/amd64/machdep.c Thu Jul 9 09:34:11 2009 (r195486) @@ -382,6 +382,7 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, regs->tf_fs = _ufssel; regs->tf_gs = _ugssel; regs->tf_flags = TF_HASSEGS; + td->td_pcb->pcb_full_iret = 1; PROC_LOCK(p); mtx_lock(&psp->ps_mtx); } @@ -483,6 +484,7 @@ sigreturn(td, uap) signotify(td); PROC_UNLOCK(p); td->td_pcb->pcb_flags |= PCB_FULLCTX; + td->td_pcb->pcb_full_iret = 1; return (EJUSTRETURN); } @@ -853,6 +855,7 @@ exec_setregs(td, entry, stack, ps_string pcb->pcb_gsbase = 0; pcb->pcb_flags &= ~(PCB_32BIT | PCB_GS32BIT); pcb->pcb_initial_fpucw = __INITIAL_FPUCW__; + pcb->pcb_full_iret = 1; bzero((char *)regs, sizeof(struct trapframe)); regs->tf_rip = entry; @@ -2031,6 +2034,7 @@ set_mcontext(struct thread *td, const mc td->td_pcb->pcb_gsbase = mcp->mc_gsbase; } td->td_pcb->pcb_flags |= PCB_FULLCTX; + td->td_pcb->pcb_full_iret = 1; return (0); } Modified: head/sys/amd64/amd64/sys_machdep.c ============================================================================== --- head/sys/amd64/amd64/sys_machdep.c Thu Jul 9 09:12:16 2009 (r195485) +++ head/sys/amd64/amd64/sys_machdep.c Thu Jul 9 09:34:11 2009 (r195486) @@ -103,6 +103,7 @@ sysarch_ldt(struct thread *td, struct sy error = amd64_get_ldt(td, largs); break; case I386_SET_LDT: + td->td_pcb->pcb_full_iret = 1; if (largs->descs != NULL) { lp = (struct user_segment_descriptor *) kmem_alloc(kernel_map, largs->num * @@ -132,6 +133,7 @@ update_gdt_gsbase(struct thread *td, uin if (td != curthread) return; + td->td_pcb->pcb_full_iret = 1; critical_enter(); sd = PCPU_GET(gs32p); sd->sd_lobase = base & 0xffffff; @@ -146,6 +148,7 @@ update_gdt_fsbase(struct thread *td, uin if (td != curthread) return; + td->td_pcb->pcb_full_iret = 1; critical_enter(); sd = PCPU_GET(fs32p); sd->sd_lobase = base & 0xffffff; @@ -201,6 +204,7 @@ sysarch(td, uap) if (!error) { pcb->pcb_fsbase = i386base; td->td_frame->tf_fs = _ufssel; + pcb->pcb_full_iret = 1; update_gdt_fsbase(td, i386base); } break; @@ -212,6 +216,7 @@ sysarch(td, uap) error = copyin(uap->parms, &i386base, sizeof(i386base)); if (!error) { pcb->pcb_gsbase = i386base; + pcb->pcb_full_iret = 1; td->td_frame->tf_gs = _ugssel; update_gdt_gsbase(td, i386base); } @@ -225,6 +230,7 @@ sysarch(td, uap) if (!error) { if (a64base < VM_MAXUSER_ADDRESS) { pcb->pcb_fsbase = a64base; + pcb->pcb_full_iret = 1; td->td_frame->tf_fs = _ufssel; } else error = EINVAL; @@ -240,6 +246,7 @@ sysarch(td, uap) if (!error) { if (a64base < VM_MAXUSER_ADDRESS) { pcb->pcb_gsbase = a64base; + pcb->pcb_full_iret = 1; td->td_frame->tf_gs = _ugssel; } else error = EINVAL; @@ -525,6 +532,7 @@ amd64_set_ldt(td, uap, descs) uap->start, uap->num, (void *)uap->descs); #endif + td->td_pcb->pcb_full_iret = 1; p = td->td_proc; if (descs == NULL) { /* Free descriptors */ Modified: head/sys/amd64/amd64/vm_machdep.c ============================================================================== --- head/sys/amd64/amd64/vm_machdep.c Thu Jul 9 09:12:16 2009 (r195485) +++ head/sys/amd64/amd64/vm_machdep.c Thu Jul 9 09:34:11 2009 (r195486) @@ -186,6 +186,9 @@ cpu_fork(td1, p2, td2, flags) /* As an i386, do not copy io permission bitmap. */ pcb2->pcb_tssp = NULL; + /* New segment registers. */ + pcb2->pcb_full_iret = 1; + /* Copy the LDT, if necessary. */ mdp1 = &td1->td_proc->p_md; mdp2 = &p2->p_md; @@ -336,6 +339,7 @@ cpu_set_upcall(struct thread *td, struct */ bcopy(td0->td_pcb, pcb2, sizeof(*pcb2)); pcb2->pcb_flags &= ~PCB_FPUINITDONE; + pcb2->pcb_full_iret = 1; /* * Create a new fresh stack for the new thread. @@ -450,6 +454,7 @@ cpu_set_user_tls(struct thread *td, void } #endif td->td_pcb->pcb_fsbase = (register_t)tls_base; + td->td_pcb->pcb_full_iret = 1; return (0); } Modified: head/sys/amd64/ia32/ia32_exception.S ============================================================================== --- head/sys/amd64/ia32/ia32_exception.S Thu Jul 9 09:12:16 2009 (r195485) +++ head/sys/amd64/ia32/ia32_exception.S Thu Jul 9 09:34:11 2009 (r195486) @@ -42,10 +42,16 @@ SUPERALIGN_TEXT IDTVEC(int0x80_syscall) swapgs - sti pushq $2 /* sizeof "int 0x80" */ subq $TF_ERR,%rsp /* skip over tf_trapno */ movq %rdi,TF_RDI(%rsp) + movq PCPU(CURPCB),%rdi + movb $0,PCB_FULL_IRET(%rdi) + movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) + sti movq %rsi,TF_RSI(%rsp) movq %rdx,TF_RDX(%rsp) movq %rcx,TF_RCX(%rsp) @@ -60,10 +66,6 @@ IDTVEC(int0x80_syscall) movq %r13,TF_R13(%rsp) movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) - movw %fs,TF_FS(%rsp) - movw %gs,TF_GS(%rsp) - movw %es,TF_ES(%rsp) - movw %ds,TF_DS(%rsp) movl $TF_HASSEGS,TF_FLAGS(%rsp) FAKE_MCOUNT(TF_RIP(%rsp)) movq %rsp, %rdi Modified: head/sys/amd64/ia32/ia32_reg.c ============================================================================== --- head/sys/amd64/ia32/ia32_reg.c Thu Jul 9 09:12:16 2009 (r195485) +++ head/sys/amd64/ia32/ia32_reg.c Thu Jul 9 09:34:11 2009 (r195486) @@ -125,6 +125,7 @@ set_regs32(struct thread *td, struct reg tp->tf_fs = regs->r_fs; tp->tf_es = regs->r_es; tp->tf_ds = regs->r_ds; + td->td_pcb->pcb_full_iret = 1; tp->tf_flags = TF_HASSEGS; tp->tf_rdi = regs->r_edi; tp->tf_rsi = regs->r_esi; Modified: head/sys/amd64/ia32/ia32_signal.c ============================================================================== --- head/sys/amd64/ia32/ia32_signal.c Thu Jul 9 09:12:16 2009 (r195485) +++ head/sys/amd64/ia32/ia32_signal.c Thu Jul 9 09:34:11 2009 (r195486) @@ -159,6 +159,7 @@ ia32_get_mcontext(struct thread *td, str ia32_get_fpcontext(td, mcp); mcp->mc_fsbase = td->td_pcb->pcb_fsbase; mcp->mc_gsbase = td->td_pcb->pcb_gsbase; + td->td_pcb->pcb_full_iret = 1; return (0); } @@ -201,6 +202,7 @@ ia32_set_mcontext(struct thread *td, con tp->tf_rsp = mcp->mc_esp; tp->tf_ss = mcp->mc_ss; td->td_pcb->pcb_flags |= PCB_FULLCTX; + td->td_pcb->pcb_full_iret = 1; return (0); } @@ -394,6 +396,7 @@ freebsd4_ia32_sendsig(sig_t catcher, ksi regs->tf_ss = _udatasel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; + td->td_pcb->pcb_full_iret = 1; /* leave user %fs and %gs untouched */ PROC_LOCK(p); mtx_lock(&psp->ps_mtx); @@ -514,6 +517,7 @@ ia32_sendsig(sig_t catcher, ksiginfo_t * regs->tf_ss = _udatasel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; + td->td_pcb->pcb_full_iret = 1; /* XXXKIB leave user %fs and %gs untouched */ PROC_LOCK(p); mtx_lock(&psp->ps_mtx); @@ -611,6 +615,7 @@ freebsd4_freebsd32_sigreturn(td, uap) SIG_CANTMASK(td->td_sigmask); signotify(td); PROC_UNLOCK(p); + td->td_pcb->pcb_full_iret = 1; return (EJUSTRETURN); } #endif /* COMPAT_FREEBSD4 */ @@ -702,6 +707,7 @@ freebsd32_sigreturn(td, uap) SIG_CANTMASK(td->td_sigmask); signotify(td); PROC_UNLOCK(p); + td->td_pcb->pcb_full_iret = 1; return (EJUSTRETURN); } @@ -747,5 +753,6 @@ ia32_setregs(td, entry, stack, ps_string /* Return via doreti so that we can change to a different %cs */ pcb->pcb_flags |= PCB_FULLCTX | PCB_32BIT; pcb->pcb_flags &= ~PCB_GS32BIT; + td->td_pcb->pcb_full_iret = 1; td->td_retval[1] = 0; } Modified: head/sys/amd64/include/pcb.h ============================================================================== --- head/sys/amd64/include/pcb.h Thu Jul 9 09:12:16 2009 (r195485) +++ head/sys/amd64/include/pcb.h Thu Jul 9 09:34:11 2009 (r195486) @@ -72,12 +72,13 @@ struct pcb { struct savefpu pcb_save; uint16_t pcb_initial_fpucw; - caddr_t pcb_onfault; /* copyin/out fault recovery */ + caddr_t pcb_onfault; /* copyin/out fault recovery */ /* 32-bit segment descriptor */ struct user_segment_descriptor pcb_gs32sd; /* local tss, with i/o bitmap; NULL for common */ struct amd64tss *pcb_tssp; + char pcb_full_iret; }; struct xpcb { Modified: head/sys/amd64/linux32/linux32_sysvec.c ============================================================================== --- head/sys/amd64/linux32/linux32_sysvec.c Thu Jul 9 09:12:16 2009 (r195485) +++ head/sys/amd64/linux32/linux32_sysvec.c Thu Jul 9 09:34:11 2009 (r195486) @@ -423,6 +423,7 @@ linux_rt_sendsig(sig_t catcher, ksiginfo regs->tf_fs = _ufssel; regs->tf_gs = _ugssel; regs->tf_flags = TF_HASSEGS; + td->td_pcb->pcb_full_iret = 1; PROC_LOCK(p); mtx_lock(&psp->ps_mtx); } @@ -545,6 +546,7 @@ linux_sendsig(sig_t catcher, ksiginfo_t regs->tf_fs = _ufssel; regs->tf_gs = _ugssel; regs->tf_flags = TF_HASSEGS; + td->td_pcb->pcb_full_iret = 1; PROC_LOCK(p); mtx_lock(&psp->ps_mtx); } @@ -645,6 +647,7 @@ linux_sigreturn(struct thread *td, struc regs->tf_rflags = eflags; regs->tf_rsp = frame.sf_sc.sc_esp_at_signal; regs->tf_ss = frame.sf_sc.sc_ss; + td->td_pcb->pcb_full_iret = 1; return (EJUSTRETURN); } @@ -746,6 +749,7 @@ linux_rt_sigreturn(struct thread *td, st regs->tf_rflags = eflags; regs->tf_rsp = context->sc_esp_at_signal; regs->tf_ss = context->sc_ss; + td->td_pcb->pcb_full_iret = 1; /* * call sigaltstack & ignore results.. @@ -864,6 +868,7 @@ exec_linux_setregs(td, entry, stack, ps_ regs->tf_flags = TF_HASSEGS; regs->tf_cs = _ucode32sel; regs->tf_rbx = ps_strings; + td->td_pcb->pcb_full_iret = 1; load_cr0(rcr0() | CR0_MP | CR0_TS); fpstate_drop(td); From avg at FreeBSD.org Thu Jul 9 13:48:08 2009 From: avg at FreeBSD.org (Andriy Gapon) Date: Thu Jul 9 13:48:24 2009 Subject: svn commit: r195492 - in stable/7/sys: . cddl/dev/dtrace/amd64 contrib/pf Message-ID: <200907091348.n69Dm7ON086801@svn.freebsd.org> Author: avg Date: Thu Jul 9 13:48:06 2009 New Revision: 195492 URL: http://svn.freebsd.org/changeset/base/195492 Log: MFC 194850: dtrace/amd64: fix virtual address checks Modified: stable/7/sys/ (props changed) stable/7/sys/cddl/dev/dtrace/amd64/dtrace_isa.c stable/7/sys/cddl/dev/dtrace/amd64/dtrace_subr.c stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/cddl/dev/dtrace/amd64/dtrace_isa.c ============================================================================== --- stable/7/sys/cddl/dev/dtrace/amd64/dtrace_isa.c Thu Jul 9 13:42:18 2009 (r195491) +++ stable/7/sys/cddl/dev/dtrace/amd64/dtrace_isa.c Thu Jul 9 13:48:06 2009 (r195492) @@ -42,8 +42,6 @@ #include #include -extern uintptr_t kernbase; -uintptr_t kernelbase = (uintptr_t) &kernbase; uint8_t dtrace_fuword8_nocheck(void *); uint16_t dtrace_fuword16_nocheck(void *); @@ -524,9 +522,9 @@ dtrace_getreg(struct regs *rp, uint_t re static int dtrace_copycheck(uintptr_t uaddr, uintptr_t kaddr, size_t size) { - ASSERT(kaddr >= kernelbase && kaddr + size >= kaddr); + ASSERT(INKERNEL(kaddr) && kaddr + size >= kaddr); - if (uaddr + size >= kernelbase || uaddr + size < uaddr) { + if (uaddr + size > VM_MAXUSER_ADDRESS || uaddr + size < uaddr) { DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR); cpu_core[curcpu].cpuc_dtrace_illval = uaddr; return (0); @@ -570,7 +568,7 @@ dtrace_copyoutstr(uintptr_t kaddr, uintp uint8_t dtrace_fuword8(void *uaddr) { - if ((uintptr_t)uaddr >= kernelbase) { + if ((uintptr_t)uaddr > VM_MAXUSER_ADDRESS) { DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR); cpu_core[curcpu].cpuc_dtrace_illval = (uintptr_t)uaddr; return (0); @@ -581,7 +579,7 @@ dtrace_fuword8(void *uaddr) uint16_t dtrace_fuword16(void *uaddr) { - if ((uintptr_t)uaddr >= kernelbase) { + if ((uintptr_t)uaddr > VM_MAXUSER_ADDRESS) { DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR); cpu_core[curcpu].cpuc_dtrace_illval = (uintptr_t)uaddr; return (0); @@ -592,7 +590,7 @@ dtrace_fuword16(void *uaddr) uint32_t dtrace_fuword32(void *uaddr) { - if ((uintptr_t)uaddr >= kernelbase) { + if ((uintptr_t)uaddr > VM_MAXUSER_ADDRESS) { DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR); cpu_core[curcpu].cpuc_dtrace_illval = (uintptr_t)uaddr; return (0); @@ -603,7 +601,7 @@ dtrace_fuword32(void *uaddr) uint64_t dtrace_fuword64(void *uaddr) { - if ((uintptr_t)uaddr >= kernelbase) { + if ((uintptr_t)uaddr > VM_MAXUSER_ADDRESS) { DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR); cpu_core[curcpu].cpuc_dtrace_illval = (uintptr_t)uaddr; return (0); Modified: stable/7/sys/cddl/dev/dtrace/amd64/dtrace_subr.c ============================================================================== --- stable/7/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Thu Jul 9 13:42:18 2009 (r195491) +++ stable/7/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Thu Jul 9 13:48:06 2009 (r195492) @@ -40,7 +40,6 @@ #include #include -extern uintptr_t kernelbase; extern uintptr_t dtrace_in_probe_addr; extern int dtrace_in_probe; From avg at FreeBSD.org Thu Jul 9 14:53:06 2009 From: avg at FreeBSD.org (Andriy Gapon) Date: Thu Jul 9 14:53:12 2009 Subject: svn commit: r195493 - stable/7/sys/amd64/amd64 Message-ID: <200907091453.n69Er5iF088218@svn.freebsd.org> Author: avg Date: Thu Jul 9 14:53:05 2009 New Revision: 195493 URL: http://svn.freebsd.org/changeset/base/195493 Log: dtrace/amd64: remove duplicate definition of dtrace_gethrtime function Primary (and enhanced) definition of this function is in sys/cddl/dev/dtrace/amd64/dtrace_subr.c. This is a direct commit to the branch, because this instance of the function was added to the branch in rev 182231, which claimed to be dtrace MFH, but in fact the code in question never existed in head. And does not exist now. Another reason for this de-duplication is that there is only one instance of this function for i386 arch. Briefly discussed with: jhb Silence from: jb Modified: stable/7/sys/amd64/amd64/tsc.c Modified: stable/7/sys/amd64/amd64/tsc.c ============================================================================== --- stable/7/sys/amd64/amd64/tsc.c Thu Jul 9 13:48:06 2009 (r195492) +++ stable/7/sys/amd64/amd64/tsc.c Thu Jul 9 14:53:05 2009 (r195493) @@ -234,18 +234,3 @@ tsc_get_timecount(struct timecounter *tc { return (rdtsc()); } - -#ifdef KDTRACE_HOOKS -/* - * DTrace needs a high resolution time function which can - * be called from a probe context and guaranteed not to have - * instrumented with probes itself. - * - * Returns nanoseconds since boot. - */ -uint64_t -dtrace_gethrtime() -{ - return (rdtsc() * (uint64_t) 1000000000 / tsc_freq); -} -#endif From n_hibma at FreeBSD.org Thu Jul 9 15:27:08 2009 From: n_hibma at FreeBSD.org (Nick Hibma) Date: Thu Jul 9 15:27:19 2009 Subject: svn commit: r195498 - stable/7/sys/dev/usb Message-ID: <200907091527.n69FR7Kg089168@svn.freebsd.org> Author: n_hibma Date: Thu Jul 9 15:27:07 2009 New Revision: 195498 URL: http://svn.freebsd.org/changeset/base/195498 Log: Errors we would like to see during debugging. Modified: stable/7/sys/dev/usb/ohci.c Modified: stable/7/sys/dev/usb/ohci.c ============================================================================== --- stable/7/sys/dev/usb/ohci.c Thu Jul 9 15:05:50 2009 (r195497) +++ stable/7/sys/dev/usb/ohci.c Thu Jul 9 15:27:07 2009 (r195498) @@ -1381,7 +1381,7 @@ ohci_softintr(void *v) */ opipe = (struct ohci_pipe *)xfer->pipe; - DPRINTFN(15,("ohci_process_done: error cc=%d (%s)\n", + DPRINTF(("ohci_process_done: error cc=%d (%s)\n", OHCI_TD_GET_CC(le32toh(std->td.td_flags)), ohci_cc_strs[OHCI_TD_GET_CC(le32toh(std->td.td_flags))])); callout_stop(&xfer->timeout_handle); From n_hibma at FreeBSD.org Thu Jul 9 15:29:27 2009 From: n_hibma at FreeBSD.org (Nick Hibma) Date: Thu Jul 9 15:29:45 2009 Subject: svn commit: r195499 - stable/7/sys/dev/usb Message-ID: <200907091529.n69FTQ71089251@svn.freebsd.org> Author: n_hibma Date: Thu Jul 9 15:29:26 2009 New Revision: 195499 URL: http://svn.freebsd.org/changeset/base/195499 Log: Improve the debugging output: Make it switchable through a sysctl for ucom and u3g. Try to reset the device if it produces ucomwritecb and ucomreadcb errors. Modified: stable/7/sys/dev/usb/u3g.c stable/7/sys/dev/usb/ucom.c Modified: stable/7/sys/dev/usb/u3g.c ============================================================================== --- stable/7/sys/dev/usb/u3g.c Thu Jul 9 15:27:07 2009 (r195498) +++ stable/7/sys/dev/usb/u3g.c Thu Jul 9 15:29:26 2009 (r195499) @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -51,16 +52,13 @@ #endif #include "usbdevs.h" -//#define U3G_DEBUG -#ifdef U3G_DEBUG -#define DPRINTF(x...) device_printf(sc->sc_dev, ##x) -#define bootverbose (1) -#else -#define DPRINTF(x...) /* nop */ -#endif +static int u3gdebug = 1; +SYSCTL_NODE(_hw_usb, OID_AUTO, u3g, CTLFLAG_RW, 0, "USB u3g"); +SYSCTL_INT(_hw_usb_u3g, OID_AUTO, debug, CTLFLAG_RW, + &u3gdebug, 0, "u3g debug level"); +#define DPRINTF(x...) if (u3gdebug) device_printf(sc->sc_dev, ##x) -#define U3G_MAXPORTS 4 -#define U3G_CONFIG_INDEX 0 +#define U3G_MAXPORTS 6 struct u3g_softc { struct ucom_softc sc_ucom[U3G_MAXPORTS]; @@ -258,6 +256,9 @@ u3g_attach(device_t self) sprintf(devnamefmt,"U%d.%%d", device_get_unit(self)); int portno = 0; for (i = 0; i < uaa->nifaces && portno < U3G_MAXPORTS; i++) { + DPRINTF("Interface %d of %d, %sin use\n", + i, uaa->nifaces, + (uaa->ifaces[i]? "not ":"")); if (uaa->ifaces[i] == NULL) continue; @@ -268,7 +269,7 @@ u3g_attach(device_t self) * Claim the first umass device (cdX) as it contains * only Windows drivers anyway (CD-ROM), hiding it. */ - if (!bootverbose) + if (!(bootverbose || u3gdebug)) if (uaa->vendor == USB_VENDOR_HUAWEI) if (id->bInterfaceNumber == 2) uaa->ifaces[i] = NULL; @@ -279,6 +280,9 @@ u3g_attach(device_t self) int claim_iface = 0; for (n = 0; n < id->bNumEndpoints && portno < U3G_MAXPORTS; n++) { ed = usbd_interface2endpoint_descriptor(uaa->ifaces[i], n); + DPRINTF(" Endpoint %d of %d%s\n", + n, id->bNumEndpoints, + (ed? "":"no descriptor")); if (ed == NULL) continue; if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN @@ -585,7 +589,7 @@ u3gstub_BBB_cmd(struct u3gstub_softc *sc usbd_errstr(err)); } } else if (err != USBD_NORMAL_COMPLETION) { - if (bootverbose) + if (u3gdebug) device_printf(sc->sc_dev, "Failed to retrieve CSW to " "change to modem mode: %s\n", @@ -609,13 +613,10 @@ u3gstub_sierra_init(struct u3gstub_softc USETW(req.wLength, 0); err = usbd_do_request(sc->sc_udev, &req, 0); - if (bootverbose) { - if (err) { - device_printf(sc->sc_dev, - "Failed to send Sierra request: %s\n", - usbd_errstr(err)); - } - } + if (err && u3gdebug) + device_printf(sc->sc_dev, + "Failed to send Sierra request: %s\n", + usbd_errstr(err)); return 1; } @@ -633,13 +634,10 @@ u3gstub_huawei_init(struct u3gstub_softc USETW(req.wLength, 0); err = usbd_do_request(sc->sc_udev, &req, 0); - if (bootverbose) { - if (err) { - device_printf(sc->sc_dev, - "Failed to send Huawei request: %s\n", - usbd_errstr(err)); - } - } + if (err && u3gdebug) + device_printf(sc->sc_dev, + "Failed to send Huawei request: %s\n", + usbd_errstr(err)); return 1; } @@ -659,19 +657,19 @@ u3gstub_do_init(void *priv) u3g_dev_type = u3g_lookup(sc->sc_vendor, sc->sc_product); switch (u3g_dev_type->init) { case U3GINIT_HUAWEI: - if (bootverbose) + if (bootverbose || u3gdebug) device_printf(sc->sc_dev, "changing Huawei modem to modem mode\n"); u3gstub_huawei_init(sc); break; case U3GINIT_SIERRA: - if (bootverbose) + if (bootverbose || u3gdebug) device_printf(sc->sc_dev, "changing Sierra modem to modem mode\n"); u3gstub_sierra_init(sc); break; case U3GINIT_EJECT: - if (bootverbose) + if (bootverbose || u3gdebug) device_printf(sc->sc_dev, "sending CD eject command to change to modem mode\n"); while (!sc->sc_dying @@ -680,20 +678,20 @@ u3gstub_do_init(void *priv) ; /* nop */ break; case U3GINIT_ZTESTOR: - if (bootverbose) + if (bootverbose || u3gdebug) device_printf(sc->sc_dev, "changing ZTE STOR modem to modem mode\n"); u3gstub_BBB_cmd(sc, ztestor_cmd); break; case U3GINIT_CMOTECH: - if (bootverbose) + if (bootverbose || u3gdebug) device_printf(sc->sc_dev, "changing CMOTECH modem to modem mode\n"); u3gstub_BBB_cmd(sc, cmotech_cmd); break; case U3GINIT_WAIT: default: - if (bootverbose) + if (bootverbose || u3gdebug) device_printf(sc->sc_dev, "waiting for modem to change to modem mode\n"); /* nop */ @@ -726,7 +724,7 @@ u3gstub_match(device_t self) id = usbd_get_interface_descriptor(uaa->iface); if (id && id->bInterfaceNumber == 0 && id->bInterfaceClass == UICLASS_MASS) { - if (!bootverbose) + if (u3gdebug == 0) device_quiet(self); return UMATCH_VENDOR_PRODUCT; @@ -745,7 +743,7 @@ u3gstub_attach(device_t self) usb_endpoint_descriptor_t *ed; int i, err; - if (!bootverbose) + if (u3gdebug == 0) device_quiet(self); for (i = 0; i < uaa->nifaces; i++) Modified: stable/7/sys/dev/usb/ucom.c ============================================================================== --- stable/7/sys/dev/usb/ucom.c Thu Jul 9 15:27:07 2009 (r195498) +++ stable/7/sys/dev/usb/ucom.c Thu Jul 9 15:29:26 2009 (r195499) @@ -95,7 +95,6 @@ __FBSDID("$FreeBSD$"); #include -#ifdef USB_DEBUG static int ucomdebug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ucom, CTLFLAG_RW, 0, "USB ucom"); SYSCTL_INT(_hw_usb_ucom, OID_AUTO, debug, CTLFLAG_RW, @@ -109,10 +108,6 @@ SYSCTL_INT(_hw_usb_ucom, OID_AUTO, debug if (ucomdebug > (n)) \ printf x; \ } while (0) -#else -#define DPRINTF(x) -#define DPRINTFN(n, x) -#endif static int ucom_modevent(module_t, int, void *); static void ucom_cleanup(struct ucom_softc *); @@ -690,11 +685,19 @@ ucomwritecb(usbd_xfer_handle xfer, usbd_ goto error; if (status != USBD_NORMAL_COMPLETION) { - printf("%s: ucomwritecb: %s\n", - device_get_nameunit(sc->sc_dev), usbd_errstr(status)); - if (status == USBD_STALLED) + if (status == USBD_STALLED) { + printf("%s: ucomwritecb: STALLED; clearing.\n", + device_get_nameunit(sc->sc_dev)); usbd_clear_endpoint_stall_async(sc->sc_bulkout_pipe); - /* XXX we should restart after some delay. */ + } else if (status == USBD_IOERROR) { + printf("%s: ucomwritecb: IOERROR; resetting device.\n", + device_get_nameunit(sc->sc_dev)); + usbd_reset_device(sc->sc_udev); + } else if (status != USBD_CANCELLED) { + printf("%s: ucomwritecb: %s\n", + device_get_nameunit(sc->sc_dev), + usbd_errstr(status)); + } goto error; } @@ -774,7 +777,21 @@ ucomreadcb(usbd_xfer_handle xfer, usbd_p sc->sc_state |= UCS_RXSTOP; if (status == USBD_STALLED) usbd_clear_endpoint_stall_async(sc->sc_bulkin_pipe); - /* XXX we should restart after some delay. */ + else if (status == USBD_IOERROR) + usbd_reset_device(sc->sc_udev); + if (status == USBD_STALLED) { + printf("%s: ucomreadcb: STALLED; clearing.\n", + device_get_nameunit(sc->sc_dev)); + usbd_clear_endpoint_stall_async(sc->sc_bulkin_pipe); + } else if (status == USBD_IOERROR) { + printf("%s: ucomreadcb: IOERROR; resetting device.\n", + device_get_nameunit(sc->sc_dev)); + usbd_reset_device(sc->sc_udev); + } else if (status != USBD_CANCELLED) { + printf("%s: ucomreadcb: %s\n", + device_get_nameunit(sc->sc_dev), + usbd_errstr(status)); + } return; } sc->sc_state |= UCS_RXSTOP; From rnoland at FreeBSD.org Thu Jul 9 16:39:29 2009 From: rnoland at FreeBSD.org (Robert Noland) Date: Thu Jul 9 16:39:35 2009 Subject: svn commit: r195501 - head/sys/dev/drm Message-ID: <200907091639.n69GdSfj090847@svn.freebsd.org> Author: rnoland Date: Thu Jul 9 16:39:28 2009 New Revision: 195501 URL: http://svn.freebsd.org/changeset/base/195501 Log: Add support for Radeon HD 4770 (RV740) chips. Approved by: re@ (kib) MFC after: 3 days Modified: head/sys/dev/drm/drm_pciids.h head/sys/dev/drm/r600_cp.c head/sys/dev/drm/radeon_drv.h Modified: head/sys/dev/drm/drm_pciids.h ============================================================================== --- head/sys/dev/drm/drm_pciids.h Thu Jul 9 15:41:17 2009 (r195500) +++ head/sys/dev/drm/drm_pciids.h Thu Jul 9 16:39:28 2009 (r195501) @@ -257,6 +257,11 @@ {0x1002, 0x940A, CHIP_R600|RADEON_NEW_MEMMAP, "ATI FireGL V8650"}, \ {0x1002, 0x940B, CHIP_R600|RADEON_NEW_MEMMAP, "ATI FireGL V8600"}, \ {0x1002, 0x940F, CHIP_R600|RADEON_NEW_MEMMAP, "ATI FireGL V7600"}, \ + {0x1002, 0x94A0, CHIP_RV740|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon HD 4830"}, \ + {0x1002, 0x94A1, CHIP_RV740|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon HD 4850"}, \ + {0x1002, 0x94B1, CHIP_RV740|RADEON_NEW_MEMMAP, "ATI RV740"}, \ + {0x1002, 0x94B3, CHIP_RV740|RADEON_NEW_MEMMAP, "ATI Radeon HD 4770"}, \ + {0x1002, 0x94B5, CHIP_RV740|RADEON_NEW_MEMMAP, "ATI Radeon HD 4770"}, \ {0x1002, 0x94C0, CHIP_RV610|RADEON_NEW_MEMMAP, "RV610"}, \ {0x1002, 0x94C1, CHIP_RV610|RADEON_NEW_MEMMAP, "Radeon HD 2400 XT"}, \ {0x1002, 0x94C3, CHIP_RV610|RADEON_NEW_MEMMAP, "Radeon HD 2400 Pro"}, \ Modified: head/sys/dev/drm/r600_cp.c ============================================================================== --- head/sys/dev/drm/r600_cp.c Thu Jul 9 15:41:17 2009 (r195500) +++ head/sys/dev/drm/r600_cp.c Thu Jul 9 16:39:28 2009 (r195501) @@ -421,7 +421,8 @@ static void r700_cp_load_microcode(drm_r cp = RV770_cp_microcode; break; case CHIP_RV730: - DRM_INFO("Loading RV730 Microcode\n"); + case CHIP_RV740: + DRM_INFO("Loading RV730/RV740 Microcode\n"); pfp = RV730_pfp_microcode; cp = RV730_cp_microcode; break; @@ -1244,6 +1245,31 @@ static void r700_gfx_init(struct drm_dev dev_priv->r700_sc_hiz_tile_fifo_size = 0x30; dev_priv->r700_sc_earlyz_tile_fifo_fize = 0x130; break; + case CHIP_RV740: + dev_priv->r600_max_pipes = 4; + dev_priv->r600_max_tile_pipes = 4; + dev_priv->r600_max_simds = 8; + dev_priv->r600_max_backends = 4; + dev_priv->r600_max_gprs = 256; + dev_priv->r600_max_threads = 248; + dev_priv->r600_max_stack_entries = 512; + dev_priv->r600_max_hw_contexts = 8; + dev_priv->r600_max_gs_threads = 16 * 2; + dev_priv->r600_sx_max_export_size = 256; + dev_priv->r600_sx_max_export_pos_size = 32; + dev_priv->r600_sx_max_export_smx_size = 224; + dev_priv->r600_sq_num_cf_insts = 2; + + dev_priv->r700_sx_num_of_sets = 7; + dev_priv->r700_sc_prim_fifo_size = 0x100; + dev_priv->r700_sc_hiz_tile_fifo_size = 0x30; + dev_priv->r700_sc_earlyz_tile_fifo_fize = 0x130; + + if (dev_priv->r600_sx_max_export_pos_size > 16) { + dev_priv->r600_sx_max_export_pos_size -= 16; + dev_priv->r600_sx_max_export_smx_size += 16; + } + break; case CHIP_RV730: dev_priv->r600_max_pipes = 2; dev_priv->r600_max_tile_pipes = 4; @@ -1263,6 +1289,11 @@ static void r700_gfx_init(struct drm_dev dev_priv->r700_sc_prim_fifo_size = 0xf9; dev_priv->r700_sc_hiz_tile_fifo_size = 0x30; dev_priv->r700_sc_earlyz_tile_fifo_fize = 0x130; + + if (dev_priv->r600_sx_max_export_pos_size > 16) { + dev_priv->r600_sx_max_export_pos_size -= 16; + dev_priv->r600_sx_max_export_smx_size += 16; + } break; case CHIP_RV710: dev_priv->r600_max_pipes = 2; @@ -1430,6 +1461,7 @@ static void r700_gfx_init(struct drm_dev case CHIP_RV770: sq_ms_fifo_sizes |= R600_FETCH_FIFO_HIWATER(0x1); break; + case CHIP_RV740: case CHIP_RV730: case CHIP_RV710: default: @@ -1507,6 +1539,7 @@ static void r700_gfx_init(struct drm_dev switch (dev_priv->flags & RADEON_FAMILY_MASK) { case CHIP_RV770: + case CHIP_RV740: case CHIP_RV730: gs_prim_buffer_depth = 384; break; Modified: head/sys/dev/drm/radeon_drv.h ============================================================================== --- head/sys/dev/drm/radeon_drv.h Thu Jul 9 15:41:17 2009 (r195500) +++ head/sys/dev/drm/radeon_drv.h Thu Jul 9 16:39:28 2009 (r195501) @@ -146,6 +146,7 @@ enum radeon_family { CHIP_RV670, CHIP_RS780, CHIP_RV770, + CHIP_RV740, CHIP_RV730, CHIP_RV710, CHIP_LAST, From trasz at FreeBSD.org Thu Jul 9 16:40:02 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Thu Jul 9 16:40:25 2009 Subject: svn commit: r195502 - in head: bin/ps share/man/man5 usr.bin/fstat usr.bin/netstat usr.bin/sockstat Message-ID: <200907091640.n69Ge09M090898@svn.freebsd.org> Author: trasz Date: Thu Jul 9 16:40:00 2009 New Revision: 195502 URL: http://svn.freebsd.org/changeset/base/195502 Log: Add manual page links to advertise procstat(1) a little better. Approved by: re (kib) Modified: head/bin/ps/ps.1 head/share/man/man5/procfs.5 head/usr.bin/fstat/fstat.1 head/usr.bin/netstat/netstat.1 head/usr.bin/sockstat/sockstat.1 Modified: head/bin/ps/ps.1 ============================================================================== --- head/bin/ps/ps.1 Thu Jul 9 16:39:28 2009 (r195501) +++ head/bin/ps/ps.1 Thu Jul 9 16:40:00 2009 (r195502) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd May 16, 2009 +.Dd July 9, 2009 .Dt PS 1 .Os .Sh NAME @@ -637,6 +637,7 @@ the mount point of .Xr kill 1 , .Xr pgrep 1 , .Xr pkill 1 , +.Xr procstat 1 , .Xr w 1 , .Xr kvm 3 , .Xr strftime 3 , Modified: head/share/man/man5/procfs.5 ============================================================================== --- head/share/man/man5/procfs.5 Thu Jul 9 16:39:28 2009 (r195501) +++ head/share/man/man5/procfs.5 Thu Jul 9 16:40:00 2009 (r195502) @@ -2,7 +2,7 @@ .\" Written by Garrett Wollman .\" This file is in the public domain. .\" -.Dd September 3, 2004 +.Dd July 9, 2009 .Dt PROCFS 5 .Os .Sh NAME @@ -252,6 +252,7 @@ file system on .Pp .Dl "mount -t procfs proc /proc" .Sh SEE ALSO +.Xr procstat 1 , .Xr mount 2 , .Xr sigaction 2 , .Xr unmount 2 , Modified: head/usr.bin/fstat/fstat.1 ============================================================================== --- head/usr.bin/fstat/fstat.1 Thu Jul 9 16:39:28 2009 (r195501) +++ head/usr.bin/fstat/fstat.1 Thu Jul 9 16:40:00 2009 (r195502) @@ -32,7 +32,7 @@ .\" @(#)fstat.1 8.3 (Berkeley) 2/25/94 .\" $FreeBSD$ .\" -.Dd March 27, 2002 +.Dd July 9, 2009 .Dt FSTAT 1 .Os .Sh NAME @@ -216,6 +216,7 @@ an arrow (``<-'' or ``->''), and a full .Sh SEE ALSO .Xr netstat 1 , .Xr nfsstat 1 , +.Xr procstat 1 , .Xr ps 1 , .Xr sockstat 1 , .Xr systat 1 , Modified: head/usr.bin/netstat/netstat.1 ============================================================================== --- head/usr.bin/netstat/netstat.1 Thu Jul 9 16:39:28 2009 (r195501) +++ head/usr.bin/netstat/netstat.1 Thu Jul 9 16:40:00 2009 (r195502) @@ -32,7 +32,7 @@ .\" @(#)netstat.1 8.8 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd February 15, 2009 +.Dd July 9, 2009 .Dt NETSTAT 1 .Os .Sh NAME @@ -490,6 +490,7 @@ queue. .Sh SEE ALSO .Xr fstat 1 , .Xr nfsstat 1 , +.Xr procstat 1 , .Xr ps 1 , .Xr sockstat 1 , .Xr bpf 4 , Modified: head/usr.bin/sockstat/sockstat.1 ============================================================================== --- head/usr.bin/sockstat/sockstat.1 Thu Jul 9 16:39:28 2009 (r195501) +++ head/usr.bin/sockstat/sockstat.1 Thu Jul 9 16:40:00 2009 (r195502) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 18, 2008 +.Dd July 9, 2009 .Dt SOCKSTAT 1 .Os .Sh NAME @@ -153,6 +153,7 @@ to examine them instead. .Sh SEE ALSO .Xr fstat 1 , .Xr netstat 1 , +.Xr procstat 1 , .Xr inet 4 , .Xr inet6 4 , .Xr protocols 5 From joel at FreeBSD.org Thu Jul 9 16:59:30 2009 From: joel at FreeBSD.org (Joel Dahl) Date: Thu Jul 9 16:59:37 2009 Subject: svn commit: r195503 - head/share/man/man4 Message-ID: <200907091659.n69GxTlO091362@svn.freebsd.org> Author: joel (doc committer) Date: Thu Jul 9 16:59:29 2009 New Revision: 195503 URL: http://svn.freebsd.org/changeset/base/195503 Log: Adjust the description of hw.snd.feeder_rate_polyphase_max and hw.snd.compat_linux_mmap a bit. Submitted by: ariff Approved by: re (blanket) Modified: head/share/man/man4/pcm.4 Modified: head/share/man/man4/pcm.4 ============================================================================== --- head/share/man/man4/pcm.4 Thu Jul 9 16:40:00 2009 (r195502) +++ head/share/man/man4/pcm.4 Thu Jul 9 16:59:29 2009 (r195503) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 7, 2009 +.Dd July 9, 2009 .Dt SOUND 4 .Os .Sh NAME @@ -210,10 +210,22 @@ are global settings and are device specific. .Bl -tag -width indent .It Va hw.snd.compat_linux_mmap -Enable to allow PROT_EXEC page mappings. -All Linux applications using sound and +Linux .Xr mmap 2 -require this. +compability. +The following values are supported (default is 0): +.Bl -tag -width 2n +.It -1 +Force disabling/denying PROT_EXEC +.Xr mmap 2 +requests. +.It 0 +Auto detect proc/ABI type, allow +.Xr mmap 2 +for Linux applications, and deny for everything else. +.It 1 +Always allow PROT_EXEC page mappings. +.El .It Va hw.snd.default_auto Enable to automatically assign default sound unit to the most recent attached device. @@ -240,6 +252,8 @@ Minimum allowable sample rate. .It Va hw.snd.feeder_rate_polyphase_max Adjust to set the maximum number of allowed polyphase entries during the process of building resampling filters. +Disabling polyphase resampling has the benefit of reducing memory usage, at +the expense of slower and lower quality conversion. Only applicable when the SINC interpolator is used. Default value is 183040. Set to 0 to disable polyphase resampling. From jilles at stack.nl Thu Jul 9 17:30:49 2009 From: jilles at stack.nl (Jilles Tjoelker) Date: Thu Jul 9 17:31:00 2009 Subject: svn commit: r195458 - in head: include lib/libc/sys sys/bsm sys/compat/freebsd32 sys/compat/svr4 sys/i386/ibcs2 sys/kern sys/sys In-Reply-To: <200907081523.n68FNIpi055036@svn.freebsd.org> References: <200907081523.n68FNIpi055036@svn.freebsd.org> Message-ID: <20090709173046.GA48155@stack.nl> On Wed, Jul 08, 2009 at 03:23:18PM +0000, Edward Tomasz Napierala wrote: > Author: trasz > Date: Wed Jul 8 15:23:18 2009 > New Revision: 195458 > URL: http://svn.freebsd.org/changeset/base/195458 > Log: > There is an optimization in chmod(1), that makes it not to call chmod(2) > if the new file mode is the same as it was before; however, this > optimization must be disabled for filesystems that support NFSv4 ACLs. > Chmod uses pathconf(2) to determine whether this is the case - however, > pathconf(2) always follows symbolic links, while the 'chmod -h' doesn't. > This change adds lpathconf(3) to make it possible to solve that problem > in a clean way. I think pathconfat() would be nicer than adding a function that will not appear in standards and lacks a useful feature. Compare futimens() and utimensat() in the 2008 POSIX spec, and notice that there is no such thing as lutimes() in POSIX (it can be done with utimensat()). Another consideration is that lpathconf/pathconfat may be considered "new work". The problem I brought up can also be fixed by never using the optimization for symlinks. -- Jilles Tjoelker From brian at Awfulhak.org Thu Jul 9 18:00:17 2009 From: brian at Awfulhak.org (Brian Somers) Date: Thu Jul 9 18:00:23 2009 Subject: svn commit: r195485 - in stable/7/sys: . contrib/pf kern In-Reply-To: <200907090912.n699CGx0077581@svn.freebsd.org> References: <200907090912.n699CGx0077581@svn.freebsd.org> Message-ID: <20090709103126.02bf7206@Awfulhak.org> On Thu, 9 Jul 2009 09:12:16 +0000 (UTC), Konstantin Belousov wrote: > Author: kib > Date: Thu Jul 9 09:12:16 2009 > New Revision: 195485 > URL: http://svn.freebsd.org/changeset/base/195485 > > Log: > MFC r194993: > In lf_iteratelocks_vnode, increment state->ls_threads around iterating > of the vnode advisory lock list. This prevents deallocation of state > while inside the loop. > > Modified: > stable/7/sys/ (props changed) > stable/7/sys/contrib/pf/ (props changed) > stable/7/sys/kern/kern_lockf.c Just picking on this commit.... Are the properties on stable/7/sys/contrib/pf intentional or should they merged into stable/7/sys (a no-op hopefully) and removed? -- Brian Somers Don't _EVER_ lose your sense of humour ! From kib at FreeBSD.org Thu Jul 9 18:49:27 2009 From: kib at FreeBSD.org (Konstantin Belousov) Date: Thu Jul 9 18:49:38 2009 Subject: svn commit: r195508 - head/sys/sys Message-ID: <200907091849.n69InQDt093896@svn.freebsd.org> Author: kib Date: Thu Jul 9 18:49:26 2009 New Revision: 195508 URL: http://svn.freebsd.org/changeset/base/195508 Log: Extend the cn_flags field of the struct componentname to 64 bits to have more space for the flags, that is too close to be exhausted. While changing the KBI for name(9), use unsigned int for symlinks count. Suggested by: rwatson Approved by: re (kensmith) Modified: head/sys/sys/namei.h Modified: head/sys/sys/namei.h ============================================================================== --- head/sys/sys/namei.h Thu Jul 9 18:18:03 2009 (r195507) +++ head/sys/sys/namei.h Thu Jul 9 18:49:26 2009 (r195508) @@ -41,7 +41,7 @@ struct componentname { * Arguments to lookup. */ u_long cn_nameiop; /* namei operation */ - u_long cn_flags; /* flags to namei */ + u_int64_t cn_flags; /* flags to namei */ struct thread *cn_thread;/* thread requesting lookup */ struct ucred *cn_cred; /* credentials */ int cn_lkflags; /* Lock flags LK_EXCLUSIVE or LK_SHARED */ @@ -80,7 +80,7 @@ struct nameidata { */ size_t ni_pathlen; /* remaining chars in path */ char *ni_next; /* next location in pathname */ - u_long ni_loopcnt; /* count of symlinks encountered */ + u_int ni_loopcnt; /* count of symlinks encountered */ /* * Lookup parameters: this structure describes the subset of * information from the nameidata structure that is passed From kib at FreeBSD.org Thu Jul 9 18:54:40 2009 From: kib at FreeBSD.org (Konstantin Belousov) Date: Thu Jul 9 18:54:46 2009 Subject: svn commit: r195509 - head/sys/kern Message-ID: <200907091854.n69IscOQ094059@svn.freebsd.org> Author: kib Date: Thu Jul 9 18:54:38 2009 New Revision: 195509 URL: http://svn.freebsd.org/changeset/base/195509 Log: The control terminal revocation at the session leader exit does not correctly checks for reclaimed vnode, possibly calling VOP_REVOKE for such vnode. If the terminal is already revoked, or devfs mount was forcibly unmounted, the revocation of doomed ctty vnode causes panic. Reported and tested by: lstewart Approved by: re (kensmith) MFC after: 2 weeks Modified: head/sys/kern/kern_exit.c Modified: head/sys/kern/kern_exit.c ============================================================================== --- head/sys/kern/kern_exit.c Thu Jul 9 18:49:26 2009 (r195508) +++ head/sys/kern/kern_exit.c Thu Jul 9 18:54:38 2009 (r195509) @@ -334,10 +334,11 @@ exit1(struct thread *td, int rv) tty_unlock(tp); } - if (ttyvp != NULL && ttyvp->v_type != VBAD) { + if (ttyvp != NULL) { sx_xunlock(&proctree_lock); - VOP_LOCK(ttyvp, LK_EXCLUSIVE); - VOP_REVOKE(ttyvp, REVOKEALL); + vn_lock(ttyvp, LK_EXCLUSIVE | LK_RETRY); + if (ttyvp->v_type != VBAD) + VOP_REVOKE(ttyvp, REVOKEALL); VOP_UNLOCK(ttyvp, 0); sx_xlock(&proctree_lock); } From rmacklem at FreeBSD.org Thu Jul 9 19:00:30 2009 From: rmacklem at FreeBSD.org (Rick Macklem) Date: Thu Jul 9 19:00:42 2009 Subject: svn commit: r195510 - in head/sys/fs: nfs nfsclient Message-ID: <200907091900.n69J0UaD094239@svn.freebsd.org> Author: rmacklem Date: Thu Jul 9 19:00:29 2009 New Revision: 195510 URL: http://svn.freebsd.org/changeset/base/195510 Log: Since the nfscl_getclose() function both decremented open counts and, optionally, created a separate list of NFSv4 opens to be closed, it was possible for the associated OpenOwner to be free'd before the Open was closed. The problem was that the Open was taken off the OpenOwner list before the Close RPC was done and OpenOwners can be free'd once the list is empty. This patch separates out the case of doing the Close RPC into a separate function called nfscl_doclose() and simplifies nfsrpc_doclose() so that it closes a single open instead of a list of them. This avoids removing the Open from the OpenOwner list before doing the Close RPC. Approved by: re (kensmith), kib (mentor) Modified: head/sys/fs/nfs/nfs_var.h head/sys/fs/nfsclient/nfs_clrpcops.c head/sys/fs/nfsclient/nfs_clstate.c Modified: head/sys/fs/nfs/nfs_var.h ============================================================================== --- head/sys/fs/nfs/nfs_var.h Thu Jul 9 18:54:38 2009 (r195509) +++ head/sys/fs/nfs/nfs_var.h Thu Jul 9 19:00:29 2009 (r195510) @@ -457,7 +457,9 @@ void nfscl_initiate_recovery(struct nfsc int nfscl_hasexpired(struct nfsclclient *, u_int32_t, NFSPROC_T *); void nfscl_dumpstate(struct nfsmount *, int, int, int, int); void nfscl_dupopen(vnode_t, int); -int nfscl_getclose(vnode_t, struct nfsclclient **, struct nfsclopenhead *); +int nfscl_getclose(vnode_t, struct nfsclclient **); +int nfscl_doclose(vnode_t, struct nfsclclient **, NFSPROC_T *); +void nfsrpc_doclose(struct nfsmount *, struct nfsclopen *, NFSPROC_T *); int nfscl_deleg(mount_t, struct nfsclclient *, u_int8_t *, int, struct ucred *, NFSPROC_T *, struct nfscldeleg **); void nfscl_lockinit(struct nfsv4lock *); Modified: head/sys/fs/nfsclient/nfs_clrpcops.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clrpcops.c Thu Jul 9 18:54:38 2009 (r195509) +++ head/sys/fs/nfsclient/nfs_clrpcops.c Thu Jul 9 19:00:29 2009 (r195510) @@ -81,8 +81,6 @@ static int nfsrpc_createv4(vnode_t , cha static int nfsrpc_locku(struct nfsrv_descript *, struct nfsmount *, struct nfscllockowner *, u_int64_t, u_int64_t, u_int32_t, struct ucred *, NFSPROC_T *, int); -static void nfsrpc_doclose(struct nfsmount *, struct nfsclopenhead *, - NFSPROC_T *); #ifdef NFS4_ACL_EXTATTR_NAME static int nfsrpc_setaclrpc(vnode_t, struct ucred *, NFSPROC_T *, struct acl *, nfsv4stateid_t *, void *); @@ -553,119 +551,117 @@ APPLESTATIC int nfsrpc_close(vnode_t vp, int doclose, NFSPROC_T *p) { struct nfsclclient *clp; - struct nfsclopenhead oh; int error; if (vnode_vtype(vp) != VREG) return (0); if (doclose) - error = nfscl_getclose(vp, &clp, &oh); + error = nfscl_doclose(vp, &clp, p); else - error = nfscl_getclose(vp, &clp, NULL); + error = nfscl_getclose(vp, &clp); if (error) return (error); - if (doclose && !LIST_EMPTY(&oh)) - nfsrpc_doclose(VFSTONFS(vnode_mount(vp)), &oh, p); nfscl_clientrelease(clp); return (0); } /* - * Close/free all the opens in the list. + * Close the open. */ -static void -nfsrpc_doclose(struct nfsmount *nmp, struct nfsclopenhead *ohp, NFSPROC_T *p) +APPLESTATIC void +nfsrpc_doclose(struct nfsmount *nmp, struct nfsclopen *op, NFSPROC_T *p) { struct nfsrv_descript nfsd, *nd = &nfsd; - struct nfsclopen *op, *nop; struct nfscllockowner *lp; struct nfscllock *lop, *nlop; struct ucred *tcred; u_int64_t off = 0, len = 0; u_int32_t type = NFSV4LOCKT_READ; - int error; + int error, do_unlock, trycnt; tcred = newnfs_getcred(); - op = LIST_FIRST(ohp); - while (op != NULL) { - nop = LIST_NEXT(op, nfso_list); - newnfs_copycred(&op->nfso_cred, tcred); - /* - * (Theoretically this could be done in the same - * compound as the close, but having multiple - * sequenced Ops in the same compound might be - * too scary for some servers.) - */ - if (op->nfso_posixlock) { - off = 0; - len = NFS64BITSSET; - type = NFSV4LOCKT_READ; - } - LIST_FOREACH(lp, &op->nfso_lock, nfsl_list) { - lop = LIST_FIRST(&lp->nfsl_lock); - while (lop != NULL) { - nlop = LIST_NEXT(lop, nfslo_list); + newnfs_copycred(&op->nfso_cred, tcred); + /* + * (Theoretically this could be done in the same + * compound as the close, but having multiple + * sequenced Ops in the same compound might be + * too scary for some servers.) + */ + if (op->nfso_posixlock) { + off = 0; + len = NFS64BITSSET; + type = NFSV4LOCKT_READ; + } + + /* + * Since this function is only called from VOP_INACTIVE(), no + * other thread will be manipulating this Open. As such, the + * lock lists are not being changed by other threads, so it should + * be safe to do this without locking. + */ + LIST_FOREACH(lp, &op->nfso_lock, nfsl_list) { + do_unlock = 1; + LIST_FOREACH_SAFE(lop, &lp->nfsl_lock, nfslo_list, nlop) { if (op->nfso_posixlock == 0) { - off = lop->nfslo_first; - len = lop->nfslo_end - lop->nfslo_first; - if (lop->nfslo_type == F_WRLCK) - type = NFSV4LOCKT_WRITE; - else - type = NFSV4LOCKT_READ; + off = lop->nfslo_first; + len = lop->nfslo_end - lop->nfslo_first; + if (lop->nfslo_type == F_WRLCK) + type = NFSV4LOCKT_WRITE; + else + type = NFSV4LOCKT_READ; } - if (lop == LIST_FIRST(&lp->nfsl_lock) || - op->nfso_posixlock == 0) { - NFSLOCKCLSTATE(); - nfscl_lockexcl(&lp->nfsl_rwlock, - NFSCLSTATEMUTEXPTR); - NFSUNLOCKCLSTATE(); - do { - error = nfsrpc_locku(nd, nmp, lp, off, len, - type, tcred, p, 0); - if ((nd->nd_repstat == NFSERR_GRACE || - nd->nd_repstat == NFSERR_DELAY) && - error == 0) - (void) nfs_catnap(PZERO, "nfs_close"); - } while ((nd->nd_repstat == NFSERR_GRACE || - nd->nd_repstat == NFSERR_DELAY) && error == 0); - NFSLOCKCLSTATE(); - nfscl_lockunlock(&lp->nfsl_rwlock); - NFSUNLOCKCLSTATE(); + if (do_unlock) { + trycnt = 0; + do { + error = nfsrpc_locku(nd, nmp, lp, off, + len, type, tcred, p, 0); + if ((nd->nd_repstat == NFSERR_GRACE || + nd->nd_repstat == NFSERR_DELAY) && + error == 0) + (void) nfs_catnap(PZERO, + "nfs_close"); + } while ((nd->nd_repstat == NFSERR_GRACE || + nd->nd_repstat == NFSERR_DELAY) && + error == 0 && trycnt++ < 5); + if (op->nfso_posixlock) + do_unlock = 0; } nfscl_freelock(lop, 0); - lop = nlop; - } } - NFSLOCKCLSTATE(); - nfscl_lockexcl(&op->nfso_own->nfsow_rwlock, NFSCLSTATEMUTEXPTR); - NFSUNLOCKCLSTATE(); - do { - error = nfscl_tryclose(op, tcred, nmp, p); - if (error == NFSERR_GRACE) - (void) nfs_catnap(PZERO, "nfs_close"); - } while (error == NFSERR_GRACE); - NFSLOCKCLSTATE(); - nfscl_lockunlock(&op->nfso_own->nfsow_rwlock); - NFSUNLOCKCLSTATE(); + } - /* - * Move the lockowner to nfsc_defunctlockowner, - * so the Renew thread will do the ReleaseLockOwner - * Op on it later. There might still be other - * opens using the same lockowner name. - */ - lp = LIST_FIRST(&op->nfso_lock); - if (lp != NULL) { - while (LIST_NEXT(lp, nfsl_list) != NULL) + /* + * There could be other Opens for different files on the same + * OpenOwner, so locking is required. + */ + NFSLOCKCLSTATE(); + nfscl_lockexcl(&op->nfso_own->nfsow_rwlock, NFSCLSTATEMUTEXPTR); + NFSUNLOCKCLSTATE(); + do { + error = nfscl_tryclose(op, tcred, nmp, p); + if (error == NFSERR_GRACE) + (void) nfs_catnap(PZERO, "nfs_close"); + } while (error == NFSERR_GRACE); + NFSLOCKCLSTATE(); + nfscl_lockunlock(&op->nfso_own->nfsow_rwlock); + + /* + * Move the lockowner to nfsc_defunctlockowner, + * so the Renew thread will do the ReleaseLockOwner + * Op on it later. There might still be other + * opens using the same lockowner name. + */ + lp = LIST_FIRST(&op->nfso_lock); + if (lp != NULL) { + while (LIST_NEXT(lp, nfsl_list) != NULL) lp = LIST_NEXT(lp, nfsl_list); - LIST_PREPEND(&nmp->nm_clp->nfsc_defunctlockowner, - &op->nfso_lock, lp, nfsl_list); - LIST_INIT(&op->nfso_lock); - } - nfscl_freeopen(op, 0); - op = nop; + LIST_PREPEND(&nmp->nm_clp->nfsc_defunctlockowner, + &op->nfso_lock, lp, nfsl_list); + LIST_INIT(&op->nfso_lock); } + nfscl_freeopen(op, 0); + NFSUNLOCKCLSTATE(); NFSFREECRED(tcred); } Modified: head/sys/fs/nfsclient/nfs_clstate.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clstate.c Thu Jul 9 18:54:38 2009 (r195509) +++ head/sys/fs/nfsclient/nfs_clstate.c Thu Jul 9 19:00:29 2009 (r195510) @@ -450,7 +450,7 @@ nfscl_getstateid(vnode_t vp, u_int8_t *n { struct nfsclclient *clp; struct nfsclowner *owp; - struct nfsclopen *op; + struct nfsclopen *op = NULL; struct nfscllockowner *lp; struct nfscldeleg *dp; struct nfsnode *np; @@ -512,40 +512,40 @@ nfscl_getstateid(vnode_t vp, u_int8_t *n nfscl_filllockowner(p, own); error = nfscl_getopen(&clp->nfsc_owner, nfhp, fhlen, NULL, p, mode, NULL, &op); - if (error) { - NFSUNLOCKCLSTATE(); - return (error); - } - - /* now look for a lockowner */ - LIST_FOREACH(lp, &op->nfso_lock, nfsl_list) { - if (!NFSBCMP(lp->nfsl_owner, own, NFSV4CL_LOCKNAMELEN)) { - stateidp->seqid = lp->nfsl_stateid.seqid; - stateidp->other[0] = lp->nfsl_stateid.other[0]; - stateidp->other[1] = lp->nfsl_stateid.other[1]; - stateidp->other[2] = lp->nfsl_stateid.other[2]; - NFSUNLOCKCLSTATE(); - return (0); - } + if (error == 0) { + /* now look for a lockowner */ + LIST_FOREACH(lp, &op->nfso_lock, nfsl_list) { + if (!NFSBCMP(lp->nfsl_owner, own, + NFSV4CL_LOCKNAMELEN)) { + stateidp->seqid = + lp->nfsl_stateid.seqid; + stateidp->other[0] = + lp->nfsl_stateid.other[0]; + stateidp->other[1] = + lp->nfsl_stateid.other[1]; + stateidp->other[2] = + lp->nfsl_stateid.other[2]; + NFSUNLOCKCLSTATE(); + return (0); + } + } } - } else { - /* - * If p == NULL, it is a read ahead or write behind, - * so just look for any OpenOwner that will work. - */ + } + if (op == NULL) { + /* If not found, just look for any OpenOwner that will work. */ done = 0; owp = LIST_FIRST(&clp->nfsc_owner); while (!done && owp != NULL) { - LIST_FOREACH(op, &owp->nfsow_open, nfso_list) { - if (op->nfso_fhlen == fhlen && - !NFSBCMP(op->nfso_fh, nfhp, fhlen) && - (mode & op->nfso_mode) == mode) { - done = 1; - break; + LIST_FOREACH(op, &owp->nfsow_open, nfso_list) { + if (op->nfso_fhlen == fhlen && + !NFSBCMP(op->nfso_fh, nfhp, fhlen) && + (mode & op->nfso_mode) == mode) { + done = 1; + break; + } } - } - if (!done) - owp = LIST_NEXT(owp, nfsow_list); + if (!done) + owp = LIST_NEXT(owp, nfsow_list); } if (!done) { NFSUNLOCKCLSTATE(); @@ -2752,33 +2752,30 @@ nfscl_dupopen(vnode_t vp, int dupopens) /* * During close, find an open that needs to be dereferenced and * dereference it. If there are no more opens for this file, - * return the list of opens, so they can be closed on the - * server. As such, opens aren't closed on the server until - * all the opens for the file are closed off. + * log a message to that effect. + * Opens aren't actually Close'd until VOP_INACTIVE() is performed + * on the file's vnode. * This is the safe way, since it is difficult to identify - * which open the close is for. + * which open the close is for and I/O can be performed after the + * close(2) system call when a file is mmap'd. * If it returns 0 for success, there will be a referenced - * clp returned via clpp and a list of opens to close/free - * on ohp. + * clp returned via clpp. */ APPLESTATIC int -nfscl_getclose(vnode_t vp, struct nfsclclient **clpp, - struct nfsclopenhead *ohp) +nfscl_getclose(vnode_t vp, struct nfsclclient **clpp) { struct nfsclclient *clp; - struct nfsclowner *owp, *nowp; - struct nfsclopen *op, *nop; + struct nfsclowner *owp; + struct nfsclopen *op; struct nfscldeleg *dp; struct nfsfh *nfhp; - int error, notdecr, candelete; + int error, notdecr; error = nfscl_getcl(vp, NULL, NULL, &clp); if (error) return (error); *clpp = clp; - if (ohp != NULL) - LIST_INIT(ohp); nfhp = VTONFS(vp)->n_fhp; notdecr = 1; NFSLOCKCLSTATE(); @@ -2788,7 +2785,7 @@ nfscl_getclose(vnode_t vp, struct nfsclc * the server are DENY_NONE, I don't see a problem with hanging * onto them. (It is much easier to use one of the extant Opens * that I already have on the server when a Delegation is recalled - * than to do fresh Opens.) Someday, I might need to rethink this, but.. + * than to do fresh Opens.) Someday, I might need to rethink this, but. */ dp = nfscl_finddeleg(clp, nfhp->nfh_fh, nfhp->nfh_len); if (dp != NULL) { @@ -2813,9 +2810,7 @@ nfscl_getclose(vnode_t vp, struct nfsclc /* Now process the opens against the server. */ LIST_FOREACH(owp, &clp->nfsc_owner, nfsow_list) { - op = LIST_FIRST(&owp->nfsow_open); - while (op != NULL) { - nop = LIST_NEXT(op, nfso_list); + LIST_FOREACH(op, &owp->nfsow_open, nfso_list) { if (op->nfso_fhlen == nfhp->nfh_len && !NFSBCMP(op->nfso_fh, nfhp->nfh_fh, nfhp->nfh_len)) { @@ -2825,74 +2820,76 @@ nfscl_getclose(vnode_t vp, struct nfsclc op->nfso_opencnt--; } /* - * There are more opens, so just return after - * putting any opens already found back in the - * state list. + * There are more opens, so just return. */ if (op->nfso_opencnt > 0) { - if (ohp != NULL) { - /* Reattach open until later */ - op = LIST_FIRST(ohp); - while (op != NULL) { - nop = LIST_NEXT(op, nfso_list); - LIST_REMOVE(op, nfso_list); - LIST_INSERT_HEAD( - &op->nfso_own->nfsow_open, - op, nfso_list); - op = nop; - } - LIST_INIT(ohp); - } NFSUNLOCKCLSTATE(); return (0); } - - /* - * Move this entry to the list of opens to be - * returned. (If we find other open(s) still in - * use, it will be put back in the state list - * in the code just above.) - */ - if (ohp != NULL) { - LIST_REMOVE(op, nfso_list); - LIST_INSERT_HEAD(ohp, op, nfso_list); - } } - op = nop; } } + NFSUNLOCKCLSTATE(); + if (notdecr) + printf("nfscl: never fnd open\n"); + return (0); +} - if (dp != NULL && ohp != NULL) { - /* - * If we are flushing all writes against the server for this - * file upon close, we do not need to keep the local opens - * (against the delegation) if they all have an opencnt == 0, - * since there are now no opens on the file and no dirty blocks. - * If the writes aren't being flushed upon close, - * a test for "no dirty blocks to write back" would have to - * be added to this code. - */ - candelete = 1; - LIST_FOREACH(owp, &dp->nfsdl_owner, nfsow_list) { +APPLESTATIC int +nfscl_doclose(vnode_t vp, struct nfsclclient **clpp, NFSPROC_T *p) +{ + struct nfsclclient *clp; + struct nfsclowner *owp, *nowp; + struct nfsclopen *op; + struct nfscldeleg *dp; + struct nfsfh *nfhp; + int error; + + error = nfscl_getcl(vp, NULL, NULL, &clp); + if (error) + return (error); + *clpp = clp; + + nfhp = VTONFS(vp)->n_fhp; + NFSLOCKCLSTATE(); + /* + * First get rid of the local Open structures, which should be no + * longer in use. + */ + dp = nfscl_finddeleg(clp, nfhp->nfh_fh, nfhp->nfh_len); + if (dp != NULL) { + LIST_FOREACH_SAFE(owp, &dp->nfsdl_owner, nfsow_list, nowp) { op = LIST_FIRST(&owp->nfsow_open); - if (op != NULL && op->nfso_opencnt > 0) { - candelete = 0; - break; + if (op != NULL) { + KASSERT((op->nfso_opencnt == 0), + ("nfscl: bad open cnt on deleg")); + nfscl_freeopen(op, 1); } + nfscl_freeopenowner(owp, 1); } - if (candelete) { - LIST_FOREACH_SAFE(owp, &dp->nfsdl_owner, nfsow_list, - nowp) { - op = LIST_FIRST(&owp->nfsow_open); - if (op != NULL) - nfscl_freeopen(op, 1); - nfscl_freeopenowner(owp, 1); + } + + /* Now process the opens against the server. */ +lookformore: + LIST_FOREACH(owp, &clp->nfsc_owner, nfsow_list) { + op = LIST_FIRST(&owp->nfsow_open); + while (op != NULL) { + if (op->nfso_fhlen == nfhp->nfh_len && + !NFSBCMP(op->nfso_fh, nfhp->nfh_fh, + nfhp->nfh_len)) { + /* Found an open, close it. */ + KASSERT((op->nfso_opencnt == 0), + ("nfscl: bad open cnt on server")); + NFSUNLOCKCLSTATE(); + nfsrpc_doclose(VFSTONFS(vnode_mount(vp)), op, + p); + NFSLOCKCLSTATE(); + goto lookformore; } + op = LIST_NEXT(op, nfso_list); } } NFSUNLOCKCLSTATE(); - if (notdecr && ohp == NULL) - printf("nfscl: never fnd open\n"); return (0); } From np at FreeBSD.org Thu Jul 9 19:27:59 2009 From: np at FreeBSD.org (Navdeep Parhar) Date: Thu Jul 9 19:28:11 2009 Subject: svn commit: r195512 - head/sys/dev/cxgb Message-ID: <200907091927.n69JRwVC094872@svn.freebsd.org> Author: np Date: Thu Jul 9 19:27:58 2009 New Revision: 195512 URL: http://svn.freebsd.org/changeset/base/195512 Log: Fix cxgb(4) panic with jumbo frames. Reviewed by: kmacy Approved by: re (kib), gnn (mentor) Modified: head/sys/dev/cxgb/cxgb_sge.c Modified: head/sys/dev/cxgb/cxgb_sge.c ============================================================================== --- head/sys/dev/cxgb/cxgb_sge.c Thu Jul 9 19:02:17 2009 (r195511) +++ head/sys/dev/cxgb/cxgb_sge.c Thu Jul 9 19:27:58 2009 (r195512) @@ -2865,15 +2865,14 @@ get_packet(adapter_t *adap, unsigned int if ((sopeop == RSPQ_SOP_EOP) || (sopeop == RSPQ_SOP)) flags |= M_PKTHDR; + m_init(m, fl->zone, fl->buf_size, M_NOWAIT, MT_DATA, flags); if (fl->zone == zone_pack) { - m_init(m, zone_pack, MCLBYTES, M_NOWAIT, MT_DATA, flags); /* * restore clobbered data pointer */ m->m_data = m->m_ext.ext_buf; } else { m_cljset(m, cl, fl->type); - m->m_flags = flags; } m->m_len = len; } From pjd at FreeBSD.org Thu Jul 9 20:22:06 2009 From: pjd at FreeBSD.org (Pawel Jakub Dawidek) Date: Thu Jul 9 20:22:13 2009 Subject: svn commit: r195515 - in head/cddl/contrib/opensolaris: head lib/libzpool/common lib/libzpool/common/sys Message-ID: <200907092022.n69KM5Pq096177@svn.freebsd.org> Author: pjd Date: Thu Jul 9 20:22:05 2009 New Revision: 195515 URL: http://svn.freebsd.org/changeset/base/195515 Log: The mutex_owned() macro should operate on kmutex_t and not on mutex_t. This fixes 'zdb ' crash. Reported by: avg Approved by: re (kib) Modified: head/cddl/contrib/opensolaris/head/thread.h head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Modified: head/cddl/contrib/opensolaris/head/thread.h ============================================================================== --- head/cddl/contrib/opensolaris/head/thread.h Thu Jul 9 20:16:01 2009 (r195514) +++ head/cddl/contrib/opensolaris/head/thread.h Thu Jul 9 20:22:05 2009 (r195515) @@ -53,7 +53,6 @@ typedef pthread_rwlock_t rwlock_t; #define mutex_lock(l) pthread_mutex_lock(l) #define mutex_trylock(l) pthread_mutex_trylock(l) #define mutex_unlock(l) pthread_mutex_unlock(l) -#define mutex_owned(l) pthread_mutex_isowned_np(l) #define rwlock_init(l,f,a) pthread_rwlock_init(l,NULL) #define rwlock_destroy(l) pthread_rwlock_destroy(l) #define rw_rdlock(l) pthread_rwlock_rdlock(l) Modified: head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c ============================================================================== --- head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Thu Jul 9 20:16:01 2009 (r195514) +++ head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Thu Jul 9 20:22:05 2009 (r195515) @@ -115,6 +115,14 @@ zmutex_destroy(kmutex_t *mp) mp->initialized = B_FALSE; } +int +zmutex_owned(kmutex_t *mp) +{ + ASSERT(mp->initialized == B_TRUE); + + return (mp->m_owner == curthread); +} + void mutex_enter(kmutex_t *mp) { Modified: head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h ============================================================================== --- head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Thu Jul 9 20:16:01 2009 (r195514) +++ head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Thu Jul 9 20:22:05 2009 (r195515) @@ -237,9 +237,11 @@ typedef struct kmutex { #define mutex_init(mp, b, c, d) zmutex_init((kmutex_t *)(mp)) #define mutex_destroy(mp) zmutex_destroy((kmutex_t *)(mp)) +#define mutex_owned(mp) zmutex_owned((kmutex_t *)(mp)) extern void zmutex_init(kmutex_t *mp); extern void zmutex_destroy(kmutex_t *mp); +extern int zmutex_owned(kmutex_t *mp); extern void mutex_enter(kmutex_t *mp); extern void mutex_exit(kmutex_t *mp); extern int mutex_tryenter(kmutex_t *mp); From rdivacky at FreeBSD.org Thu Jul 9 20:23:02 2009 From: rdivacky at FreeBSD.org (Roman Divacky) Date: Thu Jul 9 20:23:09 2009 Subject: svn commit: r195515 - in head/cddl/contrib/opensolaris: head lib/libzpool/common lib/libzpool/common/sys In-Reply-To: <200907092022.n69KM5Pq096177@svn.freebsd.org> References: <200907092022.n69KM5Pq096177@svn.freebsd.org> Message-ID: <20090709202128.GA463@freebsd.org> On Thu, Jul 09, 2009 at 08:22:05PM +0000, Pawel Jakub Dawidek wrote: > Author: pjd > Date: Thu Jul 9 20:22:05 2009 > New Revision: 195515 > URL: http://svn.freebsd.org/changeset/base/195515 > > Log: > The mutex_owned() macro should operate on kmutex_t and not on mutex_t. > This fixes 'zdb ' crash. > > Reported by: avg > Approved by: re (kib) no MFC of this? From max at love2party.net Thu Jul 9 20:36:00 2009 From: max at love2party.net (Max Laier) Date: Thu Jul 9 20:36:11 2009 Subject: svn commit: r195485 - in stable/7/sys: . contrib/pf kern In-Reply-To: <20090709103126.02bf7206@Awfulhak.org> References: <200907090912.n699CGx0077581@svn.freebsd.org> <20090709103126.02bf7206@Awfulhak.org> Message-ID: <200907092235.18828.max@love2party.net> On Thursday 09 July 2009 19:31:26 Brian Somers wrote: > On Thu, 9 Jul 2009 09:12:16 +0000 (UTC), Konstantin Belousov wrote: > > Author: kib > > Date: Thu Jul 9 09:12:16 2009 > > New Revision: 195485 > > URL: http://svn.freebsd.org/changeset/base/195485 > > > > Log: > > MFC r194993: > > In lf_iteratelocks_vnode, increment state->ls_threads around iterating > > of the vnode advisory lock list. This prevents deallocation of state > > while inside the loop. > > > > Modified: > > stable/7/sys/ (props changed) > > stable/7/sys/contrib/pf/ (props changed) > > stable/7/sys/kern/kern_lockf.c > > Just picking on this commit.... > > Are the properties on stable/7/sys/contrib/pf intentional or should > they merged into stable/7/sys (a no-op hopefully) and removed? No it shouldn't[*]. The problem is that contrib/pf is - as the path suggests - backed by contributed code and thus has vendor specific merge info. [*] That being said, I don't really care about the merge info in there - as it turns out, subversion's automerging capabilities are rather poor anyway and I can't see the benefit of the mergeinfo in dealing with vendor code. It's always easy enough to figure out the revisions you want merged and you don't really need the mergeinfo for that. OTOH, it is valuable meta-information that should be recorded - as I recall that's one reason why we switched to subversion in the first place. One way out - which I proposed several times before but never got feedback on - would be to change the hierarchies in vendor-sys to have an extra sys/contrib prefix (e.g. vendor-sys/pf/dist/*sys/contrib*/pf/...). This way we can record the mergeinfo in src/sys as well and get rid of the extra info in contrib/* I'd need some feedback from svn-savvy people to go this road, though. Before somebody asks why pf is the only offender - simply because it's the only sys/contrib source with a post-cvs merge of vendor code to the releng. -- /"\ Best regards, | mlaier@freebsd.org \ / Max Laier | ICQ #67774661 X http://pf4freebsd.love2party.net/ | mlaier@EFnet / \ ASCII Ribbon Campaign | Against HTML Mail and News From ariff at FreeBSD.org Thu Jul 9 22:21:19 2009 From: ariff at FreeBSD.org (Ariff Abdullah) Date: Thu Jul 9 22:21:26 2009 Subject: svn commit: r195519 - head/sys/dev/sound/pcm Message-ID: <200907092221.n69MLIwS098924@svn.freebsd.org> Author: ariff Date: Thu Jul 9 22:21:18 2009 New Revision: 195519 URL: http://svn.freebsd.org/changeset/base/195519 Log: Rearrange shift operation to increase interpolation accuracy, further reducing conversion artifacts and better worst case SNR. Approved by: re (kib) Modified: head/sys/dev/sound/pcm/feeder_rate.c Modified: head/sys/dev/sound/pcm/feeder_rate.c ============================================================================== --- head/sys/dev/sound/pcm/feeder_rate.c Thu Jul 9 22:11:33 2009 (r195518) +++ head/sys/dev/sound/pcm/feeder_rate.c Thu Jul 9 22:21:18 2009 (r195519) @@ -882,18 +882,18 @@ z_coeff_interpolate(int32_t z, int32_t * zoo2 = z_coeff[2] - z_coeff[-1]; zoo3 = z_coeff[3] - z_coeff[-2]; - zoc0 = ((0x1ac2260dLL * zoe1) >> 30) + - ((0x0526cdcaLL * zoe2) >> 30) + ((0x00170c29LL * zoe3) >> 30); - zoc1 = ((0x14f8a49aLL * zoo1) >> 30) + - ((0x0d6d1109LL * zoo2) >> 30) + ((0x008cd4dcLL * zoo3) >> 30); - zoc2 = ((-0x0d3e94a4LL * zoe1) >> 30) + - ((0x0bddded4LL * zoe2) >> 30) + ((0x0160b5d0LL * zoe3) >> 30); - zoc3 = ((-0x0de10cc4LL * zoo1) >> 30) + - ((0x019b2a7dLL * zoo2) >> 30) + ((0x01cfe914LL * zoo3) >> 30); - zoc4 = ((0x02aa12d7LL * zoe1) >> 30) + - ((-0x03ff1bb3LL * zoe2) >> 30) + ((0x015508ddLL * zoe3) >> 30); - zoc5 = ((0x051d29e5LL * zoo1) >> 30) + - ((-0x028e7647LL * zoo2) >> 30) + ((0x0082d81aLL * zoo3) >> 30); + zoc0 = ((0x1ac2260dLL * zoe1) + (0x0526cdcaLL * zoe2) + + (0x00170c29LL * zoe3)) >> 30; + zoc1 = ((0x14f8a49aLL * zoo1) + (0x0d6d1109LL * zoo2) + + (0x008cd4dcLL * zoo3)) >> 30; + zoc2 = ((-0x0d3e94a4LL * zoe1) + (0x0bddded4LL * zoe2) + + (0x0160b5d0LL * zoe3)) >> 30; + zoc3 = ((-0x0de10cc4LL * zoo1) + (0x019b2a7dLL * zoo2) + + (0x01cfe914LL * zoo3)) >> 30; + zoc4 = ((0x02aa12d7LL * zoe1) + (-0x03ff1bb3LL * zoe2) + + (0x015508ddLL * zoe3)) >> 30; + zoc5 = ((0x051d29e5LL * zoo1) + (-0x028e7647LL * zoo2) + + (0x0082d81aLL * zoo3)) >> 30; coeff = (((((((((((((((int64_t)zoc5 * zoz) >> Z_SHIFT) + zoc4) * zoz) >> Z_SHIFT) + zoc3) * zoz) >> Z_SHIFT) + @@ -911,18 +911,18 @@ z_coeff_interpolate(int32_t z, int32_t * zoo2 = z_coeff[2] - z_coeff[-1]; zoo3 = z_coeff[3] - z_coeff[-2]; - zoc0 = ((0x1ac2260dLL * zoe1) >> 30) + - ((0x0526cdcaLL * zoe2) >> 30) + ((0x00170c29LL * zoe3) >> 30); - zoc1 = ((0x14f8a49aLL * zoo1) >> 30) + - ((0x0d6d1109LL * zoo2) >> 30) + ((0x008cd4dcLL * zoo3) >> 30); - zoc2 = ((-0x0d3e94a4LL * zoe1) >> 30) + - ((0x0bddded4LL * zoe2) >> 30) + ((0x0160b5d0LL * zoe3) >> 30); - zoc3 = ((-0x0de10cc4LL * zoo1) >> 30) + - ((0x019b2a7dLL * zoo2) >> 30) + ((0x01cfe914LL * zoo3) >> 30); - zoc4 = ((0x02aa12d7LL * zoe1) >> 30) + - ((-0x03ff1bb3LL * zoe2) >> 30) + ((0x015508ddLL * zoe3) >> 30); - zoc5 = ((0x051d29e5LL * zoo1) >> 30) + - ((-0x028e7647LL * zoo2) >> 30) + ((0x0082d81aLL * zoo3) >> 30); + zoc0 = ((0x1ac2260dLL * zoe1) + (0x0526cdcaLL * zoe2) + + (0x00170c29LL * zoe3)) >> 30; + zoc1 = ((0x14f8a49aLL * zoo1) + (0x0d6d1109LL * zoo2) + + (0x008cd4dcLL * zoo3)) >> 30; + zoc2 = ((-0x0d3e94a4LL * zoe1) + (0x0bddded4LL * zoe2) + + (0x0160b5d0LL * zoe3)) >> 30; + zoc3 = ((-0x0de10cc4LL * zoo1) + (0x019b2a7dLL * zoo2) + + (0x01cfe914LL * zoo3)) >> 30; + zoc4 = ((0x02aa12d7LL * zoe1) + (-0x03ff1bb3LL * zoe2) + + (0x015508ddLL * zoe3)) >> 30; + zoc5 = ((0x051d29e5LL * zoo1) + (-0x028e7647LL * zoo2) + + (0x0082d81aLL * zoo3)) >> 30; coeff = (((((((((((((((int64_t)zoc5 * zoz) >> Z_SHIFT) + zoc4) * zoz) >> Z_SHIFT) + zoc3) * zoz) >> Z_SHIFT) + @@ -940,18 +940,18 @@ z_coeff_interpolate(int32_t z, int32_t * zoo2 = z_coeff[2] - z_coeff[-1]; zoo3 = z_coeff[3] - z_coeff[-2]; - zoc0 = ((0x1aa9b47dLL * zoe1) >> 30) + - ((0x053d9944LL * zoe2) >> 30) + ((0x0018b23fLL * zoe3) >> 30); - zoc1 = ((0x14a104d1LL * zoo1) >> 30) + - ((0x0d7d2504LL * zoo2) >> 30) + ((0x0094b599LL * zoo3) >> 30); - zoc2 = ((-0x0d22530bLL * zoe1) >> 30) + - ((0x0bb37a2cLL * zoe2) >> 30) + ((0x016ed8e0LL * zoe3) >> 30); - zoc3 = ((-0x0d744b1cLL * zoo1) >> 30) + - ((0x01649591LL * zoo2) >> 30) + ((0x01dae93aLL * zoo3) >> 30); - zoc4 = ((0x02a7ee1bLL * zoe1) >> 30) + - ((-0x03fbdb24LL * zoe2) >> 30) + ((0x0153ed07LL * zoe3) >> 30); - zoc5 = ((0x04cf9b6cLL * zoo1) >> 30) + - ((-0x0266b378LL * zoo2) >> 30) + ((0x007a7c26LL * zoo3) >> 30); + zoc0 = ((0x1aa9b47dLL * zoe1) + (0x053d9944LL * zoe2) + + (0x0018b23fLL * zoe3)) >> 30; + zoc1 = ((0x14a104d1LL * zoo1) + (0x0d7d2504LL * zoo2) + + (0x0094b599LL * zoo3)) >> 30; + zoc2 = ((-0x0d22530bLL * zoe1) + (0x0bb37a2cLL * zoe2) + + (0x016ed8e0LL * zoe3)) >> 30; + zoc3 = ((-0x0d744b1cLL * zoo1) + (0x01649591LL * zoo2) + + (0x01dae93aLL * zoo3)) >> 30; + zoc4 = ((0x02a7ee1bLL * zoe1) + (-0x03fbdb24LL * zoe2) + + (0x0153ed07LL * zoe3)) >> 30; + zoc5 = ((0x04cf9b6cLL * zoo1) + (-0x0266b378LL * zoo2) + + (0x007a7c26LL * zoo3)) >> 30; coeff = (((((((((((((((int64_t)zoc5 * zoz) >> Z_SHIFT) + zoc4) * zoz) >> Z_SHIFT) + zoc3) * zoz) >> Z_SHIFT) + @@ -969,18 +969,18 @@ z_coeff_interpolate(int32_t z, int32_t * zoo2 = z_coeff[2] - z_coeff[-1]; zoo3 = z_coeff[3] - z_coeff[-2]; - zoc0 = ((0x1a8eda43LL * zoe1) >> 30) + - ((0x0556ee38LL * zoe2) >> 30) + ((0x001a3784LL * zoe3) >> 30); - zoc1 = ((0x143d863eLL * zoo1) >> 30) + - ((0x0d910e36LL * zoo2) >> 30) + ((0x009ca889LL * zoo3) >> 30); - zoc2 = ((-0x0d026821LL * zoe1) >> 30) + - ((0x0b837773LL * zoe2) >> 30) + ((0x017ef0c6LL * zoe3) >> 30); - zoc3 = ((-0x0cef1502LL * zoo1) >> 30) + - ((0x01207a8eLL * zoo2) >> 30) + ((0x01e936dbLL * zoo3) >> 30); - zoc4 = ((0x029fe643LL * zoe1) >> 30) + - ((-0x03ef3fc8LL * zoe2) >> 30) + ((0x014f5923LL * zoe3) >> 30); - zoc5 = ((0x043a9d08LL * zoo1) >> 30) + - ((-0x02154febLL * zoo2) >> 30) + ((0x00670dbdLL * zoo3) >> 30); + zoc0 = ((0x1a8eda43LL * zoe1) + (0x0556ee38LL * zoe2) + + (0x001a3784LL * zoe3)) >> 30; + zoc1 = ((0x143d863eLL * zoo1) + (0x0d910e36LL * zoo2) + + (0x009ca889LL * zoo3)) >> 30; + zoc2 = ((-0x0d026821LL * zoe1) + (0x0b837773LL * zoe2) + + (0x017ef0c6LL * zoe3)) >> 30; + zoc3 = ((-0x0cef1502LL * zoo1) + (0x01207a8eLL * zoo2) + + (0x01e936dbLL * zoo3)) >> 30; + zoc4 = ((0x029fe643LL * zoe1) + (-0x03ef3fc8LL * zoe2) + + (0x014f5923LL * zoe3)) >> 30; + zoc5 = ((0x043a9d08LL * zoo1) + (-0x02154febLL * zoo2) + + (0x00670dbdLL * zoo3)) >> 30; coeff = (((((((((((((((int64_t)zoc5 * zoz) >> Z_SHIFT) + zoc4) * zoz) >> Z_SHIFT) + zoc3) * zoz) >> Z_SHIFT) + @@ -998,18 +998,18 @@ z_coeff_interpolate(int32_t z, int32_t * zoo2 = z_coeff[2] - z_coeff[-1]; zoo3 = z_coeff[3] - z_coeff[-2]; - zoc0 = ((0x19edb6fdLL * zoe1) >> 30) + - ((0x05ebd062LL * zoe2) >> 30) + ((0x00267881LL * zoe3) >> 30); - zoc1 = ((0x1223af76LL * zoo1) >> 30) + - ((0x0de3dd6bLL * zoo2) >> 30) + ((0x00d683cdLL * zoo3) >> 30); - zoc2 = ((-0x0c3ee068LL * zoe1) >> 30) + - ((0x0a5c3769LL * zoe2) >> 30) + ((0x01e2aceaLL * zoe3) >> 30); - zoc3 = ((-0x0a8ab614LL * zoo1) >> 30) + - ((-0x0019522eLL * zoo2) >> 30) + ((0x022cefc7LL * zoo3) >> 30); - zoc4 = ((0x0276187dLL * zoe1) >> 30) + - ((-0x03a801e8LL * zoe2) >> 30) + ((0x0131d935LL * zoe3) >> 30); - zoc5 = ((0x02c373f5LL * zoo1) >> 30) + - ((-0x01275f83LL * zoo2) >> 30) + ((0x0018ee79LL * zoo3) >> 30); + zoc0 = ((0x19edb6fdLL * zoe1) + (0x05ebd062LL * zoe2) + + (0x00267881LL * zoe3)) >> 30; + zoc1 = ((0x1223af76LL * zoo1) + (0x0de3dd6bLL * zoo2) + + (0x00d683cdLL * zoo3)) >> 30; + zoc2 = ((-0x0c3ee068LL * zoe1) + (0x0a5c3769LL * zoe2) + + (0x01e2aceaLL * zoe3)) >> 30; + zoc3 = ((-0x0a8ab614LL * zoo1) + (-0x0019522eLL * zoo2) + + (0x022cefc7LL * zoo3)) >> 30; + zoc4 = ((0x0276187dLL * zoe1) + (-0x03a801e8LL * zoe2) + + (0x0131d935LL * zoe3)) >> 30; + zoc5 = ((0x02c373f5LL * zoo1) + (-0x01275f83LL * zoo2) + + (0x0018ee79LL * zoo3)) >> 30; coeff = (((((((((((((((int64_t)zoc5 * zoz) >> Z_SHIFT) + zoc4) * zoz) >> Z_SHIFT) + zoc3) * zoz) >> Z_SHIFT) + From sam at FreeBSD.org Fri Jul 10 02:19:58 2009 From: sam at FreeBSD.org (Sam Leffler) Date: Fri Jul 10 02:20:09 2009 Subject: svn commit: r195527 - head/sys/net80211 Message-ID: <200907100219.n6A2JvdC004313@svn.freebsd.org> Author: sam Date: Fri Jul 10 02:19:57 2009 New Revision: 195527 URL: http://svn.freebsd.org/changeset/base/195527 Log: correctly set the tailq ptr when removing the last item in the q Approved by: re (kensmith) Modified: head/sys/net80211/ieee80211_ageq.c Modified: head/sys/net80211/ieee80211_ageq.c ============================================================================== --- head/sys/net80211/ieee80211_ageq.c Fri Jul 10 02:15:59 2009 (r195526) +++ head/sys/net80211/ieee80211_ageq.c Fri Jul 10 02:19:57 2009 (r195527) @@ -211,7 +211,6 @@ ieee80211_ageq_remove(struct ieee80211_a /* * Remove from forward list; tail pointer is harder. */ - *prev = m->m_nextpkt; if (aq->aq_tail == m) { KASSERT(m->m_nextpkt == NULL, ("not last")); if (aq->aq_head == m) { /* list empty */ @@ -223,6 +222,8 @@ ieee80211_ageq_remove(struct ieee80211_a offsetof(struct mbuf, m_nextpkt)); } } + *prev = m->m_nextpkt; + /* add to private list for return */ *phead = m; phead = &m->m_nextpkt; From delphij at FreeBSD.org Fri Jul 10 06:55:31 2009 From: delphij at FreeBSD.org (Xin LI) Date: Fri Jul 10 06:55:37 2009 Subject: svn commit: r195528 - in stable/7/sys: . contrib/pf dev/usb Message-ID: <200907100655.n6A6tUaW009989@svn.freebsd.org> Author: delphij Date: Fri Jul 10 06:55:30 2009 New Revision: 195528 URL: http://svn.freebsd.org/changeset/base/195528 Log: MFC r195080 (technically this is not really a MFC but an new implementation of the original patch to apply against 7-STABLE). Add quirks for Actions MP4 player. Submitted by: John Hixson Approved by: re (kib) Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/usb/umass.c stable/7/sys/dev/usb/usbdevs Modified: stable/7/sys/dev/usb/umass.c ============================================================================== --- stable/7/sys/dev/usb/umass.c Fri Jul 10 02:19:57 2009 (r195527) +++ stable/7/sys/dev/usb/umass.c Fri Jul 10 06:55:30 2009 (r195528) @@ -887,6 +887,10 @@ static struct umass_devdescr_t umass_dev UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_INQUIRY | NO_SYNCHRONIZE_CACHE }, + { USB_VENDOR_ACTIONS, USB_PRODUCT_ACTIONS_MP4, RID_WILDCARD, + UMASS_PROTO_SCSI | UMASS_PROTO_BBB, + NO_SYNCHRONIZE_CACHE + }, { VID_EOT, PID_EOT, RID_EOT, 0, 0 } }; Modified: stable/7/sys/dev/usb/usbdevs ============================================================================== --- stable/7/sys/dev/usb/usbdevs Fri Jul 10 02:19:57 2009 (r195527) +++ stable/7/sys/dev/usb/usbdevs Fri Jul 10 06:55:30 2009 (r195528) @@ -552,6 +552,7 @@ vendor USI 0x10ab USI vendor PLX 0x10b5 PLX vendor ASANTE 0x10bd Asante vendor SILABS 0x10c4 Silicon Labs +vendor ACTIONS 0x10d6 Actions vendor ANALOG 0x1110 Analog Devices vendor TENX 0x1130 Ten X Technology, Inc. vendor ISSC 0x1131 Integrated System Solution Corp. @@ -2471,6 +2472,9 @@ product WESTERN EXTHDD 0x0400 External product WESTERN HUB 0x0500 USB HUB product WESTERN MYBOOK 0x0901 MyBook External HDD +/* Wilson Co. Ltd products */ +product ACTIONS MP4 0x1101 Mp4 Player + /* Windbond Electronics */ product WINBOND UH104 0x5518 4-port USB Hub From delphij at FreeBSD.org Fri Jul 10 06:57:02 2009 From: delphij at FreeBSD.org (Xin LI) Date: Fri Jul 10 06:57:08 2009 Subject: svn commit: r195529 - in stable/7/sys: . contrib/pf i386/isa Message-ID: <200907100657.n6A6v0lK010063@svn.freebsd.org> Author: delphij Date: Fri Jul 10 06:57:00 2009 New Revision: 195529 URL: http://svn.freebsd.org/changeset/base/195529 Log: MFC r193790: Add line width calculations for 15/16 and 24/32 bit modes in case the "Get Scan Line Length" function fails, as it does in Parallels (in Version 2.2, Build 2112 at least). PR: i386/127367 Obtained from: DragonFly Submitted by: Pedro Giffuni Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/i386/isa/vesa.c Modified: stable/7/sys/i386/isa/vesa.c ============================================================================== --- stable/7/sys/i386/isa/vesa.c Fri Jul 10 06:55:30 2009 (r195528) +++ stable/7/sys/i386/isa/vesa.c Fri Jul 10 06:57:00 2009 (r195529) @@ -1111,6 +1111,14 @@ vesa_set_mode(video_adapter_t *adp, int default: /* shouldn't happen */ vesa_adp->va_line_width = info.vi_width; break; + case 15: + case 16: + vesa_adp->va_line_width = info.vi_width*2; + break; + case 24: + case 32: + vesa_adp->va_line_width = info.vi_width*4; + break; } } else { vesa_adp->va_line_width = info.vi_width; From scottl at FreeBSD.org Fri Jul 10 08:18:09 2009 From: scottl at FreeBSD.org (Scott Long) Date: Fri Jul 10 08:18:17 2009 Subject: svn commit: r195534 - in head: etc/mtree include lib/libcam sbin/camcontrol share/man/man4 sys/cam sys/cam/ata sys/cam/scsi sys/conf sys/dev/advansys sys/dev/ahci sys/dev/aic7xxx sys/dev/amd sys/de... Message-ID: <200907100818.n6A8I8p1011853@svn.freebsd.org> Author: scottl Date: Fri Jul 10 08:18:08 2009 New Revision: 195534 URL: http://svn.freebsd.org/changeset/base/195534 Log: Separate the parallel scsi knowledge out of the core of the XPT, and modularize it so that new transports can be created. Add a transport for SATA Add a periph+protocol layer for ATA Add a driver for AHCI-compliant hardware. Add a maxio field to CAM so that drivers can advertise their max I/O capability. Modify various drivers so that they are insulated from the value of MAXPHYS. The new ATA/SATA code supports AHCI-compliant hardware, and will override the classic ATA driver if it is loaded as a module at boot time or compiled into the kernel. The stack now support NCQ (tagged queueing) for increased performance on modern SATA drives. It also supports port multipliers. ATA drives are accessed via 'ada' device nodes. ATAPI drives are accessed via 'cd' device nodes. They can all be enumerated and manipulated via camcontrol, just like SCSI drives. SCSI commands are not translated to their ATA equivalents; ATA native commands are used throughout the entire stack, including camcontrol. See the camcontrol manpage for further details. Testing this code may require that you update your fstab, and possibly modify your BIOS to enable AHCI functionality, if available. This code is very experimental at the moment. The userland ABI/API has changed, so applications will need to be recompiled. It may change further in the near future. The 'ada' device name may also change as more infrastructure is completed in this project. The goal is to eventually put all CAM busses and devices until newbus, allowing for interesting topology and management options. Few functional changes will be seen with existing SCSI/SAS/FC drivers, though the userland ABI has still changed. In the future, transports specific modules for SAS and FC may appear in order to better support the topologies and capabilities of these technologies. The modularization of CAM and the addition of the ATA/SATA modules is meant to break CAM out of the mold of being specific to SCSI, letting it grow to be a framework for arbitrary transports and protocols. It also allows drivers to be written to support discrete hardware without jeopardizing the stability of non-related hardware. While only an AHCI driver is provided now, a Silicon Image driver is also in the works. Drivers for ICH1-4, ICH5-6, PIIX, classic IDE, and any other hardware is possible and encouraged. Help with new transports is also encouraged. Submitted by: scottl, mav Approved by: re Added: head/share/man/man4/ahci.4 (contents, props changed) head/sys/cam/ata/ head/sys/cam/ata/ata_all.c (contents, props changed) head/sys/cam/ata/ata_all.h (contents, props changed) head/sys/cam/ata/ata_da.c (contents, props changed) head/sys/cam/ata/ata_xpt.c (contents, props changed) head/sys/cam/cam_xpt_internal.h (contents, props changed) head/sys/cam/scsi/scsi_xpt.c (contents, props changed) head/sys/dev/ahci/ head/sys/dev/ahci/ahci.c (contents, props changed) head/sys/dev/ahci/ahci.h (contents, props changed) head/sys/modules/ahci/ head/sys/modules/ahci/Makefile (contents, props changed) Modified: head/etc/mtree/BSD.include.dist head/include/Makefile head/lib/libcam/Makefile head/sbin/camcontrol/camcontrol.8 head/sbin/camcontrol/camcontrol.c head/share/man/man4/Makefile head/sys/cam/cam.c head/sys/cam/cam.h head/sys/cam/cam_ccb.h head/sys/cam/cam_periph.c head/sys/cam/cam_xpt.c head/sys/cam/cam_xpt.h head/sys/cam/cam_xpt_periph.h head/sys/cam/scsi/scsi_all.c head/sys/cam/scsi/scsi_cd.c head/sys/cam/scsi/scsi_ch.c head/sys/cam/scsi/scsi_da.c head/sys/cam/scsi/scsi_pass.c head/sys/cam/scsi/scsi_pt.c head/sys/cam/scsi/scsi_sa.c head/sys/cam/scsi/scsi_ses.c head/sys/cam/scsi/scsi_sg.c head/sys/conf/files head/sys/dev/advansys/advansys.c head/sys/dev/advansys/advlib.h head/sys/dev/aic7xxx/aic79xx_osm.h head/sys/dev/aic7xxx/aic7xxx_osm.h head/sys/dev/amd/amd.h head/sys/dev/ata/atapi-cam.c head/sys/dev/ciss/ciss.c head/sys/dev/ciss/cissvar.h head/sys/dev/isp/isp_freebsd.h head/sys/dev/mfi/mfi.c head/sys/dev/mfi/mfivar.h head/sys/dev/mlx/mlx.c head/sys/dev/mlx/mlxvar.h head/sys/dev/mpt/mpt.h head/sys/dev/mpt/mpt_pci.c head/sys/dev/trm/trm.h head/sys/modules/Makefile head/sys/modules/cam/Makefile Modified: head/etc/mtree/BSD.include.dist ============================================================================== --- head/etc/mtree/BSD.include.dist Fri Jul 10 07:21:26 2009 (r195533) +++ head/etc/mtree/BSD.include.dist Fri Jul 10 08:18:08 2009 (r195534) @@ -78,6 +78,8 @@ .. .. cam + ata + .. scsi .. .. Modified: head/include/Makefile ============================================================================== --- head/include/Makefile Fri Jul 10 07:21:26 2009 (r195533) +++ head/include/Makefile Fri Jul 10 08:18:08 2009 (r195534) @@ -38,7 +38,7 @@ LDIRS= bsm cam geom net net80211 netatal nfs nfsclient nfsserver \ sys vm -LSUBDIRS= cam/scsi \ +LSUBDIRS= cam/ata cam/scsi \ dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \ dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \ dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \ Modified: head/lib/libcam/Makefile ============================================================================== --- head/lib/libcam/Makefile Fri Jul 10 07:21:26 2009 (r195533) +++ head/lib/libcam/Makefile Fri Jul 10 08:18:08 2009 (r195534) @@ -2,7 +2,8 @@ LIB= cam SHLIBDIR?= /lib -SRCS= camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c +SRCS= camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c \ + ata_all.c INCS= camlib.h DPADD= ${LIBSBUF} @@ -34,7 +35,8 @@ MLINKS+= cam.3 cam_open_device.3 \ cam_cdbparse.3 csio_encode_visit.3 \ cam_cdbparse.3 buff_encode_visit.3 -.PATH: ${.CURDIR}/../../sys/cam/scsi ${.CURDIR}/../../sys/cam +.PATH: ${.CURDIR}/../../sys/cam/scsi ${.CURDIR}/../../sys/cam/ata \ + ${.CURDIR}/../../sys/cam SDIR= ${.CURDIR}/../../sys CFLAGS+= -I${.CURDIR} -I${SDIR} Modified: head/sbin/camcontrol/camcontrol.8 ============================================================================== --- head/sbin/camcontrol/camcontrol.8 Fri Jul 10 07:21:26 2009 (r195533) +++ head/sbin/camcontrol/camcontrol.8 Fri Jul 10 08:18:08 2009 (r195534) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 21, 2006 +.Dd June 29, 2009 .Dt CAMCONTROL 8 .Os .Sh NAME @@ -59,6 +59,10 @@ .Op Fl S .Op Fl R .Nm +.Ic identify +.Op device id +.Op generic args +.Nm .Ic reportluns .Op device id .Op generic args @@ -283,6 +287,8 @@ This is to aid in script writing. .It Fl R Print out transfer rate information. .El +.It Ic identify +Send a ATA identify command (0xec) to a device. .It Ic reportluns Send the SCSI REPORT LUNS (0xA0) command to the given device. By default, Modified: head/sbin/camcontrol/camcontrol.c ============================================================================== --- head/sbin/camcontrol/camcontrol.c Fri Jul 10 07:21:26 2009 (r195533) +++ head/sbin/camcontrol/camcontrol.c Fri Jul 10 08:18:08 2009 (r195534) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -49,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include "camcontrol.h" @@ -71,7 +73,8 @@ typedef enum { CAM_CMD_RATE = 0x0000000f, CAM_CMD_DETACH = 0x00000010, CAM_CMD_REPORTLUNS = 0x00000011, - CAM_CMD_READCAP = 0x00000012 + CAM_CMD_READCAP = 0x00000012, + CAM_CMD_IDENTIFY = 0x00000013 } cam_cmdmask; typedef enum { @@ -126,6 +129,7 @@ struct camcontrol_opts option_table[] = #ifndef MINIMALISTIC {"tur", CAM_CMD_TUR, CAM_ARG_NONE, NULL}, {"inquiry", CAM_CMD_INQUIRY, CAM_ARG_NONE, "DSR"}, + {"identify", CAM_CMD_IDENTIFY, CAM_ARG_NONE, NULL}, {"start", CAM_CMD_STARTSTOP, CAM_ARG_START_UNIT, NULL}, {"stop", CAM_CMD_STARTSTOP, CAM_ARG_NONE, NULL}, {"load", CAM_CMD_STARTSTOP, CAM_ARG_START_UNIT | CAM_ARG_EJECT, NULL}, @@ -401,19 +405,35 @@ getdevtree(void) } else skip_device = 0; - cam_strvis(vendor, dev_result->inq_data.vendor, + if (dev_result->protocol == PROTO_SCSI) { + cam_strvis(vendor, dev_result->inq_data.vendor, sizeof(dev_result->inq_data.vendor), sizeof(vendor)); - cam_strvis(product, + cam_strvis(product, dev_result->inq_data.product, sizeof(dev_result->inq_data.product), sizeof(product)); - cam_strvis(revision, + cam_strvis(revision, dev_result->inq_data.revision, sizeof(dev_result->inq_data.revision), sizeof(revision)); - sprintf(tmpstr, "<%s %s %s>", vendor, product, + sprintf(tmpstr, "<%s %s %s>", vendor, product, revision); + } else if (dev_result->protocol == PROTO_ATA || + dev_result->protocol == PROTO_SATAPM) { + cam_strvis(product, + dev_result->ident_data.model, + sizeof(dev_result->ident_data.model), + sizeof(product)); + cam_strvis(revision, + dev_result->ident_data.revision, + sizeof(dev_result->ident_data.revision), + sizeof(revision)); + sprintf(tmpstr, "<%s %s>", product, + revision); + } else { + sprintf(tmpstr, "<>"); + } if (need_close) { fprintf(stdout, ")\n"); need_close = 0; @@ -899,6 +919,14 @@ scsixferrate(struct cam_device *device) if ((spi->valid & CTS_SPI_VALID_SYNC_RATE) != 0) { freq = scsi_calc_syncsrate(spi->sync_period); speed = freq; + } else { + struct ccb_pathinq cpi; + + retval = get_cpi(device, &cpi); + if (retval == 0) { + speed = cpi.base_transfer_speed; + freq = 0; + } } fprintf(stdout, "%s%d: ", device->device_name, @@ -974,6 +1002,224 @@ xferrate_bailout: return(retval); } + +static void +atacapprint(struct ata_params *parm) +{ + u_int32_t lbasize = (u_int32_t)parm->lba_size_1 | + ((u_int32_t)parm->lba_size_2 << 16); + + u_int64_t lbasize48 = ((u_int64_t)parm->lba_size48_1) | + ((u_int64_t)parm->lba_size48_2 << 16) | + ((u_int64_t)parm->lba_size48_3 << 32) | + ((u_int64_t)parm->lba_size48_4 << 48); + + printf("\n"); + printf("Protocol "); + if (parm->satacapabilities && parm->satacapabilities != 0xffff) { + if (parm->satacapabilities & ATA_SATA_GEN2) + printf("SATA revision 2.x\n"); + else if (parm->satacapabilities & ATA_SATA_GEN1) + printf("SATA revision 1.x\n"); + else + printf("Unknown SATA revision\n"); + } + else + printf("ATA/ATAPI revision %d\n", ata_version(parm->version_major)); + printf("device model %.40s\n", parm->model); + printf("serial number %.20s\n", parm->serial); + printf("firmware revision %.8s\n", parm->revision); + + printf("cylinders %d\n", parm->cylinders); + printf("heads %d\n", parm->heads); + printf("sectors/track %d\n", parm->sectors); + + if (parm->config == ATA_PROTO_CFA || + (parm->support.command2 & ATA_SUPPORT_CFA)) + printf("CFA supported\n"); + + printf("lba%ssupported ", + parm->capabilities1 & ATA_SUPPORT_LBA ? " " : " not "); + if (lbasize) + printf("%d sectors\n", lbasize); + else + printf("\n"); + + printf("lba48%ssupported ", + parm->support.command2 & ATA_SUPPORT_ADDRESS48 ? " " : " not "); + if (lbasize48) + printf("%ju sectors\n", (uintmax_t)lbasize48); + else + printf("\n"); + + printf("dma%ssupported\n", + parm->capabilities1 & ATA_SUPPORT_DMA ? " " : " not "); + + printf("overlap%ssupported\n", + parm->capabilities1 & ATA_SUPPORT_OVERLAP ? " " : " not "); + + printf("\nFeature " + "Support Enable Value Vendor\n"); + + printf("write cache %s %s\n", + parm->support.command1 & ATA_SUPPORT_WRITECACHE ? "yes" : "no", + parm->enabled.command1 & ATA_SUPPORT_WRITECACHE ? "yes" : "no"); + + printf("read ahead %s %s\n", + parm->support.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no", + parm->enabled.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no"); + + if (parm->satacapabilities && parm->satacapabilities != 0xffff) { + printf("Native Command Queuing (NCQ) %s %s" + " %d/0x%02X\n", + parm->satacapabilities & ATA_SUPPORT_NCQ ? + "yes" : "no", " -", + (parm->satacapabilities & ATA_SUPPORT_NCQ) ? + ATA_QUEUE_LEN(parm->queue) : 0, + (parm->satacapabilities & ATA_SUPPORT_NCQ) ? + ATA_QUEUE_LEN(parm->queue) : 0); + } + printf("Tagged Command Queuing (TCQ) %s %s %d/0x%02X\n", + parm->support.command2 & ATA_SUPPORT_QUEUED ? "yes" : "no", + parm->enabled.command2 & ATA_SUPPORT_QUEUED ? "yes" : "no", + ATA_QUEUE_LEN(parm->queue), ATA_QUEUE_LEN(parm->queue)); + + printf("SMART %s %s\n", + parm->support.command1 & ATA_SUPPORT_SMART ? "yes" : "no", + parm->enabled.command1 & ATA_SUPPORT_SMART ? "yes" : "no"); + + printf("microcode download %s %s\n", + parm->support.command2 & ATA_SUPPORT_MICROCODE ? "yes" : "no", + parm->enabled.command2 & ATA_SUPPORT_MICROCODE ? "yes" : "no"); + + printf("security %s %s\n", + parm->support.command1 & ATA_SUPPORT_SECURITY ? "yes" : "no", + parm->enabled.command1 & ATA_SUPPORT_SECURITY ? "yes" : "no"); + + printf("power management %s %s\n", + parm->support.command1 & ATA_SUPPORT_POWERMGT ? "yes" : "no", + parm->enabled.command1 & ATA_SUPPORT_POWERMGT ? "yes" : "no"); + + printf("advanced power management %s %s %d/0x%02X\n", + parm->support.command2 & ATA_SUPPORT_APM ? "yes" : "no", + parm->enabled.command2 & ATA_SUPPORT_APM ? "yes" : "no", + parm->apm_value, parm->apm_value); + + printf("automatic acoustic management %s %s " + "%d/0x%02X %d/0x%02X\n", + parm->support.command2 & ATA_SUPPORT_AUTOACOUSTIC ? "yes" :"no", + parm->enabled.command2 & ATA_SUPPORT_AUTOACOUSTIC ? "yes" :"no", + ATA_ACOUSTIC_CURRENT(parm->acoustic), + ATA_ACOUSTIC_CURRENT(parm->acoustic), + ATA_ACOUSTIC_VENDOR(parm->acoustic), + ATA_ACOUSTIC_VENDOR(parm->acoustic)); +} + + +static int +ataidentify(struct cam_device *device, int retry_count, int timeout) +{ + union ccb *ccb; + struct ata_params *ident_buf; + int error = 0; + int16_t *ptr; + + ccb = cam_getccb(device); + + if (ccb == NULL) { + warnx("couldn't allocate CCB"); + return(1); + } + + /* cam_getccb cleans up the header, caller has to zero the payload */ + bzero(&(&ccb->ccb_h)[1], + sizeof(struct ccb_ataio) - sizeof(struct ccb_hdr)); + + ident_buf = (struct ata_params *)malloc( + sizeof(struct ata_params)); + + if (ident_buf == NULL) { + cam_freeccb(ccb); + warnx("can't malloc memory for identify\n"); + return(1); + } + bzero(ident_buf, sizeof(*ident_buf)); + + cam_fill_ataio(&ccb->ataio, + retry_count, + NULL, + /*flags*/CAM_DIR_IN, + MSG_SIMPLE_Q_TAG, + /*data_ptr*/(u_int8_t *)ident_buf, + /*dxfer_len*/sizeof(struct ata_params), + timeout ? timeout : 30 * 1000); +// if (periph->path->device->protocol == PROTO_ATA) + ata_36bit_cmd(&ccb->ataio, ATA_ATA_IDENTIFY, 0, 0, 0); +// else +// ata_36bit_cmd(&ccb->ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0); + + /* Disable freezing the device queue */ + ccb->ccb_h.flags |= CAM_DEV_QFRZDIS; + + if (arglist & CAM_ARG_ERR_RECOVER) + ccb->ccb_h.flags |= CAM_PASS_ERR_RECOVER; + + if (cam_send_ccb(device, ccb) < 0) { + perror("error sending ATA identify"); + + if (arglist & CAM_ARG_VERBOSE) { + cam_error_print(device, ccb, CAM_ESF_ALL, + CAM_EPF_ALL, stderr); + } + + cam_freeccb(ccb); + return(1); + } + + if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { + error = 1; + + if (arglist & CAM_ARG_VERBOSE) { + cam_error_print(device, ccb, CAM_ESF_ALL, + CAM_EPF_ALL, stderr); + } + } + + cam_freeccb(ccb); + + if (error != 0) { + free(ident_buf); + return(error); + } + + for (ptr = (int16_t *)ident_buf; + ptr < (int16_t *)ident_buf + sizeof(struct ata_params)/2; ptr++) { + *ptr = le16toh(*ptr); + } + if (strncmp(ident_buf->model, "FX", 2) && + strncmp(ident_buf->model, "NEC", 3) && + strncmp(ident_buf->model, "Pioneer", 7) && + strncmp(ident_buf->model, "SHARP", 5)) { + ata_bswap(ident_buf->model, sizeof(ident_buf->model)); + ata_bswap(ident_buf->revision, sizeof(ident_buf->revision)); + ata_bswap(ident_buf->serial, sizeof(ident_buf->serial)); + } + ata_btrim(ident_buf->model, sizeof(ident_buf->model)); + ata_bpack(ident_buf->model, ident_buf->model, sizeof(ident_buf->model)); + ata_btrim(ident_buf->revision, sizeof(ident_buf->revision)); + ata_bpack(ident_buf->revision, ident_buf->revision, sizeof(ident_buf->revision)); + ata_btrim(ident_buf->serial, sizeof(ident_buf->serial)); + ata_bpack(ident_buf->serial, ident_buf->serial, sizeof(ident_buf->serial)); + + fprintf(stdout, "%s%d: ", device->device_name, + device->dev_unit_num); + ata_print_ident(ident_buf); + atacapprint(ident_buf); + + free(ident_buf); + + return(0); +} #endif /* MINIMALISTIC */ /* @@ -3675,6 +3921,7 @@ usage(int verbose) " camcontrol periphlist [dev_id][-n dev_name] [-u unit]\n" " camcontrol tur [dev_id][generic args]\n" " camcontrol inquiry [dev_id][generic args] [-D] [-S] [-R]\n" +" camcontrol identify [dev_id][generic args]\n" " camcontrol reportluns [dev_id][generic args] [-c] [-l] [-r report]\n" " camcontrol readcap [dev_id][generic args] [-b] [-h] [-H] [-N]\n" " [-q] [-s]\n" @@ -3710,6 +3957,7 @@ usage(int verbose) "periphlist list all CAM peripheral drivers attached to a device\n" "tur send a test unit ready to the named device\n" "inquiry send a SCSI inquiry command to the named device\n" +"identify send a ATA identify command to the named device\n" "reportluns send a SCSI report luns command to the device\n" "readcap send a SCSI read capacity command to the device\n" "start send a Start Unit command to the device\n" @@ -4035,6 +4283,9 @@ main(int argc, char **argv) error = scsidoinquiry(cam_dev, argc, argv, combinedopt, retry_count, timeout); break; + case CAM_CMD_IDENTIFY: + error = ataidentify(cam_dev, retry_count, timeout); + break; case CAM_CMD_STARTSTOP: error = scsistart(cam_dev, arglist & CAM_ARG_START_UNIT, arglist & CAM_ARG_EJECT, retry_count, Modified: head/share/man/man4/Makefile ============================================================================== --- head/share/man/man4/Makefile Fri Jul 10 07:21:26 2009 (r195533) +++ head/share/man/man4/Makefile Fri Jul 10 08:18:08 2009 (r195534) @@ -23,6 +23,7 @@ MAN= aac.4 \ aha.4 \ ahb.4 \ ahc.4 \ + ahci.4 \ ahd.4 \ aio.4 \ alc.4 \ Added: head/share/man/man4/ahci.4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man4/ahci.4 Fri Jul 10 08:18:08 2009 (r195534) @@ -0,0 +1,132 @@ +.\" Copyright (c) 2009 Alexander Motin +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. The name of the author may not be used to endorse or promote products +.\" derived from this software without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd June 26, 2009 +.Dt AHCI 4 +.Os +.Sh NAME +.Nm ahci +.Nd Serial ATA Advanced Host Controller Interface driver +.Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device pci" +.Cd "device scbus" +.Cd "device ahci" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +ahci_load="YES" +.Ed +.Pp +The following tunables are settable from the loader: +.Bl -ohang +.It Va hint.ahci.X.msi +controls Message Signaled Interrupts (MSI) usage by the specified controller +.Bl -tag -compact +.It 0 +MSI disabled; +.It 1 +single MSI vector used, if supported (default); +.It 2 +multiple MSI vectors used, if supported; +.El +.It Va hint.ahcich.X.pm_level +controls SATA interface Power Management for specified channel, +allowing some power to be saved at the cost of additional command +latency. +Possible values: +.Bl -tag -compact +.It 0 +interface Power Management is disabled (default); +.It 1 +device is allowed to initiate PM state change, host is passive; +.It 2 +host initiates PARTIAL PM state transition every time port becomes idle; +.It 3 +host initiates SLUMBER PM state transition every time port becomes idle. +.El +Note that interface Power Management is not compatible with +device presence detection. +You will have to reset bus manually on device hot-plug. +.It Va hint.ahcich.X.sata_rev +setting to nonzero value limits maximum SATA revision (speed). +Values 1, 2 and 3 are respectively 1.5, 3 and 6Gbps. +.El +.Sh DESCRIPTION +This driver provides the CAM subsystem with native access to the +.Tn SATA +ports of AHCI-compatible controllers. +Each SATA port found is represented to CAM as a separate bus with one +target, or, if HBA supports Port Multipliers, 15 targets. +Most of the bus-management details are handled by the SATA-specific +transport of CAM. +Connected ATA disks are handled by the ATA protocol disk peripheral driver +.Xr ada 4 . +ATAPI devices are handled by the SCSI protocol peripheral drivers +.Xr cd 4 , +.Xr da 4 , +.Xr sa 4 , +etc. +.Pp +Driver features include support for Serial ATA and ATAPI devices, +Port Multipliers, hardware command queues (up to 32 commands per port), +Native Command Queuing, SATA interface Power Management, device hot-plug +and Message Signaled Interrupts. +.Pp +The Port Multiplier FIS Based Switching feature added in the AHCI 1.2 +specification, which is required for effective parallel operation of devices +behind Port Multipliers, is not yet supported. +.Pp +AHCI hardware is also supported by ataahci driver from +.Xr ata 4 +subsystem. If both drivers are loaded at the same time, this one will be +given precedence as the more functional of the two. +.Sh HARDWARE +The +.Nm +driver supports AHCI compatible controllers having PCI class 1 (mass storage), +subclass 6 (SATA) and programming interface 1 (AHCI). +.Sh SEE ALSO +.Xr ada 4 , +.Xr cd 4 , +.Xr da 4 , +.Xr sa 4 , +.Xr scsi 4 , +.Xr ata 4 +.Sh HISTORY +The +.Nm +driver first appeared in +.Fx 8.0 . +.Sh AUTHORS +.An Alexander Motin Aq mav@FreeBSD.org . Added: head/sys/cam/ata/ata_all.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/cam/ata/ata_all.c Fri Jul 10 08:18:08 2009 (r195534) @@ -0,0 +1,304 @@ +/*- + * Copyright (c) 2009 Alexander Motin + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer, + * without modification, immediately at the beginning of the file. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include + +#ifdef _KERNEL +#include + +#include +#include +#include +#include +#else +#include +#include +#include +#include +#ifndef min +#define min(a,b) (((a)<(b))?(a):(b)) +#endif +#endif + +#include +#include +#include +#include +#include +#include +#include +#include + +int +ata_version(int ver) +{ + int bit; + + if (ver == 0xffff) + return 0; + for (bit = 15; bit >= 0; bit--) + if (ver & (1<model, sizeof(ident_data->model), + sizeof(product)); + cam_strvis(revision, ident_data->revision, sizeof(ident_data->revision), + sizeof(revision)); + printf("<%s %s> ATA/ATAPI-%d", + product, revision, ata_version(ident_data->version_major)); + if (ident_data->satacapabilities && ident_data->satacapabilities != 0xffff) { + if (ident_data->satacapabilities & ATA_SATA_GEN2) + printf(" SATA 2.x"); + else if (ident_data->satacapabilities & ATA_SATA_GEN1) + printf(" SATA 1.x"); + else + printf(" SATA"); + } + printf(" device\n"); +} + +void +ata_36bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features, + uint32_t lba, uint8_t sector_count) +{ + bzero(&ataio->cmd, sizeof(ataio->cmd)); + ataio->cmd.flags = 0; + ataio->cmd.command = cmd; + ataio->cmd.features = features; + ataio->cmd.lba_low = lba; + ataio->cmd.lba_mid = lba >> 8; + ataio->cmd.lba_high = lba >> 16; + ataio->cmd.device = 0x40 | ((lba >> 24) & 0x0f); + ataio->cmd.sector_count = sector_count; +} + +void +ata_48bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint16_t features, + uint64_t lba, uint16_t sector_count) +{ + bzero(&ataio->cmd, sizeof(ataio->cmd)); + ataio->cmd.flags = CAM_ATAIO_48BIT; + ataio->cmd.command = cmd; + ataio->cmd.features = features; + ataio->cmd.lba_low = lba; + ataio->cmd.lba_mid = lba >> 8; + ataio->cmd.lba_high = lba >> 16; + ataio->cmd.device = 0x40; + ataio->cmd.lba_low_exp = lba >> 24; + ataio->cmd.lba_mid_exp = lba >> 32; + ataio->cmd.lba_high_exp = lba >> 40; + ataio->cmd.features_exp = features >> 8; + ataio->cmd.sector_count = sector_count; + ataio->cmd.sector_count_exp = sector_count >> 8; +} + +void +ata_ncq_cmd(struct ccb_ataio *ataio, uint8_t cmd, + uint64_t lba, uint16_t sector_count) +{ + bzero(&ataio->cmd, sizeof(ataio->cmd)); + ataio->cmd.flags = CAM_ATAIO_48BIT | CAM_ATAIO_FPDMA; + ataio->cmd.command = cmd; + ataio->cmd.features = sector_count; + ataio->cmd.lba_low = lba; + ataio->cmd.lba_mid = lba >> 8; + ataio->cmd.lba_high = lba >> 16; + ataio->cmd.device = 0x40; + ataio->cmd.lba_low_exp = lba >> 24; + ataio->cmd.lba_mid_exp = lba >> 32; + ataio->cmd.lba_high_exp = lba >> 40; + ataio->cmd.features_exp = sector_count >> 8; +} + +void +ata_reset_cmd(struct ccb_ataio *ataio) +{ + bzero(&ataio->cmd, sizeof(ataio->cmd)); + ataio->cmd.flags = CAM_ATAIO_CONTROL | CAM_ATAIO_NEEDRESULT; + ataio->cmd.control = 0x04; +} + +void +ata_pm_read_cmd(struct ccb_ataio *ataio, int reg, int port) +{ + bzero(&ataio->cmd, sizeof(ataio->cmd)); + ataio->cmd.flags = CAM_ATAIO_48BIT | CAM_ATAIO_NEEDRESULT; + ataio->cmd.command = ATA_READ_PM; + ataio->cmd.features = reg; + ataio->cmd.features_exp = reg >> 8; + ataio->cmd.device = port & 0x0f; +} + +void +ata_pm_write_cmd(struct ccb_ataio *ataio, int reg, int port, uint64_t val) +{ + bzero(&ataio->cmd, sizeof(ataio->cmd)); + ataio->cmd.flags = CAM_ATAIO_48BIT | CAM_ATAIO_NEEDRESULT; + ataio->cmd.command = ATA_WRITE_PM; + ataio->cmd.features = reg; + ataio->cmd.lba_low = val >> 8; + ataio->cmd.lba_mid = val >> 16; + ataio->cmd.lba_high = val >> 24; + ataio->cmd.device = port & 0x0f; + ataio->cmd.lba_low_exp = val >> 40; + ataio->cmd.lba_mid_exp = val >> 48; + ataio->cmd.lba_high_exp = val >> 56; + ataio->cmd.features_exp = reg >> 8; + ataio->cmd.sector_count = val; + ataio->cmd.sector_count_exp = val >> 32; +} + +void +ata_bswap(int8_t *buf, int len) +{ + u_int16_t *ptr = (u_int16_t*)(buf + len); + + while (--ptr >= (u_int16_t*)buf) + *ptr = be16toh(*ptr); +} + +void +ata_btrim(int8_t *buf, int len) +{ + int8_t *ptr; + + for (ptr = buf; ptr < buf+len; ++ptr) + if (!*ptr || *ptr == '_') + *ptr = ' '; + for (ptr = buf + len - 1; ptr >= buf && *ptr == ' '; --ptr) + *ptr = 0; +} + +void +ata_bpack(int8_t *src, int8_t *dst, int len) +{ + int i, j, blank; + + for (i = j = blank = 0 ; i < len; i++) { + if (blank && src[i] == ' ') continue; + if (blank && src[i] != ' ') { + dst[j++] = src[i]; + blank = 0; + continue; + } + if (src[i] == ' ') { + blank = 1; + if (i == 0) + continue; + } + dst[j++] = src[i]; + } + while (j < len) + dst[j++] = 0x00; +} + +int +ata_max_pmode(struct ata_params *ap) +{ + if (ap->atavalid & ATA_FLAG_64_70) { + if (ap->apiomodes & 0x02) + return ATA_PIO4; + if (ap->apiomodes & 0x01) + return ATA_PIO3; + } + if (ap->mwdmamodes & 0x04) + return ATA_PIO4; + if (ap->mwdmamodes & 0x02) + return ATA_PIO3; + if (ap->mwdmamodes & 0x01) + return ATA_PIO2; + if ((ap->retired_piomode & ATA_RETIRED_PIO_MASK) == 0x200) + return ATA_PIO2; + if ((ap->retired_piomode & ATA_RETIRED_PIO_MASK) == 0x100) + return ATA_PIO1; + if ((ap->retired_piomode & ATA_RETIRED_PIO_MASK) == 0x000) + return ATA_PIO0; + return ATA_PIO0; +} + +int +ata_max_wmode(struct ata_params *ap) +{ + if (ap->mwdmamodes & 0x04) + return ATA_WDMA2; + if (ap->mwdmamodes & 0x02) + return ATA_WDMA1; + if (ap->mwdmamodes & 0x01) + return ATA_WDMA0; + return -1; +} + +int +ata_max_umode(struct ata_params *ap) +{ + if (ap->atavalid & ATA_FLAG_88) { + if (ap->udmamodes & 0x40) + return ATA_UDMA6; + if (ap->udmamodes & 0x20) + return ATA_UDMA5; + if (ap->udmamodes & 0x10) + return ATA_UDMA4; + if (ap->udmamodes & 0x08) + return ATA_UDMA3; + if (ap->udmamodes & 0x04) + return ATA_UDMA2; + if (ap->udmamodes & 0x02) + return ATA_UDMA1; + if (ap->udmamodes & 0x01) + return ATA_UDMA0; + } + return -1; +} + +int +ata_max_mode(struct ata_params *ap, int mode, int maxmode) +{ + + if (maxmode && mode > maxmode) + mode = maxmode; + + if (mode >= ATA_UDMA0 && ata_max_umode(ap) > 0) + return (min(mode, ata_max_umode(ap))); + + if (mode >= ATA_WDMA0 && ata_max_wmode(ap) > 0) + return (min(mode, ata_max_wmode(ap))); + + if (mode > ata_max_pmode(ap)) + return (min(mode, ata_max_pmode(ap))); + + return (mode); +} + Added: head/sys/cam/ata/ata_all.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/cam/ata/ata_all.h Fri Jul 10 08:18:08 2009 (r195534) @@ -0,0 +1,105 @@ +/*- + * Copyright (c) 2009 Alexander Motin + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer, + * without modification, immediately at the beginning of the file. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef CAM_ATA_ALL_H +#define CAM_ATA_ALL_H 1 + +#include + +struct ccb_ataio; +struct cam_periph; +union ccb; + +struct ata_cmd { + u_int8_t flags; /* ATA command flags */ +#define CAM_ATAIO_48BIT 0x01 /* Command has 48-bit format */ +#define CAM_ATAIO_FPDMA 0x02 /* FPDMA command */ +#define CAM_ATAIO_CONTROL 0x04 /* Control, not a command */ +#define CAM_ATAIO_NEEDRESULT 0x08 /* Request requires result. */ + + u_int8_t command; + u_int8_t features; + + u_int8_t lba_low; + u_int8_t lba_mid; + u_int8_t lba_high; + u_int8_t device; + + u_int8_t lba_low_exp; + u_int8_t lba_mid_exp; + u_int8_t lba_high_exp; + u_int8_t features_exp; + + u_int8_t sector_count; + u_int8_t sector_count_exp; + u_int8_t control; +}; + +struct ata_res { + u_int8_t flags; /* ATA command flags */ +#define CAM_ATAIO_48BIT 0x01 /* Command has 48-bit format */ + + u_int8_t status; + u_int8_t error; + + u_int8_t lba_low; + u_int8_t lba_mid; + u_int8_t lba_high; + u_int8_t device; + + u_int8_t lba_low_exp; + u_int8_t lba_mid_exp; + u_int8_t lba_high_exp; + + u_int8_t sector_count; + u_int8_t sector_count_exp; +}; + +int ata_version(int ver); +void ata_print_ident(struct ata_params *ident_data); + +void ata_36bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features, + uint32_t lba, uint8_t sector_count); +void ata_48bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint16_t features, + uint64_t lba, uint16_t sector_count); +void ata_ncq_cmd(struct ccb_ataio *ataio, uint8_t cmd, + uint64_t lba, uint16_t sector_count); +void ata_reset_cmd(struct ccb_ataio *ataio); +void ata_pm_read_cmd(struct ccb_ataio *ataio, int reg, int port); +void ata_pm_write_cmd(struct ccb_ataio *ataio, int reg, int port, uint64_t val); + +void ata_bswap(int8_t *buf, int len); +void ata_btrim(int8_t *buf, int len); +void ata_bpack(int8_t *src, int8_t *dst, int len); + +int ata_max_pmode(struct ata_params *ap); +int ata_max_wmode(struct ata_params *ap); +int ata_max_umode(struct ata_params *ap); +int ata_max_mode(struct ata_params *ap, int mode, int maxmode); + +#endif Added: head/sys/cam/ata/ata_da.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/cam/ata/ata_da.c Fri Jul 10 08:18:08 2009 (r195534) @@ -0,0 +1,1144 @@ +/*- + * Copyright (c) 2009 Alexander Motin + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer, + * without modification, immediately at the beginning of the file. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From phk at phk.freebsd.dk Fri Jul 10 08:23:32 2009 From: phk at phk.freebsd.dk (Poul-Henning Kamp) Date: Fri Jul 10 08:23:38 2009 Subject: svn commit: r195534 - in head: etc/mtree include lib/libcam sbin/camcontrol share/man/man4 sys/cam sys/cam/ata sys/cam/scsi sys/conf sys/dev/advansys sys/dev/ahci sys/dev/aic7xxx sys/dev/amd sys/de... In-Reply-To: Your message of "Fri, 10 Jul 2009 08:18:08 GMT." <200907100818.n6A8I8p1011853@svn.freebsd.org> Message-ID: <37131.1247214217@critter.freebsd.dk> In message <200907100818.n6A8I8p1011853@svn.freebsd.org>, Scott Long writes: > ATA drives are accessed via 'ada' device nodes. It there a particular good reason why we insist on making this silly mistake every five years ? I am pretty sure you were around when Justin won friends by renaming the SCSI disk devices ? -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. From scottl at samsco.org Fri Jul 10 08:32:04 2009 From: scottl at samsco.org (Scott Long) Date: Fri Jul 10 08:32:11 2009 Subject: svn commit: r195534 - in head: etc/mtree include lib/libcam sbin/camcontrol share/man/man4 sys/cam sys/cam/ata sys/cam/scsi sys/conf sys/dev/advansys sys/dev/ahci sys/dev/aic7xxx sys/dev/amd sys/de... In-Reply-To: <37131.1247214217@critter.freebsd.dk> References: <37131.1247214217@critter.freebsd.dk> Message-ID: <4A56FC7C.8060107@samsco.org> Poul-Henning Kamp wrote: > In message <200907100818.n6A8I8p1011853@svn.freebsd.org>, Scott Long writes: > >> ATA drives are accessed via 'ada' device nodes. > > It there a particular good reason why we insist on making this > silly mistake every five years ? > > I am pretty sure you were around when Justin won friends by renaming > the SCSI disk devices ? > 1. I clearly stated that the name is experimental and that a change in the future is possible. 2. If the name does change, and if it changes to either 'ad' or 'da', it can't happen until the newbus stuff is done first. I desperately need help with that, btw, starting with removing the need for Giant from newbus. Contact myself and/or Warner for details. 3. Exposing driver name details as the primary handle for users is something that I disagree with, and I'd ultimately like to see every direct-access block device in the system be called 'disk'. Or "phk". Or "bde" for all I care =-) 4. While feelings may have been hurt 12 years ago, life did, in fact, go on. Scott From phk at phk.freebsd.dk Fri Jul 10 08:38:24 2009 From: phk at phk.freebsd.dk (Poul-Henning Kamp) Date: Fri Jul 10 08:38:31 2009 Subject: svn commit: r195534 - in head: etc/mtree include lib/libcam sbin/camcontrol share/man/man4 sys/cam sys/cam/ata sys/cam/scsi sys/conf sys/dev/advansys sys/dev/ahci sys/dev/aic7xxx sys/dev/amd sys/de... In-Reply-To: Your message of "Fri, 10 Jul 2009 02:31:56 CST." <4A56FC7C.8060107@samsco.org> Message-ID: <80355.1247215110@critter.freebsd.dk> In message <4A56FC7C.8060107@samsco.org>, Scott Long writes: >1. I clearly stated that the name is experimental and that a change in >the future is possible. But what on earth is the point ?? You want to _avoid_ people testing your code ? >4. While feelings may have been hurt 12 years ago, life did, in fact, go >on. Yes, after a considerable number of "My system cannot find its harddisk any more" support emails. I'm all for unifying the namespace, but still remember how much pain the "didn't find that disk, lets renumber all of the rest of them" causes, so I tend to prefer physically bound names. -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. From brian at FreeBSD.org Fri Jul 10 09:01:55 2009 From: brian at FreeBSD.org (Brian Somers) Date: Fri Jul 10 09:02:12 2009 Subject: svn commit: r195485 - in stable/7/sys: . contrib/pf kern In-Reply-To: <200907092235.18828.max@love2party.net> References: <200907090912.n699CGx0077581@svn.freebsd.org> <20090709103126.02bf7206@Awfulhak.org> <200907092235.18828.max@love2party.net> Message-ID: <20090710013243.68775e75@dev.lan.Awfulhak.org> On Thu, 9 Jul 2009 22:35:18 +0200 Max Laier wrote: > On Thursday 09 July 2009 19:31:26 Brian Somers wrote: > > On Thu, 9 Jul 2009 09:12:16 +0000 (UTC), Konstantin Belousov > wrote: > > > Author: kib > > > Date: Thu Jul 9 09:12:16 2009 > > > New Revision: 195485 > > > URL: http://svn.freebsd.org/changeset/base/195485 > > > > > > Log: > > > MFC r194993: > > > In lf_iteratelocks_vnode, increment state->ls_threads around iterating > > > of the vnode advisory lock list. This prevents deallocation of state > > > while inside the loop. > > > > > > Modified: > > > stable/7/sys/ (props changed) > > > stable/7/sys/contrib/pf/ (props changed) > > > stable/7/sys/kern/kern_lockf.c > > > > Just picking on this commit.... > > > > Are the properties on stable/7/sys/contrib/pf intentional or should > > they merged into stable/7/sys (a no-op hopefully) and removed? > > No it shouldn't[*]. The problem is that contrib/pf is - as the path suggests > - backed by contributed code and thus has vendor specific merge info. > > [*] That being said, I don't really care about the merge info in there - as it > turns out, subversion's automerging capabilities are rather poor anyway and I > can't see the benefit of the mergeinfo in dealing with vendor code. It's > always easy enough to figure out the revisions you want merged and you don't > really need the mergeinfo for that. OTOH, it is valuable meta-information > that should be recorded - as I recall that's one reason why we switched to > subversion in the first place. > > One way out - which I proposed several times before but never got feedback on > - would be to change the hierarchies in vendor-sys to have an extra > sys/contrib prefix (e.g. vendor-sys/pf/dist/*sys/contrib*/pf/...). This way > we can record the mergeinfo in src/sys as well and get rid of the extra info > in contrib/* I'd need some feedback from svn-savvy people to go this road, > though. > > Before somebody asks why pf is the only offender - simply because it's the > only sys/contrib source with a post-cvs merge of vendor code to the releng. Yes, I was thinking along the same lines. AFAICT this would work fine with the caveat that it may be necessary to import some vendor code in pieces. If for example a vendor distributed some-package/etc/config-file some-package/bin/program some-package/kernel/driver we might need to import it in two pieces so that we can maintain the contrib/some-package part of the hierarchy when merging sys/, even though the other two hierarchies can be merged directly into src/etc and usr.bin/program directly. However, the bit that I don't understand about the original commit and its update of the contrib/pf mergeinfo is why it's updated at all by svn - it just seems wrong. When I do: cd svn/stable/7/sys svn merge -c NNNNN ^/head/sys given that change NNNNN has nothing to do with pf, I don't understand why subversion updates stable/7/sys/contrib/pf's mergeinfo. Is the "special" thing about sys/contrib/pf just that it already has mergeinfo associated with it? And if so, why does that make it special. Surely having NNNNN in sys's mergeinfo implies that it's been merged to every part beneath sys. Having said all that, svn's --depth switch allows partially sparse tree checkouts, and it's always possible to svn revert part of a merge before committing. This implies that the only way svn could successfully maintain mergeinfo would be to store it at least against every node with a merged modification. Depending on how people branch and merge, this would become very unwieldy very quickly (certainly in other environments if not in ours (we would get away with it because we eventually forget about old branches)). So I guess I'm probably just re-iterating other people's suggestions that svn's merge capabilities are somewhat dysfunctional by design. -- Brian Somers Don't _EVER_ lose your sense of humour ! -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 306 bytes Desc: not available Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20090710/b49a9fbf/signature.pgp From kib at FreeBSD.org Fri Jul 10 10:29:17 2009 From: kib at FreeBSD.org (Konstantin Belousov) Date: Fri Jul 10 10:29:23 2009 Subject: svn commit: r195535 - head/sys/amd64/amd64 Message-ID: <200907101029.n6AATGrk017107@svn.freebsd.org> Author: kib Date: Fri Jul 10 10:29:16 2009 New Revision: 195535 URL: http://svn.freebsd.org/changeset/base/195535 Log: When amd64 CPU cannot load segment descriptor during trap return to usermode, it generates GPF, that is mirrored to user mode as SIGSEGV. The offending register in mcontext should contain the value loading of which generated the GPF, and it is so on i386. On amd64, we currently report segment descriptor in tf_err, while segment register contains the corrected value loaded by trap handler. Fix the issue by behaving like i386, reloading segment register in trap frame after signal frame is pushed onto user stack. Noted and tested by: pho Approved by: re (kensmith) Modified: head/sys/amd64/amd64/exception.S Modified: head/sys/amd64/amd64/exception.S ============================================================================== --- head/sys/amd64/amd64/exception.S Fri Jul 10 08:18:08 2009 (r195534) +++ head/sys/amd64/amd64/exception.S Fri Jul 10 10:29:16 2009 (r195535) @@ -766,38 +766,38 @@ doreti_iret_fault: .globl ds_load_fault ds_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movzwl TF_DS(%rsp),%edx - movl %edx,TF_ERR(%rsp) + movq %rsp, %rdi + call trap movw $KUDSEL,TF_DS(%rsp) - jmp calltrap + jmp doreti ALIGN_TEXT .globl es_load_fault es_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movzwl TF_ES(%rsp),%edx - movl %edx,TF_ERR(%rsp) + movq %rsp, %rdi + call trap movw $KUDSEL,TF_ES(%rsp) - jmp calltrap + jmp doreti ALIGN_TEXT .globl fs_load_fault fs_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movzwl TF_FS(%rsp),%edx - movl %edx,TF_ERR(%rsp) + movq %rsp, %rdi + call trap movw $KUF32SEL,TF_FS(%rsp) - jmp calltrap + jmp doreti ALIGN_TEXT .globl gs_load_fault gs_load_fault: popfq movl $T_PROTFLT,TF_TRAPNO(%rsp) - movzwl TF_GS(%rsp),%edx - movl %edx,TF_ERR(%rsp) + movq %rsp, %rdi + call trap movw $KUG32SEL,TF_GS(%rsp) - jmp calltrap + jmp doreti #ifdef HWPMC_HOOKS ENTRY(end_exceptions) #endif From des at des.no Fri Jul 10 11:19:25 2009 From: des at des.no (=?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?=) Date: Fri Jul 10 11:19:31 2009 Subject: svn commit: r195485 - in stable/7/sys: . contrib/pf kern In-Reply-To: <20090710013243.68775e75@dev.lan.Awfulhak.org> (Brian Somers's message of "Fri, 10 Jul 2009 01:32:43 -0700") References: <200907090912.n699CGx0077581@svn.freebsd.org> <20090709103126.02bf7206@Awfulhak.org> <200907092235.18828.max@love2party.net> <20090710013243.68775e75@dev.lan.Awfulhak.org> Message-ID: <86ws6gu6o7.fsf@ds4.des.no> Brian Somers writes: > However, the bit that I don't understand about the original commit and > its update of the contrib/pf mergeinfo is why it's updated at all > [...] Because svn needs to record that the revision you merged into sys was also merged into sys/contrib/pf. > Having said all that, svn's --depth switch allows partially sparse tree > checkouts, and it's always possible to svn revert part of a merge > before committing. Don't. You'd just make things worse. Read http://wiki.freebsd.org/SubversionPrimer and its subpages. DES -- Dag-Erling Sm?rgrav - des@des.no From des at des.no Fri Jul 10 11:21:36 2009 From: des at des.no (=?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?=) Date: Fri Jul 10 11:21:43 2009 Subject: svn commit: r195534 - in head: etc/mtree include lib/libcam sbin/camcontrol share/man/man4 sys/cam sys/cam/ata sys/cam/scsi sys/conf sys/dev/advansys sys/dev/ahci sys/dev/aic7xxx sys/dev/amd sys/de... In-Reply-To: <80355.1247215110@critter.freebsd.dk> (Poul-Henning Kamp's message of "Fri, 10 Jul 2009 08:38:30 +0000") References: <80355.1247215110@critter.freebsd.dk> Message-ID: <86skh4u6kh.fsf@ds4.des.no> "Poul-Henning Kamp" writes: > I'm all for unifying the namespace, but still remember how much pain > the "didn't find that disk, lets renumber all of the rest of them" > causes, so I tend to prefer physically bound names. cXtYdZ for the win! DES -- Dag-Erling Sm?rgrav - des@des.no From phk at phk.freebsd.dk Fri Jul 10 11:56:52 2009 From: phk at phk.freebsd.dk (Poul-Henning Kamp) Date: Fri Jul 10 11:56:58 2009 Subject: svn commit: r195534 - in head: etc/mtree include lib/libcam sbin/camcontrol share/man/man4 sys/cam sys/cam/ata sys/cam/scsi sys/conf sys/dev/advansys sys/dev/ahci sys/dev/aic7xxx sys/dev/amd sys/de... In-Reply-To: Your message of "Fri, 10 Jul 2009 13:21:34 +0200." <86skh4u6kh.fsf@ds4.des.no> Message-ID: <88238.1247227018@critter.freebsd.dk> In message <86skh4u6kh.fsf@ds4.des.no>, =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= wr ites: >"Poul-Henning Kamp" writes: >> I'm all for unifying the namespace, but still remember how much pain >> the "didn't find that disk, lets renumber all of the rest of them" >> causes, so I tend to prefer physically bound names. > >cXtYdZ for the win! Actually, maybe the solution is to push glabel much more agrressively (ie: read sysinstall) -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. From ivoras at freebsd.org Fri Jul 10 12:52:02 2009 From: ivoras at freebsd.org (Ivan Voras) Date: Fri Jul 10 12:52:08 2009 Subject: svn commit: r195534 - in head: etc/mtree include lib/libcam sbin/camcontrol share/man/man4 sys/cam sys/cam/ata sys/cam/scsi sys/conf sys/dev/advansys sys/dev/ahci sys/dev/aic7xxx sys/dev/amd sys/de... In-Reply-To: <88238.1247227018@critter.freebsd.dk> References: <86skh4u6kh.fsf@ds4.des.no> <88238.1247227018@critter.freebsd.dk> Message-ID: <9bbcef730907100551l58e97392oefa5daf87efa477a@mail.gmail.com> 2009/7/10 Poul-Henning Kamp : > In message <86skh4u6kh.fsf@ds4.des.no>, =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= wr > ites: >>"Poul-Henning Kamp" writes: >>> I'm all for unifying the namespace, but still remember how much pain >>> the "didn't find that disk, lets renumber all of the rest of them" >>> causes, so I tend to prefer physically bound names. >> >>cXtYdZ for the win! > > Actually, maybe the solution is to push glabel much more agrressively > (ie: read sysinstall) Publishing drive IDs from the driver to the GEOM layer will naturally and automatically provide a reasonable unique ID to be used by sysinstall et al. It's done for ATA, but AFAIK not for CAM. I'm a bit puzzled about that - it looks trivial? I see that "camcontrol inquiry -S" works: # camcontrol inquiry da0 -S B399P6A04GRS ...but apparently not in all cases - the same on another machine (a virtual machine under VMWare) doesn't print out anything. Then there are non-da devices: # camcontrol inquiry mfid0 -S camcontrol: cam_lookup_pass: CAMGETPASSTHRU ioctl failed cam_lookup_pass: No such file or directory cam_lookup_pass: either the pass driver isn't in your kernel cam_lookup_pass: or mfid0 doesn't exist I don't know enough about the SCSI drivers to conclude anything useful. From thompsa at FreeBSD.org Fri Jul 10 14:15:54 2009 From: thompsa at FreeBSD.org (Andrew Thompson) Date: Fri Jul 10 14:16:08 2009 Subject: svn commit: r195560 - head/lib/libusb Message-ID: <200907101415.n6AEFrb8022379@svn.freebsd.org> Author: thompsa Date: Fri Jul 10 14:15:53 2009 New Revision: 195560 URL: http://svn.freebsd.org/changeset/base/195560 Log: Sync the libusb 1.0 exported api to the latest GSoC code. - Fix possible uninitialised variables and null derefs - Support big transfers - Various bug fixes and style changes Submitted by: Sylvestre Gallon Sponsored by: Google Summer of Code 2009 Approved by: re (kib) Modified: head/lib/libusb/libusb.h head/lib/libusb/libusb10.c head/lib/libusb/libusb10.h head/lib/libusb/libusb10_desc.c head/lib/libusb/libusb10_io.c Modified: head/lib/libusb/libusb.h ============================================================================== --- head/lib/libusb/libusb.h Fri Jul 10 13:33:22 2009 (r195559) +++ head/lib/libusb/libusb.h Fri Jul 10 14:15:53 2009 (r195560) @@ -27,14 +27,16 @@ #ifndef __LIBUSB_H__ #define __LIBUSB_H__ +#include +#include +#include +#include + #include #include #include #include -#include -#include -#include #ifdef __cplusplus extern "C" { @@ -44,10 +46,6 @@ extern "C" { #endif -struct list_head { - struct list_head *prev, *next; -}; - /* libusb enums */ enum libusb_class_code { @@ -183,6 +181,33 @@ enum libusb_debug_level { LIBUSB_DEBUG_TRANSFER=2, }; +/* internal structures */ + +typedef struct libusb_pollfd { + int fd; + short events; +} libusb_pollfd; + +struct usb_pollfd { + TAILQ_ENTRY(usb_pollfd) list; + struct libusb_pollfd pollfd; +}; + +struct usb_transfer { + TAILQ_ENTRY(usb_transfer) list; + int num_iso_packets; + struct timeval timeout; + int transferred; + uint8_t flags; +}; + +struct usb_ep_tr { + TAILQ_ENTRY(usb_ep_tr) list; + uint8_t addr; + uint8_t idx; + uint8_t flags; + void *os_priv; +}; /* libusb structures */ typedef void (*libusb_pollfd_added_cb) (int fd, short events, void *user_data); @@ -194,16 +219,16 @@ typedef struct libusb_context { int ctrl_pipe[2]; - struct list_head usb_devs; + TAILQ_HEAD(usb_devs_list, libusb_device) usb_devs; pthread_mutex_t usb_devs_lock; - struct list_head open_devs; + TAILQ_HEAD(open_devs_list, libusb_device_handle) open_devs; pthread_mutex_t open_devs_lock; - struct list_head flying_transfers; + TAILQ_HEAD(flying_transfers_list, usb_transfer) flying_transfers; pthread_mutex_t flying_transfers_lock; - struct list_head pollfds; + TAILQ_HEAD(pollfds_list, usb_pollfd) pollfds; pthread_mutex_t pollfds_lock; unsigned int pollfd_modify; @@ -230,7 +255,7 @@ typedef struct libusb_device { uint8_t device_address; uint8_t num_configurations; - struct list_head list; + TAILQ_ENTRY(libusb_device) list; unsigned long session_data; void *os_priv; } libusb_device; @@ -239,9 +264,10 @@ typedef struct libusb_device_handle { pthread_mutex_t lock; unsigned long claimed_interfaces; - struct list_head list; + TAILQ_ENTRY(libusb_device_handle) list; struct libusb_device *dev; void *os_priv; + TAILQ_HEAD(ep_list, usb_ep_tr) ep_list; } libusb_device_handle; typedef struct libusb_device_descriptor { @@ -343,11 +369,6 @@ typedef struct libusb_transfer { struct libusb_iso_packet_descriptor iso_packet_desc[0]; } libusb_transfer __aligned(sizeof(void *)); -typedef struct libusb_pollfd { - int fd; - short events; -} libusb_pollfd; - /* Library initialisation */ void libusb_set_debug(libusb_context * ctx, int level); @@ -360,6 +381,7 @@ ssize_t libusb_get_device_list(libusb_co void libusb_free_device_list(libusb_device ** list, int unref_devices); uint8_t libusb_get_bus_number(libusb_device * dev); uint8_t libusb_get_device_address(libusb_device * dev); +int libusb_clear_halt(libusb_device_handle *devh, unsigned char endpoint); int libusb_get_max_packet_size(libusb_device * dev, unsigned char endpoint); libusb_device *libusb_ref_device(libusb_device * dev); void libusb_unref_device(libusb_device * dev); Modified: head/lib/libusb/libusb10.c ============================================================================== --- head/lib/libusb/libusb10.c Fri Jul 10 13:33:22 2009 (r195559) +++ head/lib/libusb/libusb10.c Fri Jul 10 14:15:53 2009 (r195560) @@ -75,8 +75,8 @@ libusb_init(libusb_context ** context) pthread_mutex_init(&ctx->usb_devs_lock, NULL); pthread_mutex_init(&ctx->open_devs_lock, NULL); - USB_LIST_INIT(&ctx->usb_devs); - USB_LIST_INIT(&ctx->open_devs); + TAILQ_INIT(&ctx->usb_devs); + TAILQ_INIT(&ctx->open_devs); pthread_mutex_init(&ctx->flying_transfers_lock, NULL); pthread_mutex_init(&ctx->pollfds_lock, NULL); @@ -85,8 +85,8 @@ libusb_init(libusb_context ** context) pthread_mutex_init(&ctx->event_waiters_lock, NULL); pthread_cond_init(&ctx->event_waiters_cond, NULL); - USB_LIST_INIT(&ctx->flying_transfers); - USB_LIST_INIT(&ctx->pollfds); + TAILQ_INIT(&ctx->flying_transfers); + TAILQ_INIT(&ctx->pollfds); ret = pipe(ctx->ctrl_pipe); if (ret < 0) { @@ -123,7 +123,7 @@ libusb_exit(libusb_context * ctx) { GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_exit enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_exit enter"); usb_remove_pollfd(ctx, ctx->ctrl_pipe[0]); close(ctx->ctrl_pipe[0]); close(ctx->ctrl_pipe[1]); @@ -135,7 +135,7 @@ libusb_exit(libusb_context * ctx) pthread_mutex_unlock(&default_context_lock); free(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_exit leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_exit leave"); } /* Device handling and initialisation. */ @@ -150,7 +150,7 @@ libusb_get_device_list(libusb_context * int i; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_device_list enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_device_list enter"); usb_backend = libusb20_be_alloc_default(); if (usb_backend == NULL) @@ -178,6 +178,10 @@ libusb_get_device_list(libusb_context * ddesc = libusb20_dev_get_device_desc(pdev); dev = malloc(sizeof(*dev)); if (dev == NULL) { + while (i != 0) { + libusb_unref_device((*list)[i - 1]); + i--; + } free(*list); libusb20_be_free(usb_backend); return (LIBUSB_ERROR_NO_MEM); @@ -194,7 +198,7 @@ libusb_get_device_list(libusb_context * dev->os_priv = pdev; pthread_mutex_lock(&ctx->usb_devs_lock); - LIST_ADD(&dev->list, &ctx->usb_devs); + TAILQ_INSERT_HEAD(&ctx->usb_devs, dev, list); pthread_mutex_unlock(&ctx->usb_devs_lock); (*list)[i] = libusb_ref_device(dev); @@ -203,7 +207,7 @@ libusb_get_device_list(libusb_context * (*list)[i] = NULL; libusb20_be_free(usb_backend); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_device_list leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_device_list leave"); return (i); } @@ -219,7 +223,7 @@ libusb_free_device_list(libusb_device ** ctx = NULL; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_free_device_list enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_free_device_list enter"); if (list == NULL) return ; @@ -229,7 +233,7 @@ libusb_free_device_list(libusb_device ** libusb_unref_device(list[i]); } free(list); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_free_device_list leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_free_device_list leave"); } uint8_t @@ -239,11 +243,11 @@ libusb_get_bus_number(libusb_device * de ctx = NULL; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_bus_number enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_bus_number enter"); if (dev == NULL) return (LIBUSB_ERROR_NO_DEVICE); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_bus_number leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_bus_number leave"); return (dev->bus_number); } @@ -254,11 +258,11 @@ libusb_get_device_address(libusb_device ctx = NULL; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_device_address enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_device_address enter"); if (dev == NULL) return (LIBUSB_ERROR_NO_DEVICE); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_device_address leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_device_address leave"); return (dev->device_address); } @@ -274,7 +278,7 @@ libusb_get_max_packet_size(libusb_device ctx = NULL; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_max_packet_size enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_max_packet_size enter"); if (dev == NULL) return (LIBUSB_ERROR_NO_DEVICE); @@ -299,7 +303,7 @@ libusb_get_max_packet_size(libusb_device out: libusb_free_config_descriptor(pdconf); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_max_packet_size leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_max_packet_size leave"); return (ret); } @@ -310,7 +314,7 @@ libusb_ref_device(libusb_device * dev) ctx = NULL; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_ref_device enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_ref_device enter"); if (dev == NULL) return (NULL); @@ -319,7 +323,7 @@ libusb_ref_device(libusb_device * dev) dev->refcnt++; pthread_mutex_unlock(&dev->lock); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_ref_device leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_ref_device leave"); return (dev); } @@ -330,7 +334,7 @@ libusb_unref_device(libusb_device * dev) ctx = NULL; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_unref_device enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_unref_device enter"); if (dev == NULL) return; @@ -341,13 +345,13 @@ libusb_unref_device(libusb_device * dev) if (dev->refcnt == 0) { pthread_mutex_lock(&dev->ctx->usb_devs_lock); - LIST_DEL(&dev->list); + TAILQ_REMOVE(&ctx->usb_devs, dev, list); pthread_mutex_unlock(&dev->ctx->usb_devs_lock); libusb20_dev_free(dev->os_priv); free(dev); } - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_unref_device leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_unref_device leave"); } int @@ -360,7 +364,7 @@ libusb_open(libusb_device * dev, libusb_ int err; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_open enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_open enter"); dummy = 1; if (devh == NULL) @@ -378,6 +382,7 @@ libusb_open(libusb_device * dev, libusb_ memset(hdl, 0, sizeof(*hdl)); pthread_mutex_init(&hdl->lock, NULL); + TAILQ_INIT(&hdl->ep_list); hdl->dev = libusb_ref_device(dev); hdl->claimed_interfaces = 0; hdl->os_priv = dev->os_priv; @@ -390,7 +395,7 @@ libusb_open(libusb_device * dev, libusb_ } pthread_mutex_lock(&ctx->open_devs_lock); - LIST_ADD(&hdl->list, &ctx->open_devs); + TAILQ_INSERT_HEAD(&ctx->open_devs, hdl, list); pthread_mutex_unlock(&ctx->open_devs_lock); *devh = hdl; @@ -414,7 +419,7 @@ libusb_open(libusb_device * dev, libusb_ pthread_mutex_unlock(&ctx->pollfd_modify_lock); libusb_unlock_events(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_open leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_open leave"); return (0); } @@ -429,7 +434,7 @@ libusb_open_device_with_vid_pid(libusb_c int i, j; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_open_device_width_vid_pid enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_open_device_width_vid_pid enter"); devh = NULL; @@ -440,13 +445,15 @@ libusb_open_device_with_vid_pid(libusb_c pdev = (struct libusb20_device *)devs[j]->os_priv; pdesc = libusb20_dev_get_device_desc(pdev); if (pdesc->idVendor == vendor_id && - pdesc->idProduct == product_id) + pdesc->idProduct == product_id) { if (libusb_open(devs[j], &devh) < 0) devh = NULL; + break ; + } } libusb_free_device_list(devs, 1); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_open_device_width_vid_pid leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_open_device_width_vid_pid leave"); return (devh); } @@ -455,6 +462,7 @@ libusb_close(libusb_device_handle * devh { libusb_context *ctx; struct libusb20_device *pdev; + struct usb_ep_tr *eptr; unsigned char dummy = 1; int err; @@ -465,7 +473,7 @@ libusb_close(libusb_device_handle * devh pdev = devh->os_priv; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_close enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_close enter"); pthread_mutex_lock(&ctx->pollfd_modify_lock); ctx->pollfd_modify++; @@ -475,12 +483,21 @@ libusb_close(libusb_device_handle * devh if (err <= 0) { pthread_mutex_lock(&ctx->open_devs_lock); - LIST_DEL(&devh->list); + TAILQ_REMOVE(&ctx->open_devs, devh, list); pthread_mutex_unlock(&ctx->open_devs_lock); usb_remove_pollfd(ctx, libusb20_dev_get_fd(pdev)); - libusb_unref_device(devh->dev); libusb20_dev_close(pdev); + libusb_unref_device(devh->dev); + TAILQ_FOREACH(eptr, &devh->ep_list, list) { + TAILQ_REMOVE(&devh->ep_list, eptr, list); + libusb20_tr_close(((struct libusb20_transfer **) + eptr->os_priv)[0]); + if (eptr->flags) + libusb20_tr_close(((struct libusb20_transfer **) + eptr->os_priv)[1]); + free((struct libusb20_transfer **)eptr->os_priv); + } free(devh); pthread_mutex_lock(&ctx->pollfd_modify_lock); @@ -492,12 +509,21 @@ libusb_close(libusb_device_handle * devh read(ctx->ctrl_pipe[0], &dummy, sizeof(dummy)); pthread_mutex_lock(&ctx->open_devs_lock); - LIST_DEL(&devh->list); + TAILQ_REMOVE(&ctx->open_devs, devh, list); pthread_mutex_unlock(&ctx->open_devs_lock); usb_remove_pollfd(ctx, libusb20_dev_get_fd(pdev)); - libusb_unref_device(devh->dev); libusb20_dev_close(pdev); + libusb_unref_device(devh->dev); + TAILQ_FOREACH(eptr, &devh->ep_list, list) { + TAILQ_REMOVE(&devh->ep_list, eptr, list); + libusb20_tr_close(((struct libusb20_transfer **) + eptr->os_priv)[0]); + if (eptr->flags) + libusb20_tr_close(((struct libusb20_transfer **) + eptr->os_priv)[1]); + free((struct libusb20_transfer **)eptr->os_priv); + } free(devh); pthread_mutex_lock(&ctx->pollfd_modify_lock); @@ -505,7 +531,7 @@ libusb_close(libusb_device_handle * devh pthread_mutex_unlock(&ctx->pollfd_modify_lock); libusb_unlock_events(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_close leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_close leave"); } libusb_device * @@ -515,12 +541,12 @@ libusb_get_device(libusb_device_handle * ctx = NULL; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_device enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_device enter"); if (devh == NULL) return (NULL); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_device leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_device leave"); return (devh->dev); } @@ -531,7 +557,7 @@ libusb_get_configuration(libusb_device_h ctx = NULL; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_configuration enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_configuration enter"); if (devh == NULL || config == NULL) return (LIBUSB_ERROR_INVALID_PARAM); @@ -539,14 +565,10 @@ libusb_get_configuration(libusb_device_h *config = libusb20_dev_get_config_index((struct libusb20_device *) devh->dev->os_priv); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_configuration leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_get_configuration leave"); return (0); } -/* - * XXX this code is wrong. need update. - */ - int libusb_set_configuration(libusb_device_handle * devh, int configuration) { @@ -555,16 +577,15 @@ libusb_set_configuration(libusb_device_h ctx = NULL; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_set_configuration enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_set_configuration enter"); if (devh == NULL) return (LIBUSB_ERROR_INVALID_PARAM); pdev = (struct libusb20_device *)devh->dev->os_priv; - libusb20_dev_set_alt_index(pdev, libusb20_dev_get_config_index(pdev), - configuration); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_set_configuration leave"); + libusb20_dev_set_config_index(pdev, configuration); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_set_configuration leave"); return (0); } @@ -576,7 +597,7 @@ libusb_claim_interface(libusb_device_han ctx = NULL; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_claim_interface enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_claim_interface enter"); if (dev == NULL) return (LIBUSB_ERROR_INVALID_PARAM); @@ -592,7 +613,7 @@ libusb_claim_interface(libusb_device_han dev->claimed_interfaces |= (1 << interface_number); pthread_mutex_unlock(&(dev->lock)); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_claim_interface leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_claim_interface leave"); return (ret); } @@ -604,7 +625,7 @@ libusb_release_interface(libusb_device_h ctx = NULL; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_release_interface enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_release_interface enter"); ret = 0; if (dev == NULL) @@ -621,7 +642,7 @@ libusb_release_interface(libusb_device_h dev->claimed_interfaces &= ~(1 << interface_number); pthread_mutex_unlock(&(dev->lock)); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_release_interface leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_release_interface leave"); return (ret); } @@ -630,11 +651,10 @@ libusb_set_interface_alt_setting(libusb_ int interface_number, int alternate_setting) { libusb_context *ctx; - int ret; ctx = NULL; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_set_interface_alt_setting enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_set_interface_alt_setting enter"); if (dev == NULL) return (LIBUSB_ERROR_INVALID_PARAM); @@ -653,7 +673,7 @@ libusb_set_interface_alt_setting(libusb_ alternate_setting) != 0) return (LIBUSB_ERROR_OTHER); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_set_interface_alt_setting leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_set_interface_alt_setting leave"); return (0); } @@ -661,14 +681,19 @@ int libusb_clear_halt(libusb_device_handle * devh, unsigned char endpoint) { struct libusb20_transfer *xfer; + struct libusb20_device *pdev; libusb_context *ctx; int ret; ctx = NULL; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_clear_halt enter"); - - GET_XFER(xfer, endpoint, devh->os_priv); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_clear_halt enter"); + + pdev = devh->os_priv; + xfer = libusb20_tr_get_pointer(pdev, + ((endpoint / 0x40) | (endpoint * 4)) % (16 * 4)); + if (xfer == NULL) + return (LIBUSB_ERROR_NO_MEM); pthread_mutex_lock(&libusb20_lock); ret = libusb20_tr_open(xfer, 0, 0, endpoint); @@ -682,7 +707,7 @@ libusb_clear_halt(libusb_device_handle * libusb20_tr_close(xfer); pthread_mutex_unlock(&libusb20_lock); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_clear_halt leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_clear_halt leave"); return (0); } @@ -693,13 +718,13 @@ libusb_reset_device(libusb_device_handle ctx = NULL; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_reset_device enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_reset_device enter"); if (dev == NULL) return (LIBUSB20_ERROR_INVALID_PARAM); libusb20_dev_reset(dev->os_priv); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_reset_device leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_reset_device leave"); return (0); } @@ -710,12 +735,12 @@ libusb_kernel_driver_active(libusb_devic ctx = NULL; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_kernel_driver_active enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_kernel_driver_active enter"); if (devh == NULL) return (LIBUSB_ERROR_INVALID_PARAM); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_kernel_driver_active leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_kernel_driver_active leave"); return (libusb20_dev_kernel_driver_active(devh->os_priv, interface)); } @@ -727,7 +752,7 @@ libusb_detach_kernel_driver(libusb_devic ctx = NULL; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_detach_kernel_driver enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_detach_kernel_driver enter"); if (devh == NULL) return (LIBUSB_ERROR_INVALID_PARAM); @@ -736,7 +761,7 @@ libusb_detach_kernel_driver(libusb_devic if (libusb20_dev_detach_kernel_driver(pdev, interface) == LIBUSB20_ERROR_OTHER) return (LIBUSB_ERROR_OTHER); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_detach_kernel_driver leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_detach_kernel_driver leave"); return (0); } @@ -751,12 +776,12 @@ libusb_attach_kernel_driver(libusb_devic ctx = NULL; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_attach_kernel_driver enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_attach_kernel_driver enter"); if (devh == NULL) return (LIBUSB_ERROR_INVALID_PARAM); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_attach_kernel_driver leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_attach_kernel_driver leave"); return (0); } @@ -772,7 +797,7 @@ libusb_alloc_transfer(int iso_packets) ctx = NULL; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_alloc_transfer enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_alloc_transfer enter"); len = sizeof(struct libusb_transfer) + sizeof(struct usb_transfer) + @@ -788,7 +813,7 @@ libusb_alloc_transfer(int iso_packets) xfer = (struct libusb_transfer *) ((uint8_t *)bxfer + sizeof(struct usb_transfer)); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_alloc_transfer leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_alloc_transfer leave"); return (xfer); } @@ -800,7 +825,7 @@ libusb_free_transfer(struct libusb_trans ctx = NULL; GET_CONTEXT(ctx); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_free_transfer enter"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_free_transfer enter"); if (xfer == NULL) return ; @@ -809,10 +834,85 @@ libusb_free_transfer(struct libusb_trans sizeof(struct usb_transfer)); free(bxfer); - dprintf(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_free_transfer leave"); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_free_transfer leave"); return; } +static int +libusb_get_maxframe(struct libusb20_device *pdev, libusb_transfer *xfer) +{ + int ret; + int usb_speed; + + usb_speed = libusb20_dev_get_speed(pdev); + + switch (xfer->type) { + case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: + switch (usb_speed) { + case LIBUSB20_SPEED_LOW: + case LIBUSB20_SPEED_FULL: + ret = 60 * 1; + break ; + default : + ret = 60 * 8; + break ; + } + break ; + case LIBUSB_TRANSFER_TYPE_CONTROL: + ret = 2; + break ; + default: + ret = 1; + break ; + } + + return ret; +} + +static int +libusb_get_buffsize(struct libusb20_device *pdev, libusb_transfer *xfer) +{ + int ret; + int usb_speed; + + usb_speed = libusb20_dev_get_speed(pdev); + + switch (xfer->type) { + case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: + ret = 0; + break ; + case LIBUSB_TRANSFER_TYPE_CONTROL: + switch (usb_speed) { + case LIBUSB20_SPEED_LOW: + ret = 8; + break ; + case LIBUSB20_SPEED_FULL: + ret = 64; + break ; + default: + ret = 64; + break ; + } + ret += 8; + break ; + default : + switch (usb_speed) { + case LIBUSB20_SPEED_LOW: + ret = 256; + break ; + case LIBUSB20_SPEED_FULL: + ret = 4096; + break ; + default: + ret = 16384; + break ; + } + break ; + } + + return ret; +} + static void libusb10_proxy(struct libusb20_transfer *xfer) { @@ -820,6 +920,9 @@ libusb10_proxy(struct libusb20_transfer struct libusb20_device *pdev; libusb_transfer *usb_xfer; libusb_context *ctx; + uint32_t pos; + uint32_t max; + uint32_t size; uint8_t status; uint32_t iso_packets; int i; @@ -834,172 +937,97 @@ libusb10_proxy(struct libusb20_transfer switch (status) { case LIBUSB20_TRANSFER_COMPLETED: - dprintf(ctx, LIBUSB_DEBUG_TRANSFER, "LIBUSB20 SUBMIT"); - usb_xfer->actual_length += libusb20_tr_get_actual_length(xfer); - usb_xfer->callback(usb_xfer); - - pthread_mutex_lock(&ctx->flying_transfers_lock); - LIST_DEL(&usb_backend->list); - pthread_mutex_unlock(&ctx->flying_transfers_lock); + usb_backend->transferred += libusb20_tr_get_actual_length(xfer); + DPRINTF(ctx, LIBUSB_DEBUG_TRANSFER, "LIBUSB20 TRANSFER %i bytes", + usb_backend->transferred); + if (usb_backend->transferred != usb_xfer->length) + goto tr_start; + + DPRINTF(ctx, LIBUSB_DEBUG_TRANSFER, "LIBUSB20 TRANSFER COMPLETE"); + usb_handle_transfer_completion(usb_backend, LIBUSB_TRANSFER_COMPLETED); + break ; case LIBUSB20_TRANSFER_START: - dprintf(ctx, LIBUSB_DEBUG_TRANSFER, "LIBUSB20 START"); +tr_start: + DPRINTF(ctx, LIBUSB_DEBUG_TRANSFER, "LIBUSB20 START"); + max = libusb_get_buffsize(pdev, usb_xfer); + pos = usb_backend->transferred; + size = (usb_xfer->length - pos); + size = (size > max) ? max : size; usb_xfer->actual_length = 0; switch (usb_xfer->type) { case LIBUSB_TRANSFER_TYPE_CONTROL: - dprintf(ctx, LIBUSB_DEBUG_TRANSFER, "TYPE CTR"); + DPRINTF(ctx, LIBUSB_DEBUG_TRANSFER, "TYPE CTR"); libusb20_tr_setup_control(xfer, usb_xfer->buffer, - (void *)(((uint8_t *) usb_xfer->buffer) + + (void *)(((uint8_t *) &usb_xfer->buffer[pos]) + sizeof(libusb_control_setup)), usb_xfer->timeout); break ; case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: - dprintf(ctx, LIBUSB_DEBUG_TRANSFER, "TYPE ISO"); + DPRINTF(ctx, LIBUSB_DEBUG_TRANSFER, "TYPE ISO"); iso_packets = libusb20_tr_get_max_frames(xfer); if (usb_xfer->num_iso_packets > iso_packets) usb_xfer->num_iso_packets = iso_packets; for (i = 0 ; i < usb_xfer->num_iso_packets ; i++) { libusb20_tr_setup_isoc(xfer, - usb_xfer->buffer, usb_xfer->length, i); + &usb_xfer->buffer[pos], size, i); } libusb20_tr_set_total_frames(xfer, i); break ; case LIBUSB_TRANSFER_TYPE_BULK: - dprintf(ctx, LIBUSB_DEBUG_TRANSFER, "TYPE BULK"); - libusb20_tr_setup_bulk(xfer, usb_xfer->buffer, - usb_xfer->length, usb_xfer->timeout); + DPRINTF(ctx, LIBUSB_DEBUG_TRANSFER, "TYPE BULK"); + libusb20_tr_setup_bulk(xfer, &usb_xfer->buffer[pos], + size, usb_xfer->timeout); break ; case LIBUSB_TRANSFER_TYPE_INTERRUPT: - dprintf(ctx, LIBUSB_DEBUG_TRANSFER, "TYPE INTR"); - libusb20_tr_setup_intr(xfer, usb_xfer->buffer, - usb_xfer->length, usb_xfer->timeout); + DPRINTF(ctx, LIBUSB_DEBUG_TRANSFER, "TYPE INTR"); + libusb20_tr_setup_intr(xfer, &usb_xfer->buffer[pos], + size, usb_xfer->timeout); break ; } libusb20_tr_submit(xfer); - dprintf(ctx, LIBUSB_DEBUG_TRANSFER, "LIBUSB20 SUBMITED"); + DPRINTF(ctx, LIBUSB_DEBUG_TRANSFER, "LIBUSB20 SUBMITED"); break ; default: - if (ctx->debug == LIBUSB_DEBUG_TRANSFER) - printf("LIBUSB TRANSFER DEFAULT 0x%x\n", status); - usb_xfer->actual_length = 0; - usb_xfer->status = LIBUSB_TRANSFER_CANCELLED; - - pthread_mutex_lock(&ctx->flying_transfers_lock); - LIST_DEL(&usb_backend->list); - pthread_mutex_unlock(&ctx->flying_transfers_lock); - usb_xfer->callback(usb_xfer); - + DPRINTF(ctx, LIBUSB_DEBUG_TRANSFER, "TRANSFER DEFAULT 0x%x\n", + status); + usb_backend->transferred = 0; + usb_handle_transfer_completion(usb_backend, LIBUSB_TRANSFER_CANCELLED); break ; } switch (status) { case LIBUSB20_TRANSFER_COMPLETED: - dprintf(ctx, LIBUSB_DEBUG_TRANSFER, "STATUS COMPLETED"); + DPRINTF(ctx, LIBUSB_DEBUG_TRANSFER, "STATUS COMPLETED"); usb_xfer->status = LIBUSB_TRANSFER_COMPLETED; break ; case LIBUSB20_TRANSFER_OVERFLOW: - dprintf(ctx, LIBUSB_DEBUG_TRANSFER, "STATUS TR OVERFLOW"); + DPRINTF(ctx, LIBUSB_DEBUG_TRANSFER, "STATUS TR OVERFLOW"); usb_xfer->status = LIBUSB_TRANSFER_OVERFLOW; break ; case LIBUSB20_TRANSFER_NO_DEVICE: - dprintf(ctx, LIBUSB_DEBUG_TRANSFER, "STATUS TR NO DEVICE"); + DPRINTF(ctx, LIBUSB_DEBUG_TRANSFER, "STATUS TR NO DEVICE"); usb_xfer->status = LIBUSB_TRANSFER_NO_DEVICE; break ; case LIBUSB20_TRANSFER_STALL: - dprintf(ctx, LIBUSB_DEBUG_TRANSFER, "STATUS TR STALL"); + DPRINTF(ctx, LIBUSB_DEBUG_TRANSFER, "STATUS TR STALL"); usb_xfer->status = LIBUSB_TRANSFER_STALL; break ; case LIBUSB20_TRANSFER_CANCELLED: - dprintf(ctx, LIBUSB_DEBUG_TRANSFER, "STATUS TR CANCELLED"); + DPRINTF(ctx, LIBUSB_DEBUG_TRANSFER, "STATUS TR CANCELLED"); usb_xfer->status = LIBUSB_TRANSFER_CANCELLED; break ; case LIBUSB20_TRANSFER_TIMED_OUT: - dprintf(ctx, LIBUSB_DEBUG_TRANSFER, "STATUS TR TIMEOUT"); + DPRINTF(ctx, LIBUSB_DEBUG_TRANSFER, "STATUS TR TIMEOUT"); usb_xfer->status = LIBUSB_TRANSFER_TIMED_OUT; break ; case LIBUSB20_TRANSFER_ERROR: - dprintf(ctx, LIBUSB_DEBUG_TRANSFER, "ERROR"); + DPRINTF(ctx, LIBUSB_DEBUG_TRANSFER, "ERROR"); usb_xfer->status = LIBUSB_TRANSFER_ERROR; break ; } } -static int -libusb_get_maxframe(struct libusb20_device *pdev, libusb_transfer *xfer) -{ - int ret; - int usb_speed; - - usb_speed = libusb20_dev_get_speed(pdev); - - switch (xfer->type) { - case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: - switch (usb_speed) { - case LIBUSB20_SPEED_LOW: - case LIBUSB20_SPEED_FULL: - ret = 60 * 1; - break ; - default : - ret = 60 * 8; - break ; - } - break ; - case LIBUSB_TRANSFER_TYPE_CONTROL: - ret = 2; - break ; - default: - ret = 1; - break ; - } - - return ret; -} - -static int -libusb_get_buffsize(struct libusb20_device *pdev, libusb_transfer *xfer) -{ - int ret; - int usb_speed; - - usb_speed = libusb20_dev_get_speed(pdev); - - switch (xfer->type) { - case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: - ret = 0; - break ; - case LIBUSB_TRANSFER_TYPE_CONTROL: - switch (usb_speed) { - case LIBUSB20_SPEED_LOW: - ret = 8; - break ; - case LIBUSB20_SPEED_FULL: - ret = 64; - break ; - case LIBUSB20_SPEED_HIGH: - ret = 64; - break ; - } - /*add */ - ret += 8; - break ; - default : - switch (usb_speed) { - case LIBUSB20_SPEED_LOW: - ret = 256; - break ; - case LIBUSB20_SPEED_FULL: - ret = 4096; - break ; - default: - ret = 16384; - break ; - } - break ; - } - - return ret; -} - int libusb_submit_transfer(struct libusb_transfer *xfer) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From sam at FreeBSD.org Fri Jul 10 15:26:34 2009 From: sam at FreeBSD.org (Sam Leffler) Date: Fri Jul 10 15:26:41 2009 Subject: svn commit: r195561 - head/sys/net80211 Message-ID: <200907101526.n6AFQYUN023991@svn.freebsd.org> Author: sam Date: Fri Jul 10 15:26:33 2009 New Revision: 195561 URL: http://svn.freebsd.org/changeset/base/195561 Log: mark struct ieee80211req_maclist packed so sizeof works as intended on arm; fixes "list mac" Approved by: re (kensmith) Modified: head/sys/net80211/ieee80211_ioctl.h Modified: head/sys/net80211/ieee80211_ioctl.h ============================================================================== --- head/sys/net80211/ieee80211_ioctl.h Fri Jul 10 14:15:53 2009 (r195560) +++ head/sys/net80211/ieee80211_ioctl.h Fri Jul 10 15:26:33 2009 (r195561) @@ -302,7 +302,7 @@ enum { struct ieee80211req_maclist { uint8_t ml_macaddr[IEEE80211_ADDR_LEN]; -}; +} __packed; /* * Set the active channel list by IEEE channel #: each channel From rpaulo at FreeBSD.org Fri Jul 10 15:28:35 2009 From: rpaulo at FreeBSD.org (Rui Paulo) Date: Fri Jul 10 15:28:42 2009 Subject: svn commit: r195562 - in head/sys/dev: ipw iwi iwn wpi Message-ID: <200907101528.n6AFSYNk024058@svn.freebsd.org> Author: rpaulo Date: Fri Jul 10 15:28:33 2009 New Revision: 195562 URL: http://svn.freebsd.org/changeset/base/195562 Log: For ic_opmode switch cases, provide a default label with a printf saying this opmode is not supported. Approved by: re (kib) Modified: head/sys/dev/ipw/if_ipw.c head/sys/dev/iwi/if_iwi.c head/sys/dev/iwn/if_iwn.c head/sys/dev/wpi/if_wpi.c Modified: head/sys/dev/ipw/if_ipw.c ============================================================================== --- head/sys/dev/ipw/if_ipw.c Fri Jul 10 15:26:33 2009 (r195561) +++ head/sys/dev/ipw/if_ipw.c Fri Jul 10 15:28:33 2009 (r195562) @@ -2462,6 +2462,9 @@ ipw_config(struct ipw_softc *sc) case IEEE80211_M_MONITOR: data = htole32(IPW_MODE_MONITOR); break; + default: + device_printf(sc->sc_dev, "unknown opmode %d\n", ic->ic_opmode); + return EINVAL; } DPRINTF(("Setting mode to %u\n", le32toh(data))); error = ipw_cmd(sc, IPW_CMD_SET_MODE, &data, sizeof data); Modified: head/sys/dev/iwi/if_iwi.c ============================================================================== --- head/sys/dev/iwi/if_iwi.c Fri Jul 10 15:26:33 2009 (r195561) +++ head/sys/dev/iwi/if_iwi.c Fri Jul 10 15:28:33 2009 (r195562) @@ -2208,7 +2208,8 @@ iwi_get_firmware(struct iwi_softc *sc, e &sc->fw_uc, "iwi_ucode_monitor"); break; default: - break; + device_printf(sc->sc_dev, "unknown opmode %d\n", opmode); + return EINVAL; } fp = sc->fw_fw.fp; if (fp == NULL) { Modified: head/sys/dev/iwn/if_iwn.c ============================================================================== --- head/sys/dev/iwn/if_iwn.c Fri Jul 10 15:26:33 2009 (r195561) +++ head/sys/dev/iwn/if_iwn.c Fri Jul 10 15:28:33 2009 (r195562) @@ -3916,7 +3916,8 @@ iwn_config(struct iwn_softc *sc) IWN_FILTER_CTL | IWN_FILTER_PROMISC); break; default: - break; + device_printf(sc->sc_dev, "unknown opmode %d\n", ic->ic_opmode); + return EINVAL; } sc->config.cck_mask = 0x0f; /* not yet negotiated */ sc->config.ofdm_mask = 0xff; /* not yet negotiated */ Modified: head/sys/dev/wpi/if_wpi.c ============================================================================== --- head/sys/dev/wpi/if_wpi.c Fri Jul 10 15:26:33 2009 (r195561) +++ head/sys/dev/wpi/if_wpi.c Fri Jul 10 15:28:33 2009 (r195562) @@ -2818,6 +2818,9 @@ wpi_config(struct wpi_softc *sc) sc->config.filter |= htole32(WPI_FILTER_MULTICAST | WPI_FILTER_CTL | WPI_FILTER_PROMISC); break; + default: + device_printf(sc->sc_dev, "unknown opmode %d\n", ic->ic_opmode); + return EINVAL; } sc->config.cck_mask = 0x0f; /* not yet negotiated */ sc->config.ofdm_mask = 0xff; /* not yet negotiated */ From scottl at FreeBSD.org Fri Jul 10 17:42:54 2009 From: scottl at FreeBSD.org (Scott Long) Date: Fri Jul 10 17:43:00 2009 Subject: svn commit: r195573 - head/sbin/camcontrol Message-ID: <200907101742.n6AHgrvQ027295@svn.freebsd.org> Author: scottl Date: Fri Jul 10 17:42:53 2009 New Revision: 195573 URL: http://svn.freebsd.org/changeset/base/195573 Log: Fix alignment issue with ATA IDENTIFY structure. Approved by: re Modified: head/sbin/camcontrol/camcontrol.c Modified: head/sbin/camcontrol/camcontrol.c ============================================================================== --- head/sbin/camcontrol/camcontrol.c Fri Jul 10 17:22:41 2009 (r195572) +++ head/sbin/camcontrol/camcontrol.c Fri Jul 10 17:42:53 2009 (r195573) @@ -1121,7 +1121,7 @@ ataidentify(struct cam_device *device, i { union ccb *ccb; struct ata_params *ident_buf; - int error = 0; + u_int i, error = 0; int16_t *ptr; ccb = cam_getccb(device); @@ -1135,22 +1135,21 @@ ataidentify(struct cam_device *device, i bzero(&(&ccb->ccb_h)[1], sizeof(struct ccb_ataio) - sizeof(struct ccb_hdr)); - ident_buf = (struct ata_params *)malloc( - sizeof(struct ata_params)); + ptr = (uint16_t *)malloc(sizeof(struct ata_params)); - if (ident_buf == NULL) { + if (ptr == NULL) { cam_freeccb(ccb); warnx("can't malloc memory for identify\n"); return(1); } - bzero(ident_buf, sizeof(*ident_buf)); + bzero(ptr, sizeof(struct ata_params)); cam_fill_ataio(&ccb->ataio, retry_count, NULL, /*flags*/CAM_DIR_IN, MSG_SIMPLE_Q_TAG, - /*data_ptr*/(u_int8_t *)ident_buf, + /*data_ptr*/(u_int8_t *)ptr, /*dxfer_len*/sizeof(struct ata_params), timeout ? timeout : 30 * 1000); // if (periph->path->device->protocol == PROTO_ATA) @@ -1172,6 +1171,7 @@ ataidentify(struct cam_device *device, i CAM_EPF_ALL, stderr); } + free(ptr); cam_freeccb(ccb); return(1); } @@ -1188,14 +1188,14 @@ ataidentify(struct cam_device *device, i cam_freeccb(ccb); if (error != 0) { - free(ident_buf); + free(ptr); return(error); } - for (ptr = (int16_t *)ident_buf; - ptr < (int16_t *)ident_buf + sizeof(struct ata_params)/2; ptr++) { - *ptr = le16toh(*ptr); - } + for (i = 0; i < sizeof(struct ata_params) / 2; i++) + ptr[i] = le16toh(ptr[i]); + ident_buf = (struct ata_params *)ptr; + if (strncmp(ident_buf->model, "FX", 2) && strncmp(ident_buf->model, "NEC", 3) && strncmp(ident_buf->model, "Pioneer", 7) && From kmacy at FreeBSD.org Fri Jul 10 19:43:08 2009 From: kmacy at FreeBSD.org (Kip Macy) Date: Fri Jul 10 19:43:15 2009 Subject: svn commit: r195586 - in stable/7/sys: . kern netgraph sys Message-ID: <200907101943.n6AJh8SX030247@svn.freebsd.org> Author: kmacy Date: Fri Jul 10 19:43:07 2009 New Revision: 195586 URL: http://svn.freebsd.org/changeset/base/195586 Log: propagate MFC of 195148 to -STABLE: - Turn the third (islocked) argument of the knote call into flags parameter. Introduce the new flag KNF_NOKQLOCK to allow event callers to be called without KQ_LOCK mtx held. - Modify VFS knote calls to always use KNF_NOKQLOCK flag. This is required for ZFS as its getattr implementation may sleep. Modified: stable/7/sys/ (props changed) stable/7/sys/kern/kern_event.c stable/7/sys/netgraph/ng_ksocket.c stable/7/sys/sys/event.h stable/7/sys/sys/mount.h stable/7/sys/sys/vnode.h Modified: stable/7/sys/kern/kern_event.c ============================================================================== --- stable/7/sys/kern/kern_event.c Fri Jul 10 19:31:05 2009 (r195585) +++ stable/7/sys/kern/kern_event.c Fri Jul 10 19:43:07 2009 (r195586) @@ -1608,17 +1608,18 @@ kqueue_wakeup(struct kqueue *kq) * first. */ void -knote(struct knlist *list, long hint, int islocked) +knote(struct knlist *list, long hint, int lockflags) { struct kqueue *kq; struct knote *kn; + int error; if (list == NULL) return; - KNL_ASSERT_LOCK(list, islocked); + KNL_ASSERT_LOCK(list, lockflags & KNF_LISTLOCKED); - if (!islocked) + if ((lockflags & KNF_LISTLOCKED) == 0) list->kl_lock(list->kl_lockarg); /* @@ -1633,17 +1634,28 @@ knote(struct knlist *list, long hint, in kq = kn->kn_kq; if ((kn->kn_status & KN_INFLUX) != KN_INFLUX) { KQ_LOCK(kq); - if ((kn->kn_status & KN_INFLUX) != KN_INFLUX) { + if ((kn->kn_status & KN_INFLUX) == KN_INFLUX) { + KQ_UNLOCK(kq); + } else if ((lockflags & KNF_NOKQLOCK) != 0) { + kn->kn_status |= KN_INFLUX; + KQ_UNLOCK(kq); + error = kn->kn_fop->f_event(kn, hint); + KQ_LOCK(kq); + kn->kn_status &= ~KN_INFLUX; + if (error) + KNOTE_ACTIVATE(kn, 1); + KQ_UNLOCK_FLUX(kq); + } else { kn->kn_status |= KN_HASKQLOCK; if (kn->kn_fop->f_event(kn, hint)) KNOTE_ACTIVATE(kn, 1); kn->kn_status &= ~KN_HASKQLOCK; + KQ_UNLOCK(kq); } - KQ_UNLOCK(kq); } kq = NULL; } - if (!islocked) + if ((lockflags & KNF_LISTLOCKED) == 0) list->kl_unlock(list->kl_lockarg); } Modified: stable/7/sys/netgraph/ng_ksocket.c ============================================================================== --- stable/7/sys/netgraph/ng_ksocket.c Fri Jul 10 19:31:05 2009 (r195585) +++ stable/7/sys/netgraph/ng_ksocket.c Fri Jul 10 19:43:07 2009 (r195586) @@ -1214,7 +1214,7 @@ ng_ksocket_finish_accept(priv_p priv) SOCK_UNLOCK(so); ACCEPT_UNLOCK(); - /* XXX KNOTE(&head->so_rcv.sb_sel.si_note, 0); */ + /* XXX KNOTE_UNLOCKED(&head->so_rcv.sb_sel.si_note, 0); */ soaccept(so, &sa); Modified: stable/7/sys/sys/event.h ============================================================================== --- stable/7/sys/sys/event.h Fri Jul 10 19:31:05 2009 (r195585) +++ stable/7/sys/sys/event.h Fri Jul 10 19:43:07 2009 (r195586) @@ -135,8 +135,14 @@ struct knlist { MALLOC_DECLARE(M_KQUEUE); #endif -#define KNOTE(list, hist, lock) knote(list, hist, lock) -#define KNOTE_LOCKED(list, hint) knote(list, hint, 1) +/* + * Flags for knote call + */ +#define KNF_LISTLOCKED 0x0001 /* knlist is locked */ +#define KNF_NOKQLOCK 0x0002 /* do not keep KQ_LOCK */ + +#define KNOTE(list, hist, flags) knote(list, hist, flags) +#define KNOTE_LOCKED(list, hint) knote(list, hint, KNF_LISTLOCKED) #define KNOTE_UNLOCKED(list, hint) knote(list, hint, 0) #define KNLIST_EMPTY(list) SLIST_EMPTY(&(list)->kl_list) @@ -204,7 +210,7 @@ struct thread; struct proc; struct knlist; -extern void knote(struct knlist *list, long hint, int islocked); +extern void knote(struct knlist *list, long hint, int lockflags); extern void knote_fork(struct knlist *list, int pid); extern void knlist_add(struct knlist *knl, struct knote *kn, int islocked); extern void knlist_remove(struct knlist *knl, struct knote *kn, int islocked); Modified: stable/7/sys/sys/mount.h ============================================================================== --- stable/7/sys/sys/mount.h Fri Jul 10 19:31:05 2009 (r195585) +++ stable/7/sys/sys/mount.h Fri Jul 10 19:43:07 2009 (r195586) @@ -633,7 +633,7 @@ extern int mpsafe_vfs; #define VFS_KNOTE_LOCKED(vp, hint) do \ { \ if (((vp)->v_vflag & VV_NOKNOTE) == 0) \ - VN_KNOTE((vp), (hint), 1); \ + VN_KNOTE((vp), (hint), KNF_LISTLOCKED); \ } while (0) #define VFS_KNOTE_UNLOCKED(vp, hint) do \ Modified: stable/7/sys/sys/vnode.h ============================================================================== --- stable/7/sys/sys/vnode.h Fri Jul 10 19:31:05 2009 (r195585) +++ stable/7/sys/sys/vnode.h Fri Jul 10 19:43:07 2009 (r195586) @@ -222,9 +222,10 @@ struct xvnode { #define VN_KNOTE(vp, b, a) \ do { \ if (!VN_KNLIST_EMPTY(vp)) \ - KNOTE(&vp->v_pollinfo->vpi_selinfo.si_note, (b), (a)); \ + KNOTE(&vp->v_pollinfo->vpi_selinfo.si_note, (b), \ + (a) | KNF_NOKQLOCK); \ } while (0) -#define VN_KNOTE_LOCKED(vp, b) VN_KNOTE(vp, b, 1) +#define VN_KNOTE_LOCKED(vp, b) VN_KNOTE(vp, b, KNF_LISTLOCKED) #define VN_KNOTE_UNLOCKED(vp, b) VN_KNOTE(vp, b, 0) /* From mp at FreeBSD.org Fri Jul 10 21:00:39 2009 From: mp at FreeBSD.org (Mark Peek) Date: Fri Jul 10 21:00:53 2009 Subject: svn commit: r195587 - in vendor/tcsh/dist: . config contrib nls Message-ID: <200907102100.n6AL0cMb031913@svn.freebsd.org> Author: mp Date: Fri Jul 10 21:00:38 2009 New Revision: 195587 URL: http://svn.freebsd.org/changeset/base/195587 Log: Flatten vendor/tcsh/dist. Added: vendor/tcsh/dist/Copyright - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/Copyright vendor/tcsh/dist/FAQ - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/FAQ vendor/tcsh/dist/Fixes - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/Fixes vendor/tcsh/dist/Imakefile - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/Imakefile vendor/tcsh/dist/MAKEDIFFS - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/MAKEDIFFS vendor/tcsh/dist/MAKESHAR - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/MAKESHAR vendor/tcsh/dist/Makefile.ADMIN - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/Makefile.ADMIN vendor/tcsh/dist/Makefile.in - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/Makefile.in vendor/tcsh/dist/Makefile.std - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/Makefile.std vendor/tcsh/dist/Makefile.vms - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/Makefile.vms vendor/tcsh/dist/NewThings - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/NewThings vendor/tcsh/dist/Ported - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/Ported vendor/tcsh/dist/README - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/README vendor/tcsh/dist/README.imake - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/README.imake vendor/tcsh/dist/RELEASE-PROCEDURE - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/RELEASE-PROCEDURE vendor/tcsh/dist/WishList - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/WishList vendor/tcsh/dist/Y2K - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/Y2K vendor/tcsh/dist/complete.tcsh - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/complete.tcsh vendor/tcsh/dist/config/ - copied from r195586, vendor/tcsh/dist/contrib/tcsh/config/ vendor/tcsh/dist/config.guess - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/config.guess vendor/tcsh/dist/config.h.in - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/config.h.in vendor/tcsh/dist/config.sub - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/config.sub vendor/tcsh/dist/config_f.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/config_f.h vendor/tcsh/dist/configure - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/configure vendor/tcsh/dist/configure.in - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/configure.in vendor/tcsh/dist/csh-mode.el - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/csh-mode.el vendor/tcsh/dist/ed.chared.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/ed.chared.c vendor/tcsh/dist/ed.decls.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/ed.decls.h vendor/tcsh/dist/ed.defns.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/ed.defns.c vendor/tcsh/dist/ed.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/ed.h vendor/tcsh/dist/ed.init.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/ed.init.c vendor/tcsh/dist/ed.inputl.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/ed.inputl.c vendor/tcsh/dist/ed.refresh.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/ed.refresh.c vendor/tcsh/dist/ed.screen.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/ed.screen.c vendor/tcsh/dist/ed.term.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/ed.term.c vendor/tcsh/dist/ed.term.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/ed.term.h vendor/tcsh/dist/ed.xmap.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/ed.xmap.c vendor/tcsh/dist/eight-bit.me - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/eight-bit.me vendor/tcsh/dist/gethost.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/gethost.c vendor/tcsh/dist/glob.3 - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/glob.3 vendor/tcsh/dist/glob.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/glob.c vendor/tcsh/dist/glob.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/glob.h vendor/tcsh/dist/host.defs - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/host.defs vendor/tcsh/dist/imake.config - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/imake.config vendor/tcsh/dist/install-sh - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/install-sh vendor/tcsh/dist/ma.setp.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/ma.setp.c vendor/tcsh/dist/mi.termios.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/mi.termios.c vendor/tcsh/dist/mi.varargs.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/mi.varargs.h vendor/tcsh/dist/mi.wait.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/mi.wait.h vendor/tcsh/dist/nls/ - copied from r195586, vendor/tcsh/dist/contrib/tcsh/nls/ vendor/tcsh/dist/patchlevel.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/patchlevel.h vendor/tcsh/dist/pathnames.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/pathnames.h vendor/tcsh/dist/sh.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.c vendor/tcsh/dist/sh.char.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.char.c vendor/tcsh/dist/sh.char.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.char.h vendor/tcsh/dist/sh.decls.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.decls.h vendor/tcsh/dist/sh.dir.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.dir.c vendor/tcsh/dist/sh.dir.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.dir.h vendor/tcsh/dist/sh.dol.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.dol.c vendor/tcsh/dist/sh.err.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.err.c vendor/tcsh/dist/sh.exec.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.exec.c vendor/tcsh/dist/sh.exp.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.exp.c vendor/tcsh/dist/sh.file.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.file.c vendor/tcsh/dist/sh.func.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.func.c vendor/tcsh/dist/sh.glob.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.glob.c vendor/tcsh/dist/sh.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.h vendor/tcsh/dist/sh.hist.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.hist.c vendor/tcsh/dist/sh.init.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.init.c vendor/tcsh/dist/sh.lex.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.lex.c vendor/tcsh/dist/sh.misc.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.misc.c vendor/tcsh/dist/sh.parse.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.parse.c vendor/tcsh/dist/sh.print.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.print.c vendor/tcsh/dist/sh.proc.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.proc.c vendor/tcsh/dist/sh.proc.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.proc.h vendor/tcsh/dist/sh.sem.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.sem.c vendor/tcsh/dist/sh.set.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.set.c vendor/tcsh/dist/sh.time.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.time.c vendor/tcsh/dist/sh.types.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/sh.types.h vendor/tcsh/dist/snames.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/snames.h vendor/tcsh/dist/src.desc - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/src.desc vendor/tcsh/dist/tc.alloc.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.alloc.c vendor/tcsh/dist/tc.bind.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.bind.c vendor/tcsh/dist/tc.const.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.const.c vendor/tcsh/dist/tc.decls.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.decls.h vendor/tcsh/dist/tc.disc.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.disc.c vendor/tcsh/dist/tc.func.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.func.c vendor/tcsh/dist/tc.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.h vendor/tcsh/dist/tc.nls.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.nls.c vendor/tcsh/dist/tc.nls.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.nls.h vendor/tcsh/dist/tc.os.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.os.c vendor/tcsh/dist/tc.os.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.os.h vendor/tcsh/dist/tc.printf.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.printf.c vendor/tcsh/dist/tc.prompt.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.prompt.c vendor/tcsh/dist/tc.sched.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.sched.c vendor/tcsh/dist/tc.sig.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.sig.c vendor/tcsh/dist/tc.sig.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.sig.h vendor/tcsh/dist/tc.str.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.str.c vendor/tcsh/dist/tc.vers.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.vers.c vendor/tcsh/dist/tc.wait.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.wait.h vendor/tcsh/dist/tc.who.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tc.who.c vendor/tcsh/dist/tcsh.man - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tcsh.man vendor/tcsh/dist/tcsh.man2html - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tcsh.man2html vendor/tcsh/dist/termcap.vms - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/termcap.vms vendor/tcsh/dist/tw.color.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tw.color.c vendor/tcsh/dist/tw.comp.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tw.comp.c vendor/tcsh/dist/tw.decls.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tw.decls.h vendor/tcsh/dist/tw.h - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tw.h vendor/tcsh/dist/tw.help.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tw.help.c vendor/tcsh/dist/tw.init.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tw.init.c vendor/tcsh/dist/tw.parse.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tw.parse.c vendor/tcsh/dist/tw.spell.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/tw.spell.c vendor/tcsh/dist/vms.termcap.c - copied unchanged from r195586, vendor/tcsh/dist/contrib/tcsh/vms.termcap.c Deleted: vendor/tcsh/dist/contrib/ Copied: vendor/tcsh/dist/Copyright (from r195586, vendor/tcsh/dist/contrib/tcsh/Copyright) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/tcsh/dist/Copyright Fri Jul 10 21:00:38 2009 (r195587, copy of r195586, vendor/tcsh/dist/contrib/tcsh/Copyright) @@ -0,0 +1,32 @@ +/*- + * Copyright (c) 1980, 1991 The Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ Copied: vendor/tcsh/dist/FAQ (from r195586, vendor/tcsh/dist/contrib/tcsh/FAQ) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/tcsh/dist/FAQ Fri Jul 10 21:00:38 2009 (r195587, copy of r195586, vendor/tcsh/dist/contrib/tcsh/FAQ) @@ -0,0 +1,304 @@ + + [Home] FAQ + + Home | RecentChanges | Preferences + _________________________________________________________________ + + This is for people who do not read the manual! + + So far people who don't read manuals don't read this either... I may + call it README.*PLEASE* in the future, but then the same people won't + be able to get ftp it... :-) + _________________________________________________________________ + + 1. Where can I find tcsh sources? + + See http://www.tcsh.org/MostRecentRelease for download locations. + _________________________________________________________________ + + 2. Why is the meta key broken in tcsh-5.20 and up? + + On some machines the tty is not set up to pass 8 bit characters by + default. Tcsh 5.19 used to try to determine if pass8 should be set by + looking at the terminal's meta key. Unfortunately there is no good way + of determining if the terminal can really pass 8 characters or not. + Consider if you are logged in through a modem line with 7 bits and + parity and your terminal has a meta key. Then tcsh 5.19 would set + wrongly set pass8. + + If you did like the previous behavior you can add in /etc/csh.login, + or in .login: + + if ( $?tcsh && $?prompt ) then + if ( "`echotc meta`" == "yes" ) then + stty pass8 + endif + endif + + If you don't have pass8, maybe one of these would work.. + + stty -parity -evenp -oddp cs8 -istrip (rs6000) + stty -parenb -istrip cs8 + + Finally, tcsh will bind all printable meta characters to the self + insert command. If you don't want that to happen (i.e. use the + printable meta characters for commands) setenv NOREBIND. + _________________________________________________________________ + + 3. I ran 'dbxtool &' and 'shelltool &' from tcsh, and they end up in + cbreak and no echo mode? + + These programs are broken. Background jobs should not try to look at + the tty. What happens is that dbxtool looks in stderr to inherit the + tty setups, but tcsh sets up the tty in cbreak and -echo modes, so + that it can do line editing. This cannot be fixed because tcsh cannot + give away the tty. Pick one of the following as a workaround: + + dbxtool < /dev/null >& /dev/null & + /usr/etc/setsid dbxtool & + + If that does not work, for dbxtool at least you can add "sh stty sane" + in your .dbxinit + _________________________________________________________________ + + 4. I tried to compile tcsh and it cannot find ? + + Your system does not support NLS. Undefine NLS in config_f.h and it + should work fine. + _________________________________________________________________ + + 5. Where can I get csh sources? + + Csh sources are now available with the 4.4BSD networking + distributions. You don't need csh sources to compile tcsh-6.0x. + _________________________________________________________________ + + 6. I just made tcsh my login shell, and I cannot ftp any more? + + Newer versions of the ftp daemon check for the validity of the user's + shell before they allow logins. The list of valid login shells is + either hardcoded or it is usually in a file called /etc/shells. If it + is hard-coded, then you are out of luck and your best bet is to get a + newer version of ftpd. Otherwise add tcsh to the list of shells. [For + AIX this file is called /etc/security/login.cfg.] Remember that the + full path is required. If there is no /etc/shells, and you are + creating one, remember to add /bin/csh, /bin/sh, and any other valid + shells for your system, so that other people can ftp too :-) + _________________________________________________________________ + + 7. I am using SunView or OpenWindows and editing is screwed up. In + particular my arrow keys and backspace don't work right. What am I + doing wrong? + + Well, cmdtool tries to do its own command line editing and the effect + you get is one of using an editor inside an editor. Both try to + interpret the arrow key sequences and cmdtool wins since it gets them + first. The solutions are in my order of preference: + + 1. Don't use suntools + 2. Use shelltool instead of cmdtool. + 3. Unset edit in tcsh. + _________________________________________________________________ + + 8. On a SPARCstation running Solaris 2.x and OpenWindows 3.1, inside a + cmdtool, the short-cut key sequence to clear log (i.e. Meta-e or + Diamond-e) doesn't work: it just echos 'e'; or + + Unset edit in tcsh. + _________________________________________________________________ + + 9. On a SPARCstation running Solaris 2.x and OpenWindows 3.1, maketool + (within SPARCworks) doesn't work: it just does a `cd' to the working + directory then stops. + + Unset edit in tcsh. Using shelltool instead of cmdtool does not fix + this. + _________________________________________________________________ + + 10. I rlogin to another machine, and then no matter what I tell 'stty' + I cannot get it to pass 8 bit characters? + + Maybe you need to use 'rlogin -8' to tell rlogin to pass 8 bit + characters. + _________________________________________________________________ + + 11. Where do I get the public domain directory library? + + Anonymous ftp to prep.ai.mit.edu:/pub/gnu/dirent.tar.Z + _________________________________________________________________ + + 12. I compiled tcsh using gcc, and when I start up it says: tcsh: + Warning no access to tty (Invalid Argument). Thus no job control in + this shell + + Your file is not ansi compliant. You have one of 3 + choices: + + 1. Run fixincludes from the gcc distribution. + 2. Add -traditional to the gcc flags. + 3. Compile with cc. + _________________________________________________________________ + + 13. I compiled tcsh with the SunOS unbundled compiler and now things + get echo'ed twice. + + It is a bug in the unbundled optimizer. Lower the optimization level. + _________________________________________________________________ + + 14. How can I use the arrow keys with hpterm? + + Hp terminals use the arrow keys internally. You can tell hpterm not to + do that, by sending it the termcap sequence smkx. Since this has to be + done all the time, the easiest thing is to put it as an alias for + precmd, or inside the prompt: + + if ($term == "hp") then + set prompt="%{`echotc smkx`%}$prompt" + endif + + Note that by doing that you cannot use pgup and pgdn to scroll... Also + if you are using termcap, replace "smkx" with "ks"... + _________________________________________________________________ + + 15. On POSIX machines ^C and ^Z will do not work when tcsh is a login + shell? + + Make sure that the interrupt character is set to ^C and suspend is set + to ^Z; 'stty -a' will show you the current stty settings; 'stty intr + ^C susp ^Z' will set them to ^C and ^Z respectively. + _________________________________________________________________ + + 16. I am trying to compile tcsh and I am getting compile errors that + look like: + + >sh.c:???: `STR???' undeclared, outside of functions [gcc] + >"sh.c", line ???: STR??? undefined [cc] + + You interrupted make, while it was making the automatically generated + headers. Type 'make clean; make' + _________________________________________________________________ + + 17. On the cray, sometimes the CR/LF mapping gets screwed up. + + You are probably logged in to the cray via telnet. Cray's telnetd + implements line mode selection the telnet client you are using does + not implement telnet line mode. This cause the Cray's telnetd to try + to use KLUDGELINEMODE. You can turn off telnet line mode from the cray + side by doing a "stty -extproc", or you can get the Cray AIC to build + a telnetd without KLUDGELINEMODE, or you can compile a new telnet + client (from the BSD net2 tape), or at least on the suns use: 'mode + character'. + _________________________________________________________________ + + 18. On AU/X, I made tcsh my startup shell, but the mac desktop is not + starting up (no X11 or Finder), and I only get console emulation. + + This is another manifestation of item 5. Just add the pathname to tcsh + in /etc/shells and everything should work fine. + _________________________________________________________________ + + 19. On machines that use YP (NIS) tilde expansion might end up in + /dev/null + + If this happens complain to your vendor, to get a new version of NIS. + You can fix that in tcsh by defining YPBUGS in config.h + _________________________________________________________________ + + 20. Script on SGI 4.0.5 does not give us a tty, so we cannot have job + control. + + Their csh does not have job control either. Try: + + % script + % cat > /dev/tty + _________________________________________________________________ + + 21. I start tcsh and it takes a couple of minutes to get the prompt. + + You have defined REMOTEHOST and your DNS is not responding. Either + undefine REMOTEHOST and recompile or fix your DNS. + _________________________________________________________________ + + 22. If you need help generating your .cshrc file, check out: + + http://www.imada.sdu.dk/~blackie/dotfile/ + + or + http://www.dotfiles.com + _________________________________________________________________ + + 23. On POSIX systems the kernel will send hup signals to all the + processes in the foreground process group if 'stty hupcl' is set. + + For example + + ./tcsh + echo $$ + 591 + ./tcsh + kill -6 591 + + Will kill everything, since hup will be sent to all tcsh processes. To + avoid that you can set stty -hupcl, but it is not recommended. + _________________________________________________________________ + + 24. When I rsh the meta key stops working on the remote machine. + + Try using rsh -8; this option is undocumented on some systems, but it + works. If that does not work, get and use ssh/sshd. You'll be better + off from a security point of view anyway. + _________________________________________________________________ + + 25. Tcsh compiled under hp/ux-10.x does not pass resource limits + correctly when ran on hp/ux-11.x systems. + + This is a problem with lack of ABI compatibility between the two + systems. The only solution is to recompile. + _________________________________________________________________ + + 26. Refreshing in command line editing can appear broken on some OS's + + This is because the termcap/terminfo description lies about the + ability of the terminal to use tabs. At least on Compaq/DEC Alpha + OSF/1 3.x and 4.x systems, stty -tabs will cause problems. + _________________________________________________________________ + + 27. Where can I learn the merits of tcsh vs. bash vs. csh vs. sh etc? + + You can read the manual page section titled [NEW FEATURES] listing + features that tcsh adds to csh. + + You can read Tom Christiansen's [Csh Programming Considered Harmful], + a document advocating that csh (and by extension, tcsh) should not be + used for writing shell scripts. + + XXX: Need to find something about [bash], but bash is sh-compatible + and has many of the same interactive features of tcsh (command + completion does not appear to be as flexible, though). + + [Curtains up: introducing the Z shell] has a pretty good rundown on + zsh. Aside from the arguments about csh being evil, tcsh appears to + compare well with zsh [zsh]. Zsh is sh and ksh compatible, with many + of the interactive features of tcsh. + _________________________________________________________________ + + 28. Why does FreeBSD's tcsh do history browsing differently than I + expect? + + On FreeBSD, by default, the up arrow is set to + "history-search-backward", rather than the default "up-history". As a + result, if you type (part of) a word and press up arrow, you'll see + previous commands that match the prefix. Pretty useful, actually, + although it takes some getting used to. You can use bindkey to see + your settings, and to rebind up & down differently if desired. + _________________________________________________________________ + + Everything else is a bug :-( + + Christos + _________________________________________________________________ + + Home | RecentChanges | Preferences + Edit text of this page | View other revisions + Last edited April 29, 2004 15:02 (diff) + Search: ____________________ Copied: vendor/tcsh/dist/Fixes (from r195586, vendor/tcsh/dist/contrib/tcsh/Fixes) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/tcsh/dist/Fixes Fri Jul 10 21:00:38 2009 (r195587, copy of r195586, vendor/tcsh/dist/contrib/tcsh/Fixes) @@ -0,0 +1,1844 @@ + 74. V6.15.00 - 20070303 + 73. fix extension eating windows code (christos) + 72. fix loop in %R history expansion (christos) + 71. sched +X source file disables interrupts (Mike Sullivan) + 70. One off copying macro buffers (Jean-Luc Leger) + 69. Avoid infinite loops in :ga modifiers when the LHS is a substring of the + RHS. + 68. Automatically disable WIDE_STRINGS with --disable-nls (Miloslav Trmac) + 67. V6.14.07 - 20060825 + 66. rename set to setv to avoid clashes (christos) + 65. Eliminate sighold/sigrelse (christos) + 64. Compilation cleanups. (Martin Kraemer) + 63. Don't rebuild needlessly when generated files are unchanged + (Martin Kraemer) + 62. Fix confusion between Char and eChar (Martin Kraemer) + 61. V6.14.06 - 20060824 + 60. set PROGRAM_ENVIRONMENT for OSD_POSIX (Martin Kraemer) + 59. EBCDIC patch (Martin Kraemer) + 58. Remove globbing support in history rearches (Ryan Barrett) + 57. Highlighting patch (Ryan Barrett) + 56. Mark-Cursor exchange emacs editing fix (Martin Kraemer) + 55. V6.14.05 - 20060304 + 54. don't limit termcap strings to 1K (Alan Ferrency) + 53. protect against null path. + 52. Be more conservative in wide_read PR#29 + 51. remove HAVE_STRCOLL; not needed anymore (Miloslav Trmac) + 50. remove imake support and make nls configurable by configure + (Miloslav Trmac) + 49. V6.14.04 - 20060214 + 48. Fixes build failure with !SHORT_STRINGS (Miloslav Trmac) + 47. Fixes constness warnings with !SHORT_STRINGS: short2str is "strip()", + which modifies its argument. Rather than verify this is safe in all + callers, I have added caching_strip() to mirror the behavior of other + modes. (Miloslav Trmac) + 46. Fixes some constness warnings with SHORT_STRINGS; this is orthogonal + to both build errors with SHORT_STRINGS in 6.14.03, and + short_strings.patch. (Miloslav Trmac) + 45. config-catalogs.patch: Autodetect catalog support (#14). (Miloslav Trmac) + 44. auth.patch: Handle false positives in getauthid() detection, + IIRC on FreeBSD. (Miloslav Trmac) + 43. crypt.patch: Autodetect whether is available. (Miloslav Trmac) + 42. sigint.patch: Block SIGINT while waiting on children. + This is necessary, but I'll still have to look on the older + releases to find out why it was not necessary before + ("before" = 6.13 on Linux). (Miloslav Trmac) + 41. config-package.patch: Readd package version to configure.in, + the testsuite uses it. + (TODO: a better integration with package.h) (Miloslav Trmac) + 40. item_len.patch: Truncate item.len when truncating the string, + just to be sure. (Miloslav Trmac) + 39. va_list.patch: Add missing va_end(). (Miloslav Trmac) + 38. Use va_copy in xvasprintf(); emulate va_copy as suggested in + Autoconf manual if it is not available. (Miloslav Trmac) + 37. declarations.patch: Replace some #ifdef nests by autodetecting + whether the guarded declaration is necessary. + I'm only guessing this is the intent of the #ifdefs, though. + Declare environ unconditionally, it is a bit hard to detect + and the declaration is correct for Linux, anyway. (Miloslav Trmac) + 36. warning.patch: Fix a const warning. + 35. More color-ls variables (Jean-Luc Leger) + 34. V6.14.03 - 20060212 + 33. Signal related changes (Miloslav Trmac) + 32. Misc cast cleanups and code clarification (Miloslav Trmac) + 31. Use dynamically allocated buffers everywhere (Miloslav Trmac) + 30. Fix reading of invalid byte sequences (Miloslav Trmac) + 29. read should only increment count when it succeeds (Miloslav Trmac) + 28. testsuiteadditions (Miloslav Trmac) + 27. -n fixes (Miloslav Trmac) + 26. signness warnings (Miloslav Trmac) + 25. Prevent infinite recursion in catclose (Gerhard Niklasch) + 24. Add Dragonfly (Joerg Sonnenberger) + 23. Check for wcwidth returning a negative number (TOMITA Yoshinori) + 22. recognize "li" and "co" in echotc (Martin Kraemer) [PR/7] + 21. Don't use T_Cols for wrapping purposes; use TermH consistently + (Martin Kraemer) [PR/8] + 20. Don't display duplicate utmp records (Miloslav Trmac) [PR/17] + 19. Clarify hashing and -f sections of man page (Volker Quetschke) [PR/20] + 18. Dave Yearke: configure did not recognize solaris 10 [PR/18] + 17. CYGWIN: Don't lowercase commands and allow foo.exe on command line. + (Corinna Vinschen) [PR/19] + 16. CYGWIN: cd /foo && cd .. ends up erroneously in // for systems that + HAVE_SLASHSLASH [PR/21] + 15. %j was broken (Peter Kruse) + 14. Extend // handling in pathnames from being apollo specific to also + cygwin (Corinna Vinschen) + 13. Fix uppercase/lowercase transformations (Jean-Luc Leger) + 12. Fix symlink expansion (revert from 6.10.00) (Jean-Luc Leger and Christos) + 11. Fix literal sequence in prompt (Miloslav Trmac) + 10. V6.14.02 - 20050412 + 9. Prototype fixes (Miloslav Trmac and Jean-Luc Leger) + 8. V6.14.01 - 20050411 + 7. Make =- refer to $owd (H.Merijn Brand) + 6. Use prototypes (almost) everywhere (Miloslav Trmac) (issue #5) + 5. Fix doc path in Cygwin installation (Corinna Vinschen) + 4. Fix column size calculation (Martin Kraemer) + 3. Implement newline-and-hold and newline-and-down-history (Per Hedeland) + 2. Messages fixes for the ja (Japanese) locale (NAKAMURA Takeshi) (issue #4) + 1. Enable charset conversion in nls (Miloslav Trmac) (issue #3) + + 76. V6.14.00 - 20050325 + 75. Additional messages for the ja (Japanese) locale (NAKAMURA Takeshi) + 74. V6.13.10 - 20050321 + 73. Implement --help (Tom Warzeka) + 72. Clamp solaris autologout time + 71. Add support for "limit heapsize" (Martin Kraemer) + 70. Improved autoconf for utmp/utmpx (Miloslav Trmac) + 69. V6.13.09 - 20050303 + 68. Autoconf additions (Miloslav Trmac and Jean-Luc Leger) + 67. Fix erroneous sign extension when printing huge numbers (Martin Kraemer) + 66. Handle delay in termcap entries (Martin Kraemer) + 65. EBCDIC and BS2000 fixes (Martin Kraemer) + 64. Avoid the SCCS percent-S-percent sequence differently (Kimmo Suominen) + 63. Mark position update fixes (Martin Kraemer) + 62. Define BSDLIMIT and BSDTIMES for Cygwin (Corinna Vinschen) + 61. Fix NLSFrom prototype (Martin Kraemer) + 60. V6.13.08 - 20050303 + 59. Add test for socklen_t in autoconf + 58. Fix problems with NLSFrom prototype + 57. Deal with AIX's utmpx lossage + 56. V6.13.07 - 20050118 + 55. constifications, XXX: duplicate prototype on setpgrp(). + 54. iconv fixes (Miloslav Trmac) + 53. literal code cleanups (Miloslav Trmac) + 52. move intptr_t definition to sh.h and include both stdint.h and inttypes.h + 51. Fix dup2() issues, and introduce FSAFE as the highest file descriptor + to be left untouched. This is to avoid closing hesiod/nis etc file + descriptors behind their backs. I need to really fix file descriptor + handling one day. + 50. forward<->reverse char conversion verification (Miloslav Trmac) + 49. japanese locale additions (Yoshiyuki Sakakibara) + 48. wide character/utf 8 cleanups (Michael Schroeder) + 47. V6.13.06 - 20050105 + 46. autoconf cleanup (Miloslav Trmac) + 45. Fix literal refresh code (Michael Schroeder) + 44. Fix history printing bug with WIDE_STRINGS + 43. V6.13.05 - 20041121 + 42. deal with not having intptr_t + 41. get rid of bool. + 40. Protect HAVE_ICONV with NLS_CATALOGS + 39. Deal with wchar_t being unsigned. + 38. If we HAVEUTMPX redefine some utmp functions in terms of utmpx ones. + 37. V6.13.04 - 20041120 + 36. Fix display problems with two-column characters when using WIDE_STRINGS. + (Miloslav Trmac) + 35. Change charset declarations for some of the translations. + (Miloslav Trmac) + 34. Set O_LARGEFILE properly (Miloslav Trmac) + 33. Use libc functions to access utmp data (Miloslav Trmac) + 32. t_pmatch() was not really case-insensitive when cs == 8 + (Miloslav Trmac) + 31. Fix escaping of "control" bytes 0x80..0x9F when they are actually + parts of UTF-8 character representation. (Miloslav Trmac) + 30. V6.13.03 - 20041120 + 29. More close_on_exec fixes (Miloslav Trmac) + 28. SUSE dspmbyte fixes (via Harald) + 27. Newline handling in command substitution controlled by csubstnonl + (Miloslav Trmac) + 26. Fix UNC prompt expansion (WIN32) (Yasuhiro Matsumoto) + 25. Fix incorrect xprintf() usage (Miloslav Trmac) + 24. Additional architectures support for $HOSTTYPE and $MACHTYPE + (Miloslav Trmac) + 23. Use nl_langinfo(CODESET) to determine $dspmbyte (Miloslav Trmac) + 22. Complete arguments that contant a # (Steven Grady) + 21. Set close-on-exec in subshells + 20. Compilation fixes (Miloslav Trmac) + 19. V6.13.02 - 20040804 + 18. de-register, de-extern, de-shadow, and const poison. + 17. WIDE_STRINGS support (Miloslav Trmac) + 16. warning cleanups (Miloslav Trmac) + 15. nlsclose() arg passing, exp2 is now a gcc builtin (Mark Peek) + 14. iconv malloc portability fix. + 13. make automatic dspmbyte determination case insensitive + 12. V6.13.01 - 20040724 + 11. bug fix in automatic dspmbyte setting (Miloslav Trmac) + 10. iconv patches (Miloslav Trmac) + 9. cygwin signal fixes; only init 32 signals, don't set bit flag on error; + breaks SIGHUP. (Corinna Vinschen) + 8. Make sure terminal size change takes effect immediately. + 7. Obey $printexitvalue for builtins. + 6. FreeBSD PR/66420: Allow history parsing to be special so that it + can handle inline # characters (Oliver Eikemeier) + 5. new termname builtin from (Andrew Stevenson) + 4. if ($var =~ *[^0-9]*) echo not numeric, fix (Andrew Stevenson) + 3. completion fix to avoid dup hosts from ssh_known_hosts + (Eric D. Hendrickson) + 2. vc++ 7.1 compilation fix (Steve Schockley) + 1. UTF-8 handling for both single and double width characters, but + no combining character support. (Michael Schroeder) + + 36. V6.13.00 - 20040519 + 35. V6.12.03 - 20040322 + 34. turn on kanji and dspmbyte by default; add check for utf8 locales, + and turn parsing of that automatically based on $LANG. + 33. Fix compilation issue under Windows/NT and charset incorrect patch + (Yoshiyuki Sakakibara) + 32. completion additions (Tom Warzeka) + 31. compilation fix (Martin Kraemer) + 30. V6.12.02 - 20040221 + 29. Glob completion listing addition (Tom Warzeka) + 28. BS2000 bs2cmd builtin. (Martin Kraemer) + 27. Fix interrupt resetting code when /etc startup scripts have syntax errors + (Mark A. Grondona) + 26. Clarification of kill-ring commands (Per Hedeland) + 25. Debian completion additions (Martin Godisch) + 24. Japanese character set fixes (Juehiro-san) from debian + 23. NLS charset fixes; disabled since they only work with gnu gencat + (Martin Godisch) + 22. Fix HPUX >= 11 resource (Jack Cummings) + 21. Handle breaksw that jumps out of loops. + 20. Revert #16. It causes worse problems. + 19. Avoid using execl() because the last NULL does not always promoted to + a pointer because the function is variadic (Harti Brandt) + 18. revert ignoreeof to the 6.11.00 behavior and document it (Martin Godisch) + 17. do a case insensitive comparison for the multibyte vars (Martin Godisch) + 16. don't sigsuspend() for an already exited job + 15. glob all arguments in source (Martin Godisch) + 14. various debian fixes (Martin Godisch) + 13. setenv syntax check revert (Satoshi I. Nozawa) + 12. EAGAIN typo (dan harkless) + 11. filec compilation issue on hpux (beebe) + 10. win32 compilation fixes for O_LARGEFILE (amol) + 9. Don't go into an infinite loop when tcgetpgrp() returns an error. + 8. Cygwin fixes (Corinna Vinschen) + 7. NLS catclose() bug avoidance (KAJIMOTO Masato) + 6. V6.12.01 - 20030208 + 5. Misc NT cleanup. No more GPL code (amol) + 4. use strtol() to detect errors in builtin kill (Peter Jeremy) + 3. Recognize linux systems on mips* (Maciej W. Rozycki) + 2. Enable complete=igncase on unix (Stephen Krauth) + 1. Eliminate maxitems (Todd Miller) + + 58. V6.12.00 - 20020732 + 57. misc cleanups. + 56. V6.11.05 - 20020712 + 55. We should have socklen_t in the INET6 case, but we leave int otherwise. + 54. Fixed for Darwin/Rhapsody (Mark Peek) + 53. provide new config.sub and config.guess from ftp://ftp.gnu.org/gnu/config/ + (Nelson Beebe) + 52. V6.11.04 - 20020709 + 51. Dissallow setting of environment variables that do not contain + alphanumeric names (Ton Voon) + 50. Don't expand path components that don't resolve to path names (Jonathan + Chen) + 49. Make $ignoreeof agree with the man page (Matias Moreno Meringer) + 48. Fix argument passing in tc.prompt.c expdollar (Nelson Beebe) + 47. Completion fixes from FreeBSD (Mark Peek) + 46. FreeBSD's sbsize limit (Mark Peek) + 45. Fix repeat 3 repeat 2 echo foo + 44. Fix I/O redirection in scripts (Ian D Allen) + 43. Fix ` \\\n ` evaluation (Jean-Luc Leger) + 42. add --version (Nelson Beebe) + 41. portability fixes for sed (Nelson Beebe) + 40. undef sv_handler for AIX's benefit. (Nelson Beebe) + 39. Add a test for ss_family that disables IPV6 (linux/ppc, osf/1 have + problems) (Nelson Beebe) + 38. Disable ipv6 for Apple (Nelson Beebe) + 37. Fix darwin configure entry (Nelson Beebe) + 36. V6.11.03 - 20020701 + 35. Add Ian D. Allen's bug list. + 34. If we are invoked as csh, default to bsd echo (Matej Vela) + 33. Don't close file descriptors too early because setuid scripts fail. + (Jill Pryse-Davies) + 32. Completion updates (Tom Warzeka) + 31. Fix compilation issue on SunOS4 with _POSIX_VDISABLE (Tom Warzeka) + 30. ukrainian update (Olexander Kunytsa) + 29. DSPMBYTE=utf8 patch (Jean-Luc Leger) + 28. fix ipv4 only compilation, remove extra sigsetmask() call (Takayuki Nakao) + 27. window change can cause free to be re-entered causing abort (Mark Peek) + 26. vp->vec vetting, suggested by Ian Dall. + 25. V6.11.02 - 20020516 + 24. Fix prompt bugs in $var and %c0n (TAKAI Kousuke) + 23. Add Cray SV2 config (Rafal Maszkowski) + 22. Add pdf manual page (Warren Ferguson) + 21. Fix REMOTEHOST lossage in with AF_LOCAL sockets (Tom Mander) + 20. Fix win32 break because of TIOCSTI (Amol) + 19. Fix TIOCSTI for hpux 11 (Igor Schein) + 18. Avoid collapsing paths that refer to non-existent components + (Martin Kraemer) + 17. Make -shell invocations always treated as a login shell. + 16. V6.11.01 - 20020308 + 15. Fixes to polish nls locale (Pawe³ Niewiadomski) + 14. russian locale fixes (Alexey Dokuchaev) + 13. document door support (Shaen) + 12. tcsh euc handling extensions (Alexey Zelkin) + 11. Make sure that jobcmd does not clobber the current job (Rob McMahon) + 10. Make sure that the output of verbose and echo do not end up in the + command output (Victor I. Pasko) + 9. Add %j in prompt [needs more work; is not right the first time + after proclist changes] (Hr. Peter Kruse) + 8. `` commands with embedded newlines would ignore commands following + the new line (Victor I. Pasko) + 7. Re-initialize nls if NLSPATH is changed (Naoki Wakamatsu) + 6. Fix 64 bit compilation with linux and resource limits. + 5. Avoid double globbing when ls-F needs to fork (Joe Townsend) + 4. put back csh filec compatible support. + 3. add support for quads in xprintf in the presence of gcc. + 2. unlimit should set rlim.rlim_max to rlim.rlim_cur if max < cur. + 1. Make ~user work again when the home directory is '/'. + + 40. V6.11.00 - 20010902 + 39. Completion fixes (Tom Warzeka) + 38. make c_insert not static so that it can be used from win32 (amol) + 37. Fix rmstar not to corrupt memory when we say no. (Mark Peek) + 36. V6.10.02 - 20010806 + 35. polish nls locale (Pawe³ Niewiadomski)) + 34. Fix a tcsetattr race running background jobs as the last line on an xterm + window (Andrew Brown) + 33. jobcmd alias (Greg Parker) + 32. hpux11 support (Joshua Weage) + 31. Fix SHORT_STRINGS compilation (Daniel Trinkle) + 30. Add kill -s (Mark Peek) + 29. Don't recognize all mips as dec (Bjorn Knutsson) + 28. Fix GLOB_QUOTE problem (noted by Per) I introduced in 6.10.01. + 27. Port to concurrent's powermaxos (Matt Majka) + 26. New builtin srcfile (Amol) + 25. Fix bindkey "\\" cmd (reported by Ismail H. Tuncer) + 24. %0Xc was broken in the prompt if the user's home directory was '/'. + (reported by Edward Glowacki) + 23. V6.10.01 - 20010426 + 22. LARGEFILE support on Linux. + 21. Add big5 multibyte support (Yen-Ming Lee) + 20. Check the return value of setpriority (Dima Dorfman) + 19. Avoid constructing paths with // on DomainOS (Nickolai Zeldovich) + 18. Russian translation (Ilmar S. Habibulin) + 17. Fix hostdefs for alpha support in FreeBSD (Andrey A. Chernov) + 16. Add door support in colorls (Shaen) + 15. Add BSD_STYLE_COLORLS for FreeBSD (Anand) + 14. MAXHOSTNAMELEN needs to be 256 (Kris Kennaway) + 13. Document stty -tabs problems on compaq (Nelson H. F. Beebe) + 12. Fix broken comment, and new versions of config.guess and config.sub + (H.Merijn Brand) + 11. fix redrawing in the recognize case (Andrew Brown) + 10. don't call qsort with 0 items. (Luke Mewburn) + 9. fix echo;echo;echo; not outputing anything (Andrey A. Chernov) + 8. Fix shell word parsing in dabbrev-expand (Per Hedeland) + 7. hpux fixes (Chienting Lin) + 6. Implement kill ring (Per Hedeland) + 5. Avoid core-dumping when a very long $HOME gets passed in (Kris Kennaway) + 4. Add rlimit_vmem for linux based on rlimit_as (N KomaZaki) + 3. back out symlink=expand path check. + 2. Add Estonian translation (Toomas Soome) + 1. Accept empty $savedirs to mean infinity. + + 57. V6.10.00 - 20001119 + 56. Completion fixes (Tom Warzeka) + 55. add missing linux kanji define (Tsuyoshi Kawabe) + 54. More WINNT_NATIVE fixes (amol) + 53. Fix compile error on winnt (Yoshiyuki Sakakibara) + 52. nonstopux configure and makefile fixes (Tom Bates) + 51. V6.09.04 - 20001111 + 50. Order of initialization for multibyte display was wrong + (HyunChul Kim) + 49. Follow the guideline for linux for japanese locale: + http://www.linux.or.jp/JF/JFdocs/Japanese-Locale-Policy.txt + (Tomohiro KUBOTA) + 48. Ukrainian nls map (Olexander Kunytsa) + 47. exit immeditiately if we get an error while we are setting up + (Michael Shalayeff) + 46. (unset path; unsetenv PATH; rehash) -> crash (Kent Vander Velden) + 45. change winnt to winnt_native (Randolph Fritz) + 44. Support home/end in the editor (Andrey A. Chernov) + 43. Typo s/gycwin/cygwin/ in tc.os.h (Andreas Schott) + 42. Alpha ev6 addition (Karen R. McArthur) + 41. DSPMBYTE patch from (Issei Suzuki) + 40. Security fix for here-doc tmp files (proton@ENERGYMECH.NET) + 39. Fix resource limit rounding *again* (Johannes Gross) + 38. Fix $ expansion in prompt (Takashi Sumiyoshi) + 37. V6.09.03 - 20000715 + 36. cygwin port fixes (Arihiro Yoshida) + 35. Add a new "catalog" variable that specifies which NLS catalog + to be used (Issei Suzuki) + 34. cleanup and addition of page up/down (amol) + 33. fix vfork compile problem. + 32. use inet_addr instead of inet_aton for portability. + 31. V6.09.02 - 20000704 + 30. lots more completions (George Cox) + 29. change FILSIZ to BUFSIZE [now that BUFSIZE >> MAXPATHLEN] and + avoid a potential buffer overflow in sh.dir.c (Volker Schmidt) + 28. _MINIX_VMD port (Martijn van Buul) + 27. inet6 handling for remotehost and configure (Hajimu UMEMOTO) + 26. aix-4 does not need gethostname (Darren Reed) + 25. IBM OS/390 Unix Systems Services support (Peter Prymmer) + 24. Fix prompt formatting (Andrey A. Chernov) + 23. Use HostType from Imakefile correctly (Kjetil Torgrim Homme) + 22. Handle long and expanded history lines better (Boleslaw Ciesielski) + 21. With symlinks=expand expand valid paths only (Martin Kraemer) + 20. Make one-byte charsets work with KANJI (Andrey A. Chernov) + 19. NT-specific executable detection moved to NT code (amol) + 18. New "complete module" (Dan Nicolaescu) + 17. Correctly display scaling string in limit error messages (Nathan Ahlstrom) + 16. Don't display "unset watch" message when not appropriate (kim) + 15. V6.09.01 - 20000114 + 14. Circumvent IRIX4D ESTALE bug by exiting. + 13. IRIS4D de-linting. + 12. Finnish nls catalogs (Jukka A. Ukkonen) + 11. Even more multibyte fixes (Taga Nayuta) + 10. Patches to statically link tcsh under solaris-2.6 (John Hawkinson) + 9. Manual page typos (R. Bernstein) + 8. HP/UX-11 (9000/800) HP/UX-10.20 (9000/820) (Haflidi Sigtryggur Magnusson) + 7. Color-ls fixes (Luis Francisco Gonzalez) + 6. Don't re-use time0 to compare to stat's st_mtime, cause it could be + the value returned from times(2) which is the ticks since system + startup (Frank van der Linden) + 5. Time percentage wrap fix (Simon Burge) + 4. EUCKR support (HyunChul Kim) + 3. Grammar and typo fixes for tcsh.man (Steve Kelem) + 2. More multibyte fixes (Rodney Ruddock) + 1. Change 6.08 -> 6.09 where I missed it; update for utlrix 4.5 (Simon Burge) + + 65. V6.09.00 - 19990816 + 64. Add csh emacs mode (Dan Harkless) + 63. Make sure the the glob buffer matches the word buffer size (Brian Biswas) + 62. Fix periodic to work without tperiod set (Kenny McCormack) + 61. V6.08.07 - 19990813 + 60. Fix e_dabbrev_expand (Bjorn Knutsson) + 59. Make \builtin work again (by calling the command not the builtin) + 58. Add NLS_BUGS for OS's that keep file descriptors open for NLS (Ian Dowse) + 57. Make NONLSREBIND work after tcsh starts up. + 56. Fix AIX stupid exit bug. (Dan Harkless) + 55. More irix fixes (Kaveh) + 54. V6.08.06 - 19990701 + 53. module command completion (Dan Nicolaescu) + 52. Man command completion enhancement (Tom) + 51. Fixes for irix configuration (Kaveh) + 50. Support \a and \e in echo command. From (Keith Thompson) + 49. Alpha configure nit from Kaveh + 48. V6.08.05 - 19990511 + 47. In some system, when a builtin fails immediately after we start + tcsh and before we print any messages, NLS messages fail (some + descriptor might be closed) [FreeBSD, HP/UX?]. So we force reading + the NLS catalogs in errinit() (Yoshiyuki Sakakibara) + 46. typos in ja/set1 and ja/set29 (Yoshiyuki Sakakibara) + 45. "dspmbyte autoset trap" support to HP-UX 10.20. (Yoshiyuki Sakakibara) + 44. misnumbered NLS message in tw.help.c (Yoshiyuki Sakakibara) + 43. colorcat variable for NLS color messages (Yoshiyuki Sakakibara) + 42. autoconf fixes from Kaveh (and if it broke, me) + 41. SGI irix fixes from Glenn Coombs. + 40. Don't spin writing the history file when quota is exceeded (Rob McMahon) + 39. V6.08.04 - 19990419 + 38. complete additions (John Gotts) + 37. Port to amiga with geek gadgets (Arto Huusko) + 36. Ignore case in setenv for windows (amol) + 35. Bug fixes for NT unc stuff (amol) + 34. Hash spell check (amol) + 33. V6.08.03 - 19990211 + 32. Helpcommand documentation (Vladimir Alexiev) + 31. small Y2K fix [%y in prompt would be formatted as 10 not 00 at year 2000], + and new Itoa() code (Chris Torek) + 30. OpenBSD m68k patches (Paul DuBois) + 29. Avoid redefinition of getpeername on Solaris-2.7 + 28. fix problems with savedups=erase, savehist=merge (Randy Gobbel) + 27. Don't set $shell to csh, if we were invoked as tcsh (Tomas Persson) + 26. added $_ + 25. added postcmd + 24. V6.08.02 - 19981124 + 23. document continue and continue_args + 22. wrong test in slowexec made NT optimization a noop (Amol) + 21. Rhapsody fixes + separate CFLAGS/CPPFLAGS (Wilfredo Sanchez) + 20. literals in both prompt at rprompt did not work properly (Taga Nayuta) + 19. multibyte deletion fixes (Yoshiyuki.Sakakibara) + 18. clean up key binding stuff for NT by moving the nt dependent code to + the NT source (amol) + 17. dspmbyte fixes for AIX, typos in man page and nls (Yoshiyuki Sakakibara) + 16. Convex fixes (Ron Echeverri) + 15. V6.08.01 - 19981025 + 14. SX4 port; this adds many casts for machines where ptrdiff_t is 64 bits. + (Andreas Schott) + 13. U/Win port; does not work properly with U/Win 1.6, wait for the next + version (Chris Jones) + 12. Sgi does not need gethostname prototype (John Bogan) + 11. Logic in sh.dir.c was wrong for NT (Amol) + 10. HP_CXD_SPP stat64 fixes (Scott Garee) + 9. Documentation spelling fixes (Keith Thompson) + 8. Documentation fix for savedirs (Amol) + 7. Siemens OSD_POSIX fixes (Martin Kraemer) + 6. include for all the BSD's (Trevor Johnson) + 5. Multibyte display fixes for gnu ls (Taga Nayuta) + 4. Configure/Makefile hesiod and bindir fixes (Dan Winship) + 3. Use winnt not win32 in tc.os.h (Amol) + 2. Cygwin32 port (Raj Menon) + 1. Ported Fixes (Tom) + + 95. V6.08.00 - 19981002 + 94. where builtin nt fix (Amol) + 93. V6.07.13 - 19980926 + 96. NT multibyte fixes (Amol) + 95. NeXT needs getcwd. + 94. fix new bug introduced by strncpy'fication in sh.dir.c (Taga Nayuta) + 93. V6.07.12 - 19980918 + 92. add cray in configure script (Tom) + 91. nls fixes + 90. Avoid buffer overflows in directory code (kim) + 89. Add multibyte character display support (Yoshiyuki Sakakibara) + 88. Make tcsh use getcwd instead of getwd and supply a getcwd. + 87. Fix remotehost again (kim) + 86. V6.07.11 - 19980913 + 85. Leave remotehost ip addresses alone (don't try to resolve them) (Kim) + 84. Read vs. force_read fixes (Amol) + 83. Make colorls if color is set before the first LS_COLORS setenv + (Taga Nayuta) + 82. Use _PATH_DEFPATH on BSD4_4 systems. (Jim Bernard) + 81. Cursor bounds checks (Michael Schroeder) + 80. Syntax error nits (Michael Schroeder) + 79. configure fixes (Michael Schroeder) + 78. V6.07.10 - 19980904 + 77. Off by one error in NO_ERRORS... + 76. Japanese NLS messages (Yoshiyuki Sakakibara) + 75. Add ENXIO and EBADF in the test for write failures for Irix Zombies + (Ralf W. Grosse-Kunstleve) + 74. Missed a test for NOSTRCOLL in glob.c (Michael Liepelt) + 73. Another ABSOLUTEP change (Amol) + 72. Italian NLS messages (Massimo Bertozzi) + 71. WIN32 fixes for ntslowexec and color_ls literal printing in prompt (Amol) + 70. a few missed WIN32 merges (Amol) + 69. defined YPBUGS for sgi (Kaveh) + 68. V6.07.09 - 19980707 + 67. Separate the nt builtins (Amol) + 66. completion fixes (Tom) + 65. color ls fixes (Taga Nayuta) + 64. V6.07.08 - 19980629 + 63. add config.h.in (Kaveh) + 62. win32 updates (Amol) + 61. warning and portability cleanups on the new changes (Kaveh) + 60. V6.07.07 - 19980628 + 59. Fast execute by-pass for win32 (Amol Deshpande) + 58. Clean up const usage a bit, and fix gcc 2.8.1 warnings. + 57. Use @bindir@ for DESTBIN in Makefile.in (Edgar Hoch) + 56. Avoid overflow in time builtin computation (Nobue Adachi) + 55. Color ls additions (Taga Nayuta) + 54. unsigned char vs. char warning fixes (Kaveh) + 53. Solaris 64 bit fixes (fix directory offset bug) (Thomas-Martin Kruel) + 52. More win32 patches (Amol) + 51. autoconf lossage from (Kaveh) + 50. V6.07.06 - 04/08/98 + 49. Collation fix for globbing (Andrey A. Chernov) + 48. We might have NLS_CATALOGS and not LC_MESSAGES (Andrey A. Chernov) + 47. 4.4BSD header fixes (Andrey A. Chernov) + 46. Signed char prompt fixes (Andrey A. Chernov) + 45. Pattern match fix for directory searches (Mike Patnode) + 44. Pentium DGUX fixes (Miko Nahum) + 43. Spanish nls message catalogs (Luis Francisco Gonzalez) + 42. Fix trailing whitespace parsing in HASHBANG code (Martin Kraemer) + 41. Remove stray debuggin message from unmatched substitutions. + (from Amol Deshpande) + 40. Fix reversed arguments in Usagae message. (from Amol Deshpande) + 39. Fix bug introduced at tcsh-7.06.03 [expdollar] that affected %.n prompt + format. + 38. Fix typos introduced in last batch of changes. + 37. Fix interrupted script using onintr, exiting parent shell problem. + 36. Cleanup prototypes. + 35. V6.07.05 - 10/28/97 + 34. Integrate Amol Deshpande's WINNT fixes to the tcsh source. Note that + this is not complete yet; we are missing the NT glue code and the message + catalogs. + 33. Fix ^T at the first character in the line (Chuck Silvers) + 32. Eliminate xsprintf and xvsprintf + 31. Qmail patch from (Matthew Zahorik) + 30. Added missing linux signals (Vadim Vygonets) + 29. fixed problem where complete complete 'p/*/t:*.txt/' would not honor + the pattern. + 28. Port to an EBCDIC machine: BS2000 by Siemens Nixdorf that has an + IBM/390 compatible processor (Martin.Kraemer) + 27. Detect when we have errors writing to stdout (Vadim Vygonets) + 26. Ignore quotes in the comparisons for builtins, so that \builtin works + (Amol Deshpande). + 25. HPUX, portability fixes; make sure that we have the right config file + (Jonathan Kamens) + 24. Don't do lookups for x displays and figure out ttys properly + (Leonard N. Zubkoff) + 23. make print_by_columns print in a single column when the output is not a tty + 22. use rlim_t for Solaris2 (Casper Dik) + 21. V6.07.04 - 05/04/97 + 20. set -f -l patch (Michael Veksler) + 19. SGI patches (Tomasz J. Cholewo). Also fix completion code to take into + account aliases that start with a period. + 18. SCO patches (Boyd Lynn Gerber) + 17. Fujitsu patches (Toshiaki Nomura) + 16. autoconf patches (Kaveh Ghazi) + 15. BSDI patches (Paul Vixie) + 14. %Q formatting character addition. + 13. Fix set=#123; echo $i:s/#// (Quoting problem) + 12. V6.07.03 - 02/23/97 + 11. Understand %$variable in the prompt. + 10. Quote directory names properly in .cshdirs + 9. USE_ACCESS and autoconfig patches from (Larry Schwimmer) + 8. Pyramid att config file (Andrew Lister) + 7. $rprompt code (Luke Mewburn) + 6. Kanji patches (Huw Rogers) + 5. Cray T3E port (Jorn Amundsen) + 4. Avoid html redirects in tcsh.man2html (from Kimmo) + 3. HP/UX 10.0 fix for filesize resource limit; don't scale by 512 anymore. + 2. Workaround for TIOCSTAT for NetBSD from lukem@netbsd.org + 1. Return exit status from 0..255 not -128...127, as POSIX mandates. + +V6.07.02, 10/27/96 + 58. More configure fixes from Kaveh. + 57. Fix histdup=erase again: Don't renumber events, or access uninitialized + storage. + 56. 6.07.01 - 10/19/96 + 55. Fix histdup=erase, where after some repetitions, we would get negative + history events (kim@gw.com) + 54. NLS fixes and typo in sh.err.c (Martin.Kraemer@deejai.mch.sni.de) + 53. Output history in raw format in the history file (mveksler@VNET.IBM.COM) + 52. Fix possible core dump when !: in autoexpand mode (rbrown@ERA.COM) + 51. 6.07.00 - 10/11/96 + 50. Avoid stdio.h inclusion problem in SCO (gethost.c). + 49. A bit of housekeeping in host.defs + 48. 6.06.04 - 10/05/96 + 47. Fix tellmewhat() code to return true if found. + 46. Change register foo to register int foo to avoid compiler warnings. + 45. Fix problem with sticky non editing mode from Casper Dik. + 44. history lex fix from Martin Kraemer; history events that ended with 0 + were not properly parsed. + 43. SNI fixes from Martin Kraemer. + 42. SGI fixes from Ralf W. Grosse-Kunstleve. + 41. BSDI2.1 fixes from Paul Vixie. + 40. 6.06.03 - 09/24/96 + 39. undef TIOCGLTC for HP/UX 10.0 from Michael Shroeder + 38. Sinix fixes + 37. 6.06.02 - 06/22/96 + 36. Added implicitcd + 35. Added configure.in and Makefile.in from Kaveh. + 34. unset path, unsetenv PATH, ./foo did not work. + 33. Add VAR_NOGLOB, and use it to avoid globbing directory names when + cd'ing into them. + 32. Fix bug introduced in the new tty parsing code. + 31. Avoid pushing string back to the parsing string in ${ errors. + 30. Patches for the manual page from Dave. + 29. 6.06.01 - 05/24/96 + 28. Use sysconf to get NCARGS if available Robert Daniel Kennedy + + 27. Grab the program name and use that instead of tcsh in error messages. + 26. Fix histdup, so that it does not leave gaps in the event sequence. + 25. HP/UX v10.0 fixes: Don't use bsdtty.h and avoid clobbering memory + since SIGRT??? is defined as -1. + 24. Avoid coredumps when $TERMCAP exceeds 1024 characters + Michael Schroeder + 23. Fix memory clobbering when SHORT_STRINGS is not defined. + Todd J Derr + 22. Only restart stopped editors. Robert Webb + 21. Recognize pts sysv ptys when checking to set autologout Bob Myers + + 20. Magic space incomplete modified core dump fix. Chris Metcalf + , Bradley White + 19. Linux nls fixes Rik Faith + 18. SGI RS8000, Ported notes. Ralf W. Grosse-Kunstleve + + 17. Greek nls messages. Aggelos P. Varvitsiotis + 16. Imakefile linux and libcrypt fixes. Jonathan Kamens + 15. FreeBSD fixes Jukka Ukkonen + 14. Expand the environment space for path Steve Kelem + 13. Don't overwrite the environment randomly Steve Kelem + + 12. Don't turn the editor on when we have dumb or unknown terminals. This + breaks emacs when compiled with terminfo Jonathan Kamens *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From mp at FreeBSD.org Fri Jul 10 21:17:28 2009 From: mp at FreeBSD.org (Mark Peek) Date: Fri Jul 10 21:17:34 2009 Subject: svn commit: r195588 - head/contrib/tcsh Message-ID: <200907102117.n6ALHRIA032303@svn.freebsd.org> Author: mp Date: Fri Jul 10 21:17:27 2009 New Revision: 195588 URL: http://svn.freebsd.org/changeset/base/195588 Log: Bootstrap merge history. Approved by: re Modified: head/contrib/tcsh/ (props changed) From mp at FreeBSD.org Fri Jul 10 21:47:21 2009 From: mp at FreeBSD.org (Mark Peek) Date: Fri Jul 10 21:47:28 2009 Subject: svn commit: r195595 - vendor/tcsh/dist Message-ID: <200907102147.n6ALlKOc033242@svn.freebsd.org> Author: mp Date: Fri Jul 10 21:47:20 2009 New Revision: 195595 URL: http://svn.freebsd.org/changeset/base/195595 Log: Import of tcsh-6.17.00 Added: vendor/tcsh/dist/config.rpath Deleted: vendor/tcsh/dist/Makefile.ADMIN vendor/tcsh/dist/RELEASE-PROCEDURE Modified: vendor/tcsh/dist/Fixes vendor/tcsh/dist/Imakefile vendor/tcsh/dist/Makefile.in vendor/tcsh/dist/README vendor/tcsh/dist/complete.tcsh vendor/tcsh/dist/config.guess vendor/tcsh/dist/config.h.in vendor/tcsh/dist/config.sub vendor/tcsh/dist/config_f.h vendor/tcsh/dist/configure vendor/tcsh/dist/configure.in vendor/tcsh/dist/ed.chared.c vendor/tcsh/dist/ed.decls.h vendor/tcsh/dist/ed.h vendor/tcsh/dist/ed.inputl.c vendor/tcsh/dist/ed.screen.c vendor/tcsh/dist/ed.term.h vendor/tcsh/dist/ed.xmap.c vendor/tcsh/dist/glob.c vendor/tcsh/dist/host.defs vendor/tcsh/dist/ma.setp.c vendor/tcsh/dist/patchlevel.h vendor/tcsh/dist/sh.c vendor/tcsh/dist/sh.char.c vendor/tcsh/dist/sh.char.h vendor/tcsh/dist/sh.decls.h vendor/tcsh/dist/sh.dir.c vendor/tcsh/dist/sh.dol.c vendor/tcsh/dist/sh.err.c vendor/tcsh/dist/sh.exec.c vendor/tcsh/dist/sh.exp.c vendor/tcsh/dist/sh.file.c vendor/tcsh/dist/sh.func.c vendor/tcsh/dist/sh.glob.c vendor/tcsh/dist/sh.h vendor/tcsh/dist/sh.lex.c vendor/tcsh/dist/sh.proc.c vendor/tcsh/dist/sh.proc.h vendor/tcsh/dist/sh.sem.c vendor/tcsh/dist/sh.set.c vendor/tcsh/dist/snames.h vendor/tcsh/dist/tc.bind.c vendor/tcsh/dist/tc.const.c vendor/tcsh/dist/tc.decls.h vendor/tcsh/dist/tc.func.c vendor/tcsh/dist/tc.os.h vendor/tcsh/dist/tc.sig.h vendor/tcsh/dist/tc.str.c vendor/tcsh/dist/tcsh.man vendor/tcsh/dist/tw.color.c vendor/tcsh/dist/tw.comp.c vendor/tcsh/dist/tw.parse.c Modified: vendor/tcsh/dist/Fixes ============================================================================== --- vendor/tcsh/dist/Fixes Fri Jul 10 21:42:38 2009 (r195594) +++ vendor/tcsh/dist/Fixes Fri Jul 10 21:47:20 2009 (r195595) @@ -1,3 +1,74 @@ + 21. V6.17.00 - 20090710 + 20. Fix dataroot autoconf issue. + 19. Fix directory stuff for unit tests. + 18. Fix small bug in history in loops. + 17. Provide newer config.{guess,sub} + 16. Fix gcc 4 warnings. + 15. Fix memory trashing bug introduced in 10. + 14. V6.16.01 - 20090624 + 13. add missing sigemptyset in goodbye() + 12. add rlimit swapsize from FreeBSD. + 11. restore behavior where a[n-] never prints an error. + 10. always save the whole command, not just the first 80 chars of it. + 9. fix short2str/short2qstr length adjustment in wide chars + (Vitezslav Crhonek) + 8. set histfile=/tmp/history.temp; set savehist=(100 merge); + alias precmd history -S. After that justpr is not restored and commands + don't execute. (Andriy Gapon) + 7. Fix "as" $ modifier from corrupting memory. + set t=demfonsftraftionf; echo $t:as/f// + 6. Make $% work with environment variable (Ron Johnston) + 5. Dragonfly script support (Matthias Schmidt, m65) + 4. Add autoexpand=onlyhistory (Don Estabrook, m66) + 3. Add history in loops (Laurence Darby, m48) + 2. Add missing colorls "rs" variable (Shlomi Fish, m70) + 1. Fix pts detection issue (Ruslan Ermilov) + + 33. V6.16.00 - 20080930 + 32. longjmp clobbered variable fixes. + 31. __GNX__ addition + 30. Windows fork fixes + 28. V6.15.02 - 20080830 + 27. Fix an eval free'ing botch (Per Hedeland) + 26. /bin/echo "`" coredumped because stderror() calls longjmp corrupting + the stack (Mark Davies). We should vet the code for all stderror() + calls that cleanup local stack variables. + 25. foo > ${undef} caused coredumps because of vfork() child corrupting + the state of the parent stack. + 24. $x[A-B] did not complain for A out of range. (Cai Xianchao) + 23. rename setp -> tcsh_setp to avoid conflict with mach (Javier Vasquez) + 22. Fix degree handling by defining __XPG4_CHAR_CLASS__ for solaris + (Mike Sullivan) + 21. Change 'od' to 'od -c' in tests so that they work on big endian machines. + (Martin Kraemer) + 20. Add environment variable COMMAND_LINE to be available in completions + (Marcin Konarski) + 19. V6.15.01 - 20070928 + 18. Evaluate expressions in the proper order (Li Zefan), controlled by + compat_expr. + 17. Don't need to flush() if we are silent. Prevents recursive error issue. + (joshua stein) + 16. Don't execute the jobcmd if the output is not a tty (Charles Ross) + 15. Quote the history in the examples (Johann 'Myrkraverk' Oskarsson) + 14. Mismatch clarification patch (Per Hedeland) + 13. Fix 'repeat n cmd &' abort() (Mike Sullivan) + 12. Fix octal parsing (Li Zefan) + 11. Fix pty detection for autologout setting (Kris Kennaway, Giorgos Keramidas) + 10. kill `foo` got stuck because sigchld was disabled too soon (Mark Peek) + 9. Avoid null pointer dereference in proc cwd (Kurt Miller) + 8. eval "foreach a b c" exits (Anthony Menasse) + 7. Quoting was broken in substitutions (Joe Wells) + 6. QNX patches via pkgsrc + 5. cd - twice from a directory that contained a glob pattern, + expands the glob twice (Mark Santcroos) + 4. MidnightBsd support (Lucas Holt) + 3. Fix history substitution core-dump with no history entries + 2. Merge two character tables that are the same (Martin Kraemer) + 1. On ancient 7 bit locales, punctuation characters are used to + denote special characters such as umlaut, adiaresis, etc. + These characters return true for isalpha/isalnum. Ignore them + because they break parsing (Martin Kraemer) + 74. V6.15.00 - 20070303 73. fix extension eating windows code (christos) 72. fix loop in %R history expansion (christos) Modified: vendor/tcsh/dist/Imakefile ============================================================================== --- vendor/tcsh/dist/Imakefile Fri Jul 10 21:42:38 2009 (r195594) +++ vendor/tcsh/dist/Imakefile Fri Jul 10 21:47:20 2009 (r195595) @@ -1,5 +1,5 @@ XCOMM -XCOMM $tcsh: Imakefile,v 1.85 2006/03/02 18:46:44 christos Exp $ +XCOMM $tcsh: Imakefile,v 1.86 2007/03/19 23:25:02 christos Exp $ XCOMM XCOMM Imakefile for tcsh 6.12 XCOMM Marc Horowitz, MIT SIPB @@ -211,6 +211,10 @@ EXTF=mi.termios.c mi.wait.h mi.varargs.h # define ConfigH bsd4.4 # endif /* FreeBsdArchitecture */ +# ifdef MidnightBSDArchitecture +# define ConfigH bsd4.4 +# endif /* MidnightBsdArchitecture */ + # ifdef i386SVR4Architecture # define ConfigH sysv4 # ifdef DELL Modified: vendor/tcsh/dist/Makefile.in ============================================================================== --- vendor/tcsh/dist/Makefile.in Fri Jul 10 21:42:38 2009 (r195594) +++ vendor/tcsh/dist/Makefile.in Fri Jul 10 21:47:20 2009 (r195595) @@ -1,4 +1,4 @@ -# $tcsh: Makefile.in,v 3.36 2006/08/24 20:56:31 christos Exp $ +# $tcsh: Makefile.in,v 3.40 2009/06/24 22:09:05 christos Exp $ # Makefile.in 4.3 6/11/83 # # C Shell with process control; VM/UNIX VAX Makefile @@ -248,7 +248,7 @@ CPP = @CPP@ # This is set by autoconf. # The -B tells gcc to use /bin/ld. This is to avoid using the gnu ld, which # on the suns does not know how to make dynamically linked binaries. CC = @CC@ # This is set by autoconf. -#CC= gcc -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Werror -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wsign-compare -Wcast-qual -Wreturn-type -Wswitch -Wshadow -Wwrite-strings +#CC= gcc -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Werror -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wsign-compare -Wcast-qual -Wreturn-type -Wswitch -Wshadow -Wwrite-strings -Wextra #CC= gcc -Wall -pipe -B/bin/ # -ansi -pedantic #CC= gcc -m486 -pipe -Wall # Generate code for Intel 486 (linux) #CC= shlicc # BSDI2.1 w/ shared libraries @@ -278,7 +278,7 @@ P= prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ -mandir=@mandir@ +mandir=@datarootdir@/man MANSECT=1 DESTBIN=${DESTDIR}${bindir} DESTMAN=${DESTDIR}${mandir}/man${MANSECT} @@ -463,7 +463,7 @@ $(srcdir)/tests/package.m4: $(srcdir)/co echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ } >$(srcdir)/tests/package.m4 -$(srcdir)/tests/testsuite: tests/package.m4 tests/testsuite.at $(TESTFILES) +$(srcdir)/tests/testsuite: $(srcdir)/tests/package.m4 $(srcdir}/tests/testsuite.at $(TESTFILES) autom4te --language=autotest -I $(srcdir)/tests \ $(srcdir)/tests/testsuite.at -o $@.tmp mv $@.tmp $@ @@ -531,11 +531,16 @@ install.cygwin: install install.man cp ${srcdir}/WishList ${srcdir}/Y2K ${DESTDIR}${prefix}/share/doc/tcsh perl ${srcdir}/tcsh.man2html ${srcdir}/tcsh.man cp -rp tcsh.html ${DESTDIR}${prefix}/share/doc/tcsh + -mkdir -p ${DESTDIR}/etc/defaults/etc/profile.d -mkdir -p ${DESTDIR}/etc/profile.d -mkdir -p ${DESTDIR}/etc/postinstall - cp -p ${srcdir}/cygwin/etc/csh.* ${DESTDIR}/etc - cp -p ${srcdir}/cygwin/etc/profile.d/*.tcsh ${DESTDIR}/etc/profile.d - cp -p ${srcdir}/cygwin/etc/postinstall/tcsh.sh ${DESTDIR}/etc/postinstall + -mkdir -p ${DESTDIR}/etc/preremove + cp -p ${srcdir}/cygwin/csh.cshrc ${DESTDIR}/etc/defaults/etc + cp -p ${srcdir}/cygwin/csh.login ${DESTDIR}/etc/defaults/etc + cp -p ${srcdir}/cygwin/bindkey.tcsh ${DESTDIR}/etc/defaults/etc/profile.d + cp -p ${srcdir}/complete.tcsh ${DESTDIR}/etc/defaults/etc/profile.d + cp -p ${srcdir}/cygwin/postinstall.sh ${DESTDIR}/etc/postinstall/tcsh.sh + cp -p ${srcdir}/cygwin/preremove.sh ${DESTDIR}/etc/preremove/tcsh.sh # Amiga Unix #install.man: tcsh.man Modified: vendor/tcsh/dist/README ============================================================================== --- vendor/tcsh/dist/README Fri Jul 10 21:42:38 2009 (r195594) +++ vendor/tcsh/dist/README Fri Jul 10 21:47:20 2009 (r195595) @@ -1,4 +1,4 @@ -This is tcsh version 6.15. Tcsh is a version of the Berkeley +This is tcsh version 6.17.00. Tcsh is a version of the Berkeley C-Shell, with the addition of: a command line editor, command and file name completion, listing, etc. and a bunch of small additions to the shell itself. Modified: vendor/tcsh/dist/complete.tcsh ============================================================================== --- vendor/tcsh/dist/complete.tcsh Fri Jul 10 21:42:38 2009 (r195594) +++ vendor/tcsh/dist/complete.tcsh Fri Jul 10 21:47:20 2009 (r195595) @@ -1,5 +1,5 @@ # -# $tcsh: complete.tcsh,v 1.47 2006/03/02 18:46:44 christos Exp $ +# $tcsh: complete.tcsh,v 1.51 2007/10/01 21:51:59 christos Exp $ # example file using the new completion code # # Debian GNU/Linux @@ -38,18 +38,18 @@ endif if ($?_complete) then set noglob if ( ! $?hosts ) set hosts - foreach f ($HOME/.hosts /usr/local/etc/csh.hosts $HOME/.rhosts /etc/hosts.equiv) - if ( -r $f ) then - set hosts = ($hosts `grep -v "+" $f | grep -E -v "^#" | tr -s " " " " | cut -f 1`) + foreach f ("$HOME/.hosts" /usr/local/etc/csh.hosts "$HOME/.rhosts" /etc/hosts.equiv) + if ( -r "$f" ) then + set hosts = ($hosts `grep -v "+" "$f" | grep -E -v "^#" | tr -s " " " " | cut -f 1`) endif end - if ( -r $HOME/.netrc ) then - set f=`awk '/machine/ { print $2 }' < $HOME/.netrc` >& /dev/null + if ( -r "$HOME/.netrc" ) then + set f=`awk '/machine/ { print $2 }' < "$HOME/.netrc"` >& /dev/null set hosts=($hosts $f) endif - if ( -r $HOME/.ssh/known_hosts ) then - set f=`cat $HOME/.ssh/known_hosts | cut -f 1 -d \ ` >& /dev/null - set f=`cat $HOME/.ssh/known_hosts | cut -f 1 -d \ | sed -e 's/,/ /g'` >& /dev/null + if ( -r "$HOME/.ssh/known_hosts" ) then + set f=`cat "$HOME/.ssh/known_hosts" | cut -f 1 -d \ ` >& /dev/null + set f=`cat "$HOME/.ssh/known_hosts" | cut -f 1 -d \ | sed -e 's/,/ /g'` >& /dev/null set hosts=($hosts $f) endif unset f @@ -224,7 +224,7 @@ if ($?_complete) then # these should be merged with the MH completion hacks below - jgotts complete {refile,sprev,snext,scan,pick,rmm,inc,folder,show} \ - c@+@F:$HOME/Mail/@ + "c@+@F:$HOME/Mail/@" # these and interrupt handling from Jaap Vermeulen complete {rexec,rxexec,rxterm,rmterm} \ @@ -286,7 +286,7 @@ if ($?_complete) then complete setenv 'p/1/e/' 'c/*:/f/' # these and method of setting hosts from Kimmo Suominen - if ( -f $HOME/.mh_profile && -x "`which folders`" ) then + if ( -f "$HOME/.mh_profile" && -x "`which folders`" ) then if ( ! $?FOLDERS ) setenv FOLDERS "`folders -fast -recurse`" if ( ! $?MHA ) setenv MHA "`ali | sed -e '/^ /d' -e 's/:.*//'`" @@ -505,6 +505,19 @@ if ($?_complete) then logout rdiff release remove rtag status tag unedit \ update watch watchers)/' 'n/-a/(edit unedit commit \ all none)/' 'n/watch/(on off add remove)/' + complete svn 'C@file:///@`'"${HOME}/etc/tcsh/complete.d/svn"'`@@' \ + 'n@ls@(file:/// svn+ssh:// svn://)@@' \ + 'n@help@(add blame cat checkout \ + cleanup commit copy delete export help \ + import info list ls lock log merge mkdir \ + move propdel propedit propget proplist \ + propset resolved revert status switch unlock \ + update)@' 'p@1@(add blame cat checkout \ + cleanup commit copy delete export help \ + import info list ls lock log merge mkdir \ + move propdel propedit propget proplist \ + propset resolved revert status switch unlock \ + update)@' complete cxx 'p/*/f:*.{c++,cxx,c,cc,C,cpp}/' complete detex 'p/*/f:*.tex/' complete edquota 'n/*/u/' @@ -591,14 +604,14 @@ if ($?_complete) then flush-logs flush-status flush-tables flush-privileges \ kill password ping processlist reload refresh \ shutdown status variables version)/' - complete mutt c@-f=@F:${HOME}/Mail/@ \ + complete mutt "c@-f=@F:${HOME}/Mail/@" \ n/-a/f/ \ n/-F/f/ n/-H/f/ \ n/-s/x:''/ \ n/-e/x:''/ \ - n@-b@'`cat ${HOME}/.muttrc-alias | awk '"'"'{print $2 }'"'"\`@ \ - n@-c@'`cat ${HOME}/.muttrc-alias | awk '"'"'{print $2 }'"'"\`@ \ - n@*@'`cat ${HOME}/.muttrc-alias | awk '"'"'{print $2 }'"'"\`@ + n@-b@'`cat "${HOME}/.muttrc-alias" | awk '"'"'{print $2 }'"'"\`@ \ + n@-c@'`cat "${HOME}/.muttrc-alias" | awk '"'"'{print $2 }'"'"\`@ \ + n@*@'`cat "${HOME}/.muttrc-alias" | awk '"'"'{print $2 }'"'"\`@ complete ndc 'n/*/(status dumpdb reload stats trace notrace \ querylog start stop restart )/' if ($?traditional_complete) then @@ -711,14 +724,15 @@ if ($?_complete) then complete unsetenv n/*/e/ set _maildir = /var/mail - if (-r $HOME/.mailrc) then + if (-r "$HOME/.mailrc") then complete mail c/-/"(e i f n s u v)"/ c/*@/\$hosts/ \ - c@+@F:$HOME/Mail@ C@[./\$~]@f@ n/-s/x:''/ \ + "c@+@F:$HOME/Mail@" C@[./\$~]@f@ n/-s/x:''/ \ n@-u@T:$_maildir@ n/-f/f/ \ - n@*@'`sed -n s/alias//p $HOME/.mailrc | tr -s " " " " | cut -f 2`'@ + n@*@'`sed -n s/alias//p "$HOME/.mailrc" | \ + tr -s " " " " | cut -f 2`'@ else complete mail c/-/"(e i f n s u v)"/ c/*@/\$hosts/ \ - c@+@F:$HOME/Mail@ C@[./\$~]@f@ n/-s/x:''/ \ + "c@+@F:$HOME/Mail@" C@[./\$~]@f@ n/-s/x:''/ \ n@-u@T:$_maildir@ n/-f/f/ n/*/u/ endif unset _maildir @@ -1029,23 +1043,41 @@ n@public@'`[ -r /usr/man/manp ]&& \ls -1 N/{-C,--directory}/'`\ls $:-1`'/ \ n/-[0-7]/"(l m h)"/ - # Linux filesystems - complete mount c/-/"(a f F h l n o r s t U v V w)"/ n/-[hV]/n/ \ - n/-o/x:''/ n/-t/x:''/ \ - n/-L/x:'