Commit 6308a5f0 authored by Parav Pandit's avatar Parav Pandit Committed by Saeed Mahameed
Browse files

net/mlx5: E-Switch, Make vport number u16 



Vport number is 16-bit field in hardware. Make it u16.

Move location of vport in the structure so that it reduces a hole
in the structure.

Signed-off-by: default avatarParav Pandit <parav@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 7d5ae478

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

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ enum mlx5_eswitch_vport_event { 


struct mlx5_vport {

	struct mlx5_core_dev    *dev;

	int                     vport;

	struct hlist_head       uc_list[MLX5_L2_ADDR_HASH_SIZE];

	struct hlist_head       mc_list[MLX5_L2_ADDR_HASH_SIZE];

	struct mlx5_flow_handle *promisc_rule;
@@ -174,6 +173,7 @@ struct mlx5_vport { 
		u32 max_rate;

	} qos;



	u16 vport;

	bool                    enabled;

	enum mlx5_eswitch_vport_event enabled_events;

	struct devlink_port *dl_port;

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

+2 −1
Original line number Diff line number Diff line
@@ -986,12 +986,13 @@ static void mlx5_eswitch_del_send_to_vport_meta_rules(struct mlx5_eswitch *esw) 
static int

mlx5_eswitch_add_send_to_vport_meta_rules(struct mlx5_eswitch *esw)

{

	int num_vfs, vport_num, rule_idx = 0, err = 0;

	struct mlx5_flow_destination dest = {};

	struct mlx5_flow_act flow_act = {0};

	int num_vfs, rule_idx = 0, err = 0;

	struct mlx5_flow_handle *flow_rule;

	struct mlx5_flow_handle **flows;

	struct mlx5_flow_spec *spec;

	u16 vport_num;



	num_vfs = esw->esw_funcs.num_vfs;

	flows = kvzalloc(num_vfs * sizeof(*flows), GFP_KERNEL);

include/linux/mlx5/eswitch.h

+1 −2
Original line number Diff line number Diff line
@@ -152,8 +152,7 @@ mlx5_eswitch_vport_match_metadata_enabled(const struct mlx5_eswitch *esw) 
};



static inline u32

mlx5_eswitch_get_vport_metadata_for_match(struct mlx5_eswitch *esw,

					  int vport_num)

mlx5_eswitch_get_vport_metadata_for_match(struct mlx5_eswitch *esw, u16 vport_num)

{

	return 0;

};