From: Souptick Joarder <jrdr.linux@gmail.com>
To: leon@kernel.org, dledford@redhat.com, jgg@ziepe.ca
Cc: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org,
willy@infradead.org, Souptick Joarder <jrdr.linux@gmail.com>
Subject: [PATCH] IB/mlx5: Convert to use vm_map_pages_zero()
Date: Sun, 25 Aug 2019 11:37:27 +0530 [thread overview]
Message-ID: <1566713247-23873-1-git-send-email-jrdr.linux@gmail.com> (raw)
First, length passed to mmap is checked explicitly against
PAGE_SIZE.
Second, if vma->vm_pgoff is passed as non zero, it would return
error. It appears like driver is expecting vma->vm_pgoff to
be passed as 0 always. otherwise throw error (not sure if done
with a particular purpose). Rather driver could set vma->vm_pgoff
to 0 irrespective of the value passed to it.
vm_map_pages_zero() has condition to validate incorrect length
passed to driver and second it can also set vma->vm_pgoff to 0
before mapping the page to vma.
Hence convert to use vm_map_pages_zero().
Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
---
drivers/infiniband/hw/mlx5/main.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 0569bca..366211d 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -2071,12 +2071,10 @@ static int mlx5_ib_mmap_clock_info_page(struct mlx5_ib_dev *dev,
struct vm_area_struct *vma,
struct mlx5_ib_ucontext *context)
{
- if ((vma->vm_end - vma->vm_start != PAGE_SIZE) ||
- !(vma->vm_flags & VM_SHARED))
- return -EINVAL;
+ struct page *pages;
- if (get_index(vma->vm_pgoff) != MLX5_IB_CLOCK_INFO_V1)
- return -EOPNOTSUPP;
+ if (!(vma->vm_flags & VM_SHARED))
+ return -EINVAL;
if (vma->vm_flags & (VM_WRITE | VM_EXEC))
return -EPERM;
@@ -2084,9 +2082,9 @@ static int mlx5_ib_mmap_clock_info_page(struct mlx5_ib_dev *dev,
if (!dev->mdev->clock_info)
return -EOPNOTSUPP;
+ pages = virt_to_page(dev->mdev->clock_info);
- return vm_insert_page(vma, vma->vm_start,
- virt_to_page(dev->mdev->clock_info));
+ return vm_map_pages_zero(vma, &pages, 1);
}
static int uar_mmap(struct mlx5_ib_dev *dev, enum mlx5_ib_mmap_cmd cmd,
--
1.9.1
next reply other threads:[~2019-08-25 6:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-25 6:07 Souptick Joarder [this message]
2019-08-25 19:43 ` [PATCH] IB/mlx5: Convert to use vm_map_pages_zero() Jason Gunthorpe
2019-08-25 20:02 ` Souptick Joarder
2019-08-26 12:20 ` Jason Gunthorpe
2019-08-26 20:18 ` Souptick Joarder
2019-08-27 15:49 ` Jason Gunthorpe
2019-08-28 3:27 ` Souptick Joarder
2019-08-28 5:00 ` Leon Romanovsky
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=1566713247-23873-1-git-send-email-jrdr.linux@gmail.com \
--to=jrdr.linux@gmail.com \
--cc=dledford@redhat.com \
--cc=jgg@ziepe.ca \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=willy@infradead.org \
/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).