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 X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2D32C63699 for ; Fri, 13 Nov 2020 23:42:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7DB8922263 for ; Fri, 13 Nov 2020 23:42:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="B0r19MMZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726189AbgKMXmj (ORCPT ); Fri, 13 Nov 2020 18:42:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726064AbgKMXmj (ORCPT ); Fri, 13 Nov 2020 18:42:39 -0500 Received: from mail-lf1-x143.google.com (mail-lf1-x143.google.com [IPv6:2a00:1450:4864:20::143]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91370C0613D1; Fri, 13 Nov 2020 15:42:38 -0800 (PST) Received: by mail-lf1-x143.google.com with SMTP id v144so16523958lfa.13; Fri, 13 Nov 2020 15:42:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=JqzzLgIvxHqw73GCku4Mas63TAVlMZ5DWuV5xVfKdKs=; b=B0r19MMZBS4qnPOpH3Oh7mviI2ESDdHEhgo+UT9aZXskXoEd9SnPfMI/JIQYxPxtOR EGdJ2X/BFGo2JIgPc7YKwL5OHO+C0iGUlcLt7SsFk5strPrUoRxXyWJ0RUiRQlWr4+Q9 UGWo8SVcac0O9tQYHuBdOkO7NOuKdAMPi3UiVqcUEf+/yt3BCTCvkiiO9shXsZcgvKCI mqX10Qdfqu4P8JgnD2ndzSSlvwFINTNV0y8KdpRHFKCK3X2fikhgsl9ap1i9u5iJJjMW PWLkp0ZY+5TBxslo+fG0/WW3kZ1717ioHRkZ7oRtRA7lwDMuCMImPvZsEfTtSS5PpFGO gyNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=JqzzLgIvxHqw73GCku4Mas63TAVlMZ5DWuV5xVfKdKs=; b=o8ZaDQwtEm6/C/WINt1pKyEGYhabIlkusnY7EFCJSrwWlF6qSZsgwLlptXoLU9Yrdb oo/YwSazqMijlA5wrZtQTDLzFVeJd1842NVyqbxvTrn8TJ26EJycNTBmctvXuADyikxx UwiNYvQFYEVgt6YZWh0in3XV/M8jq/f3IrCFQ1d4uwJkFPTSPeuPR/cBcvqYT3+PlANq YVc5ydKxfkFp2bcj6VMQteCih9bpzkRWVnd+vEmri0iNk8dujLspWtqWshgrFJBmbuek h+9u4zIqS34atpwXwuDSKgpMU0BYfDzBcwaTkBWM813clLMkCgEaDieiosISk5CrUOdD Awxw== X-Gm-Message-State: AOAM531utgywuerEzI208zk1821zbvZgCmwNPedgP9/+vafzKrFsUuEL OTO+amHQVhNTTU/sUHYgrgYD0HzeFX+hXbHToEg= X-Google-Smtp-Source: ABdhPJzhCiM/9It/85NbIdVKdebxXQcus40OOuN1h7PzHPVAvA/sjezmqkryt630ZVNrgKRfchCjAC+cyB3SFkLkebc= X-Received: by 2002:a19:e84:: with SMTP id 126mr1806647lfo.432.1605310957017; Fri, 13 Nov 2020 15:42:37 -0800 (PST) MIME-Version: 1.0 References: <20201110151444.20662-1-rppt@kernel.org> <20201110151444.20662-7-rppt@kernel.org> In-Reply-To: <20201110151444.20662-7-rppt@kernel.org> From: Roman Gushchin Date: Fri, 13 Nov 2020 15:42:25 -0800 Message-ID: Subject: Re: [PATCH v8 6/9] secretmem: add memcg accounting To: Mike Rapoport Cc: Andrew Morton , Alexander Viro , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Catalin Marinas , Christopher Lameter , Dan Williams , Dave Hansen , David Hildenbrand , Elena Reshetova , "H. Peter Anvin" , Ingo Molnar , James Bottomley , "Kirill A. Shutemov" , Matthew Wilcox , Mark Rutland , Mike Rapoport , Michael Kerrisk , Palmer Dabbelt , Paul Walmsley , Peter Zijlstra , Rick Edgecombe , Shuah Khan , Thomas Gleixner , Tycho Andersen , Will Deacon , linux-api@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-nvdimm@lists.01.org, linux-riscv@lists.infradead.org, x86@kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org =D0=B2=D1=82, 10 =D0=BD=D0=BE=D1=8F=D0=B1. 2020 =D0=B3. =D0=B2 07:16, Mike = Rapoport : > > From: Mike Rapoport > > Account memory consumed by secretmem to memcg. The accounting is updated > when the memory is actually allocated and freed. > > Signed-off-by: Mike Rapoport > --- > mm/filemap.c | 2 +- > mm/secretmem.c | 42 +++++++++++++++++++++++++++++++++++++++++- > 2 files changed, 42 insertions(+), 2 deletions(-) > > diff --git a/mm/filemap.c b/mm/filemap.c > index 249cf489f5df..11387a077373 100644 > --- a/mm/filemap.c > +++ b/mm/filemap.c > @@ -844,7 +844,7 @@ static noinline int __add_to_page_cache_locked(struct= page *page, > page->mapping =3D mapping; > page->index =3D offset; > > - if (!huge) { > + if (!huge && !page->memcg_data) { > error =3D mem_cgroup_charge(page, current->mm, gfp); > if (error) > goto error; > diff --git a/mm/secretmem.c b/mm/secretmem.c > index 1aa2b7cffe0d..1eb7667016fa 100644 > --- a/mm/secretmem.c > +++ b/mm/secretmem.c > @@ -17,6 +17,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -49,6 +50,38 @@ struct secretmem_ctx { > > static struct cma *secretmem_cma; > Hi Mike! > +static int secretmem_memcg_charge(struct page *page, gfp_t gfp, int orde= r) > +{ > + unsigned long nr_pages =3D (1 << order); > + int i, err; > + > + err =3D memcg_kmem_charge_page(page, gfp, order); > + if (err) > + return err; > + > + for (i =3D 1; i < nr_pages; i++) { > + struct page *p =3D page + i; > + > + p->memcg_data =3D page->memcg_data; > + } Hm, it looks very strange to me. Why do we need to copy memcg_data? What about css reference counting? And what about statistics? I'm sorry for being late. Thank you! > + > + return 0; > +} > + > +static void secretmem_memcg_uncharge(struct page *page, int order) > +{ > + unsigned long nr_pages =3D (1 << order); > + int i; > + > + for (i =3D 1; i < nr_pages; i++) { > + struct page *p =3D page + i; > + > + p->memcg_data =3D 0; > + } > + > + memcg_kmem_uncharge_page(page, PMD_PAGE_ORDER); > +} > + > static int secretmem_pool_increase(struct secretmem_ctx *ctx, gfp_t gfp) > { > unsigned long nr_pages =3D (1 << PMD_PAGE_ORDER); > @@ -61,10 +94,14 @@ static int secretmem_pool_increase(struct secretmem_c= tx *ctx, gfp_t gfp) > if (!page) > return -ENOMEM; > > - err =3D set_direct_map_invalid_noflush(page, nr_pages); > + err =3D secretmem_memcg_charge(page, gfp, PMD_PAGE_ORDER); > if (err) > goto err_cma_release; > > + err =3D set_direct_map_invalid_noflush(page, nr_pages); > + if (err) > + goto err_memcg_uncharge; > + > addr =3D (unsigned long)page_address(page); > err =3D gen_pool_add(pool, addr, PMD_SIZE, NUMA_NO_NODE); > if (err) > @@ -81,6 +118,8 @@ static int secretmem_pool_increase(struct secretmem_ct= x *ctx, gfp_t gfp) > * won't fail > */ > set_direct_map_default_noflush(page, nr_pages); > +err_memcg_uncharge: > + secretmem_memcg_uncharge(page, PMD_PAGE_ORDER); > err_cma_release: > cma_release(secretmem_cma, page, nr_pages); > return err; > @@ -310,6 +349,7 @@ static void secretmem_cleanup_chunk(struct gen_pool *= pool, > int i; > > set_direct_map_default_noflush(page, nr_pages); > + secretmem_memcg_uncharge(page, PMD_PAGE_ORDER); > > for (i =3D 0; i < nr_pages; i++) > clear_highpage(page + i); > -- > 2.28.0 > >