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 A43C3EE6456 for ; Fri, 15 Sep 2023 11:00:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 20ED18D0023; Fri, 15 Sep 2023 07:00:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 197028D0012; Fri, 15 Sep 2023 07:00:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F03008D0023; Fri, 15 Sep 2023 07:00:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D14C68D0012 for ; Fri, 15 Sep 2023 07:00:12 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A8E51160FB9 for ; Fri, 15 Sep 2023 11:00:12 +0000 (UTC) X-FDA: 81238537464.10.69B1B85 Received: from mail-ej1-f73.google.com (mail-ej1-f73.google.com [209.85.218.73]) by imf26.hostedemail.com (Postfix) with ESMTP id C482714001B for ; Fri, 15 Sep 2023 11:00:10 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=NKeBdhHE; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf26.hostedemail.com: domain of 3OTkEZQsKCOoYMffQadUllaSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--matteorizzo.bounces.google.com designates 209.85.218.73 as permitted sender) smtp.mailfrom=3OTkEZQsKCOoYMffQadUllaSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--matteorizzo.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694775610; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Xv8bl1gghcslEiMH0/FhgvPpwPOagI6elAD3nLRWX2k=; b=D+sBTO0OU1ZkN+PWyMVvTe4j6Qn4WcwzqrMcMFy5iBUsE/rtDdNPYD0/Vgttcs5IRe9tbo mAaccPFYtPK35VyX8sbfEUxyEvc/Gmnw97f72izIK6JLymK08zJJ3wORvGPGbiKYrJQ+nU Xn8VFJAJRHjvw3TdBAyZuELO/p4cREo= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=NKeBdhHE; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf26.hostedemail.com: domain of 3OTkEZQsKCOoYMffQadUllaSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--matteorizzo.bounces.google.com designates 209.85.218.73 as permitted sender) smtp.mailfrom=3OTkEZQsKCOoYMffQadUllaSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--matteorizzo.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694775610; a=rsa-sha256; cv=none; b=KCP3mK1lex2WxAAWLiwu++nBkGuCdJNspYY5rCS1tSHvcmFCGV32ezk4RbuT4mVfnlVbUf bk3GW7c58ltcJ6VRCt11GloLp6RC0Ajs6fhvLPvHzt7AF2SbK4uJ6R6jlUufzdC51N17Ph q3rNZsfU8jNvQI1/1gsZtu42lA1nQ70= Received: by mail-ej1-f73.google.com with SMTP id a640c23a62f3a-9a9d7a801a3so143154766b.2 for ; Fri, 15 Sep 2023 04:00:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694775609; x=1695380409; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Xv8bl1gghcslEiMH0/FhgvPpwPOagI6elAD3nLRWX2k=; b=NKeBdhHEtU9j8330XkS/9L0CmnYD/1KdDhqz4gq8HgKxhZxNKnxFDCiJfvkXZBf+pI Ns4FQ7C6rXucQSE0erTHMVUOQ48qteutQDn8kHEOvgvgGHTXmu28rtlENvQvJcbDQLbj cU4Uw/KCXNdze1HSdW4prV8JDNStoW5pfAEteswURPQGMmX6v9PIR5h5tMdsJDldBJH4 enpiPOKFyEk/RZRUnfYnGcWdhIl8GHm1Io2Ixk2NW4fRgf8nEXJAuRysQcRvDeXkGXot Tni7n0hBSUeh8MvlQ3djeizW/aHBUci4/LZt3tO0w9g8je2U0OHLW2Gl0vGJuNXqNVc1 qKVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694775609; x=1695380409; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Xv8bl1gghcslEiMH0/FhgvPpwPOagI6elAD3nLRWX2k=; b=VoFU/vJ/NzSVEIJ7oA0oWWjaolbNMaXKX+EDUbqtNSokkJnlHK7ZVJI/rC6kDGEZLN GSifHZGIEx2JIWIIAmoV3LBQg5ZRgeQ1Eg8R5NjQnFid5oefquFWgJY9dnierhs+CZSU Qp1WUZkc7Y5qIsUu+5WAM5iDHYAmqwuCl4DJyExbmYDG9K0xmadDOAFNN8R7Tt9jXhHw Nmyd0SFUfpQoFxmihRp9dzdp7g2yigcskKarG6jspKf9dfeFYym8ObvrZf0wYY7T0nI6 SEtmm0QH3Ky4Cj6ofXQRTWI732KMPDWFdqryqzjpJ6Xd5vbz2e4PErg7f7NrPAefdRKu KJWg== X-Gm-Message-State: AOJu0YzpsAVkCCxh/D90ihgx3X3LV7m+NAEy7PZ/MF5kTfrCVVDqaCQx G/m4HFE4RxhjITVD4Afdhx3YnWMT06dUNLJ/pg== X-Google-Smtp-Source: AGHT+IEynAr2SnY1fMJiDuLoEg0/d2a8kjbFH3ONSC9J81629RSdKiVLHnan7ER1f/DyQsRkv3eYGMXRY5zwIxc8BQ== X-Received: from mr-cloudtop2.c.googlers.com ([fda3:e722:ac3:cc00:31:98fb:c0a8:2a6]) (user=matteorizzo job=sendgmr) by 2002:a17:907:71d7:b0:9ad:c478:586b with SMTP id zw23-20020a17090771d700b009adc478586bmr6329ejb.13.1694775609336; Fri, 15 Sep 2023 04:00:09 -0700 (PDT) Date: Fri, 15 Sep 2023 10:59:31 +0000 In-Reply-To: <20230915105933.495735-1-matteorizzo@google.com> Mime-Version: 1.0 References: <20230915105933.495735-1-matteorizzo@google.com> X-Mailer: git-send-email 2.42.0.459.ge4e396fd5e-goog Message-ID: <20230915105933.495735-13-matteorizzo@google.com> Subject: [RFC PATCH 12/14] mm/slub: introduce the deallocated_pages sysfs attribute From: Matteo Rizzo To: cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, akpm@linux-foundation.org, vbabka@suse.cz, roman.gushchin@linux.dev, 42.hyeyoo@gmail.com, keescook@chromium.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-hardening@vger.kernel.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, corbet@lwn.net, luto@kernel.org, peterz@infradead.org Cc: jannh@google.com, matteorizzo@google.com, evn@google.com, poprdi@google.com, jordyzomer@google.com Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: C482714001B X-Stat-Signature: zorb4qj1djohtk89cixrx64dkgz89zqf X-HE-Tag: 1694775610-713327 X-HE-Meta: U2FsdGVkX1/G+KO2/kM4rYOJH6y+trWdiN7SYLhr9JjHkFFjOe5YCS0a5JT9eItbJCecm85Uaa0714MgGGnZ1JM+CAi4N3YlQMHG2UcQZP3l6I6CkBqy3KAz6/FZmTEffMWEjvmmEenIvnWx6e62rn4UK5r9uROjmH0vuIpAvIAOnlVKagF8X2SYyMf78AjkatDZixL0+V8rEdYI3F/WPSIK6QsykXg1AFh37pZJaBKaTewxBlhPYdIi90kczxaJCUdgGYBWG95iFmgX6uvpOp03bnj2AxpucsC+6DZzrfQbEmo6QrbesDN8jj4kITNb/UnBk7WhUk7+Sd/uQlxUAU8rrNbdBzd8EqbCiZAOCqCxcrKiCFHLOi/g8/8JT/DUQ17gdMu2p3I82HmKzd0FKxY87I5Vb3HCENbeDPTb7Irc+csIqKOd/BTw2DvQWS93HK6FT/mWwsYHAumSFDMLvyhfQwCh2fjoq2kSRlpMcyM2j7az59kLa/88KNtbMhdCZuCvI1YLI8yomqLlHHJcE0VyM1BKaiKTkiPSFsNitfGLP4jPchjpDeqza4CGHBAlnlT5nMpUbLoHRSyurd5s+3LMIDbqG7RmYjxAHMCz8vUpI8h3Oa1w/1T32r/K2RSXhWjieCTbL5IY4LIoPOTCsBju6QHrP6jjWhkTJmht6lLN6l4hFkJIEPleWnkR8fs7cO5pO9ZpDe9kaWLemD5HIgfWq/DFuSLhSisJ/Ab7shvvkENfSxSdiN61PAGxv/+zkdifxI6KwQ1w9LvK9dT4De4xqdLO85nGZjDqKSOqpkgZyWbR3lJZBkm9ThawclDeK2WRFP0sNP4VM9EXjwmAUVqEIOd7beLqbD0+v94ndCjoO+ypHTpHj9UogPwjI4neUjE2acakADFTGoJxqJtaKkog85tGMoc1brlDSJQlnhziT7wvQOOZHmysUmNWQtf8Jc+7NWfvkXDFuMGmcGl FOiv5ZFQ PfDTOb9Z9ks9Kr2bWZshgx78ZF7eUN2/iI+Wd2WoXW5s0eRFSjT5KrB7nedb6pzdb+3HapZ1LhJVVaQreBkI7KEBta/icu6muJTjsrSs8cHPc1e98gD0RKXWbHqD4Z62jsjFKGh1xLsHHC/xuwgzBHYPR2MeIDnO+xEkGhqwBmNXwCiRPX0PSPxvkLBANGnXPj03C3PjtHlBQm0wieD4X/QUQbDXNkntry3fAO/kIK4AMgLsB8qvvPiIxczrozklFw+5uluoR1BNqJ9S9duiIrIcT6LihwJZHVvQnZMlouDunc3igIHcxtjREBeouhmHJZle7c+Ox2jYFs24Vj6oicSNbd1c+kILC20VyB6OZ7qe+LB8oKx3yCw4h/wM1IDBdZC6GtHqkxbf3VYGbWJ3Lbk5RmdMhmWiJ7fTsvDrej2YsbztDnMpy/1d2w3Bxr0rxjZ6IJmMKPSpNLXWuxJWTLhzFAqEhkArs53MYIJHNR62Q0GjkB8li5gB2d2hctntfyD88OzeEsb5Xh6Ps3Y9nGDvwI6q4jNTjSYCh/TXZKr1MXoZdglbHAWk/2Z5jXwBNMl36J/ppJ8xG1LWDGJpFGGIQCbBLsyyc3WfuTpM0NAta1apg0TPnz+5h73hZr7c2dMcFZouakEy02xJAPPav1WS3ow+VEzeuU7SdmEQElLCRXgM= 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: From: Jann Horn When SLAB_VIRTUAL is enabled this new sysfs attribute tracks the number of slab pages whose physical memory has been reclaimed but whose virtual memory is still allocated to a kmem_cache. Signed-off-by: Jann Horn Co-developed-by: Matteo Rizzo Signed-off-by: Matteo Rizzo --- include/linux/slub_def.h | 4 +++- mm/slub.c | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index 693e9bb34edc..eea402d849da 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h @@ -88,7 +88,7 @@ struct kmem_cache_cpu { */ struct kmem_cache_virtual { #ifdef CONFIG_SLAB_VIRTUAL - /* Protects freed_slabs and freed_slabs_min */ + /* Protects freed_slabs, freed_slabs_min, and nr_free_pages */ spinlock_t freed_slabs_lock; /* * Slabs on this list have virtual memory of size oo allocated to them @@ -97,6 +97,8 @@ struct kmem_cache_virtual { struct list_head freed_slabs; /* Same as freed_slabs but with memory of size min */ struct list_head freed_slabs_min; + /* Number of slab pages which got freed */ + unsigned long nr_freed_pages; #endif }; diff --git a/mm/slub.c b/mm/slub.c index 66ae60cdadaf..0f7f5bf0b174 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2110,6 +2110,8 @@ static struct slab *get_free_slab(struct kmem_cache *s, if (likely(slab)) { list_del(&slab->slab_list); + WRITE_ONCE(s->virtual.nr_freed_pages, + s->virtual.nr_freed_pages - (1UL << slab_order(slab))); spin_unlock_irqrestore(&s->virtual.freed_slabs_lock, flags); return slab; @@ -2158,6 +2160,8 @@ static struct slab *alloc_slab_page(struct kmem_cache *s, /* Rollback: put the struct slab back. */ spin_lock_irqsave(&s->virtual.freed_slabs_lock, flags); list_add(&slab->slab_list, freed_slabs); + WRITE_ONCE(s->virtual.nr_freed_pages, + s->virtual.nr_freed_pages + (1UL << slab_order(slab))); spin_unlock_irqrestore(&s->virtual.freed_slabs_lock, flags); return NULL; @@ -2438,6 +2442,8 @@ static void slub_tlbflush_worker(struct kthread_work *work) WARN_ON(oo_order(slab->oo) != oo_order(s->min)); list_add(&slab->slab_list, &s->virtual.freed_slabs_min); } + WRITE_ONCE(s->virtual.nr_freed_pages, s->virtual.nr_freed_pages + + (1UL << slab_order(slab))); spin_unlock(&s->virtual.freed_slabs_lock); } spin_unlock_irqrestore(&slub_kworker_lock, irq_flags); @@ -4924,6 +4930,7 @@ static inline void slab_virtual_open(struct kmem_cache *s) spin_lock_init(&s->virtual.freed_slabs_lock); INIT_LIST_HEAD(&s->virtual.freed_slabs); INIT_LIST_HEAD(&s->virtual.freed_slabs_min); + s->virtual.nr_freed_pages = 0; #endif } @@ -6098,6 +6105,14 @@ static ssize_t objects_partial_show(struct kmem_cache *s, char *buf) } SLAB_ATTR_RO(objects_partial); +#ifdef CONFIG_SLAB_VIRTUAL +static ssize_t deallocated_pages_show(struct kmem_cache *s, char *buf) +{ + return sysfs_emit(buf, "%lu\n", READ_ONCE(s->virtual.nr_freed_pages)); +} +SLAB_ATTR_RO(deallocated_pages); +#endif /* CONFIG_SLAB_VIRTUAL */ + static ssize_t slabs_cpu_partial_show(struct kmem_cache *s, char *buf) { int objects = 0; @@ -6424,6 +6439,9 @@ static struct attribute *slab_attrs[] = { &min_partial_attr.attr, &cpu_partial_attr.attr, &objects_partial_attr.attr, +#ifdef CONFIG_SLAB_VIRTUAL + &deallocated_pages_attr.attr, +#endif &partial_attr.attr, &cpu_slabs_attr.attr, &ctor_attr.attr, -- 2.42.0.459.ge4e396fd5e-goog