From patchwork Wed Oct 4 16:23:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Vernet X-Patchwork-Id: 148406 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:254a:b0:403:3b70:6f57 with SMTP id hf10csp252457vqb; Wed, 4 Oct 2023 09:24:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGGJ7+icbEaz3ZpS9+6hbxk5ccYzx6tRO2VgdNZsTcViHYQARsLGpFUOqFAh/iWokZrc7dz X-Received: by 2002:a17:902:ecc6:b0:1bb:fcb9:f85 with SMTP id a6-20020a170902ecc600b001bbfcb90f85mr110383plh.32.1696436673646; Wed, 04 Oct 2023 09:24:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696436673; cv=none; d=google.com; s=arc-20160816; b=d52FD/mxhsMjU+uokHzCO+IuXwONWgMCrat6t9WsBm770SoBqRdzdwzcUAk9PiGVr6 pTB5Rcw4ZR0eBYrPsyVKKY0WrkStiFASoc+/CvdlHsxf8n05q0TMxEdH2OYL2cPOc0Ea IgOah6tXkMiYXPSt26phR86tn6yuXSTkE8AllxKFBtHOe9mjiAfOUtvTgJhGHa7w5xYh QKt+6h5BI3U63rJsiNzcb+nsA4d8GMCFkTr9lWtSS2YQiXkyCReMnAK7CZ7FKCodH+pw H1Dx+iBHZyOLRlQKW27vnqgH+fMF1PCmO4+KW8MjlPfR0JRCXjBjHtqi+kwre7KWeOiy vsGw== 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=5UKCTZgVGrulhdraSlhbTYsV8kK+VRjs1vrD9smtWEA=; fh=fRduVGGcbGNLOU4DUo/BPZE9kW2AdZyQZjfnRZNvspU=; b=MUPIp9inygUZF0g1P4wW31d8ZYWA9eUKvaZ+30pMSJHP/69ocbguXlaFzgI4Gz9818 uiL+QS0gXB5cwvngLgagUizP0hMEJEHFipBDb9k99b4M63lwew7AIzvmMNJOLNNSc0ml s9FEqKhBqiQzS8M/pY/XkQbWfRU0WTqXgAcdK2pjH795T93fHnA1cyGW1iKJTmdyrh5J tsKktwpDK+ZkB3aAdBQ8KoEf9r126+K9tkKfjjsz7NFn4Cn5bV4BFXiTtRVRv5Rr1fua f/gwkLy0GdRv5iTZJaioSu2iN0NlQtu5mx/kLcHydam1+i3oS8pMlyKsf+ZcW7hxKakm k3Qg== 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:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id 79-20020a630152000000b005680cb68678si3860233pgb.446.2023.10.04.09.24.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 09:24:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 7B19A81A1E8F; Wed, 4 Oct 2023 09:24:32 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243329AbjJDQY2 (ORCPT + 19 others); Wed, 4 Oct 2023 12:24:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243312AbjJDQYY (ORCPT ); Wed, 4 Oct 2023 12:24:24 -0400 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3440DD; Wed, 4 Oct 2023 09:23:46 -0700 (PDT) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1c7373cff01so8926395ad.1; Wed, 04 Oct 2023 09:23:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696436626; x=1697041426; 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=5UKCTZgVGrulhdraSlhbTYsV8kK+VRjs1vrD9smtWEA=; b=vB4N66mRirLGv6dgREwAcY6L71WzNJnvhxE6Jz57vRoALBx/fzUVp9Hz2MDVSUQxqw cpoCzFJirVtISjBgO52aYvYwX5pnXu1oh12pLW4GdeXomdms45zuxZbmnHE41FhMBYF6 lI2yO3zSJ5p+KhMGuVwAWiKcZH8vQd4PKRijdc8OtGjPxp79m+Dc/XTE9xBa0MG//4+w HVU0lczWnMJW4Ko4SjTTx0VTe9OLyYjEtDhGIivYeYR2wxSg2+X6neobKapmaJBcjGf0 kOpGDNNz5QupjvFjQJMnSKrBO0SyirikOO2Rvb17kpUhIG0RE8am6e7+OcKgAkmsj3lD fSfw== X-Gm-Message-State: AOJu0Yw04MObEZk4vHpZ2J4hHk8MhmBRbtQYKombSV0imbVPdWFU4u9s jnZyQZ+P0qOinGkNEZ82qdvypVYx7A1Zdd47 X-Received: by 2002:a17:903:493:b0:1c0:bcbc:d66 with SMTP id jj19-20020a170903049300b001c0bcbc0d66mr133903plb.7.1696436626160; Wed, 04 Oct 2023 09:23:46 -0700 (PDT) Received: from localhost ([2620:10d:c090:400::4:3ce7]) by smtp.gmail.com with ESMTPSA id u6-20020a170902e80600b001c55e13bf39sm3904422plg.275.2023.10.04.09.23.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 09:23:45 -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 Subject: [PATCH bpf-next v2 2/2] bpf/selftests: Test pinning bpf timer to a core Date: Wed, 4 Oct 2023 11:23:39 -0500 Message-ID: <20231004162339.200702-3-void@manifault.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231004162339.200702-1-void@manifault.com> References: <20231004162339.200702-1-void@manifault.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Wed, 04 Oct 2023 09:24:32 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778842781757696795 X-GMAIL-MSGID: 1778842781757696795 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. Acked-by: Song Liu Signed-off-by: David Vernet Acked-by: Hou Tao --- .../testing/selftests/bpf/prog_tests/timer.c | 4 ++ tools/testing/selftests/bpf/progs/timer.c | 63 ++++++++++++++++++- 2 files changed, 66 insertions(+), 1 deletion(-) 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..8b946c8188c6 100644 --- a/tools/testing/selftests/bpf/progs/timer.c +++ b/tools/testing/selftests/bpf/progs/timer.c @@ -51,7 +51,7 @@ struct { __uint(max_entries, 1); __type(key, int); __type(value, struct elem); -} abs_timer SEC(".maps"); +} abs_timer SEC(".maps"), soft_timer_pinned SEC(".maps"), abs_timer_pinned SEC(".maps"); __u64 bss_data; __u64 abs_data; @@ -59,6 +59,8 @@ __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 +331,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; +}