From patchwork Thu Mar 22 22:57:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 889719 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=cumulusnetworks.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="Pj2EyocB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 406hsr3x5Wz9s0q for ; Fri, 23 Mar 2018 09:58:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751909AbeCVW6V (ORCPT ); Thu, 22 Mar 2018 18:58:21 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:46950 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751880AbeCVW6T (ORCPT ); Thu, 22 Mar 2018 18:58:19 -0400 Received: by mail-pf0-f193.google.com with SMTP id z10so3963953pfh.13 for ; Thu, 22 Mar 2018 15:58:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2kV3FWkuXH8OSns/sQ79Q4nk0L4MSp7c44zS11/6SI0=; b=Pj2EyocBo+od37u0dfW5pjziCYKpItZosq0rW91om4qXRbbBwtIkcEQ3OFdcdd2siQ KnAzarYocH8IdBzjb2BYqG0JmUjEfCFi+qaRU/yQwat+yjNL1NViCVzOVTzJjxdaDIeh kQbCVEVGnHFXRbe0ij+tyoEtNUOb+quR9Wua4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2kV3FWkuXH8OSns/sQ79Q4nk0L4MSp7c44zS11/6SI0=; b=By6cWpTY7EB/McenPKpehCyYeaVq/cSS6OERSiyh8+ioqJRx9sqLbMIWjTczHcXCQ+ nSPyLT4Xrro9ScAVizibGiQiflDK2EBXITVPOxNFVLDeHb+QbfSgVmGfaRc8uY4jfkUd UTc3es6R46iSYrVMn6cP+7IHm/VfoZecVy9H8zjzS7NKsr7QxnDYv27TY6Z5ACyH5GXN sfqgLCxk/TGOuqVspNPO1Hltocf94wTtRyqYIBUx7SfMCcIdYsuR1h4YZT/kj/V8IQsO L8m+rRstjYZd/d3swba+r1Nagj07MALSbeWsQcTgObbTWiSPqwSw1yowSifZkuqEAoiA zj5w== X-Gm-Message-State: AElRT7EuKUlIQGRJRUJ9jl62XujFyohmCG74Ljzk74XHAytzuaJehC6r F3RWV64SJ+CgckOTcl61eatmbljb X-Google-Smtp-Source: AG47ELsHEwH0k/YXydoQL7ziUGv86UJaCPYiXuvG3El6kMkkOvvljPjEfm+StszEW2teFMNsI4Le6g== X-Received: by 10.98.78.21 with SMTP id c21mr10051158pfb.107.1521759498071; Thu, 22 Mar 2018 15:58:18 -0700 (PDT) Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com. [216.129.126.126]) by smtp.googlemail.com with ESMTPSA id b78sm15807767pfe.88.2018.03.22.15.58.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Mar 2018 15:58:17 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org Cc: davem@davemloft.net, roopa@cumulusnetworks.com, shm@cumulusnetworks.com, jiri@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, David Ahern Subject: [PATCH RFC net-next 5/7] net/ipv6: Move call_fib6_entry_notifiers up for route adds Date: Thu, 22 Mar 2018 15:57:55 -0700 Message-Id: <20180322225757.10377-6-dsa@cumulusnetworks.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180322225757.10377-1-dsa@cumulusnetworks.com> References: <20180322225757.10377-1-dsa@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Move call to call_fib6_entry_notifiers for new IPv6 routes to right before the insertion into the FIB. At this point notifier handlers can decide the fate of the new route with a clean path to delete the potential new entry if the notifier returns non-0. Signed-off-by: David Ahern --- net/ipv6/ip6_fib.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 2f995e9e3050..041c0603841f 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -1007,12 +1007,16 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt, if (err) return err; + err = call_fib6_entry_notifiers(info->nl_net, + FIB_EVENT_ENTRY_ADD, + rt, extack); + if (err) + return err; + rcu_assign_pointer(rt->rt6_next, iter); atomic_inc(&rt->rt6i_ref); rcu_assign_pointer(rt->rt6i_node, fn); rcu_assign_pointer(*ins, rt); - call_fib6_entry_notifiers(info->nl_net, FIB_EVENT_ENTRY_ADD, - rt, extack); if (!info->skip_notify) inet6_rt_notify(RTM_NEWROUTE, rt, info, nlflags); info->nl_net->ipv6.rt6_stats->fib_rt_entries++; @@ -1036,12 +1040,16 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt, if (err) return err; + err = call_fib6_entry_notifiers(info->nl_net, + FIB_EVENT_ENTRY_REPLACE, + rt, extack); + if (err) + return err; + atomic_inc(&rt->rt6i_ref); rcu_assign_pointer(rt->rt6i_node, fn); rt->rt6_next = iter->rt6_next; rcu_assign_pointer(*ins, rt); - call_fib6_entry_notifiers(info->nl_net, FIB_EVENT_ENTRY_REPLACE, - rt, extack); if (!info->skip_notify) inet6_rt_notify(RTM_NEWROUTE, rt, info, NLM_F_REPLACE); if (!(fn->fn_flags & RTN_RTINFO)) {