Commit 06e9f13a authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Saeed Mahameed
Browse files

net/mlx5e: Convert RQT to a dedicated object 



Code related to RQT is now encapsulated into a dedicated object and put
into new files en/rqt.{c,h}. All usages are converted.

Signed-off-by: default avatarMaxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent bc5506a1

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ mlx5_core-$(CONFIG_MLX5_CORE_EN) += en_main.o en_common.o en_fs.o en_ethtool.o \ 
		en_selftest.o en/port.o en/monitor_stats.o en/health.o \

		en/reporter_tx.o en/reporter_rx.o en/params.o en/xsk/pool.o \

		en/xsk/setup.o en/xsk/rx.o en/xsk/tx.o en/devlink.o en/ptp.o \

		en/qos.o en/trap.o en/fs_tt_redirect.o

		en/qos.o en/trap.o en/fs_tt_redirect.o en/rqt.o



#

# Netdev extra

drivers/net/ethernet/mellanox/mlx5/core/en.h

+4 −23
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
#include "en/qos.h"

#include "lib/hv_vhca.h"

#include "lib/clock.h"

#include "en/rqt.h"



extern const struct net_device_ops mlx5e_netdev_ops;

struct page_pool;
@@ -139,8 +140,6 @@ struct page_pool; 
#define MLX5E_PARAMS_DEFAULT_MIN_RX_WQES                0x80

#define MLX5E_PARAMS_DEFAULT_MIN_RX_WQES_MPW            0x2



#define MLX5E_LOG_INDIR_RQT_SIZE       0x8

#define MLX5E_INDIR_RQT_SIZE           BIT(MLX5E_LOG_INDIR_RQT_SIZE)

#define MLX5E_MIN_NUM_CHANNELS         0x1

#define MLX5E_MAX_NUM_CHANNELS         (MLX5E_INDIR_RQT_SIZE / 2)

#define MLX5E_MAX_NUM_SQS              (MLX5E_MAX_NUM_CHANNELS * MLX5E_MAX_NUM_TC)
@@ -745,14 +744,10 @@ enum { 
	MLX5E_STATE_XDP_ACTIVE,

};



struct mlx5e_rqt {

	u32              rqtn;

	bool		 enabled;

};



struct mlx5e_tir {

	u32		  tirn;

	struct mlx5e_rqt  rqt;

	bool              rqt_enabled;

	struct list_head  list;

};
@@ -762,7 +757,7 @@ enum { 
};



struct mlx5e_rss_params {

	u32	indirection_rqt[MLX5E_INDIR_RQT_SIZE];

	struct mlx5e_rss_params_indir indir;

	u32	rx_hash_fields[MLX5E_NUM_INDIR_TIRS];

	u8	toeplitz_hash_key[40];

