mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-27 12:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

mount syscall and simple mount program

Browse Source
This commit is contained in:
Matheus
2023-07-26 00:19:51 -03:00
parent 755fd1a8d1
commit dcaa20ae9c
10 changed files with 199 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2
View File
@@ -15,3 +15,5 @@ sysroot
minimalsysroot
tools/init/init
tools/init/main.o
tools/mount/mount
tools/mount/main.o
kernel-src/arch/x86-64/syscall.asm
+3 -1
View File
@@ -36,6 +36,7 @@ extern syscall_umask
extern syscall_poll
extern syscall_nanosleep
extern syscall_ftruncate
extern syscall_mount
syscalltab:
dq syscall_print
dq syscall_mmap
@@ -74,7 +75,8 @@ dq syscall_umask
dq syscall_poll
dq syscall_nanosleep
dq syscall_ftruncate
syscallcount equ 37
dq syscall_mount
syscallcount equ 38
section .text
global arch_syscall_entry
; on entry:
kernel-src/arch/x86-64/syscalllog.c
+5 -3
View File
@@ -4,7 +4,7 @@
#ifdef SYSCALL_LOGGING
#define SYSCALL_COUNT 35
#define SYSCALL_COUNT 38
#define LOGSTR(x) arch_e9_puts(x)
static char *name[] = {
@@ -44,7 +44,8 @@ static char *name[] = {
"umask",
"poll",
"nanosleep",
"ftruncate"
"ftruncate",
"mount"
};
static char *args[] = {
@@ -84,7 +85,8 @@ static char *args[] = {
"mode %o", // umask
"fds %p nfds %d timeout %d", // poll
"time %p remaining %p", // nanosleep
"fd %d size %lu" // ftruncate
"fd %d size %lu", // ftruncate
"backing %s mountpoint %s fs %s flags %d data %p" // mount
};
#endif
kernel-src/sys/syscalls/mount.c
+71
View File
@@ -0,0 +1,71 @@
#include <kernel/syscalls.h>
#include <kernel/vmm.h>
#include <kernel/alloc.h>
#include <kernel/vfs.h>
#include <logging.h>
syscallret_t syscall_mount(context_t *context, const char *ubacking, const char *umountpoint, const char *ufs, unsigned long flags, void *data) {
syscallret_t ret = {
.ret = -1
};
__assert(flags == 0);
if ((void *)ubacking > USERSPACE_END || (void *)umountpoint > USERSPACE_END || (void *)ufs > USERSPACE_END) {
ret.errno = EFAULT;
return ret;
}
ret.errno = ENOMEM;
char *mountpoint = alloc(strlen(umountpoint) + 1);
if (mountpoint == NULL) {
return ret;
}
char *fs = alloc(strlen(ufs) + 1);
if (fs == NULL) {
free(mountpoint);
return ret;
}
char *backing = NULL;
if (ubacking) {
backing = alloc(strlen(ubacking) + 1);
if (backing == NULL) {
free(mountpoint);
free(fs);
return ret;
}
strcpy(backing, ubacking);
}
strcpy(fs, ufs);
strcpy(mountpoint, umountpoint);
vnode_t *backingrefnode = NULL;
if (ubacking)
backingrefnode = *backing == '/' ? sched_getroot() : sched_getcwd();
vnode_t *mountpointrefnode = *mountpoint == '/' ? sched_getroot() : sched_getcwd();
vnode_t *backingnode = NULL;
if (ubacking) {
ret.errno = vfs_lookup(&backingnode, backingrefnode, backing, NULL, 0);
if (ret.errno)
goto cleanup;
}
ret.errno = vfs_mount(backingnode, mountpointrefnode, mountpoint, fs, data);
if (ubacking) {
VOP_RELEASE(backingnode);
}
cleanup:
if (ubacking) {
VOP_RELEASE(backingrefnode);
free(backing);
}
VOP_RELEASE(mountpointrefnode);
free(mountpoint);
free(fs);
return ret;
}
limine.cfg
+21 -2
View File
@@ -3,9 +3,28 @@ TERM_MARGIN_GRADIENT=40
TERM_WALLPAPER=boot:///liminebg.bmp
TERM_WALLPAPER_STYLE=stretched
TIMEOUT=5
:Astral
:Astral
PROTOCOL=limine
KERNEL_PATH=boot:///astral
KERNEL_CMDLINE=root=nvme0n1 rootfs=ext2
COMMENT="The Astral operating system"
:Astral (initrd)
PROTOCOL=limine
KERNEL_PATH=boot:///astral
MODULE_PATH=boot:///initrd
KERNEL_CMDLINE=
KERNEL_CMDLINE=initrd rootfs=tmpfs
COMMENT="The Astral operating system"
:Astral (debugging)
PROTOCOL=limine
KERNEL_PATH=boot:///astral
KERNEL_CMDLINE=root=nvme0n1 rootfs=ext2 e9 syscall_log
COMMENT="The Astral operating system"
:Astral (debugging, initrd)
KERNEL_PATH=boot:///astral
MODULE_PATH=boot:///initrd
KERNEL_CMDLINE=initrd rootfs=tmpfs e9 syscall_log
COMMENT="The Astral operating system"
patches/mlibc/jinx-working-patch.patch
+14 -6
View File
@@ -13,16 +13,18 @@ index bb5b6ef..bd2f740 100644
#define IPPROTO_HOPOPTS 0
#define IPPROTO_ICMP 1
diff --git mlibc-clean/meson.build mlibc-workdir/meson.build
index 2261926..03b6260 100644
index 2261926..b5e6108 100644
--- mlibc-clean/meson.build
+++ mlibc-workdir/meson.build
@@ -153,6 +153,10 @@ elif host_machine.system() == 'dripos'
@@ -153,6 +153,12 @@ elif host_machine.system() == 'dripos'
rtdl_include_dirs += include_directories('sysdeps/dripos/include')
libc_include_dirs += include_directories('sysdeps/dripos/include')
subdir('sysdeps/dripos')
+elif host_machine.system() == 'astral'
+ rtdl_include_dirs += include_directories('sysdeps/astral/include')
+ libc_include_dirs += include_directories('sysdeps/astral/include')
+ internal_conf.set10('MLIBC_MAP_DSO_SEGMENTS', true)
+ internal_conf.set10('MLIBC_MAP_FILE_WINDOWS', true)
+ subdir('sysdeps/astral')
else
error('No sysdeps defined for OS: ' + host_machine.system())
@@ -133,10 +135,10 @@ index 0000000..e5b087a
+
diff --git mlibc-workdir/sysdeps/astral/generic/generic.cpp mlibc-workdir/sysdeps/astral/generic/generic.cpp
new file mode 100644
index 0000000..f7b6375
index 0000000..23128c0
--- /dev/null
+++ mlibc-workdir/sysdeps/astral/generic/generic.cpp
@@ -0,0 +1,443 @@
@@ -0,0 +1,448 @@
+#include <bits/ensure.h>
+#include <mlibc/debug.hpp>
+#include <mlibc/all-sysdeps.hpp>
@@ -216,6 +218,11 @@ index 0000000..f7b6375
+ return 0;
+ }
+
+ int sys_mount(const char *source, const char *target, const char *fstype, unsigned long flags, const void *data) {
+ long ret;
+ return syscall(SYSCALL_MOUNT, &ret, (uint64_t)source, (uint64_t)target, (uint64_t)fstype, flags, (uint64_t)data);
+ }
+
+ int sys_ftruncate(int fd, size_t size) {
+ long ret;
+ return syscall(SYSCALL_FTRUNCATE, &ret, fd, size);
@@ -599,10 +606,10 @@ index 0000000..990eca0
+#endif
diff --git mlibc-workdir/sysdeps/astral/include/astral/syscall.h mlibc-workdir/sysdeps/astral/include/astral/syscall.h
new file mode 100644
index 0000000..76b4800
index 0000000..2fda766
--- /dev/null
+++ mlibc-workdir/sysdeps/astral/include/astral/syscall.h
@@ -0,0 +1,60 @@
@@ -0,0 +1,61 @@
+#ifndef _SYSCALL_H_INCLUDE
+#define _SYSCALL_H_INCLUDE
+
@@ -643,6 +650,7 @@ index 0000000..76b4800
+#define SYSCALL_POLL 34
+#define SYSCALL_NANOSLEEP 35
+#define SYSCALL_FTRUNCATE 36
+#define SYSCALL_MOUNT 37
+
+#include <stddef.h>
+#include <stdint.h>
recipes/mount
+18
View File
@@ -0,0 +1,18 @@
name=mount
revision=1
from_source=mount
imagedeps="base-devel"
hostdeps="xbinutils xgcc"
deps="mlibc"
configure() {
true
}
build() {
make -C ${source_dir} -j ${parallelism}
}
install() {
make -C ${source_dir} install PREFIX=${prefix} DESTDIR=${dest_dir}
}
source-recipes/mount
+7
View File
@@ -0,0 +1,7 @@
name=mount
version=0
source_dir="tools/mount"
regenerate() {
true
}
tools/mount/Makefile
+14
View File
@@ -0,0 +1,14 @@
.phony: all install
CC=x86_64-astral-gcc
LD=x86_64-astral-gcc
all: mount
install:
mkdir -p "$(DESTDIR)/$(PREFIX)/bin/"
cp mount "$(DESTDIR)/$(PREFIX)/bin/mount"
mount: main.o
$(LD) $(LDFLAGS) -o $@ $^
main.o: main.c
$(CC) -c $(CFLAGS) -o $@ $<
tools/mount/main.c
+44
View File
@@ -0,0 +1,44 @@
#include <sys/mount.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <string.h>
void usage(char *name) {
fprintf(stderr, "%s: usage: %s [-d device] mountpoint filesystem\n", name, name);
exit(EXIT_FAILURE);
}
int main(int argc, char *argv[]) {
char *dev = NULL;
char *mountp = NULL;
char *fs = NULL;
bool devnext = false;
for (int i = 1; i < argc; ++i) {
if (strcmp(argv[i], "-d") == 0) {
devnext = true;
continue;
}
if (devnext) {
devnext = false;
dev = argv[i];
} else if (mountp == NULL)
mountp = argv[i];
else if (fs == NULL)
fs = argv[i];
else
usage(argv[0]);
}
if (mount == NULL || fs == NULL)
usage(argv[0]);
if (mount(dev, mountp, fs, 0, NULL) == -1) {
perror("mount failed");
return EXIT_FAILURE;
}
return EXIT_SUCCESS;
}