Rebase on upstream master #30

bmeagherix · 2024-05-06T16:02:39Z

git clone https://github.com/truenas/scst.git
cd scst
git remote add upstream https://github.com/scst-project/scst
git fetch upstream
git branch
git checkout -b rebase_on_upstream_master
git rebase -i upstream/master

Using scstadmin to reload a configuration with fewer targets can result in a "Use of uninitialized value in numeric ne" error. Rectify by adding a check for the undefined value and handling the situation (by disabling the target in question, unless the driver is copy_manager).

Fix the following warning: Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: actions/checkout@v3. Signed-off-by: Bart Van Assche <[email protected]>

Prevent that the Coverity and send-email workflows fail for submitters of pull requests. Signed-off-by: Bart Van Assche <[email protected]>

Commit 488aaee ("scst_lib: Remove support for kernel versions before 3.10") removed the d_km_type and s_km_type arguments. Hence this patch that removes the documentation for these arguments. Fixes: 488aaee ("scst_lib: Remove support for kernel versions before 3.10") Signed-off-by: Bart Van Assche <[email protected]>

Since SCST only supports EXTENDED COPY(LID1) commands, reject EXTENDED COPY(LID4) commands. Signed-off-by: Bart Van Assche <[email protected]>

vdisk_blockio already supports the active attribute to facilitate deferring opening au underlying block device. Add a similar feature to vdisk_fileio.

Support for the following block layer changes in the Linux kernel v6.8: - e719b4d15674 ("block: Provide bdev_open_* functions") - cd34758c5238 ("block: Remove blkdev_get_by_*() functions")

Support for the following tracing layer changes in the Linux kernel v6.8: - d23569979ca1 ("tracing: Allow creating instances with specified system events")

Suppress the following (false positive) Coverity complaint: CID 347415: (#1 of 1): Dereference after null check (FORWARD_NULL) var_deref_model: Passing null pointer virt_dev->bdev_handle to bdev_release_backport, which dereferences it

A recent commit (974001f) added backport support for bdev_open_by_path. This entailed adding a struct bdev_handle, but vdisk_exec_read_capacity16 attempts to lookup virt_dev->bdev_handle->bdev without regard for the fact that if we are not using blockio then bdev_handle will be null. Rectify by making the lookup more robust.

…ity16 This patch simplifies the retrieval of the request_queue within the vdisk_exec_read_capacity16 function.

Add a link_local parameter to control whether an IPv6 SendTargets response includes link local addresses. The default is to preserve the existing behavior and include them.

Support for the following block layer changes in the Linux kernel v6.9: - f3a608827d1f ("bdev: open block device as files") - b1211a25c4fe ("bdev: make bdev_{release, open_by_dev}() private to block layer")

Writing the string :default: to the /sys entry will restore local_def

Another kernel versions update.

Remove deprecated svn support.

This fixes the run-regression-tests build against kernel versions >= v6.3. See also commit 5573b4daa26a ("kbuild: do not automatically add -w option to modpost") # v6.3.

This patch fixes the build against kernel versions >= 5.10.210.

This patch fixes the build against UEK kernel versions 5.4.17-2136.330.7.1.el8uek, 5.15.0-205.149.5.1.el9uek.

This patch fixes the build against kernel versions >= 6.6.23.

Commit 48ef509 ("scst/include/backport.h: Port to the latest UEK kernels") broke the build for UEK kernel versions before v5.4.17-2136. Fix it.

Use DEFINE_SHOW_STORE_ATTRIBUTE() helper for read-write file to reduce some duplicated code. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Luo Jiaxing <[email protected]> Co-developed-by: Xingui Yang <[email protected]> Signed-off-by: Xingui Yang <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Cc: Al Viro <[email protected]> Cc: Animesh Manna <[email protected]> Cc: Anshuman Gupta <[email protected]> Cc: Damien Le Moal <[email protected]> Cc: Felipe Balbi <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: Himanshu Madhani <[email protected]> Cc: James Bottomley <[email protected]> Cc: John Garry <[email protected]> Cc: Martin K. Petersen <[email protected]> Cc: Uma Shankar <[email protected]> Cc: Xiang Chen <[email protected]> Cc: Zeng Tao <[email protected]> Signed-off-by: Andrew Morton <[email protected]> [ commit a9d56ce053da upstream ]

Support the previous commit against kernel versions before v6.7. See also commit 9cba82bba500 ("seq_file: add helper macro to define attribute for rw file") # v6.7.

Currently IOCBs are allowed to push through while chip reset could be in progress. During chip reset the outstanding_cmds array is cleared twice. Once when any command on this array is returned as failed and secondly when the array is initialize to zero. If a command is inserted on to the array between these intervals, then the command will be lost. Check for chip reset before sending IOCB. Cc: [email protected] Signed-off-by: Quinn Tran <[email protected]> Signed-off-by: Nilesh Javali <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Himanshu Madhani <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]> [ commit 4895009c4bb7 upstream ]

