Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

Pull rdma updates from Doug Ledford:
 "Initial roundup of 4.6 merge window patches.

  This is the first of two pull requests.  It is the smaller request,
  but touches for more different things (this is everything but what is
  in or going into staging).  The pull request for the code in
  staging/rdma is on hold until after we decide what to do on the
  write/writev API issue and may be partially deferred until 4.7 as a
  result.

  Summary:

   - cxgb4 updates
   - nes updates
   - unification of iwarp portmapper code to core
   - add drain_cq API
   - various ib_core updates
   - minor ipoib updates
   - minor mlx4 updates
   - more significant mlx5 updates (including a minor merge conflict
     with net-next tree...merge is simple to resolve and Stephen's
     resolution was confirmed by Mellanox)
   - trivial net/9p rdma conversion
   - ocrdma RoCEv2 update
   - srpt updates"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (85 commits)
  iwpm: crash fix for large connections test
  iw_cxgb3: support for iWARP port mapping
  iw_cxgb4: remove port mapper related code
  iw_nes: remove port mapper related code
  iwcm: common code for port mapper
  net/9p: convert to new CQ API
  IB/mlx5: Add support for don't trap rules
  net/mlx5_core: Introduce forward to next priority action
  net/mlx5_core: Create anchor of last flow table
  iser: Accept arbitrary sg lists mapping if the device supports it
  mlx5: Add arbitrary sg list support
  IB/core: Add arbitrary sg_list support
  IB/mlx5: Expose correct max_fast_reg_page_list_len
  IB/mlx5: Make coding style more consistent
  IB/mlx5: Convert UMR CQ to new CQ API
  IB/ocrdma: Skip using unneeded intermediate variable
  IB/ocrdma: Skip using unneeded intermediate variable
  IB/ocrdma: Delete unnecessary variable initialisations in 11 functions
  IB/core: Documentation fix in the MAD header file
  IB/core: trivial prink cleanup.
  ...

7 files changed, 105 insertions, 22 deletions

diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index a0e8cc8dcc67..8541a913f6a3 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -219,6 +219,7 @@ enum {
         MLX4_DEV_CAP_FLAG2_UPDATE_QP_SRC_CHECK_LB = 1ULL << 31,
         MLX4_DEV_CAP_FLAG2_LB_SRC_CHK           = 1ULL << 32,
         MLX4_DEV_CAP_FLAG2_ROCE_V1_V2           = 1ULL <<  33,
+        MLX4_DEV_CAP_FLAG2_DMFS_UC_MC_SNIFFER   = 1ULL <<  34,
 };
 
 enum {
@@ -1160,6 +1161,8 @@ enum mlx4_net_trans_promisc_mode {
         MLX4_FS_REGULAR = 1,
         MLX4_FS_ALL_DEFAULT,
         MLX4_FS_MC_DEFAULT,
+        MLX4_FS_MIRROR_RX_PORT,
+        MLX4_FS_MIRROR_SX_PORT,
         MLX4_FS_UC_SNIFFER,
         MLX4_FS_MC_SNIFFER,
         MLX4_FS_MODE_NUM, /* should be last */
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index 987764afa65c..9566b3b3b2c5 100644
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -105,6 +105,29 @@ __mlx5_mask(typ, fld))
         ___t; \
 })
 
+/* Big endian getters */
+#define MLX5_GET64_BE(typ, p, fld) (*((__be64 *)(p) +\
+        __mlx5_64_off(typ, fld)))
+
+#define MLX5_GET_BE(type_t, typ, p, fld) ({                               \
+                type_t tmp;                                               \
+                switch (sizeof(tmp)) {                                    \
+                case sizeof(u8):                                          \
+                        tmp = (__force type_t)MLX5_GET(typ, p, fld);      \
+                        break;                                            \
+                case sizeof(u16):                                         \
+                        tmp = (__force type_t)cpu_to_be16(MLX5_GET(typ, p, fld)); \
+                        break;                                            \
+                case sizeof(u32):                                         \
+                        tmp = (__force type_t)cpu_to_be32(MLX5_GET(typ, p, fld)); \
+                        break;                                            \
+                case sizeof(u64):                                         \
+                        tmp = (__force type_t)MLX5_GET64_BE(typ, p, fld); \
+                        break;                                            \
+                        }                                                 \
+                tmp;                                                      \
+                })
+
 enum {
         MLX5_MAX_COMMANDS               = 32,
         MLX5_CMD_DATA_BLOCK_SIZE        = 512,
@@ -1284,7 +1307,8 @@ enum {
         MLX5_RFC_3635_COUNTERS_GROUP          = 0x3,
         MLX5_ETHERNET_EXTENDED_COUNTERS_GROUP = 0x5,
         MLX5_PER_PRIORITY_COUNTERS_GROUP      = 0x10,
-        MLX5_PER_TRAFFIC_CLASS_COUNTERS_GROUP = 0x11
+        MLX5_PER_TRAFFIC_CLASS_COUNTERS_GROUP = 0x11,
+        MLX5_INFINIBAND_PORT_COUNTERS_GROUP   = 0x20,
 };
 
 static inline u16 mlx5_to_sw_pkey_sz(int pkey_sz)
@@ -1294,6 +1318,11 @@ static inline u16 mlx5_to_sw_pkey_sz(int pkey_sz)
         return MLX5_MIN_PKEY_TABLE_SIZE << pkey_sz;
 }
 
