Merge tag 'mlx5-fixes-2018-10-10' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux

Saeed Mahameed says:

====================
Mellanox, mlx5 fixes 2018-10-10

This pull request includes some fixes to mlx5 driver,
Please pull and let me know if there's any problem.

For -stable v4.11:
('net/mlx5: Take only bit 24-26 of wqe.pftype_wq for page fault type')
For -stable v4.17:
('net/mlx5: Fix memory leak when setting fpga ipsec caps')
For -stable v4.18:
('net/mlx5: WQ, fixes for fragmented WQ buffers API')
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

8 files changed, 36 insertions, 38 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index 15d8ae28c040..00172dee5339 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@ -432,10 +432,9 @@ static inline u16 mlx5e_icosq_wrap_cnt(struct mlx5e_icosq *sq)
 
 static inline void mlx5e_fill_icosq_frag_edge(struct mlx5e_icosq *sq,
                                               struct mlx5_wq_cyc *wq,
-                                              u16 pi, u16 frag_pi)
+                                              u16 pi, u16 nnops)
 {
         struct mlx5e_sq_wqe_info *edge_wi, *wi = &sq->db.ico_wqe[pi];
-        u8 nnops = mlx5_wq_cyc_get_frag_size(wq) - frag_pi;
 
         edge_wi = wi + nnops;
 
@@ -454,15 +453,14 @@ static int mlx5e_alloc_rx_mpwqe(struct mlx5e_rq *rq, u16 ix)
         struct mlx5_wq_cyc *wq = &sq->wq;
         struct mlx5e_umr_wqe *umr_wqe;
         u16 xlt_offset = ix << (MLX5E_LOG_ALIGNED_MPWQE_PPW - 1);
-        u16 pi, frag_pi;
+        u16 pi, contig_wqebbs_room;
         int err;
         int i;
 
         pi = mlx5_wq_cyc_ctr2ix(wq, sq->pc);
-        frag_pi = mlx5_wq_cyc_ctr2fragix(wq, sq->pc);
-
-        if (unlikely(frag_pi + MLX5E_UMR_WQEBBS > mlx5_wq_cyc_get_frag_size(wq))) {
-                mlx5e_fill_icosq_frag_edge(sq, wq, pi, frag_pi);
+        contig_wqebbs_room = mlx5_wq_cyc_get_contig_wqebbs(wq, pi);
+        if (unlikely(contig_wqebbs_room < MLX5E_UMR_WQEBBS)) {
+                mlx5e_fill_icosq_frag_edge(sq, wq, pi, contig_wqebbs_room);
                 pi = mlx5_wq_cyc_ctr2ix(wq, sq->pc);
         }
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
index ae73ea992845..6dacaeba2fbf 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
@@ -290,10 +290,9 @@ dma_unmap_wqe_err:
 
 static inline void mlx5e_fill_sq_frag_edge(struct mlx5e_txqsq *sq,
                                            struct mlx5_wq_cyc *wq,
-                                           u16 pi, u16 frag_pi)
+                                           u16 pi, u16 nnops)
 {
         struct mlx5e_tx_wqe_info *edge_wi, *wi = &sq->db.wqe_info[pi];
-        u8 nnops = mlx5_wq_cyc_get_frag_size(wq) - frag_pi;
 
         edge_wi = wi + nnops;
 
@@ -348,8 +347,8 @@ netdev_tx_t mlx5e_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,
         struct mlx5e_tx_wqe_info *wi;
 
         struct mlx5e_sq_stats *stats = sq->stats;
+        u16 headlen, ihs, contig_wqebbs_room;
         u16 ds_cnt, ds_cnt_inl = 0;
-        u16 headlen, ihs, frag_pi;
         u8 num_wqebbs, opcode;
         u32 num_bytes;
         int num_dma;
@@ -386,9 +385,9 @@ netdev_tx_t mlx5e_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,
         }
 
         num_wqebbs = DIV_ROUND_UP(ds_cnt, MLX5_SEND_WQEBB_NUM_DS);
-        frag_pi = mlx5_wq_cyc_ctr2fragix(wq, sq->pc);
-        if (unlikely(frag_pi + num_wqebbs > mlx5_wq_cyc_get_frag_size(wq))) {
-                mlx5e_fill_sq_frag_edge(sq, wq, pi, frag_pi);
+        contig_wqebbs_room = mlx5_wq_cyc_get_contig_wqebbs(wq, pi);
+        if (unlikely(contig_wqebbs_room < num_wqebbs)) {
+                mlx5e_fill_sq_frag_edge(sq, wq, pi, contig_wqebbs_room);
                 mlx5e_sq_fetch_wqe(sq, &wqe, &pi);
         }
 
@@ -636,7 +635,7 @@ netdev_tx_t mlx5i_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,
         struct mlx5e_tx_wqe_info *wi;
 
         struct mlx5e_sq_stats *stats = sq->stats;
-        u16 headlen, ihs, pi, frag_pi;
+        u16 headlen, ihs, pi, contig_wqebbs_room;
         u16 ds_cnt, ds_cnt_inl = 0;
         u8 num_wqebbs, opcode;
         u32 num_bytes;
@@ -672,13 +671,14 @@ netdev_tx_t mlx5i_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,
         }
 
         num_wqebbs = DIV_ROUND_UP(ds_cnt, MLX5_SEND_WQEBB_NUM_DS);
-        frag_pi = mlx5_wq_cyc_ctr2fragix(wq, sq->pc);
-        if (unlikely(frag_pi + num_wqebbs > mlx5_wq_cyc_get_frag_size(wq))) {
+        pi = mlx5_wq_cyc_ctr2ix(wq, sq->pc);
+        contig_wqebbs_room = mlx5_wq_cyc_get_contig_wqebbs(wq, pi);
+        if (unlikely(contig_wqebbs_room < num_wqebbs)) {
+                mlx5e_fill_sq_frag_edge(sq, wq, pi, contig_wqebbs_room);
                 pi = mlx5_wq_cyc_ctr2ix(wq, sq->pc);
-                mlx5e_fill_sq_frag_edge(sq, wq, pi, frag_pi);
         }
 
-        mlx5i_sq_fetch_wqe(sq, &wqe, &pi);
+        mlx5i_sq_fetch_wqe(sq, &wqe, pi);
 
         /* fill wqe */
         wi       = &sq->db.wqe_info[pi];
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
index 48864f4988a4..c1e1a16a9b07 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
@@ -273,7 +273,7 @@ static void eq_pf_process(struct mlx5_eq *eq)
                 case MLX5_PFAULT_SUBTYPE_WQE:
                         /* WQE based event */
                         pfault->type =
-                                be32_to_cpu(pf_eqe->wqe.pftype_wq) >> 24;
+                                (be32_to_cpu(pf_eqe->wqe.pftype_wq) >> 24) & 0x7;
                         pfault->token =
                                 be32_to_cpu(pf_eqe->wqe.token);
                         pfault->wqe.wq_num =
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c b/drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c
index 5645a4facad2..b8ee9101c506 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c
@@ -245,7 +245,7 @@ static void *mlx5_fpga_ipsec_cmd_exec(struct mlx5_core_dev *mdev,
                 return ERR_PTR(res);
         }
 
-        /* Context will be freed by wait func after completion */
+        /* Context should be freed by the caller after completion. */
         return context;
 }
 
@@ -418,10 +418,8 @@ static int mlx5_fpga_ipsec_set_caps(struct mlx5_core_dev *mdev, u32 flags)
         cmd.cmd = htonl(MLX5_FPGA_IPSEC_CMD_OP_SET_CAP);
         cmd.flags = htonl(flags);
         context = mlx5_fpga_ipsec_cmd_exec(mdev, &cmd, sizeof(cmd));
-        if (IS_ERR(context)) {
-                err = PTR_ERR(context);
-                goto out;
-        }
+        if (IS_ERR(context))
+                return PTR_ERR(context);
 
         err = mlx5_fpga_ipsec_cmd_wait(context);
         if (err)
@@ -435,6 +433,7 @@ static int mlx5_fpga_ipsec_set_caps(struct mlx5_core_dev *mdev, u32 flags)
         }
 
 out:
