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 45BBDE7717F for ; Tue, 17 Dec 2024 16:58:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B18176B0083; Tue, 17 Dec 2024 11:58:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AC78A6B0088; Tue, 17 Dec 2024 11:58:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 98E706B0089; Tue, 17 Dec 2024 11:58:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 784FD6B0083 for ; Tue, 17 Dec 2024 11:58:42 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 29D61A0857 for ; Tue, 17 Dec 2024 16:58:42 +0000 (UTC) X-FDA: 82905059412.18.28A6728 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf17.hostedemail.com (Postfix) with ESMTP id B35ED40010 for ; Tue, 17 Dec 2024 16:58:16 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1734454691; a=rsa-sha256; cv=none; b=TOlnzD3Bkr9g1Sn2H2OmlgbNgkwt8iDqH2bRRapoGdDra/y4agE9Gv/eOvLU9uw7GM+EoB ynWVDXwThBN8S3jcozOj8Ttqo5BPJ7RvsFVE++6VuFntEZAFrpC47Pjpb/1C4vhSaONNN5 PUAvRt4BgFFpemcjIiaXtG43H8sCSn0= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1734454691; 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=dPzfpap4U6tak3lMAXYV3PXTI6bJSXiRhXSB98czNII=; b=cRo5uBcN09Fm+ExzFR0DOeVksbstVPFx5P9mMrcKynOSs4eVImpmyM0ORhnq15TDsIw7/q MwgsV7eKaVOl1Xg8WeCT1cRhuhe8cmjqWIyvAcw2V87s9TPyXA48Ykg5W2i81fqzJOXP8R tAtNq3+pqrcWOuM1RbkfzSrFjgPA71w= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 115ECFEC; Tue, 17 Dec 2024 08:59:07 -0800 (PST) Received: from [10.57.91.184] (unknown [10.57.91.184]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6A9F83F7B4; Tue, 17 Dec 2024 08:58:33 -0800 (PST) Message-ID: Date: Tue, 17 Dec 2024 16:58:31 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [RFC PATCH 03/12] khugepaged: Generalize hugepage_vma_revalidate() Content-Language: en-GB To: Dev Jain , akpm@linux-foundation.org, david@redhat.com, willy@infradead.org, kirill.shutemov@linux.intel.com Cc: anshuman.khandual@arm.com, catalin.marinas@arm.com, cl@gentwo.org, vbabka@suse.cz, mhocko@suse.com, apopple@nvidia.com, dave.hansen@linux.intel.com, will@kernel.org, baohua@kernel.org, jack@suse.cz, srivatsa@csail.mit.edu, haowenchao22@gmail.com, hughd@google.com, aneesh.kumar@kernel.org, yang@os.amperecomputing.com, peterx@redhat.com, ioworker0@gmail.com, wangkefeng.wang@huawei.com, ziy@nvidia.com, jglisse@google.com, surenb@google.com, vishal.moola@gmail.com, zokeefe@google.com, zhengqi.arch@bytedance.com, jhubbard@nvidia.com, 21cnbao@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20241216165105.56185-1-dev.jain@arm.com> <20241216165105.56185-4-dev.jain@arm.com> From: Ryan Roberts In-Reply-To: <20241216165105.56185-4-dev.jain@arm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: B35ED40010 X-Stat-Signature: dupxm3x4j5dxdq4m5cefzxqpdi8kimsy X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1734454696-942486 X-HE-Meta: U2FsdGVkX1+BHVMirncClt6MKgTL6Uy8W5TQFOFYF6U7CWgbqnl8YqkfXiMQDDl/+Xpdkjm0z17Mr/ffdyMhXmGvVIHtGxTsXYJKst+nK0uwT4hiSOT4fRjJaQx/RLyr/l38+e5mU7TF3MSwnFKX33FpWfkrNuzxXSGJM97cxH20x24PWUfzMG5FKll9w39GSLfvXhe2GL+3eBG+kcoO33GPI7jT2rOkU4hLRD8QxgH9a2/agF8Poiba9kqhHHeqoqyXICLlYV1elQiT/9XaLwHVE3dEEHZfV61iNY5Hi1RWsS9sL45BDfssGkjQ+P7zvh3QLSdxbiVPy0SdZHWexCVGE4GjlT2UytGxQTuy808duTR3G6sBBfyLOsdiCdik4tAHDWmlDlA0I1Nz1qdiBXQMuEY8wIX0nJzdc2U7WzFoCno7npOXrjUCBFbuFNy0Uav8kl75lnPEL0U6Ez2WS2QZB51j+0tgtamaWBwKjuEPympUlPfW8hlqlTk2XSG/0rRdeYK/s91Q7tT6+So4GgU+vbQcbtuu3dZvEz4iz6C7UGjGdMtTJ6evf3Bx9iKMnh5Z2az3KpialxcdvkRl6Epn/UpQ5NXNAuFOy2WgVWHvCLSc9h0xyTwS1CA1tKCsogaV5GgJet7LKuTTXSXduVSxfoVeN+bWjFamK8cGdC+ydK+gpa6EfH6eYJLP8/4xQFRSI1MFth3//q7KHaVeVHjBfGCIQewOdU7LR8zVzqf61x8R6Nk7y0mE4le7ea1chV/pT4/xwg/VSBT6vXclqj6VHkNNsjEaZJxPurdmUQ1K51uz/fktmOxwnnUNvEfa1DakA/XAZ3AHdGDQ0oD9f6hzOwNwYtc8MI07VpTSlcXa1Zx6cfRRO4Tnn4PBUI69myf03maO5kflGkUpwwYgGmRJEvzZwaQcvsla5aPh/hGjLeh7akHqP7bvUF6e4Pe2VXROMh8jlYV4akLAafc OmWK6vy4 GhtYMRwRgUckBOm1kpnWnh5WS8Y5VtrRt2nC5iX8no3fiP2gXCZAuh3pEVNagUzaN3NI/5lhClTjWkC9cC7j8nJL+KvuBMdWzoH1noRAgI/5Yd+WLoDKQq+uQdFWOuOIXoGhJlw5gQMW5yHgUoD00NJ6sYy+wf8kGUu/hxsPf4cZfWIX71NpCBXM8z5CjE8caBkuzlTB2Zz1OSxPOxnW6Tj5Na6HrLQvUg1q6H81fiLjcP4ocE8NuATfn0wB6zzd4WQ9fL89SIErQ0ZcDc93fEAznhao8KpNNCnz9fMEowV3WilGE86I56/A5mqLQ3aEpQktZNvQaKOnDfHGb5SIR44DSguFbeSC38EZelby3YrWeTg39pF8xnmx9YTZgnPZdEQFBof3kRNX/BjyYj6ipI44FJJaG8PMz1nYCsC6B44xqDGj+zi3OHR8611hhNeVmkcug 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: List-Subscribe: List-Unsubscribe: On 16/12/2024 16:50, Dev Jain wrote: > Post retaking the lock, it must be checked that the VMA is suitable for our > scan order. Hence, generalize hugepage_vma_revalidate(). > > Signed-off-by: Dev Jain > --- > mm/khugepaged.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index 02cd424b8e48..2f0601795471 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -918,7 +918,7 @@ static int hpage_collapse_find_target_node(struct collapse_control *cc) > > static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long address, > bool expect_anon, > - struct vm_area_struct **vmap, > + struct vm_area_struct **vmap, int order, > struct collapse_control *cc) > { > struct vm_area_struct *vma; > @@ -931,9 +931,9 @@ static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long address, > if (!vma) > return SCAN_VMA_NULL; > > - if (!thp_vma_suitable_order(vma, address, PMD_ORDER)) > + if (!thp_vma_suitable_order(vma, address, order)) > return SCAN_ADDRESS_RANGE; > - if (!thp_vma_allowable_order(vma, vma->vm_flags, tva_flags, PMD_ORDER)) > + if (!thp_vma_allowable_order(vma, vma->vm_flags, tva_flags, order)) > return SCAN_VMA_CHECK; > /* > * Anon VMA expected, the address may be unmapped then > @@ -1134,7 +1134,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, > goto out_nolock; > > mmap_read_lock(mm); > - result = hugepage_vma_revalidate(mm, address, true, &vma, cc); > + result = hugepage_vma_revalidate(mm, address, true, &vma, order, cc); some more compilation issues: replace order with HPAGE_PMD_ORDER. > if (result != SCAN_SUCCEED) { > mmap_read_unlock(mm); > goto out_nolock; > @@ -1168,7 +1168,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, > * mmap_lock. > */ > mmap_write_lock(mm); > - result = hugepage_vma_revalidate(mm, address, true, &vma, cc); > + result = hugepage_vma_revalidate(mm, address, true, &vma, order, cc); and here. > if (result != SCAN_SUCCEED) > goto out_up_write; > /* check if the pmd is still valid */ > @@ -2776,7 +2776,7 @@ int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev, > mmap_read_lock(mm); > mmap_locked = true; > result = hugepage_vma_revalidate(mm, addr, false, &vma, > - cc); > + HPAGE_PMD_ORDER, cc); > if (result != SCAN_SUCCEED) { > last_fail = result; > goto out_nolock;