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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B1B3C677C4 for ; Wed, 11 Jun 2025 15:59:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0ADEC6B00A7; Wed, 11 Jun 2025 11:59:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 085C76B00AA; Wed, 11 Jun 2025 11:59:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EDD7C6B00AC; Wed, 11 Jun 2025 11:59:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id CD8916B00A7 for ; Wed, 11 Jun 2025 11:59:24 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 709AA1210A8 for ; Wed, 11 Jun 2025 15:59:24 +0000 (UTC) X-FDA: 83543579448.06.AB476F1 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf13.hostedemail.com (Postfix) with ESMTP id 43CAD20008 for ; Wed, 11 Jun 2025 15:59:22 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=NTEwK3ex; spf=none (imf13.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749657562; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=c4tnXzVGfZ+KkSY4KcyZlCXXsnzMYeEhwQF6aoeIPtM=; b=HZlDMsjH7hel/aV/wodyiTa5LtM2SyUL8Q+DdfVGzQstpM19+nW5GwnHFljq1xHP2RNIc0 4AjyXcIPO0s0EY1FZE0ZNhyH9+lDpgDC+7NN7YqmcyRKzA6ahWoRfEDHRfkPjMlMD9d0Jz hSfd2lBpsnvSKw3/F44di0wWO04eN4U= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=NTEwK3ex; spf=none (imf13.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749657562; a=rsa-sha256; cv=none; b=fd1vk+JhaAy28GkzkEy7WQjGsc0b06EolpSmVhx6cjerfNvpyKbM+K1lf8IkWYyFje+fNJ gK/PEG/om3T10uxEeXFPeOVAxNA683+9yHlSWF2Hx8Dcc2xAm3rlKNPeBJOgRzLB0vlQ3j F/7EHZ+Am+6MmJkcRkFqiZCHRyD75N0= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=c4tnXzVGfZ+KkSY4KcyZlCXXsnzMYeEhwQF6aoeIPtM=; b=NTEwK3exfLG3j2BU6djwMtk105 0a6xbOgA+WMQewTsKfl10WXXW+Ox73568cxhWJ7k0AYuqc8jElIer4/NlbPNUljAWP/Vlkp28ixxp nMuFczJIvDMEDwG3A1aZi7gXEUvSemacRiq4DcA6bw8FK4FWfwLAFhnohYYWOioUUog7LK4tINhjI O0R14vKB7sF3BmE62mhVG7RAs66Qyn6HGFfuZiie3tNZ5oPBzosWZ/2v8g0V00DNuL7at+Qdd9TFv k0xnNylOiP69WvYgSLccGYmz4dukxMMS0Dz3K2+pL1xryRvqotUUlqJtNeBpaNeUDD2YZ/ubThjab PYjV3z0Q==; Received: from willy by casper.infradead.org with local (Exim 4.98.2 #2 (Red Hat Linux)) id 1uPNrC-0000000Aoxf-1lRa; Wed, 11 Jun 2025 15:59:18 +0000 From: "Matthew Wilcox (Oracle)" To: Vlastimil Babka Cc: "Matthew Wilcox (Oracle)" , Christoph Lameter , David Rientjes , Roman Gushchin , Harry Yoo , linux-mm@kvack.org Subject: [PATCH v2 04/11] slab: Add SL_pfmemalloc flag Date: Wed, 11 Jun 2025 16:59:07 +0100 Message-ID: <20250611155916.2579160-5-willy@infradead.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250611155916.2579160-1-willy@infradead.org> References: <20250611155916.2579160-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 43CAD20008 X-Rspamd-Server: rspam07 X-Stat-Signature: jpw6esu44bxzpk5h94dnogy9jmkqrkfr X-Rspam-User: X-HE-Tag: 1749657562-857274 X-HE-Meta: U2FsdGVkX1/IJJR4Tj55kJp1VvU0GyB1DEMBIgdJ06Af4F/EY8bk+sTgjhDhbB5RZktIytW/6ce5QsC5VkTuxFEJRA6tNq0SCMxt9EMgpVYd8hjC5MzgwrP0RVtyF9L8qYZOGFLGVkCvPWEQB5Aub4Ka62oHyAaoacX5ydi9bfU0fpd0CGtRw1G2EGkHMqucNCZaGiPP0nCjGo4N9Z4yvJmYn3i7DdVc74FeRe7Qksedqov/fzKI4YX1vDjJVk/1DJTK5GlQFCryxoN3mrHQMf+yjYU8SNwwNfFVP/S8qF16xGtP4cMbGOiz0l3WxIwiuBmXSjJTJgprWYKkj/Yz4c2JAOikXr/R1irdqMHdS4nvwOcv8loeN1SqdyMNwomvMvLFJ0jUDS0s8HqXfmF63TX0NCmgTSvnPbBZ8yoQBKE2OVIjbW0oekItNgpTZbtvzpFLHmRWrED+roQCp89nBbXJgpN0xLGeeCvk52RrI9zQPF6k9Yc9TUryUjNdcO1C5gvUSUYn6w2oEyoc/1KzM5MlLE5j71npIC5jDCGsqPmbNSJqkwZQ06O0Aggw30OcjWOfO8X9GvIBLCPvY73ANoBjltgW2ijb7u9VSncx76kusH9LGO9q1tCVA+tKoe1PXp6jMNli06ByxHl3JnBhFmH3mVef+EhKXMlGAoQ6avtydmKP+s4Cnp1OE/CCqFV6eDL3i/NwBIJNG3iZEc2d9YBU7jQJ4dyKC107Gf7mKwn1Y0PkI/Kj4R04E8m0JowDNPtZtqOvHMJNYWzQTABr4/PyNkeTW7MRI8j0nVL2AUFcDR77eRjUGSK7Wj1vtzKvACXcvLXvxplB3Jx/DEmwtt5j/iRCQ18Ow3y7xH0swpLZ/2lzBxtMvko/wqKIPSaVHgLM9+0PAJLGuFVzxIPfzjOeNTOEncnMPYXpi6GjHZl4WSqjTq2wxJxsHL7MfL6KHdVWZ7smOlOGF2tscSe FmxWFssa mcXJif3XxBjYN1BiToKIOuhpa58zHEym6p9MD6CjHMnPB5EVU3H7Rag3FbU5cgjaKJ2ERXV1Zf/eq9MpMLY8lhzHj2ajL9FcbdPIAViqX0k7yIp5CYnMzzKmoLiyugMws7eQ3dsEvHFKS0QhPuGLjk96Idwrgh1ERv4naW/UWk7h0p2xgtTJ3dxYWHjYbXcFTH8A9v8U3IHhg68VPM0sWzA+IAp9m0c1FYrahNy5IJ79Je5ERUIs5CMLvqsQlIyIU57ATwRxf6v599O1GxXLOZB6Fx1eCmQVIZH9ouDNZrNiy2WlXo9nnZhVFVw== 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: List-Subscribe: List-Unsubscribe: Give slab its own name for this flag. Move the implementation from slab.h to slub.c since it's only used inside slub.c. Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Harry Yoo --- mm/slab.h | 24 ------------------------ mm/slub.c | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/mm/slab.h b/mm/slab.h index 32785ff3470a..248b34c839b7 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -167,30 +167,6 @@ static_assert(IS_ALIGNED(offsetof(struct slab, freelist), sizeof(freelist_aba_t) */ #define slab_page(s) folio_page(slab_folio(s), 0) -/* - * If network-based swap is enabled, sl*b must keep track of whether pages - * were allocated from pfmemalloc reserves. - */ -static inline bool slab_test_pfmemalloc(const struct slab *slab) -{ - return folio_test_active(slab_folio(slab)); -} - -static inline void slab_set_pfmemalloc(struct slab *slab) -{ - folio_set_active(slab_folio(slab)); -} - -static inline void slab_clear_pfmemalloc(struct slab *slab) -{ - folio_clear_active(slab_folio(slab)); -} - -static inline void __slab_clear_pfmemalloc(struct slab *slab) -{ - __folio_clear_active(slab_folio(slab)); -} - static inline void *slab_address(const struct slab *slab) { return folio_address(slab_folio(slab)); diff --git a/mm/slub.c b/mm/slub.c index 2bf1ad8a70ce..8a1df2ad26ed 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -187,6 +187,7 @@ * enum slab_flags - How the slab flags bits are used. * @SL_locked: Is locked with slab_lock() * @SL_partial: On the per-node partial list + * @SL_pfmemalloc: Was allocated from PF_MEMALLOC reserves * * The slab flags share space with the page flags but some bits have * different interpretations. The high bits are used for information @@ -195,6 +196,7 @@ enum slab_flags { SL_locked = PG_locked, SL_partial = PG_workingset, /* Historical reasons for this bit */ + SL_pfmemalloc = PG_active, /* Historical reasons for this bit */ }; /* @@ -648,6 +650,25 @@ static inline unsigned int slub_get_cpu_partial(struct kmem_cache *s) } #endif /* CONFIG_SLUB_CPU_PARTIAL */ +/* + * If network-based swap is enabled, slub must keep track of whether memory + * were allocated from pfmemalloc reserves. + */ +static inline bool slab_test_pfmemalloc(const struct slab *slab) +{ + return test_bit(SL_pfmemalloc, &slab->flags); +} + +static inline void slab_set_pfmemalloc(struct slab *slab) +{ + set_bit(SL_pfmemalloc, &slab->flags); +} + +static inline void __slab_clear_pfmemalloc(struct slab *slab) +{ + __clear_bit(SL_pfmemalloc, &slab->flags); +} + /* * Per slab locking using the pagelock */ -- 2.47.2