Commit 9c2c1c5e authored by Lama Kayal's avatar Lama Kayal Committed by Saeed Mahameed
Browse files

net/mlx5e: Separate ethtool_steering from fs.h and make private 



Create a new fs_ethtool.h header file, where ethtool steering init and
cleanup functions are declared in it.
Make mlx5e_ethtool_steering struct private and declare at en_fs_ethtool.c.

Signed-off-by: default avatarLama Kayal <lkayal@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent e8b5c4bc

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

+0 −32
Original line number Diff line number Diff line
@@ -92,38 +92,6 @@ enum { 
struct mlx5e_flow_steering;

struct mlx5e_priv;



#ifdef CONFIG_MLX5_EN_RXNFC



struct mlx5e_ethtool_table {

	struct mlx5_flow_table *ft;

	int                    num_rules;

};



#define ETHTOOL_NUM_L3_L4_FTS 7

#define ETHTOOL_NUM_L2_FTS 4



struct mlx5e_ethtool_steering {

	struct mlx5e_ethtool_table      l3_l4_ft[ETHTOOL_NUM_L3_L4_FTS];

	struct mlx5e_ethtool_table      l2_ft[ETHTOOL_NUM_L2_FTS];

	struct list_head                rules;

	int                             tot_num_rules;

};



void mlx5e_ethtool_init_steering(struct mlx5e_flow_steering *fs);

void mlx5e_ethtool_cleanup_steering(struct mlx5e_flow_steering *fs);

int mlx5e_ethtool_set_rxnfc(struct mlx5e_priv *priv, struct ethtool_rxnfc *cmd);

int mlx5e_ethtool_get_rxnfc(struct mlx5e_priv *priv,

			    struct ethtool_rxnfc *info, u32 *rule_locs);

#else

static inline void mlx5e_ethtool_init_steering(struct mlx5e_flow_steering *fs) { }

static inline void mlx5e_ethtool_cleanup_steering(struct mlx5e_flow_steering *fs) { }

static inline int mlx5e_ethtool_set_rxnfc(struct mlx5e_priv *priv, struct ethtool_rxnfc *cmd)

{ return -EOPNOTSUPP; }

static inline int mlx5e_ethtool_get_rxnfc(struct mlx5e_priv *priv,

					  struct ethtool_rxnfc *info, u32 *rule_locs)

{ return -EOPNOTSUPP; }

#endif /* CONFIG_MLX5_EN_RXNFC */



#ifdef CONFIG_MLX5_EN_ARFS

struct mlx5e_arfs_tables;

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

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

/* Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. */



#ifndef __MLX5E_FS_ETHTOOL_H__

#define __MLX5E_FS_ETHTOOL_H__



struct mlx5e_priv;

struct mlx5e_ethtool_steering;

#ifdef CONFIG_MLX5_EN_RXNFC

int mlx5e_ethtool_alloc(struct mlx5e_ethtool_steering **ethtool);

void mlx5e_ethtool_free(struct mlx5e_ethtool_steering *ethtool);

void mlx5e_ethtool_init_steering(struct mlx5e_flow_steering *fs);

void mlx5e_ethtool_cleanup_steering(struct mlx5e_flow_steering *fs);

int mlx5e_ethtool_set_rxnfc(struct mlx5e_priv *priv, struct ethtool_rxnfc *cmd);

int mlx5e_ethtool_get_rxnfc(struct mlx5e_priv *priv,

			    struct ethtool_rxnfc *info, u32 *rule_locs);

#else

static inline int mlx5e_ethtool_alloc(struct mlx5e_ethtool_steering **ethtool)

{ return 0; }

static inline void mlx5e_ethtool_free(struct mlx5e_ethtool_steering *ethtool) { }

static inline void mlx5e_ethtool_init_steering(struct mlx5e_flow_steering *fs) { }

static inline void mlx5e_ethtool_cleanup_steering(struct mlx5e_flow_steering *fs) { }

static inline int mlx5e_ethtool_set_rxnfc(struct mlx5e_priv *priv, struct ethtool_rxnfc *cmd)

{ return -EOPNOTSUPP; }

static inline int mlx5e_ethtool_get_rxnfc(struct mlx5e_priv *priv,

					  struct ethtool_rxnfc *info, u32 *rule_locs)

{ return -EOPNOTSUPP; }

#endif

#endif

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

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include "en/xsk/pool.h"

#include "en/ptp.h"

#include "lib/clock.h"

#include "en/fs_ethtool.h"



void mlx5e_ethtool_get_drvinfo(struct mlx5e_priv *priv,

			       struct ethtool_drvinfo *drvinfo)

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

+3 −6
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include "en_tc.h"

#include "lib/mpfs.h"

#include "en/ptp.h"

#include "en/fs_ethtool.h"



struct mlx5e_flow_steering {

	struct work_struct		set_rx_mode_work;
@@ -1410,16 +1411,12 @@ struct mlx5e_tc_table *mlx5e_fs_get_tc(struct mlx5e_flow_steering *fs) 
#ifdef CONFIG_MLX5_EN_RXNFC

static int mlx5e_fs_ethtool_alloc(struct mlx5e_flow_steering *fs)

{

	fs->ethtool = kvzalloc(sizeof(*fs->ethtool), GFP_KERNEL);



	if (!fs->ethtool)

		return -ENOMEM;

	return 0;

	return mlx5e_ethtool_alloc(&fs->ethtool);

}



static void mlx5e_fs_ethtool_free(struct mlx5e_flow_steering *fs)

{

	kvfree(fs->ethtool);

	mlx5e_ethtool_free(fs->ethtool);

}



struct mlx5e_ethtool_steering *mlx5e_fs_get_ethtool(struct mlx5e_flow_steering *fs)

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

+29 −0
Original line number Diff line number Diff line
@@ -34,6 +34,22 @@ 
#include "en.h"

#include "en/params.h"

#include "en/xsk/pool.h"

#include "en/fs_ethtool.h"



struct mlx5e_ethtool_table {

	struct mlx5_flow_table *ft;

	int                    num_rules;

};



#define ETHTOOL_NUM_L3_L4_FTS 7

#define ETHTOOL_NUM_L2_FTS 4



struct mlx5e_ethtool_steering {

	struct mlx5e_ethtool_table      l3_l4_ft[ETHTOOL_NUM_L3_L4_FTS];

	struct mlx5e_ethtool_table      l2_ft[ETHTOOL_NUM_L2_FTS];

	struct list_head                rules;

	int                             tot_num_rules;

};



static int flow_type_to_traffic_type(u32 flow_type);
@@ -831,6 +847,19 @@ mlx5e_ethtool_get_all_flows(struct mlx5e_priv *priv, 
	return err;

}



int mlx5e_ethtool_alloc(struct mlx5e_ethtool_steering **ethtool)

{

	*ethtool =  kvzalloc(sizeof(**ethtool), GFP_KERNEL);

	if (!*ethtool)

		return -ENOMEM;

	return 0;

}



void mlx5e_ethtool_free(struct mlx5e_ethtool_steering *ethtool)

{

	kvfree(ethtool);

}



void mlx5e_ethtool_cleanup_steering(struct mlx5e_flow_steering *fs)

{

	struct mlx5e_ethtool_steering *ethtool = mlx5e_fs_get_ethtool(fs);