Date: Sun, 26 Jun 2005 18:59:28 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 79008 for review Message-ID: <200506261859.j5QIxSIY087839@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=79008 Change 79008 by peter@peter_overcee on 2005/06/26 18:58:50 IFC @79007 Affected files ... .. //depot/projects/hammer/etc/defaults/rc.conf#55 integrate .. //depot/projects/hammer/etc/rc.d/jail#15 integrate .. //depot/projects/hammer/lib/libpmc/pmc.3#4 integrate .. //depot/projects/hammer/lib/libpmc/pmclog.3#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/install.sgml#14 integrate .. //depot/projects/hammer/sbin/dhclient/Makefile#5 integrate .. //depot/projects/hammer/sbin/mount_reiserfs/mount_reiserfs.8#2 integrate .. //depot/projects/hammer/share/man/man9/bus_space.9#2 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#28 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#66 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_machdep.c#8 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#15 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#21 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#28 integrate .. //depot/projects/hammer/sys/conf/options#79 integrate .. //depot/projects/hammer/sys/conf/options.pc98#32 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_quirks#5 integrate .. //depot/projects/hammer/sys/dev/aic/aic_pccard.c#8 integrate .. //depot/projects/hammer/sys/dev/an/if_an_pccard.c#12 integrate .. //depot/projects/hammer/sys/dev/ata/ata-card.c#23 integrate .. //depot/projects/hammer/sys/dev/awi/if_awi_pccard.c#13 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#48 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs_pccard.c#10 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_cp.c#10 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#23 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#18 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_isa.c#10 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_pccard.c#13 integrate .. //depot/projects/hammer/sys/dev/ep/if_epvar.h#8 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex_pccard.c#9 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_pccard.c#9 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe_pccard.c#13 integrate .. //depot/projects/hammer/sys/dev/iicbus/if_ic.c#10 integrate .. //depot/projects/hammer/sys/dev/ncv/ncr53c500_pccard.c#14 integrate .. //depot/projects/hammer/sys/dev/nsp/nsp_pccard.c#12 integrate .. //depot/projects/hammer/sys/dev/owi/if_owi_pccard.c#6 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#34 integrate .. //depot/projects/hammer/sys/dev/pccard/pccardvar.h#14 integrate .. //depot/projects/hammer/sys/dev/ral/if_ral_pccard.c#2 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn_pccard.c#9 integrate .. //depot/projects/hammer/sys/dev/stg/tmc18c30_pccard.c#12 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pccard.c#26 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe_pccard.c#15 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#35 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_ipr.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#48 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#20 integrate .. //depot/projects/hammer/sys/modules/bge/Makefile#3 integrate .. //depot/projects/hammer/sys/net/bpf.c#33 integrate .. //depot/projects/hammer/sys/net/if_disc.c#16 integrate .. //depot/projects/hammer/sys/net/if_faith.c#19 integrate .. //depot/projects/hammer/sys/net/if_gif.c#19 integrate .. //depot/projects/hammer/sys/net/if_gre.c#22 integrate .. //depot/projects/hammer/sys/net/if_loop.c#26 integrate .. //depot/projects/hammer/sys/net/if_stf.c#21 integrate .. //depot/projects/hammer/sys/net/if_tun.c#27 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#10 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#20 integrate .. //depot/projects/hammer/sys/netgraph/ng_sppp.c#8 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#8 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#50 integrate .. //depot/projects/hammer/sys/pci/agp_via.c#17 integrate .. //depot/projects/hammer/usr.sbin/pmccontrol/pmccontrol.8#2 integrate .. //depot/projects/hammer/usr.sbin/pmccontrol/pmccontrol.c#4 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.8#3 integrate Differences ... ==== //depot/projects/hammer/etc/defaults/rc.conf#55 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.251 2005/06/08 00:05:57 brooks Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.252 2005/06/26 16:30:20 pjd Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -515,6 +515,7 @@ #jail_example_mount_enable="NO" # mount/umount jail's fs #jail_example_devfs_ruleset="ruleset_name" # devfs ruleset to apply to jail #jail_example_fstab="" # fstab(5) for mount/umount +#jail_example_flags="-l -U root" # flags for jail(8) ############################################################## ### Define source_rc_confs, the mechanism used by /etc/rc.* ## ==== //depot/projects/hammer/etc/rc.d/jail#15 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.22 2005/04/30 00:16:00 csjp Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.23 2005/06/26 16:30:20 pjd Exp $ # # PROVIDE: jail @@ -64,6 +64,8 @@ # "/etc/fstab.${_j}" will be used for {,u}mount(8) if none is specified. eval jail_fstab=\"\$jail_${_j}_fstab\" [ -z "${jail_fstab}" ] && jail_fstab="/etc/fstab.${_j}" + eval jail_flags=\"\$jail_${_j}_flags\" + [ -z "${jail_flags}" ] && jail_flags="-l -U root" # Debugging aid # @@ -81,6 +83,7 @@ debug "$_j fstab: $jail_fstab" debug "$_j exec start: $jail_exec_start" debug "$_j exec stop: $jail_exec_stop" + debug "$_j flags: $jail_flags" } # set_sysctl rc_knob mib msg @@ -196,7 +199,7 @@ fi fi _tmp_jail=${_tmp_dir}/jail.$$ - eval jail -l -U root -i ${jail_rootdir} ${jail_hostname} \ + eval jail ${jail_flags} -i ${jail_rootdir} ${jail_hostname} \ ${jail_ip} ${jail_exec_start} > ${_tmp_jail} 2>&1 [ "$?" -eq 0 ] && echo -n " $jail_hostname" _jail_id=$(head -1 ${_tmp_jail}) ==== //depot/projects/hammer/lib/libpmc/pmc.3#4 (text+ko) ==== @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.4 2005/06/09 19:45:06 jkoshy Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.5 2005/06/24 16:56:24 ru Exp $ .\" -.Dd Apr 15, 2005 +.Dd June 24, 2005 .Os .Dt PMC 3 .Sh NAME @@ -72,10 +72,7 @@ .Fa "pmc_id_t *pmcid" .Fc .Ft int -.Fo pmc_attach -.Fa "pmc_id_t pmcid" -.Fa "pid_t pid" -.Fc +.Fn pmc_attach "pmc_id_t pmcid" "pid_t pid" .Ft int .Fn pmc_capabilities "pmc_id_t pmc" "uint32_t *caps" .Ft int @@ -83,10 +80,7 @@ .Ft int .Fn pmc_cpuinfo "const struct pmc_cpuinfo **cpu_info" .Ft int -.Fo pmc_detach -.Fa "pmc_id_t pmcid" -.Fa "pid_t pid" -.Fc +.Fn pmc_detach "pmc_id_t pmcid" "pid_t pid" .Ft int .Fn pmc_disable "uint32_t cpu" "int pmc" .Ft int @@ -98,13 +92,13 @@ .Fa "int *nevents" .Fc .Ft int -.Fn pmc_flush_logfile "void" +.Fn pmc_flush_logfile void .Ft int .Fn pmc_get_driver_stats "struct pmc_driverstats *gms" .Ft int .Fn pmc_get_msr "pmc_id_t pmc" "uint32_t *msr" .Ft int -.Fn pmc_init "void" +.Fn pmc_init void .Ft "const char *" .Fn pmc_name_of_capability "enum pmc_caps pc" .Ft "const char *" @@ -120,7 +114,7 @@ .Ft "const char *" .Fn pmc_name_of_state "enum pmc_state ps" .Ft int -.Fn pmc_ncpu "void" +.Fn pmc_ncpu void .Ft int .Fn pmc_npmc "uint32_t cpu" .Ft int @@ -159,22 +153,22 @@ .Fn pmc_stop respectively. An allocated PMC may be of -.Qq global +.Dq global scope, meaning that the PMC measures system-wide events, or -.Qq process-private +.Dq process-private scope, meaning that the PMC only counts hardware events when the allocating process (or, optionally, its children) are active. .Pp PMCs may further be in -.Qq "counting mode" , +.Dq "counting mode" , or in -.Qq "sampling mode" . +.Dq "sampling mode" . Sampling mode PMCs deliver an interrupt to the CPU after a configured number of hardware events have been seen. A process-private sampling mode PMC will cause its owner process to get periodic -.Sy SIGPROF +.Dv SIGPROF interrupts, while a global sampling mode PMC is used to do system-wide statistical sampling (see .Xr hwpmc 4 ) . @@ -193,7 +187,8 @@ driver manages system-wide statistical sampling; for more information please see .Xr hwpmc 4 . -.Ss APPLICATION PROGRAMMING INTERFACE +.Ss Application Programming Interface +The function .Fn pmc_init initializes the .Xr pmc 3 @@ -201,10 +196,11 @@ This function must be called first, before any of the other functions in the library. .Pp +The function .Fn pmc_allocate allocates a counter that counts the events named by .Fa eventspecifier , -and writes the allocated counter id to +and writes the allocated counter ID to .Fa *pmcid . Argument .Fa eventspecifier @@ -222,18 +218,18 @@ The .Fa cpu argument is the value -.Li PMC_CPU_ANY , -or names the cpu the allocation is to be on. -Requesting a specific CPU makes only makes sense for global PMCs; +.Dv PMC_CPU_ANY , +or names the CPU the allocation is to be on. +Requesting a specific CPU only makes sense for global PMCs; process-private PMC allocations should always specify -.Li PMC_CPU_ANY . +.Dv PMC_CPU_ANY . .Pp -By default a PMC configured in process-virtual counting mode is setup +By default, a PMC configured in process-virtual counting mode is set up to profile its owner process. The function .Fn pmc_attach may be used to attach the PMC to a different process. -.Fn pmc_attach +It needs to be called before the counter is first started with .Fn pmc_start . @@ -243,6 +239,7 @@ using a prior call to .Fn pmc_attach . .Pp +The function .Fn pmc_release releases a PMC previously allocated with .Fn pmc_allocate . @@ -287,7 +284,7 @@ .Fa fd . If argument .Fa fd -is -1, then any previously configured logging is reset +is \-1, then any previously configured logging is reset and all data queued to be written are discarded. .Pp The @@ -301,8 +298,9 @@ .Fa userdata to the log file. .Pp +The function .Fn pmc_set -configures an sampling PMC +configures a sampling PMC .Fa pmc to interrupt every .Fa value @@ -312,25 +310,29 @@ sets the initial value of the PMC to .Fa value . .Pp +The function .Fn pmc_get_driver_statistics copies a snapshot of the usage statistics maintained by .Xr hwpmc 4 -into the memory area pointed to be argument +into the memory area pointed to by argument .Fa gms . -.Ss SIGNAL HANDLING REQUIREMENTS +.Ss Signal Handling Requirements Applications using PMCs are required to handle the following signals: .Bl -tag -width indent -.It SIGBUS +.It Dv SIGBUS When the .Xr hwpmc 4 module is unloaded using .Xr kldunload 8 , processes that have PMCs allocated to them will be sent a -SIGBUS signal. -.It SIGIO +.Dv SIGBUS +signal. +.It Dv SIGIO The .Xr hwpmc 4 -driver will send a PMC owning process a SIGIO signal if: +driver will send a PMC owning process a +.Dv SIGIO +signal if: .Bl -bullet .It If any process-mode PMC allocated by it loses all its @@ -342,13 +344,16 @@ .Fn pmc_flush_logfile . .El .El -.Ss CONVENIENCE FUNCTIONS +.Ss Convenience Functions +The function .Fn pmc_ncpu returns the number of CPUs present in the system. .Pp +The function .Fn pmc_npmc returns the number of PMCs supported on CPU .Fa cpu . +The function .Fn pmc_cpuinfo sets argument .Fa cpu_info @@ -356,7 +361,7 @@ Function .Fn pmc_pmcinfo returns information about the current state of CPU -.Fa cpu Ap s +.Fa cpu Ns 's PMCs. This function sets argument .Fa *pmc_info @@ -377,16 +382,17 @@ .Fn pmc_name_of_state are useful for code wanting to print error messages. They return -.Ft "const char *" +.Vt "const char *" pointers to human-readable representations of their arguments. These return values should not be freed using .Xr free 3 . .Pp +The function .Fn pmc_event_names_of_class returns a list of event names supported by a given PMC class .Fa cl . On successful return, an array of -.Ft "const char *" +.Vt "const char *" pointers to the names of valid events supported by class .Fa cl is allocated by the library using @@ -396,7 +402,7 @@ The number of pointers allocated is returned in the location pointed to by .Fa nevents . -.Ss ADMINISTRATION +.Ss Administration Individual PMCs may be enabled or disabled on a given CPU using .Fn pmc_enable and @@ -408,14 +414,14 @@ .Fa pmc is the index of the PMC to be operated on. Only the super-user is allowed to enable and disable PMCs. -.Ss X86 ARCHITECTURE SPECIFIC API +.Ss x86 Architecture Specific API The .Fn pmc_get_msr function returns the processor model specific register number associated with .Fa pmc . Applications may use the x86 -.Sy RDPMC +.Ic RDPMC instruction to directly read the contents of the PMC. .Sh EVENT SPECIFIERS Event specifiers are strings comprising of an event name, followed by @@ -450,14 +456,14 @@ Measure the number of interrupts seen. .El .Ss Time Stamp Counter (TSC) -The timestamp counter is a monontonically non-decreasing counter that +The timestamp counter is a monotonically non-decreasing counter that counts processor cycles. .Pp -In the i386 architecture this counter may -be selected by requesting an event with eventspecifier -.Ic tsc . +In the i386 architecture, this counter may +be selected by requesting an event with event specifier +.Dq Li tsc . The -.Ic tsc +.Dq Li tsc event does not support any further qualifiers. It can only be allocated in system-wide counting mode, and is a read-only counter. @@ -473,7 +479,7 @@ .%B "AMD Athlon Processor x86 Code Optimization Guide" .%N "Publication No. 22007" .%D "February 2002" -.%Q "Advanced Micronic Devices, Inc." +.%Q "Advanced Micro Devices, Inc." .Re .Pp Event specifiers for AMD K7 PMCs can have the following optional @@ -491,25 +497,26 @@ which the condition remains true. .It Li inv Invert the sense of comparision when the -.Li count +.Dq Li count qualifier is present, making the counter to increment when the number of events per cycle is less than the value specified by the -.Li count +.Dq Li count qualifier. .It Li os Configure the PMC to count events happening at privilege level 0. .It Li unitmask= Ns Ar mask This qualifier is used to further qualify a select few events, -.Li k7-dc-refills-from-l2 , -.Li k7-dc-refills-from-system +.Dq Li k7-dc-refills-from-l2 , +.Dq Li k7-dc-refills-from-system and -.Li k7-dc-writebacks . +.Dq Li k7-dc-writebacks . Here .Ar mask -is a string of the following characters optionally seperated by -.Li "+" +is a string of the following characters optionally separated by +.Ql + characters: +.Pp .Bl -tag -width indent -compact .It Li m Count operations for lines in the @@ -532,21 +539,23 @@ .Dq Invalid state. .El +.Pp If no -.Ar unitmask +.Dq Li unitmask qualifier is specified, the default is to count events for caches lines in any of the above states. .It Li usr Configure the PMC to count events occurring at privilege levels 1, 2 or 3. .El +.Pp If neither of the -.Li os +.Dq Li os or -.Li usr +.Dq Li usr qualifiers were specified, the default is to enable both. .Pp -The event specifiers support on AMD K7 PMCs are: +The event specifiers supported on AMD K7 PMCs are: .Bl -tag -width indent .It Li k7-dc-accesses Count data cache accesses. @@ -555,17 +564,17 @@ .It Li k7-dc-refills-from-l2 Op Li ,unitmask= Ns Ar mask Count data cache refills from L2 cache. This event may be further qualified using the -.Li unitmask +.Dq Li unitmask qualifier. .It Li k7-dc-refills-from-system Op Li ,unitmask= Ns Ar mask Count data cache refills from system memory. This event may be further qualified using the -.Li unitmask +.Dq Li unitmask qualifier. .It Li k7-dc-writebacks Op Li ,unitmask= Ns Ar mask Count data cache writebacks. This event may be further qualified using the -.Li unitmask +.Dq Li unitmask qualifier. .It Li k7-l1-dtlb-miss-and-l2-dtlb-hits Count L1 DTLB misses and L2 DTLB hits. @@ -600,12 +609,12 @@ Count retired resync branches (non control transfer branches). .It Li k7-interrupts-masked-cycles Count the number of cycles when the processor's -.Li IF +.Va IF flag was zero. .It Li k7-interrupts-masked-while-pending-cycles Count the number of cycles interrupts were masked while pending due to the processor's -.Li IF +.Va IF flag being zero. .It Li k7-hardware-interrupts Count the number of taken hardware interrupts. @@ -621,7 +630,7 @@ .%B "BIOS and Kernel Developer's Guide for the AMD Athlon(tm) 64 and AMD Opteron Processors" .%N "Publication No. 26094" .%D "April 2004" -.%Q "Advanced Micronic Devices, Inc." +.%Q "Advanced Micro Devices, Inc." .Re .Pp Event specifiers for AMD K8 PMCs can have the following optional @@ -639,11 +648,11 @@ which the condition remains true. .It Li inv Invert the sense of comparision when the -.Li count +.Dq Li count qualifier is present, making the counter to increment when the number of events per cycle is less than the value specified by the -.Li count +.Dq Li count qualifier. .It Li mask= Ns Ar qualifier Many event specifiers for AMD K8 PMCs need to be additionally @@ -656,13 +665,14 @@ Configure the PMC to count events occurring at privilege levels 1, 2 or 3. .El +.Pp If neither of the -.Li os +.Dq Li os or -.Li usr +.Dq Li usr qualifiers were specified, the default is to enable both. .Pp -The event specifiers support on AMD K8 PMCs are: +The event specifiers supported on AMD K8 PMCs are: .Bl -tag -width indent .It Li k8-bu-cpu-clk-unhalted Count the number of clock cycles when the CPU is not in the HLT or @@ -672,9 +682,10 @@ This event may be further qualified using .Ar qualifier , which is a -.Li + Ns - Ns +.Ql + separated set of the following keywords: -.Bl -tag -width "XXXXXXXXXX" -compact +.Pp +.Bl -tag -width indent -compact .It Li dc-fill Count data cache fill requests. .It Li ic-fill @@ -682,15 +693,17 @@ .It Li tlb-reload Count TLB reloads. .El +.Pp The default is to count all types of requests. .It Li k8-bu-internal-l2-request Op Li ,mask= Ns Ar qualifier Count internally generated requests to the L2 cache. This event may be further qualified using .Ar qualifier , which is a -.Li "+" Ns - Ns +.Ql + separated set of the following keywords: -.Bl -tag -width "XXXXXXXXXX" -compact +.Pp +.Bl -tag -width indent -compact .It Li cancelled Count cancelled requests. .It Li dc-fill @@ -702,6 +715,7 @@ .It Li tlb-reload Count TLB reloads. .El +.Pp The default is to count all types of requests. .It Li k8-dc-access Count data cache accesses including microcode scratchpad accesses. @@ -710,9 +724,10 @@ This event may be further qualified using .Ar qualifier , which is a -.Li "+" Ns - Ns +.Ql + separated set of the following keywords: -.Bl -tag -width "exclusive" -compact +.Pp +.Bl -tag -width indent -compact .It Li exclusive Count operations for lines in the .Dq exclusive @@ -734,6 +749,7 @@ .Dq shared state. .El +.Pp The default is to count operations for lines in all the above states. .It Li k8-dc-dcache-accesses-by-locks Op Li ,mask= Ns Ar qualifier @@ -743,23 +759,26 @@ This event may be further qualified using .Ar qualifier , which is a -.Li "+" Ns - Ns +.Ql + separated set of the following keywords: -.Bl -tag -width "exclusive" -compact +.Pp +.Bl -tag -width indent -compact .It Li accesses Count data cache accesses by lock instructions. .It Li misses Count data cache misses by lock instructions. .El +.Pp The default is to count all accesses. .It Li k8-dc-dispatched-prefetch-instructions Op Li ,mask= Ns Ar qualifier Count the number of dispatched prefetch instructions. This event may be further qualified using .Ar qualifier , which is a -.Li "+" Ns - Ns +.Ql + separated set of the following keywords: -.Bl -tag -width "exclusive" -compact +.Pp +.Bl -tag -width indent -compact .It Li load Count load operations. .It Li nta @@ -767,6 +786,7 @@ .It Li store Count store operations. .El +.Pp The default is to count all operations. .It Li k8-dc-l1-dtlb-miss-and-l2-dtlb-hit Count L1 DTLB misses that are L2 DTLB hits. @@ -785,23 +805,26 @@ This event may be further qualified using .Ar qualifier , which is a -.Li "+" Ns - Ns +.Ql + separated set of the following keywords: -.Bl -tag -width "piggyback" -compact +.Pp +.Bl -tag -width indent -compact .It Li scrubber Count scrubber detected errors. .It Li piggyback -Count piggyback scrubber errors. +Count piggyback scrubber errors. .El +.Pp The default is to count both kinds of errors. .It Li k8-dc-refill-from-l2 Op Li ,mask= Ns Ar qualifier Count data cache refills from L2 cache. This event may be further qualified using .Ar qualifier , which is a -.Li "+" Ns - Ns +.Ql + separated set of the following keywords: -.Bl -tag -width "exclusive" -compact +.Pp +.Bl -tag -width indent -compact .It Li exclusive Count operations for lines in the .Dq exclusive @@ -823,6 +846,7 @@ .Dq shared state. .El +.Pp The default is to count operations for lines in all the above states. .It Li k8-dc-refill-from-system Op Li ,mask= Ns Ar qualifier @@ -830,9 +854,10 @@ This event may be further qualified using .Ar qualifier , which is a -.Li "+" Ns - Ns +.Ql + separated set of the following keywords: -.Bl -tag -width "exclusive" -compact +.Pp +.Bl -tag -width indent -compact .It Li exclusive Count operations for lines in the .Dq exclusive @@ -854,6 +879,7 @@ .Dq shared state. .El +.Pp The default is to count operations for lines in all the above states. .It Li k8-fp-dispatched-fpu-ops Op Li ,mask= Ns Ar qualifier @@ -862,9 +888,10 @@ This event may be further qualified using .Ar qualifier , which is a -.Li "+" Ns - Ns +.Ql + separated set of the following keywords: -.Bl -tag -width "XXXXXXXXXX" -compact +.Pp +.Bl -tag -width indent -compact .It Li add-pipe-excluding-junk-ops Count add pipe ops excluding junk ops. .It Li add-pipe-junk-ops @@ -878,6 +905,7 @@ .It Li store-pipe-junk-ops Count junk ops in the store pipe. .El +.Pp The default is to count all types of ops. .It Li k8-fp-cycles-with-no-fpu-ops-retired Count cycles when no FPU ops were retired. @@ -916,9 +944,10 @@ This event may be further qualified using .Ar qualifier , which is a -.Li "+" Ns - Ns +.Ql + separated set of the following keywords: -.Bl -tag -width "XXXXXXXXXX" -compact +.Pp +.Bl -tag -width indent -compact .It Li sse-and-x87-microtraps Count SSE and x87 microtraps. .It Li sse-reclass-microfaults @@ -928,6 +957,7 @@ .It Li x87-reclass-microfaults Count x87 reclass microfaults. .El +.Pp The default is to count all types of exceptions. .It Li k8-fr-interrupts-masked-cycles Count cycles when interrupts were masked (by CPU RFLAGS field IF was zero). @@ -954,9 +984,10 @@ This event may be further qualified using .Ar qualifier , which is a -.Li "+" Ns - Ns +.Ql + separated set of the following keywords: -.Bl -tag -width "XXXXXXXXXXXX" -compact +.Pp +.Bl -tag -width indent -compact .It Li low-op-pos-0 Count instructions with the low op in position 0. .It Li low-op-pos-1 @@ -964,6 +995,7 @@ .It Li low-op-pos-2 Count instructions with the low op in position 2. .El +.Pp The default is to count all types of instructions. .It Li k8-fr-retired-fpu-instructions Op Li ,mask= Ns Ar qualifier Count retired FPU instructions. @@ -971,11 +1003,12 @@ This event may be further qualified using .Ar qualifier , which is a -.Li "+" Ns - Ns +.Ql + separated set of the following keywords: -.Bl -tag -width "XXXXXXXXXX" -compact +.Pp +.Bl -tag -width indent -compact .It Li mmx-3dnow -Count MMX and 3DNow! instructions. +Count MMX and 3DNow!\& instructions. .It Li packed-sse-sse2 Count packed SSE and SSE2 instructions. .It Li scalar-sse-sse2 @@ -983,6 +1016,7 @@ .It Li x87 Count x87 instructions. .El +.Pp The default is to count all types of instructions. .It Li k8-fr-retired-near-returns Count retired near returns. @@ -1028,7 +1062,8 @@ .It Li k8-ls-locked-operation Op Li ,mask= Ns Ar qualifier Count locked operations. For revision C and later CPUs, the following qualifiers are supported: -.Bl -tag -width "XXXXXXXXXXXXX" -compact +.Pp +.Bl -tag -width indent -compact .It Li cycles-in-request Count the number of cycles in the lock request/grant stage. .It Li cycles-to-complete @@ -1037,6 +1072,7 @@ .It Li locked-instructions Count the number of lock instructions executed. .El +.Pp The default is to count the number of lock instructions executed. .It Li k8-ls-microarchitectural-late-cancel Count microarchitectural late cancels of operations in the load/store @@ -1054,9 +1090,9 @@ This event may be further qualified using .Ar qualifier , which is a -.Li "+" Ns - Ns +.Ql + separated set of the following keywords: -.Bl -tag -width "XX" -compact +.Bl -tag -width indent -compact .It Li cs Count CS register loads. .It Li ds @@ -1067,21 +1103,23 @@ Count FS register loads. .It Li gs Count GS register loads. -.\" .It Ic hs +.\" .It Li hs .\" Count HS register loads. .\" XXX "HS" register? .It Li ss Count SS register loads. .El +.Pp The default is to count all types of loads. .It Li k8-nb-memory-controller-bypass-saturation Op Li ,mask= Ns Ar qualifier Count memory controller bypass counter saturation events. This event may be further qualified using .Ar qualifier , which is a -.Li "+" Ns - Ns +.Ql + separated set of the following keywords: -.Bl -tag -width "XXXXXXXXXX" -compact +.Pp +.Bl -tag -width indent -compact .It Li dram-controller-interface-bypass Count DRAM controller interface bypass. .It Li dram-controller-queue-bypass @@ -1091,6 +1129,7 @@ .It Li memory-controller-lo-pri-bypass Count memory controller low priority bypasses. .El +.Pp .It Li k8-nb-memory-controller-dram-slots-missed Count memory controller DRAM command slots missed (in MemClks). .It Li k8-nb-memory-controller-page-access-event Op Li ,mask= Ns Ar qualifier @@ -1098,9 +1137,10 @@ This event may be further qualified using .Ar qualifier , which is a -.Li "+" Ns - Ns +.Ql + separated set of the following keywords: -.Bl -tag -width "XXXXXXXXXX" -compact +.Pp +.Bl -tag -width indent -compact .It Li page-conflict Count page conflicts. .It Li page-hit @@ -1108,6 +1148,7 @@ .It Li page-miss Count page misses. .El +.Pp The default is to count all types of events. .It Li k8-nb-memory-controller-page-table-overflow Count memory control page table overflow events. @@ -1116,9 +1157,10 @@ This event may be further qualified using .Ar qualifier , which is a -.Li "+" Ns - Ns +.Ql + separated set of the following keywords: -.Bl -tag -width "exclusive" -compact +.Pp +.Bl -tag -width indent -compact .It Li probe-hit Count all probe hits. .It Li probe-hit-dirty-no-memory-cancel @@ -1133,9 +1175,10 @@ This event may be further qualified using .Ar qualifier , which is a -.Li "+" Ns - Ns +.Ql + separated set of the following keywords: -.Bl -tag -width "exclusive" -compact +.Pp +.Bl -tag -width indent -compact .It Li nonpostwrszbyte .It Li nonpostwrszdword .It Li postwrszbyte @@ -1144,15 +1187,17 @@ .It Li rdszdword .It Li rdmodwr .El +.Pp The default is to count all types of commands. .It Li k8-nb-memory-controller-turnaround Op Li ,mask= Ns Ar qualifier Count memory control turnaround events. This event may be further qualified using .Ar qualifier , which is a -.Li "+" Ns - Ns +.Ql + separated set of the following keywords: -.Bl -tag -width "XXXXXXXXXX" -compact +.Pp +.Bl -tag -width indent -compact .\" XXX doc is unclear whether these are cycle counts or event counts .It Li dimm-turnaround Count DIMM turnarounds. @@ -1161,6 +1206,7 @@ .It Li write-to-read-turnaround Count write to read turnarounds. .El +.Pp The default is to count all types of events. .It Li k8-nb-ht-bus0-bandwidth Op Li ,mask= Ns Ar qualifier .It Li k8-nb-ht-bus1-bandwidth Op Li ,mask= Ns Ar qualifier @@ -1169,9 +1215,10 @@ These events may be further qualified using .Ar qualifier , which is a -.Li "+" Ns - Ns +.Ql + separated set of the following keywords: -.Bl -tag -width "XXXXXXXXXX" -compact +.Pp +.Bl -tag -width indent -compact .It Li buffer-release Count buffer release messages sent. .It Li command @@ -1181,13 +1228,14 @@ .It Li nop Count nop messages sent. .El +.Pp The default is to count all types of messages. .El .Ss Intel P6 PMCS Intel P6 PMCs are present in Intel .Tn "Pentium Pro" , .Tn "Pentium II" , -.Tn "Celeron" , +.Tn Celeron , .Tn "Pentium III" and .Tn "Pentium M" @@ -1229,10 +1277,10 @@ which the condition remains true. .It Li inv Invert the sense of comparision when the -.Ar cmask +.Dq Li cmask qualifier is present, making the counter increment when the number of >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200506261859.j5QIxSIY087839>