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 8B123C678D5 for ; Wed, 8 Mar 2023 13:51:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1C147280002; Wed, 8 Mar 2023 08:51:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 14B92280001; Wed, 8 Mar 2023 08:51:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F2F1B280002; Wed, 8 Mar 2023 08:51:16 -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 E2AD8280001 for ; Wed, 8 Mar 2023 08:51:16 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C2F59A045B for ; Wed, 8 Mar 2023 13:51:16 +0000 (UTC) X-FDA: 80545867752.03.48CD955 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by imf13.hostedemail.com (Postfix) with ESMTP id BD4172001B for ; Wed, 8 Mar 2023 13:51:13 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=A4NTo7Z6; spf=pass (imf13.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=1678283473; a=rsa-sha256; cv=none; b=WR/RAj53ieaURx5po/2Mef1mM+P+6plk4SDg0tsJ1o9W0KJh60/cBFf0Vfl1v7nw4cayMZ S/0VdqO3hldi6WIfc7vltDA6Jh5cL4xEGF3LqnIvtDXDvr3ZnVKcXiPsgxLmPXAqXdgv61 rgIfSlPCfTtV1QfDTgQQlPjmKmb7zGM= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=A4NTo7Z6; spf=pass (imf13.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=1678283473; 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=2a7IZeMYO9n6PXhDENMf/0WN13+dEVs/avcgaXRcG/k=; b=zn3Wo8GqMQWZH4GBoBdsrHZu7hlYx7Ogt0kLB5iGgy/TkonMhud9tErLrGMaJl6SZP52rc 8q12jbkQ0hsKPyMl5eDqRLdL6ZJMl2zsKErd/FWDk0EhAb5qFLuS7u65cAowYxDsjSKH7J DQoXF8Kld8DyX4YrmvnCy+SB/XjcsEw= Received: by mail-wm1-f54.google.com with SMTP id m25-20020a7bcb99000000b003e7842b75f2so1193328wmi.3 for ; Wed, 08 Mar 2023 05:51:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678283472; 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=2a7IZeMYO9n6PXhDENMf/0WN13+dEVs/avcgaXRcG/k=; b=A4NTo7Z6YDgzCwMQESROwQaWS7+cg9Iy1ytO1f0y336fkSDEYoFEwSWHuMio2AeImv bRKfQOPZS7v7R8U6HmQRtcOA2GmhZ7dXgMzYNjo0fDH0ScPWI0V6twP+EVgUmWmt9j+5 qJj4k5QZ/geasNr19348OmPQkRXOJpbvvsrRy0RL54mL+tySiJ+QoZRhhU9YG79PINK1 kERy8iZxpB6awyslCA7+Usb+u05LnxScq5SqVkyt6rluOcUlzOxOawVHn2MbjEq+Eqkh QRUARSyxOX7fJCt4YFU0PBFlW9OGyW36+oQQ0TGau6MT7BLuiC5P4+0x+GaandeSVmXQ OI9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678283472; 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=2a7IZeMYO9n6PXhDENMf/0WN13+dEVs/avcgaXRcG/k=; b=6MadyUzuxyQRsbTeO1dAbE5Tem2hmObYP9+L8SifaC6PGvJTSF4G3Z16cA4WwI1IV3 VEdp+oOWAykouByHkk47hS/PxeaJXjTobXq3JJNNn0rrHguLudb1D2af4ox3sR1hCwmb m7XV08tsDzkixrwqB9RvHUUPF1JtDSjzpRpN4Gd1nJ/xPQhB1f/QOee896x58hbcLed/ K9byrYSOrfS1cZFYuQ9xENDlRRBqrhf1RWm3D5mLTp72M+/5pbEOcSfYz5w3QJ7sjY43 2xBPuofyevIPVOp/LSu0dgRu4ZsdOeuN6Ts3JsL0tghZlwaXysn+UVhEiPDksd57+O8K myIQ== X-Gm-Message-State: AO0yUKVkdx/ub2MnwSs8U8HbRgF7/J1mF4196PZRV7o7MHHzA+doBFbw v4EubonvBPg/Uu9KyiuGoRE= X-Google-Smtp-Source: AK7set/iI0f+bFuGX2KOYnRyVO55NVMzanwW/UZXPecNwIj6030n4Qu5dMtQwcP4F+mKYfu9HOXczw== X-Received: by 2002:a05:600c:3d14:b0:3df:9858:c033 with SMTP id bh20-20020a05600c3d1400b003df9858c033mr16288216wmb.8.1678283472235; Wed, 08 Mar 2023 05:51:12 -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 o14-20020a05600c510e00b003dc522dd25esm4731434wms.30.2023.03.08.05.51.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 05:51:11 -0800 (PST) From: Jiri Olsa X-Google-Original-From: Jiri Olsa Date: Wed, 8 Mar 2023 14:51:09 +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 7/9] selftests/bpf: Replace extract_build_id with read_build_id Message-ID: References: <20230228093206.821563-1-jolsa@kernel.org> <20230228093206.821563-8-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-Rspam-User: X-Rspamd-Queue-Id: BD4172001B X-Rspamd-Server: rspam01 X-Stat-Signature: tbz6whajgz55rcr9eaz44q7ho88duzwb X-HE-Tag: 1678283473-352372 X-HE-Meta: U2FsdGVkX189uSZD1iUtPJ0rOhkI5eYIn/rsZhKR7d5eZQhvNrZgJk3EkuBGlVR9Ay1i3IVr0knLIlRqu9bDv/+3Mr6x1U+sDBYsyASCQFOa7Y/+7zwZRSja1EV0ZnvE8fDdORhIRwG4IqL/9EESUv+kRnHGYgm3dwpxw4qre/PdG5GMhzOx2rdiY/nfEf0s6MuSW1Rp+dAJTC3TwPbah0CSQCKnj+Z3NptjdI052wtWURikDbgoTq6gM0NzGCaNAs0g+/Tn0zP66QfzmSXq4kZgJWQj+ohx22tKaE11eOiCGXN0JlcP5R8JUVxrfLqwcFcTcLeeijyiKx01GB6DZ4q5r4NP//NODFsdBCLdYdJKUacgT9jjvkBpPtCr8djUSCugBe262tMOuuh3fMK8MGaHZv+Xc7qlqaXLb5wCBr3ZWEMOqc0g3YxI9BRl7MBe0P7me/Uh6ufVYdDm/daWm13V/4mE7CB6eiM+GRbDfdQfB/MIarPQOulP/K4Yb0fx8Q2UigCfCXm0DBlhXcBAnBQbf6QFz1+9tmhvPiEzWzC3rKHjrj39QkFv4IUxKaiKhvJgaIOsRpJ8Wmonq/qtxRE9qOeJyAuhEmC6Dpy+1N4fM3rpbd4WsiJDb4GLhwOazoyVCIoyyFbbx4GrAhFQgwgk8i3ZVZPVja6q79ZuwRafCXsGeubhmz0S4ralQgIdHu6uCe6UDASBiNmrAcCjDOnn4d5OwLnSmI72KJKegTYIcD3Axuq+cysEncEsmCAc9w3rgxpME/Hv3toxf3zcmvCXjrkbG4BCySW1Qi/oWbCpzN0shToRRtJD+hLL+XoHtXWkSmBmpY13/4nw5HxNh6kGcdyo4uUO5CbLHVWPJg9t5Ek8gAcpVvL2LwK+mfy8fpZTg2G55bdGnZjp+6mgbdSY8ANzSel/nBSreIdOwmUrM4ohODYkCrGc2KYicxneT68jSooq2T/1n03Inma d3ym9vOT aakSjlKciNVZ7sMxOsJgzUxQ6mLQ/Yi1AhsAGu4y7ZSN06EhFzTS0cuT0SYD/wnMow1vBCH0/biDTOfIH4E6EVLMLnWJgdGKfue6inD6VcLl3WQZ/eIMR03b45w6kHyWAy9dJaVQL2yj+oMZABKTZziCOv/vPRf9Wh/f7WeSMWYWRBvnkmprfnONr/sl973c/7qWtf5V2QkvQ45/BT8MVDUnrffb0GDYVD5FMkLcvHvToyL6MuKw7y2b89sZ3034AaVGuHrVPp5SuzptXA0APgeYGJsahODFTsH4qV459T1FX2Yf57mH2h7dCAH1ElkHypSJyzaOqRuWem+DnZ7SPCb6/XySCnZIarb/p8z0tO3ZMwJMioWTDaq8rqicd0Mgmoh/w5TJqCn4ooDjFhYLdGvJI99ibCRblB1kFsYnpttwY18Wum3wMyouU3IwINSrg08zHT+vxMz1sPWWZKetAvDJMj56WV3R9EMniPoEH1B3oDlodTS+JkfqMl0h/nfQ25FqNbe0DO8I8xLG2803bAUgXbdrMK0o2R1tpS9uMOcvb2HvITeaqKETuB/L01tMRAcum3QH5j17wtcSHVWSrhH8lGWya9chAFh0IW+Bz4VuMs03T8+gCPXls8zcDAsI5SlhG7/AIxaVDM5I= 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:26:32PM -0800, Andrii Nakryiko wrote: > On Tue, Feb 28, 2023 at 1:33 AM Jiri Olsa wrote: > > > > Replacing extract_build_id with read_build_id that parses out > > build id directly from elf without using readelf tool. > > > > Signed-off-by: Jiri Olsa > > --- > > small nit below, but looks good. Thanks for clean up! > > Acked-by: Andrii Nakryiko > > > .../bpf/prog_tests/stacktrace_build_id.c | 19 ++++++-------- > > .../bpf/prog_tests/stacktrace_build_id_nmi.c | 17 +++++-------- > > tools/testing/selftests/bpf/test_progs.c | 25 ------------------- > > tools/testing/selftests/bpf/test_progs.h | 1 - > > 4 files changed, 13 insertions(+), 49 deletions(-) > > > > diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c > > index 9ad09a6c538a..9e4b76ee356f 100644 > > --- a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c > > +++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c > > @@ -7,13 +7,12 @@ void test_stacktrace_build_id(void) > > > > int control_map_fd, stackid_hmap_fd, stackmap_fd, stack_amap_fd; > > struct test_stacktrace_build_id *skel; > > - int err, stack_trace_len; > > + int err, stack_trace_len, build_id_size; > > __u32 key, prev_key, val, duration = 0; > > - char buf[256]; > > - int i, j; > > + char buf[BPF_BUILD_ID_SIZE]; > > struct bpf_stack_build_id id_offs[PERF_MAX_STACK_DEPTH]; > > int build_id_matches = 0; > > - int retry = 1; > > + int i, retry = 1; > > > > retry: > > skel = test_stacktrace_build_id__open_and_load(); > > @@ -52,9 +51,10 @@ void test_stacktrace_build_id(void) > > "err %d errno %d\n", err, errno)) > > goto cleanup; > > > > - err = extract_build_id(buf, 256); > > + build_id_size = read_build_id("./urandom_read", buf); > > nit: "urandom_read" vs "./urandom_read" matters only when executing > binary, not when opening a file. So all these "./" just creates > unnecessary confusion, IMO right, I'll remove it also in the other test thanks, jirka > > > + err = build_id_size < 0 ? build_id_size : 0; > > > > - if (CHECK(err, "get build_id with readelf", > > + if (CHECK(err, "read_build_id", > > "err %d errno %d\n", err, errno)) > > goto cleanup; > > > > @@ -64,8 +64,6 @@ void test_stacktrace_build_id(void) > > goto cleanup; > > > > do { > > - char build_id[64]; > > - > > err = bpf_map_lookup_elem(stackmap_fd, &key, id_offs); > > if (CHECK(err, "lookup_elem from stackmap", > > "err %d, errno %d\n", err, errno)) > > @@ -73,10 +71,7 @@ void test_stacktrace_build_id(void) > > for (i = 0; i < PERF_MAX_STACK_DEPTH; ++i) > > if (id_offs[i].status == BPF_STACK_BUILD_ID_VALID && > > id_offs[i].offset != 0) { > > - for (j = 0; j < 20; ++j) > > - sprintf(build_id + 2 * j, "%02x", > > - id_offs[i].build_id[j] & 0xff); > > - if (strstr(buf, build_id) != NULL) > > + if (memcmp(buf, id_offs[i].build_id, build_id_size) == 0) > > build_id_matches = 1; > > } > > prev_key = key; > > diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c > > index f4ea1a215ce4..8d84149ebcc7 100644 > > --- a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c > > +++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c > > @@ -28,11 +28,10 @@ void test_stacktrace_build_id_nmi(void) > > .config = PERF_COUNT_HW_CPU_CYCLES, > > }; > > __u32 key, prev_key, val, duration = 0; > > - char buf[256]; > > - int i, j; > > + char buf[BPF_BUILD_ID_SIZE]; > > struct bpf_stack_build_id id_offs[PERF_MAX_STACK_DEPTH]; > > - int build_id_matches = 0; > > - int retry = 1; > > + int build_id_matches = 0, build_id_size; > > + int i, retry = 1; > > > > attr.sample_freq = read_perf_max_sample_freq(); > > > > @@ -94,7 +93,8 @@ void test_stacktrace_build_id_nmi(void) > > "err %d errno %d\n", err, errno)) > > goto cleanup; > > > > - err = extract_build_id(buf, 256); > > + build_id_size = read_build_id("./urandom_read", buf); > > + err = build_id_size < 0 ? build_id_size : 0; > > > > if (CHECK(err, "get build_id with readelf", > > "err %d errno %d\n", err, errno)) > > @@ -106,8 +106,6 @@ void test_stacktrace_build_id_nmi(void) > > goto cleanup; > > > > do { > > - char build_id[64]; > > - > > err = bpf_map__lookup_elem(skel->maps.stackmap, &key, sizeof(key), > > id_offs, sizeof(id_offs), 0); > > if (CHECK(err, "lookup_elem from stackmap", > > @@ -116,10 +114,7 @@ void test_stacktrace_build_id_nmi(void) > > for (i = 0; i < PERF_MAX_STACK_DEPTH; ++i) > > if (id_offs[i].status == BPF_STACK_BUILD_ID_VALID && > > id_offs[i].offset != 0) { > > - for (j = 0; j < 20; ++j) > > - sprintf(build_id + 2 * j, "%02x", > > - id_offs[i].build_id[j] & 0xff); > > - if (strstr(buf, build_id) != NULL) > > + if (memcmp(buf, id_offs[i].build_id, build_id_size) == 0) > > build_id_matches = 1; > > } > > prev_key = key; > > diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c > > index 6d5e3022c75f..9813d53c4878 100644 > > --- a/tools/testing/selftests/bpf/test_progs.c > > +++ b/tools/testing/selftests/bpf/test_progs.c > > @@ -591,31 +591,6 @@ int compare_stack_ips(int smap_fd, int amap_fd, int stack_trace_len) > > return err; > > } > > > > -int extract_build_id(char *build_id, size_t size) > > -{ > > - FILE *fp; > > - char *line = NULL; > > - size_t len = 0; > > - > > - fp = popen("readelf -n ./urandom_read | grep 'Build ID'", "r"); > > - if (fp == NULL) > > - return -1; > > - > > - if (getline(&line, &len, fp) == -1) > > - goto err; > > - pclose(fp); > > - > > - if (len > size) > > - len = size; > > - memcpy(build_id, line, len); > > - build_id[len] = '\0'; > > - free(line); > > - return 0; > > -err: > > - pclose(fp); > > - return -1; > > -} > > - > > static int finit_module(int fd, const char *param_values, int flags) > > { > > return syscall(__NR_finit_module, fd, param_values, flags); > > diff --git a/tools/testing/selftests/bpf/test_progs.h b/tools/testing/selftests/bpf/test_progs.h > > index 9fbdc57c5b57..3825c2797a4b 100644 > > --- a/tools/testing/selftests/bpf/test_progs.h > > +++ b/tools/testing/selftests/bpf/test_progs.h > > @@ -404,7 +404,6 @@ static inline void *u64_to_ptr(__u64 ptr) > > int bpf_find_map(const char *test, struct bpf_object *obj, const char *name); > > int compare_map_keys(int map1_fd, int map2_fd); > > int compare_stack_ips(int smap_fd, int amap_fd, int stack_trace_len); > > -int extract_build_id(char *build_id, size_t size); > > int kern_sync_rcu(void); > > int trigger_module_test_read(int read_sz); > > int trigger_module_test_write(int write_sz); > > -- > > 2.39.2 > >