From patchwork Fri May 25 18:43:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 920719 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; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="G6DYxX1D"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40swBs659Bz9s02 for ; Sat, 26 May 2018 04:44:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967598AbeEYSoF (ORCPT ); Fri, 25 May 2018 14:44:05 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:43922 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967453AbeEYSoE (ORCPT ); Fri, 25 May 2018 14:44:04 -0400 Received: by mail-pl0-f67.google.com with SMTP id c41-v6so3617415plj.10 for ; Fri, 25 May 2018 11:44:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=hsVbQYr1DjYjRIoiHJnUEVcCh3ldsqv/UWSKx7HiITQ=; b=G6DYxX1DdQzEu3m/tLqTqsZdliqXTOARqXoBIwInvkWgYOa+8Qpyi9p4vI2j0SwlY2 Bnbe3wJSHo4AFW9C1fgRQ8boWUoFxgGKHjHwhkCzjxdyt4rIPzee/OTspVmuddKmIY0w t8s6BuI0H7xF1GOMkMMY19wIyIrxzxJ/K+D0L939bRlAL8E7k8aLBwB31b9l5MWbSF77 6jdxE+VZOO7dpEjca8FRgCKh4w5P1xyMN6zAqxriPBiU06l3djgMItTUnj+T7JpOXD1C R23LNu3QsHaNbGqqb8msO5nfPfGvuzmvWg1CFhC5P4m4UoTCnRLTQ1YmnVp5m+wjh4l8 +icQ== 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=hsVbQYr1DjYjRIoiHJnUEVcCh3ldsqv/UWSKx7HiITQ=; b=f5NI/Exd1rrFXjpLxHkVXzgysPXOf081tbLC//4yw80ONqVXMoZT+2nuWV8tCXcDir eLwUrv8o3jzgFcWAKZAA086Qr/rCVdGow7KDEgZCaf7V8TYxiOQevd/C9H3XpSxxdD55 9lWn7Xd9yTY1r+y91q9dwXQBkOZOyqCjjcfkcA72Xi6LsYkMPMATw+0q5RTYg7Y5O8E4 fERIgAenx5pILFLWfNY2dg7vv/t6x5rCxPmi1Xq72thBM5hQzhXNYRsGujWV1hxJ811y tYOfoh/k6n8VHHkoRAYa9i4aCVMWYbrPfVrCl1iqg5NPz6eSFXW5EGOhO8dGcbW9UDdb jflg== X-Gm-Message-State: ALKqPwc3ruIfsf/UwE1QIkcCC80xO+xUCb3qknpUzvZlFUMv0wKLYYLU MPGpJL8WMIFtPrQR6VM7SBo= X-Google-Smtp-Source: AB8JxZqNTCWTDwBlEtB6hit8Gw5frD68YXPHD5IQo1a+ePLum+7KGXqshkdpeDuMoUgS1Hfq5GvFug== X-Received: by 2002:a17:902:8218:: with SMTP id x24-v6mr3743798pln.57.1527273843692; Fri, 25 May 2018 11:44:03 -0700 (PDT) Received: from localhost.localdomain ([59.99.105.202]) by smtp.googlemail.com with ESMTPSA id j11-v6sm30698776pgq.83.2018.05.25.11.44.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 May 2018 11:44:02 -0700 (PDT) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nf-next v3] net: netfilter: nf_tables_api: Use id allocation. Date: Sat, 26 May 2018 00:13:50 +0530 Message-Id: <20180525184350.18778-1-rvarsha016@gmail.com> X-Mailer: git-send-email 2.17.0 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_get_new_above function as it simplifies the code. Signed-off-by: Varsha Rao --- Changes in v2: - Modified the upper limit of page size. Changes in v3: - Used ida_get_new_above instead of ida_simple_get due to internal locking. - Defined macro NFT_SET_IDA_SIZE. - Modified commit message. net/netfilter/nf_tables_api.c | 39 ++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 87b2a77add65..4fb3c5dfe9f7 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -23,6 +23,8 @@ #include #include +#define NFT_SET_IDA_SIZE BITS_PER_BYTE * PAGE_SIZE + static LIST_HEAD(nf_tables_expressions); static LIST_HEAD(nf_tables_objects); static LIST_HEAD(nf_tables_flowtables); @@ -2718,17 +2720,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, min = 0, id; + 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; @@ -2737,22 +2736,34 @@ 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 < min || tmp >= min + NFT_SET_IDA_SIZE) continue; - set_bit(tmp - min, inuse); + n = ida_get_new_above(&inuse, tmp - min, &id); + if (n < 0) { + if (n == -EAGAIN) + goto cont; + + return n; + } } + n = ida_get_new_above(&inuse, 0, &id); - 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; + if (n < 0) { + if (n == -EAGAIN) + goto cont; + else if (n == -ENOSPC) { + min += NFT_SET_IDA_SIZE; + ida_destroy(&inuse); + goto cont; + } else + return n; } - free_page((unsigned long)inuse); + + ida_destroy(&inuse); } - set->name = kasprintf(GFP_KERNEL, name, min + n); + set->name = kasprintf(GFP_KERNEL, name, id); if (!set->name) return -ENOMEM;