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 0BDBCC25B75 for ; Fri, 31 May 2024 13:04:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 78E1F6B0093; Fri, 31 May 2024 09:04:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 73E456B009B; Fri, 31 May 2024 09:04:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5B7B16B009D; Fri, 31 May 2024 09:04:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 3D5BA6B0093 for ; Fri, 31 May 2024 09:04:38 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id EAB881A139D for ; Fri, 31 May 2024 13:04:37 +0000 (UTC) X-FDA: 82178710194.03.F269707 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf07.hostedemail.com (Postfix) with ESMTP id A291A40009 for ; Fri, 31 May 2024 13:04:35 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="U0T8/6hl"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf07.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717160675; 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=31tAMzYWbLSmIpJDc+a9K6kwIp/gyego2JxLxPGlZ3g=; b=JOQhzhTGUTWAJNrp1VhE9V1s3jtsE8Z8fRE0de16UY28kh0peXpRKry34cYpMNCTtXtdKD mBjBlujriLvhJVPT3CnQX/l3xBZMZ8AuYI+ekLVrsNtPeyzpqgUAcg/LB7DGDvLdBIgktT 69g55aJFN8lToGWgIMFtyDNtJ3G/NIc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717160675; a=rsa-sha256; cv=none; b=6FbYjFrej4JQbpnLUQ9Ev84R11DigjD8KmFzWBkez+teqxhXD4k4W4/DfQV4q42qH1F8sq /8yIMZOJ8KwJcMWTYN6thoY1UlxD6KftRXEc99E3tgLYjlAWVt69dei2KDnw8ENZMwd7Ce 6UFuuuswQvgbaSYUScH4P7nu6JhG3iA= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="U0T8/6hl"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf07.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717160674; h=from:from: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:autocrypt:autocrypt; bh=31tAMzYWbLSmIpJDc+a9K6kwIp/gyego2JxLxPGlZ3g=; b=U0T8/6hl9Nd11l+Pnc/UkETzDUco8kHniueAUI5c/Ixx74gvIpNoqn0oZUAtYCmn3eD/3u nwFLfQaI71b69B9fJN0LimprqoCJu42X6ezxKzPftTQ8/jxJYSADF/TAwrR9sEUqAUbNCP WF35NU8zxan8Ue5GkfGHTJJuQIv7X5k= Received: from mail-lj1-f199.google.com (mail-lj1-f199.google.com [209.85.208.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-605-VSi6KxbVPzKFyKzfl_fMVQ-1; Fri, 31 May 2024 09:04:33 -0400 X-MC-Unique: VSi6KxbVPzKFyKzfl_fMVQ-1 Received: by mail-lj1-f199.google.com with SMTP id 38308e7fff4ca-2ea93c06e3cso7698811fa.2 for ; Fri, 31 May 2024 06:04:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717160671; x=1717765471; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=31tAMzYWbLSmIpJDc+a9K6kwIp/gyego2JxLxPGlZ3g=; b=SZHCNq7TMuvRzGZAtTkqysWr89oCN3YUCa5p22mRaZ/AwACmqvxvDRWFsjw/6DjMj/ h2s2/bLQ5Y1fldCFmOim2LerYzoojjc3GjJ7uz20kMFgYF4U5EywmQaLHaRCSTJCh43r 5+qdNafkdpLEbSwLRIDH2w4gIs/WGOWxTHHaNXyIbLB7ZYdUbHXQyt/AhKTG2HMiMUEI W5890k5neRDH9FCifntv2xHXWS4CyB+y/HHLIqmm4yld4+tQsghw61kgJvSzh3TA1xFF kasYEklDBsw4rNhUx5ONXuaYV9FkFas7h6lt4u/p1ueap9BrOsW7WwPOAqR7iEFIRuwO V8Eg== X-Forwarded-Encrypted: i=1; AJvYcCVksaSS+lAKP0GLZZBVtMh3KDzbg+/MAvPLExLdGrPKGTKsMLbvmmLRORqsHMdYBBEPfN1rXlM7wpv8LpCo9SyD5e0= X-Gm-Message-State: AOJu0Ywu1yRT0/P7SQGcGfxenuKnQ4vhCS19zG1Sws1UGL7MvqzC/M4A KeHPqc6ZKrQfh8q7JHLDoly1bhHBQFFc9G3hWuoozBp4rQykr0CR0Qrfm+Q5qCWCkng0BfHVT7f PEl6fBm2O2IxtyiEl/8Earuct058t5x3Mjv+pO6lSMVMFNnfo4oWMeQHL X-Received: by 2002:a05:651c:1059:b0:2ea:8462:5927 with SMTP id 38308e7fff4ca-2ea950e5aebmr13136101fa.15.1717160671359; Fri, 31 May 2024 06:04:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFXMKer5rU3TK9RvBOPWgQ2+Tr/qZmu51IvGwtWH45MdNVV7Vb6lPA1P6AkGTbCsyIjo3LtzA== X-Received: by 2002:a05:651c:1059:b0:2ea:8462:5927 with SMTP id 38308e7fff4ca-2ea950e5aebmr13135821fa.15.1717160670794; Fri, 31 May 2024 06:04:30 -0700 (PDT) Received: from ?IPV6:2003:cb:c717:a000:d4df:4b8f:37d4:59e4? (p200300cbc717a000d4df4b8f37d459e4.dip0.t-ipconnect.de. [2003:cb:c717:a000:d4df:4b8f:37d4:59e4]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-421270ad598sm54990385e9.41.2024.05.31.06.04.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 31 May 2024 06:04:30 -0700 (PDT) Message-ID: Date: Fri, 31 May 2024 15:04:29 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] mm/hugetlb: mm/memory_hotplug: use a folio in scan_movable_pages() To: Sidhartha Kumar , linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, vishal.moola@oracle.com, muchun.song@linux.dev, osalvador@suse.de, willy@infradead.org References: <20240530171427.242018-1-sidhartha.kumar@oracle.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20240530171427.242018-1-sidhartha.kumar@oracle.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Stat-Signature: wq13xypc1y3jouiti57tb7hrxabd6n3i X-Rspamd-Queue-Id: A291A40009 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1717160675-189106 X-HE-Meta: U2FsdGVkX18dJNjdegB7dRAyARygvxXIHKhPnmorXOpVvM/5FzpWPL5V2a2ICHbbNIsbTeanPjgKkvGRYWu8tl14ukSeN23M6l86y/7Bo36SLmEIrI8/wxzd+0RUSOVYw6/zoaxApfNT/zE3Rrc2fMHIaWrS4CCmBaIMH5jN7BPAKK2MbOnsxmSGQ7AGm0grO86dAzuuLeAGANxYGUudPrVkF+Zy5kxNFAj+1WOxNk7AjSFPIiHz5l11Xlp6SJSADuPAQkLMs9+deap4SLF+lBSPaiOABCFKsar8JiV2tvr/1qAJtKjAWEn1R8ixB1Tph1oYv81/X4x4YkO6ti0pX0nNDfF/yorgi/69i0d7lGRxBqw1z1w7956wuYSyM64ibtv/6ItEuzO8VEZFmdZxlrW8pRc3jlM+f2AiYHGvRHc24TyGQD+OyStYN+fhQZPuOgK4nc7JPjs8D+hTqGBOcYCX/im/0UDmQz7cXk5muW/Xn4lidPaOpksCtJtPMbKH+KNEK1keQoltE1PWZjYSMCkCBubDDy8A97xOwNnUoys8t/5cl5Z2XHejove11U4Zk8abEHmXnFQIjkpiW5KXcHI8PG1PZnMsB/Y+izW+fQ/x12n5v4GKs0OG5so+KMA/Y2Ie9W9Mt62uauFgfyEIz9DR5U9QmFSCmzACqtYxG+a2N2WFI1JSX2Folv79dQu/xa4O2IFUnAYEfntibdkxwAW5ISlgGK7GKXSIB6PBralG7/QCOn1Hf30snCms8OWeOhMo0apvfuKT1sBMCP8vRYzuZuWVGJJU96mfGe6feKAILWX2koMTsxOEgDkblPJsf05la9M5WoVjG7gbJUV6qrBtGwy4BtRod8B8iecozfSxNeFaNjQLyELuMup1MAb0UZ08udckZ2NsdaEzXTJ57XYCVnrVQTUpfO0uhs+6XephaMmoh3guInEXeMZwpZ4wWNGIJjQQK+cpCzd7sds RJbnbeYH o7l2/A9TKXSGv6/BggMW3aIrd3uF/mqMm9dwyF9lukH4oMst8leiwjkdDmfo7jbM0zux6/9fT8dXITvrAhulf7V6PfQXlHLilGDy/14ZT4Xz5YCVqKvSk9FzFSIeQfo1qGMJx+JdyoL5jLtQp4GLrvWD1erO1eentHtwerq8ZeV5cv8UfuCkPjJ0LgaXNCQz1q7wigdkUXYbyBMnF72Ub/Y/h+51GthidRhXixnxqh0e6mPgUYpMjOgcoEECopV0TYQ9Bu6HonP60OQqjp9pZjX8WzCIWGwtU3bdnLOywWY4zpbx6hxwHcpG+CYdJ1uEwku/wvEFgVYdRzv/0ad5x8n7ASm6KtYDI67EWCHm2uoBBH/hIVhgBlUYfvX5GVs2ZYyXi2yYZ1w0ve+kdw4CYkHEmQPC6tkRhcY4zabcifkqFxbvgUKrVqThKNbjpDBrF80wOpZK5xKLuhbfWwAfWW/JPgYLjf5c72w3BEBnYHsuEDMRhKt6J8h8IKwkmPswO8Ly5skyV+sUonAd8TzYBOwnJoE36I+4osqnh 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 30.05.24 19:14, Sidhartha Kumar wrote: > By using a folio in scan_movable_pages() we convert the last user of the > page-based hugetlb information macro functions to the folio version. > After this conversion, we can safely remove the page-based definitions > from include/linux/hugetlb.h. > > Signed-off-by: Sidhartha Kumar > --- > > v1 -> v2: > simplify pfn skipping logic with pfn |= folio_nr_pages(folio) - 1 > per Matthew > > include/linux/hugetlb.h | 6 +----- > mm/memory_hotplug.c | 11 +++++------ > 2 files changed, 6 insertions(+), 11 deletions(-) > > diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h > index 15a58f69782c..279aca379b95 100644 > --- a/include/linux/hugetlb.h > +++ b/include/linux/hugetlb.h > @@ -616,9 +616,7 @@ static __always_inline \ > bool folio_test_hugetlb_##flname(struct folio *folio) \ > { void *private = &folio->private; \ > return test_bit(HPG_##flname, private); \ > - } \ > -static inline int HPage##uname(struct page *page) \ > - { return test_bit(HPG_##flname, &(page->private)); } > + } > > #define SETHPAGEFLAG(uname, flname) \ > static __always_inline \ > @@ -637,8 +635,6 @@ void folio_clear_hugetlb_##flname(struct folio *folio) \ > #define TESTHPAGEFLAG(uname, flname) \ > static inline bool \ > folio_test_hugetlb_##flname(struct folio *folio) \ > - { return 0; } \ > -static inline int HPage##uname(struct page *page) \ > { return 0; } > > #define SETHPAGEFLAG(uname, flname) \ > diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c > index 431b1f6753c0..9c36eb3bbd3b 100644 > --- a/mm/memory_hotplug.c > +++ b/mm/memory_hotplug.c > @@ -1731,8 +1731,8 @@ static int scan_movable_pages(unsigned long start, unsigned long end, > unsigned long pfn; > > for (pfn = start; pfn < end; pfn++) { > - struct page *page, *head; > - unsigned long skip; > + struct page *page; > + struct folio *folio; > > if (!pfn_valid(pfn)) > continue; > @@ -1753,7 +1753,7 @@ static int scan_movable_pages(unsigned long start, unsigned long end, > > if (!PageHuge(page)) > continue; > - head = compound_head(page); > + folio = page_folio(page); > /* > * This test is racy as we hold no reference or lock. The > * hugetlb page could have been free'ed and head is no longer > @@ -1761,10 +1761,9 @@ static int scan_movable_pages(unsigned long start, unsigned long end, > * cases false positives and negatives are possible. Calling > * code must deal with these scenarios. > */ > - if (HPageMigratable(head)) > + if (folio_test_hugetlb_migratable(folio)) > goto found; > - skip = compound_nr(head) - (pfn - page_to_pfn(head)); > - pfn += skip - 1; > + pfn |= folio_nr_pages(folio) - 1; Likely not exactly what we want? pfn |= folio_nr_pages(folio); Would make sure that we are "one PFN before the start of the next folio". The pfn++ before the next loop iteration would move us to the next folio. Or am I missing something? It might be cleaner if we would handle the "pfn++;" on the "continue;" paths inmstead, and simply here do something like pfn = ALIGN(pfn + 1, folio_nr_pages(folio)); instead. -- Cheers, David / dhildenb