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 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 6964CC433DB for ; Wed, 3 Feb 2021 15:50:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A613264E93 for ; Wed, 3 Feb 2021 15:50:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A613264E93 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 E12516B0070; Wed, 3 Feb 2021 10:50:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DC2C56B0071; Wed, 3 Feb 2021 10:50:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CB0A96B0072; Wed, 3 Feb 2021 10:50:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0191.hostedemail.com [216.40.44.191]) by kanga.kvack.org (Postfix) with ESMTP id ADDC56B0070 for ; Wed, 3 Feb 2021 10:50:19 -0500 (EST) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 48F2F3630 for ; Wed, 3 Feb 2021 15:50:19 +0000 (UTC) X-FDA: 77777393358.19.crush03_150282c275d4 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin19.hostedemail.com (Postfix) with ESMTP id 153641AD1B7 for ; Wed, 3 Feb 2021 15:50:18 +0000 (UTC) X-HE-Tag: crush03_150282c275d4 X-Filterd-Recvd-Size: 11962 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by imf36.hostedemail.com (Postfix) with ESMTP for ; Wed, 3 Feb 2021 15:50:17 +0000 (UTC) Received: by mail-pj1-f51.google.com with SMTP id m12so4596583pjs.4 for ; Wed, 03 Feb 2021 07:50:17 -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=AA4WsNr/vJqoJohizHJT6F56GEXlyS334FyQjy/hD88=; b=Mqjr4f7KulOkUcN0mhsoUSU9j0ls2dF6E4U6BeKR2Lxo6riSwlMf4dllZing9COCLE Pkt0994cCGh16YNggJHcnHWSCNhbPX14MIWdMA8Mw1WNFKsN8EH5zIobo3wGKL7wC0Zf DIry+wzeAq57KdtEiVn7QCl9Sfc49gLcg6PRR0bvKSoTSfcO7OnC5gmi5KtoSd68/8LO pxRPASy70e9M+aEL+c+OY6IakGw/+Ojpo/dqH4QW5FG8Sw2vNeH7ljZp742jsfK0SPY4 Erx+tfeXQyz2iiAV1yAKsN0/XMXpa1gjOP2J2W1hcDcQAoegGFah/zXcZpoDgeMlbk/z in9g== 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=AA4WsNr/vJqoJohizHJT6F56GEXlyS334FyQjy/hD88=; b=i5j7vbp+2eZAup5ltpq/fo/mlaDOqVe9io9UPF5jC5mfmePjIwRgopsBakuDTx8JiD X9ZlpDF+83f5zik1RuRWrh2BpM0WO+V3oTwziKnAV50pkXKrYnD1LWjk57w3YAdh9P5W YU/TaffVYJnmPuVVWS8kSSMPkkYqzrj3FKSD9XMqXxE56Y2BXKIYGx98o0pPlGnoShFU nKLi3JIO2hSdDmiBa7qceQzaZ/96Spb4fVq+50Sswz38XsAsuJ9Ud4hvS3IZwuK1YhM0 fnAuzaxSrJxaA26RZFypASwYLvqut5wsRWc86+lCq3RL3dLKsGCIPMTG/hsgEUJTAgYv Cu4Q== X-Gm-Message-State: AOAM531+78KZQUUjuxfL5KuFeexDODLozR3djEjjnvK830yPDyJJZCFo gtswoVHRhR86/emv7mVf7Lg= X-Google-Smtp-Source: ABdhPJwexbewZbtkXxsN4WEBKBfvrXrJa7iwpz+pVovrXRBBGtMXCuRHNRh4afokzD8YM6pvN8jDIA== X-Received: by 2002:a17:90a:65c4:: with SMTP id i4mr3627921pjs.132.1612367416495; Wed, 03 Feb 2021 07:50:16 -0800 (PST) Received: from bbox-1.mtv.corp.google.com ([2620:15c:211:201:1502:84f8:ffc3:45b]) by smtp.gmail.com with ESMTPSA id p7sm2692227pfn.52.2021.02.03.07.50.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 07:50:15 -0800 (PST) From: Minchan Kim To: Andrew Morton Cc: gregkh@linuxfoundation.org, surenb@google.com, joaodias@google.com, LKML , linux-mm , Minchan Kim Subject: [PATCH] mm: cma: support sysfs Date: Wed, 3 Feb 2021 07:50:01 -0800 Message-Id: <20210203155001.4121868-1-minchan@kernel.org> X-Mailer: git-send-email 2.30.0.365.g02bc693789-goog MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 for the CMA and exposes stats below to keep monitor for telemetric in the system. * the number of CMA allocation attempts * the number of CMA allocation failures * the number of CMA page allocation attempts * the number of CMA page allocation failures Signed-off-by: Minchan Kim --- Documentation/ABI/testing/sysfs-kernel-mm-cma | 39 +++++ include/linux/cma.h | 1 + mm/Makefile | 1 + mm/cma.c | 6 +- mm/cma.h | 20 +++ mm/cma_sysfs.c | 143 ++++++++++++++++++ 6 files changed, 209 insertions(+), 1 deletion(-) 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/Documentatio= n/ABI/testing/sysfs-kernel-mm-cma new file mode 100644 index 000000000000..2a43c0aacc39 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-kernel-mm-cma @@ -0,0 +1,39 @@ +What: /sys/kernel/mm/cma/ +Date: Feb 2021 +Contact: Minchan Kim +Description: + /sys/kernel/mm/cma/ contains a number of subdirectories by + cma-heap name. The subdirectory contains a number of files + to represent cma allocation statistics. + + There are number of files under + /sys/kernel/mm/cma/ directory + + - cma_alloc_attempt + - cma_alloc_fail + - alloc_pages_attempt + - alloc_pages_fail + +What: /sys/kernel/mm/cma//cma_alloc_attempt +Date: Feb 2021 +Contact: Minchan Kim +Description: + the number of cma_alloc API attempted + +What: /sys/kernel/mm/cma//cma_alloc_fail +Date: Feb 2021 +Contact: Minchan Kim +Description: + the number of CMA_alloc API failed + +What: /sys/kernel/mm/cma//alloc_pages_attempt +Date: Feb 2021 +Contact: Minchan Kim +Description: + the number of pages CMA API tried 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/include/linux/cma.h b/include/linux/cma.h index 217999c8a762..71a28a5bb54e 100644 --- a/include/linux/cma.h +++ b/include/linux/cma.h @@ -49,4 +49,5 @@ extern struct page *cma_alloc(struct cma *cma, size_t c= ount, unsigned int align, extern bool cma_release(struct cma *cma, const struct page *pages, unsig= ned int count); =20 extern int cma_for_each_area(int (*it)(struct cma *cma, void *data), voi= d *data); + #endif diff --git a/mm/Makefile b/mm/Makefile index b2a564eec27f..9c2c81ce3894 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -106,6 +106,7 @@ obj-$(CONFIG_ZSMALLOC) +=3D zsmalloc.o obj-$(CONFIG_Z3FOLD) +=3D z3fold.o obj-$(CONFIG_GENERIC_EARLY_IOREMAP) +=3D early_ioremap.o obj-$(CONFIG_CMA) +=3D cma.o +obj-$(CONFIG_SYSFS) +=3D cma_sysfs.o obj-$(CONFIG_MEMORY_BALLOON) +=3D balloon_compaction.o obj-$(CONFIG_PAGE_EXTENSION) +=3D page_ext.o obj-$(CONFIG_CMA_DEBUGFS) +=3D cma_debug.o diff --git a/mm/cma.c b/mm/cma.c index 0ba69cd16aeb..a25068b9d012 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -448,9 +448,10 @@ struct page *cma_alloc(struct cma *cma, size_t count= , unsigned int align, offset =3D cma_bitmap_aligned_offset(cma, align); bitmap_maxno =3D cma_bitmap_maxno(cma); bitmap_count =3D cma_bitmap_pages_to_bits(cma, count); + cma_sysfs_alloc_count(cma, count); =20 if (bitmap_count > bitmap_maxno) - return NULL; + goto out; =20 for (;;) { mutex_lock(&cma->lock); @@ -505,6 +506,9 @@ struct page *cma_alloc(struct cma *cma, size_t count,= unsigned int align, __func__, count, ret); cma_debug_show_areas(cma); } +out: + if (!page) + cma_sysfs_fail(cma, count); =20 pr_debug("%s(): returned %p\n", __func__, page); return page; diff --git a/mm/cma.h b/mm/cma.h index 42ae082cb067..e7e31012b44e 100644 --- a/mm/cma.h +++ b/mm/cma.h @@ -3,6 +3,16 @@ #define __MM_CMA_H__ =20 #include +#include + +struct cma_stat { + spinlock_t lock; + unsigned long alloc_attempt; /* the number of CMA allocation attempts *= / + unsigned long alloc_fail; /* the number of CMA allocation failures */ + unsigned long pages_attempt; /* the number of CMA page allocation attem= pts */ + unsigned long pages_fail; /* the number of CMA page allocation failures= */ + struct kobject kobj; +}; =20 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_SYSFS + struct cma_stat *stat; +#endif }; =20 extern struct cma cma_areas[MAX_CMA_AREAS]; @@ -26,4 +39,11 @@ static inline unsigned long cma_bitmap_maxno(struct cm= a *cma) return cma->count >> cma->order_per_bit; } =20 +#ifdef CONFIG_SYSFS +void cma_sysfs_alloc_count(struct cma *cma, size_t count); +void cma_sysfs_fail(struct cma *cma, size_t count); +#else +static void cma_sysfs_alloc_count(struct cma *cma, size_t count) {}; +static void cma_sysfs_fail(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..66df292cd6ca --- /dev/null +++ b/mm/cma_sysfs.c @@ -0,0 +1,143 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * CMA SysFS Interface + * + * Copyright (c) 2021 Minchan Kim + */ + +#include +#include +#include + +#include "cma.h" + +void cma_sysfs_alloc_count(struct cma *cma, size_t count) +{ + spin_lock(&cma->stat->lock); + cma->stat->alloc_attempt++; + cma->stat->pages_attempt +=3D count; + spin_unlock(&cma->stat->lock); +} + +void cma_sysfs_fail(struct cma *cma, size_t count) +{ + spin_lock(&cma->stat->lock); + cma->stat->alloc_fail++; + cma->stat->pages_fail +=3D count; + spin_unlock(&cma->stat->lock); +} + +#define CMA_ATTR_RO(_name) \ + static struct kobj_attribute _name##_attr =3D __ATTR_RO(_name) + +static struct kobject *cma_kobj; + +static ssize_t cma_alloc_attempt_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + unsigned long val; + struct cma_stat *stat =3D container_of(kobj, struct cma_stat, kobj); + + val =3D stat->alloc_attempt; + + return sysfs_emit(buf, "%lu\n", val); +} +CMA_ATTR_RO(cma_alloc_attempt); + +static ssize_t cma_alloc_fail_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + unsigned long val; + struct cma_stat *stat =3D container_of(kobj, struct cma_stat, kobj); + + val =3D stat->alloc_fail; + + return sysfs_emit(buf, "%lu\n", val); +} +CMA_ATTR_RO(cma_alloc_fail); + +static ssize_t alloc_pages_attempt_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + unsigned long val; + struct cma_stat *stat =3D container_of(kobj, struct cma_stat, kobj); + + val =3D stat->pages_attempt; + + return sysfs_emit(buf, "%lu\n", val); +} +CMA_ATTR_RO(alloc_pages_attempt); + +static ssize_t alloc_pages_fail_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + unsigned long val; + struct cma_stat *stat =3D container_of(kobj, struct cma_stat, kobj); + + val =3D stat->pages_fail; + + return sysfs_emit(buf, "%lu\n", val); +} +CMA_ATTR_RO(alloc_pages_fail); + +static void cma_kobj_release(struct kobject *kobj) +{ + struct cma_stat *stat =3D container_of(kobj, struct cma_stat, kobj); + + kfree(stat); +} + +static struct attribute *cma_attrs[] =3D { + &cma_alloc_attempt_attr.attr, + &cma_alloc_fail_attr.attr, + &alloc_pages_attempt_attr.attr, + &alloc_pages_fail_attr.attr, + NULL, +}; +ATTRIBUTE_GROUPS(cma); + +static struct kobj_type cma_ktype =3D { + .release =3D cma_kobj_release, + .sysfs_ops =3D &kobj_sysfs_ops, + .default_groups =3D cma_groups +}; + +static int __init cma_sysfs_init(void) +{ + int i; + struct cma *cma; + struct cma_stat *stat; + + cma_kobj =3D kobject_create_and_add("cma", mm_kobj); + if (!cma_kobj) { + pr_err("failed to create cma kobject\n"); + return -ENOMEM; + } + + for (i =3D 0; i < cma_area_count; i++) { + cma =3D &cma_areas[i]; + stat =3D kzalloc(sizeof(*stat), GFP_KERNEL); + if (!stat) + goto out; + + cma->stat =3D stat; + spin_lock_init(&stat->lock); + if (kobject_init_and_add(&stat->kobj, &cma_ktype, + cma_kobj, "%s", cma->name)) { + kobject_put(&stat->kobj); + goto out; + } + } + + return 0; +out: + while (--i >=3D 0) { + cma =3D &cma_areas[i]; + kobject_put(&cma->stat->kobj); + } + + kobject_put(cma_kobj); + + return -ENOMEM; +} +subsys_initcall(cma_sysfs_init); --=20 2.30.0.365.g02bc693789-goog