Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kernel Program Behaviour Models
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
felixkhals
Kernel Program Behaviour Models
Commits
2c569078
Commit
2c569078
authored
6 years ago
by
Tobias Bouschen
Browse files
Options
Downloads
Patches
Plain Diff
Fix reading performance counter and returning correct task
parent
54bc6728
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
kernel/sched/pb.c
+23
-12
23 additions, 12 deletions
kernel/sched/pb.c
kernel/sched/perf_error_detection.c
+8
-7
8 additions, 7 deletions
kernel/sched/perf_error_detection.c
kernel/sched/perf_error_detection.h
+3
-1
3 additions, 1 deletion
kernel/sched/perf_error_detection.h
with
34 additions
and
20 deletions
kernel/sched/pb.c
+
23
−
12
View file @
2c569078
...
...
@@ -122,17 +122,25 @@ static struct task_struct * pick_next_task_pb(struct rq *rq,
if
(
next_mode
==
PB_EXEC_MODE
)
{
if
(
current_mode
==
PB_EXEC_MODE
){
/*
* !!! perf_counter contains return value of perf_event_release_kernel(), not the event
counter
!!!
*/
//
u64 pevent_cntval;
int
perf_counter
=
terminate_perf_event
(
pb
->
pevent
,
pb
->
plan
[
pb
->
c_entry
].
task_id
/*, &pevent_cntval */
);
//error detection
u64
perf_counter
;
u64
read_error
=
get_perf_counter
(
pb
->
pevent
,
&
perf_
counter
);
//
TODO error handling
terminate_perf_event
(
pb
->
pevent
);
if
(
perf_counter
<
pb
->
plan
[
pb
->
c_entry
].
n_instr
){
// if (pevent_cntval < pb->plan[pb->c_entry].n_instr){
printk
(
KERN_WARNING
"PB TASK %llu RAN TOO SHORT
\n
"
,
pb
->
plan
[
pb
->
c_entry
].
task_id
);
u64
under_time
=
pb
->
plan
[
pb
->
c_entry
].
n_instr
-
perf_counter
;
printk
(
KERN_WARNING
"PB TASK %llu RAN %llu INSTRUCTIONS TOO SHORT
\n
"
,
pb
->
plan
[
pb
->
c_entry
].
task_id
,
under_time
);
}
else
if
(
perf_counter
>
pb
->
plan
[
pb
->
c_entry
].
n_instr
){
u64
under_time
=
perf_counter
-
pb
->
plan
[
pb
->
c_entry
].
n_instr
;
printk
(
KERN_WARNING
"PB TASK %llu RAN %llu INSTRUCTIONS TOO LONG
\n
"
,
pb
->
plan
[
pb
->
c_entry
].
task_id
,
under_time
);
}
pb
->
c_entry
++
;
if
(
pb
->
c_entry
>=
pb
->
size
){
printk
(
KERN_DEBUG
"PLAN DONE
\n
"
);
...
...
@@ -149,7 +157,8 @@ static struct task_struct * pick_next_task_pb(struct rq *rq,
}
}
else
if
(
current_mode
==
PB_ADMIN_MODE
){
printk
(
KERN_DEBUG
"PB ADMIN,STOP,%u,%llu
\n
"
,
pb
->
c_entry
,
sched_clock
());
}
else
{
// PB_DISABLED_MODE
}
else
{
// PB_DISABLED_MODE
int
perf_init_res
=
init_perf_event
(
pb
->
plan
[
pb
->
c_entry
],
&
pb
->
pevent
);
if
(
perf_init_res
<
0
){
...
...
@@ -160,9 +169,11 @@ static struct task_struct * pick_next_task_pb(struct rq *rq,
}
}
//TODO: pick next task from taskarray
picked
=
pb
->
proxy_task
;
//TODO: call papi handler------------------------------------
if
(
pb
->
mode
!=
PB_DISABLED_MODE
){
// Return current task from plan if plan is enabled
picked
=
pb
->
plan_entry
[
pb
->
c_entry
]
->
task_struct
;
}
}
if
(
current_mode
!=
next_mode
){
...
...
This diff is collapsed.
Click to expand it.
kernel/sched/perf_error_detection.c
+
8
−
7
View file @
2c569078
...
...
@@ -42,17 +42,18 @@ int init_perf_event(struct plan_entry plan_entry, struct perf_event **pevent){
return
0
;
}
//terminate perf event - return performance counter value
/*
* TODO: return the event counter value
*
* Must not be called after the event is terminated.
*/
long
long
terminate_perf_event
(
struct
perf_event
*
pevent
,
u64
task_id
/*, u64 *pevent_cntval */
){
u64
get_perf_counter
(
struct
perf_event
*
pevent
,
u64
*
perf_counter
)
{
return
perf_event_read_local
(
pevent
,
perf_counter
);
}
// TODO:
// *pevent_cntval = get the counter value here
u64
terminate_perf_event
(
struct
perf_event
*
pevent
)
{
return
perf_event_release_kernel
(
pevent
);
}
...
...
This diff is collapsed.
Click to expand it.
kernel/sched/perf_error_detection.h
+
3
−
1
View file @
2c569078
...
...
@@ -12,7 +12,9 @@
int
init_perf_event
(
struct
plan_entry
,
struct
perf_event
**
pevent
);
long
long
terminate_perf_event
(
struct
perf_event
*
pevent
,
u64
task_id
);
u64
get_perf_counter
(
struct
perf_event
*
pevent
,
u64
*
perf_counter
);
u64
terminate_perf_event
(
struct
perf_event
*
pevent
);
void
overflow_handler
(
struct
perf_event
*
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment