From patchwork Thu Jun 28 17:59:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 936304 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="Uebls736"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41GncB5VrMz9ryt for ; Fri, 29 Jun 2018 03:59:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967640AbeF1R7x (ORCPT ); Thu, 28 Jun 2018 13:59:53 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:40237 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967426AbeF1R7v (ORCPT ); Thu, 28 Jun 2018 13:59:51 -0400 Received: by mail-pl0-f68.google.com with SMTP id t6-v6so3136549plo.7 for ; Thu, 28 Jun 2018 10:59:51 -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=GcAMl333dVhLkAroQ6tpSnEyfUbLwDlWDUuZSIjFnXA=; b=Uebls736f7FXhXvNsyP1v5SvT3ZjrZ/enhB4nvqhVb2k3usYIyiv6NXeD9Uq1siHpT 03nrYCVUAED+5kl0iHceI+FgPucMzosjRa9XEDMuwzD6WtH1zc4GCnyRKptbdA5329wz HrsiwZc3kLHiV8iTvpTkhyGhtx/zxKlVEs9dzkQ6Vg0FgjRTi+tpgGZFVNDc9524HAzo eUtlP3i6K6XpXU7fEeaUNSpAOi533Xzxg2Id3g5MROj4uugRigBvWKVriBSan6krxuSz lBblCbf/pHFXt8UiYPIzCfkQPNOEnFUFfILYnuLcUtFrnqHL+RN9wAv2S53mfhJ7vPZ6 d+9Q== 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=GcAMl333dVhLkAroQ6tpSnEyfUbLwDlWDUuZSIjFnXA=; b=KGoHwy4kAYhlGE+glWozMiWWK5qvRV867ljbSApc4l7v674Ql8Tk+lh1+Sf9ZP3Fn1 r3iJrOAtokGmfkkP+i7lTZgSN5IVmzh77D8tlzbj1bI4O0NqelCNarIIU66zAPL0Q5ku DRQMbA5msEEwTlajt6sKhjENel3IAAJ/zx5mPv50i5HQTwktajkKfU5WRLy+NfkX9zdi PJjHZuEeeoVWQs1XSGlCiOAcDM5otow5KjnzrOQGTk2yCvGHArU4BTMpQk+MgV/M/owJ uQGB1a1zRU4vdX81SPFKBCwL3yHUSAC5V1f597DRC6PTO7kSqj8Dxn618M9InC9eVGo7 rbkg== X-Gm-Message-State: APt69E2IGP9CRkO9i1u/B0c0dvKrCdnG23jmA8fz59SddXN7XyLdRJsl CnxKooLqUoDua5ePjkorK2k= X-Google-Smtp-Source: ADUXVKJSlD4nNnAP5x5XRNjmExg3dwZ5VOZmAAjGU0F13IYAWLXrEfRLkExnqR3AqjScAXG5jlqeNg== X-Received: by 2002:a17:902:760d:: with SMTP id k13-v6mr11321251pll.56.1530208791004; Thu, 28 Jun 2018 10:59:51 -0700 (PDT) Received: from localhost.localdomain ([2402:3a80:d3b:3f12:aaa2:c672:6898:bde]) by smtp.gmail.com with ESMTPSA id y15-v6sm10821902pfm.136.2018.06.28.10.59.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Jun 2018 10:59:50 -0700 (PDT) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nf-next v6] net: netfilter: nf_tables_api: Use id allocation Date: Thu, 28 Jun 2018 23:29:15 +0530 Message-Id: <20180628175915.3897-1-rvarsha016@gmail.com> X-Mailer: git-send-email 2.14.4 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. In case of -EAGAIN error return -ENOMEM , EAGAIN indicates failure in loading module. Remove page size limit as id's are allocated within the range of 0x7fffffff. 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. Changes in v4: - Removed -EAGAIN return value. - Updated NFT_SET_IDA_SIZE value. Changes in v5: - In case of -EAGAIN error returned -ENOMEM. - Removed limit for page size. - Modified commit message. Changes in v6: - Removed tmp < 0 condition. net/netfilter/nf_tables_api.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 3f211e1025c1..7202295f0617 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -2926,18 +2926,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; + unsigned int n = 0, id = 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; @@ -2945,22 +2941,28 @@ 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) - continue; - set_bit(tmp - min, inuse); + n = ida_get_new_above(&inuse, tmp, &id); + if (n < 0) { + if (n == -EAGAIN) + return -ENOMEM; + + 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; + n = ida_get_new_above(&inuse, 0, &id); + ida_destroy(&inuse); + + if (n < 0) { + if (n == -EAGAIN) + return -ENOMEM; + return n; } - free_page((unsigned long)inuse); + } - set->name = kasprintf(GFP_KERNEL, name, min + n); + set->name = kasprintf(GFP_KERNEL, name, id); if (!set->name) return -ENOMEM;