Răsfoiți Sursa

Refactor patch application commands and add logging

Updated patch application commands to use --forward option for better handling of patch failures. Added echo statements for better logging of patching process. also applying in correct order
jimsterino98 2 luni în urmă
părinte
comite
3a780c607b
1 a modificat fișierele cu 45 adăugiri și 40 ștergeri
  1. 45 40
      .github/actions/optimization/action.yml

+ 45 - 40
.github/actions/optimization/action.yml

@@ -13,50 +13,55 @@ runs:
     run: |
      cd "$COMMON"
      MIN_VERSION="5.16"
-
-     # trying with rewrite
-     patch -p1 -F 3 < "$KERNEL_PATCHES/common/add_limitation_scaling_min_freq.patch"
-     # PATCH FAILS ON ONEUI 8.5patch -p1 -F 3 < "$KERNEL_PATCHES/common/avoid_extra_s2idle_wake_attempts.patch"
-     #patch fails on all hunks for all devices trying with rewrite
-     patch -p1 -F 3 < "$KERNEL_PATCHES/common/re_write_limitation_scaling_min_freq.patch"
-     #patch fails for all devices patch -p1 -F 3 < "$KERNEL_PATCHES/common/use_unlikely_wrap_cpufreq.patch"
-
-     #good patches that work
-     patch -p1 < "$KERNEL_PATCHES/common/add_timeout_wakelocks_globally.patch"
-     patch -p1 < "$KERNEL_PATCHES/common/adjust_cpu_scan_order.patch"
      
-     if [ "$(printf '%s\n' "${{ inputs.kernel_version }}" "$MIN_VERSION" | sort -V | head -n1)" = "${{ inputs.kernel_version }}" ]; then
-      patch -p1 --forward < "$KERNEL_PATCHES/common/clear_page_16bytes_align.patch"
-     else
-      cat "$KERNEL_PATCHES/common/clear_page_16bytes_align.patch" | sed -e 's/SYM_FUNC_START_PI(clear_page)/SYM_FUNC_START_PI(__pi_clear_page)/' | patch -p1 -F3 --forward
-     fi
-        
-     patch -p1 < "$KERNEL_PATCHES/common/disable_cache_hot_buddy.patch"
-     patch -p1 < "$KERNEL_PATCHES/common/f2fs_enlarge_min_fsync_blocks.patch"
-     patch -p1 < "$KERNEL_PATCHES/common/f2fs_reduce_congestion.patch"
-     patch -p1 < "$KERNEL_PATCHES/common/file_struct_8bytes_align.patch"
-     patch -p1 < "$KERNEL_PATCHES/common/force_tcp_nodelay.patch"
-     patch -p1 < "$KERNEL_PATCHES/common/increase_ext4_default_commit_age.patch"
-     patch -p1 < "$KERNEL_PATCHES/common/increase_sk_mem_packets.patch"
-     patch -p1 < "$KERNEL_PATCHES/common/int_sqrt.patch"
-     patch -p1 < "$KERNEL_PATCHES/common/mem_opt_prefetch.patch"
-     patch -p1 -F 3 < "$KERNEL_PATCHES/common/minimise_wakeup_time.patch"
+     patch -p1 --forward < "$KERNEL_PATCHES/common/optimized_mem_operations.patch"
+     patch -p1 --forward < "$KERNEL_PATCHES/common/file_struct_8bytes_align.patch"
+     patch -p1 --forward < "$KERNEL_PATCHES/common/reduce_cache_pressure.patch"
+     patch -p1 --forward < "$KERNEL_PATCHES/common/mem_opt_prefetch.patch"
 
      if [ "$(printf '%s\n' "${{ inputs.kernel_version }}" "$MIN_VERSION" | sort -V | tail -n1)" = "${{ inputs.kernel_version }}" ]; then
-          patch -p1 -F 3 < "$KERNEL_PATCHES/common/optimise_memcmp.patch"
+      patch -p1 --forward < "$KERNEL_PATCHES/common/optimise_memcmp.patch"
      elif [ "$(printf '%s\n' "${{ inputs.kernel_version }}" "5.11" | sort -V | tail -n1)" = "${{ inputs.kernel_version }}" ]; then
-          sed -e 's/SYM_FUNC_START(__pi_memcmp)/SYM_FUNC_START_WEAK_PI(memcmp)/' -e 's/SYM_FUNC_END(__pi_memcmp)/SYM_FUNC_END_PI(memcmp)/' -e 's/SYM_FUNC_ALIAS_WEAK(memcmp, __pi_memcmp)/EXPORT_SYMBOL_NOKASAN(memcmp)/' "$KERNEL_PATCHES/common/optimise_memcmp.patch" | patch -p1 --forward
+       sed -e 's/SYM_FUNC_START(__pi_memcmp)/SYM_FUNC_START_WEAK_PI(memcmp)/' -e 's/SYM_FUNC_END(__pi_memcmp)/SYM_FUNC_END_PI(memcmp)/' -e 's/SYM_FUNC_ALIAS_WEAK(memcmp, __pi_memcmp)/EXPORT_SYMBOL_NOKASAN(memcmp)/' "$KERNEL_PATCHES/common/optimise_memcmp.patch" | patch -p1 --forward
      else
