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 v11 39/44] sg: add mmap_sz tracking
Date: Wed, 14 Oct 2020 22:06:38 -0400	[thread overview]
Message-ID: <20201015020643.432908-40-dgilbert@interlog.com> (raw)
In-Reply-To: <20201015020643.432908-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 b95eb87a3c43..cba1db278775 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -232,6 +232,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;
@@ -2262,6 +2267,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() */
 }
 
@@ -2383,6 +2390,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;
@@ -4056,8 +4064,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.25.1


  parent reply	other threads:[~2020-10-15  2:07 UTC|newest]

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