From patchwork Wed Mar 28 01:21:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 891928 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="dlYmAcgh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 409qqt51xnz9rxx for ; Wed, 28 Mar 2018 12:22:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752886AbeC1BWb (ORCPT ); Tue, 27 Mar 2018 21:22:31 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:45881 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752852AbeC1BWM (ORCPT ); Tue, 27 Mar 2018 21:22:12 -0400 Received: by mail-pl0-f67.google.com with SMTP id n15-v6so562716plp.12 for ; Tue, 27 Mar 2018 18:22:12 -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=DLpKew9R2Zr6RqWM48vaue6Pn+wqBzS7NBcWBa9Y7vU=; b=dlYmAcghwimaGW7tGZ54r7UawEogxn/8ttnCdhCvDXyb4CeGwHatS49Y89b/RMX//C RS6DGHKm6DHLqKrZfgc3YQCrWzQ632B2EWdHQEUXZKMwYYTU7sjyEuBIUmF9kPZscfJK zsN2RqRUjjEn8ATHijPBxET9d4vSgqjddtywQ= 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=DLpKew9R2Zr6RqWM48vaue6Pn+wqBzS7NBcWBa9Y7vU=; b=KpTyMRY+5Zm+P16hxfmiVp0CWsYUEYFLto8cvtR8yGw6/6fmR38aQYrOVzK31DbrOd y3Wn1V4XdPuGBbnkhlRrwQfdOxH07EfQAjRxwhfCG2M/6NpvFdNom/ycnpbETXGEuaEu 3fokrLGs7lLfmuoh56NvCmJz7zRqLLl0+bZGvmZTXqQO2MO7ZqG5nAfar66eWZOQSkF4 ym4mIwF1enTfQzpKdf8QmhxhGUlZeElTAf+X7ChNT2fngpDwdistn31XCjVqvpx92LxZ Y87Rg0kAV/YtUyTT25VfFbnLGWUedUbmwvua2ir2aiESQSQZl4ZP3tsUy2guXBqV5K9x HEfA== X-Gm-Message-State: AElRT7F7LUx5xhxoVoyYemxqH7e0Ge0jSCe3aUAwTDLgqDZgYaYZSBUK r7FjTcJb6YMibQOneoF7u60djUhy X-Google-Smtp-Source: AIpwx49DelWWwrmjL+KqMlrcHilditPYPdgIwqChYxRDHQTzxJFTSfXhnPymgBzXw7e3VFSmkd9bvg== X-Received: by 2002:a17:902:d03:: with SMTP id 3-v6mr1593240plu.245.1522200132083; Tue, 27 Mar 2018 18:22:12 -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.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Mar 2018 18:22:11 -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 4/6] net/ipv4: Allow notifier to fail route replace Date: Tue, 27 Mar 2018 18:21:58 -0700 Message-Id: <20180328012200.15175-5-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 Add checking to call to call_fib_entry_notifiers for IPv4 route replace. Allows a notifier handler to fail the replace. Signed-off-by: David Ahern Reviewed-by: Ido Schimmel --- net/ipv4/fib_trie.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 67116233e2bc..3dcffd3ce98c 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -1219,8 +1219,13 @@ int fib_table_insert(struct net *net, struct fib_table *tb, new_fa->tb_id = tb->tb_id; new_fa->fa_default = -1; - call_fib_entry_notifiers(net, FIB_EVENT_ENTRY_REPLACE, - key, plen, new_fa, extack); + err = call_fib_entry_notifiers(net, + FIB_EVENT_ENTRY_REPLACE, + key, plen, new_fa, + extack); + if (err) + goto out_free_new_fa; + rtmsg_fib(RTM_NEWROUTE, htonl(key), new_fa, plen, tb->tb_id, &cfg->fc_nlinfo, nlflags);