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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 122FBC2B9F8 for ; Mon, 24 May 2021 23:41:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id ADD0A6140F for ; Mon, 24 May 2021 23:41:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ADD0A6140F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B46CA6B0081; Mon, 24 May 2021 19:40:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A9966B0095; Mon, 24 May 2021 19:40:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 92CC66B0099; Mon, 24 May 2021 19:40:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0077.hostedemail.com [216.40.44.77]) by kanga.kvack.org (Postfix) with ESMTP id 77CE26B007B for ; Mon, 24 May 2021 19:40:52 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id F3A0D824999B for ; Mon, 24 May 2021 23:40:51 +0000 (UTC) X-FDA: 78177747144.17.13CF015 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by imf11.hostedemail.com (Postfix) with ESMTP id 9664F20007D8 for ; Mon, 24 May 2021 23:40:44 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1621899648; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SGGhQXqylEVkhGCKs15bdMyTfUKJS20cQoY/lph/3m8=; b=qHeeEQdp+l8oDi/GxEUNr+OTPlCFxJqYKw0Ld1SGleywFtPjGcmkAu0J+PCCnCYm2IqrjR Hhrk/fxiSDKmaaWerViK4RB+XBOJt6wH3ukfyKO8ABMR5Xqp2ZpO35BwMLp2ORVW8rH9Wa 93i745gCo8quEaMRQuJqCxRSR2WOzao= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1621899648; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SGGhQXqylEVkhGCKs15bdMyTfUKJS20cQoY/lph/3m8=; b=Q/9QWO+pniucpKTJDZzw+89IFzM1M0qlXWLpeRR9NabOwiKr/NFXn6QGJuwVLwSum5wmda be6VckW9tHJWk2DA== Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 68FDAAF35; Mon, 24 May 2021 23:40:48 +0000 (UTC) From: Vlastimil Babka To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Christoph Lameter , David Rientjes , Pekka Enberg , Joonsoo Kim Cc: Sebastian Andrzej Siewior , Thomas Gleixner , Mel Gorman , Jesper Dangaard Brouer , Peter Zijlstra , Jann Horn , Vlastimil Babka Subject: [RFC 13/26] mm, slub: validate partial and newly allocated slabs before loading them Date: Tue, 25 May 2021 01:39:33 +0200 Message-Id: <20210524233946.20352-14-vbabka@suse.cz> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210524233946.20352-1-vbabka@suse.cz> References: <20210524233946.20352-1-vbabka@suse.cz> MIME-Version: 1.0 Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=qHeeEQdp; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="Q/9QWO+p"; dmarc=none; spf=pass (imf11.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.15 as permitted sender) smtp.mailfrom=vbabka@suse.cz X-Stat-Signature: agcarettwqkrak9fq65f7h67q8cd7dtq X-Rspamd-Queue-Id: 9664F20007D8 X-Rspamd-Server: rspam02 X-HE-Tag: 1621899644-178265 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: When we obtain a new slab page from node partial list or page allocator, = we assign it to kmem_cache_cpu, perform some checks, and if they fail, we un= do the assignment. In order to allow doing the checks without irq disabled, restructure the = code so that checks go first, and kmem_cache_cpu assignment only afterwards. Signed-off-by: Vlastimil Babka --- mm/slub.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 47a3438d6a35..78d7eb5be951 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2743,10 +2743,8 @@ static void *___slab_alloc(struct kmem_cache *s, g= fp_t gfpflags, int node, new_objects: =20 freelist =3D get_partial(s, gfpflags, node, &page); - if (freelist) { - c->page =3D page; + if (freelist) goto check_new_page; - } =20 local_irq_restore(flags); migrate_enable(); @@ -2760,9 +2758,6 @@ static void *___slab_alloc(struct kmem_cache *s, gf= p_t gfpflags, int node, } =20 local_irq_save(flags); - if (c->page) - flush_slab(s, c); - /* * No other reference to the page yet so we can * muck around with it freely without cmpxchg @@ -2771,14 +2766,12 @@ static void *___slab_alloc(struct kmem_cache *s, = gfp_t gfpflags, int node, page->freelist =3D NULL; =20 stat(s, ALLOC_SLAB); - c->page =3D page; =20 check_new_page: =20 if (kmem_cache_debug(s)) { if (!alloc_debug_processing(s, page, freelist, addr)) { /* Slab failed checks. Next slab needed */ - c->page =3D NULL; local_irq_restore(flags); goto new_slab; } else { @@ -2797,10 +2790,18 @@ static void *___slab_alloc(struct kmem_cache *s, = gfp_t gfpflags, int node, */ goto return_single; =20 + if (unlikely(c->page)) + flush_slab(s, c); + c->page =3D page; + goto load_freelist; =20 return_single: =20 + if (unlikely(c->page)) + flush_slab(s, c); + c->page =3D page; + deactivate_slab(s, page, get_freepointer(s, freelist), c); local_irq_restore(flags); return freelist; --=20 2.31.1