Move dead submodules in-tree

Signed-off-by: swurl <swurl@swurl.xyz>

externals/libadrenotools/src/hook/CMakeLists.txt

@@ -0,0 +1,27 @@
+add_library(hook_impl SHARED hook_impl.cpp hook_impl.h hook_impl_params.h)
+
+target_compile_options(hook_impl PRIVATE -Wall -Wextra)
+target_link_libraries(hook_impl linkernsbypass log)
+target_include_directories(hook_impl PRIVATE ../../include)
+set_target_properties(hook_impl PROPERTIES CXX_VISIBILITY_PRESET hidden)
+
+add_library(main_hook SHARED main_hook.c)
+
+target_compile_options(main_hook PRIVATE -Wall -Wextra)
+target_link_options(main_hook PRIVATE -z global)
+target_link_libraries(main_hook hook_impl)
+set_target_properties(main_hook PROPERTIES CXX_VISIBILITY_PRESET hidden)
+
+add_library(file_redirect_hook SHARED file_redirect_hook.c)
+
+target_compile_options(file_redirect_hook PRIVATE -Wall -Wextra)
+target_link_options(file_redirect_hook PRIVATE -z global)
+target_link_libraries(file_redirect_hook hook_impl)
+set_target_properties(file_redirect_hook PROPERTIES CXX_VISIBILITY_PRESET hidden)
+
+add_library(gsl_alloc_hook SHARED gsl_alloc_hook.c)
+
+target_compile_options(gsl_alloc_hook PRIVATE -Wall -Wextra)
+target_link_options(gsl_alloc_hook PRIVATE -z global)
+target_link_libraries(gsl_alloc_hook hook_impl)
+set_target_properties(gsl_alloc_hook PROPERTIES CXX_VISIBILITY_PRESET hidden)

externals/libadrenotools/src/hook/file_redirect_hook.c

@@ -0,0 +1,5 @@
+#include "hook_impl.h"
+
+__attribute__((visibility("default"))) FILE *fopen(const char *filename, const char *mode) {
+	return hook_fopen(filename, mode);
+}

externals/libadrenotools/src/hook/gsl_alloc_hook.c

@@ -0,0 +1,13 @@
+#include "hook_impl.h"
+
+__attribute__((visibility("default"))) int gsl_memory_alloc_pure(uint32_t size, uint32_t flags, void *memDesc) {
+	return hook_gsl_memory_alloc_pure_64((uint64_t)size, flags, memDesc);
+}
+
+__attribute__((visibility("default"))) int gsl_memory_alloc_pure_64(uint64_t size, uint32_t flags, void *memDesc) {
+	return hook_gsl_memory_alloc_pure_64(size, flags, memDesc);
+}
+
+__attribute__((visibility("default"))) int gsl_memory_free_pure(void *memDesc) {
+	return hook_gsl_memory_free_pure(memDesc);
+}

externals/libadrenotools/src/hook/hook_impl.cpp

