diff --git a/patches.suse/net-mlx5-Fix-auto-group-size-calculation.patch b/patches.suse/net-mlx5-Fix-auto-group-size-calculation.patch deleted file mode 100644 index 99b8cd2..0000000 --- a/patches.suse/net-mlx5-Fix-auto-group-size-calculation.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 7d8f195de2e812b3de1d6450f66306e43e48af55 Mon Sep 17 00:00:00 2001 -From: Maor Gottlieb -Date: Thu, 5 Sep 2019 09:56:10 +0300 -Subject: [PATCH] net/mlx5: Fix auto group size calculation -Git-commit: 97fd8da281f80e7e69e0114bc906575734d4dfaf -References: git-fixes -Patch-mainline: v5.4 - -Once all the large flow groups (defined by the user when the flow table -is created - max_num_groups) were created, then all the following new -flow groups will have only one flow table entry, even though the flow table -has place to larger groups. -Fix the condition to prefer large flow group. - -Fixes: f0d22d187473 ("net/mlx5_core: Introduce flow steering autogrouped flow table") -Signed-off-by: Maor Gottlieb -Signed-off-by: Saeed Mahameed -Signed-off-by: Denis Kirjanov ---- - drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 10 ++++++---- - drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 1 + - 2 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c -index a91b0f1bfd69..572eed360ad1 100644 ---- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c -+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c -@@ -548,7 +548,7 @@ static void del_sw_flow_group(struct fs_node *node) - - rhashtable_destroy(&fg->ftes_hash); - ida_destroy(&fg->fte_allocator); -- if (ft->autogroup.active) -+ if (ft->autogroup.active && fg->max_ftes == ft->autogroup.group_size) - ft->autogroup.num_groups--; - err = rhltable_remove(&ft->fgs_hash, - &fg->hash, -@@ -1093,6 +1093,8 @@ mlx5_create_auto_grouped_flow_table(struct mlx5_flow_namespace *ns, - - ft->autogroup.active = true; - ft->autogroup.required_groups = max_num_groups; -+ /* We save place for flow groups in addition to max types */ -+ ft->autogroup.group_size = ft->max_fte / (max_num_groups + 1); - - return ft; - } -@@ -1299,8 +1301,7 @@ static struct mlx5_flow_group *alloc_auto_flow_group(struct mlx5_flow_table *ft - return ERR_PTR(-ENOENT); - - if (ft->autogroup.num_groups < ft->autogroup.required_groups) -- /* We save place for flow groups in addition to max types */ -- group_size = ft->max_fte / (ft->autogroup.required_groups + 1); -+ group_size = ft->autogroup.group_size; - - /* ft->max_fte == ft->autogroup.max_types */ - if (group_size == 0) -@@ -1327,7 +1328,8 @@ static struct mlx5_flow_group *alloc_auto_flow_group(struct mlx5_flow_table *ft - if (IS_ERR(fg)) - goto out; - -- ft->autogroup.num_groups++; -+ if (group_size == ft->autogroup.group_size) -+ ft->autogroup.num_groups++; - - out: - return fg; -diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h -index b51ad217da32..a872023862d9 100644 ---- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h -+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h -@@ -135,6 +135,7 @@ struct mlx5_flow_table { - struct { - bool active; - unsigned int required_groups; -+ unsigned int group_size; - unsigned int num_groups; - } autogroup; - /* Protect fwd_rules */ --- -2.16.4 - diff --git a/series.conf b/series.conf index fa3a803..aacad3f 100644 --- a/series.conf +++ b/series.conf @@ -53215,7 +53215,6 @@ patches.suse/net-ibmvnic-Ignore-H_FUNCTION-return-from-H_EOI-to-t.patch patches.suse/0009-net-qca_spi-Move-reset_count-to-struct-qcaspi.patch patches.suse/net-mlx5e-Fix-set-vf-link-state-error-flow.patch - patches.suse/net-mlx5-Fix-auto-group-size-calculation.patch patches.suse/net-mlx5-Update-the-list-of-the-PCI-supported-device-b7eca940.patch patches.suse/net-mlxfw-Verify-FSM-error-code-translation-doesn-t-.patch patches.suse/0001-nfc-port100-handle-command-failure-cleanly.patch