	u8	hfunc;
@@ -838,6 +833,7 @@ struct mlx5e_priv { 
	struct mlx5e_channels      channels;

	u32                        tisn[MLX5_MAX_PORTS][MLX5E_MAX_NUM_TC];

	struct mlx5e_rqt           indir_rqt;

	bool                       indir_rqt_enabled;

	struct mlx5e_tir           indir_tir[MLX5E_NUM_INDIR_TIRS];

	struct mlx5e_tir           inner_indir_tir[MLX5E_NUM_INDIR_TIRS];

	struct mlx5e_tir           direct_tir[MLX5E_MAX_NUM_CHANNELS];
@@ -948,19 +944,6 @@ int mlx5e_vlan_rx_kill_vid(struct net_device *dev, __always_unused __be16 proto, 
			   u16 vid);

void mlx5e_timestamp_init(struct mlx5e_priv *priv);



struct mlx5e_redirect_rqt_param {

	bool is_rss;

	union {

		u32 rqn; /* Direct RQN (Non-RSS) */

		struct {

			u8 hfunc;

			struct mlx5e_channels *channels;

		} rss; /* RSS data */

	};

};



int mlx5e_redirect_rqt(struct mlx5e_priv *priv, u32 rqtn, int sz,

		       struct mlx5e_redirect_rqt_param rrp);

void mlx5e_build_indir_tir_ctx_hash(struct mlx5e_rss_params *rss_params,

				    const struct mlx5e_tirc_config *ttconfig,

				    void *tirc, bool inner);
@@ -1093,7 +1076,6 @@ int mlx5e_create_direct_rqts(struct mlx5e_priv *priv, struct mlx5e_tir *tirs, in 
void mlx5e_destroy_direct_rqts(struct mlx5e_priv *priv, struct mlx5e_tir *tirs, int n);

int mlx5e_create_direct_tirs(struct mlx5e_priv *priv, struct mlx5e_tir *tirs, int n);

void mlx5e_destroy_direct_tirs(struct mlx5e_priv *priv, struct mlx5e_tir *tirs, int n);

void mlx5e_destroy_rqt(struct mlx5e_priv *priv, struct mlx5e_rqt *rqt);



int mlx5e_create_tis(struct mlx5_core_dev *mdev, void *in, u32 *tisn);

void mlx5e_destroy_tis(struct mlx5_core_dev *mdev, u32 tisn);
@@ -1106,7 +1088,6 @@ int mlx5e_close(struct net_device *netdev); 
int mlx5e_open(struct net_device *netdev);



void mlx5e_queue_update_stats(struct mlx5e_priv *priv);

int mlx5e_bits_invert(unsigned long a, int size);



int mlx5e_set_dev_port_mtu(struct mlx5e_priv *priv);

int mlx5e_set_dev_port_mtu_ctx(struct mlx5e_priv *priv, void *context);

drivers/net/ethernet/mellanox/mlx5/core/en/rqt.c

0 → 100644
+161 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB

/* Copyright (c) 2021, Mellanox Technologies inc. All rights reserved. */



#include "rqt.h"

#include <linux/mlx5/transobj.h>



static int mlx5e_rqt_init(struct mlx5e_rqt *rqt, struct mlx5_core_dev *mdev,

			  u16 max_size, u32 *init_rqns, u16 init_size)

{

	void *rqtc;

	int inlen;

	int err;

	u32 *in;

	int i;



	rqt->mdev = mdev;

	rqt->size = max_size;



	inlen = MLX5_ST_SZ_BYTES(create_rqt_in) + sizeof(u32) * init_size;

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in)

		return -ENOMEM;



	rqtc = MLX5_ADDR_OF(create_rqt_in, in, rqt_context);



	MLX5_SET(rqtc, rqtc, rqt_max_size, rqt->size);



	MLX5_SET(rqtc, rqtc, rqt_actual_size, init_size);

	for (i = 0; i < init_size; i++)

		MLX5_SET(rqtc, rqtc, rq_num[i], init_rqns[i]);



	err = mlx5_core_create_rqt(rqt->mdev, in, inlen, &rqt->rqtn);



	kvfree(in);

	return err;

}



int mlx5e_rqt_init_direct(struct mlx5e_rqt *rqt, struct mlx5_core_dev *mdev,

			  bool indir_enabled, u32 init_rqn)

{

	u16 max_size = indir_enabled ? MLX5E_INDIR_RQT_SIZE : 1;



	return mlx5e_rqt_init(rqt, mdev, max_size, &init_rqn, 1);

}



static int mlx5e_bits_invert(unsigned long a, int size)

{

	int inv = 0;

	int i;



	for (i = 0; i < size; i++)

		inv |= (test_bit(size - i - 1, &a) ? 1 : 0) << i;



	return inv;

}



static int mlx5e_calc_indir_rqns(u32 *rss_rqns, u32 *rqns, unsigned int num_rqns,

				 u8 hfunc, struct mlx5e_rss_params_indir *indir)

{

	unsigned int i;



	for (i = 0; i < MLX5E_INDIR_RQT_SIZE; i++) {

		unsigned int ix = i;



		if (hfunc == ETH_RSS_HASH_XOR)

			ix = mlx5e_bits_invert(ix, ilog2(MLX5E_INDIR_RQT_SIZE));



		ix = indir->table[ix];



		if (WARN_ON(ix >= num_rqns))

			/* Could be a bug in the driver or in the kernel part of

			 * ethtool: indir table refers to non-existent RQs.

			 */

			return -EINVAL;

		rss_rqns[i] = rqns[ix];

	}



	return 0;

}



int mlx5e_rqt_init_indir(struct mlx5e_rqt *rqt, struct mlx5_core_dev *mdev,

			 u32 *rqns, unsigned int num_rqns,

			 u8 hfunc, struct mlx5e_rss_params_indir *indir)

{

	u32 *rss_rqns;

	int err;



	rss_rqns = kvmalloc_array(MLX5E_INDIR_RQT_SIZE, sizeof(*rss_rqns), GFP_KERNEL);

	if (!rss_rqns)

		return -ENOMEM;



	err = mlx5e_calc_indir_rqns(rss_rqns, rqns, num_rqns, hfunc, indir);

	if (err)

		goto out;



	err = mlx5e_rqt_init(rqt, mdev, MLX5E_INDIR_RQT_SIZE, rss_rqns, MLX5E_INDIR_RQT_SIZE);



out:

	kvfree(rss_rqns);

	return err;

}



void mlx5e_rqt_destroy(struct mlx5e_rqt *rqt)

{

	mlx5_core_destroy_rqt(rqt->mdev, rqt->rqtn);

}



static int mlx5e_rqt_redirect(struct mlx5e_rqt *rqt, u32 *rqns, unsigned int size)

{

	unsigned int i;

	void *rqtc;

	int inlen;

	u32 *in;

	int err;



	inlen = MLX5_ST_SZ_BYTES(modify_rqt_in) + sizeof(u32) * size;

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in)

		return -ENOMEM;



	rqtc = MLX5_ADDR_OF(modify_rqt_in, in, ctx);



	MLX5_SET(modify_rqt_in, in, bitmask.rqn_list, 1);

	MLX5_SET(rqtc, rqtc, rqt_actual_size, size);

	for (i = 0; i < size; i++)

		MLX5_SET(rqtc, rqtc, rq_num[i], rqns[i]);



	err = mlx5_core_modify_rqt(rqt->mdev, rqt->rqtn, in, inlen);



	kvfree(in);

	return err;

}



int mlx5e_rqt_redirect_direct(struct mlx5e_rqt *rqt, u32 rqn)

{

	return mlx5e_rqt_redirect(rqt, &rqn, 1);

}



int mlx5e_rqt_redirect_indir(struct mlx5e_rqt *rqt, u32 *rqns, unsigned int num_rqns,

			     u8 hfunc, struct mlx5e_rss_params_indir *indir)

{

	u32 *rss_rqns;

	int err;



	if (WARN_ON(rqt->size != MLX5E_INDIR_RQT_SIZE))

		return -EINVAL;



	rss_rqns = kvmalloc_array(MLX5E_INDIR_RQT_SIZE, sizeof(*rss_rqns), GFP_KERNEL);

	if (!rss_rqns)

		return -ENOMEM;



	err = mlx5e_calc_indir_rqns(rss_rqns, rqns, num_rqns, hfunc, indir);

	if (err)

		goto out;



	err = mlx5e_rqt_redirect(rqt, rss_rqns, MLX5E_INDIR_RQT_SIZE);



out:

	kvfree(rss_rqns);

	return err;

}

drivers/net/ethernet/mellanox/mlx5/core/en/rqt.h

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */

/* Copyright (c) 2021, Mellanox Technologies inc. All rights reserved. */



#ifndef __MLX5_EN_RQT_H__

#define __MLX5_EN_RQT_H__



#include <linux/kernel.h>



#define MLX5E_INDIR_RQT_SIZE (1 << 8)



struct mlx5_core_dev;



struct mlx5e_rss_params_indir {

