Changeset 164c5f5 in rtems-libbsd

Timestamp:

Jan 15, 2014, 11:46:22 AM (7 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, b96abfd647154f10ea8f7fac68e25676636eded5, debc0aed8b9bef9996b8ec0ae7a70b0b41912e27, 68e79b6d187fe09b0a6f3f1d22c69b4121a3f76e, freebsd-9.3, 33bfaee89aa71d2252eb48d6b9a9ec17183faced

Children:

08c8588

Parents:

a257bd7

git-author:

Sebastian Huber <sebastian.huber@…> (01/15/14 11:46:22)

git-committer:

Sebastian Huber <sebastian.huber@…> (01/16/14 14:45:44)

Message:

UNIX(4): Import from FreeBSD

Files:

• Makefile (modified) (2 diffs)
• freebsd-to-rtems.py (modified) (2 diffs)
• freebsd/sys/kern/uipc_usrreq.c (added)
• freebsd/sys/sys/kernel.h (modified) (1 diff)
• freebsd/sys/sys/unpcb.h (modified) (1 diff)
• libbsd.txt (modified) (1 diff)
• rtemsbsd/include/machine/rtems-bsd-sysinit.h (modified) (1 diff)
• testsuite/include/rtems/bsd/test/default-init.h (modified) (1 diff)
• testsuite/include/rtems/bsd/test/default-network-init.h (modified) (1 diff)
• testsuite/syscalls01/test_main.c (modified) (1 diff)
• testsuite/unix01/test_main.c (added)

Makefile

@@ -158 +158 @@
 LIB_C_FILES += freebsd/sys/kern/uipc_sockbuf.c
 LIB_C_FILES += freebsd/sys/kern/uipc_socket.c
+LIB_C_FILES += freebsd/sys/kern/uipc_usrreq.c
 LIB_C_FILES += freebsd/sys/libkern/arc4random.c
 LIB_C_FILES += freebsd/sys/libkern/fls.c
@@ -1103 +1104 @@
         $(CC) $(CPPFLAGS) $(CFLAGS) -DINET6 -c $< -o $@
 
+TEST_UNIX01 = testsuite/unix01/unix01.exe
+TEST_UNIX01_O_FILES =
+TEST_UNIX01_D_FILES =
+TEST_UNIX01_O_FILES += testsuite/unix01/test_main.o
+TEST_UNIX01_D_FILES += testsuite/unix01/test_main.d
+$(TEST_UNIX01): $(TEST_UNIX01_O_FILES) $(LIB)
+        $(LINK.c) -Wl,-Map,testsuite/unix01/unix01.map $^ -lm -lz -o $@
+TESTS += $(TEST_UNIX01)
+O_FILES += $(TEST_UNIX01_O_FILES)
+D_FILES += $(TEST_UNIX01_D_FILES)
+RUN_TESTS += $(TEST_UNIX01)
+
 TEST_FTPD01 = testsuite/ftpd01/ftpd01.exe
 TEST_FTPD01_O_FILES =

freebsd-to-rtems.py

@@ -855 +855 @@
                 'sys/kern/uipc_sockbuf.c',
                 'sys/kern/uipc_socket.c',
+                'sys/kern/uipc_usrreq.c',
                 'sys/libkern/arc4random.c',
                 'sys/libkern/fls.c',
@@ -2427 +2428 @@
 
 tests = Module('tests')
+tests.addTest('unix01', ['test_main'])
 tests.addTest('ftpd01', ['test_main'], netTest = True)
 tests.addTest('ping01', ['test_main'], netTest = True)

freebsd/sys/sys/kernel.h

@@ -266 +266 @@
 #define SYSINIT_DRIVER_REFERENCE(driver, bus)                   \
         SYSINIT_MODULE_REFERENCE(driver ## _ ## bus)
+#define SYSINIT_DOMAIN_REFERENCE(dom)                           \
+        SYSINIT_REFERENCE(domain_add_ ## dom)
 #endif /* __rtems__ */
 

freebsd/sys/sys/unpcb.h

@@ -69 +69 @@
         struct  socket *unp_socket;     /* pointer back to socket */
         struct  file *unp_file;         /* back-pointer to file for gc. */
+#ifndef __rtems__
         struct  vnode *unp_vnode;       /* if associated with file */
+#else /* __rtems__ */
+        struct  IMFS_jnode_tt *unp_vnode;       /* if associated with file */
+#endif /* __rtems__ */
         ino_t   unp_ino;                /* fake inode number */
         struct  unpcb *unp_conn;        /* control block of connected socket */

libbsd.txt

@@ -111 +111 @@
 
 * BPF(4): Add support for zero-copy buffers.
+
+* UNIX(4): Fix race conditions in the area of socket object and file node
+  destruction.  Add support for file descriptor transmission via control
+  messages.
 
 [listing]

rtemsbsd/include/machine/rtems-bsd-sysinit.h

@@ -56 +56 @@
         SYSINIT_DRIVER_REFERENCE(pci, pcib);
 
+#define SYSINIT_NEED_NET_PF_UNIX \
+        SYSINIT_DOMAIN_REFERENCE(local)
+
 #define SYSINIT_NEED_NET_IF_BFE \
         SYSINIT_DRIVER_REFERENCE(bfe, pci)

testsuite/include/rtems/bsd/test/default-init.h

@@ -97 +97 @@
 #include <machine/rtems-bsd-sysinit.h>
 
+SYSINIT_NEED_NET_PF_UNIX;
+
 /* only include FXP and PCI for i386/pc386 for debug on qemu (for now) */
 #if defined(i386)

testsuite/include/rtems/bsd/test/default-network-init.h

@@ -167 +167 @@
 }
 
+#include <machine/rtems-bsd-sysinit.h>
+
+SYSINIT_NEED_NET_PF_UNIX;
+
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

testsuite/syscalls01/test_main.c

@@ -79 +79 @@
         { -1, SOCK_RAW, 0, EPROTONOSUPPORT },
         { PF_UNSPEC, SOCK_DGRAM, 0, EPROTONOSUPPORT },
-        { PF_UNIX, SOCK_DGRAM, 0, EPROTONOSUPPORT },
+        { PF_UNIX, SOCK_STREAM, 0, 0 },
+        { PF_UNIX, SOCK_DGRAM, 0, 0 },
+        { PF_UNIX, SOCK_SEQPACKET, 0, 0 },
         { PF_INET, -1, 0, EPROTONOSUPPORT },
         { PF_INET, SOCK_RAW, -1, EPROTONOSUPPORT },