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 BBF36C6FD20 for ; Wed, 8 Mar 2023 13:50:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3E4FC6B0074; Wed, 8 Mar 2023 08:50:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 36EDE6B0075; Wed, 8 Mar 2023 08:50:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C0BB6B0078; Wed, 8 Mar 2023 08:50:04 -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 065FE6B0074 for ; Wed, 8 Mar 2023 08:50:04 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id D7F6216083D for ; Wed, 8 Mar 2023 13:50:03 +0000 (UTC) X-FDA: 80545864686.26.38B0CD6 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by imf22.hostedemail.com (Postfix) with ESMTP id DEFD1C0004 for ; Wed, 8 Mar 2023 13:50:01 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="TM835z/u"; spf=pass (imf22.hostedemail.com: domain of olsajiri@gmail.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=olsajiri@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678283402; 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:dkim-signature; bh=Fw1ybOndIbrrRfvAYzPl/haUKNAOK7/LNFeGJa5C17A=; b=Lwf6+CGKNnW1pfNoQRSLH7ogc5zs+TLCzgMdeLvzaJYX0CFl57U8jtSjcuuKfspxyjoN9z t0oZeHSj1h2GCKHsJKPTIaUfaRAuIXjY+alaFED/C5Ibn1eJSG+JD+YMC+OxbhrxG5dGt5 T9dJR91R4ALNaIywodW4V9XKH+YHiiE= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="TM835z/u"; spf=pass (imf22.hostedemail.com: domain of olsajiri@gmail.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=olsajiri@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678283402; a=rsa-sha256; cv=none; b=pc0ZA6lyec46So2U/6HphgodvbeRneo9FqBSeUS77MCShvUB9pWvFkaueRJ8q1JleV0hPL hCS6Zk7M4Mv3Y9BuVwO2R/SS6NhbfdcvweBeyzdQ/jjjsnJN5LBcW9k6dkSIGfh6M24t8+ iq1nF110vqGHdl107NYUIA2p6cZYAkI= Received: by mail-wm1-f54.google.com with SMTP id l7-20020a05600c1d0700b003eb5e6d906bso1184596wms.5 for ; Wed, 08 Mar 2023 05:50:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678283400; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:date:from:from:to :cc:subject:date:message-id:reply-to; bh=Fw1ybOndIbrrRfvAYzPl/haUKNAOK7/LNFeGJa5C17A=; b=TM835z/umscpO2GS4Z2UxobOoh2M9emTqm+nRPeWHtx4n44rsnPBo9HTt2JZgwYiLN hOPt5YYnSzwoQyTSDveBC7yrxlSjzlzn8SSY/VDcUqlukeuL2fXVpC/VYWkitDjrjGcH OXpvfVcsdxa7WJFjhIDK04kYmqSkyXf83V0vVIgNS4yLOYnJxj+ehCD+LIWbKgQk45BD AqqOeuO76An83Vl+EKcRQVzBR0iUdIJzmAC515HM3CvkjqCxTE0ex2hcO0E/f84UwwFj VKK7p2QgdmLdOv42OswM43nCO/j8GEwkpf8HGh6ETf7vdrOoYKGOPUjHwHWMYRtzkHXg iEZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678283400; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Fw1ybOndIbrrRfvAYzPl/haUKNAOK7/LNFeGJa5C17A=; b=2RSNInO3OwB2vDf+GMHS2gwLGoqP48x81o/tMTi48EiCSvUFXG7vP3sEAOJpj6Blwy Vz9Zj2XGwtnRyR5Dj2z5d/Fg0xcc7EMS96Gzq/uz0OOuwMP8zCnQ4AYjLpTKw+XGgHsE 8Rsb4C1pTyDwhmsiVp7BymxiPZ5s2Tf3KzCHeJWtZzeF7p+DvDTBrk7Oi4hPvXeX6+Fj Rw0cnXjnYSYVKAjg3VRqrgFDHHCfoEC+er4uSLRt730uYfRrEDSnU2v02mF244kohb7l wQyZprx1PXmWEuJFR1JfNGule01p0cSpkC1x/8yzVB48oWXzXG2Z1PoQU5mPp/1OKY43 S7jA== X-Gm-Message-State: AO0yUKUS0oaogQPvb2W+gxF/rTUEQLv5WKkF5HJkzsYaf72hDkPtJj2g hlM34hUYdCM9dhh/V+dAQGo= X-Google-Smtp-Source: AK7set/OJOwNtGT/PaElIGIyqo5Mldye4v822B33ypCNm7WfiKFmKdLzDkkbQcHN+5Bmw7+p7e0QQw== X-Received: by 2002:a05:600c:4590:b0:3e2:2467:d3f5 with SMTP id r16-20020a05600c459000b003e22467d3f5mr15524629wmo.25.1678283400466; Wed, 08 Mar 2023 05:50:00 -0800 (PST) Received: from krava (2001-1ae9-1c2-4c00-726e-c10f-8833-ff22.ip6.tmcz.cz. [2001:1ae9:1c2:4c00:726e:c10f:8833:ff22]) by smtp.gmail.com with ESMTPSA id s7-20020a05600c45c700b003dc434b39c7sm2613058wmo.0.2023.03.08.05.49.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 05:50:00 -0800 (PST) From: Jiri Olsa X-Google-Original-From: Jiri Olsa Date: Wed, 8 Mar 2023 14:49:57 +0100 To: Andrii Nakryiko Cc: Alexei Starovoitov , Andrii Nakryiko , Hao Luo , Andrew Morton , Alexander Viro , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Matthew Wilcox , 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: Re: [PATCH RFC v2 bpf-next 5/9] selftests/bpf: Add read_buildid function Message-ID: References: <20230228093206.821563-1-jolsa@kernel.org> <20230228093206.821563-6-jolsa@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Rspamd-Queue-Id: DEFD1C0004 X-Stat-Signature: wgcj7hsmrgg6ygqyyfyngxkhsq6o4zir X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1678283401-26542 X-HE-Meta: U2FsdGVkX1+1EKVRtYDEtwOKCcpuAB0Vb1Y8DZXhSBoG93P03F++pG+oyomACZDzMMwNlLXle7+SEOYG4I3h2SiUraSCrT3GxZIQlCTAgqWaEey8hTZ4ghQ2LuYwHsL+p6XjX+1TxG2m/0UwrjxdDGnixTdjn+bTzoDRkyAj+1CtOqIAob9Fd5oWq8goQKZSM3KWjZAZa9n7Y1S+8OvO1QaWTA/ZrkY+deGtfFusyho5HqGAXY2TwQLFsvZxSrg1sPSitJUTt7VwFe0OwBVCWjmKSTJ9hfnx/cQdVk1AR1nXZ78IDJY1zBDDo3VIM+F8hSejAdHVKUtETDsNzcLvz7RrfimOVCk0SIUYHZ9ebuGsV7JdLrElFQxPB/rtaGUVskCWpsdWieRAcm6Jiaf5u/StyV6QZQxFLhvKvlIvBzCMDS7Xxo7xBNaoRiHsQeQAQLYNYxPagKrZfprv9Ss40p4kt8XoZoLgNflBrY5zRPBxeAEtaNs1pMHw9jQs0XklHdcAU/PjROE9YrJKT6c01pTwaQtwD6B9qjpMUqrPCg+s1MRczKSMpBgUVE7toQHQlVvic9aUAvOAevpEjdRYAcfXr8Us5yU4KBKvOqepTfwZIrghf5giozm4VnpnxaaWeOFxOnuvxKS4zR33PgCNDkCNz3QnSCIUo0DhWkkUPq3dCGw/u58xnUwVefyjAJ5T7xJEVQqslCyd6Krvj5MF5FQRvKlc/u+GVvnNZ9ttz64QGIvyThZdk8DisxLzPelJAnnUH/SE+fhhXfQFrcEeYrwZrQDWra6dXGVGPIi4uHv4o4bJlOm0GFKXKjt0/alnmGi7xE9rJxOmukJStnIoL4cIpISlLqcNOQtCCPNpMto07eglVGG2+g47fZrHjKhGkFRRxdj4GdFAiASYYM7buWDo87sbQQX51+T/eVmUvoRrm+NpQKUAtbDZ4eYlQVx/XEsaarlueKvP9HjmXm+ mA10ic+Z yYMX8yBaBIdvpMmGIxUYMr4Omf6uzXDL0EbcKpSggC21mFjukwTfiUtoGIdOdixM0XEcTVuLo8YbNZjunGRXVdvz+bfNzzwHFQCCfu+C6bowUrGHO/nV6RpE4rxB+Wd3m+0nvVby235NdhB9aIJh1Nk4wLvm6Wp7L7kSbW8CAz6UCqhyHUW8zoUPtvG26wD36HpFD6j20DNKjWFOTuOGEpe35M6ZlhOLCPFwCAUFSjSqGJC3dXnlHhvfkzDlt2pgJJn5D9qpQ11iMLLu8pJiokP9PFYp6pCsJYMocPYxcjcO/yVG3sbP0qhWaGtXCLQ0lvBOiGgiDbRPPDCv6E/Db6p+uY4YhxmA7ltebv1QfRmHN0i3xaINy/UVQIoXyjIP1zjZ2NTTWx2efqrD42QXE9igpw+ZV0cXVJszVaDLfOZyI/k4ggFNxfZQu4G8Qfl0SG5Ry+Un49QN3ZHY3nTUmYXi/BgUGczYJJq3M4eCZWKqETLgSYkkTPHR/0XfFyitp/tQtUbS4OAMQYPJcQ3o1/Gnc9C1mUg9OOERP1xlvdla+j5vbvSuplvluFpdtUtm8aPjNT8pyQX6KmxYbTjstZD/wqL/YdbkUFCAppgn6CSVeTekOqxLy4VmNbzKWI19iJyjEJQxrxwRAIg4= 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: On Tue, Mar 07, 2023 at 05:22:51PM -0800, Andrii Nakryiko wrote: > On Tue, Feb 28, 2023 at 1:33 AM Jiri Olsa wrote: > > > > Adding read_build_id function that parses out build id from > > specified binary. > > > > It will replace extract_build_id and also be used in following > > changes. > > > > Signed-off-by: Jiri Olsa > > --- > > tools/testing/selftests/bpf/trace_helpers.c | 98 +++++++++++++++++++++ > > tools/testing/selftests/bpf/trace_helpers.h | 5 ++ > > 2 files changed, 103 insertions(+) > > > > diff --git a/tools/testing/selftests/bpf/trace_helpers.c b/tools/testing/selftests/bpf/trace_helpers.c > > index 09a16a77bae4..c10e16626cd3 100644 > > --- a/tools/testing/selftests/bpf/trace_helpers.c > > +++ b/tools/testing/selftests/bpf/trace_helpers.c > > @@ -11,6 +11,9 @@ > > #include > > #include > > #include "trace_helpers.h" > > +#include > > +#include > > +#include > > > > #define DEBUGFS "/sys/kernel/debug/tracing/" > > > > @@ -230,3 +233,98 @@ ssize_t get_rel_offset(uintptr_t addr) > > fclose(f); > > return -EINVAL; > > } > > + > > +static int > > +parse_build_id_buf(const void *note_start, Elf32_Word note_size, > > + char *build_id) > > +{ > > + Elf32_Word note_offs = 0, new_offs; > > + > > + while (note_offs + sizeof(Elf32_Nhdr) < note_size) { > > + Elf32_Nhdr *nhdr = (Elf32_Nhdr *)(note_start + note_offs); > > + > > + if (nhdr->n_type == 3 && > > + nhdr->n_namesz == sizeof("GNU") && > > + !strcmp((char *)(nhdr + 1), "GNU") && > > + nhdr->n_descsz > 0 && > > + nhdr->n_descsz <= BPF_BUILD_ID_SIZE) { > > + memcpy(build_id, note_start + note_offs + > > + ALIGN(sizeof("GNU"), 4) + sizeof(Elf32_Nhdr), > > + nhdr->n_descsz); > > + memset(build_id + nhdr->n_descsz, 0, > > + BPF_BUILD_ID_SIZE - nhdr->n_descsz); > > I won't count :) but if something fits within 100 characters, please > keep it on single line copy&paste from kernel code ;-) I'll reformat that SNIP > > diff --git a/tools/testing/selftests/bpf/trace_helpers.h b/tools/testing/selftests/bpf/trace_helpers.h > > index 53efde0e2998..50b2cc498ba7 100644 > > --- a/tools/testing/selftests/bpf/trace_helpers.h > > +++ b/tools/testing/selftests/bpf/trace_helpers.h > > @@ -4,6 +4,9 @@ > > > > #include > > > > +#define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a)-1) > > +#define __ALIGN_MASK(x, mask) (((x)+(mask))&~(mask)) > > nit: I know these are macros, but why would you first use __ALIGN_MASK > and then #define it? swap them? same reason as above, I'll swap that thanks, jirka