{"id":833731,"url":"http://patchwork.ozlabs.org/api/1.2/patches/833731/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171103090344.19444-11-jiri@resnulli.us/","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":"<20171103090344.19444-11-jiri@resnulli.us>","list_archive_url":null,"date":"2017-11-03T09:03:38","name":"[net-next,10/16] mlxsw: spectrum_router: Generalize __mlxsw_sp_ipip_entry_update_tunnel()","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"40257e71cf9fe4b4d478decf789bd14992633be0","submitter":{"id":15321,"url":"http://patchwork.ozlabs.org/api/1.2/people/15321/?format=json","name":"Jiri Pirko","email":"jiri@resnulli.us"},"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/20171103090344.19444-11-jiri@resnulli.us/mbox/","series":[{"id":11677,"url":"http://patchwork.ozlabs.org/api/1.2/series/11677/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=11677","date":"2017-11-03T09:03:28","name":"mlxsw: Handle changes in GRE configuration","version":1,"mbox":"http://patchwork.ozlabs.org/series/11677/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/833731/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/833731/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=\"EtTe2ccY\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3ySwy60j96z9sNV\n\tfor ;\n\tFri, 3 Nov 2017 20:04:46 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1755795AbdKCJEi (ORCPT );\n\tFri, 3 Nov 2017 05:04:38 -0400","from mail-wm0-f68.google.com ([74.125.82.68]:49185 \"EHLO\n\tmail-wm0-f68.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932571AbdKCJDy (ORCPT\n\t); Fri, 3 Nov 2017 05:03:54 -0400","by mail-wm0-f68.google.com with SMTP id b189so3504073wmd.4\n\tfor ; Fri, 03 Nov 2017 02:03:54 -0700 (PDT)","from localhost (ip-94-113-127-32.net.upcbroadband.cz.\n\t[94.113.127.32]) by smtp.gmail.com with ESMTPSA id\n\tl96sm6957204wrc.21.2017.11.03.02.03.52\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tFri, 03 Nov 2017 02:03:52 -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=zgzU/90jr9CjzjOYOmcMYwcI92HnfodvrfsBL0bR+l8=;\n\tb=EtTe2ccYF+VrH5cjIL4/2CaLmmusL8kqzARpz14l7yxs4EMrzwskZFWsDrknhjSTxe\n\thuVKII35WJbVempzwddAJf9BZWseGWegQa6b9+YkAVm6zQ6B9vqWa8pwksYDcfGuVMXh\n\tL65pIRQLq8+qOOUjQaviOjbcj5DTCtY+W/qGB6QMVP4LWTvNSItnOxsmgkVhx5lx5Tc2\n\tNMJsj94E9/ld16wjrcADzdvrE9IuCSnPkUMkr4afTFjy8oGMG4ax/jxbBQk6aaVy1Pwe\n\t5VwERNaLnVVrKtxEZgpbNu73ucbMkOzuRJCPL2mtQWoR0Tbhx9s/OFilQ/2CBWRaMzkP\n\tF2lw==","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=zgzU/90jr9CjzjOYOmcMYwcI92HnfodvrfsBL0bR+l8=;\n\tb=o2ObTtfVlW8YIFXV99OCG8kBMI7eyxcUwdy2L9KGjnPxGiGJAq+DvCEbhxHs265rLx\n\tr5+rDPUfANUHnLy+GRAVg2qyhccZKabIEVaVsIaw1XZQizgh5cEkthiNmrfB4KMfMvIs\n\tsmF6Qb6ELL52pGV/HLGBav71afBebJAQtxyEMwR+7V03O8jNCpSvf6lQLJ6n+vhLfm3j\n\t5GELtzy3v5CuPime2D3Df4yWqYQF8AaLBArOm82RpO2OV96auxawhlo+/YvlutrYKqLG\n\tiM5je7oLSRc4LkGygLkouHlV81SGYnZr5B5ZjfPX6PB8vM8pH+ve+QPwmjf5oEtoVhHO\n\tcAQg==","X-Gm-Message-State":"AJaThX7Qr2aqCedWOBLlNTfiKL4W1NcCet8XjFoiUYX0sBaQvxSQd0Xz\n\tQtNzjw0Tkm0g90kAmlLR1leftrYM","X-Google-Smtp-Source":"ABhQp+Qjv3G4pseevAzVfxLo60b1j+K0kJEg0sJikQ1+kLJzF1KgyinfNGz7vf7oZL/ETk3ZEp4XlA==","X-Received":"by 10.28.214.205 with SMTP id n196mr3325569wmg.10.1509699833279; \n\tFri, 03 Nov 2017 02:03:53 -0700 (PDT)","From":"Jiri Pirko ","To":"netdev@vger.kernel.org","Cc":"davem@davemloft.net, petrm@mellanox.com, idosch@mellanox.com,\n\tmlxsw@mellanox.com","Subject":"[patch net-next 10/16] mlxsw: spectrum_router: Generalize\n\t__mlxsw_sp_ipip_entry_update_tunnel()","Date":"Fri, 3 Nov 2017 10:03:38 +0100","Message-Id":"<20171103090344.19444-11-jiri@resnulli.us>","X-Mailer":"git-send-email 2.9.5","In-Reply-To":"<20171103090344.19444-1-jiri@resnulli.us>","References":"<20171103090344.19444-1-jiri@resnulli.us>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Petr Machata \n\nThe work that needs to be done to update HW configuration in response to\nchanges is similar to what __mlxsw_sp_ipip_entry_update_tunnel() already\ndoes, but with a number of twists: each change requires a different\nsubset of things to happen. Extend the function to support all these\nuses, and allow finely-grained configuration of what should happen at\neach call through a suite of function arguments.\n\nPublish the updated function to allow use from the spectrum_ipip module.\n\nSigned-off-by: Petr Machata \nReviewed-by: Ido Schimmel \nSigned-off-by: Jiri Pirko \n---\n .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 47 ++++++++++++++++++++--\n .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 7 ++++\n 2 files changed, 50 insertions(+), 4 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\nindex e2795b8..1376a97 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n@@ -1355,9 +1355,12 @@ static void mlxsw_sp_netdevice_ipip_ol_down_event(struct mlxsw_sp *mlxsw_sp,\n \t\tmlxsw_sp_ipip_entry_ol_down_event(mlxsw_sp, ipip_entry);\n }\n \n+static void mlxsw_sp_nexthop_rif_update(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\t\tstruct mlxsw_sp_rif *rif);\n static int\n mlxsw_sp_ipip_entry_ol_lb_update(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t struct mlxsw_sp_ipip_entry *ipip_entry,\n+\t\t\t\t bool keep_encap,\n \t\t\t\t struct netlink_ext_ack *extack)\n {\n \tstruct mlxsw_sp_rif_ipip_lb *old_lb_rif = ipip_entry->ol_lb;\n@@ -1370,13 +1373,32 @@ mlxsw_sp_ipip_entry_ol_lb_update(struct mlxsw_sp *mlxsw_sp,\n \tif (IS_ERR(new_lb_rif))\n \t\treturn PTR_ERR(new_lb_rif);\n \tipip_entry->ol_lb = new_lb_rif;\n+\n+\tif (keep_encap) {\n+\t\tlist_splice_init(&old_lb_rif->common.nexthop_list,\n+\t\t\t\t &new_lb_rif->common.nexthop_list);\n+\t\tmlxsw_sp_nexthop_rif_update(mlxsw_sp, &new_lb_rif->common);\n+\t}\n+\n \tmlxsw_sp_rif_destroy(&old_lb_rif->common);\n \n \treturn 0;\n }\n \n+/**\n+ * Update the offload related to an IPIP entry. This always updates decap, and\n+ * in addition to that it also:\n+ * @recreate_loopback: recreates the associated loopback RIF\n+ * @keep_encap: updates next hops that use the tunnel netdevice. This is only\n+ * relevant when recreate_loopback is true.\n+ * @update_nexthops: updates next hops, keeping the current loopback RIF. This\n+ * is only relevant when recreate_loopback is false.\n+ */\n int __mlxsw_sp_ipip_entry_update_tunnel(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t\tstruct mlxsw_sp_ipip_entry *ipip_entry,\n+\t\t\t\t\tbool recreate_loopback,\n+\t\t\t\t\tbool keep_encap,\n+\t\t\t\t\tbool update_nexthops,\n \t\t\t\t\tstruct netlink_ext_ack *extack)\n {\n \tint err;\n@@ -1390,9 +1412,15 @@ int __mlxsw_sp_ipip_entry_update_tunnel(struct mlxsw_sp *mlxsw_sp,\n \tif (ipip_entry->decap_fib_entry)\n \t\tmlxsw_sp_ipip_entry_demote_decap(mlxsw_sp, ipip_entry);\n \n-\terr = mlxsw_sp_ipip_entry_ol_lb_update(mlxsw_sp, ipip_entry, extack);\n-\tif (err)\n-\t\treturn err;\n+\tif (recreate_loopback) {\n+\t\terr = mlxsw_sp_ipip_entry_ol_lb_update(mlxsw_sp, ipip_entry,\n+\t\t\t\t\t\t keep_encap, extack);\n+\t\tif (err)\n+\t\t\treturn err;\n+\t} else if (update_nexthops) {\n+\t\tmlxsw_sp_nexthop_rif_update(mlxsw_sp,\n+\t\t\t\t\t &ipip_entry->ol_lb->common);\n+\t}\n \n \tif (ipip_entry->ol_dev->flags & IFF_UP)\n \t\tmlxsw_sp_ipip_entry_ol_up_event(mlxsw_sp, ipip_entry);\n@@ -1410,7 +1438,7 @@ static int mlxsw_sp_netdevice_ipip_ol_vrf_event(struct mlxsw_sp *mlxsw_sp,\n \tif (!ipip_entry)\n \t\treturn 0;\n \treturn __mlxsw_sp_ipip_entry_update_tunnel(mlxsw_sp, ipip_entry,\n-\t\t\t\t\t\t extack);\n+\t\t\t\t\t\t true, false, false, extack);\n }\n \n int mlxsw_sp_netdevice_ipip_ol_event(struct mlxsw_sp *mlxsw_sp,\n@@ -3285,6 +3313,17 @@ static void mlxsw_sp_nexthop4_event(struct mlxsw_sp *mlxsw_sp,\n \tmlxsw_sp_nexthop_group_refresh(mlxsw_sp, nh->nh_grp);\n }\n \n+static void mlxsw_sp_nexthop_rif_update(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\t\tstruct mlxsw_sp_rif *rif)\n+{\n+\tstruct mlxsw_sp_nexthop *nh;\n+\n+\tlist_for_each_entry(nh, &rif->nexthop_list, rif_list_node) {\n+\t\t__mlxsw_sp_nexthop_neigh_update(nh, false);\n+\t\tmlxsw_sp_nexthop_group_refresh(mlxsw_sp, nh->nh_grp);\n+\t}\n+}\n+\n static void mlxsw_sp_nexthop_rif_gone_sync(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t\t struct mlxsw_sp_rif *rif)\n {\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h\nindex 8120b01..4b8a12a 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h\n@@ -63,6 +63,7 @@ enum mlxsw_sp_rif_counter_dir {\n \n struct mlxsw_sp_neigh_entry;\n struct mlxsw_sp_nexthop;\n+struct mlxsw_sp_ipip_entry;\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@@ -103,6 +104,12 @@ mlxsw_sp_neigh_entry_counter_update(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t struct mlxsw_sp_neigh_entry *neigh_entry,\n \t\t\t\t bool adding);\n bool mlxsw_sp_neigh_ipv6_ignore(struct mlxsw_sp_neigh_entry *neigh_entry);\n+int __mlxsw_sp_ipip_entry_update_tunnel(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\t\tstruct mlxsw_sp_ipip_entry *ipip_entry,\n+\t\t\t\t\tbool recreate_loopback,\n+\t\t\t\t\tbool keep_encap,\n+\t\t\t\t\tbool update_nexthops,\n+\t\t\t\t\tstruct netlink_ext_ack *extack);\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","prefixes":["net-next","10/16"]}