diff --git a/memory.c b/memory.c index 95eefc9..2ec44ab 100755 --- a/memory.c +++ b/memory.c @@ -4091,6 +4091,7 @@ cmd_kmem(void) error(FATAL, "only one kmem_cache reference is allowed\n"); meminfo.reqname = p1; + meminfo.cache = value[i]; if ((i+1) == spec_addr) { /* done? */ if (meminfo.calls++) fprintf(fp, "\n"); @@ -7589,15 +7590,12 @@ is_kmem_cache_addr(ulong vaddr, char *kbuf) cache_buf = GETBUF(SIZE(kmem_cache_s)); do { - readmem(cache, KVADDR, cache_buf, SIZE(kmem_cache_s), - "kmem_cache buffer", FAULT_ON_ERROR); if (cache == vaddr) { if (vt->kmem_cache_namelen) { - BCOPY(cache_buf+name_offset, kbuf, - vt->kmem_cache_namelen); + readmem(cache+name_offset, KVADDR, kbuf, vt->kmem_cache_namelen, "name array", FAULT_ON_ERROR); } else { - name = ULONG(cache_buf + name_offset); + readmem(cache+name_offset, KVADDR, &name, sizeof(name), "name", FAULT_ON_ERROR); if (!read_string(name, kbuf, BUFSIZE-1)) { if (vt->flags & (PERCPU_KMALLOC_V1|PERCPU_KMALLOC_V2)) @@ -7615,7 +7613,8 @@ is_kmem_cache_addr(ulong vaddr, char *kbuf) return kbuf; } - cache = ULONG(cache_buf + next_offset); + readmem(cache+next_offset, KVADDR, &cache, sizeof(long), + "kmem_cache_s next", FAULT_ON_ERROR); if (vt->flags & (PERCPU_KMALLOC_V1|PERCPU_KMALLOC_V2)) cache -= next_offset; @@ -8733,9 +8732,15 @@ dump_kmem_cache_percpu_v2(struct meminfo *si) cnt = 0; - get_symbol_data("cache_chain", sizeof(ulong), &si->cache); - si->cache -= OFFSET(kmem_cache_s_next); - cache_end = symbol_value("cache_chain"); + if (si->cache) { + readmem(si->cache+OFFSET(kmem_cache_s_next), + KVADDR, &cache_end, sizeof(ulong), + "kmem_cache_s next", FAULT_ON_ERROR); + } else { + get_symbol_data("cache_chain", sizeof(ulong), &si->cache); + si->cache -= OFFSET(kmem_cache_s_next); + cache_end = symbol_value("cache_chain"); + } if (si->flags & ADDRESS_SPECIFIED) { if (!(p1 = vaddr_to_kmem_cache(si->spec_addr, kbuf, VERBOSE))) {