	u32 table[MLX5E_INDIR_RQT_SIZE];

};



struct mlx5e_rqt {

	struct mlx5_core_dev *mdev;

	u32 rqtn;

	u16 size;

};



int mlx5e_rqt_init_direct(struct mlx5e_rqt *rqt, struct mlx5_core_dev *mdev,

			  bool indir_enabled, u32 init_rqn);

int mlx5e_rqt_init_indir(struct mlx5e_rqt *rqt, struct mlx5_core_dev *mdev,

			 u32 *rqns, unsigned int num_rqns,

			 u8 hfunc, struct mlx5e_rss_params_indir *indir);

void mlx5e_rqt_destroy(struct mlx5e_rqt *rqt);



static inline u32 mlx5e_rqt_get_rqtn(struct mlx5e_rqt *rqt)

{

	return rqt->rqtn;

}



int mlx5e_rqt_redirect_direct(struct mlx5e_rqt *rqt, u32 rqn);

int mlx5e_rqt_redirect_indir(struct mlx5e_rqt *rqt, u32 *rqns, unsigned int num_rqns,

			     u8 hfunc, struct mlx5e_rss_params_indir *indir);



#endif /* __MLX5_EN_RQT_H__ */

drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c

+2 −16
Original line number Diff line number Diff line
@@ -184,28 +184,14 @@ void mlx5e_deactivate_xsk(struct mlx5e_channel *c) 
	/* TX queue is disabled on close. */

}



static int mlx5e_redirect_xsk_rqt(struct mlx5e_priv *priv, u16 ix, u32 rqn)

{

	struct mlx5e_redirect_rqt_param direct_rrp = {

		.is_rss = false,

		{

			.rqn = rqn,

		},

	};



	u32 rqtn = priv->xsk_tir[ix].rqt.rqtn;



	return mlx5e_redirect_rqt(priv, rqtn, 1, direct_rrp);

}



int mlx5e_xsk_redirect_rqt_to_channel(struct mlx5e_priv *priv, struct mlx5e_channel *c)

{

	return mlx5e_redirect_xsk_rqt(priv, c->ix, c->xskrq.rqn);

	return mlx5e_rqt_redirect_direct(&priv->xsk_tir[c->ix].rqt, c->xskrq.rqn);

}



int mlx5e_xsk_redirect_rqt_to_drop(struct mlx5e_priv *priv, u16 ix)

{

	return mlx5e_redirect_xsk_rqt(priv, ix, priv->drop_rq.rqn);

	return mlx5e_rqt_redirect_direct(&priv->xsk_tir[ix].rqt, priv->drop_rq.rqn);

}



int mlx5e_xsk_redirect_rqts_to_channels(struct mlx5e_priv *priv, struct mlx5e_channels *chs)