Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/809166/?format=api
{ "id": 809166, "url": "http://patchwork.ozlabs.org/api/patches/809166/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20170902214929.2890-15-jiri@resnulli.us/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "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": "<20170902214929.2890-15-jiri@resnulli.us>", "list_archive_url": null, "date": "2017-09-02T21:49:22", "name": "[net-next,v2,14/21] mlxsw: spectrum_router: Make nexthops typed", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "01374369b8def18588b0ed83a63bdfca6f608347", "submitter": { "id": 15321, "url": "http://patchwork.ozlabs.org/api/people/15321/?format=api", "name": "Jiri Pirko", "email": "jiri@resnulli.us" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20170902214929.2890-15-jiri@resnulli.us/mbox/", "series": [ { "id": 1180, "url": "http://patchwork.ozlabs.org/api/series/1180/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=1180", "date": "2017-09-02T21:49:08", "name": "mlxsw: Offloading GRE tunnels", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/1180/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/809166/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/809166/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "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=<UNKNOWN>)", "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=\"GEAG7WTb\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xl8tS43p3z9s8J\n\tfor <patchwork-incoming@ozlabs.org>;\n\tSun, 3 Sep 2017 07:50:40 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752932AbdIBVui (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tSat, 2 Sep 2017 17:50:38 -0400", "from mail-wr0-f194.google.com ([209.85.128.194]:37563 \"EHLO\n\tmail-wr0-f194.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752776AbdIBVtz (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Sat, 2 Sep 2017 17:49:55 -0400", "by mail-wr0-f194.google.com with SMTP id y15so1123131wrc.4\n\tfor <netdev@vger.kernel.org>; Sat, 02 Sep 2017 14:49:54 -0700 (PDT)", "from localhost (jirka.pirko.cz. [84.16.102.26])\n\tby smtp.gmail.com with ESMTPSA id\n\ts36sm3891811wrc.14.2017.09.02.14.49.52\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tSat, 02 Sep 2017 14:49:53 -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=k51uRrVX17fBcw/CFLl5vmwA1aKphcY9xCc9cSSIgjI=;\n\tb=GEAG7WTbUYZyEOr5sDdAigTNFf8I+z75mvNzrP5WzUfumGMoaBOoRfhAAEhBl3SVgB\n\tgzmkpgcGxfOXrdVyP2BKf7A8lD9eSAbb2O9YKmFLuyD0s5xYck1udvXJRwPER4VC/0Gr\n\tK3v0cliLzznLXz9cj56z/0e4UM3A6dnPAP1ZmCB63vrZcRbsL/ab0vRa/lLm3VQyiySc\n\tZ53FZoy2h1owraQ3aPs6iTgVOTYo0QnW84YeAsDs54twVlZXa6fItXMLFFGtr6oTL+hD\n\ts/Xsw/8hBWVlA+LuqUJq8WTaoyHJ+9LkoC5Lm5/qZ4trXVsk1SlYuGayDe3qNUtzDPz6\n\t8sLA==", "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=k51uRrVX17fBcw/CFLl5vmwA1aKphcY9xCc9cSSIgjI=;\n\tb=Te6o4EE0MEjU5EsAcskoNc+9HxeWiM3C3KC4aMXz5kaQCGLLNHEkCbGJYnd/4BOWQw\n\tqx1Rg5Ta56Nj2ZgpzBlhyZFIWEtEtThpQ1WMD03nj7KjF9uKu2ZKqzqHIyaf3cSzjpwX\n\tbwvZs5CgpduxGcCxfJgN/J1wMGAEGZzsMoMu5GJXfLmXJGL/0Zrta6P4LwZaFKVgtuSn\n\ts27PIhghrIOsJWycJo1y75i4mqo1fIm3BoLDGGd7SR57Lnp+k98tZW+xXJ/xOw73nGAA\n\t1Uq8Tf5ju5Yq3HhQqeCkFU0aDL5lcfFrGeoMfHlZiyvA46Lbe9jgef0pLYYQjJR5BXMY\n\t1uRg==", "X-Gm-Message-State": "AHPjjUj68U7aC+MB3cfQFBFxiGCX/cCIPJH2Tfn4Q4WOsrLFn63W4Il9\n\tOmQ/JYDNe8tWOb2RYXQ=", "X-Google-Smtp-Source": "ADKCNb4qG1PuuiSUXUuAGw/7n8/DfoNeal1Y8Z2TZN8jEgP+ILQTU3EQyltOqg2whQyn22jN+od+mQ==", "X-Received": "by 10.223.139.220 with SMTP id w28mr3903283wra.166.1504388993709;\n\tSat, 02 Sep 2017 14:49:53 -0700 (PDT)", "From": "Jiri Pirko <jiri@resnulli.us>", "To": "netdev@vger.kernel.org", "Cc": "davem@davemloft.net, petrm@mellanox.com, idosch@mellanox.com,\n\tmlxsw@mellanox.com", "Subject": "[patch net-next v2 14/21] mlxsw: spectrum_router: Make nexthops\n\ttyped", "Date": "Sat, 2 Sep 2017 23:49:22 +0200", "Message-Id": "<20170902214929.2890-15-jiri@resnulli.us>", "X-Mailer": "git-send-email 2.9.3", "In-Reply-To": "<20170902214929.2890-1-jiri@resnulli.us>", "References": "<20170902214929.2890-1-jiri@resnulli.us>", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "From: Petr Machata <petrm@mellanox.com>\n\nIn the router, some next hops may reference an encapsulating netdevice,\nsuch as GRE or IPIP. To properly offload these next hops, mlxsw needs to\nkeep track of whether a given next hop is a regular Ethernet entry, or\nan IP-in-IP tunneling entry.\n\nTo facilitate this book-keeping, add a type field to struct\nmlxsw_sp_nexthop. There is, as of this patch, only one next hop type:\nMLXSW_SP_NEXTHOP_TYPE_ETH. Follow-up patches will introduce the IP-in-IP\nvariant.\n\nThere are several places where next hops are initialized in the IPv4\npath. Instead of replicating the logic at every one of them, factor it\nout to a function mlxsw_sp_nexthop4_type_init(). The corresponding fini\nis actually protocol-neutral, so put it to mlxsw_sp_nexthop_type_fini(),\nbut create a corresponding protocoled _fini function that dispatches to\nthe protocol-neutral one.\n\nThe IPv6 path is simpler, but for symmetry with IPv4, create the same\nsuite of functions with corresponding logic.\n\nSigned-off-by: Petr Machata <petrm@mellanox.com>\nReviewed-by: Ido Schimmel <idosch@mellanox.com>\nSigned-off-by: Jiri Pirko <jiri@mellanox.com>\n---\n .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 138 ++++++++++++++-------\n 1 file changed, 95 insertions(+), 43 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\nindex 563e803..53bdd0f 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n@@ -1652,6 +1652,10 @@ static void mlxsw_sp_neigh_rif_gone_sync(struct mlxsw_sp *mlxsw_sp,\n \t}\n }\n \n+enum mlxsw_sp_nexthop_type {\n+\tMLXSW_SP_NEXTHOP_TYPE_ETH,\n+};\n+\n struct mlxsw_sp_nexthop_key {\n \tstruct fib_nh *fib_nh;\n };\n@@ -1676,7 +1680,10 @@ struct mlxsw_sp_nexthop {\n \t update:1; /* set indicates that MAC of this neigh should be\n \t\t * updated in HW\n \t\t */\n-\tstruct mlxsw_sp_neigh_entry *neigh_entry;\n+\tenum mlxsw_sp_nexthop_type type;\n+\tunion {\n+\t\tstruct mlxsw_sp_neigh_entry *neigh_entry;\n+\t};\n };\n \n struct mlxsw_sp_nexthop_group {\n@@ -1964,9 +1971,9 @@ static int mlxsw_sp_nexthop_mac_update(struct mlxsw_sp *mlxsw_sp, u32 adj_index,\n }\n \n static int\n-mlxsw_sp_nexthop_group_mac_update(struct mlxsw_sp *mlxsw_sp,\n-\t\t\t\t struct mlxsw_sp_nexthop_group *nh_grp,\n-\t\t\t\t bool reallocate)\n+mlxsw_sp_nexthop_group_update(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t struct mlxsw_sp_nexthop_group *nh_grp,\n+\t\t\t bool reallocate)\n {\n \tu32 adj_index = nh_grp->adj_index; /* base */\n \tstruct mlxsw_sp_nexthop *nh;\n@@ -1982,8 +1989,12 @@ mlxsw_sp_nexthop_group_mac_update(struct mlxsw_sp *mlxsw_sp,\n \t\t}\n \n \t\tif (nh->update || reallocate) {\n-\t\t\terr = mlxsw_sp_nexthop_mac_update(mlxsw_sp,\n-\t\t\t\t\t\t\t adj_index, nh);\n+\t\t\tswitch (nh->type) {\n+\t\t\tcase MLXSW_SP_NEXTHOP_TYPE_ETH:\n+\t\t\t\terr = mlxsw_sp_nexthop_mac_update\n+\t\t\t\t\t (mlxsw_sp, adj_index, nh);\n+\t\t\t\tbreak;\n+\t\t\t}\n \t\t\tif (err)\n \t\t\t\treturn err;\n \t\t\tnh->update = 0;\n@@ -2071,8 +2082,7 @@ mlxsw_sp_nexthop_group_refresh(struct mlxsw_sp *mlxsw_sp,\n \t\t/* Nothing was added or removed, so no need to reallocate. Just\n \t\t * update MAC on existing adjacency indexes.\n \t\t */\n-\t\terr = mlxsw_sp_nexthop_group_mac_update(mlxsw_sp, nh_grp,\n-\t\t\t\t\t\t\tfalse);\n+\t\terr = mlxsw_sp_nexthop_group_update(mlxsw_sp, nh_grp, false);\n \t\tif (err) {\n \t\t\tdev_warn(mlxsw_sp->bus_info->dev, \"Failed to update neigh MAC in adjacency table.\\n\");\n \t\t\tgoto set_trap;\n@@ -2099,7 +2109,7 @@ mlxsw_sp_nexthop_group_refresh(struct mlxsw_sp *mlxsw_sp,\n \tnh_grp->adj_index_valid = 1;\n \tnh_grp->adj_index = adj_index;\n \tnh_grp->ecmp_size = ecmp_size;\n-\terr = mlxsw_sp_nexthop_group_mac_update(mlxsw_sp, nh_grp, true);\n+\terr = mlxsw_sp_nexthop_group_update(mlxsw_sp, nh_grp, true);\n \tif (err) {\n \t\tdev_warn(mlxsw_sp->bus_info->dev, \"Failed to update neigh MAC in adjacency table.\\n\");\n \t\tgoto set_trap;\n@@ -2287,6 +2297,48 @@ static bool mlxsw_sp_netdev_ipip_type(const struct mlxsw_sp *mlxsw_sp,\n \treturn false;\n }\n \n+static void mlxsw_sp_nexthop_type_fini(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\t struct mlxsw_sp_nexthop *nh)\n+{\n+\tswitch (nh->type) {\n+\tcase MLXSW_SP_NEXTHOP_TYPE_ETH:\n+\t\tmlxsw_sp_nexthop_neigh_fini(mlxsw_sp, nh);\n+\t\tmlxsw_sp_nexthop_rif_fini(nh);\n+\t\tbreak;\n+\t}\n+}\n+\n+static int mlxsw_sp_nexthop4_type_init(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\t struct mlxsw_sp_nexthop *nh,\n+\t\t\t\t struct fib_nh *fib_nh)\n+{\n+\tstruct net_device *dev = fib_nh->nh_dev;\n+\tstruct mlxsw_sp_rif *rif;\n+\tint err;\n+\n+\tnh->type = MLXSW_SP_NEXTHOP_TYPE_ETH;\n+\trif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, dev);\n+\tif (!rif)\n+\t\treturn 0;\n+\n+\tmlxsw_sp_nexthop_rif_init(nh, rif);\n+\terr = mlxsw_sp_nexthop_neigh_init(mlxsw_sp, nh);\n+\tif (err)\n+\t\tgoto err_neigh_init;\n+\n+\treturn 0;\n+\n+err_neigh_init:\n+\tmlxsw_sp_nexthop_rif_fini(nh);\n+\treturn err;\n+}\n+\n+static void mlxsw_sp_nexthop4_type_fini(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\t\tstruct mlxsw_sp_nexthop *nh)\n+{\n+\tmlxsw_sp_nexthop_type_fini(mlxsw_sp, nh);\n+}\n+\n static int mlxsw_sp_nexthop4_init(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t struct mlxsw_sp_nexthop_group *nh_grp,\n \t\t\t\t struct mlxsw_sp_nexthop *nh,\n@@ -2294,7 +2346,6 @@ static int mlxsw_sp_nexthop4_init(struct mlxsw_sp *mlxsw_sp,\n {\n \tstruct net_device *dev = fib_nh->nh_dev;\n \tstruct in_device *in_dev;\n-\tstruct mlxsw_sp_rif *rif;\n \tint err;\n \n \tnh->nh_grp = nh_grp;\n@@ -2312,19 +2363,13 @@ static int mlxsw_sp_nexthop4_init(struct mlxsw_sp *mlxsw_sp,\n \t fib_nh->nh_flags & RTNH_F_LINKDOWN)\n \t\treturn 0;\n \n-\trif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, dev);\n-\tif (!rif)\n-\t\treturn 0;\n-\tmlxsw_sp_nexthop_rif_init(nh, rif);\n-\n-\terr = mlxsw_sp_nexthop_neigh_init(mlxsw_sp, nh);\n+\terr = mlxsw_sp_nexthop4_type_init(mlxsw_sp, nh, fib_nh);\n \tif (err)\n \t\tgoto err_nexthop_neigh_init;\n \n \treturn 0;\n \n err_nexthop_neigh_init:\n-\tmlxsw_sp_nexthop_rif_fini(nh);\n \tmlxsw_sp_nexthop_remove(mlxsw_sp, nh);\n \treturn err;\n }\n@@ -2332,8 +2377,7 @@ static int mlxsw_sp_nexthop4_init(struct mlxsw_sp *mlxsw_sp,\n static void mlxsw_sp_nexthop4_fini(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t struct mlxsw_sp_nexthop *nh)\n {\n-\tmlxsw_sp_nexthop_neigh_fini(mlxsw_sp, nh);\n-\tmlxsw_sp_nexthop_rif_fini(nh);\n+\tmlxsw_sp_nexthop4_type_fini(mlxsw_sp, nh);\n \tmlxsw_sp_nexthop_remove(mlxsw_sp, nh);\n }\n \n@@ -2342,7 +2386,6 @@ static void mlxsw_sp_nexthop4_event(struct mlxsw_sp *mlxsw_sp,\n {\n \tstruct mlxsw_sp_nexthop_key key;\n \tstruct mlxsw_sp_nexthop *nh;\n-\tstruct mlxsw_sp_rif *rif;\n \n \tif (mlxsw_sp->router->aborted)\n \t\treturn;\n@@ -2352,18 +2395,12 @@ static void mlxsw_sp_nexthop4_event(struct mlxsw_sp *mlxsw_sp,\n \tif (WARN_ON_ONCE(!nh))\n \t\treturn;\n \n-\trif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, fib_nh->nh_dev);\n-\tif (!rif)\n-\t\treturn;\n-\n \tswitch (event) {\n \tcase FIB_EVENT_NH_ADD:\n-\t\tmlxsw_sp_nexthop_rif_init(nh, rif);\n-\t\tmlxsw_sp_nexthop_neigh_init(mlxsw_sp, nh);\n+\t\tmlxsw_sp_nexthop4_type_init(mlxsw_sp, nh, fib_nh);\n \t\tbreak;\n \tcase FIB_EVENT_NH_DEL:\n-\t\tmlxsw_sp_nexthop_neigh_fini(mlxsw_sp, nh);\n-\t\tmlxsw_sp_nexthop_rif_fini(nh);\n+\t\tmlxsw_sp_nexthop4_type_fini(mlxsw_sp, nh);\n \t\tbreak;\n \t}\n \n@@ -2376,8 +2413,7 @@ static void mlxsw_sp_nexthop_rif_gone_sync(struct mlxsw_sp *mlxsw_sp,\n \tstruct mlxsw_sp_nexthop *nh, *tmp;\n \n \tlist_for_each_entry_safe(nh, tmp, &rif->nexthop_list, rif_list_node) {\n-\t\tmlxsw_sp_nexthop_neigh_fini(mlxsw_sp, nh);\n-\t\tmlxsw_sp_nexthop_rif_fini(nh);\n+\t\tmlxsw_sp_nexthop_type_fini(mlxsw_sp, nh);\n \t\tmlxsw_sp_nexthop_group_refresh(mlxsw_sp, nh->nh_grp);\n \t}\n }\n@@ -3487,22 +3523,16 @@ mlxsw_sp_fib6_entry_rt_find(const struct mlxsw_sp_fib6_entry *fib6_entry,\n \treturn NULL;\n }\n \n-static int mlxsw_sp_nexthop6_init(struct mlxsw_sp *mlxsw_sp,\n-\t\t\t\t struct mlxsw_sp_nexthop_group *nh_grp,\n-\t\t\t\t struct mlxsw_sp_nexthop *nh,\n-\t\t\t\t const struct rt6_info *rt)\n+static int mlxsw_sp_nexthop6_type_init(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\t struct mlxsw_sp_nexthop_group *nh_grp,\n+\t\t\t\t struct mlxsw_sp_nexthop *nh,\n+\t\t\t\t const struct rt6_info *rt)\n {\n \tstruct net_device *dev = rt->dst.dev;\n \tstruct mlxsw_sp_rif *rif;\n \tint err;\n \n-\tnh->nh_grp = nh_grp;\n-\tmemcpy(&nh->gw_addr, &rt->rt6i_gateway, sizeof(nh->gw_addr));\n-\n-\tif (!dev)\n-\t\treturn 0;\n-\tnh->ifindex = dev->ifindex;\n-\n+\tnh->type = MLXSW_SP_NEXTHOP_TYPE_ETH;\n \trif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, dev);\n \tif (!rif)\n \t\treturn 0;\n@@ -3519,11 +3549,33 @@ static int mlxsw_sp_nexthop6_init(struct mlxsw_sp *mlxsw_sp,\n \treturn err;\n }\n \n+static void mlxsw_sp_nexthop6_type_fini(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\t\tstruct mlxsw_sp_nexthop *nh)\n+{\n+\tmlxsw_sp_nexthop_type_fini(mlxsw_sp, nh);\n+}\n+\n+static int mlxsw_sp_nexthop6_init(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\t struct mlxsw_sp_nexthop_group *nh_grp,\n+\t\t\t\t struct mlxsw_sp_nexthop *nh,\n+\t\t\t\t const struct rt6_info *rt)\n+{\n+\tstruct net_device *dev = rt->dst.dev;\n+\n+\tnh->nh_grp = nh_grp;\n+\tmemcpy(&nh->gw_addr, &rt->rt6i_gateway, sizeof(nh->gw_addr));\n+\n+\tif (!dev)\n+\t\treturn 0;\n+\tnh->ifindex = dev->ifindex;\n+\n+\treturn mlxsw_sp_nexthop6_type_init(mlxsw_sp, nh_grp, nh, rt);\n+}\n+\n static void mlxsw_sp_nexthop6_fini(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t struct mlxsw_sp_nexthop *nh)\n {\n-\tmlxsw_sp_nexthop_neigh_fini(mlxsw_sp, nh);\n-\tmlxsw_sp_nexthop_rif_fini(nh);\n+\tmlxsw_sp_nexthop6_type_fini(mlxsw_sp, nh);\n }\n \n static bool mlxsw_sp_rt6_is_gateway(const struct mlxsw_sp *mlxsw_sp,\n", "prefixes": [ "net-next", "v2", "14/21" ] }