All of lore.kernel.org
 help / color / mirror / Atom feed
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, bvanassche@acm.org
Subject: [PATCH v25 32/44] sg: protect multiple receivers
Date: Sun, 23 Oct 2022 23:20:46 -0400	[thread overview]
Message-ID: <20221024032058.14077-33-dgilbert@interlog.com> (raw)
In-Reply-To: <20221024032058.14077-1-dgilbert@interlog.com>

If two threads call ioctl(SG_IORECEIVE) [or read()] on the same
file descriptor there is a potential race on the same request
response. Use atomic bit operations to make sure only one thread
gets each request response. [The other thread will either get
another request response or nothing.]

Also make sfp cleanup a bit more robust and report if the
number of submitted requests (which are decremented when
completed) is other than the expected value of zero.

In the case of sg_wait_open_event() which calls mutex_unlock on
sdp->open_rel_lock and later calls mutex_lock on the same
lock; this macro is needed to stop sparse complaining. In
other cases it is a reminder to the coder (a precondition).

Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Douglas Gilbert <dgilbert@interlog.com>
---
 drivers/scsi/sg.c | 53 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 14 deletions(-)

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 735ea5d11b33..5079a449111e 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -112,6 +112,7 @@ enum sg_rq_state {	/* N.B. sg_rq_state_arr assumes SG_RS_AWAIT_RCV==2 */
 #define SG_FRQ_SYNC_INVOC	2	/* synchronous (blocking) invocation */
 #define SG_FRQ_NO_US_XFER	3	/* no user space transfer of data */
 #define SG_FRQ_DEACT_ORPHAN	6	/* not keeping orphan so de-activate */
+#define SG_FRQ_RECEIVING	7	/* guard against multiple receivers */
 
 /* Bit positions (flags) for sg_fd::ffd_bm bitmask follow */
 #define SG_FFD_FORCE_PACKID	0	/* receive only given pack_id/tag */
@@ -374,6 +375,7 @@ sg_check_file_access(struct file *filp, const char *caller)
 
 static int
 sg_wait_open_event(struct sg_device *sdp, bool o_excl)
+		__must_hold(sdp->open_rel_lock)
 {
 	int res = 0;
 
@@ -1271,6 +1273,7 @@ sg_ctl_ioreceive(struct file *filp, struct sg_fd *sfp, void __user *p)
 	SG_LOG(3, sfp, "%s: non_block(+IMMED)=%d\n", __func__, non_block);
 	/* read in part of v3 or v4 header for pack_id or tag based find */
 	id = pack_id;
+try_again:
 	srp = sg_find_srp_by_id(sfp, id, &busy);
 	while (!srp) {	/* nothing available so wait on packet or */
 		if (unlikely(!busy && SG_IS_DETACHING(sdp)))
@@ -1285,6 +1288,10 @@ sg_ctl_ioreceive(struct file *filp, struct sg_fd *sfp, void __user *p)
 		if (res)
 			return res;	/* signal --> -ERESTARTSYS */
 	}
+	if (test_and_set_bit(SG_FRQ_RECEIVING, srp->frq_bm)) {
+		cpu_relax();
+		goto try_again;
+	}
 	return sg_receive_v4(sfp, srp, p, h4p);
 }
 
@@ -1322,7 +1329,7 @@ sg_ctl_ioreceive_v3(struct file *filp, struct sg_fd *sfp, void __user *p)
 
 	if (test_bit(SG_FFD_FORCE_PACKID, sfp->ffd_bm))
 		pack_id = h3p->pack_id;
-
+try_again:
 	srp = sg_find_srp_by_id(sfp, pack_id, &busy);
 	while (!srp) {	/* nothing available so wait on packet or */
 		if (unlikely(!busy && SG_IS_DETACHING(sdp)))
@@ -1335,6 +1342,10 @@ sg_ctl_ioreceive_v3(struct file *filp, struct sg_fd *sfp, void __user *p)
 		if (unlikely(res))
 			return res;	/* signal --> -ERESTARTSYS */
 	}
+	if (test_and_set_bit(SG_FRQ_RECEIVING, srp->frq_bm)) {
+		cpu_relax();
+		goto try_again;
+	}
 	return sg_receive_v3(sfp, srp, SZ_SG_IO_HDR, p);
 }
 
