support section mmap, update test

[warm.git] / warm.c

diff --git a/warm.c b/warm.c
index 5dad50d..d17b122 100644 (file)
--- a/warm.c
+++ b/warm.c
@@ -50,6 +50,7 @@ extern long delete_module(const char *, unsigned int);
 
 static int warm_fd = -1;
 static int kernel_version;
+static int module_inserted;
 
 static void sys_cacheflush(void *start, void *end)
 {
@@ -145,6 +146,8 @@ int warm_init(void)
                                fprintf(stderr, PFX "manual insmod also failed: %d\n", ret);
                }
        }
+       if (ret == 0)
+               module_inserted = 1;
 
        warm_fd = open("/proc/warm", O_RDWR);
        if (warm_fd >= 0)
@@ -166,20 +169,22 @@ void warm_finish(void)
        close(warm_fd);
        warm_fd = -1;
 
-       if (kernel_version < 0x26) {
-               struct utsname unm;
-               memset(&unm, 0, sizeof(unm));
-               uname(&unm);
-               snprintf(name, sizeof(name), "warm_%s", unm.release);
-       }
-       else
-               strcpy(name, "warm");
-
-       snprintf(cmd, sizeof(cmd), "/sbin/rmmod %s", name);
-       ret = system(cmd);
-       if (ret != 0) {
-               fprintf(stderr, PFX "system/rmmod failed: %d %d\n", ret, errno);
-               manual_rmmod(name);
+       if (module_inserted) {
+               if (kernel_version < 0x26) {
+                       struct utsname unm;
+                       memset(&unm, 0, sizeof(unm));
+                       uname(&unm);
+                       snprintf(name, sizeof(name), "warm_%s", unm.release);
+               }
+               else
+                       strcpy(name, "warm");
+
+               snprintf(cmd, sizeof(cmd), "/sbin/rmmod %s", name);
+               ret = system(cmd);
+               if (ret != 0) {
+                       fprintf(stderr, PFX "system/rmmod failed: %d %d\n", ret, errno);
+                       manual_rmmod(name);
+               }
        }
 }
 
@@ -200,7 +205,7 @@ int warm_cache_op_range(int op, void *addr, unsigned long size)
 
        ret = ioctl(warm_fd, WARMC_CACHE_OP, &wop);
        if (ret != 0) {
-               perror("WARMC_CACHE_OP failed");
+               perror(PFX "WARMC_CACHE_OP failed");
                return -1;
        }
 
@@ -227,7 +232,7 @@ int warm_change_cb_range(int cb, int is_set, void *addr, unsigned long size)
 
        ret = ioctl(warm_fd, WARMC_CHANGE_CB, &ccb);
        if (ret != 0) {
-               perror("WARMC_CHANGE_CB failed");
+               perror(PFX "WARMC_CHANGE_CB failed");
                return -1;
        }
 
@@ -247,10 +252,55 @@ unsigned long warm_virt2phys(const void *ptr)
        ptrio = (unsigned long)ptr;
        ret = ioctl(warm_fd, WARMC_VIRT2PHYS, &ptrio);
        if (ret != 0) {
-               perror("WARMC_VIRT2PHYS failed");
+               perror(PFX "WARMC_VIRT2PHYS failed");
                return (unsigned long)-1;
        }
 
        return ptrio;
 }
 
+int warm_do_section(void *virt_addr, unsigned long phys_addr,
+       unsigned long size, int cb, int is_unmap)
+{
+       struct warm_map_op mop;
+       unsigned long vaddr;
+       int ret;
+
+       if (warm_fd < 0)
+               return -1;
+
+       vaddr = (unsigned long)virt_addr;
+       if (vaddr & 0xfffff) {
+               fprintf(stderr, PFX "virt_addr is unaligned\n");
+               return -1;
+       }
+       if (phys_addr & 0xfffff) {
+               fprintf(stderr, PFX "phys_addr is unaligned\n");
+               return -1;
+       }
+
+       mop.virt_addr = vaddr;
+       mop.phys_addr = phys_addr;
+       mop.size = size;
+       mop.cb = cb;
+       mop.is_unmap = is_unmap;
+
+       ret = ioctl(warm_fd, WARMC_MMAP, &mop);
+       if (ret != 0) {
+               perror(PFX "WARMC_MMAP failed");
+               return -1;
+       }
+
+       return 0;
+}
+
+int warm_mmap_section(void *virt_addr, unsigned long phys_addr,
+       unsigned long size, int cb)
+{
+       return warm_do_section(virt_addr, phys_addr, size, cb, 0);
+}
+
+int warm_munmap_section(void *virt_addr, unsigned long size)
+{
+       return warm_do_section(virt_addr, 0, size, 0, 1);
+}