Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fb9e308 authored by Florian Mayer's avatar Florian Mayer Committed by Automerger Merge Worker
Browse files

Merge "[MTE] write stack history into tombstone" into main am: 2d75f82a 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3063532



Change-Id: I43728d9a5a68ad24480394d6a3f93f861cc39852
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da6cd342 2d75f82a

debuggerd/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ cc_test { 
        "libdebuggerd/test/dump_memory_test.cpp",

        "libdebuggerd/test/elf_fake.cpp",

        "libdebuggerd/test/log_fake.cpp",

        "libdebuggerd/test/mte_stack_record_test.cpp",

        "libdebuggerd/test/open_files_list_test.cpp",

        "libdebuggerd/test/tombstone_proto_to_text_test.cpp",

    ],

debuggerd/crash_dump.cpp

+9 −0
Original line number Diff line number Diff line
@@ -662,6 +662,15 @@ int main(int argc, char** argv) { 
        info.pac_enabled_keys = -1;

      }



#if defined(__aarch64__)

      struct iovec tls_iov = {

          &info.tls,

          sizeof(info.tls),

      };

      if (ptrace(PTRACE_GETREGSET, thread, NT_ARM_TLS, reinterpret_cast<void*>(&tls_iov)) == -1) {

        info.tls = 0;

      }

#endif

      if (thread == g_target_thread) {

        // Read the thread's registers along with the rest of the crash info out of the pipe.

        ReadCrashInfo(input_pipe, &siginfo, &info.registers, &process_info, &recoverable_crash);

debuggerd/libdebuggerd/include/libdebuggerd/tombstone.h

+4 −1
Original line number Diff line number Diff line
@@ -73,5 +73,8 @@ bool tombstone_proto_to_text( 


void fill_in_backtrace_frame(BacktraceFrame* f, const unwindstack::FrameData& frame);

void set_human_readable_cause(Cause* cause, uint64_t fault_addr);



#if defined(__aarch64__)

void dump_stack_history(unwindstack::AndroidUnwinder* unwinder, uintptr_t target_tls,

                        StackHistoryBuffer& shb_ob, bool nounwind = false);

#endif

#endif  // _DEBUGGERD_TOMBSTONE_H

debuggerd/libdebuggerd/include/libdebuggerd/types.h

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ struct ThreadInfo { 
  siginfo_t* siginfo = nullptr;



  std::unique_ptr<unwindstack::Regs> guest_registers;

#if defined(__aarch64__)

  uintptr_t tls;  // This is currently used for MTE stack history buffer.

#endif

};



// This struct is written into a pipe from inside the crashing process.

debuggerd/libdebuggerd/test/mte_stack_record_test.cpp

0 → 100644
+157 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#if defined(__aarch64__)



#include <stdint.h>

#include <sys/mman.h>



#include <optional>



#include "bionic/mte.h"

#include "bionic/page.h"

#include "unwindstack/AndroidUnwinder.h"

#include "unwindstack/Memory.h"



#include <android-base/test_utils.h>

#include "gtest/gtest.h"



#include "libdebuggerd/tombstone.h"



struct ScopedUnmap {

  void* ptr;

  size_t size;

  ~ScopedUnmap() { munmap(ptr, size); }

};



class MteStackHistoryTest : public ::testing::TestWithParam<int> {

  void SetUp() override {

#if !defined(__aarch64__)

    GTEST_SKIP();

#endif

    SKIP_WITH_HWASAN;

    unwinder.emplace();

    unwindstack::ErrorData E;

    ASSERT_TRUE(unwinder->Initialize(E));

  }



 protected:

  // std::optional so we don't construct it for the SKIP cases.

  std::optional<unwindstack::AndroidLocalUnwinder> unwinder;

};



TEST(MteStackHistoryUnwindTest, TestOne) {

#if !defined(__aarch64__)

  GTEST_SKIP();

#endif

  SKIP_WITH_HWASAN;

  size_t size = stack_mte_ringbuffer_size(0);

  char* data = static_cast<char*>(stack_mte_ringbuffer_allocate(0, nullptr));

  ScopedUnmap s{data, size};



  uintptr_t taggedfp = (1ULL << 56) | 1;

  uintptr_t pc = reinterpret_cast<uintptr_t>(&memcpy);

  memcpy(data, &pc, sizeof(pc));

  memcpy(data + 8, &taggedfp, sizeof(taggedfp));



  // The MTE TLS is at TLS - 3, so we allocate 3 placeholders.

  void* tls[4] = {data + 16};



  unwindstack::AndroidLocalUnwinder unwinder;

  unwindstack::ErrorData E;

  unwinder.Initialize(E);

  StackHistoryBuffer shb;

  dump_stack_history(&unwinder, reinterpret_cast<uintptr_t>(&tls[3]), shb, /* nounwind= */ false);

  ASSERT_EQ(shb.entries_size(), 1);

  const StackHistoryBufferEntry& e = shb.entries(0);

  EXPECT_EQ(e.addr().pc(), pc);

  EXPECT_EQ(e.addr().file_name(), "/apex/com.android.runtime/lib64/bionic/libc.so");

  EXPECT_EQ(e.fp(), 1ULL);

  EXPECT_EQ(e.tag(), 1ULL);

}



TEST_P(MteStackHistoryTest, TestEmpty) {

  int size_cls = GetParam();

  size_t size = stack_mte_ringbuffer_size(size_cls);

  void* data = stack_mte_ringbuffer_allocate(size_cls, nullptr);

  ScopedUnmap s{data, size};

  // The MTE TLS is at TLS - 3, so we allocate 3 placeholders.

  void* tls[4] = {data};



  StackHistoryBuffer shb;

  dump_stack_history(&*unwinder, reinterpret_cast<uintptr_t>(&tls[3]), shb, /* nounwind= */ true);

  EXPECT_EQ(shb.entries_size(), 0);

}



TEST_P(MteStackHistoryTest, TestFull) {

  int size_cls = GetParam();

  size_t size = stack_mte_ringbuffer_size(size_cls);

  char* data = static_cast<char*>(stack_mte_ringbuffer_allocate(size_cls, nullptr));

  ScopedUnmap s{data, size};

  uintptr_t itr = 1;

  for (char* d = data; d < &data[size]; d += 16) {

    uintptr_t taggedfp = ((itr & 15) << 56) | itr;

    uintptr_t pc = itr;

    memcpy(d, &pc, sizeof(pc));

    memcpy(d + 8, &taggedfp, sizeof(taggedfp));

    ++itr;

  }

  // The MTE TLS is at TLS - 3, so we allocate 3 placeholders.

  // Because the buffer is full, and we point at one past the last inserted element,

  // due to wrap-around we point at the beginning of the buffer.

  void* tls[4] = {data};



  StackHistoryBuffer shb;

  dump_stack_history(&*unwinder, reinterpret_cast<uintptr_t>(&tls[3]), shb, /* nounwind= */ true);

  EXPECT_EQ(static_cast<size_t>(shb.entries_size()), size / 16);

  for (const auto& entry : shb.entries()) {

    EXPECT_EQ(entry.addr().pc(), --itr);

    EXPECT_EQ(entry.addr().pc(), entry.fp());

    EXPECT_EQ(entry.addr().pc() & 15, entry.tag());

  }

}



TEST_P(MteStackHistoryTest, TestHalfFull) {

  int size_cls = GetParam();

  size_t size = stack_mte_ringbuffer_size(size_cls);

  size_t half_size = size / 2;



  char* data = static_cast<char*>(stack_mte_ringbuffer_allocate(size_cls, nullptr));

  ScopedUnmap s{data, size};



  uintptr_t itr = 1;

  for (char* d = data; d < &data[half_size]; d += 16) {

    uintptr_t taggedfp = ((itr & 15) << 56) | itr;

    uintptr_t pc = itr;

    memcpy(d, &pc, sizeof(pc));

    memcpy(d + 8, &taggedfp, sizeof(taggedfp));

    ++itr;

  }

  // The MTE TLS is at TLS - 3, so we allocate 3 placeholders.

  void* tls[4] = {&data[half_size]};



  StackHistoryBuffer shb;

  dump_stack_history(&*unwinder, reinterpret_cast<uintptr_t>(&tls[3]), shb, /* nounwind= */ true);

  EXPECT_EQ(static_cast<size_t>(shb.entries_size()), half_size / 16);

  for (const auto& entry : shb.entries()) {

    EXPECT_EQ(entry.addr().pc(), --itr);

    EXPECT_EQ(entry.addr().pc(), entry.fp());

    EXPECT_EQ(entry.addr().pc() & 15, entry.tag());

  }

}



INSTANTIATE_TEST_SUITE_P(MteStackHistoryTestInstance, MteStackHistoryTest, testing::Range(0, 8));



#endif