Skip to content
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

lib/vfscore: Solve redefining conflicts #441

Closed
wants to merge 2 commits into from

Conversation

dragosargint
Copy link
Member

@dragosargint dragosargint commented Apr 4, 2022

There are many functions that are defined in musl as well as in vfscore. When using
musl we want to use the musl functions. When we use musl the LIBSYSCALL_SHIM_NOWRAPPER
macro is set, which leads to the setting of UK_LIBC_SYSCALLS to 0. We can use this
to exclude the redefined functions from vfscore.

This PR is part of a series:
#454
#453
#442
#441

Signed-off-by: Dragos Iulian Argint dragosargint21@gmail.com

@skuenzer skuenzer self-assigned this Apr 4, 2022
lib/vfscore/main.c Outdated Show resolved Hide resolved
lib/vfscore/mount.c Outdated Show resolved Hide resolved
Copy link
Member

@mogasergiu mogasergiu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible to also squash the commit changing the style of the comments?

@razvand razvand added the state/superceded PR or Issue is no longer applicable label May 26, 2022
@razvand razvand closed this May 26, 2022
@razvand razvand removed the state/superceded PR or Issue is no longer applicable label May 26, 2022
@razvand razvand reopened this May 26, 2022
@dragosargint dragosargint requested a review from a team as a code owner August 9, 2022 20:16
@razvand razvand requested review from skuenzer and mogasergiu and removed request for a team August 10, 2022 20:36
Copy link
Member

@mogasergiu mogasergiu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed-by: Sergiu Moga sergiu.moga@protonmail.com

Copy link
Member

@skuenzer skuenzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @dragosargint,

thanks a lot for these fixes. Can you check the few comments that I posted? It is basically concerning mkfifo and umount. We should use UK_SYSCALL_R_DEFINE for those instead. Then they are also properly registered at the syscall shim.

Thanks,

Simon

lib/vfscore/mount.c Show resolved Hide resolved
lib/vfscore/pipe.c Show resolved Hide resolved
There are many functions that are defined
in musl as well as in vfscore. When using
musl you want to use the musl functions.
When we use musl the
`LIBSYSCALL_SHIM_NOWRAPPER` macro is set
, which leads to the setting of
`UK_LIBC_SYSCALLS` to 0. We can use this
to exclude the redefined functions from vfscore.

Signed-off-by: Dragos Iulian Argint <dragosargint21@gmail.com>
Signed-off-by: Dragos Iulian Argint <dragosargint21@gmail.com>
@unikraft-bot
Copy link
Member

Checkpatch passed

Beep boop! I ran Unikraft's checkpatch.pl support script on your pull request and it all looks good!

SHA commit checkpatch
9a1b646 lib/vfscore: Solve redefining conflicts
39db824 lib/vfscore: Change the call of `dup2()` to `uk_syscall_r_dup2()`

@unikraft-bot unikraft-bot added area/lib Internal Unikraft Microlibrary lang/c Issues or PRs to do with C/C++ lib/vfscore VFS Core Interface labels Aug 18, 2022
Copy link
Member

@skuenzer skuenzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved-by: Simon Kuenzer simon.kuenzer@neclab.eu

unikraft-bot pushed a commit that referenced this pull request Aug 19, 2022
Signed-off-by: Dragos Iulian Argint <dragosargint21@gmail.com>
Reviewed-by: Sergiu Moga <sergiu.moga@protonmail.com>
Approved-by: Simon Kuenzer <simon.kuenzer@neclab.eu>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #441
@unikraft-bot unikraft-bot added the ci/merged Merged by CI label Aug 19, 2022
@nderjung nderjung added the topic/muslpreview Issue or PR is related to the transition from newlib to musl label Aug 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/lib Internal Unikraft Microlibrary ci/merged Merged by CI lang/c Issues or PRs to do with C/C++ lib/vfscore VFS Core Interface topic/muslpreview Issue or PR is related to the transition from newlib to musl
Projects
Status: Done!
Development

Successfully merging this pull request may close these issues.

None yet

6 participants