Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rebase master on upstream master #38

Merged
merged 26 commits into from
Jan 16, 2025
Merged

Rebase master on upstream master #38

merged 26 commits into from
Jan 16, 2025

Conversation

bmeagherix
Copy link 

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

lnocturno and others added 26 commits November 16, 2024 14:33
@lnocturno
iscsi-scst: Fix multiple checkpatch warnings
ec80741 
This patch does not change any functionality.
@lnocturno
iscsi-scst: Fix multiple checkpatch warnings
1414c9d 
This patch does not change any functionality.
@lnocturno
iscsi-scst: Fix multiple checkpatch warnings
8aa9371 
This patch does not change any functionality.
@lnocturno
iscsi-scst: Fix multiple checkpatch warnings
ae5ea42 
This patch does not change any functionality.
@lnocturno
iscsi-scst: Fix multiple checkpatch warnings
3a54209 
This patch does not change any functionality.
@lnocturno
iscsi-scst: Fix multiple checkpatch warnings
60dc638 
This patch does not change any functionality.
@lnocturno
nightly build: Update kernel versions
cc71332 
Another kernel versions update.
@lnocturno
scst_lib: Move synchronize_rcu() calls out of loops to reduce overhead
f265dc4 
This patch refactors the code by accumulating the target devices into a
temporary list and moving the synchronize_rcu() call outside of the
loops. By doing so, we reduce the number of synchronize_rcu() calls to
one, improving the efficiency of the cleanup process.

Fixes: SCST-project#229
@f4ilfish @lnocturno
scstadmin: Fix scstadmin -list_sessions error msg in out cmd
297034d 
In out of "scstadmin -list_sessions" cmd occurs error
"Use of uninitialized value in numeric lt (<) at
/usr/local/sbin/scstadmin line 3679".
@lnocturno
nightly build: Update kernel versions
9082b4e 
Another kernel versions update
@lnocturno
dev_handlers: Fix multiple checkpatch warnings
ce31d4b 
This patch does not change any functionality.
@lnocturno
scst_vdisk: Fix multiple checkpatch warnings
2c7890d 
This patch does not change any functionality.
@lnocturno
scst_user: Fix multiple checkpatch warnings
9728e85 
This patch does not change any functionality.
@lnocturno
scst_local: Fix multiple checkpatch warnings
48120c5 
This patch does not change any functionality.
@lnocturno
scst.h: Fix multiple checkpatch warnings
34b1edd 
This patch does not change any functionality.
@lnocturno
qla2x00t-32gbit: Fix abort in bsg timeout
bbb412c 
Current abort of bsg on timeout prematurely clears the
outstanding_cmds[]. Abort does not allow FW to return the IOCB/SRB. In
addition, bsg_job_done() is not called to return the BSG (i.e. leak).

Abort the outstanding bsg/SRB and wait for the completion. The
completion IOCB will wake up the bsg_timeout thread. If abort is not
successful, then driver will forcibly call bsg_job_done() and free the
srb.

Err Inject:

 - qaucli -z
 - assign CT Passthru IOCB's NportHandle with another initiator
   nport handle to trigger timeout.  Remote port will drop CT request.
 - bsg_job_done is properly called as part of cleanup

kernel: qla2xxx [0000:21:00.1]-7012:7: qla2x00_process_ct : 286 : Error Inject.
kernel: qla2xxx [0000:21:00.1]-7016:7: bsg rqst type: FC_BSG_HST_CT else type: 101 - loop-id=1 portid=fffffa.
kernel: qla2xxx [0000:21:00.1]-70bb:7: qla24xx_bsg_timeout CMD timeout. bsg ptr ffff9971a42f0838 msgcode 80000004 vendor cmd fa010000
kernel: qla2xxx [0000:21:00.1]-507c:7: Abort command issued - hdl=4b, type=5
kernel: qla2xxx [0000:21:00.1]-5040:7: ELS-CT pass-through-ct pass-through error hdl=4b comp_status-status=0x5 error subcode 1=0x0 error subcode 2=0xaf882e80.
kernel: qla2xxx [0000:21:00.1]-7009:7: qla2x00_bsg_job_done: sp hdl 4b, result=70000 bsg ptr ffff9971a42f0838
kernel: qla2xxx [0000:21:00.1]-802c:7: Aborting bsg ffff9971a42f0838 sp=ffff99760b87ba80 handle=4b rval=0
kernel: qla2xxx [0000:21:00.1]-708a:7: bsg abort success. bsg ffff9971a42f0838 sp=ffff99760b87ba80 handle=0x4b
kernel: qla2xxx [0000:21:00.1]-7012:7: qla2x00_process_ct : 286 : Error Inject.
kernel: qla2xxx [0000:21:00.1]-7016:7: bsg rqst type: FC_BSG_HST_CT else type: 101 - loop-id=1 portid=fffffa.
kernel: qla2xxx [0000:21:00.1]-70bb:7: qla24xx_bsg_timeout CMD timeout. bsg ptr ffff9971a42f43b8 msgcode 80000004 vendor cmd fa010000
kernel: qla2xxx [0000:21:00.1]-7012:7: qla_bsg_found : 2206 : Error Inject 2.
kernel: qla2xxx [0000:21:00.1]-802c:7: Aborting bsg ffff9971a42f43b8 sp=ffff99762c304440 handle=5e rval=5
kernel: qla2xxx [0000:21:00.1]-704f:7: bsg abort fail.  bsg=ffff9971a42f43b8 sp=ffff99762c304440 rval=5.
kernel: qla2xxx [0000:21:00.1]-7051:7: qla_bsg_found bsg_job_done : bsg ffff9971a42f43b8 result 0xfffffffa sp ffff99762c304440.

Cc: [email protected]
Fixes: c449b4198701 ("scsi: qla2xxx: Use QP lock to search for bsg")
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 c423263082ee upstream ]
@lnocturno
qla2x00t-32gbit: Fix use after free on unload
767717c 
System crash is observed with stack trace warning of use after
free. There are 2 signals to tell dpc_thread to terminate (UNLOADING
flag and kthread_stop).

On setting the UNLOADING flag when dpc_thread happens to run at the time
and sees the flag, this causes dpc_thread to exit and clean up
itself. When kthread_stop is called for final cleanup, this causes use
after free.

Remove UNLOADING signal to terminate dpc_thread.  Use the kthread_stop
as the main signal to exit dpc_thread.

[596663.812935] kernel BUG at mm/slub.c:294!
[596663.812950] invalid opcode: 0000 [#1] SMP PTI
[596663.812957] CPU: 13 PID: 1475935 Comm: rmmod Kdump: loaded Tainted: G          IOE    --------- -  - 4.18.0-240.el8.x86_64 #1
[596663.812960] Hardware name: HP ProLiant DL380p Gen8, BIOS P70 08/20/2012
[596663.812974] RIP: 0010:__slab_free+0x17d/0x360

...
[596663.813008] Call Trace:
[596663.813022]  ? __dentry_kill+0x121/0x170
[596663.813030]  ? _cond_resched+0x15/0x30
[596663.813034]  ? _cond_resched+0x15/0x30
[596663.813039]  ? wait_for_completion+0x35/0x190
[596663.813048]  ? try_to_wake_up+0x63/0x540
[596663.813055]  free_task+0x5a/0x60
[596663.813061]  kthread_stop+0xf3/0x100
[596663.813103]  qla2x00_remove_one+0x284/0x440 [qla2xxx]

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 07c903db0a2f upstream ]
@lnocturno
qla2x00t-32gbit: Remove check req_sg_cnt should be equal to rsp_sg_cnt
2d8d55c 
Firmware supports multiple sg_cnt for request and response for CT
commands, so remove the redundant check. A check is there where sg_cnt
for request and response should be same. This is not required as driver
and FW have code to handle multiple and different sg_cnt on request and
response.

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 833c70e212fc upstream ]
@lnocturno
qla2x00t-32gbit: Fix NVMe and NPIV connect issue
a9cbb4e 
NVMe controller fails to send connect command due to failure to locate
hw context buffer for NVMe queue 0 (blk_mq_hw_ctx, hctx_idx=0). The
cause of the issue is NPIV host did not initialize the vha->irq_offset
field.  This field is given to blk-mq (blk_mq_pci_map_queues) to help
locate the beginning of IO Queues which in turn help locate NVMe queue
0.

Initialize this field to allow NVMe to work properly with NPIV host.

 kernel: nvme nvme5: Connect command failed, errno: -18
 kernel: nvme nvme5: qid 0: secure concatenation is not supported
 kernel: nvme nvme5: NVME-FC{5}: create_assoc failed, assoc_id 2e9100 ret 401
 kernel: nvme nvme5: NVME-FC{5}: reset: Reconnect attempt failed (401)
 kernel: nvme nvme5: NVME-FC{5}: Reconnect attempt in 2 seconds

Cc: [email protected]
Fixes: f0783d43dde4 ("scsi: qla2xxx: Use correct number of vectors for online CPUs")
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 4812b7796c14 upstream ]
@lnocturno
qla2x00t-32gbit: Supported speed displayed incorrectly for VPorts
e711206 
The fc_function_template for vports was missing the
.show_host_supported_speeds. The base port had the same.

Add .show_host_supported_speeds to the vport template as well.

Cc: [email protected]
Fixes: 2c3dfe3f6ad8 ("[SCSI] qla2xxx: add support for NPIV")
Signed-off-by: Anil Gurumurthy <[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 e4e268f898c8 upstream ]
@lnocturno
qla2x00t-32gbit: Update version to 10.02.09.400-k
f86d0ca 
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 35002a8ec557 upstream ]
@lnocturno
scst/ChangeLog: Summarize the changes for the upcoming 3.9 release
6325ba8
@lnocturno
Bump the version number to 3.9.0
a68cb8e 
These changes have been generated by running the following command:

$ scripts/update-version 3 9 0
@lnocturno
www: Update the version number from 3.8 to 3.9
ee5a0e2
@lnocturno
Bump the version number to 3.10.0-pre
2bdc19a 
These changes have been generated by running the following command:

$ scripts/update-version 3 10 0 -pre
@lnocturno
.github/workflows: Update stable branch version
ddd7f08
@bmeagherix bmeagherix requested a review from yocalebo January 16, 2025 15:38
@bmeagherix bmeagherix merged commit a542bbc into master Jan 16, 2025
33 of 34 checks passed
@bmeagherix bmeagherix deleted the rebase_master_on_upstream_master branch January 16, 2025 17:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yocalebo yocalebo yocalebo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@bmeagherix @yocalebo @lnocturno @f4ilfish