+        kfree(context);
         return err;
 }
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h
index 08eac92fc26c..0982c579ec74 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h
@@ -109,12 +109,11 @@ struct mlx5i_tx_wqe {
 
 static inline void mlx5i_sq_fetch_wqe(struct mlx5e_txqsq *sq,
                                       struct mlx5i_tx_wqe **wqe,
-                                      u16 *pi)
+                                      u16 pi)
 {
         struct mlx5_wq_cyc *wq = &sq->wq;
 
-        *pi  = mlx5_wq_cyc_ctr2ix(wq, sq->pc);
-        *wqe = mlx5_wq_cyc_get_wqe(wq, *pi);
+        *wqe = mlx5_wq_cyc_get_wqe(wq, pi);
         memset(*wqe, 0, sizeof(**wqe));
 }
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/wq.c b/drivers/net/ethernet/mellanox/mlx5/core/wq.c
index 68e7f8df2a6d..ddca327e8950 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/wq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/wq.c
@@ -39,11 +39,6 @@ u32 mlx5_wq_cyc_get_size(struct mlx5_wq_cyc *wq)
         return (u32)wq->fbc.sz_m1 + 1;
 }
 
-u16 mlx5_wq_cyc_get_frag_size(struct mlx5_wq_cyc *wq)
-{
-        return wq->fbc.frag_sz_m1 + 1;
-}
-
 u32 mlx5_cqwq_get_size(struct mlx5_cqwq *wq)
 {
         return wq->fbc.sz_m1 + 1;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/wq.h b/drivers/net/ethernet/mellanox/mlx5/core/wq.h
index 3a1a170bb2d7..b1293d153a58 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/wq.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/wq.h
@@ -80,7 +80,6 @@ int mlx5_wq_cyc_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,
                        void *wqc, struct mlx5_wq_cyc *wq,
                        struct mlx5_wq_ctrl *wq_ctrl);
 u32 mlx5_wq_cyc_get_size(struct mlx5_wq_cyc *wq);
-u16 mlx5_wq_cyc_get_frag_size(struct mlx5_wq_cyc *wq);
 
 int mlx5_wq_qp_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,
                       void *qpc, struct mlx5_wq_qp *wq,
@@ -140,11 +139,6 @@ static inline u16 mlx5_wq_cyc_ctr2ix(struct mlx5_wq_cyc *wq, u16 ctr)
         return ctr & wq->fbc.sz_m1;
 }
 
-static inline u16 mlx5_wq_cyc_ctr2fragix(struct mlx5_wq_cyc *wq, u16 ctr)
-{
-        return ctr & wq->fbc.frag_sz_m1;
-}
-
 static inline u16 mlx5_wq_cyc_get_head(struct mlx5_wq_cyc *wq)
 {
         return mlx5_wq_cyc_ctr2ix(wq, wq->wqe_ctr);
@@ -160,6 +154,11 @@ static inline void *mlx5_wq_cyc_get_wqe(struct mlx5_wq_cyc *wq, u16 ix)
         return mlx5_frag_buf_get_wqe(&wq->fbc, ix);
 }
 
+static inline u16 mlx5_wq_cyc_get_contig_wqebbs(struct mlx5_wq_cyc *wq, u16 ix)
+{
+        return mlx5_frag_buf_get_idx_last_contig_stride(&wq->fbc, ix) - ix + 1;
+}
+
 static inline int mlx5_wq_cyc_cc_bigger(u16 cc1, u16 cc2)
 {
         int equal   = (cc1 == cc2);
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 66d94b4557cf..88a041b73abf 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -1032,6 +1032,14 @@ static inline void *mlx5_frag_buf_get_wqe(struct mlx5_frag_buf_ctrl *fbc,
                 ((fbc->frag_sz_m1 & ix) << fbc->log_stride);
 }
 
+static inline u32
+mlx5_frag_buf_get_idx_last_contig_stride(struct mlx5_frag_buf_ctrl *fbc, u32 ix)
+{
+        u32 last_frag_stride_idx = (ix + fbc->strides_offset) | fbc->frag_sz_m1;
+
+        return min_t(u32, last_frag_stride_idx - fbc->strides_offset, fbc->sz_m1);
+}
+
 int mlx5_cmd_init(struct mlx5_core_dev *dev);
 void mlx5_cmd_cleanup(struct mlx5_core_dev *dev);
 void mlx5_cmd_use_events(struct mlx5_core_dev *dev);