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=-6.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 0762FC56202 for ; Fri, 13 Nov 2020 01:35:22 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5F146216C4 for ; Fri, 13 Nov 2020 01:35:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="IkDIgt7n"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="p0qhu8Fl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F146216C4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Mime-Version:References:In-Reply-To:Message-Id: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=o+S7ExY9EDWnWZVHsG4iCxpVNNcHD3H4XDOSxLXXBUM=; b=IkDIgt7nQQeQtarMPAF0mkFor TggknJMHpafwGgGql5A2nEOGlurIojL6rCHzAMR+6+UXJnPCBDgoCSmvJU/fGch6cVym9NgpdIctW 9lioGWA7Pvgf2FOqwDCkgBq2lDp7NNFEUrG4sQYHL+bIdjLCRPzFAcecJPBvr+w20PYpoBYLodVPY gL6ATS7dzN2eOrHNsHLtJNHcwh3SSCrXfeJKuirEshhS6AWT1/mXMyOHvVlWqi0t+/KbFDX4xZIHS 8k7DgHQsOv0kXaONTOgsCm19LLY6yHdUJOefI6KUllaPdw5Q/3Ljane4HcWVEYJ3AEIB65cSP7njN 29h0rZ6Fw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdNzb-00078Y-Li; Fri, 13 Nov 2020 01:35:11 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdNzV-00076I-BE; Fri, 13 Nov 2020 01:35:07 +0000 Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6C4A3216C4; Fri, 13 Nov 2020 01:35:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605231303; bh=7IlWDoYFw6qKRjH3BOF82R+49xhuW2KtSCCfIWH1mkI=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=p0qhu8FlLRBehX3rgLy1uFImTw0miiTwEZpreJOS2JwqBOK7aypH/FXHF7H7cSQaJ 99y8LK9p6OmIEjarwU8D+b4yDZG1JvcRwCGKSU23kxdHuvZhv3MoS/AuK35nuazPZd cG0gF1kwLqiFd64IeHBis7a9eoZv0ffsedBM0C8A= Date: Thu, 12 Nov 2020 17:35:00 -0800 From: Andrew Morton To: Mike Rapoport Subject: Re: [PATCH v8 6/9] secretmem: add memcg accounting Message-Id: <20201112173500.2556342ceefdbe0d66347ecd@linux-foundation.org> In-Reply-To: <20201110151444.20662-7-rppt@kernel.org> References: <20201110151444.20662-1-rppt@kernel.org> <20201110151444.20662-7-rppt@kernel.org> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) Mime-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201112_203505_592621_A2245525 X-CRM114-Status: GOOD ( 17.85 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , David Hildenbrand , Peter Zijlstra , Catalin Marinas , Dave Hansen , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, "H. Peter Anvin" , Christopher Lameter , Shuah Khan , Thomas Gleixner , Elena Reshetova , linux-arch@vger.kernel.org, Tycho Andersen , linux-nvdimm@lists.01.org, Will Deacon , x86@kernel.org, Matthew Wilcox , Mike Rapoport , Ingo Molnar , Michael Kerrisk , Arnd Bergmann , James Bottomley , Borislav Petkov , Alexander Viro , Andy Lutomirski , Paul Walmsley , "Kirill A. Shutemov" , Dan Williams , linux-arm-kernel@lists.infradead.org, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Palmer Dabbelt , linux-fsdevel@vger.kernel.org, Rick Edgecombe Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org On Tue, 10 Nov 2020 17:14:41 +0200 Mike Rapoport wrote: > Account memory consumed by secretmem to memcg. The accounting is updated > when the memory is actually allocated and freed. From: Andrew Morton Subject: secretmem-add-memcg-accounting-fix fix CONFIG_MEMCG=n build Cc: Mike Rapoport Signed-off-by: Andrew Morton --- mm/filemap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/filemap.c~secretmem-add-memcg-accounting-fix +++ a/mm/filemap.c @@ -844,7 +844,7 @@ static noinline int __add_to_page_cache_ page->mapping = mapping; page->index = offset; - if (!huge && !page->memcg_data) { + if (!huge && !page_memcg(page)) { error = mem_cgroup_charge(page, current->mm, gfp); if (error) goto error; _ _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv