From nobody Fri Oct 10 04:41:15 2025 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 2FE3D2E2666 for ; Tue, 17 Jun 2025 13:37:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750167438; cv=none; b=t5knzKTz1XYKtDV78n+hQNrnGYfgz1F1Cp5mk5vqfxsRfyjDtHa68PGaMuyHncKASbKzwBpuFN165dFB2Op6dSvIHTEbjYakiiUlMzXWSPm8xpryyy4NqV9ZxIOEhyhwsGKxj5OX113MnN7zi8as3m+72xdj5PHU9/pExGzpM2E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750167438; c=relaxed/simple; bh=HQNlByHSUvC0ZjiG4WYHMWePhB23AV2AemjXyLk+kJg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=X+jYHEZdWS4kQGAFS4GldKUw2bjUGM8n1qbQ1pcui1JZHCV8GMlrn/5rKXo8vs+SO2jxkHWQ0MIAymWIxqahnjkF3uEUkNee/ouK9n/3PcbZbUttQxI4ozo2z05YESC3oFebbvdPTYC0KdVR8eJVEbBfL5x1lIhQZybhRrTZ3OI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=UxVxbjKr; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="UxVxbjKr" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-450d668c2a1so45648445e9.0 for ; Tue, 17 Jun 2025 06:37:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1750167434; x=1750772234; 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=zgiT6f/x0Fb0H0o2vrOcdtmLUewssNoc2afzunKPIvM=; b=UxVxbjKr9xU0Wp9FRJGuk8fo0GWoKenj2xGcxHgudAF64jKrJHpZIEQzaBdHITuHzv KqccH3sU+gDL2TGYLhPVuRGCsmEQpsBu0iHM2CDLGjbbsSmPHYuzV9jxBuYlonWsRkSJ eqLwTFHNtq4AqXpPxZpDNqj5DyXUVEqhfehvDEd+DcdMmS/ZOo8cGaAQId0TBRRzdrNU CyB2cdu3+kT4FFRBmCCW2upcRNiE81bWAMnNLD0i+Kh4lZGmfBASnS1wBXwbDyF/4BLl ZSUjJsVMgfMlzLzM9VTCCgPztFLSb5iVNe216ir++vw+IRedn1LdwHhWEV3eF9ZXEg0G kTtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750167434; x=1750772234; 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=zgiT6f/x0Fb0H0o2vrOcdtmLUewssNoc2afzunKPIvM=; b=rwsh5JaHIE9iniSf3ck4nAM4/HP46UE5ajzOpT+AIvm9AdaZHOjn2S0TI0H5fljMnf ge5v4aiw+RGKVCIXTpmkB3NY+8UeG7nol6T+Y004JrEfDmTEdRM9wpPfslLHhplYF1wJ kbsVs9zVjSwgi1Povk0yAxD8A6pyLiEayvy+hzbOoAhWz4RKbSXpPWcRAjvQ3LituINo GlWA4L1jjteyfVPDiNwfyXUoK6uqjPgdokdIeXhGmrBs7qPRMiXuFwn/3q4uqrC/5Dkv mRUnQ19tu4vO/0uCJQDFm6rkxgch/Bv710Hs8W3XKVzA7V4BR2uakVPwjUtPA7GLnPSS KOZg== X-Forwarded-Encrypted: i=1; AJvYcCUPs9s8Je8bK7Xs24rJQM8ovGzOBEEPO3BrLmKKckDbtU3K+k8SGtTArxvtUcPVd9H952g6Vec+KsqdCzA=@vger.kernel.org X-Gm-Message-State: AOJu0YwA3SunmFvSfrgmVC/9axomVBRb3i0m11BTfJCjw9LIAqQFD/PH Q65xXP0yCEPlJ5DapCi5gtgn8NqfgA9ohliJyO6FVa/r2Ll0mhdYg7bHW4yaX0QVJYE= X-Gm-Gg: ASbGncvunlcRnJR4oAyPiz0RahdF11UFpasaHewhZJ1m7ppduzzB/hUhdoDSF2fEz/a /jsNIw3XTcr3agOEHiqtoyiK/B1Otj5HaGHVQXY+1ziLHJtQrKC331Tymgwy1qCEv6SqpZZf/3D RE5dmvlXp7dlfHiNAIA3Cm6Y0WDkEwS6mO3yBJYgAYLoDzoMRFp2JbbiuHnV+7pzU3BCFtYAzJR HtleMdAH8wtOf2NXlN7eTlQyfJh6XnTYBqHsLRnI7tqsbVRhRCnJ56SWjxPBKO5fzJd7JoAY0eV z71Szr6Oy2C5gzbYf10bjnIQHVRKh4YF9IgGgwR0OGCSMJMa0/C1Ody+uPuyI+7p X-Google-Smtp-Source: AGHT+IExevrLdNBxON43pa2jl4pvKa6yc0PjeTqzL/jm9rlEgPnVZnIv7wJ2pCS+hEez9KMDG8M4sg== X-Received: by 2002:a05:600c:5251:b0:453:92e:a459 with SMTP id 5b1f17b1804b1-4533b28a97emr130794415e9.16.1750167434484; Tue, 17 Jun 2025 06:37:14 -0700 (PDT) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4532e224888sm179494365e9.1.2025.06.17.06.37.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jun 2025 06:37:14 -0700 (PDT) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: cgroups@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Michal=20Koutn=C3=BD?= , Tejun Heo , Johannes Weiner , Shuah Khan Subject: [PATCH 1/4] selftests: cgroup_util: Add helpers for testing named v1 hierarchies Date: Tue, 17 Jun 2025 15:36:53 +0200 Message-ID: <20250617133701.400095-2-mkoutny@suse.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617133701.400095-1-mkoutny@suse.com> References: <20250617133701.400095-1-mkoutny@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Non-functional change, the control variable will be wired in a separate commit. Signed-off-by: Michal Koutn=C3=BD --- tools/testing/selftests/cgroup/lib/cgroup_util.c | 4 +++- tools/testing/selftests/cgroup/lib/include/cgroup_util.h | 5 +++++ tools/testing/selftests/cgroup/test_core.c | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/cgroup/lib/cgroup_util.c b/tools/testi= ng/selftests/cgroup/lib/cgroup_util.c index 8832f3d1cb614..0e89fcff4d05d 100644 --- a/tools/testing/selftests/cgroup/lib/cgroup_util.c +++ b/tools/testing/selftests/cgroup/lib/cgroup_util.c @@ -19,6 +19,8 @@ #include "cgroup_util.h" #include "../../clone3/clone3_selftests.h" =20 +bool cg_test_v1_named; + /* Returns read len on success, or -errno on failure. */ ssize_t read_text(const char *path, char *buf, size_t max_len) { @@ -361,7 +363,7 @@ int cg_enter_current(const char *cgroup) =20 int cg_enter_current_thread(const char *cgroup) { - return cg_write(cgroup, "cgroup.threads", "0"); + return cg_write(cgroup, CG_THREADS_FILE, "0"); } =20 int cg_run(const char *cgroup, diff --git a/tools/testing/selftests/cgroup/lib/include/cgroup_util.h b/too= ls/testing/selftests/cgroup/lib/include/cgroup_util.h index adb2bc1931839..c69cab66254b4 100644 --- a/tools/testing/selftests/cgroup/lib/include/cgroup_util.h +++ b/tools/testing/selftests/cgroup/lib/include/cgroup_util.h @@ -13,6 +13,10 @@ =20 #define TEST_UID 65534 /* usually nobody, any !root is fine */ =20 +#define CG_THREADS_FILE (!cg_test_v1_named ? "cgroup.threads" : "tasks") +#define CG_NAMED_NAME "selftest" +#define CG_PATH_FORMAT (!cg_test_v1_named ? "0::%s" : (":name=3D" CG_NAMED= _NAME ":%s")) + /* * Checks if two given values differ by less than err% of their sum. */ @@ -65,3 +69,4 @@ extern int dirfd_open_opath(const char *dir); extern int cg_prepare_for_wait(const char *cgroup); extern int memcg_prepare_for_wait(const char *cgroup); extern int cg_wait_for(int fd); +extern bool cg_test_v1_named; diff --git a/tools/testing/selftests/cgroup/test_core.c b/tools/testing/sel= ftests/cgroup/test_core.c index a5672a91d273c..0c4cc4e5fc8c2 100644 --- a/tools/testing/selftests/cgroup/test_core.c +++ b/tools/testing/selftests/cgroup/test_core.c @@ -573,7 +573,7 @@ static int test_cgcore_proc_migration(const char *root) } =20 cg_enter_current(dst); - if (cg_read_lc(dst, "cgroup.threads") !=3D n_threads + 1) + if (cg_read_lc(dst, CG_THREADS_FILE) !=3D n_threads + 1) goto cleanup; =20 ret =3D KSFT_PASS; @@ -605,7 +605,7 @@ static void *migrating_thread_fn(void *arg) char lines[3][PATH_MAX]; =20 for (g =3D 1; g < 3; ++g) - snprintf(lines[g], sizeof(lines[g]), "0::%s", grps[g] + strlen(grps[0])); + snprintf(lines[g], sizeof(lines[g]), CG_PATH_FORMAT, grps[g] + strlen(gr= ps[0])); =20 for (i =3D 0; i < n_iterations; ++i) { cg_enter_current_thread(grps[(i % 2) + 1]); @@ -659,7 +659,7 @@ static int test_cgcore_thread_migration(const char *roo= t) if (retval) goto cleanup; =20 - snprintf(line, sizeof(line), "0::%s", grps[1] + strlen(grps[0])); + snprintf(line, sizeof(line), CG_PATH_FORMAT, grps[1] + strlen(grps[0])); if (proc_read_strstr(0, 1, "cgroup", line)) goto cleanup; =20 --=20 2.49.0