diff options
author | Bart Van Assche <bvanassche@google.com> | 2022-03-30 16:22:53 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-30 16:22:53 +0000 |
commit | f40d7061c2c72bfed00ee376d14ec5fc6d91a5e4 (patch) | |
tree | 1ed143b0a077b21e27970499f84461050fc9a67a | |
parent | ef5ecc3324ff66318cbc62d7e7bd32faf39332cd (diff) | |
parent | efee2add8d9280e2316acaa9652d4300bbbd6464 (diff) | |
download | bonito-f40d7061c2c72bfed00ee376d14ec5fc6d91a5e4.tar.gz |
Revert "Migrate the blkio controller to the cgroup v2 hierarchy" am: efee2add8d
Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2049924
Change-Id: Icf8d63acc81dadaced74d796b80a7677309b1d4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | device.mk | 1 | ||||
-rw-r--r-- | init.hardware.rc | 7 | ||||
-rw-r--r-- | task_profiles.json | 132 |
3 files changed, 7 insertions, 133 deletions
@@ -47,7 +47,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/bonito/default-permissions.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default-permissions/default-permissions.xml \ device/google/bonito/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \ - device/google/bonito/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml diff --git a/init.hardware.rc b/init.hardware.rc index 4c3a8416..ad788c9c 100644 --- a/init.hardware.rc +++ b/init.hardware.rc @@ -508,6 +508,13 @@ on property:sys.boot_completed=1 write /dev/cpuset/system-background/cpus 2-5 write /dev/cpuset/restricted/cpus 2-5 + # Setup final blkio + # value for group_idle is us + write /dev/blkio/blkio.weight 1000 + write /dev/blkio/background/blkio.weight 200 + write /dev/blkio/blkio.group_idle 2000 + write /dev/blkio/background/blkio.group_idle 0 + # QCOM FG SRAM dump for dumpstate chown system system /d/fg/sram/data chown system system /d/fg/sram/count diff --git a/task_profiles.json b/task_profiles.json deleted file mode 100644 index 55657e05..00000000 --- a/task_profiles.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "Profiles": [ - { - "Name": "LowIoPriority", - "Actions": [ - { - "Name": "SetAttribute", - "Params": - { - "Name": "BfqWeight", - "Value": "10", - "IgnoreFailure": "true" - } - }, - { - "Name": "SetAttribute", - "Params": - { - "Name": "CfqGroupIdle", - "Value": "0", - "IgnoreFailure": "true" - } - }, - { - "Name": "SetAttribute", - "Params": - { - "Name": "CfqWeight", - "Value": "200", - "IgnoreFailure": "true" - } - } - ] - }, - { - "Name": "NormalIoPriority", - "Actions": [ - { - "Name": "SetAttribute", - "Params": - { - "Name": "BfqWeight", - "Value": "100", - "IgnoreFailure": "true" - } - }, - { - "Name": "SetAttribute", - "Params": - { - "Name": "CfqGroupIdle", - "Value": "2000", - "IgnoreFailure": "true" - } - }, - { - "Name": "SetAttribute", - "Params": - { - "Name": "CfqWeight", - "Value": "1000", - "IgnoreFailure": "true" - } - } - ] - }, - { - "Name": "HighIoPriority", - "Actions": [ - { - "Name": "SetAttribute", - "Params": - { - "Name": "BfqWeight", - "Value": "100", - "IgnoreFailure": "true" - } - }, - { - "Name": "SetAttribute", - "Params": - { - "Name": "CfqGroupIdle", - "Value": "2000", - "IgnoreFailure": "true" - } - }, - { - "Name": "SetAttribute", - "Params": - { - "Name": "CfqWeight", - "Value": "1000", - "IgnoreFailure": "true" - } - } - ] - }, - { - "Name": "MaxIoPriority", - "Actions": [ - { - "Name": "SetAttribute", - "Params": - { - "Name": "BfqWeight", - "Value": "100", - "IgnoreFailure": "true" - } - }, - { - "Name": "SetAttribute", - "Params": - { - "Name": "CfqGroupIdle", - "Value": "2000", - "IgnoreFailure": "true" - } - }, - { - "Name": "SetAttribute", - "Params": - { - "Name": "CfqWeight", - "Value": "1000", - "IgnoreFailure": "true" - } - } - ] - } - ] -} |