{"id":818090,"url":"http://patchwork.ozlabs.org/api/patches/818090/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170925083230.1193-11-jiri@resnulli.us/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/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":"<20170925083230.1193-11-jiri@resnulli.us>","list_archive_url":null,"date":"2017-09-25T08:32:30","name":"[net-next,10/10] mlxsw: spectrum_dpipe: Add support for controlling nexthop counters","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"d6f073d2cf39c95921b400f9ec4f3173f3ed4365","submitter":{"id":15321,"url":"http://patchwork.ozlabs.org/api/people/15321/?format=json","name":"Jiri Pirko","email":"jiri@resnulli.us"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170925083230.1193-11-jiri@resnulli.us/mbox/","series":[{"id":4898,"url":"http://patchwork.ozlabs.org/api/series/4898/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4898","date":"2017-09-25T08:32:21","name":"mlxsw: Add router adjacency dpipe table","version":1,"mbox":"http://patchwork.ozlabs.org/series/4898/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/818090/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818090/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=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=resnulli-us.20150623.gappssmtp.com\n\theader.i=@resnulli-us.20150623.gappssmtp.com\n\theader.b=\"lgaW8Ld/\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y0y5F2pqZz9t62\n\tfor ;\n\tMon, 25 Sep 2017 18:32:49 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S934301AbdIYIcr (ORCPT );\n\tMon, 25 Sep 2017 04:32:47 -0400","from mail-wm0-f67.google.com ([74.125.82.67]:33890 \"EHLO\n\tmail-wm0-f67.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S934150AbdIYIck (ORCPT\n\t); Mon, 25 Sep 2017 04:32:40 -0400","by mail-wm0-f67.google.com with SMTP id i131so6489916wma.1\n\tfor ; Mon, 25 Sep 2017 01:32:39 -0700 (PDT)","from localhost (ip-89-177-136-69.net.upcbroadband.cz.\n\t[89.177.136.69]) by smtp.gmail.com with ESMTPSA id\n\tf17sm2047959wmf.47.2017.09.25.01.32.38\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tMon, 25 Sep 2017 01:32:38 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=resnulli-us.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=sZ9Qvn6qovJEIpPYmFvoADUiyO7lZBG87zMa6gi+swk=;\n\tb=lgaW8Ld/Nz3TKLgb7MQzXfUQJhh0U80Yu6oJvwMTLQjArlMY68zgXlkNkZA3myU9TJ\n\tjQMMaFGqZUucqLhEBkAPLWfNIiYQIYVKT+5DlTPff74zESRqo395cANHmRod+Rt4flu1\n\tQ5StYb2NjCoLEDMX9dgtWjR4POjq1SoHpLpUc/Kssymu8f7Ru3CI+n9guZnAoWaVFL+s\n\t3kOc/OJNUzvGrCbU4+c95k8A4Y8hElKBfofCdlsNbC/IhapTt7KRtK/CFMZboQjoplSz\n\t7P6WJItIK6Uq3Z/aTizLIp420MAm3BKCYnBheizdeXLkv9RxMbdzExsQ9JJfMrhMLe4N\n\t+7Ow==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=sZ9Qvn6qovJEIpPYmFvoADUiyO7lZBG87zMa6gi+swk=;\n\tb=iSLUoQviBpI0IxktpI4oTlxpYhyt4qkhnhJfh8Yqr1Z8XHHUDYUJw7nZ9loELgGOxJ\n\tqZGiwSEw+JjQoxnb5yaSCsUHuocMn2jmTWDccm8uy/0lm3LF/BlmG588cPugGIvdGhmL\n\t6Z1EpP0W8/vocIsIDUwjuf8dY44cu4laSOuJCEvEss+BJj3VN/TAITsREiCi1YpE9RdR\n\tZcwsKG8qhmuCoYpvTCnINQSq/puTJ18b8iB2fQJbKX63wUSFNJiFCB2YR7hLBONfyp4m\n\tN9GP7eYtev/tfo2GGVwWDhjWjudS74YgW/QkxcsjVrji+f28VqA45ZGqo/MwGjTMjmcp\n\tHR9g==","X-Gm-Message-State":"AHPjjUjbhqVIzOoQp9yQKQ0S+9hrMNUmhIxK180P01wIzUgE3R0woU5t\n\tA0CuhxIyUzlOY5aTuegt2cAm5kot","X-Google-Smtp-Source":"AOwi7QB5ntBpjJA81/lZzTcOdjsUotYFk6pMvtuSZSQcroyjzbE7NvF4u9/JHJ8SQKRRs/JIOghzfQ==","X-Received":"by 10.28.189.5 with SMTP id n5mr8722022wmf.87.1506328359062;\n\tMon, 25 Sep 2017 01:32:39 -0700 (PDT)","From":"Jiri Pirko ","To":"netdev@vger.kernel.org","Cc":"davem@davemloft.net, arkadis@mellanox.com, idosch@mellanox.com,\n\tmlxsw@mellanox.com","Subject":"[patch net-next 10/10] mlxsw: spectrum_dpipe: Add support for\n\tcontrolling nexthop counters","Date":"Mon, 25 Sep 2017 10:32:30 +0200","Message-Id":"<20170925083230.1193-11-jiri@resnulli.us>","X-Mailer":"git-send-email 2.9.5","In-Reply-To":"<20170925083230.1193-1-jiri@resnulli.us>","References":"<20170925083230.1193-1-jiri@resnulli.us>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Arkadi Sharshevsky \n\nAdd support for controlling nexthop counters via dpipe.\n\nSigned-off-by: Arkadi Sharshevsky \nSigned-off-by: Jiri Pirko \n---\n .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 24 ++++++++++++++++++++++\n .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 12 +++++------\n .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 6 ++++++\n 3 files changed, 36 insertions(+), 6 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c\nindex e6755a9..a056f23 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c\n@@ -1132,6 +1132,29 @@ mlxsw_sp_dpipe_table_adj_entries_dump(void *priv, bool counters_enabled,\n \treturn err;\n }\n \n+static int mlxsw_sp_dpipe_table_adj_counters_update(void *priv, bool enable)\n+{\n+\tstruct mlxsw_sp *mlxsw_sp = priv;\n+\tstruct mlxsw_sp_nexthop *nh;\n+\tu32 adj_hash_index = 0;\n+\tu32 adj_index = 0;\n+\n+\tmlxsw_sp_nexthop_for_each(nh, mlxsw_sp->router) {\n+\t\tif (!mlxsw_sp_nexthop_offload(nh) ||\n+\t\t mlxsw_sp_nexthop_group_has_ipip(nh))\n+\t\t\tcontinue;\n+\n+\t\tmlxsw_sp_nexthop_indexes(nh, &adj_index, &adj_hash_index);\n+\t\tif (enable)\n+\t\t\tmlxsw_sp_nexthop_counter_alloc(mlxsw_sp, nh);\n+\t\telse\n+\t\t\tmlxsw_sp_nexthop_counter_free(mlxsw_sp, nh);\n+\t\tmlxsw_sp_nexthop_update(mlxsw_sp,\n+\t\t\t\t\tadj_index + adj_hash_index, nh);\n+\t}\n+\treturn 0;\n+}\n+\n static u64\n mlxsw_sp_dpipe_table_adj_size_get(void *priv)\n {\n@@ -1149,6 +1172,7 @@ static struct devlink_dpipe_table_ops mlxsw_sp_dpipe_table_adj_ops = {\n \t.matches_dump = mlxsw_sp_dpipe_table_adj_matches_dump,\n \t.actions_dump = mlxsw_sp_dpipe_table_adj_actions_dump,\n \t.entries_dump = mlxsw_sp_dpipe_table_adj_entries_dump,\n+\t.counters_set_update = mlxsw_sp_dpipe_table_adj_counters_update,\n \t.size_get = mlxsw_sp_dpipe_table_adj_size_get,\n };\n \ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\nindex 2400fff..ef4b86b 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n@@ -2085,8 +2085,8 @@ struct mlxsw_sp_nexthop_group {\n #define nh_rif\tnexthops[0].rif\n };\n \n-static void mlxsw_sp_nexthop_counter_alloc(struct mlxsw_sp *mlxsw_sp,\n-\t\t\t\t\t struct mlxsw_sp_nexthop *nh)\n+void mlxsw_sp_nexthop_counter_alloc(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\t struct mlxsw_sp_nexthop *nh)\n {\n \tstruct devlink *devlink;\n \n@@ -2101,8 +2101,8 @@ static void mlxsw_sp_nexthop_counter_alloc(struct mlxsw_sp *mlxsw_sp,\n \tnh->counter_valid = true;\n }\n \n-static void mlxsw_sp_nexthop_counter_free(struct mlxsw_sp *mlxsw_sp,\n-\t\t\t\t\t struct mlxsw_sp_nexthop *nh)\n+void mlxsw_sp_nexthop_counter_free(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\t struct mlxsw_sp_nexthop *nh)\n {\n \tif (!nh->counter_valid)\n \t\treturn;\n@@ -2448,8 +2448,8 @@ static int mlxsw_sp_adj_index_mass_update(struct mlxsw_sp *mlxsw_sp,\n \treturn 0;\n }\n \n-static int mlxsw_sp_nexthop_update(struct mlxsw_sp *mlxsw_sp, u32 adj_index,\n-\t\t\t\t struct mlxsw_sp_nexthop *nh)\n+int mlxsw_sp_nexthop_update(struct mlxsw_sp *mlxsw_sp, u32 adj_index,\n+\t\t\t struct mlxsw_sp_nexthop *nh)\n {\n \tstruct mlxsw_sp_neigh_entry *neigh_entry = nh->neigh_entry;\n \tchar ratr_pl[MLXSW_REG_RATR_LEN];\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h\nindex a6e8659..3d44918 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h\n@@ -122,5 +122,11 @@ bool mlxsw_sp_nexthop_group_has_ipip(struct mlxsw_sp_nexthop *nh);\n \t nh = mlxsw_sp_nexthop_next(router, nh))\n int mlxsw_sp_nexthop_counter_get(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t struct mlxsw_sp_nexthop *nh, u64 *p_counter);\n+int mlxsw_sp_nexthop_update(struct mlxsw_sp *mlxsw_sp, u32 adj_index,\n+\t\t\t struct mlxsw_sp_nexthop *nh);\n+void mlxsw_sp_nexthop_counter_alloc(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\t struct mlxsw_sp_nexthop *nh);\n+void mlxsw_sp_nexthop_counter_free(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\t struct mlxsw_sp_nexthop *nh);\n \n #endif /* _MLXSW_ROUTER_H_*/\n","prefixes":["net-next","10/10"]}