From f7e7b5f17fafba34879a180452dc83d3c84bb506 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 10 Mar 2019 16:23:16 +0000 Subject: [PATCH 1/6] nightly build: Update kernel versions git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8038 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- nightly/conf/nightly.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf index 28a42f1e2..5ca6436aa 100644 --- a/nightly/conf/nightly.conf +++ b/nightly/conf/nightly.conf @@ -3,9 +3,9 @@ ABT_DETAILS="x86_64" ABT_JOBS=5 ABT_KERNELS=" \ -5.0 \ -4.20.14-nc \ -4.19.27-nc \ +5.0.1 \ +4.20.15-nc \ +4.19.28-nc \ 4.18.18-nc \ 4.17.18-nc \ 4.16.18-nc \ From b80e470e36aa65b5bb265053e7af901e58892d0f Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 10 Mar 2019 16:28:37 +0000 Subject: [PATCH 2/6] scst: Remove recently introduced trailing whitespace git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8039 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_lib.c | 2 +- scst/src/scst_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index 8b128036d..04badc05d 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -4298,7 +4298,7 @@ void scst_free_device(struct scst_device *dev) percpu_ref_kill(&dev->refcnt); wait_for_completion(&c); - + TRACE_EXIT(); return; } diff --git a/scst/src/scst_main.c b/scst/src/scst_main.c index 8941186e0..7851ae9c4 100644 --- a/scst/src/scst_main.c +++ b/scst/src/scst_main.c @@ -2677,7 +2677,7 @@ static void __exit exit_scst(void) scst_event_exit(); rcu_barrier(); - + #define DEINIT_CACHEP(p) do { \ kmem_cache_destroy(p); \ p = NULL; \ From eb6a056300ffd2cbb22607b7291dbdaa4b38b186 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 10 Mar 2019 16:31:48 +0000 Subject: [PATCH 3/6] scst, LUN replacement: Add a missing if-test This was detected by smatch. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8040 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_lib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index 04badc05d..62cd5e417 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -4697,7 +4697,8 @@ int scst_acg_repl_lun(struct scst_acg *acg, struct kobject *parent, extra_tgt_dev_list_entry) { scst_free_tgt_dev(tgt_dev); } - scst_free_acg_dev(acg_dev); + if (acg_dev) + scst_free_acg_dev(acg_dev); out: return res; From c9d03b02751db54ebdd7a863072c144f05cab435 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 10 Mar 2019 16:35:14 +0000 Subject: [PATCH 4/6] scst: Remove recently introduced trailing whitespace git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8041 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scst/README b/scst/README index b314601d0..4690c86f8 100644 --- a/scst/README +++ b/scst/README @@ -462,7 +462,7 @@ following entries: Here is an example of the data produced by this infrastructure (edited for clarity): - + $ echo 1 >/sys/kernel/scst_tgt/measure_latency $ sleep 10 # Wait until an initiator has submitted multiple I/O requests $ (cd /sys/kernel/scst_tgt/targets && From 68b40638de6fc40fa36df2d94be3f1719a78dcdf Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 10 Mar 2019 16:45:23 +0000 Subject: [PATCH 5/6] scripts/specialize-patch: Add support for UEK_KABI_RENAME git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8042 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/specialize-patch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/specialize-patch b/scripts/specialize-patch index 674a5f3d3..97ee1acbf 100755 --- a/scripts/specialize-patch +++ b/scripts/specialize-patch @@ -197,6 +197,8 @@ function evaluate(stmnt, pattern, arg, op, result) { "(\\1) * 256 + (\\2)", "g", stmnt) } + gsub("defined\\(UEK_KABI_RENAME\\)", "0", stmnt) + if (SCSI_EXEC_REQ_FIFO_DEFINED != "") { gsub("defined[[:blank:]]+SCSI_EXEC_REQ_FIFO_DEFINED", @@ -388,6 +390,7 @@ function handle_if(evaluated) || $0 ~ "RHEL_MINOR" \ || $0 ~ "RHEL_RELEASE_CODE" \ || $0 ~ "SOCK_RECVMSG_HAS_FOUR_ARGS" \ + || $0 ~ "UEK_KABI_RENAME" \ || $0 ~ "USE_PRE_440_WR_STRUCTURE" \ || generating_upstream_patch_defined \ && $0 ~ "GENERATING_UPSTREAM_PATCH" \ From 34cf8f2d5d0b5e3b644b951990c2274fdaccae09 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 10 Mar 2019 17:05:20 +0000 Subject: [PATCH 6/6] scripts/run-regression-tests: Make sure CONFIG_STACK_VALIDATION is disabled git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8043 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/run-regression-tests | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/run-regression-tests b/scripts/run-regression-tests index e8b27f896..fd562212a 100755 --- a/scripts/run-regression-tests +++ b/scripts/run-regression-tests @@ -291,6 +291,7 @@ CONFIG_MAC80211_DRIVER_API_TRACER \ CONFIG_MMIOTRACE \ CONFIG_NET_DROP_MONITOR \ CONFIG_NOP_TRACER \ +CONFIG_RETPOLINE \ CONFIG_SCHED_TRACER \ CONFIG_SECURITY_SELINUX \ CONFIG_STACK_TRACER \ @@ -298,9 +299,11 @@ CONFIG_STACK_VALIDATION \ CONFIG_TRACEPOINTS \ CONFIG_TRACER_MAX_TRACE \ CONFIG_TRACING \ +CONFIG_UNWINDER_ORC \ CONFIG_X86_32 \ CONFIG_X86_X32 \ " + local enable="CONFIG_UNWINDER_FRAME_POINTER" echo "Patching and configuring kernel ..." if [ "$ipv6" = "false" ]; then @@ -319,6 +322,7 @@ CONFIG_X86_X32 \ fi && make -s allmodconfig &>"${outputdir}/make-config-output.txt" && for c in $disable; do sed -i.tmp "s/^$c=[ym]\$/$c=n/" .config; done && + for c in $enable; do sed -i.tmp "s/^\(# \)*$c\(=.*\| is not set\)\$/$c=y/" .config; done && make -s oldconfig /dev/null ) }