From mboxrd@z Thu Jan 1 00:00:00 1970 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 A705FC25B0E for ; Mon, 15 Aug 2022 15:20:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1A72B6B0074; Mon, 15 Aug 2022 11:20:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 130AC6B0075; Mon, 15 Aug 2022 11:20:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EED118D0001; Mon, 15 Aug 2022 11:20:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id DAA596B0074 for ; Mon, 15 Aug 2022 11:20:15 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A75F41205EC for ; Mon, 15 Aug 2022 15:20:15 +0000 (UTC) X-FDA: 79802187990.04.E787FD5 Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) by imf26.hostedemail.com (Postfix) with ESMTP id 3E284140183 for ; Mon, 15 Aug 2022 15:20:14 +0000 (UTC) Received: by mail-qv1-f43.google.com with SMTP id h8so5549068qvs.6 for ; Mon, 15 Aug 2022 08:20:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20210112.gappssmtp.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc; bh=lyZgYwibx9tzRtJlNLbCd26XMkmBuOumcQ8OAPPucbg=; b=YNpjJEf/4VMEm5B9xVp7Zc/3JUCCu7KwjTesSoI4+6XzsgemIUvKR0QSyGpBvFShug 3agDi7/sx0KMMGRwjNIUSg2RSHBVg9M/i246c5cNS8UZgbePBR1PVixVNZ9VdhLHXF8h pyIaajA/ZcivyGZKVcZsEOtvVxrkGfQDqv6Rqu8Bmri/u13C/72Zx4cYMjfpH9Jk8fgE Zr9AhY0jNdu+0jVXAk0F428lR6eLJ7NqwHEB8yA1Xi4G3hlMU9z+tUvmMTtVosnQSR2m 0jBcy2ZKGUUXdP06l6Z0IpCY0Vo5R37acO2WSr6dWshFN6xZGc3eq+af27clNABV4Cth acDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc; bh=lyZgYwibx9tzRtJlNLbCd26XMkmBuOumcQ8OAPPucbg=; b=yC9+nxqHZMLoWSMpDfLWJI7c/fVv4v/qsbwSDeWcr7oyvytfiKwSdMGrTBgHpn1AZg 9J5UNqAzCEBcnSqg/fkOuGfg3RpRxbSqadfMf83GmDdpRhWLRYi4xx4BLCV+3LHWf+y7 GJBgAadKWQX/3q8LfyS9s/zg/Kc6tqx3ZnKG7X7dZLpdKMSp0ZYpFv+kxHCkjlOaUT52 X2wCJc1b/Uxs+M14j0sBjAICpDBR1OG5uZCXTT+ZijopyMaLr4rB2kzl9b54fe/xR3Rw LG4LwedPPXasSGdibO/NZwoI1PsueZQG+yNiibFquuLKONZJXEhoBdmls65JSOEDCBLj ab0w== X-Gm-Message-State: ACgBeo1iXkynpE0HgJqKcsBJ8hm1hcBKJvbZDQ2TcLmvR5OwplUqj+/f veOZXYWYd8eC3P5SfWnd2VJZLA== X-Google-Smtp-Source: AA6agR4iIkJUTdnhfz/gdhu62lhmJFbdVp2FI8qCpT8ci83w3y14YkEorWdUMmQuNh3bUesYIOYOhA== X-Received: by 2002:ad4:5f0a:0:b0:474:8978:9a9f with SMTP id fo10-20020ad45f0a000000b0047489789a9fmr14442429qvb.71.1660576813268; Mon, 15 Aug 2022 08:20:13 -0700 (PDT) Received: from localhost ([2620:10d:c091:480::a23e]) by smtp.gmail.com with ESMTPSA id o2-20020ac86982000000b0033a5048464fsm8186182qtq.11.2022.08.15.08.20.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Aug 2022 08:20:12 -0700 (PDT) Date: Mon, 15 Aug 2022 11:20:11 -0400 From: Johannes Weiner To: liliguang Cc: cgroups@vger.kernel.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com, songmuchun@bytedance.com, Andrew Morton , linux-mm@kvack.org Subject: Re: [PATCH] mm: correctly charge compressed memory to its memcg Message-ID: References: <20220811081913.102770-1-liliguang@baidu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220811081913.102770-1-liliguang@baidu.com> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660576814; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=lyZgYwibx9tzRtJlNLbCd26XMkmBuOumcQ8OAPPucbg=; b=iLxapipYDAbkbpmkdI7F8F+31Zca3aPPWfIK1sbUzxse4Av/80ZKGIpS+8i2mBBbqSvvrI 1Ae0J6OPyyP78jkIkBVZSTWL0ZMrjST3l9I+toCx0N00zNZTHxagcCfSDwdrcODQ5+COE0 WENmuTluqfCUTZdssYsEFqkmTxMUXBw= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=cmpxchg-org.20210112.gappssmtp.com header.s=20210112 header.b="YNpjJEf/"; spf=pass (imf26.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.219.43 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org; dmarc=pass (policy=none) header.from=cmpxchg.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660576814; a=rsa-sha256; cv=none; b=tfDRxhHh/Fw1Ot26UhjAqUPMeif6blOLaN1ZG58blWKEbXn1WsJWrhZTCntB5sF2sp09E3 VPYTeFdMQDifr4RpcZZschhqgA7eiueSYlzOXvnHIi+GGLJisbbRTAOVOEpngAAW8nYJ0R 2YSQVdjd3/oq9TdvsfZU6UbMcSQeY0w= X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 3E284140183 X-Rspam-User: Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=cmpxchg-org.20210112.gappssmtp.com header.s=20210112 header.b="YNpjJEf/"; spf=pass (imf26.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.219.43 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org; dmarc=pass (policy=none) header.from=cmpxchg.org X-Stat-Signature: jfysuk3rbtzmpipieynaqokqooby315x X-HE-Tag: 1660576814-473046 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Thu, Aug 11, 2022 at 04:19:13PM +0800, liliguang wrote: > From: Li Liguang > > Kswapd will reclaim memory when memory pressure is high, the > annonymous memory will be compressed and stored in the zpool > if zswap is enabled. The memcg_kmem_bypass() in > get_obj_cgroup_from_page() will bypass the kernel thread and > cause the compressed memory not charged to its memory cgroup. > > Remove the memcg_kmem_bypass() and properly charge compressed > memory to its corresponding memory cgroup. > > Signed-off-by: Li Liguang Great catch. I think this qualifies for stable. Cc: stable@vger.kernel.org # 5.19 Fixes: f4840ccfca25 ("zswap: memcg accounting") Acked-by: Johannes Weiner Andrew, can you please take this through the MM tree? > --- > mm/memcontrol.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index b69979c9ced5..6a95ea7c5ee7 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -2971,7 +2971,7 @@ struct obj_cgroup *get_obj_cgroup_from_page(struct page *page) > { > struct obj_cgroup *objcg; > > - if (!memcg_kmem_enabled() || memcg_kmem_bypass()) > + if (!memcg_kmem_enabled()) > return NULL; > > if (PageMemcgKmem(page)) { > -- > 2.32.0 (Apple Git-132) >