On Tue, Apr 06, 2021 at 02:28:34PM +0100, Matthew Wilcox wrote:
> On Tue, Apr 06, 2021 at 10:33:43PM +1000, Dave Chinner wrote:
> > +++ b/fs/inode.c
> > @@ -57,8 +57,7 @@
> >
> > static unsigned int i_hash_mask __read_mostly;
> > static unsigned int i_hash_shift __read_mostly;
> > -static struct hlist_head *inode_hashtable __read_mostly;
> > -static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock);
> > +static struct hlist_bl_head *inode_hashtable __read_mostly;
>
> I'm a little concerned that we're losing a lockdep map here.
>
> Nobody seems to have done this for list_bl yet, and I'd be reluctant
> to gate your patch on "Hey, Dave, solve this problem nobody else has
> done yet".
I really don't care about lockdep. Adding lockdep support to
hlist_bl is somebody else's problem - I'm just using infrastructure
that already exists. Also, the dentry cache usage of hlist_bl is
vastly more complex and so if lockdep coverage was really necessary,
it would have already been done....
And, FWIW, I'm also aware of the problems that RT kernels have with
the use of bit spinlocks and being unable to turn them into sleeping
mutexes by preprocessor magic. I don't care about that either,
because dentry cache...
> But maybe we can figure out how to do this? I think we want one lockdep
> map for the entire hashtable (it's split for performance, not because
> they're logically separate locks). So something like ...
>
> static struct lockdep_map inode_hash_map =
> STATIC_LOCKDEP_MAP_INIT("inode_hash", &inode_hash_map);
>
> and add:
>
> static inline void hlist_bl_lock_map(struct hlist_bl_head *b,
> struct lockdep_map *map)
> {
> bit_spin_lock(0, (unsigned long *)b);
> spin_acquire(map, 0, 0, _RET_IP_);
> }
>
> then use hlist_bl_lock_map() throughout. Would that work?
> Adding lockdep experts for opinions.
Maybe, but it's kinda messy to have to carry the lockdep map around
externally to the structure. Not to mention it won't support holding
multiple hash chains locked at once if that is ever needed (e.g.
rehashing an object with a different hashval)...
Cheers,
Dave.
--
Dave Chinner
david@xxxxxxxxxxxxx
