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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44EDEC433EF for ; Tue, 14 Dec 2021 19:59:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237544AbhLNT7N convert rfc822-to-8bit (ORCPT ); Tue, 14 Dec 2021 14:59:13 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:34116 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229451AbhLNT7N (ORCPT ); Tue, 14 Dec 2021 14:59:13 -0500 Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1BEIco0J027027 for ; Tue, 14 Dec 2021 11:59:13 -0800 Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3cxxn9st95-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 14 Dec 2021 11:59:12 -0800 Received: from intmgw003.48.prn1.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Tue, 14 Dec 2021 11:59:10 -0800 Received: by devbig019.vll3.facebook.com (Postfix, from userid 137359) id E65F4D1E099B; Tue, 14 Dec 2021 11:59:05 -0800 (PST) From: Andrii Nakryiko To: , , CC: , Subject: [PATCH v4 bpf-next 0/2] libbpf: auto-bump RLIMIT_MEMLOCK on old kernels Date: Tue, 14 Dec 2021 11:59:02 -0800 Message-ID: <20211214195904.1785155-1-andrii@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT X-FB-Internal: Safe Content-Type: text/plain X-FB-Source: Intern X-Proofpoint-ORIG-GUID: kIu-NtDzb7uGkStavs0of_Lng-Gp-pzn X-Proofpoint-GUID: kIu-NtDzb7uGkStavs0of_Lng-Gp-pzn X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2021-12-14_07,2021-12-14_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 phishscore=0 lowpriorityscore=0 mlxlogscore=496 clxscore=1015 malwarescore=0 suspectscore=0 spamscore=0 impostorscore=0 priorityscore=1501 bulkscore=0 adultscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112140107 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Make libbpf bump RLIMIT_MEMLOCK, similarly to BCC, if kernel is old enough to use memcg-based memory accounting for BPF. Patch #2 drops explicit setrlimi(RLIMIT_MEMLOCK) calls in test_progs, test_maps, and test_verifier. v3->v4: - use detection based on bpf_ktime_get_coarse_ns() helper (Daniel); v2->v3: - use difference in fdinfo's memlock reporting to detect memcg; v1->v2: - fix up out-of-sync comments (Toke). Andrii Nakryiko (2): libbpf: auto-bump RLIMIT_MEMLOCK if kernel needs it for BPF selftests/bpf: remove explicit setrlimit(RLIMIT_MEMLOCK) in main selftests tools/lib/bpf/bpf.c | 81 +++++++++++++++++++ tools/lib/bpf/bpf.h | 2 + tools/lib/bpf/libbpf.c | 47 +++-------- tools/lib/bpf/libbpf.map | 1 + tools/lib/bpf/libbpf_internal.h | 39 +++++++++ tools/lib/bpf/libbpf_legacy.h | 12 ++- tools/testing/selftests/bpf/bench.c | 16 ---- tools/testing/selftests/bpf/prog_tests/btf.c | 1 - .../bpf/prog_tests/select_reuseport.c | 1 - .../selftests/bpf/prog_tests/sk_lookup.c | 1 - .../selftests/bpf/prog_tests/sock_fields.c | 1 - tools/testing/selftests/bpf/test_maps.c | 1 - tools/testing/selftests/bpf/test_progs.c | 2 - tools/testing/selftests/bpf/test_verifier.c | 4 +- 14 files changed, 146 insertions(+), 63 deletions(-) -- 2.30.2