Disk failed to rediscover after chip reset error injection. The chip reset happens at the time when a PLOGI is being sent. This causes a flag to be left on which blocks the retry. Clear the blocking flag. Cc: [email protected] Signed-off-by: Quinn Tran <[email protected]> Signed-off-by: Nilesh Javali <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Himanshu Madhani <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]> [ commit 881eb861ca38 upstream ]

Current code combines the allocation of FCE|EFT trace buffers and enables the features all in 1 step. Split this step into separate steps in preparation for follow-on patch to allow user to have a choice to enable / disable FCE trace feature. Cc: [email protected] Reported-by: kernel test robot <[email protected]> Signed-off-by: Quinn Tran <[email protected]> Signed-off-by: Nilesh Javali <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Himanshu Madhani <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]> [ commit 76a192e1a566 upstream ]

Update manufacturer detail from "Marvell Semiconductor, Inc." to "Marvell". Cc: [email protected] Signed-off-by: Bikash Hazarika <[email protected]> Signed-off-by: Nilesh Javali <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Himanshu Madhani <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]> [ commit 688fa069fda6 upstream ]

Changing of [FCP|NVME] prefer flag in flash has no effect on driver. For device that supports both FCP + NVMe over the same connection, driver continues to connect to this device using the previous successful login mode. On completion of flash update, adapter will be reset. Driver will reset the prefer flag based on setting from flash. Cc: [email protected] Signed-off-by: Quinn Tran <[email protected]> Signed-off-by: Nilesh Javali <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Himanshu Madhani <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]> [ commit 69aecdd41010 upstream ]

