From eb5d1c92c4e79c04a9d2e0027728e1378ba61f49 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Wed, 24 Apr 2024 19:51:31 -0400 Subject: kernel: Add ioctl support Signed-off-by: Ian Moffett --- lib/libc/include/sys/syscall.h | 1 + sys/include/sys/device.h | 1 + sys/include/sys/syscall.h | 1 + sys/include/sys/system.h | 2 ++ sys/kern/kern_ioctl.c | 72 ++++++++++++++++++++++++++++++++++++++++++ sys/kern/kern_syscall.c | 4 ++- 6 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 sys/kern/kern_ioctl.c diff --git a/lib/libc/include/sys/syscall.h b/lib/libc/include/sys/syscall.h index e0900c7..afa4961 100644 --- a/lib/libc/include/sys/syscall.h +++ b/lib/libc/include/sys/syscall.h @@ -42,6 +42,7 @@ #define SYS_lseek 6 #define SYS_mmap 7 #define SYS_munmap 8 +#define SYS_ioctl 9 #if !defined(__ASSEMBLER__) __attribute__((__always_inline__)) diff --git a/sys/include/sys/device.h b/sys/include/sys/device.h index a3ce983..9851ee2 100644 --- a/sys/include/sys/device.h +++ b/sys/include/sys/device.h @@ -41,6 +41,7 @@ struct device { size_t blocksize; int(*write)(struct device *dev, struct sio_txn *sio); int(*read)(struct device *dev, struct sio_txn *sio); + int(*ioctl)(struct device *dev, uint32_t cmd, uintptr_t arg); paddr_t(*mmap)(struct device *dev, off_t off, vm_prot_t prot); TAILQ_ENTRY(device) link; }; diff --git a/sys/include/sys/syscall.h b/sys/include/sys/syscall.h index 59b6036..0f5abf0 100644 --- a/sys/include/sys/syscall.h +++ b/sys/include/sys/syscall.h @@ -45,6 +45,7 @@ enum { SYS_lseek, SYS_mmap, SYS_munmap, + SYS_ioctl, __MAX_SYSCALLS }; diff --git a/sys/include/sys/system.h b/sys/include/sys/system.h index c2e47c2..03ac710 100644 --- a/sys/include/sys/system.h +++ b/sys/include/sys/system.h @@ -31,11 +31,13 @@ #define _SYS_SYSTEM_H_ #include +#include #if defined(_KERNEL) int copyin(uintptr_t uaddr, void *kaddr, size_t len); int copyout(const void *kaddr, uintptr_t uaddr, size_t len); int copyinstr(uintptr_t uaddr, char *kaddr, size_t len); +uint64_t sys_ioctl(struct syscall_args *args); #endif #endif /* !_SYS_SYSTEM_H_ */ diff --git a/sys/kern/kern_ioctl.c b/sys/kern/kern_ioctl.c new file mode 100644 index 0000000..4b81983 --- /dev/null +++ b/sys/kern/kern_ioctl.c @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include + +static int +do_ioctl(int fd, uint32_t cmd, uintptr_t arg) +{ + struct proc *td = this_td(); + struct filedesc *filedes; + struct vnode *vp; + struct device *dev; + int status; + + filedes = fd_from_fdnum(td, fd); + + /* Fetch the vnode */ + if (filedes == NULL) + return -EBADF; + if ((vp = filedes->vnode) == NULL) + return -EIO; + + if ((status = devfs_get_dev(vp, &dev)) != 0) + return status; + if (dev->ioctl == NULL) + return -EIO; + + return dev->ioctl(dev, cmd, arg); +} + +/* + * Arg0: Fd. + * Arg1: Cmd. + * Arg2: Arg. + */ +uint64_t +sys_ioctl(struct syscall_args *args) +{ + return do_ioctl(args->arg0, args->arg1, args->arg2); +} diff --git a/sys/kern/kern_syscall.c b/sys/kern/kern_syscall.c index b4a86f3..e892c39 100644 --- a/sys/kern/kern_syscall.c +++ b/sys/kern/kern_syscall.c @@ -32,6 +32,7 @@ #include #include #include +#include #include __noreturn static uint64_t @@ -49,5 +50,6 @@ uint64_t(*g_syscall_table[__MAX_SYSCALLS])(struct syscall_args *args) = { sys_read, sys_lseek, sys_mmap, - sys_munmap + sys_munmap, + sys_ioctl, }; -- cgit v1.2.3