IB/mlx5: Implement clear counters

This patch implements mlx5 driver to support clearing q counters and
congestion counters of a port.

Orabug: 26761264
MlnxSF: 00384047
Upstream_status: ignore
Signed-off-by: Parav Pandit <[email protected]>
Signed-off-by: Aron Silverton <[email protected]>
Reviewed-by: Yuval Shaia <[email protected]>
Reviewed-by: Håkon Bugge <[email protected]>

Signed-off-by: Somasundaram Krishnasamy <[email protected]>

Orabug: 31556125

UEK5 => UEK6

(cherry picked from commit fdde66a)
cherry-pick-repo=UEK/production/linux-uek.git

Conflicts:
	drivers/infiniband/hw/mlx5/main.c
	drivers/net/ethernet/mellanox/mlx5/core/lag.c

Resolved by adding clear_hw_stats() and initializer, and reverting
mlx5_cmd_query_cong_counter() to a non-static routine so it could be
called elsewhere.

Also, Oracle-specific code was placed within WITHOUT_ORACLE_EXTENSIONS
guards.

Signed-off-by: William Kucharski <[email protected]>
Reviewed-by: Qing Huang <[email protected]>
Signed-off-by: Aron Silverton <[email protected]>

Author: paravmellanox

drivers/infiniband/hw/mlx5/main.c

@@ -5584,6 +5584,39 @@ static struct rdma_hw_stats *mlx5_ib_alloc_hw_stats(struct ib_device *ibdev,
 					  RDMA_HW_STATS_DEFAULT_LIFESPAN);
 }
 
+#ifndef WITHOUT_ORACLE_EXTENSIONS
+static int mlx5_ib_clear_hw_stats(struct ib_device *ibdev, u8 port_num)
+{
+	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_port *port = &dev->port[port_num - 1];
+	int outlen = MLX5_ST_SZ_BYTES(query_q_counter_out);
+	void *out;
+	int ret;
+
+	out = kvzalloc(outlen, GFP_KERNEL);
+	if (!out)
+		return -ENOMEM;
+
+	ret = mlx5_core_query_q_counter(dev->mdev,
+					port->cnts.set_id, 1,
+					out, outlen);
+	kvfree(out);
+
+	if (ret)
+		return ret;
+
+	outlen = MLX5_ST_SZ_BYTES(query_cong_statistics_out);
+	out = kvzalloc(outlen, GFP_KERNEL);
+	if (!out)
+		return -ENOMEM;
+
+	ret = mlx5_cmd_query_cong_counter(dev->mdev, true, out, outlen);
+
+	kvfree(out);
+	return ret;
+}
+#endif /* !WITHOUT_ORACLE_EXTENSIONS */
+
 static int mlx5_ib_query_q_counters(struct mlx5_core_dev *mdev,
 				    const struct mlx5_ib_counters *cnts,
 				    struct rdma_hw_stats *stats,
@@ -6644,6 +6677,9 @@ static void mlx5_ib_stage_odp_cleanup(struct mlx5_ib_dev *dev)
 static const struct ib_device_ops mlx5_ib_dev_hw_stats_ops = {
 	.alloc_hw_stats = mlx5_ib_alloc_hw_stats,
 	.get_hw_stats = mlx5_ib_get_hw_stats,
+#ifndef WITHOUT_ORACLE_EXTENSIONS
+	.clear_hw_stats	= mlx5_ib_clear_hw_stats,
+#endif /* !WITHOUT_ORACLE_EXTENSIONS */
 	.counter_bind_qp = mlx5_ib_counter_bind_qp,
 	.counter_unbind_qp = mlx5_ib_counter_unbind_qp,
 	.counter_dealloc = mlx5_ib_counter_dealloc,

drivers/net/ethernet/mellanox/mlx5/core/lag.c

@@ -107,7 +107,11 @@ int mlx5_cmd_destroy_vport_lag(struct mlx5_core_dev *dev)
 }
 EXPORT_SYMBOL(mlx5_cmd_destroy_vport_lag);
 
+#ifndef WITHOUT_ORACLE_EXTENSIONS
+int mlx5_cmd_query_cong_counter(struct mlx5_core_dev *dev,
+#else /* WITHOUT_ORACLE_EXTENSIONS */
 static int mlx5_cmd_query_cong_counter(struct mlx5_core_dev *dev,
+#endif /* !WITOUT_ORACLE_EXTENSIONS */
 				       bool reset, void *out, int out_size)
 {
 	u32 in[MLX5_ST_SZ_DW(query_cong_statistics_in)] = { };
@@ -117,6 +121,9 @@ static int mlx5_cmd_query_cong_counter(struct mlx5_core_dev *dev,
 	MLX5_SET(query_cong_statistics_in, in, clear, reset);
 	return mlx5_cmd_exec(dev, in, sizeof(in), out, out_size);
 }
+#ifndef WITHOUT_ORACLE_EXTENSIONS
+EXPORT_SYMBOL(mlx5_cmd_query_cong_counter);
+#endif /* !WITHOUT_ORACLE_EXTENSIONS */
 
 int mlx5_lag_dev_get_netdev_idx(struct mlx5_lag *ldev,
 				struct net_device *ndev)

include/linux/mlx5/driver.h

@@ -1109,6 +1109,10 @@ bool mlx5_lag_is_sriov(struct mlx5_core_dev *dev);
 bool mlx5_lag_is_multipath(struct mlx5_core_dev *dev);
 bool mlx5_lag_is_active(struct mlx5_core_dev *dev);
 struct net_device *mlx5_lag_get_roce_netdev(struct mlx5_core_dev *dev);
+#ifndef WITHOUT_ORACLE_EXTENSIONS
+int mlx5_cmd_query_cong_counter(struct mlx5_core_dev *dev,
+				bool reset, void *out, int out_size);
+#endif /* !WITHOUT_ORACLE_EXTENSIONS */
 int mlx5_lag_query_cong_counters(struct mlx5_core_dev *dev,
 				 u64 *values,
 				 int num_counters,