Message ID | 1437461926-8908-8-git-send-email-khandual@linux.vnet.ibm.com (mailing list archive) |
---|---|
State | Changes Requested |
Headers | show |
On Tue, 2015-21-07 at 06:58:46 UTC, Anshuman Khandual wrote: > From: "khandual@linux.vnet.ibm.com" <khandual@linux.vnet.ibm.com> > > This patch adds some more elements to the existing PACA dump list > inside a xmon session which can be listed here. > > - hmi_event_available > - dscr_default > - vmalloc_sllp > - slb_cache_ptr > - sprg_vdso > - tm_scratch > - core_idle_state_ptr > - thread_idle_state > - thread_mask This is probably OK, except you broke the ppc64e build again. cheers ../arch/powerpc/xmon/xmon.c: In function ‘dump_one_paca’: ../arch/powerpc/xmon/xmon.c:2095:63: error: ‘struct paca_struct’ has no member named ‘vmalloc_sllp’ printf(" %-*s = %#-*"format"\t(0x%lx)\n", 20, #name, 18, paca->name, \ ^ ../arch/powerpc/xmon/xmon.c:2114:2: note: in expansion of macro ‘DUMP’ DUMP(p, vmalloc_sllp, "x"); ^ In file included from ../include/linux/compiler.h:56:0, from ../include/uapi/linux/stddef.h:1, from ../include/linux/stddef.h:4, from ../include/uapi/linux/posix_types.h:4, from ../include/uapi/linux/types.h:13, from ../include/linux/types.h:5, from ../include/uapi/linux/capability.h:16, from ../include/linux/capability.h:15, from ../include/linux/sched.h:15, from ../arch/powerpc/xmon/xmon.c:14: ../include/linux/compiler-gcc.h:158:2: error: ‘struct paca_struct’ has no member named ‘vmalloc_sllp’ __builtin_offsetof(a, b) ^ ../include/linux/stddef.h:16:32: note: in expansion of macro ‘__compiler_offsetof’ #define offsetof(TYPE, MEMBER) __compiler_offsetof(TYPE, MEMBER) ^ ../arch/powerpc/xmon/xmon.c:2096:3: note: in expansion of macro ‘offsetof’ offsetof(struct paca_struct, name)); ^ ../arch/powerpc/xmon/xmon.c:2114:2: note: in expansion of macro ‘DUMP’ DUMP(p, vmalloc_sllp, "x"); ^ ../arch/powerpc/xmon/xmon.c:2095:63: error: ‘struct paca_struct’ has no member named ‘slb_cache_ptr’ printf(" %-*s = %#-*"format"\t(0x%lx)\n", 20, #name, 18, paca->name, \ ^ ../arch/powerpc/xmon/xmon.c:2115:2: note: in expansion of macro ‘DUMP’ DUMP(p, slb_cache_ptr, "x"); ^ In file included from ../include/linux/compiler.h:56:0, from ../include/uapi/linux/stddef.h:1, from ../include/linux/stddef.h:4, from ../include/uapi/linux/posix_types.h:4, from ../include/uapi/linux/types.h:13, from ../include/linux/types.h:5, from ../include/uapi/linux/capability.h:16, from ../include/linux/capability.h:15, from ../include/linux/sched.h:15, from ../arch/powerpc/xmon/xmon.c:14: ../include/linux/compiler-gcc.h:158:2: error: ‘struct paca_struct’ has no member named ‘slb_cache_ptr’ __builtin_offsetof(a, b) ^ ../include/linux/stddef.h:16:32: note: in expansion of macro ‘__compiler_offsetof’ #define offsetof(TYPE, MEMBER) __compiler_offsetof(TYPE, MEMBER) ^ ../arch/powerpc/xmon/xmon.c:2096:3: note: in expansion of macro ‘offsetof’ offsetof(struct paca_struct, name)); ^ ../arch/powerpc/xmon/xmon.c:2115:2: note: in expansion of macro ‘DUMP’ DUMP(p, slb_cache_ptr, "x"); ^ ../arch/powerpc/xmon/xmon.c:2116:19: error: ‘struct paca_struct’ has no member named ‘slb_cache_ptr’ for (i = 0; i < p->slb_cache_ptr; i++) ^ ../arch/powerpc/xmon/xmon.c:2117:50: error: ‘struct paca_struct’ has no member named ‘slb_cache’ printf(" slb_cache[%d]: = 0x%lx\n", i, p->slb_cache[i]); ^ make[2]: *** [arch/powerpc/xmon/xmon.o] Error 1 make[1]: *** [arch/powerpc/xmon] Error 2
On 07/21/2015 03:38 PM, Michael Ellerman wrote: > On Tue, 2015-21-07 at 06:58:46 UTC, Anshuman Khandual wrote: >> > From: "khandual@linux.vnet.ibm.com" <khandual@linux.vnet.ibm.com> >> > >> > This patch adds some more elements to the existing PACA dump list >> > inside a xmon session which can be listed here. >> > >> > - hmi_event_available >> > - dscr_default >> > - vmalloc_sllp >> > - slb_cache_ptr >> > - sprg_vdso >> > - tm_scratch >> > - core_idle_state_ptr >> > - thread_idle_state >> > - thread_mask > This is probably OK, except you broke the ppc64e build again. Will fix it up while sending this as a patch series. Thanks for the quick review of the series.
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 1798e21..bc42f6e 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c @@ -2073,6 +2073,7 @@ static void xmon_rawdump (unsigned long adrs, long ndump) static void dump_one_paca(int cpu) { struct paca_struct *p; + int i; if (setjmp(bus_error_jmp) != 0) { printf("*** Error dumping paca for cpu 0x%x!\n", cpu); @@ -2086,12 +2087,12 @@ static void dump_one_paca(int cpu) printf("paca for cpu 0x%x @ %p:\n", cpu, p); - printf(" %-*s = %s\n", 16, "possible", cpu_possible(cpu) ? "yes" : "no"); - printf(" %-*s = %s\n", 16, "present", cpu_present(cpu) ? "yes" : "no"); - printf(" %-*s = %s\n", 16, "online", cpu_online(cpu) ? "yes" : "no"); + printf(" %-*s = %s\n", 20, "possible", cpu_possible(cpu) ? "yes" : "no"); + printf(" %-*s = %s\n", 20, "present", cpu_present(cpu) ? "yes" : "no"); + printf(" %-*s = %s\n", 20, "online", cpu_online(cpu) ? "yes" : "no"); #define DUMP(paca, name, format) \ - printf(" %-*s = %#-*"format"\t(0x%lx)\n", 16, #name, 18, paca->name, \ + printf(" %-*s = %#-*"format"\t(0x%lx)\n", 20, #name, 18, paca->name, \ offsetof(struct paca_struct, name)); DUMP(p, lock_token, "x"); @@ -2103,11 +2104,17 @@ static void dump_one_paca(int cpu) #ifdef CONFIG_PPC_BOOK3S_64 DUMP(p, mc_emergency_sp, "p"); DUMP(p, in_mce, "x"); + DUMP(p, hmi_event_available, "x"); #endif DUMP(p, data_offset, "lx"); DUMP(p, hw_cpu_id, "x"); DUMP(p, cpu_start, "x"); DUMP(p, kexec_state, "x"); + DUMP(p, dscr_default, "llx"); + DUMP(p, vmalloc_sllp, "x"); + DUMP(p, slb_cache_ptr, "x"); + for (i = 0; i < p->slb_cache_ptr; i++) + printf(" slb_cache[%d]: = 0x%lx\n", i, p->slb_cache[i]); DUMP(p, __current, "p"); DUMP(p, kstack, "lx"); DUMP(p, stab_rr, "lx"); @@ -2118,6 +2125,18 @@ static void dump_one_paca(int cpu) DUMP(p, io_sync, "x"); DUMP(p, irq_work_pending, "x"); DUMP(p, nap_state_lost, "x"); + DUMP(p, sprg_vdso, "llx"); + +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM + DUMP(p, tm_scratch, "llx"); +#endif + +#ifdef CONFIG_PPC_POWERNV + DUMP(p, core_idle_state_ptr, "p"); + DUMP(p, thread_idle_state, "x"); + DUMP(p, thread_mask, "x"); + DUMP(p, subcore_sibling_mask, "x"); +#endif #undef DUMP