@@ -0,0 +1,229 @@
+#include <initializer_list>
+#include <string>
+#include <cstdio>
+#include <cstring>
+#include <dlfcn.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <android_linker_ns.h>
+#include <android/dlext.h>
+#include <android/log.h>
+#include "kgsl.h"
+#include "hook_impl_params.h"
+#include "hook_impl.h"
+
+#define TAG "hook_impl"
+#define LOGI(fmt, ...) __android_log_print(ANDROID_LOG_INFO, TAG, fmt, ##__VA_ARGS__)
+
+const HookImplParams *hook_params; //!< Bunch of info needed to load/patch the driver
+int (*gsl_memory_alloc_pure_sym)(uint32_t, uint32_t, void *);
+int (*gsl_memory_alloc_pure_64_sym)(uint64_t, uint32_t, void *);
+int (*gsl_memory_free_pure_sym)(void *);
+int kgsl_fd;
+
+using gsl_memory_alloc_pure_t = decltype(gsl_memory_alloc_pure_sym);
+using gsl_memory_alloc_pure_64_t = decltype(gsl_memory_alloc_pure_64_sym);
+using gsl_memory_free_pure_t = decltype(gsl_memory_free_pure_sym);
+
+__attribute__((visibility("default"))) void init_hook_param(const void *param) {
+    hook_params = reinterpret_cast<const HookImplParams *>(param);
+}
+
+__attribute__((visibility("default"))) void init_gsl(void *alloc, void *alloc64, void *free) {
+    gsl_memory_alloc_pure_sym = reinterpret_cast<gsl_memory_alloc_pure_t>(alloc);
+    gsl_memory_alloc_pure_64_sym = reinterpret_cast<gsl_memory_alloc_pure_64_t>(alloc64);
+    gsl_memory_free_pure_sym = reinterpret_cast<gsl_memory_free_pure_t>(free);
+}
+
+__attribute__((visibility("default"))) void *hook_android_dlopen_ext(const char *filename, int flags, const android_dlextinfo *extinfo) {
+    auto fallback{[&]() {
+        LOGI("hook_android_dlopen_ext: falling back!");
+        return android_dlopen_ext(filename, flags, extinfo);
+    }};
+
+    LOGI("hook_android_dlopen_ext: filename: %s", filename);
+
+    // Ignore non-vulkan libraries
+    if (!strstr(filename, "vulkan."))
+        return android_dlopen_ext(filename, flags, extinfo);
+
+    if (extinfo->library_namespace == nullptr || !(extinfo->flags & ANDROID_DLEXT_USE_NAMESPACE)) {
+        LOGI("hook_android_dlopen_ext: hook failed: namespace not supplied!");
+        return fallback();
+    }
+
+    // customDriverDir will be empty if ADRENOTOOLS_DRIVER_CUSTOM isn't set therefore it's fine to have either way
+    auto driverNs{android_create_namespace(filename, hook_params->customDriverDir.c_str(),
+                                           hook_params->hookLibDir.c_str(), ANDROID_NAMESPACE_TYPE_SHARED,
+                                           nullptr, extinfo->library_namespace)};
+    if (!driverNs) {
+        LOGI("hook_android_dlopen_ext: hook failed: namespace not supplied!");
+        return fallback();
+    }
+
+    // We depend on libandroid which is unlikely to be in the supplied driver namespace so we have to link it over
+    android_link_namespaces(driverNs, nullptr, "libandroid.so");
+
+    // Preload ourself, a new instance will be created since we have different linker ancestory
+    // If we don't preload we get a weird issue where despite being in NEEDED of the hook lib the hook's symbols will overwrite ours and cause an infinite loop
+    auto hookImpl{linkernsbypass_namespace_dlopen("libhook_impl.so", RTLD_NOW, driverNs)};
+    if (!hookImpl)
+        return nullptr;
+
+    // Pass parameters to ourself
+    auto initHookParam{reinterpret_cast<void (*)(const void *)>(dlsym(hookImpl, "init_hook_param"))};
+    if (!initHookParam)
+        return nullptr;
+
+    initHookParam(hook_params);
+
+    if (hook_params->featureFlags & ADRENOTOOLS_DRIVER_FILE_REDIRECT) {
+        if (!linkernsbypass_namespace_dlopen("libfile_redirect_hook.so", RTLD_GLOBAL, driverNs)) {
+            LOGI("hook_android_dlopen_ext: hook failed: failed to apply libfopen_redirect_hook!");
+            return fallback();
+        }
+
+        LOGI("hook_android_dlopen_ext: applied libfile_redirect_hook");
+    }
+
+    // Use our new namespace to load the vulkan driver
+    auto newExtinfo{*extinfo};
+    newExtinfo.library_namespace = driverNs;
+
+    if (hook_params->featureFlags & ADRENOTOOLS_DRIVER_GPU_MAPPING_IMPORT) {
+        if (!linkernsbypass_namespace_dlopen("libgsl_alloc_hook.so", RTLD_GLOBAL, driverNs)) {
+            LOGI("hook_android_dlopen_ext: hook failed: failed to apply libgsl_alloc_hook!");
+            return fallback();
+        }
+
+        auto libgslHandle{android_dlopen_ext("vkbgsl.so", RTLD_NOW, &newExtinfo)};
+        if (!libgslHandle) {
+            libgslHandle = android_dlopen_ext("notgsl.so", RTLD_NOW, &newExtinfo);
+            if (!libgslHandle)
+                libgslHandle = android_dlopen_ext("libgsl.so", RTLD_NOW, &newExtinfo);
+        }
+
+        if (libgslHandle) {
+            gsl_memory_alloc_pure_sym = reinterpret_cast<decltype(gsl_memory_alloc_pure_sym)>(dlsym(libgslHandle, "gsl_memory_alloc_pure"));
+            gsl_memory_alloc_pure_64_sym = reinterpret_cast<decltype(gsl_memory_alloc_pure_64_sym)>(dlsym(libgslHandle, "gsl_memory_alloc_pure_64"));
+            gsl_memory_free_pure_sym = reinterpret_cast<decltype(gsl_memory_free_pure_sym)>(dlsym(libgslHandle, "gsl_memory_free_pure"));
+            if ((gsl_memory_alloc_pure_sym || gsl_memory_alloc_pure_64_sym) && gsl_memory_free_pure_sym) {
+                auto initGsl{reinterpret_cast<void (*)(gsl_memory_alloc_pure_t, gsl_memory_alloc_pure_64_t, gsl_memory_free_pure_t)>(dlsym(hookImpl, "init_gsl"))};
+                if (!initGsl)
+                    return fallback();
+
+                initGsl(gsl_memory_alloc_pure_sym, gsl_memory_alloc_pure_64_sym, gsl_memory_free_pure_sym);
+                LOGI("hook_android_dlopen_ext: applied libgsl_alloc_hook");
+                hook_params->nextGpuMapping->gpu_addr = ADRENOTOOLS_GPU_MAPPING_SUCCEEDED_MAGIC;
+            }
+        }
+
+        if (!((gsl_memory_alloc_pure_sym || gsl_memory_alloc_pure_64_sym) && gsl_memory_free_pure_sym))
+            LOGI("hook_android_dlopen_ext: hook failed: failed to apply libgsl_alloc_hook!");
+    }
+
+    // TODO: If there is already an instance of a Vulkan driver loaded hooks won't be applied, this will only be the case for skiavk generally
+    // To fix this we would need to search /proc/self/maps for the file to a loaded instance of the library in order to read it to patch the soname and load it uniquely
+    if (hook_params->featureFlags & ADRENOTOOLS_DRIVER_CUSTOM) {
+        LOGI("hook_android_dlopen_ext: loading custom driver: %s%s", hook_params->customDriverDir.c_str(), hook_params->customDriverName.c_str());
+        void *handle{android_dlopen_ext(hook_params->customDriverName.c_str(), flags, &newExtinfo)};
+        if (!handle) {
+            LOGI("hook_android_dlopen_ext: hook failed: failed to load custom driver: %s!", dlerror());
+            return fallback();
+        }
+
+        return handle;
+    } else {
+        LOGI("hook_android_dlopen_ext: loading default driver: %s", filename);
+        return android_dlopen_ext(filename, flags, &newExtinfo);
+    }
+}
+
+__attribute__((visibility("default"))) void *hook_android_load_sphal_library(const char *filename, int flags) {
+    LOGI("hook_android_load_sphal_library: filename: %s", filename);
+
+    // https://android.googlesource.com/platform/system/core/+/master/libvndksupport/linker.cpp
+    for (const char *name : {"sphal", "vendor", "default"}) {
+        if (auto vendorNs{android_get_exported_namespace(name)}) {
+            android_dlextinfo dlextinfo{
+                .flags = ANDROID_DLEXT_USE_NAMESPACE,
+                .library_namespace = vendorNs,
+            };
+
+            return hook_android_dlopen_ext(filename, flags, &dlextinfo);
+        }
+    }
+
+    return nullptr;
+}
+
+__attribute__((visibility("default"))) FILE *hook_fopen(const char *filename, const char *mode) {
+    if (!strncmp("/proc", filename, 5) || !strncmp("/sys", filename, 4)) {
+        LOGI("hook_fopen: passthrough: %s", filename);
+        return fopen(filename, mode);
+    }
+
+    auto replacement{hook_params->fileRedirectDir + filename};
+    LOGI("hook_fopen: %s -> %s", filename, replacement.c_str());
+
+    return fopen(replacement.c_str(), mode);
+}
+
+static constexpr uintptr_t GslMemDescImportedPrivMagic{0xdeadb33f};
+struct GslMemDesc {
+    void *hostptr;
+    uint64_t gpuaddr;
+    uint64_t size;
+    uint64_t flags;
+    uintptr_t priv;
+};
+
+__attribute__((visibility("default"))) int hook_gsl_memory_alloc_pure_64(uint64_t size, uint32_t flags, void *memDesc) {
+    auto gslMemDesc{reinterpret_cast<GslMemDesc *>(memDesc)};
+    if (hook_params->nextGpuMapping && hook_params->nextGpuMapping->size == size && (hook_params->nextGpuMapping->flags & flags) == hook_params->nextGpuMapping->flags) {
+        auto &nextMapping{*hook_params->nextGpuMapping};
+
+        gslMemDesc->hostptr = nextMapping.host_ptr;
+        gslMemDesc->gpuaddr = nextMapping.gpu_addr;
+        gslMemDesc->size = nextMapping.size;
+        gslMemDesc->flags = nextMapping.flags;
+        gslMemDesc->priv = GslMemDescImportedPrivMagic;
+        hook_params->nextGpuMapping->size = 0;
+        hook_params->nextGpuMapping->gpu_addr = ADRENOTOOLS_GPU_MAPPING_SUCCEEDED_MAGIC;
+        return 0;
+    } else {
+        if (gsl_memory_alloc_pure_64_sym)
+            return gsl_memory_alloc_pure_64_sym(size, flags, gslMemDesc);
+        else
+            return gsl_memory_alloc_pure_sym((uint32_t)size, flags, gslMemDesc);
+    }
+}
+
+__attribute__((visibility("default"))) int hook_gsl_memory_free_pure(void *memDesc) {
+    auto gslMemDesc{reinterpret_cast<GslMemDesc *>(memDesc)};
+
+    if (gslMemDesc->priv == GslMemDescImportedPrivMagic) {
+        if (!kgsl_fd)
+            kgsl_fd = open("/dev/kgsl-3d0", O_RDWR);
+
+        kgsl_gpumem_get_info info{
+            .gpuaddr = gslMemDesc->gpuaddr
+        };
+
+        if (ioctl(kgsl_fd, IOCTL_KGSL_GPUMEM_GET_INFO, &info) < 0) {
+            LOGI("IOCTL_KGSL_GPUMEM_GET_INFO failed");
+            return 0;
+        }
+
+        kgsl_gpuobj_free args{
+            .id = info.id,
+        };
+
+        if (ioctl(kgsl_fd, IOCTL_KGSL_GPUOBJ_FREE, &args) < 0)
+            LOGI("IOCTL_KGSL_GPUOBJ_FREE failed");
+
+        return 0;
+    } else {
+        return gsl_memory_free_pure_sym(memDesc);
+    }
+}

