[{"id":1772733,"web_url":"http://patchwork.ozlabs.org/comment/1772733/","msgid":"<9886cf14-78e7-f23f-75ed-79fbcd2e3dcf@cumulusnetworks.com>","list_archive_url":null,"date":"2017-09-21T11:48:58","subject":"Re: [patch net-next 04/12] ipmr: Send FIB notifications on MFC and\n\tVIF entries","submitter":{"id":66448,"url":"http://patchwork.ozlabs.org/api/people/66448/","name":"Nikolay Aleksandrov","email":"nikolay@cumulusnetworks.com"},"content":"On 21/09/17 09:43, Jiri Pirko wrote:\n> From: Yotam Gigi \n> \n> Use the newly introduced notification chain to send events upon VIF and MFC\n> addition and deletion. The MFC notifications are sent only on resolved MFC\n> entries, as unresolved cannot be offloaded.\n> \n> Signed-off-by: Yotam Gigi \n> Reviewed-by: Ido Schimmel \n> Signed-off-by: Jiri Pirko \n> ---\n> net/ipv4/ipmr.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++\n> 1 file changed, 53 insertions(+)\n> \n\nLGTM, I only wish we could consolidate all of these call_ipmr_mfc_entry_notifiers()\ncalls inside mroute_netlink_event() but it will need an additional argument for the\nADD vs REPLACE cases. Anyway,\n\nReviewed-by: Nikolay Aleksandrov \n\n> diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c\n> index 9d331a74..7891d95 100644\n> --- a/net/ipv4/ipmr.c\n> +++ b/net/ipv4/ipmr.c\n> @@ -627,6 +627,27 @@ static int call_ipmr_vif_entry_notifier(struct notifier_block *nb,\n> \treturn call_fib_notifier(nb, net, event_type, &info.info);\n> }\n> \n> +static int call_ipmr_vif_entry_notifiers(struct net *net,\n> +\t\t\t\t\t enum fib_event_type event_type,\n> +\t\t\t\t\t struct vif_device *vif,\n> +\t\t\t\t\t vifi_t vif_index, u32 tb_id)\n> +{\n> +\tstruct vif_entry_notifier_info info = {\n> +\t\t.info = {\n> +\t\t\t.family = RTNL_FAMILY_IPMR,\n> +\t\t\t.net = net,\n> +\t\t},\n> +\t\t.dev = vif->dev,\n> +\t\t.vif_index = vif_index,\n> +\t\t.vif_flags = vif->flags,\n> +\t\t.tb_id = tb_id,\n> +\t};\n> +\n> +\tASSERT_RTNL();\n> +\tnet->ipv4.ipmr_seq++;\n> +\treturn call_fib_notifiers(net, event_type, &info.info);\n> +}\n> +\n> static int call_ipmr_mfc_entry_notifier(struct notifier_block *nb,\n> \t\t\t\t\tstruct net *net,\n> \t\t\t\t\tenum fib_event_type event_type,\n> @@ -644,6 +665,24 @@ static int call_ipmr_mfc_entry_notifier(struct notifier_block *nb,\n> \treturn call_fib_notifier(nb, net, event_type, &info.info);\n> }\n> \n> +static int call_ipmr_mfc_entry_notifiers(struct net *net,\n> +\t\t\t\t\t enum fib_event_type event_type,\n> +\t\t\t\t\t struct mfc_cache *mfc, u32 tb_id)\n> +{\n> +\tstruct mfc_entry_notifier_info info = {\n> +\t\t.info = {\n> +\t\t\t.family = RTNL_FAMILY_IPMR,\n> +\t\t\t.net = net,\n> +\t\t},\n> +\t\t.mfc = mfc,\n> +\t\t.tb_id = tb_id\n> +\t};\n> +\n> +\tASSERT_RTNL();\n> +\tnet->ipv4.ipmr_seq++;\n> +\treturn call_fib_notifiers(net, event_type, &info.info);\n> +}\n> +\n> /**\n> *\tvif_delete - Delete a VIF entry\n> *\t@notify: Set to 1, if the caller is a notifier_call\n> @@ -651,6 +690,7 @@ static int call_ipmr_mfc_entry_notifier(struct notifier_block *nb,\n> static int vif_delete(struct mr_table *mrt, int vifi, int notify,\n> \t\t struct list_head *head)\n> {\n> +\tstruct net *net = read_pnet(&mrt->net);\n> \tstruct vif_device *v;\n> \tstruct net_device *dev;\n> \tstruct in_device *in_dev;\n> @@ -660,6 +700,10 @@ static int vif_delete(struct mr_table *mrt, int vifi, int notify,\n> \n> \tv = &mrt->vif_table[vifi];\n> \n> +\tif (VIF_EXISTS(mrt, vifi))\n> +\t\tcall_ipmr_vif_entry_notifiers(net, FIB_EVENT_VIF_DEL, v, vifi,\n> +\t\t\t\t\t mrt->id);\n> +\n> \twrite_lock_bh(&mrt_lock);\n> \tdev = v->dev;\n> \tv->dev = NULL;\n> @@ -909,6 +953,7 @@ static int vif_add(struct net *net, struct mr_table *mrt,\n> \tif (vifi+1 > mrt->maxvif)\n> \t\tmrt->maxvif = vifi+1;\n> \twrite_unlock_bh(&mrt_lock);\n> +\tcall_ipmr_vif_entry_notifiers(net, FIB_EVENT_VIF_ADD, v, vifi, mrt->id);\n> \treturn 0;\n> }\n> \n> @@ -1209,6 +1254,7 @@ static int ipmr_cache_unresolved(struct mr_table *mrt, vifi_t vifi,\n> \n> static int ipmr_mfc_delete(struct mr_table *mrt, struct mfcctl *mfc, int parent)\n> {\n> +\tstruct net *net = read_pnet(&mrt->net);\n> \tstruct mfc_cache *c;\n> \n> \t/* The entries are added/deleted only under RTNL */\n> @@ -1220,6 +1266,7 @@ static int ipmr_mfc_delete(struct mr_table *mrt, struct mfcctl *mfc, int parent)\n> \t\treturn -ENOENT;\n> \trhltable_remove(&mrt->mfc_hash, &c->mnode, ipmr_rht_params);\n> \tlist_del_rcu(&c->list);\n> +\tcall_ipmr_mfc_entry_notifiers(net, FIB_EVENT_ENTRY_DEL, c, mrt->id);\n> \tmroute_netlink_event(mrt, c, RTM_DELROUTE);\n> \tipmr_cache_put(c);\n> \n> @@ -1248,6 +1295,8 @@ static int ipmr_mfc_add(struct net *net, struct mr_table *mrt,\n> \t\tif (!mrtsock)\n> \t\t\tc->mfc_flags |= MFC_STATIC;\n> \t\twrite_unlock_bh(&mrt_lock);\n> +\t\tcall_ipmr_mfc_entry_notifiers(net, FIB_EVENT_ENTRY_REPLACE, c,\n> +\t\t\t\t\t mrt->id);\n> \t\tmroute_netlink_event(mrt, c, RTM_NEWROUTE);\n> \t\treturn 0;\n> \t}\n> @@ -1297,6 +1346,7 @@ static int ipmr_mfc_add(struct net *net, struct mr_table *mrt,\n> \t\tipmr_cache_resolve(net, mrt, uc, c);\n> \t\tipmr_cache_free(uc);\n> \t}\n> +\tcall_ipmr_mfc_entry_notifiers(net, FIB_EVENT_ENTRY_ADD, c, mrt->id);\n> \tmroute_netlink_event(mrt, c, RTM_NEWROUTE);\n> \treturn 0;\n> }\n> @@ -1304,6 +1354,7 @@ static int ipmr_mfc_add(struct net *net, struct mr_table *mrt,\n> /* Close the multicast socket, and clear the vif tables etc */\n> static void mroute_clean_tables(struct mr_table *mrt, bool all)\n> {\n> +\tstruct net *net = read_pnet(&mrt->net);\n> \tstruct mfc_cache *c, *tmp;\n> \tLIST_HEAD(list);\n> \tint i;\n> @@ -1322,6 +1373,8 @@ static void mroute_clean_tables(struct mr_table *mrt, bool all)\n> \t\t\tcontinue;\n> \t\trhltable_remove(&mrt->mfc_hash, &c->mnode, ipmr_rht_params);\n> \t\tlist_del_rcu(&c->list);\n> +\t\tcall_ipmr_mfc_entry_notifiers(net, FIB_EVENT_ENTRY_DEL, c,\n> +\t\t\t\t\t mrt->id);\n> \t\tmroute_netlink_event(mrt, c, RTM_DELROUTE);\n> \t\tipmr_cache_put(c);\n> \t}\n>","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 (1024-bit key;\n\tunprotected) header.d=cumulusnetworks.com\n\theader.i=@cumulusnetworks.com header.b=\"bvak++pz\"; \n\tdkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xyZdZ28n2z9s5L\n\tfor ;\n\tThu, 21 Sep 2017 21:49:06 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751707AbdIULtD (ORCPT );\n\tThu, 21 Sep 2017 07:49:03 -0400","from mail-wm0-f48.google.com ([74.125.82.48]:45050 \"EHLO\n\tmail-wm0-f48.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751387AbdIULtC (ORCPT\n\t); Thu, 21 Sep 2017 07:49:02 -0400","by mail-wm0-f48.google.com with SMTP id m127so501352wmm.1\n\tfor ; Thu, 21 Sep 2017 04:49:01 -0700 (PDT)","from [192.168.0.103] (46-10-142-144.ip.btc-net.bg. [46.10.142.144])\n\tby smtp.googlemail.com with ESMTPSA id\n\tk141sm1554753wmg.15.2017.09.21.04.48.58\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tThu, 21 Sep 2017 04:48:59 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=cumulusnetworks.com; s=google;\n\th=subject:to:references:cc:from:message-id:date:user-agent\n\t:mime-version:in-reply-to:content-transfer-encoding;\n\tbh=qSlrUsvtm58MjPJiMu2Nr1XQujFCUZkMc9sJ+y8uTaQ=;\n\tb=bvak++pzZshmT3c+0C6x2+ASa4FF+HSygv9VLrOeyd6nfs4a+raiLw8dtaObg7Qi1x\n\tu87g8LgVeR67801OICSFqMBcQ5ocEgA2OuEwStb9Ieo/VmLzdoWchptLSCue0ekW5kNN\n\tB/48lkq7gVspQVWy4uzS+ucXav3dIiqR3JuVQ=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:subject:to:references:cc:from:message-id:date\n\t:user-agent:mime-version:in-reply-to:content-transfer-encoding;\n\tbh=qSlrUsvtm58MjPJiMu2Nr1XQujFCUZkMc9sJ+y8uTaQ=;\n\tb=CP0EW9Zm+3caLTnD5yCPJGHtziIWdzM6LaEReAli2Tn8eLpyFURRWsNZzyfqKLxILn\n\tPyj4jWdpL1Cj2gMSGd2e9vSTohg6V8zyfvAuWKKnLZEC3gOFxFb+jHhoGMqm0rZj1pF+\n\tpsailYO3fn++C9l1y7uI9QxliNPOx+krA0doUyo/RMhpv9cNc2VOjnJOPDYnGYlYNZlL\n\t57nS9B10AXFt2ID276v+i62bngTQ70xN0FU24tofi4Bd9vRY0s5NMs5oN1Wiox7ZJugb\n\twDm1b2sGcLcHoNCEN8wXuSWw+XRGq/HGWgBxbVHEEMDE+fTuYq0xoOCwx30mWrXkFXAW\n\tRxkg==","X-Gm-Message-State":"AHPjjUiIU56T+sdIvp6CHkd/BNqGdr2j2IogaoH93wyZvUJumKAP9YM/\n\twJgxqy4w9FVEpWT+wTNY+axk+w==","X-Google-Smtp-Source":"AOwi7QAfELUm1/j3u/d+pZLklz8DP2w3NXanNgMLhhvyhk1v2A9SefWbFFy4AzxY5L0t1310skbSTw==","X-Received":"by 10.28.105.92 with SMTP id e89mr736638wmc.65.1505994540749;\n\tThu, 21 Sep 2017 04:49:00 -0700 (PDT)","Subject":"Re: [patch net-next 04/12] ipmr: Send FIB notifications on MFC and\n\tVIF entries","To":"Jiri Pirko , netdev@vger.kernel.org","References":"<20170921064338.1282-1-jiri@resnulli.us>\n\t<20170921064338.1282-5-jiri@resnulli.us>","Cc":"davem@davemloft.net, yotamg@mellanox.com, idosch@mellanox.com,\n\tmlxsw@mellanox.com","From":"Nikolay Aleksandrov ","X-Enigmail-Draft-Status":"N1110","Message-ID":"<9886cf14-78e7-f23f-75ed-79fbcd2e3dcf@cumulusnetworks.com>","Date":"Thu, 21 Sep 2017 14:48:58 +0300","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101\n\tIcedove/45.6.0","MIME-Version":"1.0","In-Reply-To":"<20170921064338.1282-5-jiri@resnulli.us>","Content-Type":"text/plain; charset=windows-1252","Content-Transfer-Encoding":"7bit","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"}}]