summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/sys/arch/amd64/cpu/trap.c24
-rw-r--r--src/sys/fs/tmpfs.c1
-rw-r--r--src/sys/include/compat/unix/syscall.h5
-rw-r--r--src/sys/include/os/vnode.h2
-rw-r--r--src/sys/include/sys/socket.h83
-rw-r--r--src/sys/include/sys/syscall.h2
-rw-r--r--src/sys/io/ic/ahci.c28
-rw-r--r--src/sys/os/os_iotap.c3
-rw-r--r--src/sys/os/os_socket.c256
9 files changed, 388 insertions, 16 deletions
diff --git a/src/sys/arch/amd64/cpu/trap.c b/src/sys/arch/amd64/cpu/trap.c
index ae3a0cc..94c6e83 100644
--- a/src/sys/arch/amd64/cpu/trap.c
+++ b/src/sys/arch/amd64/cpu/trap.c
@@ -34,6 +34,7 @@
#include <sys/param.h>
#include <sys/cdefs.h>
+#include <sys/errno.h>
#include <sys/panic.h>
#include <sys/cpuvar.h>
#include <sys/syslog.h>
@@ -148,6 +149,26 @@ trapframe_dump(struct trapframe *tf)
tf->rbp, tf->rsp, tf->rip);
}
+/*
+ * Handle user faults
+ */
+static void
+handle_ufault(void)
+{
+ struct proc *self = proc_self();
+
+ if (__unlikely(self == NULL)) {
+ panic("could not get self on fault\n");
+ }
+
+ syslog_toggle(true);
+ printf("** hardware violation **\n");
+ syslog_toggle(false);
+
+ proc_kill(self, -EFAULT);
+ __builtin_unreachable();
+}
+
void
trap_syscall(struct trapframe *tf)
{
@@ -194,7 +215,8 @@ trap_handler(struct trapframe *tf)
{
trapframe_dump(tf);
if (ISSET(tf->cs, 3)) {
- panic("fatal user trap\n");
+ handle_ufault();
+ __builtin_unreachable();
}
panic("fatal trap\n");
diff --git a/src/sys/fs/tmpfs.c b/src/sys/fs/tmpfs.c
index 9046002..3048fb4 100644
--- a/src/sys/fs/tmpfs.c
+++ b/src/sys/fs/tmpfs.c
@@ -203,6 +203,7 @@ tmpfs_create(struct vop_create_args *args)
/* Only accept the types we support */
switch (args->vtype) {
case VTYPE_FILE:
+ case VTYPE_SOCK:
break;
default:
return -ENOTSUP;
diff --git a/src/sys/include/compat/unix/syscall.h b/src/sys/include/compat/unix/syscall.h
index 42dc4c0..38419af 100644
--- a/src/sys/include/compat/unix/syscall.h
+++ b/src/sys/include/compat/unix/syscall.h
@@ -31,6 +31,7 @@
#define _UNIX_SYSCALL_H_ 1
#include <sys/proc.h>
+#include <sys/socket.h>
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/syscall.h>
@@ -95,7 +96,9 @@ scret_t(*g_unix_sctab[])(struct syscall_args *) = {
[SYS_dmsio] = sys_dmsio,
[SYS_read] = sys_read,
[SYS_close] = sys_close,
- [SYS_lseek] = sys_lseek
+ [SYS_lseek] = sys_lseek,
+ [SYS_socket] = sys_socket,
+ [SYS_listen] = sys_listen
};
#endif /* !_NEED_UNIX_SCTAB */
diff --git a/src/sys/include/os/vnode.h b/src/sys/include/os/vnode.h
index 31cfb0c..8cdcded 100644
--- a/src/sys/include/os/vnode.h
+++ b/src/sys/include/os/vnode.h
@@ -44,12 +44,14 @@ struct vop;
* @VTYPE_NONE: Vnode is yet to be assigned a type
* @VTYPE_FILE: Vnode references a file
* @VTYPE_DIR: Vnode references a directory
+ * @VTYPE_SOCK: Vnode references a socket
* @__N_VTYPE: Number of valid nodes on the system
*/
typedef enum {
VTYPE_NONE,
VTYPE_FILE,
VTYPE_DIR,
+ VTYPE_SOCK,
__N_VTYPE
} vtype_t;
diff --git a/src/sys/include/sys/socket.h b/src/sys/include/sys/socket.h
new file mode 100644
index 0000000..0ca041f
--- /dev/null
+++ b/src/sys/include/sys/socket.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2025 Ian Marco Moffett and L5 engineers
+ * 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 the project 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.
+ */
+
+#ifndef _SYS_SOCKET_H_
+#define _SYS_SOCKET_H_ 1
+
+#include <sys/types.h>
+#include <sys/syscall.h>
+
+/* Address family defines */
+#define AF_UNIX 0x00 /* Local comms / IPC */
+#define AF_LOCAL AF_UNIX /* AF_UNIX alias */
+
+/* Socket type defines */
+#define SOCK_STREAM 0x00
+#define SOCK_DGRAM 0x01
+
+/*
+ * Get a socket as a file descriptor
+ *
+ * @domain: Socket domain (AF_*)
+ * @type: Socket type SOCK_*
+ *
+ * Returns file descriptor on success, otherwise
+ * a less than zero value on failure
+ */
+int socket(int domain, int type, int protocol);
+
+/*
+ * @socket: Socket to listen on
+ * @backlog: Max connections
+ */
+int listen(int socket, int backlog);
+
+#if defined(_KERNEL)
+
+/*
+ * Kernel representation of a socket
+ *
+ * @backlog: Maximum connections (< 0 means socket not active)
+ */
+struct ksocket {
+ int backlog;
+};
+
+/*
+ * Socket syscall
+ */
+scret_t sys_socket(struct syscall_args *scargs);
+
+/*
+ * Listen syscall
+ */
+scret_t sys_listen(struct syscall_args *scargs);
+
+#endif /* _KERNEL */
+#endif /* !_SYS_SOCKET_H_ */
diff --git a/src/sys/include/sys/syscall.h b/src/sys/include/sys/syscall.h
index c97d5ea..2ca712f 100644
--- a/src/sys/include/sys/syscall.h
+++ b/src/sys/include/sys/syscall.h
@@ -59,6 +59,8 @@
#define SYS_read 0x0E /* read a file descriptor */
#define SYS_close 0x0F /* close a file */
#define SYS_lseek 0x10 /* seek to end of file */
+#define SYS_socket 0x11 /* get a socket fd */
+#define SYS_listen 0x12 /* listen on a socket */
typedef __ssize_t scret_t;
typedef __ssize_t scarg_t;
diff --git a/src/sys/io/ic/ahci.c b/src/sys/io/ic/ahci.c
index 383e531..f4b38d2 100644
--- a/src/sys/io/ic/ahci.c
+++ b/src/sys/io/ic/ahci.c
@@ -665,6 +665,7 @@ ahci_init_port(struct ahci_hba *hba, struct ahci_port *port)
const uint16_t BSIZE = 512;
volatile struct hba_port *regs;
struct ahci_cmd_hdr *cmdlist;
+ struct ahci_port *port_cpy;
uint32_t cmd, lo, hi;
size_t clen;
paddr_t pa;
@@ -718,8 +719,14 @@ ahci_init_port(struct ahci_hba *hba, struct ahci_port *port)
return error;
}
- TAILQ_INSERT_TAIL(&portlist, port, link);
- ahci_identify(hba, port);
+ port_cpy = kalloc(sizeof(*port_cpy));
+ if (port_cpy == NULL) {
+ return -ENOMEM;
+ }
+
+ memcpy(port_cpy, port, sizeof(*port_cpy));
+ TAILQ_INSERT_TAIL(&portlist, port_cpy, link);
+ ahci_identify(hba, port_cpy);
return 0;
}
@@ -730,7 +737,7 @@ static int
ahci_init_ports(struct ahci_hba *hba)
{
volatile struct hba_memspace *io = hba->io;
- struct ahci_port *port;
+ struct ahci_port port;
uint32_t pi, nbits;
int error;
@@ -743,20 +750,13 @@ ahci_init_ports(struct ahci_hba *hba)
/* Allocate a new port descriptor */
dtrace("port %d implemented\n", i);
- port = kalloc(sizeof(*port));
- if (port == NULL) {
- dtrace("failed to allocate port\n");
- continue;
- }
-
- port->io = &io->ports[i];
- port->portno = i;
- port->parent = hba;
+ port.io = &io->ports[i];
+ port.portno = i;
+ port.parent = hba;
/* Initialize the port */
- error = ahci_init_port(hba, port);
+ error = ahci_init_port(hba, &port);
if (error < 0) {
- ahci_port_detach(port);
dtrace("port init failed (error=%d)\n", error);
continue;
}
diff --git a/src/sys/os/os_iotap.c b/src/sys/os/os_iotap.c
index 238acfe..54d1157 100644
--- a/src/sys/os/os_iotap.c
+++ b/src/sys/os/os_iotap.c
@@ -130,6 +130,9 @@ iotap_mux(const char *name, struct iotap_msg *msg)
ops = desc.ops;
switch (msg->opcode) {
case IOTAP_OPC_READ:
+ if (ops->read == NULL) {
+ return -ENOTSUP;
+ }
return ops->read(&desc, msg->buf, msg->len);
}
diff --git a/src/sys/os/os_socket.c b/src/sys/os/os_socket.c
new file mode 100644
index 0000000..a37d15f
--- /dev/null
+++ b/src/sys/os/os_socket.c
@@ -0,0 +1,256 @@
+/*
+ * Copyright (c) 2025 Ian Marco Moffett and L5 engineers
+ * 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 the project 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 <sys/socket.h>
+#include <sys/mount.h>
+#include <sys/syslog.h>
+#include <sys/errno.h>
+#include <sys/proc.h>
+#include <os/vnode.h>
+#include <os/kalloc.h>
+#include <os/filedesc.h>
+#include <string.h>
+
+static size_t next_sockid = 1;
+
+/*
+ * Allocate a socket file descriptor
+ *
+ * @fdp_res: Result is written here
+ *
+ * XXX: Socket vnodes are never deallocated until explicitly
+ * closed
+ *
+ * Returns file descriptor on success, otherwise a
+ * less than zero value on faulure
+ */
+static int
+get_sock_fd(struct filedesc **fdp_res)
+{
+ char namebuf[256];
+ struct ksocket *sock;
+ struct mount *mp;
+ struct nameidata nd;
+ struct filedesc *fdp;
+ struct proc *self = proc_self();
+ struct vnode *vp;
+ int error;
+
+ if (fdp_res == NULL) {
+ return -EINVAL;
+ }
+
+ if (self == NULL) {
+ return -EIO;
+ }
+
+ error = mount_lookup("/tmp", &mp);
+ if (error < 0) {
+ printf("socket: could not get /tmp mountpoint\n");
+ return error;
+ }
+
+ error = fd_alloc(self, &fdp);
+ if (error < 0) {
+ printf("socket: could not allocate fd\n");
+ return error;
+ }
+
+ sock = kalloc(sizeof(*sock));
+ if (sock == NULL) {
+ fd_close(fdp->fdno);
+ return -EINVAL;
+ }
+
+ /* Format the name */
+ snprintf(
+ namebuf,
+ sizeof(namebuf),
+ "sock.%d",
+ next_sockid++
+ );
+
+ /* Allocate a persistent vnode */
+ error = vfs_valloc(&vp, VTYPE_SOCK, 0);
+ if (error < 0) {
+ printf("socket: could not allocate vnode\n");
+ fd_close(fdp->fdno);
+ kfree(sock);
+ return error;
+ }
+
+ /* Create the backing file */
+ nd.path = namebuf;
+ error = vop_create(mp->vp, &nd, VTYPE_SOCK);
+ if (error < 0) {
+ printf("socket: failed to create /tmp entry\n");
+ fd_close(fdp->fdno);
+ kfree(sock);
+ return error;
+ }
+
+ /* Mark the socket as inactive */
+ memset(sock, 0, sizeof(*sock));
+ sock->backlog = -1;
+
+ fdp->vp = vp;
+ vp->data = sock;
+ printf("socket: socket created @ /tmp/%s\n", namebuf);
+ return fdp->fdno;
+}
+
+/*
+ * Get a socket descriptor from a fd
+ *
+ * @fd: File descriptor to look up
+ * @sock_res: Result pointer is written here
+ *
+ * Returns zero on success, otherwise a less
+ * than zero value on failure
+ */
+static int
+get_sock(int fd, struct ksocket **sock_res)
+{
+ struct filedesc *fdp;
+ struct proc *self = proc_self();
+ struct vnode *vp;
+
+ if (fd < 0) {
+ return -EBADF;
+ }
+
+ if (sock_res == NULL) {
+ return -1;
+ }
+
+ if (self == NULL) {
+ return -EINVAL;
+ }
+
+ /* Get the file descriptor */
+ fdp = fd_get(
+ self,
+ fd
+ );
+
+ if (fdp == NULL) {
+ return -EBADF;
+ }
+
+ /* We need the vnode */
+ if ((vp = fdp->vp) == NULL) {
+ return -EIO;
+ }
+
+ *sock_res = vp->data;
+ return 0;
+}
+
+/*
+ * Any backlog value > 0 marks the socket
+ * as accepting connections
+ */
+int
+listen(int socket, int backlog)
+{
+ struct ksocket *ksock = NULL;
+ int error;
+
+ if (socket < 0) {
+ return -EBADF;
+ }
+
+ if (backlog < 0) {
+ backlog = 0;
+ }
+
+ error = get_sock(socket, &ksock);
+ if (error < 0) {
+ printf("listen: failed to get socket descriptor\n");
+ return error;
+ }
+
+ /* Set the backlog */
+ ksock->backlog = backlog;
+ return 0;
+}
+
+/*
+ * Handles the AF_UNIX domain
+ */
+static int
+af_unix(int type, int protocol)
+{
+ struct filedesc *desc;
+
+ return get_sock_fd(&desc);
+}
+
+int
+socket(int domain, int type, int protocol)
+{
+ if (domain < 0 || type < 0) {
+ return -EINVAL;
+ }
+
+ switch (domain) {
+ case AF_UNIX:
+ return af_unix(type, protocol);
+ }
+
+ return -1;
+}
+
+/*
+ * ARG0: Domain
+ * ARG1: Type
+ * ARG2: Protocol
+ */
+scret_t
+sys_socket(struct syscall_args *scargs)
+{
+ int domain = SCARG(scargs, int, 0);
+ int type = SCARG(scargs, int, 1);
+ int protocol = SCARG(scargs, int, 2);
+
+ return socket(domain, type, protocol);
+}
+
+/*
+ * ARG0: Socket fd
+ * @backlog: Maximum connections
+ */
+scret_t
+sys_listen(struct syscall_args *scargs)
+{
+ int sockfd = SCARG(scargs, int, 0);
+ int backlog = SCARG(scargs, int, 1);
+
+ return listen(sockfd, backlog);
+}
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-19 14:39:14 +0000