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 DCC22C25B75 for ; Fri, 31 May 2024 13:05:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 71A096B0085; Fri, 31 May 2024 09:05:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6C9AC6B009F; Fri, 31 May 2024 09:05:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 56A366B00A1; Fri, 31 May 2024 09:05:51 -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 37F2B6B0085 for ; Fri, 31 May 2024 09:05:51 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id DED3F160BE4 for ; Fri, 31 May 2024 13:05:50 +0000 (UTC) X-FDA: 82178713260.30.2814F0E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 72E8E140014 for ; Fri, 31 May 2024 13:05:48 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SzqDMbJX; spf=pass (imf09.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717160748; a=rsa-sha256; cv=none; b=T16Ko7rv5J6l6O6gj//Y0TI5QP1eZO16485zy1bPMTueT51rPa7fagZaRZASWsbORIuD9R mgsWPq2w02BVk/MiSxDm55kKxGrdDlzyLKgrGbYn1+Gzcvp8EoXju9U4kc1PYlYpLEhlix db9f5Y0SrG+G13ghTsKLddn8XwP6QnQ= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SzqDMbJX; spf=pass (imf09.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717160748; 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=eWPJprElNMXCXo9iDiQXBGc5GCfw1pS39+lgF8K2K38=; b=ZYd8/C0xmu0vIbJ+nc0kA0TSGuSiCkR1jffLbORGva+3aWVOUWlPWZW4e/ojLHGXY+xLhJ XsfqCpOu33sGUloc5pPN8dTD2yGNKtzQ8AlIKBVlRSE0ZeJUZPS7Q8GFrMVa8DPjoVvu05 UOcGpqkTQm5EW/nu4oBKdVclYKfZ9gQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717160747; 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=eWPJprElNMXCXo9iDiQXBGc5GCfw1pS39+lgF8K2K38=; b=SzqDMbJXK85xAm10ZsH4VtYXK1aKzdfSSeegIDIOBOdL6KrttDi8/dn9SarH87ZiGxgLjj 2Mbfp2v4liq2RnfMYPJQjm0lJQaBcwLLosYb+k+9VRkJaFtp61F4+9Raia7alBZgW9GPLU lBStz9oc4N69cq773kVchnMUiastHPc= Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-211-ZR5drHp3PWCe241UBq_GMw-1; Fri, 31 May 2024 09:05:46 -0400 X-MC-Unique: ZR5drHp3PWCe241UBq_GMw-1 Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-2ea839a481bso15332211fa.0 for ; Fri, 31 May 2024 06:05:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717160745; x=1717765545; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:from:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=eWPJprElNMXCXo9iDiQXBGc5GCfw1pS39+lgF8K2K38=; b=N/QAi5JP99dihhHtmQeE1vEM1jWC30XrTiY+Nyk3CjDwayR5RgdO67F41TqTcZg2DE 3lhGrh1kSKEgiciRlkurpRWN87k5kD9Z3xnRlbDATnASKG60F3qGX8j+Mxnu8MuQdCKh C7twfHxTg50QgwbUx6b1mFE6QTPIUnp/+G+QHaHqA8Xrhqcd9ttxXZENZJrgupG/0brX TdpPkxHmvM+KajRyusulfoKXHpVCcvhviEPst9R74I9D5vDJ9rqj8rtZoO/zzwrvNM5Z RXBKYssMLFI/D65V4Xgdhi1MTTLJQb52lr/OdYQMDwiA/Xt9wXR5Z2TKy00YrGjOXHbF M+eA== X-Forwarded-Encrypted: i=1; AJvYcCWHWb0kkkMN+MxqtBUyMckp9eoDaH4lUeu3LxpDd8hwUsJO3iOqPu59tWHFdS9hMFdI5YPcyCgPclLDLQBYaVGE17c= X-Gm-Message-State: AOJu0YyLS/UnYKHBGg8MN4G8DXlOHe8pfGFnxEIwHWtFdnJrfneAn92Y ckxeGd+qGEyhM95F32U5q/kzj/Ax9MpWLC9oJukQTken8Kcb12L0Ff2CRQN8FM1kB+MmX6QWxf8 Vc697NMNsoe9b1LJ5HzQcgo1hawVpIb+0SXCORdwSIqwUFPyy X-Received: by 2002:a05:651c:1a12:b0:2e5:67bc:739 with SMTP id 38308e7fff4ca-2ea950b55b0mr16523331fa.2.1717160744636; Fri, 31 May 2024 06:05:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHN7764g19nHVJQIhrnIPAoZI4/o58tCleNGHZw+vpvy2hTCND3S/CXd5/Pgm1sbitKw9cz8w== X-Received: by 2002:a05:651c:1a12:b0:2e5:67bc:739 with SMTP id 38308e7fff4ca-2ea950b55b0mr16523081fa.2.1717160744085; Fri, 31 May 2024 06:05:44 -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 ffacd0b85a97d-35dd04cad2csm1850133f8f.36.2024.05.31.06.05.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 31 May 2024 06:05:43 -0700 (PDT) Message-ID: Date: Fri, 31 May 2024 15:05:42 +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() From: David Hildenbrand 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> Autocrypt: addr=david@redhat.com; keydata= xsFNBFXLn5EBEAC+zYvAFJxCBY9Tr1xZgcESmxVNI/0ffzE/ZQOiHJl6mGkmA1R7/uUpiCjJ dBrn+lhhOYjjNefFQou6478faXE6o2AhmebqT4KiQoUQFV4R7y1KMEKoSyy8hQaK1umALTdL QZLQMzNE74ap+GDK0wnacPQFpcG1AE9RMq3aeErY5tujekBS32jfC/7AnH7I0v1v1TbbK3Gp XNeiN4QroO+5qaSr0ID2sz5jtBLRb15RMre27E1ImpaIv2Jw8NJgW0k/D1RyKCwaTsgRdwuK Kx/Y91XuSBdz0uOyU/S8kM1+ag0wvsGlpBVxRR/xw/E8M7TEwuCZQArqqTCmkG6HGcXFT0V9 PXFNNgV5jXMQRwU0O/ztJIQqsE5LsUomE//bLwzj9IVsaQpKDqW6TAPjcdBDPLHvriq7kGjt WhVhdl0qEYB8lkBEU7V2Yb+SYhmhpDrti9Fq1EsmhiHSkxJcGREoMK/63r9WLZYI3+4W2rAc UucZa4OT27U5ZISjNg3Ev0rxU5UH2/pT4wJCfxwocmqaRr6UYmrtZmND89X0KigoFD/XSeVv jwBRNjPAubK9/k5NoRrYqztM9W6sJqrH8+UWZ1Idd/DdmogJh0gNC0+N42Za9yBRURfIdKSb B3JfpUqcWwE7vUaYrHG1nw54pLUoPG6sAA7Mehl3nd4pZUALHwARAQABzSREYXZpZCBIaWxk ZW5icmFuZCA8ZGF2aWRAcmVkaGF0LmNvbT7CwZgEEwEIAEICGwMGCwkIBwMCBhUIAgkKCwQW AgMBAh4BAheAAhkBFiEEG9nKrXNcTDpGDfzKTd4Q9wD/g1oFAl8Ox4kFCRKpKXgACgkQTd4Q 9wD/g1oHcA//a6Tj7SBNjFNM1iNhWUo1lxAja0lpSodSnB2g4FCZ4R61SBR4l/psBL73xktp rDHrx4aSpwkRP6Epu6mLvhlfjmkRG4OynJ5HG1gfv7RJJfnUdUM1z5kdS8JBrOhMJS2c/gPf wv1TGRq2XdMPnfY2o0CxRqpcLkx4vBODvJGl2mQyJF/gPepdDfcT8/PY9BJ7FL6Hrq1gnAo4 3Iv9qV0JiT2wmZciNyYQhmA1V6dyTRiQ4YAc31zOo2IM+xisPzeSHgw3ONY/XhYvfZ9r7W1l pNQdc2G+o4Di9NPFHQQhDw3YTRR1opJaTlRDzxYxzU6ZnUUBghxt9cwUWTpfCktkMZiPSDGd KgQBjnweV2jw9UOTxjb4LXqDjmSNkjDdQUOU69jGMUXgihvo4zhYcMX8F5gWdRtMR7DzW/YE BgVcyxNkMIXoY1aYj6npHYiNQesQlqjU6azjbH70/SXKM5tNRplgW8TNprMDuntdvV9wNkFs 9TyM02V5aWxFfI42+aivc4KEw69SE9KXwC7FSf5wXzuTot97N9Phj/Z3+jx443jo2NR34XgF 89cct7wJMjOF7bBefo0fPPZQuIma0Zym71cP61OP/i11ahNye6HGKfxGCOcs5wW9kRQEk8P9 M/k2wt3mt/fCQnuP/mWutNPt95w9wSsUyATLmtNrwccz63XOwU0EVcufkQEQAOfX3n0g0fZz Bgm/S2zF/kxQKCEKP8ID+Vz8sy2GpDvveBq4H2Y34XWsT1zLJdvqPI4af4ZSMxuerWjXbVWb T6d4odQIG0fKx4F8NccDqbgHeZRNajXeeJ3R7gAzvWvQNLz4piHrO/B4tf8svmRBL0ZB5P5A 2uhdwLU3NZuK22zpNn4is87BPWF8HhY0L5fafgDMOqnf4guJVJPYNPhUFzXUbPqOKOkL8ojk CXxkOFHAbjstSK5Ca3fKquY3rdX3DNo+EL7FvAiw1mUtS+5GeYE+RMnDCsVFm/C7kY8c2d0G NWkB9pJM5+mnIoFNxy7YBcldYATVeOHoY4LyaUWNnAvFYWp08dHWfZo9WCiJMuTfgtH9tc75 7QanMVdPt6fDK8UUXIBLQ2TWr/sQKE9xtFuEmoQGlE1l6bGaDnnMLcYu+Asp3kDT0w4zYGsx 5r6XQVRH4+5N6eHZiaeYtFOujp5n+pjBaQK7wUUjDilPQ5QMzIuCL4YjVoylWiBNknvQWBXS lQCWmavOT9sttGQXdPCC5ynI+1ymZC1ORZKANLnRAb0NH/UCzcsstw2TAkFnMEbo9Zu9w7Kv AxBQXWeXhJI9XQssfrf4Gusdqx8nPEpfOqCtbbwJMATbHyqLt7/oz/5deGuwxgb65pWIzufa N7eop7uh+6bezi+rugUI+w6DABEBAAHCwXwEGAEIACYCGwwWIQQb2cqtc1xMOkYN/MpN3hD3 AP+DWgUCXw7HsgUJEqkpoQAKCRBN3hD3AP+DWrrpD/4qS3dyVRxDcDHIlmguXjC1Q5tZTwNB boaBTPHSy/Nksu0eY7x6HfQJ3xajVH32Ms6t1trDQmPx2iP5+7iDsb7OKAb5eOS8h+BEBDeq 3ecsQDv0fFJOA9ag5O3LLNk+3x3q7e0uo06XMaY7UHS341ozXUUI7wC7iKfoUTv03iO9El5f XpNMx/YrIMduZ2+nd9Di7o5+KIwlb2mAB9sTNHdMrXesX8eBL6T9b+MZJk+mZuPxKNVfEQMQ a5SxUEADIPQTPNvBewdeI80yeOCrN+Zzwy/Mrx9EPeu59Y5vSJOx/z6OUImD/GhX7Xvkt3kq Er5KTrJz3++B6SH9pum9PuoE/k+nntJkNMmQpR4MCBaV/J9gIOPGodDKnjdng+mXliF3Ptu6 3oxc2RCyGzTlxyMwuc2U5Q7KtUNTdDe8T0uE+9b8BLMVQDDfJjqY0VVqSUwImzTDLX9S4g/8 kC4HRcclk8hpyhY2jKGluZO0awwTIMgVEzmTyBphDg/Gx7dZU1Xf8HFuE+UZ5UDHDTnwgv7E th6RC9+WrhDNspZ9fJjKWRbveQgUFCpe1sa77LAw+XFrKmBHXp9ZVIe90RMe2tRL06BGiRZr jPrnvUsUUsjRoRNJjKKA/REq+sAnhkNPPZ/NNMjaZ5b8Tovi8C0tmxiCHaQYqj7G2rgnT0kt WNyWQQ== Organization: Red Hat In-Reply-To: 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-Rspamd-Queue-Id: 72E8E140014 X-Rspam-User: X-Rspamd-Server: rspam12 X-Stat-Signature: 6xob1gwsuesb88izqich76t8dzbn3t4x X-HE-Tag: 1717160748-36385 X-HE-Meta: U2FsdGVkX1/SCbttf/UNyMdsYBiXyMt2xruQP8HaGaNgc/U2mD2ZnP0mzMvMuXxzuBmweGWSgYlSxjiV+HMS3Nqcc7VZsisjYxyw9NkK5AItayN5Zo5EMzQDMyoDk7WSS5BVsQ+V3MnaQx04mcw4SfroG2THkmCOHhCz3n1fYuUWcPiShAWc7tAvBTOIyqiRjxBUwsTdAU/O5GR1ZlQykp/8CgFw6MWfo1sQYjlpE6gPqqrS3loIY/KreDo8X937nBrOblARqa86q23nlJcN+UpCDnTsrp54o5FNOZmdOS7VFhJmm5gCtjkftWgV19UPNShuMYnE1R4j7Gpmfy2dOgzkwYkVc6lwYJCFqYBFKj8MJwT5Ht5c9/0SudHO+k1HIXtHO/MOiutVll5jjJud6dHgL/i8V3ZQTqQkfDQ8r76ZdTGRc52kw/PgRgkDCcJsA/ocUVfkHSNUN1RYP0d4qLrHNts7PPE55GENR6sSuuIJyazJ0MQQudOv+UYRC4Z+V4ypcj75OOapSqOEd3KuE8pncWkgUIdWPD6I1nhIi9b0oACq70dkOJUK5mvGjHleCSSpyf6f5kIxPz98oQxhAvBSAKzzJkU69fDkWT0B2j9tNRiYO3JfhGb5jlTATVZml1lQJPsKVkxZ3VgfFYRskacMCjAWH2AnApfI8QesUSdrrp8g7iT+drGm3+yieLLDTeq0oNJdy9Vu7mHbrgt0UIo0Jq1xwj0NWvOEcHC+OhrtAPEji99VVGeoEb+if//8SzY8FOncX8aj5XKpMbGRK2tJ800I80Tj8C5LoPLKPeFSk3AUqAoJ5VFpv9klnyv97Hc7FwZiAD0uyap64udeJLWw/V5tYj+tBEwA0XjpRXVEfraRA4zO1saJCn1/7S/VXLFFyJ52aC29/c2x/BsOCuJ70ClkhzlVdPIQJEmZnfx1bEgYMcls5D54QqHLJOHZspH7N+QWVgJ7LHuRbJe 1ToQa/yG rbUedmFngZdJS5PyZo/5R9j6gx05IOuj4NNh4vO0GK6Hq6gW/2AwgerrOq0wdVb8/HIDwNn+lpldDPolOqebyQersZYe4WR0ikH1fyFLQIF+rRmE5p/pftpD9zaLveo3M0jofvNPnhQzK7A8Gr0iSPgkyUYsoA4okHA/q9Z70F/Ha61BHa2MzUChBy699fZmLVJDBSN+cwW3oTIk06KnM6qm8/iFSpL72rFl77PFCUPJVFXuBG3dZuPCGdawosDTsvB0iOq0TWuSDoH3E4OuNcn5QSVXZZYen7TQyArwdTRhDFsedTJEMtkqOjI06jx2uiXDB2wGovvWOZtnD06GFsl50sS5JazgNlaxtrG1AdMYclrrg+XlSedfihlaw14h2tMpaDGlfutZ0eyq3iqCjzjAV5Yx12iB+cA6FPCDpceDEnO/fxhibhfy9SKox67Bgx0xKFynZUHYc5e9jhulXoKk8upQsk5OjgjsuRTgm0Qo1Vr6fO372GTxVXZmixtsd+Sokis7sqd682wdYJS3EUkV2GrxL2PTe8u2zBwacnH6An95D4ESmcbKu8g== 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 31.05.24 15:04, David Hildenbrand wrote: > 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? Okay, I got it wrong. "folio_nr_pages(folio) - 1" gives us the bitmask to land one PFN before the end. Acked-by: David Hildenbrand > > 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