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 052B6C00140 for ; Sat, 13 Aug 2022 00:44:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 417796B0073; Fri, 12 Aug 2022 20:44:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C6646B0075; Fri, 12 Aug 2022 20:44:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 28E4A8E0001; Fri, 12 Aug 2022 20:44:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 191CE6B0073 for ; Fri, 12 Aug 2022 20:44:28 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E64D3802FE for ; Sat, 13 Aug 2022 00:44:27 +0000 (UTC) X-FDA: 79792723374.08.01902AA Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by imf07.hostedemail.com (Postfix) with ESMTP id 6D559401A0 for ; Sat, 13 Aug 2022 00:44:27 +0000 (UTC) Received: by mail-wr1-f54.google.com with SMTP id z12so2737380wrs.9 for ; Fri, 12 Aug 2022 17:44:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=nsBuNh8ySi6ShETxrYCuKi8D+pIFk/T+cDDfDt4bPtw=; b=flhpfV8eLQphDY35QUDVJ7szN/37QPBxxglfSV+QSAbZ16HmGEjx4iXgN+A3uyEiy5 u+TX01e611Jk7krensRzI4SVwdTXzRykr7IwEg4tIDyxtRN/s1P+9E0kz+aaf58Y7Cv8 mT3IvEYgBb3t7lKpqzhzYpn/C4vsS7C5ZTNUM5zk710sz++5UEVtcFb0AxRGMLa6trcr 31xVxvDzY0e9/5TJSegj41peN9rpqzrhczVGSc2Io9vwX0TOK3QZhEKyL5YrHWSEzSBH 6KcFZGfBSt4Hcv5gGqfp4ALrC4XcY4b1KRXRj9b4m8o9ZGOnr2vyeghnnWm4gBvQbEQD as2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=nsBuNh8ySi6ShETxrYCuKi8D+pIFk/T+cDDfDt4bPtw=; b=ScoWNBfsMF4flVYI8yOfsPJYoGoHjflKFJXwe42GTl2qLXeq/oDA9AhfOJkgmXV0rg R3awuCvaOfZvNkZNIUsRTURkrXhXDlZ8cEA7wHS3atFa2F+qbBwt5pI1fZeKZcVXHhii xvfGn1mqKfnN3Y1zBeo/1sflCkUxk9iTH64x60AbTcTvrVXEKOEvkXdE8hqAHfR7QcCP v+EBrTItgX9rTSaBqS4iUx2KBfpBIKVxwqy8iUY957//Wa4IXhd9IBUnqvSJU8ATTgAi u8sKuEtcxRZ6ODq6LnfzInZR3nspOzMp33IdyWINuArJNzM5dVJGq0VXTlFaV2aShM1u 7/pg== X-Gm-Message-State: ACgBeo0Rj+WGe92UXFA9N0CaiHBCGlbJzl83UmQxBEd/pC4VsnKLx77p XVIHukN4U0aMuA7ilpWyl4hv0QonTI+7dNW/H5d/6Q== X-Google-Smtp-Source: AA6agR4Onx/CCa2VmVAMrVd2d+HZLgXRnIWsz7wkClVEYmWvnwDCELyXj1ufb3n1XkP6oJrpe7iz8Fw+v0iMO+gKQ9M= X-Received: by 2002:adf:d84e:0:b0:21e:bdc0:2847 with SMTP id k14-20020adfd84e000000b0021ebdc02847mr3241978wrl.582.1660351465995; Fri, 12 Aug 2022 17:44:25 -0700 (PDT) MIME-Version: 1.0 References: <20220811081913.102770-1-liliguang@baidu.com> In-Reply-To: From: Yosry Ahmed Date: Fri, 12 Aug 2022 17:43:49 -0700 Message-ID: Subject: Re: [PATCH] mm: correctly charge compressed memory to its memcg To: Shakeel Butt Cc: liliguang , Andrew Morton , Linux-MM , Cgroups , Johannes Weiner , Michal Hocko , Muchun Song , Roman Gushchin Content-Type: text/plain; charset="UTF-8" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660351467; a=rsa-sha256; cv=none; b=H3me5BvSAJ25Q8G7yZmx/xUOJcbIBMpPcW2l7D/S83OZAxKUwwy1CKox8GhxyH0ZUR8OrN ue19blbzmXH3vou8yQTldxkIl4kRPhMFMVcx+h7FprnmioH7jQBhmwIBbYGB1LfV2AhZWt hmzgSg0CVsUKpkn2b+wLztXBbbz4Prg= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=flhpfV8e; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf07.hostedemail.com: domain of yosryahmed@google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=yosryahmed@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660351467; 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=nsBuNh8ySi6ShETxrYCuKi8D+pIFk/T+cDDfDt4bPtw=; b=gTQY2IdWTHgnCYiAoSSEH9e9YMIaL2Ra5xLorQdSNTJ6wUnyVoC7xjISoKgx3hvjdJ8MeM 5qkOBGrEpnISBl6XrhE77dl8FQxy9sPKlgj7t0cI9PT0MImcehBNVk5zK7uwyb3bgvOF70 gAhDfro0Hp+Zn4TiQEze8vl9JDS1SWA= X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 6D559401A0 Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=flhpfV8e; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf07.hostedemail.com: domain of yosryahmed@google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=yosryahmed@google.com X-Rspam-User: X-Stat-Signature: ro3azw38prbbsez9si3obfdozzt9ykg8 X-HE-Tag: 1660351467-515230 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 Fri, Aug 12, 2022 at 2:56 PM Shakeel Butt wrote: > > +Andrew & linux-mm > > On Thu, Aug 11, 2022 at 5:12 PM Roman Gushchin wrote: > > > > 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 > > > --- > > > 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()) Won't the memcg_kmem_enabled() check also cause a problem in that same scenario (e.g. if CONFIG_MEMCG_KMEM=n)? or am I missing something here? > > > > return NULL; > > > > > > if (PageMemcgKmem(page)) { > > > -- > > > 2.32.0 (Apple Git-132) > > > > > > > Hi Li! > > > > The fix looks good to me! As we get objcg pointer from a page and not from > > the current task, memcg_kmem_bypass() doesn't makes much sense. > > > > Acked-by: Roman Gushchin > > > > Probably, we need to add > > Fixes: f4840ccfca25 ("zswap: memcg accounting") > > > > Thank you! > > You can add: > > Acked-by: Shakeel Butt >