From patchwork Tue Jun 19 07:27:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 931450 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="OIlf7zXm"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41900l68Q9z9s3C for ; Tue, 19 Jun 2018 17:27:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755972AbeFSH1e (ORCPT ); Tue, 19 Jun 2018 03:27:34 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:37029 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755656AbeFSH1e (ORCPT ); Tue, 19 Jun 2018 03:27:34 -0400 Received: by mail-wr0-f196.google.com with SMTP id d8-v6so19384275wro.4 for ; Tue, 19 Jun 2018 00:27:33 -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=3JUm8V6Sjh5mG/vFyIb2kG6Mf6hkKSKP06JRGlpVRj0=; b=OIlf7zXm98DdMP98byb/VirgrwCcVn4rOPoYBZihW0iSlTHsLK5hslKzUQgOUBwI+G RIWv+ibiqBzApqUs9EVe7Hkh5qQZiASi5VG4pb80Hp+vIrRug6I5YXVXwzakhijrKLeC V3Uo/vY+0WwCafKkQ5FA1TeGybhfEZog7NFybHinnByULR6Qz/Deu3cPtgBqhs0OMT9M 15egH7jNdVAo/nTsJ5eyo6sp7EW0acK8FVq2RruXSHvNRnt6LCpt35pLjS704phne66P 92o1DyaL5+eR4hrmEsvj/uCLcp4QhS750Q8wFyvYyNLvAWf3ZjIxbWDRKTcVxqkO82D9 edLA== 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=3JUm8V6Sjh5mG/vFyIb2kG6Mf6hkKSKP06JRGlpVRj0=; b=FBtGLp+8YUeDHJqGs5askkQrqYkMrFHSDiKPGEC2dyUV7Oxbf5RZvFXIwVXsU8pfOQ RI4m1Z3noMlaD0+SnYkPhdMZxLRETMBsSmnGvi5IxXgKw/498GUHu2YdctHmjIxdSzuj 8sTIUGEW5XPpN4HSWnAQiWUe3fKJo3GijvNWFUngg+C1X+mA969XEJsV4YF9G1YI2BEx Aq9ScUjkR59jQfi2n0IAFIcpP21Pi0MXayfYYiBiW/B8AJISYJh2/5jQIpTv/Jogwtgt 07kCmJmiEpLkgiExtBkpJsvuCX7BjRqyYpyVL3860mWiZZZvU2jZDxVXv1q2AD5ZbZXe hfOA== X-Gm-Message-State: APt69E3Jl7kitUZ9ef4gYyApnAS7snMP2eIYNhH+TCHc6PytlrJjgC1j zBCrCZZQolk1tXXDvETYjH+jDQ== X-Google-Smtp-Source: ADUXVKK0X9VD1CjYoThIxwjb4PTEmVqGIvwPVoBcaZSbvU/4GO21/R53Nh830eZraw0766+xKYrVKw== X-Received: by 2002:adf:c60d:: with SMTP id n13-v6mr12529295wrg.177.1529393252694; Tue, 19 Jun 2018 00:27:32 -0700 (PDT) Received: from surfer-172-29-8-37-hotspot.internet-for-guests.com.hotspot.internet-for-guests.com ([195.50.135.69]) by smtp.gmail.com with ESMTPSA id a184-v6sm10671552wmf.30.2018.06.19.00.27.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 00:27:32 -0700 (PDT) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao , Varsha Rao Subject: [PATCH nf-next v5] net: netfilter: nf_tables_api: Use id allocation Date: Tue, 19 Jun 2018 12:57:22 +0530 Message-Id: <20180619072722.4638-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 From: Varsha Rao 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. net/netfilter/nf_tables_api.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index ca4c4d994ddb..999255717398 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -2924,18 +2924,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; @@ -2943,22 +2939,30 @@ 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) 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;