From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5] helo=mx0a-001b2d01.pphosted.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIXqr-0007sO-2e for kexec@lists.infradead.org; Wed, 16 Sep 2020 13:52:01 +0000 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 08GDY6ni074503 for ; Wed, 16 Sep 2020 09:52:00 -0400 Received: from ppma03fra.de.ibm.com (6b.4a.5195.ip4.static.sl-reverse.com [149.81.74.107]) by mx0b-001b2d01.pphosted.com with ESMTP id 33kkc79ajk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 16 Sep 2020 09:52:00 -0400 Received: from pps.filterd (ppma03fra.de.ibm.com [127.0.0.1]) by ppma03fra.de.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 08GDn7ST020392 for ; Wed, 16 Sep 2020 13:51:58 GMT Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by ppma03fra.de.ibm.com with ESMTP id 33k65v0c56-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 16 Sep 2020 13:51:58 +0000 From: Alexander Egorenkov Subject: [PATCH v2 1/1] Calculate offset to field 'init_uts_ns.name' Date: Wed, 16 Sep 2020 15:51:47 +0200 Message-Id: <20200916135147.1303016-1-egorenar@linux.ibm.com> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: kexec@lists.infradead.org Cc: Alexander Egorenkov The offset has changed in linux-next (v5.9.0) from 4 to 0 because there is no more 'kref' member variable at the beginning of 'init_uts_ns'. The change was introduced with commit 9a56493f6942c0e2df1579986128721da96e00d8. To handle both cases correctly, calculate the offset at run time instead. Signed-off-by: Alexander Egorenkov --- makedumpfile.c | 8 ++++++-- makedumpfile.h | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/makedumpfile.c b/makedumpfile.c index 4c4251e..2d62db8 100644 --- a/makedumpfile.c +++ b/makedumpfile.c @@ -1159,7 +1159,7 @@ check_release(void) if (SYMBOL(system_utsname) != NOT_FOUND_SYMBOL) { utsname = SYMBOL(system_utsname); } else if (SYMBOL(init_uts_ns) != NOT_FOUND_SYMBOL) { - utsname = SYMBOL(init_uts_ns) + sizeof(int); + utsname = SYMBOL(init_uts_ns) + OFFSET(init_uts_ns.name); } else { ERRMSG("Can't get the symbol of system_utsname.\n"); return FALSE; @@ -2077,7 +2077,7 @@ get_str_osrelease_from_vmlinux(void) if (SYMBOL(system_utsname) != NOT_FOUND_SYMBOL) { utsname = SYMBOL(system_utsname); } else if (SYMBOL(init_uts_ns) != NOT_FOUND_SYMBOL) { - utsname = SYMBOL(init_uts_ns) + sizeof(int); + utsname = SYMBOL(init_uts_ns) + OFFSET(init_uts_ns.name); } else { ERRMSG("Can't get the symbol of system_utsname.\n"); return FALSE; @@ -2285,6 +2285,8 @@ write_vmcoreinfo_data(void) WRITE_MEMBER_OFFSET("mmu_psize_def.shift", mmu_psize_def.shift); WRITE_MEMBER_OFFSET("cpu_spec.mmu_features", cpu_spec.mmu_features); + WRITE_MEMBER_OFFSET("init_uts_ns.name", init_uts_ns.name); + if (SYMBOL(node_data) != NOT_FOUND_SYMBOL) WRITE_ARRAY_LENGTH("node_data", node_data); if (SYMBOL(pgdat_list) != NOT_FOUND_SYMBOL) @@ -2697,6 +2699,8 @@ read_vmcoreinfo(void) READ_MEMBER_OFFSET("log.text_len", printk_log.text_len); } + READ_MEMBER_OFFSET("init_uts_ns.name", init_uts_ns.name); + READ_ARRAY_LENGTH("node_data", node_data); READ_ARRAY_LENGTH("pgdat_list", pgdat_list); READ_ARRAY_LENGTH("mem_section", mem_section); diff --git a/makedumpfile.h b/makedumpfile.h index 03fb4ce..7d8c54d 100644 --- a/makedumpfile.h +++ b/makedumpfile.h @@ -1880,6 +1880,10 @@ struct offset_table { struct cpu_spec_s { long mmu_features; } cpu_spec; + + struct init_uts_ns_s { + long name; + } init_uts_ns; }; /* -- 2.26.2 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec