openharmony/kernel_linux_common_modules
1
0
Fork 0
mirror of https://github.com/openharmony/kernel_linux_common_modules.git synced 2026-08-27 01:31:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

!121 进程cpu三方采集线程负载安全优化

Browse Source 
Merge pull request !121 from 杨世琦_hw/master
This commit is contained in:
openharmony_ci
2024-05-13 06:21:53 +00:00
committed by Gitee
parent 4b48e9228d 768b13b1f9
commit 11ccadcd4f
2 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ucollection/ucollection_process_cpu.c
+40 -14
View File
@@ -162,6 +162,26 @@ static long ioctrl_collect_process_count(void __user *argp)
return 0;
}
static long read_thread_count_locked(struct ucollection_process_thread_count *kcount,
struct ucollection_process_thread_count __user *count)
{
rcu_read_lock();
struct task_struct *task = get_alive_task_by_pid(kcount->pid);
if (task == NULL) {
pr_info("pid=%d is task NULL or not alive", kcount->pid);
rcu_read_unlock();
return -EINVAL;
}
unsigned int thread_count = 0;
struct task_struct *t = task;
do {
thread_count++;
} while_each_thread(task, t);
put_user(thread_count, &count->thread_count);
rcu_read_unlock();
return 0;
}
static long ioctrl_collect_thread_count(void __user *argp)
{
struct ucollection_process_thread_count kcount;
@@ -172,21 +192,24 @@ static long ioctrl_collect_thread_count(void __user *argp)
}
memset(&kcount, 0, sizeof(struct ucollection_process_thread_count));
(void)copy_from_user(&kcount, count, sizeof(struct ucollection_process_thread_count));
rcu_read_lock();
struct task_struct *task = get_alive_task_by_pid(kcount.pid);
if (task == NULL) {
pr_info("pid=%d is task NULL or not alive", kcount.pid);
rcu_read_unlock();
return read_thread_count_locked(&kcount, count);
}
static long ioctrl_collect_app_thread_count(void __user *argp)
{
struct ucollection_process_thread_count kcount;
struct ucollection_process_thread_count __user *count = argp;
if (count == NULL) {
pr_err("cpu entry is null");
return -EINVAL;
}
uint32_t thread_count = 0;
struct task_struct *t = task;
do {
thread_count++;
} while_each_thread(task, t);
put_user(thread_count, &count->thread_count);
rcu_read_unlock();
return 0;
memset(&kcount, 0, sizeof(struct ucollection_process_thread_count));
(void)copy_from_user(&kcount, count, sizeof(struct ucollection_process_thread_count));
if (current->tgid != kcount.pid) {
pr_err("pid=%d is not self current tgid:%d", kcount.pid, current->tgid);
return -EINVAL;
}
return read_thread_count_locked(&kcount, count);
}
static long read_thread_info_locked(struct ucollection_thread_cpu_entry *kentry,
@@ -199,7 +222,7 @@ static long read_thread_info_locked(struct ucollection_thread_cpu_entry *kentry,
rcu_read_unlock();
return -EINVAL;
}
uint32_t thread_count = 0;
unsigned int thread_count = 0;
struct task_struct *t = task;
do {
if (thread_count >= kentry->total_count) {
@@ -295,6 +318,9 @@ long unified_collection_collect_process_cpu(unsigned int cmd, void __user *argp)
case IOCTRL_COLLECT_THREAD_COUNT:
ret = ioctrl_collect_thread_count(argp);
break;
case IOCTRL_COLLECT_APP_THREAD_COUNT:
ret = ioctrl_collect_app_thread_count(argp);
break;
case IOCTRL_COLLECT_APP_THREAD:
ret = ioctrl_collect_app_thread_cpu(argp);
break;
ucollection/unified_collection_data.h
+5 -2
View File
@@ -33,8 +33,8 @@ struct ucollection_process_cpu_entry {
};
struct ucollection_process_thread_count {
uint32_t pid;
uint32_t thread_count;
int pid;
unsigned int thread_count;
};
struct ucollection_thread_cpu_item {
@@ -66,6 +66,7 @@ enum collection_type {
COLLECT_THREAD_COUNT,
COLLECT_APP_THREAD,
COLLECT_THE_THREAD,
COLLECT_APP_THREAD_COUNT,
};
#define DMIPS_NUM 128
@@ -76,6 +77,8 @@ enum collection_type {
struct ucollection_process_cpu_entry)
#define IOCTRL_COLLECT_THREAD_COUNT _IOR(IOCTRL_COLLECT_CPU_BASE, COLLECT_THREAD_COUNT, \
struct ucollection_process_thread_count)
#define IOCTRL_COLLECT_APP_THREAD_COUNT _IOR(IOCTRL_COLLECT_CPU_BASE, COLLECT_APP_THREAD_COUNT, \
struct ucollection_process_thread_count)
#define IOCTRL_COLLECT_APP_THREAD _IOR(IOCTRL_COLLECT_CPU_BASE, COLLECT_APP_THREAD, struct ucollection_thread_cpu_entry)
#define IOCTRL_COLLECT_THE_THREAD _IOR(IOCTRL_COLLECT_CPU_BASE, COLLECT_THE_THREAD, struct ucollection_thread_cpu_entry)
#define IOCTRL_COLLECT_PROC_COUNT _IOR(IOCTRL_COLLECT_CPU_BASE, COLLECT_PROC_COUNT, unsigned int)