Refactor module mount load in rust #8846
Conversation
yujincheng08
force-pushed
the
module.rs
branch
5 times, most recently
from
36b06e7 to
515d7c5
Compare
|
where is #8790 ? |
|
@vvb2060 fixed |
There was a problem hiding this comment.
Pull Request Overview
This PR refactors the module mount load in Rust to build a module mount tree and support zygisk and magisk nodes, along with various mount operations.
- Added new features and module support in native/src/core/lib.rs for deploying modules.
- Modified error logging behavior in native/src/base/result.rs and improved file/dir operations in native/src/base/files.rs and native/src/base/dir.rs.
- Introduced resize functionality in native/src/base/cstr.rs for both Utf8CString and FsPathBuf.
Reviewed Changes
Copilot reviewed 6 out of 8 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| native/src/core/lib.rs | Added a new C++ extern function deploy_modules and module import. |
| native/src/base/result.rs | Changed log_ok function signature to return Option. |
| native/src/base/files.rs | Updated libc constants and added functions for whiteout check and bind mounts. |
| native/src/base/dir.rs | Updated directory open function with enhanced flags. |
| native/src/base/cstr.rs | Added resize methods for Utf8CString and FsPathBuf. |
Files not reviewed (2)
- native/src/core/module.cpp: Language not supported
- native/src/core/node.hpp: Language not supported
Comments suppressed due to low confidence (1)
native/src/core/lib.rs:245
- [nitpick] Consider using a slice type (&[ModuleInfo]) instead of &Vec for improved flexibility and idiomatic Rust usage.
fn deploy_modules(module_list: &Vec<ModuleInfo>, zygisk_lib: &CxxString, magisk_path: &CxxString) -> bool;
There was a problem hiding this comment.
Pull Request Overview
This PR refactors the module mount load implementation in Rust, simplifying the mounting process while adding support for zygisk and magisk nodes. Key changes include the removal of the legacy node.hpp file, updates in module.cpp to replace the previous mount tree deployment with a consolidated deploy_modules call, and several minor enhancements across auxiliary modules (lib.rs, base/mount.rs, base/dir.rs, etc).
Reviewed Changes
Copilot reviewed 8 out of 8 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| native/src/core/node.hpp | Removed legacy node definitions and related mount tree logic |
| native/src/core/module.cpp | Replaced previous mounting logic with deploy_modules and adjusted magisk path selection logic |
| native/src/core/lib.rs | Enabled a new Rust feature and updated module imports |
| native/src/base/result.rs | Updated signature of log_ok for improved clarity |
| native/src/base/mount.rs | Added bind_mount_ro_to function for read-only bind mounts |
| native/src/base/files.rs | Added helper is_whiteout to FileAttr |
| native/src/base/dir.rs | Updated flag usage in open_as_dir_at for safer directory handling |
Comments suppressed due to low confidence (2)
native/src/core/node.hpp:1
- The entire node.hpp file has been removed; please ensure that all necessary declarations and type definitions previously provided by this file are now available in their new location to maintain functionality.
#pragma once
native/src/core/module.cpp:57
- Replacing the previous mounting process with deploy_modules shifts key responsibilities; please confirm that deploy_modules fully replicates the removed behavior and document any differences.
deploy_modules(module_list, native_bridge, magisk_path);
| if (get_magisk_tmp() != "/sbin"sv || !str_contains(getenv("PATH") ?: "", "/sbin")) { | ||
| // Need to inject our binaries into /system/bin | ||
| inject_magisk_bins(system); | ||
| magisk_path = "/system/bin"; | ||
| for (struct stat st{}; auto &item: split(getenv("PATH"), ":")) { | ||
| item.erase(0, item.starts_with("/system/") ? 8 : 1); | ||
| auto &&system_path = "/system/"s + item; | ||
| if (stat(system_path.data(), &st) == 0 && st.st_mode & S_IXOTH) { | ||
| magisk_path = std::move(system_path); | ||
| break; | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
[nitpick] The new logic for selecting magisk_path relies on parsing getenv('PATH'); consider adding inline comments or assertions to clarify the candidate prioritization and ensure that the fallback default is intentional.
Copilot uses AI. Check for mistakes.
|
I tried to understand the code in this PR, but failed to do so. The implementation here diverged too far from the original C++ implementation, making it very difficult to decipher and modify (I wanted to change a few things but it became unmanageable). I've created my own PR #8999, which documents clearly how the code work. It actually fixed a few bugs in the C++ implementation. I'd love you to review it. |
|
Superseded by #8999 |
Todo: