SCSI fixes for 6.4-rc4
Subsystems (3)
James Bottomley
maintainerFive fixes, all in drivers. The most extensive is the target change to fix the hang in the login code, which involves changing timers from per login to per connection.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
Bart Van Assche (1):
scsi: stex: Fix gcc 13 warnings
Gleb Chesnokov (1):
scsi: qla2xxx: Fix NULL pointer dereference in target mode
Maurizio Lombardi (3):
scsi: target: iscsi: Prevent login threads from racing between each other
scsi: target: iscsi: Remove unused transport_timer
scsi: target: iscsi: Fix hang in the iSCSI login code
And the diffstat:
drivers/scsi/qla2xxx/qla_def.h | 1 + drivers/scsi/qla2xxx/qla_init.c | 3 ++ drivers/scsi/qla2xxx/qla_inline.h | 3 ++ drivers/scsi/qla2xxx/qla_isr.c | 3 ++ drivers/scsi/stex.c | 4 ++ drivers/target/iscsi/iscsi_target.c | 2 - drivers/target/iscsi/iscsi_target_login.c | 63 +++----------------------- drivers/target/iscsi/iscsi_target_nego.c | 74 ++++++++++++++++++------------- drivers/target/iscsi/iscsi_target_util.c | 51 +++++++++++++++++++++ drivers/target/iscsi/iscsi_target_util.h | 4 ++ include/target/iscsi/iscsi_target_core.h | 7 +-- 11 files changed, 120 insertions(+), 95 deletions(-)
With full diff below.
James
---
drivers/scsi/qla2xxx/qla_def.h +1 -0
@@ -3796,6 +3796,7 @@ struct qla_qpair {uint64_t retry_term_jiff;struct qla_tgt_counters tgt_counters;uint16_t cpuid; +bool cpu_mapped;struct qla_fw_resources fwres____cacheline_aligned ;struct qla_buf_pool buf_pool;u32 cmd_cnt;
drivers/scsi/qla2xxx/qla_init.c +3 -0
@@ -9426,6 +9426,9 @@ struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos, qpair->rsp->req = qpair->req; qpair->rsp->qpair = qpair; +if (!qpair->cpu_mapped) +qla_cpu_update (qpair,raw_smp_processor_id ()); +if (IS_T10_PI_CAPABLE (ha) && ql2xenabledif) {if (ha->fw_attributes &BIT_4 ) qpair->difdix_supported =1 ;
drivers/scsi/qla2xxx/qla_inline.h +3 -0
@@ -539,11 +539,14 @@ qla_mapq_init_qp_cpu_map(struct qla_hw_data *ha,if (!ha->qp_cpu_map)return ; mask =pci_irq_get_affinity (ha->pdev, msix->vector_base0); +if (!mask) +return ; qpair->cpuid =cpumask_first (mask);for_each_cpu (cpu, mask) { ha->qp_cpu_map[cpu] = qpair; } msix->cpuid = qpair->cpuid; + qpair->cpu_mapped = true; } static inline void
drivers/scsi/qla2xxx/qla_isr.c +3 -0
@@ -3770,6 +3770,9 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,if (rsp->qpair->cpuid !=smp_processor_id () || !rsp->qpair->rcv_intr) { rsp->qpair->rcv_intr =1 ; + +if (!rsp->qpair->cpu_mapped) +qla_cpu_update (rsp->qpair,raw_smp_processor_id ()); }#define __update_rsp_in (_is_shadow_hba, _rsp, _rsp_in) \
drivers/scsi/stex.c +4 -0
@@ -109,7 +109,9 @@ enum {TASK_ATTRIBUTE_HEADOFQUEUE =0x1 ,TASK_ATTRIBUTE_ORDERED =0x2 , TASK_ATTRIBUTE_ACA = 0x4, +}; +enum {SS_STS_NORMAL =0x80000000 ,SS_STS_DONE =0x40000000 , SS_STS_HANDSHAKE = 0x20000000,
@@ -121,7 +123,9 @@ enum {SS_I2H_REQUEST_RESET =0x2000 , SS_MU_OPERATIONAL = 0x80000000, +}; +enum {STEX_CDB_LENGTH =16 , STATUS_VAR_LEN = 128,
drivers/target/iscsi/iscsi_target.c +0 -2
@@ -364,8 +364,6 @@ struct iscsi_np *iscsit_add_np(init_completion (&np->np_restart_comp);INIT_LIST_HEAD (&np->np_list); -timer_setup (&np->np_login_timer, iscsi_handle_login_thread_timeout,0 ); - ret =iscsi_target_setup_login_socket (np, sockaddr);if (ret !=0 ) {kfree (np);
drivers/target/iscsi/iscsi_target_login.c +5 -58
103 lines not on this page · raw message
drivers/target/iscsi/iscsi_target_nego.c +42 -32
147 lines not on this page · raw message
drivers/target/iscsi/iscsi_target_util.c +51 -0
57 lines not on this page · raw message
drivers/target/iscsi/iscsi_target_util.h +4 -0
@@ -56,6 +56,10 @@ extern void iscsit_handle_nopin_timeout(struct timer_list *t);extern void __iscsit_start_nopin_timer (struct iscsit_conn *);extern void iscsit_start_nopin_timer (struct iscsit_conn *);extern void iscsit_stop_nopin_timer (struct iscsit_conn *); +extern void iscsit_login_timeout (struct timer_list *t); +extern void iscsit_start_login_timer (struct iscsit_conn *,struct task_struct *kthr); +extern void iscsit_stop_login_timer (struct iscsit_conn *); +extern int iscsit_set_login_timer_kworker (struct iscsit_conn *,struct task_struct *kthr);extern int iscsit_send_tx_data (struct iscsit_cmd *,struct iscsit_conn *,int );extern int iscsit_fe_sendpage_sg (struct iscsit_cmd *,struct iscsit_conn *);extern int iscsit_tx_login_rsp (struct iscsit_conn *,u8 ,u8 );
include/target/iscsi/iscsi_target_core.h +4 -3
@@ -562,12 +562,13 @@ struct iscsit_conn {#define LOGIN_FLAGS_READ_ACTIVE 2#define LOGIN_FLAGS_WRITE_ACTIVE 3#define LOGIN_FLAGS_CLOSED 4 +#define LOGIN_FLAGS_WORKER_RUNNING 5unsigned long login_flags;struct delayed_work login_work;struct iscsi_login *login;struct timer_list nopin_timer;struct timer_list nopin_response_timer; -struct timer_list transport_timer; +struct timer_list login_timer;struct task_struct *login_kworker;/* Spinlock used for add/deleting cmd's from conn_cmd_list */ spinlock_t cmd_lock;
@@ -576,6 +577,8 @@ struct iscsit_conn {spinlock_t nopin_timer_lock;spinlock_t response_queue_lock;spinlock_t state_lock; +spinlock_t login_timer_lock; +spinlock_t login_worker_lock;/* libcrypto RX and TX contexts for crc32c */ struct ahash_request *conn_rx_hash;struct ahash_request *conn_tx_hash;
@@ -792,7 +795,6 @@ struct iscsi_np {enum np_thread_state_table np_thread_state;bool enabled;atomic_t np_reset_count; -enum iscsi_timer_flags_table np_login_timer_flags;u32 np_exports;enum np_flags_table np_flags;spinlock_t np_thread_lock;
@@ -800,7 +802,6 @@ struct iscsi_np {struct socket *np_socket;struct sockaddr_storage np_sockaddr;struct task_struct *np_thread; -struct timer_list np_login_timer;void *np_context;struct iscsit_transport *np_transport;struct list_head np_list;
The pull request you sent on Sat, 03 Jun 2023 13:43:28 -0400:
The pull request you sent on Sat, 03 Jun 2023 13:43:28 -0400:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.gitscsi-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/e5282a7d8f6b604f2bb6a06457734b8cf1e2f8f2
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/prtracker.html