From nobody Tue Dec 16 23:49:27 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D319C5479A for ; Thu, 17 Aug 2023 19:59:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354791AbjHQT7O (ORCPT ); Thu, 17 Aug 2023 15:59:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354787AbjHQT6q (ORCPT ); Thu, 17 Aug 2023 15:58:46 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96940359B for ; Thu, 17 Aug 2023 12:58:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692302280; 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; bh=M+cHwSXYqzyiBAs9LYfm9bQki8Ktpzfnu45rfgTUfPw=; b=TLwweBo8vhcHQPXVebA4cRIYmiGacO/t78+g+Tcl+8KxHB+jqxAv3A1TNsHp/MtfZ+uwxo tNeYCKbiZ3PdniFuUVs0dUhQK5kjbptq2u3Nwic1BmwhUe9GKrK8RFkDdN+BA3TC7bThmB R/qZe2BQrRPiVheFpXjrpGq+udakLcc= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-118-7r-r9azEPvmBFoHIgsRlzg-1; Thu, 17 Aug 2023 15:57:59 -0400 X-MC-Unique: 7r-r9azEPvmBFoHIgsRlzg-1 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-76d83954c41so21453785a.2 for ; Thu, 17 Aug 2023 12:57:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692302278; x=1692907078; h=user-agent:content-disposition:mime-version:message-id:subject:cc :to:from:date:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=M+cHwSXYqzyiBAs9LYfm9bQki8Ktpzfnu45rfgTUfPw=; b=TssGt+WGC3o1EtxkuSVXRn2DWfRUM8MPFSPGvi1KPplrNktNFNdUzYxu1MCaCkIb7N mm3s+vI2BPx7JfWqso1ckrMqoJXXfDoU3Eo5e/3yNpjxdNpEkPiKkjWhYh6SwSuB/tJg infLnGnms3A2DB+HMgN8wQut3BU7Ln7ReVoSSo82qhQzU0l4JlAg02TwfU3liKAM4Kyl Wjk4cUoZjw4AvDj0zHVLsu0jCJ3FWJgkzrAGT3PM8EaEm7HK2alDBDV8kKH1tY71LP5Z zJ3JSbCz4NaSUqJBfOuLU/FhusadGPWdSrRmy3P96prE9lkC6S94LkPhAJUP9HF0dgsS iNig== X-Gm-Message-State: AOJu0YxF5plPcaxw561DO2rAR5vxql3qqxFOylrA4Utbfop+FVKJmD7n PcNxJjHphtNHSoBD0Ysx118VkqtQdUF1JY0ftIkg7YBNLIWbjhltEncqOQMl45TngPhw8zMcDbH LQ8TLzNv1VSnHye2wMpQVlKs2 X-Received: by 2002:a05:620a:258e:b0:765:7d7b:7197 with SMTP id x14-20020a05620a258e00b007657d7b7197mr645093qko.31.1692302278584; Thu, 17 Aug 2023 12:57:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEQgXuoDpTI5a32rf3ve8W0aO5TbiD9EyI1QuhXrP4vNvyIDNys5Ml/PftOW0Uy323gwFC5NQ== X-Received: by 2002:a05:620a:258e:b0:765:7d7b:7197 with SMTP id x14-20020a05620a258e00b007657d7b7197mr645085qko.31.1692302278329; Thu, 17 Aug 2023 12:57:58 -0700 (PDT) Received: from fedora ([174.89.37.104]) by smtp.gmail.com with ESMTPSA id o10-20020a05620a130a00b00767c961eb47sm37865qkj.43.2023.08.17.12.57.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 12:57:58 -0700 (PDT) Date: Thu, 17 Aug 2023 15:57:48 -0400 From: Lucas Karpinski To: Andrew Morton , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Tejun Heo , Zefan Li , Shuah Khan Cc: Muchun Song , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] selftests: cgroup: fix test_kmem_memcg_deletion kernel mem check Message-ID: MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20230517 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, not all kernel memory usage is being accounted for. This commit switches to using the kernel entry within memory.stat which already includes kernel_stack, pagetables, and slab. The kernel entry also includes vmalloc and other additional kernel memory use cases which were missing. Signed-off-by: Lucas Karpinski Acked-by: Roman Gushchin Acked-by: Shakeel Butt --- Changes in v3: - Fixed test case description - Included anon, file, and sock as mentioned by Shakeel. tools/testing/selftests/cgroup/test_kmem.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/tools/testing/selftests/cgroup/test_kmem.c b/tools/testing/sel= ftests/cgroup/test_kmem.c index ed2e50bb1e76..c82f974b85c9 100644 --- a/tools/testing/selftests/cgroup/test_kmem.c +++ b/tools/testing/selftests/cgroup/test_kmem.c @@ -162,11 +162,11 @@ static int cg_run_in_subcgroups(const char *parent, * allocates some slab memory (mostly negative dentries) using 2 * NR_CPUS * threads. Then it checks the sanity of numbers on the parent level: * the total size of the cgroups should be roughly equal to - * anon + file + slab + kernel_stack. + * anon + file + kernel + sock. */ static int test_kmem_memcg_deletion(const char *root) { - long current, slab, anon, file, kernel_stack, pagetables, percpu, sock, s= um; + long current, anon, file, kernel, sock, sum; int ret =3D KSFT_FAIL; char *parent; =20 @@ -184,29 +184,22 @@ static int test_kmem_memcg_deletion(const char *root) goto cleanup; =20 current =3D cg_read_long(parent, "memory.current"); - slab =3D cg_read_key_long(parent, "memory.stat", "slab "); anon =3D cg_read_key_long(parent, "memory.stat", "anon "); file =3D cg_read_key_long(parent, "memory.stat", "file "); - kernel_stack =3D cg_read_key_long(parent, "memory.stat", "kernel_stack "); - pagetables =3D cg_read_key_long(parent, "memory.stat", "pagetables "); - percpu =3D cg_read_key_long(parent, "memory.stat", "percpu "); + kernel =3D cg_read_key_long(parent, "memory.stat", "kernel "); sock =3D cg_read_key_long(parent, "memory.stat", "sock "); - if (current < 0 || slab < 0 || anon < 0 || file < 0 || - kernel_stack < 0 || pagetables < 0 || percpu < 0 || sock < 0) + if (current < 0 || anon < 0 || file < 0 || kernel < 0 || sock < 0) goto cleanup; =20 - sum =3D slab + anon + file + kernel_stack + pagetables + percpu + sock; + sum =3D anon + file + kernel + sock; if (abs(sum - current) < MAX_VMSTAT_ERROR) { ret =3D KSFT_PASS; } else { printf("memory.current =3D %ld\n", current); - printf("slab + anon + file + kernel_stack =3D %ld\n", sum); - printf("slab =3D %ld\n", slab); + printf("anon + file + kernel + sock =3D %ld\n", sum); printf("anon =3D %ld\n", anon); printf("file =3D %ld\n", file); - printf("kernel_stack =3D %ld\n", kernel_stack); - printf("pagetables =3D %ld\n", pagetables); - printf("percpu =3D %ld\n", percpu); + printf("kernel =3D %ld\n", kernel); printf("sock =3D %ld\n", sock); } =20 --=20 2.41.0