lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 045/862] mbcache: Avoid nesting of cache->c_list_lock under bit locks
    Date
    From: Jan Kara <jack@suse.cz>

    commit 5fc4cbd9fde5d4630494fd6ffc884148fb618087 upstream.

    Commit 307af6c87937 ("mbcache: automatically delete entries from cache
    on freeing") started nesting cache->c_list_lock under the bit locks
    protecting hash buckets of the mbcache hash table in
    mb_cache_entry_create(). This causes problems for real-time kernels
    because there spinlocks are sleeping locks while bitlocks stay atomic.
    Luckily the nesting is easy to avoid by holding entry reference until
    the entry is added to the LRU list. This makes sure we cannot race with
    entry deletion.

    Cc: stable@kernel.org
    Fixes: 307af6c87937 ("mbcache: automatically delete entries from cache on freeing")
    Reported-by: Mike Galbraith <efault@gmx.de>
    Signed-off-by: Jan Kara <jack@suse.cz>
    Link: https://lore.kernel.org/r/20220908091032.10513-1-jack@suse.cz
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/mbcache.c | 17 ++++++++++-------
    1 file changed, 10 insertions(+), 7 deletions(-)

    diff --git a/fs/mbcache.c b/fs/mbcache.c
    index 47ccfcbe0a22..e272ad738faf 100644
    --- a/fs/mbcache.c
    +++ b/fs/mbcache.c
    @@ -90,8 +90,14 @@ int mb_cache_entry_create(struct mb_cache *cache, gfp_t mask, u32 key,
    return -ENOMEM;

    INIT_LIST_HEAD(&entry->e_list);
    - /* Initial hash reference */
    - atomic_set(&entry->e_refcnt, 1);
    + /*
    + * We create entry with two references. One reference is kept by the
    + * hash table, the other reference is used to protect us from
    + * mb_cache_entry_delete_or_get() until the entry is fully setup. This
    + * avoids nesting of cache->c_list_lock into hash table bit locks which
    + * is problematic for RT.
    + */
    + atomic_set(&entry->e_refcnt, 2);
    entry->e_key = key;
    entry->e_value = value;
    entry->e_reusable = reusable;
    @@ -106,15 +112,12 @@ int mb_cache_entry_create(struct mb_cache *cache, gfp_t mask, u32 key,
    }
    }
    hlist_bl_add_head(&entry->e_hash_list, head);
    - /*
    - * Add entry to LRU list before it can be found by
    - * mb_cache_entry_delete() to avoid races
    - */
    + hlist_bl_unlock(head);
    spin_lock(&cache->c_list_lock);
    list_add_tail(&entry->e_list, &cache->c_list);
    cache->c_entry_count++;
    spin_unlock(&cache->c_list_lock);
    - hlist_bl_unlock(head);
    + mb_cache_entry_put(cache, entry);

    return 0;
    }
    --
    2.38.0


    \
     
     \ /
      Last update: 2022-10-19 10:44    [W:4.027 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site