6 files changed, 127 insertions, 60 deletions

diff --git a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/cq.c
index 84591865e39d..eecac7b52bcb 100644
--- a/drivers/infiniband/hw/mlx5/cq.c
+++ b/drivers/infiniband/hw/mlx5/cq.c
@@ -620,7 +620,7 @@ static int create_cq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
         }
         mlx5_fill_page_array(&cq->buf.buf, (*cqb)->pas);
 
-        (*cqb)->ctx.log_pg_sz = cq->buf.buf.page_shift - PAGE_SHIFT;
+        (*cqb)->ctx.log_pg_sz = cq->buf.buf.page_shift - 12;
         *index = dev->mdev.priv.uuari.uars[0].index;
 
         return 0;
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 8a36fd78c89f..ce14008a5702 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -551,7 +551,7 @@ static int create_user_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
         }
         mlx5_ib_populate_pas(dev, qp->umem, page_shift, (*in)->pas, 0);
         (*in)->ctx.log_pg_sz_remote_qpn =
-                cpu_to_be32((page_shift - PAGE_SHIFT) << 24);
+                cpu_to_be32((page_shift - 12) << 24);
         (*in)->ctx.params2 = cpu_to_be32(offset << 6);
 
         (*in)->ctx.qp_counter_set_usr_page = cpu_to_be32(uar_index);
@@ -648,7 +648,7 @@ static int create_kernel_qp(struct mlx5_ib_dev *dev,
                 goto err_buf;
         }
         (*in)->ctx.qp_counter_set_usr_page = cpu_to_be32(uar_index);
-        (*in)->ctx.log_pg_sz_remote_qpn = cpu_to_be32((qp->buf.page_shift - PAGE_SHIFT) << 24);
+        (*in)->ctx.log_pg_sz_remote_qpn = cpu_to_be32((qp->buf.page_shift - 12) << 24);
         /* Set "fast registration enabled" for all kernel QPs */
         (*in)->ctx.params1 |= cpu_to_be32(1 << 11);
         (*in)->ctx.sq_crq_size |= cpu_to_be16(1 << 4);
diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c
index f1e5845b42b0..dbc2c7188c5e 100644
--- a/drivers/infiniband/hw/mlx5/srq.c
+++ b/drivers/infiniband/hw/mlx5/srq.c
@@ -123,7 +123,7 @@ static int create_srq_user(struct ib_pd *pd, struct mlx5_ib_srq *srq,
                 goto err_in;
         }
 
-        (*in)->ctx.log_pg_sz = page_shift - PAGE_SHIFT;
+        (*in)->ctx.log_pg_sz = page_shift - 12;
         (*in)->ctx.pgoff_cqn = cpu_to_be32(offset << 26);
 
         return 0;
@@ -192,7 +192,7 @@ static int create_srq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_srq *srq,
         }
         srq->wq_sig = !!srq_signature;
 
-        (*in)->ctx.log_pg_sz = page_shift - PAGE_SHIFT;
+        (*in)->ctx.log_pg_sz = page_shift - 12;
 
         return 0;
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
index 2231d93cc7ad..6b4b436840bd 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
@@ -354,7 +354,7 @@ int mlx5_create_map_eq(struct mlx5_core_dev *dev, struct mlx5_eq *eq, u8 vecidx,
         in->hdr.opcode = cpu_to_be16(MLX5_CMD_OP_CREATE_EQ);
         in->ctx.log_sz_usr_page = cpu_to_be32(ilog2(eq->nent) << 24 | uar->index);
         in->ctx.intr = vecidx;
-        in->ctx.log_page_size = PAGE_SHIFT - 12;
+        in->ctx.log_page_size = eq->buf.page_shift - 12;
         in->events_mask = cpu_to_be64(mask);
 
         err = mlx5_cmd_exec(dev, in, inlen, &out, sizeof(out));
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
index a0d0da35578c..013aa422adee 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
@@ -57,10 +57,13 @@ struct mlx5_pages_req {
 };
 
 struct fw_page {
-        struct rb_node  rb_node;
-        u64             addr;
-        struct page     *page;
-        u16             func_id;
+        struct rb_node          rb_node;
+        u64                     addr;
+        struct page            *page;
+        u16                     func_id;
+        unsigned long           bitmask;
+        struct list_head        list;
+        unsigned                free_count;
 };
 
 struct mlx5_query_pages_inbox {
@@ -94,6 +97,11 @@ enum {
         MAX_RECLAIM_TIME_MSECS  = 5000,
 };
 
+enum {
+        MLX5_MAX_RECLAIM_TIME_MILI      = 5000,
+        MLX5_NUM_4K_IN_PAGE             = PAGE_SIZE / 4096,
+};
+
 static int insert_page(struct mlx5_core_dev *dev, u64 addr, struct page *page, u16 func_id)
 {
         struct rb_root *root = &dev->priv.page_root;
@@ -101,6 +109,7 @@ static int insert_page(struct mlx5_core_dev *dev, u64 addr, struct page *page, u
         struct rb_node *parent = NULL;
         struct fw_page *nfp;
         struct fw_page *tfp;
+        int i;
 
         while (*new) {
                 parent = *new;
@@ -113,25 +122,29 @@ static int insert_page(struct mlx5_core_dev *dev, u64 addr, struct page *page, u
                         return -EEXIST;
         }
 
-        nfp = kmalloc(sizeof(*nfp), GFP_KERNEL);
+        nfp = kzalloc(sizeof(*nfp), GFP_KERNEL);
         if (!nfp)
                 return -ENOMEM;
 
         nfp->addr = addr;
         nfp->page = page;
         nfp->func_id = func_id;
+        nfp->free_count = MLX5_NUM_4K_IN_PAGE;
+        for (i = 0; i < MLX5_NUM_4K_IN_PAGE; i++)
+                set_bit(i, &nfp->bitmask);
 
         rb_link_node(&nfp->rb_node, parent, new);
         rb_insert_color(&nfp->rb_node, root);
+        list_add(&nfp->list, &dev->priv.free_list);
 
         return 0;
 }
 
-static struct page *remove_page(struct mlx5_core_dev *dev, u64 addr)
+static struct fw_page *find_fw_page(struct mlx5_core_dev *dev, u64 addr)
 {
         struct rb_root *root = &dev->priv.page_root;
         struct rb_node *tmp = root->rb_node;
-        struct page *result = NULL;
+        struct fw_page *result = NULL;
         struct fw_page *tfp;
 
         while (tmp) {
@@ -141,9 +154,7 @@ static struct page *remove_page(struct mlx5_core_dev *dev, u64 addr)
                 } else if (tfp->addr > addr) {
                         tmp = tmp->rb_right;
                 } else {
-                        rb_erase(&tfp->rb_node, root);
-                        result = tfp->page;
-                        kfree(tfp);
+                        result = tfp;
                         break;