System crash due to command failed to flush back to SCSI layer. BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 PGD 0 P4D 0 Oops: 0000 [#1] SMP NOPTI CPU: 27 PID: 793455 Comm: kworker/u130:6 Kdump: loaded Tainted: G OE --------- - - 4.18.0-372.9.1.el8.x86_64 #1 Hardware name: HPE ProLiant DL360 Gen10/ProLiant DL360 Gen10, BIOS U32 09/03/2021 Workqueue: nvme-wq nvme_fc_connect_ctrl_work [nvme_fc] RIP: 0010:__wake_up_common+0x4c/0x190 Code: 24 10 4d 85 c9 74 0a 41 f6 01 04 0f 85 9d 00 00 00 48 8b 43 08 48 83 c3 08 4c 8d 48 e8 49 8d 41 18 48 39 c3 0f 84 f0 00 00 00 <49> 8b 41 18 89 54 24 08 31 ed 4c 8d 70 e8 45 8b 29 41 f6 c5 04 75 RSP: 0018:ffff95f3e0cb7cd0 EFLAGS: 00010086 RAX: 0000000000000000 RBX: ffff8b08d3b26328 RCX: 0000000000000000 RDX: 0000000000000001 RSI: 0000000000000003 RDI: ffff8b08d3b26320 RBP: 0000000000000001 R08: 0000000000000000 R09: ffffffffffffffe8 R10: 0000000000000000 R11: ffff95f3e0cb7a60 R12: ffff95f3e0cb7d20 R13: 0000000000000003 R14: 0000000000000000 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffff8b2fdf6c0000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 0000002f1e410002 CR4: 00000000007706e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: __wake_up_common_lock+0x7c/0xc0 qla_nvme_ls_req+0x355/0x4c0 [qla2xxx] qla2xxx [0000:12:00.1]-f084:3: qlt_free_session_done: se_sess 0000000000000000 / sess ffff8ae1407ca000 from port 21:32:00:02:ac:07:ee:b8 loop_id 0x02 s_id 01:02:00 logout 1 keep 0 els_logo 0 ? __nvme_fc_send_ls_req+0x260/0x380 [nvme_fc] qla2xxx [0000:12:00.1]-207d:3: FCPort 21:32:00:02:ac:07:ee:b8 state transitioned from ONLINE to LOST - portid=010200. ? nvme_fc_send_ls_req.constprop.42+0x1a/0x45 [nvme_fc] qla2xxx [0000:12:00.1]-2109:3: qla2x00_schedule_rport_del 21320002ac07eeb8. rport ffff8ae598122000 roles 1 ? nvme_fc_connect_ctrl_work.cold.63+0x1e3/0xa7d [nvme_fc] qla2xxx [0000:12:00.1]-f084:3: qlt_free_session_done: se_sess 0000000000000000 / sess ffff8ae14801e000 from port 21:32:01:02:ad:f7:ee:b8 loop_id 0x04 s_id 01:02:01 logout 1 keep 0 els_logo 0 ? __switch_to+0x10c/0x450 ? process_one_work+0x1a7/0x360 qla2xxx [0000:12:00.1]-207d:3: FCPort 21:32:01:02:ad:f7:ee:b8 state transitioned from ONLINE to LOST - portid=010201. ? worker_thread+0x1ce/0x390 ? create_worker+0x1a0/0x1a0 qla2xxx [0000:12:00.1]-2109:3: qla2x00_schedule_rport_del 21320102adf7eeb8. rport ffff8ae3b2312800 roles 70 ? kthread+0x10a/0x120 qla2xxx [0000:12:00.1]-2112:3: qla_nvme_unregister_remote_port: unregister remoteport on ffff8ae14801e000 21320102adf7eeb8 ? set_kthread_struct+0x40/0x40 qla2xxx [0000:12:00.1]-2110:3: remoteport_delete of ffff8ae14801e000 21320102adf7eeb8 completed. ? ret_from_fork+0x1f/0x40 qla2xxx [0000:12:00.1]-f086:3: qlt_free_session_done: waiting for sess ffff8ae14801e000 logout The system was under memory stress where driver was not able to allocate an SRB to carry out error recovery of cable pull. The failure to flush causes upper layer to start modifying scsi_cmnd. When the system frees up some memory, the subsequent cable pull trigger another command flush. At this point the driver access a null pointer when attempting to DMA unmap the SGL. Add a check to make sure commands are flush back on session tear down to prevent the null pointer access. Cc: [email protected] Signed-off-by: Quinn Tran <[email protected]> Signed-off-by: Nilesh Javali <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Himanshu Madhani <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]> [ commit a27d4d0e7de3 upstream ]

Coverity scan reported potential risk of double free of the pointer ha->vp_map. ha->vp_map was freed in qla2x00_mem_alloc(), and again freed in function qla2x00_mem_free(ha). Assign NULL to vp_map and kfree take care of NULL. Cc: [email protected] Signed-off-by: Saurav Kashyap <[email protected]> Signed-off-by: Nilesh Javali <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Himanshu Madhani <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]> [ commit e288285d4778 upstream ]