externals/libadrenotools/src/hook/hook_impl.h

@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: BSD-2-Clause
+// Copyright © 2021 Billy Laws
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdio.h>
+#include <android/dlext.h>
+
+void init_hook_param(const void *param);
+
+void init_gsl(void *alloc, void *alloc64, void *free);
+
+void *hook_android_dlopen_ext(const char *filename, int flags, const android_dlextinfo *extinfo);
+
+void *hook_android_load_sphal_library(const char *filename, int flags);
+
+FILE *hook_fopen(const char *filename, const char *mode);
+
+int hook_gsl_memory_alloc_pure_64(uint64_t size, uint32_t flags, void *memDesc);
+
+int hook_gsl_memory_free_pure(void *memDesc);
+
+#ifdef __cplusplus
+}
+#endif
+

externals/libadrenotools/src/hook/hook_impl_params.h

@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: BSD-2-Clause
+// Copyright © 2021 Billy Laws
+
+#pragma once
+
+#include <string>
+#include <adrenotools/priv.h>
+
+/**
+ * @brief Holds the parameters needed for all hooks
+ * @note See comments for adrenotools_open_libvulkan as a reference for member variables
+ */
+struct HookImplParams {
+    int featureFlags;
+    std::string tmpLibDir;
+    std::string hookLibDir;
+    std::string customDriverDir;
+    std::string customDriverName;
+    std::string fileRedirectDir;
+    adrenotools_gpu_mapping *nextGpuMapping;
+
+    HookImplParams(int featureFlags, const char *tmpLibDir, const char *hookLibDir, const char *customDriverDir,
+                  const char *customDriverName, const char *fileRedirectDir, adrenotools_gpu_mapping *nextGpuMapping)
+        : featureFlags(featureFlags),
+          tmpLibDir(tmpLibDir ? tmpLibDir : ""),
+          hookLibDir(hookLibDir),
+          customDriverDir(customDriverDir ? customDriverDir : ""),
+          customDriverName(customDriverName ? customDriverName : ""),
+          fileRedirectDir(fileRedirectDir ? fileRedirectDir : ""),
+          nextGpuMapping(nextGpuMapping) {}
+};

externals/libadrenotools/src/hook/main_hook.c

@@ -0,0 +1,9 @@
+#include "hook_impl.h"
+
+__attribute__((visibility("default"))) void *android_dlopen_ext(const char *filename, int flags, const android_dlextinfo *extinfo) {
+	return hook_android_dlopen_ext(filename, flags, extinfo);
+}
+
+__attribute__((visibility("default"))) void *android_load_sphal_library(const char *filename, int flags) {
+	return hook_android_load_sphal_library(filename, flags);
+}