From patchwork Tue Mar 9 06:23:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Minchan Kim X-Patchwork-Id: 12124233 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.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 6C1DEC433E6 for ; Tue, 9 Mar 2021 06:23:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EE0376526C for ; Tue, 9 Mar 2021 06:23:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EE0376526C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7B39F8D00B4; Tue, 9 Mar 2021 01:23:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 763928D007F; Tue, 9 Mar 2021 01:23:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 604088D00B4; Tue, 9 Mar 2021 01:23:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0168.hostedemail.com [216.40.44.168]) by kanga.kvack.org (Postfix) with ESMTP id 405D18D007F for ; Tue, 9 Mar 2021 01:23:40 -0500 (EST) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id D51751730844 for ; Tue, 9 Mar 2021 06:23:39 +0000 (UTC) X-FDA: 77899344558.11.CC0C592 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by imf06.hostedemail.com (Postfix) with ESMTP id 64E32C0001EE for ; Tue, 9 Mar 2021 06:23:39 +0000 (UTC) Received: by mail-pg1-f179.google.com with SMTP id v14so1150503pgq.2 for ; Mon, 08 Mar 2021 22:23:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tJzIOcFBu4yonwIwsIyQXifzObwXNjdAETzu8HpriMc=; b=Ja6CHlr6flviktEKD/C6O05x729Pz8BwiLV6E2XQHOQJwZWQ2DAhM9tCtZLXSszGs4 kG2VUe1Y4aUOMBbjPFbWvZF3yAYPsei2QNx60DeOkb091uSGbaHg2poukLjXBmBwcFhT 8g0EIrzRJ7+6yx8jwswSdleGtXCMYpdbHIUlsQP/kcvxHDjfrbGpph0O/QvhgUrpYFuL 6FTG5lGh3mDzdyD45usJffB2AfvY8iLmsVVZlzt0CbB5InWc50rU/80pkJ6/QcPbxGWF TPY5461pYVaxsFFPyOAArwPaQKgh6//03B29jrCLpalA/99MjQ8a1WTGbRRmcigrujne da7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=tJzIOcFBu4yonwIwsIyQXifzObwXNjdAETzu8HpriMc=; b=kTIiSvpksEk6+7rugtSU10D3V6Qw588MraI5yy8XdS4jz+CuK1S078tuugle0iECGL c7aEkO1uZJ+lUJ5oz8cvBJS+cPEGw0CB+JapbJ6pDMPRW9MkMuQquWCc+r6YJ9E5OhDq pLfPgCQwgKOKfTaI7/JKI72EkEJ0wfU/m66I2UpFcTyfdIfniOqxs2Be2hgwXJIOpUxw KwYOYxFGj3MdUIxm3mu34cWZ2t/6vnbJr5PsrxqUPED+bKX6A4ro6zaYczb8P1a24Iwy 5bjqykAsLSdSzDZzaD3tcp6qE691MqD60t99svPMwl4/ueJmzjz2+89oSTurJJyETBP1 5WkQ== X-Gm-Message-State: AOAM532pqSV1ci4NjtKeYkFcsJ2uO5VNvxKWMHccteHPL0FnxhRUC3dd 956eD7ryKgtbNnOAIW2HZaU= X-Google-Smtp-Source: ABdhPJwZMOpehLXPSaus0vHRfCnz6cXHmvmh3jW0zfWXWhx3I8Fnp9vUFEssAaOVvN2m6stFbJyjvw== X-Received: by 2002:a65:44c5:: with SMTP id g5mr24015616pgs.295.1615271018216; Mon, 08 Mar 2021 22:23:38 -0800 (PST) Received: from bbox-1.mtv.corp.google.com ([2620:15c:211:201:4ccc:acdd:25da:14d1]) by smtp.gmail.com with ESMTPSA id u7sm11583223pfh.150.2021.03.08.22.23.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 22:23:37 -0800 (PST) From: Minchan Kim To: Andrew Morton Cc: linux-mm , LKML , joaodias@google.com, willy@infradead.org, david@redhat.com, surenb@google.com, Minchan Kim , Greg Kroah-Hartman , John Hubbard Subject: [PATCH v4] mm: cma: support sysfs Date: Mon, 8 Mar 2021 22:23:33 -0800 Message-Id: <20210309062333.3216138-1-minchan@kernel.org> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 64E32C0001EE X-Stat-Signature: yzg7mhxsg3wpyg7ihibubdknsgktup6z Received-SPF: none (gmail.com>: No applicable sender policy available) receiver=imf06; identity=mailfrom; envelope-from=""; helo=mail-pg1-f179.google.com; client-ip=209.85.215.179 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1615271019-238140 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: Since CMA is getting used more widely, it's more important to keep monitoring CMA statistics for system health since it's directly related to user experience. This patch introduces sysfs statistics for CMA, in order to provide some basic monitoring of the CMA allocator. * the number of CMA page successful allocations * the number of CMA page allocation failures These two values allow the user to calcuate the allocation failure rate for each CMA area. e.g.) /sys/kernel/mm/cma/WIFI/alloc_pages_[success|fail] /sys/kernel/mm/cma/SENSOR/alloc_pages_[success|fail] /sys/kernel/mm/cma/BLUETOOTH/alloc_pages_[success|fail] The cma_stat was intentionally allocated by dynamic allocation to harmonize with kobject lifetime management. https://lore.kernel.org/linux-mm/YCOAmXqt6dZkCQYs@kroah.com/ Reviewed-by: Greg Kroah-Hartman Reviewed-by: John Hubbard Signed-off-by: Minchan Kim Signed-off-by: Minchan Kim Tested-by: Dmitry Osipenko --- From v3 - https://lore.kernel.org/linux-mm/20210303205053.2906924-1-minchan@kernel.org/ * fix ZERO_OR_NULL_PTR - kernel test robot * remove prefix cma - david@ * resolve conflict with vmstat cma in mmotm - akpm@ * rename stat name with success|fail From v2 - https://lore.kernel.org/linux-mm/20210208180142.2765456-1-minchan@kernel.org/ * sysfs doc and description modification - jhubbard From v1 - https://lore.kernel.org/linux-mm/20210203155001.4121868-1-minchan@kernel.org/ * fix sysfs build and refactoring - willy * rename and drop some attributes - jhubbard Documentation/ABI/testing/sysfs-kernel-mm-cma | 25 ++++ mm/Kconfig | 7 ++ mm/Makefile | 1 + mm/cma.c | 7 +- mm/cma.h | 20 ++++ mm/cma_sysfs.c | 110 ++++++++++++++++++ 6 files changed, 168 insertions(+), 2 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cma create mode 100644 mm/cma_sysfs.c diff --git a/Documentation/ABI/testing/sysfs-kernel-mm-cma b/Documentation/ABI/testing/sysfs-kernel-mm-cma new file mode 100644 index 000000000000..02b2bb60c296 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-kernel-mm-cma @@ -0,0 +1,25 @@ +What: /sys/kernel/mm/cma/ +Date: Feb 2021 +Contact: Minchan Kim +Description: + /sys/kernel/mm/cma/ contains a subdirectory for each CMA + heap name (also sometimes called CMA areas). + + Each CMA heap subdirectory (that is, each + /sys/kernel/mm/cma/ directory) contains the + following items: + + alloc_pages_success + alloc_pages_fail + +What: /sys/kernel/mm/cma//alloc_pages_success +Date: Feb 2021 +Contact: Minchan Kim +Description: + the number of pages CMA API succeeded to allocate + +What: /sys/kernel/mm/cma//alloc_pages_fail +Date: Feb 2021 +Contact: Minchan Kim +Description: + the number of pages CMA API failed to allocate diff --git a/mm/Kconfig b/mm/Kconfig index 24c045b24b95..febb7e8e24de 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -513,6 +513,13 @@ config CMA_DEBUGFS help Turns on the DebugFS interface for CMA. +config CMA_SYSFS + bool "CMA information through sysfs interface" + depends on CMA && SYSFS + help + This option exposes some sysfs attributes to get information + from CMA. + config CMA_AREAS int "Maximum count of the CMA areas" depends on CMA diff --git a/mm/Makefile b/mm/Makefile index 72227b24a616..56968b23ed7a 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -109,6 +109,7 @@ obj-$(CONFIG_CMA) += cma.o obj-$(CONFIG_MEMORY_BALLOON) += balloon_compaction.o obj-$(CONFIG_PAGE_EXTENSION) += page_ext.o obj-$(CONFIG_CMA_DEBUGFS) += cma_debug.o +obj-$(CONFIG_CMA_SYSFS) += cma_sysfs.o obj-$(CONFIG_USERFAULTFD) += userfaultfd.o obj-$(CONFIG_IDLE_PAGE_TRACKING) += page_idle.o obj-$(CONFIG_DEBUG_PAGE_REF) += debug_page_ref.o diff --git a/mm/cma.c b/mm/cma.c index 908f04775686..ac050359faae 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -507,10 +507,13 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align, pr_debug("%s(): returned %p\n", __func__, page); out: - if (page) + if (page) { count_vm_event(CMA_ALLOC_SUCCESS); - else + cma_sysfs_alloc_pages_count(cma, count); + } else { count_vm_event(CMA_ALLOC_FAIL); + cma_sysfs_fail_pages_count(cma, count); + } return page; } diff --git a/mm/cma.h b/mm/cma.h index 42ae082cb067..95d1aa2d808a 100644 --- a/mm/cma.h +++ b/mm/cma.h @@ -3,6 +3,16 @@ #define __MM_CMA_H__ #include +#include + +struct cma_stat { + spinlock_t lock; + /* the number of CMA page successful allocations */ + unsigned long nr_pages_succeeded; + /* the number of CMA page allocation failures */ + unsigned long nr_pages_failed; + struct kobject kobj; +}; struct cma { unsigned long base_pfn; @@ -16,6 +26,9 @@ struct cma { struct debugfs_u32_array dfs_bitmap; #endif char name[CMA_MAX_NAME]; +#ifdef CONFIG_CMA_SYSFS + struct cma_stat *stat; +#endif }; extern struct cma cma_areas[MAX_CMA_AREAS]; @@ -26,4 +39,11 @@ static inline unsigned long cma_bitmap_maxno(struct cma *cma) return cma->count >> cma->order_per_bit; } +#ifdef CONFIG_CMA_SYSFS +void cma_sysfs_alloc_pages_count(struct cma *cma, size_t count); +void cma_sysfs_fail_pages_count(struct cma *cma, size_t count); +#else +static inline void cma_sysfs_alloc_pages_count(struct cma *cma, size_t count) {}; +static inline void cma_sysfs_fail_pages_count(struct cma *cma, size_t count) {}; +#endif #endif diff --git a/mm/cma_sysfs.c b/mm/cma_sysfs.c new file mode 100644 index 000000000000..3134b2b3a96d --- /dev/null +++ b/mm/cma_sysfs.c @@ -0,0 +1,110 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * CMA SysFS Interface + * + * Copyright (c) 2021 Minchan Kim + */ + +#include +#include +#include + +#include "cma.h" + +static struct cma_stat *cma_stats; + +void cma_sysfs_alloc_pages_count(struct cma *cma, size_t count) +{ + spin_lock(&cma->stat->lock); + cma->stat->nr_pages_succeeded += count; + spin_unlock(&cma->stat->lock); +} + +void cma_sysfs_fail_pages_count(struct cma *cma, size_t count) +{ + spin_lock(&cma->stat->lock); + cma->stat->nr_pages_failed += count; + spin_unlock(&cma->stat->lock); +} + +#define CMA_ATTR_RO(_name) \ + static struct kobj_attribute _name##_attr = __ATTR_RO(_name) + +static struct kobject *cma_kobj; + +static ssize_t alloc_pages_success_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + struct cma_stat *stat = container_of(kobj, struct cma_stat, kobj); + + return sysfs_emit(buf, "%lu\n", stat->nr_pages_succeeded); +} +CMA_ATTR_RO(alloc_pages_success); + +static ssize_t alloc_pages_fail_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + struct cma_stat *stat = container_of(kobj, struct cma_stat, kobj); + + return sysfs_emit(buf, "%lu\n", stat->nr_pages_failed); +} +CMA_ATTR_RO(alloc_pages_fail); + +static void cma_kobj_release(struct kobject *kobj) +{ + struct cma_stat *stat = container_of(kobj, struct cma_stat, kobj); + + kfree(stat); +} + +static struct attribute *cma_attrs[] = { + &alloc_pages_success_attr.attr, + &alloc_pages_fail_attr.attr, + NULL, +}; +ATTRIBUTE_GROUPS(cma); + +static struct kobj_type cma_ktype = { + .release = cma_kobj_release, + .sysfs_ops = &kobj_sysfs_ops, + .default_groups = cma_groups +}; + +static int __init cma_sysfs_init(void) +{ + int i = 0; + struct cma *cma; + + cma_kobj = kobject_create_and_add("cma", mm_kobj); + if (!cma_kobj) + return -ENOMEM; + + cma_stats = kmalloc_array(cma_area_count, sizeof(struct cma_stat), + GFP_KERNEL|__GFP_ZERO); + if (ZERO_OR_NULL_PTR(cma_stats)) + goto out; + + do { + cma = &cma_areas[i]; + cma->stat = &cma_stats[i]; + spin_lock_init(&cma->stat->lock); + if (kobject_init_and_add(&cma->stat->kobj, &cma_ktype, + cma_kobj, "%s", cma->name)) { + kobject_put(&cma->stat->kobj); + goto out; + } + } while (++i < cma_area_count); + + return 0; +out: + while (--i >= 0) { + cma = &cma_areas[i]; + kobject_put(&cma->stat->kobj); + } + + kfree(cma_stats); + kobject_put(cma_kobj); + + return -ENOMEM; +} +subsys_initcall(cma_sysfs_init);