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 58811C4338F for ; Thu, 29 Jul 2021 13:22:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 08A4E60F23 for ; Thu, 29 Jul 2021 13:22:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 08A4E60F23 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 5FCE48D0012; Thu, 29 Jul 2021 09:21:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 24C2E8D000E; 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 99F94900004; Thu, 29 Jul 2021 09:21:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 615C38E0002 for ; Thu, 29 Jul 2021 09:21:44 -0400 (EDT) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 10450183CEEF9 for ; Thu, 29 Jul 2021 13:21:44 +0000 (UTC) X-FDA: 78415687728.22.0E00CE0 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf12.hostedemail.com (Postfix) with ESMTP id 84BF910000AE for ; Thu, 29 Jul 2021 13:21:43 +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 8FC7120042; Thu, 29 Jul 2021 13:21:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1627564902; 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=h3jOKXWfJUymDwTxueaUYO9BtcrveH/pMJLw393rqic=; b=EMIb1hiWoxMXvqbx9CecmwdbZnvxYOw2u0aaE3DOmw96sGAyEJSXzoWXvVwxSgXIitmoF3 0OSbWFYu2SYwW7n8FFB2laEWRrrRT65mJc3H7U5avxWS9KLHPWqmjO7GBcZMJ6qXoQ3q1H 1vsTnuAYjvV19M2o8DXku2qZQ0C4U/g= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1627564902; 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=h3jOKXWfJUymDwTxueaUYO9BtcrveH/pMJLw393rqic=; b=MgtPhFMxftLRJC6osZZ9t3uyxHfT4Ty8Lot/Uy3Lq51PbQ3/rTh5Px0iwq3CkqnwGcV9Iz TYfTFG0LOL8B5BAg== 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 5F28113AE9; Thu, 29 Jul 2021 13:21:42 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id OE03FmarAmF9AwAAMHmgww (envelope-from ); Thu, 29 Jul 2021 13:21:42 +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 12/35] mm, slub: move disabling/enabling irqs to ___slab_alloc() Date: Thu, 29 Jul 2021 15:21:09 +0200 Message-Id: <20210729132132.19691-13-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: rspam03 X-Rspamd-Queue-Id: 84BF910000AE Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=EMIb1hiW; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=MgtPhFMx; dmarc=none; spf=pass (imf12.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz X-Stat-Signature: hq8o8m9s6k7tjn9wcedihjanhnft8unz X-HE-Tag: 1627564903-68797 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: Currently __slab_alloc() disables irqs around the whole ___slab_alloc(). = This includes cases where this is not needed, such as when the allocation ends= up in the page allocator and has to awkwardly enable irqs back based on gfp fla= gs. Also the whole kmem_cache_alloc_bulk() is executed with irqs disabled eve= n when it hits the __slab_alloc() slow path, and long periods with disabled inte= rrupts are undesirable. As a first step towards reducing irq disabled periods, move irq handling = into ___slab_alloc(). Callers will instead prevent the s->cpu_slab percpu poin= ter from becoming invalid via get_cpu_ptr(), thus preempt_disable(). This doe= s not protect against modification by an irq handler, which is still done by di= sabled irq for most of ___slab_alloc(). As a small immediate benefit, slab_out_of_memory() from ___slab_alloc() is now called with irqs enabled= . kmem_cache_alloc_bulk() disables irqs for its fastpath and then re-enable= s them before calling ___slab_alloc(), which then disables them at its discretio= n. The whole kmem_cache_alloc_bulk() operation also disables preemption. When ___slab_alloc() calls new_slab() to allocate a new page, re-enable preemption, because new_slab() will re-enable interrupts in contexts that= allow blocking (this will be improved by later patches). The patch itself will thus increase overhead a bit due to disabled preemp= tion (on configs where it matters) and increased disabling/enabling irqs in kmem_cache_alloc_bulk(), but that will be gradually improved in the follo= wing patches. Note in __slab_alloc() we need to change the #ifdef CONFIG_PREEMPT guard = to CONFIG_PREEMPT_COUNT to make sure preempt disable/enable is properly pair= ed in all configurations. On configs without involuntary preemption and debuggi= ng the re-read of kmem_cache_cpu pointer is still compiled out as it was bef= ore. [ Mike Galbraith : Fix kmem_cache_alloc_bulk() error path = ] Signed-off-by: Vlastimil Babka --- mm/slub.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 0871bba8ecc2..71a5617b839a 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2653,7 +2653,7 @@ static inline void *get_freelist(struct kmem_cache = *s, struct page *page) * we need to allocate a new slab. This is the slowest path since it inv= olves * a call to the page allocator and the setup of a new slab. * - * Version of __slab_alloc to use when we know that interrupts are + * Version of __slab_alloc to use when we know that preemption is * already disabled (which is the case for bulk allocation). */ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int nod= e, @@ -2661,9 +2661,11 @@ static void *___slab_alloc(struct kmem_cache *s, g= fp_t gfpflags, int node, { void *freelist; struct page *page; + unsigned long flags; =20 stat(s, ALLOC_SLOWPATH); =20 + local_irq_save(flags); page =3D c->page; if (!page) { /* @@ -2726,6 +2728,7 @@ static void *___slab_alloc(struct kmem_cache *s, gf= p_t gfpflags, int node, VM_BUG_ON(!c->page->frozen); c->freelist =3D get_freepointer(s, freelist); c->tid =3D next_tid(c->tid); + local_irq_restore(flags); return freelist; =20 new_slab: @@ -2743,14 +2746,16 @@ static void *___slab_alloc(struct kmem_cache *s, = gfp_t gfpflags, int node, goto check_new_page; } =20 + 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 - c =3D raw_cpu_ptr(s->cpu_slab); if (c->page) flush_slab(s, c); =20 @@ -2790,31 +2795,33 @@ static void *___slab_alloc(struct kmem_cache *s, = gfp_t gfpflags, int node, return_single: =20 deactivate_slab(s, page, get_freepointer(s, freelist), c); + local_irq_restore(flags); return freelist; } =20 /* - * Another one that disabled interrupt and compensates for possible - * cpu changes by refetching the per cpu area pointer. + * A wrapper for ___slab_alloc() for contexts where preemption is not ye= t + * disabled. Compensates for possible cpu changes by refetching the per = cpu area + * pointer. */ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node= , unsigned long addr, struct kmem_cache_cpu *c) { void *p; - unsigned long flags; =20 - local_irq_save(flags); -#ifdef CONFIG_PREEMPTION +#ifdef CONFIG_PREEMPT_COUNT /* * We may have been preempted and rescheduled on a different - * cpu before disabling interrupts. Need to reload cpu area + * cpu before disabling preemption. Need to reload cpu area * pointer. */ - c =3D this_cpu_ptr(s->cpu_slab); + c =3D get_cpu_ptr(s->cpu_slab); #endif =20 p =3D ___slab_alloc(s, gfpflags, node, addr, c); - local_irq_restore(flags); +#ifdef CONFIG_PREEMPT_COUNT + put_cpu_ptr(s->cpu_slab); +#endif return p; } =20 @@ -3334,8 +3341,8 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp= _t flags, size_t size, * IRQs, which protects against PREEMPT and interrupts * handlers invoking normal fastpath. */ + c =3D get_cpu_ptr(s->cpu_slab); local_irq_disable(); - c =3D this_cpu_ptr(s->cpu_slab); =20 for (i =3D 0; i < size; i++) { void *object =3D kfence_alloc(s, s->object_size, flags); @@ -3356,6 +3363,8 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp= _t flags, size_t size, */ c->tid =3D next_tid(c->tid); =20 + local_irq_enable(); + /* * Invoking slow path likely have side-effect * of re-populating per CPU c->freelist @@ -3368,6 +3377,8 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp= _t flags, size_t size, c =3D this_cpu_ptr(s->cpu_slab); maybe_wipe_obj_freeptr(s, p[i]); =20 + local_irq_disable(); + continue; /* goto for-loop */ } c->freelist =3D get_freepointer(s, object); @@ -3376,6 +3387,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp= _t flags, size_t size, } c->tid =3D next_tid(c->tid); local_irq_enable(); + put_cpu_ptr(s->cpu_slab); =20 /* * memcg and kmem_cache debug support and memory initialization. @@ -3385,7 +3397,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp= _t flags, size_t size, slab_want_init_on_alloc(flags, s)); return i; error: - local_irq_enable(); + put_cpu_ptr(s->cpu_slab); slab_post_alloc_hook(s, objcg, flags, i, p, false); __kmem_cache_free_bulk(s, i, p); return 0; --=20 2.32.0