Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp9580887rwd; Wed, 21 Jun 2023 09:07:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7VAJQGaAPNBefb3kK1Hsx57znKXnBeuQfDemzeX+i4UkuLMWJ2qxQp4lQzLZtlhTGTP4Xj X-Received: by 2002:a05:6a00:1a10:b0:668:9fb6:b321 with SMTP id g16-20020a056a001a1000b006689fb6b321mr4406963pfv.12.1687363623776; Wed, 21 Jun 2023 09:07:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687363623; cv=none; d=google.com; s=arc-20160816; b=WCadcuwHm3WdFt4WOCHuYmjYD2HTQh65BY6PRJ/Jr1mnocNbgy4299gcChhZU8Oe6g 0Kipp2dKl+1WZxTUFr3LC3cLTKfWuy0RzySP0ll4aqNvbZ/BhePD7qfDwMgM7aLnEo7X GVlm3QMXSQKqnqn8GlpKjNjAXB+8pcTuF6ww+5Ik555OUUl5Xn3gfTPVD51ewNYCUP7R /7D8uIFjMZs/RcUV3qFfOJTF5GI6iUz32I22Mm66MyVe7OjjSqCEoVqjp/oS9Jb90mbI 0EUpl1FCMIBvU3ZeAeLdx1Ro9QubQq8hcG3YzYyCRBdJZAlMrqYrjWnFxXL76aGbRX/O PZag== 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 :dkim-signature; bh=WEOIwynIIsT/3TCYBn4hnrnBW3FX88KHSnE+980PXNU=; b=r9C9etA1JXeRhzvvPsIbqv9/O6Oje8yA00QOWzu4PS30ESbBiz8QmAEygW+OiU0ut+ erpHlny6rbdM0uKu45KrasmigfP5sN0nUeo5NHUZ9YNyVLCpI7F3/gl8b9Qb1809u3vY B5a+euUG4CfkYCkE8R+L9mm1UTDGnWse13jWuddX/Bpjd6TGDPPBN0rqr3lLldyBPtg5 yKmgxzKbrvdQ29v/CiVkKuQg+4lryQXtKZbUHyyrz9Wh/foXsyLDv5rMwalqP8ZaXpmb yExS2qGwijWQdWs7qVzcawPi3Ao6KOag5zPPAtIyWJDLTrpEsSAKpdv/Tx5vXyQ6Zhf0 WpdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b="LeFLd/T5"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k8-20020aa79728000000b00662db175212si1601212pfg.47.2023.06.21.09.06.50; Wed, 21 Jun 2023 09:07:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b="LeFLd/T5"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233599AbjFUPg7 (ORCPT + 99 others); Wed, 21 Jun 2023 11:36:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233555AbjFUPgq (ORCPT ); Wed, 21 Jun 2023 11:36:46 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43D7EDC; Wed, 21 Jun 2023 08:36:11 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-988a076a7d3so535675066b.3; Wed, 21 Jun 2023 08:36:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687361758; x=1689953758; 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=WEOIwynIIsT/3TCYBn4hnrnBW3FX88KHSnE+980PXNU=; b=LeFLd/T5OM7aszQ1BHpFd0lDMx5q3DtKYmanSZjPYSO9vh9puF3ky8Fx90y7g5rbL/ ZQesZAiEn4lr2smBWWC3dAzUstEMURZ+QSShkPF6FjFpZf/FHZ6X5GDVlslXIdQUxLfl KgT1BGP5eERxBDUn+DMzi4Tlv13Y8MqVVVbZC09Ve8oTJI9eLkqyqNPNCyWrHxApZj8y kgAL6n5oXWw5LVHF0E2lo2tQn6ylvgXV1O/8dxzLIbQXAwYVD8MQIDmxcYIi3A8Ys9nb PyPHQzQAr0tJmcixMtaFbr5pJDcFTYhJpajQz2ErIoQ/MpRwnd5ayZQRzSobig5ls2OW usAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687361758; x=1689953758; 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=WEOIwynIIsT/3TCYBn4hnrnBW3FX88KHSnE+980PXNU=; b=Nq6UvMSc2h9ZMgoCU/lyL1wQqTJXU1f8QmX68URwVe3i1Txi/6/fvRq/AeMyHj+wCk j2DFSKJal8tCdYiV3NwaJB1yynaP3cVMEEG0ARdr01klWDB/O/hTYmfFr6LCOjvE9kZW w+8djj5ADnAAPdZswWOjuEv0xbWXCoFOI/qar962zu6+IHkwOayKTlhCZvXf10o/aQ7x V08kO/vXRED1+zQTxsC+MHmt6uHy/AnQM7OdppHShqJB9gKNSRBqMYd87KpARWirwX0w 8861mnJJmxPzFb0KKmpxthk7uTmlfAmzS+N3ZTRRuwER/HX0+/sI6QpsyTAfwdNgZfa3 DssQ== X-Gm-Message-State: AC+VfDxuRQ+QAcdbNJ+hlk+JHRCm6FRKprdC34JO0LTs0J4PHapspJAC X1izMPGtyjv99POAioNKjMM= X-Received: by 2002:a17:907:2d28:b0:96a:3e39:f567 with SMTP id gs40-20020a1709072d2800b0096a3e39f567mr17431248ejc.47.1687361758375; Wed, 21 Jun 2023 08:35:58 -0700 (PDT) Received: from lelloman-5950.homenet.telecomitalia.it (host-87-21-158-222.retail.telecomitalia.it. [87.21.158.222]) by smtp.gmail.com with ESMTPSA id r3-20020a170906c28300b00988acf24f9csm3266123ejz.97.2023.06.21.08.35.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jun 2023 08:35:57 -0700 (PDT) From: Domenico Cerasuolo To: tj@kernel.org, lizefan.x@bytedance.com, hannes@cmpxchg.org, shuah@kernel.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com, muchun.song@linux.dev, sjenning@redhat.com, ddstreet@ieee.org, vitaly.wool@konsulko.com, riel@surriel.com, nphamcs@gmail.com Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-kselftest@vger.kernel.org, Domenico Cerasuolo Subject: [PATCH 3/3] selftests: cgroup: add zswap-memcg unwanted writeback test Date: Wed, 21 Jun 2023 17:35:48 +0200 Message-Id: <20230621153548.428093-4-cerasuolodomenico@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230621153548.428093-1-cerasuolodomenico@gmail.com> References: <20230621153548.428093-1-cerasuolodomenico@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 Add a test to verify that when a memcg hits its limit in zswap, it doesn't trigger an unwanted writeback that would result in pages not owned by that memcg to be sent to disk, even if zswap isn't full. This was fixed by commit 0bdf0efa180a("zswap: do not shrink if cgroup may not zswap"). Signed-off-by: Domenico Cerasuolo --- tools/testing/selftests/cgroup/test_zswap.c | 61 +++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/tools/testing/selftests/cgroup/test_zswap.c b/tools/testing/selftests/cgroup/test_zswap.c index e859fecd310b..49def87a909b 100644 --- a/tools/testing/selftests/cgroup/test_zswap.c +++ b/tools/testing/selftests/cgroup/test_zswap.c @@ -50,6 +50,66 @@ static int get_zswap_stored_pages(size_t *value) return read_int("/sys/kernel/debug/zswap/stored_pages", value); } +static int get_zswap_written_back_pages(size_t *value) +{ + return read_int("/sys/kernel/debug/zswap/written_back_pages", value); +} + +static int allocate_bytes(const char *cgroup, void *arg) +{ + size_t size = (size_t)arg; + char *mem = (char *)malloc(size); + + if (!mem) + return -1; + for (int i = 0; i < size; i += 4095) + mem[i] = 'a'; + free(mem); + return 0; +} + +/* + * When trying to store a memcg page in zswap, if the memcg hits its memory + * limit in zswap, writeback should not be triggered. + * + * This was fixed with commit 0bdf0efa180a("zswap: do not shrink if cgroup may + * not zswap"). Needs to be revised when a per memcg writeback mechanism is + * implemented. + */ +static int test_no_invasive_cgroup_shrink(const char *root) +{ + size_t written_back_before, written_back_after; + int ret = KSFT_FAIL; + char *test_group; + + /* Set up */ + test_group = cg_name(root, "no_shrink_test"); + if (!test_group) + goto out; + if (cg_create(test_group)) + goto out; + if (cg_write(test_group, "memory.max", "1M")) + goto out; + if (cg_write(test_group, "memory.zswap.max", "10K")) + goto out; + if (get_zswap_written_back_pages(&written_back_before)) + goto out; + + /* Allocate 10x memory.max to push memory into zswap */ + if (cg_run(test_group, allocate_bytes, (void *)MB(10))) + goto out; + + /* Verify that no writeback happened because of the memcg allocation */ + if (get_zswap_written_back_pages(&written_back_after)) + goto out; + if (written_back_after == written_back_before) + ret = KSFT_PASS; +out: + cg_destroy(test_group); + free(test_group); + return ret; +} + struct no_kmem_bypass_child_args { size_t target_alloc_bytes; size_t child_allocated; @@ -176,6 +236,7 @@ struct zswap_test { const char *name; } tests[] = { T(test_no_kmem_bypass), + T(test_no_invasive_cgroup_shrink), }; #undef T -- 2.34.1