From patchwork Fri Feb 10 00:11:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Leoshkevich X-Patchwork-Id: 13135252 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0FFA3C6379F for ; Fri, 10 Feb 2023 00:12:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229662AbjBJAMx (ORCPT ); Thu, 9 Feb 2023 19:12:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229585AbjBJAMv (ORCPT ); Thu, 9 Feb 2023 19:12:51 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5375B5D3EE for ; Thu, 9 Feb 2023 16:12:48 -0800 (PST) Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31A0Bpbf001349; Fri, 10 Feb 2023 00:12:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : content-transfer-encoding : mime-version; s=pp1; bh=86ecuVDXFXR7q8LtX9cHdhLfTpuq6+tg67Y51RPVmNY=; b=onfrAjo1dPukGmrBGdEsYWm7ZplgspiorKS3BSymbzaFiAaDt/6r2f6ivgCECaLyUqpz lzKyXjSsMl/nfXLn9NOEZGMj1xWTAPcFHYl9EP4FMOA30hGGlQKN5icfokQ6dZES01r6 mF4AH3MK9da9GE86FB29HCcErOMIFsKIP6pQuHarFoGDStG3e4d5/Y+cwBJxMU5RnplU hnYPUvFgDGEuynWnl2YlULX9H9NKOzFThlY1RSS4e6+TJwbNTvOiEvWXHoQiN3np2G3b DalFEqETE5XnSVRo75bQ1hRw/YGLWSXzlkBc3EUOlGdAPov+PPUBPC9H9L24zcyJrtQr 0A== Received: from ppma02fra.de.ibm.com (47.49.7a9f.ip4.static.sl-reverse.com [159.122.73.71]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3nnb60g0cm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Feb 2023 00:12:31 +0000 Received: from pps.filterd (ppma02fra.de.ibm.com [127.0.0.1]) by ppma02fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 319D8Jnl026476; Fri, 10 Feb 2023 00:12:29 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma02fra.de.ibm.com (PPS) with ESMTPS id 3nhf06vus6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Feb 2023 00:12:28 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 31A0CPt426607966 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 10 Feb 2023 00:12:25 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1FAF020043; Fri, 10 Feb 2023 00:12:25 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 88BA720040; Fri, 10 Feb 2023 00:12:24 +0000 (GMT) Received: from heavy.ibmuc.com (unknown [9.171.74.186]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 10 Feb 2023 00:12:24 +0000 (GMT) From: Ilya Leoshkevich To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Ilya Leoshkevich Subject: [PATCH bpf-next v2 00/16] selftests/bpf: Add Memory Sanitizer support Date: Fri, 10 Feb 2023 01:11:54 +0100 Message-Id: <20230210001210.395194-1-iii@linux.ibm.com> X-Mailer: git-send-email 2.39.1 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: sZ0Q_H68xOHICMJ7a1svo8eb7aRW_Znz X-Proofpoint-ORIG-GUID: sZ0Q_H68xOHICMJ7a1svo8eb7aRW_Znz X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-09_16,2023-02-09_03,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 suspectscore=0 bulkscore=0 adultscore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 mlxscore=0 impostorscore=0 clxscore=1015 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302090217 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net v1: https://lore.kernel.org/bpf/20230208205642.270567-1-iii@linux.ibm.com/ v1 -> v2: - Apply runqslower's EXTRA_CFLAGS and EXTRA_LDFLAGS unconditionally. - Use u64 for uretprobe_byname2_rc. - Use BPF_UPROBE() instead of PT_REGS_xxx(). - Use void * instead of char * for pointer arithmetic. - Rename libbpf_mark_defined() to __libbpf_mark_mem_written(), add convenience wrappers. - Add a comment about defined(__has_feature) && __has_feature(memory_sanitizer). - Extract is_percpu_bpf_map_type(). - Introduce bpf_get_{map,prog,link,btf}_info_by_fd() and convert all code to use them. If it's too early for that, in particular for samples and perf, the respective patches can be dropped. - Unpoison infos returned by these functions, paying attention to potentially missing fields. Use macros to reduce boilerplate. - Move capget() unpoisoning to LLVM [5]. - With that, only a few cases remain where data needs to be unpoisoned in selftests. Hi, This series adds support for building selftests with Memory Sanitizer [1] - a compiler instrumentation for detecting usages of undefined memory. The primary motivation is to make sure that such usages do not occur during testing, since the ones that have not been caught yet are likely to affect the CI results on s390x. The secondary motivation is to be able to use libbpf in applications instrumented with MSan (it requires all code running in a process to be instrumented). MSan has found one real issue (fixed by patch 7), and of course a number of false positives. This rest of this series deals with preparing the build infrastructure and adding MSan annotations to libbpf and selftests. The setup I'm using is as follows: - Instrumented zlib-ng and patched elfutils [2]. - Patched LLVM [3, 4, 5]. - Clang-built kernel. - Building tests with MSan: make \ -C tools/testing/selftests/bpf \ CC="ccache clang-17" \ LD=ld \ HOSTCC="ccache clang-17" \ HOSTLD=ld \ LLVM=1 \ LLVM_SUFFIX=-17 \ OBJCOPY=objcopy \ CLANG="ccache clang-17" \ LLVM_STRIP=llvm-strip-17 \ LLC=llc-17 \ BPF_GCC= \ SAN_CFLAGS="-fsanitize=memory \ -fsanitize-memory-track-origins \ -I$PWD/../zlib-ng/dist/include \ -I$PWD/../elfutils/dist/include" \ SAN_LDFLAGS="-fsanitize=memory \ -fsanitize-memory-track-origins \ -L$PWD/../zlib-ng/dist/lib \ -L$PWD/../elfutils/dist/lib" \ CROSS_COMPILE=s390x-linux-gnu- It's a lot of options, but most of them are trivial: setting up LLVM toolchain, taking in account s390x quirks, setting up MSan and disabling bpf-gcc. The CROSS_COMPILE one is a hack: instrumenting bpftool turned out to be too complicated from the build system perspective, so having CROSS_COMPILE forces compiling the host libbpf uninstrumented and guest libbpf instrumented. - Running tests with MSan on s390x: LD_LIBRARY_PATH= ./test_progs ... Summary: 282/1624 PASSED, 23 SKIPPED, 4 FAILED The 4 failures happen without MSan too, they are already known and denylisted. Best regards, Ilya [1] https://clang.llvm.org/docs/MemorySanitizer.html [2] https://sourceware.org/pipermail/elfutils-devel/2023q1/005831.html [3] https://reviews.llvm.org/D143296 [4] https://reviews.llvm.org/D143330 [5] https://reviews.llvm.org/D143660 Ilya Leoshkevich (16): selftests/bpf: Quote host tools tools: runqslower: Add EXTRA_CFLAGS and EXTRA_LDFLAGS support selftests/bpf: Split SAN_CFLAGS and SAN_LDFLAGS selftests/bpf: Forward SAN_CFLAGS and SAN_LDFLAGS to runqslower and libbpf selftests/bpf: Attach to fopen()/fclose() in uprobe_autoattach selftests/bpf: Attach to fopen()/fclose() in attach_probe libbpf: Fix alen calculation in libbpf_nla_dump_errormsg() libbpf: Introduce bpf_{btf,link,map,prog}_get_info_by_fd() libbpf: Use bpf_{btf,link,map,prog}_get_info_by_fd() bpftool: Use bpf_{btf,link,map,prog}_get_info_by_fd() perf: Use bpf_{btf,link,map,prog}_get_info_by_fd() samples/bpf: Use bpf_{btf,link,map,prog}_get_info_by_fd() selftests/bpf: Use bpf_{btf,link,map,prog}_get_info_by_fd() libbpf: Factor out is_percpu_bpf_map_type() libbpf: Add MSan annotations selftests/bpf: Add MSan annotations samples/bpf/test_map_in_map_user.c | 2 +- samples/bpf/xdp1_user.c | 2 +- samples/bpf/xdp_adjust_tail_user.c | 2 +- samples/bpf/xdp_fwd_user.c | 4 +- samples/bpf/xdp_redirect_cpu_user.c | 4 +- samples/bpf/xdp_rxq_info_user.c | 2 +- samples/bpf/xdp_sample_pkts_user.c | 2 +- samples/bpf/xdp_tx_iptunnel_user.c | 2 +- tools/bpf/bpftool/btf.c | 13 +- tools/bpf/bpftool/btf_dumper.c | 4 +- tools/bpf/bpftool/cgroup.c | 4 +- tools/bpf/bpftool/common.c | 13 +- tools/bpf/bpftool/link.c | 4 +- tools/bpf/bpftool/main.h | 3 +- tools/bpf/bpftool/map.c | 8 +- tools/bpf/bpftool/prog.c | 24 +-- tools/bpf/bpftool/struct_ops.c | 6 +- tools/bpf/runqslower/Makefile | 2 + tools/lib/bpf/bpf.c | 179 +++++++++++++++++- tools/lib/bpf/bpf.h | 13 ++ tools/lib/bpf/btf.c | 9 +- tools/lib/bpf/libbpf.c | 26 +-- tools/lib/bpf/libbpf.map | 5 + tools/lib/bpf/libbpf_internal.h | 46 +++++ tools/lib/bpf/netlink.c | 2 +- tools/lib/bpf/nlattr.c | 2 +- tools/lib/bpf/ringbuf.c | 4 +- tools/perf/util/bpf-utils.c | 4 +- tools/perf/util/bpf_counter.c | 2 +- tools/perf/util/bpf_counter.h | 6 +- tools/testing/selftests/bpf/Makefile | 17 +- .../bpf/map_tests/map_in_map_batch_ops.c | 2 +- .../selftests/bpf/prog_tests/attach_probe.c | 10 +- .../selftests/bpf/prog_tests/bpf_iter.c | 8 +- .../selftests/bpf/prog_tests/bpf_obj_id.c | 20 +- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 3 + tools/testing/selftests/bpf/prog_tests/btf.c | 24 +-- .../selftests/bpf/prog_tests/btf_map_in_map.c | 2 +- .../selftests/bpf/prog_tests/check_mtu.c | 2 +- .../selftests/bpf/prog_tests/enable_stats.c | 2 +- .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 14 +- .../bpf/prog_tests/flow_dissector_reattach.c | 10 +- .../bpf/prog_tests/libbpf_get_fd_by_id_opts.c | 4 +- .../selftests/bpf/prog_tests/lsm_cgroup.c | 3 +- .../selftests/bpf/prog_tests/metadata.c | 8 +- tools/testing/selftests/bpf/prog_tests/mmap.c | 2 +- .../selftests/bpf/prog_tests/perf_link.c | 2 +- .../selftests/bpf/prog_tests/pinning.c | 2 +- .../selftests/bpf/prog_tests/prog_run_opts.c | 2 +- .../selftests/bpf/prog_tests/recursion.c | 4 +- .../selftests/bpf/prog_tests/send_signal.c | 2 + .../selftests/bpf/prog_tests/sockmap_basic.c | 6 +- .../bpf/prog_tests/task_local_storage.c | 8 +- .../testing/selftests/bpf/prog_tests/tc_bpf.c | 4 +- .../bpf/prog_tests/tp_attach_query.c | 9 +- .../bpf/prog_tests/unpriv_bpf_disabled.c | 8 +- .../bpf/prog_tests/uprobe_autoattach.c | 14 +- .../selftests/bpf/prog_tests/verif_stats.c | 5 +- .../selftests/bpf/prog_tests/xdp_attach.c | 4 +- .../selftests/bpf/prog_tests/xdp_bonding.c | 3 + .../bpf/prog_tests/xdp_cpumap_attach.c | 8 +- .../bpf/prog_tests/xdp_devmap_attach.c | 8 +- .../selftests/bpf/prog_tests/xdp_info.c | 2 +- .../selftests/bpf/prog_tests/xdp_link.c | 10 +- .../selftests/bpf/progs/test_attach_probe.c | 11 +- .../bpf/progs/test_uprobe_autoattach.c | 16 +- tools/testing/selftests/bpf/test_maps.c | 2 +- .../selftests/bpf/test_skb_cgroup_id_user.c | 2 +- .../bpf/test_tcp_check_syncookie_user.c | 2 +- tools/testing/selftests/bpf/test_verifier.c | 8 +- tools/testing/selftests/bpf/testing_helpers.c | 2 +- tools/testing/selftests/bpf/xdp_synproxy.c | 15 +- 72 files changed, 478 insertions(+), 211 deletions(-)