xnu-3248.40.184.tar.gz

[apple/xnu.git] / bsd / vm / vnode_pager.c

diff --git a/bsd/vm/vnode_pager.c b/bsd/vm/vnode_pager.c
index 4bc408e876b17254250db28e975b39ea5a50f6a8..45e338a5e136042726d7cf3c0ad326536e8b29ec 100644 (file)
--- a/bsd/vm/vnode_pager.c
+++ b/bsd/vm/vnode_pager.c
@@ -102,6 +102,33 @@ vnode_pager_isSSD(vnode_t vp)
        return (FALSE);
 }
 
        return (FALSE);
 }
 

+#if CONFIG_IOSCHED
+void
+vnode_pager_issue_reprioritize_io(struct vnode *devvp, uint64_t blkno, uint32_t len, int priority)
+{
+       u_int32_t blocksize = 0;
+       dk_extent_t extent;
+        dk_set_tier_t set_tier;
+       int error = 0;
+
+       error = VNOP_IOCTL(devvp, DKIOCGETBLOCKSIZE, (caddr_t)&blocksize, 0, vfs_context_kernel());
+       if (error)
+               return;
+
+       memset(&extent, 0, sizeof(dk_extent_t));
+       memset(&set_tier, 0, sizeof(dk_set_tier_t));
+       
+       extent.offset = blkno * (u_int64_t) blocksize;
+       extent.length = len;
+
+       set_tier.extents = &extent; 
+       set_tier.extentsCount = 1;
+       set_tier.tier = priority;
+               
+       error = VNOP_IOCTL(devvp, DKIOCSETTIER, (caddr_t)&set_tier, 0, vfs_context_kernel());
+       return;
+}
+#endif

 
 uint32_t
 vnode_pager_isinuse(struct vnode *vp)
 
 uint32_t
 vnode_pager_isinuse(struct vnode *vp)


@@ -123,29 +150,46 @@ vnode_pager_get_filesize(struct vnode *vp)
        return (vm_object_offset_t) ubc_getsize(vp);
 }
 
        return (vm_object_offset_t) ubc_getsize(vp);
 }
 

+extern int safe_getpath(struct vnode *dvp, char *leafname, char *path, int _len, int *truncated_path);
+

 kern_return_t
 kern_return_t

-vnode_pager_get_pathname(
+vnode_pager_get_name(

        struct vnode    *vp,
        char            *pathname,
        struct vnode    *vp,
        char            *pathname,

-       vm_size_t       *length_p)
+       vm_size_t       pathname_len,
+       char            *filename,
+       vm_size_t       filename_len,
+       boolean_t       *truncated_path_p)

 {
 {

-       int     error, len;
-
-       len = (int) *length_p;
-       error = vn_getpath(vp, pathname, &len);
-       if (error != 0) {
-               return KERN_FAILURE;
+       *truncated_path_p = FALSE;
+       if (pathname != NULL) {
+               /* get the path name */
+               safe_getpath(vp, NULL,
+                            pathname, (int) pathname_len,
+                            truncated_path_p);
+       }
+       if ((pathname == NULL || *truncated_path_p) &&
+           filename != NULL) {
+               /* get the file name */
+               const char *name;
+
+               name = vnode_getname_printable(vp);
+               strlcpy(filename, name, (size_t) filename_len);
+               vnode_putname_printable(name);

        }
        }

-       *length_p = (vm_size_t) len;

        return KERN_SUCCESS;
 }
 
 kern_return_t
        return KERN_SUCCESS;
 }
 
 kern_return_t

-vnode_pager_get_filename(
+vnode_pager_get_mtime(

        struct vnode    *vp,
        struct vnode    *vp,

-       const char      **filename)
+       struct timespec *current_mtime,
+       struct timespec *cs_mtime)

 {
 {

-       *filename = vp->v_name;
+       vnode_mtime(vp, current_mtime, vfs_context_current());
+       if (cs_mtime != NULL) {
+               ubc_get_cs_mtime(vp, cs_mtime);
+       }

        return KERN_SUCCESS;
 }
 
        return KERN_SUCCESS;
 }
 


@@ -332,6 +376,30 @@ vnode_pageout(struct vnode *vp,
        } else 
                pl = ubc_upl_pageinfo(upl);
 
        } else 
                pl = ubc_upl_pageinfo(upl);
 

+       /*
+        * Ignore any non-present pages at the end of the
+        * UPL so that we aren't looking at a upl that 
+        * may already have been freed by the preceeding
+        * aborts/completions.
+        */
+       base_index = upl_offset / PAGE_SIZE;
+
+       for (pg_index = (upl_offset + isize) / PAGE_SIZE; pg_index > base_index;) {
+               if (upl_page_present(pl, --pg_index))
+                       break;
+               if (pg_index == base_index) {
+                       /*
+                        * no pages were returned, so release
+                        * our hold on the upl and leave
+                        */
+                       if ( !(flags & UPL_NOCOMMIT))
+                               ubc_upl_abort_range(upl, upl_offset, isize, UPL_ABORT_FREE_ON_EMPTY);
+
+                       goto out;
+               }
+       }
+       isize = ((pg_index + 1) - base_index) * PAGE_SIZE;
+

        /*
         * we come here for pageouts to 'real' files and
         * for msyncs...  the upl may not contain any
        /*
         * we come here for pageouts to 'real' files and
         * for msyncs...  the upl may not contain any


@@ -339,6 +407,7 @@ vnode_pageout(struct vnode *vp,
         * through it and find the 'runs' of dirty pages
         * to call VNOP_PAGEOUT on...
         */
         * through it and find the 'runs' of dirty pages
         * to call VNOP_PAGEOUT on...
         */

+

        if (ubc_getsize(vp) == 0) {
                /*
                 * if the file has been effectively deleted, then
        if (ubc_getsize(vp) == 0) {
                /*
                 * if the file has been effectively deleted, then


@@ -371,29 +440,6 @@ vnode_pageout(struct vnode *vp,
                }
                goto out;
        }
                }
                goto out;
        }

-       /*
-        * Ignore any non-present pages at the end of the
-        * UPL so that we aren't looking at a upl that 
-        * may already have been freed by the preceeding
-        * aborts/completions.
-        */
-       base_index = upl_offset / PAGE_SIZE;
-
-       for (pg_index = (upl_offset + isize) / PAGE_SIZE; pg_index > base_index;) {
-               if (upl_page_present(pl, --pg_index))
-                       break;
-               if (pg_index == base_index) {
-                       /*
-                        * no pages were returned, so release
-                        * our hold on the upl and leave
-                        */
-                       if ( !(flags & UPL_NOCOMMIT))
-                               ubc_upl_abort_range(upl, upl_offset, isize, UPL_ABORT_FREE_ON_EMPTY);
-
-                       goto out;
-               }
-       }
-       isize = ((pg_index + 1) - base_index) * PAGE_SIZE;

 
        offset = upl_offset;
        pg_index = base_index;
 
        offset = upl_offset;
        pg_index = base_index;


@@ -530,7 +576,7 @@ vnode_pagein(
        if (upl == (upl_t)NULL) {
                flags &= ~UPL_NOCOMMIT;
 
        if (upl == (upl_t)NULL) {
                flags &= ~UPL_NOCOMMIT;
 

-               if (size > (MAX_UPL_SIZE * PAGE_SIZE)) {
+               if (size > MAX_UPL_SIZE_BYTES) {

                        result = PAGER_ERROR;
                        error  = PAGER_ERROR;
                        goto out;
                        result = PAGER_ERROR;
                        error  = PAGER_ERROR;
                        goto out;