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 7A73DC433EF for ; Tue, 17 May 2022 09:44:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CBB166B0072; Tue, 17 May 2022 05:44:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C6B146B0073; Tue, 17 May 2022 05:44:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B0B7C8D0001; Tue, 17 May 2022 05:44:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 9F2986B0072 for ; Tue, 17 May 2022 05:44:20 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id 69ECD813F0 for ; Tue, 17 May 2022 09:44:20 +0000 (UTC) X-FDA: 79474749480.10.E278895 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by imf06.hostedemail.com (Postfix) with ESMTP id 62901180074 for ; Tue, 17 May 2022 09:44:15 +0000 (UTC) Received: by mail-lf1-f51.google.com with SMTP id y32so30301082lfa.6 for ; Tue, 17 May 2022 02:44:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvz-org.20210112.gappssmtp.com; s=20210112; h=message-id:date:mime-version:user-agent:from:subject:to:cc :content-language:reply-to:content-transfer-encoding; bh=4Y7GTp06m87sjrCjAMpmQ5sQb3h3R2MyluXYoWhziFQ=; b=MghXAnMT6KgtejKHKI+m5S8SyqmUYagS+dMS6d3Siyt9TDQsrCRUjWc6Af1jh3cJbV Tqh+DfBGiOkHXNOEJMxbR7HlMjwq+wlzQD8Tnm6peub57oQqy3FrQM0iz2qatq17+g+G vW64ljpV+gwxahaKaIZQlLdLl1wvofEtn20vw4bQDgnqbyetV3Ry6IsomfwJmeSIscUg pV2pqY0Nzgs/8/xNTdyZtztvcr7anhSOTIrBB8HqZu/AZrudcrUXsNhCaJ8sgvtLRDrc zJYjHz/fXOkFcwwbWB5v3Q5F8Pc88geDcDWRqusZeZ38rnDv5PD+1L+sa1IPyotMGU8n tusA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:from :subject:to:cc:content-language:reply-to:content-transfer-encoding; bh=4Y7GTp06m87sjrCjAMpmQ5sQb3h3R2MyluXYoWhziFQ=; b=Y/N2zh73bnuFhGbt6se4ZE/vnYJ893rtQ1LSUyOI4+laV7zfa75MQAiECjFSnl6pWu R56NamtWxluwRLgoDYmlnNEEbHFIKBzze0CgBMA01JeupkClquqGQp7u9aXghVclqran gx1y1wXgocsdkMrh5qJL9Tlk6kScfV7LC5t6OLv30qhw8GyfYzYs7SM/Vf7BgfBbhifr /Y4RfjHCIUjvIFjmdsPU05Sh8VHmzrGm8294ZNE2HiTY3JArY+JHhNHp10IzgWMoVzi7 Bh6dmDA/TajTqP6AVy78+1Q5P+9Cv468hNJiesRgZ+4l4DVpiEU91d8a9qqeMF7SOHNj v4tA== X-Gm-Message-State: AOAM531+haxnVeGbct3bMmLnyd1LNaC+ORGu59eQaTGqzN+x0HUPQjDY tSdtlwz82z+DaVTLs9HNIsJIIA== X-Google-Smtp-Source: ABdhPJzcUizreDjMj6lesjstMRBHyYVo4l8fnzb8tHWmpwpORw+SWixzfqsvuUJJjw6CTjr+uQJjjw== X-Received: by 2002:a05:6512:2350:b0:472:6182:955c with SMTP id p16-20020a056512235000b004726182955cmr16059189lfu.214.1652780656167; Tue, 17 May 2022 02:44:16 -0700 (PDT) Received: from [192.168.1.65] ([46.188.121.177]) by smtp.gmail.com with ESMTPSA id y16-20020ac24e70000000b0047255d211aasm1536573lfs.217.2022.05.17.02.44.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 17 May 2022 02:44:15 -0700 (PDT) Message-ID: <8ef9de6a-7497-07f7-852c-befcc3843771@openvz.org> Date: Tue, 17 May 2022 12:44:14 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 From: Vasily Averin Subject: [PATCH v2] tracing: add ACCOUNT flag for allocations from marked slab caches To: Steven Rostedt , Shakeel Butt , Roman Gushchin , Vlastimil Babka , Matthew Wilcox Cc: kernel@openvz.org, linux-kernel@vger.kernel.org, Ingo Molnar , Andrew Morton , linux-mm@kvack.org, Joonsoo Kim , David Rientjes , Pekka Enberg , Christoph Lameter , Michal Hocko Content-Language: en-US Reply-To: YoMccU66auLAPEHa@casper.infradead.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 62901180074 X-Stat-Signature: 9cjh7o9c4f9jgkjqjggndu7nh9ueee83 X-Rspam-User: Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=openvz-org.20210112.gappssmtp.com header.s=20210112 header.b=MghXAnMT; spf=pass (imf06.hostedemail.com: domain of vvs@openvz.org designates 209.85.167.51 as permitted sender) smtp.mailfrom=vvs@openvz.org; dmarc=pass (policy=none) header.from=openvz.org X-HE-Tag: 1652780655-864840 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: dSlab caches marked with SLAB_ACCOUNT force accounting for every allocation from this cache even if __GFP_ACCOUNT flag is not passed. Unfortunately, at the moment this flag is not visible in ftrace output, and this makes it difficult to analyze the accounted allocations. This patch adds the __GFP_ACCOUNT flag for allocations from slab caches marked with SLAB_ACCOUNT to the ftrace output --- v2: 1) handle kmem_cache_alloc_node() too, thanks to Shakeel 2) rework kmem_cache_alloc* tracepoints to use cachep instead of current cachep->*size parameters. Now kmalloc[_node] and kmem_cache_alloc[_node] tracepoints do not use common template NB: kmem_cache_alloc_node tracepoint in SLOB cannot be switched to cachep, therefore it was replaced by kmalloc_node tracepoint. --- VvS: is this acceptable? Maybe I should split this patch? Signed-off-by: Vasily Averin --- include/trace/events/kmem.h | 82 +++++++++++++++++++++++++++---------- mm/slab.c | 7 +--- mm/slab_common.c | 7 ++-- mm/slob.c | 10 ++--- mm/slub.c | 6 +-- 5 files changed, 71 insertions(+), 41 deletions(-) diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h index 71c141804222..3b4f96e4a607 100644 --- a/include/trace/events/kmem.h +++ b/include/trace/events/kmem.h @@ -9,7 +9,7 @@ #include #include -DECLARE_EVENT_CLASS(kmem_alloc, +TRACE_EVENT(kmalloc, TP_PROTO(unsigned long call_site, const void *ptr, @@ -43,23 +43,41 @@ DECLARE_EVENT_CLASS(kmem_alloc, show_gfp_flags(__entry->gfp_flags)) ); -DEFINE_EVENT(kmem_alloc, kmalloc, +TRACE_EVENT(kmem_cache_alloc, - TP_PROTO(unsigned long call_site, const void *ptr, - size_t bytes_req, size_t bytes_alloc, gfp_t gfp_flags), + TP_PROTO(unsigned long call_site, + const void *ptr, + struct kmem_cache *s, + gfp_t gfp_flags), - TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags) -); + TP_ARGS(call_site, ptr, s, gfp_flags), -DEFINE_EVENT(kmem_alloc, kmem_cache_alloc, + TP_STRUCT__entry( + __field( unsigned long, call_site ) + __field( const void *, ptr ) + __field( size_t, bytes_req ) + __field( size_t, bytes_alloc ) + __field( unsigned long, gfp_flags ) + ), - TP_PROTO(unsigned long call_site, const void *ptr, - size_t bytes_req, size_t bytes_alloc, gfp_t gfp_flags), + TP_fast_assign( + __entry->call_site = call_site; + __entry->ptr = ptr; + __entry->bytes_req = s->object_size; + __entry->bytes_alloc = s->size; + __entry->gfp_flags = (__force unsigned long)gfp_flags | + (s->flags & SLAB_ACCOUNT ? __GFP_ACCOUNT : 0); + ), - TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags) + TP_printk("call_site=%pS ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s", + (void *)__entry->call_site, + __entry->ptr, + __entry->bytes_req, + __entry->bytes_alloc, + show_gfp_flags(__entry->gfp_flags)) ); -DECLARE_EVENT_CLASS(kmem_alloc_node, +TRACE_EVENT(kmalloc_node, TP_PROTO(unsigned long call_site, const void *ptr, @@ -97,22 +115,42 @@ DECLARE_EVENT_CLASS(kmem_alloc_node, __entry->node) ); -DEFINE_EVENT(kmem_alloc_node, kmalloc_node, +TRACE_EVENT(kmem_cache_alloc_node, - TP_PROTO(unsigned long call_site, const void *ptr, - size_t bytes_req, size_t bytes_alloc, - gfp_t gfp_flags, int node), + TP_PROTO(unsigned long call_site, + const void *ptr, + struct kmem_cache *s, + gfp_t gfp_flags, + int node), - TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node) -); + TP_ARGS(call_site, ptr, s, gfp_flags, node), -DEFINE_EVENT(kmem_alloc_node, kmem_cache_alloc_node, + TP_STRUCT__entry( + __field( unsigned long, call_site ) + __field( const void *, ptr ) + __field( size_t, bytes_req ) + __field( size_t, bytes_alloc ) + __field( unsigned long, gfp_flags ) + __field( int, node ) + ), - TP_PROTO(unsigned long call_site, const void *ptr, - size_t bytes_req, size_t bytes_alloc, - gfp_t gfp_flags, int node), + TP_fast_assign( + __entry->call_site = call_site; + __entry->ptr = ptr; + __entry->bytes_req = s->object_size; + __entry->bytes_alloc = s->size; + __entry->gfp_flags = (__force unsigned long)gfp_flags | + (s->flags & SLAB_ACCOUNT ? __GFP_ACCOUNT : 0); + __entry->node = node; + ), - TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node) + TP_printk("call_site=%pS ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s node=%d", + (void *)__entry->call_site, + __entry->ptr, + __entry->bytes_req, + __entry->bytes_alloc, + show_gfp_flags(__entry->gfp_flags), + __entry->node) ); TRACE_EVENT(kfree, diff --git a/mm/slab.c b/mm/slab.c index 0edb474edef1..935b1c90d7f0 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3492,8 +3492,7 @@ void *__kmem_cache_alloc_lru(struct kmem_cache *cachep, struct list_lru *lru, { void *ret = slab_alloc(cachep, lru, flags, cachep->object_size, _RET_IP_); - trace_kmem_cache_alloc(_RET_IP_, ret, - cachep->object_size, cachep->size, flags); + trace_kmem_cache_alloc(_RET_IP_, ret, cachep, flags); return ret; } @@ -3606,9 +3605,7 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid) { void *ret = slab_alloc_node(cachep, flags, nodeid, cachep->object_size, _RET_IP_); - trace_kmem_cache_alloc_node(_RET_IP_, ret, - cachep->object_size, cachep->size, - flags, nodeid); + trace_kmem_cache_alloc_node(_RET_IP_, ret, cachep, flags, nodeid); return ret; } diff --git a/mm/slab_common.c b/mm/slab_common.c index 2b3206a2c3b5..12299cf450fe 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -25,13 +25,12 @@ #include #include -#define CREATE_TRACE_POINTS -#include - #include "internal.h" - #include "slab.h" +#define CREATE_TRACE_POINTS +#include + enum slab_state slab_state; LIST_HEAD(slab_caches); DEFINE_MUTEX(slab_mutex); diff --git a/mm/slob.c b/mm/slob.c index 40ea6e2d4ccd..69875419769c 100644 --- a/mm/slob.c +++ b/mm/slob.c @@ -610,14 +610,12 @@ static void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node) if (c->size < PAGE_SIZE) { b = slob_alloc(c->size, flags, c->align, node, 0); - trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size, - SLOB_UNITS(c->size) * SLOB_UNIT, - flags, node); + trace_kmalloc_node(_RET_IP_, b, c->object_size, + SLOB_UNITS(c->size) * SLOB_UNIT, flags, node); } else { b = slob_new_pages(flags, get_order(c->size), node); - trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size, - PAGE_SIZE << get_order(c->size), - flags, node); + trace_kmalloc_node(_RET_IP_, b, c->object_size, + PAGE_SIZE << get_order(c->size), flags, node); } if (b && c->ctor) { diff --git a/mm/slub.c b/mm/slub.c index ed5c2c03a47a..fc6678269db0 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3231,8 +3231,7 @@ void *__kmem_cache_alloc_lru(struct kmem_cache *s, struct list_lru *lru, { void *ret = slab_alloc(s, lru, gfpflags, _RET_IP_, s->object_size); - trace_kmem_cache_alloc(_RET_IP_, ret, s->object_size, - s->size, gfpflags); + trace_kmem_cache_alloc(_RET_IP_, ret, s, gfpflags); return ret; } @@ -3266,8 +3265,7 @@ void *kmem_cache_alloc_node(struct kmem_cache *s, gfp_t gfpflags, int node) { void *ret = slab_alloc_node(s, NULL, gfpflags, node, _RET_IP_, s->object_size); - trace_kmem_cache_alloc_node(_RET_IP_, ret, - s->object_size, s->size, gfpflags, node); + trace_kmem_cache_alloc_node(_RET_IP_, ret, s, gfpflags, node); return ret; } -- 2.31.1