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 16/44] sg: rework sg_mmap
Date: Wed, 14 Oct 2020 22:06:15 -0400 [thread overview]
Message-ID: <20201015020643.432908-17-dgilbert@interlog.com> (raw)
In-Reply-To: <20201015020643.432908-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 adfd4abe312f..b2ddc044ad87 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1489,14 +1489,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;
@@ -1509,19 +1510,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:[~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 ` Douglas Gilbert [this message]
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 ` [PATCH v11 39/44] sg: add mmap_sz tracking Douglas Gilbert
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-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 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.