Merge "Update riscv64 prebuilts from a local AOSP build." into main
diff --git a/mainline/conscrypt/apex/com.android.conscrypt-riscv64.apex b/mainline/conscrypt/apex/com.android.conscrypt-riscv64.apex
index f9f75ec..4ed711e 100644
--- a/mainline/conscrypt/apex/com.android.conscrypt-riscv64.apex
+++ b/mainline/conscrypt/apex/com.android.conscrypt-riscv64.apex
Binary files differ
diff --git a/mainline/i18n/apex/com.android.i18n-riscv64.apex b/mainline/i18n/apex/com.android.i18n-riscv64.apex
index e5e21d6..1db3710 100644
--- a/mainline/i18n/apex/com.android.i18n-riscv64.apex
+++ b/mainline/i18n/apex/com.android.i18n-riscv64.apex
Binary files differ
diff --git a/mainline/i18n/sdk/android/riscv64/lib/libandroidicu.so b/mainline/i18n/sdk/android/riscv64/lib/libandroidicu.so
index 09e4770..30e1e04 100755
--- a/mainline/i18n/sdk/android/riscv64/lib/libandroidicu.so
+++ b/mainline/i18n/sdk/android/riscv64/lib/libandroidicu.so
Binary files differ
diff --git a/mainline/i18n/sdk/android/riscv64/lib/libicu.so b/mainline/i18n/sdk/android/riscv64/lib/libicu.so
index 7e16129..7ee62fb 100755
--- a/mainline/i18n/sdk/android/riscv64/lib/libicu.so
+++ b/mainline/i18n/sdk/android/riscv64/lib/libicu.so
Binary files differ
diff --git a/mainline/i18n/test-exports/android/riscv64/lib/libicu_jni.so b/mainline/i18n/test-exports/android/riscv64/lib/libicu_jni.so
index 1893f82..8d9c327 100755
--- a/mainline/i18n/test-exports/android/riscv64/lib/libicu_jni.so
+++ b/mainline/i18n/test-exports/android/riscv64/lib/libicu_jni.so
Binary files differ
diff --git a/mainline/i18n/test-exports/android/riscv64/lib/libicui18n.so b/mainline/i18n/test-exports/android/riscv64/lib/libicui18n.so
index 162ed1e..db4c65f 100755
--- a/mainline/i18n/test-exports/android/riscv64/lib/libicui18n.so
+++ b/mainline/i18n/test-exports/android/riscv64/lib/libicui18n.so
Binary files differ
diff --git a/mainline/i18n/test-exports/android/riscv64/lib/libicuuc.so b/mainline/i18n/test-exports/android/riscv64/lib/libicuuc.so
index f913b8a..190d2b4 100755
--- a/mainline/i18n/test-exports/android/riscv64/lib/libicuuc.so
+++ b/mainline/i18n/test-exports/android/riscv64/lib/libicuuc.so
Binary files differ
diff --git a/mainline/local_riscv64/prebuilts/module_sdk/StatsD/current/ArtThinBuild.bp b/mainline/local_riscv64/prebuilts/module_sdk/StatsD/current/ArtThinBuild.bp
new file mode 100644
index 0000000..4479525
--- /dev/null
+++ b/mainline/local_riscv64/prebuilts/module_sdk/StatsD/current/ArtThinBuild.bp
@@ -0,0 +1,187 @@
+// DO NOT COMMIT. Changes in this file are temporary and generated by art/tools/buildbot-build.sh. See b/286551985.
+
+package {
+ // A default list here prevents the license LSC from adding its own list which would
+ // be unnecessary as every module in the sdk already has its own licenses property.
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+apex_contributions_defaults {
+ name: "statsd-module-sdk.contributions",
+ contents: [
+ "prebuilt_framework-statsd",
+ "prebuilt_libstatspull",
+ "prebuilt_libstatssocket",
+ ],
+}
+
+prebuilt_bootclasspath_fragment {
+ name: "com.android.os.statsd-bootclasspath-fragment",
+ visibility: ["//visibility:public"],
+ apex_available: ["com.android.os.statsd"],
+ licenses: ["statsd-module-sdk_Android-Apache-2.0"],
+ contents: ["framework-statsd"],
+ fragments: [
+ {
+ apex: "com.android.art",
+ module: "art-bootclasspath-fragment",
+ },
+ ],
+ hidden_api: {
+ max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
+ annotation_flags: "hiddenapi/annotation-flags.csv",
+ metadata: "hiddenapi/metadata.csv",
+ index: "hiddenapi/index.csv",
+ signature_patterns: "hiddenapi/signature-patterns.csv",
+ filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
+ filtered_flags: "hiddenapi/filtered-flags.csv",
+ },
+}
+
+java_sdk_library_import {
+ name: "framework-statsd",
+ visibility: ["//visibility:public"],
+ apex_available: [
+ "com.android.os.statsd",
+ "test_com.android.os.statsd",
+ ],
+ licenses: ["statsd-module-sdk_Android-Apache-2.0"],
+ shared_library: false,
+ permitted_packages: [
+ "android.app",
+ "android.os",
+ "android.util",
+ "com.android.internal.statsd",
+ ],
+ public: {
+ jars: ["sdk_library/public/framework-statsd-stubs.jar"],
+ stub_srcs: ["sdk_library/public/framework-statsd.srcjar"],
+ current_api: "sdk_library/public/framework-statsd.txt",
+ removed_api: "sdk_library/public/framework-statsd-removed.txt",
+ annotations: "sdk_library/public/framework-statsd_annotations.zip",
+ sdk_version: "module_current",
+ },
+ system: {
+ jars: ["sdk_library/system/framework-statsd-stubs.jar"],
+ stub_srcs: ["sdk_library/system/framework-statsd.srcjar"],
+ current_api: "sdk_library/system/framework-statsd.txt",
+ removed_api: "sdk_library/system/framework-statsd-removed.txt",
+ annotations: "sdk_library/system/framework-statsd_annotations.zip",
+ sdk_version: "module_current",
+ },
+ module_lib: {
+ jars: ["sdk_library/module-lib/framework-statsd-stubs.jar"],
+ stub_srcs: ["sdk_library/module-lib/framework-statsd.srcjar"],
+ current_api: "sdk_library/module-lib/framework-statsd.txt",
+ removed_api: "sdk_library/module-lib/framework-statsd-removed.txt",
+ annotations: "sdk_library/module-lib/framework-statsd_annotations.zip",
+ sdk_version: "module_current",
+ },
+}
+
+java_import {
+ name: "service-statsd",
+ visibility: ["//visibility:public"],
+ apex_available: [
+ "com.android.os.statsd",
+ "test_com.android.os.statsd",
+ ],
+ licenses: ["statsd-module-sdk_Android-Apache-2.0"],
+ jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-statsd.jar"],
+ min_sdk_version: "30",
+}
+
+license {
+ name: "statsd-module-sdk_Android-Apache-2.0",
+ visibility: ["//visibility:private"],
+ license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+ license_text: ["licenses/build/soong/licenses/LICENSE"],
+}
+
+cc_prebuilt_library_shared {
+ name: "libstatspull",
+ visibility: ["//visibility:public"],
+ apex_available: [
+ "com.android.os.statsd",
+ "test_com.android.os.statsd",
+ ],
+ licenses: ["statsd-module-sdk_Android-Apache-2.0"],
+ stl: "none",
+ compile_multilib: "both",
+ export_include_dirs: ["include/packages/modules/StatsD/lib/libstatspull/include"],
+ stubs: {
+ versions: [
+ "30",
+ "current",
+ ],
+ symbol_file: "libstatspull.map.txt",
+ },
+ arch: {
+ arm64: {
+ srcs: ["arm64/lib/libstatspull.so"],
+ },
+ riscv64: {
+ srcs: ["riscv64/lib/libstatspull.so"],
+ },
+ x86_64: {
+ srcs: ["x86_64/lib/libstatspull.so"],
+ },
+ arm: {
+ srcs: ["arm/lib/libstatspull.so"],
+ },
+ x86: {
+ srcs: ["x86/lib/libstatspull.so"],
+ },
+ },
+ strip: {
+ none: true,
+ },
+}
+
+cc_prebuilt_library_shared {
+ name: "libstatssocket",
+ visibility: ["//visibility:public"],
+ apex_available: [
+ "com.android.os.statsd",
+ "test_com.android.os.statsd",
+ ],
+ licenses: ["statsd-module-sdk_Android-Apache-2.0"],
+ stl: "none",
+ compile_multilib: "both",
+ export_include_dirs: ["include/packages/modules/StatsD/lib/libstatssocket/include"],
+ stubs: {
+ versions: [
+ "30",
+ "current",
+ ],
+ symbol_file: "libstatssocket.map.txt",
+ },
+ arch: {
+ arm64: {
+ srcs: ["arm64/lib/libstatssocket.so"],
+ },
+ riscv64: {
+ srcs: ["riscv64/lib/libstatssocket.so"],
+ },
+ x86_64: {
+ srcs: ["x86_64/lib/libstatssocket.so"],
+ },
+ arm: {
+ srcs: ["arm/lib/libstatssocket.so"],
+ },
+ x86: {
+ srcs: ["x86/lib/libstatssocket.so"],
+ },
+ },
+ strip: {
+ none: true,
+ },
+}
+
+prebuilt_systemserverclasspath_fragment {
+ name: "com.android.os.statsd-systemserverclasspath-fragment",
+ visibility: ["//visibility:public"],
+ apex_available: ["com.android.os.statsd"],
+ licenses: ["statsd-module-sdk_Android-Apache-2.0"],
+ standalone_contents: ["service-statsd"],
+}
diff --git a/mainline/local_riscv64/prebuilts/module_sdk/StatsD/current/riscv64/lib/libstatspull.so b/mainline/local_riscv64/prebuilts/module_sdk/StatsD/current/riscv64/lib/libstatspull.so
index c6738a2..ff65c36 100755
--- a/mainline/local_riscv64/prebuilts/module_sdk/StatsD/current/riscv64/lib/libstatspull.so
+++ b/mainline/local_riscv64/prebuilts/module_sdk/StatsD/current/riscv64/lib/libstatspull.so
Binary files differ
diff --git a/mainline/local_riscv64/prebuilts/module_sdk/StatsD/current/riscv64/lib/libstatssocket.so b/mainline/local_riscv64/prebuilts/module_sdk/StatsD/current/riscv64/lib/libstatssocket.so
index eac3f6b..ee29edb 100755
--- a/mainline/local_riscv64/prebuilts/module_sdk/StatsD/current/riscv64/lib/libstatssocket.so
+++ b/mainline/local_riscv64/prebuilts/module_sdk/StatsD/current/riscv64/lib/libstatssocket.so
Binary files differ
diff --git a/mainline/local_riscv64/prebuilts/module_sdk/conscrypt/current/ArtThinBuild.bp b/mainline/local_riscv64/prebuilts/module_sdk/conscrypt/current/ArtThinBuild.bp
new file mode 100644
index 0000000..92a2bf3
--- /dev/null
+++ b/mainline/local_riscv64/prebuilts/module_sdk/conscrypt/current/ArtThinBuild.bp
@@ -0,0 +1,192 @@
+// DO NOT COMMIT. Changes in this file are temporary and generated by art/tools/buildbot-build.sh. See b/286551985.
+
+package {
+ // A default list here prevents the license LSC from adding its own list which would
+ // be unnecessary as every module in the sdk already has its own licenses property.
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+apex_contributions_defaults {
+ name: "conscrypt-module-sdk.contributions",
+ contents: [
+ "prebuilt_conscrypt.module.public.api",
+ "prebuilt_conscrypt.module.platform.api",
+ "prebuilt_conscrypt.module.intra.core.api",
+ "prebuilt_libconscrypt_jni",
+ ],
+}
+
+prebuilt_bootclasspath_fragment {
+ name: "com.android.conscrypt-bootclasspath-fragment",
+ visibility: ["//external/conscrypt:__subpackages__"],
+ apex_available: ["com.android.conscrypt"],
+ licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
+ contents: ["conscrypt"],
+ fragments: [
+ {
+ apex: "com.android.art",
+ module: "art-bootclasspath-fragment",
+ },
+ ],
+ api: {
+ stub_libs: ["conscrypt.module.public.api"],
+ },
+ core_platform_api: {
+ stub_libs: ["conscrypt.module.platform.api"],
+ },
+ hidden_api: {
+ max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
+ annotation_flags: "hiddenapi/annotation-flags.csv",
+ metadata: "hiddenapi/metadata.csv",
+ index: "hiddenapi/index.csv",
+ signature_patterns: "hiddenapi/signature-patterns.csv",
+ filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
+ filtered_flags: "hiddenapi/filtered-flags.csv",
+ },
+}
+
+java_import {
+ name: "conscrypt",
+ visibility: [
+ "//device:__subpackages__",
+ "//external/conscrypt:__subpackages__",
+ ],
+ apex_available: [
+ "com.android.conscrypt",
+ "test_com.android.conscrypt",
+ ],
+ licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
+ jars: ["java_boot_libs/snapshot/jars/are/invalid/conscrypt.jar"],
+ min_sdk_version: "30",
+ permitted_packages: [
+ "android.net.ssl",
+ "com.android.org.conscrypt",
+ ],
+}
+
+java_sdk_library_import {
+ name: "conscrypt.module.public.api",
+ visibility: [
+ "//build/soong/java/core-libraries",
+ "//external/conscrypt",
+ "//frameworks/base",
+ "//frameworks/base/api",
+ "//libcore",
+ "//packages/modules/IPsec",
+ "//packages/modules/common/sdk",
+ "//prebuilts:__subpackages__",
+ ],
+ apex_available: ["//apex_available:platform"],
+ licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
+ shared_library: false,
+ public: {
+ jars: ["sdk_library/public/conscrypt-stubs.jar"],
+ stub_srcs: ["sdk_library/public/conscrypt.srcjar"],
+ current_api: "sdk_library/public/conscrypt.txt",
+ removed_api: "sdk_library/public/conscrypt-removed.txt",
+ annotations: "sdk_library/public/conscrypt_annotations.zip",
+ sdk_version: "none",
+ },
+ system: {
+ jars: ["sdk_library/system/conscrypt-stubs.jar"],
+ stub_srcs: ["sdk_library/system/conscrypt.srcjar"],
+ current_api: "sdk_library/system/conscrypt.txt",
+ removed_api: "sdk_library/system/conscrypt-removed.txt",
+ annotations: "sdk_library/system/conscrypt_annotations.zip",
+ sdk_version: "none",
+ },
+ module_lib: {
+ jars: ["sdk_library/module-lib/conscrypt-stubs.jar"],
+ stub_srcs: ["sdk_library/module-lib/conscrypt.srcjar"],
+ current_api: "sdk_library/module-lib/conscrypt.txt",
+ removed_api: "sdk_library/module-lib/conscrypt-removed.txt",
+ annotations: "sdk_library/module-lib/conscrypt_annotations.zip",
+ sdk_version: "none",
+ },
+}
+
+java_sdk_library_import {
+ name: "conscrypt.module.platform.api",
+ visibility: [
+ "//build/soong/java/core-libraries",
+ "//external/conscrypt",
+ "//external/wycheproof",
+ "//libcore/mmodules/core_platform_api",
+ "//prebuilts:__subpackages__",
+ ],
+ apex_available: ["//apex_available:platform"],
+ licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
+ shared_library: false,
+ public: {
+ jars: ["sdk_library/public/conscrypt-coreplatform-stubs.jar"],
+ stub_srcs: ["sdk_library/public/conscrypt-coreplatform.srcjar"],
+ current_api: "sdk_library/public/conscrypt-coreplatform.txt",
+ removed_api: "sdk_library/public/conscrypt-coreplatform-removed.txt",
+ sdk_version: "none",
+ },
+}
+
+java_sdk_library_import {
+ name: "conscrypt.module.intra.core.api",
+ visibility: [
+ "//external/conscrypt",
+ "//external/okhttp",
+ "//libcore:__subpackages__",
+ "//prebuilts:__subpackages__",
+ ],
+ apex_available: ["//apex_available:platform"],
+ licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
+ shared_library: false,
+ public: {
+ jars: ["sdk_library/public/conscrypt.module.intra.core.api-stubs.jar"],
+ stub_srcs: ["sdk_library/public/conscrypt.module.intra.core.api.srcjar"],
+ current_api: "sdk_library/public/conscrypt.module.intra.core.api.txt",
+ removed_api: "sdk_library/public/conscrypt.module.intra.core.api-removed.txt",
+ sdk_version: "none",
+ },
+}
+
+license {
+ name: "conscrypt-module-sdk_external_conscrypt_license",
+ visibility: ["//visibility:private"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "legacy_unencumbered",
+ ],
+ license_text: [
+ "licenses/external/conscrypt/LICENSE",
+ "licenses/external/conscrypt/NOTICE",
+ "licenses/external/conscrypt/licenses/LICENSE.harmony.txt",
+ "licenses/external/conscrypt/licenses/LICENSE.netty.txt",
+ ],
+}
+
+cc_prebuilt_library_shared {
+ name: "libconscrypt_jni",
+ visibility: ["//external/conscrypt:__subpackages__"],
+ apex_available: ["//apex_available:platform"],
+ licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
+ stl: "c++_static",
+ compile_multilib: "both",
+ shared_libs: ["liblog"],
+ arch: {
+ arm64: {
+ srcs: ["arm64/lib/libconscrypt_jni.so"],
+ },
+ riscv64: {
+ srcs: ["riscv64/lib/libconscrypt_jni.so"],
+ },
+ x86_64: {
+ srcs: ["x86_64/lib/libconscrypt_jni.so"],
+ },
+ arm: {
+ srcs: ["arm/lib/libconscrypt_jni.so"],
+ },
+ x86: {
+ srcs: ["x86/lib/libconscrypt_jni.so"],
+ },
+ },
+ strip: {
+ none: true,
+ },
+}
diff --git a/mainline/local_riscv64/prebuilts/module_sdk/conscrypt/current/riscv64/lib/libconscrypt_jni.so b/mainline/local_riscv64/prebuilts/module_sdk/conscrypt/current/riscv64/lib/libconscrypt_jni.so
index 289ae23..3aa14ac 100755
--- a/mainline/local_riscv64/prebuilts/module_sdk/conscrypt/current/riscv64/lib/libconscrypt_jni.so
+++ b/mainline/local_riscv64/prebuilts/module_sdk/conscrypt/current/riscv64/lib/libconscrypt_jni.so
Binary files differ
diff --git a/mainline/local_riscv64/prebuilts/module_sdk/conscrypt/current/test-exports/ArtThinBuild.bp b/mainline/local_riscv64/prebuilts/module_sdk/conscrypt/current/test-exports/ArtThinBuild.bp
new file mode 100644
index 0000000..7501fca
--- /dev/null
+++ b/mainline/local_riscv64/prebuilts/module_sdk/conscrypt/current/test-exports/ArtThinBuild.bp
@@ -0,0 +1,121 @@
+// DO NOT COMMIT. Changes in this file are temporary and generated by art/tools/buildbot-build.sh. See b/286551985.
+
+package {
+ // A default list here prevents the license LSC from adding its own list which would
+ // be unnecessary as every module in the sdk already has its own licenses property.
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+apex_contributions_defaults {
+ name: "conscrypt-module-test-exports.contributions",
+ contents: [
+ "prebuilt_conscrypt-for-host",
+ "prebuilt_conscrypt-tests",
+ "prebuilt_libjavacrypto",
+ ],
+}
+
+java_import {
+ name: "conscrypt-for-host",
+ visibility: [
+ "//art/build",
+ "//external/conscrypt",
+ "//external/robolectric",
+ "//external/robolectric-shadows",
+ "//frameworks/layoutlib",
+ ],
+ apex_available: ["//apex_available:platform"],
+ licenses: ["conscrypt-module-test-exports_external_conscrypt_license"],
+ jars: ["java/conscrypt-for-host.jar"],
+}
+
+java_test_import {
+ name: "conscrypt-tests",
+ visibility: [
+ "//cts/tests/libcore/luni",
+ "//external/conscrypt",
+ "//external/conscrypt/apex/tests",
+ "//libcore",
+ ],
+ apex_available: ["//apex_available:platform"],
+ licenses: ["conscrypt-module-test-exports_external_conscrypt_license"],
+ jars: ["java/conscrypt-tests.jar"],
+ test_config: "java/conscrypt-tests-AndroidTest.xml",
+}
+
+license {
+ name: "conscrypt-module-test-exports_external_conscrypt_license",
+ visibility: ["//visibility:private"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "legacy_unencumbered",
+ ],
+ license_text: [
+ "licenses/external/conscrypt/LICENSE",
+ "licenses/external/conscrypt/NOTICE",
+ "licenses/external/conscrypt/licenses/LICENSE.harmony.txt",
+ "licenses/external/conscrypt/licenses/LICENSE.netty.txt",
+ ],
+}
+
+cc_prebuilt_library_shared {
+ name: "libjavacrypto",
+ visibility: ["//external/conscrypt:__subpackages__"],
+ apex_available: [
+ "com.android.conscrypt",
+ "test_com.android.conscrypt",
+ ],
+ licenses: ["conscrypt-module-test-exports_external_conscrypt_license"],
+ host_supported: true,
+ target: {
+ host: {
+ enabled: false,
+ },
+ android: {
+ compile_multilib: "both",
+ shared_libs: [
+ "liblog",
+ "libcrypto",
+ "libssl",
+ ],
+ },
+ android_arm64: {
+ srcs: ["android/arm64/lib/libjavacrypto.so"],
+ },
+ android_riscv64: {
+ srcs: ["android/riscv64/lib/libjavacrypto.so"],
+ },
+ android_x86_64: {
+ srcs: ["android/x86_64/lib/libjavacrypto.so"],
+ },
+ android_arm: {
+ srcs: ["android/arm/lib/libjavacrypto.so"],
+ },
+ android_x86: {
+ srcs: ["android/x86/lib/libjavacrypto.so"],
+ },
+ linux_bionic: {
+ compile_multilib: "64",
+ shared_libs: ["liblog"],
+ },
+ linux_bionic_x86_64: {
+ enabled: true,
+ srcs: ["linux_bionic/x86_64/lib/libjavacrypto.so"],
+ },
+ linux_glibc: {
+ compile_multilib: "both",
+ shared_libs: ["liblog"],
+ },
+ linux_glibc_x86_64: {
+ enabled: true,
+ srcs: ["linux_glibc/x86_64/lib/libjavacrypto.so"],
+ },
+ linux_glibc_x86: {
+ enabled: true,
+ srcs: ["linux_glibc/x86/lib/libjavacrypto.so"],
+ },
+ },
+ strip: {
+ none: true,
+ },
+}
diff --git a/mainline/local_riscv64/prebuilts/module_sdk/conscrypt/current/test-exports/android/riscv64/lib/libjavacrypto.so b/mainline/local_riscv64/prebuilts/module_sdk/conscrypt/current/test-exports/android/riscv64/lib/libjavacrypto.so
index 5cb5800..71f4c59 100755
--- a/mainline/local_riscv64/prebuilts/module_sdk/conscrypt/current/test-exports/android/riscv64/lib/libjavacrypto.so
+++ b/mainline/local_riscv64/prebuilts/module_sdk/conscrypt/current/test-exports/android/riscv64/lib/libjavacrypto.so
Binary files differ
diff --git a/mainline/platform/impl/riscv64/heapprofd_client_api.so b/mainline/platform/impl/riscv64/heapprofd_client_api.so
index 060d238..a4495f0 100644
--- a/mainline/platform/impl/riscv64/heapprofd_client_api.so
+++ b/mainline/platform/impl/riscv64/heapprofd_client_api.so
Binary files differ
diff --git a/mainline/platform/impl/riscv64/libandroid_runtime_lazy.so b/mainline/platform/impl/riscv64/libandroid_runtime_lazy.so
index 1301c0a..20fe3fd 100644
--- a/mainline/platform/impl/riscv64/libandroid_runtime_lazy.so
+++ b/mainline/platform/impl/riscv64/libandroid_runtime_lazy.so
Binary files differ
diff --git a/mainline/platform/impl/riscv64/libapexsupport.so b/mainline/platform/impl/riscv64/libapexsupport.so
new file mode 100644
index 0000000..cca27d0
--- /dev/null
+++ b/mainline/platform/impl/riscv64/libapexsupport.so
Binary files differ
diff --git a/mainline/platform/impl/riscv64/libartpalette-system.so b/mainline/platform/impl/riscv64/libartpalette-system.so
index d681849..d9f0465 100644
--- a/mainline/platform/impl/riscv64/libartpalette-system.so
+++ b/mainline/platform/impl/riscv64/libartpalette-system.so
Binary files differ
diff --git a/mainline/platform/impl/riscv64/libbase.so b/mainline/platform/impl/riscv64/libbase.so
index 492e94e..802f245 100644
--- a/mainline/platform/impl/riscv64/libbase.so
+++ b/mainline/platform/impl/riscv64/libbase.so
Binary files differ
diff --git a/mainline/platform/impl/riscv64/libbinder.so b/mainline/platform/impl/riscv64/libbinder.so
index eed6446..ba3a593 100644
--- a/mainline/platform/impl/riscv64/libbinder.so
+++ b/mainline/platform/impl/riscv64/libbinder.so
Binary files differ
diff --git a/mainline/platform/impl/riscv64/libbinder_ndk.so b/mainline/platform/impl/riscv64/libbinder_ndk.so
index 8806e9b..a10be75 100644
--- a/mainline/platform/impl/riscv64/libbinder_ndk.so
+++ b/mainline/platform/impl/riscv64/libbinder_ndk.so
Binary files differ
diff --git a/mainline/platform/impl/riscv64/libcutils.so b/mainline/platform/impl/riscv64/libcutils.so
index 81e0a86..aef604b 100644
--- a/mainline/platform/impl/riscv64/libcutils.so
+++ b/mainline/platform/impl/riscv64/libcutils.so
Binary files differ
diff --git a/mainline/platform/impl/riscv64/libdebugstore_cxx.so b/mainline/platform/impl/riscv64/libdebugstore_cxx.so
new file mode 100644
index 0000000..2b2c34f
--- /dev/null
+++ b/mainline/platform/impl/riscv64/libdebugstore_cxx.so
Binary files differ
diff --git a/mainline/platform/impl/riscv64/liblog.so b/mainline/platform/impl/riscv64/liblog.so
index f01bd5d..5caf9e6 100644
--- a/mainline/platform/impl/riscv64/liblog.so
+++ b/mainline/platform/impl/riscv64/liblog.so
Binary files differ
diff --git a/mainline/platform/impl/riscv64/libutils.so b/mainline/platform/impl/riscv64/libutils.so
index aca7904..9353160 100644
--- a/mainline/platform/impl/riscv64/libutils.so
+++ b/mainline/platform/impl/riscv64/libutils.so
Binary files differ
diff --git a/mainline/platform/impl/riscv64/libvndksupport.so b/mainline/platform/impl/riscv64/libvndksupport.so
index 0b665a6..ff15452 100644
--- a/mainline/platform/impl/riscv64/libvndksupport.so
+++ b/mainline/platform/impl/riscv64/libvndksupport.so
Binary files differ
diff --git a/mainline/platform/sdk/android/riscv64/lib/libartpalette-system.so b/mainline/platform/sdk/android/riscv64/lib/libartpalette-system.so
index 5759082..329656e 100755
--- a/mainline/platform/sdk/android/riscv64/lib/libartpalette-system.so
+++ b/mainline/platform/sdk/android/riscv64/lib/libartpalette-system.so
Binary files differ
diff --git a/mainline/platform/sdk/android/riscv64/lib/libcap.a b/mainline/platform/sdk/android/riscv64/lib/libcap.a
index c6e96ce..7232222 100644
--- a/mainline/platform/sdk/android/riscv64/lib/libcap.a
+++ b/mainline/platform/sdk/android/riscv64/lib/libcap.a
Binary files differ
diff --git a/mainline/platform/sdk/android/riscv64/lib/liblog.so b/mainline/platform/sdk/android/riscv64/lib/liblog.so
index e3f82c4..5535903 100755
--- a/mainline/platform/sdk/android/riscv64/lib/liblog.so
+++ b/mainline/platform/sdk/android/riscv64/lib/liblog.so
Binary files differ
diff --git a/mainline/platform/sdk/riscv64/lib/heapprofd_client_api.so b/mainline/platform/sdk/riscv64/lib/heapprofd_client_api.so
index 12a5607..66c72b8 100755
--- a/mainline/platform/sdk/riscv64/lib/heapprofd_client_api.so
+++ b/mainline/platform/sdk/riscv64/lib/heapprofd_client_api.so
Binary files differ
diff --git a/mainline/platform/sdk/riscv64/lib/libbinder_ndk.so b/mainline/platform/sdk/riscv64/lib/libbinder_ndk.so
index a08c91e..072377c 100755
--- a/mainline/platform/sdk/riscv64/lib/libbinder_ndk.so
+++ b/mainline/platform/sdk/riscv64/lib/libbinder_ndk.so
Binary files differ
diff --git a/mainline/platform/sdk/riscv64/lib/libperfetto_client_experimental.a b/mainline/platform/sdk/riscv64/lib/libperfetto_client_experimental.a
index bea2795..9e056ff 100644
--- a/mainline/platform/sdk/riscv64/lib/libperfetto_client_experimental.a
+++ b/mainline/platform/sdk/riscv64/lib/libperfetto_client_experimental.a
Binary files differ
diff --git a/mainline/platform/sdk/riscv64/lib/perfetto_trace_protos.a b/mainline/platform/sdk/riscv64/lib/perfetto_trace_protos.a
index fa157fe..2c95dc2 100644
--- a/mainline/platform/sdk/riscv64/lib/perfetto_trace_protos.a
+++ b/mainline/platform/sdk/riscv64/lib/perfetto_trace_protos.a
Binary files differ
diff --git a/mainline/platform/test-exports/riscv64/lib/libtombstoned_client.so b/mainline/platform/test-exports/riscv64/lib/libtombstoned_client.so
index d0369cd..e7bd3da 100755
--- a/mainline/platform/test-exports/riscv64/lib/libtombstoned_client.so
+++ b/mainline/platform/test-exports/riscv64/lib/libtombstoned_client.so
Binary files differ
diff --git a/mainline/runtime/apex/com.android.runtime-riscv64.apex b/mainline/runtime/apex/com.android.runtime-riscv64.apex
index b5da595..c7d53ea 100644
--- a/mainline/runtime/apex/com.android.runtime-riscv64.apex
+++ b/mainline/runtime/apex/com.android.runtime-riscv64.apex
Binary files differ
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/api-level.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/api-level.h
index 77ec653..1bde3a5 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/api-level.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/api-level.h
@@ -168,7 +168,10 @@
*/
#define __ANDROID_API_U__ 34
-/** Names the "V" API level (35), for comparison against `__ANDROID_API__`. */
+/**
+ * Names the Android 15 (aka "V" or "VanillaIceCream") API level (35),
+ * for comparison against `__ANDROID_API__`.
+ */
#define __ANDROID_API_V__ 35
/* This file is included in <features.h>, and might be used from .S files. */
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/crash_detail.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/crash_detail.h
new file mode 100644
index 0000000..946a3ab
--- /dev/null
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/crash_detail.h
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#pragma once
+
+/**
+ * @file android/crash_detail.h
+ * @brief Attach extra information to android crashes.
+ */
+
+#include <stddef.h>
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+
+typedef struct crash_detail_t crash_detail_t;
+
+/**
+ * Register a new buffer to get logged into tombstones for crashes.
+ *
+ * It will be added to both the tombstone proto in the crash_detail field, and
+ * in the tombstone text format.
+ *
+ * Tombstone proto definition:
+ * https://cs.android.com/android/platform/superproject/main/+/main:system/core/debuggerd/proto/tombstone.proto
+ *
+ * An app can get hold of these for any `REASON_CRASH_NATIVE` instance of
+ * `android.app.ApplicationExitInfo`.
+ *
+ * https://developer.android.com/reference/android/app/ApplicationExitInfo#getTraceInputStream()
+
+ * The lifetime of name and data has to be valid until the program crashes, or until
+ * android_crash_detail_unregister is called.
+ *
+ * Example usage:
+ * const char* stageName = "garbage_collection";
+ * crash_detail_t* cd = android_crash_detail_register("stage", stageName, strlen(stageName));
+ * do_garbage_collection();
+ * android_crash_detail_unregister(cd);
+ *
+ * If this example crashes in do_garbage_collection, a line will show up in the textual representation of the tombstone:
+ * Extra crash detail: stage: 'garbage_collection'
+ *
+ * Introduced in API 35.
+ *
+ * \param name identifying name for this extra data.
+ * this should generally be a human-readable UTF-8 string, but we are treating
+ * it as arbitrary bytes because it could be corrupted by the crash.
+ * \param name_size number of bytes of the buffer pointed to by name
+ * \param data a buffer containing the extra detail bytes, if null the crash detail
+ * is disabled until android_crash_detail_replace_data replaces it with
+ * a non-null pointer.
+ * \param data_size number of bytes of the buffer pointed to by data
+ *
+ * \return a handle to the extra crash detail.
+ */
+crash_detail_t* _Nullable android_crash_detail_register(
+ const void* _Nonnull name, size_t name_size, const void* _Nullable data, size_t data_size) __INTRODUCED_IN(35);
+
+/**
+ * Unregister crash detail from being logged into tombstones.
+ *
+ * After this function returns, the lifetime of the objects crash_detail was
+ * constructed from no longer needs to be valid.
+ *
+ * Introduced in API 35.
+ *
+ * \param crash_detail the crash_detail that should be removed.
+ */
+void android_crash_detail_unregister(crash_detail_t* _Nonnull crash_detail) __INTRODUCED_IN(35);
+
+/**
+ * Replace data of crash detail.
+ *
+ * This is more efficient than using android_crash_detail_unregister followed by
+ * android_crash_detail_register. If you very frequently need to swap out the data,
+ * you can hold onto the crash_detail.
+ *
+ * Introduced in API 35.
+ *
+ * \param data the new buffer containing the extra detail bytes, or null to disable until
+ * android_crash_detail_replace_data is called again with non-null data.
+ * \param data_size the number of bytes of the buffer pointed to by data.
+ */
+void android_crash_detail_replace_data(crash_detail_t* _Nonnull crash_detail, const void* _Nullable data, size_t data_size) __INTRODUCED_IN(35);
+
+/**
+ * Replace name of crash detail.
+ *
+ * This is more efficient than using android_crash_detail_unregister followed by
+ * android_crash_detail_register. If you very frequently need to swap out the name,
+ * you can hold onto the crash_detail.
+ *
+ * Introduced in API 35.
+ *
+ * \param name identifying name for this extra data.
+ * \param name_size number of bytes of the buffer pointed to by name
+ */
+void android_crash_detail_replace_name(crash_detail_t* _Nonnull crash_detail, const void* _Nonnull name, size_t name_size) __INTRODUCED_IN(35);
+
+__END_DECLS
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/dlext.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/dlext.h
index a5061c7..b42e5b2 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/dlext.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/dlext.h
@@ -14,8 +14,7 @@
* limitations under the License.
*/
-#ifndef __ANDROID_DLEXT_H__
-#define __ANDROID_DLEXT_H__
+#pragma once
#include <stdbool.h>
#include <stddef.h>
@@ -101,7 +100,7 @@
ANDROID_DLEXT_FORCE_LOAD = 0x40,
// Historically we had two other options for ART.
- // They were last available in Android P.
+ // They were last available in API level 28.
// Reuse these bits last!
// ANDROID_DLEXT_FORCE_FIXED_VADDR = 0x80
// ANDROID_DLEXT_LOAD_AT_FIXED_ADDRESS = 0x100
@@ -115,7 +114,7 @@
ANDROID_DLEXT_USE_NAMESPACE = 0x200,
/**
- * Instructs dlopen to apply `ANDROID_DLEXT_RESERVED_ADDRESS`,
+ * Instructs dlopen() to apply `ANDROID_DLEXT_RESERVED_ADDRESS`,
* `ANDROID_DLEXT_RESERVED_ADDRESS_HINT`, `ANDROID_DLEXT_WRITE_RELRO` and
* `ANDROID_DLEXT_USE_RELRO` to any libraries loaded as dependencies of the
* main library as well.
@@ -151,7 +150,7 @@
struct android_namespace_t;
-/** Used to pass Android-specific arguments to `android_dlopen_ext`. */
+/** Used to pass Android-specific arguments to android_dlopen_ext(). */
typedef struct {
/** A bitmask of `ANDROID_DLEXT_` enum values. */
uint64_t flags;
@@ -183,5 +182,3 @@
__END_DECLS
/** @} */
-
-#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/fdsan.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/fdsan.h
index 3de0649..4540498 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/fdsan.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/fdsan.h
@@ -126,6 +126,9 @@
/* native_handle_t */
ANDROID_FDSAN_OWNER_TYPE_NATIVE_HANDLE = 13,
+
+ /* android::Parcel */
+ ANDROID_FDSAN_OWNER_TYPE_PARCEL = 14,
};
/*
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/set_abort_message.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/set_abort_message.h
index 35867ac..a778057 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/set_abort_message.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/set_abort_message.h
@@ -33,16 +33,40 @@
* @brief The android_set_abort_message() function.
*/
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
#include <sys/cdefs.h>
__BEGIN_DECLS
+typedef struct crash_detail_t crash_detail_t;
+
/**
- * android_set_abort_message() sets the abort message that will be shown
- * by [debuggerd](https://source.android.com/devices/tech/debug/native-crash).
+ * android_set_abort_message() sets the abort message passed to
+ * [debuggerd](https://source.android.com/devices/tech/debug/native-crash)
+ * for inclusion in any crash.
+ *
* This is meant for use by libraries that deliberately abort so that they can
* provide an explanation. It is used within bionic to implement assert() and
- * all FORTIFY/fdsan aborts.
+ * all FORTIFY and fdsan failures.
+ *
+ * The message appears directly in logcat at the time of crash. It will
+ * also be added to both the tombstone proto in the crash_detail field, and
+ * in the tombstone text format.
+ *
+ * Tombstone proto definition:
+ * https://cs.android.com/android/platform/superproject/main/+/main:system/core/debuggerd/proto/tombstone.proto
+ *
+ * An app can get hold of these for any `REASON_CRASH_NATIVE` instance of
+ * `android.app.ApplicationExitInfo`.
+ * https://developer.android.com/reference/android/app/ApplicationExitInfo#getTraceInputStream()
+ *
+ * The given message is copied at the time this function is called, and does
+ * not need to be valid until the crash actually happens, but typically this
+ * function is called immediately before aborting. See <android/crash_detail.h>
+ * for API more suited to the use case where the caller doesn't _expect_ a
+ * crash but would like to see the information _if_ a crash happens.
*/
void android_set_abort_message(const char* _Nullable __msg);
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/versioning.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/versioning.h
index 08fe45d..6bab291 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/versioning.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/android/versioning.h
@@ -20,15 +20,15 @@
// we should only annotate headers when we are running versioner.
#if defined(__BIONIC_VERSIONER)
-#define __INTRODUCED_IN(api_level) __attribute__((annotate("introduced_in=" #api_level)))
-#define __INTRODUCED_IN_NO_GUARD_FOR_NDK(api_level) __attribute__((annotate("introduced_in=" #api_level))) __VERSIONER_NO_GUARD
-#define __DEPRECATED_IN(api_level) __attribute__((annotate("deprecated_in=" #api_level)))
-#define __REMOVED_IN(api_level) __attribute__((annotate("obsoleted_in=" #api_level)))
-#define __INTRODUCED_IN_32(api_level) __attribute__((annotate("introduced_in_32=" #api_level)))
-#define __INTRODUCED_IN_64(api_level) __attribute__((annotate("introduced_in_64=" #api_level)))
+#define __INTRODUCED_IN(api_level) __attribute__((__annotate__("introduced_in=" #api_level)))
+#define __INTRODUCED_IN_NO_GUARD_FOR_NDK(api_level) __attribute__((__annotate__("introduced_in=" #api_level))) __VERSIONER_NO_GUARD
+#define __DEPRECATED_IN(api_level, msg) __attribute__((__annotate__("deprecated_in=" #api_level)))
+#define __REMOVED_IN(api_level, msg) __attribute__((__annotate__("obsoleted_in=" #api_level)))
+#define __INTRODUCED_IN_32(api_level) __attribute__((__annotate__("introduced_in_32=" #api_level)))
+#define __INTRODUCED_IN_64(api_level) __attribute__((__annotate__("introduced_in_64=" #api_level)))
-#define __VERSIONER_NO_GUARD __attribute__((annotate("versioner_no_guard")))
-#define __VERSIONER_FORTIFY_INLINE __attribute__((annotate("versioner_fortify_inline")))
+#define __VERSIONER_NO_GUARD __attribute__((__annotate__("versioner_no_guard")))
+#define __VERSIONER_FORTIFY_INLINE __attribute__((__annotate__("versioner_fortify_inline")))
#else
@@ -47,16 +47,16 @@
// libc++ doesn't currently guard these calls. There's no risk to the apps though because using
// those APIs will still cause a link error.
#if defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__)
-#define __BIONIC_AVAILABILITY(__what) __attribute__((__availability__(android,__what)))
+#define __BIONIC_AVAILABILITY(__what, ...) __attribute__((__availability__(android,__what __VA_OPT__(,) __VA_ARGS__)))
#define __INTRODUCED_IN_NO_GUARD_FOR_NDK(api_level) __INTRODUCED_IN(api_level)
#else
-#define __BIONIC_AVAILABILITY(__what) __attribute__((__availability__(android,strict,__what)))
+#define __BIONIC_AVAILABILITY(__what, ...) __attribute__((__availability__(android,strict,__what __VA_OPT__(,) __VA_ARGS__)))
#define __INTRODUCED_IN_NO_GUARD_FOR_NDK(api_level)
#endif
#define __INTRODUCED_IN(api_level) __BIONIC_AVAILABILITY(introduced=api_level)
-#define __DEPRECATED_IN(api_level) __BIONIC_AVAILABILITY(deprecated=api_level)
-#define __REMOVED_IN(api_level) __BIONIC_AVAILABILITY(obsoleted=api_level)
+#define __DEPRECATED_IN(api_level, msg) __BIONIC_AVAILABILITY(deprecated=api_level, message=msg)
+#define __REMOVED_IN(api_level, msg) __BIONIC_AVAILABILITY(obsoleted=api_level, message=msg)
// The same availability attribute can't be annotated multiple times. Therefore, the macros are
// defined for the configuration that it is valid for so that declarations like the below doesn't
@@ -76,3 +76,9 @@
#define __VERSIONER_FORTIFY_INLINE
#endif // defined(__BIONIC_VERSIONER)
+
+// Vendor modules do not follow SDK versioning. Ignore NDK guards for vendor modules.
+#if defined(__ANDROID_VENDOR__)
+#undef __BIONIC_AVAILABILITY
+#define __BIONIC_AVAILABILITY(api_level, ...)
+#endif // defined(__ANDROID_VENDOR__)
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/elf_common.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/elf_common.h
index 0856f45..13d4fbf 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/elf_common.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/elf_common.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017, 2018 Dell EMC
* Copyright (c) 2000, 2001, 2008, 2011, David E. O'Brien
@@ -26,8 +26,6 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD$
*/
#ifndef _SYS_ELF_COMMON_H_
@@ -38,6 +36,26 @@
*/
/*
+ * Note header. The ".note" section contains an array of notes. Each
+ * begins with this header, aligned to a word boundary. Immediately
+ * following the note header is n_namesz bytes of name, padded to the
+ * next word boundary. Then comes n_descsz bytes of descriptor, again
+ * padded to a word boundary. The values of n_namesz and n_descsz do
+ * not include the padding.
+ */
+
+#if 0 // android-added
+#if !defined(LOCORE) && !defined(__ASSEMBLER__)
+typedef struct {
+ u_int32_t n_namesz; /* Length of name. */
+ u_int32_t n_descsz; /* Length of descriptor. */
+ u_int32_t n_type; /* Type of this note. */
+} Elf_Note;
+typedef Elf_Note Elf_Nhdr;
+#endif
+#endif // android-added
+
+/*
* Option kinds.
*/
#define ODK_NULL 0 /* undefined */
@@ -92,6 +110,21 @@
#define OGP_GROUP 0x0000ffff /* GP group number */
#define OGP_SELF 0x00010000 /* GP group is self-contained */
+/*
+ * The header for GNU-style hash sections.
+ */
+
+#if 0 // android-added
+#if !defined(LOCORE) && !defined(__ASSEMBLER__)
+typedef struct {
+ u_int32_t gh_nbuckets; /* Number of hash buckets. */
+ u_int32_t gh_symndx; /* First visible symbol in .dynsym. */
+ u_int32_t gh_maskwords; /* #maskwords used in bloom filter. */
+ u_int32_t gh_shift2; /* Bloom filter shift count. */
+} Elf_GNU_Hash_Header;
+#endif
+#endif
+
/* Indexes into the e_ident array. Keep synced with
http://www.sco.com/developers/gabi/latest/ch4.eheader.html */
#define EI_MAG0 0 /* Magic number, byte 0. */
@@ -153,7 +186,9 @@
#define ELFOSABI_ARM 97 /* ARM */
#define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */
+#define ELFOSABI_SYSV ELFOSABI_NONE /* symbol used in old spec */
#define ELFOSABI_MONTEREY ELFOSABI_AIX /* Monterey */
+#define ELFOSABI_GNU ELFOSABI_LINUX
/* e_ident */
#define IS_ELF(ehdr) ((ehdr).e_ident[EI_MAG0] == ELFMAG0 && \
@@ -299,6 +334,7 @@
#define EF_ARM_EABI_VER3 0x03000000
#define EF_ARM_EABI_VER4 0x04000000
#define EF_ARM_EABI_VER5 0x05000000
+#define EF_ARM_EABI_VERSION(x) ((x) & EF_ARM_EABIMASK)
#define EF_ARM_INTERWORK 0x00000004
#define EF_ARM_APCS_26 0x00000008
#define EF_ARM_APCS_FLOAT 0x00000010
@@ -418,12 +454,12 @@
#define SHT_HIOS 0x6fffffff /* Last of OS specific semantics */
#define SHT_LOPROC 0x70000000 /* reserved range for processor */
#define SHT_X86_64_UNWIND 0x70000001 /* unwind information */
-#define SHT_AMD64_UNWIND SHT_X86_64_UNWIND
+#define SHT_AMD64_UNWIND SHT_X86_64_UNWIND
#define SHT_ARM_EXIDX 0x70000001 /* Exception index table. */
-#define SHT_ARM_PREEMPTMAP 0x70000002 /* BPABI DLL dynamic linking
+#define SHT_ARM_PREEMPTMAP 0x70000002 /* BPABI DLL dynamic linking
pre-emption map. */
-#define SHT_ARM_ATTRIBUTES 0x70000003 /* Object file compatibility
+#define SHT_ARM_ATTRIBUTES 0x70000003 /* Object file compatibility
attributes. */
#define SHT_ARM_DEBUGOVERLAY 0x70000004 /* See DBGOVL for details. */
#define SHT_ARM_OVERLAYSECTION 0x70000005 /* See DBGOVL for details. */
@@ -499,6 +535,9 @@
#define PT_TLS 7 /* Thread local storage segment */
#define PT_LOOS 0x60000000 /* First OS-specific. */
#define PT_SUNW_UNWIND 0x6464e550 /* amd64 UNWIND program header */
+// android-removed: #define PT_GNU_EH_FRAME 0x6474e550
+// android-removed: #define PT_GNU_STACK 0x6474e551
+// android-removed: #define PT_GNU_RELRO 0x6474e552
#define PT_DUMP_DELTA 0x6fb5d000 /* va->pa map for kernel dumps
(currently arm). */
#define PT_LOSUNW 0x6ffffffa
@@ -648,11 +687,6 @@
#define DT_AARCH64_BTI_PLT 0x70000001
#define DT_AARCH64_PAC_PLT 0x70000003
#define DT_AARCH64_VARIANT_PCS 0x70000005
-#define DT_AARCH64_MEMTAG_MODE 0x70000009
-#define DT_AARCH64_MEMTAG_HEAP 0x7000000b
-#define DT_AARCH64_MEMTAG_STACK 0x7000000c
-#define DT_AARCH64_MEMTAG_GLOBALS 0x7000000d
-#define DT_AARCH64_MEMTAG_GLOBALSSZ 0x7000000f
#define DT_ARM_SYMTABSZ 0x70000001
#define DT_ARM_PREEMPTMAP 0x70000002
@@ -810,6 +844,7 @@
#define GNU_PROPERTY_AARCH64_FEATURE_1_AND 0xc0000000
+// android-removed: #define GNU_PROPERTY_AARCH64_FEATURE_1_BTI 0x00000001
#define GNU_PROPERTY_AARCH64_FEATURE_1_PAC 0x00000002
#define GNU_PROPERTY_X86_FEATURE_1_AND 0xc0000002
@@ -918,6 +953,49 @@
#define ELFCOMPRESS_LOPROC 0x70000000 /* Processor-specific */
#define ELFCOMPRESS_HIPROC 0x7fffffff
+#if 0 // android-added
+/* Values for a_type. */
+#define AT_NULL 0 /* Terminates the vector. */
+#define AT_IGNORE 1 /* Ignored entry. */
+#define AT_EXECFD 2 /* File descriptor of program to load. */
+#define AT_PHDR 3 /* Program header of program already loaded. */
+#define AT_PHENT 4 /* Size of each program header entry. */
+#define AT_PHNUM 5 /* Number of program header entries. */
+#define AT_PAGESZ 6 /* Page size in bytes. */
+#define AT_BASE 7 /* Interpreter's base address. */
+#define AT_FLAGS 8 /* Flags. */
+#define AT_ENTRY 9 /* Where interpreter should transfer control. */
+#define AT_NOTELF 10 /* Program is not ELF ?? */
+#define AT_UID 11 /* Real uid. */
+#define AT_EUID 12 /* Effective uid. */
+#define AT_GID 13 /* Real gid. */
+#define AT_EGID 14 /* Effective gid. */
+#define AT_EXECPATH 15 /* Path to the executable. */
+#define AT_CANARY 16 /* Canary for SSP. */
+#define AT_CANARYLEN 17 /* Length of the canary. */
+#define AT_OSRELDATE 18 /* OSRELDATE. */
+#define AT_NCPUS 19 /* Number of CPUs. */
+#define AT_PAGESIZES 20 /* Pagesizes. */
+#define AT_PAGESIZESLEN 21 /* Number of pagesizes. */
+#define AT_TIMEKEEP 22 /* Pointer to timehands. */
+#define AT_STACKPROT 23 /* Initial stack protection. */
+#define AT_EHDRFLAGS 24 /* e_flags field from elf hdr */
+#define AT_HWCAP 25 /* CPU feature flags. */
+#define AT_HWCAP2 26 /* CPU feature flags 2. */
+#define AT_BSDFLAGS 27 /* ELF BSD Flags. */
+#define AT_ARGC 28 /* Argument count */
+#define AT_ARGV 29 /* Argument vector */
+#define AT_ENVC 30 /* Environment count */
+#define AT_ENVV 31 /* Environment vector */
+#define AT_PS_STRINGS 32 /* struct ps_strings */
+#define AT_FXRNG 33 /* Pointer to root RNG seed version. */
+#define AT_KPRELOAD 34 /* Base of vdso, preloaded by rtld */
+#define AT_USRSTACKBASE 35 /* Top of user stack */
+#define AT_USRSTACKLIM 36 /* Grow limit of user stack */
+
+#define AT_COUNT 37 /* Count of defined aux entry types. */
+#endif // android-added
+
/*
* Relocation types.
*
@@ -1087,7 +1165,7 @@
#define R_IA_64_PCREL22 0x7a /* immediate22 S + A - P */
#define R_IA_64_PCREL64I 0x7b /* immediate64 S + A - P */
#define R_IA_64_IPLTMSB 0x80 /* function descriptor MSB special */
-#define R_IA_64_IPLTLSB 0x81 /* function descriptor LSB speciaal */
+#define R_IA_64_IPLTLSB 0x81 /* function descriptor LSB special */
#define R_IA_64_SUB 0x85 /* immediate64 A - S */
#define R_IA_64_LTOFF22X 0x86 /* immediate22 special */
#define R_IA_64_LDXMOV 0x87 /* immediate22 special */
@@ -1248,7 +1326,6 @@
/*
* RISC-V relocation types.
- * https://github.com/riscv-non-isa/riscv-elf-psabi-doc/blob/master/riscv-elf.adoc#relocations
*/
/* Relocation types used by the dynamic linker. */
@@ -1264,7 +1341,6 @@
#define R_RISCV_TLS_DTPREL64 9
#define R_RISCV_TLS_TPREL32 10
#define R_RISCV_TLS_TPREL64 11
-#define R_RISCV_TLSDESC 12
/* Relocation types not used by the dynamic linker. */
#define R_RISCV_BRANCH 16
@@ -1292,8 +1368,6 @@
#define R_RISCV_SUB16 38
#define R_RISCV_SUB32 39
#define R_RISCV_SUB64 40
-#define R_RISCV_GNU_VTINHERIT 41
-#define R_RISCV_GNU_VTENTRY 42
#define R_RISCV_ALIGN 43
#define R_RISCV_RVC_BRANCH 44
#define R_RISCV_RVC_JUMP 45
@@ -1306,13 +1380,6 @@
#define R_RISCV_SET32 56
#define R_RISCV_32_PCREL 57
#define R_RISCV_IRELATIVE 58
-#define R_RISCV_PLT32 59
-#define R_RISCV_SET_ULEB128 60
-#define R_RISCV_SUB_ULEB128 61
-#define R_RISCV_TLSDESC_HI20 62
-#define R_RISCV_TLSDESC_LOAD_LO12 63
-#define R_RISCV_TLSDESC_ADD_LO12 64
-#define R_RISCV_TLSDESC_CALL 65
#define R_SPARC_NONE 0
#define R_SPARC_8 1
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/fcntl.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/fcntl.h
index 597aa6e..ee5a6e1 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/fcntl.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/fcntl.h
@@ -43,6 +43,6 @@
*
* The return value depends on the operation.
*/
-int fcntl(int __fd, int __cmd, ...);
+int fcntl(int __fd, int __op, ...);
__END_DECLS
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/glibc-syscalls.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/glibc-syscalls.h
index 83fb257..eceb334 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/glibc-syscalls.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/glibc-syscalls.h
@@ -552,6 +552,9 @@
#if defined(__NR_listen)
#define SYS_listen __NR_listen
#endif
+#if defined(__NR_listmount)
+ #define SYS_listmount __NR_listmount
+#endif
#if defined(__NR_listxattr)
#define SYS_listxattr __NR_listxattr
#endif
@@ -576,6 +579,15 @@
#if defined(__NR_lsetxattr)
#define SYS_lsetxattr __NR_lsetxattr
#endif
+#if defined(__NR_lsm_get_self_attr)
+ #define SYS_lsm_get_self_attr __NR_lsm_get_self_attr
+#endif
+#if defined(__NR_lsm_list_modules)
+ #define SYS_lsm_list_modules __NR_lsm_list_modules
+#endif
+#if defined(__NR_lsm_set_self_attr)
+ #define SYS_lsm_set_self_attr __NR_lsm_set_self_attr
+#endif
#if defined(__NR_lstat)
#define SYS_lstat __NR_lstat
#endif
@@ -1218,6 +1230,9 @@
#if defined(__NR_statfs64)
#define SYS_statfs64 __NR_statfs64
#endif
+#if defined(__NR_statmount)
+ #define SYS_statmount __NR_statmount
+#endif
#if defined(__NR_statx)
#define SYS_statx __NR_statx
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/ioctl.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/ioctl.h
index fd31a58..260eb7d 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/ioctl.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/ioctl.h
@@ -40,7 +40,7 @@
/**
* [ioctl(2)](http://man7.org/linux/man-pages/man2/ioctl.2.html) operates on device files.
*/
-int ioctl(int __fd, int __request, ...);
+int ioctl(int __fd, int __op, ...);
/*
* Work around unsigned -> signed conversion warnings: many common ioctl
@@ -57,7 +57,7 @@
*/
#if !defined(BIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD)
/* enable_if(1) just exists to break overloading ties. */
-int ioctl(int __fd, unsigned __request, ...) __overloadable __enable_if(1, "") __RENAME(ioctl);
+int ioctl(int __fd, unsigned __op, ...) __overloadable __enable_if(1, "") __RENAME(ioctl);
#endif
__END_DECLS
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/lockf.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/lockf.h
index ec6e53c..d9f5987 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/lockf.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/lockf.h
@@ -56,12 +56,12 @@
*
* See also flock().
*/
-int lockf(int __fd, int __cmd, off_t __length) __RENAME_IF_FILE_OFFSET64(lockf64) __INTRODUCED_IN(24);
+int lockf(int __fd, int __op, off_t __length) __RENAME_IF_FILE_OFFSET64(lockf64) __INTRODUCED_IN(24);
/**
* Like lockf() but allows using a 64-bit length
* even from a 32-bit process without `_FILE_OFFSET_BITS=64`.
*/
-int lockf64(int __fd, int __cmd, off64_t __length) __INTRODUCED_IN(24);
+int lockf64(int __fd, int __op, off64_t __length) __INTRODUCED_IN(24);
__END_DECLS
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/page_size.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/page_size.h
index ca434e5..594ffe5 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/page_size.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/page_size.h
@@ -32,7 +32,16 @@
__BEGIN_DECLS
-#if !defined(__BIONIC_NO_PAGE_SIZE_MACRO)
+// PAGE_SIZE is going away in Android. Prefer getpagesize() instead.
+//
+// For more info, see https://developer.android.com/16kb-page-size.
+//
+// To restore the original behavior, use __BIONIC_DEPRECATED_PAGE_SIZE_MACRO.
+
+#if (defined(__NDK_MAJOR__) && __NDK_MAJOR__ <= 27 && !defined(__BIONIC_NO_PAGE_SIZE_MACRO)) \
+ || defined(__BIONIC_DEPRECATED_PAGE_SIZE_MACRO) \
+ || defined(__arm__) \
+ || defined(__i386__)
#define PAGE_SIZE 4096
#define PAGE_MASK (~(PAGE_SIZE - 1))
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/stdatomic.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/stdatomic.h
index fe3d68d..c74eafd 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/stdatomic.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/stdatomic.h
@@ -138,11 +138,11 @@
* 7.17.4 Fences.
*/
-static __inline void atomic_thread_fence(memory_order __order __attribute__((unused))) {
+static __inline void atomic_thread_fence(memory_order __order __attribute__((__unused__))) {
__c11_atomic_thread_fence(__order);
}
-static __inline void atomic_signal_fence(memory_order __order __attribute__((unused))) {
+static __inline void atomic_signal_fence(memory_order __order __attribute__((__unused__))) {
__c11_atomic_signal_fence(__order);
}
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/struct_file.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/struct_file.h
index abbd320..8cb8d28 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/struct_file.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/struct_file.h
@@ -39,6 +39,6 @@
#else
char __private[84];
#endif
-} __attribute__((aligned(sizeof(void*))));
+} __attribute__((__aligned__(sizeof(void*))));
__END_DECLS
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/sysconf.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/sysconf.h
index 8607adf..ecf26ba 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/sysconf.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/sysconf.h
@@ -26,172 +26,324 @@
* SUCH DAMAGE.
*/
-#ifndef _BITS_SYSCONF_H_
-#define _BITS_SYSCONF_H_
+#pragma once
#include <sys/cdefs.h>
-/* as listed by Posix sysconf() description */
-/* most of these will return -1 and ENOSYS */
-
-#define _SC_ARG_MAX 0x0000
-#define _SC_BC_BASE_MAX 0x0001
-#define _SC_BC_DIM_MAX 0x0002
-#define _SC_BC_SCALE_MAX 0x0003
-#define _SC_BC_STRING_MAX 0x0004
-#define _SC_CHILD_MAX 0x0005
-#define _SC_CLK_TCK 0x0006
-#define _SC_COLL_WEIGHTS_MAX 0x0007
-#define _SC_EXPR_NEST_MAX 0x0008
-#define _SC_LINE_MAX 0x0009
-#define _SC_NGROUPS_MAX 0x000a
-#define _SC_OPEN_MAX 0x000b
-#define _SC_PASS_MAX 0x000c
-#define _SC_2_C_BIND 0x000d
-#define _SC_2_C_DEV 0x000e
-#define _SC_2_C_VERSION 0x000f /* Obsolescent in POSIX.1-2008, TODO: remove it. */
-#define _SC_2_CHAR_TERM 0x0010
-#define _SC_2_FORT_DEV 0x0011
-#define _SC_2_FORT_RUN 0x0012
-#define _SC_2_LOCALEDEF 0x0013
-#define _SC_2_SW_DEV 0x0014
-#define _SC_2_UPE 0x0015
-#define _SC_2_VERSION 0x0016
-#define _SC_JOB_CONTROL 0x0017
-#define _SC_SAVED_IDS 0x0018
-#define _SC_VERSION 0x0019
-#define _SC_RE_DUP_MAX 0x001a
-#define _SC_STREAM_MAX 0x001b
-#define _SC_TZNAME_MAX 0x001c
-#define _SC_XOPEN_CRYPT 0x001d
-#define _SC_XOPEN_ENH_I18N 0x001e
-#define _SC_XOPEN_SHM 0x001f
-#define _SC_XOPEN_VERSION 0x0020
-#define _SC_XOPEN_XCU_VERSION 0x0021 /* Obsolescent in POSIX.1-2008, TODO: remove it. */
-#define _SC_XOPEN_REALTIME 0x0022
-#define _SC_XOPEN_REALTIME_THREADS 0x0023
-#define _SC_XOPEN_LEGACY 0x0024
-#define _SC_ATEXIT_MAX 0x0025
-#define _SC_IOV_MAX 0x0026
+/** sysconf() query for the maximum number of bytes of exec() arguments. */
+#define _SC_ARG_MAX 0x0000
+/** sysconf() query for bc(1) behavior equivalent to _POSIX2_BC_BASE_MAX. */
+#define _SC_BC_BASE_MAX 0x0001
+/** sysconf() query for bc(1) behavior equivalent to _POSIX2_BC_DIM_MAX. */
+#define _SC_BC_DIM_MAX 0x0002
+/** sysconf() query for bc(1) behavior equivalent to _POSIX2_BC_SCALE_MAX. */
+#define _SC_BC_SCALE_MAX 0x0003
+/** sysconf() query for bc(1) behavior equivalent to _POSIX2_BC_STRING_MAX. */
+#define _SC_BC_STRING_MAX 0x0004
+/** sysconf() query equivalent to RLIMIT_NPROC. */
+#define _SC_CHILD_MAX 0x0005
+/** sysconf() query equivalent to AT_CLKTCK. */
+#define _SC_CLK_TCK 0x0006
+/** sysconf() query for collation behavior equivalent to _POSIX2_COLL_WEIGHTS_MAX. */
+#define _SC_COLL_WEIGHTS_MAX 0x0007
+/** sysconf() query for expr(1) behavior equivalent to _POSIX2_EXPR_NEST_MAX. */
+#define _SC_EXPR_NEST_MAX 0x0008
+/** sysconf() query for command-line tool behavior equivalent to _POSIX2_LINE_MAX. */
+#define _SC_LINE_MAX 0x0009
+/** sysconf() query equivalent to NGROUPS_MAX. */
+#define _SC_NGROUPS_MAX 0x000a
+/** sysconf() query equivalent to RLIMIT_NOFILE. */
+#define _SC_OPEN_MAX 0x000b
+/** sysconf() query equivalent to PASS_MAX. */
+#define _SC_PASS_MAX 0x000c
+/** sysconf() query equivalent to _POSIX2_C_BIND. */
+#define _SC_2_C_BIND 0x000d
+/** sysconf() query equivalent to _POSIX2_C_DEV. */
+#define _SC_2_C_DEV 0x000e
+/** Obsolescent in POSIX.1-2008. */
+#define _SC_2_C_VERSION 0x000f
+/** sysconf() query equivalent to _POSIX2_CHAR_TERM. */
+#define _SC_2_CHAR_TERM 0x0010
+/** sysconf() query equivalent to _POSIX2_FORT_DEV. */
+#define _SC_2_FORT_DEV 0x0011
+/** sysconf() query equivalent to _POSIX2_FORT_RUN. */
+#define _SC_2_FORT_RUN 0x0012
+/** sysconf() query equivalent to _POSIX2_LOCALEDEF. */
+#define _SC_2_LOCALEDEF 0x0013
+/** sysconf() query equivalent to _POSIX2_SW_DEV. */
+#define _SC_2_SW_DEV 0x0014
+/** sysconf() query equivalent to _POSIX2_UPE. */
+#define _SC_2_UPE 0x0015
+/** sysconf() query equivalent to _POSIX2_VERSION. */
+#define _SC_2_VERSION 0x0016
+/** sysconf() query equivalent to _POSIX_JOB_CONTROL. */
+#define _SC_JOB_CONTROL 0x0017
+/** sysconf() query equivalent to _POSIX_SAVED_IDS. */
+#define _SC_SAVED_IDS 0x0018
+/** sysconf() query equivalent to _POSIX_VERSION. */
+#define _SC_VERSION 0x0019
+/** sysconf() query equivalent to _POSIX_RE_DUP_MAX. */
+#define _SC_RE_DUP_MAX 0x001a
+/** sysconf() query equivalent to FOPEN_MAX. */
+#define _SC_STREAM_MAX 0x001b
+/** sysconf() query equivalent to _POSIX_TZNAME_MAX. */
+#define _SC_TZNAME_MAX 0x001c
+/** sysconf() query equivalent to _XOPEN_CRYPT. */
+#define _SC_XOPEN_CRYPT 0x001d
+/** sysconf() query equivalent to _XOPEN_ENH_I18N. */
+#define _SC_XOPEN_ENH_I18N 0x001e
+/** sysconf() query equivalent to _XOPEN_SHM. */
+#define _SC_XOPEN_SHM 0x001f
+/** sysconf() query equivalent to _XOPEN_VERSION. */
+#define _SC_XOPEN_VERSION 0x0020
+/** Obsolescent in POSIX.1-2008. */
+#define _SC_XOPEN_XCU_VERSION 0x0021
+/** sysconf() query equivalent to _XOPEN_REALTIME. */
+#define _SC_XOPEN_REALTIME 0x0022
+/** sysconf() query equivalent to _XOPEN_REALTIME_THREADS. */
+#define _SC_XOPEN_REALTIME_THREADS 0x0023
+/** sysconf() query equivalent to _XOPEN_LEGACY. */
+#define _SC_XOPEN_LEGACY 0x0024
+/** sysconf() query for the maximum number of atexit() handlers. Unlimited on Android. */
+#define _SC_ATEXIT_MAX 0x0025
+/** sysconf() query equivalent to IOV_MAX. */
+#define _SC_IOV_MAX 0x0026
+/** Same as _SC_IOV_MAX. */
#define _SC_UIO_MAXIOV _SC_IOV_MAX
-#define _SC_PAGESIZE 0x0027
-#define _SC_PAGE_SIZE 0x0028
-#define _SC_XOPEN_UNIX 0x0029
-#define _SC_XBS5_ILP32_OFF32 0x002a /* Obsolescent in POSIX.1-2008, TODO: remove it. */
-#define _SC_XBS5_ILP32_OFFBIG 0x002b /* Obsolescent in POSIX.1-2008, TODO: remove it. */
-#define _SC_XBS5_LP64_OFF64 0x002c /* Obsolescent in POSIX.1-2008, TODO: remove it. */
-#define _SC_XBS5_LPBIG_OFFBIG 0x002d /* Obsolescent in POSIX.1-2008, TODO: remove it. */
-#define _SC_AIO_LISTIO_MAX 0x002e
-#define _SC_AIO_MAX 0x002f
+/** Same as _SC_PAGE_SIZE. */
+#define _SC_PAGESIZE 0x0027
+/** sysconf() query equivalent to getpagesize(). */
+#define _SC_PAGE_SIZE 0x0028
+/** sysconf() query equivalent to _XOPEN_UNIX. */
+#define _SC_XOPEN_UNIX 0x0029
+/** Obsolescent in POSIX.1-2008. */
+#define _SC_XBS5_ILP32_OFF32 0x002a
+/** Obsolescent in POSIX.1-2008. */
+#define _SC_XBS5_ILP32_OFFBIG 0x002b
+/** Obsolescent in POSIX.1-2008. */
+#define _SC_XBS5_LP64_OFF64 0x002c
+/** Obsolescent in POSIX.1-2008. */
+#define _SC_XBS5_LPBIG_OFFBIG 0x002d
+/** sysconf() query equivalent to _POSIX_AIO_LISTIO_MAX. */
+#define _SC_AIO_LISTIO_MAX 0x002e
+/** sysconf() query equivalent to _POSIX_AIO_MAX. */
+#define _SC_AIO_MAX 0x002f
+/** Unimplemented on Android. */
#define _SC_AIO_PRIO_DELTA_MAX 0x0030
-#define _SC_DELAYTIMER_MAX 0x0031
-#define _SC_MQ_OPEN_MAX 0x0032
-#define _SC_MQ_PRIO_MAX 0x0033
-#define _SC_RTSIG_MAX 0x0034
-#define _SC_SEM_NSEMS_MAX 0x0035
-#define _SC_SEM_VALUE_MAX 0x0036
-#define _SC_SIGQUEUE_MAX 0x0037
-#define _SC_TIMER_MAX 0x0038
-#define _SC_ASYNCHRONOUS_IO 0x0039
-#define _SC_FSYNC 0x003a
-#define _SC_MAPPED_FILES 0x003b
-#define _SC_MEMLOCK 0x003c
-#define _SC_MEMLOCK_RANGE 0x003d
-#define _SC_MEMORY_PROTECTION 0x003e
-#define _SC_MESSAGE_PASSING 0x003f
-#define _SC_PRIORITIZED_IO 0x0040
+/** sysconf() query equivalent to _POSIX_DELAYTIMER_MAX. */
+#define _SC_DELAYTIMER_MAX 0x0031
+/** sysconf() query equivalent to _POSIX_MQ_OPEN_MAX. */
+#define _SC_MQ_OPEN_MAX 0x0032
+/** sysconf() query equivalent to _POSIX_MQ_PRIO_MAX. */
+#define _SC_MQ_PRIO_MAX 0x0033
+/** sysconf() query equivalent to RTSIG_MAX. Constant on Android. */
+#define _SC_RTSIG_MAX 0x0034
+/** sysconf() query equivalent to _POSIX_SEM_NSEMS_MAX. Constant on Android. */
+#define _SC_SEM_NSEMS_MAX 0x0035
+/** sysconf() query equivalent to SEM_VALUE_MAX. Constant on Android. */
+#define _SC_SEM_VALUE_MAX 0x0036
+/** sysconf() query equivalent to _POSIX_SIGQUEUE_MAX. */
+#define _SC_SIGQUEUE_MAX 0x0037
+/** sysconf() query equivalent to _POSIX_TIMER_MAX. */
+#define _SC_TIMER_MAX 0x0038
+/** sysconf() query equivalent to _POSIX_ASYNCHRONOUS_IO. */
+#define _SC_ASYNCHRONOUS_IO 0x0039
+/** sysconf() query equivalent to _POSIX_FSYNC. */
+#define _SC_FSYNC 0x003a
+/** sysconf() query equivalent to _POSIX_MAPPED_FILES. */
+#define _SC_MAPPED_FILES 0x003b
+/** sysconf() query equivalent to _POSIX_MEMLOCK. */
+#define _SC_MEMLOCK 0x003c
+/** sysconf() query equivalent to _POSIX_MEMLOCK_RANGE. */
+#define _SC_MEMLOCK_RANGE 0x003d
+/** sysconf() query equivalent to _POSIX_MEMORY_PROTECTION. */
+#define _SC_MEMORY_PROTECTION 0x003e
+/** sysconf() query equivalent to _POSIX_MESSAGE_PASSING. */
+#define _SC_MESSAGE_PASSING 0x003f
+/** sysconf() query equivalent to _POSIX_PRIORITIZED_IO. */
+#define _SC_PRIORITIZED_IO 0x0040
+/** sysconf() query equivalent to _POSIX_PRIORITY_SCHEDULING. */
#define _SC_PRIORITY_SCHEDULING 0x0041
-#define _SC_REALTIME_SIGNALS 0x0042
-#define _SC_SEMAPHORES 0x0043
-#define _SC_SHARED_MEMORY_OBJECTS 0x0044
-#define _SC_SYNCHRONIZED_IO 0x0045
-#define _SC_TIMERS 0x0046
-#define _SC_GETGR_R_SIZE_MAX 0x0047
-#define _SC_GETPW_R_SIZE_MAX 0x0048
-#define _SC_LOGIN_NAME_MAX 0x0049
-#define _SC_THREAD_DESTRUCTOR_ITERATIONS 0x004a
-#define _SC_THREAD_KEYS_MAX 0x004b
-#define _SC_THREAD_STACK_MIN 0x004c
-#define _SC_THREAD_THREADS_MAX 0x004d
-#define _SC_TTY_NAME_MAX 0x004e
-
-#define _SC_THREADS 0x004f
-#define _SC_THREAD_ATTR_STACKADDR 0x0050
-#define _SC_THREAD_ATTR_STACKSIZE 0x0051
-#define _SC_THREAD_PRIORITY_SCHEDULING 0x0052
-#define _SC_THREAD_PRIO_INHERIT 0x0053
-#define _SC_THREAD_PRIO_PROTECT 0x0054
-#define _SC_THREAD_SAFE_FUNCTIONS 0x0055
-
-#define _SC_NPROCESSORS_CONF 0x0060
-#define _SC_NPROCESSORS_ONLN 0x0061
-#define _SC_PHYS_PAGES 0x0062
-#define _SC_AVPHYS_PAGES 0x0063
-#define _SC_MONOTONIC_CLOCK 0x0064
-
-#define _SC_2_PBS 0x0065
-#define _SC_2_PBS_ACCOUNTING 0x0066
-#define _SC_2_PBS_CHECKPOINT 0x0067
-#define _SC_2_PBS_LOCATE 0x0068
-#define _SC_2_PBS_MESSAGE 0x0069
-#define _SC_2_PBS_TRACK 0x006a
-#define _SC_ADVISORY_INFO 0x006b
-#define _SC_BARRIERS 0x006c
-#define _SC_CLOCK_SELECTION 0x006d
-#define _SC_CPUTIME 0x006e
-#define _SC_HOST_NAME_MAX 0x006f
-#define _SC_IPV6 0x0070
-#define _SC_RAW_SOCKETS 0x0071
+/** sysconf() query equivalent to _POSIX_REALTIME_SIGNALS. */
+#define _SC_REALTIME_SIGNALS 0x0042
+/** sysconf() query equivalent to _POSIX_SEMAPHORES. */
+#define _SC_SEMAPHORES 0x0043
+/** sysconf() query equivalent to _POSIX_SHARED_MEMORY_OBJECTS. */
+#define _SC_SHARED_MEMORY_OBJECTS 0x0044
+/** sysconf() query equivalent to _POSIX_SYNCHRONIZED_IO. */
+#define _SC_SYNCHRONIZED_IO 0x0045
+/** sysconf() query equivalent to _POSIX_TIMERS. */
+#define _SC_TIMERS 0x0046
+/** sysconf() query for an initial size for getgrgid_r() and getgrnam_r() buffers. */
+#define _SC_GETGR_R_SIZE_MAX 0x0047
+/** sysconf() query for an initial size for getpwuid_r() and getpwnam_r() buffers. */
+#define _SC_GETPW_R_SIZE_MAX 0x0048
+/** sysconf() query equivalent to LOGIN_NAME_MAX. */
+#define _SC_LOGIN_NAME_MAX 0x0049
+/** sysconf() query equivalent to PTHREAD_DESTRUCTOR_ITERATIONS. */
+#define _SC_THREAD_DESTRUCTOR_ITERATIONS 0x004a
+/** sysconf() query equivalent to PTHREAD_KEYS_MAX. */
+#define _SC_THREAD_KEYS_MAX 0x004b
+/** sysconf() query equivalent to PTHREAD_STACK_MIN. */
+#define _SC_THREAD_STACK_MIN 0x004c
+/** sysconf() query for a maximum number of threads. Unlimited on Android. */
+#define _SC_THREAD_THREADS_MAX 0x004d
+/** sysconf() query equivalent to TTY_NAME_MAX. */
+#define _SC_TTY_NAME_MAX 0x004e
+/** sysconf() query equivalent to _POSIX_THREADS. */
+#define _SC_THREADS 0x004f
+/** sysconf() query equivalent to _POSIX_THREAD_ATTR_STACKADDR. */
+#define _SC_THREAD_ATTR_STACKADDR 0x0050
+/** sysconf() query equivalent to _POSIX_THREAD_ATTR_STACKSIZE. */
+#define _SC_THREAD_ATTR_STACKSIZE 0x0051
+/** sysconf() query equivalent to _POSIX_THREAD_PRIORITY_SCHEDULING. */
+#define _SC_THREAD_PRIORITY_SCHEDULING 0x0052
+/** sysconf() query equivalent to _POSIX_THREAD_PRIO_INHERIT. */
+#define _SC_THREAD_PRIO_INHERIT 0x0053
+/** sysconf() query equivalent to _POSIX_THREAD_PRIO_PROTECT. */
+#define _SC_THREAD_PRIO_PROTECT 0x0054
+/** sysconf() query equivalent to _POSIX_THREAD_SAFE_FUNCTIONS. */
+#define _SC_THREAD_SAFE_FUNCTIONS 0x0055
+/** sysconf() query equivalent to get_nprocs_conf(). */
+#define _SC_NPROCESSORS_CONF 0x0060
+/** sysconf() query equivalent to get_nprocs(). */
+#define _SC_NPROCESSORS_ONLN 0x0061
+/** sysconf() query equivalent to get_phys_pages(). */
+#define _SC_PHYS_PAGES 0x0062
+/** sysconf() query equivalent to get_avphys_pages(). */
+#define _SC_AVPHYS_PAGES 0x0063
+/** sysconf() query equivalent to _POSIX_MONOTONIC_CLOCK. */
+#define _SC_MONOTONIC_CLOCK 0x0064
+/** Obsolescent in POSIX.1-2008. */
+#define _SC_2_PBS 0x0065
+/** Obsolescent in POSIX.1-2008. */
+#define _SC_2_PBS_ACCOUNTING 0x0066
+/** Obsolescent in POSIX.1-2008. */
+#define _SC_2_PBS_CHECKPOINT 0x0067
+/** Obsolescent in POSIX.1-2008. */
+#define _SC_2_PBS_LOCATE 0x0068
+/** Obsolescent in POSIX.1-2008. */
+#define _SC_2_PBS_MESSAGE 0x0069
+/** Obsolescent in POSIX.1-2008. */
+#define _SC_2_PBS_TRACK 0x006a
+/** sysconf() query equivalent to _POSIX_ADVISORY_INFO. */
+#define _SC_ADVISORY_INFO 0x006b
+/** sysconf() query equivalent to _POSIX_BARRIERS. */
+#define _SC_BARRIERS 0x006c
+/** sysconf() query equivalent to _POSIX_CLOCK_SELECTION. */
+#define _SC_CLOCK_SELECTION 0x006d
+/** sysconf() query equivalent to _POSIX_CPUTIME. */
+#define _SC_CPUTIME 0x006e
+/** sysconf() query equivalent to _POSIX_HOST_NAME_MAX. */
+#define _SC_HOST_NAME_MAX 0x006f
+/** sysconf() query equivalent to _POSIX_IPV6. */
+#define _SC_IPV6 0x0070
+/** sysconf() query equivalent to _POSIX_RAW_SOCKETS. */
+#define _SC_RAW_SOCKETS 0x0071
+/** sysconf() query equivalent to _POSIX_READER_WRITER_LOCKS. */
#define _SC_READER_WRITER_LOCKS 0x0072
-#define _SC_REGEXP 0x0073
-#define _SC_SHELL 0x0074
-#define _SC_SPAWN 0x0075
-#define _SC_SPIN_LOCKS 0x0076
-#define _SC_SPORADIC_SERVER 0x0077
-#define _SC_SS_REPL_MAX 0x0078
-#define _SC_SYMLOOP_MAX 0x0079
-#define _SC_THREAD_CPUTIME 0x007a
-#define _SC_THREAD_PROCESS_SHARED 0x007b
-#define _SC_THREAD_ROBUST_PRIO_INHERIT 0x007c
-#define _SC_THREAD_ROBUST_PRIO_PROTECT 0x007d
-#define _SC_THREAD_SPORADIC_SERVER 0x007e
-#define _SC_TIMEOUTS 0x007f
-#define _SC_TRACE 0x0080
-#define _SC_TRACE_EVENT_FILTER 0x0081
-#define _SC_TRACE_EVENT_NAME_MAX 0x0082
-#define _SC_TRACE_INHERIT 0x0083
-#define _SC_TRACE_LOG 0x0084
-#define _SC_TRACE_NAME_MAX 0x0085
-#define _SC_TRACE_SYS_MAX 0x0086
-#define _SC_TRACE_USER_EVENT_MAX 0x0087
-#define _SC_TYPED_MEMORY_OBJECTS 0x0088
-#define _SC_V7_ILP32_OFF32 0x0089
-#define _SC_V7_ILP32_OFFBIG 0x008a
-#define _SC_V7_LP64_OFF64 0x008b
-#define _SC_V7_LPBIG_OFFBIG 0x008c
-#define _SC_XOPEN_STREAMS 0x008d
-#define _SC_XOPEN_UUCP 0x008e
-
-#define _SC_LEVEL1_ICACHE_SIZE 0x008f
-#define _SC_LEVEL1_ICACHE_ASSOC 0x0090
-#define _SC_LEVEL1_ICACHE_LINESIZE 0x0091
-#define _SC_LEVEL1_DCACHE_SIZE 0x0092
-#define _SC_LEVEL1_DCACHE_ASSOC 0x0093
-#define _SC_LEVEL1_DCACHE_LINESIZE 0x0094
-#define _SC_LEVEL2_CACHE_SIZE 0x0095
-#define _SC_LEVEL2_CACHE_ASSOC 0x0096
-#define _SC_LEVEL2_CACHE_LINESIZE 0x0097
-#define _SC_LEVEL3_CACHE_SIZE 0x0098
-#define _SC_LEVEL3_CACHE_ASSOC 0x0099
-#define _SC_LEVEL3_CACHE_LINESIZE 0x009a
-#define _SC_LEVEL4_CACHE_SIZE 0x009b
-#define _SC_LEVEL4_CACHE_ASSOC 0x009c
-#define _SC_LEVEL4_CACHE_LINESIZE 0x009d
+/** sysconf() query equivalent to _POSIX_REGEXP. */
+#define _SC_REGEXP 0x0073
+/** sysconf() query equivalent to _POSIX_SHELL. */
+#define _SC_SHELL 0x0074
+/** sysconf() query equivalent to _POSIX_SPAWN. */
+#define _SC_SPAWN 0x0075
+/** sysconf() query equivalent to _POSIX_SPIN_LOCKS. */
+#define _SC_SPIN_LOCKS 0x0076
+/** sysconf() query equivalent to _POSIX_SPORADIC_SERVER. */
+#define _SC_SPORADIC_SERVER 0x0077
+/** sysconf() query equivalent to _POSIX_SS_REPL_MAX. */
+#define _SC_SS_REPL_MAX 0x0078
+/** sysconf() query equivalent to _POSIX_SYMLOOP_MAX. */
+#define _SC_SYMLOOP_MAX 0x0079
+/** sysconf() query equivalent to _POSIX_THREAD_CPUTIME. */
+#define _SC_THREAD_CPUTIME 0x007a
+/** sysconf() query equivalent to _POSIX_THREAD_PROCESS_SHARED. */
+#define _SC_THREAD_PROCESS_SHARED 0x007b
+/** sysconf() query equivalent to _POSIX_THREAD_ROBUST_PRIO_INHERIT. */
+#define _SC_THREAD_ROBUST_PRIO_INHERIT 0x007c
+/** sysconf() query equivalent to _POSIX_THREAD_ROBUST_PRIO_PROTECT. */
+#define _SC_THREAD_ROBUST_PRIO_PROTECT 0x007d
+/** sysconf() query equivalent to _POSIX_THREAD_SPORADIC_SERVER. */
+#define _SC_THREAD_SPORADIC_SERVER 0x007e
+/** sysconf() query equivalent to _POSIX_TIMEOUTS. */
+#define _SC_TIMEOUTS 0x007f
+/** Unimplemented. */
+#define _SC_TRACE 0x0080
+/** Unimplemented. */
+#define _SC_TRACE_EVENT_FILTER 0x0081
+/** Unimplemented. */
+#define _SC_TRACE_EVENT_NAME_MAX 0x0082
+/** Unimplemented. */
+#define _SC_TRACE_INHERIT 0x0083
+/** Unimplemented. */
+#define _SC_TRACE_LOG 0x0084
+/** Unimplemented. */
+#define _SC_TRACE_NAME_MAX 0x0085
+/** Unimplemented. */
+#define _SC_TRACE_SYS_MAX 0x0086
+/** Unimplemented. */
+#define _SC_TRACE_USER_EVENT_MAX 0x0087
+/** sysconf() query equivalent to _POSIX_TYPED_MEMORY_OBJECTS. */
+#define _SC_TYPED_MEMORY_OBJECTS 0x0088
+/** sysconf() query equivalent to _POSIX_V7_ILP32_OFF32. */
+#define _SC_V7_ILP32_OFF32 0x0089
+/** sysconf() query equivalent to _POSIX_V7_ILP32_OFFBIG. */
+#define _SC_V7_ILP32_OFFBIG 0x008a
+/** sysconf() query equivalent to _POSIX_V7_ILP64_OFF64. */
+#define _SC_V7_LP64_OFF64 0x008b
+/** sysconf() query equivalent to _POSIX_V7_ILP64_OFFBIG. */
+#define _SC_V7_LPBIG_OFFBIG 0x008c
+/** Unimplemented. */
+#define _SC_XOPEN_STREAMS 0x008d
+/** Meaningless in Android, unsupported in every other libc (but defined by POSIX). */
+#define _SC_XOPEN_UUCP 0x008e
+/** sysconf() query for the L1 instruction cache size. Not available on all architectures. */
+#define _SC_LEVEL1_ICACHE_SIZE 0x008f
+/** sysconf() query for the L1 instruction cache associativity. Not available on all architectures. */
+#define _SC_LEVEL1_ICACHE_ASSOC 0x0090
+/** sysconf() query for the L1 instruction cache line size. Not available on all architectures. */
+#define _SC_LEVEL1_ICACHE_LINESIZE 0x0091
+/** sysconf() query for the L1 data cache size. Not available on all architectures. */
+#define _SC_LEVEL1_DCACHE_SIZE 0x0092
+/** sysconf() query for the L1 data cache associativity. Not available on all architectures. */
+#define _SC_LEVEL1_DCACHE_ASSOC 0x0093
+/** sysconf() query for the L1 data cache line size. Not available on all architectures. */
+#define _SC_LEVEL1_DCACHE_LINESIZE 0x0094
+/** sysconf() query for the L2 cache size. Not available on all architectures. */
+#define _SC_LEVEL2_CACHE_SIZE 0x0095
+/** sysconf() query for the L2 cache associativity. Not available on all architectures. */
+#define _SC_LEVEL2_CACHE_ASSOC 0x0096
+/** sysconf() query for the L2 cache line size. Not available on all architectures. */
+#define _SC_LEVEL2_CACHE_LINESIZE 0x0097
+/** sysconf() query for the L3 cache size. Not available on all architectures. */
+#define _SC_LEVEL3_CACHE_SIZE 0x0098
+/** sysconf() query for the L3 cache associativity. Not available on all architectures. */
+#define _SC_LEVEL3_CACHE_ASSOC 0x0099
+/** sysconf() query for the L3 cache line size. Not available on all architectures. */
+#define _SC_LEVEL3_CACHE_LINESIZE 0x009a
+/** sysconf() query for the L4 cache size. Not available on all architectures. */
+#define _SC_LEVEL4_CACHE_SIZE 0x009b
+/** sysconf() query for the L4 cache associativity. Not available on all architectures. */
+#define _SC_LEVEL4_CACHE_ASSOC 0x009c
+/** sysconf() query for the L4 cache line size. Not available on all architectures. */
+#define _SC_LEVEL4_CACHE_LINESIZE 0x009d
__BEGIN_DECLS
+/**
+ * [sysconf(3)](https://man7.org/linux/man-pages/man3/sysconf.3.html)
+ * gets system configuration at runtime, corresponding to the given
+ * `_SC_` constant. See the man page for details on how to interpret
+ * the results.
+ *
+ * For `_SC_` constants where an equivalent is given, it's cheaper on Android
+ * to go straight to that function call --- sysconf() is just a multiplexer.
+ * This may not be true on other systems, and other systems may not support the
+ * direct function, so sysconf() can be useful for portability, though despite
+ * POSIX's best efforts, the exact set of constants that return useful results
+ * will also vary by system.
+ */
long sysconf(int __name);
__END_DECLS
-
-#endif /* _SYS_SYSCONF_H_ */
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/threads_inlines.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/threads_inlines.h
index 5878e0a..459866e 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/threads_inlines.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/bits/threads_inlines.h
@@ -124,7 +124,7 @@
};
#pragma clang diagnostic pop
-static inline void* _Nonnull __bionic_thrd_trampoline(void* _Nonnull __arg) {
+static __inline void* _Nonnull __bionic_thrd_trampoline(void* _Nonnull __arg) {
struct __bionic_thrd_data __data =
*__BIONIC_CAST(static_cast, struct __bionic_thrd_data*, __arg);
free(__arg);
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/ctype.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/ctype.h
index c15ee56..cb926a4 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/ctype.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/ctype.h
@@ -73,9 +73,35 @@
/** Internal implementation detail. Do not use. */
extern const char* _ctype_;
+/**
+ * Returns the corresponding lower-case character if `ch` is upper-case, or undefined otherwise.
+ *
+ * Prefer tolower() instead.
+ */
+__BIONIC_CTYPE_INLINE int _tolower(int __ch) {
+ return __ch | 0x20;
+}
+
+/**
+ * Returns the corresponding upper-case character if `ch` is lower-case, or undefined otherwise.
+ *
+ * Prefer toupper() instead.
+ */
+__BIONIC_CTYPE_INLINE int _toupper(int __ch) {
+ // Using EOR rather than AND makes no difference on arm, but saves an
+ // instruction on arm64.
+ return __ch ^ 0x20;
+}
+
+/** Internal implementation detail. Do not use. */
+__attribute__((__no_sanitize__("unsigned-integer-overflow")))
+static inline int __bionic_ctype_in_range(unsigned __lo, int __ch, unsigned __hi) {
+ return (__BIONIC_CAST(static_cast, unsigned, __ch) - __lo) < (__hi - __lo + 1);
+}
+
/** Returns true if `ch` is in `[A-Za-z]`. */
__BIONIC_CTYPE_INLINE int isalpha(int __ch) {
- return (__ch >= 'A' && __ch <= 'Z') || (__ch >= 'a' && __ch <= 'z');
+ return __bionic_ctype_in_range('a', _tolower(__ch), 'z');
}
/** Returns true if `ch` is a space or tab. */
@@ -90,37 +116,37 @@
/** Returns true if `ch` is in `[0-9]`. */
__BIONIC_CTYPE_INLINE int isdigit(int __ch) {
- return (__ch >= '0' && __ch <= '9');
+ return __bionic_ctype_in_range('0', __ch, '9');
}
/** Returns true if `ch` is `[A-Za-z0-9]` or punctuation. */
__BIONIC_CTYPE_INLINE int isgraph(int __ch) {
- return (__ch >= '!' && __ch <= '~');
+ return __bionic_ctype_in_range('!', __ch, '~');
}
/** Returns true if `ch` is in `[a-z]`. */
__BIONIC_CTYPE_INLINE int islower(int __ch) {
- return (__ch >= 'a' && __ch <= 'z');
+ return __bionic_ctype_in_range('a', __ch, 'z');
}
/** Returns true if `ch` is `[A-Za-z0-9]` or punctuation or space. */
__BIONIC_CTYPE_INLINE int isprint(int __ch) {
- return (__ch >= ' ' && __ch <= '~');
+ return __bionic_ctype_in_range(' ', __ch, '~');
}
/** Returns true if `ch` is in `[ \f\n\r\t\v]`. */
__BIONIC_CTYPE_INLINE int isspace(int __ch) {
- return __ch == ' ' || (__ch >= '\t' && __ch <= '\r');
+ return __ch == ' ' || __bionic_ctype_in_range('\t', __ch, '\r');
}
/** Returns true if `ch` is in `[A-Z]`. */
__BIONIC_CTYPE_INLINE int isupper(int __ch) {
- return (__ch >= 'A' && __ch <= 'Z');
+ return __bionic_ctype_in_range('A', __ch, 'Z');
}
/** Returns true if `ch` is in `[0-9A-Fa-f]`. */
__BIONIC_CTYPE_INLINE int isxdigit(int __ch) {
- return (__ch >= '0' && __ch <= '9') || (__ch >= 'a' && __ch <= 'f') || (__ch >= 'A' && __ch <= 'F');
+ return isdigit(__ch) || __bionic_ctype_in_range('a', _tolower(__ch), 'f') ;
}
/** Returns true if `ch` is in `[A-Za-z0-9]`. */
@@ -133,36 +159,14 @@
return isgraph(__ch) && !isalnum(__ch);
}
-/**
- * Returns the corresponding lower-case character if `ch` is upper-case, or undefined otherwise.
- *
- * Prefer tolower() instead.
- */
-__BIONIC_CTYPE_INLINE int _tolower(int __ch) {
- return __ch | 0x20;
-}
-
/** Returns the corresponding lower-case character if `ch` is upper-case, or `ch` otherwise. */
__BIONIC_CTYPE_INLINE int tolower(int __ch) {
- if (__ch >= 'A' && __ch <= 'Z') return _tolower(__ch);
- return __ch;
-}
-
-/**
- * Returns the corresponding upper-case character if `ch` is lower-case, or undefined otherwise.
- *
- * Prefer toupper() instead.
- */
-__BIONIC_CTYPE_INLINE int _toupper(int __ch) {
- // Using EOR rather than AND makes no difference on arm, but saves an
- // instruction on arm64.
- return __ch ^ 0x20;
+ return (__bionic_ctype_in_range('A', __ch, 'Z')) ? _tolower(__ch) : __ch;
}
/** Returns the corresponding upper-case character if `ch` is lower-case, or `ch` otherwise. */
__BIONIC_CTYPE_INLINE int toupper(int __ch) {
- if (__ch >= 'a' && __ch <= 'z') return _toupper(__ch);
- return __ch;
+ return (__bionic_ctype_in_range('a', __ch, 'z')) ? _toupper(__ch) : __ch;
}
/** Returns true if `ch` is less than 0x80. */
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/dlfcn.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/dlfcn.h
index 0425031..d65a409 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/dlfcn.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/dlfcn.h
@@ -26,25 +26,35 @@
* SUCH DAMAGE.
*/
-#ifndef __DLFCN_H__
-#define __DLFCN_H__
+#pragma once
#include <stdint.h>
#include <sys/cdefs.h>
__BEGIN_DECLS
+/**
+ * dladdr() returns information using this structure.
+ */
typedef struct {
- /* Pathname of shared object that contains address. */
+ /** Pathname of the shared object that contains the given address. */
const char* _Nullable dli_fname;
- /* Address at which shared object is loaded. */
+ /** Address at which the shared object is loaded. */
void* _Nullable dli_fbase;
- /* Name of nearest symbol with address lower than addr. */
+ /** Name of the nearest symbol with an address lower than the given address. */
const char* _Nullable dli_sname;
- /* Exact address of symbol named in dli_sname. */
+ /** Exact address of the symbol named in `dli_sname`. */
void* _Nullable dli_saddr;
} Dl_info;
+/**
+ * [dlopen(3)](http://man7.org/linux/man-pages/man3/dlopen.3.html)
+ * loads the given shared library.
+ *
+ * Returns a pointer to an opaque handle for use with other <dlfcn.h> functions
+ * on success, and returns NULL on failure, in which case dlerror() can be used
+ * to retrieve the specific error.
+ */
void* _Nullable dlopen(const char* _Nullable __filename, int __flag);
/**
@@ -64,42 +74,115 @@
* a child process which can later be killed by the parent or call
* exit() itself.
*
+ * Note also that dlclose() interacts badly with thread local variables
+ * with non-trivial destructors, with the
+ * (exact behavior varying by API level)[https://android.googlesource.com/platform/bionic/+/main/android-changes-for-ndk-developers.md#dlclose-interacts-badly-with-thread-local-variables-with-non_trivial-destructors].
+ *
* Returns 0 on success, and returns -1 on failure, in which case
* dlerror() can be used to retrieve the specific error.
*/
int dlclose(void* _Nonnull __handle);
+/**
+ * [dlerror(3)](http://man7.org/linux/man-pages/man3/dlerror.3.html)
+ * returns a human-readable error message describing the most recent
+ * failure from one of the <dlfcn.h> functions on the calling thread.
+ *
+ * This function also clears the error, so a second call (or a call
+ * before any failure) will return NULL.
+ *
+ * Returns a pointer to an error on success, and returns NULL if no
+ * error is pending.
+ */
char* _Nullable dlerror(void);
-/* (RTLD_DEFAULT is null for LP64, but -1 for LP32) */
+/**
+ * [dlsym(3)](http://man7.org/linux/man-pages/man3/dlsym.3.html)
+ * returns a pointer to the symbol with the given name in the shared
+ * library represented by the given handle. The handle may have been
+ * returned from dlopen(), or can be RTLD_DEFAULT or RTLD_NEXT.
+ *
+ * Returns the address of the symbol on success, and returns NULL on failure,
+ * in which case dlerror() can be used to retrieve the specific error.
+ */
void* _Nullable dlsym(void* __BIONIC_COMPLICATED_NULLNESS __handle, const char* _Nullable __symbol);
-/* (RTLD_DEFAULT is null for LP64, but -1 for LP32) */
+
+/**
+ * [dlvsym(3)](http://man7.org/linux/man-pages/man3/dlvsym.3.html)
+ * returns a pointer to the symbol with the given name and version in the shared
+ * library represented by the given handle. The handle may have been
+ * returned from dlopen(), or can be RTLD_DEFAULT or RTLD_NEXT.
+ *
+ * Returns the address of the symbol on success, and returns NULL on failure,
+ * in which case dlerror() can be used to retrieve the specific error.
+ */
void* _Nullable dlvsym(void* __BIONIC_COMPLICATED_NULLNESS __handle, const char* _Nullable __symbol, const char* _Nullable __version) __INTRODUCED_IN(24);
+
+/**
+ * [dladdr(3)](http://man7.org/linux/man-pages/man3/dladdr.3.html)
+ * returns information about the symbol at the given address.
+ *
+ * Returns non-zero on success, and returns 0 on failure. Note that unlike
+ * the other <dlfcn.h> functions, in this case dlerror() will _not_ have
+ * more information.
+ */
int dladdr(const void* _Nonnull __addr, Dl_info* _Nonnull __info);
+/**
+ * A dlsym()/dlvsym() handle that returns the first symbol found in any
+ * shared library using the default search order.
+ */
+#define RTLD_DEFAULT __BIONIC_CAST(reinterpret_cast, void*, 0)
+
+/**
+ * A dlsym()/dlvsym() handle that returns the first symbol found in any
+ * shared library that appears _after_ the object containing the caller.
+ */
+#define RTLD_NEXT __BIONIC_CAST(reinterpret_cast, void*, -1L)
+
+/**
+ * A dlopen() flag to not make symbols from this library available to later
+ * libraries. See also RTLD_GLOBAL.
+ */
#define RTLD_LOCAL 0
+
+/**
+ * Not supported on Android. Android always uses RTLD_NOW for security reasons.
+ * Resolving all undefined symbols before dlopen() returns means that RELRO
+ * protections can be applied to the PLT before dlopen() returns.
+ */
#define RTLD_LAZY 0x00001
+
+/** A dlopen() flag to resolve all undefined symbols before dlopen() returns. */
#define RTLD_NOW 0x00002
+
+/**
+ * A dlopen() flag to not actually load the given library;
+ * used to test whether the library is already loaded.
+ */
#define RTLD_NOLOAD 0x00004
+
+/**
+ * A dlopen() flag to make symbols from this library available to later
+ * libraries. See also RTLD_LOCAL.
+ */
#define RTLD_GLOBAL 0x00100
+
+/**
+ * A dlopen() flag to ignore later dlclose() calls on this library.
+ */
#define RTLD_NODELETE 0x01000
+/* LP32 has historical ABI breakage. */
#if !defined(__LP64__)
-/* LP32 is broken for historical reasons. */
+#undef RTLD_DEFAULT
+#define RTLD_DEFAULT __BIONIC_CAST(reinterpret_cast, void*, 0xffffffff)
+#undef RTLD_NEXT
+#define RTLD_NEXT __BIONIC_CAST(reinterpret_cast, void*, 0xfffffffe)
#undef RTLD_NOW
#define RTLD_NOW 0x00000
#undef RTLD_GLOBAL
#define RTLD_GLOBAL 0x00002
#endif
-#if defined (__LP64__)
-#define RTLD_DEFAULT __BIONIC_CAST(reinterpret_cast, void*, 0)
-#define RTLD_NEXT __BIONIC_CAST(reinterpret_cast, void*, -1L)
-#else
-#define RTLD_DEFAULT __BIONIC_CAST(reinterpret_cast, void*, 0xffffffff)
-#define RTLD_NEXT __BIONIC_CAST(reinterpret_cast, void*, 0xfffffffe)
-#endif
-
__END_DECLS
-
-#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/elf.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/elf.h
index 81a50db..374d5bb 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/elf.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/elf.h
@@ -202,17 +202,11 @@
#define DF_1_SINGLETON 0x02000000
#define DF_1_STUB 0x04000000
-/* http://www.sco.com/developers/gabi/latest/ch4.eheader.html */
-#define ELFOSABI_SYSV 0 /* Synonym for ELFOSABI_NONE used by valgrind. */
-#define ELFOSABI_GNU 3 /* Synonym for ELFOSABI_LINUX. */
-
/* http://www.sco.com/developers/gabi/latest/ch4.reloc.html */
#define ELF32_R_INFO(sym, type) ((((Elf32_Word)sym) << 8) | ((type) & 0xff))
#define ELF64_R_INFO(sym, type) ((((Elf64_Xword)sym) << 32) | ((type) & 0xffffffff))
/* http://www.sco.com/developers/gabi/latest/ch4.symtab.html */
-#undef ELF_ST_TYPE
-#define ELF_ST_TYPE(x) ((x) & 0xf)
#define ELF_ST_INFO(b,t) (((b) << 4) + ((t) & 0xf))
#define ELF32_ST_INFO(b,t) ELF_ST_INFO(b,t)
#define ELF64_ST_INFO(b,t) ELF_ST_INFO(b,t)
@@ -229,8 +223,6 @@
#undef SHT_NUM
#define SHT_NUM 20
-#define SHT_RISCV_ATTRIBUTES 0x70000003
-
/*
* Experimental support for SHT_RELR sections. For details, see proposal
* at https://groups.google.com/forum/#!topic/generic-abi/bX460iggiKg.
@@ -260,6 +252,15 @@
#define DT_ANDROID_RELA 0x60000011 // DT_LOOS + 4
#define DT_ANDROID_RELASZ 0x60000012 // DT_LOOS + 5
+/* arm64 psabi. */
+
+/* TODO: upstreamed to FreeBSD as https://github.com/freebsd/freebsd-src/pull/1141/. */
+#define DT_AARCH64_MEMTAG_MODE 0x70000009
+#define DT_AARCH64_MEMTAG_HEAP 0x7000000b
+#define DT_AARCH64_MEMTAG_STACK 0x7000000c
+#define DT_AARCH64_MEMTAG_GLOBALS 0x7000000d
+#define DT_AARCH64_MEMTAG_GLOBALSSZ 0x7000000f
+
/* Linux traditionally doesn't have the trailing 64 that BSD has on these. */
#define R_AARCH64_TLS_DTPREL R_AARCH64_TLS_DTPREL64
#define R_AARCH64_TLS_DTPMOD R_AARCH64_TLS_DTPMOD64
@@ -269,5 +270,32 @@
#define R_ARM_TLS_DESC 13
#define R_ARM_IRELATIVE 160
-/* BSD spells this slightly differently to Linux. */
+/* riscv64 psabi. */
+
+/* FreeBSD is missing these, found in
+ * https://github.com/riscv-non-isa/riscv-elf-psabi-doc/blob/master/riscv-elf.adoc#relocations
+ * so I've sent https://github.com/freebsd/freebsd-src/pull/1141 upstream.
+ */
+#define R_RISCV_TLSDESC 12
+#define R_RISCV_PLT32 59
+#define R_RISCV_SET_ULEB128 60
+#define R_RISCV_SUB_ULEB128 61
+#define R_RISCV_TLSDESC_HI20 62
+#define R_RISCV_TLSDESC_LOAD_LO12 63
+#define R_RISCV_TLSDESC_ADD_LO12 64
+#define R_RISCV_TLSDESC_CALL 65
+
+/* https://github.com/riscv-non-isa/riscv-elf-psabi-doc/blob/master/riscv-elf.adoc#program-header-table */
+#define PT_RISCV_ATTRIBUTES 0x70000003
+
+/* https://github.com/riscv-non-isa/riscv-elf-psabi-doc/blob/master/riscv-elf.adoc#section-types */
+#define SHT_RISCV_ATTRIBUTES 0x70000003
+
+/* FreeBSD spells this slightly differently to Linux. Linux is correct according to
+ * https://github.com/riscv-non-isa/riscv-elf-psabi-doc/blob/master/riscv-elf.adoc#file-header
+ * so I've sent https://github.com/freebsd/freebsd-src/pull/1148 upstream.
+ */
+#define EF_RISCV_FLOAT_ABI EF_RISCV_FLOAT_ABI_MASK
+
+/* FreeBSD spells this slightly differently to Linux. */
#define R_X86_64_JUMP_SLOT R_X86_64_JMP_SLOT
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/fts.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/fts.h
index 8dfd213..aabe2db 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/fts.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/fts.h
@@ -119,7 +119,7 @@
FTSENT* _Nullable fts_children(FTS* _Nonnull __fts, int __options);
int fts_close(FTS* _Nonnull __fts);
-FTS* _Nullable fts_open(char* _Nonnull const* _Nonnull __path, int __options, int (* _Nullable __comparator)(const FTSENT* _Nonnull * _Nonnull __lhs, const FTSENT* _Nonnull * _Nonnull __rhs));
+FTS* _Nullable fts_open(char* _Nullable const* _Nonnull __path, int __options, int (* _Nullable __comparator)(const FTSENT* _Nonnull * _Nonnull __lhs, const FTSENT* _Nonnull * _Nonnull __rhs));
FTSENT* _Nullable fts_read(FTS* _Nonnull __fts);
int fts_set(FTS* _Nonnull __fts, FTSENT* _Nonnull __entry, int __options);
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/limits.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/limits.h
index 48e7ea9..e1f566c 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/limits.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/limits.h
@@ -136,6 +136,9 @@
#define IOV_MAX 1024
#define SEM_VALUE_MAX 0x3fffffff
+/** Do not use: prefer getline() or asprintf() rather than hard-coding an arbitrary size. */
+#define LINE_MAX _POSIX2_LINE_MAX
+
/* POSIX says these belong in <unistd.h> but BSD has some in <limits.h>. */
#include <bits/posix_limits.h>
@@ -145,9 +148,15 @@
/* >= _POSIX_THREAD_DESTRUCTOR_ITERATIONS */
#define PTHREAD_DESTRUCTOR_ITERATIONS 4
-/* >= _POSIX_THREAD_KEYS_MAX */
+
+/**
+ * The number of calls to pthread_key_create() without intervening calls to
+ * pthread_key_delete() that are guaranteed to succeed. See pthread_key_create()
+ * for more details and ways to avoid hitting this limit.
+ */
#define PTHREAD_KEYS_MAX 128
-/* bionic has no specific limit */
+
+/** bionic has no specific limit on the number of threads. */
#undef PTHREAD_THREADS_MAX
#endif /* !_LIMITS_H_ */
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/link.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/link.h
index 33fea49..ee1fc42 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/link.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/link.h
@@ -25,8 +25,13 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-#ifndef _LINK_H_
-#define _LINK_H_
+
+#pragma once
+
+/**
+ * @file link.h
+ * @brief Extra dynamic linker functionality (see also <dlfcn.h>).
+ */
#include <stdint.h>
#include <sys/cdefs.h>
@@ -37,32 +42,80 @@
__BEGIN_DECLS
#if defined(__LP64__)
+/** Convenience macro to get the appropriate 32-bit or 64-bit <elf.h> type for the caller's bitness. */
#define ElfW(type) Elf64_ ## type
#else
+/** Convenience macro to get the appropriate 32-bit or 64-bit <elf.h> type for the caller's bitness. */
#define ElfW(type) Elf32_ ## type
#endif
+/**
+ * Information passed by dl_iterate_phdr() to the callback.
+ */
struct dl_phdr_info {
+ /** The address of the shared object. */
ElfW(Addr) dlpi_addr;
+ /** The name of the shared object. */
const char* _Nullable dlpi_name;
+ /** Pointer to the shared object's program headers. */
const ElfW(Phdr)* _Nullable dlpi_phdr;
+ /** Number of program headers pointed to by `dlpi_phdr`. */
ElfW(Half) dlpi_phnum;
- // These fields were added in Android R.
+ /**
+ * The total number of library load events at the time dl_iterate_phdr() was
+ * called.
+ *
+ * This field is only available since API level 30; you can use the size
+ * passed to the callback to determine whether you have the full struct,
+ * or just the fields up to and including `dlpi_phnum`.
+ */
unsigned long long dlpi_adds;
+ /**
+ * The total number of library unload events at the time dl_iterate_phdr() was
+ * called.
+ *
+ * This field is only available since API level 30; you can use the size
+ * passed to the callback to determine whether you have the full struct,
+ * or just the fields up to and including `dlpi_phnum`.
+ */
unsigned long long dlpi_subs;
+ /**
+ * The module ID for TLS relocations in this shared object.
+ *
+ * This field is only available since API level 30; you can use the size
+ * passed to the callback to determine whether you have the full struct,
+ * or just the fields up to and including `dlpi_phnum`.
+ */
size_t dlpi_tls_modid;
+ /**
+ * The caller's TLS data for this shared object.
+ *
+ * This field is only available since API level 30; you can use the size
+ * passed to the callback to determine whether you have the full struct,
+ * or just the fields up to and including `dlpi_phnum`.
+ */
void* _Nullable dlpi_tls_data;
};
-int dl_iterate_phdr(int (* _Nonnull __callback)(struct dl_phdr_info* _Nonnull, size_t, void* _Nullable), void* _Nullable __data);
+/**
+ * [dl_iterate_phdr(3)](http://man7.org/linux/man-pages/man3/dl_iterate_phdr.3.html)
+ * calls the given callback once for every loaded shared object. The size
+ * argument to the callback lets you determine whether you have a smaller
+ * `dl_phdr_info` from before API level 30, or the newer full one.
+ * The data argument to the callback is whatever you pass as the data argument
+ * to dl_iterate_phdr().
+ *
+ * Returns the value returned by the final call to the callback.
+ */
+int dl_iterate_phdr(int (* _Nonnull __callback)(struct dl_phdr_info* _Nonnull __info, size_t __size, void* _Nullable __data), void* _Nullable __data);
#ifdef __arm__
typedef uintptr_t _Unwind_Ptr;
_Unwind_Ptr dl_unwind_find_exidx(_Unwind_Ptr, int* _Nonnull);
#endif
-/* Used by the dynamic linker to communicate with the debugger. */
+/** Used by the dynamic linker to communicate with the debugger. */
struct link_map {
ElfW(Addr) l_addr;
char* _Nullable l_name;
@@ -71,7 +124,7 @@
struct link_map* _Nullable l_prev;
};
-/* Used by the dynamic linker to communicate with the debugger. */
+/** Used by the dynamic linker to communicate with the debugger. */
struct r_debug {
int32_t r_version;
struct link_map* _Nullable r_map;
@@ -85,5 +138,3 @@
};
__END_DECLS
-
-#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/malloc.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/malloc.h
index d22b85c..3ebc1be 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/malloc.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/malloc.h
@@ -110,7 +110,7 @@
* [malloc_usable_size(3)](http://man7.org/linux/man-pages/man3/malloc_usable_size.3.html)
* returns the actual size of the given heap block.
*/
-size_t malloc_usable_size(const void* _Nullable __ptr);
+size_t malloc_usable_size(const void* _Nullable __ptr) __wur;
#define __MALLINFO_BODY \
/** Total number of non-mmapped bytes currently allocated from OS. */ \
@@ -186,7 +186,11 @@
int malloc_info(int __must_be_zero, FILE* _Nonnull __fp) __INTRODUCED_IN(23);
/**
- * mallopt() option to set the decay time. Valid values are 0 and 1.
+ * mallopt() option to set the decay time. Valid values are -1, 0 and 1.
+ * -1 : Disable the releasing of unused pages. This value is available since
+ * API level 35.
+ * 0 : Release the unused pages immediately.
+ * 1 : Release the unused pages at a device-specific interval.
*
* Available since API level 27.
*/
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/math.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/math.h
index fc6c228..343ab98 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/math.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/math.h
@@ -68,10 +68,7 @@
#define isnormal(x) __builtin_isnormal(x)
-#define signbit(x) \
- ((sizeof(x) == sizeof(float)) ? __builtin_signbitf(x) \
- : (sizeof(x) == sizeof(double)) ? __builtin_signbit(x) \
- : __builtin_signbitl(x))
+#define signbit(x) __builtin_signbit(x)
double acos(double __x);
float acosf(float __x);
@@ -308,20 +305,6 @@
#define islessgreater(x, y) __builtin_islessgreater((x), (y))
#define isunordered(x, y) __builtin_isunordered((x), (y))
-/*
- * https://code.google.com/p/android/issues/detail?id=271629
- * To be fully compliant with C++, we need to not define these (C doesn't
- * specify them either). Exposing these means that isinf and isnan will have a
- * return type of int in C++ rather than bool like they're supposed to be.
- *
- * GNU libstdc++ 4.9 isn't able to handle a standard compliant C library. Its
- * <cmath> will `#undef isnan` from math.h and only adds the function overloads
- * to the std namespace, making it impossible to use both <cmath> (which gets
- * included by a lot of other standard headers) and ::isnan.
- */
-int (isinf)(double __x) __attribute_const__;
-int (isnan)(double __x) __attribute_const__;
-
/* POSIX extensions. */
extern int signgam;
@@ -362,6 +345,7 @@
double scalb(double __x, double __exponent);
double drem(double __x, double __y);
int finite(double __x) __attribute_const__;
+int isinff(float __x) __attribute_const__;
int isnanf(float __x) __attribute_const__;
double gamma_r(double __x, int* _Nonnull __sign);
double lgamma_r(double __x, int* _Nonnull __sign);
@@ -402,6 +386,8 @@
#define M_2_SQRTPIl 1.128379167095512573896158903121545172L /* 2/sqrt(pi) */
#define M_SQRT2l 1.414213562373095048801688724209698079L /* sqrt(2) */
#define M_SQRT1_2l 0.707106781186547524400844362104849039L /* 1/sqrt(2) */
+int isinfl(long double __x) __attribute_const__;
+int isnanl(long double __x) __attribute_const__;
#endif
__END_DECLS
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/netinet/ether.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/netinet/ether.h
index d570c18..4af7eda 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/netinet/ether.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/netinet/ether.h
@@ -40,7 +40,7 @@
/**
* [ether_ntoa(3)](http://man7.org/linux/man-pages/man3/ether_ntoa.3.html) returns a string
- * representation of the given Ethernet address.
+ * representation of the given Ethernet (MAC) address.
*
* Returns a pointer to a static buffer.
*/
@@ -48,7 +48,7 @@
/**
* [ether_ntoa_r(3)](http://man7.org/linux/man-pages/man3/ether_ntoa_r.3.html) returns a string
- * representation of the given Ethernet address.
+ * representation of the given Ethernet (MAC) address.
*
* Returns a pointer to the given buffer.
*/
@@ -56,7 +56,7 @@
/**
* [ether_aton(3)](http://man7.org/linux/man-pages/man3/ether_aton.3.html) returns an `ether_addr`
- * corresponding to the given Ethernet address string.
+ * corresponding to the given Ethernet (MAC) address string.
*
* Returns a pointer to a static buffer, or NULL if the given string isn't a valid MAC address.
*/
@@ -64,7 +64,7 @@
/**
* [ether_aton_r(3)](http://man7.org/linux/man-pages/man3/ether_aton_r.3.html) returns an
- * `ether_addr` corresponding to the given Ethernet address string.
+ * `ether_addr` corresponding to the given Ethernet (MAC) address string.
*
* Returns a pointer to the given buffer, or NULL if the given string isn't a valid MAC address.
*/
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/netinet/igmp.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/netinet/igmp.h
new file mode 100644
index 0000000..497d02d
--- /dev/null
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/netinet/igmp.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#pragma once
+
+/**
+ * @file netinet/igmp.h
+ * @brief Internet Group Management Protocol (IGMP).
+ */
+
+#include <sys/cdefs.h>
+#include <netinet/in.h>
+
+#include <linux/igmp.h>
+
+/**
+ * The uapi type is called `igmphdr`,
+ * doesn't have the `igmp_` prefix on each field,
+ * and uses a `__be32` for the group address.
+ *
+ * This is the type that BSDs and musl/glibc expose to userspace.
+ */
+struct igmp {
+ uint8_t igmp_type;
+ uint8_t igmp_code;
+ uint16_t igmp_cksum;
+ struct in_addr igmp_group;
+};
+
+/** Commonly-used BSD synonym for the Linux constant. */
+#define IGMP_MEMBERSHIP_QUERY IGMP_HOST_MEMBERSHIP_QUERY
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/pthread.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/pthread.h
index 871c62c..ef41e2d 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/pthread.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/pthread.h
@@ -174,7 +174,29 @@
int pthread_join(pthread_t __pthread, void* _Nullable * _Nullable __return_value_ptr);
+/**
+ * [pthread_key_create(3)](https://man7.org/linux/man-pages/man3/pthread_key_create.3p.html)
+ * creates a key for thread-specific data.
+ *
+ * There is a limit of `PTHREAD_KEYS_MAX` keys per process, but most callers
+ * should just use the C or C++ `thread_local` storage specifier anyway. When
+ * targeting new enough OS versions, the compiler will automatically use
+ * ELF TLS; when targeting old OS versions the emutls implementation will
+ * multiplex pthread keys behind the scenes, using one per library rather than
+ * one per thread-local variable. If you are implementing the runtime for a
+ * different language, you should consider similar implementation choices and
+ * avoid a direct one-to-one mapping from thread locals to pthread keys.
+ *
+ * Returns 0 on success and returns an error number on failure.
+ */
int pthread_key_create(pthread_key_t* _Nonnull __key_ptr, void (* _Nullable __key_destructor)(void* _Nullable));
+
+/**
+ * [pthread_key_delete(3)](https://man7.org/linux/man-pages/man3/pthread_key_delete.3p.html)
+ * deletes a key for thread-specific data.
+ *
+ * Returns 0 on success and returns an error number on failure.
+ */
int pthread_key_delete(pthread_key_t __key);
int pthread_mutexattr_destroy(pthread_mutexattr_t* _Nonnull __attr);
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sched.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sched.h
index b1f1842..9f043b6 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sched.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sched.h
@@ -99,7 +99,7 @@
};
/**
- * [sched_setscheduler(2)](http://man7.org/linux/man-pages/man2/sched_getcpu.2.html)
+ * [sched_setscheduler(2)](https://man7.org/linux/man-pages/man2/sched_setscheduler.2.html)
* sets the scheduling policy and associated parameters for the given thread.
*
* Returns 0 on success and returns -1 and sets `errno` on failure.
@@ -107,7 +107,7 @@
int sched_setscheduler(pid_t __pid, int __policy, const struct sched_param* _Nonnull __param);
/**
- * [sched_getscheduler(2)](http://man7.org/linux/man-pages/man2/sched_getcpu.2.html)
+ * [sched_getscheduler(2)](https://man7.org/linux/man-pages/man2/sched_getscheduler.2)
* gets the scheduling policy for the given thread.
*
* Returns a non-negative thread policy on success and returns -1 and sets
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/signal.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/signal.h
index cf83db8..9d47bcc 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/signal.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/signal.h
@@ -86,17 +86,17 @@
int sigwait64(const sigset64_t* _Nonnull __set, int* _Nonnull __signal) __INTRODUCED_IN(28);
int sighold(int __signal)
- __attribute__((deprecated("use sigprocmask() or pthread_sigmask() instead")))
+ __attribute__((__deprecated__("use sigprocmask() or pthread_sigmask() instead")))
__INTRODUCED_IN(26);
int sigignore(int __signal)
- __attribute__((deprecated("use sigaction() instead"))) __INTRODUCED_IN(26);
+ __attribute__((__deprecated__("use sigaction() instead"))) __INTRODUCED_IN(26);
int sigpause(int __signal)
- __attribute__((deprecated("use sigsuspend() instead"))) __INTRODUCED_IN(26);
+ __attribute__((__deprecated__("use sigsuspend() instead"))) __INTRODUCED_IN(26);
int sigrelse(int __signal)
- __attribute__((deprecated("use sigprocmask() or pthread_sigmask() instead")))
+ __attribute__((__deprecated__("use sigprocmask() or pthread_sigmask() instead")))
__INTRODUCED_IN(26);
sighandler_t _Nonnull sigset(int __signal, sighandler_t _Nullable __handler)
- __attribute__((deprecated("use sigaction() instead"))) __INTRODUCED_IN(26);
+ __attribute__((__deprecated__("use sigaction() instead"))) __INTRODUCED_IN(26);
int raise(int __signal);
int kill(pid_t __pid, int __signal);
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/spawn.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/spawn.h
index 6c34b98..3ce402f 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/spawn.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/spawn.h
@@ -55,7 +55,7 @@
int posix_spawn(pid_t* _Nullable __pid, const char* _Nonnull __path, const posix_spawn_file_actions_t _Nullable * _Nullable __actions, const posix_spawnattr_t _Nullable * _Nullable __attr, char* const _Nonnull __argv[_Nonnull], char* const _Nullable __env[_Nullable]) __INTRODUCED_IN(28);
int posix_spawnp(pid_t* _Nullable __pid, const char* _Nonnull __file, const posix_spawn_file_actions_t _Nullable * _Nullable __actions, const posix_spawnattr_t _Nullable * _Nullable __attr, char* const _Nonnull __argv[_Nonnull], char* const _Nullable __env[_Nullable]) __INTRODUCED_IN(28);
-int posix_spawnattr_init(posix_spawnattr_t _Nonnull * _Nonnull __attr) __INTRODUCED_IN(28);
+int posix_spawnattr_init(posix_spawnattr_t _Nullable * _Nonnull __attr) __INTRODUCED_IN(28);
int posix_spawnattr_destroy(posix_spawnattr_t _Nonnull * _Nonnull __attr) __INTRODUCED_IN(28);
int posix_spawnattr_setflags(posix_spawnattr_t _Nonnull * _Nonnull __attr, short __flags) __INTRODUCED_IN(28);
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/stdio.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/stdio.h
index 312b356..279c658 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/stdio.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/stdio.h
@@ -69,7 +69,7 @@
#define stderr stderr
#else
/* Before M the actual symbols for stdin and friends had different names. */
-extern FILE __sF[] __REMOVED_IN(23);
+extern FILE __sF[] __REMOVED_IN(23, "Use stdin/stdout/stderr");
#define stdin (&__sF[0])
#define stdout (&__sF[1])
@@ -105,10 +105,10 @@
void clearerr(FILE* _Nonnull __fp);
int fclose(FILE* _Nonnull __fp);
-int feof(FILE* _Nonnull __fp);
-int ferror(FILE* _Nonnull __fp);
+__wur int feof(FILE* _Nonnull __fp);
+__wur int ferror(FILE* _Nonnull __fp);
int fflush(FILE* _Nullable __fp);
-int fgetc(FILE* _Nonnull __fp);
+__wur int fgetc(FILE* _Nonnull __fp);
char* _Nullable fgets(char* _Nonnull __buf, int __size, FILE* _Nonnull __fp);
int fprintf(FILE* _Nonnull __fp , const char* _Nonnull __fmt, ...) __printflike(2, 3);
int fputc(int __ch, FILE* _Nonnull __fp);
@@ -116,8 +116,8 @@
size_t fread(void* _Nonnull __buf, size_t __size, size_t __count, FILE* _Nonnull __fp);
int fscanf(FILE* _Nonnull __fp, const char* _Nonnull __fmt, ...) __scanflike(2, 3);
size_t fwrite(const void* _Nonnull __buf, size_t __size, size_t __count, FILE* _Nonnull __fp);
-int getc(FILE* _Nonnull __fp);
-int getchar(void);
+__wur int getc(FILE* _Nonnull __fp);
+__wur int getchar(void);
ssize_t getdelim(char* _Nullable * _Nonnull __line_ptr, size_t* _Nonnull __line_length_ptr, int __delimiter, FILE* _Nonnull __fp);
ssize_t getline(char* _Nullable * _Nonnull __line_ptr, size_t* _Nonnull __line_length_ptr, FILE* _Nonnull __fp);
@@ -141,7 +141,7 @@
#if (defined(__STDC_VERSION__) && __STDC_VERSION__ < 201112L) || \
(defined(__cplusplus) && __cplusplus <= 201103L)
-char* _Nullable gets(char* _Nonnull __buf) __attribute__((deprecated("gets is unsafe, use fgets instead")));
+char* _Nullable gets(char* _Nonnull __buf) __attribute__((__deprecated__("gets is unsafe, use fgets instead")));
#endif
int sprintf(char* __BIONIC_COMPLICATED_NULLNESS __s, const char* _Nonnull __fmt, ...)
__printflike(2, 3) __warnattr_strict("sprintf is often misused; please use snprintf");
@@ -201,17 +201,17 @@
#endif
int fseek(FILE* _Nonnull __fp, long __offset, int __whence);
-long ftell(FILE* _Nonnull __fp);
+__wur long ftell(FILE* _Nonnull __fp);
/* See https://android.googlesource.com/platform/bionic/+/main/docs/32-bit-abi.md */
#if defined(__USE_FILE_OFFSET64)
int fgetpos(FILE* _Nonnull __fp, fpos_t* _Nonnull __pos) __RENAME(fgetpos64) __INTRODUCED_IN(24);
int fsetpos(FILE* _Nonnull __fp, const fpos_t* _Nonnull __pos) __RENAME(fsetpos64) __INTRODUCED_IN(24);
int fseeko(FILE* _Nonnull __fp, off_t __offset, int __whence) __RENAME(fseeko64) __INTRODUCED_IN(24);
-off_t ftello(FILE* _Nonnull __fp) __RENAME(ftello64) __INTRODUCED_IN(24);
+__wur off_t ftello(FILE* _Nonnull __fp) __RENAME(ftello64) __INTRODUCED_IN(24);
# if defined(__USE_BSD)
/* If __read_fn and __write_fn are both nullptr, it will cause EINVAL */
-FILE* _Nullable funopen(const void* _Nullable __cookie,
+__wur FILE* _Nullable funopen(const void* _Nullable __cookie,
int (* __BIONIC_COMPLICATED_NULLNESS __read_fn)(void* _Nonnull, char* _Nonnull, int),
int (* __BIONIC_COMPLICATED_NULLNESS __write_fn)(void* _Nonnull, const char* _Nonnull, int),
fpos_t (* _Nullable __seek_fn)(void* _Nonnull, fpos_t, int),
@@ -221,10 +221,10 @@
int fgetpos(FILE* _Nonnull __fp, fpos_t* _Nonnull __pos);
int fsetpos(FILE* _Nonnull __fp, const fpos_t* _Nonnull __pos);
int fseeko(FILE* _Nonnull __fp, off_t __offset, int __whence);
-off_t ftello(FILE* _Nonnull __fp);
+__wur off_t ftello(FILE* _Nonnull __fp);
# if defined(__USE_BSD)
/* If __read_fn and __write_fn are both nullptr, it will cause EINVAL */
-FILE* _Nullable funopen(const void* _Nullable __cookie,
+__wur FILE* _Nullable funopen(const void* _Nullable __cookie,
int (* __BIONIC_COMPLICATED_NULLNESS __read_fn)(void* _Nonnull, char* _Nonnull, int),
int (* __BIONIC_COMPLICATED_NULLNESS __write_fn)(void* _Nonnull, const char* _Nonnull, int),
fpos_t (* _Nullable __seek_fn)(void* _Nonnull, fpos_t, int),
@@ -234,22 +234,22 @@
int fgetpos64(FILE* _Nonnull __fp, fpos64_t* _Nonnull __pos) __INTRODUCED_IN(24);
int fsetpos64(FILE* _Nonnull __fp, const fpos64_t* _Nonnull __pos) __INTRODUCED_IN(24);
int fseeko64(FILE* _Nonnull __fp, off64_t __offset, int __whence) __INTRODUCED_IN(24);
-off64_t ftello64(FILE* _Nonnull __fp) __INTRODUCED_IN(24);
+__wur off64_t ftello64(FILE* _Nonnull __fp) __INTRODUCED_IN(24);
#if defined(__USE_BSD)
/* If __read_fn and __write_fn are both nullptr, it will cause EINVAL */
-FILE* _Nullable funopen64(const void* _Nullable __cookie,
+__wur FILE* _Nullable funopen64(const void* _Nullable __cookie,
int (* __BIONIC_COMPLICATED_NULLNESS __read_fn)(void* _Nonnull, char* _Nonnull, int),
int (* __BIONIC_COMPLICATED_NULLNESS __write_fn)(void* _Nonnull, const char* _Nonnull, int),
fpos64_t (* _Nullable __seek_fn)(void* _Nonnull, fpos64_t, int),
int (* _Nullable __close_fn)(void* _Nonnull)) __INTRODUCED_IN(24);
#endif
-FILE* _Nullable fopen(const char* _Nonnull __path, const char* _Nonnull __mode);
-FILE* _Nullable fopen64(const char* _Nonnull __path, const char* _Nonnull __mode) __INTRODUCED_IN(24);
+__wur FILE* _Nullable fopen(const char* _Nonnull __path, const char* _Nonnull __mode);
+__wur FILE* _Nullable fopen64(const char* _Nonnull __path, const char* _Nonnull __mode) __INTRODUCED_IN(24);
FILE* _Nullable freopen(const char* _Nullable __path, const char* _Nonnull __mode, FILE* _Nonnull __fp);
FILE* _Nullable freopen64(const char* _Nullable __path, const char* _Nonnull __mode, FILE* _Nonnull __fp) __INTRODUCED_IN(24);
-FILE* _Nullable tmpfile(void);
-FILE* _Nullable tmpfile64(void) __INTRODUCED_IN(24);
+__wur FILE* _Nullable tmpfile(void);
+__wur FILE* _Nullable tmpfile64(void) __INTRODUCED_IN(24);
int snprintf(char* __BIONIC_COMPLICATED_NULLNESS __buf, size_t __size, const char* _Nonnull __fmt, ...) __printflike(3, 4);
int vfscanf(FILE* _Nonnull __fp, const char* _Nonnull __fmt, va_list __args) __scanflike(2, 0);
@@ -260,20 +260,20 @@
#define L_ctermid 1024 /* size for ctermid() */
char* _Nonnull ctermid(char* _Nullable __buf) __INTRODUCED_IN(26);
-FILE* _Nullable fdopen(int __fd, const char* _Nonnull __mode);
-int fileno(FILE* _Nonnull __fp);
+__wur FILE* _Nullable fdopen(int __fd, const char* _Nonnull __mode);
+__wur int fileno(FILE* _Nonnull __fp);
int pclose(FILE* _Nonnull __fp);
-FILE* _Nullable popen(const char* _Nonnull __command, const char* _Nonnull __mode);
+__wur FILE* _Nullable popen(const char* _Nonnull __command, const char* _Nonnull __mode);
void flockfile(FILE* _Nonnull __fp);
int ftrylockfile(FILE* _Nonnull __fp);
void funlockfile(FILE* _Nonnull __fp);
-int getc_unlocked(FILE* _Nonnull __fp);
-int getchar_unlocked(void);
+__wur int getc_unlocked(FILE* _Nonnull __fp);
+__wur int getchar_unlocked(void);
int putc_unlocked(int __ch, FILE* _Nonnull __fp);
int putchar_unlocked(int __ch);
-FILE* _Nullable fmemopen(void* _Nullable __buf, size_t __size, const char* _Nonnull __mode) __INTRODUCED_IN(23);
-FILE* _Nullable open_memstream(char* _Nonnull * _Nonnull __ptr, size_t* _Nonnull __size_ptr) __INTRODUCED_IN(23);
+__wur FILE* _Nullable fmemopen(void* _Nullable __buf, size_t __size, const char* _Nonnull __mode) __INTRODUCED_IN(23);
+__wur FILE* _Nullable open_memstream(char* _Nonnull * _Nonnull __ptr, size_t* _Nonnull __size_ptr) __INTRODUCED_IN(23);
#if defined(__USE_BSD) || defined(__BIONIC__) /* Historically bionic exposed these. */
int asprintf(char* _Nullable * _Nonnull __s_ptr, const char* _Nonnull __fmt, ...) __printflike(2, 3);
@@ -283,16 +283,16 @@
int setlinebuf(FILE* _Nonnull __fp);
int vasprintf(char* _Nullable * _Nonnull __s_ptr, const char* _Nonnull __fmt, va_list __args) __printflike(2, 0);
void clearerr_unlocked(FILE* _Nonnull __fp) __INTRODUCED_IN(23);
-int feof_unlocked(FILE* _Nonnull __fp) __INTRODUCED_IN(23);
-int ferror_unlocked(FILE* _Nonnull __fp) __INTRODUCED_IN(23);
-int fileno_unlocked(FILE* _Nonnull __fp) __INTRODUCED_IN(24);
+__wur int feof_unlocked(FILE* _Nonnull __fp) __INTRODUCED_IN(23);
+__wur int ferror_unlocked(FILE* _Nonnull __fp) __INTRODUCED_IN(23);
+__wur int fileno_unlocked(FILE* _Nonnull __fp) __INTRODUCED_IN(24);
#define fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0)
#define fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0)
#endif
#if defined(__USE_BSD)
int fflush_unlocked(FILE* _Nullable __fp) __INTRODUCED_IN(28);
-int fgetc_unlocked(FILE* _Nonnull __fp) __INTRODUCED_IN(28);
+__wur int fgetc_unlocked(FILE* _Nonnull __fp) __INTRODUCED_IN(28);
int fputc_unlocked(int __ch, FILE* _Nonnull __fp) __INTRODUCED_IN(28);
size_t fread_unlocked(void* _Nonnull __buf, size_t __size, size_t __count, FILE* _Nonnull __fp) __INTRODUCED_IN(28);
size_t fwrite_unlocked(const void* _Nonnull __buf, size_t __size, size_t __count, FILE* _Nonnull __fp) __INTRODUCED_IN(28);
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/stdlib.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/stdlib.h
index 2830a49..d0efc4c 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/stdlib.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/stdlib.h
@@ -57,7 +57,7 @@
int clearenv(void);
char* _Nullable mkdtemp(char* _Nonnull __template);
-char* _Nullable mktemp(char* _Nonnull __template) __attribute__((deprecated("mktemp is unsafe, use mkstemp or tmpfile instead")));
+char* _Nullable mktemp(char* _Nonnull __template) __attribute__((__deprecated__("mktemp is unsafe, use mkstemp or tmpfile instead")));
int mkostemp64(char* _Nonnull __template, int __flags) __INTRODUCED_IN(23);
int mkostemp(char* _Nonnull __template, int __flags) __INTRODUCED_IN(23);
@@ -105,7 +105,14 @@
*/
int system(const char* _Nonnull __command);
-void* _Nullable bsearch(const void* _Nonnull __key, const void* _Nullable __base, size_t __nmemb, size_t __size, int (* _Nonnull __comparator)(const void* _Nonnull __lhs, const void* _Nonnull __rhs));
+/**
+ * [bsearch(3)](http://man7.org/linux/man-pages/man3/bsearch.3.html) searches
+ * a sorted array.
+ *
+ * Returns a pointer to a matching item on success,
+ * or NULL if no matching item is found.
+ */
+__wur void* _Nullable bsearch(const void* _Nonnull __key, const void* _Nullable __base, size_t __nmemb, size_t __size, int (* _Nonnull __comparator)(const void* _Nonnull __lhs, const void* _Nonnull __rhs));
void qsort(void* _Nullable __base, size_t __nmemb, size_t __size, int (* _Nonnull __comparator)(const void* _Nullable __lhs, const void* _Nullable __rhs));
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/strings.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/strings.h
index 2f4f764..4b8cc08 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/strings.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/strings.h
@@ -61,13 +61,13 @@
/** Deprecated. Use memmove() instead. */
#define bcopy(b1, b2, len) __bionic_bcopy((b1), (b2), (len))
-static __inline__ __always_inline void __bionic_bcopy(const void* _Nonnull b1, void* _Nonnull b2, size_t len) {
+static __inline __always_inline void __bionic_bcopy(const void* _Nonnull b1, void* _Nonnull b2, size_t len) {
__builtin_memmove(b2, b1, len);
}
/** Deprecated. Use memset() instead. */
#define bzero(b, len) __bionic_bzero((b), (len))
-static __inline__ __always_inline void __bionic_bzero(void* _Nonnull b, size_t len) {
+static __inline __always_inline void __bionic_bzero(void* _Nonnull b, size_t len) {
__builtin_memset(b, 0, len);
}
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/_system_properties.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/_system_properties.h
index 079c825..078e857 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/_system_properties.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/_system_properties.h
@@ -41,6 +41,7 @@
__BEGIN_DECLS
#define PROP_SERVICE_NAME "property_service"
+#define PROP_SERVICE_FOR_SYSTEM_NAME "property_service_for_system"
#define PROP_DIRNAME "/dev/__properties__"
#define PROP_MSG_SETPROP 1
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/cdefs.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/cdefs.h
index a8fb624..5d1718e 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/cdefs.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/cdefs.h
@@ -87,9 +87,12 @@
#define __STRING(x) #x
#define ___STRING(x) __STRING(x)
-#if defined(__cplusplus)
-#define __inline inline /* convert to C++ keyword */
-#endif /* !__cplusplus */
+// C++ has `inline` as a keyword, as does C99, but ANSI C (aka C89 aka C90)
+// does not. Everything accepts the `__inline__` extension though. We could
+// just use that directly in our own code, but there's historical precedent
+// for `__inline` meaning it's still used in upstream BSD code (and potentially
+// downstream in vendor or app code).
+#define __inline __inline__
#define __always_inline __attribute__((__always_inline__))
#define __attribute_const__ __attribute__((__const__))
@@ -139,12 +142,12 @@
#define __wur __attribute__((__warn_unused_result__))
-#define __errorattr(msg) __attribute__((unavailable(msg)))
-#define __warnattr(msg) __attribute__((deprecated(msg)))
-#define __warnattr_real(msg) __attribute__((deprecated(msg)))
-#define __enable_if(cond, msg) __attribute__((enable_if(cond, msg)))
-#define __clang_error_if(cond, msg) __attribute__((diagnose_if(cond, msg, "error")))
-#define __clang_warning_if(cond, msg) __attribute__((diagnose_if(cond, msg, "warning")))
+#define __errorattr(msg) __attribute__((__unavailable__(msg)))
+#define __warnattr(msg) __attribute__((__deprecated__(msg)))
+#define __warnattr_real(msg) __attribute__((__deprecated__(msg)))
+#define __enable_if(cond, msg) __attribute__((__enable_if__(cond, msg)))
+#define __clang_error_if(cond, msg) __attribute__((__diagnose_if__(cond, msg, "error")))
+#define __clang_warning_if(cond, msg) __attribute__((__diagnose_if__(cond, msg, "warning")))
#if defined(ANDROID_STRICT)
/*
@@ -248,7 +251,7 @@
#if defined(__BIONIC_FORTIFY)
# define __bos0(s) __bosn((s), 0)
-# define __pass_object_size_n(n) __attribute__((pass_object_size(n)))
+# define __pass_object_size_n(n) __attribute__((__pass_object_size__(n)))
/*
* FORTIFY'ed functions all have either enable_if or pass_object_size, which
* makes taking their address impossible. Saying (&read)(foo, bar, baz); will
@@ -260,7 +263,7 @@
* them available externally. FORTIFY'ed functions try to be as close to possible as 'invisible';
* having stack protectors detracts from that (b/182948263).
*/
-# define __BIONIC_FORTIFY_INLINE static __inline__ __attribute__((no_stack_protector)) \
+# define __BIONIC_FORTIFY_INLINE static __inline __attribute__((__no_stack_protector__)) \
__always_inline __VERSIONER_FORTIFY_INLINE
/*
* We should use __BIONIC_FORTIFY_VARIADIC instead of __BIONIC_FORTIFY_INLINE
@@ -268,9 +271,9 @@
* The __always_inline attribute is useless, misleading, and could trigger
* clang compiler bug to incorrectly inline variadic functions.
*/
-# define __BIONIC_FORTIFY_VARIADIC static __inline__
+# define __BIONIC_FORTIFY_VARIADIC static __inline
/* Error functions don't have bodies, so they can just be static. */
-# define __BIONIC_ERROR_FUNCTION_VISIBILITY static __attribute__((unused))
+# define __BIONIC_ERROR_FUNCTION_VISIBILITY static __unused
#else
/* Further increase sharing for some inline functions */
# define __pass_object_size_n(n)
@@ -300,47 +303,32 @@
# define __BIONIC_INCLUDE_FORTIFY_HEADERS 1
#endif
-#define __overloadable __attribute__((overloadable))
+#define __overloadable __attribute__((__overloadable__))
-#define __diagnose_as_builtin(...) __attribute__((diagnose_as_builtin(__VA_ARGS__)))
+#define __diagnose_as_builtin(...) __attribute__((__diagnose_as_builtin__(__VA_ARGS__)))
/* Used to tag non-static symbols that are private and never exposed by the shared library. */
-#define __LIBC_HIDDEN__ __attribute__((visibility("hidden")))
+#define __LIBC_HIDDEN__ __attribute__((__visibility__("hidden")))
/*
* Used to tag symbols that should be hidden for 64-bit,
* but visible to preserve binary compatibility for LP32.
*/
#ifdef __LP64__
-#define __LIBC32_LEGACY_PUBLIC__ __attribute__((visibility("hidden")))
+#define __LIBC32_LEGACY_PUBLIC__ __attribute__((__visibility__("hidden")))
#else
-#define __LIBC32_LEGACY_PUBLIC__ __attribute__((visibility("default")))
+#define __LIBC32_LEGACY_PUBLIC__ __attribute__((__visibility__("default")))
#endif
/* Used to rename functions so that the compiler emits a call to 'x' rather than the function this was applied to. */
#define __RENAME(x) __asm__(#x)
-#if __has_builtin(__builtin_umul_overflow) || __GNUC__ >= 5
-#if defined(__LP64__)
-#define __size_mul_overflow(a, b, result) __builtin_umull_overflow(a, b, result)
-#else
-#define __size_mul_overflow(a, b, result) __builtin_umul_overflow(a, b, result)
-#endif
-#else
-extern __inline__ __always_inline __attribute__((gnu_inline))
-int __size_mul_overflow(__SIZE_TYPE__ a, __SIZE_TYPE__ b, __SIZE_TYPE__ *result) {
- *result = a * b;
- static const __SIZE_TYPE__ mul_no_overflow = 1UL << (sizeof(__SIZE_TYPE__) * 4);
- return (a >= mul_no_overflow || b >= mul_no_overflow) && a > 0 && (__SIZE_TYPE__)-1 / a < b;
-}
-#endif
-
/*
* Used when we need to check for overflow when multiplying x and y. This
- * should only be used where __size_mul_overflow can not work, because it makes
- * assumptions that __size_mul_overflow doesn't (x and y are positive, ...),
+ * should only be used where __builtin_umull_overflow can not work, because it makes
+ * assumptions that __builtin_umull_overflow doesn't (x and y are positive, ...),
* *and* doesn't make use of compiler intrinsics, so it's probably slower than
- * __size_mul_overflow.
+ * __builtin_umull_overflow.
*/
#define __unsafe_check_mul_overflow(x, y) ((__SIZE_TYPE__)-1 / (x) < (y))
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/io.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/io.h
new file mode 100644
index 0000000..d187b78
--- /dev/null
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/io.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#pragma once
+
+/**
+ * @file sys/io.h
+ * @brief The x86/x86-64 I/O port functions iopl() and ioperm().
+ */
+
+#include <sys/cdefs.h>
+
+#include <errno.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+
+__BEGIN_DECLS
+
+/**
+ * [iopl(2)](http://man7.org/linux/man-pages/man2/iopl.2.html) changes the I/O
+ * privilege level for all x86/x8-64 I/O ports, for the calling thread.
+ *
+ * New callers should use ioperm() instead.
+ *
+ * Returns 0 on success, and returns -1 and sets `errno` on failure.
+ *
+ * Only available for x86/x86-64.
+ */
+#if defined(__NR_iopl)
+__attribute__((__deprecated__("use ioperm() instead"))) static __inline int iopl(int __level) {
+ return syscall(__NR_iopl, __level);
+}
+#endif
+
+/**
+ * [ioperm(2)](http://man7.org/linux/man-pages/man2/ioperm.2.html) sets the I/O
+ * permissions for the given number of x86/x86-64 I/O ports, starting at the
+ * given port.
+ *
+ * Returns 0 on success, and returns -1 and sets `errno` on failure.
+ *
+ * Only available for x86/x86-64.
+ */
+#if defined(__NR_iopl)
+static __inline int ioperm(unsigned long __from, unsigned long __n, int __enabled) {
+ return syscall(__NR_ioperm, __from, __n, __enabled);
+}
+#endif
+
+__END_DECLS
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/msg.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/msg.h
index ad481a0..26071b1 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/msg.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/msg.h
@@ -46,7 +46,7 @@
typedef __kernel_ulong_t msglen_t;
/** Not useful on Android; disallowed by SELinux. */
-int msgctl(int __msg_id, int __cmd, struct msqid_ds* _Nullable __buf) __INTRODUCED_IN(26);
+int msgctl(int __msg_id, int __op, struct msqid_ds* _Nullable __buf) __INTRODUCED_IN(26);
/** Not useful on Android; disallowed by SELinux. */
int msgget(key_t __key, int __flags) __INTRODUCED_IN(26);
/** Not useful on Android; disallowed by SELinux. */
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/param.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/param.h
index 79ae067..1c991ae 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/param.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/param.h
@@ -41,8 +41,11 @@
/** The unit of `st_blocks` in `struct stat`. */
#define DEV_BSIZE 512
-/** A historical name for PATH_MAX. */
-#define MAXPATHLEN PATH_MAX
+/** A historical name for PATH_MAX. Use PATH_MAX in new code. */
+#define MAXPATHLEN PATH_MAX
+
+/** A historical name for NGROUPS_MAX. Use NGROUPS_MAX in new code. */
+#define NGROUPS NGROUPS_MAX
#define MAXSYMLINKS 8
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/prctl.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/prctl.h
index ff03c33..1c80415 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/prctl.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/prctl.h
@@ -45,6 +45,6 @@
*
* Returns -1 and sets `errno` on failure; success values vary by option.
*/
-int prctl(int __option, ...);
+int prctl(int __op, ...);
__END_DECLS
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/ptrace.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/ptrace.h
index 022fc3a..66b30a1 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/ptrace.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/ptrace.h
@@ -59,7 +59,7 @@
#define PT_GETSIGINFO PTRACE_GETSIGINFO
#define PT_SETSIGINFO PTRACE_SETSIGINFO
-long ptrace(int __request, ...);
+long ptrace(int __op, ...);
__END_DECLS
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/quota.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/quota.h
index 79c653d..37f8925 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/quota.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/quota.h
@@ -51,6 +51,6 @@
*
* Available since API level 26.
*/
-int quotactl(int __cmd, const char* _Nullable __special, int __id, char* __BIONIC_COMPLICATED_NULLNESS __addr) __INTRODUCED_IN(26);
+int quotactl(int __op, const char* _Nullable __special, int __id, char* __BIONIC_COMPLICATED_NULLNESS __addr) __INTRODUCED_IN(26);
__END_DECLS
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/reboot.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/reboot.h
index 156d947..5d9e1a7 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/reboot.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/reboot.h
@@ -55,6 +55,6 @@
* Does not return on successful reboot, returns 0 if CAD was successfully enabled/disabled,
* and returns -1 and sets `errno` on failure.
*/
-int reboot(int __cmd);
+int reboot(int __op);
__END_DECLS
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/sem.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/sem.h
index f4256e2..5682282 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/sem.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/sem.h
@@ -51,7 +51,7 @@
void* _Nullable __pad;
};
-int semctl(int __sem_id, int __sem_num, int __cmd, ...) __INTRODUCED_IN(26);
+int semctl(int __sem_id, int __sem_num, int __op, ...) __INTRODUCED_IN(26);
int semget(key_t __key, int __sem_count, int __flags) __INTRODUCED_IN(26);
int semop(int __sem_id, struct sembuf* _Nonnull __ops, size_t __op_count) __INTRODUCED_IN(26);
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/shm.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/shm.h
index 9d58046..8ab3d9a 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/shm.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/shm.h
@@ -36,11 +36,12 @@
#include <sys/cdefs.h>
#include <sys/ipc.h>
#include <sys/types.h>
+#include <unistd.h>
#include <linux/shm.h>
#define shmid_ds shmid64_ds
-#define SHMLBA 4096
+#define SHMLBA getpagesize()
__BEGIN_DECLS
@@ -49,7 +50,7 @@
/** Not useful on Android; disallowed by SELinux. */
void* _Nonnull shmat(int __shm_id, const void* _Nullable __addr, int __flags) __INTRODUCED_IN(26);
/** Not useful on Android; disallowed by SELinux. */
-int shmctl(int __shm_id, int __cmd, struct shmid_ds* _Nullable __buf) __INTRODUCED_IN(26);
+int shmctl(int __shm_id, int __op, struct shmid_ds* _Nullable __buf) __INTRODUCED_IN(26);
/** Not useful on Android; disallowed by SELinux. */
int shmdt(const void* _Nonnull __addr) __INTRODUCED_IN(26);
/** Not useful on Android; disallowed by SELinux. */
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/socket.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/socket.h
index 9402e70..47ddce0 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/socket.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/socket.h
@@ -277,41 +277,33 @@
#define IPX_TYPE 1
-#ifdef __i386__
-# define __socketcall extern __attribute__((__cdecl__))
-#else
-# define __socketcall extern
-#endif
-
-__socketcall int accept(int __fd, struct sockaddr* _Nullable __addr, socklen_t* _Nullable __addr_length);
-__socketcall int accept4(int __fd, struct sockaddr* _Nullable __addr, socklen_t* _Nullable __addr_length, int __flags);
-__socketcall int bind(int __fd, const struct sockaddr* _Nonnull __addr, socklen_t __addr_length);
-__socketcall int connect(int __fd, const struct sockaddr* _Nonnull __addr, socklen_t __addr_length);
-__socketcall int getpeername(int __fd, struct sockaddr* _Nonnull __addr, socklen_t* _Nonnull __addr_length);
-__socketcall int getsockname(int __fd, struct sockaddr* _Nonnull __addr, socklen_t* _Nonnull __addr_length);
-__socketcall int getsockopt(int __fd, int __level, int __option, void* _Nullable __value, socklen_t* _Nonnull __value_length);
-__socketcall int listen(int __fd, int __backlog);
-__socketcall int recvmmsg(int __fd, struct mmsghdr* _Nonnull __msgs, unsigned int __msg_count, int __flags, const struct timespec* _Nullable __timeout);
-__socketcall ssize_t recvmsg(int __fd, struct msghdr* _Nonnull __msg, int __flags);
-__socketcall int sendmmsg(int __fd, const struct mmsghdr* _Nonnull __msgs, unsigned int __msg_count, int __flags);
-__socketcall ssize_t sendmsg(int __fd, const struct msghdr* _Nonnull __msg, int __flags);
-__socketcall int setsockopt(int __fd, int __level, int __option, const void* _Nullable __value, socklen_t __value_length);
-__socketcall int shutdown(int __fd, int __how);
-__socketcall int socket(int __af, int __type, int __protocol);
-__socketcall int socketpair(int __af, int __type, int __protocol, int __fds[_Nonnull 2]);
+int accept(int __fd, struct sockaddr* _Nullable __addr, socklen_t* _Nullable __addr_length);
+int accept4(int __fd, struct sockaddr* _Nullable __addr, socklen_t* _Nullable __addr_length, int __flags);
+int bind(int __fd, const struct sockaddr* _Nonnull __addr, socklen_t __addr_length);
+int connect(int __fd, const struct sockaddr* _Nonnull __addr, socklen_t __addr_length);
+int getpeername(int __fd, struct sockaddr* _Nonnull __addr, socklen_t* _Nonnull __addr_length);
+int getsockname(int __fd, struct sockaddr* _Nonnull __addr, socklen_t* _Nonnull __addr_length);
+int getsockopt(int __fd, int __level, int __option, void* _Nullable __value, socklen_t* _Nonnull __value_length);
+int listen(int __fd, int __backlog);
+int recvmmsg(int __fd, struct mmsghdr* _Nonnull __msgs, unsigned int __msg_count, int __flags, const struct timespec* _Nullable __timeout);
+ssize_t recvmsg(int __fd, struct msghdr* _Nonnull __msg, int __flags);
+int sendmmsg(int __fd, const struct mmsghdr* _Nonnull __msgs, unsigned int __msg_count, int __flags);
+ssize_t sendmsg(int __fd, const struct msghdr* _Nonnull __msg, int __flags);
+int setsockopt(int __fd, int __level, int __option, const void* _Nullable __value, socklen_t __value_length);
+int shutdown(int __fd, int __how);
+int socket(int __af, int __type, int __protocol);
+int socketpair(int __af, int __type, int __protocol, int __fds[_Nonnull 2]);
ssize_t recv(int __fd, void* _Nullable __buf, size_t __n, int __flags);
ssize_t send(int __fd, const void* _Nonnull __buf, size_t __n, int __flags);
-__socketcall ssize_t sendto(int __fd, const void* _Nonnull __buf, size_t __n, int __flags, const struct sockaddr* _Nullable __dst_addr, socklen_t __dst_addr_length);
-__socketcall ssize_t recvfrom(int __fd, void* _Nullable __buf, size_t __n, int __flags, struct sockaddr* _Nullable __src_addr, socklen_t* _Nullable __src_addr_length);
+ssize_t sendto(int __fd, const void* _Nonnull __buf, size_t __n, int __flags, const struct sockaddr* _Nullable __dst_addr, socklen_t __dst_addr_length);
+ssize_t recvfrom(int __fd, void* _Nullable __buf, size_t __n, int __flags, struct sockaddr* _Nullable __src_addr, socklen_t* _Nullable __src_addr_length);
#if defined(__BIONIC_INCLUDE_FORTIFY_HEADERS)
#include <bits/fortify/socket.h>
#endif
-#undef __socketcall
-
__END_DECLS
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/system_properties.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/system_properties.h
index dc869da..ae94db5 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/system_properties.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/sys/system_properties.h
@@ -26,8 +26,12 @@
* SUCH DAMAGE.
*/
-#ifndef _INCLUDE_SYS_SYSTEM_PROPERTIES_H
-#define _INCLUDE_SYS_SYSTEM_PROPERTIES_H
+#pragma once
+
+/**
+ * @file system_properties.h
+ * @brief System properties.
+ */
#include <sys/cdefs.h>
#include <stdbool.h>
@@ -36,39 +40,53 @@
__BEGIN_DECLS
+/** An opaque structure representing a system property. */
typedef struct prop_info prop_info;
+/**
+ * The limit on the length of a property value.
+ * (See PROP_NAME_MAX for property names.)
+ */
#define PROP_VALUE_MAX 92
-/*
+/**
* Sets system property `name` to `value`, creating the system property if it doesn't already exist.
+ *
+ * Returns 0 on success, or -1 on failure.
*/
int __system_property_set(const char* _Nonnull __name, const char* _Nonnull __value);
-/*
+/**
* Returns a `prop_info` corresponding system property `name`, or nullptr if it doesn't exist.
- * Use __system_property_read_callback to query the current value.
+ * Use __system_property_read_callback() to query the current value.
*
- * Property lookup is expensive, so it can be useful to cache the result of this function.
+ * Property lookup is expensive, so it can be useful to cache the result of this
+ * function rather than using __system_property_get().
*/
const prop_info* _Nullable __system_property_find(const char* _Nonnull __name);
-/*
- * Calls `callback` with a consistent trio of name, value, and serial number for property `pi`.
+/**
+ * Calls `callback` with a consistent trio of name, value, and serial number
+ * for property `pi`.
+ *
+ * Available since API level 26.
*/
void __system_property_read_callback(const prop_info* _Nonnull __pi,
void (* _Nonnull __callback)(void* _Nullable __cookie, const char* _Nonnull __name, const char* _Nonnull __value, uint32_t __serial),
void* _Nullable __cookie) __INTRODUCED_IN(26);
-/*
+/**
* Passes a `prop_info` for each system property to the provided
- * callback. Use __system_property_read_callback() to read the value.
+ * callback. Use __system_property_read_callback() to read the value of
+ * any of the properties.
*
* This method is for inspecting and debugging the property system, and not generally useful.
+ *
+ * Returns 0 on success, or -1 on failure.
*/
int __system_property_foreach(void (* _Nonnull __callback)(const prop_info* _Nonnull __pi, void* _Nullable __cookie), void* _Nullable __cookie);
-/*
+/**
* Waits for the specific system property identified by `pi` to be updated
* past `old_serial`. Waits no longer than `relative_timeout`, or forever
* if `relative_timeout` is null.
@@ -79,20 +97,24 @@
*
* Returns true and updates `*new_serial_ptr` on success, or false if the call
* timed out.
+ *
+ * Available since API level 26.
*/
struct timespec;
bool __system_property_wait(const prop_info* _Nullable __pi, uint32_t __old_serial, uint32_t* _Nonnull __new_serial_ptr, const struct timespec* _Nullable __relative_timeout)
__INTRODUCED_IN(26);
-/* Deprecated. In Android O and above, there's no limit on property name length. */
+/**
+ * Deprecated: there's no limit on the length of a property name since
+ * API level 26, though the limit on property values (PROP_VALUE_MAX) remains.
+ */
#define PROP_NAME_MAX 32
-/* Deprecated. Use __system_property_read_callback instead. */
+
+/** Deprecated. Use __system_property_read_callback() instead. */
int __system_property_read(const prop_info* _Nonnull __pi, char* _Nullable __name, char* _Nonnull __value);
-/* Deprecated. Use __system_property_read_callback instead. */
+/** Deprecated. Use __system_property_read_callback() instead. */
int __system_property_get(const char* _Nonnull __name, char* _Nonnull __value);
-/* Deprecated. Use __system_property_foreach instead. */
+/** Deprecated. Use __system_property_foreach() instead. */
const prop_info* _Nullable __system_property_find_nth(unsigned __n);
__END_DECLS
-
-#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/time.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/time.h
index 45c5c34..f448851 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/time.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/time.h
@@ -365,13 +365,14 @@
/**
* [clock_nanosleep(2)](http://man7.org/linux/man-pages/man2/clock_nanosleep.2.html)
- * sleeps for the given time as measured by the given clock.
+ * sleeps for the given time (or until the given time if the TIMER_ABSTIME flag
+ * is used), as measured by the given clock.
*
* Returns 0 on success, and returns -1 and returns an error number on failure.
* If the sleep was interrupted by a signal, the return value will be `EINTR`
* and `remainder` will be the amount of time remaining.
*/
-int clock_nanosleep(clockid_t __clock, int __flags, const struct timespec* _Nonnull __duration, struct timespec* _Nullable __remainder);
+int clock_nanosleep(clockid_t __clock, int __flags, const struct timespec* _Nonnull __time, struct timespec* _Nullable __remainder);
/**
* [clock_settime(2)](http://man7.org/linux/man-pages/man2/clock_settime.2.html)
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/unistd.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/unistd.h
index c8cceb2..2552ca8 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/unistd.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/include/unistd.h
@@ -78,10 +78,57 @@
__noreturn void _exit(int __status);
-pid_t fork(void);
-pid_t vfork(void) __returns_twice;
+/**
+ * [fork(2)](http://man7.org/linux/man-pages/man2/fork.2.html) creates a new
+ * process. fork() runs any handlers set by pthread_atfork().
+ *
+ * Returns 0 in the child, the pid of the child in the parent,
+ * and returns -1 and sets `errno` on failure.
+ */
+pid_t fork(void);
+
+/**
+ * _Fork() creates a new process. _Fork() differs from fork() in that it does
+ * not run any handlers set by pthread_atfork(). In addition to any user-defined
+ * ones, bionic uses pthread_atfork() handlers to ensure consistency of its own
+ * state, so the child should only call
+ * [POSIX async-safe](https://man7.org/linux/man-pages/man7/signal-safety.7.html)
+ * functions.
+ *
+ * Returns 0 in the child, the pid of the child in the parent,
+ * and returns -1 and sets `errno` on failure.
+ *
+ * Available since API level 35.
+ */
+pid_t _Fork(void) __INTRODUCED_IN(35);
+
+/**
+ * [vfork(2)](http://man7.org/linux/man-pages/man2/vfork.2.html) creates a new
+ * process. vfork() differs from fork() in that it does not run any handlers
+ * set by pthread_atfork(), and the parent is suspended until the child calls
+ * exec() or exits.
+ *
+ * Returns 0 in the child, the pid of the child in the parent,
+ * and returns -1 and sets `errno` on failure.
+ */
+pid_t vfork(void) __returns_twice;
+
+/**
+ * [getpid(2)](http://man7.org/linux/man-pages/man2/getpid.2.html) returns
+ * the caller's process ID.
+ *
+ * Returns the caller's process ID.
+ */
pid_t getpid(void);
-pid_t gettid(void) __attribute_const__;
+
+/**
+ * [gettid(2)](http://man7.org/linux/man-pages/man2/gettid.2.html) returns
+ * the caller's thread ID.
+ *
+ * Returns the caller's thread ID.
+ */
+pid_t gettid(void);
+
pid_t getpgid(pid_t __pid);
int setpgid(pid_t __pid, pid_t __pgid);
pid_t getppid(void);
@@ -303,6 +350,13 @@
int acct(const char* _Nullable __path);
+/**
+ * [getpagesize(2)](https://man7.org/linux/man-pages/man2/getpagesize.2.html)
+ * returns the system's page size. This is slightly faster than going via
+ * sysconf(), and avoids the linear search in getauxval().
+ *
+ * Returns the system's page size in bytes.
+ */
int getpagesize(void) __attribute_const__;
long syscall(long __number, ...);
@@ -310,8 +364,11 @@
int daemon(int __no_chdir, int __no_close);
#if defined(__arm__)
+/**
+ * New code should use __builtin___clear_cache() instead, which works on
+ * all architectures.
+ */
int cacheflush(long __addr, long __nbytes, long __cache);
- /* __attribute__((deprecated("use __builtin___clear_cache instead"))); */
#endif
pid_t tcgetpgrp(int __fd);
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm/asm/unistd-eabi.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm/asm/unistd-eabi.h
index 482b9cb..1032131 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm/asm/unistd-eabi.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm/asm/unistd-eabi.h
@@ -415,4 +415,9 @@
#define __NR_futex_wake (__NR_SYSCALL_BASE + 454)
#define __NR_futex_wait (__NR_SYSCALL_BASE + 455)
#define __NR_futex_requeue (__NR_SYSCALL_BASE + 456)
+#define __NR_statmount (__NR_SYSCALL_BASE + 457)
+#define __NR_listmount (__NR_SYSCALL_BASE + 458)
+#define __NR_lsm_get_self_attr (__NR_SYSCALL_BASE + 459)
+#define __NR_lsm_set_self_attr (__NR_SYSCALL_BASE + 460)
+#define __NR_lsm_list_modules (__NR_SYSCALL_BASE + 461)
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm/asm/unistd-oabi.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm/asm/unistd-oabi.h
index 5126831..1f57604 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm/asm/unistd-oabi.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm/asm/unistd-oabi.h
@@ -427,4 +427,9 @@
#define __NR_futex_wake (__NR_SYSCALL_BASE + 454)
#define __NR_futex_wait (__NR_SYSCALL_BASE + 455)
#define __NR_futex_requeue (__NR_SYSCALL_BASE + 456)
+#define __NR_statmount (__NR_SYSCALL_BASE + 457)
+#define __NR_listmount (__NR_SYSCALL_BASE + 458)
+#define __NR_lsm_get_self_attr (__NR_SYSCALL_BASE + 459)
+#define __NR_lsm_set_self_attr (__NR_SYSCALL_BASE + 460)
+#define __NR_lsm_list_modules (__NR_SYSCALL_BASE + 461)
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm64/asm/hwcap.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm64/asm/hwcap.h
index 5abff63..f5c720a 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm64/asm/hwcap.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm64/asm/hwcap.h
@@ -86,4 +86,19 @@
#define HWCAP2_SVE_B16B16 (1UL << 45)
#define HWCAP2_LRCPC3 (1UL << 46)
#define HWCAP2_LSE128 (1UL << 47)
+#define HWCAP2_FPMR (1UL << 48)
+#define HWCAP2_LUT (1UL << 49)
+#define HWCAP2_FAMINMAX (1UL << 50)
+#define HWCAP2_F8CVT (1UL << 51)
+#define HWCAP2_F8FMA (1UL << 52)
+#define HWCAP2_F8DP4 (1UL << 53)
+#define HWCAP2_F8DP2 (1UL << 54)
+#define HWCAP2_F8E4M3 (1UL << 55)
+#define HWCAP2_F8E5M2 (1UL << 56)
+#define HWCAP2_SME_LUTV2 (1UL << 57)
+#define HWCAP2_SME_F8F16 (1UL << 58)
+#define HWCAP2_SME_F8F32 (1UL << 59)
+#define HWCAP2_SME_SF8FMA (1UL << 60)
+#define HWCAP2_SME_SF8DP4 (1UL << 61)
+#define HWCAP2_SME_SF8DP2 (1UL << 62)
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm64/asm/kvm.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm64/asm/kvm.h
index 5ad9021..1818c5f 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm64/asm/kvm.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm64/asm/kvm.h
@@ -18,9 +18,7 @@
#include <linux/types.h>
#include <asm/ptrace.h>
#include <asm/sve_context.h>
-#define __KVM_HAVE_GUEST_DEBUG
#define __KVM_HAVE_IRQ_LINE
-#define __KVM_HAVE_READONLY_MEM
#define __KVM_HAVE_VCPU_EVENTS
#define KVM_COALESCED_MMIO_PAGE_OFFSET 1
#define KVM_DIRTY_LOG_PAGE_OFFSET 64
@@ -40,9 +38,9 @@
#define KVM_ARM_TARGET_GENERIC_V8 5
#define KVM_ARM_NUM_TARGETS 6
#define KVM_ARM_DEVICE_TYPE_SHIFT 0
-#define KVM_ARM_DEVICE_TYPE_MASK GENMASK(KVM_ARM_DEVICE_TYPE_SHIFT + 15, KVM_ARM_DEVICE_TYPE_SHIFT)
+#define KVM_ARM_DEVICE_TYPE_MASK __GENMASK(KVM_ARM_DEVICE_TYPE_SHIFT + 15, KVM_ARM_DEVICE_TYPE_SHIFT)
#define KVM_ARM_DEVICE_ID_SHIFT 16
-#define KVM_ARM_DEVICE_ID_MASK GENMASK(KVM_ARM_DEVICE_ID_SHIFT + 15, KVM_ARM_DEVICE_ID_SHIFT)
+#define KVM_ARM_DEVICE_ID_MASK __GENMASK(KVM_ARM_DEVICE_ID_SHIFT + 15, KVM_ARM_DEVICE_ID_SHIFT)
#define KVM_ARM_DEVICE_VGIC_V2 0
#define KVM_VGIC_V2_ADDR_TYPE_DIST 0
#define KVM_VGIC_V2_ADDR_TYPE_CPU 1
@@ -89,6 +87,9 @@
struct kvm_sync_regs {
__u64 device_irq_level;
};
+#define KVM_ARM_DEV_EL1_VTIMER (1 << 0)
+#define KVM_ARM_DEV_EL1_PTIMER (1 << 1)
+#define KVM_ARM_DEV_PMU (1 << 2)
struct kvm_pmu_event_filter {
__u16 base_event;
__u16 nevents;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm64/asm/sigcontext.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm64/asm/sigcontext.h
index 6098fc7..8e48d55 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm64/asm/sigcontext.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-arm64/asm/sigcontext.h
@@ -52,6 +52,11 @@
struct _aarch64_ctx head;
__u64 tpidr2;
};
+#define FPMR_MAGIC 0x46504d52
+struct fpmr_context {
+ struct _aarch64_ctx head;
+ __u64 fpmr;
+};
#define ZA_MAGIC 0x54366345
struct za_context {
struct _aarch64_ctx head;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-generic/bitsperlong.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-generic/bitsperlong.h
index 969913b..11dcc1a 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-generic/bitsperlong.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-generic/bitsperlong.h
@@ -13,4 +13,7 @@
#define __BITS_PER_LONG 32
#endif
#endif
+#ifndef __BITS_PER_LONG_LONG
+#define __BITS_PER_LONG_LONG 64
+#endif
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-generic/unistd.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-generic/unistd.h
index 717a098..c882751 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-generic/unistd.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-generic/unistd.h
@@ -407,8 +407,13 @@
#define __NR_futex_wake 454
#define __NR_futex_wait 455
#define __NR_futex_requeue 456
+#define __NR_statmount 457
+#define __NR_listmount 458
+#define __NR_lsm_get_self_attr 459
+#define __NR_lsm_set_self_attr 460
+#define __NR_lsm_list_modules 461
#undef __NR_syscalls
-#define __NR_syscalls 457
+#define __NR_syscalls 462
#if __BITS_PER_LONG == 64 && !defined(__SYSCALL_COMPAT)
#define __NR_fcntl __NR3264_fcntl
#define __NR_statfs __NR3264_statfs
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-riscv/asm/auxvec.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-riscv/asm/auxvec.h
index 446fc54..755f4e9 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-riscv/asm/auxvec.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-riscv/asm/auxvec.h
@@ -15,6 +15,6 @@
#define AT_L2_CACHEGEOMETRY 45
#define AT_L3_CACHESIZE 46
#define AT_L3_CACHEGEOMETRY 47
-#define AT_VECTOR_SIZE_ARCH 9
+#define AT_VECTOR_SIZE_ARCH 10
#define AT_MINSIGSTKSZ 51
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-riscv/asm/hwprobe.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-riscv/asm/hwprobe.h
index a18b020..5c82561 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-riscv/asm/hwprobe.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-riscv/asm/hwprobe.h
@@ -24,6 +24,35 @@
#define RISCV_HWPROBE_EXT_ZBB (1 << 4)
#define RISCV_HWPROBE_EXT_ZBS (1 << 5)
#define RISCV_HWPROBE_EXT_ZICBOZ (1 << 6)
+#define RISCV_HWPROBE_EXT_ZBC (1 << 7)
+#define RISCV_HWPROBE_EXT_ZBKB (1 << 8)
+#define RISCV_HWPROBE_EXT_ZBKC (1 << 9)
+#define RISCV_HWPROBE_EXT_ZBKX (1 << 10)
+#define RISCV_HWPROBE_EXT_ZKND (1 << 11)
+#define RISCV_HWPROBE_EXT_ZKNE (1 << 12)
+#define RISCV_HWPROBE_EXT_ZKNH (1 << 13)
+#define RISCV_HWPROBE_EXT_ZKSED (1 << 14)
+#define RISCV_HWPROBE_EXT_ZKSH (1 << 15)
+#define RISCV_HWPROBE_EXT_ZKT (1 << 16)
+#define RISCV_HWPROBE_EXT_ZVBB (1 << 17)
+#define RISCV_HWPROBE_EXT_ZVBC (1 << 18)
+#define RISCV_HWPROBE_EXT_ZVKB (1 << 19)
+#define RISCV_HWPROBE_EXT_ZVKG (1 << 20)
+#define RISCV_HWPROBE_EXT_ZVKNED (1 << 21)
+#define RISCV_HWPROBE_EXT_ZVKNHA (1 << 22)
+#define RISCV_HWPROBE_EXT_ZVKNHB (1 << 23)
+#define RISCV_HWPROBE_EXT_ZVKSED (1 << 24)
+#define RISCV_HWPROBE_EXT_ZVKSH (1 << 25)
+#define RISCV_HWPROBE_EXT_ZVKT (1 << 26)
+#define RISCV_HWPROBE_EXT_ZFH (1 << 27)
+#define RISCV_HWPROBE_EXT_ZFHMIN (1 << 28)
+#define RISCV_HWPROBE_EXT_ZIHINTNTL (1 << 29)
+#define RISCV_HWPROBE_EXT_ZVFH (1 << 30)
+#define RISCV_HWPROBE_EXT_ZVFHMIN (1ULL << 31)
+#define RISCV_HWPROBE_EXT_ZFA (1ULL << 32)
+#define RISCV_HWPROBE_EXT_ZTSO (1ULL << 33)
+#define RISCV_HWPROBE_EXT_ZACAS (1ULL << 34)
+#define RISCV_HWPROBE_EXT_ZICOND (1ULL << 35)
#define RISCV_HWPROBE_KEY_CPUPERF_0 5
#define RISCV_HWPROBE_MISALIGNED_UNKNOWN (0 << 0)
#define RISCV_HWPROBE_MISALIGNED_EMULATED (1 << 0)
@@ -32,4 +61,5 @@
#define RISCV_HWPROBE_MISALIGNED_UNSUPPORTED (4 << 0)
#define RISCV_HWPROBE_MISALIGNED_MASK (7 << 0)
#define RISCV_HWPROBE_KEY_ZICBOZ_BLOCK_SIZE 6
+#define RISCV_HWPROBE_WHICH_CPUS (1 << 0)
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-riscv/asm/kvm.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-riscv/asm/kvm.h
index 470d581..4c759ed 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-riscv/asm/kvm.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-riscv/asm/kvm.h
@@ -11,7 +11,6 @@
#include <asm/bitsperlong.h>
#include <asm/ptrace.h>
#define __KVM_HAVE_IRQ_LINE
-#define __KVM_HAVE_READONLY_MEM
#define KVM_COALESCED_MMIO_PAGE_OFFSET 1
#define KVM_INTERRUPT_SET - 1U
#define KVM_INTERRUPT_UNSET - 2U
@@ -99,6 +98,35 @@
KVM_RISCV_ISA_EXT_ZIHPM,
KVM_RISCV_ISA_EXT_SMSTATEEN,
KVM_RISCV_ISA_EXT_ZICOND,
+ KVM_RISCV_ISA_EXT_ZBC,
+ KVM_RISCV_ISA_EXT_ZBKB,
+ KVM_RISCV_ISA_EXT_ZBKC,
+ KVM_RISCV_ISA_EXT_ZBKX,
+ KVM_RISCV_ISA_EXT_ZKND,
+ KVM_RISCV_ISA_EXT_ZKNE,
+ KVM_RISCV_ISA_EXT_ZKNH,
+ KVM_RISCV_ISA_EXT_ZKR,
+ KVM_RISCV_ISA_EXT_ZKSED,
+ KVM_RISCV_ISA_EXT_ZKSH,
+ KVM_RISCV_ISA_EXT_ZKT,
+ KVM_RISCV_ISA_EXT_ZVBB,
+ KVM_RISCV_ISA_EXT_ZVBC,
+ KVM_RISCV_ISA_EXT_ZVKB,
+ KVM_RISCV_ISA_EXT_ZVKG,
+ KVM_RISCV_ISA_EXT_ZVKNED,
+ KVM_RISCV_ISA_EXT_ZVKNHA,
+ KVM_RISCV_ISA_EXT_ZVKNHB,
+ KVM_RISCV_ISA_EXT_ZVKSED,
+ KVM_RISCV_ISA_EXT_ZVKSH,
+ KVM_RISCV_ISA_EXT_ZVKT,
+ KVM_RISCV_ISA_EXT_ZFH,
+ KVM_RISCV_ISA_EXT_ZFHMIN,
+ KVM_RISCV_ISA_EXT_ZIHINTNTL,
+ KVM_RISCV_ISA_EXT_ZVFH,
+ KVM_RISCV_ISA_EXT_ZVFHMIN,
+ KVM_RISCV_ISA_EXT_ZFA,
+ KVM_RISCV_ISA_EXT_ZTSO,
+ KVM_RISCV_ISA_EXT_ZACAS,
KVM_RISCV_ISA_EXT_MAX,
};
enum KVM_RISCV_SBI_EXT_ID {
@@ -112,8 +140,13 @@
KVM_RISCV_SBI_EXT_EXPERIMENTAL,
KVM_RISCV_SBI_EXT_VENDOR,
KVM_RISCV_SBI_EXT_DBCN,
+ KVM_RISCV_SBI_EXT_STA,
KVM_RISCV_SBI_EXT_MAX,
};
+struct kvm_riscv_sbi_sta {
+ unsigned long shmem_lo;
+ unsigned long shmem_hi;
+};
#define KVM_RISCV_TIMER_STATE_OFF 0
#define KVM_RISCV_TIMER_STATE_ON 1
#define KVM_REG_SIZE(id) (1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT))
@@ -155,6 +188,9 @@
#define KVM_REG_RISCV_VECTOR (0x09 << KVM_REG_RISCV_TYPE_SHIFT)
#define KVM_REG_RISCV_VECTOR_CSR_REG(name) (offsetof(struct __riscv_v_ext_state, name) / sizeof(unsigned long))
#define KVM_REG_RISCV_VECTOR_REG(n) ((n) + sizeof(struct __riscv_v_ext_state) / sizeof(unsigned long))
+#define KVM_REG_RISCV_SBI_STATE (0x0a << KVM_REG_RISCV_TYPE_SHIFT)
+#define KVM_REG_RISCV_SBI_STA (0x0 << KVM_REG_RISCV_SUBTYPE_SHIFT)
+#define KVM_REG_RISCV_SBI_STA_REG(name) (offsetof(struct kvm_riscv_sbi_sta, name) / sizeof(unsigned long))
#define KVM_DEV_RISCV_APLIC_ALIGN 0x1000
#define KVM_DEV_RISCV_APLIC_SIZE 0x4000
#define KVM_DEV_RISCV_APLIC_MAX_HARTS 0x4000
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/bootparam.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/bootparam.h
index c87a8af..6a4b59c 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/bootparam.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/bootparam.h
@@ -6,19 +6,7 @@
*/
#ifndef _ASM_X86_BOOTPARAM_H
#define _ASM_X86_BOOTPARAM_H
-#define SETUP_NONE 0
-#define SETUP_E820_EXT 1
-#define SETUP_DTB 2
-#define SETUP_PCI 3
-#define SETUP_EFI 4
-#define SETUP_APPLE_PROPERTIES 5
-#define SETUP_JAILHOUSE 6
-#define SETUP_CC_BLOB 7
-#define SETUP_IMA 8
-#define SETUP_RNG_SEED 9
-#define SETUP_ENUM_MAX SETUP_RNG_SEED
-#define SETUP_INDIRECT (1 << 31)
-#define SETUP_TYPE_MAX (SETUP_ENUM_MAX | SETUP_INDIRECT)
+#include <asm/setup_data.h>
#define RAMDISK_IMAGE_START_MASK 0x07FF
#define RAMDISK_PROMPT_FLAG 0x8000
#define RAMDISK_LOAD_FLAG 0x4000
@@ -34,6 +22,7 @@
#define XLF_EFI_KEXEC (1 << 4)
#define XLF_5LEVEL (1 << 5)
#define XLF_5LEVEL_ENABLED (1 << 6)
+#define XLF_MEM_ENCRYPTION (1 << 7)
#ifndef __ASSEMBLY__
#include <linux/types.h>
#include <linux/screen_info.h>
@@ -41,18 +30,6 @@
#include <linux/edd.h>
#include <asm/ist.h>
#include <video/edid.h>
-struct setup_data {
- __u64 next;
- __u32 type;
- __u32 len;
- __u8 data[];
-};
-struct setup_indirect {
- __u32 type;
- __u32 reserved;
- __u64 len;
- __u64 addr;
-};
struct setup_header {
__u8 setup_sects;
__u16 root_flags;
@@ -115,34 +92,7 @@
__u32 efi_memmap_hi;
};
#define E820_MAX_ENTRIES_ZEROPAGE 128
-struct boot_e820_entry {
- __u64 addr;
- __u64 size;
- __u32 type;
-} __attribute__((packed));
#define JAILHOUSE_SETUP_REQUIRED_VERSION 1
-struct jailhouse_setup_data {
- struct {
- __u16 version;
- __u16 compatible_version;
- } __attribute__((packed)) hdr;
- struct {
- __u16 pm_timer_address;
- __u16 num_cpus;
- __u64 pci_mmconfig_base;
- __u32 tsc_khz;
- __u32 apic_khz;
- __u8 standard_ioapic;
- __u8 cpu_ids[255];
- } __attribute__((packed)) v1;
- struct {
- __u32 flags;
- } __attribute__((packed)) v2;
-} __attribute__((packed));
-struct ima_setup_data {
- __u64 addr;
- __u64 size;
-} __attribute__((packed));
struct boot_params {
struct screen_info screen_info;
struct apm_bios_info apm_bios_info;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/kvm.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/kvm.h
index 334fb25..440ffb8 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/kvm.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/kvm.h
@@ -6,6 +6,8 @@
*/
#ifndef _ASM_X86_KVM_H
#define _ASM_X86_KVM_H
+#include <linux/const.h>
+#include <linux/bits.h>
#include <linux/types.h>
#include <linux/ioctl.h>
#include <linux/stddef.h>
@@ -35,7 +37,6 @@
#define __KVM_HAVE_IRQ_LINE
#define __KVM_HAVE_MSI
#define __KVM_HAVE_USER_NMI
-#define __KVM_HAVE_GUEST_DEBUG
#define __KVM_HAVE_MSIX
#define __KVM_HAVE_MCE
#define __KVM_HAVE_PIT_STATE2
@@ -44,7 +45,6 @@
#define __KVM_HAVE_DEBUGREGS
#define __KVM_HAVE_XSAVE
#define __KVM_HAVE_XCRS
-#define __KVM_HAVE_READONLY_MEM
#define KVM_NR_INTERRUPTS 256
struct kvm_pic_state {
__u8 last_irr;
@@ -398,15 +398,260 @@
};
#define KVM_PMU_EVENT_ALLOW 0
#define KVM_PMU_EVENT_DENY 1
-#define KVM_PMU_EVENT_FLAG_MASKED_EVENTS BIT(0)
+#define KVM_PMU_EVENT_FLAG_MASKED_EVENTS _BITUL(0)
#define KVM_PMU_EVENT_FLAGS_VALID_MASK (KVM_PMU_EVENT_FLAG_MASKED_EVENTS)
+struct kvm_x86_mce {
+ __u64 status;
+ __u64 addr;
+ __u64 misc;
+ __u64 mcg_status;
+ __u8 bank;
+ __u8 pad1[7];
+ __u64 pad2[3];
+};
+#define KVM_XEN_HVM_CONFIG_HYPERCALL_MSR (1 << 0)
+#define KVM_XEN_HVM_CONFIG_INTERCEPT_HCALL (1 << 1)
+#define KVM_XEN_HVM_CONFIG_SHARED_INFO (1 << 2)
+#define KVM_XEN_HVM_CONFIG_RUNSTATE (1 << 3)
+#define KVM_XEN_HVM_CONFIG_EVTCHN_2LEVEL (1 << 4)
+#define KVM_XEN_HVM_CONFIG_EVTCHN_SEND (1 << 5)
+#define KVM_XEN_HVM_CONFIG_RUNSTATE_UPDATE_FLAG (1 << 6)
+#define KVM_XEN_HVM_CONFIG_PVCLOCK_TSC_UNSTABLE (1 << 7)
+#define KVM_XEN_HVM_CONFIG_SHARED_INFO_HVA (1 << 8)
+struct kvm_xen_hvm_config {
+ __u32 flags;
+ __u32 msr;
+ __u64 blob_addr_32;
+ __u64 blob_addr_64;
+ __u8 blob_size_32;
+ __u8 blob_size_64;
+ __u8 pad2[30];
+};
+struct kvm_xen_hvm_attr {
+ __u16 type;
+ __u16 pad[3];
+ union {
+ __u8 long_mode;
+ __u8 vector;
+ __u8 runstate_update_flag;
+ union {
+ __u64 gfn;
+#define KVM_XEN_INVALID_GFN ((__u64) - 1)
+ __u64 hva;
+ } shared_info;
+ struct {
+ __u32 send_port;
+ __u32 type;
+ __u32 flags;
+#define KVM_XEN_EVTCHN_DEASSIGN (1 << 0)
+#define KVM_XEN_EVTCHN_UPDATE (1 << 1)
+#define KVM_XEN_EVTCHN_RESET (1 << 2)
+ union {
+ struct {
+ __u32 port;
+ __u32 vcpu;
+ __u32 priority;
+ } port;
+ struct {
+ __u32 port;
+ __s32 fd;
+ } eventfd;
+ __u32 padding[4];
+ } deliver;
+ } evtchn;
+ __u32 xen_version;
+ __u64 pad[8];
+ } u;
+};
+#define KVM_XEN_ATTR_TYPE_LONG_MODE 0x0
+#define KVM_XEN_ATTR_TYPE_SHARED_INFO 0x1
+#define KVM_XEN_ATTR_TYPE_UPCALL_VECTOR 0x2
+#define KVM_XEN_ATTR_TYPE_EVTCHN 0x3
+#define KVM_XEN_ATTR_TYPE_XEN_VERSION 0x4
+#define KVM_XEN_ATTR_TYPE_RUNSTATE_UPDATE_FLAG 0x5
+#define KVM_XEN_ATTR_TYPE_SHARED_INFO_HVA 0x6
+struct kvm_xen_vcpu_attr {
+ __u16 type;
+ __u16 pad[3];
+ union {
+ __u64 gpa;
+#define KVM_XEN_INVALID_GPA ((__u64) - 1)
+ __u64 hva;
+ __u64 pad[8];
+ struct {
+ __u64 state;
+ __u64 state_entry_time;
+ __u64 time_running;
+ __u64 time_runnable;
+ __u64 time_blocked;
+ __u64 time_offline;
+ } runstate;
+ __u32 vcpu_id;
+ struct {
+ __u32 port;
+ __u32 priority;
+ __u64 expires_ns;
+ } timer;
+ __u8 vector;
+ } u;
+};
+#define KVM_XEN_VCPU_ATTR_TYPE_VCPU_INFO 0x0
+#define KVM_XEN_VCPU_ATTR_TYPE_VCPU_TIME_INFO 0x1
+#define KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_ADDR 0x2
+#define KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_CURRENT 0x3
+#define KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_DATA 0x4
+#define KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_ADJUST 0x5
+#define KVM_XEN_VCPU_ATTR_TYPE_VCPU_ID 0x6
+#define KVM_XEN_VCPU_ATTR_TYPE_TIMER 0x7
+#define KVM_XEN_VCPU_ATTR_TYPE_UPCALL_VECTOR 0x8
+#define KVM_XEN_VCPU_ATTR_TYPE_VCPU_INFO_HVA 0x9
+enum sev_cmd_id {
+ KVM_SEV_INIT = 0,
+ KVM_SEV_ES_INIT,
+ KVM_SEV_LAUNCH_START,
+ KVM_SEV_LAUNCH_UPDATE_DATA,
+ KVM_SEV_LAUNCH_UPDATE_VMSA,
+ KVM_SEV_LAUNCH_SECRET,
+ KVM_SEV_LAUNCH_MEASURE,
+ KVM_SEV_LAUNCH_FINISH,
+ KVM_SEV_SEND_START,
+ KVM_SEV_SEND_UPDATE_DATA,
+ KVM_SEV_SEND_UPDATE_VMSA,
+ KVM_SEV_SEND_FINISH,
+ KVM_SEV_RECEIVE_START,
+ KVM_SEV_RECEIVE_UPDATE_DATA,
+ KVM_SEV_RECEIVE_UPDATE_VMSA,
+ KVM_SEV_RECEIVE_FINISH,
+ KVM_SEV_GUEST_STATUS,
+ KVM_SEV_DBG_DECRYPT,
+ KVM_SEV_DBG_ENCRYPT,
+ KVM_SEV_CERT_EXPORT,
+ KVM_SEV_GET_ATTESTATION_REPORT,
+ KVM_SEV_SEND_CANCEL,
+ KVM_SEV_NR_MAX,
+};
+struct kvm_sev_cmd {
+ __u32 id;
+ __u32 pad0;
+ __u64 data;
+ __u32 error;
+ __u32 sev_fd;
+};
+struct kvm_sev_launch_start {
+ __u32 handle;
+ __u32 policy;
+ __u64 dh_uaddr;
+ __u32 dh_len;
+ __u32 pad0;
+ __u64 session_uaddr;
+ __u32 session_len;
+ __u32 pad1;
+};
+struct kvm_sev_launch_update_data {
+ __u64 uaddr;
+ __u32 len;
+ __u32 pad0;
+};
+struct kvm_sev_launch_secret {
+ __u64 hdr_uaddr;
+ __u32 hdr_len;
+ __u32 pad0;
+ __u64 guest_uaddr;
+ __u32 guest_len;
+ __u32 pad1;
+ __u64 trans_uaddr;
+ __u32 trans_len;
+ __u32 pad2;
+};
+struct kvm_sev_launch_measure {
+ __u64 uaddr;
+ __u32 len;
+ __u32 pad0;
+};
+struct kvm_sev_guest_status {
+ __u32 handle;
+ __u32 policy;
+ __u32 state;
+};
+struct kvm_sev_dbg {
+ __u64 src_uaddr;
+ __u64 dst_uaddr;
+ __u32 len;
+ __u32 pad0;
+};
+struct kvm_sev_attestation_report {
+ __u8 mnonce[16];
+ __u64 uaddr;
+ __u32 len;
+ __u32 pad0;
+};
+struct kvm_sev_send_start {
+ __u32 policy;
+ __u32 pad0;
+ __u64 pdh_cert_uaddr;
+ __u32 pdh_cert_len;
+ __u32 pad1;
+ __u64 plat_certs_uaddr;
+ __u32 plat_certs_len;
+ __u32 pad2;
+ __u64 amd_certs_uaddr;
+ __u32 amd_certs_len;
+ __u32 pad3;
+ __u64 session_uaddr;
+ __u32 session_len;
+ __u32 pad4;
+};
+struct kvm_sev_send_update_data {
+ __u64 hdr_uaddr;
+ __u32 hdr_len;
+ __u32 pad0;
+ __u64 guest_uaddr;
+ __u32 guest_len;
+ __u32 pad1;
+ __u64 trans_uaddr;
+ __u32 trans_len;
+ __u32 pad2;
+};
+struct kvm_sev_receive_start {
+ __u32 handle;
+ __u32 policy;
+ __u64 pdh_uaddr;
+ __u32 pdh_len;
+ __u32 pad0;
+ __u64 session_uaddr;
+ __u32 session_len;
+ __u32 pad1;
+};
+struct kvm_sev_receive_update_data {
+ __u64 hdr_uaddr;
+ __u32 hdr_len;
+ __u32 pad0;
+ __u64 guest_uaddr;
+ __u32 guest_len;
+ __u32 pad1;
+ __u64 trans_uaddr;
+ __u32 trans_len;
+ __u32 pad2;
+};
+#define KVM_X2APIC_API_USE_32BIT_IDS (1ULL << 0)
+#define KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK (1ULL << 1)
+struct kvm_hyperv_eventfd {
+ __u32 conn_id;
+ __s32 fd;
+ __u32 flags;
+ __u32 padding[3];
+};
+#define KVM_HYPERV_CONN_ID_MASK 0x00ffffff
+#define KVM_HYPERV_EVENTFD_DEASSIGN (1 << 0)
#define KVM_PMU_ENCODE_MASKED_ENTRY(event_select,mask,match,exclude) (((event_select) & 0xFFULL) | (((event_select) & 0XF00ULL) << 24) | (((mask) & 0xFFULL) << 56) | (((match) & 0xFFULL) << 8) | ((__u64) (! ! (exclude)) << 55))
-#define KVM_PMU_MASKED_ENTRY_EVENT_SELECT (GENMASK_ULL(7, 0) | GENMASK_ULL(35, 32))
-#define KVM_PMU_MASKED_ENTRY_UMASK_MASK (GENMASK_ULL(63, 56))
-#define KVM_PMU_MASKED_ENTRY_UMASK_MATCH (GENMASK_ULL(15, 8))
-#define KVM_PMU_MASKED_ENTRY_EXCLUDE (BIT_ULL(55))
+#define KVM_PMU_MASKED_ENTRY_EVENT_SELECT (__GENMASK_ULL(7, 0) | __GENMASK_ULL(35, 32))
+#define KVM_PMU_MASKED_ENTRY_UMASK_MASK (__GENMASK_ULL(63, 56))
+#define KVM_PMU_MASKED_ENTRY_UMASK_MATCH (__GENMASK_ULL(15, 8))
+#define KVM_PMU_MASKED_ENTRY_EXCLUDE (_BITULL(55))
#define KVM_PMU_MASKED_ENTRY_UMASK_MASK_SHIFT (56)
#define KVM_VCPU_TSC_CTRL 0
#define KVM_VCPU_TSC_OFFSET 0
-#define KVM_EXIT_HYPERCALL_LONG_MODE BIT(0)
+#define KVM_EXIT_HYPERCALL_LONG_MODE _BITULL(0)
+#define KVM_X86_DEFAULT_VM 0
+#define KVM_X86_SW_PROTECTED_VM 1
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/kvm_para.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/kvm_para.h
index 03421ed..3395a15 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/kvm_para.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/kvm_para.h
@@ -67,7 +67,7 @@
#define KVM_ASYNC_PF_SEND_ALWAYS (1 << 1)
#define KVM_ASYNC_PF_DELIVERY_AS_PF_VMEXIT (1 << 2)
#define KVM_ASYNC_PF_DELIVERY_AS_INT (1 << 3)
-#define KVM_ASYNC_PF_VEC_MASK GENMASK(7, 0)
+#define KVM_ASYNC_PF_VEC_MASK __GENMASK(7, 0)
#define KVM_MIGRATION_READY (1 << 0)
#define KVM_MAP_GPA_RANGE_PAGE_SZ_4K 0
#define KVM_MAP_GPA_RANGE_PAGE_SZ_2M (1 << 0)
@@ -100,7 +100,6 @@
__u32 flags;
__u32 token;
__u8 pad[56];
- __u32 enabled;
};
#define KVM_PV_EOI_BIT 0
#define KVM_PV_EOI_MASK (0x1 << KVM_PV_EOI_BIT)
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/processor-flags.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/processor-flags.h
index f06fdda..9842847 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/processor-flags.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/processor-flags.h
@@ -123,6 +123,12 @@
#define X86_CR4_CET _BITUL(X86_CR4_CET_BIT)
#define X86_CR4_LAM_SUP_BIT 28
#define X86_CR4_LAM_SUP _BITUL(X86_CR4_LAM_SUP_BIT)
+#ifdef __x86_64__
+#define X86_CR4_FRED_BIT 32
+#define X86_CR4_FRED _BITUL(X86_CR4_FRED_BIT)
+#else
+#define X86_CR4_FRED (0)
+#endif
#define X86_CR8_TPR _AC(0x0000000f, UL)
#define CX86_PCR0 0x20
#define CX86_GCR 0xb8
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/setup_data.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/setup_data.h
new file mode 100644
index 0000000..d00a554
--- /dev/null
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/setup_data.h
@@ -0,0 +1,64 @@
+/*
+ * This file is auto-generated. Modifications will be lost.
+ *
+ * See https://android.googlesource.com/platform/bionic/+/master/libc/kernel/
+ * for more information.
+ */
+#ifndef _UAPI_ASM_X86_SETUP_DATA_H
+#define _UAPI_ASM_X86_SETUP_DATA_H
+#define SETUP_NONE 0
+#define SETUP_E820_EXT 1
+#define SETUP_DTB 2
+#define SETUP_PCI 3
+#define SETUP_EFI 4
+#define SETUP_APPLE_PROPERTIES 5
+#define SETUP_JAILHOUSE 6
+#define SETUP_CC_BLOB 7
+#define SETUP_IMA 8
+#define SETUP_RNG_SEED 9
+#define SETUP_ENUM_MAX SETUP_RNG_SEED
+#define SETUP_INDIRECT (1 << 31)
+#define SETUP_TYPE_MAX (SETUP_ENUM_MAX | SETUP_INDIRECT)
+#ifndef __ASSEMBLY__
+#include <linux/types.h>
+struct setup_data {
+ __u64 next;
+ __u32 type;
+ __u32 len;
+ __u8 data[];
+};
+struct setup_indirect {
+ __u32 type;
+ __u32 reserved;
+ __u64 len;
+ __u64 addr;
+};
+struct boot_e820_entry {
+ __u64 addr;
+ __u64 size;
+ __u32 type;
+} __attribute__((packed));
+struct jailhouse_setup_data {
+ struct {
+ __u16 version;
+ __u16 compatible_version;
+ } __attribute__((packed)) hdr;
+ struct {
+ __u16 pm_timer_address;
+ __u16 num_cpus;
+ __u64 pci_mmconfig_base;
+ __u32 tsc_khz;
+ __u32 apic_khz;
+ __u8 standard_ioapic;
+ __u8 cpu_ids[255];
+ } __attribute__((packed)) v1;
+ struct {
+ __u32 flags;
+ } __attribute__((packed)) v2;
+} __attribute__((packed));
+struct ima_setup_data {
+ __u64 addr;
+ __u64 size;
+} __attribute__((packed));
+#endif
+#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/signal.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/signal.h
index 96ac8fb..6cffef3 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/signal.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/signal.h
@@ -8,7 +8,6 @@
#define _UAPI_ASM_X86_SIGNAL_H
#ifndef __ASSEMBLY__
#include <linux/types.h>
-#include <linux/time.h>
#include <linux/compiler.h>
struct siginfo;
#define _KERNEL_NSIG 32
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/unistd_32.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/unistd_32.h
index e82b988..72076fd 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/unistd_32.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/unistd_32.h
@@ -452,4 +452,9 @@
#define __NR_futex_wake 454
#define __NR_futex_wait 455
#define __NR_futex_requeue 456
+#define __NR_statmount 457
+#define __NR_listmount 458
+#define __NR_lsm_get_self_attr 459
+#define __NR_lsm_set_self_attr 460
+#define __NR_lsm_list_modules 461
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/unistd_64.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/unistd_64.h
index 10d6e96..8c4f76e 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/unistd_64.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/unistd_64.h
@@ -374,4 +374,9 @@
#define __NR_futex_wake 454
#define __NR_futex_wait 455
#define __NR_futex_requeue 456
+#define __NR_statmount 457
+#define __NR_listmount 458
+#define __NR_lsm_get_self_attr 459
+#define __NR_lsm_set_self_attr 460
+#define __NR_lsm_list_modules 461
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/unistd_x32.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/unistd_x32.h
index 7fbbe11..984cfca 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/unistd_x32.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/asm-x86/asm/unistd_x32.h
@@ -326,6 +326,11 @@
#define __NR_futex_wake (__X32_SYSCALL_BIT + 454)
#define __NR_futex_wait (__X32_SYSCALL_BIT + 455)
#define __NR_futex_requeue (__X32_SYSCALL_BIT + 456)
+#define __NR_statmount (__X32_SYSCALL_BIT + 457)
+#define __NR_listmount (__X32_SYSCALL_BIT + 458)
+#define __NR_lsm_get_self_attr (__X32_SYSCALL_BIT + 459)
+#define __NR_lsm_set_self_attr (__X32_SYSCALL_BIT + 460)
+#define __NR_lsm_list_modules (__X32_SYSCALL_BIT + 461)
#define __NR_rt_sigaction (__X32_SYSCALL_BIT + 512)
#define __NR_rt_sigreturn (__X32_SYSCALL_BIT + 513)
#define __NR_ioctl (__X32_SYSCALL_BIT + 514)
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/amdgpu_drm.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/amdgpu_drm.h
index 1e5b8e3..0ad0bc2 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/amdgpu_drm.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/amdgpu_drm.h
@@ -490,6 +490,7 @@
#define AMDGPU_INFO_SENSOR_STABLE_PSTATE_GFX_MCLK 0x9
#define AMDGPU_INFO_SENSOR_PEAK_PSTATE_GFX_SCLK 0xa
#define AMDGPU_INFO_SENSOR_PEAK_PSTATE_GFX_MCLK 0xb
+#define AMDGPU_INFO_SENSOR_GPU_INPUT_POWER 0xc
#define AMDGPU_INFO_NUM_VRAM_CPU_PAGE_FAULTS 0x1E
#define AMDGPU_INFO_VRAM_LOST_COUNTER 0x1F
#define AMDGPU_INFO_RAS_ENABLED_FEATURES 0x20
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/drm.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/drm.h
index 0fe5c26..c8fab3c 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/drm.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/drm.h
@@ -353,6 +353,7 @@
#define DRM_CAP_CRTC_IN_VBLANK_EVENT 0x12
#define DRM_CAP_SYNCOBJ 0x13
#define DRM_CAP_SYNCOBJ_TIMELINE 0x14
+#define DRM_CAP_ATOMIC_ASYNC_PAGE_FLIP 0x15
struct drm_get_cap {
__u64 capability;
__u64 value;
@@ -362,6 +363,7 @@
#define DRM_CLIENT_CAP_ATOMIC 3
#define DRM_CLIENT_CAP_ASPECT_RATIO 4
#define DRM_CLIENT_CAP_WRITEBACK_CONNECTORS 5
+#define DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT 6
struct drm_set_client_cap {
__u64 capability;
__u64 value;
@@ -401,6 +403,7 @@
#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL (1 << 0)
#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT (1 << 1)
#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE (1 << 2)
+#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE (1 << 3)
struct drm_syncobj_wait {
__u64 handles;
__s64 timeout_nsec;
@@ -408,6 +411,7 @@
__u32 flags;
__u32 first_signaled;
__u32 pad;
+ __u64 deadline_nsec;
};
struct drm_syncobj_timeline_wait {
__u64 handles;
@@ -417,6 +421,7 @@
__u32 flags;
__u32 first_signaled;
__u32 pad;
+ __u64 deadline_nsec;
};
struct drm_syncobj_eventfd {
__u32 handle;
@@ -570,6 +575,7 @@
#define DRM_IOCTL_SYNCOBJ_TIMELINE_SIGNAL DRM_IOWR(0xCD, struct drm_syncobj_timeline_array)
#define DRM_IOCTL_MODE_GETFB2 DRM_IOWR(0xCE, struct drm_mode_fb_cmd2)
#define DRM_IOCTL_SYNCOBJ_EVENTFD DRM_IOWR(0xCF, struct drm_syncobj_eventfd)
+#define DRM_IOCTL_MODE_CLOSEFB DRM_IOWR(0xD0, struct drm_mode_closefb)
#define DRM_COMMAND_BASE 0x40
#define DRM_COMMAND_END 0xA0
struct drm_event {
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/drm_mode.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/drm_mode.h
index f7b65b2..9e6296c 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/drm_mode.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/drm_mode.h
@@ -357,6 +357,9 @@
struct drm_color_ctm {
__u64 matrix[9];
};
+struct drm_color_ctm_3x4 {
+ __u64 matrix[12];
+};
struct drm_color_lut {
__u16 red;
__u16 green;
@@ -483,6 +486,10 @@
__s32 x2;
__s32 y2;
};
+struct drm_mode_closefb {
+ __u32 fb_id;
+ __u32 pad;
+};
#ifdef __cplusplus
}
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/habanalabs_accel.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/habanalabs_accel.h
index 158e937..47afb82 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/habanalabs_accel.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/habanalabs_accel.h
@@ -656,6 +656,7 @@
#define HL_INFO_HW_ERR_EVENT 36
#define HL_INFO_FW_ERR_EVENT 37
#define HL_INFO_USER_ENGINE_ERR_EVENT 38
+#define HL_INFO_DEV_SIGNED 40
#define HL_INFO_VERSION_MAX_LEN 128
#define HL_INFO_CARD_NAME_MAX_LEN 16
#define HL_ENGINES_DATA_MAX_SIZE SZ_1M
@@ -849,6 +850,7 @@
#define SEC_SIGNATURE_BUF_SZ 255
#define SEC_PUB_DATA_BUF_SZ 510
#define SEC_CERTIFICATE_BUF_SZ 2046
+#define SEC_DEV_INFO_BUF_SZ 5120
struct hl_info_sec_attest {
__u32 nonce;
__u16 pcr_quote_len;
@@ -864,6 +866,18 @@
__u8 certificate[SEC_CERTIFICATE_BUF_SZ];
__u8 pad0[2];
};
+struct hl_info_signed {
+ __u32 nonce;
+ __u16 pub_data_len;
+ __u16 certificate_len;
+ __u8 info_sig_len;
+ __u8 public_data[SEC_PUB_DATA_BUF_SZ];
+ __u8 certificate[SEC_CERTIFICATE_BUF_SZ];
+ __u8 info_sig[SEC_SIGNATURE_BUF_SZ];
+ __u16 dev_info_len;
+ __u8 dev_info[SEC_DEV_INFO_BUF_SZ];
+ __u8 pad[2];
+};
struct hl_page_fault_info {
__s64 timestamp;
__u64 addr;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/i915_drm.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/i915_drm.h
index ccb8278..0738cee 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/i915_drm.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/i915_drm.h
@@ -901,6 +901,7 @@
#define DRM_I915_QUERY_MEMORY_REGIONS 4
#define DRM_I915_QUERY_HWCONFIG_BLOB 5
#define DRM_I915_QUERY_GEOMETRY_SUBSLICES 6
+#define DRM_I915_QUERY_GUC_SUBMISSION_VERSION 7
__s32 length;
__u32 flags;
#define DRM_I915_QUERY_PERF_CONFIG_LIST 1
@@ -976,6 +977,12 @@
__u32 rsvd[3];
struct drm_i915_memory_region_info regions[];
};
+struct drm_i915_query_guc_submission_version {
+ __u32 branch;
+ __u32 major;
+ __u32 minor;
+ __u32 patch;
+};
struct drm_i915_gem_create_ext {
__u64 size;
__u32 handle;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/ivpu_accel.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/ivpu_accel.h
index ca2014f..fcbf6f7 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/ivpu_accel.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/ivpu_accel.h
@@ -43,6 +43,11 @@
#define DRM_IVPU_CONTEXT_PRIORITY_NORMAL 1
#define DRM_IVPU_CONTEXT_PRIORITY_FOCUS 2
#define DRM_IVPU_CONTEXT_PRIORITY_REALTIME 3
+#define DRM_IVPU_JOB_PRIORITY_DEFAULT 0
+#define DRM_IVPU_JOB_PRIORITY_IDLE 1
+#define DRM_IVPU_JOB_PRIORITY_NORMAL 2
+#define DRM_IVPU_JOB_PRIORITY_FOCUS 3
+#define DRM_IVPU_JOB_PRIORITY_REALTIME 4
#define DRM_IVPU_CAP_METRIC_STREAMER 1
#define DRM_IVPU_CAP_DMA_MEMORY_RANGE 2
struct drm_ivpu_param {
@@ -80,8 +85,10 @@
__u32 engine;
__u32 flags;
__u32 commands_offset;
+ __u32 priority;
};
#define DRM_IVPU_JOB_STATUS_SUCCESS 0
+#define DRM_IVPU_JOB_STATUS_ABORTED 256
struct drm_ivpu_bo_wait {
__u32 handle;
__u32 flags;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/msm_drm.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/msm_drm.h
index d180f70..4d83744 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/msm_drm.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/msm_drm.h
@@ -36,6 +36,7 @@
#define MSM_PARAM_CMDLINE 0x0d
#define MSM_PARAM_VA_START 0x0e
#define MSM_PARAM_VA_SIZE 0x0f
+#define MSM_PARAM_HIGHEST_BANK_BIT 0x10
#define MSM_PARAM_NR_RINGS MSM_PARAM_PRIORITIES
struct drm_msm_param {
__u32 pipe;
@@ -63,6 +64,8 @@
#define MSM_INFO_GET_NAME 0x03
#define MSM_INFO_SET_IOVA 0x04
#define MSM_INFO_GET_FLAGS 0x05
+#define MSM_INFO_SET_METADATA 0x06
+#define MSM_INFO_GET_METADATA 0x07
struct drm_msm_gem_info {
__u32 handle;
__u32 info;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/nouveau_drm.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/nouveau_drm.h
index 221ff21..f7d870e 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/nouveau_drm.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/nouveau_drm.h
@@ -23,6 +23,8 @@
#define NOUVEAU_GETPARAM_HAS_BO_USAGE 15
#define NOUVEAU_GETPARAM_HAS_PAGEFLIP 16
#define NOUVEAU_GETPARAM_EXEC_PUSH_MAX 17
+#define NOUVEAU_GETPARAM_VRAM_BAR_SIZE 18
+#define NOUVEAU_GETPARAM_VRAM_USED 19
struct drm_nouveau_getparam {
__u64 param;
__u64 value;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/pvr_drm.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/pvr_drm.h
new file mode 100644
index 0000000..c68c719
--- /dev/null
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/pvr_drm.h
@@ -0,0 +1,271 @@
+/*
+ * This file is auto-generated. Modifications will be lost.
+ *
+ * See https://android.googlesource.com/platform/bionic/+/master/libc/kernel/
+ * for more information.
+ */
+#ifndef PVR_DRM_UAPI_H
+#define PVR_DRM_UAPI_H
+#include "drm.h"
+#include <linux/const.h>
+#include <linux/types.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+struct drm_pvr_obj_array {
+ __u32 stride;
+ __u32 count;
+ __u64 array;
+};
+#define DRM_PVR_OBJ_ARRAY(cnt,ptr) {.stride = sizeof((ptr)[0]),.count = (cnt),.array = (__u64) (uintptr_t) (ptr) }
+#define PVR_IOCTL(_ioctl,_mode,_data) _mode(DRM_COMMAND_BASE + (_ioctl), struct drm_pvr_ioctl_ ##_data ##_args)
+#define DRM_IOCTL_PVR_DEV_QUERY PVR_IOCTL(0x00, DRM_IOWR, dev_query)
+#define DRM_IOCTL_PVR_CREATE_BO PVR_IOCTL(0x01, DRM_IOWR, create_bo)
+#define DRM_IOCTL_PVR_GET_BO_MMAP_OFFSET PVR_IOCTL(0x02, DRM_IOWR, get_bo_mmap_offset)
+#define DRM_IOCTL_PVR_CREATE_VM_CONTEXT PVR_IOCTL(0x03, DRM_IOWR, create_vm_context)
+#define DRM_IOCTL_PVR_DESTROY_VM_CONTEXT PVR_IOCTL(0x04, DRM_IOW, destroy_vm_context)
+#define DRM_IOCTL_PVR_VM_MAP PVR_IOCTL(0x05, DRM_IOW, vm_map)
+#define DRM_IOCTL_PVR_VM_UNMAP PVR_IOCTL(0x06, DRM_IOW, vm_unmap)
+#define DRM_IOCTL_PVR_CREATE_CONTEXT PVR_IOCTL(0x07, DRM_IOWR, create_context)
+#define DRM_IOCTL_PVR_DESTROY_CONTEXT PVR_IOCTL(0x08, DRM_IOW, destroy_context)
+#define DRM_IOCTL_PVR_CREATE_FREE_LIST PVR_IOCTL(0x09, DRM_IOWR, create_free_list)
+#define DRM_IOCTL_PVR_DESTROY_FREE_LIST PVR_IOCTL(0x0a, DRM_IOW, destroy_free_list)
+#define DRM_IOCTL_PVR_CREATE_HWRT_DATASET PVR_IOCTL(0x0b, DRM_IOWR, create_hwrt_dataset)
+#define DRM_IOCTL_PVR_DESTROY_HWRT_DATASET PVR_IOCTL(0x0c, DRM_IOW, destroy_hwrt_dataset)
+#define DRM_IOCTL_PVR_SUBMIT_JOBS PVR_IOCTL(0x0d, DRM_IOW, submit_jobs)
+struct drm_pvr_dev_query_gpu_info {
+ __u64 gpu_id;
+ __u32 num_phantoms;
+ __u32 _padding_c;
+};
+struct drm_pvr_dev_query_runtime_info {
+ __u64 free_list_min_pages;
+ __u64 free_list_max_pages;
+ __u32 common_store_alloc_region_size;
+ __u32 common_store_partition_space_size;
+ __u32 max_coeffs;
+ __u32 cdm_max_local_mem_size_regs;
+};
+struct drm_pvr_dev_query_quirks {
+ __u64 quirks;
+ __u16 count;
+ __u16 musthave_count;
+ __u32 _padding_c;
+};
+struct drm_pvr_dev_query_enhancements {
+ __u64 enhancements;
+ __u16 count;
+ __u16 _padding_a;
+ __u32 _padding_c;
+};
+enum drm_pvr_heap_id {
+ DRM_PVR_HEAP_GENERAL = 0,
+ DRM_PVR_HEAP_PDS_CODE_DATA,
+ DRM_PVR_HEAP_USC_CODE,
+ DRM_PVR_HEAP_RGNHDR,
+ DRM_PVR_HEAP_VIS_TEST,
+ DRM_PVR_HEAP_TRANSFER_FRAG,
+ DRM_PVR_HEAP_COUNT
+};
+struct drm_pvr_heap {
+ __u64 base;
+ __u64 size;
+ __u32 flags;
+ __u32 page_size_log2;
+};
+struct drm_pvr_dev_query_heap_info {
+ struct drm_pvr_obj_array heaps;
+};
+enum drm_pvr_static_data_area_usage {
+ DRM_PVR_STATIC_DATA_AREA_EOT = 0,
+ DRM_PVR_STATIC_DATA_AREA_FENCE,
+ DRM_PVR_STATIC_DATA_AREA_VDM_SYNC,
+ DRM_PVR_STATIC_DATA_AREA_YUV_CSC,
+};
+struct drm_pvr_static_data_area {
+ __u16 area_usage;
+ __u16 location_heap_id;
+ __u32 size;
+ __u64 offset;
+};
+struct drm_pvr_dev_query_static_data_areas {
+ struct drm_pvr_obj_array static_data_areas;
+};
+enum drm_pvr_dev_query {
+ DRM_PVR_DEV_QUERY_GPU_INFO_GET = 0,
+ DRM_PVR_DEV_QUERY_RUNTIME_INFO_GET,
+ DRM_PVR_DEV_QUERY_QUIRKS_GET,
+ DRM_PVR_DEV_QUERY_ENHANCEMENTS_GET,
+ DRM_PVR_DEV_QUERY_HEAP_INFO_GET,
+ DRM_PVR_DEV_QUERY_STATIC_DATA_AREAS_GET,
+};
+struct drm_pvr_ioctl_dev_query_args {
+ __u32 type;
+ __u32 size;
+ __u64 pointer;
+};
+#define DRM_PVR_BO_BYPASS_DEVICE_CACHE _BITULL(0)
+#define DRM_PVR_BO_PM_FW_PROTECT _BITULL(1)
+#define DRM_PVR_BO_ALLOW_CPU_USERSPACE_ACCESS _BITULL(2)
+#define DRM_PVR_BO_FLAGS_MASK (DRM_PVR_BO_BYPASS_DEVICE_CACHE | DRM_PVR_BO_PM_FW_PROTECT | DRM_PVR_BO_ALLOW_CPU_USERSPACE_ACCESS)
+struct drm_pvr_ioctl_create_bo_args {
+ __u64 size;
+ __u32 handle;
+ __u32 _padding_c;
+ __u64 flags;
+};
+struct drm_pvr_ioctl_get_bo_mmap_offset_args {
+ __u32 handle;
+ __u32 _padding_4;
+ __u64 offset;
+};
+struct drm_pvr_ioctl_create_vm_context_args {
+ __u32 handle;
+ __u32 _padding_4;
+};
+struct drm_pvr_ioctl_destroy_vm_context_args {
+ __u32 handle;
+ __u32 _padding_4;
+};
+struct drm_pvr_ioctl_vm_map_args {
+ __u32 vm_context_handle;
+ __u32 flags;
+ __u64 device_addr;
+ __u32 handle;
+ __u32 _padding_14;
+ __u64 offset;
+ __u64 size;
+};
+struct drm_pvr_ioctl_vm_unmap_args {
+ __u32 vm_context_handle;
+ __u32 _padding_4;
+ __u64 device_addr;
+ __u64 size;
+};
+enum drm_pvr_ctx_priority {
+ DRM_PVR_CTX_PRIORITY_LOW = - 512,
+ DRM_PVR_CTX_PRIORITY_NORMAL = 0,
+ DRM_PVR_CTX_PRIORITY_HIGH = 512,
+};
+enum drm_pvr_ctx_type {
+ DRM_PVR_CTX_TYPE_RENDER = 0,
+ DRM_PVR_CTX_TYPE_COMPUTE,
+ DRM_PVR_CTX_TYPE_TRANSFER_FRAG,
+};
+struct drm_pvr_ioctl_create_context_args {
+ __u32 type;
+ __u32 flags;
+ __s32 priority;
+ __u32 handle;
+ __u64 static_context_state;
+ __u32 static_context_state_len;
+ __u32 vm_context_handle;
+ __u64 callstack_addr;
+};
+struct drm_pvr_ioctl_destroy_context_args {
+ __u32 handle;
+ __u32 _padding_4;
+};
+struct drm_pvr_ioctl_create_free_list_args {
+ __u64 free_list_gpu_addr;
+ __u32 initial_num_pages;
+ __u32 max_num_pages;
+ __u32 grow_num_pages;
+ __u32 grow_threshold;
+ __u32 vm_context_handle;
+ __u32 handle;
+};
+struct drm_pvr_ioctl_destroy_free_list_args {
+ __u32 handle;
+ __u32 _padding_4;
+};
+struct drm_pvr_create_hwrt_geom_data_args {
+ __u64 tpc_dev_addr;
+ __u32 tpc_size;
+ __u32 tpc_stride;
+ __u64 vheap_table_dev_addr;
+ __u64 rtc_dev_addr;
+};
+struct drm_pvr_create_hwrt_rt_data_args {
+ __u64 pm_mlist_dev_addr;
+ __u64 macrotile_array_dev_addr;
+ __u64 region_header_dev_addr;
+};
+#define PVR_DRM_HWRT_FREE_LIST_LOCAL 0
+#define PVR_DRM_HWRT_FREE_LIST_GLOBAL 1U
+struct drm_pvr_ioctl_create_hwrt_dataset_args {
+ struct drm_pvr_create_hwrt_geom_data_args geom_data_args;
+ struct drm_pvr_create_hwrt_rt_data_args rt_data_args[2];
+ __u32 free_list_handles[2];
+ __u32 width;
+ __u32 height;
+ __u32 samples;
+ __u32 layers;
+ __u32 isp_merge_lower_x;
+ __u32 isp_merge_lower_y;
+ __u32 isp_merge_scale_x;
+ __u32 isp_merge_scale_y;
+ __u32 isp_merge_upper_x;
+ __u32 isp_merge_upper_y;
+ __u32 region_header_size;
+ __u32 handle;
+};
+struct drm_pvr_ioctl_destroy_hwrt_dataset_args {
+ __u32 handle;
+ __u32 _padding_4;
+};
+#define DRM_PVR_SYNC_OP_FLAG_HANDLE_TYPE_MASK 0xf
+#define DRM_PVR_SYNC_OP_FLAG_HANDLE_TYPE_SYNCOBJ 0
+#define DRM_PVR_SYNC_OP_FLAG_HANDLE_TYPE_TIMELINE_SYNCOBJ 1
+#define DRM_PVR_SYNC_OP_FLAG_SIGNAL _BITULL(31)
+#define DRM_PVR_SYNC_OP_FLAG_WAIT 0
+#define DRM_PVR_SYNC_OP_FLAGS_MASK (DRM_PVR_SYNC_OP_FLAG_HANDLE_TYPE_MASK | DRM_PVR_SYNC_OP_FLAG_SIGNAL)
+struct drm_pvr_sync_op {
+ __u32 handle;
+ __u32 flags;
+ __u64 value;
+};
+#define DRM_PVR_SUBMIT_JOB_GEOM_CMD_FIRST _BITULL(0)
+#define DRM_PVR_SUBMIT_JOB_GEOM_CMD_LAST _BITULL(1)
+#define DRM_PVR_SUBMIT_JOB_GEOM_CMD_SINGLE_CORE _BITULL(2)
+#define DRM_PVR_SUBMIT_JOB_GEOM_CMD_FLAGS_MASK (DRM_PVR_SUBMIT_JOB_GEOM_CMD_FIRST | DRM_PVR_SUBMIT_JOB_GEOM_CMD_LAST | DRM_PVR_SUBMIT_JOB_GEOM_CMD_SINGLE_CORE)
+#define DRM_PVR_SUBMIT_JOB_FRAG_CMD_SINGLE_CORE _BITULL(0)
+#define DRM_PVR_SUBMIT_JOB_FRAG_CMD_DEPTHBUFFER _BITULL(1)
+#define DRM_PVR_SUBMIT_JOB_FRAG_CMD_STENCILBUFFER _BITULL(2)
+#define DRM_PVR_SUBMIT_JOB_FRAG_CMD_PREVENT_CDM_OVERLAP _BITULL(3)
+#define DRM_PVR_SUBMIT_JOB_FRAG_CMD_SCRATCHBUFFER _BITULL(4)
+#define DRM_PVR_SUBMIT_JOB_FRAG_CMD_GET_VIS_RESULTS _BITULL(5)
+#define DRM_PVR_SUBMIT_JOB_FRAG_CMD_PARTIAL_RENDER _BITULL(6)
+#define DRM_PVR_SUBMIT_JOB_FRAG_CMD_DISABLE_PIXELMERGE _BITULL(7)
+#define DRM_PVR_SUBMIT_JOB_FRAG_CMD_FLAGS_MASK (DRM_PVR_SUBMIT_JOB_FRAG_CMD_SINGLE_CORE | DRM_PVR_SUBMIT_JOB_FRAG_CMD_DEPTHBUFFER | DRM_PVR_SUBMIT_JOB_FRAG_CMD_STENCILBUFFER | DRM_PVR_SUBMIT_JOB_FRAG_CMD_PREVENT_CDM_OVERLAP | DRM_PVR_SUBMIT_JOB_FRAG_CMD_SCRATCHBUFFER | DRM_PVR_SUBMIT_JOB_FRAG_CMD_GET_VIS_RESULTS | DRM_PVR_SUBMIT_JOB_FRAG_CMD_PARTIAL_RENDER | DRM_PVR_SUBMIT_JOB_FRAG_CMD_DISABLE_PIXELMERGE)
+#define DRM_PVR_SUBMIT_JOB_COMPUTE_CMD_PREVENT_ALL_OVERLAP _BITULL(0)
+#define DRM_PVR_SUBMIT_JOB_COMPUTE_CMD_SINGLE_CORE _BITULL(1)
+#define DRM_PVR_SUBMIT_JOB_COMPUTE_CMD_FLAGS_MASK (DRM_PVR_SUBMIT_JOB_COMPUTE_CMD_PREVENT_ALL_OVERLAP | DRM_PVR_SUBMIT_JOB_COMPUTE_CMD_SINGLE_CORE)
+#define DRM_PVR_SUBMIT_JOB_TRANSFER_CMD_SINGLE_CORE _BITULL(0)
+#define DRM_PVR_SUBMIT_JOB_TRANSFER_CMD_FLAGS_MASK DRM_PVR_SUBMIT_JOB_TRANSFER_CMD_SINGLE_CORE
+enum drm_pvr_job_type {
+ DRM_PVR_JOB_TYPE_GEOMETRY = 0,
+ DRM_PVR_JOB_TYPE_FRAGMENT,
+ DRM_PVR_JOB_TYPE_COMPUTE,
+ DRM_PVR_JOB_TYPE_TRANSFER_FRAG,
+};
+struct drm_pvr_hwrt_data_ref {
+ __u32 set_handle;
+ __u32 data_index;
+};
+struct drm_pvr_job {
+ __u32 type;
+ __u32 context_handle;
+ __u32 flags;
+ __u32 cmd_stream_len;
+ __u64 cmd_stream;
+ struct drm_pvr_obj_array sync_ops;
+ struct drm_pvr_hwrt_data_ref hwrt;
+};
+struct drm_pvr_ioctl_submit_jobs_args {
+ struct drm_pvr_obj_array jobs;
+};
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/v3d_drm.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/v3d_drm.h
index 594856f..4000fd3 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/v3d_drm.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/v3d_drm.h
@@ -21,6 +21,7 @@
#define DRM_V3D_PERFMON_CREATE 0x08
#define DRM_V3D_PERFMON_DESTROY 0x09
#define DRM_V3D_PERFMON_GET_VALUES 0x0a
+#define DRM_V3D_SUBMIT_CPU 0x0b
#define DRM_IOCTL_V3D_SUBMIT_CL DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_SUBMIT_CL, struct drm_v3d_submit_cl)
#define DRM_IOCTL_V3D_WAIT_BO DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_WAIT_BO, struct drm_v3d_wait_bo)
#define DRM_IOCTL_V3D_CREATE_BO DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_CREATE_BO, struct drm_v3d_create_bo)
@@ -32,12 +33,19 @@
#define DRM_IOCTL_V3D_PERFMON_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_PERFMON_CREATE, struct drm_v3d_perfmon_create)
#define DRM_IOCTL_V3D_PERFMON_DESTROY DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_PERFMON_DESTROY, struct drm_v3d_perfmon_destroy)
#define DRM_IOCTL_V3D_PERFMON_GET_VALUES DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_PERFMON_GET_VALUES, struct drm_v3d_perfmon_get_values)
+#define DRM_IOCTL_V3D_SUBMIT_CPU DRM_IOW(DRM_COMMAND_BASE + DRM_V3D_SUBMIT_CPU, struct drm_v3d_submit_cpu)
#define DRM_V3D_SUBMIT_CL_FLUSH_CACHE 0x01
#define DRM_V3D_SUBMIT_EXTENSION 0x02
struct drm_v3d_extension {
__u64 next;
__u32 id;
#define DRM_V3D_EXT_ID_MULTI_SYNC 0x01
+#define DRM_V3D_EXT_ID_CPU_INDIRECT_CSD 0x02
+#define DRM_V3D_EXT_ID_CPU_TIMESTAMP_QUERY 0x03
+#define DRM_V3D_EXT_ID_CPU_RESET_TIMESTAMP_QUERY 0x04
+#define DRM_V3D_EXT_ID_CPU_COPY_TIMESTAMP_QUERY 0x05
+#define DRM_V3D_EXT_ID_CPU_RESET_PERFORMANCE_QUERY 0x06
+#define DRM_V3D_EXT_ID_CPU_COPY_PERFORMANCE_QUERY 0x07
__u32 flags;
};
struct drm_v3d_sem {
@@ -52,6 +60,7 @@
V3D_TFU,
V3D_CSD,
V3D_CACHE_CLEAN,
+ V3D_CPU,
};
struct drm_v3d_multi_sync {
struct drm_v3d_extension base;
@@ -109,6 +118,7 @@
DRM_V3D_PARAM_SUPPORTS_CACHE_FLUSH,
DRM_V3D_PARAM_SUPPORTS_PERFMON,
DRM_V3D_PARAM_SUPPORTS_MULTISYNC_EXT,
+ DRM_V3D_PARAM_SUPPORTS_CPU_QUEUE,
};
struct drm_v3d_get_param {
__u32 param;
@@ -133,6 +143,10 @@
__u32 out_sync;
__u32 flags;
__u64 extensions;
+ struct {
+ __u32 ioc;
+ __u32 pad;
+ } v71;
};
struct drm_v3d_submit_csd {
__u32 cfg[7];
@@ -146,6 +160,66 @@
__u32 flags;
__u32 pad;
};
+struct drm_v3d_indirect_csd {
+ struct drm_v3d_extension base;
+ struct drm_v3d_submit_csd submit;
+ __u32 indirect;
+ __u32 offset;
+ __u32 wg_size;
+ __u32 wg_uniform_offsets[3];
+};
+struct drm_v3d_timestamp_query {
+ struct drm_v3d_extension base;
+ __u64 offsets;
+ __u64 syncs;
+ __u32 count;
+ __u32 pad;
+};
+struct drm_v3d_reset_timestamp_query {
+ struct drm_v3d_extension base;
+ __u64 syncs;
+ __u32 offset;
+ __u32 count;
+};
+struct drm_v3d_copy_timestamp_query {
+ struct drm_v3d_extension base;
+ __u8 do_64bit;
+ __u8 do_partial;
+ __u8 availability_bit;
+ __u8 pad;
+ __u32 offset;
+ __u32 stride;
+ __u32 count;
+ __u64 offsets;
+ __u64 syncs;
+};
+struct drm_v3d_reset_performance_query {
+ struct drm_v3d_extension base;
+ __u64 syncs;
+ __u32 count;
+ __u32 nperfmons;
+ __u64 kperfmon_ids;
+};
+struct drm_v3d_copy_performance_query {
+ struct drm_v3d_extension base;
+ __u8 do_64bit;
+ __u8 do_partial;
+ __u8 availability_bit;
+ __u8 pad;
+ __u32 offset;
+ __u32 stride;
+ __u32 nperfmons;
+ __u32 ncounters;
+ __u32 count;
+ __u64 syncs;
+ __u64 kperfmon_ids;
+};
+struct drm_v3d_submit_cpu {
+ __u64 bo_handles;
+ __u32 bo_handle_count;
+ __u32 flags;
+ __u64 extensions;
+};
enum {
V3D_PERFCNT_FEP_VALID_PRIMTS_NO_PIXELS,
V3D_PERFCNT_FEP_VALID_PRIMS,
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/virtgpu_drm.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/virtgpu_drm.h
index 6babe2d..d79c7d9 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/virtgpu_drm.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/virtgpu_drm.h
@@ -58,6 +58,7 @@
#define VIRTGPU_PARAM_CROSS_DEVICE 5
#define VIRTGPU_PARAM_CONTEXT_INIT 6
#define VIRTGPU_PARAM_SUPPORTED_CAPSET_IDs 7
+#define VIRTGPU_PARAM_EXPLICIT_DEBUG_NAME 8
struct drm_virtgpu_getparam {
__u64 param;
__u64 value;
@@ -140,6 +141,7 @@
#define VIRTGPU_CONTEXT_PARAM_CAPSET_ID 0x0001
#define VIRTGPU_CONTEXT_PARAM_NUM_RINGS 0x0002
#define VIRTGPU_CONTEXT_PARAM_POLL_RINGS_MASK 0x0003
+#define VIRTGPU_CONTEXT_PARAM_DEBUG_NAME 0x0004
struct drm_virtgpu_context_set_param {
__u64 param;
__u64 value;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/xe_drm.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/xe_drm.h
new file mode 100644
index 0000000..dd0da6f
--- /dev/null
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/drm/xe_drm.h
@@ -0,0 +1,308 @@
+/*
+ * This file is auto-generated. Modifications will be lost.
+ *
+ * See https://android.googlesource.com/platform/bionic/+/master/libc/kernel/
+ * for more information.
+ */
+#ifndef _UAPI_XE_DRM_H_
+#define _UAPI_XE_DRM_H_
+#include "drm.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define DRM_XE_DEVICE_QUERY 0x00
+#define DRM_XE_GEM_CREATE 0x01
+#define DRM_XE_GEM_MMAP_OFFSET 0x02
+#define DRM_XE_VM_CREATE 0x03
+#define DRM_XE_VM_DESTROY 0x04
+#define DRM_XE_VM_BIND 0x05
+#define DRM_XE_EXEC_QUEUE_CREATE 0x06
+#define DRM_XE_EXEC_QUEUE_DESTROY 0x07
+#define DRM_XE_EXEC_QUEUE_GET_PROPERTY 0x08
+#define DRM_XE_EXEC 0x09
+#define DRM_XE_WAIT_USER_FENCE 0x0a
+#define DRM_IOCTL_XE_DEVICE_QUERY DRM_IOWR(DRM_COMMAND_BASE + DRM_XE_DEVICE_QUERY, struct drm_xe_device_query)
+#define DRM_IOCTL_XE_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_XE_GEM_CREATE, struct drm_xe_gem_create)
+#define DRM_IOCTL_XE_GEM_MMAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + DRM_XE_GEM_MMAP_OFFSET, struct drm_xe_gem_mmap_offset)
+#define DRM_IOCTL_XE_VM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_XE_VM_CREATE, struct drm_xe_vm_create)
+#define DRM_IOCTL_XE_VM_DESTROY DRM_IOW(DRM_COMMAND_BASE + DRM_XE_VM_DESTROY, struct drm_xe_vm_destroy)
+#define DRM_IOCTL_XE_VM_BIND DRM_IOW(DRM_COMMAND_BASE + DRM_XE_VM_BIND, struct drm_xe_vm_bind)
+#define DRM_IOCTL_XE_EXEC_QUEUE_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_XE_EXEC_QUEUE_CREATE, struct drm_xe_exec_queue_create)
+#define DRM_IOCTL_XE_EXEC_QUEUE_DESTROY DRM_IOW(DRM_COMMAND_BASE + DRM_XE_EXEC_QUEUE_DESTROY, struct drm_xe_exec_queue_destroy)
+#define DRM_IOCTL_XE_EXEC_QUEUE_GET_PROPERTY DRM_IOWR(DRM_COMMAND_BASE + DRM_XE_EXEC_QUEUE_GET_PROPERTY, struct drm_xe_exec_queue_get_property)
+#define DRM_IOCTL_XE_EXEC DRM_IOW(DRM_COMMAND_BASE + DRM_XE_EXEC, struct drm_xe_exec)
+#define DRM_IOCTL_XE_WAIT_USER_FENCE DRM_IOWR(DRM_COMMAND_BASE + DRM_XE_WAIT_USER_FENCE, struct drm_xe_wait_user_fence)
+struct drm_xe_user_extension {
+ __u64 next_extension;
+ __u32 name;
+ __u32 pad;
+};
+struct drm_xe_ext_set_property {
+ struct drm_xe_user_extension base;
+ __u32 property;
+ __u32 pad;
+ __u64 value;
+ __u64 reserved[2];
+};
+struct drm_xe_engine_class_instance {
+#define DRM_XE_ENGINE_CLASS_RENDER 0
+#define DRM_XE_ENGINE_CLASS_COPY 1
+#define DRM_XE_ENGINE_CLASS_VIDEO_DECODE 2
+#define DRM_XE_ENGINE_CLASS_VIDEO_ENHANCE 3
+#define DRM_XE_ENGINE_CLASS_COMPUTE 4
+#define DRM_XE_ENGINE_CLASS_VM_BIND 5
+ __u16 engine_class;
+ __u16 engine_instance;
+ __u16 gt_id;
+ __u16 pad;
+};
+struct drm_xe_engine {
+ struct drm_xe_engine_class_instance instance;
+ __u64 reserved[3];
+};
+struct drm_xe_query_engines {
+ __u32 num_engines;
+ __u32 pad;
+ struct drm_xe_engine engines[];
+};
+enum drm_xe_memory_class {
+ DRM_XE_MEM_REGION_CLASS_SYSMEM = 0,
+ DRM_XE_MEM_REGION_CLASS_VRAM
+};
+struct drm_xe_mem_region {
+ __u16 mem_class;
+ __u16 instance;
+ __u32 min_page_size;
+ __u64 total_size;
+ __u64 used;
+ __u64 cpu_visible_size;
+ __u64 cpu_visible_used;
+ __u64 reserved[6];
+};
+struct drm_xe_query_mem_regions {
+ __u32 num_mem_regions;
+ __u32 pad;
+ struct drm_xe_mem_region mem_regions[];
+};
+struct drm_xe_query_config {
+ __u32 num_params;
+ __u32 pad;
+#define DRM_XE_QUERY_CONFIG_REV_AND_DEVICE_ID 0
+#define DRM_XE_QUERY_CONFIG_FLAGS 1
+#define DRM_XE_QUERY_CONFIG_FLAG_HAS_VRAM (1 << 0)
+#define DRM_XE_QUERY_CONFIG_MIN_ALIGNMENT 2
+#define DRM_XE_QUERY_CONFIG_VA_BITS 3
+#define DRM_XE_QUERY_CONFIG_MAX_EXEC_QUEUE_PRIORITY 4
+ __u64 info[];
+};
+struct drm_xe_gt {
+#define DRM_XE_QUERY_GT_TYPE_MAIN 0
+#define DRM_XE_QUERY_GT_TYPE_MEDIA 1
+ __u16 type;
+ __u16 tile_id;
+ __u16 gt_id;
+ __u16 pad[3];
+ __u32 reference_clock;
+ __u64 near_mem_regions;
+ __u64 far_mem_regions;
+ __u64 reserved[8];
+};
+struct drm_xe_query_gt_list {
+ __u32 num_gt;
+ __u32 pad;
+ struct drm_xe_gt gt_list[];
+};
+struct drm_xe_query_topology_mask {
+ __u16 gt_id;
+#define DRM_XE_TOPO_DSS_GEOMETRY (1 << 0)
+#define DRM_XE_TOPO_DSS_COMPUTE (1 << 1)
+#define DRM_XE_TOPO_EU_PER_DSS (1 << 2)
+ __u16 type;
+ __u32 num_bytes;
+ __u8 mask[];
+};
+struct drm_xe_query_engine_cycles {
+ struct drm_xe_engine_class_instance eci;
+ __s32 clockid;
+ __u32 width;
+ __u64 engine_cycles;
+ __u64 cpu_timestamp;
+ __u64 cpu_delta;
+};
+struct drm_xe_query_uc_fw_version {
+#define XE_QUERY_UC_TYPE_GUC_SUBMISSION 0
+ __u16 uc_type;
+ __u16 pad;
+ __u32 branch_ver;
+ __u32 major_ver;
+ __u32 minor_ver;
+ __u32 patch_ver;
+ __u32 pad2;
+ __u64 reserved;
+};
+struct drm_xe_device_query {
+ __u64 extensions;
+#define DRM_XE_DEVICE_QUERY_ENGINES 0
+#define DRM_XE_DEVICE_QUERY_MEM_REGIONS 1
+#define DRM_XE_DEVICE_QUERY_CONFIG 2
+#define DRM_XE_DEVICE_QUERY_GT_LIST 3
+#define DRM_XE_DEVICE_QUERY_HWCONFIG 4
+#define DRM_XE_DEVICE_QUERY_GT_TOPOLOGY 5
+#define DRM_XE_DEVICE_QUERY_ENGINE_CYCLES 6
+#define DRM_XE_DEVICE_QUERY_UC_FW_VERSION 7
+ __u32 query;
+ __u32 size;
+ __u64 data;
+ __u64 reserved[2];
+};
+struct drm_xe_gem_create {
+ __u64 extensions;
+ __u64 size;
+ __u32 placement;
+#define DRM_XE_GEM_CREATE_FLAG_DEFER_BACKING (1 << 0)
+#define DRM_XE_GEM_CREATE_FLAG_SCANOUT (1 << 1)
+#define DRM_XE_GEM_CREATE_FLAG_NEEDS_VISIBLE_VRAM (1 << 2)
+ __u32 flags;
+ __u32 vm_id;
+ __u32 handle;
+#define DRM_XE_GEM_CPU_CACHING_WB 1
+#define DRM_XE_GEM_CPU_CACHING_WC 2
+ __u16 cpu_caching;
+ __u16 pad[3];
+ __u64 reserved[2];
+};
+struct drm_xe_gem_mmap_offset {
+ __u64 extensions;
+ __u32 handle;
+ __u32 flags;
+ __u64 offset;
+ __u64 reserved[2];
+};
+struct drm_xe_vm_create {
+ __u64 extensions;
+#define DRM_XE_VM_CREATE_FLAG_SCRATCH_PAGE (1 << 0)
+#define DRM_XE_VM_CREATE_FLAG_LR_MODE (1 << 1)
+#define DRM_XE_VM_CREATE_FLAG_FAULT_MODE (1 << 2)
+ __u32 flags;
+ __u32 vm_id;
+ __u64 reserved[2];
+};
+struct drm_xe_vm_destroy {
+ __u32 vm_id;
+ __u32 pad;
+ __u64 reserved[2];
+};
+struct drm_xe_vm_bind_op {
+ __u64 extensions;
+ __u32 obj;
+ __u16 pat_index;
+ __u16 pad;
+ union {
+ __u64 obj_offset;
+ __u64 userptr;
+ };
+ __u64 range;
+ __u64 addr;
+#define DRM_XE_VM_BIND_OP_MAP 0x0
+#define DRM_XE_VM_BIND_OP_UNMAP 0x1
+#define DRM_XE_VM_BIND_OP_MAP_USERPTR 0x2
+#define DRM_XE_VM_BIND_OP_UNMAP_ALL 0x3
+#define DRM_XE_VM_BIND_OP_PREFETCH 0x4
+ __u32 op;
+#define DRM_XE_VM_BIND_FLAG_NULL (1 << 2)
+#define DRM_XE_VM_BIND_FLAG_DUMPABLE (1 << 3)
+ __u32 flags;
+ __u32 prefetch_mem_region_instance;
+ __u32 pad2;
+ __u64 reserved[3];
+};
+struct drm_xe_vm_bind {
+ __u64 extensions;
+ __u32 vm_id;
+ __u32 exec_queue_id;
+ __u32 pad;
+ __u32 num_binds;
+ union {
+ struct drm_xe_vm_bind_op bind;
+ __u64 vector_of_binds;
+ };
+ __u32 pad2;
+ __u32 num_syncs;
+ __u64 syncs;
+ __u64 reserved[2];
+};
+struct drm_xe_exec_queue_create {
+#define DRM_XE_EXEC_QUEUE_EXTENSION_SET_PROPERTY 0
+#define DRM_XE_EXEC_QUEUE_SET_PROPERTY_PRIORITY 0
+#define DRM_XE_EXEC_QUEUE_SET_PROPERTY_TIMESLICE 1
+ __u64 extensions;
+ __u16 width;
+ __u16 num_placements;
+ __u32 vm_id;
+ __u32 flags;
+ __u32 exec_queue_id;
+ __u64 instances;
+ __u64 reserved[2];
+};
+struct drm_xe_exec_queue_destroy {
+ __u32 exec_queue_id;
+ __u32 pad;
+ __u64 reserved[2];
+};
+struct drm_xe_exec_queue_get_property {
+ __u64 extensions;
+ __u32 exec_queue_id;
+#define DRM_XE_EXEC_QUEUE_GET_PROPERTY_BAN 0
+ __u32 property;
+ __u64 value;
+ __u64 reserved[2];
+};
+struct drm_xe_sync {
+ __u64 extensions;
+#define DRM_XE_SYNC_TYPE_SYNCOBJ 0x0
+#define DRM_XE_SYNC_TYPE_TIMELINE_SYNCOBJ 0x1
+#define DRM_XE_SYNC_TYPE_USER_FENCE 0x2
+ __u32 type;
+#define DRM_XE_SYNC_FLAG_SIGNAL (1 << 0)
+ __u32 flags;
+ union {
+ __u32 handle;
+ __u64 addr;
+ };
+ __u64 timeline_value;
+ __u64 reserved[2];
+};
+struct drm_xe_exec {
+ __u64 extensions;
+ __u32 exec_queue_id;
+ __u32 num_syncs;
+ __u64 syncs;
+ __u64 address;
+ __u16 num_batch_buffer;
+ __u16 pad[3];
+ __u64 reserved[2];
+};
+struct drm_xe_wait_user_fence {
+ __u64 extensions;
+ __u64 addr;
+#define DRM_XE_UFENCE_WAIT_OP_EQ 0x0
+#define DRM_XE_UFENCE_WAIT_OP_NEQ 0x1
+#define DRM_XE_UFENCE_WAIT_OP_GT 0x2
+#define DRM_XE_UFENCE_WAIT_OP_GTE 0x3
+#define DRM_XE_UFENCE_WAIT_OP_LT 0x4
+#define DRM_XE_UFENCE_WAIT_OP_LTE 0x5
+ __u16 op;
+#define DRM_XE_UFENCE_WAIT_FLAG_ABSTIME (1 << 0)
+ __u16 flags;
+ __u32 pad;
+ __u64 value;
+ __u64 mask;
+ __s64 timeout;
+ __u32 exec_queue_id;
+ __u32 pad2;
+ __u64 reserved[2];
+};
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/android/binder.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/android/binder.h
index 1abb3a3..6e64ebc 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/android/binder.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/android/binder.h
@@ -120,20 +120,22 @@
__u32 command;
__s32 param;
};
-#define BINDER_WRITE_READ _IOWR('b', 1, struct binder_write_read)
-#define BINDER_SET_IDLE_TIMEOUT _IOW('b', 3, __s64)
-#define BINDER_SET_MAX_THREADS _IOW('b', 5, __u32)
-#define BINDER_SET_IDLE_PRIORITY _IOW('b', 6, __s32)
-#define BINDER_SET_CONTEXT_MGR _IOW('b', 7, __s32)
-#define BINDER_THREAD_EXIT _IOW('b', 8, __s32)
-#define BINDER_VERSION _IOWR('b', 9, struct binder_version)
-#define BINDER_GET_NODE_DEBUG_INFO _IOWR('b', 11, struct binder_node_debug_info)
-#define BINDER_GET_NODE_INFO_FOR_REF _IOWR('b', 12, struct binder_node_info_for_ref)
-#define BINDER_SET_CONTEXT_MGR_EXT _IOW('b', 13, struct flat_binder_object)
-#define BINDER_FREEZE _IOW('b', 14, struct binder_freeze_info)
-#define BINDER_GET_FROZEN_INFO _IOWR('b', 15, struct binder_frozen_status_info)
-#define BINDER_ENABLE_ONEWAY_SPAM_DETECTION _IOW('b', 16, __u32)
-#define BINDER_GET_EXTENDED_ERROR _IOWR('b', 17, struct binder_extended_error)
+enum {
+ BINDER_WRITE_READ = _IOWR('b', 1, struct binder_write_read),
+ BINDER_SET_IDLE_TIMEOUT = _IOW('b', 3, __s64),
+ BINDER_SET_MAX_THREADS = _IOW('b', 5, __u32),
+ BINDER_SET_IDLE_PRIORITY = _IOW('b', 6, __s32),
+ BINDER_SET_CONTEXT_MGR = _IOW('b', 7, __s32),
+ BINDER_THREAD_EXIT = _IOW('b', 8, __s32),
+ BINDER_VERSION = _IOWR('b', 9, struct binder_version),
+ BINDER_GET_NODE_DEBUG_INFO = _IOWR('b', 11, struct binder_node_debug_info),
+ BINDER_GET_NODE_INFO_FOR_REF = _IOWR('b', 12, struct binder_node_info_for_ref),
+ BINDER_SET_CONTEXT_MGR_EXT = _IOW('b', 13, struct flat_binder_object),
+ BINDER_FREEZE = _IOW('b', 14, struct binder_freeze_info),
+ BINDER_GET_FROZEN_INFO = _IOWR('b', 15, struct binder_frozen_status_info),
+ BINDER_ENABLE_ONEWAY_SPAM_DETECTION = _IOW('b', 16, __u32),
+ BINDER_GET_EXTENDED_ERROR = _IOWR('b', 17, struct binder_extended_error),
+};
enum transaction_flags {
TF_ONE_WAY = 0x01,
TF_ROOT_OBJECT = 0x04,
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/auxvec.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/auxvec.h
index ce02287..6dbdc75 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/auxvec.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/auxvec.h
@@ -31,6 +31,8 @@
#define AT_HWCAP2 26
#define AT_RSEQ_FEATURE_SIZE 27
#define AT_RSEQ_ALIGN 28
+#define AT_HWCAP3 29
+#define AT_HWCAP4 30
#define AT_EXECFN 31
#ifndef AT_MINSIGSTKSZ
#define AT_MINSIGSTKSZ 51
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/batadv_packet.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/batadv_packet.h
index eb72d63..83e5e71 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/batadv_packet.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/batadv_packet.h
@@ -51,6 +51,7 @@
BATADV_MCAST_WANT_ALL_IPV6 = 1UL << 2,
BATADV_MCAST_WANT_NO_RTR4 = 1UL << 3,
BATADV_MCAST_WANT_NO_RTR6 = 1UL << 4,
+ BATADV_MCAST_HAVE_MC_PTYPE_CAPA = 1UL << 5,
};
#define BATADV_TT_DATA_TYPE_MASK 0x0F
enum batadv_tt_data_flags {
@@ -76,6 +77,7 @@
BATADV_TVLV_TT = 0x04,
BATADV_TVLV_ROAM = 0x05,
BATADV_TVLV_MCAST = 0x06,
+ BATADV_TVLV_MCAST_TRACKER = 0x07,
};
#pragma pack(2)
struct batadv_bla_claim_dst {
@@ -208,6 +210,13 @@
__be32 seqno;
__u8 orig[ETH_ALEN];
};
+struct batadv_mcast_packet {
+ __u8 packet_type;
+ __u8 version;
+ __u8 ttl;
+ __u8 reserved;
+ __be16 tvlv_len;
+};
struct batadv_coded_packet {
__u8 packet_type;
__u8 version;
@@ -267,5 +276,8 @@
__u8 flags;
__u8 reserved[3];
};
+struct batadv_tvlv_mcast_tracker {
+ __be16 num_dests;
+};
#pragma pack()
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/bits.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/bits.h
new file mode 100644
index 0000000..d747e24
--- /dev/null
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/bits.h
@@ -0,0 +1,11 @@
+/*
+ * This file is auto-generated. Modifications will be lost.
+ *
+ * See https://android.googlesource.com/platform/bionic/+/master/libc/kernel/
+ * for more information.
+ */
+#ifndef _UAPI_LINUX_BITS_H
+#define _UAPI_LINUX_BITS_H
+#define __GENMASK(h,l) (((~_UL(0)) - (_UL(1) << (l)) + 1) & (~_UL(0) >> (__BITS_PER_LONG - 1 - (h))))
+#define __GENMASK_ULL(h,l) (((~_ULL(0)) - (_ULL(1) << (l)) + 1) & (~_ULL(0) >> (__BITS_PER_LONG_LONG - 1 - (h))))
+#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/bpf.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/bpf.h
index 25e8ad7..0e9e883 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/bpf.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/bpf.h
@@ -28,11 +28,15 @@
#define BPF_JSGE 0x70
#define BPF_JSLT 0xc0
#define BPF_JSLE 0xd0
+#define BPF_JCOND 0xe0
#define BPF_CALL 0x80
#define BPF_EXIT 0x90
#define BPF_FETCH 0x01
#define BPF_XCHG (0xe0 | BPF_FETCH)
#define BPF_CMPXCHG (0xf0 | BPF_FETCH)
+enum bpf_cond_pseudo_jmp {
+ BPF_MAY_GOTO = 0,
+};
enum {
BPF_REG_0 = 0,
BPF_REG_1,
@@ -59,6 +63,16 @@
__u32 prefixlen;
__u8 data[0];
};
+struct bpf_lpm_trie_key_hdr {
+ __u32 prefixlen;
+};
+struct bpf_lpm_trie_key_u8 {
+ union {
+ struct bpf_lpm_trie_key_hdr hdr;
+ __u32 prefixlen;
+ };
+ __u8 data[];
+};
struct bpf_cgroup_storage_key {
__u64 cgroup_inode_id;
__u32 attach_type;
@@ -123,6 +137,8 @@
BPF_ITER_CREATE,
BPF_LINK_DETACH,
BPF_PROG_BIND_MAP,
+ BPF_TOKEN_CREATE,
+ __MAX_BPF_CMD,
};
enum bpf_map_type {
BPF_MAP_TYPE_UNSPEC,
@@ -160,6 +176,8 @@
BPF_MAP_TYPE_BLOOM_FILTER,
BPF_MAP_TYPE_USER_RINGBUF,
BPF_MAP_TYPE_CGRP_STORAGE,
+ BPF_MAP_TYPE_ARENA,
+ __MAX_BPF_MAP_TYPE
};
enum bpf_prog_type {
BPF_PROG_TYPE_UNSPEC,
@@ -195,6 +213,7 @@
BPF_PROG_TYPE_SK_LOOKUP,
BPF_PROG_TYPE_SYSCALL,
BPF_PROG_TYPE_NETFILTER,
+ __MAX_BPF_PROG_TYPE
};
enum bpf_attach_type {
BPF_CGROUP_INET_INGRESS,
@@ -271,8 +290,9 @@
BPF_LINK_TYPE_TCX = 11,
BPF_LINK_TYPE_UPROBE_MULTI = 12,
BPF_LINK_TYPE_NETKIT = 13,
- MAX_BPF_LINK_TYPE,
+ __MAX_BPF_LINK_TYPE,
};
+#define MAX_BPF_LINK_TYPE __MAX_BPF_LINK_TYPE
enum bpf_perf_event_type {
BPF_PERF_EVENT_UNSPEC = 0,
BPF_PERF_EVENT_UPROBE = 1,
@@ -296,6 +316,7 @@
#define BPF_F_SLEEPABLE (1U << 4)
#define BPF_F_XDP_HAS_FRAGS (1U << 5)
#define BPF_F_XDP_DEV_BOUND_ONLY (1U << 6)
+#define BPF_F_TEST_REG_INVARIANTS (1U << 7)
enum {
BPF_F_KPROBE_MULTI_RETURN = (1U << 0)
};
@@ -311,6 +332,9 @@
#define BPF_PSEUDO_FUNC 4
#define BPF_PSEUDO_CALL 1
#define BPF_PSEUDO_KFUNC_CALL 2
+enum bpf_addr_space_cast {
+ BPF_ADDR_SPACE_CAST = 1,
+};
enum {
BPF_ANY = 0,
BPF_NOEXIST = 1,
@@ -333,6 +357,10 @@
BPF_F_INNER_MAP = (1U << 12),
BPF_F_LINK = (1U << 13),
BPF_F_PATH_FD = (1U << 14),
+ BPF_F_VTYPE_BTF_OBJ_FD = (1U << 15),
+ BPF_F_TOKEN_FD = (1U << 16),
+ BPF_F_SEGV_ON_FAULT = (1U << 17),
+ BPF_F_NO_USER_CONV = (1U << 18),
};
#define BPF_F_QUERY_EFFECTIVE (1U << 0)
#define BPF_F_TEST_RUN_ON_CPU (1U << 0)
@@ -371,6 +399,8 @@
__u32 btf_value_type_id;
__u32 btf_vmlinux_value_type_id;
__u64 map_extra;
+ __s32 value_type_btf_obj_fd;
+ __s32 map_token_fd;
};
struct {
__u32 map_fd;
@@ -421,6 +451,7 @@
__aligned_u64 core_relos;
__u32 core_relo_rec_size;
__u32 log_true_size;
+ __s32 prog_token_fd;
};
struct {
__aligned_u64 pathname;
@@ -506,6 +537,8 @@
__u32 btf_log_size;
__u32 btf_log_level;
__u32 btf_log_true_size;
+ __u32 btf_flags;
+ __s32 btf_token_fd;
};
struct {
__u32 pid;
@@ -607,6 +640,10 @@
__u32 map_fd;
__u32 flags;
} prog_bind_map;
+ struct {
+ __u32 flags;
+ __u32 bpffs_fd;
+ } token_create;
} __attribute__((aligned(8)));
#define ___BPF_FUNC_MAPPER(FN,ctx...) FN(unspec, 0, ##ctx) FN(map_lookup_elem, 1, ##ctx) FN(map_update_elem, 2, ##ctx) FN(map_delete_elem, 3, ##ctx) FN(probe_read, 4, ##ctx) FN(ktime_get_ns, 5, ##ctx) FN(trace_printk, 6, ##ctx) FN(get_prandom_u32, 7, ##ctx) FN(get_smp_processor_id, 8, ##ctx) FN(skb_store_bytes, 9, ##ctx) FN(l3_csum_replace, 10, ##ctx) FN(l4_csum_replace, 11, ##ctx) FN(tail_call, 12, ##ctx) FN(clone_redirect, 13, ##ctx) FN(get_current_pid_tgid, 14, ##ctx) FN(get_current_uid_gid, 15, ##ctx) FN(get_current_comm, 16, ##ctx) FN(get_cgroup_classid, 17, ##ctx) FN(skb_vlan_push, 18, ##ctx) FN(skb_vlan_pop, 19, ##ctx) FN(skb_get_tunnel_key, 20, ##ctx) FN(skb_set_tunnel_key, 21, ##ctx) FN(perf_event_read, 22, ##ctx) FN(redirect, 23, ##ctx) FN(get_route_realm, 24, ##ctx) FN(perf_event_output, 25, ##ctx) FN(skb_load_bytes, 26, ##ctx) FN(get_stackid, 27, ##ctx) FN(csum_diff, 28, ##ctx) FN(skb_get_tunnel_opt, 29, ##ctx) FN(skb_set_tunnel_opt, 30, ##ctx) FN(skb_change_proto, 31, ##ctx) FN(skb_change_type, 32, ##ctx) FN(skb_under_cgroup, 33, ##ctx) FN(get_hash_recalc, 34, ##ctx) FN(get_current_task, 35, ##ctx) FN(probe_write_user, 36, ##ctx) FN(current_task_under_cgroup, 37, ##ctx) FN(skb_change_tail, 38, ##ctx) FN(skb_pull_data, 39, ##ctx) FN(csum_update, 40, ##ctx) FN(set_hash_invalid, 41, ##ctx) FN(get_numa_node_id, 42, ##ctx) FN(skb_change_head, 43, ##ctx) FN(xdp_adjust_head, 44, ##ctx) FN(probe_read_str, 45, ##ctx) FN(get_socket_cookie, 46, ##ctx) FN(get_socket_uid, 47, ##ctx) FN(set_hash, 48, ##ctx) FN(setsockopt, 49, ##ctx) FN(skb_adjust_room, 50, ##ctx) FN(redirect_map, 51, ##ctx) FN(sk_redirect_map, 52, ##ctx) FN(sock_map_update, 53, ##ctx) FN(xdp_adjust_meta, 54, ##ctx) FN(perf_event_read_value, 55, ##ctx) FN(perf_prog_read_value, 56, ##ctx) FN(getsockopt, 57, ##ctx) FN(override_return, 58, ##ctx) FN(sock_ops_cb_flags_set, 59, ##ctx) FN(msg_redirect_map, 60, ##ctx) FN(msg_apply_bytes, 61, ##ctx) FN(msg_cork_bytes, 62, ##ctx) FN(msg_pull_data, 63, ##ctx) FN(bind, 64, ##ctx) FN(xdp_adjust_tail, 65, ##ctx) FN(skb_get_xfrm_state, 66, ##ctx) FN(get_stack, 67, ##ctx) FN(skb_load_bytes_relative, 68, ##ctx) FN(fib_lookup, 69, ##ctx) FN(sock_hash_update, 70, ##ctx) FN(msg_redirect_hash, 71, ##ctx) FN(sk_redirect_hash, 72, ##ctx) FN(lwt_push_encap, 73, ##ctx) FN(lwt_seg6_store_bytes, 74, ##ctx) FN(lwt_seg6_adjust_srh, 75, ##ctx) FN(lwt_seg6_action, 76, ##ctx) FN(rc_repeat, 77, ##ctx) FN(rc_keydown, 78, ##ctx) FN(skb_cgroup_id, 79, ##ctx) FN(get_current_cgroup_id, 80, ##ctx) FN(get_local_storage, 81, ##ctx) FN(sk_select_reuseport, 82, ##ctx) FN(skb_ancestor_cgroup_id, 83, ##ctx) FN(sk_lookup_tcp, 84, ##ctx) FN(sk_lookup_udp, 85, ##ctx) FN(sk_release, 86, ##ctx) FN(map_push_elem, 87, ##ctx) FN(map_pop_elem, 88, ##ctx) FN(map_peek_elem, 89, ##ctx) FN(msg_push_data, 90, ##ctx) FN(msg_pop_data, 91, ##ctx) FN(rc_pointer_rel, 92, ##ctx) FN(spin_lock, 93, ##ctx) FN(spin_unlock, 94, ##ctx) FN(sk_fullsock, 95, ##ctx) FN(tcp_sock, 96, ##ctx) FN(skb_ecn_set_ce, 97, ##ctx) FN(get_listener_sock, 98, ##ctx) FN(skc_lookup_tcp, 99, ##ctx) FN(tcp_check_syncookie, 100, ##ctx) FN(sysctl_get_name, 101, ##ctx) FN(sysctl_get_current_value, 102, ##ctx) FN(sysctl_get_new_value, 103, ##ctx) FN(sysctl_set_new_value, 104, ##ctx) FN(strtol, 105, ##ctx) FN(strtoul, 106, ##ctx) FN(sk_storage_get, 107, ##ctx) FN(sk_storage_delete, 108, ##ctx) FN(send_signal, 109, ##ctx) FN(tcp_gen_syncookie, 110, ##ctx) FN(skb_output, 111, ##ctx) FN(probe_read_user, 112, ##ctx) FN(probe_read_kernel, 113, ##ctx) FN(probe_read_user_str, 114, ##ctx) FN(probe_read_kernel_str, 115, ##ctx) FN(tcp_send_ack, 116, ##ctx) FN(send_signal_thread, 117, ##ctx) FN(jiffies64, 118, ##ctx) FN(read_branch_records, 119, ##ctx) FN(get_ns_current_pid_tgid, 120, ##ctx) FN(xdp_output, 121, ##ctx) FN(get_netns_cookie, 122, ##ctx) FN(get_current_ancestor_cgroup_id, 123, ##ctx) FN(sk_assign, 124, ##ctx) FN(ktime_get_boot_ns, 125, ##ctx) FN(seq_printf, 126, ##ctx) FN(seq_write, 127, ##ctx) FN(sk_cgroup_id, 128, ##ctx) FN(sk_ancestor_cgroup_id, 129, ##ctx) FN(ringbuf_output, 130, ##ctx) FN(ringbuf_reserve, 131, ##ctx) FN(ringbuf_submit, 132, ##ctx) FN(ringbuf_discard, 133, ##ctx) FN(ringbuf_query, 134, ##ctx) FN(csum_level, 135, ##ctx) FN(skc_to_tcp6_sock, 136, ##ctx) FN(skc_to_tcp_sock, 137, ##ctx) FN(skc_to_tcp_timewait_sock, 138, ##ctx) FN(skc_to_tcp_request_sock, 139, ##ctx) FN(skc_to_udp6_sock, 140, ##ctx) FN(get_task_stack, 141, ##ctx) FN(load_hdr_opt, 142, ##ctx) FN(store_hdr_opt, 143, ##ctx) FN(reserve_hdr_opt, 144, ##ctx) FN(inode_storage_get, 145, ##ctx) FN(inode_storage_delete, 146, ##ctx) FN(d_path, 147, ##ctx) FN(copy_from_user, 148, ##ctx) FN(snprintf_btf, 149, ##ctx) FN(seq_printf_btf, 150, ##ctx) FN(skb_cgroup_classid, 151, ##ctx) FN(redirect_neigh, 152, ##ctx) FN(per_cpu_ptr, 153, ##ctx) FN(this_cpu_ptr, 154, ##ctx) FN(redirect_peer, 155, ##ctx) FN(task_storage_get, 156, ##ctx) FN(task_storage_delete, 157, ##ctx) FN(get_current_task_btf, 158, ##ctx) FN(bprm_opts_set, 159, ##ctx) FN(ktime_get_coarse_ns, 160, ##ctx) FN(ima_inode_hash, 161, ##ctx) FN(sock_from_file, 162, ##ctx) FN(check_mtu, 163, ##ctx) FN(for_each_map_elem, 164, ##ctx) FN(snprintf, 165, ##ctx) FN(sys_bpf, 166, ##ctx) FN(btf_find_by_name_kind, 167, ##ctx) FN(sys_close, 168, ##ctx) FN(timer_init, 169, ##ctx) FN(timer_set_callback, 170, ##ctx) FN(timer_start, 171, ##ctx) FN(timer_cancel, 172, ##ctx) FN(get_func_ip, 173, ##ctx) FN(get_attach_cookie, 174, ##ctx) FN(task_pt_regs, 175, ##ctx) FN(get_branch_snapshot, 176, ##ctx) FN(trace_vprintk, 177, ##ctx) FN(skc_to_unix_sock, 178, ##ctx) FN(kallsyms_lookup_name, 179, ##ctx) FN(find_vma, 180, ##ctx) FN(loop, 181, ##ctx) FN(strncmp, 182, ##ctx) FN(get_func_arg, 183, ##ctx) FN(get_func_ret, 184, ##ctx) FN(get_func_arg_cnt, 185, ##ctx) FN(get_retval, 186, ##ctx) FN(set_retval, 187, ##ctx) FN(xdp_get_buff_len, 188, ##ctx) FN(xdp_load_bytes, 189, ##ctx) FN(xdp_store_bytes, 190, ##ctx) FN(copy_from_user_task, 191, ##ctx) FN(skb_set_tstamp, 192, ##ctx) FN(ima_file_hash, 193, ##ctx) FN(kptr_xchg, 194, ##ctx) FN(map_lookup_percpu_elem, 195, ##ctx) FN(skc_to_mptcp_sock, 196, ##ctx) FN(dynptr_from_mem, 197, ##ctx) FN(ringbuf_reserve_dynptr, 198, ##ctx) FN(ringbuf_submit_dynptr, 199, ##ctx) FN(ringbuf_discard_dynptr, 200, ##ctx) FN(dynptr_read, 201, ##ctx) FN(dynptr_write, 202, ##ctx) FN(dynptr_data, 203, ##ctx) FN(tcp_raw_gen_syncookie_ipv4, 204, ##ctx) FN(tcp_raw_gen_syncookie_ipv6, 205, ##ctx) FN(tcp_raw_check_syncookie_ipv4, 206, ##ctx) FN(tcp_raw_check_syncookie_ipv6, 207, ##ctx) FN(ktime_get_tai_ns, 208, ##ctx) FN(user_ringbuf_drain, 209, ##ctx) FN(cgrp_storage_get, 210, ##ctx) FN(cgrp_storage_delete, 211, ##ctx)
#define __BPF_FUNC_MAPPER_APPLY(name,value,FN) FN(name),
@@ -992,7 +1029,7 @@
__u32 btf_id;
__u32 btf_key_type_id;
__u32 btf_value_type_id;
- __u32 : 32;
+ __u32 btf_vmlinux_id;
__u64 map_extra;
} __attribute__((aligned(8)));
struct bpf_btf_info {
@@ -1061,8 +1098,19 @@
__u32 count;
__u32 flags;
__u64 missed;
+ __aligned_u64 cookies;
} kprobe_multi;
struct {
+ __aligned_u64 path;
+ __aligned_u64 offsets;
+ __aligned_u64 ref_ctr_offsets;
+ __aligned_u64 cookies;
+ __u32 path_size;
+ __u32 count;
+ __u32 flags;
+ __u32 pid;
+ } uprobe_multi;
+ struct {
__u32 type;
__u32 : 32;
union {
@@ -1070,6 +1118,7 @@
__aligned_u64 file_name;
__u32 name_len;
__u32 offset;
+ __u64 cookie;
} uprobe;
struct {
__aligned_u64 func_name;
@@ -1077,14 +1126,19 @@
__u32 offset;
__u64 addr;
__u64 missed;
+ __u64 cookie;
} kprobe;
struct {
__aligned_u64 tp_name;
__u32 name_len;
+ __u32 : 32;
+ __u64 cookie;
} tracepoint;
struct {
__u64 config;
__u32 type;
+ __u32 : 32;
+ __u64 cookie;
} event;
};
} perf_event;
@@ -1198,6 +1252,7 @@
BPF_TCP_LISTEN,
BPF_TCP_CLOSING,
BPF_TCP_NEW_SYN_RECV,
+ BPF_TCP_BOUND_INACTIVE,
BPF_TCP_MAX_STATES
};
enum {
@@ -1358,34 +1413,25 @@
__u32 val;
};
struct bpf_timer {
- __u64 : 64;
- __u64 : 64;
+ __u64 __opaque[2];
} __attribute__((aligned(8)));
struct bpf_dynptr {
- __u64 : 64;
- __u64 : 64;
+ __u64 __opaque[2];
} __attribute__((aligned(8)));
struct bpf_list_head {
- __u64 : 64;
- __u64 : 64;
+ __u64 __opaque[2];
} __attribute__((aligned(8)));
struct bpf_list_node {
- __u64 : 64;
- __u64 : 64;
- __u64 : 64;
+ __u64 __opaque[3];
} __attribute__((aligned(8)));
struct bpf_rb_root {
- __u64 : 64;
- __u64 : 64;
+ __u64 __opaque[2];
} __attribute__((aligned(8)));
struct bpf_rb_node {
- __u64 : 64;
- __u64 : 64;
- __u64 : 64;
- __u64 : 64;
+ __u64 __opaque[4];
} __attribute__((aligned(8)));
struct bpf_refcount {
- __u32 : 32;
+ __u32 __opaque[1];
} __attribute__((aligned(4)));
struct bpf_sysctl {
__u32 write;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/btrfs.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/btrfs.h
index 27564f8..a3ebc4f 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/btrfs.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/btrfs.h
@@ -45,6 +45,7 @@
__u64 rsv_excl;
};
#define BTRFS_QGROUP_INHERIT_SET_LIMITS (1ULL << 0)
+#define BTRFS_QGROUP_INHERIT_FLAGS_SUPP (BTRFS_QGROUP_INHERIT_SET_LIMITS)
struct btrfs_qgroup_inherit {
__u64 flags;
__u64 num_qgroups;
@@ -310,6 +311,7 @@
};
#define BTRFS_DEFRAG_RANGE_COMPRESS 1
#define BTRFS_DEFRAG_RANGE_START_IO 2
+#define BTRFS_DEFRAG_RANGE_FLAGS_SUPP (BTRFS_DEFRAG_RANGE_COMPRESS | BTRFS_DEFRAG_RANGE_START_IO)
struct btrfs_ioctl_defrag_range_args {
__u64 start;
__u64 len;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/can.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/can.h
index 0fc98ae..a913d73 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/can.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/can.h
@@ -55,6 +55,9 @@
};
#define CANXL_XLF 0x80
#define CANXL_SEC 0x01
+#define CANXL_VCID_OFFSET 16
+#define CANXL_VCID_VAL_MASK 0xFFUL
+#define CANXL_VCID_MASK (CANXL_VCID_VAL_MASK << CANXL_VCID_OFFSET)
struct canxl_frame {
canid_t prio;
__u8 flags;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/can/isotp.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/can/isotp.h
index cff12d6..407f6ca 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/can/isotp.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/can/isotp.h
@@ -45,6 +45,7 @@
#define CAN_ISOTP_WAIT_TX_DONE 0x0400
#define CAN_ISOTP_SF_BROADCAST 0x0800
#define CAN_ISOTP_CF_BROADCAST 0x1000
+#define CAN_ISOTP_DYN_FC_PARMS 0x2000
#define CAN_ISOTP_DEFAULT_FLAGS 0
#define CAN_ISOTP_DEFAULT_EXT_ADDRESS 0x00
#define CAN_ISOTP_DEFAULT_PAD_CONTENT 0xCC
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/can/raw.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/can/raw.h
index 940a852..8e47899 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/can/raw.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/can/raw.h
@@ -20,5 +20,15 @@
CAN_RAW_FD_FRAMES,
CAN_RAW_JOIN_FILTERS,
CAN_RAW_XL_FRAMES,
+ CAN_RAW_XL_VCID_OPTS,
};
+struct can_raw_vcid_options {
+ __u8 flags;
+ __u8 tx_vcid;
+ __u8 rx_vcid;
+ __u8 rx_vcid_mask;
+};
+#define CAN_RAW_XL_VCID_TX_SET 0x01
+#define CAN_RAW_XL_VCID_TX_PASS 0x02
+#define CAN_RAW_XL_VCID_RX_FILTER 0x04
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/cxl_mem.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/cxl_mem.h
index a008826..942e817 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/cxl_mem.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/cxl_mem.h
@@ -9,7 +9,7 @@
#include <linux/types.h>
#define CXL_MEM_QUERY_COMMANDS _IOR(0xCE, 1, struct cxl_mem_query_commands)
#define CXL_MEM_SEND_COMMAND _IOWR(0xCE, 2, struct cxl_send_command)
-#define CXL_CMDS ___C(INVALID, "Invalid Command"), ___C(IDENTIFY, "Identify Command"), ___C(RAW, "Raw device command"), ___C(GET_SUPPORTED_LOGS, "Get Supported Logs"), ___C(GET_FW_INFO, "Get FW Info"), ___C(GET_PARTITION_INFO, "Get Partition Information"), ___C(GET_LSA, "Get Label Storage Area"), ___C(GET_HEALTH_INFO, "Get Health Info"), ___C(GET_LOG, "Get Log"), ___C(SET_PARTITION_INFO, "Set Partition Information"), ___C(SET_LSA, "Set Label Storage Area"), ___C(GET_ALERT_CONFIG, "Get Alert Configuration"), ___C(SET_ALERT_CONFIG, "Set Alert Configuration"), ___C(GET_SHUTDOWN_STATE, "Get Shutdown State"), ___C(SET_SHUTDOWN_STATE, "Set Shutdown State"), ___DEPRECATED(GET_POISON, "Get Poison List"), ___DEPRECATED(INJECT_POISON, "Inject Poison"), ___DEPRECATED(CLEAR_POISON, "Clear Poison"), ___C(GET_SCAN_MEDIA_CAPS, "Get Scan Media Capabilities"), ___DEPRECATED(SCAN_MEDIA, "Scan Media"), ___DEPRECATED(GET_SCAN_MEDIA, "Get Scan Media Results"), ___C(MAX, "invalid / last command")
+#define CXL_CMDS ___C(INVALID, "Invalid Command"), ___C(IDENTIFY, "Identify Command"), ___C(RAW, "Raw device command"), ___C(GET_SUPPORTED_LOGS, "Get Supported Logs"), ___C(GET_FW_INFO, "Get FW Info"), ___C(GET_PARTITION_INFO, "Get Partition Information"), ___C(GET_LSA, "Get Label Storage Area"), ___C(GET_HEALTH_INFO, "Get Health Info"), ___C(GET_LOG, "Get Log"), ___C(SET_PARTITION_INFO, "Set Partition Information"), ___C(SET_LSA, "Set Label Storage Area"), ___C(GET_ALERT_CONFIG, "Get Alert Configuration"), ___C(SET_ALERT_CONFIG, "Set Alert Configuration"), ___C(GET_SHUTDOWN_STATE, "Get Shutdown State"), ___C(SET_SHUTDOWN_STATE, "Set Shutdown State"), ___DEPRECATED(GET_POISON, "Get Poison List"), ___DEPRECATED(INJECT_POISON, "Inject Poison"), ___DEPRECATED(CLEAR_POISON, "Clear Poison"), ___C(GET_SCAN_MEDIA_CAPS, "Get Scan Media Capabilities"), ___DEPRECATED(SCAN_MEDIA, "Scan Media"), ___DEPRECATED(GET_SCAN_MEDIA, "Get Scan Media Results"), ___C(GET_TIMESTAMP, "Get Timestamp"), ___C(MAX, "invalid / last command")
#define ___C(a,b) CXL_MEM_COMMAND_ID_ ##a
#define ___DEPRECATED(a,b) CXL_MEM_DEPRECATED_ID_ ##a
enum {
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/devlink.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/devlink.h
index bc44a70..968d6be 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/devlink.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/devlink.h
@@ -97,6 +97,7 @@
DEVLINK_CMD_LINECARD_DEL,
DEVLINK_CMD_SELFTESTS_GET,
DEVLINK_CMD_SELFTESTS_RUN,
+ DEVLINK_CMD_NOTIFY_FILTER_SET,
__DEVLINK_CMD_MAX,
DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
};
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/dpll.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/dpll.h
index 9b5f37d..dd692f6 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/dpll.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/dpll.h
@@ -22,6 +22,14 @@
__DPLL_LOCK_STATUS_MAX,
DPLL_LOCK_STATUS_MAX = (__DPLL_LOCK_STATUS_MAX - 1)
};
+enum dpll_lock_status_error {
+ DPLL_LOCK_STATUS_ERROR_NONE = 1,
+ DPLL_LOCK_STATUS_ERROR_UNDEFINED,
+ DPLL_LOCK_STATUS_ERROR_MEDIA_DOWN,
+ DPLL_LOCK_STATUS_ERROR_FRACTIONAL_FREQUENCY_OFFSET_TOO_HIGH,
+ __DPLL_LOCK_STATUS_ERROR_MAX,
+ DPLL_LOCK_STATUS_ERROR_MAX = (__DPLL_LOCK_STATUS_ERROR_MAX - 1)
+};
#define DPLL_TEMP_DIVIDER 1000
enum dpll_type {
DPLL_TYPE_PPS = 1,
@@ -71,6 +79,7 @@
DPLL_A_LOCK_STATUS,
DPLL_A_TEMP,
DPLL_A_TYPE,
+ DPLL_A_LOCK_STATUS_ERROR,
__DPLL_A_MAX,
DPLL_A_MAX = (__DPLL_A_MAX - 1)
};
@@ -98,6 +107,7 @@
DPLL_A_PIN_PHASE_ADJUST_MAX,
DPLL_A_PIN_PHASE_ADJUST,
DPLL_A_PIN_PHASE_OFFSET,
+ DPLL_A_PIN_FRACTIONAL_FREQUENCY_OFFSET,
__DPLL_A_PIN_MAX,
DPLL_A_PIN_MAX = (__DPLL_A_PIN_MAX - 1)
};
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/elf.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/elf.h
index c545fdf..f1cf522 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/elf.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/elf.h
@@ -358,6 +358,7 @@
#define NT_ARM_SSVE 0x40b
#define NT_ARM_ZA 0x40c
#define NT_ARM_ZT 0x40d
+#define NT_ARM_FPMR 0x40e
#define NT_ARC_V2 0x600
#define NT_VMCOREDD 0x700
#define NT_MIPS_DSP 0x800
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ethtool.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ethtool.h
index 0d166af..48b4544 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ethtool.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ethtool.h
@@ -433,7 +433,8 @@
__u32 indir_size;
__u32 key_size;
__u8 hfunc;
- __u8 rsvd8[3];
+ __u8 input_xfrm;
+ __u8 rsvd8[2];
__u32 rsvd32;
__u32 rss_config[];
};
@@ -857,6 +858,8 @@
#define WAKE_MAGICSECURE (1 << 6)
#define WAKE_FILTER (1 << 7)
#define WOL_MODE_COUNT 8
+#define RXH_XFRM_SYM_XOR (1 << 0)
+#define RXH_XFRM_NO_CHANGE 0xff
#define TCP_V4_FLOW 0x01
#define UDP_V4_FLOW 0x02
#define SCTP_V4_FLOW 0x03
@@ -875,6 +878,18 @@
#define IPV4_FLOW 0x10
#define IPV6_FLOW 0x11
#define ETHER_FLOW 0x12
+#define GTPU_V4_FLOW 0x13
+#define GTPU_V6_FLOW 0x14
+#define GTPC_V4_FLOW 0x15
+#define GTPC_V6_FLOW 0x16
+#define GTPC_TEID_V4_FLOW 0x17
+#define GTPC_TEID_V6_FLOW 0x18
+#define GTPU_EH_V4_FLOW 0x19
+#define GTPU_EH_V6_FLOW 0x1a
+#define GTPU_UL_V4_FLOW 0x1b
+#define GTPU_UL_V6_FLOW 0x1c
+#define GTPU_DL_V4_FLOW 0x1d
+#define GTPU_DL_V6_FLOW 0x1e
#define FLOW_EXT 0x80000000
#define FLOW_MAC_EXT 0x40000000
#define FLOW_RSS 0x20000000
@@ -885,6 +900,7 @@
#define RXH_IP_DST (1 << 5)
#define RXH_L4_B_0_1 (1 << 6)
#define RXH_L4_B_2_3 (1 << 7)
+#define RXH_GTP_TEID (1 << 8)
#define RXH_DISCARD (1 << 31)
#define RX_CLS_FLOW_DISC 0xffffffffffffffffULL
#define RX_CLS_FLOW_WAKE 0xfffffffffffffffeULL
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ethtool_netlink.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ethtool_netlink.h
index c5012d2..e4fc40e 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ethtool_netlink.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ethtool_netlink.h
@@ -638,6 +638,7 @@
ETHTOOL_A_RSS_HFUNC,
ETHTOOL_A_RSS_INDIR,
ETHTOOL_A_RSS_HKEY,
+ ETHTOOL_A_RSS_INPUT_XFRM,
__ETHTOOL_A_RSS_CNT,
ETHTOOL_A_RSS_MAX = (__ETHTOOL_A_RSS_CNT - 1),
};
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/eventpoll.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/eventpoll.h
index 3468658..7704cb3 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/eventpoll.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/eventpoll.h
@@ -35,4 +35,13 @@
#else
#define EPOLL_PACKED
#endif
+struct epoll_params {
+ __u32 busy_poll_usecs;
+ __u16 busy_poll_budget;
+ __u8 prefer_busy_poll;
+ __u8 __pad;
+};
+#define EPOLL_IOC_TYPE 0x8A
+#define EPIOCSPARAMS _IOW(EPOLL_IOC_TYPE, 0x01, struct epoll_params)
+#define EPIOCGPARAMS _IOR(EPOLL_IOC_TYPE, 0x02, struct epoll_params)
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/fb.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/fb.h
index fda2b05..82f35e7 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/fb.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/fb.h
@@ -8,6 +8,7 @@
#define _UAPI_LINUX_FB_H
#include <linux/types.h>
#include <linux/i2c.h>
+#include <linux/vesa.h>
#define FB_MAX 32
#define FBIOGET_VSCREENINFO 0x4600
#define FBIOPUT_VSCREENINFO 0x4601
@@ -235,10 +236,6 @@
__u32 console;
__u32 framebuffer;
};
-#define VESA_NO_BLANKING 0
-#define VESA_VSYNC_SUSPEND 1
-#define VESA_HSYNC_SUSPEND 2
-#define VESA_POWERDOWN 3
enum {
FB_BLANK_UNBLANK = VESA_NO_BLANKING,
FB_BLANK_NORMAL = VESA_NO_BLANKING + 1,
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/fs.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/fs.h
index 9288653..38a2d9e 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/fs.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/fs.h
@@ -36,6 +36,14 @@
__u64 len;
__u64 minlen;
};
+struct fsuuid2 {
+ __u8 len;
+ __u8 uuid[16];
+};
+struct fs_sysfs_path {
+ __u8 len;
+ __u8 name[128];
+};
#define FILE_DEDUPE_RANGE_SAME 0
#define FILE_DEDUPE_RANGE_DIFFERS 1
struct file_dedupe_range_info {
@@ -141,6 +149,8 @@
#define FS_IOC_FSSETXATTR _IOW('X', 32, struct fsxattr)
#define FS_IOC_GETFSLABEL _IOR(0x94, 49, char[FSLABEL_MAX])
#define FS_IOC_SETFSLABEL _IOW(0x94, 50, char[FSLABEL_MAX])
+#define FS_IOC_GETFSUUID _IOR(0x15, 0, struct fsuuid2)
+#define FS_IOC_GETFSSYSFSPATH _IOR(0x15, 1, struct fs_sysfs_path)
#define FS_SECRM_FL 0x00000001
#define FS_UNRM_FL 0x00000002
#define FS_COMPR_FL 0x00000004
@@ -183,7 +193,8 @@
#define RWF_SYNC (( __kernel_rwf_t) 0x00000004)
#define RWF_NOWAIT (( __kernel_rwf_t) 0x00000008)
#define RWF_APPEND (( __kernel_rwf_t) 0x00000010)
-#define RWF_SUPPORTED (RWF_HIPRI | RWF_DSYNC | RWF_SYNC | RWF_NOWAIT | RWF_APPEND)
+#define RWF_NOAPPEND (( __kernel_rwf_t) 0x00000020)
+#define RWF_SUPPORTED (RWF_HIPRI | RWF_DSYNC | RWF_SYNC | RWF_NOWAIT | RWF_APPEND | RWF_NOAPPEND)
#define PAGEMAP_SCAN _IOWR('f', 16, struct pm_scan_arg)
#define PAGE_IS_WPALLOWED (1 << 0)
#define PAGE_IS_WRITTEN (1 << 1)
@@ -192,6 +203,7 @@
#define PAGE_IS_SWAPPED (1 << 4)
#define PAGE_IS_PFNZERO (1 << 5)
#define PAGE_IS_HUGE (1 << 6)
+#define PAGE_IS_SOFT_DIRTY (1 << 7)
struct page_region {
__u64 start;
__u64 end;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/fuse.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/fuse.h
index 8a7d37f..4ac2d2c 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/fuse.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/fuse.h
@@ -8,7 +8,7 @@
#define _LINUX_FUSE_H
#include <stdint.h>
#define FUSE_KERNEL_VERSION 7
-#define FUSE_KERNEL_MINOR_VERSION 39
+#define FUSE_KERNEL_MINOR_VERSION 40
#define FUSE_ROOT_ID 1
struct fuse_attr {
uint64_t ino;
@@ -93,6 +93,7 @@
#define FOPEN_STREAM (1 << 4)
#define FOPEN_NOFLUSH (1 << 5)
#define FOPEN_PARALLEL_DIRECT_WRITES (1 << 6)
+#define FOPEN_PASSTHROUGH (1 << 7)
#define FUSE_ASYNC_READ (1 << 0)
#define FUSE_POSIX_LOCKS (1 << 1)
#define FUSE_FILE_OPS (1 << 2)
@@ -130,12 +131,10 @@
#define FUSE_CREATE_SUPP_GROUP (1ULL << 34)
#define FUSE_HAS_EXPIRE_ONLY (1ULL << 35)
#define FUSE_DIRECT_IO_ALLOW_MMAP (1ULL << 36)
+#define FUSE_PASSTHROUGH (1ULL << 37)
+#define FUSE_NO_EXPORT_SUPPORT (1ULL << 38)
+#define FUSE_HAS_RESEND (1ULL << 39)
#define FUSE_DIRECT_IO_RELAX FUSE_DIRECT_IO_ALLOW_MMAP
-#if FUSE_KERNEL_VERSION > 7 || FUSE_KERNEL_VERSION == 7 && FUSE_KERNEL_MINOR_VERSION >= 36
-#define FUSE_PASSTHROUGH (1ULL << 63)
-#else
-#define FUSE_PASSTHROUGH (1 << 31)
-#endif
#define CUSE_UNRESTRICTED_IOCTL (1 << 0)
#define FUSE_RELEASE_FLUSH (1 << 0)
#define FUSE_RELEASE_FLOCK_UNLOCK (1 << 1)
@@ -215,7 +214,6 @@
FUSE_SYNCFS = 50,
FUSE_TMPFILE = 51,
FUSE_STATX = 52,
- FUSE_CANONICAL_PATH = 2016,
CUSE_INIT = 4096,
CUSE_INIT_BSWAP_RESERVED = 1048576,
FUSE_INIT_BSWAP_RESERVED = 436207616,
@@ -227,6 +225,7 @@
FUSE_NOTIFY_STORE = 4,
FUSE_NOTIFY_RETRIEVE = 5,
FUSE_NOTIFY_DELETE = 6,
+ FUSE_NOTIFY_RESEND = 7,
FUSE_NOTIFY_CODE_MAX,
};
#define FUSE_MIN_READ_BUFFER 8192
@@ -330,7 +329,7 @@
struct fuse_open_out {
uint64_t fh;
uint32_t open_flags;
- uint32_t passthrough_fh;
+ int32_t backing_id;
};
struct fuse_release_in {
uint64_t fh;
@@ -427,7 +426,8 @@
uint16_t max_pages;
uint16_t map_alignment;
uint32_t flags2;
- uint32_t unused[7];
+ uint32_t max_stack_depth;
+ uint32_t unused[6];
};
#define CUSE_INIT_INFO_MAX 4096
struct cuse_init_in {
@@ -496,6 +496,7 @@
uint32_t mode;
uint32_t padding;
};
+#define FUSE_UNIQUE_RESEND (1ULL << 63)
struct fuse_in_header {
uint32_t len;
uint32_t opcode;
@@ -566,9 +567,15 @@
uint64_t dummy3;
uint64_t dummy4;
};
+struct fuse_backing_map {
+ int32_t fd;
+ uint32_t flags;
+ uint64_t padding;
+};
#define FUSE_DEV_IOC_MAGIC 229
#define FUSE_DEV_IOC_CLONE _IOR(FUSE_DEV_IOC_MAGIC, 0, uint32_t)
-#define FUSE_DEV_IOC_PASSTHROUGH_OPEN _IOW(FUSE_DEV_IOC_MAGIC, 126, uint32_t)
+#define FUSE_DEV_IOC_BACKING_OPEN _IOW(FUSE_DEV_IOC_MAGIC, 1, struct fuse_backing_map)
+#define FUSE_DEV_IOC_BACKING_CLOSE _IOW(FUSE_DEV_IOC_MAGIC, 2, uint32_t)
struct fuse_lseek_in {
uint64_t fh;
uint64_t offset;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/if_bridge.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/if_bridge.h
index a738876..97c0fb6 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/if_bridge.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/if_bridge.h
@@ -587,6 +587,7 @@
MDBE_ATTR_VNI,
MDBE_ATTR_IFINDEX,
MDBE_ATTR_SRC_VNI,
+ MDBE_ATTR_STATE_MASK,
__MDBE_ATTR_MAX,
};
#define MDBE_ATTR_MAX (__MDBE_ATTR_MAX - 1)
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/if_link.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/if_link.h
index 54b751e..397adfe 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/if_link.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/if_link.h
@@ -536,6 +536,7 @@
IFLA_VXLAN_DF,
IFLA_VXLAN_VNIFILTER,
IFLA_VXLAN_LOCALBYPASS,
+ IFLA_VXLAN_LABEL_POLICY,
__IFLA_VXLAN_MAX
};
#define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)
@@ -550,6 +551,12 @@
__VXLAN_DF_END,
VXLAN_DF_MAX = __VXLAN_DF_END - 1,
};
+enum ifla_vxlan_label_policy {
+ VXLAN_LABEL_FIXED = 0,
+ VXLAN_LABEL_INHERIT = 1,
+ __VXLAN_LABEL_END,
+ VXLAN_LABEL_MAX = __VXLAN_LABEL_END - 1,
+};
enum {
IFLA_GENEVE_UNSPEC,
IFLA_GENEVE_ID,
@@ -639,6 +646,7 @@
IFLA_BOND_AD_LACP_ACTIVE,
IFLA_BOND_MISSED_MAX,
IFLA_BOND_NS_IP6_TARGET,
+ IFLA_BOND_COUPLED_CONTROL,
__IFLA_BOND_MAX,
};
#define IFLA_BOND_MAX (__IFLA_BOND_MAX - 1)
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/if_xdp.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/if_xdp.h
index 02a014a..b7eec87 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/if_xdp.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/if_xdp.h
@@ -13,6 +13,7 @@
#define XDP_USE_NEED_WAKEUP (1 << 3)
#define XDP_USE_SG (1 << 4)
#define XDP_UMEM_UNALIGNED_CHUNK_FLAG (1 << 0)
+#define XDP_UMEM_TX_SW_CSUM (1 << 1)
struct sockaddr_xdp {
__u16 sxdp_family;
__u16 sxdp_flags;
@@ -47,6 +48,7 @@
__u32 chunk_size;
__u32 headroom;
__u32 flags;
+ __u32 tx_metadata_len;
};
struct xdp_statistics {
__u64 rx_dropped;
@@ -66,10 +68,25 @@
#define XDP_UMEM_PGOFF_COMPLETION_RING 0x180000000ULL
#define XSK_UNALIGNED_BUF_OFFSET_SHIFT 48
#define XSK_UNALIGNED_BUF_ADDR_MASK ((1ULL << XSK_UNALIGNED_BUF_OFFSET_SHIFT) - 1)
+#define XDP_TXMD_FLAGS_TIMESTAMP (1 << 0)
+#define XDP_TXMD_FLAGS_CHECKSUM (1 << 1)
+struct xsk_tx_metadata {
+ __u64 flags;
+ union {
+ struct {
+ __u16 csum_start;
+ __u16 csum_offset;
+ } request;
+ struct {
+ __u64 tx_timestamp;
+ } completion;
+ };
+};
struct xdp_desc {
__u64 addr;
__u32 len;
__u32 options;
};
#define XDP_PKT_CONTD (1 << 0)
+#define XDP_TX_METADATA (1 << 1)
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/iio/types.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/iio/types.h
index 4e4324a..f40cb95 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/iio/types.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/iio/types.h
@@ -99,6 +99,8 @@
IIO_MOD_PITCH,
IIO_MOD_YAW,
IIO_MOD_ROLL,
+ IIO_MOD_LIGHT_UVA,
+ IIO_MOD_LIGHT_UVB,
};
enum iio_event_type {
IIO_EV_TYPE_THRESH,
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/input-event-codes.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/input-event-codes.h
index 96f285b..0fe5a14 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/input-event-codes.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/input-event-codes.h
@@ -528,6 +528,7 @@
#define BTN_DPAD_RIGHT 0x223
#define KEY_ALS_TOGGLE 0x230
#define KEY_ROTATE_LOCK_TOGGLE 0x231
+#define KEY_REFRESH_RATE_TOGGLE 0x232
#define KEY_BUTTONCONFIG 0x240
#define KEY_TASKMANAGER 0x241
#define KEY_JOURNAL 0x242
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/io_uring.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/io_uring.h
index 57c6405..10936f2 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/io_uring.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/io_uring.h
@@ -58,6 +58,7 @@
__u32 uring_cmd_flags;
__u32 waitid_flags;
__u32 futex_flags;
+ __u32 install_fd_flags;
};
__u64 user_data;
union {
@@ -172,6 +173,8 @@
IORING_OP_FUTEX_WAIT,
IORING_OP_FUTEX_WAKE,
IORING_OP_FUTEX_WAITV,
+ IORING_OP_FIXED_FD_INSTALL,
+ IORING_OP_FTRUNCATE,
IORING_OP_LAST,
};
#define IORING_URING_CMD_FIXED (1U << 0)
@@ -209,6 +212,7 @@
};
#define IORING_MSG_RING_CQE_SKIP (1U << 0)
#define IORING_MSG_RING_FLAGS_PASS (1U << 1)
+#define IORING_FIXED_FD_NO_CLOEXEC (1U << 0)
struct io_uring_cqe {
__u64 user_data;
__s32 res;
@@ -312,6 +316,9 @@
IORING_UNREGISTER_PBUF_RING = 23,
IORING_REGISTER_SYNC_CANCEL = 24,
IORING_REGISTER_FILE_ALLOC_RANGE = 25,
+ IORING_REGISTER_PBUF_STATUS = 26,
+ IORING_REGISTER_NAPI = 27,
+ IORING_UNREGISTER_NAPI = 28,
IORING_REGISTER_LAST,
IORING_REGISTER_USE_REGISTERED_RING = 1U << 31
};
@@ -397,6 +404,17 @@
__u16 flags;
__u64 resv[3];
};
+struct io_uring_buf_status {
+ __u32 buf_group;
+ __u32 head;
+ __u32 resv[8];
+};
+struct io_uring_napi {
+ __u32 busy_poll_to;
+ __u8 prefer_busy_poll;
+ __u8 pad[3];
+ __u64 resv;
+};
enum {
IORING_RESTRICTION_REGISTER_OP = 0,
IORING_RESTRICTION_SQE_OP = 1,
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ioam6_genl.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ioam6_genl.h
index 8201bb5..216cd31 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ioam6_genl.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ioam6_genl.h
@@ -33,4 +33,18 @@
__IOAM6_CMD_MAX,
};
#define IOAM6_CMD_MAX (__IOAM6_CMD_MAX - 1)
+#define IOAM6_GENL_EV_GRP_NAME "ioam6_events"
+enum ioam6_event_type {
+ IOAM6_EVENT_UNSPEC,
+ IOAM6_EVENT_TRACE,
+};
+enum ioam6_event_attr {
+ IOAM6_EVENT_ATTR_UNSPEC,
+ IOAM6_EVENT_ATTR_TRACE_NAMESPACE,
+ IOAM6_EVENT_ATTR_TRACE_NODELEN,
+ IOAM6_EVENT_ATTR_TRACE_TYPE,
+ IOAM6_EVENT_ATTR_TRACE_DATA,
+ __IOAM6_EVENT_ATTR_MAX
+};
+#define IOAM6_EVENT_ATTR_MAX (__IOAM6_EVENT_ATTR_MAX - 1)
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/iommufd.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/iommufd.h
index d19a471..2570628 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/iommufd.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/iommufd.h
@@ -24,6 +24,7 @@
IOMMUFD_CMD_GET_HW_INFO,
IOMMUFD_CMD_HWPT_SET_DIRTY_TRACKING,
IOMMUFD_CMD_HWPT_GET_DIRTY_BITMAP,
+ IOMMUFD_CMD_HWPT_INVALIDATE,
};
struct iommu_destroy {
__u32 size;
@@ -200,4 +201,26 @@
__aligned_u64 data;
};
#define IOMMU_HWPT_GET_DIRTY_BITMAP _IO(IOMMUFD_TYPE, IOMMUFD_CMD_HWPT_GET_DIRTY_BITMAP)
+enum iommu_hwpt_invalidate_data_type {
+ IOMMU_HWPT_INVALIDATE_DATA_VTD_S1,
+};
+enum iommu_hwpt_vtd_s1_invalidate_flags {
+ IOMMU_VTD_INV_FLAGS_LEAF = 1 << 0,
+};
+struct iommu_hwpt_vtd_s1_invalidate {
+ __aligned_u64 addr;
+ __aligned_u64 npages;
+ __u32 flags;
+ __u32 __reserved;
+};
+struct iommu_hwpt_invalidate {
+ __u32 size;
+ __u32 hwpt_id;
+ __aligned_u64 data_uptr;
+ __u32 data_type;
+ __u32 entry_len;
+ __u32 entry_num;
+ __u32 __reserved;
+};
+#define IOMMU_HWPT_INVALIDATE _IO(IOMMUFD_TYPE, IOMMUFD_CMD_HWPT_INVALIDATE)
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/kexec.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/kexec.h
index 53c86f3..c5c8623 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/kexec.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/kexec.h
@@ -14,6 +14,7 @@
#define KEXEC_FILE_UNLOAD 0x00000001
#define KEXEC_FILE_ON_CRASH 0x00000002
#define KEXEC_FILE_NO_INITRAMFS 0x00000004
+#define KEXEC_FILE_DEBUG 0x00000008
#define KEXEC_ARCH_DEFAULT (0 << 16)
#define KEXEC_ARCH_386 (3 << 16)
#define KEXEC_ARCH_68K (4 << 16)
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/kfd_ioctl.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/kfd_ioctl.h
index 0dc806f..62c9872 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/kfd_ioctl.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/kfd_ioctl.h
@@ -9,7 +9,7 @@
#include <drm/drm.h>
#include <linux/ioctl.h>
#define KFD_IOCTL_MAJOR_VERSION 1
-#define KFD_IOCTL_MINOR_VERSION 14
+#define KFD_IOCTL_MINOR_VERSION 15
struct kfd_ioctl_get_version_args {
__u32 major_version;
__u32 minor_version;
@@ -497,9 +497,12 @@
#define KFD_EC_MASK_QUEUE (KFD_EC_MASK(EC_QUEUE_WAVE_ABORT) | KFD_EC_MASK(EC_QUEUE_WAVE_TRAP) | KFD_EC_MASK(EC_QUEUE_WAVE_MATH_ERROR) | KFD_EC_MASK(EC_QUEUE_WAVE_ILLEGAL_INSTRUCTION) | KFD_EC_MASK(EC_QUEUE_WAVE_MEMORY_VIOLATION) | KFD_EC_MASK(EC_QUEUE_WAVE_APERTURE_VIOLATION) | KFD_EC_MASK(EC_QUEUE_PACKET_DISPATCH_DIM_INVALID) | KFD_EC_MASK(EC_QUEUE_PACKET_DISPATCH_GROUP_SEGMENT_SIZE_INVALID) | KFD_EC_MASK(EC_QUEUE_PACKET_DISPATCH_CODE_INVALID) | KFD_EC_MASK(EC_QUEUE_PACKET_RESERVED) | KFD_EC_MASK(EC_QUEUE_PACKET_UNSUPPORTED) | KFD_EC_MASK(EC_QUEUE_PACKET_DISPATCH_WORK_GROUP_SIZE_INVALID) | KFD_EC_MASK(EC_QUEUE_PACKET_DISPATCH_REGISTER_INVALID) | KFD_EC_MASK(EC_QUEUE_PACKET_VENDOR_UNSUPPORTED) | KFD_EC_MASK(EC_QUEUE_PREEMPTION_ERROR) | KFD_EC_MASK(EC_QUEUE_NEW))
#define KFD_EC_MASK_DEVICE (KFD_EC_MASK(EC_DEVICE_QUEUE_DELETE) | KFD_EC_MASK(EC_DEVICE_RAS_ERROR) | KFD_EC_MASK(EC_DEVICE_FATAL_HALT) | KFD_EC_MASK(EC_DEVICE_MEMORY_VIOLATION) | KFD_EC_MASK(EC_DEVICE_NEW))
#define KFD_EC_MASK_PROCESS (KFD_EC_MASK(EC_PROCESS_RUNTIME) | KFD_EC_MASK(EC_PROCESS_DEVICE_REMOVE))
-#define KFD_DBG_EC_TYPE_IS_QUEUE(ecode) (! ! (KFD_EC_MASK(ecode) & KFD_EC_MASK_QUEUE))
-#define KFD_DBG_EC_TYPE_IS_DEVICE(ecode) (! ! (KFD_EC_MASK(ecode) & KFD_EC_MASK_DEVICE))
-#define KFD_DBG_EC_TYPE_IS_PROCESS(ecode) (! ! (KFD_EC_MASK(ecode) & KFD_EC_MASK_PROCESS))
+#define KFD_EC_MASK_PACKET (KFD_EC_MASK(EC_QUEUE_PACKET_DISPATCH_DIM_INVALID) | KFD_EC_MASK(EC_QUEUE_PACKET_DISPATCH_GROUP_SEGMENT_SIZE_INVALID) | KFD_EC_MASK(EC_QUEUE_PACKET_DISPATCH_CODE_INVALID) | KFD_EC_MASK(EC_QUEUE_PACKET_RESERVED) | KFD_EC_MASK(EC_QUEUE_PACKET_UNSUPPORTED) | KFD_EC_MASK(EC_QUEUE_PACKET_DISPATCH_WORK_GROUP_SIZE_INVALID) | KFD_EC_MASK(EC_QUEUE_PACKET_DISPATCH_REGISTER_INVALID) | KFD_EC_MASK(EC_QUEUE_PACKET_VENDOR_UNSUPPORTED))
+#define KFD_DBG_EC_IS_VALID(ecode) (ecode > EC_NONE && ecode < EC_MAX)
+#define KFD_DBG_EC_TYPE_IS_QUEUE(ecode) (KFD_DBG_EC_IS_VALID(ecode) && ! ! (KFD_EC_MASK(ecode) & KFD_EC_MASK_QUEUE))
+#define KFD_DBG_EC_TYPE_IS_DEVICE(ecode) (KFD_DBG_EC_IS_VALID(ecode) && ! ! (KFD_EC_MASK(ecode) & KFD_EC_MASK_DEVICE))
+#define KFD_DBG_EC_TYPE_IS_PROCESS(ecode) (KFD_DBG_EC_IS_VALID(ecode) && ! ! (KFD_EC_MASK(ecode) & KFD_EC_MASK_PROCESS))
+#define KFD_DBG_EC_TYPE_IS_PACKET(ecode) (KFD_DBG_EC_IS_VALID(ecode) && ! ! (KFD_EC_MASK(ecode) & KFD_EC_MASK_PACKET))
enum kfd_dbg_runtime_state {
DEBUG_RUNTIME_STATE_DISABLED = 0,
DEBUG_RUNTIME_STATE_ENABLED = 1,
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/kvm.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/kvm.h
index 2a89638..ffaf5e6 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/kvm.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/kvm.h
@@ -12,59 +12,7 @@
#include <linux/ioctl.h>
#include <asm/kvm.h>
#define KVM_API_VERSION 12
-#define KVM_TRC_SHIFT 16
-#define KVM_TRC_ENTRYEXIT (1 << KVM_TRC_SHIFT)
-#define KVM_TRC_HANDLER (1 << (KVM_TRC_SHIFT + 1))
-#define KVM_TRC_VMENTRY (KVM_TRC_ENTRYEXIT + 0x01)
-#define KVM_TRC_VMEXIT (KVM_TRC_ENTRYEXIT + 0x02)
-#define KVM_TRC_PAGE_FAULT (KVM_TRC_HANDLER + 0x01)
-#define KVM_TRC_HEAD_SIZE 12
-#define KVM_TRC_CYCLE_SIZE 8
-#define KVM_TRC_EXTRA_MAX 7
-#define KVM_TRC_INJ_VIRQ (KVM_TRC_HANDLER + 0x02)
-#define KVM_TRC_REDELIVER_EVT (KVM_TRC_HANDLER + 0x03)
-#define KVM_TRC_PEND_INTR (KVM_TRC_HANDLER + 0x04)
-#define KVM_TRC_IO_READ (KVM_TRC_HANDLER + 0x05)
-#define KVM_TRC_IO_WRITE (KVM_TRC_HANDLER + 0x06)
-#define KVM_TRC_CR_READ (KVM_TRC_HANDLER + 0x07)
-#define KVM_TRC_CR_WRITE (KVM_TRC_HANDLER + 0x08)
-#define KVM_TRC_DR_READ (KVM_TRC_HANDLER + 0x09)
-#define KVM_TRC_DR_WRITE (KVM_TRC_HANDLER + 0x0A)
-#define KVM_TRC_MSR_READ (KVM_TRC_HANDLER + 0x0B)
-#define KVM_TRC_MSR_WRITE (KVM_TRC_HANDLER + 0x0C)
-#define KVM_TRC_CPUID (KVM_TRC_HANDLER + 0x0D)
-#define KVM_TRC_INTR (KVM_TRC_HANDLER + 0x0E)
-#define KVM_TRC_NMI (KVM_TRC_HANDLER + 0x0F)
-#define KVM_TRC_VMMCALL (KVM_TRC_HANDLER + 0x10)
-#define KVM_TRC_HLT (KVM_TRC_HANDLER + 0x11)
-#define KVM_TRC_CLTS (KVM_TRC_HANDLER + 0x12)
-#define KVM_TRC_LMSW (KVM_TRC_HANDLER + 0x13)
-#define KVM_TRC_APIC_ACCESS (KVM_TRC_HANDLER + 0x14)
-#define KVM_TRC_TDP_FAULT (KVM_TRC_HANDLER + 0x15)
-#define KVM_TRC_GTLB_WRITE (KVM_TRC_HANDLER + 0x16)
-#define KVM_TRC_STLB_WRITE (KVM_TRC_HANDLER + 0x17)
-#define KVM_TRC_STLB_INVAL (KVM_TRC_HANDLER + 0x18)
-#define KVM_TRC_PPC_INSTR (KVM_TRC_HANDLER + 0x19)
-struct kvm_user_trace_setup {
- __u32 buf_size;
- __u32 buf_nr;
-};
-#define __KVM_DEPRECATED_MAIN_W_0x06 _IOW(KVMIO, 0x06, struct kvm_user_trace_setup)
-#define __KVM_DEPRECATED_MAIN_0x07 _IO(KVMIO, 0x07)
-#define __KVM_DEPRECATED_MAIN_0x08 _IO(KVMIO, 0x08)
-#define __KVM_DEPRECATED_VM_R_0x70 _IOR(KVMIO, 0x70, struct kvm_assigned_irq)
-struct kvm_breakpoint {
- __u32 enabled;
- __u32 padding;
- __u64 address;
-};
-struct kvm_debug_guest {
- __u32 enabled;
- __u32 pad;
- struct kvm_breakpoint breakpoints[4];
- __u32 singlestep;
-};
-#define __KVM_DEPRECATED_VCPU_W_0x87 _IOW(KVMIO, 0x87, struct kvm_debug_guest)
+#define __KVM_HAVE_GUEST_DEBUG
struct kvm_userspace_memory_region {
__u32 slot;
__u32 flags;
@@ -72,8 +20,20 @@
__u64 memory_size;
__u64 userspace_addr;
};
+struct kvm_userspace_memory_region2 {
+ __u32 slot;
+ __u32 flags;
+ __u64 guest_phys_addr;
+ __u64 memory_size;
+ __u64 userspace_addr;
+ __u64 guest_memfd_offset;
+ __u32 guest_memfd;
+ __u32 pad1;
+ __u64 pad2[14];
+};
#define KVM_MEM_LOG_DIRTY_PAGES (1UL << 0)
#define KVM_MEM_READONLY (1UL << 1)
+#define KVM_MEM_GUEST_MEMFD (1UL << 2)
struct kvm_irq_level {
union {
__u32 irq;
@@ -99,24 +59,6 @@
__u32 pad[15];
};
#define KVM_PIT_SPEAKER_DUMMY 1
-struct kvm_s390_skeys {
- __u64 start_gfn;
- __u64 count;
- __u64 skeydata_addr;
- __u32 flags;
- __u32 reserved[9];
-};
-#define KVM_S390_CMMA_PEEK (1 << 0)
-struct kvm_s390_cmma_log {
- __u64 start_gfn;
- __u32 count;
- __u32 flags;
- union {
- __u64 remaining;
- __u64 mask;
- };
- __u64 values;
-};
struct kvm_hyperv_exit {
#define KVM_EXIT_HYPERV_SYNIC 1
#define KVM_EXIT_HYPERV_HCALL 2
@@ -201,6 +143,7 @@
#define KVM_EXIT_RISCV_CSR 36
#define KVM_EXIT_NOTIFY 37
#define KVM_EXIT_LOONGARCH_IOCSR 38
+#define KVM_EXIT_MEMORY_FAULT 39
#define KVM_INTERNAL_ERROR_EMULATION 1
#define KVM_INTERNAL_ERROR_SIMUL_EX 2
#define KVM_INTERNAL_ERROR_DELIVERY_EV 3
@@ -275,11 +218,6 @@
__u16 ipa;
__u32 ipb;
} s390_sieic;
-#define KVM_S390_RESET_POR 1
-#define KVM_S390_RESET_CLEAR 2
-#define KVM_S390_RESET_SUBSYSTEM 4
-#define KVM_S390_RESET_CPU_INIT 8
-#define KVM_S390_RESET_IPL 16
__u64 s390_reset_flags;
struct {
__u64 trans_exc_code;
@@ -383,6 +321,12 @@
#define KVM_NOTIFY_CONTEXT_INVALID (1 << 0)
__u32 flags;
} notify;
+ struct {
+#define KVM_MEMORY_EXIT_FLAG_PRIVATE (1ULL << 3)
+ __u64 flags;
+ __u64 gpa;
+ __u64 size;
+ } memory_fault;
char padding[256];
};
#define SYNC_REGS_SIZE_BYTES 2048
@@ -423,35 +367,6 @@
__u8 usermode;
__u8 pad[5];
};
-struct kvm_s390_mem_op {
- __u64 gaddr;
- __u64 flags;
- __u32 size;
- __u32 op;
- __u64 buf;
- union {
- struct {
- __u8 ar;
- __u8 key;
- __u8 pad1[6];
- __u64 old_addr;
- };
- __u32 sida_offset;
- __u8 reserved[32];
- };
-};
-#define KVM_S390_MEMOP_LOGICAL_READ 0
-#define KVM_S390_MEMOP_LOGICAL_WRITE 1
-#define KVM_S390_MEMOP_SIDA_READ 2
-#define KVM_S390_MEMOP_SIDA_WRITE 3
-#define KVM_S390_MEMOP_ABSOLUTE_READ 4
-#define KVM_S390_MEMOP_ABSOLUTE_WRITE 5
-#define KVM_S390_MEMOP_ABSOLUTE_CMPXCHG 6
-#define KVM_S390_MEMOP_F_CHECK_ONLY (1ULL << 0)
-#define KVM_S390_MEMOP_F_INJECT_EXCEPTION (1ULL << 1)
-#define KVM_S390_MEMOP_F_SKEY_PROTECTION (1ULL << 2)
-#define KVM_S390_MEMOP_EXTENSION_CAP_BASE (1 << 0)
-#define KVM_S390_MEMOP_EXTENSION_CAP_CMPXCHG (1 << 1)
struct kvm_interrupt {
__u32 irq;
};
@@ -498,104 +413,6 @@
struct kvm_mp_state {
__u32 mp_state;
};
-struct kvm_s390_psw {
- __u64 mask;
- __u64 addr;
-};
-#define KVM_S390_SIGP_STOP 0xfffe0000u
-#define KVM_S390_PROGRAM_INT 0xfffe0001u
-#define KVM_S390_SIGP_SET_PREFIX 0xfffe0002u
-#define KVM_S390_RESTART 0xfffe0003u
-#define KVM_S390_INT_PFAULT_INIT 0xfffe0004u
-#define KVM_S390_INT_PFAULT_DONE 0xfffe0005u
-#define KVM_S390_MCHK 0xfffe1000u
-#define KVM_S390_INT_CLOCK_COMP 0xffff1004u
-#define KVM_S390_INT_CPU_TIMER 0xffff1005u
-#define KVM_S390_INT_VIRTIO 0xffff2603u
-#define KVM_S390_INT_SERVICE 0xffff2401u
-#define KVM_S390_INT_EMERGENCY 0xffff1201u
-#define KVM_S390_INT_EXTERNAL_CALL 0xffff1202u
-#define KVM_S390_INT_IO(ai,cssid,ssid,schid) (((schid)) | ((ssid) << 16) | ((cssid) << 18) | ((ai) << 26))
-#define KVM_S390_INT_IO_MIN 0x00000000u
-#define KVM_S390_INT_IO_MAX 0xfffdffffu
-#define KVM_S390_INT_IO_AI_MASK 0x04000000u
-struct kvm_s390_interrupt {
- __u32 type;
- __u32 parm;
- __u64 parm64;
-};
-struct kvm_s390_io_info {
- __u16 subchannel_id;
- __u16 subchannel_nr;
- __u32 io_int_parm;
- __u32 io_int_word;
-};
-struct kvm_s390_ext_info {
- __u32 ext_params;
- __u32 pad;
- __u64 ext_params2;
-};
-struct kvm_s390_pgm_info {
- __u64 trans_exc_code;
- __u64 mon_code;
- __u64 per_address;
- __u32 data_exc_code;
- __u16 code;
- __u16 mon_class_nr;
- __u8 per_code;
- __u8 per_atmid;
- __u8 exc_access_id;
- __u8 per_access_id;
- __u8 op_access_id;
-#define KVM_S390_PGM_FLAGS_ILC_VALID 0x01
-#define KVM_S390_PGM_FLAGS_ILC_0 0x02
-#define KVM_S390_PGM_FLAGS_ILC_1 0x04
-#define KVM_S390_PGM_FLAGS_ILC_MASK 0x06
-#define KVM_S390_PGM_FLAGS_NO_REWIND 0x08
- __u8 flags;
- __u8 pad[2];
-};
-struct kvm_s390_prefix_info {
- __u32 address;
-};
-struct kvm_s390_extcall_info {
- __u16 code;
-};
-struct kvm_s390_emerg_info {
- __u16 code;
-};
-#define KVM_S390_STOP_FLAG_STORE_STATUS 0x01
-struct kvm_s390_stop_info {
- __u32 flags;
-};
-struct kvm_s390_mchk_info {
- __u64 cr14;
- __u64 mcic;
- __u64 failing_storage_address;
- __u32 ext_damage_code;
- __u32 pad;
- __u8 fixed_logout[16];
-};
-struct kvm_s390_irq {
- __u64 type;
- union {
- struct kvm_s390_io_info io;
- struct kvm_s390_ext_info ext;
- struct kvm_s390_pgm_info pgm;
- struct kvm_s390_emerg_info emerg;
- struct kvm_s390_extcall_info extcall;
- struct kvm_s390_prefix_info prefix;
- struct kvm_s390_stop_info stop;
- struct kvm_s390_mchk_info mchk;
- char reserved[64];
- } u;
-};
-struct kvm_s390_irq_state {
- __u64 buf;
- __u32 flags;
- __u32 len;
- __u32 reserved[4];
-};
#define KVM_GUESTDBG_ENABLE 0x00000001
#define KVM_GUESTDBG_SINGLESTEP 0x00000002
struct kvm_guest_debug {
@@ -635,37 +452,6 @@
__u64 args[4];
__u8 pad[64];
};
-#define KVM_PPC_PVINFO_FLAGS_EV_IDLE (1 << 0)
-struct kvm_ppc_pvinfo {
- __u32 flags;
- __u32 hcall[4];
- __u8 pad[108];
-};
-#define KVM_PPC_PAGE_SIZES_MAX_SZ 8
-struct kvm_ppc_one_page_size {
- __u32 page_shift;
- __u32 pte_enc;
-};
-struct kvm_ppc_one_seg_page_size {
- __u32 page_shift;
- __u32 slb_enc;
- struct kvm_ppc_one_page_size enc[KVM_PPC_PAGE_SIZES_MAX_SZ];
-};
-#define KVM_PPC_PAGE_SIZES_REAL 0x00000001
-#define KVM_PPC_1T_SEGMENTS 0x00000002
-#define KVM_PPC_NO_HASH 0x00000004
-struct kvm_ppc_smmu_info {
- __u64 flags;
- __u32 slb_size;
- __u16 data_keys;
- __u16 instr_keys;
- struct kvm_ppc_one_seg_page_size sps[KVM_PPC_PAGE_SIZES_MAX_SZ];
-};
-struct kvm_ppc_resize_hpt {
- __u64 flags;
- __u32 shift;
- __u32 pad;
-};
#define KVMIO 0xAE
#define KVM_VM_S390_UCONTROL 1
#define KVM_VM_PPC_HV 1
@@ -683,9 +469,6 @@
#define KVM_CHECK_EXTENSION _IO(KVMIO, 0x03)
#define KVM_GET_VCPU_MMAP_SIZE _IO(KVMIO, 0x04)
#define KVM_GET_SUPPORTED_CPUID _IOWR(KVMIO, 0x05, struct kvm_cpuid2)
-#define KVM_TRACE_ENABLE __KVM_DEPRECATED_MAIN_W_0x06
-#define KVM_TRACE_PAUSE __KVM_DEPRECATED_MAIN_0x07
-#define KVM_TRACE_DISABLE __KVM_DEPRECATED_MAIN_0x08
#define KVM_GET_EMULATED_CPUID _IOWR(KVMIO, 0x09, struct kvm_cpuid2)
#define KVM_GET_MSR_FEATURE_INDEX_LIST _IOWR(KVMIO, 0x0a, struct kvm_msr_list)
#define KVM_CAP_IRQCHIP 0
@@ -707,9 +490,7 @@
#define KVM_CAP_IOMMU 18
#define KVM_CAP_DESTROY_MEMORY_REGION_WORKS 21
#define KVM_CAP_USER_NMI 22
-#ifdef __KVM_HAVE_GUEST_DEBUG
#define KVM_CAP_SET_GUEST_DEBUG 23
-#endif
#ifdef __KVM_HAVE_PIT
#define KVM_CAP_REINJECT_CONTROL 24
#endif
@@ -933,7 +714,11 @@
#define KVM_CAP_ARM_EAGER_SPLIT_CHUNK_SIZE 228
#define KVM_CAP_ARM_SUPPORTED_BLOCK_SIZES 229
#define KVM_CAP_ARM_SUPPORTED_REG_MASK_RANGES 230
-#ifdef KVM_CAP_IRQ_ROUTING
+#define KVM_CAP_USER_MEMORY2 231
+#define KVM_CAP_MEMORY_FAULT_INFO 232
+#define KVM_CAP_MEMORY_ATTRIBUTES 233
+#define KVM_CAP_GUEST_MEMFD 234
+#define KVM_CAP_VM_TYPES 235
struct kvm_irq_routing_irqchip {
__u32 irqchip;
__u32 pin;
@@ -988,36 +773,6 @@
__u32 flags;
struct kvm_irq_routing_entry entries[];
};
-#endif
-#ifdef KVM_CAP_MCE
-struct kvm_x86_mce {
- __u64 status;
- __u64 addr;
- __u64 misc;
- __u64 mcg_status;
- __u8 bank;
- __u8 pad1[7];
- __u64 pad2[3];
-};
-#endif
-#ifdef KVM_CAP_XEN_HVM
-#define KVM_XEN_HVM_CONFIG_HYPERCALL_MSR (1 << 0)
-#define KVM_XEN_HVM_CONFIG_INTERCEPT_HCALL (1 << 1)
-#define KVM_XEN_HVM_CONFIG_SHARED_INFO (1 << 2)
-#define KVM_XEN_HVM_CONFIG_RUNSTATE (1 << 3)
-#define KVM_XEN_HVM_CONFIG_EVTCHN_2LEVEL (1 << 4)
-#define KVM_XEN_HVM_CONFIG_EVTCHN_SEND (1 << 5)
-#define KVM_XEN_HVM_CONFIG_RUNSTATE_UPDATE_FLAG (1 << 6)
-struct kvm_xen_hvm_config {
- __u32 flags;
- __u32 msr;
- __u64 blob_addr_32;
- __u64 blob_addr_64;
- __u8 blob_size_32;
- __u8 blob_size_64;
- __u8 pad2[30];
-};
-#endif
#define KVM_IRQFD_FLAG_DEASSIGN (1 << 0)
#define KVM_IRQFD_FLAG_RESAMPLE (1 << 1)
struct kvm_irqfd {
@@ -1148,11 +903,7 @@
#define KVM_SET_USER_MEMORY_REGION _IOW(KVMIO, 0x46, struct kvm_userspace_memory_region)
#define KVM_SET_TSS_ADDR _IO(KVMIO, 0x47)
#define KVM_SET_IDENTITY_MAP_ADDR _IOW(KVMIO, 0x48, __u64)
-struct kvm_s390_ucas_mapping {
- __u64 user_addr;
- __u64 vcpu_addr;
- __u64 length;
-};
+#define KVM_SET_USER_MEMORY_REGION2 _IOW(KVMIO, 0x49, struct kvm_userspace_memory_region2)
#define KVM_S390_UCAS_MAP _IOW(KVMIO, 0x50, struct kvm_s390_ucas_mapping)
#define KVM_S390_UCAS_UNMAP _IOW(KVMIO, 0x51, struct kvm_s390_ucas_mapping)
#define KVM_S390_VCPU_FAULT _IOW(KVMIO, 0x52, unsigned long)
@@ -1166,15 +917,8 @@
#define KVM_IRQ_LINE_STATUS _IOWR(KVMIO, 0x67, struct kvm_irq_level)
#define KVM_REGISTER_COALESCED_MMIO _IOW(KVMIO, 0x67, struct kvm_coalesced_mmio_zone)
#define KVM_UNREGISTER_COALESCED_MMIO _IOW(KVMIO, 0x68, struct kvm_coalesced_mmio_zone)
-#define KVM_ASSIGN_PCI_DEVICE _IOR(KVMIO, 0x69, struct kvm_assigned_pci_dev)
#define KVM_SET_GSI_ROUTING _IOW(KVMIO, 0x6a, struct kvm_irq_routing)
-#define KVM_ASSIGN_IRQ __KVM_DEPRECATED_VM_R_0x70
-#define KVM_ASSIGN_DEV_IRQ _IOW(KVMIO, 0x70, struct kvm_assigned_irq)
#define KVM_REINJECT_CONTROL _IO(KVMIO, 0x71)
-#define KVM_DEASSIGN_PCI_DEVICE _IOW(KVMIO, 0x72, struct kvm_assigned_pci_dev)
-#define KVM_ASSIGN_SET_MSIX_NR _IOW(KVMIO, 0x73, struct kvm_assigned_msix_nr)
-#define KVM_ASSIGN_SET_MSIX_ENTRY _IOW(KVMIO, 0x74, struct kvm_assigned_msix_entry)
-#define KVM_DEASSIGN_DEV_IRQ _IOW(KVMIO, 0x75, struct kvm_assigned_irq)
#define KVM_IRQFD _IOW(KVMIO, 0x76, struct kvm_irqfd)
#define KVM_CREATE_PIT2 _IOW(KVMIO, 0x77, struct kvm_pit_config)
#define KVM_SET_BOOT_CPU_ID _IO(KVMIO, 0x78)
@@ -1187,7 +931,6 @@
#define KVM_PPC_GET_PVINFO _IOW(KVMIO, 0xa1, struct kvm_ppc_pvinfo)
#define KVM_SET_TSC_KHZ _IO(KVMIO, 0xa2)
#define KVM_GET_TSC_KHZ _IO(KVMIO, 0xa3)
-#define KVM_ASSIGN_SET_INTX_MASK _IOW(KVMIO, 0xa4, struct kvm_assigned_pci_dev)
#define KVM_SIGNAL_MSI _IOW(KVMIO, 0xa5, struct kvm_msi)
#define KVM_PPC_GET_SMMU_INFO _IOR(KVMIO, 0xa6, struct kvm_ppc_smmu_info)
#define KVM_PPC_ALLOCATE_HTAB _IOWR(KVMIO, 0xa7, __u32)
@@ -1218,7 +961,6 @@
#define KVM_SET_SREGS _IOW(KVMIO, 0x84, struct kvm_sregs)
#define KVM_TRANSLATE _IOWR(KVMIO, 0x85, struct kvm_translation)
#define KVM_INTERRUPT _IOW(KVMIO, 0x86, struct kvm_interrupt)
-#define KVM_DEBUG_GUEST __KVM_DEPRECATED_VCPU_W_0x87
#define KVM_GET_MSRS _IOWR(KVMIO, 0x88, struct kvm_msrs)
#define KVM_SET_MSRS _IOW(KVMIO, 0x89, struct kvm_msrs)
#define KVM_SET_CPUID _IOW(KVMIO, 0x8a, struct kvm_cpuid)
@@ -1284,322 +1026,16 @@
#define KVM_ARM_VCPU_FINALIZE _IOW(KVMIO, 0xc2, int)
#define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3)
#define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4)
-struct kvm_s390_pv_sec_parm {
- __u64 origin;
- __u64 length;
-};
-struct kvm_s390_pv_unp {
- __u64 addr;
- __u64 size;
- __u64 tweak;
-};
-enum pv_cmd_dmp_id {
- KVM_PV_DUMP_INIT,
- KVM_PV_DUMP_CONFIG_STOR_STATE,
- KVM_PV_DUMP_COMPLETE,
- KVM_PV_DUMP_CPU,
-};
-struct kvm_s390_pv_dmp {
- __u64 subcmd;
- __u64 buff_addr;
- __u64 buff_len;
- __u64 gaddr;
- __u64 reserved[4];
-};
-enum pv_cmd_info_id {
- KVM_PV_INFO_VM,
- KVM_PV_INFO_DUMP,
-};
-struct kvm_s390_pv_info_dump {
- __u64 dump_cpu_buffer_len;
- __u64 dump_config_mem_buffer_per_1m;
- __u64 dump_config_finalize_len;
-};
-struct kvm_s390_pv_info_vm {
- __u64 inst_calls_list[4];
- __u64 max_cpus;
- __u64 max_guests;
- __u64 max_guest_addr;
- __u64 feature_indication;
-};
-struct kvm_s390_pv_info_header {
- __u32 id;
- __u32 len_max;
- __u32 len_written;
- __u32 reserved;
-};
-struct kvm_s390_pv_info {
- struct kvm_s390_pv_info_header header;
- union {
- struct kvm_s390_pv_info_dump dump;
- struct kvm_s390_pv_info_vm vm;
- };
-};
-enum pv_cmd_id {
- KVM_PV_ENABLE,
- KVM_PV_DISABLE,
- KVM_PV_SET_SEC_PARMS,
- KVM_PV_UNPACK,
- KVM_PV_VERIFY,
- KVM_PV_PREP_RESET,
- KVM_PV_UNSHARE_ALL,
- KVM_PV_INFO,
- KVM_PV_DUMP,
- KVM_PV_ASYNC_CLEANUP_PREPARE,
- KVM_PV_ASYNC_CLEANUP_PERFORM,
-};
-struct kvm_pv_cmd {
- __u32 cmd;
- __u16 rc;
- __u16 rrc;
- __u64 data;
- __u32 flags;
- __u32 reserved[3];
-};
#define KVM_S390_PV_COMMAND _IOWR(KVMIO, 0xc5, struct kvm_pv_cmd)
#define KVM_X86_SET_MSR_FILTER _IOW(KVMIO, 0xc6, struct kvm_msr_filter)
#define KVM_RESET_DIRTY_RINGS _IO(KVMIO, 0xc7)
#define KVM_XEN_HVM_GET_ATTR _IOWR(KVMIO, 0xc8, struct kvm_xen_hvm_attr)
#define KVM_XEN_HVM_SET_ATTR _IOW(KVMIO, 0xc9, struct kvm_xen_hvm_attr)
-struct kvm_xen_hvm_attr {
- __u16 type;
- __u16 pad[3];
- union {
- __u8 long_mode;
- __u8 vector;
- __u8 runstate_update_flag;
- struct {
- __u64 gfn;
-#define KVM_XEN_INVALID_GFN ((__u64) - 1)
- } shared_info;
- struct {
- __u32 send_port;
- __u32 type;
- __u32 flags;
-#define KVM_XEN_EVTCHN_DEASSIGN (1 << 0)
-#define KVM_XEN_EVTCHN_UPDATE (1 << 1)
-#define KVM_XEN_EVTCHN_RESET (1 << 2)
- union {
- struct {
- __u32 port;
- __u32 vcpu;
- __u32 priority;
- } port;
- struct {
- __u32 port;
- __s32 fd;
- } eventfd;
- __u32 padding[4];
- } deliver;
- } evtchn;
- __u32 xen_version;
- __u64 pad[8];
- } u;
-};
-#define KVM_XEN_ATTR_TYPE_LONG_MODE 0x0
-#define KVM_XEN_ATTR_TYPE_SHARED_INFO 0x1
-#define KVM_XEN_ATTR_TYPE_UPCALL_VECTOR 0x2
-#define KVM_XEN_ATTR_TYPE_EVTCHN 0x3
-#define KVM_XEN_ATTR_TYPE_XEN_VERSION 0x4
-#define KVM_XEN_ATTR_TYPE_RUNSTATE_UPDATE_FLAG 0x5
#define KVM_XEN_VCPU_GET_ATTR _IOWR(KVMIO, 0xca, struct kvm_xen_vcpu_attr)
#define KVM_XEN_VCPU_SET_ATTR _IOW(KVMIO, 0xcb, struct kvm_xen_vcpu_attr)
#define KVM_XEN_HVM_EVTCHN_SEND _IOW(KVMIO, 0xd0, struct kvm_irq_routing_xen_evtchn)
#define KVM_GET_SREGS2 _IOR(KVMIO, 0xcc, struct kvm_sregs2)
#define KVM_SET_SREGS2 _IOW(KVMIO, 0xcd, struct kvm_sregs2)
-struct kvm_xen_vcpu_attr {
- __u16 type;
- __u16 pad[3];
- union {
- __u64 gpa;
-#define KVM_XEN_INVALID_GPA ((__u64) - 1)
- __u64 pad[8];
- struct {
- __u64 state;
- __u64 state_entry_time;
- __u64 time_running;
- __u64 time_runnable;
- __u64 time_blocked;
- __u64 time_offline;
- } runstate;
- __u32 vcpu_id;
- struct {
- __u32 port;
- __u32 priority;
- __u64 expires_ns;
- } timer;
- __u8 vector;
- } u;
-};
-#define KVM_XEN_VCPU_ATTR_TYPE_VCPU_INFO 0x0
-#define KVM_XEN_VCPU_ATTR_TYPE_VCPU_TIME_INFO 0x1
-#define KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_ADDR 0x2
-#define KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_CURRENT 0x3
-#define KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_DATA 0x4
-#define KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_ADJUST 0x5
-#define KVM_XEN_VCPU_ATTR_TYPE_VCPU_ID 0x6
-#define KVM_XEN_VCPU_ATTR_TYPE_TIMER 0x7
-#define KVM_XEN_VCPU_ATTR_TYPE_UPCALL_VECTOR 0x8
-enum sev_cmd_id {
- KVM_SEV_INIT = 0,
- KVM_SEV_ES_INIT,
- KVM_SEV_LAUNCH_START,
- KVM_SEV_LAUNCH_UPDATE_DATA,
- KVM_SEV_LAUNCH_UPDATE_VMSA,
- KVM_SEV_LAUNCH_SECRET,
- KVM_SEV_LAUNCH_MEASURE,
- KVM_SEV_LAUNCH_FINISH,
- KVM_SEV_SEND_START,
- KVM_SEV_SEND_UPDATE_DATA,
- KVM_SEV_SEND_UPDATE_VMSA,
- KVM_SEV_SEND_FINISH,
- KVM_SEV_RECEIVE_START,
- KVM_SEV_RECEIVE_UPDATE_DATA,
- KVM_SEV_RECEIVE_UPDATE_VMSA,
- KVM_SEV_RECEIVE_FINISH,
- KVM_SEV_GUEST_STATUS,
- KVM_SEV_DBG_DECRYPT,
- KVM_SEV_DBG_ENCRYPT,
- KVM_SEV_CERT_EXPORT,
- KVM_SEV_GET_ATTESTATION_REPORT,
- KVM_SEV_SEND_CANCEL,
- KVM_SEV_NR_MAX,
-};
-struct kvm_sev_cmd {
- __u32 id;
- __u64 data;
- __u32 error;
- __u32 sev_fd;
-};
-struct kvm_sev_launch_start {
- __u32 handle;
- __u32 policy;
- __u64 dh_uaddr;
- __u32 dh_len;
- __u64 session_uaddr;
- __u32 session_len;
-};
-struct kvm_sev_launch_update_data {
- __u64 uaddr;
- __u32 len;
-};
-struct kvm_sev_launch_secret {
- __u64 hdr_uaddr;
- __u32 hdr_len;
- __u64 guest_uaddr;
- __u32 guest_len;
- __u64 trans_uaddr;
- __u32 trans_len;
-};
-struct kvm_sev_launch_measure {
- __u64 uaddr;
- __u32 len;
-};
-struct kvm_sev_guest_status {
- __u32 handle;
- __u32 policy;
- __u32 state;
-};
-struct kvm_sev_dbg {
- __u64 src_uaddr;
- __u64 dst_uaddr;
- __u32 len;
-};
-struct kvm_sev_attestation_report {
- __u8 mnonce[16];
- __u64 uaddr;
- __u32 len;
-};
-struct kvm_sev_send_start {
- __u32 policy;
- __u64 pdh_cert_uaddr;
- __u32 pdh_cert_len;
- __u64 plat_certs_uaddr;
- __u32 plat_certs_len;
- __u64 amd_certs_uaddr;
- __u32 amd_certs_len;
- __u64 session_uaddr;
- __u32 session_len;
-};
-struct kvm_sev_send_update_data {
- __u64 hdr_uaddr;
- __u32 hdr_len;
- __u64 guest_uaddr;
- __u32 guest_len;
- __u64 trans_uaddr;
- __u32 trans_len;
-};
-struct kvm_sev_receive_start {
- __u32 handle;
- __u32 policy;
- __u64 pdh_uaddr;
- __u32 pdh_len;
- __u64 session_uaddr;
- __u32 session_len;
-};
-struct kvm_sev_receive_update_data {
- __u64 hdr_uaddr;
- __u32 hdr_len;
- __u64 guest_uaddr;
- __u32 guest_len;
- __u64 trans_uaddr;
- __u32 trans_len;
-};
-#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)
-#define KVM_DEV_ASSIGN_PCI_2_3 (1 << 1)
-#define KVM_DEV_ASSIGN_MASK_INTX (1 << 2)
-struct kvm_assigned_pci_dev {
- __u32 assigned_dev_id;
- __u32 busnr;
- __u32 devfn;
- __u32 flags;
- __u32 segnr;
- union {
- __u32 reserved[11];
- };
-};
-#define KVM_DEV_IRQ_HOST_INTX (1 << 0)
-#define KVM_DEV_IRQ_HOST_MSI (1 << 1)
-#define KVM_DEV_IRQ_HOST_MSIX (1 << 2)
-#define KVM_DEV_IRQ_GUEST_INTX (1 << 8)
-#define KVM_DEV_IRQ_GUEST_MSI (1 << 9)
-#define KVM_DEV_IRQ_GUEST_MSIX (1 << 10)
-#define KVM_DEV_IRQ_HOST_MASK 0x00ff
-#define KVM_DEV_IRQ_GUEST_MASK 0xff00
-struct kvm_assigned_irq {
- __u32 assigned_dev_id;
- __u32 host_irq;
- __u32 guest_irq;
- __u32 flags;
- union {
- __u32 reserved[12];
- };
-};
-struct kvm_assigned_msix_nr {
- __u32 assigned_dev_id;
- __u16 entry_nr;
- __u16 padding;
-};
-#define KVM_MAX_MSIX_PER_DEV 256
-struct kvm_assigned_msix_entry {
- __u32 assigned_dev_id;
- __u32 gsi;
- __u16 entry;
- __u16 padding[3];
-};
-#define KVM_X2APIC_API_USE_32BIT_IDS (1ULL << 0)
-#define KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK (1ULL << 1)
-#define KVM_ARM_DEV_EL1_VTIMER (1 << 0)
-#define KVM_ARM_DEV_EL1_PTIMER (1 << 1)
-#define KVM_ARM_DEV_PMU (1 << 2)
-struct kvm_hyperv_eventfd {
- __u32 conn_id;
- __s32 fd;
- __u32 flags;
- __u32 padding[3];
-};
-#define KVM_HYPERV_CONN_ID_MASK 0x00ffffff
-#define KVM_HYPERV_EVENTFD_DEASSIGN (1 << 0)
#define KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE (1 << 0)
#define KVM_DIRTY_LOG_INITIALLY_SET (1 << 1)
#ifndef KVM_DIRTY_LOG_PAGE_OFFSET
@@ -1659,24 +1095,18 @@
#define KVM_X86_NOTIFY_VMEXIT_ENABLED (1ULL << 0)
#define KVM_X86_NOTIFY_VMEXIT_USER (1ULL << 1)
#define KVM_S390_ZPCI_OP _IOW(KVMIO, 0xd1, struct kvm_s390_zpci_op)
-struct kvm_s390_zpci_op {
- __u32 fh;
- __u8 op;
- __u8 pad[3];
- union {
- struct {
- __u64 ibv;
- __u64 sb;
- __u32 flags;
- __u32 noi;
- __u8 isc;
- __u8 sbo;
- __u16 pad;
- } reg_aen;
- __u64 reserved[8];
- } u;
+#define KVM_SET_MEMORY_ATTRIBUTES _IOW(KVMIO, 0xd2, struct kvm_memory_attributes)
+struct kvm_memory_attributes {
+ __u64 address;
+ __u64 size;
+ __u64 attributes;
+ __u64 flags;
};
-#define KVM_S390_ZPCIOP_REG_AEN 0
-#define KVM_S390_ZPCIOP_DEREG_AEN 1
-#define KVM_S390_ZPCIOP_REGAEN_HOST (1 << 0)
+#define KVM_MEMORY_ATTRIBUTE_PRIVATE (1ULL << 3)
+#define KVM_CREATE_GUEST_MEMFD _IOWR(KVMIO, 0xd4, struct kvm_create_guest_memfd)
+struct kvm_create_guest_memfd {
+ __u64 size;
+ __u64 flags;
+ __u64 reserved[6];
+};
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/lsm.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/lsm.h
new file mode 100644
index 0000000..3a3f152
--- /dev/null
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/lsm.h
@@ -0,0 +1,41 @@
+/*
+ * This file is auto-generated. Modifications will be lost.
+ *
+ * See https://android.googlesource.com/platform/bionic/+/master/libc/kernel/
+ * for more information.
+ */
+#ifndef _UAPI_LINUX_LSM_H
+#define _UAPI_LINUX_LSM_H
+#include <linux/stddef.h>
+#include <linux/types.h>
+#include <linux/unistd.h>
+struct lsm_ctx {
+ __u64 id;
+ __u64 flags;
+ __u64 len;
+ __u64 ctx_len;
+ __u8 ctx[] __counted_by(ctx_len);
+};
+#define LSM_ID_UNDEF 0
+#define LSM_ID_CAPABILITY 100
+#define LSM_ID_SELINUX 101
+#define LSM_ID_SMACK 102
+#define LSM_ID_TOMOYO 103
+#define LSM_ID_APPARMOR 104
+#define LSM_ID_YAMA 105
+#define LSM_ID_LOADPIN 106
+#define LSM_ID_SAFESETID 107
+#define LSM_ID_LOCKDOWN 108
+#define LSM_ID_BPF 109
+#define LSM_ID_LANDLOCK 110
+#define LSM_ID_IMA 111
+#define LSM_ID_EVM 112
+#define LSM_ATTR_UNDEF 0
+#define LSM_ATTR_CURRENT 100
+#define LSM_ATTR_EXEC 101
+#define LSM_ATTR_FSCREATE 102
+#define LSM_ATTR_KEYCREATE 103
+#define LSM_ATTR_PREV 104
+#define LSM_ATTR_SOCKCREATE 105
+#define LSM_FLAG_SINGLE 0x0001
+#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/magic.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/magic.h
index c4d698e..4d24726 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/magic.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/magic.h
@@ -90,4 +90,5 @@
#define DMA_BUF_MAGIC 0x444d4142
#define DEVMEM_MAGIC 0x454d444d
#define SECRETMEM_MAGIC 0x5345434d
+#define PID_FS_MAGIC 0x50494446
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mctp.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mctp.h
index 8920339..0057842 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mctp.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mctp.h
@@ -38,9 +38,18 @@
#define MCTP_OPT_ADDR_EXT 1
#define SIOCMCTPALLOCTAG (SIOCPROTOPRIVATE + 0)
#define SIOCMCTPDROPTAG (SIOCPROTOPRIVATE + 1)
+#define SIOCMCTPALLOCTAG2 (SIOCPROTOPRIVATE + 2)
+#define SIOCMCTPDROPTAG2 (SIOCPROTOPRIVATE + 3)
struct mctp_ioc_tag_ctl {
mctp_eid_t peer_addr;
__u8 tag;
__u16 flags;
};
+struct mctp_ioc_tag_ctl2 {
+ unsigned int net;
+ mctp_eid_t peer_addr;
+ mctp_eid_t local_addr;
+ __u16 flags;
+ __u8 tag;
+};
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mdio.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mdio.h
index 7ea6a72..7b51b73 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mdio.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mdio.h
@@ -110,6 +110,8 @@
#define MDIO_PMA_SPEED_1000 0x0010
#define MDIO_PMA_SPEED_100 0x0020
#define MDIO_PMA_SPEED_10 0x0040
+#define MDIO_PMA_SPEED_2_5G 0x2000
+#define MDIO_PMA_SPEED_5G 0x4000
#define MDIO_PCS_SPEED_10P2B 0x0002
#define MDIO_PCS_SPEED_2_5G 0x0040
#define MDIO_PCS_SPEED_5G 0x0080
@@ -273,6 +275,8 @@
#define MDIO_AN_T1_ADV_L_ACK ADVERTISE_LPACK
#define MDIO_AN_T1_ADV_L_NEXT_PAGE_REQ ADVERTISE_NPAGE
#define MDIO_AN_T1_ADV_M_B10L 0x4000
+#define MDIO_AN_T1_ADV_M_1000BT1 0x0080
+#define MDIO_AN_T1_ADV_M_100BT1 0x0020
#define MDIO_AN_T1_ADV_M_MST 0x0010
#define MDIO_AN_T1_ADV_H_10L_TX_HI_REQ 0x1000
#define MDIO_AN_T1_ADV_H_10L_TX_HI 0x2000
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mempolicy.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mempolicy.h
index 6cd8fd1..09ce41e 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mempolicy.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mempolicy.h
@@ -14,6 +14,7 @@
MPOL_INTERLEAVE,
MPOL_LOCAL,
MPOL_PREFERRED_MANY,
+ MPOL_WEIGHTED_INTERLEAVE,
MPOL_MAX,
};
#define MPOL_F_STATIC_NODES (1 << 15)
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mount.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mount.h
index faef8af..1166a7a 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mount.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mount.h
@@ -88,4 +88,41 @@
__u64 userns_fd;
};
#define MOUNT_ATTR_SIZE_VER0 32
+struct statmount {
+ __u32 size;
+ __u32 __spare1;
+ __u64 mask;
+ __u32 sb_dev_major;
+ __u32 sb_dev_minor;
+ __u64 sb_magic;
+ __u32 sb_flags;
+ __u32 fs_type;
+ __u64 mnt_id;
+ __u64 mnt_parent_id;
+ __u32 mnt_id_old;
+ __u32 mnt_parent_id_old;
+ __u64 mnt_attr;
+ __u64 mnt_propagation;
+ __u64 mnt_peer_group;
+ __u64 mnt_master;
+ __u64 propagate_from;
+ __u32 mnt_root;
+ __u32 mnt_point;
+ __u64 __spare2[50];
+ char str[];
+};
+struct mnt_id_req {
+ __u32 size;
+ __u32 spare;
+ __u64 mnt_id;
+ __u64 param;
+};
+#define MNT_ID_REQ_SIZE_VER0 24
+#define STATMOUNT_SB_BASIC 0x00000001U
+#define STATMOUNT_MNT_BASIC 0x00000002U
+#define STATMOUNT_PROPAGATE_FROM 0x00000004U
+#define STATMOUNT_MNT_ROOT 0x00000008U
+#define STATMOUNT_MNT_POINT 0x00000010U
+#define STATMOUNT_FS_TYPE 0x00000020U
+#define LSMT_ROOT 0xffffffffffffffff
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mptcp.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mptcp.h
index 6f5d272..3c9ba5e 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mptcp.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/mptcp.h
@@ -52,6 +52,7 @@
__u64 mptcpi_bytes_sent;
__u64 mptcpi_bytes_received;
__u64 mptcpi_bytes_acked;
+ __u8 mptcpi_subflows_total;
};
#define MPTCP_RST_EUNSPEC 0
#define MPTCP_RST_EMPTCP 1
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/netdev.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/netdev.h
index 3c5cb94..cbfe26a 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/netdev.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/netdev.h
@@ -21,7 +21,18 @@
enum netdev_xdp_rx_metadata {
NETDEV_XDP_RX_METADATA_TIMESTAMP = 1,
NETDEV_XDP_RX_METADATA_HASH = 2,
- NETDEV_XDP_RX_METADATA_MASK = 3,
+ NETDEV_XDP_RX_METADATA_VLAN_TAG = 4,
+};
+enum netdev_xsk_flags {
+ NETDEV_XSK_FLAGS_TX_TIMESTAMP = 1,
+ NETDEV_XSK_FLAGS_TX_CHECKSUM = 2,
+};
+enum netdev_queue_type {
+ NETDEV_QUEUE_TYPE_RX,
+ NETDEV_QUEUE_TYPE_TX,
+};
+enum netdev_qstats_scope {
+ NETDEV_QSTATS_SCOPE_QUEUE = 1,
};
enum {
NETDEV_A_DEV_IFINDEX = 1,
@@ -29,16 +40,81 @@
NETDEV_A_DEV_XDP_FEATURES,
NETDEV_A_DEV_XDP_ZC_MAX_SEGS,
NETDEV_A_DEV_XDP_RX_METADATA_FEATURES,
+ NETDEV_A_DEV_XSK_FEATURES,
__NETDEV_A_DEV_MAX,
NETDEV_A_DEV_MAX = (__NETDEV_A_DEV_MAX - 1)
};
enum {
+ NETDEV_A_PAGE_POOL_ID = 1,
+ NETDEV_A_PAGE_POOL_IFINDEX,
+ NETDEV_A_PAGE_POOL_NAPI_ID,
+ NETDEV_A_PAGE_POOL_INFLIGHT,
+ NETDEV_A_PAGE_POOL_INFLIGHT_MEM,
+ NETDEV_A_PAGE_POOL_DETACH_TIME,
+ __NETDEV_A_PAGE_POOL_MAX,
+ NETDEV_A_PAGE_POOL_MAX = (__NETDEV_A_PAGE_POOL_MAX - 1)
+};
+enum {
+ NETDEV_A_PAGE_POOL_STATS_INFO = 1,
+ NETDEV_A_PAGE_POOL_STATS_ALLOC_FAST = 8,
+ NETDEV_A_PAGE_POOL_STATS_ALLOC_SLOW,
+ NETDEV_A_PAGE_POOL_STATS_ALLOC_SLOW_HIGH_ORDER,
+ NETDEV_A_PAGE_POOL_STATS_ALLOC_EMPTY,
+ NETDEV_A_PAGE_POOL_STATS_ALLOC_REFILL,
+ NETDEV_A_PAGE_POOL_STATS_ALLOC_WAIVE,
+ NETDEV_A_PAGE_POOL_STATS_RECYCLE_CACHED,
+ NETDEV_A_PAGE_POOL_STATS_RECYCLE_CACHE_FULL,
+ NETDEV_A_PAGE_POOL_STATS_RECYCLE_RING,
+ NETDEV_A_PAGE_POOL_STATS_RECYCLE_RING_FULL,
+ NETDEV_A_PAGE_POOL_STATS_RECYCLE_RELEASED_REFCNT,
+ __NETDEV_A_PAGE_POOL_STATS_MAX,
+ NETDEV_A_PAGE_POOL_STATS_MAX = (__NETDEV_A_PAGE_POOL_STATS_MAX - 1)
+};
+enum {
+ NETDEV_A_NAPI_IFINDEX = 1,
+ NETDEV_A_NAPI_ID,
+ NETDEV_A_NAPI_IRQ,
+ NETDEV_A_NAPI_PID,
+ __NETDEV_A_NAPI_MAX,
+ NETDEV_A_NAPI_MAX = (__NETDEV_A_NAPI_MAX - 1)
+};
+enum {
+ NETDEV_A_QUEUE_ID = 1,
+ NETDEV_A_QUEUE_IFINDEX,
+ NETDEV_A_QUEUE_TYPE,
+ NETDEV_A_QUEUE_NAPI_ID,
+ __NETDEV_A_QUEUE_MAX,
+ NETDEV_A_QUEUE_MAX = (__NETDEV_A_QUEUE_MAX - 1)
+};
+enum {
+ NETDEV_A_QSTATS_IFINDEX = 1,
+ NETDEV_A_QSTATS_QUEUE_TYPE,
+ NETDEV_A_QSTATS_QUEUE_ID,
+ NETDEV_A_QSTATS_SCOPE,
+ NETDEV_A_QSTATS_RX_PACKETS = 8,
+ NETDEV_A_QSTATS_RX_BYTES,
+ NETDEV_A_QSTATS_TX_PACKETS,
+ NETDEV_A_QSTATS_TX_BYTES,
+ NETDEV_A_QSTATS_RX_ALLOC_FAIL,
+ __NETDEV_A_QSTATS_MAX,
+ NETDEV_A_QSTATS_MAX = (__NETDEV_A_QSTATS_MAX - 1)
+};
+enum {
NETDEV_CMD_DEV_GET = 1,
NETDEV_CMD_DEV_ADD_NTF,
NETDEV_CMD_DEV_DEL_NTF,
NETDEV_CMD_DEV_CHANGE_NTF,
+ NETDEV_CMD_PAGE_POOL_GET,
+ NETDEV_CMD_PAGE_POOL_ADD_NTF,
+ NETDEV_CMD_PAGE_POOL_DEL_NTF,
+ NETDEV_CMD_PAGE_POOL_CHANGE_NTF,
+ NETDEV_CMD_PAGE_POOL_STATS_GET,
+ NETDEV_CMD_QUEUE_GET,
+ NETDEV_CMD_NAPI_GET,
+ NETDEV_CMD_QSTATS_GET,
__NETDEV_CMD_MAX,
NETDEV_CMD_MAX = (__NETDEV_CMD_MAX - 1)
};
#define NETDEV_MCGRP_MGMT "mgmt"
+#define NETDEV_MCGRP_PAGE_POOL "page-pool"
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/netfilter/nf_tables.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/netfilter/nf_tables.h
index 1d0af17..7922147 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/netfilter/nf_tables.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/netfilter/nf_tables.h
@@ -103,8 +103,9 @@
enum nft_table_flags {
NFT_TABLE_F_DORMANT = 0x1,
NFT_TABLE_F_OWNER = 0x2,
+ NFT_TABLE_F_PERSIST = 0x4,
};
-#define NFT_TABLE_F_MASK (NFT_TABLE_F_DORMANT | NFT_TABLE_F_OWNER)
+#define NFT_TABLE_F_MASK (NFT_TABLE_F_DORMANT | NFT_TABLE_F_OWNER | NFT_TABLE_F_PERSIST)
enum nft_table_attributes {
NFTA_TABLE_UNSPEC,
NFTA_TABLE_NAME,
@@ -157,6 +158,7 @@
};
#define NFTA_RULE_MAX (__NFTA_RULE_MAX - 1)
enum nft_rule_compat_flags {
+ NFT_RULE_COMPAT_F_UNUSED = (1 << 0),
NFT_RULE_COMPAT_F_INV = (1 << 1),
NFT_RULE_COMPAT_F_MASK = NFT_RULE_COMPAT_F_INV,
};
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/nexthop.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/nexthop.h
index ea68f62..5726a66 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/nexthop.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/nexthop.h
@@ -26,6 +26,8 @@
__NEXTHOP_GRP_TYPE_MAX,
};
#define NEXTHOP_GRP_TYPE_MAX (__NEXTHOP_GRP_TYPE_MAX - 1)
+#define NHA_OP_FLAG_DUMP_STATS BIT(0)
+#define NHA_OP_FLAG_DUMP_HW_STATS BIT(1)
enum {
NHA_UNSPEC,
NHA_ID,
@@ -41,6 +43,10 @@
NHA_FDB,
NHA_RES_GROUP,
NHA_RES_BUCKET,
+ NHA_OP_FLAGS,
+ NHA_GROUP_STATS,
+ NHA_HW_STATS_ENABLE,
+ NHA_HW_STATS_USED,
__NHA_MAX,
};
#define NHA_MAX (__NHA_MAX - 1)
@@ -63,4 +69,18 @@
__NHA_RES_BUCKET_MAX,
};
#define NHA_RES_BUCKET_MAX (__NHA_RES_BUCKET_MAX - 1)
+enum {
+ NHA_GROUP_STATS_UNSPEC,
+ NHA_GROUP_STATS_ENTRY,
+ __NHA_GROUP_STATS_MAX,
+};
+#define NHA_GROUP_STATS_MAX (__NHA_GROUP_STATS_MAX - 1)
+enum {
+ NHA_GROUP_STATS_ENTRY_UNSPEC,
+ NHA_GROUP_STATS_ENTRY_ID,
+ NHA_GROUP_STATS_ENTRY_PACKETS,
+ NHA_GROUP_STATS_ENTRY_PACKETS_HW,
+ __NHA_GROUP_STATS_ENTRY_MAX,
+};
+#define NHA_GROUP_STATS_ENTRY_MAX (__NHA_GROUP_STATS_ENTRY_MAX - 1)
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/nl80211.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/nl80211.h
index bf87c0e..ddf2b3b 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/nl80211.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/nl80211.h
@@ -180,6 +180,7 @@
NL80211_CMD_REMOVE_LINK_STA,
NL80211_CMD_SET_HW_TIMESTAMP,
NL80211_CMD_LINKS_REMOVED,
+ NL80211_CMD_SET_TID_TO_LINK_MAPPING,
__NL80211_CMD_AFTER_LAST,
NL80211_CMD_MAX = __NL80211_CMD_AFTER_LAST - 1
};
@@ -523,6 +524,10 @@
NL80211_ATTR_HW_TIMESTAMP_ENABLED,
NL80211_ATTR_EMA_RNR_ELEMS,
NL80211_ATTR_MLO_LINK_DISABLED,
+ NL80211_ATTR_BSS_DUMP_INCLUDE_USE_DATA,
+ NL80211_ATTR_MLO_TTLM_DLINK,
+ NL80211_ATTR_MLO_TTLM_ULINK,
+ NL80211_ATTR_ASSOC_SPP_AMSDU,
__NL80211_ATTR_AFTER_LAST,
NUM_NL80211_ATTR = __NL80211_ATTR_AFTER_LAST,
NL80211_ATTR_MAX = __NL80211_ATTR_AFTER_LAST - 1
@@ -598,6 +603,7 @@
NL80211_STA_FLAG_AUTHENTICATED,
NL80211_STA_FLAG_TDLS_PEER,
NL80211_STA_FLAG_ASSOCIATED,
+ NL80211_STA_FLAG_SPP_AMSDU,
__NL80211_STA_FLAG_AFTER_LAST,
NL80211_STA_FLAG_MAX = __NL80211_STA_FLAG_AFTER_LAST - 1
};
@@ -868,6 +874,10 @@
NL80211_FREQUENCY_ATTR_NO_320MHZ,
NL80211_FREQUENCY_ATTR_NO_EHT,
NL80211_FREQUENCY_ATTR_PSD,
+ NL80211_FREQUENCY_ATTR_DFS_CONCURRENT,
+ NL80211_FREQUENCY_ATTR_NO_6GHZ_VLP_CLIENT,
+ NL80211_FREQUENCY_ATTR_NO_6GHZ_AFC_CLIENT,
+ NL80211_FREQUENCY_ATTR_CAN_MONITOR,
__NL80211_FREQUENCY_ATTR_AFTER_LAST,
NL80211_FREQUENCY_ATTR_MAX = __NL80211_FREQUENCY_ATTR_AFTER_LAST - 1
};
@@ -876,6 +886,8 @@
#define NL80211_FREQUENCY_ATTR_NO_IBSS NL80211_FREQUENCY_ATTR_NO_IR
#define NL80211_FREQUENCY_ATTR_NO_IR NL80211_FREQUENCY_ATTR_NO_IR
#define NL80211_FREQUENCY_ATTR_GO_CONCURRENT NL80211_FREQUENCY_ATTR_IR_CONCURRENT
+#define NL80211_FREQUENCY_ATTR_NO_UHB_VLP_CLIENT NL80211_FREQUENCY_ATTR_NO_6GHZ_VLP_CLIENT
+#define NL80211_FREQUENCY_ATTR_NO_UHB_AFC_CLIENT NL80211_FREQUENCY_ATTR_NO_6GHZ_AFC_CLIENT
enum nl80211_bitrate_attr {
__NL80211_BITRATE_ATTR_INVALID,
NL80211_BITRATE_ATTR_RATE,
@@ -940,12 +952,17 @@
NL80211_RRF_NO_320MHZ = 1 << 18,
NL80211_RRF_NO_EHT = 1 << 19,
NL80211_RRF_PSD = 1 << 20,
+ NL80211_RRF_DFS_CONCURRENT = 1 << 21,
+ NL80211_RRF_NO_6GHZ_VLP_CLIENT = 1 << 22,
+ NL80211_RRF_NO_6GHZ_AFC_CLIENT = 1 << 23,
};
#define NL80211_RRF_PASSIVE_SCAN NL80211_RRF_NO_IR
#define NL80211_RRF_NO_IBSS NL80211_RRF_NO_IR
#define NL80211_RRF_NO_IR NL80211_RRF_NO_IR
#define NL80211_RRF_NO_HT40 (NL80211_RRF_NO_HT40MINUS | NL80211_RRF_NO_HT40PLUS)
#define NL80211_RRF_GO_CONCURRENT NL80211_RRF_IR_CONCURRENT
+#define NL80211_RRF_NO_UHB_VLP_CLIENT NL80211_RRF_NO_6GHZ_VLP_CLIENT
+#define NL80211_RRF_NO_UHB_AFC_CLIENT NL80211_RRF_NO_6GHZ_AFC_CLIENT
#define NL80211_RRF_NO_IR_ALL (NL80211_RRF_NO_IR | __NL80211_RRF_NO_IBSS)
enum nl80211_dfs_regions {
NL80211_DFS_UNSET = 0,
@@ -1104,6 +1121,15 @@
NL80211_BSS_CHAN_WIDTH_1,
NL80211_BSS_CHAN_WIDTH_2,
};
+enum nl80211_bss_use_for {
+ NL80211_BSS_USE_FOR_NORMAL = 1 << 0,
+ NL80211_BSS_USE_FOR_MLD_LINK = 1 << 1,
+};
+enum nl80211_bss_cannot_use_reasons {
+ NL80211_BSS_CANNOT_USE_NSTR_NONPRIMARY = 1 << 0,
+ NL80211_BSS_CANNOT_USE_6GHZ_PWR_MISMATCH = 1 << 1,
+};
+#define NL80211_BSS_CANNOT_USE_UHB_PWR_MISMATCH NL80211_BSS_CANNOT_USE_6GHZ_PWR_MISMATCH
enum nl80211_bss {
__NL80211_BSS_INVALID,
NL80211_BSS_BSSID,
@@ -1128,6 +1154,8 @@
NL80211_BSS_FREQUENCY_OFFSET,
NL80211_BSS_MLO_LINK_ID,
NL80211_BSS_MLD_ADDR,
+ NL80211_BSS_USE_FOR,
+ NL80211_BSS_CANNOT_USE_REASONS,
__NL80211_BSS_AFTER_LAST,
NL80211_BSS_MAX = __NL80211_BSS_AFTER_LAST - 1
};
@@ -1318,6 +1346,7 @@
NL80211_WOWLAN_TRIG_WAKEUP_TCP_NOMORETOKENS,
NL80211_WOWLAN_TRIG_NET_DETECT,
NL80211_WOWLAN_TRIG_NET_DETECT_RESULTS,
+ NL80211_WOWLAN_TRIG_UNPROTECTED_DEAUTH_DISASSOC,
NUM_NL80211_WOWLAN_TRIG,
MAX_NL80211_WOWLAN_TRIG = NUM_NL80211_WOWLAN_TRIG - 1
};
@@ -1547,6 +1576,8 @@
NL80211_EXT_FEATURE_AUTH_AND_DEAUTH_RANDOM_TA,
NL80211_EXT_FEATURE_OWE_OFFLOAD,
NL80211_EXT_FEATURE_OWE_OFFLOAD_AP,
+ NL80211_EXT_FEATURE_DFS_CONCURRENT,
+ NL80211_EXT_FEATURE_SPP_AMSDU_SUPPORT,
NUM_NL80211_EXT_FEATURES,
MAX_NL80211_EXT_FEATURES = NUM_NL80211_EXT_FEATURES - 1
};
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/nsm.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/nsm.h
new file mode 100644
index 0000000..5c8e27d
--- /dev/null
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/nsm.h
@@ -0,0 +1,23 @@
+/*
+ * This file is auto-generated. Modifications will be lost.
+ *
+ * See https://android.googlesource.com/platform/bionic/+/master/libc/kernel/
+ * for more information.
+ */
+#ifndef __UAPI_LINUX_NSM_H
+#define __UAPI_LINUX_NSM_H
+#include <linux/ioctl.h>
+#include <linux/types.h>
+#define NSM_MAGIC 0x0A
+#define NSM_REQUEST_MAX_SIZE 0x1000
+#define NSM_RESPONSE_MAX_SIZE 0x3000
+struct nsm_iovec {
+ __u64 addr;
+ __u64 len;
+};
+struct nsm_raw {
+ struct nsm_iovec request;
+ struct nsm_iovec response;
+};
+#define NSM_IOCTL_RAW _IOWR(NSM_MAGIC, 0x0, struct nsm_raw)
+#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/pcitest.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/pcitest.h
index 2e8e761..38e498d 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/pcitest.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/pcitest.h
@@ -7,7 +7,8 @@
#ifndef __UAPI_LINUX_PCITEST_H
#define __UAPI_LINUX_PCITEST_H
#define PCITEST_BAR _IO('P', 0x1)
-#define PCITEST_LEGACY_IRQ _IO('P', 0x2)
+#define PCITEST_INTX_IRQ _IO('P', 0x2)
+#define PCITEST_LEGACY_IRQ PCITEST_INTX_IRQ
#define PCITEST_MSI _IOW('P', 0x3, int)
#define PCITEST_WRITE _IOW('P', 0x4, unsigned long)
#define PCITEST_READ _IOW('P', 0x5, unsigned long)
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/perf_event.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/perf_event.h
index 4b01018..16a1a2e 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/perf_event.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/perf_event.h
@@ -118,6 +118,7 @@
PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT = 16,
PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT = 17,
PERF_SAMPLE_BRANCH_PRIV_SAVE_SHIFT = 18,
+ PERF_SAMPLE_BRANCH_COUNTERS_SHIFT = 19,
PERF_SAMPLE_BRANCH_MAX_SHIFT
};
enum perf_branch_sample_type {
@@ -140,6 +141,7 @@
PERF_SAMPLE_BRANCH_TYPE_SAVE = 1U << PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT,
PERF_SAMPLE_BRANCH_HW_INDEX = 1U << PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT,
PERF_SAMPLE_BRANCH_PRIV_SAVE = 1U << PERF_SAMPLE_BRANCH_PRIV_SAVE_SHIFT,
+ PERF_SAMPLE_BRANCH_COUNTERS = 1U << PERF_SAMPLE_BRANCH_COUNTERS_SHIFT,
PERF_SAMPLE_BRANCH_MAX = 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT,
};
enum {
@@ -502,6 +504,7 @@
__u64 to;
__u64 mispred : 1, predicted : 1, in_tx : 1, abort : 1, cycles : 16, type : 4, spec : 2, new_type : 4, priv : 3, reserved : 31;
};
+#define PERF_BRANCH_ENTRY_INFO_BITS_MAX 33
union perf_sample_weight {
__u64 full;
#ifdef __LITTLE_ENDIAN_BITFIELD
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/pidfd.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/pidfd.h
index 9a49e6a..082b4a0 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/pidfd.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/pidfd.h
@@ -9,4 +9,8 @@
#include <linux/types.h>
#include <linux/fcntl.h>
#define PIDFD_NONBLOCK O_NONBLOCK
+#define PIDFD_THREAD O_EXCL
+#define PIDFD_SIGNAL_THREAD (1UL << 0)
+#define PIDFD_SIGNAL_THREAD_GROUP (1UL << 1)
+#define PIDFD_SIGNAL_PROCESS_GROUP (1UL << 2)
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/pkt_cls.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/pkt_cls.h
index 8ea50d4..b402fa6 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/pkt_cls.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/pkt_cls.h
@@ -205,30 +205,6 @@
#define TC_U32_EAT 8
#define TC_U32_MAXDEPTH 8
enum {
- TCA_RSVP_UNSPEC,
- TCA_RSVP_CLASSID,
- TCA_RSVP_DST,
- TCA_RSVP_SRC,
- TCA_RSVP_PINFO,
- TCA_RSVP_POLICE,
- TCA_RSVP_ACT,
- __TCA_RSVP_MAX
-};
-#define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1)
-struct tc_rsvp_gpi {
- __u32 key;
- __u32 mask;
- int offset;
-};
-struct tc_rsvp_pinfo {
- struct tc_rsvp_gpi dpi;
- struct tc_rsvp_gpi spi;
- __u8 protocol;
- __u8 tunnelid;
- __u8 tunnelhdr;
- __u8 pad;
-};
-enum {
TCA_ROUTE4_UNSPEC,
TCA_ROUTE4_CLASSID,
TCA_ROUTE4_TO,
@@ -250,18 +226,6 @@
};
#define TCA_FW_MAX (__TCA_FW_MAX - 1)
enum {
- TCA_TCINDEX_UNSPEC,
- TCA_TCINDEX_HASH,
- TCA_TCINDEX_MASK,
- TCA_TCINDEX_SHIFT,
- TCA_TCINDEX_FALL_THROUGH,
- TCA_TCINDEX_CLASSID,
- TCA_TCINDEX_POLICE,
- TCA_TCINDEX_ACT,
- __TCA_TCINDEX_MAX
-};
-#define TCA_TCINDEX_MAX (__TCA_TCINDEX_MAX - 1)
-enum {
FLOW_KEY_SRC,
FLOW_KEY_DST,
FLOW_KEY_PROTO,
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/pkt_sched.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/pkt_sched.h
index 9047c8e..c3488c2 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/pkt_sched.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/pkt_sched.h
@@ -327,95 +327,6 @@
__TCA_HFSC_MAX,
};
#define TCA_HFSC_MAX (__TCA_HFSC_MAX - 1)
-#define TC_CBQ_MAXPRIO 8
-#define TC_CBQ_MAXLEVEL 8
-#define TC_CBQ_DEF_EWMA 5
-struct tc_cbq_lssopt {
- unsigned char change;
- unsigned char flags;
-#define TCF_CBQ_LSS_BOUNDED 1
-#define TCF_CBQ_LSS_ISOLATED 2
- unsigned char ewma_log;
- unsigned char level;
-#define TCF_CBQ_LSS_FLAGS 1
-#define TCF_CBQ_LSS_EWMA 2
-#define TCF_CBQ_LSS_MAXIDLE 4
-#define TCF_CBQ_LSS_MINIDLE 8
-#define TCF_CBQ_LSS_OFFTIME 0x10
-#define TCF_CBQ_LSS_AVPKT 0x20
- __u32 maxidle;
- __u32 minidle;
- __u32 offtime;
- __u32 avpkt;
-};
-struct tc_cbq_wrropt {
- unsigned char flags;
- unsigned char priority;
- unsigned char cpriority;
- unsigned char __reserved;
- __u32 allot;
- __u32 weight;
-};
-struct tc_cbq_ovl {
- unsigned char strategy;
-#define TC_CBQ_OVL_CLASSIC 0
-#define TC_CBQ_OVL_DELAY 1
-#define TC_CBQ_OVL_LOWPRIO 2
-#define TC_CBQ_OVL_DROP 3
-#define TC_CBQ_OVL_RCLASSIC 4
- unsigned char priority2;
- __u16 pad;
- __u32 penalty;
-};
-struct tc_cbq_police {
- unsigned char police;
- unsigned char __res1;
- unsigned short __res2;
-};
-struct tc_cbq_fopt {
- __u32 split;
- __u32 defmap;
- __u32 defchange;
-};
-struct tc_cbq_xstats {
- __u32 borrows;
- __u32 overactions;
- __s32 avgidle;
- __s32 undertime;
-};
-enum {
- TCA_CBQ_UNSPEC,
- TCA_CBQ_LSSOPT,
- TCA_CBQ_WRROPT,
- TCA_CBQ_FOPT,
- TCA_CBQ_OVL_STRATEGY,
- TCA_CBQ_RATE,
- TCA_CBQ_RTAB,
- TCA_CBQ_POLICE,
- __TCA_CBQ_MAX,
-};
-#define TCA_CBQ_MAX (__TCA_CBQ_MAX - 1)
-enum {
- TCA_DSMARK_UNSPEC,
- TCA_DSMARK_INDICES,
- TCA_DSMARK_DEFAULT_INDEX,
- TCA_DSMARK_SET_TC_INDEX,
- TCA_DSMARK_MASK,
- TCA_DSMARK_VALUE,
- __TCA_DSMARK_MAX,
-};
-#define TCA_DSMARK_MAX (__TCA_DSMARK_MAX - 1)
-enum {
- TCA_ATM_UNSPEC,
- TCA_ATM_FD,
- TCA_ATM_PTR,
- TCA_ATM_HDR,
- TCA_ATM_EXCESS,
- TCA_ATM_ADDR,
- TCA_ATM_STATE,
- __TCA_ATM_MAX,
-};
-#define TCA_ATM_MAX (__TCA_ATM_MAX - 1)
enum {
TCA_NETEM_UNSPEC,
TCA_NETEM_CORR,
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/psp-sev.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/psp-sev.h
index ffbcf82..82fcbf1 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/psp-sev.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/psp-sev.h
@@ -17,6 +17,9 @@
SEV_PEK_CERT_IMPORT,
SEV_GET_ID,
SEV_GET_ID2,
+ SNP_PLATFORM_STATUS,
+ SNP_COMMIT,
+ SNP_SET_CONFIG,
SEV_MAX,
};
typedef enum {
@@ -47,6 +50,12 @@
SEV_RET_RESOURCE_LIMIT,
SEV_RET_SECURE_DATA_INVALID,
SEV_RET_INVALID_KEY = 0x27,
+ SEV_RET_INVALID_PAGE_SIZE,
+ SEV_RET_INVALID_PAGE_STATE,
+ SEV_RET_INVALID_MDATA_ENTRY,
+ SEV_RET_INVALID_PAGE_OWNER,
+ SEV_RET_INVALID_PAGE_AEAD_OFLOW,
+ SEV_RET_RMP_INIT_REQUIRED,
SEV_RET_MAX,
} sev_ret_code;
struct sev_user_data_status {
@@ -82,6 +91,28 @@
__u64 address;
__u32 length;
} __attribute__((__packed__));
+struct sev_user_data_snp_status {
+ __u8 api_major;
+ __u8 api_minor;
+ __u8 state;
+ __u8 is_rmp_initialized : 1;
+ __u8 rsvd : 7;
+ __u32 build_id;
+ __u32 mask_chip_id : 1;
+ __u32 mask_chip_key : 1;
+ __u32 vlek_en : 1;
+ __u32 rsvd1 : 29;
+ __u32 guest_count;
+ __u64 current_tcb_version;
+ __u64 reported_tcb_version;
+} __attribute__((__packed__));
+struct sev_user_data_snp_config {
+ __u64 reported_tcb;
+ __u32 mask_chip_id : 1;
+ __u32 mask_chip_key : 1;
+ __u32 rsvd : 30;
+ __u8 rsvd1[52];
+} __attribute__((__packed__));
struct sev_issue_cmd {
__u32 cmd;
__u64 data;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ptp_clock.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ptp_clock.h
index ca4447e..5014936 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ptp_clock.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ptp_clock.h
@@ -12,9 +12,11 @@
#define PTP_RISING_EDGE (1 << 1)
#define PTP_FALLING_EDGE (1 << 2)
#define PTP_STRICT_FLAGS (1 << 3)
+#define PTP_EXT_OFFSET (1 << 4)
#define PTP_EXTTS_EDGES (PTP_RISING_EDGE | PTP_FALLING_EDGE)
-#define PTP_EXTTS_VALID_FLAGS (PTP_ENABLE_FEATURE | PTP_RISING_EDGE | PTP_FALLING_EDGE | PTP_STRICT_FLAGS)
+#define PTP_EXTTS_VALID_FLAGS (PTP_ENABLE_FEATURE | PTP_RISING_EDGE | PTP_FALLING_EDGE | PTP_STRICT_FLAGS | PTP_EXT_OFFSET)
#define PTP_EXTTS_V1_VALID_FLAGS (PTP_ENABLE_FEATURE | PTP_RISING_EDGE | PTP_FALLING_EDGE)
+#define PTP_EXTTS_EVENT_VALID (PTP_ENABLE_FEATURE)
#define PTP_PEROUT_ONE_SHOT (1 << 0)
#define PTP_PEROUT_DUTY_CYCLE (1 << 1)
#define PTP_PEROUT_PHASE (1 << 2)
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/raid/md_u.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/raid/md_u.h
index f5ae289..f291f64 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/raid/md_u.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/raid/md_u.h
@@ -57,9 +57,6 @@
int layout;
int chunk_size;
} mdu_array_info_t;
-#define LEVEL_MULTIPATH (- 4)
-#define LEVEL_LINEAR (- 1)
-#define LEVEL_FAULTY (- 5)
#define LEVEL_NONE (- 1000000)
typedef struct mdu_disk_info_s {
int number;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/resource.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/resource.h
index e64c79e..05e201b 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/resource.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/resource.h
@@ -6,7 +6,7 @@
*/
#ifndef _UAPI_LINUX_RESOURCE_H
#define _UAPI_LINUX_RESOURCE_H
-#include <linux/time.h>
+#include <linux/time_types.h>
#include <linux/types.h>
#define RUSAGE_SELF 0
#define RUSAGE_CHILDREN (- 1)
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/rkisp1-config.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/rkisp1-config.h
index ac0b5eb..d4206a0 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/rkisp1-config.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/rkisp1-config.h
@@ -97,6 +97,7 @@
RKISP1_V11,
RKISP1_V12,
RKISP1_V13,
+ RKISP1_V_IMX8MP,
};
enum rkisp1_cif_isp_histogram_mode {
RKISP1_CIF_ISP_HISTOGRAM_MODE_DISABLE,
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/serial.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/serial.h
index adbdd1b..ed5ed66 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/serial.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/serial.h
@@ -6,6 +6,7 @@
*/
#ifndef _UAPI_LINUX_SERIAL_H
#define _UAPI_LINUX_SERIAL_H
+#include <linux/const.h>
#include <linux/types.h>
#include <linux/tty_flags.h>
struct serial_struct {
@@ -79,14 +80,15 @@
};
struct serial_rs485 {
__u32 flags;
-#define SER_RS485_ENABLED (1 << 0)
-#define SER_RS485_RTS_ON_SEND (1 << 1)
-#define SER_RS485_RTS_AFTER_SEND (1 << 2)
-#define SER_RS485_RX_DURING_TX (1 << 4)
-#define SER_RS485_TERMINATE_BUS (1 << 5)
-#define SER_RS485_ADDRB (1 << 6)
-#define SER_RS485_ADDR_RECV (1 << 7)
-#define SER_RS485_ADDR_DEST (1 << 8)
+#define SER_RS485_ENABLED _BITUL(0)
+#define SER_RS485_RTS_ON_SEND _BITUL(1)
+#define SER_RS485_RTS_AFTER_SEND _BITUL(2)
+#define SER_RS485_RX_DURING_TX _BITUL(4)
+#define SER_RS485_TERMINATE_BUS _BITUL(5)
+#define SER_RS485_ADDRB _BITUL(6)
+#define SER_RS485_ADDR_RECV _BITUL(7)
+#define SER_RS485_ADDR_DEST _BITUL(8)
+#define SER_RS485_MODE_RS422 _BITUL(9)
__u32 delay_rts_before_send;
__u32 delay_rts_after_send;
union {
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/smc.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/smc.h
index 4521ceb..5e75fac 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/smc.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/smc.h
@@ -132,6 +132,8 @@
SMC_NLA_LGR_D_CHID,
SMC_NLA_LGR_D_PAD,
SMC_NLA_LGR_D_V2_COMMON,
+ SMC_NLA_LGR_D_EXT_GID,
+ SMC_NLA_LGR_D_PEER_EXT_GID,
__SMC_NLA_LGR_D_MAX,
SMC_NLA_LGR_D_MAX = __SMC_NLA_LGR_D_MAX - 1
};
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/smc_diag.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/smc_diag.h
index be540ac..b358acf 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/smc_diag.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/smc_diag.h
@@ -85,5 +85,7 @@
__aligned_u64 my_gid;
__aligned_u64 token;
__aligned_u64 peer_token;
+ __aligned_u64 peer_gid_ext;
+ __aligned_u64 my_gid_ext;
};
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/stat.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/stat.h
index 2fb7437..9974f3e 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/stat.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/stat.h
@@ -85,6 +85,7 @@
#define STATX_BTIME 0x00000800U
#define STATX_MNT_ID 0x00001000U
#define STATX_DIOALIGN 0x00002000U
+#define STATX_MNT_ID_UNIQUE 0x00004000U
#define STATX__RESERVED 0x80000000U
#define STATX_ALL 0x00000fffU
#define STATX_ATTR_COMPRESSED 0x00000004
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/sync_file.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/sync_file.h
index 423d248..bde8c16 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/sync_file.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/sync_file.h
@@ -30,7 +30,12 @@
__u32 pad;
__u64 sync_fence_info;
};
+struct sync_set_deadline {
+ __u64 deadline_ns;
+ __u64 pad;
+};
#define SYNC_IOC_MAGIC '>'
#define SYNC_IOC_MERGE _IOWR(SYNC_IOC_MAGIC, 3, struct sync_merge_data)
#define SYNC_IOC_FILE_INFO _IOWR(SYNC_IOC_MAGIC, 4, struct sync_file_info)
+#define SYNC_IOC_SET_DEADLINE _IOW(SYNC_IOC_MAGIC, 5, struct sync_set_deadline)
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/tc_act/tc_mirred.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/tc_act/tc_mirred.h
index d87b74a..dc51bc7 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/tc_act/tc_mirred.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/tc_act/tc_mirred.h
@@ -22,6 +22,7 @@
TCA_MIRRED_TM,
TCA_MIRRED_PARMS,
TCA_MIRRED_PAD,
+ TCA_MIRRED_BLOCKID,
__TCA_MIRRED_MAX
};
#define TCA_MIRRED_MAX (__TCA_MIRRED_MAX - 1)
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/tc_act/tc_pedit.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/tc_act/tc_pedit.h
index bc7cc06..9635370 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/tc_act/tc_pedit.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/tc_act/tc_pedit.h
@@ -53,7 +53,7 @@
tc_gen;
unsigned char nkeys;
unsigned char flags;
- struct tc_pedit_key keys[0];
+ struct tc_pedit_key keys[] __counted_by(nkeys);
};
#define tc_pedit tc_pedit_sel
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/thp7312.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/thp7312.h
new file mode 100644
index 0000000..fbd5571
--- /dev/null
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/thp7312.h
@@ -0,0 +1,14 @@
+/*
+ * This file is auto-generated. Modifications will be lost.
+ *
+ * See https://android.googlesource.com/platform/bionic/+/master/libc/kernel/
+ * for more information.
+ */
+#ifndef __UAPI_THP7312_H_
+#define __UAPI_THP7312_H_
+#include <linux/v4l2-controls.h>
+#define V4L2_CID_THP7312_LOW_LIGHT_COMPENSATION (V4L2_CID_USER_THP7312_BASE + 0x01)
+#define V4L2_CID_THP7312_AUTO_FOCUS_METHOD (V4L2_CID_USER_THP7312_BASE + 0x02)
+#define V4L2_CID_THP7312_NOISE_REDUCTION_AUTO (V4L2_CID_USER_THP7312_BASE + 0x03)
+#define V4L2_CID_THP7312_NOISE_REDUCTION_ABSOLUTE (V4L2_CID_USER_THP7312_BASE + 0x04)
+#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/time_types.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/time_types.h
index 668f6ae..bca8698 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/time_types.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/time_types.h
@@ -6,6 +6,7 @@
*/
#ifndef _UAPI_LINUX_TIME_TYPES_H
#define _UAPI_LINUX_TIME_TYPES_H
+#include <linux/time.h>
#include <linux/types.h>
struct __kernel_timespec {
__kernel_time64_t tv_sec;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ublk_cmd.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ublk_cmd.h
index d05c7c4..8e7732b 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ublk_cmd.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/ublk_cmd.h
@@ -30,6 +30,7 @@
#define UBLK_U_CMD_END_USER_RECOVERY _IOWR('u', UBLK_CMD_END_USER_RECOVERY, struct ublksrv_ctrl_cmd)
#define UBLK_U_CMD_GET_DEV_INFO2 _IOR('u', UBLK_CMD_GET_DEV_INFO2, struct ublksrv_ctrl_cmd)
#define UBLK_U_CMD_GET_FEATURES _IOR('u', 0x13, struct ublksrv_ctrl_cmd)
+#define UBLK_U_CMD_DEL_DEV_ASYNC _IOR('u', 0x14, struct ublksrv_ctrl_cmd)
#define UBLK_FEATURES_LEN 8
#define UBLK_IO_FETCH_REQ 0x20
#define UBLK_IO_COMMIT_AND_FETCH_REQ 0x21
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/usb/ch9.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/usb/ch9.h
index b858bac..6762773 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/usb/ch9.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/usb/ch9.h
@@ -286,6 +286,7 @@
#define USB_OTG_SRP (1 << 0)
#define USB_OTG_HNP (1 << 1)
#define USB_OTG_ADP (1 << 2)
+#define USB_OTG_RSP (1 << 3)
#define OTG_STS_SELECTOR 0xF000
struct usb_debug_descriptor {
__u8 bLength;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/usb/functionfs.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/usb/functionfs.h
index 889360e..095e937 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/usb/functionfs.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/usb/functionfs.h
@@ -59,8 +59,9 @@
struct usb_ext_compat_desc {
__u8 bFirstInterfaceNumber;
__u8 Reserved1;
- __u8 CompatibleID[8];
+ __struct_group(, IDs,, __u8 CompatibleID[8];
__u8 SubCompatibleID[8];
+ );
__u8 Reserved2[6];
};
struct usb_ext_prop_desc {
@@ -68,6 +69,12 @@
__le32 dwPropertyDataType;
__le16 wPropertyNameLength;
} __attribute__((packed));
+#define USB_FFS_DMABUF_TRANSFER_MASK 0x0
+struct usb_ffs_dmabuf_transfer_req {
+ int fd;
+ __u32 flags;
+ __u64 length;
+} __attribute__((packed));
struct usb_functionfs_strings_head {
__le32 magic;
__le32 length;
@@ -96,4 +103,7 @@
#define FUNCTIONFS_INTERFACE_REVMAP _IO('g', 128)
#define FUNCTIONFS_ENDPOINT_REVMAP _IO('g', 129)
#define FUNCTIONFS_ENDPOINT_DESC _IOR('g', 130, struct usb_endpoint_descriptor)
+#define FUNCTIONFS_DMABUF_ATTACH _IOW('g', 131, int)
+#define FUNCTIONFS_DMABUF_DETACH _IOW('g', 132, int)
+#define FUNCTIONFS_DMABUF_TRANSFER _IOW('g', 133, struct usb_ffs_dmabuf_transfer_req)
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/user_events.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/user_events.h
index 7bff0b0..37bf66b 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/user_events.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/user_events.h
@@ -9,11 +9,13 @@
#include <linux/types.h>
#include <linux/ioctl.h>
#define USER_EVENTS_SYSTEM "user_events"
+#define USER_EVENTS_MULTI_SYSTEM "user_events_multi"
#define USER_EVENTS_PREFIX "u:"
#define DYN_LOC(offset,size) ((size) << 16 | (offset))
enum user_reg_flag {
USER_EVENT_REG_PERSIST = 1U << 0,
- USER_EVENT_REG_MAX = 1U << 1,
+ USER_EVENT_REG_MULTI_FORMAT = 1U << 1,
+ USER_EVENT_REG_MAX = 1U << 2,
};
struct user_reg {
__u32 size;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/userfaultfd.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/userfaultfd.h
index 5eeea4e..1dc2d79 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/userfaultfd.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/userfaultfd.h
@@ -11,15 +11,16 @@
#define USERFAULTFD_IOC_NEW _IO(USERFAULTFD_IOC, 0x00)
#define UFFD_API ((__u64) 0xAA)
#define UFFD_API_REGISTER_MODES (UFFDIO_REGISTER_MODE_MISSING | UFFDIO_REGISTER_MODE_WP | UFFDIO_REGISTER_MODE_MINOR)
-#define UFFD_API_FEATURES (UFFD_FEATURE_PAGEFAULT_FLAG_WP | UFFD_FEATURE_EVENT_FORK | UFFD_FEATURE_EVENT_REMAP | UFFD_FEATURE_EVENT_REMOVE | UFFD_FEATURE_EVENT_UNMAP | UFFD_FEATURE_MISSING_HUGETLBFS | UFFD_FEATURE_MISSING_SHMEM | UFFD_FEATURE_SIGBUS | UFFD_FEATURE_THREAD_ID | UFFD_FEATURE_MINOR_HUGETLBFS | UFFD_FEATURE_MINOR_SHMEM | UFFD_FEATURE_EXACT_ADDRESS | UFFD_FEATURE_WP_HUGETLBFS_SHMEM | UFFD_FEATURE_WP_UNPOPULATED | UFFD_FEATURE_POISON | UFFD_FEATURE_WP_ASYNC)
+#define UFFD_API_FEATURES (UFFD_FEATURE_PAGEFAULT_FLAG_WP | UFFD_FEATURE_EVENT_FORK | UFFD_FEATURE_EVENT_REMAP | UFFD_FEATURE_EVENT_REMOVE | UFFD_FEATURE_EVENT_UNMAP | UFFD_FEATURE_MISSING_HUGETLBFS | UFFD_FEATURE_MISSING_SHMEM | UFFD_FEATURE_SIGBUS | UFFD_FEATURE_THREAD_ID | UFFD_FEATURE_MINOR_HUGETLBFS | UFFD_FEATURE_MINOR_SHMEM | UFFD_FEATURE_EXACT_ADDRESS | UFFD_FEATURE_WP_HUGETLBFS_SHMEM | UFFD_FEATURE_WP_UNPOPULATED | UFFD_FEATURE_POISON | UFFD_FEATURE_WP_ASYNC | UFFD_FEATURE_MOVE)
#define UFFD_API_IOCTLS ((__u64) 1 << _UFFDIO_REGISTER | (__u64) 1 << _UFFDIO_UNREGISTER | (__u64) 1 << _UFFDIO_API)
-#define UFFD_API_RANGE_IOCTLS ((__u64) 1 << _UFFDIO_WAKE | (__u64) 1 << _UFFDIO_COPY | (__u64) 1 << _UFFDIO_ZEROPAGE | (__u64) 1 << _UFFDIO_WRITEPROTECT | (__u64) 1 << _UFFDIO_CONTINUE | (__u64) 1 << _UFFDIO_POISON)
+#define UFFD_API_RANGE_IOCTLS ((__u64) 1 << _UFFDIO_WAKE | (__u64) 1 << _UFFDIO_COPY | (__u64) 1 << _UFFDIO_ZEROPAGE | (__u64) 1 << _UFFDIO_MOVE | (__u64) 1 << _UFFDIO_WRITEPROTECT | (__u64) 1 << _UFFDIO_CONTINUE | (__u64) 1 << _UFFDIO_POISON)
#define UFFD_API_RANGE_IOCTLS_BASIC ((__u64) 1 << _UFFDIO_WAKE | (__u64) 1 << _UFFDIO_COPY | (__u64) 1 << _UFFDIO_WRITEPROTECT | (__u64) 1 << _UFFDIO_CONTINUE | (__u64) 1 << _UFFDIO_POISON)
#define _UFFDIO_REGISTER (0x00)
#define _UFFDIO_UNREGISTER (0x01)
#define _UFFDIO_WAKE (0x02)
#define _UFFDIO_COPY (0x03)
#define _UFFDIO_ZEROPAGE (0x04)
+#define _UFFDIO_MOVE (0x05)
#define _UFFDIO_WRITEPROTECT (0x06)
#define _UFFDIO_CONTINUE (0x07)
#define _UFFDIO_POISON (0x08)
@@ -31,6 +32,7 @@
#define UFFDIO_WAKE _IOR(UFFDIO, _UFFDIO_WAKE, struct uffdio_range)
#define UFFDIO_COPY _IOWR(UFFDIO, _UFFDIO_COPY, struct uffdio_copy)
#define UFFDIO_ZEROPAGE _IOWR(UFFDIO, _UFFDIO_ZEROPAGE, struct uffdio_zeropage)
+#define UFFDIO_MOVE _IOWR(UFFDIO, _UFFDIO_MOVE, struct uffdio_move)
#define UFFDIO_WRITEPROTECT _IOWR(UFFDIO, _UFFDIO_WRITEPROTECT, struct uffdio_writeprotect)
#define UFFDIO_CONTINUE _IOWR(UFFDIO, _UFFDIO_CONTINUE, struct uffdio_continue)
#define UFFDIO_POISON _IOWR(UFFDIO, _UFFDIO_POISON, struct uffdio_poison)
@@ -92,6 +94,7 @@
#define UFFD_FEATURE_WP_UNPOPULATED (1 << 13)
#define UFFD_FEATURE_POISON (1 << 14)
#define UFFD_FEATURE_WP_ASYNC (1 << 15)
+#define UFFD_FEATURE_MOVE (1 << 16)
__u64 features;
__u64 ioctls;
};
@@ -141,5 +144,14 @@
__u64 mode;
__s64 updated;
};
+struct uffdio_move {
+ __u64 dst;
+ __u64 src;
+ __u64 len;
+#define UFFDIO_MOVE_MODE_DONTWAKE ((__u64) 1 << 0)
+#define UFFDIO_MOVE_MODE_ALLOW_SRC_HOLES ((__u64) 1 << 1)
+ __u64 mode;
+ __s64 move;
+};
#define UFFD_USER_MODE_ONLY 1
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/v4l2-controls.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/v4l2-controls.h
index 90cb69d..23158dc 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/v4l2-controls.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/v4l2-controls.h
@@ -111,6 +111,7 @@
#define V4L2_CID_USER_DW100_BASE (V4L2_CID_USER_BASE + 0x1190)
#define V4L2_CID_USER_ASPEED_BASE (V4L2_CID_USER_BASE + 0x11a0)
#define V4L2_CID_USER_NPCM_BASE (V4L2_CID_USER_BASE + 0x11b0)
+#define V4L2_CID_USER_THP7312_BASE (V4L2_CID_USER_BASE + 0x11c0)
#define V4L2_CID_CODEC_BASE (V4L2_CTRL_CLASS_CODEC | 0x900)
#define V4L2_CID_CODEC_CLASS (V4L2_CTRL_CLASS_CODEC | 1)
#define V4L2_CID_MPEG_STREAM_TYPE (V4L2_CID_CODEC_BASE + 0)
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/v4l2-subdev.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/v4l2-subdev.h
index d684a54..9caaa47 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/v4l2-subdev.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/v4l2-subdev.h
@@ -59,7 +59,8 @@
__u32 pad;
struct v4l2_fract interval;
__u32 stream;
- __u32 reserved[8];
+ __u32 which;
+ __u32 reserved[7];
};
struct v4l2_subdev_frame_interval_enum {
__u32 index;
@@ -104,6 +105,7 @@
__u32 reserved[6];
};
#define V4L2_SUBDEV_CLIENT_CAP_STREAMS (1ULL << 0)
+#define V4L2_SUBDEV_CLIENT_CAP_INTERVAL_USES_WHICH (1ULL << 1)
struct v4l2_subdev_client_capability {
__u64 capabilities;
};
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/vdpa.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/vdpa.h
index a8a9515..462d579 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/vdpa.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/vdpa.h
@@ -41,6 +41,22 @@
VDPA_ATTR_DEV_VENDOR_ATTR_NAME,
VDPA_ATTR_DEV_VENDOR_ATTR_VALUE,
VDPA_ATTR_DEV_FEATURES,
+ VDPA_ATTR_DEV_BLK_CFG_CAPACITY,
+ VDPA_ATTR_DEV_BLK_CFG_SIZE_MAX,
+ VDPA_ATTR_DEV_BLK_CFG_BLK_SIZE,
+ VDPA_ATTR_DEV_BLK_CFG_SEG_MAX,
+ VDPA_ATTR_DEV_BLK_CFG_NUM_QUEUES,
+ VDPA_ATTR_DEV_BLK_CFG_PHY_BLK_EXP,
+ VDPA_ATTR_DEV_BLK_CFG_ALIGN_OFFSET,
+ VDPA_ATTR_DEV_BLK_CFG_MIN_IO_SIZE,
+ VDPA_ATTR_DEV_BLK_CFG_OPT_IO_SIZE,
+ VDPA_ATTR_DEV_BLK_CFG_MAX_DISCARD_SEC,
+ VDPA_ATTR_DEV_BLK_CFG_MAX_DISCARD_SEG,
+ VDPA_ATTR_DEV_BLK_CFG_DISCARD_SEC_ALIGN,
+ VDPA_ATTR_DEV_BLK_CFG_MAX_WRITE_ZEROES_SEC,
+ VDPA_ATTR_DEV_BLK_CFG_MAX_WRITE_ZEROES_SEG,
+ VDPA_ATTR_DEV_BLK_READ_ONLY,
+ VDPA_ATTR_DEV_BLK_FLUSH,
VDPA_ATTR_MAX,
};
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/version.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/version.h
index 645a2ab..1563f47 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/version.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/version.h
@@ -4,8 +4,8 @@
* See https://android.googlesource.com/platform/bionic/+/master/libc/kernel/
* for more information.
*/
-#define LINUX_VERSION_CODE 395008
+#define LINUX_VERSION_CODE 395520
#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + ((c) > 255 ? 255 : (c)))
#define LINUX_VERSION_MAJOR 6
-#define LINUX_VERSION_PATCHLEVEL 7
+#define LINUX_VERSION_PATCHLEVEL 9
#define LINUX_VERSION_SUBLEVEL 0
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/vesa.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/vesa.h
new file mode 100644
index 0000000..1bf9946
--- /dev/null
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/vesa.h
@@ -0,0 +1,20 @@
+/*
+ * This file is auto-generated. Modifications will be lost.
+ *
+ * See https://android.googlesource.com/platform/bionic/+/master/libc/kernel/
+ * for more information.
+ */
+#ifndef _UAPI_LINUX_VESA_H
+#define _UAPI_LINUX_VESA_H
+enum vesa_blank_mode {
+ VESA_NO_BLANKING = 0,
+#define VESA_NO_BLANKING VESA_NO_BLANKING
+ VESA_VSYNC_SUSPEND = 1,
+#define VESA_VSYNC_SUSPEND VESA_VSYNC_SUSPEND
+ VESA_HSYNC_SUSPEND = 2,
+#define VESA_HSYNC_SUSPEND VESA_HSYNC_SUSPEND
+ VESA_POWERDOWN = VESA_VSYNC_SUSPEND | VESA_HSYNC_SUSPEND,
+#define VESA_POWERDOWN VESA_POWERDOWN
+ VESA_BLANK_MAX = VESA_POWERDOWN,
+};
+#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/vfio.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/vfio.h
index 1107b21..5910e40 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/vfio.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/vfio.h
@@ -336,6 +336,7 @@
VFIO_DEVICE_STATE_RUNNING_P2P = 5,
VFIO_DEVICE_STATE_PRE_COPY = 6,
VFIO_DEVICE_STATE_PRE_COPY_P2P = 7,
+ VFIO_DEVICE_STATE_NR,
};
struct vfio_precopy_info {
__u32 argsz;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/vhost.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/vhost.h
index adf0af7..a93212e 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/vhost.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/vhost.h
@@ -55,12 +55,13 @@
#define VHOST_VDPA_SET_CONFIG_CALL _IOW(VHOST_VIRTIO, 0x77, int)
#define VHOST_VDPA_GET_IOVA_RANGE _IOR(VHOST_VIRTIO, 0x78, struct vhost_vdpa_iova_range)
#define VHOST_VDPA_GET_CONFIG_SIZE _IOR(VHOST_VIRTIO, 0x79, __u32)
-#define VHOST_VDPA_GET_VQS_COUNT _IOR(VHOST_VIRTIO, 0x80, __u32)
-#define VHOST_VDPA_GET_GROUP_NUM _IOR(VHOST_VIRTIO, 0x81, __u32)
#define VHOST_VDPA_GET_AS_NUM _IOR(VHOST_VIRTIO, 0x7A, unsigned int)
#define VHOST_VDPA_GET_VRING_GROUP _IOWR(VHOST_VIRTIO, 0x7B, struct vhost_vring_state)
#define VHOST_VDPA_SET_GROUP_ASID _IOW(VHOST_VIRTIO, 0x7C, struct vhost_vring_state)
#define VHOST_VDPA_SUSPEND _IO(VHOST_VIRTIO, 0x7D)
#define VHOST_VDPA_RESUME _IO(VHOST_VIRTIO, 0x7E)
#define VHOST_VDPA_GET_VRING_DESC_GROUP _IOWR(VHOST_VIRTIO, 0x7F, struct vhost_vring_state)
+#define VHOST_VDPA_GET_VQS_COUNT _IOR(VHOST_VIRTIO, 0x80, __u32)
+#define VHOST_VDPA_GET_GROUP_NUM _IOR(VHOST_VIRTIO, 0x81, __u32)
+#define VHOST_VDPA_GET_VRING_SIZE _IOWR(VHOST_VIRTIO, 0x82, struct vhost_vring_state)
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/videodev2.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/videodev2.h
index bb98888..ed91484 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/videodev2.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/videodev2.h
@@ -562,6 +562,7 @@
#define V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS (1 << 4)
#define V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF (1 << 5)
#define V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS (1 << 6)
+#define V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS (1 << 7)
struct v4l2_plane {
__u32 bytesused;
__u32 length;
@@ -911,7 +912,7 @@
__s64 * p_s64;
struct v4l2_area * p_area;
struct v4l2_ctrl_h264_sps * p_h264_sps;
- struct v4l2_ctrl_h264_pps * p_h264_pps;
+ struct v4l2_ctrl_h264_pps * p_h264_pps;
struct v4l2_ctrl_h264_scaling_matrix * p_h264_scaling_matrix;
struct v4l2_ctrl_h264_pred_weights * p_h264_pred_weights;
struct v4l2_ctrl_h264_slice_params * p_h264_slice_params;
@@ -932,6 +933,8 @@
struct v4l2_ctrl_av1_tile_group_entry * p_av1_tile_group_entry;
struct v4l2_ctrl_av1_frame * p_av1_frame;
struct v4l2_ctrl_av1_film_grain * p_av1_film_grain;
+ struct v4l2_ctrl_hdr10_cll_info * p_hdr10_cll_info;
+ struct v4l2_ctrl_hdr10_mastering_display * p_hdr10_mastering_display;
void * ptr;
};
} __attribute__((packed));
@@ -1429,7 +1432,8 @@
struct v4l2_format format;
__u32 capabilities;
__u32 flags;
- __u32 reserved[6];
+ __u32 max_num_buffers;
+ __u32 reserved[5];
};
#define VIDIOC_QUERYCAP _IOR('V', 0, struct v4l2_capability)
#define VIDIOC_ENUM_FMT _IOWR('V', 2, struct v4l2_fmtdesc)
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_config.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_config.h
index 520a472..021845c 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_config.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_config.h
@@ -14,7 +14,7 @@
#define VIRTIO_CONFIG_S_NEEDS_RESET 0x40
#define VIRTIO_CONFIG_S_FAILED 0x80
#define VIRTIO_TRANSPORT_F_START 28
-#define VIRTIO_TRANSPORT_F_END 41
+#define VIRTIO_TRANSPORT_F_END 42
#ifndef VIRTIO_CONFIG_NO_LEGACY
#define VIRTIO_F_NOTIFY_ON_EMPTY 24
#define VIRTIO_F_ANY_LAYOUT 27
@@ -29,4 +29,5 @@
#define VIRTIO_F_NOTIFICATION_DATA 38
#define VIRTIO_F_NOTIF_CONFIG_DATA 39
#define VIRTIO_F_RING_RESET 40
+#define VIRTIO_F_ADMIN_VQ 41
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_gpu.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_gpu.h
index 7162226..c3f0fcc 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_gpu.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_gpu.h
@@ -194,6 +194,7 @@
};
#define VIRTIO_GPU_CAPSET_VIRGL 1
#define VIRTIO_GPU_CAPSET_VIRGL2 2
+#define VIRTIO_GPU_CAPSET_VENUS 4
struct virtio_gpu_get_capset_info {
struct virtio_gpu_ctrl_hdr hdr;
__le32 capset_index;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_pci.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_pci.h
index f9595bc..8921155 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_pci.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_pci.h
@@ -78,6 +78,8 @@
struct virtio_pci_common_cfg cfg;
__le16 queue_notify_data;
__le16 queue_reset;
+ __le16 admin_queue_index;
+ __le16 admin_queue_num;
};
struct virtio_pci_cfg_cap {
struct virtio_pci_cap cap;
@@ -112,5 +114,48 @@
#define VIRTIO_PCI_COMMON_Q_USEDHI 52
#define VIRTIO_PCI_COMMON_Q_NDATA 56
#define VIRTIO_PCI_COMMON_Q_RESET 58
+#define VIRTIO_PCI_COMMON_ADM_Q_IDX 60
+#define VIRTIO_PCI_COMMON_ADM_Q_NUM 62
#endif
+#define VIRTIO_ADMIN_STATUS_OK 0
+#define VIRTIO_ADMIN_CMD_LIST_QUERY 0x0
+#define VIRTIO_ADMIN_CMD_LIST_USE 0x1
+#define VIRTIO_ADMIN_GROUP_TYPE_SRIOV 0x1
+#define VIRTIO_ADMIN_CMD_LEGACY_COMMON_CFG_WRITE 0x2
+#define VIRTIO_ADMIN_CMD_LEGACY_COMMON_CFG_READ 0x3
+#define VIRTIO_ADMIN_CMD_LEGACY_DEV_CFG_WRITE 0x4
+#define VIRTIO_ADMIN_CMD_LEGACY_DEV_CFG_READ 0x5
+#define VIRTIO_ADMIN_CMD_LEGACY_NOTIFY_INFO 0x6
+struct virtio_admin_cmd_hdr {
+ __le16 opcode;
+ __le16 group_type;
+ __u8 reserved1[12];
+ __le64 group_member_id;
+};
+struct virtio_admin_cmd_status {
+ __le16 status;
+ __le16 status_qualifier;
+ __u8 reserved2[4];
+};
+struct virtio_admin_cmd_legacy_wr_data {
+ __u8 offset;
+ __u8 reserved[7];
+ __u8 registers[];
+};
+struct virtio_admin_cmd_legacy_rd_data {
+ __u8 offset;
+};
+#define VIRTIO_ADMIN_CMD_NOTIFY_INFO_FLAGS_END 0
+#define VIRTIO_ADMIN_CMD_NOTIFY_INFO_FLAGS_OWNER_DEV 0x1
+#define VIRTIO_ADMIN_CMD_NOTIFY_INFO_FLAGS_OWNER_MEM 0x2
+#define VIRTIO_ADMIN_CMD_MAX_NOTIFY_INFO 4
+struct virtio_admin_cmd_notify_info_data {
+ __u8 flags;
+ __u8 bar;
+ __u8 padding[6];
+ __le64 offset;
+};
+struct virtio_admin_cmd_notify_info_result {
+ struct virtio_admin_cmd_notify_info_data entries[VIRTIO_ADMIN_CMD_MAX_NOTIFY_INFO];
+};
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_pmem.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_pmem.h
index 182baf7..da0f764 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_pmem.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_pmem.h
@@ -9,6 +9,8 @@
#include <linux/types.h>
#include <linux/virtio_ids.h>
#include <linux/virtio_config.h>
+#define VIRTIO_PMEM_F_SHMEM_REGION 0
+#define VIRTIO_PMEM_SHMEM_REGION_ID 0
struct virtio_pmem_config {
__le64 start;
__le64 size;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_snd.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_snd.h
index e4ec8cd..7318e29 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_snd.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/linux/virtio_snd.h
@@ -7,10 +7,14 @@
#ifndef VIRTIO_SND_IF_H
#define VIRTIO_SND_IF_H
#include <linux/virtio_types.h>
+enum {
+ VIRTIO_SND_F_CTLS = 0
+};
struct virtio_snd_config {
__le32 jacks;
__le32 streams;
__le32 chmaps;
+ __le32 controls;
};
enum {
VIRTIO_SND_VQ_CONTROL = 0,
@@ -33,10 +37,18 @@
VIRTIO_SND_R_PCM_START,
VIRTIO_SND_R_PCM_STOP,
VIRTIO_SND_R_CHMAP_INFO = 0x0200,
+ VIRTIO_SND_R_CTL_INFO = 0x0300,
+ VIRTIO_SND_R_CTL_ENUM_ITEMS,
+ VIRTIO_SND_R_CTL_READ,
+ VIRTIO_SND_R_CTL_WRITE,
+ VIRTIO_SND_R_CTL_TLV_READ,
+ VIRTIO_SND_R_CTL_TLV_WRITE,
+ VIRTIO_SND_R_CTL_TLV_COMMAND,
VIRTIO_SND_EVT_JACK_CONNECTED = 0x1000,
VIRTIO_SND_EVT_JACK_DISCONNECTED,
VIRTIO_SND_EVT_PCM_PERIOD_ELAPSED = 0x1100,
VIRTIO_SND_EVT_PCM_XRUN,
+ VIRTIO_SND_EVT_CTL_NOTIFY = 0x1200,
VIRTIO_SND_S_OK = 0x8000,
VIRTIO_SND_S_BAD_MSG,
VIRTIO_SND_S_NOT_SUPP,
@@ -209,4 +221,83 @@
__u8 channels;
__u8 positions[VIRTIO_SND_CHMAP_MAX_SIZE];
};
+struct virtio_snd_ctl_hdr {
+ struct virtio_snd_hdr hdr;
+ __le32 control_id;
+};
+enum {
+ VIRTIO_SND_CTL_ROLE_UNDEFINED = 0,
+ VIRTIO_SND_CTL_ROLE_VOLUME,
+ VIRTIO_SND_CTL_ROLE_MUTE,
+ VIRTIO_SND_CTL_ROLE_GAIN
+};
+enum {
+ VIRTIO_SND_CTL_TYPE_BOOLEAN = 0,
+ VIRTIO_SND_CTL_TYPE_INTEGER,
+ VIRTIO_SND_CTL_TYPE_INTEGER64,
+ VIRTIO_SND_CTL_TYPE_ENUMERATED,
+ VIRTIO_SND_CTL_TYPE_BYTES,
+ VIRTIO_SND_CTL_TYPE_IEC958
+};
+enum {
+ VIRTIO_SND_CTL_ACCESS_READ = 0,
+ VIRTIO_SND_CTL_ACCESS_WRITE,
+ VIRTIO_SND_CTL_ACCESS_VOLATILE,
+ VIRTIO_SND_CTL_ACCESS_INACTIVE,
+ VIRTIO_SND_CTL_ACCESS_TLV_READ,
+ VIRTIO_SND_CTL_ACCESS_TLV_WRITE,
+ VIRTIO_SND_CTL_ACCESS_TLV_COMMAND
+};
+struct virtio_snd_ctl_info {
+ struct virtio_snd_info hdr;
+ __le32 role;
+ __le32 type;
+ __le32 access;
+ __le32 count;
+ __le32 index;
+ __u8 name[44];
+ union {
+ struct {
+ __le32 min;
+ __le32 max;
+ __le32 step;
+ } integer;
+ struct {
+ __le64 min;
+ __le64 max;
+ __le64 step;
+ } integer64;
+ struct {
+ __le32 items;
+ } enumerated;
+ } value;
+};
+struct virtio_snd_ctl_enum_item {
+ __u8 item[64];
+};
+struct virtio_snd_ctl_iec958 {
+ __u8 status[24];
+ __u8 subcode[147];
+ __u8 pad;
+ __u8 dig_subframe[4];
+};
+struct virtio_snd_ctl_value {
+ union {
+ __le32 integer[128];
+ __le64 integer64[64];
+ __le32 enumerated[128];
+ __u8 bytes[512];
+ struct virtio_snd_ctl_iec958 iec958;
+ } value;
+};
+enum {
+ VIRTIO_SND_CTL_EVT_MASK_VALUE = 0,
+ VIRTIO_SND_CTL_EVT_MASK_INFO,
+ VIRTIO_SND_CTL_EVT_MASK_TLV
+};
+struct virtio_snd_ctl_event {
+ struct virtio_snd_hdr hdr;
+ __le16 control_id;
+ __le16 mask;
+};
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/bnxt_re-abi.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/bnxt_re-abi.h
index 86e16a0..3dceafd 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/bnxt_re-abi.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/bnxt_re-abi.h
@@ -17,12 +17,20 @@
BNXT_RE_UCNTX_CMASK_HAVE_MODE = 0x02ULL,
BNXT_RE_UCNTX_CMASK_WC_DPI_ENABLED = 0x04ULL,
BNXT_RE_UCNTX_CMASK_DBR_PACING_ENABLED = 0x08ULL,
+ BNXT_RE_UCNTX_CMASK_POW2_DISABLED = 0x10ULL,
+ BNXT_RE_COMP_MASK_UCNTX_HW_RETX_ENABLED = 0x40,
};
enum bnxt_re_wqe_mode {
BNXT_QPLIB_WQE_MODE_STATIC = 0x00,
BNXT_QPLIB_WQE_MODE_VARIABLE = 0x01,
BNXT_QPLIB_WQE_MODE_INVALID = 0x02,
};
+enum {
+ BNXT_RE_COMP_MASK_REQ_UCNTX_POW2_SUPPORT = 0x01,
+};
+struct bnxt_re_uctx_req {
+ __aligned_u64 comp_mask;
+};
struct bnxt_re_uctx_resp {
__u32 dev_id;
__u32 max_qp;
@@ -45,11 +53,15 @@
__aligned_u64 cq_va;
__aligned_u64 cq_handle;
};
+enum bnxt_re_cq_mask {
+ BNXT_RE_CQ_TOGGLE_PAGE_SUPPORT = 0x1,
+};
struct bnxt_re_cq_resp {
__u32 cqid;
__u32 tail;
__u32 phase;
__u32 rsvd;
+ __aligned_u64 comp_mask;
};
struct bnxt_re_resize_cq_req {
__aligned_u64 cq_va;
@@ -79,6 +91,7 @@
enum bnxt_re_objects {
BNXT_RE_OBJECT_ALLOC_PAGE = (1U << UVERBS_ID_NS_SHIFT),
BNXT_RE_OBJECT_NOTIFY_DRV,
+ BNXT_RE_OBJECT_GET_TOGGLE_MEM,
};
enum bnxt_re_alloc_page_type {
BNXT_RE_ALLOC_WC_PAGE = 0,
@@ -102,4 +115,23 @@
enum bnxt_re_notify_drv_methods {
BNXT_RE_METHOD_NOTIFY_DRV = (1U << UVERBS_ID_NS_SHIFT),
};
+enum bnxt_re_get_toggle_mem_type {
+ BNXT_RE_CQ_TOGGLE_MEM = 0,
+ BNXT_RE_SRQ_TOGGLE_MEM,
+};
+enum bnxt_re_var_toggle_mem_attrs {
+ BNXT_RE_TOGGLE_MEM_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
+ BNXT_RE_TOGGLE_MEM_TYPE,
+ BNXT_RE_TOGGLE_MEM_RES_ID,
+ BNXT_RE_TOGGLE_MEM_MMAP_PAGE,
+ BNXT_RE_TOGGLE_MEM_MMAP_OFFSET,
+ BNXT_RE_TOGGLE_MEM_MMAP_LENGTH,
+};
+enum bnxt_re_toggle_mem_attrs {
+ BNXT_RE_RELEASE_TOGGLE_MEM_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
+};
+enum bnxt_re_toggle_mem_methods {
+ BNXT_RE_METHOD_GET_TOGGLE_MEM = (1U << UVERBS_ID_NS_SHIFT),
+ BNXT_RE_METHOD_RELEASE_TOGGLE_MEM,
+};
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/efa-abi.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/efa-abi.h
index c327764..2b30941 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/efa-abi.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/efa-abi.h
@@ -7,6 +7,7 @@
#ifndef EFA_ABI_USER_H
#define EFA_ABI_USER_H
#include <linux/types.h>
+#include <rdma/ib_user_ioctl_cmds.h>
#define EFA_UVERBS_ABI_VERSION 1
enum {
EFA_ALLOC_UCONTEXT_CMD_COMP_TX_BATCH = 1 << 0,
@@ -104,4 +105,19 @@
__u32 max_rdma_size;
__u32 device_caps;
};
+enum {
+ EFA_QUERY_MR_VALIDITY_RECV_IC_ID = 1 << 0,
+ EFA_QUERY_MR_VALIDITY_RDMA_READ_IC_ID = 1 << 1,
+ EFA_QUERY_MR_VALIDITY_RDMA_RECV_IC_ID = 1 << 2,
+};
+enum efa_query_mr_attrs {
+ EFA_IB_ATTR_QUERY_MR_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
+ EFA_IB_ATTR_QUERY_MR_RESP_IC_ID_VALIDITY,
+ EFA_IB_ATTR_QUERY_MR_RESP_RECV_IC_ID,
+ EFA_IB_ATTR_QUERY_MR_RESP_RDMA_READ_IC_ID,
+ EFA_IB_ATTR_QUERY_MR_RESP_RDMA_RECV_IC_ID,
+};
+enum efa_mr_methods {
+ EFA_IB_METHOD_MR_QUERY = (1U << UVERBS_ID_NS_SHIFT),
+};
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/hns-abi.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/hns-abi.h
index f9effb3..5b0f700 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/hns-abi.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/hns-abi.h
@@ -37,6 +37,15 @@
__u32 srqn;
__u32 cap_flags;
};
+enum hns_roce_congest_type_flags {
+ HNS_ROCE_CREATE_QP_FLAGS_DCQCN,
+ HNS_ROCE_CREATE_QP_FLAGS_LDCP,
+ HNS_ROCE_CREATE_QP_FLAGS_HC3,
+ HNS_ROCE_CREATE_QP_FLAGS_DIP,
+};
+enum hns_roce_create_qp_comp_mask {
+ HNS_ROCE_CREATE_QP_MASK_CONGEST_TYPE = 1 << 0,
+};
struct hns_roce_ib_create_qp {
__aligned_u64 buf_addr;
__aligned_u64 db_addr;
@@ -45,6 +54,9 @@
__u8 sq_no_prefetch;
__u8 reserved[5];
__aligned_u64 sdb_addr;
+ __aligned_u64 comp_mask;
+ __aligned_u64 create_flags;
+ __aligned_u64 cong_type_flags;
};
enum hns_roce_qp_cap_flags {
HNS_ROCE_QP_CAP_RQ_RECORD_DB = 1 << 0,
@@ -73,6 +85,8 @@
__u32 reserved;
__u32 config;
__u32 max_inline_data;
+ __u8 congest_type;
+ __u8 reserved0[7];
};
struct hns_roce_ib_alloc_ucontext {
__u32 config;
@@ -81,4 +95,8 @@
struct hns_roce_ib_alloc_pd_resp {
__u32 pdn;
};
+struct hns_roce_ib_create_ah_resp {
+ __u8 dmac[6];
+ __u8 reserved[2];
+};
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/mlx5-abi.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/mlx5-abi.h
index dc6420b..22cf99e 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/mlx5-abi.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/mlx5-abi.h
@@ -9,6 +9,7 @@
#include <linux/types.h>
#include <linux/if_ether.h>
#include <rdma/ib_user_ioctl_verbs.h>
+#include <rdma/mlx5_user_ioctl_verbs.h>
enum {
MLX5_QP_FLAG_SIGNATURE = 1 << 0,
MLX5_QP_FLAG_SCATTER_CQE = 1 << 1,
@@ -186,6 +187,7 @@
__u32 tunnel_offloads_caps;
struct mlx5_ib_dci_streams_caps dci_streams_caps;
__u16 reserved;
+ struct mlx5_ib_uapi_reg reg_c0;
};
enum mlx5_ib_create_cq_flags {
MLX5_IB_CREATE_CQ_FLAGS_CQE_128B_PAD = 1 << 0,
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/mlx5_user_ioctl_verbs.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/mlx5_user_ioctl_verbs.h
index 57fc43e..f087ee8 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/mlx5_user_ioctl_verbs.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/rdma/mlx5_user_ioctl_verbs.h
@@ -32,6 +32,7 @@
MLX5_IB_UAPI_DM_TYPE_STEERING_SW_ICM,
MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_SW_ICM,
MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_PATTERN_SW_ICM,
+ MLX5_IB_UAPI_DM_TYPE_ENCAP_SW_ICM,
};
enum mlx5_ib_uapi_devx_create_event_channel_flags {
MLX5_IB_UAPI_DEVX_CR_EV_CH_FLAGS_OMIT_DATA = 1 << 0,
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/regulator/regulator.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/regulator/regulator.h
new file mode 100644
index 0000000..23ce7c6
--- /dev/null
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/regulator/regulator.h
@@ -0,0 +1,47 @@
+/*
+ * This file is auto-generated. Modifications will be lost.
+ *
+ * See https://android.googlesource.com/platform/bionic/+/master/libc/kernel/
+ * for more information.
+ */
+#ifndef _UAPI_REGULATOR_H
+#define _UAPI_REGULATOR_H
+#include <stdint.h>
+#define REGULATOR_EVENT_UNDER_VOLTAGE 0x01
+#define REGULATOR_EVENT_OVER_CURRENT 0x02
+#define REGULATOR_EVENT_REGULATION_OUT 0x04
+#define REGULATOR_EVENT_FAIL 0x08
+#define REGULATOR_EVENT_OVER_TEMP 0x10
+#define REGULATOR_EVENT_FORCE_DISABLE 0x20
+#define REGULATOR_EVENT_VOLTAGE_CHANGE 0x40
+#define REGULATOR_EVENT_DISABLE 0x80
+#define REGULATOR_EVENT_PRE_VOLTAGE_CHANGE 0x100
+#define REGULATOR_EVENT_ABORT_VOLTAGE_CHANGE 0x200
+#define REGULATOR_EVENT_PRE_DISABLE 0x400
+#define REGULATOR_EVENT_ABORT_DISABLE 0x800
+#define REGULATOR_EVENT_ENABLE 0x1000
+#define REGULATOR_EVENT_UNDER_VOLTAGE_WARN 0x2000
+#define REGULATOR_EVENT_OVER_CURRENT_WARN 0x4000
+#define REGULATOR_EVENT_OVER_VOLTAGE_WARN 0x8000
+#define REGULATOR_EVENT_OVER_TEMP_WARN 0x10000
+#define REGULATOR_EVENT_WARN_MASK 0x1E000
+struct reg_genl_event {
+ char reg_name[32];
+ uint64_t event;
+};
+enum {
+ REG_GENL_ATTR_UNSPEC,
+ REG_GENL_ATTR_EVENT,
+ __REG_GENL_ATTR_MAX,
+};
+#define REG_GENL_ATTR_MAX (__REG_GENL_ATTR_MAX - 1)
+enum {
+ REG_GENL_CMD_UNSPEC,
+ REG_GENL_CMD_EVENT,
+ __REG_GENL_CMD_MAX,
+};
+#define REG_GENL_CMD_MAX (__REG_GENL_CMD_MAX - 1)
+#define REG_GENL_FAMILY_NAME "reg_event"
+#define REG_GENL_VERSION 0x01
+#define REG_GENL_MCAST_GROUP_NAME "reg_mc_group"
+#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/scsi/scsi_bsg_mpi3mr.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/scsi/scsi_bsg_mpi3mr.h
index f12c36f..d98e8fa 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/scsi/scsi_bsg_mpi3mr.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/scsi/scsi_bsg_mpi3mr.h
@@ -176,7 +176,7 @@
__u8 mpi_reply_type;
__u8 rsvd1;
__u16 rsvd2;
- __u8 reply_buf[1];
+ __u8 reply_buf[];
};
struct mpi3mr_buf_entry {
__u8 buf_type;
@@ -242,6 +242,8 @@
#define MPI3MR_NVME_DATA_FORMAT_PRP 0
#define MPI3MR_NVME_DATA_FORMAT_SGL1 1
#define MPI3MR_NVME_DATA_FORMAT_SGL2 2
+#define MPI3MR_NVMESGL_DATA_SEGMENT 0x00
+#define MPI3MR_NVMESGL_LAST_SEGMENT 0x03
struct mpi3_scsi_task_mgmt_request {
__le16 host_tag;
__u8 ioc_use_only02;
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/sound/asound.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/sound/asound.h
index 7da2fbb..b608ed5 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/sound/asound.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/sound/asound.h
@@ -92,7 +92,7 @@
#define SNDRV_HWDEP_IOCTL_INFO _IOR('H', 0x01, struct snd_hwdep_info)
#define SNDRV_HWDEP_IOCTL_DSP_STATUS _IOR('H', 0x02, struct snd_hwdep_dsp_status)
#define SNDRV_HWDEP_IOCTL_DSP_LOAD _IOW('H', 0x03, struct snd_hwdep_dsp_image)
-#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 15)
+#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 17)
typedef unsigned long snd_pcm_uframes_t;
typedef signed long snd_pcm_sframes_t;
enum {
@@ -201,7 +201,10 @@
#endif
typedef int __bitwise snd_pcm_subformat_t;
#define SNDRV_PCM_SUBFORMAT_STD (( snd_pcm_subformat_t) 0)
-#define SNDRV_PCM_SUBFORMAT_LAST SNDRV_PCM_SUBFORMAT_STD
+#define SNDRV_PCM_SUBFORMAT_MSBITS_MAX (( snd_pcm_subformat_t) 1)
+#define SNDRV_PCM_SUBFORMAT_MSBITS_20 (( snd_pcm_subformat_t) 2)
+#define SNDRV_PCM_SUBFORMAT_MSBITS_24 (( snd_pcm_subformat_t) 3)
+#define SNDRV_PCM_SUBFORMAT_LAST SNDRV_PCM_SUBFORMAT_MSBITS_24
#define SNDRV_PCM_INFO_MMAP 0x00000001
#define SNDRV_PCM_INFO_MMAP_VALID 0x00000002
#define SNDRV_PCM_INFO_DOUBLE 0x00000004
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/sound/intel/avs/tokens.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/sound/intel/avs/tokens.h
index 6a8ed8a..01b20a5 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/sound/intel/avs/tokens.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/sound/intel/avs/tokens.h
@@ -15,6 +15,8 @@
AVS_TKN_MANIFEST_NUM_MODCFGS_EXT_U32 = 6,
AVS_TKN_MANIFEST_NUM_PPLCFGS_U32 = 7,
AVS_TKN_MANIFEST_NUM_BINDINGS_U32 = 8,
+ AVS_TKN_MANIFEST_NUM_CONDPATH_TMPLS_U32 = 9,
+ AVS_TKN_MANIFEST_NUM_INIT_CONFIGS_U32 = 10,
AVS_TKN_LIBRARY_ID_U32 = 101,
AVS_TKN_LIBRARY_NAME_STRING = 102,
AVS_TKN_AFMT_ID_U32 = 201,
@@ -89,6 +91,8 @@
AVS_TKN_MOD_PROC_DOMAIN_U8 = 1705,
AVS_TKN_MOD_MODCFG_EXT_ID_U32 = 1706,
AVS_TKN_MOD_KCONTROL_ID_U32 = 1707,
+ AVS_TKN_MOD_INIT_CONFIG_NUM_IDS_U32 = 1708,
+ AVS_TKN_MOD_INIT_CONFIG_ID_U32 = 1709,
AVS_TKN_PATH_TMPL_ID_U32 = 1801,
AVS_TKN_PATH_ID_U32 = 1901,
AVS_TKN_PATH_FE_FMT_ID_U32 = 1902,
@@ -97,5 +101,8 @@
AVS_TKN_PIN_FMT_IOBS_U32 = 2202,
AVS_TKN_PIN_FMT_AFMT_ID_U32 = 2203,
AVS_TKN_KCONTROL_ID_U32 = 2301,
+ AVS_TKN_INIT_CONFIG_ID_U32 = 2401,
+ AVS_TKN_INIT_CONFIG_PARAM_U8 = 2402,
+ AVS_TKN_INIT_CONFIG_LENGTH_U32 = 2403,
};
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/sound/scarlett2.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/sound/scarlett2.h
new file mode 100644
index 0000000..13e6abe
--- /dev/null
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/sound/scarlett2.h
@@ -0,0 +1,30 @@
+/*
+ * This file is auto-generated. Modifications will be lost.
+ *
+ * See https://android.googlesource.com/platform/bionic/+/master/libc/kernel/
+ * for more information.
+ */
+#ifndef __UAPI_SOUND_SCARLETT2_H
+#define __UAPI_SOUND_SCARLETT2_H
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#define SCARLETT2_HWDEP_MAJOR 1
+#define SCARLETT2_HWDEP_MINOR 0
+#define SCARLETT2_HWDEP_SUBMINOR 0
+#define SCARLETT2_HWDEP_VERSION ((SCARLETT2_HWDEP_MAJOR << 16) | (SCARLETT2_HWDEP_MINOR << 8) | SCARLETT2_HWDEP_SUBMINOR)
+#define SCARLETT2_HWDEP_VERSION_MAJOR(v) (((v) >> 16) & 0xFF)
+#define SCARLETT2_HWDEP_VERSION_MINOR(v) (((v) >> 8) & 0xFF)
+#define SCARLETT2_HWDEP_VERSION_SUBMINOR(v) ((v) & 0xFF)
+#define SCARLETT2_IOCTL_PVERSION _IOR('S', 0x60, int)
+#define SCARLETT2_IOCTL_REBOOT _IO('S', 0x61)
+#define SCARLETT2_SEGMENT_ID_SETTINGS 0
+#define SCARLETT2_SEGMENT_ID_FIRMWARE 1
+#define SCARLETT2_SEGMENT_ID_COUNT 2
+#define SCARLETT2_IOCTL_SELECT_FLASH_SEGMENT _IOW('S', 0x62, int)
+#define SCARLETT2_IOCTL_ERASE_FLASH_SEGMENT _IO('S', 0x63)
+struct scarlett2_flash_segment_erase_progress {
+ unsigned char progress;
+ unsigned char num_blocks;
+};
+#define SCARLETT2_IOCTL_GET_ERASE_PROGRESS _IOR('S', 0x64, struct scarlett2_flash_segment_erase_progress)
+#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/sound/sof/tokens.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/sound/sof/tokens.h
index d57d55b..c4257d9 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/sound/sof/tokens.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/sound/sof/tokens.h
@@ -15,6 +15,7 @@
#define SOF_TPLG_KCTL_BYTES_WO_ID 262
#define SOF_TKN_BUF_SIZE 100
#define SOF_TKN_BUF_CAPS 101
+#define SOF_TKN_BUF_FLAGS 102
#define SOF_TKN_DAI_TYPE 154
#define SOF_TKN_DAI_INDEX 155
#define SOF_TKN_DAI_DIRECTION 156
@@ -125,4 +126,8 @@
#define SOF_TKN_AMD_ACPI2S_RATE 1700
#define SOF_TKN_AMD_ACPI2S_CH 1701
#define SOF_TKN_AMD_ACPI2S_TDM_MODE 1702
+#define SOF_TKN_IMX_MICFIL_RATE 2000
+#define SOF_TKN_IMX_MICFIL_CH 2001
+#define SOF_TKN_AMD_ACP_SDW_RATE 2100
+#define SOF_TKN_AMD_ACP_SDW_CH 2101
#endif
diff --git a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/xen/gntalloc.h b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/xen/gntalloc.h
index 02e4d47..4f0e7b8 100644
--- a/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/xen/gntalloc.h
+++ b/mainline/runtime/sdk/android/riscv64/include/bionic/libc/kernel/uapi/xen/gntalloc.h
@@ -13,7 +13,10 @@
__u16 flags;
__u32 count;
__u64 index;
- __u32 gref_ids[1];
+ union {
+ __u32 gref_ids[1];
+ __DECLARE_FLEX_ARRAY(__u32, gref_ids_flex);
+ };
};
#define GNTALLOC_FLAG_WRITABLE 1
#define IOCTL_GNTALLOC_DEALLOC_GREF _IOC(_IOC_NONE, 'G', 6, sizeof(struct ioctl_gntalloc_dealloc_gref))
diff --git a/mainline/runtime/sdk/android/riscv64/lib/crtbegin_dynamic.o b/mainline/runtime/sdk/android/riscv64/lib/crtbegin_dynamic.o
index b3f520a..374d59e 100644
--- a/mainline/runtime/sdk/android/riscv64/lib/crtbegin_dynamic.o
+++ b/mainline/runtime/sdk/android/riscv64/lib/crtbegin_dynamic.o
Binary files differ
diff --git a/mainline/runtime/sdk/android/riscv64/lib/crtbegin_so.o b/mainline/runtime/sdk/android/riscv64/lib/crtbegin_so.o
index b080258..46b91e0 100644
--- a/mainline/runtime/sdk/android/riscv64/lib/crtbegin_so.o
+++ b/mainline/runtime/sdk/android/riscv64/lib/crtbegin_so.o
Binary files differ
diff --git a/mainline/runtime/sdk/android/riscv64/lib/libasync_safe.a b/mainline/runtime/sdk/android/riscv64/lib/libasync_safe.a
index d15ba00..e2d6885 100644
--- a/mainline/runtime/sdk/android/riscv64/lib/libasync_safe.a
+++ b/mainline/runtime/sdk/android/riscv64/lib/libasync_safe.a
Binary files differ
diff --git a/mainline/runtime/sdk/android/riscv64/lib/libc.so b/mainline/runtime/sdk/android/riscv64/lib/libc.so
index a151dd4..1bd91f8 100755
--- a/mainline/runtime/sdk/android/riscv64/lib/libc.so
+++ b/mainline/runtime/sdk/android/riscv64/lib/libc.so
Binary files differ
diff --git a/mainline/runtime/sdk/android/riscv64/lib/libdl.so b/mainline/runtime/sdk/android/riscv64/lib/libdl.so
index 027892f..4178b8f 100755
--- a/mainline/runtime/sdk/android/riscv64/lib/libdl.so
+++ b/mainline/runtime/sdk/android/riscv64/lib/libdl.so
Binary files differ
diff --git a/mainline/runtime/sdk/android/riscv64/lib/libdl_android.so b/mainline/runtime/sdk/android/riscv64/lib/libdl_android.so
index b7d014b..86a0511 100755
--- a/mainline/runtime/sdk/android/riscv64/lib/libdl_android.so
+++ b/mainline/runtime/sdk/android/riscv64/lib/libdl_android.so
Binary files differ
diff --git a/mainline/runtime/sdk/android/riscv64/lib/libm.so b/mainline/runtime/sdk/android/riscv64/lib/libm.so
index 7530870..88dff9b 100755
--- a/mainline/runtime/sdk/android/riscv64/lib/libm.so
+++ b/mainline/runtime/sdk/android/riscv64/lib/libm.so
Binary files differ
diff --git a/mainline/statsd/apex/com.android.os.statsd-riscv64.apex b/mainline/statsd/apex/com.android.os.statsd-riscv64.apex
index 9dfe082..34fddd9 100644
--- a/mainline/statsd/apex/com.android.os.statsd-riscv64.apex
+++ b/mainline/statsd/apex/com.android.os.statsd-riscv64.apex
Binary files differ
diff --git a/mainline/tzdata/apex/com.android.tzdata-riscv64.apex b/mainline/tzdata/apex/com.android.tzdata-riscv64.apex
index 49d062c..62d2e1b 100644
--- a/mainline/tzdata/apex/com.android.tzdata-riscv64.apex
+++ b/mainline/tzdata/apex/com.android.tzdata-riscv64.apex
Binary files differ
