github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 05:55:44 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "ANDROID: cpufreq: Add time_in_state to /proc/uid directories"

Browse Source 
This reverts commit ce765ecd8d.

Bug: 127641090
Signed-off-by: Connor O'Brien <connoro@google.com>
Change-Id: If2218dbb21dfd807f8eed79092c9e77f7e1ea840
This commit is contained in:
Connor O'Brien 2020-02-28 12:24:41 -08:00 committed by Alistair Delva
parent eb8cd4a66a
commit 652638b3bd
3 changed files with 1 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/cpufreq/cpufreq_times.c
View File

@ -58,19 +58,6 @@ static struct cpu_freqs *all_freqs[NR_CPUS];
static unsigned int next_offset;
/* Caller must hold rcu_read_lock() */
static struct uid_entry *find_uid_entry_rcu(uid_t uid)
{
struct uid_entry *uid_entry;
hash_for_each_possible_rcu(uid_hash_table, uid_entry, hash, uid) {
if (uid_entry->uid == uid)
return uid_entry;
}
return NULL;
}
/* Caller must hold uid lock */
static struct uid_entry *find_uid_entry_locked(uid_t uid)
{
@ -126,33 +113,6 @@ static struct uid_entry *find_or_register_uid_locked(uid_t uid)
return uid_entry;
}
static int single_uid_time_in_state_show(struct seq_file *m, void *ptr)
{
struct uid_entry *uid_entry;
unsigned int i;
uid_t uid = from_kuid_munged(current_user_ns(), *(kuid_t *)m->private);
if (uid == overflowuid)
return -EINVAL;
rcu_read_lock();
uid_entry = find_uid_entry_rcu(uid);
if (!uid_entry) {
rcu_read_unlock();
return 0;
}
for (i = 0; i < uid_entry->max_state; ++i) {
u64 time = nsec_to_clock_t(uid_entry->time_in_state[i]);
seq_write(m, &time, sizeof(time));
}
rcu_read_unlock();
return 0;
}
static void *uid_seq_start(struct seq_file *seq, loff_t *pos)
{
if (*pos >= HASH_SIZE(uid_hash_table))
@ -424,12 +384,6 @@ static int uid_time_in_state_open(struct inode *inode, struct file *file)
return seq_open(file, &uid_time_in_state_seq_ops);
}
int single_uid_time_in_state_open(struct inode *inode, struct file *file)
{
return single_open(file, single_uid_time_in_state_show,
&(inode->i_uid));
}
static const struct proc_ops uid_time_in_state_fops = {
.proc_open = uid_time_in_state_open,
.proc_read = seq_read,

16
fs/proc/uid.c
View File

@ -2,7 +2,6 @@
* /proc/uid support
*/
#include <linux/cpufreq_times.h>
#include <linux/fs.h>
#include <linux/hashtable.h>
#include <linux/init.h>
@ -83,20 +82,7 @@ struct uid_entry {
.fop = FOP, \
}
#ifdef CONFIG_CPU_FREQ_TIMES
static const struct file_operations proc_uid_time_in_state_operations = {
.open = single_uid_time_in_state_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
#endif
static const struct uid_entry uid_base_stuff[] = {
#ifdef CONFIG_CPU_FREQ_TIMES
NOD("time_in_state", 0444, NULL, &proc_uid_time_in_state_operations),
#endif
};
static const struct uid_entry uid_base_stuff[] = {};
static const struct inode_operations proc_uid_def_inode_operations = {
.setattr = proc_setattr,

1
include/linux/cpufreq_times.h
View File

@ -30,7 +30,6 @@ void cpufreq_times_create_policy(struct cpufreq_policy *policy);
void cpufreq_times_record_transition(struct cpufreq_policy *policy,
unsigned int new_freq);
void cpufreq_task_times_remove_uids(uid_t uid_start, uid_t uid_end);
int single_uid_time_in_state_open(struct inode *inode, struct file *file);
#else
static inline void cpufreq_task_times_init(struct task_struct *p) {}
static inline void cpufreq_task_times_alloc(struct task_struct *p) {}