-          echo "Optimised memcmp patch not found!"
+       echo "Optimised memcmp patch not found!"
      fi
-     
-     patch -p1 < "$KERNEL_PATCHES/common/optimized_mem_operations.patch"
-     patch -p1 < "$KERNEL_PATCHES/common/reduce_cache_pressure.patch"
-     patch -p1 < "$KERNEL_PATCHES/common/reduce_freeze_timeout.patch"
-     patch -p1 < "$KERNEL_PATCHES/common/reduce_gc_thread_sleep_time.patch"
 
-     #test for organizing
-     patch -p1 < "$KERNEL_PATCHES/common/reduce_pci_pme_wakeups.patch"
-     patch -p1 < "$KERNEL_PATCHES/common/silence_irq_cpu_logspam.patch"
-     patch -p1 < "$KERNEL_PATCHES/common/silence_system_logspam.patch"
-     
+     patch -p1 --forward < "$KERNEL_PATCHES/common/minimise_wakeup_time.patch"
+     patch -p1 --forward < "$KERNEL_PATCHES/common/int_sqrt.patch"
+     patch -p1 --forward < "$KERNEL_PATCHES/common/force_tcp_nodelay.patch"
+     patch -p1 --forward < "$KERNEL_PATCHES/common/reduce_gc_thread_sleep_time.patch"
+     patch -p1 --forward < "$KERNEL_PATCHES/common/add_timeout_wakelocks_globally.patch"
+     patch -p1 --forward < "$KERNEL_PATCHES/common/f2fs_reduce_congestion.patch"
+     patch -p1 --forward < "$KERNEL_PATCHES/common/reduce_freeze_timeout.patch"
+
+     if [ "$(printf '%s\n' "${{ inputs.kernel_version }}" "$MIN_VERSION" | sort -V | head -n1)" = "${{ inputs.kernel_version }}" ]; then
+       patch -p1 --forward < "$KERNEL_PATCHES/common/clear_page_16bytes_align.patch"
+     else
+       cat "$KERNEL_PATCHES/common/clear_page_16bytes_align.patch" | sed -e 's/SYM_FUNC_START_PI(clear_page)/SYM_FUNC_START_PI(__pi_clear_page)/' | patch -p1 -F3 --forward
+     fi
+
+     echo "Patching add_limitation_scaling_min_freq.patch"
+     patch -p1 -F3 --forward < "$KERNEL_PATCHES/common/add_limitation_scaling_min_freq.patch"
+     echo "Patching re_write_limitation_scaling_min_freq.patch"
+     patch -p1 -F3 --forward < "$KERNEL_PATCHES/common/re_write_limitation_scaling_min_freq.patch"
+     echo "Patching adjust_cpu_scan_order.patch"
+     patch -p1 -F3 --forward < "$KERNEL_PATCHES/common/adjust_cpu_scan_order.patch"
+     echo "Patching avoid_extra_s2idle_wake_attempts.patch"
+     patch -p1 -F3 --forward < "$KERNEL_PATCHES/common/avoid_extra_s2idle_wake_attempts.patch"
+     echo "Patching disable_cache_hot_buddy.patch"
+     patch -p1 -F3 --forward < "$KERNEL_PATCHES/common/disable_cache_hot_buddy.patch"
+     echo "Patching f2fs_enlarge_min_fsync_blocks.patch"
+     patch -p1 -F3 --forward < "$KERNEL_PATCHES/common/f2fs_enlarge_min_fsync_blocks.patch"
+     echo "Patching increase_ext4_default_commit_age.patch"
+     patch -p1 -F3 --forward < "$KERNEL_PATCHES/common/increase_ext4_default_commit_age.patch"
+     echo "Patching increase_sk_mem_packets.patch"
+     patch -p1 -F3 --forward < "$KERNEL_PATCHES/common/increase_sk_mem_packets.patch"
+     echo "Patching reduce_pci_pme_wakeups.patch"
+     patch -p1 -F3 --forward < "$KERNEL_PATCHES/common/reduce_pci_pme_wakeups.patch"
+     echo "Patching silence_irq_cpu_logspam.patch"
+     patch -p1 -F3 --forward < "$KERNEL_PATCHES/common/silence_irq_cpu_logspam.patch"
+     echo "Patching silence_system_logspam.patch"
+     patch -p1 -F3 --forward < "$KERNEL_PATCHES/common/silence_system_logspam.patch"
+     echo "Patching use_unlikely_wrap_cpufreq.patch"
+     patch -p1 -F3 --forward < "$KERNEL_PATCHES/common/use_unlikely_wrap_cpufreq.patch"