Merge branch 'tsahee-kmap-atomic'

504ensicsLabs · Mar 21, 2021 · 9c73477 · 9c73477
2 parents a19344f + e1c841a
commit 9c73477
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/lime.h b/src/lime.h
@@ -76,6 +76,10 @@
 #define LIME_SUPPORTS_TIMING
 #endif
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
+#define LIME_USE_KMAP_ATOMIC
+#endif
+
 #ifdef CONFIG_ZLIB_DEFLATE
 #define LIME_SUPPORTS_DEFLATE
 #endif

diff --git a/src/main.c b/src/main.c
@@ -288,7 +288,11 @@ static void write_range(struct resource * res) {
             DBG("Padding partial page: vaddr %p size: %lu", (void *) i, (unsigned long) is);
             write_padding(is);
         } else {
+#ifdef LIME_USE_KMAP_ATOMIC
+            v = kmap_atomic(p);
+#else
             v = kmap(p);
+#endif
             /*
              * If we need to compute the digest or compress the output
              * take a snapshot of the page. Otherwise save some cycles.
@@ -299,8 +303,11 @@ static void write_range(struct resource * res) {
             } else {
                 s = write_vaddr(v, is);
             }
+#ifdef LIME_USE_KMAP_ATOMIC
+            kunmap_atomic(v);
+#else
             kunmap(p);
-
+#endif
             if (s < 0) {
                 DBG("Failed to write page: vaddr %p. Skipping Range...", v);
                 break;