From patchwork Tue Jan 12 09:21:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Faiyaz Mohammed X-Patchwork-Id: 12012865 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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 BB784C433E6 for ; Tue, 12 Jan 2021 09:21:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 13B2322DFB for ; Tue, 12 Jan 2021 09:21:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 13B2322DFB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7249E8D007B; Tue, 12 Jan 2021 04:21:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6D4CD8D0051; Tue, 12 Jan 2021 04:21:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 59C2E8D007B; Tue, 12 Jan 2021 04:21:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0136.hostedemail.com [216.40.44.136]) by kanga.kvack.org (Postfix) with ESMTP id 421818D0051 for ; Tue, 12 Jan 2021 04:21:58 -0500 (EST) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 0B575BBDB for ; Tue, 12 Jan 2021 09:21:58 +0000 (UTC) X-FDA: 77696581116.29.cork00_04042e227514 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id DD4E1180868E2 for ; Tue, 12 Jan 2021 09:21:57 +0000 (UTC) X-HE-Tag: cork00_04042e227514 X-Filterd-Recvd-Size: 7758 Received: from m43-15.mailgun.net (m43-15.mailgun.net [69.72.43.15]) by imf45.hostedemail.com (Postfix) with ESMTP for ; Tue, 12 Jan 2021 09:21:55 +0000 (UTC) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1610443317; h=Message-Id: Date: Subject: Cc: To: From: Sender; bh=tmJ6Ka/918qUhfkQLgwGKMtGbWVEy2Qyn9+9KS0ZyOc=; b=SzzUNbwXHzFGlG1cXnYPXcKBupNsTS/uEolLPD6aoz3d8ctPzjHelO3+kdEV7wvI5ahM1v2c NBTEbE9ubP48aZNbLHZW4n/y23/WCfEgkx/Os3FOq0ZKFBGBSt/s54qOcy/ExUgy5ToePhfa x+8S6BM28/yE4Shx2zwR7TdC7EU= X-Mailgun-Sending-Ip: 69.72.43.15 X-Mailgun-Sid: WyIwY2Q3OCIsICJsaW51eC1tbUBrdmFjay5vcmciLCAiYmU5ZTRhIl0= Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n10.prod.us-west-2.postgun.com with SMTP id 5ffd6a229dddba11a6a1de47 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Tue, 12 Jan 2021 09:21:38 GMT Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 380ADC43461; Tue, 12 Jan 2021 09:21:38 +0000 (UTC) Received: from faiyazm-linux.qualcomm.com (unknown [202.46.22.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: faiyazm) by smtp.codeaurora.org (Postfix) with ESMTPSA id D4451C433CA; Tue, 12 Jan 2021 09:21:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org D4451C433CA Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=fail smtp.mailfrom=faiyazm@codeaurora.org From: Faiyaz Mohammed To: cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: vinmenon@codeaurora.org, Faiyaz Mohammed Subject: [PATCH] mm: slub: Convert sys slab alloc_calls, free_calls to bin attribute Date: Tue, 12 Jan 2021 14:51:27 +0530 Message-Id: <1610443287-23933-1-git-send-email-faiyazm@codeaurora.org> X-Mailer: git-send-email 2.7.4 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: Reading the sys slab alloc_calls, free_calls returns the available object owners, but the size of this file is limited to PAGE_SIZE because of the limitation of sysfs attributes, it is returning the partial owner info, which is not sufficient to debug/account the slab memory and alloc_calls output is not matching with /proc/slabinfo. To remove the PAGE_SIZE limitation converted the sys slab alloc_calls, free_calls to bin attribute. Signed-off-by: Faiyaz Mohammed --- mm/slub.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 14 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index b52384e..8744e5ec 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -4710,13 +4710,14 @@ static void process_slab(struct loc_track *t, struct kmem_cache *s, } static int list_locations(struct kmem_cache *s, char *buf, - enum track_item alloc) + loff_t offset, enum track_item alloc) { int len = 0; unsigned long i; struct loc_track t = { 0, 0, NULL }; int node; struct kmem_cache_node *n; + static unsigned int previous_read_count; unsigned long *map = bitmap_alloc(oo_objects(s->max), GFP_KERNEL); if (!map || !alloc_loc_track(&t, PAGE_SIZE / sizeof(struct location), @@ -4742,11 +4743,9 @@ static int list_locations(struct kmem_cache *s, char *buf, spin_unlock_irqrestore(&n->list_lock, flags); } - for (i = 0; i < t.count; i++) { + for (i = previous_read_count; i < t.count; i++) { struct location *l = &t.loc[i]; - if (len > PAGE_SIZE - KSYM_SYMBOL_LEN - 100) - break; len += sprintf(buf + len, "%7ld ", l->count); if (l->addr) @@ -4784,12 +4783,20 @@ static int list_locations(struct kmem_cache *s, char *buf, nodemask_pr_args(&l->nodes)); len += sprintf(buf + len, "\n"); + + if (len > PAGE_SIZE - KSYM_SYMBOL_LEN - 100) { + previous_read_count = i + 1; + break; + } } + if ((offset != 0) && ((i >= t.count) || (previous_read_count > t.count))) { + previous_read_count = 0; + len = 0; + } else if (!t.count) + len += sprintf(buf, "No data\n"); free_loc_track(&t); bitmap_free(map); - if (!t.count) - len += sprintf(buf, "No data\n"); return len; } @@ -5180,6 +5187,7 @@ static int any_slab_objects(struct kmem_cache *s) struct slab_attribute { struct attribute attr; + struct bin_attribute bin_attr; ssize_t (*show)(struct kmem_cache *s, char *buf); ssize_t (*store)(struct kmem_cache *s, const char *x, size_t count); }; @@ -5192,6 +5200,12 @@ struct slab_attribute { static struct slab_attribute _name##_attr = \ __ATTR(_name, 0600, _name##_show, _name##_store) +#define SLAB_BIN_ATTR_RO(_name) \ + static struct slab_attribute _name##_attr = { \ + .bin_attr = \ + __BIN_ATTR_RO(_name, 0) \ + } \ + static ssize_t slab_size_show(struct kmem_cache *s, char *buf) { return sprintf(buf, "%u\n", s->size); @@ -5535,21 +5549,33 @@ static ssize_t validate_store(struct kmem_cache *s, } SLAB_ATTR(validate); -static ssize_t alloc_calls_show(struct kmem_cache *s, char *buf) +static ssize_t alloc_calls_read(struct file *filp, struct kobject *kobj, + struct bin_attribute *bin_attr, char *buf, + loff_t offset, size_t count) { + struct kmem_cache *s; + + s = to_slab(kobj); if (!(s->flags & SLAB_STORE_USER)) return -ENOSYS; - return list_locations(s, buf, TRACK_ALLOC); + + return list_locations(s, buf, offset, TRACK_ALLOC); } -SLAB_ATTR_RO(alloc_calls); +SLAB_BIN_ATTR_RO(alloc_calls); -static ssize_t free_calls_show(struct kmem_cache *s, char *buf) +static ssize_t free_calls_read(struct file *filp, struct kobject *kobj, + struct bin_attribute *bin_attr, char *buf, + loff_t offset, size_t count) { + struct kmem_cache *s; + + s = to_slab(kobj); if (!(s->flags & SLAB_STORE_USER)) return -ENOSYS; - return list_locations(s, buf, TRACK_FREE); + + return list_locations(s, buf, offset, TRACK_FREE); } -SLAB_ATTR_RO(free_calls); +SLAB_BIN_ATTR_RO(free_calls); #endif /* CONFIG_SLUB_DEBUG */ #ifdef CONFIG_FAILSLAB @@ -5694,6 +5720,14 @@ STAT_ATTR(CPU_PARTIAL_NODE, cpu_partial_node); STAT_ATTR(CPU_PARTIAL_DRAIN, cpu_partial_drain); #endif /* CONFIG_SLUB_STATS */ + +static struct bin_attribute *slab_bin_attrs[] = { +#ifdef CONFIG_SLUB_DEBUG + &alloc_calls_attr.bin_attr, + &free_calls_attr.bin_attr, +#endif +}; + static struct attribute *slab_attrs[] = { &slab_size_attr.attr, &object_size_attr.attr, @@ -5722,8 +5756,6 @@ static struct attribute *slab_attrs[] = { &poison_attr.attr, &store_user_attr.attr, &validate_attr.attr, - &alloc_calls_attr.attr, - &free_calls_attr.attr, #endif #ifdef CONFIG_ZONE_DMA &cache_dma_attr.attr, @@ -5769,6 +5801,7 @@ static struct attribute *slab_attrs[] = { static const struct attribute_group slab_attr_group = { .attrs = slab_attrs, + .bin_attrs = slab_bin_attrs, }; static ssize_t slab_attr_show(struct kobject *kobj,