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 44211C4338F for ; Thu, 29 Jul 2021 13:22:13 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EB83860184 for ; Thu, 29 Jul 2021 13:22:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EB83860184 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 BC5708D000E; Thu, 29 Jul 2021 09:21:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B49558D0006; Thu, 29 Jul 2021 09:21:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5F4608D0011; Thu, 29 Jul 2021 09:21:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id D904F900003 for ; Thu, 29 Jul 2021 09:21:44 -0400 (EDT) Received: from smtpin37.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 8371E184383C0 for ; Thu, 29 Jul 2021 13:21:44 +0000 (UTC) X-FDA: 78415687728.37.CFA97FE Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf14.hostedemail.com (Postfix) with ESMTP id 2E63C6001981 for ; Thu, 29 Jul 2021 13:21:44 +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-out2.suse.de (Postfix) with ESMTPS id 377F120044; Thu, 29 Jul 2021 13:21:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1627564903; 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=B4vdJolFL2GVYpcikot2LbNLNf+dSU83/o6wpmgcp6o=; b=WYagSXYGnVn3RHhHbl+/Wmv3AyCDrwuVsgobW/8YcpjvqGqpB8dyrBfrO+vv8F6jwo9MiU JW2/Nnry5aVpS55gq2OvKO+1rFCzFymmeOMU2OunWJEndVJo0uwx8uvgxgeODbjZ7RhKQC quMgF7lAjbjWhrPHe1kDdx1cyaASegM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1627564903; 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=B4vdJolFL2GVYpcikot2LbNLNf+dSU83/o6wpmgcp6o=; b=OQKAio0SyrpdzM2mh4lNi0WHqsibNZ2w+xoky0jsVt2lVcHaj3j9uzNRledcO2+7xSqtor EfMiyfQOYKKNSoCw== 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 0523713AF4; Thu, 29 Jul 2021 13:21:43 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id sMoRAGerAmF9AwAAMHmgww (envelope-from ); Thu, 29 Jul 2021 13:21:43 +0000 From: Vlastimil Babka To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Christoph Lameter , David Rientjes , Pekka Enberg , Joonsoo Kim Cc: Mike Galbraith , Sebastian Andrzej Siewior , Thomas Gleixner , Mel Gorman , Jesper Dangaard Brouer , Jann Horn , Vlastimil Babka Subject: [PATCH v3 15/35] mm, slub: restore irqs around calling new_slab() Date: Thu, 29 Jul 2021 15:21:12 +0200 Message-Id: <20210729132132.19691-16-vbabka@suse.cz> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210729132132.19691-1-vbabka@suse.cz> References: <20210729132132.19691-1-vbabka@suse.cz> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 2E63C6001981 Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=WYagSXYG; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=OQKAio0S; dmarc=none; spf=pass (imf14.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz X-Stat-Signature: wm5qj8bxmz5kztdohk35w71aquc4c5q6 X-HE-Tag: 1627564904-274780 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: allocate_slab() currently re-enables irqs before calling to the page allo= cator. It depends on gfpflags_allow_blocking() to determine if it's safe to do s= o. Now we can instead simply restore irq before calling it through new_slab(= ). The other caller early_kmem_cache_node_alloc() is unaffected by this. Signed-off-by: Vlastimil Babka --- mm/slub.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 187424ebf1d8..43f38fd47062 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1792,9 +1792,6 @@ static struct page *allocate_slab(struct kmem_cache= *s, gfp_t flags, int node) =20 flags &=3D gfp_allowed_mask; =20 - if (gfpflags_allow_blocking(flags)) - local_irq_enable(); - flags |=3D s->allocflags; =20 /* @@ -1853,8 +1850,6 @@ static struct page *allocate_slab(struct kmem_cache= *s, gfp_t flags, int node) page->frozen =3D 1; =20 out: - if (gfpflags_allow_blocking(flags)) - local_irq_disable(); if (!page) return NULL; =20 @@ -2782,16 +2777,17 @@ static void *___slab_alloc(struct kmem_cache *s, = gfp_t gfpflags, int node, goto check_new_page; } =20 + local_irq_restore(flags); put_cpu_ptr(s->cpu_slab); page =3D new_slab(s, gfpflags, node); c =3D get_cpu_ptr(s->cpu_slab); =20 if (unlikely(!page)) { - local_irq_restore(flags); slab_out_of_memory(s, gfpflags, node); return NULL; } =20 + local_irq_save(flags); if (c->page) flush_slab(s, c); =20 --=20 2.32.0