RDMA/mlx5: Use get_zeroed_page() for clock_info

commit ddcdc368b1033e19fd3a5f750752e10e28a87826 upstream.

get_zeroed_page() returns a virtual address for the page which is better
than allocating a struct page and doing a permanent kmap on it.

Cc: stable@vger.kernel.org
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Reviewed-by: Haggai Eran <haggaie@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index c6bdd0d16c4b6d4dac7017a5718252198ee07a0c..ca91f90b4cccd1c526591950b1f21ebd0e95b090 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -1986,11 +1986,12 @@ static int mlx5_ib_mmap_clock_info_page(struct mlx5_ib_dev *dev,
                return -EPERM;
        vma->vm_flags &= ~VM_MAYWRITE;
 
-       if (!dev->mdev->clock_info_page)
+       if (!dev->mdev->clock_info)
                return -EOPNOTSUPP;
 
        return rdma_user_mmap_page(&context->ibucontext, vma,
-                                  dev->mdev->clock_info_page, PAGE_SIZE);
+                                  virt_to_page(dev->mdev->clock_info),
+                                  PAGE_SIZE);
 }
 
 static int uar_mmap(struct mlx5_ib_dev *dev, enum mlx5_ib_mmap_cmd cmd,

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
index ca0ee9916e9e0d746a8eaae04c53b752229b700e..0059b290e09572aa7bb8a6f7233fc4a235cc3b76 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
@@ -535,23 +535,16 @@ void mlx5_init_clock(struct mlx5_core_dev *mdev)
        do_div(ns, NSEC_PER_SEC / HZ);
        clock->overflow_period = ns;
 
-       mdev->clock_info_page = alloc_page(GFP_KERNEL);
-       if (mdev->clock_info_page) {
-               mdev->clock_info = kmap(mdev->clock_info_page);
-               if (!mdev->clock_info) {
-                       __free_page(mdev->clock_info_page);
-                       mlx5_core_warn(mdev, "failed to map clock page\n");
-               } else {
-                       mdev->clock_info->sign   = 0;
-                       mdev->clock_info->nsec   = clock->tc.nsec;
-                       mdev->clock_info->cycles = clock->tc.cycle_last;
-                       mdev->clock_info->mask   = clock->cycles.mask;
-                       mdev->clock_info->mult   = clock->nominal_c_mult;
-                       mdev->clock_info->shift  = clock->cycles.shift;
-                       mdev->clock_info->frac   = clock->tc.frac;
-                       mdev->clock_info->overflow_period =
-                                               clock->overflow_period;
-               }
+       mdev->clock_info =
+               (struct mlx5_ib_clock_info *)get_zeroed_page(GFP_KERNEL);
+       if (mdev->clock_info) {
+               mdev->clock_info->nsec = clock->tc.nsec;
+               mdev->clock_info->cycles = clock->tc.cycle_last;
+               mdev->clock_info->mask = clock->cycles.mask;
+               mdev->clock_info->mult = clock->nominal_c_mult;
+               mdev->clock_info->shift = clock->cycles.shift;
+               mdev->clock_info->frac = clock->tc.frac;
+               mdev->clock_info->overflow_period = clock->overflow_period;
        }
 
        INIT_WORK(&clock->pps_info.out_work, mlx5_pps_out);
@@ -599,8 +592,7 @@ void mlx5_cleanup_clock(struct mlx5_core_dev *mdev)
        cancel_delayed_work_sync(&clock->overflow_work);
 
        if (mdev->clock_info) {
-               kunmap(mdev->clock_info_page);
-               __free_page(mdev->clock_info_page);
+               free_page((unsigned long)mdev->clock_info);
                mdev->clock_info = NULL;
        }
 

diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 4f001619f854b068d84eae8b6c4e5e091b3df3e0..a6d4436c76b541767357ad2a8ab1ab47ea4a6b66 100644 (file)
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -677,7 +677,6 @@ struct mlx5_core_dev {
 #endif
        struct mlx5_clock        clock;
        struct mlx5_ib_clock_info  *clock_info;
-       struct page             *clock_info_page;
        struct mlx5_fw_tracer   *tracer;
 };