From patchwork Mon Oct 2 23:47:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Vernet X-Patchwork-Id: 147577 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1757201vqb; Mon, 2 Oct 2023 16:47:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEwKsGSrVg7jDQ5n/psIa6cA6qstcgTAIcVcbyhIqH3/kEmKyGJ0Wva172/Tks4WuDMKH0p X-Received: by 2002:a05:6a00:a13:b0:682:4c1c:a0fc with SMTP id p19-20020a056a000a1300b006824c1ca0fcmr15310254pfh.19.1696290464441; Mon, 02 Oct 2023 16:47:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696290464; cv=none; d=google.com; s=arc-20160816; b=igsVQni7rKrzw1PpL1BfN3jo71fOCsNFZgsKYmW4+seuD478SVlfmvL6U2xYgqRK3e fMQTjPLKiTlRK9/g5ok3VTUAzebd0vA5wKBW06S3qEMhwkJztvVX/K2PnlEtLnkQCtms YXzAsPg4PRh1/MzB0mwKttWb7+kpvr1N2cCmwsfJTkmULE1tUWDwXsIr5QXwz7ptd+iX 5KtSKkdI7r3r7cTNLIxMQh15Ps8CBXrRV7TpLiAHkr6GMW1ayzvYErBnfe+xPgKAq5ms a64rfXx+ZRs3paOS1tpTpncnb6qVdz2ShPUpmP3pAqfFdK/TbwTuMj7COiJEalVoZB+/ z9zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=/wzzKUe/S8MKLxWxB+dTpANkK30HpVTpho7RkzNp9HU=; fh=+xswMKcdOGWx3YoVcouoA/LViA7AygFoPJpk6kRm3TE=; b=FkKANwNBBA2XFjLyRcGsCvFEeCGgdm4IZ1MKV8kDGtu40/8ec5Dc9A+rRKgUqjQQEB oDKmfzK8W9uYs9cwpVAndHjamiMS9b201oN/QNFu/ru2Ekury3QDrpjCYnANS/xrVf1K zSVKyazT2F+Ll0l0/DZXojNBP4O+2wNbL+dY4UV0/qVg3raoCZkaqxtU5cWiofpKf7h5 5ttQK7Mz5x9gphpcjrMNmozvb35j/Y+Yg9LAN3MEmMG4/x7EWwsdy5bYvp8jtK/8KaDr T03RXrksSRBCB0ArMisf8PPk7pfWj23gNEr4UGovcC74vwlzoWJhbU6G2tSzLgGqq8vj PkEg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id i125-20020a639d83000000b00563d791d978si61824pgd.750.2023.10.02.16.47.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 16:47:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 4CDCF8070ECC; Mon, 2 Oct 2023 16:47:41 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237232AbjJBXrV (ORCPT + 18 others); Mon, 2 Oct 2023 19:47:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229549AbjJBXrR (ORCPT ); Mon, 2 Oct 2023 19:47:17 -0400 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 879EACC; Mon, 2 Oct 2023 16:47:14 -0700 (PDT) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-5859a7d6556so185881a12.0; Mon, 02 Oct 2023 16:47:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696290434; x=1696895234; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/wzzKUe/S8MKLxWxB+dTpANkK30HpVTpho7RkzNp9HU=; b=JGZXPKN5C88bONLmHTu2b+WahjPJe/spGq8m56Xh9fBqJ6dl6qJs/yjQx2I9bXvVg1 TpRD8MfphdqbENu8Wdowr6LfPJxX33DN4Eduo7KOtECns27+DG4bSPozuCPV/ce6ICje jK2M2kkDuhXaYPiELQI6bpUFN8MpvbMT2Jr29d3/wQ2rMhGx8wCL1z/TQ+3RHnuKijyp /vaWt6to5pnIPkw3yzqdwcD8dZOhomdAfuv1fvjTS875WFI4ZWJ0n+TtVGRzl8BnC5cz tzPKCddwbvkSZq/+RCWYzXFoxMyGP/bRsU2LWjUjNwGuFlP544bfZSi6aMCJtH4xOC7p oBRA== X-Gm-Message-State: AOJu0YzpASAx7My8RFcUqO8CfJh+GfOs9aNpeZXrvUrj2VSfvYUg9K0O wp0sLnOPOablTTVirlnJhAaZBhva55bTFeH8 X-Received: by 2002:a05:6a20:9184:b0:153:8754:8a7e with SMTP id v4-20020a056a20918400b0015387548a7emr14828886pzd.3.1696290433610; Mon, 02 Oct 2023 16:47:13 -0700 (PDT) Received: from localhost ([2620:10d:c090:400::4:d0e0]) by smtp.gmail.com with ESMTPSA id g6-20020a170902740600b001b5656b0bf9sm13876pll.286.2023.10.02.16.47.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 16:47:13 -0700 (PDT) From: David Vernet To: bpf@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com, haoluo@google.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com, himadrispandya@gmail.com, julia.lawall@inria.fr Subject: [PATCH bpf-next 2/2] bpf/selftests: Test pinning bpf timer to a core Date: Mon, 2 Oct 2023 18:47:08 -0500 Message-ID: <20231002234708.331192-2-void@manifault.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231002234708.331192-1-void@manifault.com> References: <20231002234708.331192-1-void@manifault.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Mon, 02 Oct 2023 16:47:41 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778689469868510347 X-GMAIL-MSGID: 1778689469868510347 Now that we support pinning a BPF timer to the current core, we should test it with some selftests. This patch adds two new testcases to the timer suite, which verifies that a BPF timer both with and without BPF_F_TIMER_ABS, can be pinned to the calling core with BPF_F_TIMER_CPU_PIN. Signed-off-by: David Vernet Acked-by: Song Liu --- .../testing/selftests/bpf/prog_tests/timer.c | 4 + tools/testing/selftests/bpf/progs/timer.c | 75 +++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/timer.c b/tools/testing/selftests/bpf/prog_tests/timer.c index 290c21dbe65a..d8bc838445ec 100644 --- a/tools/testing/selftests/bpf/prog_tests/timer.c +++ b/tools/testing/selftests/bpf/prog_tests/timer.c @@ -14,6 +14,7 @@ static int timer(struct timer *timer_skel) ASSERT_EQ(timer_skel->data->callback_check, 52, "callback_check1"); ASSERT_EQ(timer_skel->data->callback2_check, 52, "callback2_check1"); + ASSERT_EQ(timer_skel->bss->pinned_callback_check, 0, "pinned_callback_check1"); prog_fd = bpf_program__fd(timer_skel->progs.test1); err = bpf_prog_test_run_opts(prog_fd, &topts); @@ -32,6 +33,9 @@ static int timer(struct timer *timer_skel) /* check that timer_cb3() was executed twice */ ASSERT_EQ(timer_skel->bss->abs_data, 12, "abs_data"); + /* check that timer_cb_pinned() was executed twice */ + ASSERT_EQ(timer_skel->bss->pinned_callback_check, 2, "pinned_callback_check"); + /* check that there were no errors in timer execution */ ASSERT_EQ(timer_skel->bss->err, 0, "err"); diff --git a/tools/testing/selftests/bpf/progs/timer.c b/tools/testing/selftests/bpf/progs/timer.c index 9a16d95213e1..0112b9c038b4 100644 --- a/tools/testing/selftests/bpf/progs/timer.c +++ b/tools/testing/selftests/bpf/progs/timer.c @@ -53,12 +53,28 @@ struct { __type(value, struct elem); } abs_timer SEC(".maps"); +struct { + __uint(type, BPF_MAP_TYPE_ARRAY); + __uint(max_entries, 1); + __type(key, int); + __type(value, struct elem); +} soft_timer_pinned SEC(".maps"); + +struct { + __uint(type, BPF_MAP_TYPE_ARRAY); + __uint(max_entries, 1); + __type(key, int); + __type(value, struct elem); +} abs_timer_pinned SEC(".maps"); + __u64 bss_data; __u64 abs_data; __u64 err; __u64 ok; __u64 callback_check = 52; __u64 callback2_check = 52; +__u64 pinned_callback_check; +__s32 pinned_cpu; #define ARRAY 1 #define HTAB 2 @@ -329,3 +345,62 @@ int BPF_PROG2(test3, int, a) return 0; } + +/* callback for pinned timer */ +static int timer_cb_pinned(void *map, int *key, struct bpf_timer *timer) +{ + __s32 cpu = bpf_get_smp_processor_id(); + + if (cpu != pinned_cpu) + err |= 16384; + + pinned_callback_check++; + return 0; +} + +static void test_pinned_timer(bool soft) +{ + int key = 0; + void *map; + struct bpf_timer *timer; + __u64 flags = BPF_F_TIMER_CPU_PIN; + __u64 start_time; + + if (soft) { + map = &soft_timer_pinned; + start_time = 0; + } else { + map = &abs_timer_pinned; + start_time = bpf_ktime_get_boot_ns(); + flags |= BPF_F_TIMER_ABS; + } + + timer = bpf_map_lookup_elem(map, &key); + if (timer) { + if (bpf_timer_init(timer, map, CLOCK_BOOTTIME) != 0) + err |= 4096; + bpf_timer_set_callback(timer, timer_cb_pinned); + pinned_cpu = bpf_get_smp_processor_id(); + bpf_timer_start(timer, start_time + 1000, flags); + } else { + err |= 8192; + } +} + +SEC("fentry/bpf_fentry_test4") +int BPF_PROG2(test4, int, a) +{ + bpf_printk("test4"); + test_pinned_timer(true); + + return 0; +} + +SEC("fentry/bpf_fentry_test5") +int BPF_PROG2(test5, int, a) +{ + bpf_printk("test5"); + test_pinned_timer(false); + + return 0; +}