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 99863C64ED6 for ; Tue, 28 Feb 2023 09:32:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 350BA6B0075; Tue, 28 Feb 2023 04:32:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 300416B0078; Tue, 28 Feb 2023 04:32:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C8486B007B; Tue, 28 Feb 2023 04:32:56 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 0E6576B0075 for ; Tue, 28 Feb 2023 04:32:56 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D2FD1141455 for ; Tue, 28 Feb 2023 09:32:55 +0000 (UTC) X-FDA: 80516186310.03.FAA2672 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf24.hostedemail.com (Postfix) with ESMTP id 103EE18001A for ; Tue, 28 Feb 2023 09:32:53 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=UUER4sVx; spf=pass (imf24.hostedemail.com: domain of jolsa@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=jolsa@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677576774; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=CeCJ0oEk5RL2g2O2Wkuzd5KPC6xHac/W/ZeSwdsbPjc=; b=btmNqKbPY5OsgHzeByregJdYQUpoHpNKpqFJmYyOGBM6ZJnbcHR1xFkcmlw9W6sEr0keNE Ekbfh1ULQIWJQgYfdZDZOG35WlZN33O27r3wHzqSRC9znw18lH7plDwOzgdzxEODndIF5a klVEySwUipvg/J33Z5qnzfcnX3Lmmo4= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=UUER4sVx; spf=pass (imf24.hostedemail.com: domain of jolsa@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=jolsa@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677576774; a=rsa-sha256; cv=none; b=4/2SnGxCV97E/BBL3vyqyEybY7CtyBjqACYns9YlfAqFgdC476ol8/lSWzbukKV207UqQ/ hIxaRvZ1G7riH5SDOHbRm80QeOUJq9nXsuwWw23eccbLPHVgCtYkrQTOog3FYqBi2GA2r0 akZh59X5bS9wTonHqFxLqW8RZhHBjfA= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 9CA36B80E19; Tue, 28 Feb 2023 09:32:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3B153C4339B; Tue, 28 Feb 2023 09:32:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677576772; bh=gRbBq9vcg2Rx0X4DobOUrTbz29HAnK95YnrQdwF+tOs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UUER4sVx5kKwhIxZJzXS365tQT33utMe1eesSOX10vXEV3c2fXxOy4y9NsJhXUSVj KGCct3+pPhcRE6etwiID1UiyTVQBD13Q7e8AhkqWdblrc0rmr+ztVaXWSb6Pv+KEry YuRjGz9aua3cIofqdhIrhgf/Z1iqxjOuygz3pleLvUxOJ5hfKziy/n/soR1wUwG7aS nzcl/wOtvF13q+0mNO4y6Zse0dxmwf8NZw0Kp6Hw5MonV1qnkiGJWFjTEb++bv3uDS SximpWRECz8+nkMrKJImloHn5eZrbunWLqwZ0EXwwrH7Zw7a6dbLxXJtMKTLweRI9B Uvg44OWRgv/pg== From: Jiri Olsa To: Alexei Starovoitov , Andrii Nakryiko , Hao Luo , Andrew Morton , Alexander Viro , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Matthew Wilcox Cc: bpf@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-perf-users@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Daniel Borkmann , Namhyung Kim Subject: [PATCH RFC v2 bpf-next 3/9] perf: Use file object build id in perf_event_mmap_event Date: Tue, 28 Feb 2023 10:32:00 +0100 Message-Id: <20230228093206.821563-4-jolsa@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228093206.821563-1-jolsa@kernel.org> References: <20230228093206.821563-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 103EE18001A X-Rspam-User: X-Stat-Signature: r456ygdepikyoqbwusch4brk9t1f6kmw X-HE-Tag: 1677576773-485907 X-HE-Meta: U2FsdGVkX196wGsUjtr08bbYThG6Vb+MV/nBtTipzbjxu6W8nM651SCU+YtDm2mO/4VgOJowkXuQXGAmeJlioxpaezWktcV2LFbqsFBL7Yf6uA9vhc8NFjevnQQClv3p1s4IRtOtx/fJFz0/7n0RcVjmW88f/T80GT5k0d3Rwz6gh478JA9wlumEB2OsOfdMs2iuZ8IhLRBfZlDRkiVUGuFJdHGEm4xhKubVcBVZatv9LacSWBQ5K1d7BspotGac/nZXSyxadDyZEnCJiBK7LVvSrq9c7JVjZlBxF5uNcUII5KzCNBMj9o167rWILAIKk9pl8IUJWRkjuL1sVY3a8flsVLo1QrqILlW6bt08g7+48OufY+TnhGKepPYAZxxQLx8XsECeJNrjOr6ylOq9VtUcOFDkqnotZItD3bKZNL8Ag8wc1a3uNlLkZHtVGaCJg7ith30V1wLi9zxsCPtpJYyNHvhCE1loUqb/mAkeRmqSkIsnBjsEs5N1HnUnsCQekLsvVoVkcil1yk+WqTj12EHAAVIjz91DcNx3msh1Y+VKrsTZNOjGC2NCcC/oMV9fGoyXnDYX9KSyGhFHX+DMLVSEqK7aDbiuBEFZL5AZzWADtEqDEePKLTqB0k14k5b8VvlqpOnrrkMCJZjgpusZvyqAWvT5eU0H1twVlSupGCb9EXA1Hof9NPP3M+Z8p5wD17bdhSqc35vzoa45SadA+M5gkxH+ijGR34yDfggKnxLb8CVQbNbJPXowMzaNF9U4mVrSRALh4SYN5OaYS6Lh9Y4TyFU3rejSgs4a0lWbnwDZwxWvUqgpYeluAVCw2JxUArVLC05jZQdJm6cb2qgqWSzxOCCOLKL3t595kX6OCNOFb/tb1z4FcvBxsTx4JfZWieqkFD56ZCkc9V7dYBZCOf2NSfqwAJlQ1M2d0kWDXiGIcRwmYbu5PvkQOJ6oFRzl/LEB2PlPCmqvUEkiqQw bi90FC1p 4fdkRDd5NtenH4TEbWB32edk7+/dtKrkHgUv3GJmGoJuGL8dE9L4854JXCQE8UnMfaiOXuiHl5ZmDRUDgF6jIAaCjHzNjkoh7D8A1AGHHqUea0dmykDSwjsDT9ARq71Jqls+KwMAJqP+gPw/zlsfiAKDiRdeUzrjsIeyZMqV2YVQGpGXIspQNrqtBuoPdxJWPbLGTxETxDhGgZWmAv89ojvxcU5+fp2wQmm+HHdl5dvmPjuWgn5YhVtJyaqwgGpdaQpBjB3+6vaHVwaD9K9s0e3JDO4wftxlVB2urQ4GRkDJK+Adnxu6aqHtZ6VxpHaYQWVgHg0hGxjVbnmpovwazp9wyka8ACeQH8kZhi07cIl/0Eh59DdvvES5oMNXfJ2IlWe5NI5K6I3208s7bluG7Kx79l7Rc+3RWLB7qK6GrczyTytfXiJUtRQPVTvHAKnqyFXGgMXPBSgPlIgynWCLPtBQksBrBXAfKsgeX 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: Use build id from file's inode object when available for perf's MMAP2 event build id data. Signed-off-by: Jiri Olsa --- kernel/events/core.c | 46 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 7099c77bc53b..148f78a88492 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -8527,6 +8527,9 @@ struct perf_mmap_event { u32 prot, flags; u8 build_id[BUILD_ID_SIZE_MAX]; u32 build_id_size; +#ifdef CONFIG_INODE_BUILD_ID + struct build_id *i_build_id; +#endif struct { struct perf_event_header header; @@ -8539,6 +8542,41 @@ struct perf_mmap_event { } event_id; }; +#ifdef CONFIG_INODE_BUILD_ID +static void build_id_read(struct perf_mmap_event *mmap_event) +{ + struct vm_area_struct *vma = mmap_event->vma; + struct inode *inode = NULL; + + if (vma->vm_file) + inode = file_inode(vma->vm_file); + mmap_event->i_build_id = inode ? inode->i_build_id : NULL; +} + +static bool has_build_id(struct perf_mmap_event *mmap_event) +{ + return !IS_ERR_OR_NULL(mmap_event->i_build_id); +} + +#define build_id_data mmap_event->i_build_id->data +#define build_id_size mmap_event->i_build_id->sz +#else +static void build_id_read(struct perf_mmap_event *mmap_event) +{ + struct vm_area_struct *vma = mmap_event->vma; + + build_id_parse(vma, mmap_event->build_id, &mmap_event->build_id_size); +} + +static bool has_build_id(struct perf_mmap_event *mmap_event) +{ + return mmap_event->build_id_size; +} + +#define build_id_data mmap_event->build_id +#define build_id_size mmap_event->build_id_size +#endif + static int perf_event_mmap_match(struct perf_event *event, void *data) { @@ -8583,7 +8621,7 @@ static void perf_event_mmap_output(struct perf_event *event, mmap_event->event_id.pid = perf_event_pid(event, current); mmap_event->event_id.tid = perf_event_tid(event, current); - use_build_id = event->attr.build_id && mmap_event->build_id_size; + use_build_id = event->attr.build_id && has_build_id(mmap_event); if (event->attr.mmap2 && use_build_id) mmap_event->event_id.header.misc |= PERF_RECORD_MISC_MMAP_BUILD_ID; @@ -8592,10 +8630,10 @@ static void perf_event_mmap_output(struct perf_event *event, if (event->attr.mmap2) { if (use_build_id) { - u8 size[4] = { (u8) mmap_event->build_id_size, 0, 0, 0 }; + u8 size[4] = { (u8) build_id_size, 0, 0, 0 }; __output_copy(&handle, size, 4); - __output_copy(&handle, mmap_event->build_id, BUILD_ID_SIZE_MAX); + __output_copy(&handle, build_id_data, BUILD_ID_SIZE_MAX); } else { perf_output_put(&handle, mmap_event->maj); perf_output_put(&handle, mmap_event->min); @@ -8727,7 +8765,7 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event) mmap_event->event_id.header.size = sizeof(mmap_event->event_id) + size; if (atomic_read(&nr_build_id_events)) - build_id_parse(vma, mmap_event->build_id, &mmap_event->build_id_size); + build_id_read(mmap_event); perf_iterate_sb(perf_event_mmap_output, mmap_event, -- 2.39.2