From 9e428e5f7fafc83c3948ed693282f868868ba551 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 24 Jul 2012 03:13:10 +0100 Subject: [PATCH] Include package version along with kernel release in stack traces Forwarded: not-needed For distribution binary packages we assume $DISTRIBUTION_OFFICIAL_BUILD, $DISTRIBUTOR and $DISTRIBUTION_VERSION are set. Gbp-Pq: Topic debian Gbp-Pq: Name version.patch --- Makefile | 16 +++++++++++++++- arch/ia64/kernel/process.c | 5 +++-- arch/powerpc/kernel/process.c | 6 ++++-- arch/x86/um/sysrq_64.c | 6 ++++-- kernel/hung_task.c | 6 ++++-- lib/dump_stack.c | 7 +++++-- 6 files changed, 35 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index f86e26fa0b3..5517120fd06 100644 --- a/Makefile +++ b/Makefile @@ -1285,7 +1285,8 @@ PHONY += prepare archprepare archprepare: outputmakefile archheaders archscripts scripts include/config/kernel.release \ asm-generic $(version_h) $(autoksyms_h) include/generated/utsrelease.h \ - include/generated/compile.h include/generated/autoconf.h remove-stale-files + include/generated/compile.h include/generated/autoconf.h \ + include/generated/package.h remove-stale-files prepare0: archprepare $(Q)$(MAKE) $(build)=scripts/mod @@ -1343,6 +1344,16 @@ define filechk_version.h echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL) endef +ifneq ($(DISTRIBUTION_OFFICIAL_BUILD),) +define filechk_package.h + echo \#define LINUX_PACKAGE_ID \" $(DISTRIBUTOR) $(DISTRIBUTION_VERSION)\" +endef +else +define filechk_package.h + echo \#define LINUX_PACKAGE_ID \"\" +endef +endif + $(version_h): PATCHLEVEL := $(or $(PATCHLEVEL), 0) $(version_h): SUBLEVEL := $(or $(SUBLEVEL), 0) $(version_h): FORCE @@ -1357,6 +1368,9 @@ filechk_compile.h = $(srctree)/scripts/mkcompile_h \ include/generated/compile.h: FORCE $(call filechk,compile.h) +include/generated/package.h: $(srctree)/Makefile FORCE + $(call filechk,package.h) + PHONY += headerdep headerdep: $(Q)find $(srctree)/include/ -name '*.h' | xargs --max-args 1 \ diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index 416305e550e..ef88a671284 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -102,9 +103,9 @@ show_regs (struct pt_regs *regs) print_modules(); printk("\n"); show_regs_print_info(KERN_DEFAULT); - printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n", + printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s%s)\n", regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(), - init_utsname()->release); + init_utsname()->release, LINUX_PACKAGE_ID); printk("ip is at %pS\n", (void *)ip); printk("unat: %016lx pfs : %016lx rsc : %016lx\n", regs->ar_unat, regs->ar_pfs, regs->ar_rsc); diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index f2cbad52288..2716fe7871a 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -1520,8 +1521,9 @@ static void __show_regs(struct pt_regs *regs) printk("NIP: "REG" LR: "REG" CTR: "REG"\n", regs->nip, regs->link, regs->ctr); - printk("REGS: %px TRAP: %04lx %s (%s)\n", - regs, regs->trap, print_tainted(), init_utsname()->release); + printk("REGS: %px TRAP: %04lx %s (%s%s)\n", + regs, regs->trap, print_tainted(), init_utsname()->release, + LINUX_PACKAGE_ID); printk("MSR: "REG" ", regs->msr); print_msr_bits(regs->msr); pr_cont(" CR: %08lx XER: %08lx\n", regs->ccr, regs->xer); diff --git a/arch/x86/um/sysrq_64.c b/arch/x86/um/sysrq_64.c index ef1eb4f4f61..a09c4e36118 100644 --- a/arch/x86/um/sysrq_64.c +++ b/arch/x86/um/sysrq_64.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -17,8 +18,9 @@ void show_regs(struct pt_regs *regs) { printk("\n"); print_modules(); - printk(KERN_INFO "Pid: %d, comm: %.20s %s %s\n", task_pid_nr(current), - current->comm, print_tainted(), init_utsname()->release); + printk(KERN_INFO "Pid: %d, comm: %.20s %s %s%s\n", task_pid_nr(current), + current->comm, print_tainted(), init_utsname()->release, + LINUX_PACKAGE_ID); printk(KERN_INFO "RIP: %04lx:%pS\n", PT_REGS_CS(regs) & 0xffff, (void *)PT_REGS_IP(regs)); printk(KERN_INFO "RSP: %016lx EFLAGS: %08lx\n", PT_REGS_SP(regs), diff --git a/kernel/hung_task.c b/kernel/hung_task.c index c71889f3f3f..784c3756122 100644 --- a/kernel/hung_task.c +++ b/kernel/hung_task.c @@ -24,6 +24,7 @@ #include #include +#include /* * The number of tasks checked: @@ -131,10 +132,11 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout) sysctl_hung_task_warnings--; pr_err("INFO: task %s:%d blocked for more than %ld seconds.\n", t->comm, t->pid, (jiffies - t->last_switch_time) / HZ); - pr_err(" %s %s %.*s\n", + pr_err(" %s %s %.*s%s\n", print_tainted(), init_utsname()->release, (int)strcspn(init_utsname()->version, " "), - init_utsname()->version); + init_utsname()->version, + LINUX_PACKAGE_ID); pr_err("\"echo 0 > /proc/sys/kernel/hung_task_timeout_secs\"" " disables this message.\n"); sched_show_task(t); diff --git a/lib/dump_stack.c b/lib/dump_stack.c index 83471e81501..ad4e7fb21a8 100644 --- a/lib/dump_stack.c +++ b/lib/dump_stack.c @@ -14,6 +14,7 @@ #include #include #include +#include static char dump_stack_arch_desc_str[128]; @@ -54,13 +55,15 @@ void __init dump_stack_set_arch_desc(const char *fmt, ...) */ void dump_stack_print_info(const char *log_lvl) { - printk("%sCPU: %d PID: %d Comm: %.20s %s%s %s %.*s" BUILD_ID_FMT "\n", + printk("%sCPU: %d PID: %d Comm: %.20s %s%s %s %.*s %s" BUILD_ID_FMT "\n", log_lvl, raw_smp_processor_id(), current->pid, current->comm, kexec_crash_loaded() ? "Kdump: loaded " : "", print_tainted(), init_utsname()->release, (int)strcspn(init_utsname()->version, " "), - init_utsname()->version, BUILD_ID_VAL); + init_utsname()->version, + LINUX_PACKAGE_ID, + BUILD_ID_VAL); if (dump_stack_arch_desc_str[0] != '\0') printk("%sHardware name: %s\n", -- 2.30.2