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 D3EF8C433FE for ; Mon, 16 May 2022 18:53:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 531456B0071; Mon, 16 May 2022 14:53:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4E0176B0072; Mon, 16 May 2022 14:53:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3A71F6B0074; Mon, 16 May 2022 14:53:38 -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 2AAB16B0071 for ; Mon, 16 May 2022 14:53:38 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id C2AC160840 for ; Mon, 16 May 2022 18:53:37 +0000 (UTC) X-FDA: 79472504874.28.E54530C Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by imf11.hostedemail.com (Postfix) with ESMTP id CE9024006C for ; Mon, 16 May 2022 18:53:30 +0000 (UTC) Received: by mail-lj1-f175.google.com with SMTP id q130so19246147ljb.5 for ; Mon, 16 May 2022 11:53:36 -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:content-transfer-encoding; bh=nuaRCyZ3f8/tAk5NBkEcb+gaJ9vpmmFYS74QQLXNLAk=; b=uHW2EOknJrrdEJKCG/9WPjfw9+6HT1KxNEanFdBQTCPYnK+1353SmGzP9S4QOZIkBM USeZ6AT9OmZ1K/5kggz51UgdnUpkAKg5hiZxDmRECbfTH7AUbRw0vfesKIX5WCM140pa 1lzo6/pJrYfCkGtdWfIO/olD1whWCjh70BZ+vzfstWpzXGH/S8Vva2BtDXFWv32Zq9X7 VfXEvKtN8dWYgZSekKRsgMYcLiftUAQwGhES7+8UCu9rwRvDqFGZWoXBjPu//0DHBMYw +F/B0aOwFrSH9r7lDT0Sb/zV/FNIpGYLQu/tSluvf7mGdOyZWQJPsXZsSQDf4tJ2qANp GSIA== 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:content-transfer-encoding; bh=nuaRCyZ3f8/tAk5NBkEcb+gaJ9vpmmFYS74QQLXNLAk=; b=LVKeyT6XyhT1fSLjBUcFNIkj3gKLDGrlTInylV/4TwbJzcgsMC+bI0ZwbkAxv9rAeC X1kYBI8A27IBFDZedArHEbjOfofK524IsInDLsplfY4nqaW/ED75h/7IMC7TFiCtqicW Jf5WcbdGsVIasgkyMc3k+FXADXRVIft/7HKqadMknAokmk4h+yrSS68M9I9OXcBP/yLe zxu5VQaXZVddl8r6/u/NsbttUaZPOngHUzkrXPvyZcQ77MUmV3s2quKCSqeiyOD0ACgJ MRLqfVdc6/25QTwWDDBfG+zX27fuu/oOqOaYMq/RvcI7H3s9hzSujqnczUeS5B2coqA/ Hyuw== X-Gm-Message-State: AOAM5309IakX2xkoKLBvYqmrue68NFEMerT7C8Jf/XCMY62vimGKVwfV Dg69oiybvbELzXhuMsd7IrdfVQ== X-Google-Smtp-Source: ABdhPJww7Y9nENr1+mTatkIp+n0/Fh5qQaeQBoLLg5apVauQaouQWDA2JQ+MZO6Cwh5vfN1CWSnZ0A== X-Received: by 2002:a2e:9dc8:0:b0:24f:d84:3001 with SMTP id x8-20020a2e9dc8000000b0024f0d843001mr11931801ljj.435.1652727214669; Mon, 16 May 2022 11:53:34 -0700 (PDT) Received: from [192.168.1.72] (46-138-221-128.dynamic.spd-mgts.ru. [46.138.221.128]) by smtp.gmail.com with ESMTPSA id w8-20020a2e3008000000b00250664c906asm1639086ljw.133.2022.05.16.11.53.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 May 2022 11:53:34 -0700 (PDT) Message-ID: <1fd21e25-b095-e055-fc2e-abda640a0575@openvz.org> Date: Mon, 16 May 2022 21:53:32 +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] tracing: add ACCOUNT flag for allocations from marked slab caches To: Roman Gushchin , Vlastimil Babka , Andrew Morton , Joonsoo Kim , David Rientjes , Pekka Enberg , Christoph Lameter Cc: kernel@openvz.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Shakeel Butt , Michal Hocko Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: CE9024006C X-Stat-Signature: 4wb97mt87how4m31oeiipm5wgec6jdqt Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=openvz-org.20210112.gappssmtp.com header.s=20210112 header.b=uHW2EOkn; dmarc=pass (policy=none) header.from=openvz.org; spf=pass (imf11.hostedemail.com: domain of vvs@openvz.org designates 209.85.208.175 as permitted sender) smtp.mailfrom=vvs@openvz.org X-Rspam-User: X-HE-Tag: 1652727210-742488 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: Slab 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. Signed-off-by: Vasily Averin --- mm/slab.c | 3 +++ mm/slub.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/mm/slab.c b/mm/slab.c index 0edb474edef1..4c3da8dfcbdb 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3492,6 +3492,9 @@ 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_); + if (cachep->flags & SLAB_ACCOUNT) + flags |= __GFP_ACCOUNT; + trace_kmem_cache_alloc(_RET_IP_, ret, cachep->object_size, cachep->size, flags); diff --git a/mm/slub.c b/mm/slub.c index ed5c2c03a47a..670bbfef9e49 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3231,6 +3231,9 @@ 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); + if (s->flags & SLAB_ACCOUNT) + gfpflags |= __GFP_ACCOUNT; + trace_kmem_cache_alloc(_RET_IP_, ret, s->object_size, s->size, gfpflags); -- 2.25.1