{"id":833725,"url":"http://patchwork.ozlabs.org/api/1.2/patches/833725/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171103090344.19444-9-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-9-jiri@resnulli.us>","list_archive_url":null,"date":"2017-11-03T09:03:36","name":"[net-next,08/16] mlxsw: spectrum: Propagate extack for tunnel events","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"2b943abe6703e21219fe83a2cc59497f0d599693","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-9-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/833725/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/833725/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=\"XpduhLKT\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3ySwxg5bNXz9sNV\n\tfor ;\n\tFri, 3 Nov 2017 20:04:23 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932660AbdKCJD5 (ORCPT );\n\tFri, 3 Nov 2017 05:03:57 -0400","from mail-wr0-f196.google.com ([209.85.128.196]:50907 \"EHLO\n\tmail-wr0-f196.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932453AbdKCJDx (ORCPT\n\t); Fri, 3 Nov 2017 05:03:53 -0400","by mail-wr0-f196.google.com with SMTP id p96so1868870wrb.7\n\tfor ; Fri, 03 Nov 2017 02:03:52 -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\tm37sm9216577wrm.4.2017.11.03.02.03.51\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tFri, 03 Nov 2017 02:03:51 -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=I0mxgTHSMxK7DlWMcqpXhs41owXyDoBmPNEUvMRIDSQ=;\n\tb=XpduhLKTuzNuoFtMPQqtzILzML1JtydRMLj8p9HfnwnMVhw2Pgx8NMoYCZ1Q0RmKlI\n\tRvOsNTAhkghhkDIZ00fHXUA8GT8w06AeMVShnrHiiFUEX29v2Serqu+8b+qKCxhB5ivL\n\txp2qrPRX9w4Qgs3pS+TJk3jGXds/xejzbxob647W6KcvU4DZsK0k4TGyAdoQ+0k+j8ON\n\tWyGYt5PXqUVTONtgFLWogM3J8/bZxC2Mn67h2ucsNK2SK0iuTr7EkgyWapYPjPmo4oqg\n\ttpMMnwbirkJBMucToPcLchLPe4lj/lrlZ0omcxyHT9LNKz7Ml72JpWCz+mf8UATfOP8m\n\tCrSg==","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=I0mxgTHSMxK7DlWMcqpXhs41owXyDoBmPNEUvMRIDSQ=;\n\tb=hB11OLl8OvDojp7y0SPxn2sdVBUDY/TFkRwQQm9ecXMoyM4jLNVorWM+ij1u1PYoOw\n\tZebut7tRbnPG16BfAEFtindU1QbOyQJvyaYHMSrnzjG/h+oJmhP0sy4kOIiscZMrDZ14\n\tEkCWA8r92vL+siksxKd6H736zgXQ1V3r/I2AiBYOapJl75rOQCoVjB74Esbh6rVDMgto\n\t35palPK140riBxli8NisYAyrCpXmTwk6FpjjM7FanRV29U36WIEc66RYvKwP0bqvpag6\n\tYnZ1MPJgDxbov/C6FQObysIfeiH/X+gvMnawawfdtxxp3wme9+9+0y53tkHV2mLLboO9\n\tiPJg==","X-Gm-Message-State":"AMCzsaW06WkxuQihVYhQkgNBBQkvJV0SHv/jdUMSOv4yWHYbGB/b6fJa\n\tKNCh7TBSAeHAKdsAQeonTPsxHx6N","X-Google-Smtp-Source":"ABhQp+QoJrAEQL7XGHCG0G0VujxQ4IxejlVNKnzFJPr0sC7Am8ER3HLe5XgxObs8P2zsrtt7xamr+Q==","X-Received":"by 10.223.195.147 with SMTP id p19mr5142991wrf.176.1509699831596;\n\tFri, 03 Nov 2017 02:03:51 -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 08/16] mlxsw: spectrum: Propagate extack for tunnel\n\tevents","Date":"Fri, 3 Nov 2017 10:03:36 +0100","Message-Id":"<20171103090344.19444-9-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 function mlxsw_sp_rif_create() takes an extack parameter. So far,\nfor creation of loopback interfaces, NULL was passed. For some events\nhowever the extack can be extracted and passed along. So do that for\nNETDEV_CHANGEUPPER handler.\n\nUse the opportunity to update the type of info argument that\nmlxsw_sp_netdevice_ipip_ol_event() takes. Follow-up patches will\nintroduce handling of more changes, and some of them carry an extack as\nwell, but in an info structure of a different type. Though not strictly\nerroneous (the pointer could be cast whichever way), it makes no sense\nto pretend the value is always of a certain type, when in fact it isn't.\nSo change the prototype of the above-mentioned function as well.\n\nSigned-off-by: Petr Machata \nReviewed-by: Ido Schimmel \nSigned-off-by: Jiri Pirko \n---\n drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 9 +++----\n .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 31 +++++++++++++---------\n 2 files changed, 23 insertions(+), 17 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h\nindex f01b5cb..07cba52 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h\n@@ -398,11 +398,10 @@ int mlxsw_sp_netdevice_vrf_event(struct net_device *l3_dev, unsigned long event,\n \t\t\t\t struct netdev_notifier_changeupper_info *info);\n bool mlxsw_sp_netdev_is_ipip_ol(const struct mlxsw_sp *mlxsw_sp,\n \t\t\t\tconst struct net_device *dev);\n-int\n-mlxsw_sp_netdevice_ipip_ol_event(struct mlxsw_sp *mlxsw_sp,\n-\t\t\t\t struct net_device *l3_dev,\n-\t\t\t\t unsigned long event,\n-\t\t\t\t struct netdev_notifier_changeupper_info *info);\n+int mlxsw_sp_netdevice_ipip_ol_event(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\t struct net_device *l3_dev,\n+\t\t\t\t unsigned long event,\n+\t\t\t\t struct netdev_notifier_info *info);\n void\n mlxsw_sp_port_vlan_router_leave(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan);\n void mlxsw_sp_rif_destroy(struct mlxsw_sp_rif *rif);\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\nindex ce0d462..c4f1881 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n@@ -961,7 +961,8 @@ mlxsw_sp_rif_create(struct mlxsw_sp *mlxsw_sp,\n static struct mlxsw_sp_rif_ipip_lb *\n mlxsw_sp_ipip_ol_ipip_lb_create(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\tenum mlxsw_sp_ipip_type ipipt,\n-\t\t\t\tstruct net_device *ol_dev)\n+\t\t\t\tstruct net_device *ol_dev,\n+\t\t\t\tstruct netlink_ext_ack *extack)\n {\n \tstruct mlxsw_sp_rif_params_ipip_lb lb_params;\n \tconst struct mlxsw_sp_ipip_ops *ipip_ops;\n@@ -974,7 +975,7 @@ mlxsw_sp_ipip_ol_ipip_lb_create(struct mlxsw_sp *mlxsw_sp,\n \t\t.lb_config = ipip_ops->ol_loopback_config(mlxsw_sp, ol_dev),\n \t};\n \n-\trif = mlxsw_sp_rif_create(mlxsw_sp, &lb_params.common, NULL);\n+\trif = mlxsw_sp_rif_create(mlxsw_sp, &lb_params.common, extack);\n \tif (IS_ERR(rif))\n \t\treturn ERR_CAST(rif);\n \treturn container_of(rif, struct mlxsw_sp_rif_ipip_lb, common);\n@@ -993,7 +994,7 @@ mlxsw_sp_ipip_entry_alloc(struct mlxsw_sp *mlxsw_sp,\n \t\treturn ERR_PTR(-ENOMEM);\n \n \tipip_entry->ol_lb = mlxsw_sp_ipip_ol_ipip_lb_create(mlxsw_sp, ipipt,\n-\t\t\t\t\t\t\t ol_dev);\n+\t\t\t\t\t\t\t ol_dev, NULL);\n \tif (IS_ERR(ipip_entry->ol_lb)) {\n \t\tret = ERR_CAST(ipip_entry->ol_lb);\n \t\tgoto err_ol_ipip_lb_create;\n@@ -1355,7 +1356,8 @@ static void mlxsw_sp_netdevice_ipip_ol_down_event(struct mlxsw_sp *mlxsw_sp,\n }\n \n static int mlxsw_sp_netdevice_ipip_ol_vrf_event(struct mlxsw_sp *mlxsw_sp,\n-\t\t\t\t\t\tstruct net_device *ol_dev)\n+\t\t\t\t\t\tstruct net_device *ol_dev,\n+\t\t\t\t\t\tstruct netlink_ext_ack *extack)\n {\n \tstruct mlxsw_sp_fib_entry *decap_fib_entry;\n \tstruct mlxsw_sp_ipip_entry *ipip_entry;\n@@ -1376,7 +1378,7 @@ static int mlxsw_sp_netdevice_ipip_ol_vrf_event(struct mlxsw_sp *mlxsw_sp,\n \t\tmlxsw_sp_ipip_entry_demote_decap(mlxsw_sp, ipip_entry);\n \n \tlb_rif = mlxsw_sp_ipip_ol_ipip_lb_create(mlxsw_sp, ipip_entry->ipipt,\n-\t\t\t\t\t\t ol_dev);\n+\t\t\t\t\t\t ol_dev, extack);\n \tif (IS_ERR(lb_rif))\n \t\treturn PTR_ERR(lb_rif);\n \tmlxsw_sp_rif_destroy(&ipip_entry->ol_lb->common);\n@@ -1393,12 +1395,14 @@ static int mlxsw_sp_netdevice_ipip_ol_vrf_event(struct mlxsw_sp *mlxsw_sp,\n \treturn 0;\n }\n \n-int\n-mlxsw_sp_netdevice_ipip_ol_event(struct mlxsw_sp *mlxsw_sp,\n-\t\t\t\t struct net_device *ol_dev,\n-\t\t\t\t unsigned long event,\n-\t\t\t\t struct netdev_notifier_changeupper_info *info)\n+int mlxsw_sp_netdevice_ipip_ol_event(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\t struct net_device *ol_dev,\n+\t\t\t\t unsigned long event,\n+\t\t\t\t struct netdev_notifier_info *info)\n {\n+\tstruct netdev_notifier_changeupper_info *chup;\n+\tstruct netlink_ext_ack *extack;\n+\n \tswitch (event) {\n \tcase NETDEV_REGISTER:\n \t\treturn mlxsw_sp_netdevice_ipip_ol_reg_event(mlxsw_sp, ol_dev);\n@@ -1412,9 +1416,12 @@ mlxsw_sp_netdevice_ipip_ol_event(struct mlxsw_sp *mlxsw_sp,\n \t\tmlxsw_sp_netdevice_ipip_ol_down_event(mlxsw_sp, ol_dev);\n \t\treturn 0;\n \tcase NETDEV_CHANGEUPPER:\n-\t\tif (netif_is_l3_master(info->upper_dev))\n+\t\tchup = container_of(info, typeof(*chup), info);\n+\t\textack = info->extack;\n+\t\tif (netif_is_l3_master(chup->upper_dev))\n \t\t\treturn mlxsw_sp_netdevice_ipip_ol_vrf_event(mlxsw_sp,\n-\t\t\t\t\t\t\t\t ol_dev);\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 \t}\n \treturn 0;\n","prefixes":["net-next","08/16"]}