{"id":834180,"url":"http://patchwork.ozlabs.org/api/1.2/patches/834180/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171104085030.25430-10-saeedm@mellanox.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20171104085030.25430-10-saeedm@mellanox.com>","list_archive_url":null,"date":"2017-11-04T08:50:27","name":"[net-next,09/12] net/mlx5: Enlarge the NIC TC offload table size","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"10f4ae32301faa572a1d1447ea69265b60c91bc9","submitter":{"id":65299,"url":"http://patchwork.ozlabs.org/api/1.2/people/65299/?format=json","name":"Saeed Mahameed","email":"saeedm@mellanox.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20171104085030.25430-10-saeedm@mellanox.com/mbox/","series":[{"id":11869,"url":"http://patchwork.ozlabs.org/api/1.2/series/11869/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=11869","date":"2017-11-04T08:50:18","name":"[net-next,01/12] net/dcb: Add dscp to priority selector type","version":1,"mbox":"http://patchwork.ozlabs.org/series/11869/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/834180/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/834180/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yTXdh2fgTz9sBW\n\tfor ;\n\tSat, 4 Nov 2017 19:52:40 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932639AbdKDIwe (ORCPT );\n\tSat, 4 Nov 2017 04:52:34 -0400","from mail-il-dmz.mellanox.com ([193.47.165.129]:54574 \"EHLO\n\tmellanox.co.il\" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org\n\twith ESMTP id S1756465AbdKDIwK (ORCPT\n\t); Sat, 4 Nov 2017 04:52:10 -0400","from Internal Mail-Server by MTLPINE1 (envelope-from\n\tsaeedm@mellanox.com)\n\twith ESMTPS (AES256-SHA encrypted); 4 Nov 2017 10:52:05 +0200","from mti-swat15.mti.labs.mlnx. (mti-swat15.mti.labs.mlnx\n\t[10.20.1.123])\n\tby labmailer.mlnx (8.13.8/8.13.8) with ESMTP id vA48pkiX022678;\n\tSat, 4 Nov 2017 10:52:03 +0200"],"From":"Saeed Mahameed ","To":"\"David S. Miller\" ","Cc":"netdev@vger.kernel.org, Or Gerlitz ,\n\tSaeed Mahameed ","Subject":"[net-next 09/12] net/mlx5: Enlarge the NIC TC offload table size","Date":"Sat, 4 Nov 2017 01:50:27 -0700","Message-Id":"<20171104085030.25430-10-saeedm@mellanox.com>","X-Mailer":"git-send-email 2.14.2","In-Reply-To":"<20171104085030.25430-1-saeedm@mellanox.com>","References":"<20171104085030.25430-1-saeedm@mellanox.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Or Gerlitz \n\nThe NIC TC offload table size was hard coded to 1k. Change it to be\n\n min(max NIC RX table size,\n\t min(max flow counters, 64k) * num flow groups)\n\nwhere the max values are read from the firmware and the number of\nflow groups is hard-coded as before this change.\n\nWe don't know upfront the division of flows to groups (== different masks).\nThis setup allows each group to be of size up to the where we want to go\n(when supported, all offloaded flows use counters). Thus, we don't expect\nmultiple occurences for a group which in turn would add steering hops.\n\nSigned-off-by: Or Gerlitz \nSigned-off-by: Saeed Mahameed \n---\n drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 15 +++++++++++++--\n 1 file changed, 13 insertions(+), 2 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c\nindex 9ba1f72060aa..55979ec2e88a 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c\n@@ -90,8 +90,8 @@ enum {\n \tMLX5_HEADER_TYPE_NVGRE = 0x1,\n };\n \n-#define MLX5E_TC_TABLE_NUM_ENTRIES 1024\n #define MLX5E_TC_TABLE_NUM_GROUPS 4\n+#define MLX5E_TC_TABLE_MAX_GROUP_SIZE (1 << 16)\n \n struct mod_hdr_key {\n \tint num_actions;\n@@ -263,10 +263,21 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv,\n \t}\n \n \tif (IS_ERR_OR_NULL(priv->fs.tc.t)) {\n+\t\tint tc_grp_size, tc_tbl_size;\n+\t\tu32 max_flow_counter;\n+\n+\t\tmax_flow_counter = (MLX5_CAP_GEN(dev, max_flow_counter_31_16) << 16) |\n+\t\t\t\t MLX5_CAP_GEN(dev, max_flow_counter_15_0);\n+\n+\t\ttc_grp_size = min_t(int, max_flow_counter, MLX5E_TC_TABLE_MAX_GROUP_SIZE);\n+\n+\t\ttc_tbl_size = min_t(int, tc_grp_size * MLX5E_TC_TABLE_NUM_GROUPS,\n+\t\t\t\t BIT(MLX5_CAP_FLOWTABLE_NIC_RX(dev, log_max_ft_size)));\n+\n \t\tpriv->fs.tc.t =\n \t\t\tmlx5_create_auto_grouped_flow_table(priv->fs.ns,\n \t\t\t\t\t\t\t MLX5E_TC_PRIO,\n-\t\t\t\t\t\t\t MLX5E_TC_TABLE_NUM_ENTRIES,\n+\t\t\t\t\t\t\t tc_tbl_size,\n \t\t\t\t\t\t\t MLX5E_TC_TABLE_NUM_GROUPS,\n \t\t\t\t\t\t\t 0, 0);\n \t\tif (IS_ERR(priv->fs.tc.t)) {\n","prefixes":["net-next","09/12"]}