From abf92a16d6a2b01c3a230f7ce731f861f679c52a Mon Sep 17 00:00:00 2001 From: chungkai Date: Wed, 23 Mar 2022 09:41:51 +0000 Subject: [PATCH] sched: move sysfs to procfs Modify the path of vendor_sched nodes Test: work normally Bug: 216207007 Signed-off-by: chungkai Change-Id: Id9d85bb742dbfe96cc7e9fe8572a6a610a9f592e --- conf/init.gs101.rc | 156 +++++++++++++++++++++++---------------------- powerhint_a0.json | 2 +- powerhint_a1.json | 2 +- task_profiles.json | 56 ++++++++-------- 4 files changed, 110 insertions(+), 106 deletions(-) diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc index eaa7525c..72a292cf 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -18,55 +18,59 @@ on init write /dev/sys/fs/by-name/userdata/data_io_flag 56 write /dev/sys/fs/by-name/userdata/node_io_flag 56 - chown system system /sys/kernel/vendor_sched/set_task_group_bg - chown system system /sys/kernel/vendor_sched/set_task_group_cam - chown system system /sys/kernel/vendor_sched/set_task_group_fg - chown system system /sys/kernel/vendor_sched/set_task_group_nnapi - chown system system /sys/kernel/vendor_sched/set_task_group_sys - chown system system /sys/kernel/vendor_sched/set_task_group_sysbg - chown system system /sys/kernel/vendor_sched/set_task_group_ta - chown system system /sys/kernel/vendor_sched/set_task_group_rt - chown system system /sys/kernel/vendor_sched/set_task_group_sf - chown system system /sys/kernel/vendor_sched/set_task_group_dex2oat - chown system system /sys/kernel/vendor_sched/set_task_group_cam_power - chown system system /sys/kernel/vendor_sched/set_task_group_ota - chown system system /sys/kernel/vendor_sched/set_proc_group_bg - chown system system /sys/kernel/vendor_sched/set_proc_group_cam - chown system system /sys/kernel/vendor_sched/set_proc_group_fg - chown system system /sys/kernel/vendor_sched/set_proc_group_nnapi - chown system system /sys/kernel/vendor_sched/set_proc_group_sys - chown system system /sys/kernel/vendor_sched/set_proc_group_sysbg - chown system system /sys/kernel/vendor_sched/set_proc_group_ta - chown system system /sys/kernel/vendor_sched/set_proc_group_rt - chown system system /sys/kernel/vendor_sched/set_proc_group_sf - chown system system /sys/kernel/vendor_sched/set_proc_group_dex2oat - chown system system /sys/kernel/vendor_sched/set_proc_group_cam_power - chown system system /sys/kernel/vendor_sched/set_proc_group_ota + chown system system /proc/vendor_sched/set_task_group_bg + chown system system /proc/vendor_sched/set_task_group_cam + chown system system /proc/vendor_sched/set_task_group_fg + chown system system /proc/vendor_sched/set_task_group_nnapi + chown system system /proc/vendor_sched/set_task_group_sys + chown system system /proc/vendor_sched/set_task_group_sysbg + chown system system /proc/vendor_sched/set_task_group_ta + chown system system /proc/vendor_sched/set_task_group_rt + chown system system /proc/vendor_sched/set_task_group_sf + chown system system /proc/vendor_sched/set_task_group_dex2oat + chown system system /proc/vendor_sched/set_task_group_cam_power + chown system system /proc/vendor_sched/set_task_group_ota + chown system system /proc/vendor_sched/set_proc_group_bg + chown system system /proc/vendor_sched/set_proc_group_cam + chown system system /proc/vendor_sched/set_proc_group_fg + chown system system /proc/vendor_sched/set_proc_group_nnapi + chown system system /proc/vendor_sched/set_proc_group_sys + chown system system /proc/vendor_sched/set_proc_group_sysbg + chown system system /proc/vendor_sched/set_proc_group_ta + chown system system /proc/vendor_sched/set_proc_group_rt + chown system system /proc/vendor_sched/set_proc_group_sf + chown system system /proc/vendor_sched/set_proc_group_dex2oat + chown system system /proc/vendor_sched/set_proc_group_cam_power + chown system system /proc/vendor_sched/set_proc_group_ota + chown system system /proc/vendor_sched/prefer_idle_set + chown system system /proc/vendor_sched/prefer_idle_clear - chmod 0220 /sys/kernel/vendor_sched/set_task_group_bg - chmod 0220 /sys/kernel/vendor_sched/set_task_group_cam - chmod 0220 /sys/kernel/vendor_sched/set_task_group_fg - chmod 0220 /sys/kernel/vendor_sched/set_task_group_nnapi - chmod 0220 /sys/kernel/vendor_sched/set_task_group_sys - chmod 0220 /sys/kernel/vendor_sched/set_task_group_sysbg - chmod 0220 /sys/kernel/vendor_sched/set_task_group_ta - chmod 0220 /sys/kernel/vendor_sched/set_task_group_rt - chmod 0220 /sys/kernel/vendor_sched/set_task_group_sf - chmod 0220 /sys/kernel/vendor_sched/set_task_group_dex2oat - chmod 0220 /sys/kernel/vendor_sched/set_task_group_cam_power - chmod 0220 /sys/kernel/vendor_sched/set_task_group_ota - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_bg - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_cam - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_fg - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_nnapi - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_sys - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_sysbg - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_ta - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_rt - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_sf - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_dex2oat - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_cam_power - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_ota + chmod 0220 /proc/vendor_sched/set_task_group_bg + chmod 0220 /proc/vendor_sched/set_task_group_cam + chmod 0220 /proc/vendor_sched/set_task_group_fg + chmod 0220 /proc/vendor_sched/set_task_group_nnapi + chmod 0220 /proc/vendor_sched/set_task_group_sys + chmod 0220 /proc/vendor_sched/set_task_group_sysbg + chmod 0220 /proc/vendor_sched/set_task_group_ta + chmod 0220 /proc/vendor_sched/set_task_group_rt + chmod 0220 /proc/vendor_sched/set_task_group_sf + chmod 0220 /proc/vendor_sched/set_task_group_dex2oat + chmod 0220 /proc/vendor_sched/set_task_group_cam_power + chmod 0220 /proc/vendor_sched/set_task_group_ota + chmod 0220 /proc/vendor_sched/set_proc_group_bg + chmod 0220 /proc/vendor_sched/set_proc_group_cam + chmod 0220 /proc/vendor_sched/set_proc_group_fg + chmod 0220 /proc/vendor_sched/set_proc_group_nnapi + chmod 0220 /proc/vendor_sched/set_proc_group_sys + chmod 0220 /proc/vendor_sched/set_proc_group_sysbg + chmod 0220 /proc/vendor_sched/set_proc_group_ta + chmod 0220 /proc/vendor_sched/set_proc_group_rt + chmod 0220 /proc/vendor_sched/set_proc_group_sf + chmod 0220 /proc/vendor_sched/set_proc_group_dex2oat + chmod 0220 /proc/vendor_sched/set_proc_group_cam_power + chmod 0220 /proc/vendor_sched/set_proc_group_ota + chmod 0220 /proc/vendor_sched/prefer_idle_set + chmod 0220 /proc/vendor_sched/prefer_idle_clear wait /dev/block/platform/${ro.boot.boot_devices} symlink /dev/block/platform/${ro.boot.boot_devices} /dev/block/bootdevice @@ -128,12 +132,12 @@ on init mkdir /dev/socket/pdx/system/vr/sensors 0775 system system # Boot time 183626384 - write /sys/kernel/vendor_sched/ta_uclamp_min 1024 - write /sys/kernel/vendor_sched/ta_prefer_idle 1 - write /sys/kernel/vendor_sched/fg_uclamp_min 1024 - write /sys/kernel/vendor_sched/fg_prefer_idle 1 - write /sys/kernel/vendor_sched/sys_uclamp_min 1024 - write /sys/kernel/vendor_sched/sys_prefer_idle 1 + write /proc/vendor_sched/ta_uclamp_min 1024 + write /proc/vendor_sched/ta_prefer_idle 1 + write /proc/vendor_sched/fg_uclamp_min 1024 + write /proc/vendor_sched/fg_prefer_idle 1 + write /proc/vendor_sched/sys_uclamp_min 1024 + write /proc/vendor_sched/sys_prefer_idle 1 # governor setting write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor sched_pixel @@ -174,8 +178,8 @@ on init chown system system /dev/cpuset/camera-daemon-mid-high-group/tasks chmod 0664 /dev/cpuset/camera-daemon-mid-high-group/tasks - write /sys/kernel/vendor_sched/cam_prefer_idle 1 - write /sys/kernel/vendor_sched/cam_uclamp_min 1 + write /proc/vendor_sched/cam_prefer_idle 1 + write /proc/vendor_sched/cam_uclamp_min 1 chown system system /dev/cpuset/cgroup.procs @@ -278,8 +282,8 @@ on init start watchdogd # Add a boost for NNAPI HAL - write /sys/kernel/vendor_sched/nnapi_prefer_idle 0 - write /sys/kernel/vendor_sched/nnapi_uclamp_min 512 + write /proc/vendor_sched/nnapi_prefer_idle 0 + write /proc/vendor_sched/nnapi_uclamp_min 512 # Add memlat governor settings write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu0_memlat@17000010/polling_interval 10 @@ -404,7 +408,7 @@ on post-fs-data on zygote-start # For PixelLogger configuration file. chmod 0771 /data/vendor/wifi - write /sys/kernel/vendor_sched/sys_uclamp_min 0 + write /proc/vendor_sched/sys_uclamp_min 0 on post-fs-data # Create the directories used by the Wireless subsystem @@ -723,28 +727,28 @@ on property:sys.boot_completed=1 setprop vendor.powerhal.init 1 # Setup final cpu.uclamp - write /sys/kernel/vendor_sched/ta_uclamp_min 1 - write /sys/kernel/vendor_sched/fg_uclamp_min 0 - write /sys/kernel/vendor_sched/sys_prefer_idle 0 + write /proc/vendor_sched/ta_uclamp_min 1 + write /proc/vendor_sched/fg_uclamp_min 0 + write /proc/vendor_sched/sys_prefer_idle 0 # cfs_rq clamp is using tg->uclamp setting # align it with the vendor_group setting - write /sys/kernel/vendor_sched/bg_uclamp_max 512 + write /proc/vendor_sched/bg_uclamp_max 512 write /dev/cpuctl/background/cpu.uclamp.max 50 - write /sys/kernel/vendor_sched/bg_group_throttle 512 - write /sys/kernel/vendor_sched/sysbg_uclamp_max 512 + write /proc/vendor_sched/bg_group_throttle 512 + write /proc/vendor_sched/sysbg_uclamp_max 512 write /dev/cpuctl/system-background/cpu.uclamp.max 50 - write /sys/kernel/vendor_sched/sysbg_group_throttle 512 - write /sys/kernel/vendor_sched/dex2oat_uclamp_max 615 + write /proc/vendor_sched/sysbg_group_throttle 512 + write /proc/vendor_sched/dex2oat_uclamp_max 615 write /dev/cpuctl/dex2oat/cpu.uclamp.max 60 - write /sys/kernel/vendor_sched/dex2oat_group_throttle 615 - write /sys/kernel/vendor_sched/ota_uclamp_max 410 - write /sys/kernel/vendor_sched/ota_group_throttle 410 + write /proc/vendor_sched/dex2oat_group_throttle 615 + write /proc/vendor_sched/ota_uclamp_max 410 + write /proc/vendor_sched/ota_group_throttle 410 # Setup groups for SF (RT used for SF RE, SF used for SF main) - write /sys/kernel/vendor_sched/rt_uclamp_min 125 - write /sys/kernel/vendor_sched/rt_prefer_idle 1 - write /sys/kernel/vendor_sched/sf_uclamp_min 30 - write /sys/kernel/vendor_sched/sf_prefer_idle 1 + write /proc/vendor_sched/rt_uclamp_min 125 + write /proc/vendor_sched/rt_prefer_idle 1 + write /proc/vendor_sched/sf_uclamp_min 30 + write /proc/vendor_sched/sf_prefer_idle 1 # Setup cpu.shares to throttle background groups (bg ~ 5% sysbg ~ 5% dex2oat ~2.5%) write /dev/cpuctl/background/cpu.shares 1024 @@ -936,8 +940,8 @@ on charger mkdir /dev/thermal/tz-by-name 0750 system system mkdir /dev/thermal/cdev-by-name 0750 system system start vendor.thermal.symlinks - write /sys/kernel/vendor_sched/sys_uclamp_min 0 - write /sys/kernel/vendor_sched/sys_prefer_idle 0 + write /proc/vendor_sched/sys_uclamp_min 0 + write /proc/vendor_sched/sys_prefer_idle 0 # Launch thermal hal in off charging mode on charger && property:vendor.thermal.link_ready=1 diff --git a/powerhint_a0.json b/powerhint_a0.json index 2136a2bb..47873678 100644 --- a/powerhint_a0.json +++ b/powerhint_a0.json @@ -55,7 +55,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/sys/kernel/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "0", "410", diff --git a/powerhint_a1.json b/powerhint_a1.json index c3d1581d..81b4b659 100644 --- a/powerhint_a1.json +++ b/powerhint_a1.json @@ -75,7 +75,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/sys/kernel/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "0", "410", diff --git a/task_profiles.json b/task_profiles.json index ac21c778..4bcfe412 100644 --- a/task_profiles.json +++ b/task_profiles.json @@ -7,8 +7,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_ta", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_ta", + "FilePath": "/proc/vendor_sched/set_task_group_ta", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_ta", "Value": "", "LogFailures": "false" } @@ -22,8 +22,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_cam", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_cam", + "FilePath": "/proc/vendor_sched/set_task_group_cam", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_cam", "Value": "", "LogFailures": "false" } @@ -37,8 +37,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_cam_power", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_cam_power", + "FilePath": "/proc/vendor_sched/set_task_group_cam_power", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_cam_power", "Value": "", "LogFailures": "false" } @@ -52,8 +52,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_dex2oat", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_dex2oat", + "FilePath": "/proc/vendor_sched/set_task_group_dex2oat", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_dex2oat", "Value": "", "LogFailures": "false" } @@ -67,8 +67,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_ota", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_ota", + "FilePath": "/proc/vendor_sched/set_task_group_ota", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_ota", "Value": "", "LogFailures": "false" } @@ -121,8 +121,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_bg", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_bg", + "FilePath": "/proc/vendor_sched/set_task_group_bg", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_bg", "Value": "", "LogFailures": "false" } @@ -136,8 +136,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_sys", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_sys", + "FilePath": "/proc/vendor_sched/set_task_group_sys", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_sys", "Value": "", "LogFailures": "false" } @@ -151,8 +151,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_fg", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_fg", + "FilePath": "/proc/vendor_sched/set_task_group_fg", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_fg", "Value": "", "LogFailures": "false" } @@ -166,8 +166,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_ta", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_ta", + "FilePath": "/proc/vendor_sched/set_task_group_ta", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_ta", "Value": "", "LogFailures": "false" } @@ -181,8 +181,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_nnapi", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_nnapi", + "FilePath": "/proc/vendor_sched/set_task_group_nnapi", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_nnapi", "Value": "", "LogFailures": "false" } @@ -196,8 +196,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_sysbg", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_sysbg", + "FilePath": "/proc/vendor_sched/set_task_group_sysbg", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_sysbg", "Value": "", "LogFailures": "false" } @@ -219,8 +219,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_sf", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_sf", + "FilePath": "/proc/vendor_sched/set_task_group_sf", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_sf", "Value": "", "LogFailures": "false" } @@ -242,8 +242,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_rt", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_rt", + "FilePath": "/proc/vendor_sched/set_task_group_rt", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_rt", "Value": "", "LogFailures": "false" } @@ -257,7 +257,7 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/uclamp_fork_reset_set", + "FilePath": "/proc/vendor_sched/uclamp_fork_reset_set", "Value": "", "LogFailures": "false" } @@ -271,7 +271,7 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/uclamp_fork_reset_clear", + "FilePath": "/proc/vendor_sched/uclamp_fork_reset_clear", "Value": "", "LogFailures": "false" }