net/mlx5: Define fdb tc levels per prio (4db7b98e) · Commits · 戴 / test

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@
		#define FDB_TC_MAX_CHAIN 3
		#define FDB_TC_SLOW_PATH_CHAIN (FDB_TC_MAX_CHAIN + 1)
		#define FDB_TC_MAX_PRIO 16
		#define FDB_TC_LEVELS_PER_PRIO 2

		#ifdef CONFIG_MLX5_ESWITCH

		@@ -146,7 +147,6 @@ enum offloads_fdb_flags {

		extern const unsigned int ESW_POOLS[4];

		#define PRIO_LEVELS 2
		struct mlx5_eswitch_fdb {
		union {
		struct legacy_fdb {
		@@ -173,7 +173,7 @@ struct mlx5_eswitch_fdb {
		struct {
		struct mlx5_flow_table *fdb;
		u32 num_rules;
		} fdb_prio[FDB_TC_MAX_CHAIN + 1][FDB_TC_MAX_PRIO + 1][PRIO_LEVELS];
		} fdb_prio[FDB_TC_MAX_CHAIN + 1][FDB_TC_MAX_PRIO + 1][FDB_TC_LEVELS_PER_PRIO];
		/* Protects fdb_prio table */
		struct mutex fdb_prio_lock;

+4 −2

Original line number	Diff line number	Diff line
		@@ -2576,7 +2576,8 @@ static int init_fdb_root_ns(struct mlx5_flow_steering *steering)
		goto out_err;
		}

		levels = 2 * FDB_TC_MAX_PRIO * (FDB_TC_MAX_CHAIN + 1);
		levels = FDB_TC_LEVELS_PER_PRIO *
		FDB_TC_MAX_PRIO * (FDB_TC_MAX_CHAIN + 1);
		maj_prio = fs_create_prio_chained(&steering->fdb_root_ns->ns,
		FDB_FAST_PATH,
		levels);
		@@ -2593,7 +2594,8 @@ static int init_fdb_root_ns(struct mlx5_flow_steering *steering)
		}

		for (prio = 0; prio < FDB_TC_MAX_PRIO * (chain + 1); prio++) {
		min_prio = fs_create_prio(ns, prio, 2);
		min_prio = fs_create_prio(ns, prio,
		FDB_TC_LEVELS_PER_PRIO);
		if (IS_ERR(min_prio)) {
		err = PTR_ERR(min_prio);
		goto out_err;