From owner-svn-src-head@freebsd.org Sat Jun 27 14:42:09 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9C987352E59; Sat, 27 Jun 2020 14:42:09 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49vGg53jxFz41Rq; Sat, 27 Jun 2020 14:42:09 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7B08626D42; Sat, 27 Jun 2020 14:42:09 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05REg9lC085649; Sat, 27 Jun 2020 14:42:09 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05REg8dD085642; Sat, 27 Jun 2020 14:42:08 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <202006271442.05REg8dD085642@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sat, 27 Jun 2020 14:42:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r362692 - in head/sys: amd64/linux amd64/linux32 arm64/linux i386/linux X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: in head/sys: amd64/linux amd64/linux32 arm64/linux i386/linux X-SVN-Commit-Revision: 362692 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2020 14:42:09 -0000 Author: trasz Date: Sat Jun 27 14:42:08 2020 New Revision: 362692 URL: https://svnweb.freebsd.org/changeset/base/362692 Log: Add proper types for linux message queue syscalls; mostly taken from 32-bit Linuxulator. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D25386 Modified: head/sys/amd64/linux/syscalls.master head/sys/amd64/linux32/syscalls.master head/sys/arm64/linux/linux.h head/sys/arm64/linux/syscalls.master head/sys/i386/linux/syscalls.master Modified: head/sys/amd64/linux/syscalls.master ============================================================================== --- head/sys/amd64/linux/syscalls.master Sat Jun 27 14:39:44 2020 (r362691) +++ head/sys/amd64/linux/syscalls.master Sat Jun 27 14:42:08 2020 (r362692) @@ -1394,22 +1394,48 @@ int linux_get_mempolicy(void); } 240 AUE_NULL STD { - int linux_mq_open(void); + int linux_mq_open( + const char *name, + l_int oflag, + l_mode_t mode, + struct mq_attr *attr + ); } 241 AUE_NULL STD { - int linux_mq_unlink(void); + int linux_mq_unlink( + const char *name + ); } 242 AUE_NULL STD { - int linux_mq_timedsend(void); + int linux_mq_timedsend( + l_mqd_t mqd, + const char *msg_ptr, + l_size_t msg_len, + l_uint msg_prio, + const struct l_timespec *abs_timeout + ); } 243 AUE_NULL STD { - int linux_mq_timedreceive(void); + int linux_mq_timedreceive( + l_mqd_t mqd, + char *msg_ptr, + l_size_t msg_len, + l_uint *msg_prio, + const struct l_timespec *abs_timeout + ); } 244 AUE_NULL STD { - int linux_mq_notify(void); + int linux_mq_notify( + l_mqd_t mqd, + const struct l_timespec *abs_timeout + ); } 245 AUE_NULL STD { - int linux_mq_getsetattr(void); + int linux_mq_getsetattr( + l_mqd_t mqd, + const struct mq_attr *attr, + struct mq_attr *oattr + ); } 246 AUE_NULL STD { int linux_kexec_load(void); Modified: head/sys/amd64/linux32/syscalls.master ============================================================================== --- head/sys/amd64/linux32/syscalls.master Sat Jun 27 14:39:44 2020 (r362691) +++ head/sys/amd64/linux32/syscalls.master Sat Jun 27 14:42:08 2020 (r362692) @@ -1508,22 +1508,48 @@ } ; Linux 2.6.6: 277 AUE_NULL STD { - int linux_mq_open(void); + int linux_mq_open( + const char *name, + l_int oflag, + l_mode_t mode, + struct mq_attr *attr + ); } 278 AUE_NULL STD { - int linux_mq_unlink(void); + int linux_mq_unlink( + const char *name + ); } 279 AUE_NULL STD { - int linux_mq_timedsend(void); + int linux_mq_timedsend( + l_mqd_t mqd, + const char *msg_ptr, + l_size_t msg_len, + l_uint msg_prio, + const struct l_timespec *abs_timeout + ); } 280 AUE_NULL STD { - int linux_mq_timedreceive(void); + int linux_mq_timedreceive( + l_mqd_t mqd, + char *msg_ptr, + l_size_t msg_len, + l_uint *msg_prio, + const struct l_timespec *abs_timeout + ); } 281 AUE_NULL STD { - int linux_mq_notify(void); + int linux_mq_notify( + l_mqd_t mqd, + const struct l_timespec *abs_timeout + ); } 282 AUE_NULL STD { - int linux_mq_getsetattr(void); + int linux_mq_getsetattr( + l_mqd_t mqd, + const struct mq_attr *attr, + struct mq_attr *oattr + ); } 283 AUE_NULL STD { int linux_kexec_load(void); Modified: head/sys/arm64/linux/linux.h ============================================================================== --- head/sys/arm64/linux/linux.h Sat Jun 27 14:39:44 2020 (r362691) +++ head/sys/arm64/linux/linux.h Sat Jun 27 14:42:08 2020 (r362692) @@ -64,6 +64,7 @@ typedef l_ulong l_size_t; typedef l_long l_suseconds_t; typedef l_long l_time_t; typedef l_int l_timer_t; /* XXX */ +typedef l_int l_mqd_t; typedef l_ulong l_fd_mask; typedef struct { Modified: head/sys/arm64/linux/syscalls.master ============================================================================== --- head/sys/arm64/linux/syscalls.master Sat Jun 27 14:39:44 2020 (r362691) +++ head/sys/arm64/linux/syscalls.master Sat Jun 27 14:42:08 2020 (r362692) @@ -1040,22 +1040,48 @@ ); } 180 AUE_NULL STD { - int linux_mq_open(void); + int linux_mq_open( + const char *name, + l_int oflag, + l_mode_t mode, + struct mq_attr *attr + ); } 181 AUE_NULL STD { - int linux_mq_unlink(void); + int linux_mq_unlink( + const char *name + ); } 182 AUE_NULL STD { - int linux_mq_timedsend(void); + int linux_mq_timedsend( + l_mqd_t mqd, + const char *msg_ptr, + l_size_t msg_len, + l_uint msg_prio, + const struct l_timespec *abs_timeout + ); } 183 AUE_NULL STD { - int linux_mq_timedreceive(void); + int linux_mq_timedreceive( + l_mqd_t mqd, + char *msg_ptr, + l_size_t msg_len, + l_uint *msg_prio, + const struct l_timespec *abs_timeout + ); } 184 AUE_NULL STD { - int linux_mq_notify(void); + int linux_mq_notify( + l_mqd_t mqd, + const struct l_timespec *abs_timeout + ); } 185 AUE_NULL STD { - int linux_mq_getsetattr(void); + int linux_mq_getsetattr( + l_mqd_t mqd, + const struct mq_attr *attr, + struct mq_attr *oattr + ); } 186 AUE_NULL STD { int linux_msgget( Modified: head/sys/i386/linux/syscalls.master ============================================================================== --- head/sys/i386/linux/syscalls.master Sat Jun 27 14:39:44 2020 (r362691) +++ head/sys/i386/linux/syscalls.master Sat Jun 27 14:42:08 2020 (r362692) @@ -1532,8 +1532,8 @@ 277 AUE_NULL STD { int linux_mq_open( const char *name, - int oflag, - mode_t mode, + l_int oflag, + l_mode_t mode, struct mq_attr *attr ); } @@ -1546,8 +1546,8 @@ int linux_mq_timedsend( l_mqd_t mqd, const char *msg_ptr, - size_t msg_len, - unsigned int msg_prio, + l_size_t msg_len, + l_uint msg_prio, const struct l_timespec *abs_timeout ); } @@ -1555,8 +1555,8 @@ int linux_mq_timedreceive( l_mqd_t mqd, char *msg_ptr, - size_t msg_len, - unsigned int msg_prio, + l_size_t msg_len, + l_uint *msg_prio, const struct l_timespec *abs_timeout ); }