From patchwork Fri Feb 16 18:49:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 874622 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 (mailfrom) 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aP3Z40C5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zjhyz3XBHz9t0m for ; Sat, 17 Feb 2018 05:50:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752650AbeBPSuA (ORCPT ); Fri, 16 Feb 2018 13:50:00 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:41522 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752638AbeBPSty (ORCPT ); Fri, 16 Feb 2018 13:49:54 -0500 Received: by mail-pg0-f66.google.com with SMTP id t4so3088712pgp.8 for ; Fri, 16 Feb 2018 10:49:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=yw3X6Ak5wozJ7sKQmUTXrNAgatH/hA7pg+OKZBd4hJI=; b=aP3Z40C5mZJqVTec2S3UXoF2k23xX5PKV/QFk4WVgX5x6AP+aPQRodLnwiejL2aF7V PcXtsymjKEL2/yke+7JSnqsnBLjesFQtxmgJ/5J3QARKboaxKDXW0NidjdMU3Jt4+pI9 K5X3kD0oQYiQ0rC2CIyPQl9nZYYFetENN+PNkZ/uI0Fj/9ZR7avCIN8Ht5Y8bvQvNTVd J8wUgAxk/eJdGsMyHTS5WZ3VmvxJkI5u7MJ+LfxkrFHOSpHhqqxVWXG/ybqHJtHPbzde 1AO3Vosp5RWCCsfzLX+uB86n/Q5I+p8ZCQsEP4CV+Nx0A5CcROMnIwhTXqcYJvVW0y4W ro/w== 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; bh=yw3X6Ak5wozJ7sKQmUTXrNAgatH/hA7pg+OKZBd4hJI=; b=Sa6DvhNq7M4mVdE+Ipqw1qv/p1EpC19J+O/w7a5Ze5TZMJfGM2kJtOQxZru84rmTgJ Qft7LSgxS/I2gOLciVizfzg8NOyjh4+vNBtYGfleMO0kn/0RKIlUEibtNZIOvC1nNtyg Une1uZEaKSSPWTTsYyWLmVfokFELVK4jEaMh1/noSoa38OvUWMT5aRoA/e5KsyLL5fTQ 2C+6nh+SRPFsjpzGidugF7I+EeQeDwaz5MtYTSZU1d/WNIG0xMR4hIj45VJ8fN7m4Qk8 mXm/0iIajlTJpv/vOW3naPfJBIvA1awUSQzaDHCqtGK6zuDAVE1YJgBo1MRM1jKBuitD YoKA== X-Gm-Message-State: APf1xPDz7lyI475ypepij5oBzVvRF0DHv2Xhcizwyn0ieoc5zgymZEZI bLT5r1cWaJ/IAhjBmGN9bp/pYVmF X-Google-Smtp-Source: AH8x225Ah1CBoZIJM9xSvTqsp0ZNWCj9rpHqMXmbHfpOQ84lhfI3b1swyO1wuXNPQVfNd+27CHitwg== X-Received: by 10.101.98.23 with SMTP id d23mr5938445pgv.275.1518806993627; Fri, 16 Feb 2018 10:49:53 -0800 (PST) Received: from localhost.localdomain ([2405:204:52a2:8c85:1ef5:a92f:3c5:4fed]) by smtp.googlemail.com with ESMTPSA id f8sm37289883pgs.51.2018.02.16.10.49.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 16 Feb 2018 10:49:51 -0800 (PST) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nf-next] net: netfilter: nf_tables_api: Use id allocation. Date: Sat, 17 Feb 2018 00:19:18 +0530 Message-Id: <20180216184918.9781-1-rvarsha016@gmail.com> X-Mailer: git-send-email 2.14.3 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org In nf_tables_set_alloc_name function, remove get_zeroed_page find_first_zero_bit and set_bit functions. Instead use ida_simple_get function as it simplifies the code. Signed-off-by: Varsha Rao --- net/netfilter/nf_tables_api.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 0791813a1e7d..08fbb5ffab3a 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -2653,18 +2653,14 @@ static int nf_tables_set_alloc_name(struct nft_ctx *ctx, struct nft_set *set, { const struct nft_set *i; const char *p; - unsigned long *inuse; - unsigned int n = 0, min = 0; + int n = 0; + DEFINE_IDA(inuse); p = strchr(name, '%'); if (p != NULL) { if (p[1] != 'd' || strchr(p + 2, '%')) return -EINVAL; - inuse = (unsigned long *)get_zeroed_page(GFP_KERNEL); - if (inuse == NULL) - return -ENOMEM; -cont: list_for_each_entry(i, &ctx->table->sets, list) { int tmp; @@ -2672,22 +2668,21 @@ static int nf_tables_set_alloc_name(struct nft_ctx *ctx, struct nft_set *set, continue; if (!sscanf(i->name, name, &tmp)) continue; - if (tmp < min || tmp >= min + BITS_PER_BYTE * PAGE_SIZE) + if (tmp < 0 || tmp >= BITS_PER_BYTE * PAGE_SIZE) continue; - set_bit(tmp - min, inuse); + n = ida_simple_get(&inuse, tmp, BITS_PER_BYTE * PAGE_SIZE, GFP_KERNEL); + if (n < 0) + return n; } + n = ida_simple_get(&inuse, 0, BITS_PER_BYTE * PAGE_SIZE, GFP_KERNEL); + if (n < 0) + return n; - n = find_first_zero_bit(inuse, BITS_PER_BYTE * PAGE_SIZE); - if (n >= BITS_PER_BYTE * PAGE_SIZE) { - min += BITS_PER_BYTE * PAGE_SIZE; - memset(inuse, 0, PAGE_SIZE); - goto cont; - } - free_page((unsigned long)inuse); + ida_destroy(&inuse); } - set->name = kasprintf(GFP_KERNEL, name, min + n); + set->name = kasprintf(GFP_KERNEL, name, n); if (!set->name) return -ENOMEM;