Unverified Commit c1ab39e0 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5259 CVE-2024-26627​ 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Nan <linan122@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/FSMG5OCOU6BIAVNJPVDI2QVTRWRWGYR6/ 
Ming Lei (2):
  scsi: core: Move scsi_host_busy() out of host lock for waking up EH
    handler
  scsi: core: Move scsi_host_busy() out of host lock if it is for
    per-command


-- 
2.39.2
 
https://gitee.com/src-openeuler/kernel/issues/I96GXK 
 
Link:https://gitee.com/openeuler/kernel/pulls/5259

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 5c282702 bbc12cb8

drivers/scsi/scsi_error.c

+5 −4
Original line number Diff line number Diff line
@@ -63,11 +63,11 @@ static int scsi_eh_try_stu(struct scsi_cmnd *scmd); 
static int scsi_try_to_abort_cmd(struct scsi_host_template *,

				 struct scsi_cmnd *);



void scsi_eh_wakeup(struct Scsi_Host *shost)

void scsi_eh_wakeup(struct Scsi_Host *shost, unsigned int busy)

{

	lockdep_assert_held(shost->host_lock);



	if (scsi_host_busy(shost) == shost->host_failed) {

	if (busy == shost->host_failed) {

		trace_scsi_eh_wakeup(shost);

		wake_up_process(shost->ehandler);

		SCSI_LOG_ERROR_RECOVERY(5, shost_printk(KERN_INFO, shost,
@@ -90,7 +90,7 @@ void scsi_schedule_eh(struct Scsi_Host *shost) 
	if (scsi_host_set_state(shost, SHOST_RECOVERY) == 0 ||

	    scsi_host_set_state(shost, SHOST_CANCEL_RECOVERY) == 0) {

		shost->host_eh_scheduled++;

		scsi_eh_wakeup(shost);

		scsi_eh_wakeup(shost, scsi_host_busy(shost));

	}



	spin_unlock_irqrestore(shost->host_lock, flags);
@@ -241,11 +241,12 @@ static void scsi_eh_inc_host_failed(struct rcu_head *head) 
{

	struct scsi_cmnd *scmd = container_of(head, typeof(*scmd), rcu);

	struct Scsi_Host *shost = scmd->device->host;

	unsigned int busy = scsi_host_busy(shost);

	unsigned long flags;



	spin_lock_irqsave(shost->host_lock, flags);

	shost->host_failed++;

	scsi_eh_wakeup(shost);

	scsi_eh_wakeup(shost, busy);

	spin_unlock_irqrestore(shost->host_lock, flags);

}

drivers/scsi/scsi_lib.c

+3 −1
Original line number Diff line number Diff line
@@ -313,9 +313,11 @@ static void scsi_dec_host_busy(struct Scsi_Host *shost, struct scsi_cmnd *cmd) 
	rcu_read_lock();

	__clear_bit(SCMD_STATE_INFLIGHT, &cmd->state);

	if (unlikely(scsi_host_in_recovery(shost))) {

		unsigned int busy = scsi_host_busy(shost);



		spin_lock_irqsave(shost->host_lock, flags);

		if (shost->host_failed || shost->host_eh_scheduled)

			scsi_eh_wakeup(shost);

			scsi_eh_wakeup(shost, busy);

		spin_unlock_irqrestore(shost->host_lock, flags);

	}

	rcu_read_unlock();

drivers/scsi/scsi_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ extern void scmd_eh_abort_handler(struct work_struct *work); 
extern enum blk_eh_timer_return scsi_times_out(struct request *req);

extern int scsi_error_handler(void *host);

extern int scsi_decide_disposition(struct scsi_cmnd *cmd);

extern void scsi_eh_wakeup(struct Scsi_Host *shost);

extern void scsi_eh_wakeup(struct Scsi_Host *shost, unsigned int busy);

extern void scsi_eh_scmd_add(struct scsi_cmnd *);

void scsi_eh_ready_devs(struct Scsi_Host *shost,

			struct list_head *work_q,