ports(mlibc): tag memory locations on library load

Signed-off-by: Anhad Singh <[email protected]>

Author: Andy-Python-Programmer

patches/fox/jinx-working-patch.patch

@@ -22,4 +22,20 @@ index ce0f651..189b5e8 100644
  saved_cppflags="${CXXFLAGS}"
  CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H=1 $XFTCFLAGS"
  X_BASE_LIBS="${X_BASE_LIBS} $XFTLIBS"
-
+diff --git fox-clean/include/FXStream.h fox-workdir/include/FXStream.h
+index 41fe97a..b483556 100644
+--- fox-clean/include/FXStream.h
++++ fox-workdir/include/FXStream.h
+@@ -52,9 +52,9 @@ enum FXStreamStatus {
+ 
+ /// Stream seeking
+ enum FXWhence {
+-  FXFromStart=0,                /// Seek from start position
+-  FXFromCurrent=1,              /// Seek from current position
+-  FXFromEnd=2                   /// Seek from end position
++  FXFromStart=3,                /// Seek from start position (SEEK_SET)
++  FXFromCurrent=1,              /// Seek from current position (SEEK_CUR)
++  FXFromEnd=2                   /// Seek from end position (SEEK_END)
+   };
+ 
+ 

patches/mlibc/jinx-working-patch.patch

@@ -1,3 +1,16 @@
+diff --git mlibc-clean/meson.build mlibc-workdir/meson.build
+index 905fbb9..6da45e0 100644
+--- mlibc-clean/meson.build
++++ mlibc-workdir/meson.build
+@@ -213,7 +213,7 @@ elif host_machine.system() == 'aero'
+ 	rtld_include_dirs += include_directories('sysdeps/aero/include')
+ 	libc_include_dirs += include_directories('sysdeps/aero/include')
+ 	internal_conf.set10('MLIBC_MAP_DSO_SEGMENTS', true)
+-	internal_conf.set10('MLIBC_MAP_FILE_WINDOWS', true)
++	internal_conf.set10('MLIBC_MAP_FILE_WINDOWS', false)
+ 	subdir('sysdeps/aero')
+ elif host_machine.system() == 'managarm'
+ 	# TODO: Adopt the include_directories() commands from the managarm meson.build.
 diff --git mlibc-clean/options/glibc/generic/execinfo.cpp mlibc-workdir/options/glibc/generic/execinfo.cpp
 index 3474615..d06f130 100644
 --- mlibc-clean/options/glibc/generic/execinfo.cpp
@@ -15,11 +28,69 @@ index 3474615..d06f130 100644
  }
 
  char **backtrace_symbols(void *const *, int) {
+diff --git mlibc-clean/options/rtld/generic/linker.cpp mlibc-workdir/options/rtld/generic/linker.cpp
+index b5f42af..569a8c2 100644
+--- mlibc-clean/options/rtld/generic/linker.cpp
++++ mlibc-workdir/options/rtld/generic/linker.cpp
+@@ -27,7 +27,7 @@ uintptr_t libraryBase = 0x41000000;
+ 
+ constexpr bool verbose = false;
+ constexpr bool stillSlightlyVerbose = false;
+-constexpr bool logBaseAddresses = false;
++constexpr bool logBaseAddresses = true;
+ constexpr bool logRpath = false;
+ constexpr bool logLdPath = false;
+ constexpr bool eagerBinding = true;
+@@ -470,6 +470,7 @@ frg::expected<LinkerError, void> ObjectRepository::_fetchFromFile(SharedObject *
+ 	__ensure(!(object->baseAddress & (hugeSize - 1)));
+ 
+ 	highest_address = (highest_address + mlibc::page_size - 1) & ~(mlibc::page_size - 1);
++	size_t tagSize = highest_address - object->baseAddress;
+ 
+ #if MLIBC_MMAP_ALLOCATE_DSO
+ 	void *mappedAddr = nullptr;
+@@ -492,9 +493,12 @@ frg::expected<LinkerError, void> ObjectRepository::_fetchFromFile(SharedObject *
+ 	libraryBase += (highest_address + (hugeSize - 1)) & ~(hugeSize - 1);
+ #endif
+ 
+-	if(verbose || logBaseAddresses)
++	if(verbose || logBaseAddresses) {
++		mlibc::sys_tag_memory((void *)object->baseAddress, tagSize, object->name.data());
++
+ 		mlibc::infoLogger() << "rtld: Loading " << object->name
+ 				<< " at " << (void *)object->baseAddress << frg::endlog;
++	}
+ 
+ 	// Load all segments.
+ 	constexpr size_t pageSize = 0x1000;
+diff --git mlibc-clean/options/rtld/include/mlibc/rtld-sysdeps.hpp mlibc-workdir/options/rtld/include/mlibc/rtld-sysdeps.hpp
+index 6f42d41..3e37a1d 100644
+--- mlibc-clean/options/rtld/include/mlibc/rtld-sysdeps.hpp
++++ mlibc-workdir/options/rtld/include/mlibc/rtld-sysdeps.hpp
+@@ -5,6 +5,7 @@ namespace [[gnu::visibility("hidden")]] mlibc {
+ 
+ int sys_tcb_set(void *pointer);
+ 
++[[gnu::weak]] int sys_tag_memory(void *ptr, size_t size, char *tag);
+ [[gnu::weak]] int sys_vm_readahead(void *pointer, size_t size);
+ 
+ } // namespace mlibc
 diff --git mlibc-clean/sysdeps/aero/generic/aero.cpp mlibc-workdir/sysdeps/aero/generic/aero.cpp
-index 80f9c6f..897986d 100644
+index 80f9c6f..85031cd 100644
 --- mlibc-clean/sysdeps/aero/generic/aero.cpp
 +++ mlibc-workdir/sysdeps/aero/generic/aero.cpp
-@@ -200,14 +200,19 @@ int sys_getcwd(char *buffer, size_t size) {
+@@ -62,6 +62,10 @@ static frg::vector<Slice, MemoryAllocator> create_slice(char *const arg[]) {
+ }
+ 
+ namespace mlibc {
++int sys_tag_memory(void *ptr, size_t size, char *tag) {
++    return syscall(SYS_DEBUG, ptr, size, tag, strlen(tag));
++}
++
+ int sys_uname(struct utsname *buf) {
+     auto result = syscall(SYS_UNAME, buf);
+ 
+@@ -200,14 +204,19 @@ int sys_getcwd(char *buffer, size_t size) {
      return 0;
  }
 
@@ -46,7 +117,7 @@ index 80f9c6f..897986d 100644
 
  int sys_gethostname(char *buffer, size_t bufsize) {
 diff --git mlibc-clean/sysdeps/aero/generic/filesystem.cpp mlibc-workdir/sysdeps/aero/generic/filesystem.cpp
-index 95c49b9..9416be7 100644
+index 95c49b9..8777468 100644
 --- mlibc-clean/sysdeps/aero/generic/filesystem.cpp
 +++ mlibc-workdir/sysdeps/aero/generic/filesystem.cpp
 @@ -69,13 +69,14 @@ int sys_seek(int fd, off_t offset, int whence, off_t *new_offset) {
@@ -70,3 +141,24 @@ index 95c49b9..9416be7 100644
      return 0;
  }
 
+@@ -124,6 +125,20 @@ int sys_stat(fsfd_target fsfdt, int fd, const char *path, int flags,
+     return 0;
+ }
+ 
++int sys_statfs(const char *path, struct statfs *buf) {
++    __ensure(!syscall(SYS_BACKTRACE));
++    __ensure(!"statfs");
++    memset(buf, 0, sizeof(struct statfs));
++    return 0;
++}
++
++int sys_fstatfs(int fd, struct statfs *buf) {
++    __ensure(!syscall(SYS_BACKTRACE));
++    mlibc::infoLogger() << "fstatfs" << frg::endlog;
++    memset(buf, 0, sizeof(struct statfs));
++    return 0;
++}
++
+ int sys_ioctl(int fd, unsigned long request, void *arg, int *result) {
+     auto sys_res = syscall(SYS_IOCTL, fd, request, arg);
+ 

recipes/mlibc

@@ -1,8 +1,8 @@
 name=mlibc
-version=71d6b326e31b88796088690278ce31bb8e9fc994
+version=7b67d09bde0be6d53284d1583058483e1687880c
 revision=1
 tarball_url="https://github.com/managarm/mlibc/archive/${version}.tar.gz"
-tarball_blake2b="b2fc2178bf9a26191a78866272da2ff6cb2b547cb3fdd5fe28f4280d5bbf98a929e9920e5c05a25ed340af8d29d45265e148eba6d31490a7a6796adfcb2158d6"
+tarball_blake2b="a18b4fe6ab839088079f5cdcf1d35831ac9f3d25408118f5ddce280d595b730d1cbf7d4869a2da24f4df4edce7d250042acfea67f20266cc7a157db2e1d7c1ed"
 imagedeps="meson ninja"
 hostdeps="gcc pkg-config libgcc-binaries"
 builddeps="cxxshim frigg linux-headers"

userland/tests/utest.cc

@@ -762,8 +762,8 @@ void abstract_test_case::register_case(abstract_test_case *tcp) {
 }
 
 int main() {
-    // Go through all tests and run them.
-    for(abstract_test_case *tcp : test_case_ptrs()) {
+  // Go through all tests and run them.
+  for(abstract_test_case *tcp : test_case_ptrs()) {
 		std::cout << "tests: Running " << tcp->name() << std::endl;
 		tcp->run();
 	}