{"id":818094,"url":"http://patchwork.ozlabs.org/api/patches/818094/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170925083230.1193-6-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-6-jiri@resnulli.us>","list_archive_url":null,"date":"2017-09-25T08:32:25","name":"[net-next,05/10] mlxsw: spectrum_router: Add helpers for nexthop access","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"6111747ac80584529eed97fa3ee1022038478409","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-6-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/818094/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818094/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=\"hFvATuLa\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y0y5f5qb0z9t62\n\tfor ;\n\tMon, 25 Sep 2017 18:33:10 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S934158AbdIYIdD (ORCPT );\n\tMon, 25 Sep 2017 04:33:03 -0400","from mail-wm0-f66.google.com ([74.125.82.66]:38604 \"EHLO\n\tmail-wm0-f66.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932368AbdIYIcg (ORCPT\n\t); Mon, 25 Sep 2017 04:32:36 -0400","by mail-wm0-f66.google.com with SMTP id x17so6466854wmd.5\n\tfor ; Mon, 25 Sep 2017 01:32:35 -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\t109sm3558752wrc.25.2017.09.25.01.32.34\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tMon, 25 Sep 2017 01:32:34 -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=9NFF08042rPtgOSZ5864JZO3AdrQpzp6QWkAEngDvsU=;\n\tb=hFvATuLam0nypAWRONlh/MkA+jd0hqtqNHfqhzq+EkLDb5x7zcTYhwhmZWnW6THwJc\n\t6omY7IU+0FVLC+j0cx0n3uNp2aUVsjknEz8j1RfzEAuW+n6+t2KnvI59xuKBA99yMjOa\n\txJNS2iB/1vdgiO7/GI6b9qsFHU1P/a6+qpGO/PF012REcy2qEDGmS25LapDRWRJ8FEq0\n\ttok68YhCd7Rw3YF2NqhDP3G1GYC1sKbzgNsCuSbQLF2sbbMKm2HRGhvhNpNP+vtOQvc/\n\tPndhToH3GbnXXwI+E6bLbZ8OOEHOyHzmcY6FdHd76c7cWjS4u4LIVV8CIQ5Fd3dfjsR0\n\t5x6w==","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=9NFF08042rPtgOSZ5864JZO3AdrQpzp6QWkAEngDvsU=;\n\tb=tPir1FyCjFKLlJPOrGZ0J0U2L8tj+Fqift2MjdXQic20Ucw9uTs6syV3uIyYBfmqcC\n\tnHwzuqeKmRGSNJgzdkc1vjLkQGxPdPx+3L/CoNs3EF8/6WIjLxouEnMynmvA7a4IxD2Y\n\tWa7SCHGbYNluJD8XQO6uhElqZ9fWodKvE/Wh6j440g4mTB0GCjZ+3+ap7Rex4unkibRy\n\tyI8H+iCCmklMo8R5fHqpKLsRcST/Ry4Va7AF5P5wXjIGCpk9YGhHuPrN+Yg0wnXFYC7N\n\tqo3Ziq4yTMRWTo6L944u1fmqCBepMAWcSgTBjv/K3o+ZbHSQNou0EMAqQaDUDySJ4YDm\n\tCw2Q==","X-Gm-Message-State":"AHPjjUgeFTJD++Ve9PHgjQf83Y9wwQ921EsXqHiVrjtf3w2lmhM9qrpi\n\tTZ71QBe4c3ZgFvvJNVGqS/HeIufX","X-Google-Smtp-Source":"AOwi7QD9MCzUJOvU9A12Bp5e3kidSZTjsyjr/K/X/dD6Ja82MgBHJYeAVZXHaNlfFUvv7oD4NomO8Q==","X-Received":"by 10.28.50.200 with SMTP id y191mr9223434wmy.74.1506328355187; \n\tMon, 25 Sep 2017 01:32:35 -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 05/10] mlxsw: spectrum_router: Add helpers for\n\tnexthop access","Date":"Mon, 25 Sep 2017 10:32:25 +0200","Message-Id":"<20170925083230.1193-6-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\nThis is done as a preparation before introducing the ability to dump the\nadjacency table via dpipe, and to count the table size. The current table\nimplementation avoids tunnel entries, thus a helper for checking if\nthe nexthop group contains tunnel entries is also provided. The mlxsw's\nnexthop representative struct stays private to the router module.\n\nSigned-off-by: Arkadi Sharshevsky \nSigned-off-by: Jiri Pirko \n---\n .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 71 ++++++++++++++++++++++\n .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 12 ++++\n 2 files changed, 83 insertions(+)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\nindex 8e78a95..78e0420 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n@@ -2083,6 +2083,77 @@ struct mlxsw_sp_nexthop_group {\n #define nh_rif\tnexthops[0].rif\n };\n \n+struct mlxsw_sp_nexthop *mlxsw_sp_nexthop_next(struct mlxsw_sp_router *router,\n+\t\t\t\t\t struct mlxsw_sp_nexthop *nh)\n+{\n+\tif (!nh) {\n+\t\tif (list_empty(&router->nexthop_list))\n+\t\t\treturn NULL;\n+\t\telse\n+\t\t\treturn list_first_entry(&router->nexthop_list,\n+\t\t\t\t\t\ttypeof(*nh), router_list_node);\n+\t}\n+\tif (list_is_last(&nh->router_list_node, &router->nexthop_list))\n+\t\treturn NULL;\n+\treturn list_next_entry(nh, router_list_node);\n+}\n+\n+bool mlxsw_sp_nexthop_offload(struct mlxsw_sp_nexthop *nh)\n+{\n+\treturn nh->offloaded;\n+}\n+\n+unsigned char *mlxsw_sp_nexthop_ha(struct mlxsw_sp_nexthop *nh)\n+{\n+\tif (!nh->offloaded)\n+\t\treturn NULL;\n+\treturn nh->neigh_entry->ha;\n+}\n+\n+int mlxsw_sp_nexthop_indexes(struct mlxsw_sp_nexthop *nh, u32 *p_adj_index,\n+\t\t\t u32 *p_adj_hash_index)\n+{\n+\tstruct mlxsw_sp_nexthop_group *nh_grp = nh->nh_grp;\n+\tu32 adj_hash_index = 0;\n+\tint i;\n+\n+\tif (!nh->offloaded || !nh_grp->adj_index_valid)\n+\t\treturn -EINVAL;\n+\n+\t*p_adj_index = nh_grp->adj_index;\n+\n+\tfor (i = 0; i < nh_grp->count; i++) {\n+\t\tstruct mlxsw_sp_nexthop *nh_iter = &nh_grp->nexthops[i];\n+\n+\t\tif (nh_iter == nh)\n+\t\t\tbreak;\n+\t\tif (nh_iter->offloaded)\n+\t\t\tadj_hash_index++;\n+\t}\n+\n+\t*p_adj_hash_index = adj_hash_index;\n+\treturn 0;\n+}\n+\n+struct mlxsw_sp_rif *mlxsw_sp_nexthop_rif(struct mlxsw_sp_nexthop *nh)\n+{\n+\treturn nh->rif;\n+}\n+\n+bool mlxsw_sp_nexthop_group_has_ipip(struct mlxsw_sp_nexthop *nh)\n+{\n+\tstruct mlxsw_sp_nexthop_group *nh_grp = nh->nh_grp;\n+\tint i;\n+\n+\tfor (i = 0; i < nh_grp->count; i++) {\n+\t\tstruct mlxsw_sp_nexthop *nh_iter = &nh_grp->nexthops[i];\n+\n+\t\tif (nh_iter->type == MLXSW_SP_NEXTHOP_TYPE_IPIP)\n+\t\t\treturn true;\n+\t}\n+\treturn false;\n+}\n+\n static struct fib_info *\n mlxsw_sp_nexthop4_group_fi(const struct mlxsw_sp_nexthop_group *nh_grp)\n {\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h\nindex ae4c99b..d6951d5 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h\n@@ -62,6 +62,7 @@ enum mlxsw_sp_rif_counter_dir {\n };\n \n struct mlxsw_sp_neigh_entry;\n+struct mlxsw_sp_nexthop;\n \n struct mlxsw_sp_rif *mlxsw_sp_rif_by_index(const struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t\t u16 rif_index);\n@@ -108,5 +109,16 @@ union mlxsw_sp_l3addr\n mlxsw_sp_ipip_netdev_daddr(enum mlxsw_sp_l3proto proto,\n \t\t\t const struct net_device *ol_dev);\n __be32 mlxsw_sp_ipip_netdev_daddr4(const struct net_device *ol_dev);\n+struct mlxsw_sp_nexthop *mlxsw_sp_nexthop_next(struct mlxsw_sp_router *router,\n+\t\t\t\t\t struct mlxsw_sp_nexthop *nh);\n+bool mlxsw_sp_nexthop_offload(struct mlxsw_sp_nexthop *nh);\n+unsigned char *mlxsw_sp_nexthop_ha(struct mlxsw_sp_nexthop *nh);\n+int mlxsw_sp_nexthop_indexes(struct mlxsw_sp_nexthop *nh, u32 *p_adj_index,\n+\t\t\t u32 *p_adj_hash_index);\n+struct mlxsw_sp_rif *mlxsw_sp_nexthop_rif(struct mlxsw_sp_nexthop *nh);\n+bool mlxsw_sp_nexthop_group_has_ipip(struct mlxsw_sp_nexthop *nh);\n+#define mlxsw_sp_nexthop_for_each(nh, router)\t\t\t\t\\\n+\tfor (nh = mlxsw_sp_nexthop_next(router, NULL); nh;\t\t\\\n+\t nh = mlxsw_sp_nexthop_next(router, nh))\n \n #endif /* _MLXSW_ROUTER_H_*/\n","prefixes":["net-next","05/10"]}