From patchwork Tue Jul 23 03:08:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongbo Li X-Patchwork-Id: 13739289 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 E33D1C3DA70 for ; Tue, 23 Jul 2024 03:03:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CB8C36B0088; Mon, 22 Jul 2024 23:03:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BF2F56B0089; Mon, 22 Jul 2024 23:03:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A1F3A6B008A; Mon, 22 Jul 2024 23:03:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 82F506B0088 for ; Mon, 22 Jul 2024 23:03:34 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 2270CA1B7F for ; Tue, 23 Jul 2024 03:03:34 +0000 (UTC) X-FDA: 82369521948.22.38F36F4 Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by imf30.hostedemail.com (Postfix) with ESMTP id 76B9A8000E for ; Tue, 23 Jul 2024 03:03:31 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of lihongbo22@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=lihongbo22@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721703789; 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:in-reply-to:references:references; bh=YHcViOhs66YKTs24XG3I6Lct2/SrqlKDxlXZqgWhLmc=; b=vfSWfYsY4wM7F7SRbA02kKt5N5+HxHc0AlrtESIofWII2evC5zTkQkNzqo7mOh6JW11m3A 1enj09U1klUImCLAiYkmM+aUyYVjoQRm2+kS9xzbGpE61awgJxZAIiTG51J+UytB5NZCLK N0sYr4R4veJD4Jxd4ptRZ2Qkaau7FcA= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of lihongbo22@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=lihongbo22@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721703789; a=rsa-sha256; cv=none; b=BGbQEzdjvqjTLV9RnlrrmCnLFV2R1tiihnITSTEb4cRa5E4K3tWeWqKoGxgeV8kn3Of8oc UiFOJXtNM0Drub5Px1BDI1ThI68f08f3TJoPZBTRbxWaDS2cGAuFOKUsnvmsmOt2PAKtPX Rv7SmygaWsihnTf2RSJvLcie1oiKC/I= Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4WShkf2XHwz20lW3; Tue, 23 Jul 2024 11:01:46 +0800 (CST) Received: from dggpeml500022.china.huawei.com (unknown [7.185.36.66]) by mail.maildlp.com (Postfix) with ESMTPS id C42331A0188; Tue, 23 Jul 2024 11:03:27 +0800 (CST) Received: from huawei.com (10.90.53.73) by dggpeml500022.china.huawei.com (7.185.36.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Tue, 23 Jul 2024 11:03:27 +0800 From: Hongbo Li To: , , , CC: , , , , Subject: [PATCH v3 1/2] hugetlbfs: support tracepoint Date: Tue, 23 Jul 2024 11:08:33 +0800 Message-ID: <20240723030834.213012-2-lihongbo22@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240723030834.213012-1-lihongbo22@huawei.com> References: <20240723030834.213012-1-lihongbo22@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.90.53.73] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpeml500022.china.huawei.com (7.185.36.66) X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 76B9A8000E X-Stat-Signature: wxya8ahykptumdc7azrynp5eh64as8wr X-Rspam-User: X-HE-Tag: 1721703811-59256 X-HE-Meta: U2FsdGVkX19TzVOxedKyBRjH4EXOUAoMqrWGpn2aCQb6+MMvfct0mAc4zUO6vy87Vs5gyy3GyOlt/VQpxfpg7TaNfHNfvXdsMhVhoGhLSruzs7vWmfkXo+oODW+PGXtp30Bmy2LuZysvTv6qczJU1MCIoItnKjHtpjh+QtDFHasmhVYAQQtmTja/rd3dB086KCKPw/kGBCLVE0cibTs6APLIKA5Vw51/RVArQIPnOeJqoSFaRTvEYlLfmNLQ2TlfdLXmgKb1KbrAJm2CeWuMCUVShex2zl63h75s6fuzrmsQnvIvi5uoAqlxhjwDiD9DfVXAroHENW+yJTuSxIqGAEb2lfYUPH8Es2iDNcl4tuzCsuv2DDGF3r9NfBBLDQvgZT5loARO+CrXFR9R9XijE/Pbp3mauvwJtyaq03ypCg95xTzMjvrz/3eGRoJVrWpgFY8/ik/99A8fzwP5OtTnti1t1Jyk5c4esgzy8t1uKP5Bb7Yf5rSR9sWxch3ABz+ZeYMmN8c/XtMZtZ6x5PX+4GQVSD3xG/pJ055JJ1AxqA/yFBYoCgQPvRNyLO/QG1hMGbKw5367t7k5Ic5ZhzO2h5rwyQfMsujRwJsxZgXwOTLjqionMbMK8Z0MNS6kgtRtIuSoM/7wBdr04y6xQQb3J6OddtkTyzMkKu34uqsYqozQzBQA4MLAYMZAr0slrtNEP/dGwOweaon9BoyDX7DnZf/cxrtI0ajAiGHE5OVitYI7s6WKU3qrnqTGUbbOvBWolVqKpgmGghqvcCm05slgSC4PNbSxafpoGs7W3ZA71yBNoTVc4M54ymXkJzqyQAQAMGo8lRNxRQZAhWsWIsQgYDnqft2L6Fi97c+0fdRMSsposHMfNSFP+NbYjxvvTbXnwqfypkUnNCcQ919O2F/rDyIUfrMjMLR4/M3+5Jfzq06QUxyHSBpDfxaGTWMv4H5snahaBoAauQsDF0g8cL/ fhqHLGoS r6qL3WAkGye5r6a/VUh4pE099oslnQ2CKjv+qRnfpwv3y0EOUOTYscWB2wHHxwxNWwXQM+BYS1koBVA0g6yQ4HFN1G76N79j5CPd3ObAn80qKDMViK6Jqe6sOp98aW5eSFMQR4IAuPg56kj8= 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: List-Subscribe: List-Unsubscribe: Add basic tracepoints for {alloc, evict, free}_inode, setattr and fallocate. These can help users to debug hugetlbfs more conveniently. Signed-off-by: Hongbo Li --- MAINTAINERS | 1 + include/trace/events/hugetlbfs.h | 156 +++++++++++++++++++++++++++++++ 2 files changed, 157 insertions(+) create mode 100644 include/trace/events/hugetlbfs.h diff --git a/MAINTAINERS b/MAINTAINERS index a0baccca11de..362e846e1294 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10351,6 +10351,7 @@ F: Documentation/mm/hugetlbfs_reserv.rst F: Documentation/mm/vmemmap_dedup.rst F: fs/hugetlbfs/ F: include/linux/hugetlb.h +F: include/trace/events/hugetlbfs.h F: mm/hugetlb.c F: mm/hugetlb_vmemmap.c F: mm/hugetlb_vmemmap.h diff --git a/include/trace/events/hugetlbfs.h b/include/trace/events/hugetlbfs.h new file mode 100644 index 000000000000..8331c904a9ba --- /dev/null +++ b/include/trace/events/hugetlbfs.h @@ -0,0 +1,156 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM hugetlbfs + +#if !defined(_TRACE_HUGETLBFS_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_HUGETLBFS_H + +#include + +TRACE_EVENT(hugetlbfs_alloc_inode, + + TP_PROTO(struct inode *inode, struct inode *dir, int mode), + + TP_ARGS(inode, dir, mode), + + TP_STRUCT__entry( + __field(dev_t, dev) + __field(ino_t, ino) + __field(ino_t, dir) + __field(__u16, mode) + ), + + TP_fast_assign( + __entry->dev = inode->i_sb->s_dev; + __entry->ino = inode->i_ino; + __entry->dir = dir->i_ino; + __entry->mode = mode; + ), + + TP_printk("dev %d,%d ino %lu dir %lu mode 0%o", + MAJOR(__entry->dev), MINOR(__entry->dev), + (unsigned long) __entry->ino, + (unsigned long) __entry->dir, __entry->mode) +); + +DECLARE_EVENT_CLASS(hugetlbfs__inode, + + TP_PROTO(struct inode *inode), + + TP_ARGS(inode), + + TP_STRUCT__entry( + __field(dev_t, dev) + __field(ino_t, ino) + __field(__u16, mode) + __field(loff_t, size) + __field(unsigned int, nlink) + __field(unsigned int, seals) + __field(blkcnt_t, blocks) + ), + + TP_fast_assign( + __entry->dev = inode->i_sb->s_dev; + __entry->ino = inode->i_ino; + __entry->mode = inode->i_mode; + __entry->size = inode->i_size; + __entry->nlink = inode->i_nlink; + __entry->seals = HUGETLBFS_I(inode)->seals; + __entry->blocks = inode->i_blocks; + ), + + TP_printk("dev %d,%d ino %lu mode 0%o size %lld nlink %u seals %u blocks %llu", + MAJOR(__entry->dev), MINOR(__entry->dev), (unsigned long) __entry->ino, + __entry->mode, __entry->size, __entry->nlink, __entry->seals, + (unsigned long long)__entry->blocks) +); + +DEFINE_EVENT(hugetlbfs__inode, hugetlbfs_evict_inode, + + TP_PROTO(struct inode *inode), + + TP_ARGS(inode) +); + +DEFINE_EVENT(hugetlbfs__inode, hugetlbfs_free_inode, + + TP_PROTO(struct inode *inode), + + TP_ARGS(inode) +); + +TRACE_EVENT(hugetlbfs_setattr, + + TP_PROTO(struct inode *inode, struct dentry *dentry, + struct iattr *attr), + + TP_ARGS(inode, dentry, attr), + + TP_STRUCT__entry( + __field(dev_t, dev) + __field(ino_t, ino) + __field(unsigned int, d_len) + __string(d_name, dentry->d_name.name) + __field(unsigned int, ia_valid) + __field(unsigned int, ia_mode) + __field(loff_t, old_size) + __field(loff_t, ia_size) + ), + + TP_fast_assign( + __entry->dev = inode->i_sb->s_dev; + __entry->ino = inode->i_ino; + __entry->d_len = dentry->d_name.len; + __assign_str(d_name); + __entry->ia_valid = attr->ia_valid; + __entry->ia_mode = attr->ia_mode; + __entry->old_size = inode->i_size; + __entry->ia_size = attr->ia_size; + ), + + TP_printk("dev %d,%d ino %lu name %.*s valid %#x mode 0%o old_size %lld size %lld", + MAJOR(__entry->dev), MINOR(__entry->dev), (unsigned long)__entry->ino, + __entry->d_len, __get_str(d_name), __entry->ia_valid, __entry->ia_mode, + __entry->old_size, __entry->ia_size) +); + +TRACE_EVENT(hugetlbfs_fallocate, + + TP_PROTO(struct inode *inode, int mode, + loff_t offset, loff_t len, int ret), + + TP_ARGS(inode, mode, offset, len, ret), + + TP_STRUCT__entry( + __field(dev_t, dev) + __field(ino_t, ino) + __field(int, mode) + __field(loff_t, offset) + __field(loff_t, len) + __field(loff_t, size) + __field(int, ret) + ), + + TP_fast_assign( + __entry->dev = inode->i_sb->s_dev; + __entry->ino = inode->i_ino; + __entry->mode = mode; + __entry->offset = offset; + __entry->len = len; + __entry->size = inode->i_size; + __entry->ret = ret; + ), + + TP_printk("dev %d,%d ino %lu mode 0%o offset %lld len %lld size %lld ret %d", + MAJOR(__entry->dev), MINOR(__entry->dev), + (unsigned long)__entry->ino, __entry->mode, + (unsigned long long)__entry->offset, + (unsigned long long)__entry->len, + (unsigned long long)__entry->size, + __entry->ret) +); + +#endif /* _TRACE_HUGETLBFS_H */ + + /* This part must be outside protection */ +#include From patchwork Tue Jul 23 03:08:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongbo Li X-Patchwork-Id: 13739290 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 4218CC3DA7F for ; Tue, 23 Jul 2024 03:03:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C91756B0089; Mon, 22 Jul 2024 23:03:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BF5A46B008A; Mon, 22 Jul 2024 23:03:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9F9A66B008C; Mon, 22 Jul 2024 23:03:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 818DD6B0089 for ; Mon, 22 Jul 2024 23:03:36 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id F0B23121B94 for ; Tue, 23 Jul 2024 03:03:35 +0000 (UTC) X-FDA: 82369521990.26.D554E13 Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by imf09.hostedemail.com (Postfix) with ESMTP id 98658140008 for ; Tue, 23 Jul 2024 03:03:33 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=none; spf=pass (imf09.hostedemail.com: domain of lihongbo22@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=lihongbo22@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721703752; 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:in-reply-to:references:references; bh=aI0Y34PQLxRn1vGBSbRhSuI4l+X92FpSqRn9JIXV2eI=; b=OOMZKYigno4bYgBPb9QJXCSYEbCTsJUpFuZRp/pxTczcLDflx30R/ROH1P6fti2uj9zMsP nIeJaLPGAlsHxQEjaZeUQoKK6huD/xwVGkfVHWhzhdVzmqv18aI7lk0+FYlunZ8SA0/kby j0v9in4pRKy7VMG8OBc9ZWUOOLYcwOw= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; spf=pass (imf09.hostedemail.com: domain of lihongbo22@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=lihongbo22@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721703752; a=rsa-sha256; cv=none; b=Muelk1riFzwTPEWWmO9SKlNgP8Dv2PWOyUQyYUKyJ+THRL+1odCiWc1QEuWSMFNOkpZUsH 1uUH+MWnSFEVwNfF4UfHrXbYxsDi1KLBIE9rKskLFUMA2BSmzmJ0Z7h00SUk5Q0VmGhzI+ 4loimfsDYwaRIMdnYHUikDC3D8PKm+c= Received: from mail.maildlp.com (unknown [172.19.88.163]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4WShkg26Wvz20lWB; Tue, 23 Jul 2024 11:01:47 +0800 (CST) Received: from dggpeml500022.china.huawei.com (unknown [7.185.36.66]) by mail.maildlp.com (Postfix) with ESMTPS id B548318001B; Tue, 23 Jul 2024 11:03:28 +0800 (CST) Received: from huawei.com (10.90.53.73) by dggpeml500022.china.huawei.com (7.185.36.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Tue, 23 Jul 2024 11:03:28 +0800 From: Hongbo Li To: , , , CC: , , , , Subject: [PATCH v3 2/2] hugetlbfs: use tracepoints in hugetlbfs functions. Date: Tue, 23 Jul 2024 11:08:34 +0800 Message-ID: <20240723030834.213012-3-lihongbo22@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240723030834.213012-1-lihongbo22@huawei.com> References: <20240723030834.213012-1-lihongbo22@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.90.53.73] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpeml500022.china.huawei.com (7.185.36.66) X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 98658140008 X-Stat-Signature: gb46agtcbkspswkij39gp1bn38495kwb X-Rspam-User: X-HE-Tag: 1721703813-751860 X-HE-Meta: U2FsdGVkX1/lkoIcGJkgSZn/80KyGJO2UADHFeL3yAk1HqolRyy2jbvFFxnQrONCLnSO3ElIca1XMIuLGoMH2o2KJAjU04CNCay9fZR0Y/KCB4xsaUoPdHnInlwmD/4eJVyTf/YRbK3VOeJyzrJK9fQfnWliI+6WN4fCX2rTPhkUAq+041H+QsbSEBpbumBOQ4wbPTwJrn+NsiMXBRWrRl5Cbhj+XwvAOXQOL++p/nuPAW0SCc9iFK8O9uFzxZF3S1ezSOPbixR/XMy7nVYmkshy3cEspDO1JDq1vo4fyI8C0ulvbeV3uf5wEvFvjjdCZ3jGHrT1SYMaHfUfgRuZPGOcCwQGjrABtzC9S7iSiovJzspFAxhVD5m44/72P1EVW1hdsTIdSgdW2G4RiTli9HQ9KjPY+QIlxOr0Eg4TvSvJ5AtVx5v4UkT60jpwDUYn0anjbQIh7RTbHJTBLAO1QPGB93/IcNS7ckFSaCbw1He6OYpQB3uoQK0pMAypug/0wdqpELrLhMkwW3W4wtvNQhJt4JgEQ6hKAo5CzsuRNJtglagow+S2OLO2fA318QoOm3eLqvvnVyJMdELYs4+uLU0we7vL9DDeNoKDt1j3vkWCDh39O1rpEvt9OQt7tY5k4HFCkhvkvU6/fAS3ImpVgTdzfGL+skwItYEucdH6oZ3WEtW241Dl9eZZVbojqXQCYSH/HgNsJFixyFew+hWVcq1hJKz92mR+Hlo0RsNTmm2fbrpRQWefZQcuL8hM+E/FpzPqP/6b0ZbkqRCc/U3ZkUohE4Pjzz6ugh/DCWS1OxeyzQd0dqghhMNQsDxabb3lzlzmFhv+PaBRN6lpGr2UpX7ABgmQla6y+fTkKRbVC9Eqzw1d2pdODZ4AuSuhABWx46VJ6wVgo0fklhyeZUs80P0AAL5SxN7eQXgCkthwfQ9X3I+k7P/6jLt/xYtT9SAGS7E78u6hAkp2Po7k9W0 eiikLFGh HIQg8Gz1b9jVrAxuoX+grJz/VEvDcqCi1+GnIBVOdE+9TS/QROngZkc4e28kRwOKJdxDTDTSU6Dg7XPtFbEQwxbd6hEfCymEjuu5liG34NBLMOSvloGKXry1kDl9lGISXoips8/4mJ3Eu6NORa+04zzxRmwtoZYfTyeJ7wEztKiUMDoA= 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: List-Subscribe: List-Unsubscribe: Here we use the hugetlbfs tracepoint to track the call stack. And the output in trace is as follows: ``` touch-5265 [005] ..... 43.246550: hugetlbfs_alloc_inode: dev 0,51 ino 24621 dir 21959 mode 0100644 touch-5265 [005] ..... 43.246638: hugetlbfs_setattr: dev 0,51 ino 24621 name testfile valid 0x20070 mode 0177777 old_size 0 size -51622648042749952 truncate-5266 [005] ..... 45.590890: hugetlbfs_setattr: dev 0,51 ino 24621 name testfile valid 0x2068 mode 00 old_size 0 size 2097152 rm-5273 [007] ..... 110.052783: hugetlbfs_evict_inode: dev 0,51 ino 24621 mode 0100644 size 2097152 nlink 0 seals 1 blocks 0 -0 [007] ..s1. 110.059441: hugetlbfs_free_inode: dev 0,51 ino 24621 mode 0100644 size 2097152 nlink 0 seals 1 blocks 0 ``` Signed-off-by: Hongbo Li --- fs/hugetlbfs/inode.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 9f6cff356796..1689c01a11a0 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -39,6 +39,9 @@ #include #include +#define CREATE_TRACE_POINTS +#include + static const struct address_space_operations hugetlbfs_aops; static const struct file_operations hugetlbfs_file_operations; static const struct inode_operations hugetlbfs_dir_inode_operations; @@ -687,6 +690,7 @@ static void hugetlbfs_evict_inode(struct inode *inode) { struct resv_map *resv_map; + trace_hugetlbfs_evict_inode(inode); remove_inode_hugepages(inode, 0, LLONG_MAX); /* @@ -814,8 +818,10 @@ static long hugetlbfs_fallocate(struct file *file, int mode, loff_t offset, if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE)) return -EOPNOTSUPP; - if (mode & FALLOC_FL_PUNCH_HOLE) - return hugetlbfs_punch_hole(inode, offset, len); + if (mode & FALLOC_FL_PUNCH_HOLE) { + error = hugetlbfs_punch_hole(inode, offset, len); + goto out_nolock; + } /* * Default preallocate case. @@ -919,6 +925,9 @@ static long hugetlbfs_fallocate(struct file *file, int mode, loff_t offset, inode_set_ctime_current(inode); out: inode_unlock(inode); + +out_nolock: + trace_hugetlbfs_fallocate(inode, mode, offset, len, error); return error; } @@ -935,6 +944,8 @@ static int hugetlbfs_setattr(struct mnt_idmap *idmap, if (error) return error; + trace_hugetlbfs_setattr(inode, dentry, attr); + if (ia_valid & ATTR_SIZE) { loff_t oldsize = inode->i_size; loff_t newsize = attr->ia_size; @@ -1033,6 +1044,7 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb, break; } lockdep_annotate_inode_mutex_key(inode); + trace_hugetlbfs_alloc_inode(inode, dir, mode); } else { if (resv_map) kref_put(&resv_map->refs, resv_map_release); @@ -1272,6 +1284,7 @@ static struct inode *hugetlbfs_alloc_inode(struct super_block *sb) static void hugetlbfs_free_inode(struct inode *inode) { + trace_hugetlbfs_free_inode(inode); kmem_cache_free(hugetlbfs_inode_cachep, HUGETLBFS_I(inode)); }