From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EF32C433E0 for ; Tue, 11 Aug 2020 02:03:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E03FF206DC for ; Tue, 11 Aug 2020 02:03:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E03FF206DC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 5AD756B0003; Mon, 10 Aug 2020 22:03:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 55C936B0005; Mon, 10 Aug 2020 22:03:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 472366B0006; Mon, 10 Aug 2020 22:03:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0195.hostedemail.com [216.40.44.195]) by kanga.kvack.org (Postfix) with ESMTP id 2EE386B0003 for ; Mon, 10 Aug 2020 22:03:11 -0400 (EDT) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id BB98E3646 for ; Tue, 11 Aug 2020 02:03:10 +0000 (UTC) X-FDA: 77136640140.08.bells06_460290526fdf Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id 8D1521819E764 for ; Tue, 11 Aug 2020 02:03:10 +0000 (UTC) X-HE-Tag: bells06_460290526fdf X-Filterd-Recvd-Size: 2381 Received: from huawei.com (szxga04-in.huawei.com [45.249.212.190]) by imf39.hostedemail.com (Postfix) with ESMTP for ; Tue, 11 Aug 2020 02:03:09 +0000 (UTC) Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 47154FA38E8B707599D2; Tue, 11 Aug 2020 10:03:05 +0800 (CST) Received: from DESKTOP-A9S207P.china.huawei.com (10.174.179.61) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.487.0; Tue, 11 Aug 2020 10:02:55 +0800 From: To: Christoph Lameter , Pekka Enberg , "David Rientjes" , Joonsoo Kim , "Andrew Morton" CC: , Abel Wu , "open list:SLAB ALLOCATOR" , open list Subject: [PATCH] mm/slub: make add_full() condition more explicit Date: Tue, 11 Aug 2020 10:02:36 +0800 Message-ID: <20200811020240.1231-1-wuyun.wu@huawei.com> X-Mailer: git-send-email 2.28.0.windows.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.174.179.61] X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 8D1521819E764 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Abel Wu The commit below is incomplete, as it didn't handle the add_full() part. commit a4d3f8916c65 ("slub: remove useless kmem_cache_debug() before remo= ve_full()") This patch checks for SLAB_STORE_USER instead of kmem_cache_debug(), since that should be the only context in which we need the list_lock for add_full(). Signed-off-by: Abel Wu --- mm/slub.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/slub.c b/mm/slub.c index f226d66408ee..df93a5a0e9a4 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2182,7 +2182,8 @@ static void deactivate_slab(struct kmem_cache *s, s= truct page *page, } } else { m =3D M_FULL; - if (kmem_cache_debug(s) && !lock) { +#ifdef CONFIG_SLUB_DEBUG + if ((s->flags & SLAB_STORE_USER) && !lock) { lock =3D 1; /* * This also ensures that the scanning of full @@ -2191,6 +2192,7 @@ static void deactivate_slab(struct kmem_cache *s, s= truct page *page, */ spin_lock(&n->list_lock); } +#endif } =20 if (l !=3D m) { --=20 2.28.0.windows.1