Re: svn commit: r195652 - head/etc
In message <200907130551.n6d5pyoy012...@svn.freebsd.org>, David Malone (dwmal...@freebsd.org) wrote: > Author: dwmalone > Date: Mon Jul 13 05:51:33 2009 > New Revision: 195652 > URL: http://svn.freebsd.org/changeset/base/195652 > > Log: > 1) Use our vendor domain at the pool. > 2) Point people at the pool website and encourage > people to provide a server in the pool (as a > courtesy to the pool guys). > 3) Fix a spelling. > 4) Comment out the local clock and include a link > to documentation for use of the local clock on > the ntp.org site. > > Approved by:re (kib) > > Modified: > head/etc/ntp.conf > > Modified: head/etc/ntp.conf > == > --- head/etc/ntp.conf Mon Jul 13 01:37:48 2009(r195651) > +++ head/etc/ntp.conf Mon Jul 13 05:51:33 2009(r195652) > @@ -13,19 +13,22 @@ > # > # The following three servers will give you a random set of three > # NTP servers geographically close to you. > -# See http://en.wikipedia.org/wiki/NTP_pool for details. > +# See http://www.pool.ntp.org/ for details. Note, the pool encourages > +# users with a static IP and good upstream NTP servers to add a server > +# to the pool. See http://www.pool.ntp.org/join.html if you are interested. > # > # The option `iburst' is used for faster initial synchronisation. > # The option `maxpoll 9' is used to prevent PLL/FLL flipping on FreeBSD. > # > -server 0.pool.ntp.org iburst maxpoll 9 > -server 1.pool.ntp.org iburst maxpoll 9 > -server 2.pool.ntp.org iburst maxpoll 9 > +server 0.freebsd.pool.ntp.org iburst maxpoll 9 > +server 1.freebsd.pool.ntp.org iburst maxpoll 9 > +server 2.freebsd.pool.ntp.org iburst maxpoll 9 > +#server 3.freebsd.pool.ntp.org iburst maxpoll 9 > > # > # If you want to pick yourself which country's public NTP server > # you want sync against, comment out the above servers, uncomment The above sentence seems very clumsy to me. How about: # If you wish to choose which country's public server you want # to sync against, ... Cheers, Nick. -- ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: 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/
Paul B. Mahol wrote: On 7/11/09, Paul B. Mahol wrote: When trying to load cam.ko nothing verbose is displayed, just this: module_register: module probe already exists! Module probe failed to register: 17 Argh, it's so obvious, it doesnt get loaded because module probe is used twice with PERIPHDRIVER_DECLARE(probe, ...) in scsi_xpt.c and ata_xpt.c Fixed. Thanks. -- Alexander Motin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r195653 - head/sys/cam/ata
Author: mav
Date: Mon Jul 13 06:12:21 2009
New Revision: 195653
URL: http://svn.freebsd.org/changeset/base/195653
Log:
Rename ATA probe driver to "aprobe" to resolve name conflict with SCSI
and fix loading cam as module.
Approved by: re (implicitly)
Modified:
head/sys/cam/ata/ata_xpt.c
Modified: head/sys/cam/ata/ata_xpt.c
==
--- head/sys/cam/ata/ata_xpt.c Mon Jul 13 05:51:33 2009(r195652)
+++ head/sys/cam/ata/ata_xpt.c Mon Jul 13 06:12:21 2009(r195653)
@@ -83,11 +83,11 @@ static periph_init_t probe_periph_init;
static struct periph_driver probe_driver =
{
- probe_periph_init, "probe",
+ probe_periph_init, "aprobe",
TAILQ_HEAD_INITIALIZER(probe_driver.units)
};
-PERIPHDRIVER_DECLARE(probe, probe_driver);
+PERIPHDRIVER_DECLARE(aprobe, probe_driver);
typedef enum {
PROBE_RESET,
@@ -1311,7 +1311,7 @@ ata_scan_lun(struct cam_periph *periph,
request_ccb->crcn.flags = flags;
}
- if ((old_periph = cam_periph_find(path, "probe")) != NULL) {
+ if ((old_periph = cam_periph_find(path, "aprobe")) != NULL) {
probe_softc *softc;
softc = (probe_softc *)old_periph->softc;
@@ -1319,7 +1319,7 @@ ata_scan_lun(struct cam_periph *periph,
periph_links.tqe);
} else {
status = cam_periph_alloc(proberegister, NULL, probecleanup,
- probestart, "probe",
+ probestart, "aprobe",
CAM_PERIPH_BIO,
request_ccb->ccb_h.path, NULL, 0,
request_ccb);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r195652 - head/etc
Author: dwmalone Date: Mon Jul 13 05:51:33 2009 New Revision: 195652 URL: http://svn.freebsd.org/changeset/base/195652 Log: 1) Use our vendor domain at the pool. 2) Point people at the pool website and encourage people to provide a server in the pool (as a courtesy to the pool guys). 3) Fix a spelling. 4) Comment out the local clock and include a link to documentation for use of the local clock on the ntp.org site. Approved by: re (kib) Modified: head/etc/ntp.conf Modified: head/etc/ntp.conf == --- head/etc/ntp.conf Mon Jul 13 01:37:48 2009(r195651) +++ head/etc/ntp.conf Mon Jul 13 05:51:33 2009(r195652) @@ -13,19 +13,22 @@ # # The following three servers will give you a random set of three # NTP servers geographically close to you. -# See http://en.wikipedia.org/wiki/NTP_pool for details. +# See http://www.pool.ntp.org/ for details. Note, the pool encourages +# users with a static IP and good upstream NTP servers to add a server +# to the pool. See http://www.pool.ntp.org/join.html if you are interested. # # The option `iburst' is used for faster initial synchronisation. # The option `maxpoll 9' is used to prevent PLL/FLL flipping on FreeBSD. # -server 0.pool.ntp.org iburst maxpoll 9 -server 1.pool.ntp.org iburst maxpoll 9 -server 2.pool.ntp.org iburst maxpoll 9 +server 0.freebsd.pool.ntp.org iburst maxpoll 9 +server 1.freebsd.pool.ntp.org iburst maxpoll 9 +server 2.freebsd.pool.ntp.org iburst maxpoll 9 +#server 3.freebsd.pool.ntp.org iburst maxpoll 9 # # If you want to pick yourself which country's public NTP server # you want sync against, comment out the above servers, uncomment -# the next ones and replace CC with the country's abbrevation. +# the next ones and replace CC with the country's abbreviation. # Make sure that the hostnames resolve to a proper IP address! # # server 0.CC.pool.ntp.org iburst maxpoll 9 @@ -50,10 +53,12 @@ server 2.pool.ntp.org iburst maxpoll 9 #restrict 127.127.1.0 # -# If we lose sync against all configured servers, the NTP clients -# syncing against this server will lose sync too. To overcome this, -# we will act as a stratum 10 server with our own internal clock -# so that everybody at least will have the same time as we have. +# If a server loses sync with all upstream servers, NTP clients +# no longer follow that server. The local clock can be configured +# to provide a time source when this happens, but it should usually +# be configured on just one server on a network. For more details see +# http://support.ntp.org/bin/view/Support/UndisciplinedLocalClock +# The use of Orphan Mode may be preferable. # -server 127.127.1.0 -fudge 127.127.1.0 stratum 10 +#server 127.127.1.0 +#fudge 127.127.1.0 stratum 10 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: 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/
Carlos A. M. dos Santos wrote: On Fri, Jul 10, 2009 at 5:31 AM, Scott Long wrote: Poul-Henning Kamp wrote: In message <200907100818.n6a8i8p1011...@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. Well, from a user's perspective, if CD/DVD drives are to be seen as 'cdX', then it would make sense that hard disks were seen as daX, as already advertised by cam(4). cdX implemented by cd(4) driver in both cases uses the same SCSI command set. In ATA case, SCSI commands are just wrapped within ATAPI PACKET command. For disks, situation is completely different, as ATA disks have completely different command and feature set. So da(4) is a driver for SCSI command set devices and ada(4) is a driver for ATA command set devices. -- Alexander Motin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: 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/d
On Mon, 13 Jul 2009, Scott Long wrote: > The only big downside to using the 'da' device moniker for SATA disks > is that it hinders people who want to experiment with switching back > and forth between the old and new ahci/ata drivers. I feel for these > people, and I don't like making their lives hard. But on the other > hand, this is a transition period, and experimenting is not without > headaches and risks. A day will come, hopefully fairly soon, where > switching between the two subsystems is no longer needed, and I don't > like catering to a short term need at the expense of a long-term > need. If you are such a user it is trivial to switch to using UFS ID labels. Swap is a little more complex but you can use glabel fairly easily. -- 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 signature.asc Description: This is a digitally signed message part.
Re: 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/
Carlos A. M. dos Santos wrote: On Fri, Jul 10, 2009 at 5:31 AM, Scott Long wrote: Poul-Henning Kamp wrote: In message <200907100818.n6a8i8p1011...@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. Well, from a user's perspective, if CD/DVD drives are to be seen as 'cdX', then it would make sense that hard disks were seen as daX, as already advertised by cam(4). It gets more complicated than that, even. What about a SAS controller that handles both SATA and SAS disks? Should some disks on the controller be called one thing and some disks be called something else, even though they are both disks? What about intelligent controllers like MPT that do ATA emulation in firmware; SATA and SAS already both show up as 'da' under that controller. How consistent should it be that some disks show up under one name instead of the other name, depending on some feature of controller and/or disk firmware (and I'm not even talking about RAID controllers yet, see below). Should users be expected to care about this level of detail just to get their filesystem created and mounted (and no, this is not a debate about disk and/or filesystem labels, k thx)? SATA vs SCSI/SAS is really just a difference in firmware these days, and it's a difference that the computer should be smart enough to handle transparently in the common case of detecting the disks and doing i/o. Why burden users with caring about the details of a protocol, when all they want to do is access their data? Computers are supposed to automate mundane tasks and decisions like this, not add new mundane tasks and decisions for us to manage by hand. The only time that the protocol matters in a user-visible way is when using camcontrol to manually send a command. I consider camcontrol to be a power-user tool anyways; it's not something that is needed at boot or needed in order to access a USB thumb drive. The only big downside to using the 'da' device moniker for SATA disks is that it hinders people who want to experiment with switching back and forth between the old and new ahci/ata drivers. I feel for these people, and I don't like making their lives hard. But on the other hand, this is a transition period, and experimenting is not without headaches and risks. A day will come, hopefully fairly soon, where switching between the two subsystems is no longer needed, and I don't like catering to a short term need at the expense of a long-term need. One solution to moderate the risk and workload for these experimental users is to add some sort of intelligence to the system that would create 'ad' aliases for 'da' sata disks, but only if the classic ata driver is not present. This restriction would be needed so that there aren't any name clashes in the 'ad' space. Users could then generate some CAM hints to specify 'adX' unit numbers that match what the classic ata driver would use. Another solution is to just bite the bullet and do what I've ultimately wanted to do with disk device names, and create 'diskX' aliases for all direct-access block devices. This would affect hard disks, memory sticks, logical disks like g_raid things, and things that look like hard disks. It would not include cdroms, tapes, etc, that operate on different paradigm than disks. Then you'd have a single handle for both classic ata and new cam devices. There would be a problem with keping unit numbers consistent between classic ata and CAM, though, so this would still present some risk to the experimenter group. However, it also represents where I'd ultimately like this whole disk naming debate to go. What needs to happen in any case is that newbus needs to get out from under Giant. CAM needs to be able to create and destroy devices on the fly, and having to juggle Giant to do that is a step backwards that I don't want to take. Once the newbus problem is solved (and there is already at least one person interested in it, please contact me if you are also interested) then CAM periphs and buses can be made into newbus objects, and the unit numbering for them can be handled consistently and safely though the devclass mechanism in newbus. Once that happens, SATA disks can use 'da' or 'ad' or anything else without conflicts in the unit number space. And then, it's just a question of which color best suits the shed that houses our nuclear reactor. Scott ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: 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
On Fri, Jul 10, 2009 at 5:31 AM, Scott Long wrote: > Poul-Henning Kamp wrote: >> >> In message <200907100818.n6a8i8p1011...@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. Well, from a user's perspective, if CD/DVD drives are to be seen as 'cdX', then it would make sense that hard disks were seen as daX, as already advertised by cam(4). > 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 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r195649 - in head/sys: amd64/amd64 amd64/include arm/include i386/i386 i386/include i386/xen ia64/include kern mips/include powerpc/include sparc64/include sun4v/include vm
Author: alc
Date: Sun Jul 12 23:31:20 2009
New Revision: 195649
URL: http://svn.freebsd.org/changeset/base/195649
Log:
Add support to the virtual memory system for configuring machine-
dependent memory attributes:
Rename vm_cache_mode_t to vm_memattr_t. The new name reflects the
fact that there are machine-dependent memory attributes that have
nothing to do with controlling the cache's behavior.
Introduce vm_object_set_memattr() for setting the default memory
attributes that will be given to an object's pages.
Introduce and use pmap_page_{get,set}_memattr() for getting and
setting a page's machine-dependent memory attributes. Add full
support for these functions on amd64 and i386 and stubs for them on
the other architectures. The function pmap_page_set_memattr() is also
responsible for any other machine-dependent aspects of changing a
page's memory attributes, such as flushing the cache or updating the
direct map. The uses include kmem_alloc_contig(), vm_page_alloc(),
and the device pager:
kmem_alloc_contig() can now be used to allocate kernel memory with
non-default memory attributes on amd64 and i386.
vm_page_alloc() and the device pager will set the memory attributes
for the real or fictitious page according to the object's default
memory attributes.
Update the various pmap functions on amd64 and i386 that map pages to
incorporate each page's memory attributes in the mapping.
Notes: (1) Inherent to this design are safety features that prevent
the specification of inconsistent memory attributes by different
mappings on amd64 and i386. In addition, the device pager provides a
warning when a device driver creates a fictitious page with memory
attributes that are inconsistent with the real page that the
fictitious page is an alias for. (2) Storing the machine-dependent
memory attributes for amd64 and i386 as a dedicated "int" in "struct
md_page" represents a compromise between space efficiency and the ease
of MFCing these changes to RELENG_7.
In collaboration with: jhb
Approved by: re (kib)
Modified:
head/sys/amd64/amd64/pmap.c
head/sys/amd64/include/pmap.h
head/sys/amd64/include/vm.h
head/sys/arm/include/pmap.h
head/sys/arm/include/vm.h
head/sys/i386/i386/pmap.c
head/sys/i386/include/pmap.h
head/sys/i386/include/vm.h
head/sys/i386/xen/pmap.c
head/sys/ia64/include/pmap.h
head/sys/ia64/include/vm.h
head/sys/kern/kern_mbuf.c
head/sys/mips/include/pmap.h
head/sys/mips/include/vm.h
head/sys/powerpc/include/pmap.h
head/sys/powerpc/include/vm.h
head/sys/sparc64/include/pmap.h
head/sys/sparc64/include/vm.h
head/sys/sun4v/include/pmap.h
head/sys/sun4v/include/vm.h
head/sys/vm/device_pager.c
head/sys/vm/pmap.h
head/sys/vm/vm.h
head/sys/vm/vm_contig.c
head/sys/vm/vm_extern.h
head/sys/vm/vm_object.c
head/sys/vm/vm_object.h
head/sys/vm/vm_page.c
head/sys/vm/vm_phys.c
head/sys/vm/vm_phys.h
Modified: head/sys/amd64/amd64/pmap.c
==
--- head/sys/amd64/amd64/pmap.c Sun Jul 12 22:19:50 2009(r195648)
+++ head/sys/amd64/amd64/pmap.c Sun Jul 12 23:31:20 2009(r195649)
@@ -614,6 +614,7 @@ pmap_page_init(vm_page_t m)
{
TAILQ_INIT(&m->md.pv_list);
+ m->md.pat_mode = PAT_WRITE_BACK;
}
/*
@@ -1120,7 +1121,8 @@ pmap_qenter(vm_offset_t sva, vm_page_t *
endpte = pte + count;
while (pte < endpte) {
oldpte |= *pte;
- pte_store(pte, VM_PAGE_TO_PHYS(*ma) | PG_G | PG_RW | PG_V);
+ pte_store(pte, VM_PAGE_TO_PHYS(*ma) | PG_G |
+ pmap_cache_bits((*ma)->md.pat_mode, 0) | PG_RW | PG_V);
pte++;
ma++;
}
@@ -3025,7 +3027,7 @@ validate:
/*
* Now validate mapping with desired protection/wiring.
*/
- newpte = (pt_entry_t)(pa | PG_V);
+ newpte = (pt_entry_t)(pa | pmap_cache_bits(m->md.pat_mode, 0) | PG_V);
if ((prot & VM_PROT_WRITE) != 0) {
newpte |= PG_RW;
vm_page_flag_set(m, PG_WRITEABLE);
@@ -3110,7 +3112,8 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t
" in pmap %p", va, pmap);
return (FALSE);
}
- newpde = VM_PAGE_TO_PHYS(m) | PG_PS | PG_V;
+ newpde = VM_PAGE_TO_PHYS(m) | pmap_cache_bits(m->md.pat_mode, 1) |
+ PG_PS | PG_V;
if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) {
newpde |= PG_MANAGED;
@@ -3292,7 +3295,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_
*/
pmap->pm_stats.resident_count++;
- pa = VM_PAGE_TO_PHYS(m);
+ pa = VM_PAGE_TO_PHYS(m) | pmap_cache_bits(m->md.pat_mode, 0);
if ((prot & VM_PROT_EXECUTE) == 0)
pa |= pg_nx;
@@ -,6 +3336,7 @@ pmap_object_init_pt(pmap_t pmap, vm_offs
pd_entry_t *pde;
vm_pad
svn commit: r195645 - head/share/man/man4
Author: sam Date: Sun Jul 12 20:17:31 2009 New Revision: 195645 URL: http://svn.freebsd.org/changeset/base/195645 Log: add IEEE80211_SCAN_REQ Approved by: re (blanket) Modified: head/share/man/man4/net80211.4 Modified: head/share/man/man4/net80211.4 == --- head/share/man/man4/net80211.4 Sun Jul 12 19:58:52 2009 (r195644) +++ head/share/man/man4/net80211.4 Sun Jul 12 20:17:31 2009 (r195645) @@ -1156,6 +1156,22 @@ Set the age (in seconds) that results fr considered valid. When scan results are no longer valid and they are needed (e.g. to roam) the system will initiate a scan operation to replenish the scan cache. +.It Dv IEEE80211_IOC_SCAN_REQ +Request a scan operation using the parameters pointed to by +.Va i_val . +The underlying device must be running or +.Er ENXIO +will be returned. +Values for +.Va sr_duration , +.Va sr_mindwell , +and +.Va sr_maxdwell +shorter than 1 clock tick are rounded up to a tick. +If more SSID's are supplied than the system is capable of handling +the extra ones are silently ignored. +If a scan operation is already in progress the request will be +(silently) ignored. .It Dv IEEE80211_IOC_SCAN_CANCEL Cancel any pending/active scan operation. .It Dv IEEE80211_IOC_SHORTGI ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r195644 - in head/usr.sbin/wpa: hostapd hostapd_cli wpa_cli wpa_passphrase wpa_supplicant
Author: sam Date: Sun Jul 12 19:58:52 2009 New Revision: 195644 URL: http://svn.freebsd.org/changeset/base/195644 Log: fix Jouni's email address Approved by: re (blanket) Modified: head/usr.sbin/wpa/hostapd/hostapd.8 head/usr.sbin/wpa/hostapd/hostapd.conf.5 head/usr.sbin/wpa/hostapd_cli/hostapd_cli.8 head/usr.sbin/wpa/wpa_cli/wpa_cli.8 head/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8 head/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 head/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 Modified: head/usr.sbin/wpa/hostapd/hostapd.8 == --- head/usr.sbin/wpa/hostapd/hostapd.8 Sun Jul 12 19:20:55 2009 (r195643) +++ head/usr.sbin/wpa/hostapd/hostapd.8 Sun Jul 12 19:58:52 2009 (r195644) @@ -126,7 +126,7 @@ utility first appeared in The .Nm utility was written by -.An Jouni Malinen Aq jkmal...@cc.hut.fi . +.An Jouni Malinen Aq j...@w1.fi . This manual page is derived from the .Pa README file included in the Modified: head/usr.sbin/wpa/hostapd/hostapd.conf.5 == --- head/usr.sbin/wpa/hostapd/hostapd.conf.5Sun Jul 12 19:20:55 2009 (r195643) +++ head/usr.sbin/wpa/hostapd/hostapd.conf.5Sun Jul 12 19:58:52 2009 (r195644) @@ -207,4 +207,4 @@ and files in the .Nm hostapd distribution provided by -.An Jouni Malinen Aq jkmal...@cc.hut.fi . +.An Jouni Malinen Aq j...@w1.fi . Modified: head/usr.sbin/wpa/hostapd_cli/hostapd_cli.8 == --- head/usr.sbin/wpa/hostapd_cli/hostapd_cli.8 Sun Jul 12 19:20:55 2009 (r195643) +++ head/usr.sbin/wpa/hostapd_cli/hostapd_cli.8 Sun Jul 12 19:58:52 2009 (r195644) @@ -104,7 +104,7 @@ utility first appeared in The .Nm utility was written by -.An Jouni Malinen Aq jkmal...@cc.hut.fi . +.An Jouni Malinen Aq j...@w1.fi . This manual page is derived from the .Pa README file included in the Modified: head/usr.sbin/wpa/wpa_cli/wpa_cli.8 == --- head/usr.sbin/wpa/wpa_cli/wpa_cli.8 Sun Jul 12 19:20:55 2009 (r195643) +++ head/usr.sbin/wpa/wpa_cli/wpa_cli.8 Sun Jul 12 19:58:52 2009 (r195644) @@ -214,7 +214,7 @@ utility first appeared in The .Nm utility was written by -.An Jouni Malinen Aq jkmal...@cc.hut.fi . +.An Jouni Malinen Aq j...@w1.fi . This manual page is derived from the .Pa README file included in the Modified: head/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8 == --- head/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8 Sun Jul 12 19:20:55 2009(r195643) +++ head/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8 Sun Jul 12 19:58:52 2009(r195644) @@ -59,7 +59,7 @@ The .Nm utility was written by .An Jouni Malinen -.Aq jkmal...@cc.hut.fi . +.Aq j...@w1.fi . .Pp This manual page was written by .An Henrik Brix Andersen Modified: head/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 == --- head/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 Sun Jul 12 19:20:55 2009(r195643) +++ head/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 Sun Jul 12 19:58:52 2009(r195644) @@ -147,7 +147,7 @@ utility first appeared in The .Nm utility was written by -.An Jouni Malinen Aq jkmal...@cc.hut.fi . +.An Jouni Malinen Aq j...@w1.fi . This manual page is derived from the .Pa README file included in the Modified: head/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 == --- head/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 Sun Jul 12 19:20:55 2009(r195643) +++ head/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 Sun Jul 12 19:58:52 2009(r195644) @@ -542,4 +542,4 @@ and files in the .Nm wpa_supplicant distribution provided by -.An Jouni Malinen Aq jkmal...@cc.hut.fi . +.An Jouni Malinen Aq j...@w1.fi . ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r195643 - head/sys/netinet6
Author: qingli
Date: Sun Jul 12 19:20:55 2009
New Revision: 195643
URL: http://svn.freebsd.org/changeset/base/195643
Log:
This patch adds a host route to an interface address (that is assigned
to a non loopback/ppp link type) through the loopback interface. Prior
to the new L2/L3 rewrite, this host route was explicitly created when
processing the IPv6 address assignment. This loopback host route is
deleted when that IPv6 address is removed from the interface.
Reviewed by: bz, gnn
Approved by: re
Modified:
head/sys/netinet6/in6.c
Modified: head/sys/netinet6/in6.c
==
--- head/sys/netinet6/in6.c Sun Jul 12 17:07:35 2009(r195642)
+++ head/sys/netinet6/in6.c Sun Jul 12 19:20:55 2009(r195643)
@@ -1194,6 +1194,25 @@ in6_purgeaddr(struct ifaddr *ifa)
ifa_ref(ifa0);
IF_ADDR_UNLOCK(ifp);
+ if (!(ia->ia_ifp->if_flags & (IFF_LOOPBACK | IFF_POINTOPOINT))) {
+ struct rt_addrinfo info;
+ struct sockaddr_dl null_sdl;
+
+ bzero(&null_sdl, sizeof(null_sdl));
+ null_sdl.sdl_len = sizeof(null_sdl);
+ null_sdl.sdl_family = AF_LINK;
+ null_sdl.sdl_type = V_loif->if_type;
+ null_sdl.sdl_index = V_loif->if_index;
+ bzero(&info, sizeof(info));
+ info.rti_flags = ia->ia_flags | RTF_HOST | RTF_STATIC;
+ info.rti_info[RTAX_DST] = (struct sockaddr *)&ia->ia_addr;
+ info.rti_info[RTAX_GATEWAY] = (struct sockaddr *)&null_sdl;
+ error = rtrequest1_fib(RTM_DELETE, &info, NULL, 0);
+
+ if (error != 0)
+ log(LOG_INFO, "in6_purgeaddr: deletion failed\n");
+ }
+
/* stop DAD processing */
nd6_dad_stop(ifa);
@@ -1755,6 +1774,33 @@ in6_ifinit(struct ifnet *ifp, struct in6
ia->ia_flags |= IFA_ROUTE;
}
+ /*
+* add a loopback route to self
+*/
+ if (!(ifp->if_flags & (IFF_LOOPBACK | IFF_POINTOPOINT))) {
+ struct rt_addrinfo info;
+ struct rtentry *rt = NULL;
+ static struct sockaddr_dl null_sdl = {sizeof(null_sdl),
AF_LINK};
+
+ bzero(&info, sizeof(info));
+ info.rti_ifp = V_loif;
+ info.rti_flags = ia->ia_flags | RTF_HOST | RTF_STATIC;
+ info.rti_info[RTAX_DST] = (struct sockaddr *)&ia->ia_addr;
+ info.rti_info[RTAX_GATEWAY] = (struct sockaddr *)&null_sdl;
+ error = rtrequest1_fib(RTM_ADD, &info, &rt, 0);
+
+ if (error == 0 && rt != NULL) {
+ RT_LOCK(rt);
+ ((struct sockaddr_dl *)rt->rt_gateway)->sdl_type =
+ rt->rt_ifp->if_type;
+ ((struct sockaddr_dl *)rt->rt_gateway)->sdl_index =
+ rt->rt_ifp->if_index;
+ RT_REMREF(rt);
+ RT_UNLOCK(rt);
+ } else if (error != 0)
+ log(LOG_INFO, "in6_ifinit: insertion failed\n");
+ }
+
/* Add ownaddr as loopback rtentry, if necessary (ex. on p2p link). */
if (newhost) {
struct llentry *ln;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r195642 - head/sys/fs/nfs
Author: rmacklem
Date: Sun Jul 12 17:07:35 2009
New Revision: 195642
URL: http://svn.freebsd.org/changeset/base/195642
Log:
Add calls to the experimental nfs client for the case of an "intr" mount,
so that signals that aren't supposed to terminate RPCs in progress are
masked off during the RPC.
Approved by: re (kensmith), kib (mentor)
Modified:
head/sys/fs/nfs/nfs_commonkrpc.c
Modified: head/sys/fs/nfs/nfs_commonkrpc.c
==
--- head/sys/fs/nfs/nfs_commonkrpc.cSun Jul 12 17:02:17 2009
(r195641)
+++ head/sys/fs/nfs/nfs_commonkrpc.cSun Jul 12 17:07:35 2009
(r195642)
@@ -404,7 +404,7 @@ newnfs_request(struct nfsrv_descript *nd
{
u_int32_t *tl;
time_t waituntil;
- int i, j, set_uid = 0;
+ int i, j, set_uid = 0, set_sigset = 0;
int trycnt, error = 0, usegssname = 0, secflavour = AUTH_SYS;
u_int16_t procnum;
u_int trylater_delay = 1;
@@ -416,6 +416,7 @@ newnfs_request(struct nfsrv_descript *nd
struct nfsreq *rep = NULL;
char *srv_principal = NULL;
uid_t saved_uid = (uid_t)-1;
+ sigset_t oldset;
if (xidp != NULL)
*xidp = 0;
@@ -425,6 +426,12 @@ newnfs_request(struct nfsrv_descript *nd
return (ESTALE);
}
+ /* For client side interruptible mounts, mask off the signals. */
+ if (nmp != NULL && td != NULL && NFSHASINT(nmp)) {
+ newnfs_set_sigmask(td, &oldset);
+ set_sigset = 1;
+ }
+
/*
* XXX if not already connected call nfs_connect now. Longer
* term, change nfs_mount to call nfs_connect unconditionally
@@ -507,6 +514,8 @@ newnfs_request(struct nfsrv_descript *nd
cred->cr_uid = saved_uid;
if (auth == NULL) {
m_freem(nd->nd_mreq);
+ if (set_sigset)
+ newnfs_restore_sigmask(td, &oldset);
return (EACCES);
}
bzero(&ext, sizeof(ext));
@@ -598,6 +607,8 @@ tryagain:
AUTH_DESTROY(auth);
if (rep != NULL)
FREE((caddr_t)rep, M_NFSDREQ);
+ if (set_sigset)
+ newnfs_restore_sigmask(td, &oldset);
return (error);
}
@@ -728,6 +739,8 @@ tryagain:
AUTH_DESTROY(auth);
if (rep != NULL)
FREE((caddr_t)rep, M_NFSDREQ);
+ if (set_sigset)
+ newnfs_restore_sigmask(td, &oldset);
return (0);
nfsmout:
mbuf_freem(nd->nd_mrep);
@@ -735,6 +748,8 @@ nfsmout:
AUTH_DESTROY(auth);
if (rep != NULL)
FREE((caddr_t)rep, M_NFSDREQ);
+ if (set_sigset)
+ newnfs_restore_sigmask(td, &oldset);
return (error);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r195641 - head/sys/fs/nfsclient
Author: rmacklem
Date: Sun Jul 12 17:02:17 2009
New Revision: 195641
URL: http://svn.freebsd.org/changeset/base/195641
Log:
Fix the handling of dotdot in lookup for the experimental nfs client
in a manner analagous to the change in r195294 for the regular nfs client.
Approved by: re (kensmith), kib (mentor)
Modified:
head/sys/fs/nfsclient/nfs_clvnops.c
Modified: head/sys/fs/nfsclient/nfs_clvnops.c
==
--- head/sys/fs/nfsclient/nfs_clvnops.c Sun Jul 12 16:50:32 2009
(r195640)
+++ head/sys/fs/nfsclient/nfs_clvnops.c Sun Jul 12 17:02:17 2009
(r195641)
@@ -,9 +,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;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r195640 - head/sys/dev/sound/usb
Author: marcel
Date: Sun Jul 12 16:50:32 2009
New Revision: 195640
URL: http://svn.freebsd.org/changeset/base/195640
Log:
Isochronous transfers only have 1 frame buffer, but multiple
frame lengths. The frame buffer is at index 0.
Approved by: re (kensmith)
Obtained from:HPS
Modified:
head/sys/dev/sound/usb/uaudio.c
Modified: head/sys/dev/sound/usb/uaudio.c
==
--- head/sys/dev/sound/usb/uaudio.c Sun Jul 12 16:46:43 2009
(r195639)
+++ head/sys/dev/sound/usb/uaudio.c Sun Jul 12 16:50:32 2009
(r195640)
@@ -1256,7 +1256,7 @@ tr_transferred:
for (n = 0; n != nframes; n++) {
offset1 = offset0;
- pc = usbd_xfer_get_frame(xfer, n);
+ pc = usbd_xfer_get_frame(xfer, 0);
len = usbd_xfer_frame_len(xfer, n);
while (len > 0) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r195639 - head/sys/dev/usb
Author: marcel Date: Sun Jul 12 16:46:43 2009 New Revision: 195639 URL: http://svn.freebsd.org/changeset/base/195639 Log: MFp4: USB CORE: busdma improvement For single segment allocations the boundary field of the BUSDMA tag should be zero. Currently all single segment allocations are less than or equal to 4096 bytes, so the limit does not kick in. If any single segment USB allocations would be greater than 4K, then it would be a problem. Approved by: re (kensmith) Obtained from:HPS Modified: head/sys/dev/usb/usb_busdma.c Modified: head/sys/dev/usb/usb_busdma.c == --- head/sys/dev/usb/usb_busdma.c Sun Jul 12 16:04:12 2009 (r195638) +++ head/sys/dev/usb/usb_busdma.c Sun Jul 12 16:46:43 2009 (r195639) @@ -359,7 +359,8 @@ usb_dma_tag_create(struct usb_dma_tag *u if (bus_dma_tag_create ( /* parent*/ udt->tag_parent->tag, /* alignment */ align, -/* boundary */ USB_PAGE_SIZE, +/* boundary */ (align == 1) ? + USB_PAGE_SIZE : 0, /* lowaddr */ (2ULL << (udt->tag_parent->dma_bits - 1)) - 1, /* highaddr */ BUS_SPACE_MAXADDR, /* filter*/ NULL, ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r195637 - head/lib/libc/stdio
Author: ed Date: Sun Jul 12 13:09:43 2009 New Revision: 195637 URL: http://svn.freebsd.org/changeset/base/195637 Log: Fix fwrite() to return 0 when size or nmemb are zero. Right now nmemb is returned when size is 0. In newer versions of the standards, it is explicitly required that fwrite() should return 0. Submitted by: Christoph Mallon Approved by: re (kib) Modified: head/lib/libc/stdio/fread.c head/lib/libc/stdio/fwrite.c Modified: head/lib/libc/stdio/fread.c == --- head/lib/libc/stdio/fread.c Sun Jul 12 12:50:43 2009(r195636) +++ head/lib/libc/stdio/fread.c Sun Jul 12 13:09:43 2009(r195637) @@ -67,9 +67,7 @@ __fread(void * __restrict buf, size_t si size_t total; /* -* The ANSI standard requires a return value of 0 for a count -* or a size of 0. Peculiarily, it imposes no such requirements -* on fwrite; it only requires fread to be broken. +* ANSI and SUSv2 require a return value of 0 if size or count are 0. */ if ((resid = count * size) == 0) return (0); Modified: head/lib/libc/stdio/fwrite.c == --- head/lib/libc/stdio/fwrite.cSun Jul 12 12:50:43 2009 (r195636) +++ head/lib/libc/stdio/fwrite.cSun Jul 12 13:09:43 2009 (r195637) @@ -57,8 +57,15 @@ fwrite(buf, size, count, fp) struct __suio uio; struct __siov iov; + /* +* ANSI and SUSv2 require a return value of 0 if size or count are 0. +*/ + n = count * size; + if (n == 0) + return (0); + iov.iov_base = (void *)buf; - uio.uio_resid = iov.iov_len = n = count * size; + uio.uio_resid = iov.iov_len = n; uio.uio_iov = &iov; uio.uio_iovcnt = 1; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r195636 - in head/tools/regression/poll: . 4 7 l m n
Author: kib Date: Sun Jul 12 12:50:43 2009 New Revision: 195636 URL: http://svn.freebsd.org/changeset/base/195636 Log: Test suite for the poll(2)/select(2) on fifos, pipes and sockets, and recorded results for several operating systems. Submitted by: bde Approved by: re (kensmith) Added: head/tools/regression/poll/ head/tools/regression/poll/4/ head/tools/regression/poll/4/pipepoll.out (contents, props changed) head/tools/regression/poll/4/pipeselect.out (contents, props changed) head/tools/regression/poll/7/ head/tools/regression/poll/7/pipepoll.out (contents, props changed) head/tools/regression/poll/7/pipeselect.out (contents, props changed) head/tools/regression/poll/Makefile (contents, props changed) head/tools/regression/poll/Readme (contents, props changed) head/tools/regression/poll/l/ head/tools/regression/poll/l/pipepoll.out (contents, props changed) head/tools/regression/poll/l/pipeselect.out (contents, props changed) head/tools/regression/poll/m/ head/tools/regression/poll/m/pipepoll.out (contents, props changed) head/tools/regression/poll/m/pipeselect.out (contents, props changed) head/tools/regression/poll/n/ head/tools/regression/poll/n/pipepoll.out (contents, props changed) head/tools/regression/poll/n/pipeselect.out (contents, props changed) head/tools/regression/poll/pipepoll.c (contents, props changed) head/tools/regression/poll/pipeselect.c (contents, props changed) Added: head/tools/regression/poll/4/pipepoll.out == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/poll/4/pipepoll.out Sun Jul 12 12:50:43 2009 (r195636) @@ -0,0 +1,21 @@ +1..20 +ok 1 Pipe state 4: expected 0; got 0 +ok 2 Pipe state 5: expected POLLIN; got POLLIN +ok 3 Pipe state 6: expected POLLIN | POLLHUP; got POLLIN | POLLHUP +not ok 4 Pipe state 6a: expected POLLHUP; got POLLIN | POLLHUP +ok 5 Sock state 4: expected 0; got 0 +ok 6 Sock state 5: expected POLLIN; got POLLIN +not ok 7 Sock state 6: expected POLLIN | POLLHUP; got POLLIN +not ok 8 Sock state 6a: expected POLLHUP; got POLLIN +not ok 9 FIFO state 0: expected 0; got POLLIN +ok 10 FIFO state 1: expected 0; got 0 +ok 11 FIFO state 2: expected POLLIN; got POLLIN +ok 12 FIFO state 2a: expected 0; got 0 +not ok 13 FIFO state 3: expected POLLHUP; got POLLIN +ok 14 FIFO state 4: expected 0; got 0 +ok 15 FIFO state 5: expected POLLIN; got POLLIN +not ok 16 FIFO state 6: expected POLLIN | POLLHUP; got POLLIN +not ok 17 FIFO state 6a: expected POLLHUP; got POLLIN +not ok 18 FIFO state 6b: expected 0; got POLLIN +not ok 19 FIFO state 6c: expected POLLHUP; got POLLIN +not ok 20 FIFO state 6d: expected POLLHUP; got POLLIN Added: head/tools/regression/poll/4/pipeselect.out == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/poll/4/pipeselect.out Sun Jul 12 12:50:43 2009 (r195636) @@ -0,0 +1,21 @@ +1..20 +ok 1 Pipe state 4: expected clear; got clear +ok 2 Pipe state 5: expected set; got set +ok 3 Pipe state 6: expected set; got set +ok 4 Pipe state 6a: expected set; got set +ok 5 Sock state 4: expected clear; got clear +ok 6 Sock state 5: expected set; got set +ok 7 Sock state 6: expected set; got set +ok 8 Sock state 6a: expected set; got set +not ok 9 FIFO state 0: expected clear; got set +ok 10 FIFO state 1: expected clear; got clear +ok 11 FIFO state 2: expected set; got set +ok 12 FIFO state 2a: expected clear; got clear +ok 13 FIFO state 3: expected set; got set +ok 14 FIFO state 4: expected clear; got clear +ok 15 FIFO state 5: expected set; got set +ok 16 FIFO state 6: expected set; got set +ok 17 FIFO state 6a: expected set; got set +not ok 18 FIFO state 6b: expected clear; got set +ok 19 FIFO state 6c: expected set; got set +ok 20 FIFO state 6d: expected set; got set Added: head/tools/regression/poll/7/pipepoll.out == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/poll/7/pipepoll.out Sun Jul 12 12:50:43 2009 (r195636) @@ -0,0 +1,21 @@ +1..20 +ok 1 Pipe state 4: expected 0; got 0 +ok 2 Pipe state 5: expected POLLIN; got POLLIN +ok 3 Pipe state 6: expected POLLIN | POLLHUP; got POLLIN | POLLHUP +not ok 4 Pipe state 6a: expected POLLHUP; got POLLIN | POLLHUP +ok 5 Sock state 4: expected 0; got 0 +ok 6 Sock state 5: expected POLLIN; got POLLIN +not ok 7 Sock state 6: expected POLLIN | POLLHUP; got POLLIN +not ok 8 Sock state 6a: expected POLLHUP; got POLLIN +ok 9 FIFO state 0: expected 0; got 0 +ok 10 FIFO state 1: expected 0; got 0
svn commit: r195635 - head/sys/vm
Author: kib
Date: Sun Jul 12 12:37:38 2009
New Revision: 195635
URL: http://svn.freebsd.org/changeset/base/195635
Log:
When VM_MAP_WIRE_HOLESOK is not specified and vm_map_wire(9) encounters
non-readable and non-executable map entry, the entry is skipped from
wiring and loop is aborted. But, since MAP_ENTRY_WIRE_SKIPPED was not
set for the map entry, its wired_count is later erronously decremented.
vm_map_delete(9) for such map entry stuck in "vmmaps".
Properly set MAP_ENTRY_WIRE_SKIPPED when aborting the loop.
Reported by: John Marshall
Approved by: re (kensmith)
Modified:
head/sys/vm/vm_map.c
Modified: head/sys/vm/vm_map.c
==
--- head/sys/vm/vm_map.cSun Jul 12 09:14:28 2009(r195634)
+++ head/sys/vm/vm_map.cSun Jul 12 12:37:38 2009(r195635)
@@ -2354,12 +2354,12 @@ vm_map_wire(vm_map_t map, vm_offset_t st
if (entry->wired_count == 0) {
if ((entry->protection & (VM_PROT_READ|VM_PROT_EXECUTE))
== 0) {
+ entry->eflags |= MAP_ENTRY_WIRE_SKIPPED;
if ((flags & VM_MAP_WIRE_HOLESOK) == 0) {
end = entry->end;
rv = KERN_INVALID_ADDRESS;
goto done;
}
- entry->eflags |= MAP_ENTRY_WIRE_SKIPPED;
goto next_entry;
}
entry->wired_count++;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r195626 - in head: contrib/amd/amd contrib/ntp/scripts contrib/sendmail/cf/sh secure/lib/libcrypto sys/contrib/dev/acpica/compiler sys/dev/hptrr
Brian Somers wrote: On Sat, 11 Jul 2009 22:30:37 + (UTC) Colin Percival wrote: Remove build timestamps from the following files: >> [...] After this commit, the only remaining build timestamps are in the kernel, the boot loaders, /usr/include/osreldate.h (the year in the copyright notice), and lib*.a (the timestamps on all of the included .o files). > This is a fantastic change. Our new-branch-per-project methodology @work made us implement this change locally. Another change that was necessary along the same lines was to remove any hostnames or path names that leak into object code, the most noticeable of which is of course one of the first kernel boot message lines. Are there plans to change kernel code and/or hostname/path name stuff? I'm not particularly concerned about the hostname or paths, since there are workarounds (i.e., set the same hostname and use the same path, and files will come out the same). The timestamps in the kernel and boot loaders can probably be removed, but I wanted to consult with the community first, since it is conceivable that those timestamps are useful in some situations. I'm even less certain about the timestamps included in library archive files -- if anyone with binutils-fu can confirm for me if these are used at all, and if not, how to get rid of them, I'd be very very happy. -- Colin Percival Security Officer, FreeBSD | freebsd.org | The power to serve Founder / author, Tarsnap | tarsnap.com | Online backups for the truly paranoid ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r195634 - in head: . sys/netinet sys/sys
Author: lstewart
Date: Sun Jul 12 09:14:28 2009
New Revision: 195634
URL: http://svn.freebsd.org/changeset/base/195634
Log:
Pad the following TCP related structs to allow MFCs of upcoming features/fixes
back to the 8 branch:
tcp_var.h
- struct sackhint
- struct tcpcb
- struct tcpstat
The patch breaks the ABI. Bump __FreeBSD_version to 800102 accordingly. User
space tools that rely on the size of any of these structs (e.g. sockstat) need
to be recompiled.
Reviewed by: rpaulo, sam, andre, rwatson
Approved by: re & mentor (gnn)
Modified:
head/UPDATING
head/sys/netinet/tcp_var.h
head/sys/sys/param.h
Modified: head/UPDATING
==
--- head/UPDATING Sun Jul 12 04:48:47 2009(r195633)
+++ head/UPDATING Sun Jul 12 09:14:28 2009(r195634)
@@ -22,6 +22,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20090712:
+ Padding has been added to struct tcpcb, sackhint and tcpstat in
+to facilitate future MFCs and bug fixes whilst
+ maintainig the ABI. However, this change breaks the ABI, so bump
+ __FreeBSD_version to 800102. User space tools that rely on the size of
+ any of these structs (e.g. sockstat) need to be recompiled.
+
20090630:
The NFS_LEGACYRPC option has been removed along with the old
kernel RPC implementation that this option selected. Kernel
Modified: head/sys/netinet/tcp_var.h
==
--- head/sys/netinet/tcp_var.h Sun Jul 12 04:48:47 2009(r195633)
+++ head/sys/netinet/tcp_var.h Sun Jul 12 09:14:28 2009(r195634)
@@ -72,6 +72,9 @@ struct sackhole {
struct sackhint {
struct sackhole *nexthole;
int sack_bytes_rexmit;
+
+ int ispare; /* explicit pad for 64bit alignment */
+ uint64_t_pad[2];/* 1 sacked_bytes, 1 TBD */
};
struct tcptemp {
@@ -99,6 +102,7 @@ do {
\
*/
struct tcpcb {
struct tsegqe_head t_segq; /* segment reassembly queue */
+ void*t_pspare[2]; /* new reassembly queue */
int t_segqlen; /* segment reassembly queue length */
int t_dupacks; /* consecutive dup acks recd */
@@ -190,10 +194,13 @@ struct tcpcb {
int t_rttlow; /* smallest observerved RTT */
u_int32_t rfbuf_ts; /* recv buffer autoscaling timestamp */
int rfbuf_cnt; /* recv buffer autoscaling byte count */
- void*t_pspare[3]; /* toe usrreqs / toepcb * / congestion
algo / 1 general use */
struct toe_usrreqs *t_tu; /* offload operations vector */
void*t_toe; /* TOE pcb pointer */
int t_bytes_acked; /* # bytes acked during current RTT */
+
+ int t_ispare; /* explicit pad for 64bit alignment */
+ void*t_pspare2[6]; /* 2 CC / 4 TBD */
+ uint64_t _pad[12]; /* 7 UTO, 5 TBD (1-2 CC/RTT?) */
};
/*
@@ -460,6 +467,8 @@ struct tcpstat {
u_long tcps_ecn_ect1; /* ECN Capable Transport */
u_long tcps_ecn_shs; /* ECN successful handshakes */
u_long tcps_ecn_rcwnd; /* # times ECN reduced the cwnd */
+
+ u_long _pad[12]; /* 6 UTO, 6 TBD */
};
#ifdef _KERNEL
Modified: head/sys/sys/param.h
==
--- head/sys/sys/param.hSun Jul 12 04:48:47 2009(r195633)
+++ head/sys/sys/param.hSun Jul 12 09:14:28 2009(r195634)
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 800101 /* Master, propagated to newvers */
+#define __FreeBSD_version 800102 /* Master, propagated to newvers */
#ifndef LOCORE
#include
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r195626 - in head: contrib/amd/amd contrib/ntp/scripts contrib/sendmail/cf/sh secure/lib/libcrypto sys/contrib/dev/acpica/compiler sys/dev/hptrr
On Sat, 11 Jul 2009 22:30:37 + (UTC) Colin Percival wrote: > Author: cperciva > Date: Sat Jul 11 22:30:37 2009 > New Revision: 195626 > URL: http://svn.freebsd.org/changeset/base/195626 > > Log: > Remove build timestamps from the following files: > /boot/kernel/hptrr.ko > /etc/mail/*.cf > /lib/libcrypto.so.5 > /usr/bin/ntpq > /usr/sbin/amd > /usr/sbin/iasl > /usr/sbin/ntpd > /usr/sbin/ntpdate > /usr/sbin/ntpdc > > There does not appear to be any purpose to having these timestamps, and > they have the irritating consequence that the aforementioned files will > be different every time they are rebuilt. > > After this commit, the only remaining build timestamps are in the kernel, > the boot loaders, /usr/include/osreldate.h (the year in the copyright > notice), and lib*.a (the timestamps on all of the included .o files). > > Reviewed by:scottl (hptrr), gshapiro (sendmail), simon (openssl), > roberto (ntp), jkim (acpica) > Approved by:re (kib) This is a fantastic change. Our new-branch-per-project methodology @work made us implement this change locally. Another change that was necessary along the same lines was to remove any hostnames or path names that leak into object code, the most noticeable of which is of course one of the first kernel boot message lines. Are there plans to change kernel code and/or hostname/path name stuff? -- Brian Somers Don't _EVER_ lose your sense of humour ! ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
