diff options
author | Lee Jones <joneslee@google.com> | 2024-01-29 16:40:16 +0000 |
---|---|---|
committer | Lee Jones <joneslee@google.com> | 2024-01-30 11:00:06 +0000 |
commit | fda83cf7c9247ad2f8a9a5f198c1905d195460d0 (patch) | |
tree | e6c201113eb65f311c9522484577de525bf192e8 | |
parent | d204a2739963985e3837d3e4f39e1c8f3ff19fa1 (diff) | |
download | common-patches-fda83cf7c9247ad2f8a9a5f198c1905d195460d0.tar.gz |
aosp/android-mainline: update series
up to 3851c83bf23ba ("ANDROID: timers: Use original names for outputs of some timer binaries")
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: Ia68c2ac55d9f3120a0249cc52ebf2a3e2879e874
4 files changed, 293 insertions, 133 deletions
diff --git a/android-mainline/ANDROID-tools-Miscellaneous.patch b/android-mainline/ANDROID-tools-Miscellaneous.patch index a6fca29f..218ee094 100644 --- a/android-mainline/ANDROID-tools-Miscellaneous.patch +++ b/android-mainline/ANDROID-tools-Miscellaneous.patch @@ -7,11 +7,16 @@ Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: Ic155709fbf07ec0575fa2fa954ee199e63051a97 --- tools/testing/android/OWNERS | 4 + - tools/testing/android/bin/acloudb.sh | 43 +++++++++++ - tools/testing/android/bin/kselftest.sh | 76 +++++++++++++++++++ - .../selftests/android/config_arm64.xml | 55 ++++++++++++++ - .../selftests/android/config_x86_64.xml | 55 ++++++++++++++ - 5 files changed, 233 insertions(+) + tools/testing/android/bin/acloudb.sh | 43 +++++++++ + tools/testing/android/bin/kselftest.sh | 88 +++++++++++++++++++ + .../selftests/android/config_arm64.xml | 84 ++++++++++++++++++ + .../selftests/android/config_x86_64.xml | 84 ++++++++++++++++++ + .../filesystems/binderfs/binderfs_test.c | 10 +++ + .../selftests/futex/functional/futex_wait.c | 6 ++ + .../futex/functional/futex_wait_timeout.c | 11 ++- + .../futex/functional/futex_wait_wouldblock.c | 13 ++- + tools/testing/selftests/rtc/rtctest.c | 2 + + 10 files changed, 338 insertions(+), 7 deletions(-) create mode 100644 tools/testing/android/OWNERS create mode 100755 tools/testing/android/bin/acloudb.sh create mode 100755 tools/testing/android/bin/kselftest.sh @@ -79,7 +84,7 @@ diff --git a/tools/testing/android/bin/kselftest.sh b/tools/testing/android/bin/ new file mode 100755 --- /dev/null +++ b/tools/testing/android/bin/kselftest.sh -@@ -0,0 +1,76 @@ +@@ -0,0 +1,88 @@ +#!/usr/bin/env bash +# SPDX-License-Identifier: GPL-2.0 + @@ -147,7 +152,19 @@ new file mode 100755 +fi + +echo "Building selftests..." -+$BAZEL build //common:kselftest_tests_x86_64 ++ABI=$(adb shell getprop ro.product.cpu.abi) ++case $ABI in ++ arm64*) ++ $BAZEL build //common:kselftest_tests_arm64 ++ ;; ++ x86_64*) ++ $BAZEL build //common:kselftest_tests_x86_64 ++ ;; ++ *) ++ echo "$ABI not supported" ++ exit 1 ++ ;; ++esac + +$TRADEFED run commandAndExit template/local_min --template:map test=suite/test_mapping_suite \ +--include-filter selftests --tests-dir=$TESTSDIR --primary-abi-only @@ -160,11 +177,14 @@ diff --git a/tools/testing/selftests/android/config_arm64.xml b/tools/testing/se new file mode 100644 --- /dev/null +++ b/tools/testing/selftests/android/config_arm64.xml -@@ -0,0 +1,55 @@ +@@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2023 The Android Open Source Project +SPDX-License-Identifier: GPL-2.0 OR Apache-2.0 +--> ++<!DOCTYPE configuration [ ++<!ENTITY ktest_dir "/data/selftests/arm64"> ++]> +<configuration description="kselftest"> + <option name="test-suite-tag" value="kernel-test" /> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" /> @@ -174,57 +194,86 @@ new file mode 100644 + <option name="cleanup" value="true" /> + <option name="push-file" key="selftests" value="/data/selftests" /> + <option name="skip-abi-filtering" value="true" /> -+ <option name="post-push" value='chmod -R 755 /data/selftests; find /data/selftests; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' /> ++ <option name="post-push" value='chmod -R 755 /data/selftests; find /data/selftests -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' /> + </target_preparer> + + <test class="com.android.tradefed.testtype.binary.KernelTargetTest" > + <option name="exit-code-skip" value="4" /> + <option name="skip-binary-check" value="true" /> -+ <option name="test-command-line" key="kselftest_binderfs_binderfs_test" value="/data/selftests/arm64/kselftest_binderfs_binderfs_test" /> -+ <option name="test-command-line" key="kselftest_breakpoints_breakpoint_test" value="/data/selftests/arm64/kselftest_breakpoints_breakpoint_test" /> -+ <option name="test-command-line" key="kselftest_breakpoints_step_after_suspend_test" value="/data/selftests/arm64/kselftest_breakpoints_step_after_suspend_test" /> -+ <option name="test-command-line" key="kselftest_futex_run" value="cd /data/selftests/arm64/;USE_COLOR=0 ./kselftest_futex_run" /> -+ <option name="test-command-line" key="kselftest_kcmp_kcmp_test" value="/data/selftests/arm64/kselftest_kcmp_kcmp_test" /> -+ <option name="test-command-line" key="kselftest_ptrace_peeksiginfo" value="/data/selftests/arm64/kselftest_ptrace_peeksiginfo" /> -+ <option name="test-command-line" key="kselftest_rtc_rtctest" value="/data/selftests/arm64/kselftest_rtc_rtctest" /> -+ <option name="test-command-line" key="kselftest_vdso_vdso_test_abi" value="/data/selftests/arm64/kselftest_vdso_vdso_test_abi" /> -+ <option name="test-command-line" key="kselftest_vdso_vdso_test_clock_getres" value="/data/selftests/arm64/kselftest_vdso_vdso_test_clock_getres" /> -+ <option name="test-command-line" key="kselftest_vdso_vdso_test_getcpu" value="/data/selftests/arm64/kselftest_vdso_vdso_test_getcpu" /> -+ <option name="test-command-line" key="kselftest_vdso_vdso_test_gettimeofday" value="/data/selftests/arm64/kselftest_vdso_vdso_test_gettimeofday" /> -+ <option name="test-command-line" key="kselftest_size_test_get_size" value="/data/selftests/arm64/kselftest_size_test_get_size" /> -+ <option name="test-command-line" key="kselftest_mm_mremap_dontunmap" value="/data/selftests/arm64/kselftest_mm_mremap_dontunmap" /> -+ <option name="test-command-line" key="kselftest_mm_mremap_test" value="/data/selftests/arm64/kselftest_mm_mremap_test" /> -+ <option name="test-command-line" key="kselftest_mm_uffd_unit_tests" value="/data/selftests/arm64/kselftest_mm_uffd_unit_tests" /> -+ <option name="test-command-line" key="kselftest_timers_adjtick" value="/data/selftests/arm64/kselftest_timers_adjtick" /> -+ <option name="test-command-line" key="kselftest_timers_alarmtimer_suspend" value="/data/selftests/arm64/kselftest_timers_alarmtimer_suspend" /> -+ <option name="test-command-line" key="kselftest_timers_change_skew" value="/data/selftests/arm64/kselftest_timers_change_skew" /> -+ <option name="test-command-line" key="kselftest_timers_clocksource_switch" value="/data/selftests/arm64/kselftest_timers_clocksource_switch" /> -+ <option name="test-command-line" key="kselftest_timers_freq_step" value="/data/selftests/arm64/kselftest_timers_freq_step" /> -+ <option name="test-command-line" key="kselftest_timers_inconsistency_check" value="/data/selftests/arm64/kselftest_timers_inconsistency_check" /> -+ <option name="test-command-line" key="kselftest_timers_leap_a_day" value="/data/selftests/arm64/kselftest_timers_leap_a_day" /> -+ <option name="test-command-line" key="kselftest_timers_leapcrash" value="/data/selftests/arm64/kselftest_timers_leapcrash" /> -+ <option name="test-command-line" key="kselftest_timers_nanosleep" value="/data/selftests/arm64/kselftest_timers_nanosleep" /> -+ <option name="test-command-line" key="kselftest_timers_nsleep_lat" value="/data/selftests/arm64/kselftest_timers_nsleep_lat" /> -+ <option name="test-command-line" key="kselftest_timers_posix_timers" value="/data/selftests/arm64/kselftest_timers_posix_timers" /> -+ <option name="test-command-line" key="kselftest_timers_set_2038" value="/data/selftests/arm64/kselftest_timers_set_2038" /> -+ <option name="test-command-line" key="kselftest_timers_set_tai" value="/data/selftests/arm64/kselftest_timers_set_tai" /> -+ <option name="test-command-line" key="kselftest_timers_set_timer_lat" value="/data/selftests/arm64/kselftest_timers_set_timer_lat" /> -+ <option name="test-command-line" key="kselftest_timers_set_tz" value="/data/selftests/arm64/kselftest_timers_set_tz" /> -+ <option name="test-command-line" key="kselftest_timers_skew_consistency" value="/data/selftests/arm64/kselftest_timers_skew_consistency" /> -+ <option name="test-command-line" key="kselftest_timers_tests_raw_skew" value="/data/selftests/arm64/kselftest_timers_tests_raw_skew" /> -+ <option name="test-command-line" key="kselftest_timers_threadtest" value="/data/selftests/arm64/kselftest_timers_threadtest" /> -+ <option name="test-command-line" key="kselftest_timers_valid_adjtimex" value="/data/selftests/arm64/kselftest_timers_valid_adjtimex" /> ++ <option name="test-command-line" key="kselftest_binderfs_binderfs_test" value="cd &ktest_dir;; ./kselftest_binderfs_binderfs_test" /> ++ <option name="test-command-line" key="kselftest_breakpoints_breakpoint_test" value="cd &ktest_dir;; ./kselftest_breakpoints_breakpoint_test" /> ++ <option name="test-command-line" key="kselftest_futex_requeue" value="cd &ktest_dir;; ./futex_requeue" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi" value="cd &ktest_dir;; ./futex_requeue_pi" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_b" value="cd &ktest_dir;; ./futex_requeue_pi -b" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_bl" value="cd &ktest_dir;; ./futex_requeue_pi -b -l" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_bo" value="cd &ktest_dir;; ./futex_requeue_pi -b -o" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_l" value="cd &ktest_dir;; ./futex_requeue_pi -l" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_o" value="cd &ktest_dir;; ./futex_requeue_pi -o" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_5k" value="cd &ktest_dir;; ./futex_requeue_pi -t 5000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_b_5k" value="cd &ktest_dir;; ./futex_requeue_pi -b -t 5000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_bl_5k" value="cd &ktest_dir;; ./futex_requeue_pi -b -l -t 5000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_bo_5k" value="cd &ktest_dir;; ./futex_requeue_pi -b -o -t 5000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_l_5k" value="cd &ktest_dir;; ./futex_requeue_pi -l -t 5000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_o_5k" value="cd &ktest_dir;; ./futex_requeue_pi -o -t 5000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_500k" value="cd &ktest_dir;; ./futex_requeue_pi -t 500000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_b_500k" value="cd &ktest_dir;; ./futex_requeue_pi -b -t 500000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_bl_500k" value="cd &ktest_dir;; ./futex_requeue_pi -b -l -t 500000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_bo_500k" value="cd &ktest_dir;; ./futex_requeue_pi -b -o -t 500000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_l_500k" value="cd &ktest_dir;; ./futex_requeue_pi -l -t 500000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_o_500k" value="cd &ktest_dir;; ./futex_requeue_pi -o -t 500000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_bl_2G" value="cd &ktest_dir;; ./futex_requeue_pi -b -l -t 2000000000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_l_2G" value="cd &ktest_dir;; ./futex_requeue_pi -l -t 2000000000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_mismatched_ops" value="cd &ktest_dir;; ./futex_requeue_pi_mismatched_ops" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_signal_restart" value="cd &ktest_dir;; ./futex_requeue_pi_signal_restart" /> ++ <option name="test-command-line" key="kselftest_futex_wait" value="cd &ktest_dir;; ./futex_wait" /> ++ <option name="test-command-line" key="kselftest_futex_wait_private_mapped_file" value="cd &ktest_dir;; ./futex_wait_private_mapped_file" /> ++ <option name="test-command-line" key="kselftest_futex_wait_timeout" value="cd &ktest_dir;; ./futex_wait_timeout" /> ++ <option name="test-command-line" key="kselftest_futex_wait_uninitialized_heap" value="cd &ktest_dir;; ./futex_wait_uninitialized_heap" /> ++ <option name="test-command-line" key="kselftest_futex_wait_wouldblock" value="cd &ktest_dir;; ./futex_wait_wouldblock" /> ++ <option name="test-command-line" key="kselftest_kcmp_kcmp_test" value="cd &ktest_dir;; ./kselftest_kcmp_kcmp_test" /> ++ <option name="test-command-line" key="kselftest_mm_mremap_dontunmap" value="cd &ktest_dir;; ./kselftest_mm_mremap_dontunmap" /> ++ <option name="test-command-line" key="kselftest_mm_mremap_test" value="cd &ktest_dir;; ./kselftest_mm_mremap_test" /> ++ <option name="test-command-line" key="kselftest_mm_uffd_unit_tests" value="cd &ktest_dir;; ./kselftest_mm_uffd_unit_tests" /> ++ <option name="test-command-line" key="kselftest_ptrace_peeksiginfo" value="cd &ktest_dir;; ./kselftest_ptrace_peeksiginfo" /> ++ <option name="test-command-line" key="kselftest_rtc_rtctest" value="cd &ktest_dir;; ./kselftest_rtc_rtctest" /> ++ <option name="test-command-line" key="kselftest_size_test_get_size" value="cd &ktest_dir;; ./kselftest_size_test_get_size" /> ++ <option name="test-command-line" key="kselftest_timers_adjtick" value="cd &ktest_dir;; ./kselftest_timers_adjtick" /> ++ <option name="test-command-line" key="kselftest_timers_alarmtimer_suspend" value="cd &ktest_dir;; ./kselftest_timers_alarmtimer_suspend" /> ++ <option name="test-command-line" key="kselftest_timers_change_skew" value="cd &ktest_dir;; ./kselftest_timers_change_skew" /> ++ <option name="test-command-line" key="kselftest_timers_clocksource_switch" value="cd &ktest_dir;; ./kselftest_timers_clocksource_switch" /> ++ <option name="test-command-line" key="kselftest_timers_freq_step" value="cd &ktest_dir;; ./kselftest_timers_freq_step" /> ++ <option name="test-command-line" key="kselftest_timers_inconsistency_check" value="cd &ktest_dir;; ./kselftest_timers_inconsistency_check" /> ++ <option name="test-command-line" key="kselftest_timers_leap_a_day" value="cd &ktest_dir;; ./kselftest_timers_leap_a_day" /> ++ <option name="test-command-line" key="kselftest_timers_leapcrash" value="cd &ktest_dir;; ./kselftest_timers_leapcrash" /> ++ <option name="test-command-line" key="kselftest_timers_nanosleep" value="cd &ktest_dir;; ./kselftest_timers_nanosleep" /> ++ <option name="test-command-line" key="kselftest_timers_nsleep_lat" value="cd &ktest_dir;; ./kselftest_timers_nsleep_lat" /> ++ <option name="test-command-line" key="kselftest_timers_posix_timers" value="cd &ktest_dir;; ./kselftest_timers_posix_timers" /> ++ <option name="test-command-line" key="kselftest_timers_set_2038" value="cd &ktest_dir;; ./kselftest_timers_set_2038" /> ++ <option name="test-command-line" key="kselftest_timers_set_tai" value="cd &ktest_dir;; ./kselftest_timers_set_tai" /> ++ <option name="test-command-line" key="kselftest_timers_set_timer_lat" value="cd &ktest_dir;; ./kselftest_timers_set_timer_lat" /> ++ <option name="test-command-line" key="kselftest_timers_set_tz" value="cd &ktest_dir;; ./kselftest_timers_set_tz" /> ++ <option name="test-command-line" key="kselftest_timers_skew_consistency" value="cd &ktest_dir;; ./kselftest_timers_skew_consistency" /> ++ <option name="test-command-line" key="kselftest_timers_tests_raw_skew" value="cd &ktest_dir;; ./kselftest_timers_tests_raw_skew" /> ++ <option name="test-command-line" key="kselftest_timers_threadtest" value="cd &ktest_dir;; ./kselftest_timers_threadtest" /> ++ <option name="test-command-line" key="kselftest_timers_valid_adjtimex" value="cd &ktest_dir;; ./kselftest_timers_valid_adjtimex" /> ++ <option name="test-command-line" key="kselftest_vdso_vdso_test_abi" value="cd &ktest_dir;; ./kselftest_vdso_vdso_test_abi" /> ++ <option name="test-command-line" key="kselftest_vdso_vdso_test_clock_getres" value="cd &ktest_dir;; ./kselftest_vdso_vdso_test_clock_getres" /> ++ <option name="test-command-line" key="kselftest_vdso_vdso_test_getcpu" value="cd &ktest_dir;; ./kselftest_vdso_vdso_test_getcpu" /> ++ <option name="test-command-line" key="kselftest_vdso_vdso_test_gettimeofday" value="cd &ktest_dir;; ./kselftest_vdso_vdso_test_gettimeofday" /> + </test> +</configuration> diff --git a/tools/testing/selftests/android/config_x86_64.xml b/tools/testing/selftests/android/config_x86_64.xml new file mode 100644 --- /dev/null +++ b/tools/testing/selftests/android/config_x86_64.xml -@@ -0,0 +1,55 @@ +@@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2023 The Android Open Source Project +SPDX-License-Identifier: GPL-2.0 OR Apache-2.0 +--> ++<!DOCTYPE configuration [ ++<!ENTITY ktest_dir "/data/selftests/x86_64"> ++]> +<configuration description="kselftest"> + <option name="test-suite-tag" value="kernel-test" /> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" /> @@ -234,45 +283,191 @@ new file mode 100644 + <option name="cleanup" value="true" /> + <option name="push-file" key="selftests" value="/data/selftests" /> + <option name="skip-abi-filtering" value="true" /> -+ <option name="post-push" value='chmod -R 755 /data/selftests; find /data/selftests; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' /> ++ <option name="post-push" value='chmod -R 755 /data/selftests; find /data/selftests -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' /> + </target_preparer> + + <test class="com.android.tradefed.testtype.binary.KernelTargetTest" > + <option name="exit-code-skip" value="4" /> + <option name="skip-binary-check" value="true" /> -+ <option name="test-command-line" key="kselftest_binderfs_binderfs_test" value="/data/selftests/x86_64/kselftest_binderfs_binderfs_test" /> -+ <option name="test-command-line" key="kselftest_breakpoints_breakpoint_test" value="/data/selftests/x86_64/kselftest_breakpoints_breakpoint_test" /> -+ <option name="test-command-line" key="kselftest_breakpoints_step_after_suspend_test" value="/data/selftests/x86_64/kselftest_breakpoints_step_after_suspend_test" /> -+ <option name="test-command-line" key="kselftest_futex_run" value="cd /data/selftests/x86_64/;USE_COLOR=0 ./kselftest_futex_run" /> -+ <option name="test-command-line" key="kselftest_kcmp_kcmp_test" value="/data/selftests/x86_64/kselftest_kcmp_kcmp_test" /> -+ <option name="test-command-line" key="kselftest_ptrace_peeksiginfo" value="/data/selftests/x86_64/kselftest_ptrace_peeksiginfo" /> -+ <option name="test-command-line" key="kselftest_rtc_rtctest" value="/data/selftests/x86_64/kselftest_rtc_rtctest" /> -+ <option name="test-command-line" key="kselftest_vdso_vdso_test_abi" value="/data/selftests/x86_64/kselftest_vdso_vdso_test_abi" /> -+ <option name="test-command-line" key="kselftest_vdso_vdso_test_clock_getres" value="/data/selftests/x86_64/kselftest_vdso_vdso_test_clock_getres" /> -+ <option name="test-command-line" key="kselftest_vdso_vdso_test_getcpu" value="/data/selftests/x86_64/kselftest_vdso_vdso_test_getcpu" /> -+ <option name="test-command-line" key="kselftest_vdso_vdso_test_gettimeofday" value="/data/selftests/x86_64/kselftest_vdso_vdso_test_gettimeofday" /> -+ <option name="test-command-line" key="kselftest_size_test_get_size" value="/data/selftests/x86_64/kselftest_size_test_get_size" /> -+ <option name="test-command-line" key="kselftest_mm_mremap_dontunmap" value="/data/selftests/x86_64/kselftest_mm_mremap_dontunmap" /> -+ <option name="test-command-line" key="kselftest_mm_mremap_test" value="/data/selftests/x86_64/kselftest_mm_mremap_test" /> -+ <option name="test-command-line" key="kselftest_mm_uffd_unit_tests" value="/data/selftests/x86_64/kselftest_mm_uffd_unit_tests" /> -+ <option name="test-command-line" key="kselftest_timers_adjtick" value="/data/selftests/x86_64/kselftest_timers_adjtick" /> -+ <option name="test-command-line" key="kselftest_timers_alarmtimer_suspend" value="/data/selftests/x86_64/kselftest_timers_alarmtimer_suspend" /> -+ <option name="test-command-line" key="kselftest_timers_change_skew" value="/data/selftests/x86_64/kselftest_timers_change_skew" /> -+ <option name="test-command-line" key="kselftest_timers_clocksource_switch" value="/data/selftests/x86_64/kselftest_timers_clocksource_switch" /> -+ <option name="test-command-line" key="kselftest_timers_freq_step" value="/data/selftests/x86_64/kselftest_timers_freq_step" /> -+ <option name="test-command-line" key="kselftest_timers_inconsistency_check" value="/data/selftests/x86_64/kselftest_timers_inconsistency_check" /> -+ <option name="test-command-line" key="kselftest_timers_leap_a_day" value="/data/selftests/x86_64/kselftest_timers_leap_a_day" /> -+ <option name="test-command-line" key="kselftest_timers_leapcrash" value="/data/selftests/x86_64/kselftest_timers_leapcrash" /> -+ <option name="test-command-line" key="kselftest_timers_nanosleep" value="/data/selftests/x86_64/kselftest_timers_nanosleep" /> -+ <option name="test-command-line" key="kselftest_timers_nsleep_lat" value="/data/selftests/x86_64/kselftest_timers_nsleep_lat" /> -+ <option name="test-command-line" key="kselftest_timers_posix_timers" value="/data/selftests/x86_64/kselftest_timers_posix_timers" /> -+ <option name="test-command-line" key="kselftest_timers_set_2038" value="/data/selftests/x86_64/kselftest_timers_set_2038" /> -+ <option name="test-command-line" key="kselftest_timers_set_tai" value="/data/selftests/x86_64/kselftest_timers_set_tai" /> -+ <option name="test-command-line" key="kselftest_timers_set_timer_lat" value="/data/selftests/x86_64/kselftest_timers_set_timer_lat" /> -+ <option name="test-command-line" key="kselftest_timers_set_tz" value="/data/selftests/x86_64/kselftest_timers_set_tz" /> -+ <option name="test-command-line" key="kselftest_timers_skew_consistency" value="/data/selftests/x86_64/kselftest_timers_skew_consistency" /> -+ <option name="test-command-line" key="kselftest_timers_tests_raw_skew" value="/data/selftests/x86_64/kselftest_timers_tests_raw_skew" /> -+ <option name="test-command-line" key="kselftest_timers_threadtest" value="/data/selftests/x86_64/kselftest_timers_threadtest" /> -+ <option name="test-command-line" key="kselftest_timers_valid_adjtimex" value="/data/selftests/x86_64/kselftest_timers_valid_adjtimex" /> ++ <option name="test-command-line" key="kselftest_binderfs_binderfs_test" value="cd &ktest_dir;; ./kselftest_binderfs_binderfs_test" /> ++ <option name="test-command-line" key="kselftest_breakpoints_breakpoint_test" value="cd &ktest_dir;; ./kselftest_breakpoints_breakpoint_test" /> ++ <option name="test-command-line" key="kselftest_futex_requeue" value="cd &ktest_dir;; ./futex_requeue" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi" value="cd &ktest_dir;; ./futex_requeue_pi" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_b" value="cd &ktest_dir;; ./futex_requeue_pi -b" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_bl" value="cd &ktest_dir;; ./futex_requeue_pi -b -l" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_bo" value="cd &ktest_dir;; ./futex_requeue_pi -b -o" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_l" value="cd &ktest_dir;; ./futex_requeue_pi -l" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_o" value="cd &ktest_dir;; ./futex_requeue_pi -o" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_5k" value="cd &ktest_dir;; ./futex_requeue_pi -t 5000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_b_5k" value="cd &ktest_dir;; ./futex_requeue_pi -b -t 5000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_bl_5k" value="cd &ktest_dir;; ./futex_requeue_pi -b -l -t 5000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_bo_5k" value="cd &ktest_dir;; ./futex_requeue_pi -b -o -t 5000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_l_5k" value="cd &ktest_dir;; ./futex_requeue_pi -l -t 5000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_o_5k" value="cd &ktest_dir;; ./futex_requeue_pi -o -t 5000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_500k" value="cd &ktest_dir;; ./futex_requeue_pi -t 500000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_b_500k" value="cd &ktest_dir;; ./futex_requeue_pi -b -t 500000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_bl_500k" value="cd &ktest_dir;; ./futex_requeue_pi -b -l -t 500000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_bo_500k" value="cd &ktest_dir;; ./futex_requeue_pi -b -o -t 500000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_l_500k" value="cd &ktest_dir;; ./futex_requeue_pi -l -t 500000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_o_500k" value="cd &ktest_dir;; ./futex_requeue_pi -o -t 500000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_bl_2G" value="cd &ktest_dir;; ./futex_requeue_pi -b -l -t 2000000000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_l_2G" value="cd &ktest_dir;; ./futex_requeue_pi -l -t 2000000000" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_mismatched_ops" value="cd &ktest_dir;; ./futex_requeue_pi_mismatched_ops" /> ++ <option name="test-command-line" key="kselftest_futex_requeue_pi_signal_restart" value="cd &ktest_dir;; ./futex_requeue_pi_signal_restart" /> ++ <option name="test-command-line" key="kselftest_futex_wait" value="cd &ktest_dir;; ./futex_wait" /> ++ <option name="test-command-line" key="kselftest_futex_wait_private_mapped_file" value="cd &ktest_dir;; ./futex_wait_private_mapped_file" /> ++ <option name="test-command-line" key="kselftest_futex_wait_timeout" value="cd &ktest_dir;; ./futex_wait_timeout" /> ++ <option name="test-command-line" key="kselftest_futex_wait_uninitialized_heap" value="cd &ktest_dir;; ./futex_wait_uninitialized_heap" /> ++ <option name="test-command-line" key="kselftest_futex_wait_wouldblock" value="cd &ktest_dir;; ./futex_wait_wouldblock" /> ++ <option name="test-command-line" key="kselftest_kcmp_kcmp_test" value="cd &ktest_dir;; ./kselftest_kcmp_kcmp_test" /> ++ <option name="test-command-line" key="kselftest_mm_mremap_dontunmap" value="cd &ktest_dir;; ./kselftest_mm_mremap_dontunmap" /> ++ <option name="test-command-line" key="kselftest_mm_mremap_test" value="cd &ktest_dir;; ./kselftest_mm_mremap_test" /> ++ <option name="test-command-line" key="kselftest_mm_uffd_unit_tests" value="cd &ktest_dir;; ./kselftest_mm_uffd_unit_tests" /> ++ <option name="test-command-line" key="kselftest_ptrace_peeksiginfo" value="cd &ktest_dir;; ./kselftest_ptrace_peeksiginfo" /> ++ <option name="test-command-line" key="kselftest_rtc_rtctest" value="cd &ktest_dir;; ./kselftest_rtc_rtctest" /> ++ <option name="test-command-line" key="kselftest_size_test_get_size" value="cd &ktest_dir;; ./kselftest_size_test_get_size" /> ++ <option name="test-command-line" key="kselftest_timers_adjtick" value="cd &ktest_dir;; ./kselftest_timers_adjtick" /> ++ <option name="test-command-line" key="kselftest_timers_alarmtimer_suspend" value="cd &ktest_dir;; ./kselftest_timers_alarmtimer_suspend" /> ++ <option name="test-command-line" key="kselftest_timers_change_skew" value="cd &ktest_dir;; ./kselftest_timers_change_skew" /> ++ <option name="test-command-line" key="kselftest_timers_clocksource_switch" value="cd &ktest_dir;; ./kselftest_timers_clocksource_switch" /> ++ <option name="test-command-line" key="kselftest_timers_freq_step" value="cd &ktest_dir;; ./kselftest_timers_freq_step" /> ++ <option name="test-command-line" key="kselftest_timers_inconsistency_check" value="cd &ktest_dir;; ./kselftest_timers_inconsistency_check" /> ++ <option name="test-command-line" key="kselftest_timers_leap_a_day" value="cd &ktest_dir;; ./kselftest_timers_leap_a_day" /> ++ <option name="test-command-line" key="kselftest_timers_leapcrash" value="cd &ktest_dir;; ./kselftest_timers_leapcrash" /> ++ <option name="test-command-line" key="kselftest_timers_nanosleep" value="cd &ktest_dir;; ./kselftest_timers_nanosleep" /> ++ <option name="test-command-line" key="kselftest_timers_nsleep_lat" value="cd &ktest_dir;; ./kselftest_timers_nsleep_lat" /> ++ <option name="test-command-line" key="kselftest_timers_posix_timers" value="cd &ktest_dir;; ./kselftest_timers_posix_timers" /> ++ <option name="test-command-line" key="kselftest_timers_set_2038" value="cd &ktest_dir;; ./kselftest_timers_set_2038" /> ++ <option name="test-command-line" key="kselftest_timers_set_tai" value="cd &ktest_dir;; ./kselftest_timers_set_tai" /> ++ <option name="test-command-line" key="kselftest_timers_set_timer_lat" value="cd &ktest_dir;; ./kselftest_timers_set_timer_lat" /> ++ <option name="test-command-line" key="kselftest_timers_set_tz" value="cd &ktest_dir;; ./kselftest_timers_set_tz" /> ++ <option name="test-command-line" key="kselftest_timers_skew_consistency" value="cd &ktest_dir;; ./kselftest_timers_skew_consistency" /> ++ <option name="test-command-line" key="kselftest_timers_tests_raw_skew" value="cd &ktest_dir;; ./kselftest_timers_tests_raw_skew" /> ++ <option name="test-command-line" key="kselftest_timers_threadtest" value="cd &ktest_dir;; ./kselftest_timers_threadtest" /> ++ <option name="test-command-line" key="kselftest_timers_valid_adjtimex" value="cd &ktest_dir;; ./kselftest_timers_valid_adjtimex" /> ++ <option name="test-command-line" key="kselftest_vdso_vdso_test_abi" value="cd &ktest_dir;; ./kselftest_vdso_vdso_test_abi" /> ++ <option name="test-command-line" key="kselftest_vdso_vdso_test_clock_getres" value="cd &ktest_dir;; ./kselftest_vdso_vdso_test_clock_getres" /> ++ <option name="test-command-line" key="kselftest_vdso_vdso_test_getcpu" value="cd &ktest_dir;; ./kselftest_vdso_vdso_test_getcpu" /> ++ <option name="test-command-line" key="kselftest_vdso_vdso_test_gettimeofday" value="cd &ktest_dir;; ./kselftest_vdso_vdso_test_gettimeofday" /> + </test> +</configuration> +diff --git a/tools/testing/selftests/filesystems/binderfs/binderfs_test.c b/tools/testing/selftests/filesystems/binderfs/binderfs_test.c +--- a/tools/testing/selftests/filesystems/binderfs/binderfs_test.c ++++ b/tools/testing/selftests/filesystems/binderfs/binderfs_test.c +@@ -291,6 +291,11 @@ static int write_id_mapping(enum idmap_type type, pid_t pid, const char *buf, + return 0; + } + ++static bool has_userns(void) ++{ ++ return (access("/proc/self/ns/user", F_OK) == 0); ++} ++ + static void change_userns(struct __test_metadata *_metadata, int syncfds[2]) + { + int ret; +@@ -378,6 +383,9 @@ static void *binder_version_thread(void *data) + */ + TEST(binderfs_stress) + { ++ if (!has_userns()) ++ SKIP(return, "%s: user namespace not supported\n", __func__); ++ + int fds[1000]; + int syncfds[2]; + pid_t pid; +@@ -502,6 +510,8 @@ TEST(binderfs_test_privileged) + + TEST(binderfs_test_unprivileged) + { ++ if (!has_userns()) ++ SKIP(return, "%s: user namespace not supported\n", __func__); + int ret; + int syncfds[2]; + pid_t pid; +diff --git a/tools/testing/selftests/futex/functional/futex_wait.c b/tools/testing/selftests/futex/functional/futex_wait.c +--- a/tools/testing/selftests/futex/functional/futex_wait.c ++++ b/tools/testing/selftests/futex/functional/futex_wait.c +@@ -96,6 +96,11 @@ int main(int argc, char *argv[]) + /* Testing an anon page shared memory */ + shm_id = shmget(IPC_PRIVATE, 4096, IPC_CREAT | 0666); + if (shm_id < 0) { ++ if (errno == ENOSYS) { ++ ksft_test_result_skip("shmget returned: %d %s\n", ++ errno, strerror(errno)); ++ goto skip_anon_page_shared_memory_test; ++ } + perror("shmget"); + exit(1); + } +@@ -121,6 +126,7 @@ int main(int argc, char *argv[]) + ksft_test_result_pass("futex_wake shared (page anon) succeeds\n"); + } + ++skip_anon_page_shared_memory_test: + + /* Testing a file backed shared memory */ + fd = open(SHM_PATH, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); +diff --git a/tools/testing/selftests/futex/functional/futex_wait_timeout.c b/tools/testing/selftests/futex/functional/futex_wait_timeout.c +--- a/tools/testing/selftests/futex/functional/futex_wait_timeout.c ++++ b/tools/testing/selftests/futex/functional/futex_wait_timeout.c +@@ -64,9 +64,14 @@ void *get_pi_lock(void *arg) + static void test_timeout(int res, int *ret, char *test_name, int err) + { + if (!res || errno != err) { +- ksft_test_result_fail("%s returned %d\n", test_name, +- res < 0 ? errno : res); +- *ret = RET_FAIL; ++ if (errno == ENOSYS) { ++ ksft_test_result_skip("%s returned %d\n", test_name, ++ errno); ++ } else { ++ ksft_test_result_fail("%s returned %d\n", test_name, ++ res < 0 ? errno : res); ++ *ret = RET_FAIL; ++ } + } else { + ksft_test_result_pass("%s succeeds\n", test_name); + } +diff --git a/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c b/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c +--- a/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c ++++ b/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c +@@ -98,10 +98,15 @@ int main(int argc, char *argv[]) + info("Calling futex_waitv on f1: %u @ %p with val=%u\n", f1, &f1, f1+1); + res = futex_waitv(&waitv, 1, 0, &to, CLOCK_MONOTONIC); + if (!res || errno != EWOULDBLOCK) { +- ksft_test_result_pass("futex_waitv returned: %d %s\n", +- res ? errno : res, +- res ? strerror(errno) : ""); +- ret = RET_FAIL; ++ if (errno == ENOSYS) { ++ ksft_test_result_skip("futex_waitv returned %d\n", ++ errno); ++ } else { ++ ksft_test_result_fail("futex_waitv returned: %d %s\n", ++ res ? errno : res, ++ res ? strerror(errno) : ""); ++ ret = RET_FAIL; ++ } + } else { + ksft_test_result_pass("futex_waitv\n"); + } +diff --git a/tools/testing/selftests/rtc/rtctest.c b/tools/testing/selftests/rtc/rtctest.c +--- a/tools/testing/selftests/rtc/rtctest.c ++++ b/tools/testing/selftests/rtc/rtctest.c +@@ -122,6 +122,7 @@ TEST_F_TIMEOUT(rtc, date_read_loop, READ_LOOP_DURATION_SEC + 2) { + TH_LOG("Performed %ld RTC time reads.", iter_count); + } + ++#ifndef __ANDROID__ // b/31578457 + TEST_F_TIMEOUT(rtc, uie_read, NUM_UIE + 2) { + int i, rc, irq = 0; + unsigned long data; +@@ -409,6 +410,7 @@ TEST_F_TIMEOUT(rtc, alarm_wkalm_set_minute, 65) { + new = timegm((struct tm *)&tm); + ASSERT_EQ(new, secs); + } ++#endif + + static void __attribute__((constructor)) + __constructor_order_last(void) diff --git a/android-mainline/NOUPSTREAM-ANDROID-Kleaf-Bazel-based-GKI-kernel-build.patch b/android-mainline/NOUPSTREAM-ANDROID-Kleaf-Bazel-based-GKI-kernel-build.patch index ee0a173c..cb05ea02 100644 --- a/android-mainline/NOUPSTREAM-ANDROID-Kleaf-Bazel-based-GKI-kernel-build.patch +++ b/android-mainline/NOUPSTREAM-ANDROID-Kleaf-Bazel-based-GKI-kernel-build.patch @@ -22,11 +22,11 @@ Change-Id: I2f06b2b79dbcbf197cb23d68b3c2f6786191e19d Signed-off-by: Matthias Maennich <maennich@google.com> Signed-off-by: Lee Jones <joneslee@google.com> --- - BUILD.bazel | 1947 +++++++++++++++++++++++++++++++++++++++++++++++++++ + BUILD.bazel | 1911 +++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 4 + abi.bzl | 136 ++++ modules.bzl | 132 ++++ - 4 files changed, 2219 insertions(+) + 4 files changed, 2183 insertions(+) create mode 100644 BUILD.bazel create mode 100644 abi.bzl create mode 100644 modules.bzl @@ -35,7 +35,7 @@ diff --git a/BUILD.bazel b/BUILD.bazel new file mode 100644 --- /dev/null +++ b/BUILD.bazel -@@ -0,0 +1,1947 @@ +@@ -0,0 +1,1911 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2021 The Android Open Source Project + @@ -55,7 +55,7 @@ new file mode 100644 + "kernel_modules_install", + "merged_kernel_uapi_headers", +) -+load(":abi.bzl", "cc_binary_with_abi", "sh_binary_with_abi") ++load(":abi.bzl", "cc_binary_with_abi") +load(":modules.bzl", "get_gki_modules_list") + +package( @@ -395,6 +395,7 @@ new file mode 100644 + "drivers/usb/host/ohci-hcd.ko", + "drivers/usb/host/ohci-pci.ko", + "drivers/usb/host/ohci-platform.ko", ++ "drivers/usb/typec/mux/nb7vpq904m.ko", + "drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm.ko", + "net/qrtr/qrtr.ko", + "net/qrtr/qrtr-mhi.ko", @@ -1020,15 +1021,6 @@ new file mode 100644 +) + +cc_binary_with_abi( -+ name = "kselftest_breakpoints_step_after_suspend_test", -+ srcs = ["tools/testing/selftests/breakpoints/step_after_suspend_test.c"], -+ path_prefix = _KSELFTEST_DIR, -+ target_compatible_with = ["@platforms//os:android"], -+ visibility = ["//visibility:private"], -+ deps = [":kselftest_headers_lib"], -+) -+ -+cc_binary_with_abi( + name = "kselftest_breakpoints_breakpoint_test", + srcs = select({ + ":x86_64": ["tools/testing/selftests/breakpoints/breakpoint_test.c"], @@ -1321,36 +1313,6 @@ new file mode 100644 +) + +cc_binary_with_abi( -+ name = "kselftest_futex_futex_waitv", -+ srcs = ["tools/testing/selftests/futex/functional/futex_waitv.c"], -+ out = "futex_waitv", -+ copts = [ -+ "-D_GNU_SOURCE", -+ "-pthread", -+ ], -+ includes = [ -+ "tools/testing/selftests", -+ "tools/testing/selftests/futex/include", -+ ], -+ path_prefix = _KSELFTEST_DIR, -+ target_compatible_with = ["@platforms//os:android"], -+ visibility = ["//visibility:private"], -+ deps = [ -+ ":kselftest_futex_headers_lib", -+ ":kselftest_headers_lib", -+ ], -+) -+ -+sh_binary_with_abi( -+ name = "kselftest_futex_run", -+ src = "tools/testing/selftests/futex/functional/run.sh", -+ out = "kselftest_futex_run", -+ path_prefix = _KSELFTEST_DIR, -+ target_compatible_with = ["@platforms//os:android"], -+ visibility = ["//visibility:private"], -+) -+ -+cc_binary_with_abi( + name = "kselftest_mm_compaction_test", + srcs = ["tools/testing/selftests/mm/compaction_test.c"], + includes = ["tools/testing/selftests"], @@ -1584,7 +1546,7 @@ new file mode 100644 + }), + includes = [ + "tools/testing/selftests", -+ "tools/testing/selftests/mm/", ++ "tools/testing/selftests/mm", + ], + linkopts = ["-nostartfiles"], + path_prefix = _KSELFTEST_DIR, @@ -1661,6 +1623,8 @@ new file mode 100644 +cc_binary_with_abi( + name = "kselftest_timers_inconsistency_check", + srcs = ["tools/testing/selftests/timers/inconsistency-check.c"], ++ # Called by set-2038, skew_consistency, change_skew, clocksource-switch ++ out = "inconsistency-check", + copts = [ + "-O3", + "-DKTEST", @@ -1700,6 +1664,8 @@ new file mode 100644 +cc_binary_with_abi( + name = "kselftest_timers_nanosleep", + srcs = ["tools/testing/selftests/timers/nanosleep.c"], ++ # Called by clocksource-switch, change_skew, set-2038 ++ out = "nanosleep", + copts = [ + "-O3", + "-DKTEST", @@ -1739,6 +1705,8 @@ new file mode 100644 +cc_binary_with_abi( + name = "kselftest_timers_tests_raw_skew", + srcs = ["tools/testing/selftests/timers/raw_skew.c"], ++ # Called by change_skew ++ out = "raw_skew", + copts = [ + "-O3", + "-DKTEST", @@ -1855,7 +1823,6 @@ new file mode 100644 + srcs = [ + ":kselftest_binderfs_binderfs_test_x86_64", + ":kselftest_breakpoints_breakpoint_test_x86_64", -+ ":kselftest_breakpoints_step_after_suspend_test_x86_64", + ":kselftest_futex_futex_requeue_pi_mismatched_ops_x86_64", + ":kselftest_futex_futex_requeue_pi_signal_restart_x86_64", + ":kselftest_futex_futex_requeue_pi_x86_64", @@ -1865,8 +1832,6 @@ new file mode 100644 + ":kselftest_futex_futex_wait_uninitialized_heap_x86_64", + ":kselftest_futex_futex_wait_wouldblock_x86_64", + ":kselftest_futex_futex_wait_x86_64", -+ ":kselftest_futex_futex_waitv_x86_64", -+ ":kselftest_futex_run_x86_64", + ":kselftest_gen_config", + ":kselftest_kcmp_kcmp_test_x86_64", + ":kselftest_mm_compaction_test_x86_64", @@ -1883,6 +1848,7 @@ new file mode 100644 + ":kselftest_mm_uffd_unit_tests_x86_64", + ":kselftest_ptrace_peeksiginfo_x86_64", + ":kselftest_rtc_rtctest_x86_64", ++ ":kselftest_size_test_get_size_x86_64", + ":kselftest_timers_adjtick_x86_64", + ":kselftest_timers_alarmtimer_suspend_x86_64", + ":kselftest_timers_change_skew_x86_64", @@ -1916,7 +1882,6 @@ new file mode 100644 + srcs = [ + ":kselftest_binderfs_binderfs_test_arm64", + ":kselftest_breakpoints_breakpoint_test_arm64", -+ ":kselftest_breakpoints_step_after_suspend_test_arm64", + ":kselftest_futex_futex_requeue_arm64", + ":kselftest_futex_futex_requeue_pi_arm64", + ":kselftest_futex_futex_requeue_pi_mismatched_ops_arm64", @@ -1926,8 +1891,6 @@ new file mode 100644 + ":kselftest_futex_futex_wait_timeout_arm64", + ":kselftest_futex_futex_wait_uninitialized_heap_arm64", + ":kselftest_futex_futex_wait_wouldblock_arm64", -+ ":kselftest_futex_futex_waitv_arm64", -+ ":kselftest_futex_run_arm64", + ":kselftest_gen_config", + ":kselftest_kcmp_kcmp_test_arm64", + ":kselftest_mm_compaction_test_arm64", @@ -1944,6 +1907,7 @@ new file mode 100644 + ":kselftest_mm_uffd_unit_tests_arm64", + ":kselftest_ptrace_peeksiginfo_arm64", + ":kselftest_rtc_rtctest_arm64", ++ ":kselftest_size_test_get_size_arm64", + ":kselftest_timers_adjtick_arm64", + ":kselftest_timers_alarmtimer_suspend_arm64", + ":kselftest_timers_change_skew_arm64", diff --git a/android-mainline/NOUPSTREAM-ANDROID-gki_defconfigs.patch b/android-mainline/NOUPSTREAM-ANDROID-gki_defconfigs.patch index 55f3c0a7..53d21a84 100644 --- a/android-mainline/NOUPSTREAM-ANDROID-gki_defconfigs.patch +++ b/android-mainline/NOUPSTREAM-ANDROID-gki_defconfigs.patch @@ -23,14 +23,14 @@ Signed-off-by: Lee Jones <joneslee@google.com> --- arch/arm64/configs/16k_gki.fragment | 3 + arch/arm64/configs/crashdump_defconfig | 81 +++ - arch/arm64/configs/db845c_gki.fragment | 13 +- + arch/arm64/configs/db845c_gki.fragment | 14 +- arch/arm64/configs/gki_defconfig | 709 ++++++++++++++++++++++++ arch/arm64/configs/microdroid_defconfig | 216 ++++++++ arch/riscv/configs/gki_defconfig | 651 ++++++++++++++++++++++ arch/x86/configs/crashdump_defconfig | 87 +++ arch/x86/configs/gki_defconfig | 657 ++++++++++++++++++++++ arch/x86/configs/microdroid_defconfig | 290 ++++++++++ - 9 files changed, 2704 insertions(+), 3 deletions(-) + 9 files changed, 2705 insertions(+), 3 deletions(-) create mode 100644 arch/arm64/configs/16k_gki.fragment create mode 100644 arch/arm64/configs/crashdump_defconfig create mode 100644 arch/arm64/configs/gki_defconfig @@ -179,12 +179,13 @@ diff --git a/arch/arm64/configs/db845c_gki.fragment b/arch/arm64/configs/db845c_ CONFIG_LEDS_QCOM_LPG=m CONFIG_SM_GPUCC_8250=m CONFIG_SM_DISPCC_8250=m -@@ -301,3 +302,9 @@ CONFIG_CLK_GFM_LPASS_SM8250=m +@@ -301,3 +302,10 @@ CONFIG_CLK_GFM_LPASS_SM8250=m CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=m CONFIG_INTERCONNECT_QCOM_SM8250=m CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_QCOM_CPR=m +CONFIG_QCOM_SPM=m ++CONFIG_TYPEC_MUX_NB7VPQ904M=m +# XXX SM8450 bits start here +CONFIG_PINCTRL_SM8450=m +CONFIG_SM_GCC_8450=m diff --git a/android-mainline/series b/android-mainline/series index 2023c22f..6060f64a 100644 --- a/android-mainline/series +++ b/android-mainline/series @@ -2,7 +2,7 @@ # android-mainline patches # # Applies onto upstream e9806ff8a0f9e Linux v6.6-10372-ge9806ff8a0f9e -# Matches android-mainline a09213bd847d4 ("Merge e9806ff8a0f9 ("Merge tag 'jfs-6.7' of https://github.com/kleikamp/linux-shaggy") into android-mainline") +# Matches android-mainline 3851c83bf23ba ("ANDROID: timers: Use original names for outputs of some timer binaries") # Status: Tested # Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch |