Adds support for RDMA_VERBS_IOCTL

CMakeLists.txt

@@ -55,7 +55,7 @@ set(supports32bit true)
 set(x86ish false)
 if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
   set(supports32bit false)
-  set(FLAGS_COMMON "${FLAGS_COMMON} -march=armv8.3-a")
+  set(FLAGS_COMMON "${FLAGS_COMMON} -march=armv8.3-a -Wl,-dynamic-linker=/lib/aarch64-linux-gnu/atomics/ld-linux-aarch64.so.1")
 else()
   set(x86ish true)
   set(FLAGS_COMMON "${FLAGS_COMMON} -msse2 -D__MMX__ -D__SSE__ -D__SSE2__")
@@ -342,7 +342,7 @@ foreach(file ${RR_PAGE_FILES})
   set_source_files_properties("${CMAKE_SOURCE_DIR}/src/preload/${file}"
                               PROPERTIES COMPILE_FLAGS ${PRELOAD_COMPILE_FLAGS})
 endforeach(file)
-set_target_properties(rrpage PROPERTIES LINK_FLAGS "-Wl,-T -Wl,${CMAKE_SOURCE_DIR}/src/preload/rr_page.ld -nostartfiles -nostdlib -Wl,-z,max-page-size=0x1000 ${LINKER_FLAGS}")
+set_target_properties(rrpage PROPERTIES LINK_FLAGS "-Wl,-T -Wl,${CMAKE_SOURCE_DIR}/src/preload/rr_page.ld -Wl,--hash-style=both -nostartfiles -nostdlib -Wl,-z,max-page-size=0x1000 ${LINKER_FLAGS}")
 set_target_properties(rrpage PROPERTIES LINK_DEPENDS ${CMAKE_SOURCE_DIR}/src/preload/rr_page.ld)
 # CMake seems to have trouble generating the link line without this
 set_target_properties(rrpage PROPERTIES LINKER_LANGUAGE C)
@@ -364,6 +364,7 @@ set(PRELOAD_SOURCE_FILES
   rrcalls.h
   syscallbuf.h
 )
+if (x86ish)
 add_library(rrpreload)
 foreach(file ${PRELOAD_FILES})
   target_sources(rrpreload PUBLIC "${CMAKE_SOURCE_DIR}/src/preload/${file}")
@@ -372,6 +373,7 @@ foreach(file ${PRELOAD_FILES})
 endforeach(file)
 set_target_properties(rrpreload PROPERTIES LINK_FLAGS "-nostartfiles ${LINKER_FLAGS}")
 set_target_properties(rrpreload PROPERTIES INSTALL_RPATH "\$ORIGIN")
+endif()
 
 set(AUDIT_FILES
   rtld-audit.c
@@ -544,29 +546,10 @@ else()
   set(CMAKE_INSTALL_INCLUDEDIR "include")
 endif()
 
-option(RR_BUILD_SHARED "Build the rr shared library as well as the binary (experimental).")
-
-if(RR_BUILD_SHARED)
-  add_library(rr ${RR_SOURCES})
-  set_target_properties(rr PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
-  add_executable(rrbin src/main.cc)
-  set(RR_BIN rrbin)
-  post_build_executable(rrbin)
-  set_target_properties(rrbin PROPERTIES ENABLE_EXPORTS true OUTPUT_NAME rr)
-  set_target_properties(rrbin PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-  set_target_properties(rrbin PROPERTIES INSTALL_RPATH_USE_LINK_PATH true)
-  set_target_properties(brotli PROPERTIES POSITION_INDEPENDENT_CODE ON)
-  target_link_libraries(rrbin rr)
-  install(TARGETS rr
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-else()
-  add_executable(rr ${RR_SOURCES} src/main.cc)
-  set_target_properties(rr PROPERTIES ENABLE_EXPORTS true)
-  post_build_executable(rr)
-  set(RR_BIN rr)
-endif()
+add_executable(rr ${RR_SOURCES} src/main.cc)
+set_target_properties(rr PROPERTIES ENABLE_EXPORTS true)
+post_build_executable(rr)
+set(RR_BIN rr)
 add_dependencies(rr Generated)
 
 option(strip "Strip debug info from rr binary")
@@ -593,13 +576,12 @@ else()
 endif()
 
 set_target_properties(rr PROPERTIES LINK_FLAGS "${RR_MAIN_LINKER_FLAGS}")
-if(RR_BUILD_SHARED)
-  set_target_properties(rrbin PROPERTIES LINK_FLAGS "${RR_MAIN_LINKER_FLAGS}")
-endif()
 
+if (x86ish)
 target_link_libraries(rrpreload
   ${CMAKE_DL_LIBS}
 )
+endif()
 
 add_executable(rr_exec_stub src/exec_stub.c)
 post_build_executable(rr_exec_stub)
@@ -661,7 +643,11 @@ install(PROGRAMS scripts/signal-rr-recording.sh
 install(PROGRAMS scripts/rr_completion
   DESTINATION ${CMAKE_INSTALL_DATADIR}/bash-completion/completions RENAME rr)
 
-install(TARGETS ${RR_BIN} rrpreload rrpage rraudit rr_exec_stub
+set(RR_INSTALL_LIBS rrpage rraudit rr_exec_stub)
+if (x86ish)
+  set(RR_INSTALL_LIBS rrpreload ${RR_INSTALL_LIBS})
+endif()
+install(TARGETS ${RR_BIN} ${RR_INSTALL_LIBS}
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/rr
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/rr)
@@ -686,7 +672,7 @@ if(rr_32BIT AND rr_64BIT)
                                 PROPERTIES COMPILE_FLAGS "-m32 ${PRELOAD_COMPILE_FLAGS}")
   endforeach(file)
 
-  set_target_properties(rrpage_32 PROPERTIES LINK_FLAGS "-m32 -Wl,-T -Wl,${CMAKE_SOURCE_DIR}/src/preload/rr_page.ld -nostartfiles -nostdlib ${LINKER_FLAGS}")
+  set_target_properties(rrpage_32 PROPERTIES LINK_FLAGS "-m32 -Wl,-T -Wl,${CMAKE_SOURCE_DIR}/src/preload/rr_page.ld -Wl,--hash-style=both -nostartfiles -nostdlib ${LINKER_FLAGS}")
   set_target_properties(rrpage_32 PROPERTIES LINK_DEPENDS ${CMAKE_SOURCE_DIR}/src/preload/rr_page.ld)
   set_target_properties(rrpage_32 PROPERTIES LINKER_LANGUAGE C)
 
@@ -785,6 +771,7 @@ set(BASIC_TESTS
   big_buffers
   block
   block_open
+  bpf
   brk
   brk2
   capget
@@ -835,10 +822,12 @@ set(BASIC_TESTS
   exit_with_syscallbuf_signal
   fadvise
   fanotify
+  fatal_init_signal
   fatal_sigsegv_thread
-  fcntl_dupfd
   x86/fault_in_code_page
+  fcntl_dupfd
   fcntl_misc
+  fcntl_notify
   fcntl_owner_ex
   fcntl_rw_hints
   fcntl_seals
@@ -884,17 +873,23 @@ set(BASIC_TESTS
   invalid_fcntl
   invalid_ioctl
   io
+  io_uring
   ioctl
+  ioctl_fb
   ioctl_fs
   ioctl_pty
   ioctl_sg
   ioctl_tty
+  ioctl_vt
+  x86/ioperm
+  x86/iopl
   join_threads
   joystick
   kcmp
   keyctl
   kill_newborn
   kill_ptracee
+  large_hole
   large_write_deadlock
   legacy_ugid
   x86/lsl
@@ -965,6 +960,7 @@ set(BASIC_TESTS
   pid_ns_reap
   pid_ns_segv
   pidfd
+  x86/pkeys
   poll_sig_race
   ppoll
   prctl
@@ -1002,7 +998,7 @@ set(BASIC_TESTS
   ptrace_singlestep
   ptrace_syscall
   ptrace_syscall_clone_untraced
-  ptrace_sysemu
+  x86/ptrace_sysemu
   ptrace_sysemu_syscall
   ptrace_trace_clone
   ptrace_trace_exit
@@ -1026,6 +1022,7 @@ set(BASIC_TESTS
   rename
   rlimit
   robust_futex
+  rseq
   rusage
   samask
   save_data_fd
@@ -1037,6 +1034,7 @@ set(BASIC_TESTS
   scm_rights
   scratch_read
   seccomp
+  seccomp_cloning
   seccomp_clone_fail
   seccomp_desched
   seccomp_kill_exit
@@ -1058,6 +1056,8 @@ set(BASIC_TESTS
   setsid
   setuid
   shared_exec
+  shared_monitor
+  shared_offset
   shared_write
   shm
   shm_unmap
@@ -1092,6 +1092,7 @@ set(BASIC_TESTS
   sigtrap
   simple_threads_stress
   sioc
+  small_holes
   sock_names_opts
   spinlock_priorities
   splice
@@ -1140,12 +1141,15 @@ set(BASIC_TESTS
   unexpected_exit_pid_ns
   unjoined_thread
   unshare
+  userfaultfd
   utimes
+  vdso_parts
   vfork_flush
   vfork_shared
   video_capture
   vm_readv_writev
   vsyscall
+  vsyscall_timeslice
   x86/x87env
   wait
   wait_sigstop
@@ -1224,7 +1228,8 @@ set(TESTS_WITH_PROGRAM
   exit_group
   exit_race
   exit_status
-  explicit_checkpoints
+  x86/explicit_checkpoints
+  fd_limit
   fork_stress
   fork_syscalls
   function_calls
@@ -1318,8 +1323,8 @@ set(TESTS_WITH_PROGRAM
   ttyname
   unexpected_stack_growth
   user_ignore_sig
-  vdso_gettimeofday_stack
   vdso_clock_gettime_stack
+  vdso_gettimeofday_stack
   vdso_time_stack
   vfork
   vfork_read_clone_stress
@@ -1432,6 +1437,7 @@ set(TESTS_WITHOUT_PROGRAM
   syscallbuf_timeslice_250
   trace_version
   term_trace_cpu
+  tty
   unmap_vdso
   unwind_on_signal
   vfork_exec
@@ -1666,20 +1672,20 @@ if(BUILD_TESTS)
     foreach(test ${BASIC_TESTS} ${BASIC_CPP_TESTS} ${OTHER_TESTS})
       get_filename_component(testname ${test} NAME)
       add_test(${test}-32
-        bash source_dir/src/test/basic_test.run ${testname}_32 "" bin_dir)
+        bash source_dir/src/test/basic_test.run ${testname}_32 "" bin_dir ${TEST_MONITOR_DEFAULT_TIMEOUT})
       configure_test(${test}-32)
       add_test(${test}-32-no-syscallbuf
-        bash source_dir/src/test/basic_test.run ${testname}_32 -n bin_dir)
+        bash source_dir/src/test/basic_test.run ${testname}_32 -n bin_dir ${TEST_MONITOR_DEFAULT_TIMEOUT})
       configure_test(${test}-32-no-syscallbuf)
     endforeach(test)
 
     foreach(test ${TESTS_WITH_PROGRAM} ${TESTS_WITHOUT_PROGRAM})
       get_filename_component(testname ${test} NAME)
       add_test(${test}-32
-        bash source_dir/src/test/${test}.run ${testname}_32 "" bin_dir)
+        bash source_dir/src/test/${test}.run ${testname}_32 "" bin_dir ${TEST_MONITOR_DEFAULT_TIMEOUT})
       configure_test(${test}-32)
       add_test(${test}-32-no-syscallbuf
-        bash source_dir/src/test/${test}.run ${testname}_32 -n bin_dir)
+        bash source_dir/src/test/${test}.run ${testname}_32 -n bin_dir ${TEST_MONITOR_DEFAULT_TIMEOUT})
       configure_test(${test}-32-no-syscallbuf)
     endforeach(test)
   endif()

README.md

@@ -9,6 +9,8 @@ Please contribute!  Make sure to review the [pull request checklist](/CONTRIBUTI
 
 If you find rr useful, please [add a testimonial](https://github.com/rr-debugger/rr/wiki/Testimonials).
 
+rr development is sponsored by [Pernosco](https://pernos.co) and was originated by [Mozilla](https://www.mozilla.org).
+
 # System requirements
 
 * Linux kernel ≥ 3.11 is required (for `PTRACE_SETSIGMASK`).

src/AutoRemoteSyscalls.cc

@@ -113,6 +113,11 @@ AutoRemoteSyscalls::AutoRemoteSyscalls(Task* t,
 }
 
 void AutoRemoteSyscalls::setup_path(bool enable_singlestep_path) {
+#if defined(__aarch64__)
+  // XXXkhuey this fast path doesn't work on AArch64 yet, go slow instead
+  enable_singlestep_path = false;
+#endif
+
   if (!replaced_bytes.empty()) {
     // XXX what to do here to clean up if the task died unexpectedly?
     t->write_mem(remote_ptr<uint8_t>(initial_regs.ip().to_data_ptr<uint8_t>()),

src/AutoRemoteSyscalls.h

@@ -289,8 +289,6 @@ class AutoRemoteSyscalls {
 
   AutoRemoteSyscalls& operator=(const AutoRemoteSyscalls&) = delete;
   AutoRemoteSyscalls(const AutoRemoteSyscalls&) = delete;
-  void* operator new(size_t) = delete;
-  void operator delete(void*) = delete;
 };
 
 } // namespace rr

src/DiversionSession.cc

@@ -140,8 +140,15 @@ DiversionSession::DiversionResult DiversionSession::diversion_step(
 
   // An exit might have occurred while processing a previous syscall.
   if (t->ptrace_event() == PTRACE_EVENT_EXIT) {
+    // We're about to destroy the task, so capture the context while
+    // we can.
+    TaskContext context(t);
     handle_ptrace_exit_event(t);
+    // This is now a dangling pointer, so clear it.
+    context.task = nullptr;
     result.status = DIVERSION_EXITED;
+    result.break_status.task_context = context;
+    result.break_status.task_exit = true;
     return result;
   }