From 12566f2781bb65925f3453321f90f62cd8346abc Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 28 Jun 2015 05:24:49 +0000 Subject: [PATCH 1/5] nightly build: Update a kernel version git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6404 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- nightly/conf/nightly.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf index de777d24f..39af5c19d 100644 --- a/nightly/conf/nightly.conf +++ b/nightly/conf/nightly.conf @@ -11,7 +11,7 @@ ABT_KERNELS=" \ 3.15.10-nc \ 3.14.45-nc \ 3.13.11-nc \ -3.12.38-nc \ +3.12.44-nc \ 3.11.10-nc \ 3.10.81-nc \ 3.9.11-nc \ From 2e07fca500d4a90a6fc5cd4feb15ec7c4ab2a885 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 28 Jun 2015 15:45:59 +0000 Subject: [PATCH 2/5] nightly build: Add kernel v4.1 build infrastructure git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6405 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t/qla2x00-target/Makefile_in-tree-4.1 | 5 +++++ .../kernel/in-tree/Kconfig.drivers.Linux-4.1.patch | 13 +++++++++++++ scst/kernel/in-tree/Makefile.dev_handlers-4.1 | 14 ++++++++++++++ .../in-tree/Makefile.drivers.Linux-4.1.patch | 12 ++++++++++++ scst/kernel/in-tree/Makefile.scst-4.1 | 13 +++++++++++++ scst_local/in-tree/Makefile-4.1 | 2 ++ 6 files changed, 59 insertions(+) create mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-4.1 create mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-4.1.patch create mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-4.1 create mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-4.1.patch create mode 100644 scst/kernel/in-tree/Makefile.scst-4.1 create mode 100644 scst_local/in-tree/Makefile-4.1 diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.1 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.1 new file mode 100644 index 000000000..9657aee84 --- /dev/null +++ b/qla2x00t/qla2x00-target/Makefile_in-tree-4.1 @@ -0,0 +1,5 @@ +ccflags-y += -Idrivers/scsi/qla2xxx + +qla2x00tgt-y := qla2x00t.o + +obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.1.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.1.patch new file mode 100644 index 000000000..39d30a55e --- /dev/null +++ b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.1.patch @@ -0,0 +1,13 @@ +diff --git a/drivers/Kconfig b/drivers/Kconfig +index c70d6e4..0a4ed1b 100644 +--- a/drivers/Kconfig ++++ b/drivers/Kconfig +@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig" + + source "drivers/scsi/Kconfig" + ++source "drivers/scst/Kconfig" ++ + source "drivers/ata/Kconfig" + + source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.1 b/scst/kernel/in-tree/Makefile.dev_handlers-4.1 new file mode 100644 index 000000000..f933b36f7 --- /dev/null +++ b/scst/kernel/in-tree/Makefile.dev_handlers-4.1 @@ -0,0 +1,14 @@ +ccflags-y += -Wno-unused-parameter + +obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ + scst_vdisk.o scst_raid.o scst_processor.o scst_user.o + +obj-$(CONFIG_SCST_DISK) += scst_disk.o +obj-$(CONFIG_SCST_TAPE) += scst_tape.o +obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o +obj-$(CONFIG_SCST_MODISK) += scst_modisk.o +obj-$(CONFIG_SCST_CHANGER) += scst_changer.o +obj-$(CONFIG_SCST_RAID) += scst_raid.o +obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o +obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o +obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-4.1.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-4.1.patch new file mode 100644 index 000000000..6bbacd12f --- /dev/null +++ b/scst/kernel/in-tree/Makefile.drivers.Linux-4.1.patch @@ -0,0 +1,12 @@ +diff --git a/drivers/Makefile b/drivers/Makefile +index 527a6da..db2c24f 100644 +--- a/drivers/Makefile ++++ b/drivers/Makefile +@@ -137,6 +137,7 @@ obj-$(CONFIG_SSB) += ssb/ + obj-$(CONFIG_BCMA) += bcma/ + obj-$(CONFIG_VHOST_RING) += vhost/ + obj-$(CONFIG_VLYNQ) += vlynq/ ++obj-$(CONFIG_SCST) += scst/ + obj-$(CONFIG_STAGING) += staging/ + obj-y += platform/ + #common clk code diff --git a/scst/kernel/in-tree/Makefile.scst-4.1 b/scst/kernel/in-tree/Makefile.scst-4.1 new file mode 100644 index 000000000..53af5f388 --- /dev/null +++ b/scst/kernel/in-tree/Makefile.scst-4.1 @@ -0,0 +1,13 @@ +ccflags-y += -Wno-unused-parameter + +scst-y += scst_main.o +scst-y += scst_pres.o +scst-y += scst_targ.o +scst-y += scst_lib.o +scst-y += scst_sysfs.o +scst-y += scst_mem.o +scst-y += scst_tg.o +scst-y += scst_debug.o + +obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ + srpt/ scst_local/ diff --git a/scst_local/in-tree/Makefile-4.1 b/scst_local/in-tree/Makefile-4.1 new file mode 100644 index 000000000..8cbbbff63 --- /dev/null +++ b/scst_local/in-tree/Makefile-4.1 @@ -0,0 +1,2 @@ +obj-$(CONFIG_SCST_LOCAL) += scst_local.o + From ce6721207e6d9905d63cf7a9a67439b2d58b3f04 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 30 Jun 2015 01:11:54 +0000 Subject: [PATCH 3/5] nightly build: Update kernel versions git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6406 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 39af5c19d..46a9338f2 100644 --- a/nightly/conf/nightly.conf +++ b/nightly/conf/nightly.conf @@ -3,17 +3,17 @@ ABT_DETAILS="x86_64" ABT_JOBS=5 ABT_KERNELS=" \ -4.0.6 \ +4.0.7 \ 3.19.7-nc \ 3.18.8-nc \ 3.17.8-nc \ 3.16.7-nc \ 3.15.10-nc \ -3.14.45-nc \ +3.14.46-nc \ 3.13.11-nc \ 3.12.44-nc \ 3.11.10-nc \ -3.10.81-nc \ +3.10.82-nc \ 3.9.11-nc \ 3.8.13-nc \ 3.7.10-nc \ From 3949bfa44512b979e0a4c3ae2ab670722016c6c6 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Wed, 1 Jul 2015 22:13:40 +0000 Subject: [PATCH 4/5] scst_vdisk: fix typo in vdisk_get_supported_opcodes() git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6407 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_vdisk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index 6c826d2b4..960184ffa 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -2721,7 +2721,7 @@ static int vdisk_get_supported_opcodes(struct scst_cmd *cmd, *out_supp_opcodes_cnt = ARRAY_SIZE(vdisk_opcode_descriptors); } else { *out_supp_opcodes = vdisk_opcode_descriptors_type2; - *out_supp_opcodes_cnt = ARRAY_SIZE(vdisk_opcode_descriptors); + *out_supp_opcodes_cnt = ARRAY_SIZE(vdisk_opcode_descriptors_type2); } return 0; } From 1656efe689f9f4aaaebf34238e8a795f3d9edc86 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Fri, 3 Jul 2015 04:21:52 +0000 Subject: [PATCH 5/5] iscsi-scst: small post-r6315 cleanup Avoid that rd_task declared when it is not used git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6408 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/iscsi.c | 8 ++++++-- iscsi-scst/kernel/iscsi.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c index bd9251016..b1442504b 100644 --- a/iscsi-scst/kernel/iscsi.c +++ b/iscsi-scst/kernel/iscsi.c @@ -2309,6 +2309,11 @@ static void __cmnd_abort(struct iscsi_cmnd *cmnd) unsigned long timeout_time = jiffies + ISCSI_TM_DATA_WAIT_TIMEOUT + ISCSI_ADD_SCHED_TIME; struct iscsi_conn *conn = cmnd->conn; +#ifdef CONFIG_SCST_EXTRACHECKS + struct task_struct *rdt = cmnd->conn->rd_task; +#else + struct task_struct *rdt = NULL; +#endif TRACE_MGMT_DBG("Aborting cmd %p, scst_cmd %p (scst state %x, " "ref_cnt %d, on_write_timeout_list %d, write_start %ld, ITT %x, " @@ -2322,8 +2327,7 @@ static void __cmnd_abort(struct iscsi_cmnd *cmnd) cmnd->r2t_len_to_send, cmnd_scsicode(cmnd), cmnd_write_size(cmnd), cmnd->outstanding_r2t, cmnd->conn->session->exp_cmd_sn, cmnd->conn, - cmnd->conn->rd_task, cmnd->conn->read_cmnd, - cmnd->conn->read_state); + rdt, cmnd->conn->read_cmnd, cmnd->conn->read_state); #if defined(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION) TRACE_MGMT_DBG("net_ref_cnt %d", atomic_read(&cmnd->net_ref_cnt)); diff --git a/iscsi-scst/kernel/iscsi.h b/iscsi-scst/kernel/iscsi.h index 5875fbd2a..908068bd0 100644 --- a/iscsi-scst/kernel/iscsi.h +++ b/iscsi-scst/kernel/iscsi.h @@ -280,7 +280,9 @@ struct iscsi_conn { struct list_head rd_list_entry; +#ifdef CONFIG_SCST_EXTRACHECKS struct task_struct *rd_task; +#endif unsigned long last_rcv_time;