[core] Try to fix #1144 by hook (#1166)

core/src/main/cpp/main/include/art/runtime/class_linker.h

@@ -28,6 +28,7 @@
 #include "jni_env_ext.h"
 #include "context.h"
 #include "jni/pending_hooks.h"
+#include "jni/yahfa.h"
 #include "utils.h"
 #include "HookMain.h"
 

core/src/main/cpp/main/include/art/runtime/jit/profiling_info.h

@@ -0,0 +1,65 @@
+/*
+ * This file is part of LSPosed.
+ *
+ * LSPosed is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LSPosed is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LSPosed.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * Copyright (C) 2021 LSPosed Contributors
+ */
+
+#pragma once
+
+#include <jni_helper.h>
+#include <base/object.h>
+#include <art/runtime/mirror/class.h>
+#include "utils.h"
+#include "jni/pending_hooks.h"
+
+namespace art {
+    namespace profiling_info {
+        inline static size_t OFFSET_art_method = -1;
+
+        CREATE_MEM_HOOK_STUB_ENTRIES(
+                "_ZN3art13ProfilingInfo13AddInvokeInfoEjPNS_6mirror5ClassE",
+                void, AddInvokeInfo, (void * thiz, uint32_t dex_pc, void * clazz_ptr), {
+                    void *method = *reinterpret_cast<void **>(
+                            reinterpret_cast<uintptr_t>(thiz) + OFFSET_art_method);
+                    if (lspd::isHooked(method)) [[unlikely]] return;
+                    backup(thiz, dex_pc, clazz_ptr);
+                });
+
+        static void Setup(const SandHook::ElfImg &handle) {
+            int api_level = lspd::GetAndroidApiLevel();
+            switch (api_level) {
+                case __ANDROID_API_Q__:
+                    OFFSET_art_method = 0;
+                    break;
+                case __ANDROID_API_O_MR1__:
+                    [[fallthrough]];
+                case __ANDROID_API_P__:
+                    [[fallthrough]];
+                case __ANDROID_API_R__:
+                    [[fallthrough]];
+                case __ANDROID_API_S__:
+                    if constexpr(lspd::is64) {
+                        OFFSET_art_method = 8;
+                    } else {
+                        OFFSET_art_method = 4;
+                    }
+                    break;
+            }
+            if (OFFSET_art_method != size_t(-1))
+                lspd::HookSyms(handle, AddInvokeInfo);
+        }
+    }
+}

core/src/main/cpp/main/src/jni/pending_hooks.cpp

@@ -35,9 +35,6 @@ namespace lspd {
 
         std::unordered_set<const void *> pending_methods_;
         std::shared_mutex pending_methods_lock_;
-
-        std::unordered_set<const void *> hooked_methods_;
-        std::shared_mutex hooked_methods_lock_;
     }
 
     bool IsClassPending(void *clazz) {
@@ -93,15 +90,4 @@ namespace lspd {
     void RegisterPendingHooks(JNIEnv *env) {
         REGISTER_LSP_NATIVE_METHODS(PendingHooks);
     }
-
+}  // namespace lspd
-    bool isHooked(void *art_method) {
-        std::shared_lock lk(hooked_methods_lock_);
-        return hooked_methods_.contains(art_method);
-    }
-
-    void recordHooked(void *art_method) {
-        std::unique_lock lk(hooked_methods_lock_);
-        hooked_methods_.insert(art_method);
-    }
-
-}

core/src/main/cpp/main/src/jni/pending_hooks.h

@@ -28,10 +28,6 @@ namespace lspd {
 
     void RegisterPendingHooks(JNIEnv *);
 
-    bool isHooked(void* art_method);
-
-    void recordHooked(void* art_method);
-
     void DonePendingHook(void *clazz);
 
     bool IsMethodPending(void* art_method);

core/src/main/cpp/main/src/jni/yahfa.cpp

@@ -27,9 +27,26 @@
 #include "art/runtime/thread.h"
 #include "art/runtime/gc/scoped_gc_critical_section.h"
 #include <dex_builder.h>
+#include <shared_mutex>
+#include <unordered_set>
 
 
 namespace lspd {
+    namespace {
+        std::unordered_set<const void *> hooked_methods_;
+        std::shared_mutex hooked_methods_lock_;
+    }
+
+    bool isHooked(void *art_method) {
+        std::shared_lock lk(hooked_methods_lock_);
+        return hooked_methods_.contains(art_method);
+    }
+
+    void recordHooked(void *art_method) {
+        std::unique_lock lk(hooked_methods_lock_);
+        hooked_methods_.insert(art_method);
+    }
+
     using namespace startop::dex;
     LSP_DEF_NATIVE_METHOD(void, Yahfa, init, jint sdkVersion) {
         yahfa::init(env, clazz, sdkVersion);

core/src/main/cpp/main/src/jni/yahfa.h

@@ -24,6 +24,10 @@
 
 namespace lspd {
 
+    bool isHooked(void* art_method);
+
+    void recordHooked(void* art_method);
+
     void RegisterYahfa(JNIEnv *);
 
 } // namespace lspd

core/src/main/cpp/main/src/native_hook.cpp

@@ -36,6 +36,7 @@
 #include "art/runtime/instrumentation.h"
 #include "art/runtime/thread_list.h"
 #include "art/runtime/gc/scoped_gc_critical_section.h"
+#include "art/runtime/jit/profiling_info.h"
 
 namespace lspd {
     static std::atomic_bool installed = false;
@@ -60,8 +61,9 @@ namespace lspd {
         art::instrumentation::DisableUpdateHookedMethodsCode(handle_libart);
         art::thread_list::ScopedSuspendAll::Setup(handle_libart);
         art::gc::ScopedGCCriticalSection::Setup(handle_libart);
+        art::profiling_info::Setup(handle_libart);
         art_img.reset();
         LOGD("Inline hooks installed");
     }
-}
+}  // namespace lspd