- 28 Feb, 2013 40 commits
-
-
Tejun Heo authored
With recent preloading changes, idr no longer keeps full layer cache per each idr instance (used to be ~6.5k per idr on 64bit) and the previous patch removed restriction on the bitmap size. Both now allow us to have larger layers. Increase IDR_BITS to 8 regardless of BITS_PER_LONG. Each layer is slightly larger than 2k on 64bit and 1k on 32bit and carries 256 entries. The size isn't too large, especially compared to what we used to waste on per-idr caches, and 256 entries should be able to serve most use cases with single layer. The max tree depth is 4 which is much better than the previous 6 on 64bit and 7 on 32bit. Signed-off-by:
Tejun Heo <tj@kernel.org> Signed-off-by:
Andrew Morton <akpm@linux-foundation.org> Signed-off-by:
Linus Torvalds <torvalds@linux-foundation.org>
-
Tejun Heo authored
Currently, idr->bitmap is declared as an unsigned long which restricts the number of bits an idr_layer can contain. All bitops can handle arbitrary positive integer bit number and there's no reason for this restriction. Declare idr_layer->bitmap using DECLARE_BITMAP() instead of a single unsigned long. * idr_layer->bitmap is now an array. '&' dropped from params to bitops. * Replaced "== IDR_FULL" tests with bitmap_full() and removed IDR_FULL. * Replaced find_next_bit() on ~bitmap with find_next_zero_bit(). * Replaced "bitmap = 0" with bitmap_clear(). This patch doesn't (or at least shouldn't) introduce any behavior changes. [akpm@linux-foundation.org: checkpatch fixes] Signed-off-by:
-
Tejun Heo authored
MAX_IDR_MASK is another weirdness in the idr interface. As idr covers whole positive integer range, it's defined as 0x7fffffff or INT_MAX. Its usage in idr_find(), idr_replace() and idr_remove() is bizarre. They basically mask off the sign bit and operate on the rest, so if the caller, by accident, passes in a negative number, the sign bit will be masked off and the remaining part will be used as if that was the input, which is worse than crashing. The constant is visible in idr.h and there are several users in the kernel. * drivers/i2c/i2c-core.c:i2c_add_numbered_adapter() Basically used to test if adap->nr is a negative number which isn't -1 and returns -EINVAL if so. idr_alloc() already has negative @start checking (w/ WARN_ON_ONCE), so this can go away. * drivers/infiniband/core/cm.c:cm_alloc_id() drivers/infiniband/hw/mlx4/cm.c:id_map_alloc() Used to wrap cyclic @start. Can be replaced with max(next, 0). Note that this type of cyclic allocation using idr is buggy. These are prone to spurious -ENOSPC failure after the first wraparound. * fs/super.c:get_anon_bdev() The ID allocated from ida is masked off before being tested whether it's inside valid range. ida allocated ID can never be a negative number and the masking is unnecessary. Update idr_*() functions to fail with -EINVAL when negative @id is specified and update other MAX_IDR_MASK users as described above. This leaves MAX_IDR_MASK without any user, remove it and relocate other MAX_IDR_* constants to lib/idr.c. Signed-off-by:
Wolfram Sang <wolfram@the-dreams.de> Signed-off-by:
-
Tejun Heo authored
Most functions in idr fail to deal with the high bits when the idr tree grows to the maximum height. * idr_get_empty_slot() stops growing idr tree once the depth reaches MAX_IDR_LEVEL - 1, which is one depth shallower than necessary to cover the whole range. The function doesn't even notice that it didn't grow the tree enough and ends up allocating the wrong ID given sufficiently high @starting_id. For example, on 64 bit, if the starting id is 0x7fffff01, idr_get_empty_slot() will grow the tree 5 layer deep, which only covers the 30 bits and then proceed to allocate as if the bit 30 wasn't specified. It ends up allocating 0x3fffff01 without the bit 30 but still returns 0x7fffff01. * __idr_remove_all() will not remove anything if the tree is fully grown. * idr_find() can't find anything if the tree is fully grown. * idr_for_each() and idr_get_next() can't iterate anything if the tree is fully grown. Fix it by introducing idr_max() which returns the maximum possible ID given the depth of tree and replacing the id limit checks in all affected places. As the idr_layer pointer array pa[] needs to be 1 larger than the maximum depth, enlarge pa[] arrays by one. While this plugs the discovered issues, the whole code base is horrible and in desparate need of rewrite. It's fragile like hell, Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
Neil Horman <nhorman@tuxdriver.com> Acked-by:
Vlad Yasevich <vyasevich@gmail.com> Cc: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
Johannes Berg <johannes@sipsolutions.net> Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
Li Zefan <lizefan@huawei.com> Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. The new interface doesn't directly translate to the way idr_pre_get() was used around ipc_addid() as preloading disables preemption. From my cursory reading, it seems like we should be able to do all allocation from ipc_addid(), so I moved it there. Can you please check whether this would be okay? If this is wrong and ipc_addid() should be allowed to be called from non-sleepable context, I'd suggest allocating id itself in the outer functions and later install the pointer using idr_replace(). Signed-off-by:
Sedat Dilek <sedat.dilek@gmail.com> Tested-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
Joel Becker <jlbec@evilplan.org> Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Note that the adhoc cyclic id allocation is buggy. If wraparound happens, the previous code with idr_get_new_above() may segfault and the converted code will trigger WARN and return -EINVAL. Even if it's fixed to wrap to zero, the code will be prone to unnecessary -ENOSPC failures after the first wraparound. We probably need to implement proper cyclic support in idr. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Error return values from recover_idr_add() mix -1 and -errno. The conversion doesn't change that but it looks iffy. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
Alex Williamson <alex.williamson@redhat.com> Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: "Hans J. Koch" <hjk@hansjkoch.de> Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
James Smart <james.smart@emulex.com> Cc: James Bottomley <James.Bottomley@HansenPartnership.com> Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
Anton Vorontsov <cbou@mail.ru> Cc: David Woodhouse <dwmw2@infradead.org> Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Cc: David Woodhouse <dwmw2@infradead.org> Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. [yongjun_wei@trendmicro.com.cn: use GFP_NOWAIT under spin lock] Signed-off-by:
Wei Yongjun <yongjun_wei@trendmicro.com.cn> Cc: Mike Marciniszyn <mike.marciniszyn@intel.com> Signed-off-by:
-
Tejun Heo authored
Convert to the much saner new idr interface. Signed-off-by:
-
