ida: Remove simple_ida_lock
Subsystems (2)
Matthew Wilcox
maintainerPATCH 1/1 ida: Remove simple_ida_lock
From: Matthew Wilcox <[email protected]>
Improve the scalability of the IDA by using the per-IDA xa_lock rather than the global simple_ida_lock. IDAs are not typically used in performance-sensitive locations, but since we have this lock anyway, we can use it. It is also a step towards converting the IDA from the radix tree to the XArray.
Signed-off-by Matthew Wilcox <[email protected]>
--- lib/idr.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
lib/idr.c +4 -5
@@ -7,7 +7,6 @@#include <linux/xarray.h> DEFINE_PER_CPU(struct ida_bitmap *, ida_bitmap); -static DEFINE_SPINLOCK (simple_ida_lock);/** * idr_alloc_u32() - Allocate an ID.
@@ -572,7 +571,7 @@ int ida_simple_get(struct ida *ida, unsigned int start, unsigned int end,if (!ida_pre_get (ida, gfp_mask))return -ENOMEM ; -spin_lock_irqsave (&simple_ida_lock, flags); +xa_lock_irqsave (&ida->ida_rt, flags); ret =ida_get_new_above (ida, start, &id);if (!ret) {if (id > max) {
@@ -582,7 +581,7 @@ int ida_simple_get(struct ida *ida, unsigned int start, unsigned int end, ret = id; } } -spin_unlock_irqrestore (&simple_ida_lock, flags); +xa_unlock_irqrestore (&ida->ida_rt, flags);if (unlikely (ret == -EAGAIN )) goto again;
@@ -606,8 +605,8 @@ void ida_simple_remove(struct ida *ida, unsigned int id)unsigned long flags;BUG_ON ((int )id <0 ); -spin_lock_irqsave (&simple_ida_lock, flags); +xa_lock_irqsave (&ida->ida_rt, flags);ida_remove (ida, id); -spin_unlock_irqrestore (&simple_ida_lock, flags); +xa_unlock_irqrestore (&ida->ida_rt, flags); }EXPORT_SYMBOL (ida_simple_remove);
Signature · 1 line
2.16.2