[10/17] cls_basic: Convert to use idr_alloc_u32

Message ID	20171128213312.28983-11-willy@infradead.org
State	Not Applicable, archived
Delegated to:	David Miller
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: Matthew Wilcox <willy@infradead.org> Cc: Matthew Wilcox <mawilcox@microsoft.com>, Chris Mi <chrism@mellanox.com>, Jiri Pirko <jiri@mellanox.com>, "David S . Miller" <davem@davemloft.net>, Cong Wang <xiyou.wangcong@gmail.com>, Jamal Hadi Salim <jhs@mojatatu.com>, Daniel Borkmann <daniel@iogearbox.net>, Eric Biggers <ebiggers@google.com>, Lai Jiangshan <laijs@cn.fujitsu.com>, Tejun Heo <tj@kernel.org>, Rehas Sachdeva <aquannie@gmail.com>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 10/17] cls_basic: Convert to use idr_alloc_u32 Date: Tue, 28 Nov 2017 13:33:05 -0800 Message-Id: <20171128213312.28983-11-willy@infradead.org> In-Reply-To: <20171128213312.28983-1-willy@infradead.org> References: <20171128213312.28983-1-willy@infradead.org> To: unlisted-recipients:; (no To-header on input) Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	IDR patches for 4.15 \| expand [00/17] IDR patches for 4.15 [01/17] idr: Fix build [02/17] radix tree test suite: Remove ARRAY_SIZE [03/17] idr test suite: Fix ida_test_random() [04/17] IDR test suite: Check handling negative end correctly [05/17] idr: Delete idr_remove_ext function [06/17] idr: Delete idr_replace_ext function [07/17] idr: Delete idr_find_ext function [08/17] idr: Add idr_alloc_u32 helper [09/17] net sched actions: Convert to use idr_alloc_u32 [10/17] cls_basic: Convert to use idr_alloc_u32 [11/17] cls_bpf: Convert to use idr_alloc_u32 [12/17] cls_flower: Convert to idr_alloc_u32 [13/17] cls_u32: Reinstate cyclic allocation [14/17] cls_u32: Convert to idr_alloc_u32 [15/17] idr: Rename idr_alloc_ext to idr_alloc_ul [16/17] idr: Rename idr_for_each_entry_ext [17/17] idr: Warn if old iterators see large IDs

Message ID

20171128213312.28983-11-willy@infradead.org

State

Not Applicable, archived

Delegated to:

David Miller

Headers

From: Matthew Wilcox <willy@infradead.org>
Cc: Matthew Wilcox <mawilcox@microsoft.com>,
	Chris Mi <chrism@mellanox.com>, Jiri Pirko <jiri@mellanox.com>,
	"David S . Miller" <davem@davemloft.net>,
	Cong Wang <xiyou.wangcong@gmail.com>,
	Jamal Hadi Salim <jhs@mojatatu.com>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Eric Biggers <ebiggers@google.com>, Lai Jiangshan <laijs@cn.fujitsu.com>,
	Tejun Heo <tj@kernel.org>, Rehas Sachdeva <aquannie@gmail.com>,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 10/17] cls_basic: Convert to use idr_alloc_u32
Date: Tue, 28 Nov 2017 13:33:05 -0800
Message-Id: <20171128213312.28983-11-willy@infradead.org>
In-Reply-To: <20171128213312.28983-1-willy@infradead.org>
References: <20171128213312.28983-1-willy@infradead.org>
To: unlisted-recipients:; (no To-header on input)
Sender: netdev-owner@vger.kernel.org
Precedence: bulk

Series

IDR patches for 4.15 | expand

Commit Message

Matthew Wilcox (Oracle) Nov. 28, 2017, 9:33 p.m. UTC

From: Matthew Wilcox <mawilcox@microsoft.com>

Use the new helper which saves a temporary variable and a few lines of
code.

Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
---
 net/sched/cls_basic.c | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c
index 147700afcf31..529597c8c28c 100644
--- a/net/sched/cls_basic.c
+++ b/net/sched/cls_basic.c
@@ -182,7 +182,6 @@  static int basic_change(struct net *net, struct sk_buff *in_skb,
 	struct nlattr *tb[TCA_BASIC_MAX + 1];
 	struct basic_filter *fold = (struct basic_filter *) *arg;
 	struct basic_filter *fnew;
-	unsigned long idr_index;
 
 	if (tca[TCA_OPTIONS] == NULL)
 		return -EINVAL;
@@ -205,21 +204,17 @@  static int basic_change(struct net *net, struct sk_buff *in_skb,
 	if (err < 0)
 		goto errout;
 
-	if (handle) {
-		fnew->handle = handle;
-		if (!fold) {
-			err = idr_alloc_ext(&head->handle_idr, fnew, &idr_index,
-					    handle, handle + 1, GFP_KERNEL);
-			if (err)
-				goto errout;
-		}
-	} else {
-		err = idr_alloc_ext(&head->handle_idr, fnew, &idr_index,
-				    1, 0x7FFFFFFF, GFP_KERNEL);
-		if (err)
-			goto errout;
-		fnew->handle = idr_index;
+	if (!handle) {
+		handle = 1;
+		err = idr_alloc_u32(&head->handle_idr, fnew, &handle,
+					INT_MAX, GFP_KERNEL);
+	} else if (!fold) {
+		err = idr_alloc_u32(&head->handle_idr, fnew, &handle,
+					handle, GFP_KERNEL);
 	}
+	if (err)
+		goto errout;
+	fnew->handle = handle;
 
 	err = basic_set_parms(net, tp, fnew, base, tb, tca[TCA_RATE], ovr);
 	if (err < 0) {

[10/17] cls_basic: Convert to use idr_alloc_u32

Commit Message

Patch