Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions .github/workflows/run_regression_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,37 @@ jobs:
fail-fast: false
matrix:
version: [
'7.1',
'7.0.12',
'7.2',
'7.1.8',
'7.0.14',
'6.19.14',
'6.18.35',
'6.18.44',
'6.17.13',
'6.16.12',
'6.15.11',
'6.14.11',
'6.13.12',
'6.12.93',
'6.12.103',
'6.11.11',
'6.10.14',
'6.9.12',
'6.8.12',
'6.7.12',
'6.6.142',
'6.1.175',
'5.15.209',
'5.10.258',
'6.6.151',
'6.1.182',
'5.15.215',
'5.10.264',
'5.4.302',
'4.19.325',
'4.14.336',
'4.9.337',
'3.18.140',
'3.10.108',
'6.12.0-211.22.1.el10_2^Rocky^10.2',
'6.12.0-211.47.1.el10_2^Rocky^10.2',
'6.12.0-124.56.1.el10_1^Rocky^10.1',
'5.14.0-687.15.1.el9_8^Rocky^9.8',
'5.14.0-687.39.1.el9_8^Rocky^9.8',
'5.14.0-611.55.1.el9_7^Rocky^9.7',
'4.18.0-553.132.1.el8_10^Rocky^8.10',
'4.18.0-553.155.1.el8_10^Rocky^8.10',
'6.12.0-55.43.1.el10_0^AlmaLinux^10.0',
'5.14.0-570.62.1.el9_6^AlmaLinux^9.6',
'5.14.0-503.40.1.el9_5^AlmaLinux^9.5',
Expand All @@ -63,9 +64,9 @@ jobs:
'4.18.0-240.22.1.el8_3^AlmaLinux^8.3',
'3.10.0-1160.118.1.el7^CentOS^7.9.2009',
'3.10.0-862.14.4.el7^CentOS^7.5.1804',
'6.12.0-203.76.7.1.el10uek^UEK^10',
'5.15.0-321.202.5.2.el9uek^UEK^9',
'5.4.17-2136.356.4.2.el8uek^UEK^8',
'6.12.0-205.92.4.2.el10uek^UEK^10',
'5.15.0-323.211.3.4.el9uek^UEK^9',
'5.4.17-2136.358.2.1.el8uek^UEK^8',
'4.14.35-2047.543.3.1.el7uek^UEK^7',
'4.1.12-124.93.1.el7uek^UEK^7'
]
Expand Down
29 changes: 15 additions & 14 deletions nightly/conf/nightly.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,39 @@
ABT_DETAILS="x86_64"
ABT_JOBS=5
ABT_KERNELS=" \
7.1 \
7.0.12-nc \
7.2 \
7.1.8-nc \
7.0.14-nc \
6.19.14-nc \
6.18.35-nc \
6.18.44-nc \
6.17.13-nc \
6.16.12-nc \
6.15.11-nc \
6.14.11-nc \
6.13.12-nc \
6.12.93-nc \
6.12.103-nc \
6.11.11-nc \
6.10.14-nc \
6.9.12-nc \
6.8.12-nc \
6.7.12-nc \
6.6.142-nc \
6.6.151-nc \
6.5.13-nc \
6.4.16-nc \
6.3.13-nc \
6.2.16-nc \
6.1.175-nc \
6.1.182-nc \
6.0.19-nc \
5.19.17-nc \
5.18.19-nc \
5.17.15-nc \
5.16.20-nc \
5.15.209-nc \
5.15.215-nc \
5.14.21-nc \
5.13.19-nc \
5.12.19-nc \
5.11.22-nc \
5.10.258-nc \
5.10.264-nc \
5.9.16-nc \
5.8.18-nc \
5.7.19-nc \
Expand Down Expand Up @@ -76,11 +77,11 @@ ABT_KERNELS=" \
3.12.74-nc \
3.11.10-nc \
3.10.108-nc \
6.12.0-211.22.1.el10_2^Rocky^10.2-nc \
6.12.0-211.47.1.el10_2^Rocky^10.2-nc \
6.12.0-124.56.1.el10_1^Rocky^10.1-nc \
5.14.0-687.15.1.el9_8^Rocky^9.8-nc \
5.14.0-687.39.1.el9_8^Rocky^9.8-nc \
5.14.0-611.55.1.el9_7^Rocky^9.7-nc \
4.18.0-553.132.1.el8_10^Rocky^8.10-nc \
4.18.0-553.155.1.el8_10^Rocky^8.10-nc \
6.12.0-55.43.1.el10_0^AlmaLinux^10.0-nc \
5.14.0-570.62.1.el9_6^AlmaLinux^9.6-nc \
5.14.0-503.40.1.el9_5^AlmaLinux^9.5-nc \
Expand All @@ -104,9 +105,9 @@ ABT_KERNELS=" \
3.10.0-1062.18.1.el7^CentOS^7.7.1908-nc \
3.10.0-957.27.2.el7^CentOS^7.6.1810-nc \
3.10.0-862.14.4.el7^CentOS^7.5.1804-nc \
6.12.0-203.76.7.1.el10uek^UEK^10-nc \
5.15.0-321.202.5.2.el9uek^UEK^9-nc \
5.4.17-2136.356.4.2.el8uek^UEK^8-nc \
6.12.0-205.92.4.2.el10uek^UEK^10-nc \
5.15.0-323.211.3.4.el9uek^UEK^9-nc \
5.4.17-2136.358.2.1.el8uek^UEK^8-nc \
4.14.35-2047.543.3.1.el7uek^UEK^7-nc \
4.1.12-124.93.1.el7uek^UEK^7-nc \
"
16 changes: 14 additions & 2 deletions scst/include/backport.h
Original file line number Diff line number Diff line change
Expand Up @@ -1716,10 +1716,16 @@ static inline struct kmem_cache *kmem_cache_create_usercopy(const char *name,
sizeof_field(struct __struct, __field), NULL)
#endif

