packages/crash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!70 arm64: Add lowercase tcr_el1_t1sz

Browse Source 
From: @huskartang 
Reviewed-by: @wangbin224 
Signed-off-by: @wangbin224
This commit is contained in:
openeuler-ci-bot 2022-12-29 03:42:33 +00:00 committed by Gitee
commit 5e1c30fc74
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
0009-Add-lowercase-tcr_el1_t1sz.patch Normal file
View File

@ -0,0 +1,41 @@
From 3085ad7bf654c2fe1aefe5023d83b91c3c7f8aa8 Mon Sep 17 00:00:00 2001
From: huskarTang <tanly6@chinatelecom.cn>
Date: Thu, 29 Dec 2022 11:11:16 +0800
Subject: [PATCH] arm64: Add lowercase tcr_el1_t1sz
---
arm64.c | 3 ++-
netdump.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arm64.c b/arm64.c
index c703dd9..5d76a25 100644
--- a/arm64.c
+++ b/arm64.c
@@ -4177,7 +4177,8 @@ arm64_calc_VA_BITS(void)
} else if (ACTIVE())
error(FATAL, "cannot determine VA_BITS_ACTUAL: please use /proc/kcore\n");
else {
- if ((string = pc->read_vmcoreinfo("NUMBER(TCR_EL1_T1SZ)"))) {
+ if ((string = pc->read_vmcoreinfo("NUMBER(TCR_EL1_T1SZ)")) ||
+ (string = pc->read_vmcoreinfo("NUMBER(tcr_el1_t1sz)"))) {
/* See ARMv8 ARM for the description of
* TCR_EL1.T1SZ and how it can be used
* to calculate the vabits_actual
diff --git a/netdump.c b/netdump.c
index c1c9cbf..aaea945 100644
--- a/netdump.c
+++ b/netdump.c
@@ -1921,7 +1921,8 @@ vmcoreinfo_read_string(const char *key)
sprintf(value, "%ld", nd->arch_data2 & 0xffffffff);
return value;
}
- if (STREQ(key, "NUMBER(TCR_EL1_T1SZ)") && nd->arch_data2) {
+ if ((STREQ(key, "NUMBER(TCR_EL1_T1SZ)") ||
+ STREQ(key, "NUMBER(tcr_el1_t1sz)")) && nd->arch_data2) {
value = calloc(VADDR_PRLEN+1, sizeof(char));
sprintf(value, "%lld", ((ulonglong)nd->arch_data2 >> 32) & 0xffffffff);
pc->read_vmcoreinfo = no_vmcoreinfo;
--
2.7.4

9
crash.spec
View File

@ -1,6 +1,6 @@
Name: crash
Version: 7.3.0
Release: 8
Release: 9
Summary: Linux kernel crash utility.
License: GPLv3
URL: https://crash-utility.github.io
@ -18,6 +18,8 @@ Patch7: 0006-Handle-task_struct-cpu-member-changes-for-kernels-5.1.patch
Patch8: 0007-crash-7.3.0-sw.patch
%endif
Patch9: 0008-arm64-fix-backtraces-of-KASAN-kernel-dumpfile-truncated.patch
Patch10: 0009-Add-lowercase-tcr_el1_t1sz.patch
BuildRequires: ncurses-devel zlib-devel lzo-devel snappy-devel
BuildRequires: gcc gcc-c++ bison m4
@ -83,7 +85,10 @@ install -D -m 0644 defs.h %{buildroot}%{_includedir}/%{name}/defs.h
%{_mandir}/man8/crash.8*
%changelog
* Wed Dec 28 2022 tanly <tanly6@chinatelecom.cn> - 7.3.0-8
* Thu Dec 29 2022 huskartang <tanly6@chinatelecom.cn> - 7.3.0-9
- Add lowercase tcr_el1_t1sz
* Wed Dec 28 2022 huskartang <tanly6@chinatelecom.cn> - 7.3.0-8
- rename pathes to keep in order
* Thu Dec 1 2022 Ding Hui <dinghui@sangfor.com.cn> - 7.3.0-7