<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, May 26, 2021 at 10:34 AM HAGIO KAZUHITO(萩尾 一仁) <<a href="mailto:k-hagio-ab@nec.com">k-hagio-ab@nec.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">From: John Donnelly <<a href="mailto:john.p.donnelly@oracle.com" target="_blank">john.p.donnelly@oracle.com</a>><br>
<br>
Commit 1c45cea "arm64: Change tcr_el1_t1sz variable name to<br>
TCR_EL1_T1SZ", renamed the variable to upper case, but there are<br>
kernels in existence that still have the lower case name, which<br>
breaks crash backwards compatibility.<br>
<br></blockquote><div><br></div><div>Acked-by: Lianbo Jiang <<a href="mailto:lijiang@redhat.com">lijiang@redhat.com</a>></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
Resolves: <a href="https://github.com/crash-utility/crash/pull/82" rel="noreferrer" target="_blank">https://github.com/crash-utility/crash/pull/82</a><br>
Signed-off-by: John Donnelly <<a href="mailto:john.p.donnelly@oracle.com" target="_blank">john.p.donnelly@oracle.com</a>><br>
Signed-off-by: Kazuhito Hagio <<a href="mailto:k-hagio-ab@nec.com" target="_blank">k-hagio-ab@nec.com</a>><br>
---<br>
The lowercase tcr_el1_t1sz was not seen upstream, but crash had it<br>
once, we should have added the uppercase name, not replaced it.<br>
So I ack this.<br>
<br>
arm64.c | 3 ++-<br>
netdump.c | 3 ++-<br>
2 files changed, 4 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/arm64.c b/arm64.c<br>
index 4787fa61e3e5..8934961b109d 100644<br>
--- a/arm64.c<br>
+++ b/arm64.c<br>
@@ -3936,7 +3936,8 @@ arm64_calc_VA_BITS(void)<br>
} else if (ACTIVE())<br>
error(FATAL, "cannot determine VA_BITS_ACTUAL: please use /proc/kcore\n");<br>
else {<br>
- if ((string = pc->read_vmcoreinfo("NUMBER(TCR_EL1_T1SZ)"))) {<br>
+ if ((string = pc->read_vmcoreinfo("NUMBER(TCR_EL1_T1SZ)")) ||<br>
+ (string = pc->read_vmcoreinfo("NUMBER(tcr_el1_t1sz)"))) {<br>
/* See ARMv8 ARM for the description of<br>
* TCR_EL1.T1SZ and how it can be used<br>
* to calculate the vabits_actual<br>
diff --git a/netdump.c b/netdump.c<br>
index c1c9cbfaed94..aaea945aaca7 100644<br>
--- a/netdump.c<br>
+++ b/netdump.c<br>
@@ -1921,7 +1921,8 @@ vmcoreinfo_read_string(const char *key)<br>
sprintf(value, "%ld", nd->arch_data2 & 0xffffffff);<br>
return value;<br>
}<br>
- if (STREQ(key, "NUMBER(TCR_EL1_T1SZ)") && nd->arch_data2) {<br>
+ if ((STREQ(key, "NUMBER(TCR_EL1_T1SZ)") ||<br>
+ STREQ(key, "NUMBER(tcr_el1_t1sz)")) && nd->arch_data2) {<br>
value = calloc(VADDR_PRLEN+1, sizeof(char));<br>
sprintf(value, "%lld", ((ulonglong)nd->arch_data2 >> 32) & 0xffffffff);<br>
pc->read_vmcoreinfo = no_vmcoreinfo;<br>
-- <br>
2.27.0<br>
<br>
</blockquote></div></div>