Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/833723/?format=api
{ "id": 833723, "url": "http://patchwork.ozlabs.org/api/1.2/patches/833723/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20171103090344.19444-15-jiri@resnulli.us/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/1.2/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": "<20171103090344.19444-15-jiri@resnulli.us>", "list_archive_url": null, "date": "2017-11-03T09:03:42", "name": "[net-next,14/16] mlxsw: spectrum: Handle NETDEV_CHANGE on L3 tunnels", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "3aa8334905c9d177658fd6e28a6323d3a726b98c", "submitter": { "id": 15321, "url": "http://patchwork.ozlabs.org/api/1.2/people/15321/?format=api", "name": "Jiri Pirko", "email": "jiri@resnulli.us" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/1.2/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20171103090344.19444-15-jiri@resnulli.us/mbox/", "series": [ { "id": 11677, "url": "http://patchwork.ozlabs.org/api/1.2/series/11677/?format=api", "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/833723/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/833723/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=\"d5dITAMU\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3ySwxP3yjNz9sNc\n\tfor <patchwork-incoming@ozlabs.org>;\n\tFri, 3 Nov 2017 20:04:09 +1100 (AEDT)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932982AbdKCJEH (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tFri, 3 Nov 2017 05:04:07 -0400", "from mail-wr0-f194.google.com ([209.85.128.194]:55636 \"EHLO\n\tmail-wr0-f194.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932453AbdKCJD6 (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Fri, 3 Nov 2017 05:03:58 -0400", "by mail-wr0-f194.google.com with SMTP id l8so1851371wre.12\n\tfor <netdev@vger.kernel.org>; Fri, 03 Nov 2017 02:03:57 -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\t195sm9488062wmj.3.2017.11.03.02.03.56\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tFri, 03 Nov 2017 02:03:56 -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=SaInU0X5xh97DAmnoVGjJjx8Cfou8Izn60cGInfim8g=;\n\tb=d5dITAMUw0Ev3mJ267wZiQFdaW8Db1vi7UhwxLJeYZSLsUYejnUMrDoKxCX8QoS7nq\n\tagrPcWnAUfoutUuc+W7iQ9BLvEookh6fheq8lZL6gs0UXQJKAhla7QmdcFph3biC4C+9\n\tjZWGU4BdLCLaSXYChGZT2TdxrXNX1XeyQ48NojDje/LTlS64p8UM5FD5eTkBtiS0TSw5\n\t/QnoHrSYOz6VwsG1UFpSaFlauI4xV5M/aVl3YKb8Ppovz9HxeyDmg4s6EcYhEHFT8ehy\n\tvFuejYrtKWBf+GxHKt/7OzAFG73bkkrjnjkE9LN+qj3sINFtmtyzf1Zu14aAvEhbr00i\n\t8VLA==", "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=SaInU0X5xh97DAmnoVGjJjx8Cfou8Izn60cGInfim8g=;\n\tb=DGyvM5SImRtHrmvjZx65knjex6z9GxiRlzHQtLGFpZ/nqo6SWGQKjrP+66HB83sLOV\n\ttIzzmCaSxYqbonApfX+jQBdzvYMMFnYlC+xMtGlLF0lagjCft8epQiyFtbC3ow1Bi/Uu\n\tj1bNDHYMx/kEHMf7RSYjyVXT9y6hgfvz+Z4DmDgws1KNRD+Q6FhoqXMUuAx8rKgIpjx3\n\tpyCxQLDtPNY3pRuDEcrj7rNnmxNGFlSkN7Dsrg/ygGJYEM0OBo0wcY99MAlPzWR4Wj/u\n\tK6ngF56Nl1GGtPiSzx2jqj3IgQTHIXwSbAqd8ZrR61uld3FmDoGs+cF7rpDcbA8LCc6B\n\tNIPA==", "X-Gm-Message-State": "AMCzsaXYnHiLtaaqjbNQkuWw+IuQNN7Y2fAJGFE3QNv+DZQbtJEREq3Z\n\trmltuNYJEzti3Pt4jOzVLO2LAAEU", "X-Google-Smtp-Source": "ABhQp+T2lHu3geO+SkvrQx3P7duZRbCWZyi1Z/QXaAgN5NArXSAedrjowkIESonrQoOILqc+FnATig==", "X-Received": "by 10.223.158.8 with SMTP id u8mr5523032wre.16.1509699836716;\n\tFri, 03 Nov 2017 02:03:56 -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 14/16] mlxsw: spectrum: Handle NETDEV_CHANGE on L3\n\ttunnels", "Date": "Fri, 3 Nov 2017 10:03:42 +0100", "Message-Id": "<20171103090344.19444-15-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": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "From: Petr Machata <petrm@mellanox.com>\n\nChanges to L3 tunnel netdevices (through `ip tunnel change' as well as\n`ip link set') lead to NETDEV_CHANGE being generated on the tunnel\ndevice. Because what is relevant for the tunnel in question depends on\nthe tunnel type, handling of the event is dispatched to the IPIP module\nthrough a newly-added interface mlxsw_sp_ipip_ops.ol_netdev_change().\n\nIPIP tunnels now remember the last set of tunnel parameters in struct\nmlxsw_sp_ipip_entry.parms, and use it to figure out what exactly has\nchanged.\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_ipip.c | 67 ++++++++++++++++++++++\n .../net/ethernet/mellanox/mlxsw/spectrum_ipip.h | 5 ++\n .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 42 +++++++++++---\n .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 7 +++\n 4 files changed, 114 insertions(+), 7 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c\nindex 1850080..5f78fc5 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c\n@@ -287,6 +287,72 @@ mlxsw_sp_ipip_ol_loopback_config_gre4(struct mlxsw_sp *mlxsw_sp,\n \t};\n }\n \n+static int\n+mlxsw_sp_ipip_ol_netdev_change_gre4(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\t struct mlxsw_sp_ipip_entry *ipip_entry,\n+\t\t\t\t struct netlink_ext_ack *extack)\n+{\n+\tunion mlxsw_sp_l3addr old_saddr, new_saddr;\n+\tunion mlxsw_sp_l3addr old_daddr, new_daddr;\n+\tstruct ip_tunnel_parm new_parms;\n+\tbool update_tunnel = false;\n+\tbool update_decap = false;\n+\tbool update_nhs = false;\n+\tint err = 0;\n+\n+\tnew_parms = mlxsw_sp_ipip_netdev_parms(ipip_entry->ol_dev);\n+\n+\tnew_saddr = mlxsw_sp_ipip_parms_saddr(MLXSW_SP_L3_PROTO_IPV4,\n+\t\t\t\t\t new_parms);\n+\told_saddr = mlxsw_sp_ipip_parms_saddr(MLXSW_SP_L3_PROTO_IPV4,\n+\t\t\t\t\t ipip_entry->parms);\n+\tnew_daddr = mlxsw_sp_ipip_parms_daddr(MLXSW_SP_L3_PROTO_IPV4,\n+\t\t\t\t\t new_parms);\n+\told_daddr = mlxsw_sp_ipip_parms_daddr(MLXSW_SP_L3_PROTO_IPV4,\n+\t\t\t\t\t ipip_entry->parms);\n+\n+\tif (!mlxsw_sp_l3addr_eq(&new_saddr, &old_saddr)) {\n+\t\tu16 ul_tb_id = mlxsw_sp_ipip_dev_ul_tb_id(ipip_entry->ol_dev);\n+\n+\t\t/* Since the local address has changed, if there is another\n+\t\t * tunnel with a matching saddr, both need to be demoted.\n+\t\t */\n+\t\tif (mlxsw_sp_ipip_demote_tunnel_by_saddr(mlxsw_sp,\n+\t\t\t\t\t\t\t MLXSW_SP_L3_PROTO_IPV4,\n+\t\t\t\t\t\t\t new_saddr, ul_tb_id,\n+\t\t\t\t\t\t\t ipip_entry)) {\n+\t\t\tmlxsw_sp_ipip_entry_demote_tunnel(mlxsw_sp, ipip_entry);\n+\t\t\treturn 0;\n+\t\t}\n+\n+\t\tupdate_tunnel = true;\n+\t} else if (mlxsw_sp_ipip_parms_okey(ipip_entry->parms) !=\n+\t\t mlxsw_sp_ipip_parms_okey(new_parms)) {\n+\t\tupdate_tunnel = true;\n+\t} else if (!mlxsw_sp_l3addr_eq(&new_daddr, &old_daddr)) {\n+\t\tupdate_nhs = true;\n+\t} else if (mlxsw_sp_ipip_parms_ikey(ipip_entry->parms) !=\n+\t\t mlxsw_sp_ipip_parms_ikey(new_parms)) {\n+\t\tupdate_decap = true;\n+\t}\n+\n+\tif (update_tunnel)\n+\t\terr = __mlxsw_sp_ipip_entry_update_tunnel(mlxsw_sp, ipip_entry,\n+\t\t\t\t\t\t\t true, true, true,\n+\t\t\t\t\t\t\t extack);\n+\telse if (update_nhs)\n+\t\terr = __mlxsw_sp_ipip_entry_update_tunnel(mlxsw_sp, ipip_entry,\n+\t\t\t\t\t\t\t false, false, true,\n+\t\t\t\t\t\t\t extack);\n+\telse if (update_decap)\n+\t\terr = __mlxsw_sp_ipip_entry_update_tunnel(mlxsw_sp, ipip_entry,\n+\t\t\t\t\t\t\t false, false, false,\n+\t\t\t\t\t\t\t extack);\n+\n+\tipip_entry->parms = new_parms;\n+\treturn err;\n+}\n+\n static const struct mlxsw_sp_ipip_ops mlxsw_sp_ipip_gre4_ops = {\n \t.dev_type = ARPHRD_IPGRE,\n \t.ul_proto = MLXSW_SP_L3_PROTO_IPV4,\n@@ -294,6 +360,7 @@ static const struct mlxsw_sp_ipip_ops mlxsw_sp_ipip_gre4_ops = {\n \t.fib_entry_op = mlxsw_sp_ipip_fib_entry_op_gre4,\n \t.can_offload = mlxsw_sp_ipip_can_offload_gre4,\n \t.ol_loopback_config = mlxsw_sp_ipip_ol_loopback_config_gre4,\n+\t.ol_netdev_change = mlxsw_sp_ipip_ol_netdev_change_gre4,\n };\n \n const struct mlxsw_sp_ipip_ops *mlxsw_sp_ipip_ops_arr[] = {\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h\nindex 918d74b..04b08d9 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h\n@@ -56,6 +56,7 @@ struct mlxsw_sp_ipip_entry {\n \tstruct mlxsw_sp_rif_ipip_lb *ol_lb;\n \tstruct mlxsw_sp_fib_entry *decap_fib_entry;\n \tstruct list_head ipip_list_node;\n+\tstruct ip_tunnel_parm parms;\n };\n \n struct mlxsw_sp_ipip_ops {\n@@ -78,6 +79,10 @@ struct mlxsw_sp_ipip_ops {\n \t\t\t struct mlxsw_sp_ipip_entry *ipip_entry,\n \t\t\t enum mlxsw_reg_ralue_op op,\n \t\t\t u32 tunnel_index);\n+\n+\tint (*ol_netdev_change)(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\tstruct mlxsw_sp_ipip_entry *ipip_entry,\n+\t\t\t\tstruct netlink_ext_ack *extack);\n };\n \n extern const struct mlxsw_sp_ipip_ops *mlxsw_sp_ipip_ops_arr[];\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\nindex aa7b820..c1928561 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n@@ -943,7 +943,7 @@ __mlxsw_sp_ipip_netdev_ul_dev_get(const struct net_device *ol_dev)\n \treturn __dev_get_by_index(net, tun->parms.link);\n }\n \n-static u32 mlxsw_sp_ipip_dev_ul_tb_id(const struct net_device *ol_dev)\n+u32 mlxsw_sp_ipip_dev_ul_tb_id(const struct net_device *ol_dev)\n {\n \tstruct net_device *d = __mlxsw_sp_ipip_netdev_ul_dev_get(ol_dev);\n \n@@ -1002,6 +1002,7 @@ mlxsw_sp_ipip_entry_alloc(struct mlxsw_sp *mlxsw_sp,\n \n \tipip_entry->ipipt = ipipt;\n \tipip_entry->ol_dev = ol_dev;\n+\tipip_entry->parms = mlxsw_sp_ipip_netdev_parms(ol_dev);\n \n \treturn ipip_entry;\n \n@@ -1017,12 +1018,6 @@ mlxsw_sp_ipip_entry_dealloc(struct mlxsw_sp_ipip_entry *ipip_entry)\n \tkfree(ipip_entry);\n }\n \n-static bool mlxsw_sp_l3addr_eq(const union mlxsw_sp_l3addr *addr1,\n-\t\t\t const union mlxsw_sp_l3addr *addr2)\n-{\n-\treturn !memcmp(addr1, addr2, sizeof(*addr1));\n-}\n-\n static bool\n mlxsw_sp_ipip_entry_saddr_matches(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t const enum mlxsw_sp_l3proto ul_proto,\n@@ -1471,6 +1466,35 @@ mlxsw_sp_netdevice_ipip_ul_vrf_event(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t\t\t true, true, false, extack);\n }\n \n+static int\n+mlxsw_sp_netdevice_ipip_ol_change_event(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\t\tstruct net_device *ol_dev,\n+\t\t\t\t\tstruct netlink_ext_ack *extack)\n+{\n+\tconst struct mlxsw_sp_ipip_ops *ipip_ops;\n+\tstruct mlxsw_sp_ipip_entry *ipip_entry;\n+\tint err;\n+\n+\tipip_entry = mlxsw_sp_ipip_entry_find_by_ol_dev(mlxsw_sp, ol_dev);\n+\tif (!ipip_entry)\n+\t\t/* A change might make a tunnel eligible for offloading, but\n+\t\t * that is currently not implemented. What falls to slow path\n+\t\t * stays there.\n+\t\t */\n+\t\treturn 0;\n+\n+\t/* A change might make a tunnel not eligible for offloading. */\n+\tif (!mlxsw_sp_netdevice_ipip_can_offload(mlxsw_sp, ol_dev,\n+\t\t\t\t\t\t ipip_entry->ipipt)) {\n+\t\tmlxsw_sp_ipip_entry_demote_tunnel(mlxsw_sp, ipip_entry);\n+\t\treturn 0;\n+\t}\n+\n+\tipip_ops = mlxsw_sp->router->ipip_ops_arr[ipip_entry->ipipt];\n+\terr = ipip_ops->ol_netdev_change(mlxsw_sp, ipip_entry, extack);\n+\treturn err;\n+}\n+\n void mlxsw_sp_ipip_entry_demote_tunnel(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t struct mlxsw_sp_ipip_entry *ipip_entry)\n {\n@@ -1552,6 +1576,10 @@ int mlxsw_sp_netdevice_ipip_ol_event(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t\t\t\t\t ol_dev,\n \t\t\t\t\t\t\t\t extack);\n \t\treturn 0;\n+\tcase NETDEV_CHANGE:\n+\t\textack = info->extack;\n+\t\treturn mlxsw_sp_netdevice_ipip_ol_change_event(mlxsw_sp,\n+\t\t\t\t\t\t\t ol_dev, extack);\n \t}\n \treturn 0;\n }\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h\nindex 5dd650b..1fb8224 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h\n@@ -70,6 +70,7 @@ struct mlxsw_sp_rif *mlxsw_sp_rif_by_index(const struct mlxsw_sp *mlxsw_sp,\n u16 mlxsw_sp_rif_index(const struct mlxsw_sp_rif *rif);\n u16 mlxsw_sp_ipip_lb_rif_index(const struct mlxsw_sp_rif_ipip_lb *rif);\n u16 mlxsw_sp_ipip_lb_ul_vr_id(const struct mlxsw_sp_rif_ipip_lb *rif);\n+u32 mlxsw_sp_ipip_dev_ul_tb_id(const struct net_device *ol_dev);\n int mlxsw_sp_rif_dev_ifindex(const struct mlxsw_sp_rif *rif);\n u8 mlxsw_sp_router_port(const struct mlxsw_sp *mlxsw_sp);\n const struct net_device *mlxsw_sp_rif_dev(const struct mlxsw_sp_rif *rif);\n@@ -138,4 +139,10 @@ void mlxsw_sp_nexthop_counter_alloc(struct mlxsw_sp *mlxsw_sp,\n void mlxsw_sp_nexthop_counter_free(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t struct mlxsw_sp_nexthop *nh);\n \n+static inline bool mlxsw_sp_l3addr_eq(const union mlxsw_sp_l3addr *addr1,\n+\t\t\t\t const union mlxsw_sp_l3addr *addr2)\n+{\n+\treturn !memcmp(addr1, addr2, sizeof(*addr1));\n+}\n+\n #endif /* _MLXSW_ROUTER_H_*/\n", "prefixes": [ "net-next", "14/16" ] }