From patchwork Tue Mar 26 15:30:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 1065726 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=quarantine dis=none) header.from=arista.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=arista.com header.i=@arista.com header.b="iSkg4fsQ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44TFTC5gcVz9sSV for ; Wed, 27 Mar 2019 02:30:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732176AbfCZPas (ORCPT ); Tue, 26 Mar 2019 11:30:48 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:41766 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732093AbfCZPad (ORCPT ); Tue, 26 Mar 2019 11:30:33 -0400 Received: by mail-ed1-f66.google.com with SMTP id a25so11136220edc.8 for ; Tue, 26 Mar 2019 08:30:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=googlenew; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5AmL7INQVSixEXzYLcTw3S29fd2fYSbdnmlsd37WMAc=; b=iSkg4fsQ1JIKR5iFGa0idGSRotE+/wEzkJemA3rfncwWltbkHAc40xCj1zGnU7N1SE eIntoPpA3CnoxM6AI5qO2qtE6u5X1NReLNr1jVOjqO41ile3rBJxQ0vFM/qeTThijGUh lMLozqP3h3oy7uN3yxESN51FQOHFR02BYDXEKWT0E1bxOl4sC/xbdJFD+Dan+dHQrutd 15ooAM8hoDRlgOnT3lazFN/gWzjTWYfDNE1M5NhsOp0N3EZzd36bVf1SngVksPmM9dBV 5yYJtdZTU5X6vmNkXkCh86uuys6XZwOd4JMRbSvSCsHeue/bAVj6d4fW2UVFTuX6zcXU NhTg== 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:mime-version:content-transfer-encoding; bh=5AmL7INQVSixEXzYLcTw3S29fd2fYSbdnmlsd37WMAc=; b=d7ihbsgVeXj9LN79IIX7FucvKbm0abELNhRxmUJKKrBs7Gi/hRyk1U2KsP0IZ7VEgd xBWV2ASXgSaR8RIgEdDYknwku+buMd/f4aFtVWQ3LFGYM6a8VBGdVUMWsob4x6+ynvx9 Abirbmj7p5y6xvs5JG5QgxEaGmsV83hpyICR++f8delkPCyoYBcboWZq8zLMMclS27N1 yuzu7I4MCrZJp3YzJqZCMoAeNHr3NfMaaLURkHXi6FxoTzT8YrkRXHkPfVRn2BRiU1Ic vzWb1j+VLJnCF8ud1XPvbXPQ4lMjm7XJV5+YtkctbCO+RgzSsgrC4f0kqJfDX95T58gL BBQQ== X-Gm-Message-State: APjAAAUM1x9j7FgSU5OvpncEb5BqgjuZ/kjjr3fDYloWt3cUj9/YT2Hi 0rsJimimt0nYRm86vywPGt9f7A== X-Google-Smtp-Source: APXvYqw+sJ0YtUytYc08TB+MyZlXTvsgHWcF3mji94/+J7Lknij1mIcHXIP1nVcwtsbEMpG2PRr9vQ== X-Received: by 2002:a50:ca87:: with SMTP id x7mr20705284edh.165.1553614232059; Tue, 26 Mar 2019 08:30:32 -0700 (PDT) Received: from Mindolluin.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id b2sm5310830eda.36.2019.03.26.08.30.30 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 26 Mar 2019 08:30:31 -0700 (PDT) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov , Alexander Duyck , Alexey Kuznetsov , David Ahern , "David S. Miller" , Eric Dumazet , Hideaki YOSHIFUJI , Ido Schimmel , netdev@vger.kernel.org Subject: [RFC 3/4] net/fib: Check budget before should_{inflate,halve}() Date: Tue, 26 Mar 2019 15:30:24 +0000 Message-Id: <20190326153026.24493-4-dima@arista.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190326153026.24493-1-dima@arista.com> References: <20190326153026.24493-1-dima@arista.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Those functions are compute-costly, if we're out of budget - better omit additional computations. Signed-off-by: Dmitry Safonov --- net/ipv4/fib_trie.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index d90cf9dfd443..2ce2739e7693 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -868,7 +868,7 @@ static struct key_vector *resize(struct trie *t, struct key_vector *tn, /* Double as long as the resulting node has a number of * nonempty nodes that are above the threshold. */ - while (should_inflate(tp, tn) && *budget) { + while (*budget && should_inflate(tp, tn)) { tp = inflate(t, tn, budget); if (!tp) { #ifdef CONFIG_IP_FIB_TRIE_STATS @@ -894,7 +894,7 @@ static struct key_vector *resize(struct trie *t, struct key_vector *tn, /* Halve as long as the number of empty children in this * node is above threshold. */ - while (should_halve(tp, tn) && *budget) { + while (*budget && should_halve(tp, tn)) { tp = halve(t, tn, budget); if (!tp) { #ifdef CONFIG_IP_FIB_TRIE_STATS