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 16/45] sg: rework sg_mmap
Date: Sun, 23 May 2021 21:01:18 -0400 [thread overview]
Message-ID: <20210524010147.94845-17-dgilbert@interlog.com> (raw)
In-Reply-To: <20210524010147.94845-1-dgilbert@interlog.com>
Simple rework of the sg_mmap() function.
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Douglas Gilbert <dgilbert@interlog.com>
---
drivers/scsi/sg.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index aa3202cbf3a1..4d13cd28a60c 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1488,14 +1488,15 @@ static const struct vm_operations_struct sg_mmap_vm_ops = {
.fault = sg_vma_fault,
};
+/* Entry point for mmap(2) system call */
static int
sg_mmap(struct file *filp, struct vm_area_struct *vma)
{
- struct sg_fd *sfp;
- unsigned long req_sz, len, sa;
- struct sg_scatter_hold *rsv_schp;
int k, length;
int ret = 0;
+ unsigned long req_sz, len, sa;
+ struct sg_scatter_hold *rsv_schp;
+ struct sg_fd *sfp;
if (!filp || !vma)
return -ENXIO;
@@ -1508,19 +1509,23 @@ sg_mmap(struct file *filp, struct vm_area_struct *vma)
SG_LOG(3, sfp, "%s: vm_start=%p, len=%d\n", __func__,
(void *)vma->vm_start, (int)req_sz);
if (vma->vm_pgoff)
- return -EINVAL; /* want no offset */
- rsv_schp = &sfp->reserve;
+ return -EINVAL; /* only an offset of 0 accepted */
+ /* Check reserve request is inactive and has large enough buffer */
mutex_lock(&sfp->f_mutex);
- if (req_sz > rsv_schp->buflen) {
- ret = -ENOMEM; /* cannot map more than reserved buffer */
+ if (sfp->res_in_use) {
+ ret = -EBUSY;
+ goto out;
+ }
+ rsv_schp = &sfp->reserve;
+ if (req_sz > (unsigned long)rsv_schp->buflen) {
+ ret = -ENOMEM;
goto out;
}
-
sa = vma->vm_start;
length = 1 << (PAGE_SHIFT + rsv_schp->page_order);
- for (k = 0; k < rsv_schp->num_sgat && sa < vma->vm_end; k++) {
+ for (k = 0; k < rsv_schp->num_sgat && sa < vma->vm_end; ++k) {
len = vma->vm_end - sa;
- len = (len < length) ? len : length;
+ len = min_t(unsigned long, len, (unsigned long)length);
sa += len;
}
--
2.25.1
next prev parent reply other threads:[~2021-05-24 1:02 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 ` Douglas Gilbert [this message]
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 ` [PATCH v19 42/45] sg: remove unit attention check for device changed Douglas Gilbert
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-17-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).