From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C3A302512FD; Tue, 29 Jul 2025 18:26:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753813564; cv=none; b=VUyxgPlMpdXMaiZ6hKTBSYp2dLQCEp/S/4T+ZNCxCTlLiGtQoBR0/O5UKX+olT8kRTJTjPteux0GrA7DEfjL2uoZFtFpttHgCyPoHv8nMnwSfZhRcE4CHDUjXt0F1Qw6tWWPVgGbK/ytuqJ+3MD91y45GWnjtbJanc4Wka5ANK8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753813564; c=relaxed/simple; bh=ccp3EztJlEJzQLmiEu1DIzpJsXT5LIfKYR2G67v0qAc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L/BQqMLLafh+J8PoBqHVl+bSSdMaFZT7gnjy8Bvb1TdOoHQdHvgUay7+mLOIfKzuQKLXwhjYLDDATIr1KnK0d3YFm75shxuoQjOD/1pxF0MVdEjaHwUT8U0tDM4ik977IFWAZNseLUq2Mbu51D7dq6rfxK/xrBLO5O1nusdz3fM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=aWXerCBn; arc=none smtp.client-ip=209.85.210.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aWXerCBn" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-748fe69a7baso5337658b3a.3; Tue, 29 Jul 2025 11:26:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753813562; x=1754418362; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6dhstHRDqQgEPx9WkzXkwbtwT/zsNcRbIl8bglWWgQI=; b=aWXerCBnoTHUCXdRxm22Csz4dzVciSCJ6iApFHYdggORgALMRrtvQ0gsiiCGMQWyyI xVnlH72jG4tMZVHW5bOpj7TSmn781GTqw5RMm5Vb29ywqqOPyhSQd/1ErAzgZeQN9nw1 PvuCbJIwMOSjyDfjqMcCqWUrpa3lsNiZ9PhK7zSPPgkGFl8h80+jd7/krSgWOnvsbIgI s+7+H2cWc76pAcjhb355SXHGn9Qa4IQV90lNICI15Px7bxz7cc2BGOdAF+E+OpADdYrI qpJJ5i4WloLurI7OsHdNejIxSHgWYsFhC067nuo8IKC0aFCKzQcPOzHcBM/eAIzEkswT tdkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753813562; x=1754418362; 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=6dhstHRDqQgEPx9WkzXkwbtwT/zsNcRbIl8bglWWgQI=; b=v3YuHijCdJLbrfI8PSZ3CfSFx2Bypsg8Ovx2YybJKgrDMq9eoEPSNHtqikUfVPO6HM Y08mRImHeEn13eRE9f6A0VOvUdDAyx3RxQ8bxowVHMkBUgRBFkEONhdIdSUOIiPEJXPH 15Cq1mlEHso9xPC0JAXjW7yah2aoPlMwicWvQVnhxzkAN/U/riJolskwMP7oQYcpCT+V oLSwvZlyxBXrMz3EY5BTMUfK834t1Z0Zb+10KwpHf6HkFUQM6cnxIwtMJ2u0eL+vWjRs stYkFnFZxg421zHCCsB0ny5lb9rf5fMoPMBgx+2iWn6BV0ruCQrw5pRVruyGc31URE0J 4skQ== X-Gm-Message-State: AOJu0YzoxWNnz3azVv1TlMHveCVqL1ZnSpqa/t1LfHaosrt2Q+tcghP4 CIYf7E6fVNtmpaukyAjVvInhnNW1cvXd5AsnIPl3HmQrh/Y7Xu6KRnNE+zoplA== X-Gm-Gg: ASbGncti7131LWa1adsRvEiPW8WlWli2zqiHlS0Z9WYQTV9VQbAF2RFj7/yw+R/4cdt KKsZnprKBMm2MpHk45t4BoJoPplRQnRobMbijrTPXj7x9imt4+CDYcF1mjHfwE9UHzgXItdW2SP kiGjy0MN0mGA9OkYow6FqjOPPUkVKeZbf5+7eH3Jv22AsxLIBzIVqIUr6Jq7NCt2evYCSTnj2iA XMaKmgSbnBdw7Y+aDoTjOTnqUP1wzEwttVVq+BqoU5DTZ60imFh3mHAp8KtlMl54LQw952rf+RB n+tf13cqAV5tcWY0iW3CSSfHWcvJ1Ek/eQgERDpOtPdmr+n8h6TJA8kX+68bNl2/OfuIN325TlB fkOO9WT5XPx11uA== X-Google-Smtp-Source: AGHT+IHK8gjQxqhlxuTrLwM82VLOGymbekXN3C5Eg4vfwn1Ua77qx74YV6XnLoY/uILWP33svKnTSw== X-Received: by 2002:a05:6a00:1903:b0:758:72b9:e5da with SMTP id d2e1a72fcca58-76ab30b1785mr759055b3a.17.1753813561811; Tue, 29 Jul 2025 11:26:01 -0700 (PDT) Received: from localhost ([2a03:2880:ff:4a::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7640b4c852fsm8099051b3a.118.2025.07.29.11.26.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jul 2025 11:26:01 -0700 (PDT) From: Amery Hung To: bpf@vger.kernel.org Cc: netdev@vger.kernel.org, alexei.starovoitov@gmail.com, andrii@kernel.org, daniel@iogearbox.net, memxor@gmail.com, kpsingh@kernel.org, martin.lau@kernel.org, yonghong.song@linux.dev, song@kernel.org, haoluo@google.com, ameryhung@gmail.com, kernel-team@meta.com Subject: [RFC PATCH bpf-next v1 10/11] selftests/bpf: Remove test_task_storage_map_stress_lookup Date: Tue, 29 Jul 2025 11:25:48 -0700 Message-ID: <20250729182550.185356-11-ameryhung@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250729182550.185356-1-ameryhung@gmail.com> References: <20250729182550.185356-1-ameryhung@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Remove a test in test_maps that checks if the updating of the percpu counter in task local storage map is preemption safe as the percpu counter is now removed. Signed-off-by: Amery Hung --- .../bpf/map_tests/task_storage_map.c | 128 ------------------ .../bpf/progs/read_bpf_task_storage_busy.c | 38 ------ 2 files changed, 166 deletions(-) delete mode 100644 tools/testing/selftests/bpf/map_tests/task_storage_map.c delete mode 100644 tools/testing/selftests/bpf/progs/read_bpf_task_storage_busy.c diff --git a/tools/testing/selftests/bpf/map_tests/task_storage_map.c b/tools/testing/selftests/bpf/map_tests/task_storage_map.c deleted file mode 100644 index a4121d2248ac..000000000000 --- a/tools/testing/selftests/bpf/map_tests/task_storage_map.c +++ /dev/null @@ -1,128 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2022. Huawei Technologies Co., Ltd */ -#define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "bpf_util.h" -#include "test_maps.h" -#include "task_local_storage_helpers.h" -#include "read_bpf_task_storage_busy.skel.h" - -struct lookup_ctx { - bool start; - bool stop; - int pid_fd; - int map_fd; - int loop; -}; - -static void *lookup_fn(void *arg) -{ - struct lookup_ctx *ctx = arg; - long value; - int i = 0; - - while (!ctx->start) - usleep(1); - - while (!ctx->stop && i++ < ctx->loop) - bpf_map_lookup_elem(ctx->map_fd, &ctx->pid_fd, &value); - return NULL; -} - -static void abort_lookup(struct lookup_ctx *ctx, pthread_t *tids, unsigned int nr) -{ - unsigned int i; - - ctx->stop = true; - ctx->start = true; - for (i = 0; i < nr; i++) - pthread_join(tids[i], NULL); -} - -void test_task_storage_map_stress_lookup(void) -{ -#define MAX_NR_THREAD 4096 - unsigned int i, nr = 256, loop = 8192, cpu = 0; - struct read_bpf_task_storage_busy *skel; - pthread_t tids[MAX_NR_THREAD]; - struct lookup_ctx ctx; - cpu_set_t old, new; - const char *cfg; - int err; - - cfg = getenv("TASK_STORAGE_MAP_NR_THREAD"); - if (cfg) { - nr = atoi(cfg); - if (nr > MAX_NR_THREAD) - nr = MAX_NR_THREAD; - } - cfg = getenv("TASK_STORAGE_MAP_NR_LOOP"); - if (cfg) - loop = atoi(cfg); - cfg = getenv("TASK_STORAGE_MAP_PIN_CPU"); - if (cfg) - cpu = atoi(cfg); - - skel = read_bpf_task_storage_busy__open_and_load(); - err = libbpf_get_error(skel); - CHECK(err, "open_and_load", "error %d\n", err); - - /* Only for a fully preemptible kernel */ - if (!skel->kconfig->CONFIG_PREEMPTION) { - printf("%s SKIP (no CONFIG_PREEMPTION)\n", __func__); - read_bpf_task_storage_busy__destroy(skel); - skips++; - return; - } - - /* Save the old affinity setting */ - sched_getaffinity(getpid(), sizeof(old), &old); - - /* Pinned on a specific CPU */ - CPU_ZERO(&new); - CPU_SET(cpu, &new); - sched_setaffinity(getpid(), sizeof(new), &new); - - ctx.start = false; - ctx.stop = false; - ctx.pid_fd = sys_pidfd_open(getpid(), 0); - ctx.map_fd = bpf_map__fd(skel->maps.task); - ctx.loop = loop; - for (i = 0; i < nr; i++) { - err = pthread_create(&tids[i], NULL, lookup_fn, &ctx); - if (err) { - abort_lookup(&ctx, tids, i); - CHECK(err, "pthread_create", "error %d\n", err); - goto out; - } - } - - ctx.start = true; - for (i = 0; i < nr; i++) - pthread_join(tids[i], NULL); - - skel->bss->pid = getpid(); - err = read_bpf_task_storage_busy__attach(skel); - CHECK(err, "attach", "error %d\n", err); - - /* Trigger program */ - sys_gettid(); - skel->bss->pid = 0; - - CHECK(skel->bss->busy != 0, "bad bpf_task_storage_busy", "got %d\n", skel->bss->busy); -out: - read_bpf_task_storage_busy__destroy(skel); - /* Restore affinity setting */ - sched_setaffinity(getpid(), sizeof(old), &old); - printf("%s:PASS\n", __func__); -} diff --git a/tools/testing/selftests/bpf/progs/read_bpf_task_storage_busy.c b/tools/testing/selftests/bpf/progs/read_bpf_task_storage_busy.c deleted file mode 100644 index 69da05bb6c63..000000000000 --- a/tools/testing/selftests/bpf/progs/read_bpf_task_storage_busy.c +++ /dev/null @@ -1,38 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2022. Huawei Technologies Co., Ltd */ -#include "vmlinux.h" -#include -#include - -extern bool CONFIG_PREEMPTION __kconfig __weak; -extern const int bpf_task_storage_busy __ksym; - -char _license[] SEC("license") = "GPL"; - -int pid = 0; -int busy = 0; - -struct { - __uint(type, BPF_MAP_TYPE_TASK_STORAGE); - __uint(map_flags, BPF_F_NO_PREALLOC); - __type(key, int); - __type(value, long); -} task SEC(".maps"); - -SEC("raw_tp/sys_enter") -int BPF_PROG(read_bpf_task_storage_busy) -{ - int *value; - - if (!CONFIG_PREEMPTION) - return 0; - - if (bpf_get_current_pid_tgid() >> 32 != pid) - return 0; - - value = bpf_this_cpu_ptr(&bpf_task_storage_busy); - if (value) - busy = *value; - - return 0; -} -- 2.47.3