Commit f8275c08 authored by Lee Duncan's avatar Lee Duncan Committed by Li Lingfeng
Browse files

scsi: fnic: Move fnic_fnic_flush_tx() to a work queue 

mainline inclusion
from mainline-v6.8-rc5
commit 379a58caa19930e010b7efa1c1f3b9411d3d2ca3
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9HL6L
CVE: CVE-2024-26917

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=379a58caa19930e010b7efa1c1f3b9411d3d2ca3



--------------------------------

Rather than call 'fnic_flush_tx()' from interrupt context we should be
moving it onto a work queue to avoid any locking issues.

Fixes: 1a197555 ("scsi: fcoe: Fix potential deadlock on &fip->ctlr_lock")
Co-developed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarLee Duncan <lduncan@suse.com>
Link: https://lore.kernel.org/r/ce5ffa5d0ff82c2b2e283b3b4bff23291d49b05c.1707500786.git.lduncan@suse.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>

Conflict:
  drivers/scsi/fnic/fnic.h
  Commit 554a14826020 ("scsi: fnic: Refactor and redefine fnic.h for
  multiqueue") in mainline add copy_wq_base in fnic.
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
parent f8ab733c

drivers/scsi/fnic/fnic.h

+2 −1
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ struct fnic { 


	struct work_struct link_work;

	struct work_struct frame_work;

	struct work_struct flush_work;

	struct sk_buff_head frame_queue;

	struct sk_buff_head tx_queue;
@@ -336,7 +337,7 @@ void fnic_handle_event(struct work_struct *work); 
int fnic_rq_cmpl_handler(struct fnic *fnic, int);

int fnic_alloc_rq_frame(struct vnic_rq *rq);

void fnic_free_rq_buf(struct vnic_rq *rq, struct vnic_rq_buf *buf);

void fnic_flush_tx(struct fnic *);

void fnic_flush_tx(struct work_struct *work);

void fnic_eth_send(struct fcoe_ctlr *, struct sk_buff *skb);

void fnic_set_port_id(struct fc_lport *, u32, struct fc_frame *);

void fnic_update_mac(struct fc_lport *, u8 *new);

drivers/scsi/fnic/fnic_fcs.c

+3 −2
Original line number Diff line number Diff line
@@ -1184,7 +1184,7 @@ int fnic_send(struct fc_lport *lp, struct fc_frame *fp) 


/**

 * fnic_flush_tx() - send queued frames.

 * @fnic: fnic device

 * @work: pointer to work element

 *

 * Send frames that were waiting to go out in FC or Ethernet mode.

 * Whenever changing modes we purge queued frames, so these frames should
@@ -1192,8 +1192,9 @@ int fnic_send(struct fc_lport *lp, struct fc_frame *fp) 
 *

 * Called without fnic_lock held.

 */

void fnic_flush_tx(struct fnic *fnic)

void fnic_flush_tx(struct work_struct *work)

{

	struct fnic *fnic = container_of(work, struct fnic, flush_work);

	struct sk_buff *skb;

	struct fc_frame *fp;

drivers/scsi/fnic/fnic_main.c

+1 −0
Original line number Diff line number Diff line
@@ -776,6 +776,7 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		spin_lock_init(&fnic->vlans_lock);

		INIT_WORK(&fnic->fip_frame_work, fnic_handle_fip_frame);

		INIT_WORK(&fnic->event_work, fnic_handle_event);

		INIT_WORK(&fnic->flush_work, fnic_flush_tx);

		skb_queue_head_init(&fnic->fip_frame_queue);

		INIT_LIST_HEAD(&fnic->evlist);

		INIT_LIST_HEAD(&fnic->vlans);

drivers/scsi/fnic/fnic_scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ static int fnic_fcpio_fw_reset_cmpl_handler(struct fnic *fnic, 


	spin_unlock_irqrestore(&fnic->fnic_lock, flags);



	fnic_flush_tx(fnic);

	queue_work(fnic_event_queue, &fnic->flush_work);



 reset_cmpl_handler_end:

	fnic_clear_state_flags(fnic, FNIC_FLAGS_FWRESET);
@@ -751,7 +751,7 @@ static int fnic_fcpio_flogi_reg_cmpl_handler(struct fnic *fnic, 
		}

		spin_unlock_irqrestore(&fnic->fnic_lock, flags);



		fnic_flush_tx(fnic);

		queue_work(fnic_event_queue, &fnic->flush_work);

		queue_work(fnic_event_queue, &fnic->frame_work);

	} else {

		spin_unlock_irqrestore(&fnic->fnic_lock, flags);