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 A245BC677C4 for ; Wed, 11 Jun 2025 15:59:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4304F6B00B5; Wed, 11 Jun 2025 11:59:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3E1726B00B6; Wed, 11 Jun 2025 11:59:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 31D8A6B00B7; Wed, 11 Jun 2025 11:59:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 138BC6B00B5 for ; Wed, 11 Jun 2025 11:59:42 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 96B8810193B for ; Wed, 11 Jun 2025 15:59:41 +0000 (UTC) X-FDA: 83543580162.01.315695B Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf02.hostedemail.com (Postfix) with ESMTP id 082358000D for ; Wed, 11 Jun 2025 15:59:39 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=JGLI8i43; spf=none (imf02.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=1749657580; 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=9JVKrRgKtxE1u77Xam2T1pIGXWzukNaniO09MNHlVbI=; b=d3wL+Rwxqp6i1AiKjwgWPvd/GxF+NvyoImpVrXOoTj/nFBZ3r6HvoG9qlba+f9DkcBjV3F cH9l/dbt0iHZRc7C5vO/maz4Qov6NvZXqtsgzHhuFc3Qk6+DYlYSUVafO0/y7w8+h+Z8KB SSPCgtTUAzk9az3P7YhKs5/K77LHPvU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749657580; a=rsa-sha256; cv=none; b=n9noLfQaMqnsqAvbJvi6mpGvPHDb+BX0M/nmPpCCHZH7C4QyzYr/jxuhz8rWajXVcNe54k z5Rp0OzQ7f/7/Qz3rDapw+ktuoBB/Q/u/5YixgN4SANyLgXNUSm7nsgf/mmWAaRO41rtEr IyyzqMr/RO49+0M57PrpVLKJLNEgqu0= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=JGLI8i43; spf=none (imf02.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none 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=9JVKrRgKtxE1u77Xam2T1pIGXWzukNaniO09MNHlVbI=; b=JGLI8i43sdTqXuIzo7quH9BJ1G Q+pqTulE7fw8cmlLEbNjqsTyVhNQvMO+2rxblDZU+6kjN1Vw3F9Un/pqoPm2j9ww+isVfdnO6q0Al ubA8D5ijjT/+dsIjM98Cfslw+x++2botA4skLN4rcYuXmITpmYq0bOnqoWIj6BGHVn3+PkkDmbM+Q uopPyzWnxUqWPN3+kpimKaRO7tlSo40xW8GuTRPgL4tvgiCw9y0VwOMw+M4lE0gnnxqCL6kF1BfpD +CrAI6QQzWJkM0wvGWYDDe8JQFzRlk478CGsPrwPqkx6vMu54Pb8e5j5STUEKgspq8EOfZnPiQqSK 6pZDXAKw==; Received: from willy by casper.infradead.org with local (Exim 4.98.2 #2 (Red Hat Linux)) id 1uPNrC-0000000Aoxb-12z2; 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 02/11] slab: Rename slab->__page_flags to slab->flags Date: Wed, 11 Jun 2025 16:59:05 +0100 Message-ID: <20250611155916.2579160-3-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-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 082358000D X-Stat-Signature: emjnifhzj1i93wxc3xt5gq1xksokf3s4 X-HE-Tag: 1749657579-907374 X-HE-Meta: U2FsdGVkX19xY3syjt/tDyn9FkyHeVJ9mF7KcbjrIbwj9tjSci7GvHbPkIu1MDLiv5XxJevQLfvc5tqfTqS4w4uZ0BigEVeI/GOHQrjmRbB0XndU7O4GNudyB6EK9PCNcqQ3jBFAiAGL7TJZb5zq6WbeVhDgZeUyhSA1wtOYBg8VKqq6HFYrEeKUiXAlkxDxvmvPd7HX/+Pzo0V2JeLuIViys70/LiOrrn7OsBhH+jhLg32+8LGcX2+67Hg786EfP1uK1C+se6kXMCRwmA4dFK6pwXo2KO+/Dq5of8KfYaIogh0/R8Q2vmLFOcZL4teR+iBWVxdUCueM5dKq11+sMniq3jo2rRC5jBBsG34rtxWaccFso0ef7zcvG/YW2PfBrpcShsUADZSRP38IxFWTUyO+Wv5TZ+3wCHrLo9jmqS6Lh8+UCmJBe3HelMBNVrHrvAaLHDhCtsGIYoBQP3YOoAMUjAmT42nJH8vUPBRL1YfJ7EWo3RAXn/FhC3Qw7yEAt7y8zrhentid7FLTazOegZ1i+dmXs08cGfMKOQ1CopBMQaKPX/vmKFYh9cWEPIOCRkK1kzLEn/5T+EuMcuZNJOn8ZgFBNL5P36xUI9fGBPkarDrOWcV4WH728893b+cyki9nB6alVluCM5/jfEdJMbeCxN12AX0oCTOKscbGO7pofYTTw9xE17Bli5T3n8yhcBROWH2bf7DhHup2ViuMrQw11bIioKmw5P9S/yPDObT/FUWVRqHHjHyLII0KCqYrXFrqW0EXhr9SJAfplfRw18FRHrV/RputAgTpQFPVo85WL7zho87RXtnns3+ZTGcoE6TXXMjXsx2uPjwaM//bBo60yvBLOIvjNHnEcKwHnca7j1gm98fmoHdAAs1jYvt3RIErYMnzkrWQa7ngRnBPvIZ6dCk8UCNypuKpU2tkvC3RXgzWw6W4YCTDtv9X6ezON0sY5+kS//qReQpLUsg hk79pRQJ HcSFpEjJ5lbHh5TZwCdpwT8IsXp6nOZBBT/5DFrpb+aXZpFi2zNnzAMERYzNLjzG0ZLhOVoadd4dxZu1o4LHxBVYSytbZy+mbKdhpDqfKykXKFPjofo9rCEHO+v8/59Bdv4rJasUOjCRW24OWacv+iAao4fDYtmTA1ct2FBl6Q6zwL7R975U3Q6prVkcGNENNMTNR0zD1ht12TrYgOqIjgzXVImjuapBiRzo2gxZYkE41rxGgkhcZ9RqbZ0LPD/GxfgWTX8nFdRy6qPPzktbKhLw/q0VZ6jcQIOIU 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: Slab has its own reasons for using flag bits; they aren't just the page bits. Maybe this won't be the ultimate solution, but we should be clear that these bits are in use. Signed-off-by: Matthew Wilcox (Oracle) --- mm/slab.h | 4 ++-- mm/slub.c | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/mm/slab.h b/mm/slab.h index 05a21dc796e0..32785ff3470a 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -50,7 +50,7 @@ typedef union { /* Reuses the bits in struct page */ struct slab { - unsigned long __page_flags; + unsigned long flags; struct kmem_cache *slab_cache; union { @@ -99,7 +99,7 @@ struct slab { #define SLAB_MATCH(pg, sl) \ static_assert(offsetof(struct page, pg) == offsetof(struct slab, sl)) -SLAB_MATCH(flags, __page_flags); +SLAB_MATCH(flags, flags); SLAB_MATCH(compound_head, slab_cache); /* Ensure bit 0 is clear */ SLAB_MATCH(_refcount, __page_refcount); #ifdef CONFIG_MEMCG diff --git a/mm/slub.c b/mm/slub.c index 31a47299cd99..be44d7bd1f89 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -183,6 +183,18 @@ * the fast path and disables lockless freelists. */ +/** + * enum slab_flags - How the slab flags bits are used. + * @SL_locked: Is locked with slab_lock() + * + * The slab flags share space with the page flags but some bits have + * different interpretations. The high bits are used for information + * like zone/node/section. + */ +enum slab_flags { + SL_locked = PG_locked, +}; + /* * We could simply use migrate_disable()/enable() but as long as it's a * function call even on !PREEMPT_RT, use inline preempt_disable() there. @@ -639,12 +651,12 @@ static inline unsigned int slub_get_cpu_partial(struct kmem_cache *s) */ static __always_inline void slab_lock(struct slab *slab) { - bit_spin_lock(PG_locked, &slab->__page_flags); + bit_spin_lock(SL_locked, &slab->flags); } static __always_inline void slab_unlock(struct slab *slab) { - bit_spin_unlock(PG_locked, &slab->__page_flags); + bit_spin_unlock(SL_locked, &slab->flags); } static inline bool @@ -1010,7 +1022,7 @@ static void print_slab_info(const struct slab *slab) { pr_err("Slab 0x%p objects=%u used=%u fp=0x%p flags=%pGp\n", slab, slab->objects, slab->inuse, slab->freelist, - &slab->__page_flags); + &slab->flags); } void skip_orig_size_check(struct kmem_cache *s, const void *object) -- 2.47.2