xnu-6153.41.3.tar.gz

[apple/xnu.git] / osfmk / i386 / hibernate_restore.c

diff --git a/osfmk/i386/hibernate_restore.c b/osfmk/i386/hibernate_restore.c
index 47a5b9c7a791267d886a00e217726e1a5622a058..f8b0bb19564458240cc7829117ef80a265fb7fda 100644 (file)
--- a/osfmk/i386/hibernate_restore.c
+++ b/osfmk/i386/hibernate_restore.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2008 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * Copyright (c) 2008 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.

- * 
+ *

  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 #include <i386/pmap.h>
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 #include <i386/pmap.h>


@@ -31,28 +31,27 @@
 
 #include <i386/pal_hibernate.h>
 
 
 #include <i386/pal_hibernate.h>
 

-extern pd_entry_t BootstrapPTD[2048];
+extern pd_entry_t BootPTD[2048];

 
 

-// src is virtually mapped, not page aligned, 
+// src is virtually mapped, not page aligned,

 // dst is a physical 4k page aligned ptr, len is one 4K page
 // src & dst will not overlap
 
 // dst is a physical 4k page aligned ptr, len is one 4K page
 // src & dst will not overlap
 

-uintptr_t 
+uintptr_t

 hibernate_restore_phys_page(uint64_t src, uint64_t dst, uint32_t len, uint32_t procFlags)
 {
        (void)procFlags;
        uint64_t * d;
        uint64_t * s;
 hibernate_restore_phys_page(uint64_t src, uint64_t dst, uint32_t len, uint32_t procFlags)
 {
        (void)procFlags;
        uint64_t * d;
        uint64_t * s;

-       uint32_t idx;

 
 

-       if (src == 0)
+       if (src == 0) {

                return (uintptr_t)dst;
                return (uintptr_t)dst;

+       }

 
        d = (uint64_t *)pal_hib_map(DEST_COPY_AREA, dst);
        s = (uint64_t *) (uintptr_t)src;
 
 
        d = (uint64_t *)pal_hib_map(DEST_COPY_AREA, dst);
        s = (uint64_t *) (uintptr_t)src;
 

-       for (idx = 0; idx < (len / (uint32_t)sizeof(uint64_t)); idx++) 
-               d[idx] = s[idx];
+       __nosan_memcpy(d, s, len);

 
        return (uintptr_t)d;
 }
 
        return (uintptr_t)d;
 }


@@ -63,36 +62,44 @@ void hibprintf(const char *fmt, ...);
 uintptr_t
 pal_hib_map(uintptr_t virt, uint64_t phys)
 {
 uintptr_t
 pal_hib_map(uintptr_t virt, uint64_t phys)
 {

-    uintptr_t index;
+       uintptr_t index;

 
 

-    switch (virt)
-    {
+       switch (virt) {

        case DEST_COPY_AREA:
        case SRC_COPY_AREA:
        case COPY_PAGE_AREA:
        case BITMAP_AREA:
        case IMAGE_AREA:
        case IMAGE2_AREA:
        case DEST_COPY_AREA:
        case SRC_COPY_AREA:
        case COPY_PAGE_AREA:
        case BITMAP_AREA:
        case IMAGE_AREA:
        case IMAGE2_AREA:

-           break;
-       default:
-           asm("cli;hlt;");
-           break;
-    }
+               break;

 
 

-    index = (virt >> I386_LPGSHIFT);
-    virt += (uintptr_t)(phys & I386_LPGMASK);
-    phys  = ((phys & ~((uint64_t)I386_LPGMASK)) | INTEL_PTE_PS  | INTEL_PTE_VALID | INTEL_PTE_WRITE);
-    BootstrapPTD[index] = phys;
-    invlpg(virt);
-    BootstrapPTD[index + 1] = (phys + I386_LPGBYTES);
-    invlpg(virt + I386_LPGBYTES);
+       default:
+               asm("cli;hlt;");
+               break;
+       }
+       if (phys < IMAGE2_AREA) {
+               // first 4Gb is all mapped,
+               // and do not expect source areas to cross 4Gb
+               return phys;
+       }
+       index = (virt >> I386_LPGSHIFT);
+       virt += (uintptr_t)(phys & I386_LPGMASK);
+       phys  = ((phys & ~((uint64_t)I386_LPGMASK)) | INTEL_PTE_PS  | INTEL_PTE_VALID | INTEL_PTE_WRITE);
+       if (phys == BootPTD[index]) {
+               return virt;
+       }
+       BootPTD[index] = phys;
+       invlpg(virt);
+       BootPTD[index + 1] = (phys + I386_LPGBYTES);
+       invlpg(virt + I386_LPGBYTES);

 
 

-    return (virt);
+       return virt;

 }
 
 }
 

-void hibernateRestorePALState(uint32_t *arg)
+void
+hibernateRestorePALState(uint32_t *arg)

 {
 {

-    (void)arg;
+       (void)arg;

 }
 
 void
 }
 
 void