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 E29FCC636D4 for ; Mon, 13 Feb 2023 15:55:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 83BB96B0073; Mon, 13 Feb 2023 10:55:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7E9C36B0075; Mon, 13 Feb 2023 10:55:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6D9946B0078; Mon, 13 Feb 2023 10:55:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 61E6F6B0073 for ; Mon, 13 Feb 2023 10:55:12 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 292BE4053A for ; Mon, 13 Feb 2023 15:55:12 +0000 (UTC) X-FDA: 80462717664.18.D1B0FCF Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by imf10.hostedemail.com (Postfix) with ESMTP id 2F859C0007 for ; Mon, 13 Feb 2023 15:55:09 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=none; dmarc=none; spf=none (imf10.hostedemail.com: domain of alex@ghiti.fr has no SPF policy when checking 217.70.183.194) smtp.mailfrom=alex@ghiti.fr ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676303710; 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=+y+WBi+LfCD1FobrbtKlZApT63zPxfE1lrI06SjmTwQ=; b=ib6oum98W6aghrLseV1f2psUuZqIZMqWAGKQ0LP8W3Zmv1X++Eqae6m3BexTMU6/fbYAYO L6yzNVl2Ay3UzADt2fyfccOEeWoyl7cfzm/CTXpeoyrm+qJlvGvEBUMEwn0e3dZEQgfq4p GpmLbEsr39rJFBXdOYiPVry+PhOLwTk= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none; dmarc=none; spf=none (imf10.hostedemail.com: domain of alex@ghiti.fr has no SPF policy when checking 217.70.183.194) smtp.mailfrom=alex@ghiti.fr ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676303710; a=rsa-sha256; cv=none; b=ST0TV43Hdox2KJ87ohxrlhtUwSwL2hTJdCEfF780dUCFxjhFkWvWylk6VUE9ux+UwXp6hl U+hh38FUrupBg6c9hBoDEfgqnMOpvlN5raI154pE3iO3T7AbKiGNcuxt50/6fmsQsCjgZv AFvCeK91pLF0j2HaHKduhtmSEo5Xmk8= Received: (Authenticated sender: alex@ghiti.fr) by mail.gandi.net (Postfix) with ESMTPSA id CD4EE40002; Mon, 13 Feb 2023 15:55:06 +0000 (UTC) Message-ID: <707cd2b6-4350-4171-1e0c-f63ea5db7ece@ghiti.fr> Date: Mon, 13 Feb 2023 16:55:06 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Subject: Re: [PATCH 2/2] mm/khugepaged: Convert release_pte_pages() to use folios Content-Language: en-US To: Matthew Wilcox Cc: Marek Szyprowski , "Vishal Moola (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton , Mike Kravetz References: <20230114001556.43795-1-vishal.moola@gmail.com> <20230114001556.43795-2-vishal.moola@gmail.com> <3a3457b1-60bc-a97b-0042-432790d3bbbe@ghiti.fr> From: Alexandre Ghiti In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 2F859C0007 X-Stat-Signature: w97exk5fmyxn6jt1dnszkupswc9wm7q9 X-HE-Tag: 1676303709-194782 X-HE-Meta: U2FsdGVkX19xFzwmk0Rh5r3kjnXZy2JFNWL7/qz4eRuuSQTGKN1aafsN6Hy47nCTHBa/dlz0GlmoNb/bZaQqv+HUmrHgNuwD9wEPMgzPi8gAQeMqtumd7KhcdcygTmPar67kOjt6gXFE2stErQQHHdaEY2KZW/tEctBOC/Rsk5mOGFPkZ+kpEN7Mn8+/vRt3qpsNAtF0uMIarLRexlKCAMCmFYxwxtG6rXEDKoMv3n36jAPwuVoOtmyuNhqeFN9U23QlTa1Hf/30klTbnH5diAAfiIspNpYwIFa6R4lvyd/Yd2PUNYkOf46plojbJ2EBoyGSbVXS7HzDnSsw+064+OgHnB0X8kFfOfd622x5f8sxGOgDVjLNuUvv/giwtdP4sYxVe5mksaEKvZRDtWszST+Djf4dLVrkSAiNhfA4yBVng7aMzoYxt7oqYoGOVeVKfbKqd2tXYmjo4nS6yi25+01Tivoc9Dj1J2oEC8vluNnNpLmdVGAcShqvu9bOmP9MgEWHj0C+t4eDa/6JGxwjmN1u4HazypMnqReVc3utL49J7Rth4oCx1/TJ2WTAkP0fDGGMw82vDsnRJYTTlhIH/GuS77YRWgkdcIpGCmWmNnAWcJbUShnmnv9K0eMXLrG6HnvJUo+iH70GsruNzr10Kaz/+oFro7rrvaAcEPme69cGrAOidZdqaM7oBfM2hN3/0V0tJfT5Aj3MefIWg2bigVtbHL66a7bGG66nCaCH+LyeupfESdfV7y5tPDrkyxYdKlB68AaHzrXnjUPS324C+iW6i/lf0+ahGPxO8qa816BaHqaj5W+3fON/D/d2iFQVlz0zvC2shKaXb/es6Cs2iUp5aRx1PbhVqAGjccYF3w5mx32H7QztTmSZ0DUB0iXQbg2DF/T3eHtHRS1HYrWSD2JFXEuAc9HkH7JOBpISecZmkcC2lf7mZ6VyOOicJiMxGPeTQLxQQITUYMg+nOy z/EasdVV CHFZ+qa8WhOn5PObwGFrYL3SkWkohpL9gDPXUTPwQIXAY1a21Pp1MJhnq+C3qyQ447BAIEpHVX+502W9R02NlERaWntXf0M40YJM5oCYrlnpfsA7SOIVDSS7SK4iWAUK1T1771fm1m5zYCVG7qxQrYLj039s2+3eQg7AbA9A0Af5MeP2tfvahSXiOwFrCwaERZdQj X-Bogosity: Ham, tests=bogofilter, spamicity=0.000163, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Hi Matthew, On 2/13/23 16:50, Matthew Wilcox wrote: > On Mon, Feb 13, 2023 at 04:28:05PM +0100, Alexandre Ghiti wrote: >> The issue lies here: before using pteval in pfn_folio(), we should test it. >> The following patch fixes the issue for me: > Thanks for debugging it. I'd rather see this written as ... > > pte_t pteval = *_pte; > + unsigned long pfn; > > + if (pte_none(pteval)) > + continue; > + pfn = pte_pfn(pteval); > + if (is_zero_pfn(pfn)) > + continue; > + folio = pfn_folio(pfn); > + if (folio_test_large(folio)) > + continue; > release_pte_folio(folio); > > makes sense? Sure, that's fine by me, I can send that or I'll add my tested-by on what you send, whatever suits you. Alex > >> diff --git a/mm/khugepaged.c b/mm/khugepaged.c >> index eb38bd1b1b2f..fef3414b481b 100644 >> --- a/mm/khugepaged.c >> +++ b/mm/khugepaged.c >> @@ -514,10 +514,12 @@ static void release_pte_pages(pte_t *pte, pte_t *_pte, >>         while (--_pte >= pte) { >>                 pte_t pteval = *_pte; >> >> -               folio = pfn_folio(pte_pfn(pteval)); >> -               if (!pte_none(pteval) && !is_zero_pfn(pte_pfn(pteval)) && >> -                               !folio_test_large(folio)) >> -                       release_pte_folio(folio); >> +               if (!pte_none(pteval) && !is_zero_pfn(pte_pfn(pteval))) { >> +                       folio = pfn_folio(pte_pfn(pteval)); >> + >> +                       if (!folio_test_large(folio)) >> +                               release_pte_folio(folio); >> +               } >>         } >> >>         list_for_each_entry_safe(folio, tmp, compound_pagelist, lru) { >> >> >> @Marek: could you give it a try? >> >> I can send a separate patch if needed, let me know. >> >> Thanks, >> >> Alex >> >> >>>> if (!pte_none(pteval) && !is_zero_pfn(pte_pfn(pteval)) && >>>> - !PageCompound(page)) >>>> - release_pte_page(page); >>>> + !folio_test_large(folio)) >>>> + release_pte_folio(folio); >>>> } >>>> - list_for_each_entry_safe(page, tmp, compound_pagelist, lru) { >>>> - list_del(&page->lru); >>>> - release_pte_page(page); >>>> + list_for_each_entry_safe(folio, tmp, compound_pagelist, lru) { >>>> + list_del(&folio->lru); >>>> + release_pte_folio(folio); >>>> } >>>> } >>> Best regards