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 40479CDB47E for ; Wed, 18 Oct 2023 17:21:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CD2E78D0168; Wed, 18 Oct 2023 13:21:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C5B4B8D0016; Wed, 18 Oct 2023 13:21:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AFC0A8D0168; Wed, 18 Oct 2023 13:21:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 9BCAC8D0016 for ; Wed, 18 Oct 2023 13:21:40 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5CFC680321 for ; Wed, 18 Oct 2023 17:21:40 +0000 (UTC) X-FDA: 81359249160.04.41242B6 Received: from mail-yb1-f169.google.com (mail-yb1-f169.google.com [209.85.219.169]) by imf13.hostedemail.com (Postfix) with ESMTP id 8A4E12000C for ; Wed, 18 Oct 2023 17:21:38 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=QjnvzQ7e; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf13.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.169 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697649698; 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:dkim-signature; bh=mlsllgD6PkaqFDw9HMpD0Og8oMtW0iTOecosrhmZCqs=; b=2fkdg3qm7GwoiFnOuOoCDkknl1N7L/HK7sDcbAXzd0HM+4+YXX/VmP0PLdv3VOMtxrqfOz 6rU54YBg6nXaQGb0bzX574TdHoohPf4C/+w5qLVeBG6moU8cZ4ZF7P8qtQNmITzME/MCmo LINiy4QNJQi7sTkvx+YiPFPdW97YWUc= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=QjnvzQ7e; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf13.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.169 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697649698; a=rsa-sha256; cv=none; b=ggADAymm4FXR/Oe/1JtTFS98dd41QqIdOTL6bfk9MxBDNnqJN8Czx9ZmTA488VarJoY7kH RerHoegBWG+ibA04fMzV4t/ok4AJ9ptaY3VYJr587d2ixk3qpU7lIZ8ifL9TXZBql7IzE6 3bfjb02reCW7KZXNnJ14idfUrHdGa+I= Received: by mail-yb1-f169.google.com with SMTP id 3f1490d57ef6-d9a518d66a1so8246319276.0 for ; Wed, 18 Oct 2023 10:21:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697649697; x=1698254497; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=mlsllgD6PkaqFDw9HMpD0Og8oMtW0iTOecosrhmZCqs=; b=QjnvzQ7eK+vR23SO/gn56E503PEY64BGfa/NzdgcRqhVImCEvBMnV3+aH03rDEGrxO 09FRz64hJX+9DUGjZrd3SSOqfLnjibCaqBulmOeZfDhlbO8DmWMC1/tbW87cpfRdymXB 6i7EhO2UR4+tukiKH3wqg6S5Z/4/FBSMav94OTZbGyASwDg+HVj7FkdoXh0sjZvGEkuG j7kgWJmaJhIYRRATtcKpah8y/ccfy1G9ZVY20Wl7hcFSK1WswJrJXQ0jye0QRU/6x+oR ygpH07BSdMbNAjbxlg7+wJKfihFPq23GNAWT/K3Xk/UA85ltNNqWjBVyTxrO6muGVILm rjpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697649697; x=1698254497; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mlsllgD6PkaqFDw9HMpD0Og8oMtW0iTOecosrhmZCqs=; b=wbFs9WmTZb2iMIeBB7h4suOVjdJY7bwqbbFTvJIQWiCMjdlQnw94yBFQQbEdno8whp gLPoqdClNg/TvPZzwR88FdG0t5Lo/djojRvljzSBKil99nEkzHhRebnSZOLtMmrTtdjh f7F9Ax0dj8gSGr35kjiTOARWA0Wh26v1RlLxgF7HmNY2dgDHYZXPnCnVqw6hIdR0+txb w4BZR5t6lCZkHLwB677raRKe9JFDCZ57Wg3F9WDNG6JxIZUxuZA9KM1s74OOpHfuNq7A b+OKZHChkzMfgKt6GzfEONgvZMlcM6oxF0eVX4I55IqEyrlsXLtFuIZ4peQ5KkZVb8nh 6W/g== X-Gm-Message-State: AOJu0YyOotE2xXwiHxaHNcyy+geUEh5gNqJrTMbyJ1C2sTQTQu6xhnha v1hP2f/kT5uL1aUdq2+drOiaLdWl3ghEwNw2ZC4= X-Google-Smtp-Source: AGHT+IHcqLXU34Ocg34YwR4wruTTUORgvwsW2VYFcffaPOMJl8CEorUKlJWndaafeW9HkCYXPFx+bt4rln6T8GQYrCU= X-Received: by 2002:a25:8a92:0:b0:d9a:bbe1:1b7a with SMTP id h18-20020a258a92000000b00d9abbe11b7amr5541586ybl.50.1697649697519; Wed, 18 Oct 2023 10:21:37 -0700 (PDT) MIME-Version: 1.0 References: <20231016200510.7387-1-vishal.moola@gmail.com> <20231016200510.7387-5-vishal.moola@gmail.com> <84cdc2c3-e5e3-469b-b265-8df3e72a8c2f@huawei.com> In-Reply-To: <84cdc2c3-e5e3-469b-b265-8df3e72a8c2f@huawei.com> From: Vishal Moola Date: Wed, 18 Oct 2023 10:21:25 -0700 Message-ID: Subject: Re: [PATCH 4/5] mm/khugepaged: Convert alloc_charge_hpage() to use folios To: Kefeng Wang Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, shy828301@gmail.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 8A4E12000C X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: gq647rs53ijzqz6bnccxz5t3kerjpkbe X-HE-Tag: 1697649698-254410 X-HE-Meta: U2FsdGVkX19csA8PgIk4ssJIeeELAtKWhFlvK4xHYgSgbDrvrV5FEP6WaVTsV9cb7TVaiRJmNL73KFn+5m5npwDbpfD+AMac2JDPguoZfdpbu2U/kD3FYCphCNYn2b7hDo+ID5fXkqWv9vUNVebRc++nn7FtmoCX7hRMK1GFwcRGKhJ5oRFwFwwQd9yPydi80fyXg4KeZouITQDFR1uRzBySEKD+01ylD4p9mc0YXX9Ql/Me8foPdYU79wjTeow1OjL/J3ItydbVF3S2QIQYYdBhLz9HKpldbRnLqRaXZwsKGSJfJUFcbQahJPF7V0w5JAZSaxv9n261E9IfRYKMjSta3QWMlDYtPuqI23ObE6pRHxZiFhmBWK+JtIhNvMdJ1qwp9alXu1mjs+2f5nhItQheHONaXZOhhLOyBVre54LQegLCjVyaZFZz+rQOqrwtQRA+0Q1OdoxIl4pjEdlDsIroBtHSnFqSbL4u1sDJcsnZQg2NfM0/9Gzw+np869RGc7uKWUkUMjd8CJ7OxcT0VjpwochqxuAvzoUKcHdgHFhsKXcHb6VHnTCTaFWIYHaSYoD/8c5wgcoNuQzyHArYY0Wu+TL+jPYk6+MZhyhWSrwPKS4RTOCo72zQUGvKA8wT+QjJTWAKEU8ndhmTHFeV6imcVa4b4jG5MIUagcq3x1rSAgEsEp3pMeXRg/aFQOHHYV/8eBMSC8kwqBY9YEEpbwmyw4z3D6e/9kpIpqw4VHmSmMwKUHYudLJG30c+wdY+K3qk1gaZnZAtJT4VNiLoS0mBHDjO3rCsXgH74WaApotyW6YiHOzjIziBpDa2+y+j4x2v2ztWGEjYD45mS3zuFHFG/sc/lFwn47eq42B2UNL4Sc8T7cH+HCis43c7F6glzguLGMkN6aLBnp5QOHykOAq3srwP0XnuStiJtuZ+PJVv+ZpkkPljM5ZIJNflQCoHF7f3+UjSMGiSwBs9Xa1 naRNNOHs pzk3+o4rXVlIKNno+hr+ngGE3udC+ipzeGpD36JU+JeVDwtV1XIbwhMPH6deFR5f5h553eMO7AHyDPeiwkJ0yqH6Ee7Xi+j0/BWp5sF+aA3dBb+D0wYoET6cAZTOF/IMgsplK+D9AktcnIK4aH7rk1gDiLaYIQ/5laNvA2AEM5YKXAWLlktd9ZhZezIyFov8SWgNI3fNDia2qBDsW8UnJhr625rIa8zgy3WGRMAGcwVpWcq69l++XCKm684xzBfte86VozxQULZkvXpczihjNmg8qYMYwiuxsX3z8FS75T/9z92Tm3JVrN7Uabp0BzLjHy/w/DNqT4dvHsHjf1kAz80bk7PRmF8thSLnoZFa+COC/kIjE3WNgw1h6sXNUWeO10SK0YWzL6nsyjcgsyTfSbEQjeCXyoJrUVkVBni9qbeUneqPxzpisqTrl5JbLMxCRynn4k/V4vCl905qFyIwodOqrmeqHinY7QFK6 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 Mon, Oct 16, 2023 at 8:48=E2=80=AFPM Kefeng Wang wrote: > > > > 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 =3D __alloc_pages(gfp, HPAGE_PMD_ORDER, node, nmask); > > - if (unlikely(!*hpage)) { > > + *folio =3D __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 **hpa= ge, struct mm_struct *mm, > > int node =3D 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_nma= sk)) > > return SCAN_ALLOC_HUGE_PAGE_FAIL; > > > > - folio =3D page_folio(*hpage); > > if (unlikely(mem_cgroup_charge(folio, mm, gfp))) { > > folio_put(folio); > > *hpage =3D NULL; > > return SCAN_CGROUP_CHARGE_FAIL; > > } > > + > > + *hpage =3D folio_page(folio, 0); > > count_memcg_page_event(*hpage, THP_COLLAPSE_ALLOC); > > count_memcg_folio_events=EF=BC=88=EF=BC=89and kill count_memcg_page_event= ? > > > > return SCAN_SUCCEED; Thanks, I didn't notice that was the last caller.