X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=warm.git;a=blobdiff_plain;f=warm.c;h=d17b12273373406dc2a698199aa21444c219ab8d;hp=197df0f80d9f5ae7254ba1164d7ccbf3ccf978b8;hb=55b74e0bebeb4b3bdffa77f5ebedc87c85770308;hpb=198a1649dcb74c973706066d37bb955c139232b1 diff --git a/warm.c b/warm.c index 197df0f..d17b122 100644 --- a/warm.c +++ b/warm.c @@ -36,42 +36,156 @@ #include #include #include +#include #include #define WARM_CODE #include "warm.h" -#include "sys_cacheflush.h" + +#define PFX "wARM: " + +/* provided by glibc */ +extern long init_module(void *, unsigned long, const char *); +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) +{ +#ifdef __ARM_EABI__ + /* EABI version */ + int num = __ARM_NR_cacheflush; + __asm__("mov r0, %0 ;" + "mov r1, %1 ;" + "mov r2, #0 ;" + "mov r7, %2 ;" + "swi 0" : : "r" (start), "r" (end), "r" (num) + : "r0", "r1", "r2", "r3", "r7"); +#else + /* OABI */ + __asm__("mov r0, %0 ;" + "mov r1, %1 ;" + "mov r2, #0 ;" + "swi %2" : : "r" (start), "r" (end), "i" __ARM_NR_cacheflush + : "r0", "r1", "r2", "r3"); +#endif +} + +/* Those are here because system() occasionaly fails on Wiz + * with errno 12 for some unknown reason */ +static int manual_insmod_26(const char *fname, const char *opts) +{ + unsigned long len, read_len; + int ret = -1; + void *buff; + FILE *f; + + f = fopen(fname, "rb"); + if (f == NULL) + return -1; + + fseek(f, 0, SEEK_END); + len = ftell(f); + fseek(f, 0, SEEK_SET); + + buff = malloc(len); + if (buff == NULL) + goto fail0; + + read_len = fread(buff, 1, len, f); + if (read_len != len) { + fprintf(stderr, PFX "failed to read module\n"); + goto fail1; + } + + ret = init_module(buff, len, opts); + +fail1: + free(buff); +fail0: + fclose(f); + return ret; +} + +static int manual_rmmod(const char *name) +{ + return delete_module(name, O_NONBLOCK|O_EXCL); +} int warm_init(void) { struct utsname unm; - char buff[128]; + char buff1[32], buff2[128]; + int ret; + + memset(&unm, 0, sizeof(unm)); + uname(&unm); + + if (strlen(unm.release) < 3 || unm.release[1] != '.') { + fprintf(stderr, PFX "unexpected version string: %s\n", unm.release); + goto fail; + } + kernel_version = ((unm.release[0] - '0') << 4) | (unm.release[2] - '0'); warm_fd = open("/proc/warm", O_RDWR); if (warm_fd >= 0) return 0; - memset(&unm, 0, sizeof(unm)); - uname(&unm); - snprintf(buff, sizeof(buff), "/sbin/insmod warm_%s.ko", unm.release); + snprintf(buff1, sizeof(buff1), "warm_%s.%s", unm.release, kernel_version >= 0x26 ? "ko" : "o"); + snprintf(buff2, sizeof(buff2), "/sbin/insmod %s verbose=1", buff1); /* try to insmod */ - system(buff); + ret = system(buff2); + if (ret != 0) { + fprintf(stderr, PFX "system/insmod failed: %d %d\n", ret, errno); + if (kernel_version >= 0x26) { + ret = manual_insmod_26(buff1, "verbose=1"); + if (ret != 0) + 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) return 0; - fprintf(stderr, "wARM: can't init, acting as sys_cacheflush wrapper\n"); +fail: + fprintf(stderr, PFX "can't init, acting as sys_cacheflush wrapper\n"); return -1; } void warm_finish(void) { - if (warm_fd >= 0) - close(warm_fd); - system("rmmod warm"); + char name[32], cmd[64]; + int ret; + + if (warm_fd < 0) + return; + + close(warm_fd); + warm_fd = -1; + + 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); + } + } } int warm_cache_op_range(int op, void *addr, unsigned long size) @@ -80,6 +194,7 @@ int warm_cache_op_range(int op, void *addr, unsigned long size) int ret; if (warm_fd < 0) { + /* note that this won't work for warm_cache_op_all */ sys_cacheflush(addr, (char *)addr + size); return -1; } @@ -90,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; } @@ -99,7 +214,7 @@ int warm_cache_op_range(int op, void *addr, unsigned long size) int warm_cache_op_all(int op) { - return warm_cache_op_range(op, NULL, (size_t)-1); + return warm_cache_op_range(op, NULL, (unsigned long)-1); } int warm_change_cb_range(int cb, int is_set, void *addr, unsigned long size) @@ -117,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; } @@ -137,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); +}