提交 6ef2c7e0 编写于 作者: N Nitesh Konkar 提交者: John Ferlan

perf: add page_faults software perf event support

This patch adds support and documentation
for the page_faults perf event.
Signed-off-by: NNitesh Konkar <nitkon12@linux.vnet.ibm.com>
上级 20dc6908
...@@ -1949,6 +1949,7 @@ ...@@ -1949,6 +1949,7 @@
&lt;event name='ref_cpu_cycles' enabled='no'/&gt; &lt;event name='ref_cpu_cycles' enabled='no'/&gt;
&lt;event name='cpu_clock' enabled='no'/&gt; &lt;event name='cpu_clock' enabled='no'/&gt;
&lt;event name='task_clock' enabled='no'/&gt; &lt;event name='task_clock' enabled='no'/&gt;
&lt;event name='page_faults' enabled='no'/&gt;
&lt;/perf&gt; &lt;/perf&gt;
... ...
</pre> </pre>
...@@ -2041,6 +2042,13 @@ ...@@ -2041,6 +2042,13 @@
is run by applications running on the platform</td> is run by applications running on the platform</td>
<td><code>perf.task_clock</code></td> <td><code>perf.task_clock</code></td>
</tr> </tr>
<tr>
<td><code>page_faults</code></td>
<td>the count of page faults by applications running on the
platform. This includes minor, major, invalid and other
types of page faults</td>
<td><code>perf.page_faults</code></td>
</tr>
</table> </table>
<h3><a name="elementsDevices">Devices</a></h3> <h3><a name="elementsDevices">Devices</a></h3>
......
...@@ -435,6 +435,7 @@ ...@@ -435,6 +435,7 @@
<value>ref_cpu_cycles</value> <value>ref_cpu_cycles</value>
<value>cpu_clock</value> <value>cpu_clock</value>
<value>task_clock</value> <value>task_clock</value>
<value>page_faults</value>
</choice> </choice>
</attribute> </attribute>
<attribute name="enabled"> <attribute name="enabled">
......
...@@ -2210,6 +2210,17 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); ...@@ -2210,6 +2210,17 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats);
*/ */
# define VIR_PERF_PARAM_TASK_CLOCK "task_clock" # define VIR_PERF_PARAM_TASK_CLOCK "task_clock"
/**
* VIR_PERF_PARAM_PAGE_FAULTS:
*
* Macro for typed parameter name that represents page_faults
* perf event which can be used to measure the count of page
* faults by applications running on the platform. It corresponds
* to the "perf.page_faults" field in the *Stats APIs.
*/
# define VIR_PERF_PARAM_PAGE_FAULTS "page_faults"
int virDomainGetPerfEvents(virDomainPtr dom, int virDomainGetPerfEvents(virDomainPtr dom,
virTypedParameterPtr *params, virTypedParameterPtr *params,
int *nparams, int *nparams,
......
...@@ -11254,6 +11254,8 @@ virConnectGetDomainCapabilities(virConnectPtr conn, ...@@ -11254,6 +11254,8 @@ virConnectGetDomainCapabilities(virConnectPtr conn,
* It is produced by the cpu_clock perf event. * It is produced by the cpu_clock perf event.
* "perf.task_clock" - The count of task clock time as unsigned long long. * "perf.task_clock" - The count of task clock time as unsigned long long.
* It is produced by the task_clock perf event. * It is produced by the task_clock perf event.
* "perf.page_faults" - The count of page faults as unsigned long long.
* It is produced by the page_faults perf event
* *
* Note that entire stats groups or individual stat fields may be missing from * Note that entire stats groups or individual stat fields may be missing from
* the output in case they are not supported by the given hypervisor, are not * the output in case they are not supported by the given hypervisor, are not
......
...@@ -9569,6 +9569,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, ...@@ -9569,6 +9569,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom,
VIR_PERF_PARAM_REF_CPU_CYCLES, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_REF_CPU_CYCLES, VIR_TYPED_PARAM_BOOLEAN,
VIR_PERF_PARAM_CPU_CLOCK, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_CPU_CLOCK, VIR_TYPED_PARAM_BOOLEAN,
VIR_PERF_PARAM_TASK_CLOCK, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_TASK_CLOCK, VIR_TYPED_PARAM_BOOLEAN,
VIR_PERF_PARAM_PAGE_FAULTS, VIR_TYPED_PARAM_BOOLEAN,
NULL) < 0) NULL) < 0)
return -1; return -1;
......
...@@ -44,7 +44,7 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, ...@@ -44,7 +44,7 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST,
"branch_instructions", "branch_misses", "branch_instructions", "branch_misses",
"bus_cycles", "stalled_cycles_frontend", "bus_cycles", "stalled_cycles_frontend",
"stalled_cycles_backend", "ref_cpu_cycles", "stalled_cycles_backend", "ref_cpu_cycles",
"cpu_clock", "task_clock"); "cpu_clock", "task_clock", "page_faults");
struct virPerfEvent { struct virPerfEvent {
int type; int type;
...@@ -119,6 +119,9 @@ static struct virPerfEventAttr attrs[] = { ...@@ -119,6 +119,9 @@ static struct virPerfEventAttr attrs[] = {
{.type = VIR_PERF_EVENT_TASK_CLOCK, {.type = VIR_PERF_EVENT_TASK_CLOCK,
.attrType = PERF_TYPE_SOFTWARE, .attrType = PERF_TYPE_SOFTWARE,
.attrConfig = PERF_COUNT_SW_TASK_CLOCK}, .attrConfig = PERF_COUNT_SW_TASK_CLOCK},
{.type = VIR_PERF_EVENT_PAGE_FAULTS,
.attrType = PERF_TYPE_SOFTWARE,
.attrConfig = PERF_COUNT_SW_PAGE_FAULTS},
}; };
typedef struct virPerfEventAttr *virPerfEventAttrPtr; typedef struct virPerfEventAttr *virPerfEventAttrPtr;
......
...@@ -49,6 +49,7 @@ typedef enum { ...@@ -49,6 +49,7 @@ typedef enum {
VIR_PERF_EVENT_REF_CPU_CYCLES, /* Count of ref cpu cycles */ VIR_PERF_EVENT_REF_CPU_CYCLES, /* Count of ref cpu cycles */
VIR_PERF_EVENT_CPU_CLOCK, /* Count of cpu clock time*/ VIR_PERF_EVENT_CPU_CLOCK, /* Count of cpu clock time*/
VIR_PERF_EVENT_TASK_CLOCK, /* Count of task clock time*/ VIR_PERF_EVENT_TASK_CLOCK, /* Count of task clock time*/
VIR_PERF_EVENT_PAGE_FAULTS, /* Count of total page faults */
VIR_PERF_EVENT_LAST VIR_PERF_EVENT_LAST
} virPerfEventType; } virPerfEventType;
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
<event name='ref_cpu_cycles' enabled='yes'/> <event name='ref_cpu_cycles' enabled='yes'/>
<event name='cpu_clock' enabled='yes'/> <event name='cpu_clock' enabled='yes'/>
<event name='task_clock' enabled='yes'/> <event name='task_clock' enabled='yes'/>
<event name='page_faults' enabled='yes'/>
</perf> </perf>
<devices> <devices>
</devices> </devices>
......
...@@ -966,6 +966,7 @@ I<--perf> returns the statistics of all enabled perf events: ...@@ -966,6 +966,7 @@ I<--perf> returns the statistics of all enabled perf events:
"perf.ref_cpu_cycles" - the count of ref cpu cycles "perf.ref_cpu_cycles" - the count of ref cpu cycles
"perf.cpu_clock" - the count of cpu clock time "perf.cpu_clock" - the count of cpu clock time
"perf.task_clock" - the count of task clock time "perf.task_clock" - the count of task clock time
"perf.page_faults" - the count of page faults
See the B<perf> command for more details about each event. See the B<perf> command for more details about each event.
...@@ -2339,6 +2340,8 @@ B<Valid perf event names> ...@@ -2339,6 +2340,8 @@ B<Valid perf event names>
applications running on the platform. applications running on the platform.
task_clock - Provides the task clock time consumed by task_clock - Provides the task clock time consumed by
applications running on the platform. applications running on the platform.
page_faults - Provides the count of page faults by
applications running on the platform.
B<Note>: The statistics can be retrieved using the B<domstats> command using B<Note>: The statistics can be retrieved using the B<domstats> command using
the I<--perf> flag. the I<--perf> flag.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册