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 EA9EEC432BE for ; Mon, 23 Aug 2021 14:59:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9F4EA61247 for ; Mon, 23 Aug 2021 14:59:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9F4EA61247 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 917146B007D; Mon, 23 Aug 2021 10:58:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6C8B590000D; Mon, 23 Aug 2021 10:58:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF4C790000B; Mon, 23 Aug 2021 10:58:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0187.hostedemail.com [216.40.44.187]) by kanga.kvack.org (Postfix) with ESMTP id 3754D900008 for ; Mon, 23 Aug 2021 10:58:42 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id DC4B426DE4 for ; Mon, 23 Aug 2021 14:58:41 +0000 (UTC) X-FDA: 78506652042.14.E2D7A78 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf03.hostedemail.com (Postfix) with ESMTP id 8B10930000A4 for ; Mon, 23 Aug 2021 14:58:41 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 973C921FEA; Mon, 23 Aug 2021 14:58:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1629730720; 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=xli1ta2rWXTvirL38W0uAjurVB0A8z+tU+gP3KFvM38=; b=Z5Y7ffV/ZPLjJbeqSQ2ztRiZmqaxrX6payOKhlInV4dDrOdgw1NhgKUtqY+gCiOQjpo/v0 KzMocb/E7M5mqjNdzs78a7g5ogEzJvZ+Ty0ouQSSeDch6u+YtnIAWK64mL9JMMlounX65a Q2NugmdYHB8BrMUC3PSSbsebqTGjS5w= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1629730720; 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=xli1ta2rWXTvirL38W0uAjurVB0A8z+tU+gP3KFvM38=; b=A/hzIJnMerGuqRhp2LFmnessL8RgWHXhr7oDYdBGr/tSVnNFghGR2upvXyeLouBLXPMAPv bqYV9KpgnyiCBBBQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 6E5F413BE0; Mon, 23 Aug 2021 14:58:40 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id +B5gGqC3I2EFQQAAMHmgww (envelope-from ); Mon, 23 Aug 2021 14:58:40 +0000 From: Vlastimil Babka To: Andrew Morton , Christoph Lameter , David Rientjes , Pekka Enberg , Joonsoo Kim Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mike Galbraith , Sebastian Andrzej Siewior , Thomas Gleixner , Mel Gorman , Jesper Dangaard Brouer , Jann Horn , Vlastimil Babka Subject: [PATCH v5 16/35] mm, slub: validate slab from partial list or page allocator before making it cpu slab Date: Mon, 23 Aug 2021 16:58:07 +0200 Message-Id: <20210823145826.3857-17-vbabka@suse.cz> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210823145826.3857-1-vbabka@suse.cz> References: <20210823145826.3857-1-vbabka@suse.cz> MIME-Version: 1.0 Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="Z5Y7ffV/"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="A/hzIJnM"; spf=pass (imf03.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none X-Stat-Signature: pbzbdjy6bpkbqzj53hdbx68j7fegp1nd X-Rspamd-Queue-Id: 8B10930000A4 X-Rspamd-Server: rspam04 X-HE-Tag: 1629730721-396465 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 the checks are done first, and kmem_cache_cpu.page assignment onl= y after they pass. 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 8b240eb10a1d..fddfb0629b8e 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2788,10 +2788,8 @@ static void *___slab_alloc(struct kmem_cache *s, g= fp_t gfpflags, int node, lockdep_assert_irqs_disabled(); =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); put_cpu_ptr(s->cpu_slab); @@ -2804,9 +2802,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 @@ -2815,14 +2810,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 { @@ -2841,10 +2834,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.32.0