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=-17.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 0ED15C4338F for ; Wed, 11 Aug 2021 10:54:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E98CE601FE for ; Wed, 11 Aug 2021 10:54:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237203AbhHKKyd (ORCPT ); Wed, 11 Aug 2021 06:54:33 -0400 Received: from smtp-out1.suse.de ([195.135.220.28]:53296 "EHLO smtp-out1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231143AbhHKKya (ORCPT ); Wed, 11 Aug 2021 06:54:30 -0400 Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 08B25221AB; Wed, 11 Aug 2021 10:54:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1628679246; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Hv1T/hKNTE5d+nxwafHGQund8yaFQUJNQ0XZ3C5Zyew=; b=iQOx39CqLJK+SgrFRASjmJYMXVBiEfDNNCMKiUUDReNTOCEmAwg+IaLD/VZIp4aNOAbESv /5u0JPXXtkcM/vsgTcpzCwgtquzkcaLEE9pzamA8x82GTiDndne+ODLpBf9W3B9cz8f1t7 i7fWuilC//2Qj9CeUQKpoiHJ8b2yXgg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1628679246; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Hv1T/hKNTE5d+nxwafHGQund8yaFQUJNQ0XZ3C5Zyew=; b=LKWKi2se9J/Klv+89EjxNlk7E2kGuS/TtKPdzHERlei0VBO4cNqB7Wi+l8rDIg9uIk2Cj8 HXSmQQr10iPPMECA== Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap1.suse-dmz.suse.de (Postfix) with ESMTPS id DA314131F5; Wed, 11 Aug 2021 10:54:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap1.suse-dmz.suse.de with ESMTPSA id gddsNE2sE2HjFQAAGKfGzw (envelope-from ); Wed, 11 Aug 2021 10:54:05 +0000 Subject: Re: [PATCH v14 040/138] mm/memcg: Convert mem_cgroup_charge() to take a folio To: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Christoph Hellwig , Michal Hocko , Johannes Weiner , Vladimir Davydov References: <20210715033704.692967-1-willy@infradead.org> <20210715033704.692967-41-willy@infradead.org> From: Vlastimil Babka Message-ID: <40a868bf-61dc-1832-4799-ff85018ebcec@suse.cz> Date: Wed, 11 Aug 2021 12:54:05 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <20210715033704.692967-41-willy@infradead.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 7/15/21 5:35 AM, Matthew Wilcox (Oracle) wrote: > Convert all callers of mem_cgroup_charge() to call page_folio() on the > page they're currently passing in. Many of them will be converted to > use folios themselves soon. > > Signed-off-by: Matthew Wilcox (Oracle) > Reviewed-by: Christoph Hellwig Acked-by: Vlastimil Babka > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index c2ffad021e09..03283d97b62a 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -6681,10 +6681,9 @@ void mem_cgroup_calculate_protection(struct mem_cgroup *root, > atomic_long_read(&parent->memory.children_low_usage))); > } > > -static int __mem_cgroup_charge(struct page *page, struct mem_cgroup *memcg, > +static int __mem_cgroup_charge(struct folio *folio, struct mem_cgroup *memcg, > gfp_t gfp) The git/next version also renames this function to charge_memcg(), why? The new name doesn't look that internal as the old one. I don't have a strong opinion but CCing memcg maintainers who might. > { > - struct folio *folio = page_folio(page); > unsigned int nr_pages = folio_nr_pages(folio); > int ret; > > @@ -6697,27 +6696,27 @@ static int __mem_cgroup_charge(struct page *page, struct mem_cgroup *memcg, > > local_irq_disable(); > mem_cgroup_charge_statistics(memcg, nr_pages); > - memcg_check_events(memcg, page_to_nid(page)); > + memcg_check_events(memcg, folio_nid(folio)); > local_irq_enable(); > out: > return ret; > } >