Changeset b68ca55 in rtems-libbsd

Timestamp:

07/18/19 08:56:26 (4 years ago)

Author:

Vijay Kumar Banerjee <vijaykumar9597@…>

Branches:

5, master

Children:

e3bc24e

Parents:

bc2ba9a

git-author:

Vijay Kumar Banerjee <vijaykumar9597@…> (07/18/19 08:56:26)

git-committer:

Christian Mauderer <oss@…> (07/27/19 11:49:07)

Message:

Add mmap

Files:

• freebsd/sys/kern/kern_conf.c (modified) (5 diffs)
• freebsd/sys/sys/conf.h (modified) (1 diff)
• rtemsbsd/include/machine/vm.h (modified) (1 diff)
• rtemsbsd/sys/fs/devfs/devfs_devs.c (modified) (2 diffs)
• testsuite/cdev01/test_cdev.c (modified) (5 diffs)
• testsuite/cdev01/test_cdev01.h (modified) (1 diff)
• testsuite/cdev01/test_main.c (modified) (2 diffs)

freebsd/sys/kern/kern_conf.c

@@ -329 +329 @@
         .d_ioctl =      dead_ioctl,
         .d_poll =       dead_poll,
-#ifndef __rtems__
         .d_mmap =       dead_mmap,
+#ifndef __rtems__
         .d_strategy =   dead_strategy,
 #endif /* __rtems__ */
@@ -523 +523 @@
 }
 
-#ifndef __rtems__
 static int
 giant_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, int nprot,
@@ -542 +541 @@
 }
 
+#ifndef __rtems__
 static int
 giant_mmap_single(struct cdev *dev, vm_ooffset_t *offset, vm_size_t size,
@@ -668 +668 @@
                 devsw->d_ioctl = dead_ioctl;
                 devsw->d_poll = dead_poll;
-#ifndef __rtems__
                 devsw->d_mmap = dead_mmap;
+#ifndef __rtems__
                 devsw->d_mmap_single = dead_mmap_single;
                 devsw->d_strategy = dead_strategy;
@@ -703 +703 @@
         FIXUP(d_ioctl,          no_ioctl,       giant_ioctl);
         FIXUP(d_poll,           no_poll,        giant_poll);
-#ifndef __rtems__
         FIXUP(d_mmap,           no_mmap,        giant_mmap);
+#ifndef __rtems__
         FIXUP(d_strategy,       no_strategy,    giant_strategy);
 #endif /* __rtems__ */

freebsd/sys/sys/conf.h

@@ -210 +210 @@
         d_ioctl_t               *d_ioctl;
         d_poll_t                *d_poll;
-#ifndef __rtems__
         d_mmap_t                *d_mmap;
+#ifndef __rtems__
         d_strategy_t            *d_strategy;
         dumper_t                *d_dump;

rtemsbsd/include/machine/vm.h

@@ +1 @@
+#define VM_MEMATTR_DEFAULT 0
+#define VM_MEMATTR_UNCACHEABLE 1

rtemsbsd/sys/fs/devfs/devfs_devs.c

@@ -388 +388 @@
 }
 
+static int
+devfs_imfs_mmap(rtems_libio_t *iop, void **addr, size_t len, int prot,
+    off_t off)
+{
+        struct cdev *cdev = devfs_imfs_get_context_by_iop(iop);
+        struct file *fp = rtems_bsd_iop_to_fp(iop);
+        struct thread *td = rtems_bsd_get_curthread_or_null();
+        struct file *fpop;
+        struct cdevsw *dsw;
+        int error, ref;
+
+        if (td != 0) {
+                if (cdev == NULL) {
+                        error = ENXIO;
+                        goto err;
+                }
+                if (cdev->si_flags & SI_ALIAS) {
+                        cdev = cdev->si_parent;
+                }
+                dsw = dev_refthread(cdev, &ref);
+                if (dsw == NULL) {
+                        error = ENXIO;
+                        goto err;
+                }
+                fpop = td->td_fpop;
+                curthread->td_fpop = fp;
+                error = dsw->d_mmap( cdev, off, (vm_paddr_t *) addr, prot, VM_MEMATTR_DEFAULT);
+                td->td_fpop = fpop;
+                dev_relthread(cdev, ref);
+        } else {
+                error = ENOMEM;
+        }
+
+err:
+        return rtems_bsd_error_to_status_and_errno(error);
+}
+
 static const rtems_filesystem_file_handlers_r devfs_imfs_handlers = {
         .open_h = devfs_imfs_open,
@@ -404 +441 @@
         .readv_h = devfs_imfs_readv,
         .writev_h = devfs_imfs_writev,
+        .mmap_h = devfs_imfs_mmap,
 };
 

testsuite/cdev01/test_cdev.c

@@ -31 +31 @@
 
 #include <machine/rtems-bsd-kernel-space.h>
+#include <machine/vm.h>
 #include <sys/types.h>
 #include <sys/conf.h>
+#include <sys/mman.h>
 
 #include <rtems/seterr.h>
@@ -47 +49 @@
 static  d_poll_t        testpoll;
 static  d_kqfilter_t    testkqfilter;
+static  d_mmap_t        testmmap;
 
 static struct cdevsw test_cdevsw = {
@@ -60 +63 @@
         .d_poll =       testpoll,
         .d_kqfilter =   testkqfilter,
+        .d_mmap =       testmmap,
 };
 
@@ -78 +82 @@
         test_state *state = dev->si_drv1;
 
-        assert(*state == TEST_KQFILTER);
+        assert(*state == TEST_MMAP);
         *state = TEST_CLOSED;
 
@@ -149 +153 @@
 }
 
+static int
+testmmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr,
+         int nprot, vm_memattr_t *memattr)
+{
+        test_state *state = dev->si_drv1;
+
+        assert(paddr != NULL);
+        assert(memattr == VM_MEMATTR_DEFAULT);
+        assert(nprot == (PROT_READ | PROT_WRITE));
+        assert(*state == TEST_KQFILTER);
+        *state = TEST_MMAP;
+
+        return 0;
+}
+
 void
 test_make_dev(test_state *state, const char *name)

testsuite/cdev01/test_cdev01.h

@@ -43 +43 @@
         TEST_POLL,
         TEST_KQFILTER,
-        TEST_CLOSED
+        TEST_MMAP,
+        TEST_CLOSED,
 } test_state;
 

testsuite/cdev01/test_main.c

@@ -36 +36 @@
 #include <sys/uio.h>
 #include <sys/ioctl.h>
+#include <sys/mman.h>
 
 #include <assert.h>
@@ -126 +127 @@
         assert(errno == TEST_KQ_ERRNO);
 
+        rv = mmap(NULL, 1, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+        assert(rv == 0);
+
         rv = close(fd);
         assert(rv == 0);