From patchwork Thu Jan 23 14:30:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 1228069 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=nwl.cc Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 483Pnv67j4z9sSL for ; Fri, 24 Jan 2020 01:30:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728816AbgAWOan (ORCPT ); Thu, 23 Jan 2020 09:30:43 -0500 Received: from orbyte.nwl.cc ([151.80.46.58]:39884 "EHLO orbyte.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726231AbgAWOan (ORCPT ); Thu, 23 Jan 2020 09:30:43 -0500 Received: from localhost ([::1]:52972 helo=tatos) by orbyte.nwl.cc with esmtp (Exim 4.91) (envelope-from ) id 1iudVK-0000n9-Db; Thu, 23 Jan 2020 15:30:42 +0100 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org, Florian Westphal Subject: [nft PATCH 1/4] segtree: Drop needless insertion in ei_insert() Date: Thu, 23 Jan 2020 15:30:46 +0100 Message-Id: <20200123143049.13888-2-phil@nwl.cc> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200123143049.13888-1-phil@nwl.cc> References: <20200123143049.13888-1-phil@nwl.cc> MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Code checks whether for two new ranges one fully includes the other. If so, it would add the contained one only for segtree_linearize() to later omit the redundant items. Instead just drop the contained item (which will always come last because caller orders the new elements in beforehand). Signed-off-by: Phil Sutter Acked-by: Pablo Neira Ayuso --- src/segtree.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/src/segtree.c b/src/segtree.c index e8e32412f3a41..aa1f1c38d789c 100644 --- a/src/segtree.c +++ b/src/segtree.c @@ -191,9 +191,6 @@ static int ei_insert(struct list_head *msgs, struct seg_tree *tree, struct elementary_interval *new, bool merge) { struct elementary_interval *lei, *rei; - mpz_t p; - - mpz_init2(p, tree->keylen); /* * Lookup the intervals containing the left and right endpoints. @@ -207,25 +204,9 @@ static int ei_insert(struct list_head *msgs, struct seg_tree *tree, if (lei != NULL && rei != NULL && lei == rei) { if (!merge) goto err; - /* - * The new interval is entirely contained in the same interval, - * split it into two parts: - * - * [lei_left, new_left) and (new_right, rei_right] - */ - if (segtree_debug(tree->debug_mask)) - pr_gmp_debug("split [%Zx %Zx]\n", lei->left, lei->right); - ei_remove(tree, lei); - - mpz_sub_ui(p, new->left, 1); - if (mpz_cmp(lei->left, p) <= 0) - __ei_insert(tree, ei_alloc(lei->left, p, lei->expr, 0)); - - mpz_add_ui(p, new->right, 1); - if (mpz_cmp(p, rei->right) < 0) - __ei_insert(tree, ei_alloc(p, rei->right, lei->expr, 0)); - ei_destroy(lei); + ei_destroy(new); + return 0; } else { if (lei != NULL) { if (!merge) @@ -271,8 +252,6 @@ static int ei_insert(struct list_head *msgs, struct seg_tree *tree, __ei_insert(tree, new); - mpz_clear(p); - return 0; err: errno = EEXIST;