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 AF18DC3600C for ; Tue, 8 Apr 2025 10:18:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D79946B0007; Tue, 8 Apr 2025 06:17:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D27C76B0008; Tue, 8 Apr 2025 06:17:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA1686B000A; Tue, 8 Apr 2025 06:17:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 99CA56B0007 for ; Tue, 8 Apr 2025 06:17:58 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 694D01C913C for ; Tue, 8 Apr 2025 10:17:59 +0000 (UTC) X-FDA: 83310475878.04.829BE78 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf15.hostedemail.com (Postfix) with ESMTP id 0484CA0006 for ; Tue, 8 Apr 2025 10:17:56 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=W+ANls4T; spf=pass (imf15.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744107477; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=+QXjoSO++61Rw3lEBx9/YrC1Wu2Hx1g0Z2dV7dOogaI=; b=G6YaZ5Ok6N8u0v1WNln0CqU4asVppuhnQb8Ivjr6BMLXHE/MXD1grSDxQGhi29pKy9WOT9 tjDpb4vy79/WvMkFmbG+VvRGrPuJFh+74os/v8Btqv5tNBuhbRluAeLt5ZuzQL35xCOwMk JmGTDlOi628QTdUYm7pCPozP4jA6ruQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744107477; a=rsa-sha256; cv=none; b=w7KS5ufworpqz/3Vz2V0D9LlDIB5gtdih84uXCAMaYf1wmrcj3Drn5fgFRaBYlUID+ozWm h8hYccQ6ZpsnZwA68eQvyu7NS4OZA+27OQVLXKgPM6NVAUHtSh+IvPXpo3me8SbVUgjz/i PMIBeL6f5W0IyYjqT9FfChy7+e78xnI= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=W+ANls4T; spf=pass (imf15.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744107476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=+QXjoSO++61Rw3lEBx9/YrC1Wu2Hx1g0Z2dV7dOogaI=; b=W+ANls4TjCT8UmnPfjzOf09Rkn5osCXeNehrQr3HYrtiZNa8rc1c+UCO866NnRx1bVr6pa t9+W3Sz8KalqIeepIK/HMNN77xqp6umdGD9Gq2lgUyDZZRNgIDCSpQiLdTHeCAcrKpuN7F i96mn3FAI2dbcW4FtpGg1RPGrDXok3k= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-164-WHH-nobKOvWNdWqRuYbMVQ-1; Tue, 08 Apr 2025 06:17:55 -0400 X-MC-Unique: WHH-nobKOvWNdWqRuYbMVQ-1 X-Mimecast-MFC-AGG-ID: WHH-nobKOvWNdWqRuYbMVQ_1744107474 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-43ceeaf1524so30358605e9.1 for ; Tue, 08 Apr 2025 03:17:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744107474; x=1744712274; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=+QXjoSO++61Rw3lEBx9/YrC1Wu2Hx1g0Z2dV7dOogaI=; b=Ko96hnQSjVb36rKAH5Vik/IVB8CX6xsrDgNb/gl642cRiC9AHg9I6B0d3W0WNCLxVt IRbUSYT0S9uopULQ6K2ErSjuUiXaOkJWsY+0tvvM6PrDVsDdn010j23Zo/1LcfuYMD+c 7+/iwD+AQJnZxuouuyB9DOdABmMuOzqJDm1Lk3CcU2kh6aAZuhKBvwVklOEsfPvyiBN5 gNPz8suGmVeUc6EsaCSxKEu6qF+H+tv8K031pa2o62ue4TjrXMSI94C1mK5sU3WhVq6v XvmMduG19Of8/HSCJ8d13fPFsUpLuoA8Cgo3wYq9kP1wxrsBGoyWooOCPWltguJ5VS3V 2DEg== X-Gm-Message-State: AOJu0YwfGuzXuKR1VIG8Fv9Tc0rera/d0snogZmMUhQQ3yEbAoxGp79N lnZ8F+9Fs110kBrdOY55BusJDtyZTxGNidfVD0GK9k2oa6rP9/xUab8lA6Hi4noOuuYUrZVy5Ar 3BB70Fqc6rkt8fE4qcXngyRneKyHzgTuRV8XLpoMH8qfeUbMq X-Gm-Gg: ASbGnctDTWNdFx+5wL35ym+VuCOYB4k236Owcmf6oIC3hRS0AMvi0rjkk9pfyhGqHdd SBQyU3ovriD4DhbMnhdNHWgd7x5g7djYJ/n+uisKDa45Y3YHdYijWqlyWiXmr+7/RsIHBc+fSGw tzhzY90LbI4NdEy27Jlw47tx4dYvyYFP73u7BbYsAnwfS+6KFsdhomCtKpRz4FRXxSPibj4zDnZ oWotyvE4P9rAQLUPjqDG2P9MJHyxHATzY9E8puj3q0VpHHUnNLqSwSPlMRvoVPrYm4k/pA1o5Kt E/skcPZKjKZfqp0+6ywu42jaDDbqp6UUYPDuZwY9Aa0Vd3f261gnTL2HPH6GiZdzqKWSsRULpcf DKctlxV+00V2RD3uw4+aXiztrpUQ/6LVuJfC5kIIf X-Received: by 2002:a05:600c:6a8e:b0:43d:174:2668 with SMTP id 5b1f17b1804b1-43f0e4169ecmr22305915e9.0.1744107474047; Tue, 08 Apr 2025 03:17:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGvhf/O4SrDVxe52Q5rxDWw5mMOxlWyYd3m7dxYtUfxFz9WvM4KB6/eS6EW0gyvVNLEaYkyqg== X-Received: by 2002:a05:600c:6a8e:b0:43d:174:2668 with SMTP id 5b1f17b1804b1-43f0e4169ecmr22305645e9.0.1744107473616; Tue, 08 Apr 2025 03:17:53 -0700 (PDT) Received: from ?IPV6:2003:cb:c707:4f00:a44a:5ad6:765a:635? (p200300cbc7074f00a44a5ad6765a0635.dip0.t-ipconnect.de. [2003:cb:c707:4f00:a44a:5ad6:765a:635]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c3020d66csm14985167f8f.63.2025.04.08.03.17.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Apr 2025 03:17:53 -0700 (PDT) Message-ID: <92ff4f7f-90d2-48ab-8f7d-7fc3485276b5@redhat.com> Date: Tue, 8 Apr 2025 12:17:52 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 1/3] mm,slub: Do not special case N_NORMAL nodes for slab_nodes To: Oscar Salvador , Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Vlastimil Babka , Harry Yoo , Jonathan Cameron , linux-cxl@vger.kernel.org References: <20250408084153.255762-1-osalvador@suse.de> <20250408084153.255762-2-osalvador@suse.de> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20250408084153.255762-2-osalvador@suse.de> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ALTxqjbabJkgFdMzK2orWKNrr_HGsxFaMsHgeJQkj_Q_1744107474 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 0484CA0006 X-Stat-Signature: 7ptpia4urc1yngky3f4hszia6dy6nwam X-HE-Tag: 1744107476-584907 X-HE-Meta: U2FsdGVkX19xLb4ZDqjdQcmd3ZYJapZzGdTdQKwTeTdo4A80h3D7GL6CdnSJ10tRRyFxzpDVhyPElmRvB+XXuq0i0YOY1m8VKVSEKbasmuGBc8P/15M7TZ1g0i+hTYddxiyjGOX2gn0+1WPV7onBOWLG7EbEK/TezwXt6S8Ir0S09mA7e4nRuMts+W4lzSAoqQcVpyLshH4mfkAE63hQz9COYbAheTEgPg/v6SWlS8uLRF0qAv9t8IbUCddjMuP0QW7ZRIUfYLHWzO/KrhJGniqQW/tOYvae9AoBK/l0qTG+q3POuO4zmhd3eQaBb5y1hqA4M048srW1v8k6hS9ZRgRjZkLp0eHVMmybSRZzakUKCk3GRPJU4yRruBYNYozZDCoN9Q50zjYQGnNrzQJUETS7yAukFuRUQS8tCLxjHRRUz+avr2SenCnPiea5wB/VvWjDx0Eec87dV/yxeowMFoRkFRgFyeFyG+68PSp2dMS3DorcByp2LNRinI3CHQwjzEXt2SxLAKkrZ/OpGcwp4kmL/4Fl5UjobqCw5dCf9udNr0HH7TgHVovW5MrhMxPG5octqjl7yzonueCYiyyl+MWEqMrGcZimciVCD4/laTAuKGhXlo3LsNC2nqEKMqOUcVJk9vuJn6v+RX/mUGirgBntPffc8YHc8wGshKj0NFkhmGJfWTvSAmd5+dEF1v6eXH2M92+qGIL6v0dPMk/XBGjY31wnulyV+XQfIbRcpCAfQjJhPa3+zn8gwzhVdiAvC4AafjZpldq5t6Ev94niEziXOvFz+ZOusEAjynE2AJdoh1xw0/Iclr29yCFJPH/l9nFFvjiq4+n/36uczdDIUcvHIKiXLC6EJhPv0EZoewlGU1yVDSBY9LJQHJudBiFdTb9OdU/JiwUKXiH704LD9TmNItU1v2QEwNYqPpncKPXNqnB32j3Paityuaxb/AhgYSOCXBisRbwkxXPoKpW JxOI4q9z FHNDcysgDAlQSEjCBFBirutKgdy75GpWi1lcmqzgoWeYkyq0msf9Nt/Rmry0VWa4t8q95leOulPKO/4LIJ7uvBosevck0mxkZyTAuZU6dbRx9x8F+AQnNtsfIvSXgYRE05dXzbJKfAnchWd2TJHOkhed4Nr0iioH8xKJyETZimSN3roeN8ITDA3IY9TAaf9lTDaRUD6C2o5PNAfdJzBs2hjJ6RVU7hlSsTfs20z0WkymSIrTM0VCPFdjRd4DUwTpV2FldJggrDdqw+dTCfTHONu0p2qIrJK5Ryr0X+174ge09XfFMpZf3P989Z2siPhoL6YzBNlUnmltSN8GtioNVGKsuTVJ8c7qyf3hh+znRhaqcDkR/WmRig4dlLkX6EG1nq4rWd32MRPR6rRysemj9ICrI5RcMVN7j4wd2Ft85ABYqUxgmdZd7Cd2Adj5YyWsPgBwapRFTzzmb18R94MOlKXb5XrBQXKeNvmnb 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: On 08.04.25 10:41, Oscar Salvador wrote: > Currently, slab_mem_going_going_callback() checks whether the node has > N_NORMAL memory in order to be set in slab_nodes. > While it is true that gettind rid of that enforcing would mean > ending up with movables nodes in slab_nodes, the memory waste that comes > with that is negligible. > > So stop checking for status_change_nid_normal and just use status_change_nid > instead which works for both types of memory. > > Also, once we allocate the kmem_cache_node cache for the node in > slab_mem_online_callback(), we never deallocate it in > slab_mem_off_callback() when the node goes memoryless, so we can just > get rid of it. > > The only side effect is that we will stop clearing the node from slab_nodes. > Feel free to add a Suggested-by: if you think it applies. Do we have to take care of the N_NORMAL_MEMORY check in kmem_cache_init() ? Likely it would have to be a N_MEMORY check. But, I was wondering if we could get rid of the "slab_nodes" thingy as a first step? From 518a2b83a9c5bd85d74ddabbc36ce5d181a88ed6 Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Tue, 8 Apr 2025 12:16:13 +0200 Subject: [PATCH] tmp Signed-off-by: David Hildenbrand --- mm/slub.c | 56 ++++--------------------------------------------------- 1 file changed, 4 insertions(+), 52 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index b46f87662e71d..afe31149e7f4e 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -445,14 +445,6 @@ static inline struct kmem_cache_node *get_node(struct kmem_cache *s, int node) for (__node = 0; __node < nr_node_ids; __node++) \ if ((__n = get_node(__s, __node))) -/* - * Tracks for which NUMA nodes we have kmem_cache_nodes allocated. - * Corresponds to node_state[N_NORMAL_MEMORY], but can temporarily - * differ during memory hotplug/hotremove operations. - * Protected by slab_mutex. - */ -static nodemask_t slab_nodes; - #ifndef CONFIG_SLUB_TINY /* * Workqueue used for flush_cpu_slab(). @@ -3706,10 +3698,9 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, if (!slab) { /* * if the node is not online or has no normal memory, just - * ignore the node constraint + * ignore the node constraint. */ - if (unlikely(node != NUMA_NO_NODE && - !node_isset(node, slab_nodes))) + if (unlikely(node != NUMA_NO_NODE && !node_state(node, N_NORMAL_MEMORY))) node = NUMA_NO_NODE; goto new_slab; } @@ -3719,7 +3710,7 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, * same as above but node_match() being false already * implies node != NUMA_NO_NODE */ - if (!node_isset(node, slab_nodes)) { + if (!node_state(node, N_NORMAL_MEMORY)) { node = NUMA_NO_NODE; } else { stat(s, ALLOC_NODE_MISMATCH); @@ -5623,7 +5614,7 @@ static int init_kmem_cache_nodes(struct kmem_cache *s) { int node; - for_each_node_mask(node, slab_nodes) { + for_each_node_state(node, N_NORMAL_MEMORY) { struct kmem_cache_node *n; if (slab_state == DOWN) { @@ -6164,30 +6155,6 @@ static int slab_mem_going_offline_callback(void *arg) return 0; } -static void slab_mem_offline_callback(void *arg) -{ - struct memory_notify *marg = arg; - int offline_node; - - offline_node = marg->status_change_nid_normal; - - /* - * If the node still has available memory. we need kmem_cache_node - * for it yet. - */ - if (offline_node < 0) - return; - - mutex_lock(&slab_mutex); - node_clear(offline_node, slab_nodes); - /* - * We no longer free kmem_cache_node structures here, as it would be - * racy with all get_node() users, and infeasible to protect them with - * slab_mutex. - */ - mutex_unlock(&slab_mutex); -} - static int slab_mem_going_online_callback(void *arg) { struct kmem_cache_node *n; @@ -6229,11 +6196,6 @@ static int slab_mem_going_online_callback(void *arg) init_kmem_cache_node(n); s->node[nid] = n; } - /* - * Any cache created after this point will also have kmem_cache_node - * initialized for the new node. - */ - node_set(nid, slab_nodes); out: mutex_unlock(&slab_mutex); return ret; @@ -6253,8 +6215,6 @@ static int slab_memory_callback(struct notifier_block *self, break; case MEM_OFFLINE: case MEM_CANCEL_ONLINE: - slab_mem_offline_callback(arg); - break; case MEM_ONLINE: case MEM_CANCEL_OFFLINE: break; @@ -6309,7 +6269,6 @@ void __init kmem_cache_init(void) { static __initdata struct kmem_cache boot_kmem_cache, boot_kmem_cache_node; - int node; if (debug_guardpage_minorder()) slub_max_order = 0; @@ -6321,13 +6280,6 @@ void __init kmem_cache_init(void) kmem_cache_node = &boot_kmem_cache_node; kmem_cache = &boot_kmem_cache; - /* - * Initialize the nodemask for which we will allocate per node - * structures. Here we don't need taking slab_mutex yet. - */ - for_each_node_state(node, N_NORMAL_MEMORY) - node_set(node, slab_nodes); - create_boot_cache(kmem_cache_node, "kmem_cache_node", sizeof(struct kmem_cache_node), SLAB_HWCACHE_ALIGN | SLAB_NO_OBJ_EXT, 0, 0); -- 2.48.1 Not sure if there are any races to consider ... just an idea. -- Cheers, David / dhildenb