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
Subject: [PATCH v9 39/40] sg: add mmap_sz tracking
Date: Tue, 21 Apr 2020 17:52:57 -0400	[thread overview]
Message-ID: <20200421215258.14348-40-dgilbert@interlog.com> (raw)
In-Reply-To: <20200421215258.14348-1-dgilbert@interlog.com>

Track mmap_sz from prior mmap(2) call, per sg file descriptor. Also
reset this value whenever munmap(2) is called. Fail SG_FLAG_MMAP_IO
uses if mmap(2) hasn't been called or the memory associated with it
is not large enough for the current request.

Signed-off-by: Douglas Gilbert <dgilbert@interlog.com>
---
 drivers/scsi/sg.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 7e261b065190..ba9f08b932a5 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -231,6 +231,7 @@ struct sg_fd {		/* holds the state of a file descriptor */
 	atomic_t waiting;	/* number of requests awaiting receive */
 	atomic_t req_cnt;	/* number of requests */
 	int sgat_elem_sz;	/* initialized to scatter_elem_sz */
+	int mmap_sz;		/* byte size of previous mmap() call */
 	unsigned long ffd_bm[1];	/* see SG_FFD_* defines above */
 	pid_t tid;		/* thread id when opened */
 	u8 next_cmd_len;	/* 0: automatic, >0: use on next write() */
@@ -725,10 +726,14 @@ sg_write(struct file *filp, const char __user *p, size_t count, loff_t *ppos)
 static inline int
 sg_chk_mmap(struct sg_fd *sfp, int rq_flags, int len)
 {
+	if (!test_bit(SG_FFD_MMAP_CALLED, sfp->ffd_bm))
+		return -EBADFD;
 	if (atomic_read(&sfp->submitted) > 0)
 		return -EBUSY;  /* already active requests on fd */
 	if (len > sfp->rsv_srp->sgat_h.buflen)
 		return -ENOMEM; /* MMAP_IO size must fit in reserve */
+	if (unlikely(len > sfp->mmap_sz))
+		return -ENOMEM; /* MMAP_IO size can't exceed mmap() size */
 	if (rq_flags & SG_FLAG_DIRECT_IO)
 		return -EINVAL; /* not both MMAP_IO and DIRECT_IO */
 	return 0;
@@ -2260,6 +2265,8 @@ sg_vma_close(struct vm_area_struct *vma)
 		pr_warn("%s: sfp null\n", __func__);
 		return;
 	}
+	sfp->mmap_sz = 0;
+	clear_bit(SG_FFD_MMAP_CALLED, sfp->ffd_bm);
 	kref_put(&sfp->f_ref, sg_remove_sfp); /* get in: sg_vma_open() */
 }
 
@@ -2380,6 +2387,7 @@ sg_mmap(struct file *filp, struct vm_area_struct *vma)
 			goto fini;
 		}
 	}
+	sfp->mmap_sz = req_sz;
 	vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
 	vma->vm_private_data = sfp;
 	vma->vm_ops = &sg_mmap_vm_ops;
@@ -4060,8 +4068,7 @@ sg_proc_debug_fd(struct sg_fd *fp, char *obp, int len, unsigned long idx)
 		       (int)test_bit(SG_FFD_FORCE_PACKID, fp->ffd_bm),
 		       (int)test_bit(SG_FFD_KEEP_ORPHAN, fp->ffd_bm),
 		       fp->ffd_bm[0]);
-	n += scnprintf(obp + n, len - n, "   mmap_called=%d\n",
-		       test_bit(SG_FFD_MMAP_CALLED, fp->ffd_bm));
+	n += scnprintf(obp + n, len - n, "   mmap_sz=%d\n", fp->mmap_sz);
 	n += scnprintf(obp + n, len - n,
 		       "   submitted=%d waiting=%d   open thr_id=%d\n",
 		       atomic_read(&fp->submitted),
-- 
2.26.1


  parent reply	other threads:[~2020-04-21 21:53 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-21 21:52 [PATCH v9 00/40] sg: add v4 interface Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 01/40] sg: move functions around Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 02/40] sg: remove typedefs, type+formatting cleanup Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 03/40] sg: sg_log and is_enabled Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 04/40] sg: rework sg_poll(), minor changes Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 05/40] sg: bitops in sg_device Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 06/40] sg: make open count an atomic Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 07/40] sg: move header to uapi section Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 08/40] sg: speed sg_poll and sg_get_num_waiting Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 09/40] sg: sg_allow_if_err_recovery and renames Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 10/40] sg: improve naming Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 11/40] sg: change rwlock to spinlock Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 12/40] sg: ioctl handling Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 13/40] sg: split sg_read Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 14/40] sg: sg_common_write add structure for arguments Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 15/40] sg: rework sg_vma_fault Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 16/40] sg: rework sg_mmap Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 17/40] sg: replace sg_allow_access Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 18/40] sg: rework scatter gather handling Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 19/40] sg: introduce request state machine Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 20/40] sg: sg_find_srp_by_id Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 21/40] sg: sg_fill_request_element Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 22/40] sg: printk change %p to %pK Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 23/40] sg: xarray for fds in device Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 24/40] sg: xarray for reqs in fd Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 25/40] sg: replace rq array with lists Douglas Gilbert
2020-04-24 15:21   ` kbuild test robot
2020-04-24 15:21     ` kbuild test robot
2020-04-21 21:52 ` [PATCH v9 26/40] sg: sense buffer rework Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 27/40] sg: add sg v4 interface support Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 28/40] sg: rework debug info Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 29/40] sg: add 8 byte SCSI LUN to sg_scsi_id Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 30/40] sg: expand sg_comm_wr_t Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 31/40] sg: add sg_iosubmit_v3 and sg_ioreceive_v3 ioctls Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 32/40] sg: add some __must_hold macros Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 33/40] sg: move procfs objects to avoid forward decls Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 34/40] sg: protect multiple receivers Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 35/40] sg: first debugfs support Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 36/40] sg: rework mmap support Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 37/40] sg: defang allow_dio Douglas Gilbert
2020-04-21 21:52 ` [PATCH v9 38/40] sg: warn v3 write system call users Douglas Gilbert
2020-04-21 21:52 ` Douglas Gilbert [this message]
2020-04-21 21:52 ` [PATCH v9 40/40] sg: bump version to 4.0.09 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=20200421215258.14348-40-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 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.