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 28E0FCDB474 for ; Tue, 17 Oct 2023 03:48:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 63EC28D00E6; Mon, 16 Oct 2023 23:48:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5EF2F8D00DE; Mon, 16 Oct 2023 23:48:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4DD828D00E6; Mon, 16 Oct 2023 23:48:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 3A6108D00DE for ; Mon, 16 Oct 2023 23:48:54 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 07DC340D81 for ; Tue, 17 Oct 2023 03:48:54 +0000 (UTC) X-FDA: 81353572188.14.E79C360 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf06.hostedemail.com (Postfix) with ESMTP id 83D8C18000A for ; Tue, 17 Oct 2023 03:48:50 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf06.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697514531; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rDqvk+pemIiPY1BxgVYMkMxuwjPpgv+Sf5SUA2rujnE=; b=4CcHZR5JkjZ7oBTBP3sZZ6RnjP3YJu8SxiWeOhsYBN+smCiwHoarwTtz6/j1avI6KClnYg ZvzyQdtxo5zC8oogZgJ8AHjPwBP0wWkinA48bDyH3MoQnp9F/1J+djvmDvOJz57gsvBBwa aXngS/h7jwQ8jTCC65vPmX4feiJe/cw= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf06.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697514531; a=rsa-sha256; cv=none; b=hvatyAbQgEj4AzLPV61kr2VZfTCEVgZ5uyflBxTDyfqDy6kv0jee48oJUebZCc+kMZWz7m OaUSOs76aj6MOw18p9CzXS7/6KLsetqev4OlcXLK17IzktJ4ZhOPEnmCv5qc33M96W/9Q6 JweDIvt7t965NyEir08HF2kJQAZRUh0= Received: from dggpemm100001.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4S8fwJ0lvyzvPyY; Tue, 17 Oct 2023 11:43:44 +0800 (CST) Received: from [10.174.177.243] (10.174.177.243) by dggpemm100001.china.huawei.com (7.185.36.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Tue, 17 Oct 2023 11:48:27 +0800 Message-ID: <84cdc2c3-e5e3-469b-b265-8df3e72a8c2f@huawei.com> Date: Tue, 17 Oct 2023 11:48:26 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 4/5] mm/khugepaged: Convert alloc_charge_hpage() to use folios Content-Language: en-US To: "Vishal Moola (Oracle)" , CC: , , References: <20231016200510.7387-1-vishal.moola@gmail.com> <20231016200510.7387-5-vishal.moola@gmail.com> From: Kefeng Wang In-Reply-To: <20231016200510.7387-5-vishal.moola@gmail.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.177.243] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm100001.china.huawei.com (7.185.36.93) X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 83D8C18000A X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 1z7ic5oi45z1c3kh58nqzpkd1f9szzwj X-HE-Tag: 1697514530-236730 X-HE-Meta: U2FsdGVkX19FXNIRl+7xgW8M4uxxkAOg4cZT+fw73zzJTNFtxYUj8EN/kUUZ1iFEKbg8To5uKu/skr2fgzL8qXvpXO63SFZsx5FoPKjvlr9m+R6weZCM6gkECRhmTrx7emoICz1vVKd325dkszQbqmbipdem/KGcjFp7xL3Cs7KJMO8pesqhvDz2pkEX12PRJiKE00dSvw30kLnjZHai2mgeTVzYfHnHeF9busmX7BgD1m3tk2mSeru9zRnEvnAUuKGp3NABaYONEshM75MH+LoRQr6JZJhOsDq7Z/77DfeUu3h0FkeamHrrae/73AhPYHWkddH5rA9N8GiI1wQoGF52OEXK3Pl8vUwTiXZoAg0yw4HQmOaNvrR0XnzcNkF4Nn6rvc1N85YY0/wKoJS2+6LnjirB1VaB3k09cFHJZ907uD9daBgquMIRH/WhQLbtZG769tWAe7acYcX8TEhzBsEnDUIEZ/giOkP/O6OtOxv4FtXVKl6soxz+QrEf391YGD8ZkyhBP5JABPXNaylKGo5UFBFP25km4+zmjvpM6HpU/B/jKACK+2Lz4PX8QOuRqXVkhhgE3ip/u1Zl0Skd+cNVZFiaAk4JIIxjArDbzumRjmvznWujSKECaJvg+cVzM/ymF2u69BGaPVdUUPFbhM24vfygUOjYRtyBWZF0wq63n/iHtux0q8CAXCVyVOEyYj7NXqRSP3Ii31z21OJ4LBb6kHkWkv8BoDyE6XJQN4RfSYyUL2RZp318ISqgAE2VgBBv5vmVFQcReCo7ZlHE8jUCABr/SSNY78rlMHKRhIpZ3S4V3k0rTFM7l1A6PLxft6L+gLED/aJO6rjp112HZQOqM4NWcbILl/bHbsnd9hni+43AQtxTSNv6dLBqVfHljg+xuxwFcwDIJZFrjz9lxnvySLyt6X55u/l3DBRDVFyCkRWS18+AqSdNTd1w5ELnctzdIh8S+gVZwKd8nqd phw697HC /Jdcp5H64oWB5n+0xLNLBUlWeajohtVY1u7DtOPxhD6l/lHXtL7GHFA/eyyJd+r9vhcci+ukUvl7oeMcCr504DPzCM81jHzatYPxtnvetOvZjzeugy3hURyzVSHH/baN0MSwDuFtbG4M+mSl4zW5VrK2nNYdOgNL4kkhi6aIU91nk84bmYisNfNCBwdgRGFNiw+TBdsn9TA9asSdbpIGFU/9gpCkIZitTlMXEJ1J0hUkSZGhcVoBTFnrReOErwLGhci4817GCVDdlBRzVY7+p0Z9tqp0nXyeRNSzXUCaVZ13OZc/pphuB6J/8dcX48vpbdtmusAD1KHm2VQqEgQIEZM2mISlrzpFuSep4DhJQjani1T8L8K+k2O+W74CzyRKsdxavUV+0R9y8oPGlfuW5ojUrZg== 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 2023/10/17 4:05, Vishal Moola (Oracle) wrote: > Also convert hpage_collapse_alloc_page() to > hpage_collapse_alloc_folio(). > > This removes 1 call to compound_head() and helps convert khugepaged to > use folios throughout. > > Signed-off-by: Vishal Moola (Oracle) > --- > mm/khugepaged.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index fa21a53ce0c0..70bba8ddea13 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -886,16 +886,16 @@ static int hpage_collapse_find_target_node(struct collapse_control *cc) > } > #endif > > -static bool hpage_collapse_alloc_page(struct page **hpage, gfp_t gfp, int node, > +static bool hpage_collapse_alloc_folio(struct folio **folio, gfp_t gfp, int node, > nodemask_t *nmask) > { > - *hpage = __alloc_pages(gfp, HPAGE_PMD_ORDER, node, nmask); > - if (unlikely(!*hpage)) { > + *folio = __folio_alloc(gfp, HPAGE_PMD_ORDER, node, nmask); > + > + if (unlikely(!*folio)) { > count_vm_event(THP_COLLAPSE_ALLOC_FAILED); > return false; > } > > - folio_prep_large_rmappable((struct folio *)*hpage); > count_vm_event(THP_COLLAPSE_ALLOC); > return true; > } > @@ -1062,15 +1062,16 @@ static int alloc_charge_hpage(struct page **hpage, struct mm_struct *mm, > int node = hpage_collapse_find_target_node(cc); > struct folio *folio; > > - if (!hpage_collapse_alloc_page(hpage, gfp, node, &cc->alloc_nmask)) > + if (!hpage_collapse_alloc_folio(&folio, gfp, node, &cc->alloc_nmask)) > return SCAN_ALLOC_HUGE_PAGE_FAIL; > > - folio = page_folio(*hpage); > if (unlikely(mem_cgroup_charge(folio, mm, gfp))) { > folio_put(folio); > *hpage = NULL; > return SCAN_CGROUP_CHARGE_FAIL; > } > + > + *hpage = folio_page(folio, 0); > count_memcg_page_event(*hpage, THP_COLLAPSE_ALLOC); count_memcg_folio_events（）and kill count_memcg_page_event? > > return SCAN_SUCCEED;