#if LINUX_VERSION_CODE < KERNEL_VERSION(7, 0, 0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(7, 0, 0) && \
(LINUX_VERSION_CODE >> 8 != KERNEL_VERSION(6, 18, 0) >> 8 || \
LINUX_VERSION_CODE < KERNEL_VERSION(6, 18, 39)) && \
(LINUX_VERSION_CODE >> 8 != KERNEL_VERSION(6, 12, 0) >> 8 || \
LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 97))
/*
* See also commit e19e1b480ac7 ("add default_gfp() helper macro and use it
* in the new *alloc_obj() helpers") # v7.0.
* See also commit 50c26b461b8e # v6.18.39.
* See also commit 62554fc32b08 # v6.12.97.
*/
#define __default_gfp(a,...) a
#define default_gfp(...) __default_gfp(__VA_ARGS__ __VA_OPT__(,) GFP_KERNEL)
Expand Down Expand Up @@ -1793,9 +1799,15 @@ static inline struct kmem_cache *kmem_cache_create_usercopy(const char *name,
__alloc_objs(kvzalloc, default_gfp(__VA_ARGS__), typeof(P), COUNT)
#endif

#if LINUX_VERSION_CODE < KERNEL_VERSION(7, 0, 0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(7, 0, 0) && \
(LINUX_VERSION_CODE >> 8 != KERNEL_VERSION(6, 18, 0) >> 8 || \
LINUX_VERSION_CODE < KERNEL_VERSION(6, 18, 39)) && \
(LINUX_VERSION_CODE >> 8 != KERNEL_VERSION(6, 12, 0) >> 8 || \
LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 97))
/*
* See also commit e4c8b46b924e ("slab: Introduce kmalloc_flex() and family") # v7.0.
* See also commit 2dca62902eb3 # v6.18.39.
* See also commit 5be0caeeb9a3 # v6.12.97.
*/
#define __alloc_flex(KMALLOC, GFP, TYPE, FAM, COUNT) \
({ \
Expand Down
Loading