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 396D6C433F5 for ; Fri, 14 Jan 2022 00:49:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238551AbiANAte (ORCPT ); Thu, 13 Jan 2022 19:49:34 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:27596 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238527AbiANAte (ORCPT ); Thu, 13 Jan 2022 19:49:34 -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 20DN5pgD030471 for ; Thu, 13 Jan 2022 16:49:34 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=CQDO9m7TzsaaJ0OOYKFSMCqU3OyAfpjxhml18kcgnGg=; b=U5MwIzAMOvqbXcN2I3zetJ9bSUHPIpCa+rUg86966h9i24nIqre3gtHt3TmdkgzMTnFg tCEL59uRQfxJ/HURHgGeOGB3RI9Xd0wD0UxDBLSMOZiqGPf6VE8oFQ4x6MiEaAx9tjyg GM+docR7YTobSP5dw+quHHIJfkWEHv6tRoY= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3djh9xw2c1-18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 13 Jan 2022 16:49:33 -0800 Received: from twshared14302.24.prn2.facebook.com (2620:10d:c085:108::4) by mail.thefacebook.com (2620:10d:c085:11d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Thu, 13 Jan 2022 16:49:30 -0800 Received: by devbig014.vll3.facebook.com (Postfix, from userid 7377) id 1CDD68FA33E4; Thu, 13 Jan 2022 16:49:22 -0800 (PST) From: Kenny Yu To: , , , , CC: Kenny Yu Subject: [PATCH v2 bpf-next 4/4] selftests/bpf: Add test for sleepable bpf iterator programs Date: Thu, 13 Jan 2022 16:49:00 -0800 Message-ID: <20220114004900.3756025-5-kennyyu@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220114004900.3756025-1-kennyyu@fb.com> References: <20220113233158.1582743-1-kennyyu@fb.com> <20220114004900.3756025-1-kennyyu@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: u0a4nFfQ81FsQrAIOMlsEGL4p8RYvxgP X-Proofpoint-ORIG-GUID: u0a4nFfQ81FsQrAIOMlsEGL4p8RYvxgP X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-13_10,2022-01-13_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 mlxlogscore=897 clxscore=1015 impostorscore=0 lowpriorityscore=0 bulkscore=0 mlxscore=0 priorityscore=1501 spamscore=0 adultscore=0 phishscore=0 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201140003 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org This adds a test for bpf iterator programs to make use of sleepable bpf helpers. Signed-off-by: Kenny Yu --- .../selftests/bpf/prog_tests/bpf_iter.c | 16 ++++++ .../selftests/bpf/progs/bpf_iter_task.c | 54 +++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c b/tools/te= sting/selftests/bpf/prog_tests/bpf_iter.c index b84f859b1267..fcda0ecd8746 100644 --- a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c +++ b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c @@ -138,6 +138,20 @@ static void test_task(void) bpf_iter_task__destroy(skel); } =20 +static void test_task_sleepable(void) +{ + struct bpf_iter_task *skel; + + skel =3D bpf_iter_task__open_and_load(); + if (CHECK(!skel, "bpf_iter_task__open_and_load", + "skeleton open_and_load failed\n")) + return; + + do_dummy_read(skel->progs.dump_task_sleepable); + + bpf_iter_task__destroy(skel); +} + static void test_task_stack(void) { struct bpf_iter_task_stack *skel; @@ -1252,6 +1266,8 @@ void test_bpf_iter(void) test_bpf_map(); if (test__start_subtest("task")) test_task(); + if (test__start_subtest("task_sleepable")) + test_task_sleepable(); if (test__start_subtest("task_stack")) test_task_stack(); if (test__start_subtest("task_file")) diff --git a/tools/testing/selftests/bpf/progs/bpf_iter_task.c b/tools/te= sting/selftests/bpf/progs/bpf_iter_task.c index c86b93f33b32..bb4b63043533 100644 --- a/tools/testing/selftests/bpf/progs/bpf_iter_task.c +++ b/tools/testing/selftests/bpf/progs/bpf_iter_task.c @@ -2,6 +2,7 @@ /* Copyright (c) 2020 Facebook */ #include "bpf_iter.h" #include +#include =20 char _license[] SEC("license") =3D "GPL"; =20 @@ -23,3 +24,56 @@ int dump_task(struct bpf_iter__task *ctx) BPF_SEQ_PRINTF(seq, "%8d %8d\n", task->tgid, task->pid); return 0; } + +// New helper added +static long (*bpf_access_process_vm)( + struct task_struct *tsk, + unsigned long addr, + void *buf, + int len, + unsigned int gup_flags) =3D (void *)186; + +// Copied from include/linux/mm.h +#define FOLL_REMOTE 0x2000 /* we are working on non-current tsk/mm */ + +SEC("iter.s/task") +int dump_task_sleepable(struct bpf_iter__task *ctx) +{ + struct seq_file *seq =3D ctx->meta->seq; + struct task_struct *task =3D ctx->task; + static const char info[] =3D " =3D=3D=3D END =3D=3D=3D"; + struct pt_regs *regs; + void *ptr; + uint32_t user_data =3D 0; + int numread; + + if (task =3D=3D (void *)0) { + BPF_SEQ_PRINTF(seq, "%s\n", info); + return 0; + } + + regs =3D (struct pt_regs *)bpf_task_pt_regs(task); + if (regs =3D=3D (void *)0) { + BPF_SEQ_PRINTF(seq, "%s\n", info); + return 0; + } + ptr =3D (void *)PT_REGS_IP(regs); + + // Try to read the contents of the task's instruction pointer from the + // remote task's address space. + numread =3D bpf_access_process_vm(task, + (unsigned long)ptr, + (void *)&user_data, + sizeof(uint32_t), + FOLL_REMOTE); + if (numread !=3D sizeof(uint32_t)) { + BPF_SEQ_PRINTF(seq, "%s\n", info); + return 0; + } + + if (ctx->meta->seq_num =3D=3D 0) + BPF_SEQ_PRINTF(seq, " tgid gid data\n"); + + BPF_SEQ_PRINTF(seq, "%8d %8d %8d\n", task->tgid, task->pid, user_data); + return 0; +} --=20 2.30.2