-
-
Notifications
You must be signed in to change notification settings - Fork 142
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
实现SYS_LINK和SYS_LINKAT #611
Conversation
@schulice: no appropriate reviewer found, use r? to override |
PR Description updated to latest commit (04a8ab0) |
PR Analysis
PR Feedback
✨ Usage guide:Overview:
With a configuration file, use the following template:
See the review usage page for a comprehensive guide on using this tool. |
PR Code Suggestions
✨ Usage guide:Overview:
With a configuration file, use the following template:
See the improve usage page for a more comprehensive guide on using this tool. |
对于这两个建议。1. fd是否有效在user_path_at中会检查(AT_EMPTY直接使用oldfd时也有)。2. 新文件是否存在在inode的link中有检查,虽然我个人认为在do_linkat中用find检查会更合适。 |
@dragonosbot assign @chiichen |
@dragonosbot label S-等待审查 |
kernel/src/filesystem/vfs/syscall.rs
Outdated
} | ||
// TODO AT_EMPTY_PATH标志启用时,进行调用者CAP_DAC_READ_SEARCH或相似的检查 | ||
let symlink_times = match flags & AtFlags::AT_SYMLINK_FOLLOW.bits() { | ||
0 => 0, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这里应当使用flags.contains或者if 来判断它是否等于0,而不是match。下面那个代码也一样。
kernel/src/filesystem/vfs/syscall.rs
Outdated
.ok_or(SystemError::EBADF)?; | ||
let old_inode = file.lock().inode(); | ||
if old_inode.metadata().unwrap().file_type == FileType::Dir { | ||
return Err(SystemError::EPERM); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
返回值是eperm吗?有无linux man7的文档。看看这种情况应当返回什么内容。
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
kernel/src/filesystem/vfs/syscall.rs
Outdated
old: &str, | ||
newfd: i32, | ||
new: &str, | ||
flags: i32, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这个作为内部的函数,flags应当是Atflags类型,而不是i32
kernel/src/syscall/mod.rs
Outdated
let old_cstr = args[0] as *const u8; | ||
let new_cstr = args[1] as *const u8; | ||
|
||
let old = check_and_clone_cstr(old_cstr, Some(MAX_PATHLEN))?; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
把这些校验的操作放到vfs的syscall里面去。不要写在这里。
} | ||
|
||
#[cfg(target_arch = "x86_64")] | ||
SYS_LINKAT => { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这个系统调用riscv也有,因此不需要加条件编译。
kernel/src/syscall/mod.rs
Outdated
|
||
let old = check_and_clone_cstr(old_cstr, Some(MAX_PATHLEN))?; | ||
let new = check_and_clone_cstr(new_cstr, Some(MAX_PATHLEN))?; | ||
if old.len() >= MAX_PATHLEN || new.len() >= MAX_PATHLEN { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这两个系统调用在校验这块的逻辑类似,应当封装成函数。
kernel/src/syscall/mod.rs
Outdated
return Err(SystemError::ENAMETOOLONG); | ||
} | ||
// old.len() 根据flags & AtFlags::AT_EMPTY_PATH判空 | ||
if new.len() <= 0 || (old.len() <= 0 && flags & AtFlags::AT_EMPTY_PATH.bits() == 0) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这些逻辑不应该放在这里。应到放在do_link_at
@dragonosbot label +S-等待作者修改 |
pub fn link(old: *const u8, new: *const u8) -> Result<usize, SystemError> { | ||
let get_path = |cstr: *const u8| -> Result<String, SystemError> { | ||
let res = check_and_clone_cstr(cstr, Some(MAX_PATHLEN))?; | ||
if res.len() >= MAX_PATHLEN { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这两个if是不必要的。
let old = check_and_clone_cstr(old, Some(MAX_PATHLEN))?; | ||
let new = check_and_clone_cstr(new, Some(MAX_PATHLEN))?; | ||
if old.len() >= MAX_PATHLEN || new.len() >= MAX_PATHLEN { | ||
return Err(SystemError::ENAMETOOLONG); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
同理,因为check_and_clone_str会自动截断。
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
我个人认为这个只检查是否等于MAX_PATHLEN,写成>=的形式是参考了unlink的写法。
这个我在主线刚才改好了,返回EFAULT 然后合并一下主线代码进来,这个PR感觉无问题 |
kernel/src/filesystem/vfs/syscall.rs
Outdated
let new_parent = new_begin_inode | ||
.lookup_follow_symlink(&new_parent_path.unwrap_or("/"), symlink_times)?; | ||
|
||
// 在下层检查是否处于同一文件系统 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这个注释貌似不太对。
User description
目的
希望提供一个方便在用户态测试文件系统link的接口。
实现了才想起来应当先提个issue,索性测完交个pr。
实现方法
实现do_linkat(),在link()及linkat()中直接调用。
do_linkat()调用inode的link()
可能不合规范的行为
功能测试
在/ramte上挂载了ramfs,并使用shell的echo向文件写入内容进行测试。
其他杂项
#596 在SYS_RMDIR上加了个判空。
Type
Bug fix, Enhancement
Description
此PR实现了SYS_LINK和SYS_LINKAT系统调用,允许用户在文件系统中创建硬链接。同时,对SYS_RMDIR函数进行了增强,现在可以正确处理空路径的情况。
Changes walkthrough
syscall.rs
- 实现SYS_LINK和SYS_LINKAT系统调用 - 完善SYS_RMDIR功能
kernel/src/filesystem/vfs/syscall.rs
do_linkat()
和link()
函数,实现了创建硬链接的系统调用。rmdir()
函数进行了完善,增加了对空路径的处理。✨ Usage guide:
Overview:
The
describe
tool scans the PR code changes, and generates a description for the PR - title, type, summary, walkthrough and labels. The tool can be triggered automatically every time a new PR is opened, or can be invoked manually by commenting on a PR.When commenting, to edit configurations related to the describe tool (
pr_description
section), use the following template:With a configuration file, use the following template:
Enabling\disabling automation
meaning the
describe
tool will run automatically on every PR, will keep the original title, and will add the original user description above the generated description.the tool will replace every marker of the form
pr_agent:marker_name
in the PR description with the relevant content, wheremarker_name
is one of the following:type
: the PR type.summary
: the PR summary.walkthrough
: the PR walkthrough.Note that when markers are enabled, if the original PR description does not contain any markers, the tool will not alter the description at all.
Custom labels
The default labels of the
describe
tool are quite generic: [Bug fix
,Tests
,Enhancement
,Documentation
,Other
].If you specify custom labels in the repo's labels page or via configuration file, you can get tailored labels for your use cases.
Examples for custom labels:
Main topic:performance
- pr_agent:The main topic of this PR is performanceNew endpoint
- pr_agent:A new endpoint was added in this PRSQL query
- pr_agent:A new SQL query was added in this PRDockerfile changes
- pr_agent:The PR contains changes in the DockerfileThe list above is eclectic, and aims to give an idea of different possibilities. Define custom labels that are relevant for your repo and use cases.
Note that Labels are not mutually exclusive, so you can add multiple label categories.
Make sure to provide proper title, and a detailed and well-phrased description for each label, so the tool will know when to suggest it.
Inline File Walkthrough 💎
For enhanced user experience, the
describe
tool can add file summaries directly to the "Files changed" tab in the PR page.This will enable you to quickly understand the changes in each file, while reviewing the code changes (diffs).
To enable inline file summary, set
pr_description.inline_file_summary
in the configuration file, possible values are:'table'
: File changes walkthrough table will be displayed on the top of the "Files changed" tab, in addition to the "Conversation" tab.true
: A collapsable file comment with changes title and a changes summary for each file in the PR.false
(default): File changes walkthrough will be added only to the "Conversation" tab.Utilizing extra instructions
The
describe
tool can be configured with extra instructions, to guide the model to a feedback tailored to the needs of your project.Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter. Notice that the general structure of the description is fixed, and cannot be changed. Extra instructions can change the content or style of each sub-section of the PR description.
Examples for extra instructions:
Use triple quotes to write multi-line instructions. Use bullet points to make the instructions more readable.
More PR-Agent commands
See the describe usage page for a comprehensive guide on using this tool.