The server was crashing after LOGO because fcport was getting freed twice. -----------[ cut here ]----------- kernel BUG at mm/slub.c:371! invalid opcode: 0000 1 SMP PTI CPU: 35 PID: 4610 Comm: bash Kdump: loaded Tainted: G OE --------- - - 4.18.0-425.3.1.el8.x86_64 #1 Hardware name: HPE ProLiant DL360 Gen10/ProLiant DL360 Gen10, BIOS U32 09/03/2021 RIP: 0010:set_freepointer.part.57+0x0/0x10 RSP: 0018:ffffb07107027d90 EFLAGS: 00010246 RAX: ffff9cb7e3150000 RBX: ffff9cb7e332b9c0 RCX: ffff9cb7e3150400 RDX: 0000000000001f37 RSI: 0000000000000000 RDI: ffff9cb7c0005500 RBP: fffff693448c5400 R08: 0000000080000000 R09: 0000000000000009 R10: 0000000000000000 R11: 0000000000132af0 R12: ffff9cb7c0005500 R13: ffff9cb7e3150000 R14: ffffffffc06990e0 R15: ffff9cb7ea85ea58 FS: 00007ff6b79c2740(0000) GS:ffff9cb8f7ec0000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000055b426b7d700 CR3: 0000000169c18002 CR4: 00000000007706e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: kfree+0x238/0x250 qla2x00_els_dcmd_sp_free+0x20/0x230 [qla2xxx] ? qla24xx_els_dcmd_iocb+0x607/0x690 [qla2xxx] qla2x00_issue_logo+0x28c/0x2a0 [qla2xxx] ? qla2x00_issue_logo+0x28c/0x2a0 [qla2xxx] ? kernfs_fop_write+0x11e/0x1a0 Remove one of the free calls and add check for valid fcport. Also use function qla2x00_free_fcport() instead of kfree(). Cc: [email protected] Signed-off-by: Saurav Kashyap <[email protected]> Signed-off-by: Nilesh Javali <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Himanshu Madhani <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]> [ commit 82f522ae0d97 upstream ]

Upon driver unload, purge_mbox flag is set and the heartbeat monitor thread detects this flag and does not send the mailbox command down to FW with a debug message "Error detected: purge[1] eeh[0] cmd=0x0, Exiting". This being not a real error, change the debug message. Cc: [email protected] Signed-off-by: Saurav Kashyap <[email protected]> Signed-off-by: Nilesh Javali <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Himanshu Madhani <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]> [ commit b5a30840727a upstream ]

Currently when PCI error is detected, I/O is aborted manually through the ABORT IOCB mechanism which is not guaranteed to succeed. Instead, wait for the OS or system to notify driver to wind down I/O through the pci_error_handlers api. Set eeh_busy flag to pause all traffic and wait for I/O to drain. Cc: [email protected] Signed-off-by: Quinn Tran <[email protected]> Signed-off-by: Nilesh Javali <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Himanshu Madhani <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]> [ commit 591c1fdf2016 upstream ]

Signed-off-by: Nilesh Javali <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Himanshu Madhani <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]> [ commit b8260ca37930 upstream ]

The app_reply->elem[] array is allocated earlier in this function and it has app_req.num_ports elements. Thus this > comparison needs to be >= to prevent memory corruption. Fixes: 7878f22a2e03 ("scsi: qla2xxx: edif: Add getfcinfo and statistic bsgs") Signed-off-by: Dan Carpenter <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Himanshu Madhani <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]> [ commit 4406e4176f47 upstream ]

Initiators will attempt to send LUN 0 INQUIRY and REPORT LUNS commands when connecting to a target. Add scst_set_lun_not_supported_report_luns to handle the case when REPORT LUNs is sent to an unsupported LUN. Also, in scst_set_lun_not_supported_inquiry report a valid vendor identification string to promote better initiator behavior.

Introduce a new GitHub action that automatically runs the scripts/run_regression_tests script upon each push to the master branch.

bmeagherix and others added 30 commits January 30, 2024 10:55

.github/workflows: Use the latest checkout action

b1ec106

Fix the following warning: Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: actions/checkout@v3. Signed-off-by: Bart Van Assche <[email protected]>

.github/workflows: Restrict some workflows to the official repository

38b9e89

Prevent that the Coverity and send-email workflows fail for submitters of pull requests. Signed-off-by: Bart Van Assche <[email protected]>

scst_copy_mgr: Reject EXTENDED COPY(LID4) commands

bee5066

Since SCST only supports EXTENDED COPY(LID1) commands, reject EXTENDED COPY(LID4) commands. Signed-off-by: Bart Van Assche <[email protected]>

scst_vdisk: Add active attributes support to vdisk_fileio

ff70c9d

vdisk_blockio already supports the active attribute to facilitate deferring opening au underlying block device. Add a similar feature to vdisk_fileio.

scst/include/backport.h, scst_vdisk: Port to Linux kernel v6.8

974001f

Support for the following block layer changes in the Linux kernel v6.8: - e719b4d15674 ("block: Provide bdev_open_* functions") - cd34758c5238 ("block: Remove blkdev_get_by_*() functions")

qla2x00t-32gbit: Port to Linux kernel v6.8

bf6d418

Support for the following tracing layer changes in the Linux kernel v6.8: - d23569979ca1 ("tracing: Allow creating instances with specified system events")

scst_vdisk: Fix check for blockio device

ce2ba13

Suppress the following (false positive) Coverity complaint: CID 347415: (#1 of 1): Dereference after null check (FORWARD_NULL) var_deref_model: Passing null pointer virt_dev->bdev_handle to bdev_release_backport, which dereferences it

scst_vdisk: Simplify request_queue retrieval in vdisk_exec_read_capac…

7bec059

…ity16 This patch simplifies the retrieval of the request_queue within the vdisk_exec_read_capacity16 function.

iscsi-scst: Add link_local parameter

659c7a7

Add a link_local parameter to control whether an IPv6 SendTargets response includes link local addresses. The default is to preserve the existing behavior and include them.

scst_lib, scst_vdisk: Port to Linux kernel v6.9

12f9b6e

Support for the following block layer changes in the Linux kernel v6.9: - f3a608827d1f ("bdev: open block device as files") - b1211a25c4fe ("bdev: make bdev_{release, open_by_dev}() private to block layer")

iscsi-scst: Add mechanism to restore target parameter to default

6a21f45

Writing the string :default: to the /sys entry will restore local_def

nightly build: Update kernel versions

f4840e9

Another kernel versions update.

nightly build, scripts: Remove svn support

56bb6c0

Remove deprecated svn support.

scripts/run-regression-tests: Explicitly set KBUILD_MODPOST_WARN=1

d3a2fae

This fixes the run-regression-tests build against kernel versions >= v6.3. See also commit 5573b4daa26a ("kbuild: do not automatically add -w option to modpost") # v6.3.

scst/include/backport.h: Fix backport for new stable kernels

71abad2

This patch fixes the build against kernel versions >= 5.10.210.

scst/include/backport.h: Port to the latest UEK kernels

48ef509

This patch fixes the build against UEK kernel versions 5.4.17-2136.330.7.1.el8uek, 5.15.0-205.149.5.1.el9uek.

scst/include/backport.h: Fix backport for new stable kernels

52b5e84

This patch fixes the build against kernel versions >= 6.6.23.

scst/include/backport.h: Fix the build against UEK kernels

8a1a7fa

Commit 48ef509 ("scst/include/backport.h: Port to the latest UEK kernels") broke the build for UEK kernel versions before v5.4.17-2136. Fix it.

scst/include/backport.h: Backport DEFINE_SHOW_STORE_ATTRIBUTE()

e322287

Support the previous commit against kernel versions before v6.7. See also commit 9cba82bba500 ("seq_file: add helper macro to define attribute for rw file") # v6.7.

lnocturno and others added 7 commits May 3, 2024 12:50

qla2x00t-32gbit: Update version to 10.02.09.200-k

6c6f675

Signed-off-by: Nilesh Javali <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Himanshu Madhani <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]> [ commit b8260ca37930 upstream ]

.github/workflows: Add a GitHub action to run regression tests upon push

7c4e074

Introduce a new GitHub action that automatically runs the scripts/run_regression_tests script upon each push to the master branch.

bmeagherix requested a review from yocalebo May 6, 2024 16:03

yocalebo approved these changes May 6, 2024

View reviewed changes

bmeagherix merged commit 6c71dbf into master May 6, 2024
4 of 5 checks passed

bmeagherix deleted the rebase_on_upstream_master branch May 6, 2024 16:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rebase on upstream master #30

Rebase on upstream master #30

bmeagherix commented May 6, 2024 •

edited

Loading

Rebase on upstream master #30

Rebase on upstream master #30

Conversation

bmeagherix commented May 6, 2024 • edited Loading

bmeagherix commented May 6, 2024 •

edited

Loading