@@ -1451,7 +1462,6 @@ get_sg_io_pack_id(int *pack_id, void __user *buf, size_t count)
 			return get_user(*pack_id, &hp->pack_id);
 		}
 	}
-
 	/* no valid header was passed, so ignore the pack_id */
 	*pack_id = -1;
 	return 0;
@@ -1486,8 +1496,9 @@ sg_read(struct file *filp, char __user *buf, size_t count, loff_t *ppos)
 			return ret;
 	}
 
+try_again:
 	srp = sg_find_srp_by_id(sfp, req_pack_id, &busy);
-	if (!srp) {		/* now wait on packet to arrive */
+	while (!srp) {	/* now wait on packet to arrive */
 		if (unlikely(!busy && SG_IS_DETACHING(sdp)))
 			return -ENODEV;
 		if (non_block) /* O_NONBLOCK or v3::flags & SGV4_FLAG_IMMED */
@@ -1501,6 +1512,10 @@ sg_read(struct file *filp, char __user *buf, size_t count, loff_t *ppos)
 			return ret;
 		/* otherwise srp should be valid */
 	}
+	if (test_and_set_bit(SG_FRQ_RECEIVING, srp->frq_bm)) {
+		cpu_relax();
+		goto try_again;
+	}
 	if (srp->s_hdr3.interface_id == '\0')
 		ret = sg_read_v1v2(buf, (int)count, sfp, srp);
 	else
@@ -1720,6 +1735,7 @@ sg_ctl_sg_io(struct file *filp, struct sg_device *sdp, struct sg_fd *sfp,
  */
 static int
 sg_set_reserved_sz(struct sg_fd *sfp, int want_rsv_sz)
+		__must_hold(sfp->f_mutex)
 {
 	int new_sz, blen, res;
 	unsigned long iflags;
@@ -2908,26 +2924,27 @@ sg_finish_scsi_blk_rq(struct sg_request *srp)
 		atomic_dec(&sfp->submitted);
 		atomic_dec(&sfp->waiting);
 	}
+
+	/* Expect blk_mq_free_request(rq) already called in sg_rq_end_io() */
+	if (rq) {	/* blk_get_request() may have failed */
+		srp->rq = NULL;
+		blk_mq_free_request(rq);
+	}
 	if (srp->bio) {
 		bool us_xfer = !test_bit(SG_FRQ_NO_US_XFER, srp->frq_bm);
+		struct bio *bio = srp->bio;
 
-		if (us_xfer) {
-			ret = blk_rq_unmap_user(srp->bio);
+		srp->bio = NULL;
+		if (us_xfer && bio) {
+			ret = blk_rq_unmap_user(bio);
 			if (ret) {	/* -EINTR (-4) can be ignored */
 				SG_LOG(6, sfp,
 				       "%s: blk_rq_unmap_user() --> %d\n",
 				       __func__, ret);
 			}
 		}
-		srp->bio = NULL;
-	}
-	/* In worst case READ data returned to user space by this point */
-
-	/* Expect blk_mq_free_request(rq) already called in sg_rq_end_io() */
-	if (rq) {       /* blk_get_request() may have failed */
-		srp->rq = NULL;
-		blk_mq_free_request(rq);
 	}
+	/* In worst case, READ data returned to user space by this point */
 }
 
 static int
@@ -3367,6 +3384,7 @@ sg_deact_request(struct sg_fd *sfp, struct sg_request *srp)
 		return;
 	sbp = srp->sense_bp;
 	srp->sense_bp = NULL;
+	srp->frq_bm[0] = 0;
 	sg_rq_state_chg(srp, 0, SG_RS_INACTIVE, true /* force */, __func__);
 	/* maybe orphaned req, thus never read */
 	if (sbp)
@@ -3499,6 +3517,7 @@ static void
 sg_remove_sfp_usercontext(struct work_struct *work)
 {
 	__maybe_unused int o_count;
+	int subm;
 	unsigned long idx, iflags;
 	struct sg_device *sdp;
 	struct sg_fd *sfp = container_of(work, struct sg_fd, ew_fd.work);
@@ -3536,6 +3555,10 @@ sg_remove_sfp_usercontext(struct work_struct *work)
 		SG_LOG(6, sfp, "%s: kfree: srp=%pK --\n", __func__, srp);
 		kfree(srp);
 	}
+	subm = atomic_read(&sfp->submitted);
+	if (subm != 0)
+		SG_LOG(1, sfp, "%s: expected submitted=0 got %d\n",
+		       __func__, subm);
 	xa_destroy(xafp);
 	xa_lock_irqsave(xadp, iflags);
 	e_sfp = __xa_erase(xadp, sfp->idx);
@@ -3564,12 +3587,12 @@ sg_remove_sfp(struct kref *kref)
 
 static int
 sg_idr_max_id(int id, void *p, void *data)
+		__must_hold(sg_index_lock)
 {
 	int *k = data;
 
 	if (*k < id)
 		*k = id;
-
 	return 0;
 }
 
@@ -3799,6 +3822,7 @@ sg_proc_seq_show_devstrs(struct seq_file *s, void *v)
 /* Writes debug info for one sg_request in obp buffer */
 static int
 sg_proc_debug_sreq(struct sg_request *srp, int to, char *obp, int len)
+		__must_hold(sfp->srp_arr.xa_lock)
 {
 	bool is_v3v4, v4, is_dur;
 	int n = 0;
@@ -3901,6 +3925,7 @@ sg_proc_debug_fd(struct sg_fd *fp, char *obp, int len, unsigned long idx)
 /* Writes debug info for one sg device (including its sg fds) in obp buffer */
 static int
 sg_proc_debug_sdev(struct sg_device *sdp, char *obp, int len, int *fd_counterp)
+		__must_hold(sg_index_lock)
 {
 	int n = 0;
 	int my_count = 0;
-- 
2.37.3


  parent reply	other threads:[~2022-10-24  3:25 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-24  3:20 [PATCH v25 00/44] sg: add v4 interface Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 01/44] sg: move functions around Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 02/44] sg: remove typedefs, type+formatting cleanup Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 03/44] sg: sg_log and is_enabled Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 04/44] sg: remove typedefs, type+formatting cleanup Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 05/44] sg: bitops in sg_device Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 06/44] sg: make open count an atomic Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 07/44] sg: move header to uapi section Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 08/44] sg: speed sg_poll and sg_get_num_waiting Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 09/44] sg: sg_allow_if_err_recovery and renames Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 10/44] sg: change rwlock to spinlock Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 11/44] sg: ioctl handling Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 12/44] sg: split sg_read Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 13/44] sg: sg_common_write add structure for arguments Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 14/44] sg: rework sg_vma_fault Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 15/44] sg: rework sg_mmap Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 16/44] sg: replace sg_allow_access Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 17/44] sg: rework scatter gather handling Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 18/44] sg: introduce request state machine Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 19/44] sg: sg_find_srp_by_id Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 20/44] sg: sg_fill_request_element Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 21/44] sg: printk change %p to %pK Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 22/44] sg: xarray for fds in device Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 23/44] sg: xarray for reqs in fd Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 24/44] sg: replace rq array with xarray Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 25/44] sg: sense buffer rework Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 26/44] sg: add sg v4 interface support Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 27/44] sg: rework debug info Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 28/44] sg: add 8 byte SCSI LUN to sg_scsi_id Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 29/44] sg: expand sg_comm_wr_t Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 30/44] sg: add sg_iosubmit_v3 and sg_ioreceive_v3 ioctls Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 31/44] sg: move procfs objects to avoid forward decls Douglas Gilbert
2022-10-24  3:20 ` Douglas Gilbert [this message]
2022-10-24  3:20 ` [PATCH v25 33/44] sg: first debugfs support Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 34/44] sg: rework mmap support Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 35/44] sg: defang allow_dio Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 36/44] sg: warn v3 write system call users Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 37/44] sg: add mmap_sz tracking Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 38/44] sg: track lowest inactive and await indexes Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 39/44] sg: remove unit attention check for device changed Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 40/44] sg: no_dxfer: move to/from kernel buffers Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 41/44] sg: add bio_poll support Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 42/44] sg: add statistics similar to st Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 43/44] sg: rework command completion when removed device Douglas Gilbert
2022-10-24  3:20 ` [PATCH v25 44/44] sg: bump version to 4.0.14 Douglas Gilbert

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=20221024032058.14077-33-dgilbert@interlog.com \
    --to=dgilbert@interlog.com \
    --cc=bvanassche@acm.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.