From: Douglas Gilbert <dgilbert@interlog.com>
To: linux-scsi@vger.kernel.org
Cc: martin.petersen@oracle.com, jejb@linux.vnet.ibm.com, hare@suse.de
Subject: [PATCH v19 42/45] sg: remove unit attention check for device changed
Date: Sun, 23 May 2021 21:01:44 -0400 [thread overview]
Message-ID: <20210524010147.94845-43-dgilbert@interlog.com> (raw)
In-Reply-To: <20210524010147.94845-1-dgilbert@interlog.com>
The SCSI mid-layer now checks for SCSI UNIT ATTENTIONs and takes
the appropriate actions. This means that the sg driver no longer
needs to do this check.
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Douglas Gilbert <dgilbert@interlog.com>
---
drivers/scsi/sg.c | 49 ++++++++++++-----------------------------------
1 file changed, 12 insertions(+), 37 deletions(-)
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index d63294a55a88..20ebaebe4a9b 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -2396,39 +2396,6 @@ sg_rq_end_io_usercontext(struct work_struct *work)
kref_put(&sfp->f_ref, sg_remove_sfp);
}
-static void
-sg_check_sense(struct sg_device *sdp, struct sg_request *srp, int sense_len)
-{
- int driver_stat;
- u32 rq_res = srp->rq_result;
- struct scsi_request *scsi_rp = scsi_req(READ_ONCE(srp->rqq));
- u8 *sbp = scsi_rp ? scsi_rp->sense : NULL;
-
- if (!sbp)
- return;
- driver_stat = driver_byte(rq_res);
- if (driver_stat & DRIVER_SENSE) {
- struct scsi_sense_hdr ssh;
-
- if (scsi_normalize_sense(sbp, sense_len, &ssh)) {
- if (!scsi_sense_is_deferred(&ssh)) {
- if (ssh.sense_key == UNIT_ATTENTION) {
- if (sdp->device->removable)
- sdp->device->changed = 1;
- }
- }
- }
- }
- if (test_bit(SG_FDEV_LOG_SENSE, sdp->fdev_bm) > 0) {
- int scsi_stat = rq_res & 0xff;
-
- if (scsi_stat == SAM_STAT_CHECK_CONDITION ||
- scsi_stat == SAM_STAT_COMMAND_TERMINATED)
- __scsi_print_sense(sdp->device, __func__, sbp,
- sense_len);
- }
-}
-
/*
* This "bottom half" (soft interrupt) handler is called by the mid-level
* when a request has completed or failed. This callback is registered in a
@@ -2440,6 +2407,7 @@ sg_rq_end_io(struct request *rqq, blk_status_t status)
{
enum sg_rq_state rqq_state = SG_RS_AWAIT_RCV;
int a_resid, slen;
+ u32 rq_result;
unsigned long iflags;
struct sg_request *srp = rqq->end_io_data;
struct scsi_request *scsi_rp = scsi_req(rqq);
@@ -2449,7 +2417,8 @@ sg_rq_end_io(struct request *rqq, blk_status_t status)
sfp = srp->parentfp;
sdp = sfp->parentdp;
- srp->rq_result = scsi_rp->result;
+ rq_result = scsi_rp->result;
+ srp->rq_result = rq_result;
slen = min_t(int, scsi_rp->sense_len, SCSI_SENSE_BUFFERSIZE);
a_resid = scsi_rp->resid_len;
@@ -2465,10 +2434,16 @@ sg_rq_end_io(struct request *rqq, blk_status_t status)
}
SG_LOG(6, sfp, "%s: pack_id=%d, res=0x%x\n", __func__, srp->pack_id,
- srp->rq_result);
+ rq_result);
srp->duration = sg_calc_rq_dur(srp);
- if (unlikely((srp->rq_result & SG_ML_RESULT_MSK) && slen > 0))
- sg_check_sense(sdp, srp, slen);
+ if (unlikely((rq_result & SG_ML_RESULT_MSK) && slen > 0 &&
+ test_bit(SG_FDEV_LOG_SENSE, sdp->fdev_bm))) {
+ u32 scsi_stat = rq_result & 0xff;
+
+ if (scsi_stat == SAM_STAT_CHECK_CONDITION ||
+ scsi_stat == SAM_STAT_COMMAND_TERMINATED)
+ __scsi_print_sense(sdp->device, __func__, scsi_rp->sense, slen);
+ }
if (slen > 0) {
if (scsi_rp->sense && !srp->sense_bp) {
srp->sense_bp = mempool_alloc(sg_sense_pool,
--
2.25.1
next prev parent reply other threads:[~2021-05-24 1:03 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-24 1:01 [PATCH v19 00/45] sg: add v4 interface Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 01/45] sg: move functions around Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 02/45] sg: remove typedefs, type+formatting cleanup Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 03/45] sg: sg_log and is_enabled Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 04/45] sg: rework sg_poll(), minor changes Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 05/45] sg: bitops in sg_device Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 06/45] sg: make open count an atomic Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 07/45] sg: move header to uapi section Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 08/45] sg: speed sg_poll and sg_get_num_waiting Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 09/45] sg: sg_allow_if_err_recovery and renames Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 10/45] sg: improve naming Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 11/45] sg: change rwlock to spinlock Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 12/45] sg: ioctl handling Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 13/45] sg: split sg_read Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 14/45] sg: sg_common_write add structure for arguments Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 15/45] sg: rework sg_vma_fault Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 16/45] sg: rework sg_mmap Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 17/45] sg: replace sg_allow_access Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 18/45] sg: rework scatter gather handling Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 19/45] sg: introduce request state machine Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 20/45] sg: sg_find_srp_by_id Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 21/45] sg: sg_fill_request_element Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 22/45] sg: printk change %p to %pK Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 23/45] sg: xarray for fds in device Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 24/45] sg: xarray for reqs in fd Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 25/45] sg: replace rq array with xarray Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 26/45] sg: sense buffer rework Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 27/45] sg: add sg v4 interface support Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 28/45] sg: rework debug info Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 29/45] sg: add 8 byte SCSI LUN to sg_scsi_id Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 30/45] sg: expand sg_comm_wr_t Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 31/45] sg: add sg_iosubmit_v3 and sg_ioreceive_v3 ioctls Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 32/45] sg: add some __must_hold macros Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 33/45] sg: move procfs objects to avoid forward decls Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 34/45] sg: protect multiple receivers Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 35/45] sg: first debugfs support Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 36/45] sg: rework mmap support Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 37/45] sg: defang allow_dio Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 38/45] sg: warn v3 write system call users Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 39/45] sg: add mmap_sz tracking Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 40/45] sg: remove rcv_done request state Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 41/45] sg: track lowest inactive and await indexes Douglas Gilbert
2021-05-24 1:01 ` Douglas Gilbert [this message]
2021-05-24 1:01 ` [PATCH v19 43/45] sg: no_dxfer: move to/from kernel buffers Douglas Gilbert
2021-05-24 1:01 ` [PATCH v19 44/45] sg: add blk_poll support Douglas Gilbert
2021-05-25 8:36 ` Hannes Reinecke
2021-05-24 1:01 ` [PATCH v19 45/45] sg: bump version to 4.0.12 Douglas Gilbert
2021-05-25 8:36 ` Hannes Reinecke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210524010147.94845-43-dgilbert@interlog.com \
--to=dgilbert@interlog.com \
--cc=hare@suse.de \
--cc=jejb@linux.vnet.ibm.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).