-#define MLX5_BY_PASS_NUM_PRIOS 9
+#define MLX5_BY_PASS_NUM_REGULAR_PRIOS 8
+#define MLX5_BY_PASS_NUM_DONT_TRAP_PRIOS 8
+#define MLX5_BY_PASS_NUM_MULTICAST_PRIOS 1
+#define MLX5_BY_PASS_NUM_PRIOS (MLX5_BY_PASS_NUM_REGULAR_PRIOS +\
+                                MLX5_BY_PASS_NUM_DONT_TRAP_PRIOS +\
+                                MLX5_BY_PASS_NUM_MULTICAST_PRIOS)
 
 #endif /* MLX5_DEVICE_H */
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 1e3006dcf35d..9108904a6a56 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -338,7 +338,7 @@ struct mlx5_core_sig_ctx {
         u32                     sigerr_count;
 };
 
-struct mlx5_core_mr {
+struct mlx5_core_mkey {
         u64                     iova;
         u64                     size;
         u32                     key;
@@ -426,7 +426,7 @@ struct mlx5_srq_table {
         struct radix_tree_root  tree;
 };
 
-struct mlx5_mr_table {
+struct mlx5_mkey_table {
         /* protect radix tree
          */
         rwlock_t                lock;
@@ -484,9 +484,9 @@ struct mlx5_priv {
         struct mlx5_cq_table    cq_table;
         /* end: cq staff */
 
-        /* start: mr staff */
-        struct mlx5_mr_table    mr_table;
-        /* end: mr staff */
+        /* start: mkey staff */
+        struct mlx5_mkey_table  mkey_table;
+        /* end: mkey staff */
 
         /* start: alloc staff */
         /* protect buffer alocation according to numa node */
@@ -739,16 +739,18 @@ int mlx5_core_query_srq(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq,
                         struct mlx5_query_srq_mbox_out *out);
 int mlx5_core_arm_srq(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq,
                       u16 lwm, int is_srq);
-void mlx5_init_mr_table(struct mlx5_core_dev *dev);
-void mlx5_cleanup_mr_table(struct mlx5_core_dev *dev);
-int mlx5_core_create_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr,
+void mlx5_init_mkey_table(struct mlx5_core_dev *dev);
+void mlx5_cleanup_mkey_table(struct mlx5_core_dev *dev);
+int mlx5_core_create_mkey(struct mlx5_core_dev *dev,
+                          struct mlx5_core_mkey *mkey,
                           struct mlx5_create_mkey_mbox_in *in, int inlen,
                           mlx5_cmd_cbk_t callback, void *context,
                           struct mlx5_create_mkey_mbox_out *out);
-int mlx5_core_destroy_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr);
-int mlx5_core_query_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr,
+int mlx5_core_destroy_mkey(struct mlx5_core_dev *dev,
+                           struct mlx5_core_mkey *mkey);
+int mlx5_core_query_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mkey *mkey,
                          struct mlx5_query_mkey_mbox_out *out, int outlen);
-int mlx5_core_dump_fill_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr,
+int mlx5_core_dump_fill_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mkey *_mkey,
                              u32 *mkey);
 int mlx5_core_alloc_pd(struct mlx5_core_dev *dev, u32 *pdn);
 int mlx5_core_dealloc_pd(struct mlx5_core_dev *dev, u32 pdn);
@@ -847,6 +849,8 @@ int mlx5_core_destroy_psv(struct mlx5_core_dev *dev, int psv_num);
 void mlx5_core_put_rsc(struct mlx5_core_rsc_common *common);
 int mlx5_query_odp_caps(struct mlx5_core_dev *dev,
                         struct mlx5_odp_caps *odp_caps);
+int mlx5_core_query_ib_ppcnt(struct mlx5_core_dev *dev,
+                             u8 port_num, void *out, size_t sz);
 
 static inline int fw_initializing(struct mlx5_core_dev *dev)
 {
diff --git a/include/linux/mlx5/fs.h b/include/linux/mlx5/fs.h
index 8230caa3fb6e..8dec5508d93d 100644
--- a/include/linux/mlx5/fs.h
+++ b/include/linux/mlx5/fs.h
@@ -38,6 +38,10 @@
 
 #define MLX5_FS_DEFAULT_FLOW_TAG 0x0
 
+enum {
+        MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO  = 1 << 16,
+};
+
 #define LEFTOVERS_RULE_NUM       2
 static inline void build_leftovers_ft_param(int *priority,
                                             int *n_ent,
@@ -52,6 +56,7 @@ enum mlx5_flow_namespace_type {
         MLX5_FLOW_NAMESPACE_BYPASS,
         MLX5_FLOW_NAMESPACE_KERNEL,
         MLX5_FLOW_NAMESPACE_LEFTOVERS,
+        MLX5_FLOW_NAMESPACE_ANCHOR,
         MLX5_FLOW_NAMESPACE_FDB,
 };
 
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 58eef02edc7e..9b8a02b7880f 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -458,7 +458,8 @@ struct mlx5_ifc_ads_bits {
 };
 
 struct mlx5_ifc_flow_table_nic_cap_bits {
-        u8         reserved_at_0[0x200];
+        u8         nic_rx_multi_path_tirs[0x1];
+        u8         reserved_at_1[0x1ff];
 
         struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties_nic_receive;
 
@@ -736,7 +737,9 @@ struct mlx5_ifc_cmd_hca_cap_bits {
         u8         cqe_version[0x4];
 
         u8         compact_address_vector[0x1];
-        u8         reserved_at_200[0xe];
+        u8         reserved_at_200[0x3];
+        u8         ipoib_basic_offloads[0x1];
+        u8         reserved_at_204[0xa];
         u8         drain_sigerr[0x1];
         u8         cmdif_checksum[0x2];
         u8         sigerr_cqe[0x1];
@@ -767,10 +770,13 @@ struct mlx5_ifc_cmd_hca_cap_bits {
         u8         cd[0x1];
         u8         reserved_at_22c[0x1];
         u8         apm[0x1];
-        u8         reserved_at_22e[0x7];
+        u8         reserved_at_22e[0x2];
+        u8         imaicl[0x1];
+        u8         reserved_at_231[0x4];
         u8         qkv[0x1];
         u8         pkv[0x1];
-        u8         reserved_at_237[0x4];
+        u8         set_deth_sqpn[0x1];
+        u8         reserved_at_239[0x3];
         u8         xrc[0x1];
         u8         ud[0x1];
         u8         uc[0x1];
@@ -1208,6 +1214,36 @@ struct mlx5_ifc_phys_layer_cntrs_bits {
         u8         reserved_at_640[0x180];
 };
 
+struct mlx5_ifc_ib_port_cntrs_grp_data_layout_bits {
+        u8         symbol_error_counter[0x10];
+
+        u8         link_error_recovery_counter[0x8];
+
+        u8         link_downed_counter[0x8];
+
+        u8         port_rcv_errors[0x10];
+
+        u8         port_rcv_remote_physical_errors[0x10];
+
+        u8         port_rcv_switch_relay_errors[0x10];
+
+        u8         port_xmit_discards[0x10];
+
+        u8         port_xmit_constraint_errors[0x8];
+
+        u8         port_rcv_constraint_errors[0x8];
+
+        u8         reserved_at_70[0x8];
+
+        u8         link_overrun_errors[0x8];
+
+        u8         reserved_at_80[0x10];
+
+        u8         vl_15_dropped[0x10];
+
+        u8         reserved_at_a0[0xa0];
+};
+
 struct mlx5_ifc_eth_per_traffic_grp_data_layout_bits {
         u8         transmit_queue_high[0x20];
 
@@ -1780,7 +1816,7 @@ struct mlx5_ifc_qpc_bits {
         u8         log_sq_size[0x4];
         u8         reserved_at_55[0x6];
         u8         rlky[0x1];
-        u8         reserved_at_5c[0x4];
+        u8         ulp_stateless_offload_mode[0x4];
 
         u8         counter_set_id[0x8];
         u8         uar_page[0x18];
@@ -2618,6 +2654,7 @@ union mlx5_ifc_eth_cntrs_grp_data_layout_auto_bits {
         struct mlx5_ifc_eth_extended_cntrs_grp_data_layout_bits eth_extended_cntrs_grp_data_layout;
         struct mlx5_ifc_eth_per_prio_grp_data_layout_bits eth_per_prio_grp_data_layout;
         struct mlx5_ifc_eth_per_traffic_grp_data_layout_bits eth_per_traffic_grp_data_layout;
+        struct mlx5_ifc_ib_port_cntrs_grp_data_layout_bits ib_port_cntrs_grp_data_layout;
         struct mlx5_ifc_phys_layer_cntrs_bits phys_layer_cntrs;
         u8         reserved_at_0[0x7c0];
 };
@@ -3126,7 +3163,8 @@ struct mlx5_ifc_query_vport_counter_in_bits {
         u8         op_mod[0x10];
 
         u8         other_vport[0x1];
-        u8         reserved_at_41[0xf];
+        u8         reserved_at_41[0xb];
+        u8         port_num[0x4];
         u8         vport_number[0x10];
 
         u8         reserved_at_60[0x60];
@@ -6956,6 +6994,7 @@ union mlx5_ifc_ports_control_registers_document_bits {
         struct mlx5_ifc_peir_reg_bits peir_reg;
         struct mlx5_ifc_pelc_reg_bits pelc_reg;
         struct mlx5_ifc_pfcc_reg_bits pfcc_reg;
+        struct mlx5_ifc_ib_port_cntrs_grp_data_layout_bits ib_port_cntrs_grp_data_layout;
         struct mlx5_ifc_phys_layer_cntrs_bits phys_layer_cntrs;
         struct mlx5_ifc_pifr_reg_bits pifr_reg;
         struct mlx5_ifc_pipg_reg_bits pipg_reg;
diff --git a/include/linux/mlx5/qp.h b/include/linux/mlx5/qp.h
index 5b8c89ffaa58..cf031a3f16c5 100644
--- a/include/linux/mlx5/qp.h
+++ b/include/linux/mlx5/qp.h
@@ -499,7 +499,8 @@ struct mlx5_qp_context {
         u8                      reserved2[4];
         __be32                  next_send_psn;
         __be32                  cqn_send;
-        u8                      reserved3[8];
+        __be32                  deth_sqpn;
+        u8                      reserved3[4];
         __be32                  last_acked_psn;
         __be32                  ssn;
         __be32                  params2;
@@ -621,9 +622,9 @@ static inline struct mlx5_core_qp *__mlx5_qp_lookup(struct mlx5_core_dev *dev, u
         return radix_tree_lookup(&dev->priv.qp_table.tree, qpn);
 }
 
-static inline struct mlx5_core_mr *__mlx5_mr_lookup(struct mlx5_core_dev *dev, u32 key)
+static inline struct mlx5_core_mkey *__mlx5_mr_lookup(struct mlx5_core_dev *dev, u32 key)
 {
-        return radix_tree_lookup(&dev->priv.mr_table.tree, key);
+        return radix_tree_lookup(&dev->priv.mkey_table.tree, key);
 }
 
 struct mlx5_page_fault_resume_mbox_in {
diff --git a/include/linux/mlx5/vport.h b/include/linux/mlx5/vport.h
index 123771003e68..a9f2bcc98cab 100644
--- a/include/linux/mlx5/vport.h
+++ b/include/linux/mlx5/vport.h
@@ -92,5 +92,7 @@ int mlx5_modify_nic_vport_vlans(struct mlx5_core_dev *dev,
 
 int mlx5_nic_vport_enable_roce(struct mlx5_core_dev *mdev);
 int mlx5_nic_vport_disable_roce(struct mlx5_core_dev *mdev);
+int mlx5_core_query_vport_counter(struct mlx5_core_dev *dev, u8 other_vport,
+                                  u8 port_num, void *out, size_t out_sz);
 
 #endif /* __MLX5_VPORT_H__ */