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 9BB2DC05027 for ; Wed, 1 Feb 2023 13:58:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 113EC6B0075; Wed, 1 Feb 2023 08:58:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0C3026B0078; Wed, 1 Feb 2023 08:58:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ECCEB6B007B; Wed, 1 Feb 2023 08:58:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id DD63F6B0075 for ; Wed, 1 Feb 2023 08:58:12 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A74BB16073E for ; Wed, 1 Feb 2023 13:58:12 +0000 (UTC) X-FDA: 80418877224.01.20D36FD Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf09.hostedemail.com (Postfix) with ESMTP id DCAAB140003 for ; Wed, 1 Feb 2023 13:58:10 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=JnHy4CCn; spf=pass (imf09.hostedemail.com: domain of jolsa@kernel.org designates 139.178.84.217 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=1675259891; 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=gSnnt4fgX2I9uu82kp63+YnlF3N0Lzc/HDoxGN8vSwA=; b=kvnXUUteI8/YhdSC1de+qeRRlHls103SK7s6lpL0N+ZhLjDQqoPRFXlXLrILcopd/9I5/n rPnvag0pzaI3SkBWb36bbo7UDUK020SyXiWMEInlTmZi98VwCk5cOu6/d6oEL3sgWn5/Rm 7chU1J6xLFMPOQw2fABSOp1HvSE0qrI= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=JnHy4CCn; spf=pass (imf09.hostedemail.com: domain of jolsa@kernel.org designates 139.178.84.217 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=1675259891; a=rsa-sha256; cv=none; b=4vJnfMgRu5dGPLWEOmMJav7uZbPD6BY9tkC1MYjKqxDplE+Iz5XpobRVxkvRBfX+zEmja/ mGro3kFT3gFx3nmFf/xFTii7loicN+yfQABE6AqVIXKuXWVV3bCFPPrvnf8zP8vCjxnEcZ h6iOD+5oFftllqKcydmHv3jgyTEihZY= 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 dfw.source.kernel.org (Postfix) with ESMTPS id 0EFA9617BC; Wed, 1 Feb 2023 13:58:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF1C7C4339B; Wed, 1 Feb 2023 13:58:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675259889; bh=ut4TSVh/smk46JzyD72UAqn8UMJWTZ29FILHTx+yUwk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JnHy4CCnRASBpAW99dtJkbPX2oqBQQXDvGScvJq3o+/FaodL245/D9NJYxQNfNUsZ CMfE08ZZyQxrXuSMX6uO4lScYcc/QgQO6IdbezuEiloYTYdTdeMjt/DHZ2tJVA2nro lM9RoLjYSHdt9TmUMwqAm/Jx30Kz6WwRjHo/AuFSjgOjBt0zv5V5lx9CuomjQ881Pv eYXBR/aNwaA5hZTHvCZ/bRuaC72f8SSsEJPVdQGeMITJheap/wLUx3bYuvBMl9MFhH ye62SNud97XMHzIXR5+WUMVs3uW1p8/qPvccJ8q++3h1uCmOiECCYxs54/JclrE3nt NOavObpiK6Nlw== From: Jiri Olsa To: Alexei Starovoitov , Andrii Nakryiko , Hao Luo , Andrew Morton , Alexander Viro , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo 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 Subject: [PATCH RFC 2/5] bpf: Use file object build id in stackmap Date: Wed, 1 Feb 2023 14:57:34 +0100 Message-Id: <20230201135737.800527-3-jolsa@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230201135737.800527-1-jolsa@kernel.org> References: <20230201135737.800527-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: ueozs71fgdu8d6nnquxxfwgpyy9xh8su X-Rspam-User: X-Rspamd-Queue-Id: DCAAB140003 X-Rspamd-Server: rspam06 X-HE-Tag: 1675259890-67069 X-HE-Meta: U2FsdGVkX1/aytRiuIz7Y2Bf5lg/a0vaR2zRAuoulnM/Sr1OpKVWe9XGKf4wZ94C8szKJzCP5yd7m3FWgvWYwpTXaOpaCvosyJDO8oBl0waZPkTfSC4EnbsXmWZygIBwtc8jwA4zPuMVXWmFPVef+We5x1ShpJy4aNSHbyWuuq6Ms7shEF0FjIzkLgRaN6rZIwWu+PuHzjL02OfVFNGasfb4axq7HJXa5Em6nBqQSgrH/8CwDvUnlJ2NlqNCxaZ9usvY02OIGCMXJfX5fqwpcVu2PcaQs68x7P6aRlpJlp7JwTNK8kioE1DZlw8qcZtnQ/8uxOAZ4JK3s2IGxvR2kSjDBkqTq/eqz/dyItSqo+PE5DHM30bnKaQ5yjwUlbcBv416DqIvV4chk/gZRYGOipfDcTqucPnT0G+2a9koWTZ3++bQCGIV59qI92xCmP9xALm6+fmACr/UvRZQ0gW/gt1jBXWHuBEvw6G9CDKcwTmgRuqQKpqQCiSnqFIaZmxJNaTE/MZQk3riITvcAj2VVl1G/pBQnUnxXkj5uUwkiKw9eqC+MJNU2Plh0d0kbedEyo3u/tM64DzBREV3ASfWgZMXOK3dLq3ujGTN/cNqwOSJSOzN1XTXZTYIaRQaYY37YfrJXLerhY5xpGpXup+n0HFfyk8hWj563eo03hK6hyiznqDvObKwbTowkd3t7fYsih6NdmtneimjL2TwijcfjBQ6aeXLeMZ/uh7g7aRVD4OKP8c0+FgQwnK262hOpZPe4Wc2MXLeIgi9kzIzmtMMli8chAVc/LhOt1GkfLYlHSsyeqqwKDnNwsYpNm7D1WCAGRX4lmvsWW+az/sXDJzj09YlPGUM5tKCJzSSWOUzIvCYrOXR+/V4cmymVbfBwr4aNwFbOC5KegfxPKHBv3ZF9QzB/XQiAUrLtgqonN/L2dZds+JR30If7ITwkqm+DRXdFAZEfnbDKv9qxXSpxa8 oWYrUxZE JW5BQeVhTH7nloFRZhzExQQggI9QXP9dyKx7Dy6i92O2AAPmMHp7QHwrfp/3OXCXxzrUy8sag/lLS0X2XqnQoXUoX5si6G4GDMCeMhe2FdNf79Qv7gKozh6mRs1Q0XqCioqp94Dh6dSqQbN14xl2oXbrPG4mp7hUQk4DM97V7rVyVB5w/xDuBBwf5zN7bwt2mdyEOjwO/cvHRa19hbqAiqF1QO2qY7ZPkDn7gnByC/58YITyJ0UdV1EOj1RLdLVk6BuZS8QatgOzhFHGjSvaXclJ+kxckjBrQsH3ez6QwdCY6mFtVa/N5iDXPxaVTGrJtBs9KKwdWubsvD3lZzO1BPXKcMylVKJSKI/BlinwZ8KqKzBFdWa0JaE6wg3F716r960NjIAfzGN04Ca5zLlqeMEXYglbAJg29HkCH0ag6lErqWhU= 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 object in stackmap if it's available. Signed-off-by: Jiri Olsa --- kernel/bpf/stackmap.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/kernel/bpf/stackmap.c b/kernel/bpf/stackmap.c index aecea7451b61..944cb260a42c 100644 --- a/kernel/bpf/stackmap.c +++ b/kernel/bpf/stackmap.c @@ -156,7 +156,15 @@ static void stack_map_get_build_id_offset(struct bpf_stack_build_id *id_offs, goto build_id_valid; } vma = find_vma(current->mm, ips[i]); +#ifdef CONFIG_FILE_BUILD_ID + if (vma && vma->vm_file && vma->vm_file->f_bid) { + memcpy(id_offs[i].build_id, + vma->vm_file->f_bid->data, + vma->vm_file->f_bid->sz); + } else { +#else if (!vma || build_id_parse(vma, id_offs[i].build_id, NULL)) { +#endif /* per entry fall back to ips */ id_offs[i].status = BPF_STACK_BUILD_ID_IP; id_offs[i].ip = ips[i]; -- 2.39.1