Rename psi_group structure member fields used for calculating psi totals and averages for clear distinction between them and for trigger-related fields that will be added by "psi: introduce psi monitor". [surenb@google.com: v6] Link: http://lkml.kernel.org/r/20190319235619.260832-4-surenb@google.com Link: http://lkml.kernel.org/r/20190124211518.244221-5-surenb@google.com Signed-off-by: Suren Baghdasaryan <surenb@google.com> Acked-by: Johannes Weiner <hannes@cmpxchg.org> Cc: Dennis Zhou <dennis@kernel.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jens Axboe <axboe@kernel.dk> Cc: Li Zefan <lizefan@huawei.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Tejun Heo <tj@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing the changes to include/linux (1 of 2 files). Show all
Unified · Split
| @@ -69,17 +69,17 @@ struct psi_group_cpu { · 68 unmodified lines | |||
| 69 | }; | 69 | }; |
| 70 | 70 | ||
| 71 | struct psi_group { | 71 | struct psi_group { |
| 72 | /* Protects data updated during an aggregation */ | 72 | /* Protects data used by the aggregator */ |
| 73 | struct mutex stat_lock; | 73 | struct mutex avgs_lock; |
| 74 | 74 | ||
| 75 | /* Per-cpu task state & time tracking */ | 75 | /* Per-cpu task state & time tracking */ |
| 76 | struct psi_group_cpu __percpu *pcpu; | 76 | struct psi_group_cpu __percpu *pcpu; |
| 77 | 77 | ||
| 78 | /* Periodic aggregation state */ | 78 | /* Running pressure averages */ |
| 79 | u64 total_prev[NR_PSI_STATES - 1]; | 79 | u64 avg_total[NR_PSI_STATES - 1]; |
| 80 | u64 last_update; | 80 | u64 avg_last_update; |
| 81 | u64 next_update; | 81 | u64 avg_next_update; |
| 82 | struct delayed_work clock_work; | 82 | struct delayed_work avgs_work; |
| 83 | 83 | ||
| 84 | /* Total stall times and sampled pressure averages */ | 84 | /* Total stall times and sampled pressure averages */ |
| 85 | u64 total[NR_PSI_STATES - 1]; | 85 | u64 total[NR_PSI_STATES - 1]; |