From: Qian Cai <cai@lca.pw>
To: Waiman Long <longman@redhat.com>
Cc: Christoph Lameter <cl@linux.com>,
Pekka Enberg <penberg@kernel.org>,
David Rientjes <rientjes@google.com>,
Joonsoo Kim <iamjoonsoo.kim@lge.com>,
Andrew Morton <akpm@linux-foundation.org>,
Linux-MM <linux-mm@kvack.org>,
LKML <linux-kernel@vger.kernel.org>,
Juri Lelli <juri.lelli@redhat.com>
Subject: Re: [PATCH 2/2] mm/slub: Fix slab_mutex circular locking problem in slab_attr_store()
Date: Fri, 24 Apr 2020 12:16:00 -0400 [thread overview]
Message-ID: <0A3C34CA-F514-41C2-AC3F-E5925C7C0F9A@lca.pw> (raw)
In-Reply-To: <20200424151225.10966-2-longman@redhat.com>
> On Apr 24, 2020, at 11:12 AM, Waiman Long <longman@redhat.com> wrote:
>
> diff --git a/mm/slub.c b/mm/slub.c
> index 183ccc364ccf..255981180489 100644
> --- a/mm/slub.c
> +++ b/mm/slub.c
> @@ -5567,13 +5567,30 @@ static ssize_t slab_attr_store(struct kobject *kobj,
> return -EIO;
>
> err = attribute->store(s, buf, len);
> -#ifdef CONFIG_MEMCG
> - if (slab_state >= FULL && err >= 0 && is_root_cache(s)) {
> - struct kmem_cache *c;
> +#ifdef CONFIG_MEMCG_KMEM
> + if (slab_state >= FULL && err >= 0 && is_root_cache(s) &&
> + !list_empty(&s->memcg_params.children)) {
> + struct kmem_cache *c, **pcaches;
> + int idx, max, cnt = 0;
> + size_t size = s->max_attr_size;
> + struct memcg_cache_array *arr;
> +
> + /*
> + * Make atomic update to s->max_attr_size.
> + */
> + do {
> + if (len <= size)
> + break;
> + } while (!try_cmpxchg(&s->max_attr_size, &size, len));
>
try_cmpxchg() is only available on x86.
mm/slub.c: In function ‘slab_attr_store’:
mm/slub.c:5613:13: error: implicit declaration of function ‘try_cmpxchg’; did you mean ‘xa_cmpxchg’? [-Werror=implicit-function-declaration]
} while (!try_cmpxchg(&s->max_attr_size, &size, len));
^~~~~~~~~~~
xa_cmpxchg
next prev parent reply other threads:[~2020-04-24 16:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-24 15:12 [PATCH 1/2] mm, slab: Revert "extend slab/shrink to shrink all memcg caches" Waiman Long
2020-04-24 15:12 ` [PATCH 2/2] mm/slub: Fix slab_mutex circular locking problem in slab_attr_store() Waiman Long
2020-04-24 16:16 ` Qian Cai [this message]
2020-04-27 18:16 ` Waiman Long
2020-04-24 19:44 ` Qian Cai
2020-04-27 19:00 ` Waiman Long
2020-04-24 16:41 ` [PATCH 1/2] mm, slab: Revert "extend slab/shrink to shrink all memcg caches" Qian Cai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0A3C34CA-F514-41C2-AC3F-E5925C7C0F9A@lca.pw \
--to=cai@lca.pw \
--cc=akpm@linux-foundation.org \
--cc=cl@linux.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=juri.lelli@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=longman@redhat.com \
--cc=penberg@kernel.org \
--cc=rientjes@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox