[syscall] Update readv & writev from comments in MR #207

Signed-off-by: Jean-Pierre Miceli <jean-pierre.miceli@heig-vd.ch>

Author: jmi-reds

so3/arch/arm64/include/asm/syscall_number.h

@@ -71,7 +71,7 @@
 #define SYSCALL_MUTEX_LOCK 60
 #define SYSCALL_MUTEX_UNLOCK 61
 
-#define SYSCALL_READV 66
+#define SYSCALL_READV 65
 #define SYSCALL_WRITEV 66
 
 #define SYSCALL_NANOSLEEP 70

so3/devices/serial/pl011.c

@@ -119,7 +119,7 @@ static irq_return_t pl011_int(int irq, void *dummy)
 
 #ifdef CONFIG_IPC_SIGNAL
 					if (current()->pcb != NULL)
-						__do_kill(current()->pcb->pid, SIGINT);
+						sys_do_kill(current()->pcb->pid, SIGINT);
 #endif
 				}
 

so3/fs/elf.c

@@ -35,12 +35,12 @@ uint8_t *elf_load_buffer(const char *filename)
 	struct stat st;
 
 	/* open and read file */
-	fd = __do_open(filename, O_RDONLY);
+	fd = sys_do_open(filename, O_RDONLY);
 
 	if (fd < 0)
 		return NULL;
 
-	if (__do_stat(filename, &st))
+	if (sys_do_stat(filename, &st))
 		return NULL;
 
 	if (!st.st_size)
@@ -52,9 +52,9 @@ uint8_t *elf_load_buffer(const char *filename)
 		return NULL;
 	}
 
-	__do_read(fd, buffer, st.st_size);
+	sys_do_read(fd, buffer, st.st_size);
 
-	__do_close(fd);
+	sys_do_close(fd);
 
 	return buffer;
 }

so3/fs/vfs.c

@@ -467,43 +467,7 @@ static int do_write(int fd, const void *buffer, int count)
 
 SYSCALL_DEFINE3(read, int, fd, void *, buffer, int, count)
 {
-	int gfd;
-	int ret;
-
-	/* FIXME Max size of buffer */
-	if (!buffer || count < 0) {
-		LOG_ERROR("Invalid inputs\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&vfs_lock);
-
-	gfd = vfs_get_gfd(fd);
-
-	/* FIXME: As for now the do_read/do_open only
-	 * support regular file VFS_TYPE_FILE, VFS_TYPE_IO and pipes
-	 */
-	if (open_fds[gfd]->type == VFS_TYPE_DIR) {
-		mutex_unlock(&vfs_lock);
-		return -EISDIR;
-	}
-
-	if (!vfs_is_valid_gfd(gfd)) {
-		mutex_unlock(&vfs_lock);
-		return -EINVAL;
-	}
-
-	if (!open_fds[gfd]->fops->read) {
-		LOG_ERROR("No fops read\n");
-		mutex_unlock(&vfs_lock);
-		return -EBADF;
-	}
-
-	mutex_unlock(&vfs_lock);
-
-	ret = open_fds[gfd]->fops->read(gfd, buffer, count);
-
-	return ret;
+	return do_read(fd, buffer, count);
 }
 
 /**
@@ -705,7 +669,7 @@ SYSCALL_DEFINE2(dup2, int, oldfd, int, newfd)
 	}
 
 	if (vfs_get_gfd(oldfd) != vfs_get_gfd(newfd))
-		__do_close(newfd);
+		sys_do_close(newfd);
 
 	vfs_link_fd(newfd, vfs_get_gfd(oldfd));
 
@@ -885,17 +849,21 @@ SYSCALL_DEFINE3(writev, unsigned long, fd, const struct iovec *, vec, unsigned l
 
 	for (i = 0; i < vlen; i++) {
 		ret = do_write(fd, (const void *)vec[i].iov_base, vec[i].iov_len);
+		ret = do_read(fd, vec[i].iov_base, vec[i].iov_len);
 		if (ret < 0) {
-			/* Error on the fist loop --> return error code */
-			if (i == 0)
-				total = -1;
+			break;
+		} else if ((ret >= 0) && (ret < vec[i].iov_len)) {
+			total += ret;
 			break;
 		}
 
 		total += ret;
 	}
 
