Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1569ff1 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Christoph Hellwig
Browse files

scsi: ratelimit I/O error messages 



There can be quite a lot of I/O error messages, even on smaller
machines. So we need to ratelimit them to not overwhelm logging.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Tested-by: default avatarRobert Elliott <elliott@hp.com>
Reviewed-by: default avatarRobert Elliott <elliott@hp.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent b6c92b7e

drivers/scsi/scsi_lib.c

+20 −12
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/hardirq.h>

#include <linux/scatterlist.h>

#include <linux/blk-mq.h>

#include <linux/ratelimit.h>



#include <scsi/scsi.h>

#include <scsi/scsi_cmnd.h>
@@ -1038,19 +1039,26 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes) 
	switch (action) {

	case ACTION_FAIL:

		/* Give up and fail the remainder of the request */

		if (!(req->cmd_flags & REQ_QUIET)) {

			static DEFINE_RATELIMIT_STATE(_rs,

					DEFAULT_RATELIMIT_INTERVAL,

					DEFAULT_RATELIMIT_BURST);



			if (unlikely(scsi_logging_level))

			level = SCSI_LOG_LEVEL(SCSI_LOG_MLQUEUE_SHIFT,

					       SCSI_LOG_MLQUEUE_BITS);

				level = SCSI_LOG_LEVEL(SCSI_LOG_MLCOMPLETE_SHIFT,

						       SCSI_LOG_MLCOMPLETE_BITS);



			/*

			 * if logging is enabled the failure will be printed

			 * in scsi_log_completion(), so avoid duplicate messages

			 */

		if (!level && !(req->cmd_flags & REQ_QUIET)) {

			if (!level && __ratelimit(&_rs)) {

				scsi_print_result(cmd, NULL, FAILED);

				if (driver_byte(result) & DRIVER_SENSE)

					scsi_print_sense(cmd);

				scsi_print_command(cmd);

			}

		}

		if (!scsi_end_request(req, error, blk_rq_err_bytes(req), 0))

			return;

		/*FALLTHRU*/