From patchwork Thu Apr 3 03:12:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waiman Long X-Patchwork-Id: 14036744 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C414BC3601A for ; Thu, 3 Apr 2025 03:12:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9F1B3280004; Wed, 2 Apr 2025 23:12:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 97772280001; Wed, 2 Apr 2025 23:12:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 81803280004; Wed, 2 Apr 2025 23:12:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 60A49280001 for ; Wed, 2 Apr 2025 23:12:56 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 2FFD91A1131 for ; Thu, 3 Apr 2025 03:12:57 +0000 (UTC) X-FDA: 83291260794.26.D892B54 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf22.hostedemail.com (Postfix) with ESMTP id 74404C000B for ; Thu, 3 Apr 2025 03:12:55 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="Xmo/HpWo"; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf22.hostedemail.com: domain of longman@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=longman@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743649975; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=tHphIEaw5gDaEtW0EdbaEwdklWHfbt6vvd4IdDuXcxU=; b=zI65HolEjwwtPz2d6DfQOCwuXljquY6QJC+2TuDhcWMpJbTcZDNKJeZ90qvLHvkvlMoVGC EAtWw9vzqD3TI8++qPm1zhDGJiJdkTA56eN1l/kVe05pq5vUrDeMGPQLy+wYgdSucMBkdo ju1drdYDu1BrJG3y8t+yJ5VXKvdZNPA= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="Xmo/HpWo"; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf22.hostedemail.com: domain of longman@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=longman@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743649975; a=rsa-sha256; cv=none; b=vqv6UCLMaEHLdRDHlx1efTWeNGFzf6taiXoDLbJYGs7AsPYEoa4T5sOZxbq82eA9vHxK7p 8Jbp6RJuDLGoh2gwkwbye3g6nN1Qn6A+/0k252/GH/XocH/rj6/O7S/1/c2lbI8kNrHWaO Eol5vmI0uJiDtJWMwMxh7asTEuG7Z+k= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743649974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=tHphIEaw5gDaEtW0EdbaEwdklWHfbt6vvd4IdDuXcxU=; b=Xmo/HpWo6Cgvn2nAou4U+YgQVADDbCB3javfMFP5MOEHyw3yDvpNN947rslso16uoN7YqH 04SJmgfv1MH3yLgpOvmj80LT6A4szsvlNdrvwu03Rho8L+5w3QENkytDhTWqNiB9mTDE6J BEbgepU/bBuyzV16CAKZt6WmFchL6zk= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-367-FeCn6EObM2q3ZsXIDduRxg-1; Wed, 02 Apr 2025 23:12:50 -0400 X-MC-Unique: FeCn6EObM2q3ZsXIDduRxg-1 X-Mimecast-MFC-AGG-ID: FeCn6EObM2q3ZsXIDduRxg_1743649969 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B50FA19560B3; Thu, 3 Apr 2025 03:12:48 +0000 (UTC) Received: from llong-thinkpadp16vgen1.westford.csb (unknown [10.22.81.199]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E991E1955BC2; Thu, 3 Apr 2025 03:12:45 +0000 (UTC) From: Waiman Long To: Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Andrew Morton Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, Waiman Long Subject: [PATCH] memcg: Don't generate low/min events if either low/min or elow/emin is 0 Date: Wed, 2 Apr 2025 23:12:12 -0400 Message-ID: <20250403031212.317837-1-longman@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Rspamd-Server: rspam01 X-Stat-Signature: pbi4pxgjcz5t66tmso64s1djnn91b31k X-Rspam-User: X-Rspamd-Queue-Id: 74404C000B X-HE-Tag: 1743649975-261947 X-HE-Meta: U2FsdGVkX1+UvwahTSxDPcwXW1M4p0X3dMumPAtS1y0mxsmxJdh0/0d5Ecp+c15Ar0ubBvZGAfq62pLk+BTlZbZYr37bHvb45d23CKVHs1QGWjs68s4zP6RXMfiXhoLt3EoVu3D/qtDb2i5HuKvy2QgvEzWbqYV6z7sWPZijx7v9YsStJWuW8p6PUTcZVGE4sTo0Xoj0R/AV1P8pFK61tyyqp8jw/JSaX477ZO0K6st502/Uaf+hipNr2TJ1tEKzS/Wbm5nG2UzD4VsFhhM0ztly8rTY2wApcXsb1e8fEqcTvxU1VTV8B5mtXEO3GapjYzYZpCmAbRgjdd2wEvqSdjLbBlj3K/lgmCx6ZnNJL6JCX+t6zgCZD/ye5+BUwPCIRuLxJULSBdXANl4smRLWqTXd7B2PkyXqIPH5/5ZeYGBm/oFCZ5hiBysUV5c3wwAMaQS/t4oxcHiuVxc5KhtvJLJhqMj7o9nQ5HT+0UvwDa6ezmbzdnqqZh/KDzobdGxFdftBXNfzvXx1rfTA/XqOXKjp77c8VgkGtk7RtEaB9LPBEbTox2Qtb4MAqwHD2ZV4NCbri4NoM1gZhhEqyYWcdE97wasTyPtRPCc7bhxOmaSDA89kMGIKYMLn2bqJH+BCPshtC+KBkb7gwWm0UsXbCC5UtWYvAE9EKWvsSrXbfeOQ/PDUICFlC/Tc0P82Y6hEgoyoSMomFpp4otWqn7crbrzlaQHRL8KELWWraHMjfLIDRsnC4/FcPgc9BLtFYQ7qrQ2PLjP0euNLjOHRlj5Ab3UBMeZwbLHMpW79xXzFilTGaYXdUwB8NyJSyBGilp0OTiY8qjAIvdtqm4B9iOwmdoCW7H1MG8RHn/gMNlMiIxizTfqwJtLyZUcmVR8seiNoWumJJVw9UDYEgGpid7JHtuEOLBns17wVVf0h6FoJsauosIBZ5tbmDZohC6yMDHDpsDpO1lOxXIA+axFMkwE NTOEMhRb yUMKxg1/diU1QkaoOjgCmV4va2hSwQVj32ENjO0bUc0/O57FTg9XXvW7Rn7XwrAF/YXkkCvr74hzrHG20DQkSAZdvoj/oPvWhSDCk/OfBLRkEgBJqLGUmRJ2JB5Fw4W03nnRMLt5fVWaONjtmyQZKMlObCQ0G5iIYH0NXzsFq48i3KL2Oa9hnxWE4RRs6noq4MoqVMH459kjROXsiPzrZSqS63asx9z8uZYuUBlOCxwPbyHlCznwavr/OBpqw4jy5UwnHJuc9cOky7CkVy53enIlr3/RR3RZcYfEjUhlj/WCdZcphHMF6sK9w5yTcTswLH0PpVjGeAWdqbtc= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000656, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: The test_memcontrol selftest consistently fails its test_memcg_low sub-test because of the fact that two of its test child cgroups which have a memmory.low of 0 or an effective memory.low of 0 still have low events generated for them since mem_cgroup_below_low() use the ">=" operator when comparing to elow. The simple fix of changing the operator to ">", however, changes the way memory reclaim works quite drastically leading to other failures. So we can't do that without some relatively riskier changes in memory reclaim. Another simpler alternative is to avoid reporting below_low failure if either memory.low or its effective equivalent is 0 which is done by this patch. With this patch applied, the test_memcg_low sub-test finishes successfully without failure in most cases. Though both test_memcg_low and test_memcg_min sub-tests may fail occasionally if the memory.current values fall outside of the expected ranges. To be consistent, similar change is appled to mem_cgroup_below_min() as well. Signed-off-by: Waiman Long --- include/linux/memcontrol.h | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 53364526d877..4d4a1f159eaa 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -601,21 +601,31 @@ static inline bool mem_cgroup_unprotected(struct mem_cgroup *target, static inline bool mem_cgroup_below_low(struct mem_cgroup *target, struct mem_cgroup *memcg) { + unsigned long elow; + if (mem_cgroup_unprotected(target, memcg)) return false; - return READ_ONCE(memcg->memory.elow) >= - page_counter_read(&memcg->memory); + elow = READ_ONCE(memcg->memory.elow); + if (!elow || !READ_ONCE(memcg->memory.low)) + return false; + + return page_counter_read(&memcg->memory) <= elow; } static inline bool mem_cgroup_below_min(struct mem_cgroup *target, struct mem_cgroup *memcg) { + unsigned long emin; + if (mem_cgroup_unprotected(target, memcg)) return false; - return READ_ONCE(memcg->memory.emin) >= - page_counter_read(&memcg->memory); + emin = READ_ONCE(memcg->memory.emin); + if (!emin || !READ_ONCE(memcg->memory.min)) + return false; + + return page_counter_read(&memcg->memory) <= emin; } int __mem_cgroup_charge(struct folio *folio, struct mm_struct *mm, gfp_t gfp);