-	return total;
+	if (total == 0)
+		return ret;
+	else
+		return total;
 }
 
 SYSCALL_DEFINE3(readv, unsigned long, fd, const struct iovec *, vec,
@@ -908,16 +876,19 @@ SYSCALL_DEFINE3(readv, unsigned long, fd, const struct iovec *, vec,
 	for (i = 0; i < vlen; i++) {
 		ret = do_read(fd, vec[i].iov_base, vec[i].iov_len);
 		if (ret < 0) {
-			/* Error on the fist loop --> return error code */
-			if (i == 0)
-				total = -1;
+			break;
+		} else if ((ret >= 0) && (ret < vec[i].iov_len)) {
+			total += ret;
 			break;
 		}
 
 		total += ret;
 	}
 
-	return total;
+	if (total == 0)
+		return ret;
+	else
+		return total;
 }
 
 static void vfs_gfd_init(void)

so3/include/net/lwip/sockets.h

@@ -123,12 +123,12 @@ typedef u32_t socklen_t;
 #error "IOV_MAX larger than supported by LwIP"
 #endif /* IOV_MAX */
 
-// #if !defined(iovec)
-// struct iovec {
-// 	void *iov_base;
-// 	size_t iov_len;
-// };
-// #endif
+#if !defined(iovec)
+struct iovec {
+	void *iov_base;
+	size_t iov_len;
+};
+#endif
 
 typedef int msg_iovlen_t;
 

so3/include/syscall.h

@@ -84,20 +84,20 @@
  * __sys_SYSCALL_NAME taking syscall_args_t as arguments allowing for
  * a common interface between all syscall to put them in an array.
  *
- * do_SYSCALL_NAME actual function with the syscall implementation with
+ * sys_do_SYSCALL_NAME actual function with the syscall implementation with
  * arguments define like a normal function. That function is automatically
  * called by __sys_SYCALL_NAME with the correct argument number and cast.
  */
 #define SYSCALL_DECLARE(name, ...)               \
 	long __sys_##name(syscall_args_t *args); \
-	inline long __do_##name(__VA_ARGS__);
+	inline long sys_do_##name(__VA_ARGS__);
 
 #define SYSCALL_DEFINE0(name)                     \
 	long __sys_##name(syscall_args_t *unused) \
 	{                                         \
-		return __do_##name();               \
+		return sys_do_##name();               \
 	}                                         \
-	inline long __do_##name(void)
+	inline long sys_do_##name(void)
 #define SYSCALL_DEFINE1(...) __SYSCALL_DEFINEx(1, __VA_ARGS__)
 #define SYSCALL_DEFINE2(...) __SYSCALL_DEFINEx(2, __VA_ARGS__)
 #define SYSCALL_DEFINE3(...) __SYSCALL_DEFINEx(3, __VA_ARGS__)
@@ -108,9 +108,9 @@
 #define __SYSCALL_DEFINEx(x, name, ...)                                   \
 	long __sys_##name(syscall_args_t *args)                           \
 	{                                                                 \
-		return __do_##name(__MAP_ARGS(x, args->args, __VA_ARGS__)); \
+		return sys_do_##name(__MAP_ARGS(x, args->args, __VA_ARGS__)); \
 	}                                                                 \
-	inline long __do_##name(__MAP(x, __M_DECL, __VA_ARGS__))
+	inline long sys_do_##name(__MAP(x, __M_DECL, __VA_ARGS__))
 
 typedef struct {
 	unsigned long args[6];

so3/include/vfs.h

@@ -108,6 +108,9 @@ struct iovec {
 	size_t iov_len;
 };
 
+#define iovec iovec
+
+
 struct file_operations {
 	int (*open)(int fd, const char *path);
 	int (*close)(int fd);

so3/kernel/process.c

@@ -925,7 +925,7 @@ SYSCALL_DEFINE1(exit, int, exit_status)
          * locking in the low layers. */
 
 	for (i = 0; i < FD_MAX; i++)
-		__do_close(i);
+		sys_do_close(i);
 
 	local_irq_disable();
 
@@ -944,7 +944,7 @@ SYSCALL_DEFINE1(exit, int, exit_status)
 #ifdef CONFIG_IPC_SIGNAL
 
 	/* Send the SIGCHLD signal to the parent */
-	__do_kill(pcb->parent->pid, SIGCHLD);
+	sys_do_kill(pcb->parent->pid, SIGCHLD);
 
 #endif /* CONFIG_IPC_SIGNAL */
 

so3/kernel/syscalls.c

@@ -60,6 +60,7 @@ static const syscall_fn_t syscall_table[NR_SYSCALLS] = {
 	[SYSCALL_IOCTL] = __sys_ioctl,
 	[SYSCALL_FCNTL] = __sys_fcntl,
 	[SYSCALL_LSEEK] = __sys_lseek,
+	[SYSCALL_READV] = __sys_readv,
 	[SYSCALL_WRITEV] = __sys_writev,
 #ifdef CONFIG_IPC_PIPE
 	[SYSCALL_PIPE] = __sys_pipe,

so3/kernel/thread.c

@@ -272,7 +272,7 @@ void thread_exit(int *exit_status)
 		remove_tcb_from_pcb(current());
 
 #ifdef CONFIG_PROC_ENV
-		__do_exit(0);
+		sys_do_exit(0);
 #endif
 
 	} else {