feat(mm): add slab usage calculation #768
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@laokengwt: no appropriate reviewer found, use |
github-actions
bot
added
the
ambiguous
github-actions
bot
added
the
documentation
laokengwt
changed the title
github-actions
bot
added
enhancement
laokengwt
changed the title
fslongjin
reviewed
Apr 26, 2024
| let mut count = 0; | ||
|
|
||
| // 遍历所有scallocator | ||
| while count < 9 { |
There was a problem hiding this comment.
这个是slab里面scallocator的数量
There was a problem hiding this comment.
这个是slab里面scallocator的数量
那应该使用slab allocator的常量，而不是在这里写死一个9.
fslongjin
requested changes
Apr 26, 2024
kernel/src/mm/allocator/slab.rs
Outdated
| if let Some(ref mut slab) = SLABALLOCATOR { | ||
| slab.zone.usage() | ||
| } else { | ||
| panic!("slab hasn't been initialized") |
There was a problem hiding this comment.
应该返回零，而不是panic，不然如果我们调试的时候想禁用掉slab，结果就panic掉了，这个显然是不合理的。
kernel/src/mm/allocator/slab.rs
Outdated
| @@ -63,6 +63,15 @@ impl SlabAllocator { | |||
| } | |||
| } | |||
|
|
|||
| /// 获取slab中的空闲空间 | |||
| pub unsafe fn slab_usage() -> u64 { | |||
There was a problem hiding this comment.
看这个名字，让人理解为slab里面已经使用的空间哦。
而且分配器的trait里面不已经有一个usage方法了吗？为啥要自己实现一个usage？
|
@dragonosbot author |
dragonosbot
added
S-等待作者修改
fslongjin
requested changes
Apr 26, 2024
| @@ -126,6 +123,38 @@ impl<'a> ZoneAllocator<'a> { | |||
| } | |||
| } | |||
| } | |||
|
|
|||
| /// 获取scallocator中的还未被分配的空间 | |||
| pub fn usage(&mut self) -> u64 { | |||
There was a problem hiding this comment.
我的意思是，定义一个结构体类似这样的：
因为usage这个函数名字，然后你只返回空闲空间的数字的话，其实总让人觉得是“已经使用了的空间”的意思
fslongjin
requested changes
Apr 26, 2024
kernel/src/mm/allocator/slab.rs
Outdated
|
|
||
| /// slab空闲空间 | ||
| pub struct SlabFreeSpace { | ||
| pub free: u64, |
There was a problem hiding this comment.
啊这，为什么你不在slab那个库里面定义一个slabusage的结构体，然后有free和use的两个字段，而要在内核里面定义这个。
这个从职责分配上来说就是一个很不好的设计。
|
@dragonosbot review |
dragonosbot
added
S-等待审查
fslongjin
requested changes
Apr 28, 2024
| @@ -162,9 +198,38 @@ unsafe impl<'a> crate::Allocator<'a> for ZoneAllocator<'a> { | |||
| match ZoneAllocator::get_slab(layout.size()) { | |||
| Slab::Base(idx) => { | |||
| self.small_slabs[idx].refill(new_page); | |||
| // 每refill一个page就为slab的总空间统计加上4KB | |||
| self.total += 4096; | |||
There was a problem hiding this comment.
这个不要直接写4096，而是应该用OBJECT_PAGE_SIZEE。
|
@dragonosbot author |
dragonosbot
added
S-等待作者修改
|
@dragonosbot review |
dragonosbot
added
S-等待审查
|
@dragonosbot review |
fslongjin
requested changes
Apr 28, 2024
| // 剩余可分配object数乘上page中规定的每个object的大小，即空闲空间 | ||
| free += obj_count * scallocator.size(); | ||
| } | ||
| count -= 1; |
|
@dragonosbot author |
dragonosbot
added
S-等待作者修改
|
@dragonosbot review |
dragonosbot
added
S-等待审查
fslongjin
approved these changes
Apr 29, 2024
BrahmaMantra
pushed a commit
to BrahmaMantra/DragonOS
that referenced
this pull request
Dec 9, 2024
* Add slab free space calculation and add it to freeram of sysinfo
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.