From patchwork Tue Feb 28 09:31:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Olsa X-Patchwork-Id: 62368 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2915674wrd; Tue, 28 Feb 2023 01:43:43 -0800 (PST) X-Google-Smtp-Source: AK7set/pkYH/nZBjUWVpmhFoRkO9HubsQSaMhMG1zs7x6e3EOxVuzCbwUN5gwYuF1OEtx5+JoIFH X-Received: by 2002:a17:906:db02:b0:8e1:1f8c:5670 with SMTP id xj2-20020a170906db0200b008e11f8c5670mr2527347ejb.5.1677577423692; Tue, 28 Feb 2023 01:43:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677577423; cv=none; d=google.com; s=arc-20160816; b=tYMWN3zN9Qy0NtVMUTyuE+uVbSZzVp/14TgcwEfi2h6kHON7cgpfH6/3F/0r/e2CNU h90SjzoRnxr+N5RLx1v4RyIhLGx38/cNOTOqqVI/cJawQjPGoyOk7lyHwCgkak89yaQq hAVI/+GSI9Sweho4fgtGTq2hXztr980961wc4eO7zeO+bh2t57GNEqBa8ItUqoT70Z4j aZ7mCho51m8dJjVfgBbLdK4ioHx2v/q2ALiwbJZT90jZuD+NPdrvNGTapCkgGVtxEFH/ AElQnWoXlBSYjDH/uRau3V+nShZzMZXzGAuXchh3zCnCX/HuqdDNYvWRlfBsO+KfMLzo 5wGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jRiMVL8UMxdDmYRWnPBpaiDnrL4C3JcclWXafbd0+ks=; b=o1A/cQ7ArwnIhe9xSBQ1Uru3JKeLejeVCaCKTJM7DRbs+C2+e83L7bGwr/yCan3hxj iaSBvGlRmF/k33vFCcEspPCXcaiimmzpwWjy+qojqxKlmxvdV+3nM9qvM7pfP7Vq6Eva kK/bImLfIsh0P7QQI9yWWuUe2QH9Hdup/0YEiRNLFygMNdAC8yApsynF+ywmBMbJ+G7a 69RmORoHK5hgZM83FxspUQPmXvBGdnLoKQrO7I09F1hu2cLuMTZAFbKSUv8TwqCqxybI qhpyLplf9VjA7VhLKO3KoGsHpfraC7tphWWRoAvu+41hsPPm74gK0lmWLPcOC5n7fpcB u+0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HBaS3gT2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lf17-20020a170906ae5100b008b315ed8bd6si11225538ejb.787.2023.02.28.01.43.21; Tue, 28 Feb 2023 01:43:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HBaS3gT2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230334AbjB1Jcr (ORCPT + 99 others); Tue, 28 Feb 2023 04:32:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231331AbjB1Jcl (ORCPT ); Tue, 28 Feb 2023 04:32:41 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 625D5211F6; Tue, 28 Feb 2023 01:32:40 -0800 (PST) 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 F386860FFC; Tue, 28 Feb 2023 09:32:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 532EFC4339C; Tue, 28 Feb 2023 09:32:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677576759; bh=KVeSwjr1MM70r3HIU41SsfKM/mZY7sGzW/FlWf73V/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HBaS3gT21KO0nsyCT8FwE/BIVPSrUUAxD9WbcMeJSMhx+MPsx2OXhehXjktvVQ9SF kgJTVUP2drmveFEQk744dTA34D7L/FR0tCswjY48qD3gZLezBwpxEZdaAKZUfEV9E8 puKhKdldF5sCccw/H2cmBkC1DcvkyZ0EPz3U9fIMjXlUn7pqlNJ4oKgcBkNiYoOlta cVp0OrKcyhSKGCigtDHHEBTfcJIn3NdplKyAHXX+250Ogh4BZ5UuwAz7T0/68WfyFW ib8w3H4K5cOCX3dNnQvhTkO039M+djRYVP/majEBXvugWcRXiA6lq1snRVqbeG+RoZ mhHeZuGdkPo5w== 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 2/9] bpf: Use file's inode object build id in stackmap Date: Tue, 28 Feb 2023 10:31:59 +0100 Message-Id: <20230228093206.821563-3-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 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759067424548678881?= X-GMAIL-MSGID: =?utf-8?q?1759067424548678881?= Use build id from file's inode object in stackmap if it's available. Signed-off-by: Jiri Olsa --- kernel/bpf/stackmap.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/kernel/bpf/stackmap.c b/kernel/bpf/stackmap.c index aecea7451b61..9b9578e0cada 100644 --- a/kernel/bpf/stackmap.c +++ b/kernel/bpf/stackmap.c @@ -124,6 +124,28 @@ static struct bpf_map *stack_map_alloc(union bpf_attr *attr) return ERR_PTR(err); } +#ifdef CONFIG_INODE_BUILD_ID +static int vma_get_build_id(struct vm_area_struct *vma, unsigned char *build_id) +{ + struct build_id *bid; + + if (!vma->vm_file) + return -EINVAL; + bid = file_inode(vma->vm_file)->i_build_id; + if (IS_ERR_OR_NULL(bid)) + return bid ? PTR_ERR(bid) : -ENOENT; + if (bid->sz > BUILD_ID_SIZE_MAX) + return -EINVAL; + memcpy(build_id, bid->data, bid->sz); + return 0; +} +#else +static int vma_get_build_id(struct vm_area_struct *vma, unsigned char *build_id) +{ + return build_id_parse(vma, build_id, NULL); +} +#endif + static void stack_map_get_build_id_offset(struct bpf_stack_build_id *id_offs, u64 *ips, u32 trace_nr, bool user) { @@ -156,7 +178,7 @@ 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]); - if (!vma || build_id_parse(vma, id_offs[i].build_id, NULL)) { + if (!vma || vma_get_build_id(vma, id_offs[i].build_id)) { /* per entry fall back to ips */ id_offs[i].status = BPF_STACK_BUILD_ID_IP; id_offs[i].ip = ips[i];