d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkgdep/git: Apply pci_aer_centos patch

Browse Source 
The latest QAT driver version which we support attempts to define
pci_cleanup_aer_uncorrect_error_status() whenever <= 5.7.0 kernels
are detected. However, in case of centos8, the latest 4.18 build of
the kernel which is available there includes patches which completely
removed use of this call.

To make sure this function is not built into the driver, apply the
patch on top of QAT which will remove this definition entirely. This
patch is meant to be applied only in case <= 5.7.0 kernel are picked
up and which are missing pci_cleanup_aer_uncorrect_error_status()
symbol definitions.

Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: Ieb09d5a1dc8936d6e266c6cadfdf9d70620a3bca
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6620
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Michal Berger 2021-03-02 11:13:04 +01:00 committed by Tomasz Zawadzki
parent a5fe2a6499
commit b2ff542576
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/common/config/pkgdep/git
View File

@ -168,8 +168,17 @@ function install_qat() {
# Patch name of the pci_aer function which was renamed in kernels >= 5.7.1. See .patch for details
if ((kernel_ver >= 0x050701)) || ! in_syms pci_cleanup_aer_uncorrect_error_status; then
# Patch only the driver version that was tested
[[ ${DRIVER_LOCATION_QAT##*/} == qat1.7.l.4.9.0-00008.tar.gz ]] && patch --dir="$GIT_REPOS/QAT" -p1
fi < "$rootdir/test/common/config/pkgdep/patches/qat/0001-pci_aer.patch"
if [[ ${DRIVER_LOCATION_QAT##*/} == qat1.7.l.4.9.0-00008.tar.gz ]]; then
patch --dir="$GIT_REPOS/QAT" -p1
fi < "$rootdir/test/common/config/pkgdep/patches/qat/0001-pci_aer.patch"
if ((kernel_ver < 0x050701)); then
# Older kernel build without pci_cleanup_aer_uncorrect_error_status()? This might be
# centos8's build.
if [[ ${DRIVER_LOCATION_QAT##*/} == qat1.7.l.4.12.0-00011.tar.gz ]]; then
patch --dir="$GIT_REPOS/QAT" -p1
fi < "$rootdir/test/common/config/pkgdep/patches/qat/0001-pci_aer_centos.patch"
fi
fi
# Patch use of cryptohash.h which was removed in favor of crypto/sha.h in kernels >= 5.8. See .patch for details
if ((kernel_ver >= 0x050800)); then

26
test/common/config/pkgdep/patches/qat/0001-pci_aer_centos.patch Normal file
View File

@ -0,0 +1,26 @@
Latest kernels available for centos8 (4.18) include backport patches which
dropped use of pci_cleanup_aer_uncorrect_error_status(). Make sure this
call won't be referenced for kernels older than 5.7. To make it work, this
patch is going to be applied only when pci_cleanup_aer_uncorrect_error_status()
is not detected in older kernels (like the centos8's builds).
---
quickassist/qat/compat/qat_compat.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/quickassist/qat/compat/qat_compat.h b/quickassist/qat/compat/qat_compat.h
index 06d640d..cee298c 100644
--- a/quickassist/qat/compat/qat_compat.h
+++ b/quickassist/qat/compat/qat_compat.h
@@ -478,12 +478,6 @@ static inline void pci_ignore_hotplug(struct pci_dev *dev)
#define QAT_KPT_CAP_DISCOVERY
#endif
-#if ((SLE_VERSION_CODE && (SLE_VERSION(15, 2, 0) > SLE_VERSION_CODE)) || \
- (!SLE_VERSION_CODE && KERNEL_VERSION(5, 7, 0) > LINUX_VERSION_CODE))
-#define pci_aer_clear_nonfatal_status(pdev) \
- pci_cleanup_aer_uncorrect_error_status(pdev)
-#endif /* SUSE15 SP2 */
-
#if (KERNEL_VERSION(3, 17, 0) > LINUX_VERSION_CODE)
#ifndef ktime_get_real_ts64
#define ktime_get_real_ts64 getnstimeofday