From 94cac34962bd2a9f6b86cd5d9c369da868f09027 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mon, 9 Nov 2020 16:08:42 +0000
Subject: [PATCH] import crash-7.2.8-8.el8

---
 .../rhel8_arm64_idmap_ptrs_per_pgd_fix.patch  | 30 +++++++++++++++++++
 SPECS/crash.spec                              |  8 ++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/rhel8_arm64_idmap_ptrs_per_pgd_fix.patch

diff --git a/SOURCES/rhel8_arm64_idmap_ptrs_per_pgd_fix.patch b/SOURCES/rhel8_arm64_idmap_ptrs_per_pgd_fix.patch
new file mode 100644
index 0000000..4d24e81
--- /dev/null
+++ b/SOURCES/rhel8_arm64_idmap_ptrs_per_pgd_fix.patch
@@ -0,0 +1,30 @@
+commit ba7c7b89f0e959342c6a5204653366820fb630ef
+Author: Bhupesh Sharma <bhsharma@redhat.com>
+Date:   Thu Nov 5 16:26:17 2020 +0530
+
+    rhel8 only patch
+
+    Since we reverted to the implementation used in crash-7.2.3-17.el8 for
+    arm64 52-bit changes (see 'crash/arm64: Revert to implementation used
+    in crash-7.2.3-17.el8  [Support for CONFIG_ARM64_USER_VA_BITS_52 and
+    CONFIG_ARM64_PA_BITS=52]' for details), add the missing QUIET argument
+    if the read access to the 'idmap_ptrs_per_pgd' symbol failed.
+    
+    This will do away with the warning message we get in case the
+    'idmap_ptrs_per_pgd' symbol is not found via readmem().
+    
+    Signed-off-by: Bhupesh Sharma <bhsharma@redhat.com>
+
+diff --git a/arm64.c b/arm64.c
+index dfcde6e11359..6d825c9e67de 100644
+--- a/arm64.c
++++ b/arm64.c
+@@ -266,7 +266,7 @@ arm64_init(int when)
+ 		case 65536:
+ 			if (kernel_symbol_exists("idmap_ptrs_per_pgd") &&
+ 			    readmem(symbol_value("idmap_ptrs_per_pgd"), KVADDR,
+-			    &value, sizeof(ulong), "idmap_ptrs_per_pgd", RETURN_ON_ERROR))
++			    &value, sizeof(ulong), "idmap_ptrs_per_pgd", QUIET|RETURN_ON_ERROR))
+ 				machdep->ptrs_per_pgd = value;
+ 		
+ 			if (machdep->machspec->VA_BITS > PGDIR_SHIFT_L3_64K) {
diff --git a/SPECS/crash.spec b/SPECS/crash.spec
index e20f26b..022df77 100644
--- a/SPECS/crash.spec
+++ b/SPECS/crash.spec
@@ -4,7 +4,7 @@
 Summary: Kernel analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles
 Name: crash
 Version: 7.2.8
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv3
 Group: Development/Debuggers
 Source0: https://github.com/crash-utility/crash/archive/crash-%{version}.tar.gz
@@ -23,6 +23,7 @@ Patch3: github_0f29a8ac6b73.patch
 Patch4: github_1c45cea02df7.patch
 Patch5: github_9596b4388ea5.patch
 Patch6: github_b97e7fd4e826_to_8b50d94ada21.patch
+Patch7: rhel8_arm64_idmap_ptrs_per_pgd_fix.patch
 
 %description
 The core analysis suite is a self-contained tool that can be used to
@@ -50,6 +51,7 @@ offered by Mission Critical Linux, or the LKCD kernel patch.
 %patch4 -p1 -b github_1c45cea02df7.patch
 %patch5 -p1 -b github_9596b4388ea5.patch
 %patch6 -p1 -b github_b97e7fd4e826_to_8b50d94ada21.patch
+%patch7 -p1 -b rhel8_arm64_idmap_ptrs_per_pgd_fix.patch
 
 %build
 cp %{SOURCE1} .
@@ -80,6 +82,10 @@ rm -rf %{buildroot}
 %{_includedir}/*
 
 %changelog
+* Wed Nov 5 2020 Bhupesh Sharma <bhsharma@redhat.com> - 7.2.8-8
+- crash/arm64: Fix arm64 read error with 'idmap_ptrs_per_pgd' symbol with debug kernel
+  Resolves: rhbz#1876039
+
 * Mon Aug 17 2020 Bhupesh Sharma <bhsharma@redhat.com> - 7.2.8-7
 - crash/sadump, kaslr: fix failure of calculating kaslr_offset due to an sadump format restriction
   Resolves: rhbz#1855527