From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A985B25F98B for ; Fri, 13 Mar 2026 04:36:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773376567; cv=none; b=dwRFr09mygGoL7Y420K8oXl4E5SDiNOR1YIC/YSmb/nTs6nsTE+1wRvXMhsoBFtwCCAzc/mtZyDVCqIVtzk09yM36dVNBHKACgCw0OZxyqqwe58D9jLMkrsR/UhUYqNa6Q0jKwGbmUr4Mn9TCqhBKRK+oiS7ykpz24EpkPMsNw8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773376567; c=relaxed/simple; bh=z7gcam+2/M0OFx7j9XbR8/o2XuCnf2HbBTh7t0Oipys=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rNcks1CeJQvzTRicfQVBDiRCNhunPa2vOVgYx+GuxS/tgioMeVSq6w4DMX8QUNam8+LAsYSmDLGlimAMB6LYdNO31qA51RMJDywDNsRKJTziD24XZfAOgM70UeS3WhGGzxZowpNqSqDuqVMKV6WgUEH9ObuV1ZAqZKPyTi5lVnI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=CDJGoyUK; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="CDJGoyUK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773376565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mANu5JTngoht673DDmFsfxzBZTyPV5zWpLjDuRKk2EE=; b=CDJGoyUKGlaRf0JAi757HetA7HYWAzAZQeNiKYE+BvnETz7RArsY+Ny1NfzInOTQEma+xt mIzLCda3CsNklx3gekBaWwvEBH4fRAia+0oQFhffaVy+CLksGOsmg6EjJi3MrsdrXEmHoK WGJN0fqaxejr774IIxbEaLGDTMWdzuU= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-512-77vDwfrhMyaYvAkdEQSqsw-1; Fri, 13 Mar 2026 00:35:59 -0400 X-MC-Unique: 77vDwfrhMyaYvAkdEQSqsw-1 X-Mimecast-MFC-AGG-ID: 77vDwfrhMyaYvAkdEQSqsw_1773376557 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A9966180049D; Fri, 13 Mar 2026 04:35:56 +0000 (UTC) Received: from fedora-laptop-x1.redhat.com (unknown [10.72.112.18]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8E65919540C5; Fri, 13 Mar 2026 04:35:50 +0000 (UTC) From: Li Wang To: yosryahmed@google.com, nphamcs@gmail.com Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Johannes Weiner , Michal Hocko , =?UTF-8?q?Michal=20Koutn=C3=BD?= , Muchun Song , Tejun Heo , Roman Gushchin , Shakeel Butt , Yosry Ahmed Subject: [PATCH v3 3/7] selftests/cgroup: use runtime page size for zswpin check Date: Fri, 13 Mar 2026 12:35:28 +0800 Message-ID: <20260313043532.103987-3-liwang@redhat.com> In-Reply-To: <20260313043532.103987-1-liwang@redhat.com> References: <20260313043532.103987-1-liwang@redhat.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: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 test_zswapin compares memory.stat:zswpin (counted in pages) against a byte threshold converted with PAGE_SIZE. In cgroup selftests, PAGE_SIZE is hardcoded to 4096, which makes the conversion wrong on systems with non-4K base pages (e.g. 64K). As a result, the test requires too many pages to pass and fails spuriously even when zswap is working. Use sysconf(_SC_PAGESIZE) for the zswpin threshold conversion so the check matches the actual system page size. Signed-off-by: Li Wang Cc: Johannes Weiner Cc: Michal Hocko Cc: Michal Koutný Cc: Muchun Song Cc: Nhat Pham Cc: Tejun Heo Cc: Roman Gushchin Cc: Shakeel Butt Reviewed-by: Yosry Ahmed --- tools/testing/selftests/cgroup/test_zswap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/cgroup/test_zswap.c b/tools/testing/selftests/cgroup/test_zswap.c index 04796b6641b8..74b57331cbf1 100644 --- a/tools/testing/selftests/cgroup/test_zswap.c +++ b/tools/testing/selftests/cgroup/test_zswap.c @@ -240,7 +240,7 @@ static int test_zswapin(const char *root) goto out; } - if (zswpin < MB(24) / PAGE_SIZE) { + if (zswpin < MB(24) / sysconf(_SC_PAGESIZE)) { ksft_print_msg("at least 24MB should be brought back from zswap\n"); goto out; } -- 2.53.0