net: introduce system calls for zsock socket APIs

Add system calls for the zsock implementations of socket,
close, bind, connect, listen, accept, sendto, recvfrom,
fcntl, poll, inet_pton, and getaddrinfo.

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>

Author: Andrew Boie

include/net/socket.h

@@ -106,25 +106,57 @@ struct zsock_addrinfo {
 	char _ai_canonname[DNS_MAX_NAME_SIZE + 1];
 };
 
-int zsock_socket(int family, int type, int proto);
-int zsock_close(int sock);
-int zsock_bind(int sock, const struct sockaddr *addr, socklen_t addrlen);
-int zsock_connect(int sock, const struct sockaddr *addr, socklen_t addrlen);
-int zsock_listen(int sock, int backlog);
-int zsock_accept(int sock, struct sockaddr *addr, socklen_t *addrlen);
-ssize_t zsock_send(int sock, const void *buf, size_t len, int flags);
-ssize_t zsock_recv(int sock, void *buf, size_t max_len, int flags);
-ssize_t zsock_sendto(int sock, const void *buf, size_t len, int flags,
-		     const struct sockaddr *dest_addr, socklen_t addrlen);
-ssize_t zsock_recvfrom(int sock, void *buf, size_t max_len, int flags,
-		       struct sockaddr *src_addr, socklen_t *addrlen);
-int zsock_fcntl(int sock, int cmd, int flags);
-int zsock_poll(struct zsock_pollfd *fds, int nfds, int timeout);
+__syscall int zsock_socket(int family, int type, int proto);
+
+__syscall int zsock_close(int sock);
+
+__syscall int zsock_bind(int sock, const struct sockaddr *addr,
+			 socklen_t addrlen);
+
+__syscall int zsock_connect(int sock, const struct sockaddr *addr,
+			    socklen_t addrlen);
+
+__syscall int zsock_listen(int sock, int backlog);
+
+__syscall int zsock_accept(int sock, struct sockaddr *addr, socklen_t *addrlen);
+
+__syscall ssize_t zsock_sendto(int sock, const void *buf, size_t len,
+			       int flags, const struct sockaddr *dest_addr,
+			       socklen_t addrlen);
+
+static inline ssize_t zsock_send(int sock, const void *buf, size_t len,
+				 int flags)
+{
+	return zsock_sendto(sock, buf, len, flags, NULL, 0);
+}
+
+__syscall ssize_t zsock_recvfrom(int sock, void *buf, size_t max_len,
+				 int flags, struct sockaddr *src_addr,
+				 socklen_t *addrlen);
+
+static inline ssize_t zsock_recv(int sock, void *buf, size_t max_len,
+				 int flags)
+{
+	return zsock_recvfrom(sock, buf, max_len, flags, NULL, NULL);
+}
+
+__syscall int zsock_fcntl(int sock, int cmd, int flags);
+
+__syscall int zsock_poll(struct zsock_pollfd *fds, int nfds, int timeout);
+
 int zsock_getsockopt(int sock, int level, int optname,
 		     void *optval, socklen_t *optlen);
+
 int zsock_setsockopt(int sock, int level, int optname,
 		     const void *optval, socklen_t optlen);
-int zsock_inet_pton(sa_family_t family, const char *src, void *dst);
+
+__syscall int zsock_inet_pton(sa_family_t family, const char *src, void *dst);
+
+__syscall int z_zsock_getaddrinfo_internal(const char *host,
+					   const char *service,
+					   const struct zsock_addrinfo *hints,
+					   struct zsock_addrinfo *res);
+
 int zsock_getaddrinfo(const char *host, const char *service,
 		      const struct zsock_addrinfo *hints,
 		      struct zsock_addrinfo **res);
@@ -325,6 +357,8 @@ static inline void freeaddrinfo(struct zsock_addrinfo *ai)
 }
 #endif
 
+#include <syscalls/socket.h>
+
 /**
  * @}
  */

subsys/net/lib/sockets/getaddrinfo.c

@@ -15,6 +15,7 @@
 /* Zephyr headers */
 #include <kernel.h>
 #include <net/socket.h>
+#include <syscall_handler.h>
 
 #define AI_ARR_MAX	2
 
@@ -81,9 +82,9 @@ static void dns_resolve_cb(enum dns_resolve_status status,
 }
 
 
-static int zsock_getaddrinfo_internal(const char *host, const char *service,
-				      const struct zsock_addrinfo *hints,
-				      struct zsock_addrinfo *res)
+int _impl_z_zsock_getaddrinfo_internal(const char *host, const char *service,
+				       const struct zsock_addrinfo *hints,
+				       struct zsock_addrinfo *res)
 {
 	int family = AF_UNSPEC;
 	long int port = 0;
@@ -164,6 +165,46 @@ static int zsock_getaddrinfo_internal(const char *host, const char *service,
 	return 0;
 }
 
+#ifdef CONFIG_USERSPACE
+Z_SYSCALL_HANDLER(z_zsock_getaddrinfo_internal, host, service, hints, res)
+{
+	struct zsock_addrinfo hints_copy;
+	char *host_copy = NULL, *service_copy = NULL;
+	u32_t ret;
+
+	if (hints) {
+		Z_OOPS(z_user_from_copy(&hints_copy, (void *)hints,
+					sizeof(hints_copy)));
+	}
+	Z_OOPS(Z_SYSCALL_MEMORY_ARRAY_WRITE(res, AI_ARR_MAX,
+					    sizeof(struct zsock_addrinfo)));
+
+	if (service) {
+		service_copy = z_user_string_alloc_copy((char *)service, 64);
+		if (!service_copy) {
+			ret = DNS_EAI_MEMORY;
+			goto out;
+		}
+	}
+
+	if (host) {
+		host_copy = z_user_string_alloc_copy((char *)host, 64);
+		if (!host_copy) {
+			ret = DNS_EAI_MEMORY;
+			goto out;
+		}
+	}
+
+	ret = _impl_z_zsock_getaddrinfo_internal(host_copy, service_copy,
+						 hints ? &hints_copy : NULL,
+						 (struct zsock_addrinfo *)res);
+out:
+	k_free(service_copy);
+	k_free(host_copy);
+
+	return ret;
+}
+#endif /* CONFIG_USERSPACE */
 
 int zsock_getaddrinfo(const char *host, const char *service,
 		      const struct zsock_addrinfo *hints,
@@ -175,7 +216,7 @@ int zsock_getaddrinfo(const char *host, const char *service,
 	if (!(*res)) {
 		return DNS_EAI_MEMORY;
 	}
-	ret = zsock_getaddrinfo_internal(host, service, hints, *res);
+	ret = z_zsock_getaddrinfo_internal(host, service, hints, *res);
 	if (ret) {
 		free(*res);
 		*res = NULL;