From patchwork Wed Mar 28 01:21:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 891925 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="hlh5wOmP"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 409qqc54zFz9rxx for ; Wed, 28 Mar 2018 12:22:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752868AbeC1BWS (ORCPT ); Tue, 27 Mar 2018 21:22:18 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:39199 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752839AbeC1BWO (ORCPT ); Tue, 27 Mar 2018 21:22:14 -0400 Received: by mail-pl0-f68.google.com with SMTP id s24-v6so571877plq.6 for ; Tue, 27 Mar 2018 18:22:13 -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=ygWWzbZgbYkXJvSXBPv7bce9g7hi//NbpluFKlu2esU=; b=hlh5wOmPWQDkdX128nZ7tBtZmlwr3ew9NQYr+wVpOm95QGCx1UnMcy3+cBho5Z4pjE Mt+jUetD+JaQzHWt2710S4+A2FDuVxI81txKM6IH7F/+EG389NPhUnM5sCmBj5BL1KmW GY3S363ffAj0afnueiDFyLnnKqZZ+LoWNhQVU= 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=ygWWzbZgbYkXJvSXBPv7bce9g7hi//NbpluFKlu2esU=; b=NwnPhwwKxd8KaElNm3o5h9EorKlJCGcqBfDk5AnFQlXGvDJ9DioDMGYfgh89QMKQju LJrzo4AEPT5aYXCB/TV3UJ1VGgZ3wKlna1tbnbX5PUYcLPguOoLoJ1d24Cmv+b2hdis0 0HzCWA4oBUSlWM99Tpooas3t9PyMNKvxExaGYoV5wRhp3S/2EB8z3d0FarOWN4FdXWGg p1FmwdguXQuRH0lJ6pzm6C5VzHg+vRFR791Q8q5B2cVUDmxOSmO5fQ5As3jyMSG0/rGT i6vp8d67hulCXUFbZqomIwcO0ojGNQRm+N65OsxS5XlkhWuniQfcuHG0qtvskTSb/d8d kIxQ== X-Gm-Message-State: AElRT7H/sVrX58NC4JzcjwJqLwgrVQFA9GBvkJx4DXGHw8n0Y1Y8Tbyg R1R7bUfYGJniDdnCA/b9XNaZWOK4 X-Google-Smtp-Source: AIpwx49naMaybCdVFlFgN6v3g+QFq9ourJs9DpbcRcPmAnPXYP/hk0qDOmIu0yQjj1XWJeirnVBCBA== X-Received: by 2002:a17:902:b414:: with SMTP id x20-v6mr1574813plr.165.1522200133411; Tue, 27 Mar 2018 18:22:13 -0700 (PDT) Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com. [216.129.126.126]) by smtp.googlemail.com with ESMTPSA id y18sm4798595pfe.67.2018.03.27.18.22.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Mar 2018 18:22:12 -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, andy.roulin@gmail.com, David Ahern Subject: [PATCH net-next 5/6] net/ipv6: Move call_fib6_entry_notifiers up for route adds Date: Tue, 27 Mar 2018 18:21:59 -0700 Message-Id: <20180328012200.15175-6-dsa@cumulusnetworks.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180328012200.15175-1-dsa@cumulusnetworks.com> References: <20180328012200.15175-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 Reviewed-by: Ido Schimmel --- 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 908b8e5b615a..deab2db6692e 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)) {