From patchwork Thu Dec 8 14:21:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenchao Hao X-Patchwork-Id: 13068484 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 B0026C3A5A7 for ; Thu, 8 Dec 2022 14:22:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0F3BF8E0003; Thu, 8 Dec 2022 09:22:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0A3CF8E0001; Thu, 8 Dec 2022 09:22:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ED5728E0003; Thu, 8 Dec 2022 09:22:33 -0500 (EST) 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 E15E88E0001 for ; Thu, 8 Dec 2022 09:22:33 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id AC135120EC3 for ; Thu, 8 Dec 2022 14:22:33 +0000 (UTC) X-FDA: 80219354586.11.137F030 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf25.hostedemail.com (Postfix) with ESMTP id 54362A0014 for ; Thu, 8 Dec 2022 14:22:29 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf25.hostedemail.com: domain of haowenchao@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=haowenchao@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670509352; a=rsa-sha256; cv=none; b=7N2642sNKW73x549hjp0OPl508YI8ogWtjHlf1c8nXlT33T9veLr/G9pBqq2oHYxJZ8p3i 99nHHFO9OFtzi00LOGzRU2ud/3FUTCTlR8iPAIexLsul5qACHGtA1ZuCLfhvnnTYVSUxpu I0vhzcIp3PX/Z/witMLGXaxKKhOTeeE= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf25.hostedemail.com: domain of haowenchao@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=haowenchao@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670509352; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=awkCMJfui5JXntKNBPmTRfwdJIskPwSnNDmoSFudBxg=; b=bbj3MqHTRzn1eLYGiWZKfq2HSyeg7iWMewnYvqY/AWnl6/WDnKcmaBtVufI3mZNDQXaCKB uuFot/+TN+EB7fl7tcGTFS/6JAc2MSijJVKlCm3ZGh7rYKgaSrumNmwITrPySQPAEM09Ti 7Se86cCEOsuQ14eRtkCTyuH9Ah0st3Y= Received: from dggpemm500017.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4NSbqd15PNzJpDN; Thu, 8 Dec 2022 22:18:53 +0800 (CST) Received: from build.huawei.com (10.175.101.6) by dggpemm500017.china.huawei.com (7.185.36.178) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 8 Dec 2022 22:22:24 +0800 From: Wenchao Hao To: Steven Rostedt , Masami Hiramatsu , Andrew Morton , Wenchao Hao , , CC: , Subject: [PATCH] cma:tracing: Print alloc result in trace_cma_alloc_finish Date: Thu, 8 Dec 2022 22:21:30 +0800 Message-ID: <20221208142130.1501195-1-haowenchao@huawei.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemm500017.china.huawei.com (7.185.36.178) X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 54362A0014 X-Stat-Signature: owr6xnkoj9mxx4zn6f3p4iprxcbb1ety X-HE-Tag: 1670509349-73636 X-HE-Meta: U2FsdGVkX1+Rtc2LHr002/HWrVq67BAkJ0pURY5QT+XzCFcfAzLkHFZmjmDJkx2/9yydQuRMd/DOZlSoyQutbkvHR/tnIgDKuJO2XfA7uu489Kt9zp8keTodVMalS6excAkZ6XDUi/7UB2nTRQU2Qu4G1cbRNeFIZasCmxuJ/SKcC9crsSBM+6OB2dW/6UiZboELMFtBFjvl3ay1JWun9Ouz7Rn8JQn2yebbf2gDzLIpsYB7RZ+Z7052VkkdPRi9eP+GXrLqjkAPeL8Fyq4Pl/S4WXeHDooRhCa4+mwT0upL8d0BhMnyEGzKECuah3YSePkDoUYn/rgj350TQyeEo6PI6Se3b5dzcr+yUpW9C9MdevRhWF6P0U3IWiV2P7mD3P3+2arNE84bsnpMbyeRg1QJDlc4Wh6GMK1Dr+Lj41HeH+glCpUwgypB0fEXbdE1Q+HMpVvG8tgYKZuaO94gvmDYKtJHgdG60feCwBN7WMJVnaVyl13mLZEhp/BF3u1qzzvuYVEmCbSkdaljkzC1egMHYqJoSiS3J/AnkVp5d27XB5cEB3Yz9ZDX9gn4HN9cBlC/S4ic2aier0oe13o3edMf18mCdZMIyzJ9GxVdrAms0Fyo7x5oiiLYCDG0ETxyIlPixBk0iE+Dz19p8Fk2LKv1pZzhr7mKhbhPcVWv913Cx26zf+e8ZpOYmII5uAwW8pafO1U1p6KYNwrMBJUx1z/GkeIfCvF6wXEarpVCYQWPhTySBT3ffWG+hgp9nYI5EOjCCW0JP3yaj/UvmXyNW9d1MALyBmztPHLfDkwezmat8ZjkPMfaBp9QsrFfYAlILm7+5HBbHiezlDM5uVwtMaO5t+KgzRzLfKJZkRZZi8y01tf/ILO8sCbv/GlWSdpJrhlLPUd5ifqe9VAEeKMqLYRPlyIrSW7s 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: The result of allocation is not printed in trace_cma_alloc_finish now, while it's important to do it so we can set filters to catch specific error on allocation or trigger some operations on specific error. Although we have printed the result in log, but the log is conditional and could not be filtered by tracing event. What's more, it introduce little overhead to print this result. The result of allocation is named as errorno in trace. Signed-off-by: Wenchao Hao Reviewed-by: Steven Rostedt (Google) --- include/trace/events/cma.h | 32 +++++++++++++++++++++++++++++--- mm/cma.c | 2 +- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/include/trace/events/cma.h b/include/trace/events/cma.h index 3d708dae1542..ef75ea606ab2 100644 --- a/include/trace/events/cma.h +++ b/include/trace/events/cma.h @@ -91,12 +91,38 @@ TRACE_EVENT(cma_alloc_start, __entry->align) ); -DEFINE_EVENT(cma_alloc_class, cma_alloc_finish, +TRACE_EVENT(cma_alloc_finish, TP_PROTO(const char *name, unsigned long pfn, const struct page *page, - unsigned long count, unsigned int align), + unsigned long count, unsigned int align, int errorno), - TP_ARGS(name, pfn, page, count, align) + TP_ARGS(name, pfn, page, count, align, errorno), + + TP_STRUCT__entry( + __string(name, name) + __field(unsigned long, pfn) + __field(const struct page *, page) + __field(unsigned long, count) + __field(unsigned int, align) + __field(int, errorno) + ), + + TP_fast_assign( + __assign_str(name, name); + __entry->pfn = pfn; + __entry->page = page; + __entry->count = count; + __entry->align = align; + __entry->errorno = errorno; + ), + + TP_printk("name=%s pfn=0x%lx page=%p count=%lu align=%u errorno=%d", + __get_str(name), + __entry->pfn, + __entry->page, + __entry->count, + __entry->align, + __entry->errorno) ); DEFINE_EVENT(cma_alloc_class, cma_alloc_busy_retry, diff --git a/mm/cma.c b/mm/cma.c index 4a978e09547a..a75b17b03b66 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -491,7 +491,7 @@ struct page *cma_alloc(struct cma *cma, unsigned long count, start = bitmap_no + mask + 1; } - trace_cma_alloc_finish(cma->name, pfn, page, count, align); + trace_cma_alloc_finish(cma->name, pfn, page, count, align, ret); /* * CMA can allocate multiple page blocks, which results in different